Mercurial > hg > octave-kai
changeset 17633:855ab26b6f38
maint: periodic merge of default branch into my branch
| author | Kai T. Ohlhus <k.ohlhus@gmail.com> |
|---|---|
| date | Sun, 06 Oct 2013 12:56:28 +0200 |
| parents | b0b5b67a47ae (current diff) 7af442c326a8 (diff) |
| children | 17bbdb24d5d0 |
| files | configure.ac libinterp/corefcn/action-container.h libinterp/corefcn/unwind-prot.cc libinterp/corefcn/unwind-prot.h libinterp/dldfcn/module-files libinterp/dldfcn/urlwrite.cc scripts/plot/__gnuplot_drawnow__.m scripts/plot/__plt_get_axis_arg__.m scripts/plot/allchild.m scripts/plot/ancestor.m scripts/plot/area.m scripts/plot/axes.m scripts/plot/axis.m scripts/plot/bar.m scripts/plot/barh.m scripts/plot/box.m scripts/plot/caxis.m scripts/plot/cla.m scripts/plot/clabel.m scripts/plot/clf.m scripts/plot/close.m scripts/plot/closereq.m scripts/plot/colorbar.m scripts/plot/colstyle.m scripts/plot/comet.m scripts/plot/comet3.m scripts/plot/compass.m scripts/plot/contour.m scripts/plot/contour3.m scripts/plot/contourc.m scripts/plot/contourf.m scripts/plot/copyobj.m scripts/plot/cylinder.m scripts/plot/daspect.m scripts/plot/diffuse.m scripts/plot/ellipsoid.m scripts/plot/errorbar.m scripts/plot/ezcontour.m scripts/plot/ezcontourf.m scripts/plot/ezmesh.m scripts/plot/ezmeshc.m scripts/plot/ezplot.m scripts/plot/ezplot3.m scripts/plot/ezpolar.m scripts/plot/ezsurf.m scripts/plot/ezsurfc.m scripts/plot/feather.m scripts/plot/figure.m scripts/plot/fill.m scripts/plot/findall.m scripts/plot/findfigs.m scripts/plot/findobj.m scripts/plot/fplot.m scripts/plot/gca.m scripts/plot/gcbf.m scripts/plot/gcbo.m scripts/plot/gcf.m scripts/plot/gco.m scripts/plot/ginput.m scripts/plot/gnuplot_binary.in scripts/plot/graphics_toolkit.m scripts/plot/grid.m scripts/plot/gtext.m scripts/plot/guidata.m scripts/plot/guihandles.m scripts/plot/hdl2struct.m scripts/plot/hggroup.m scripts/plot/hidden.m scripts/plot/hist.m scripts/plot/hold.m scripts/plot/isaxes.m scripts/plot/isfigure.m scripts/plot/ishghandle.m scripts/plot/ishold.m scripts/plot/isocolors.m scripts/plot/isonormals.m scripts/plot/isosurface.m scripts/plot/isprop.m scripts/plot/legend.m scripts/plot/line.m scripts/plot/linkprop.m scripts/plot/loglog.m scripts/plot/loglogerr.m scripts/plot/mesh.m scripts/plot/meshc.m scripts/plot/meshgrid.m scripts/plot/meshz.m scripts/plot/ndgrid.m scripts/plot/newplot.m scripts/plot/orient.m scripts/plot/pareto.m scripts/plot/patch.m scripts/plot/pbaspect.m scripts/plot/pcolor.m scripts/plot/peaks.m scripts/plot/pie.m scripts/plot/pie3.m scripts/plot/plot.m scripts/plot/plot3.m scripts/plot/plotmatrix.m scripts/plot/plotyy.m scripts/plot/polar.m scripts/plot/print.m scripts/plot/printd.m scripts/plot/private/__actual_axis_position__.m scripts/plot/private/__add_datasource__.m scripts/plot/private/__add_default_menu__.m scripts/plot/private/__axes_limits__.m scripts/plot/private/__axis_label__.m scripts/plot/private/__bar__.m scripts/plot/private/__clabel__.m scripts/plot/private/__contour__.m scripts/plot/private/__default_plot_options__.m scripts/plot/private/__errcomm__.m scripts/plot/private/__errplot__.m scripts/plot/private/__ezplot__.m scripts/plot/private/__file_filter__.m scripts/plot/private/__fltk_file_filter__.m scripts/plot/private/__fltk_ginput__.m scripts/plot/private/__fltk_print__.m scripts/plot/private/__getlegenddata__.m scripts/plot/private/__ghostscript__.m scripts/plot/private/__gnuplot_get_var__.m scripts/plot/private/__gnuplot_ginput__.m scripts/plot/private/__gnuplot_has_feature__.m scripts/plot/private/__gnuplot_has_terminal__.m scripts/plot/private/__gnuplot_open_stream__.m scripts/plot/private/__gnuplot_print__.m scripts/plot/private/__gnuplot_version__.m scripts/plot/private/__go_draw_axes__.m scripts/plot/private/__go_draw_figure__.m scripts/plot/private/__interp_cube__.m scripts/plot/private/__is_function__.m scripts/plot/private/__line__.m scripts/plot/private/__marching_cube__.m scripts/plot/private/__next_line_color__.m scripts/plot/private/__next_line_style__.m scripts/plot/private/__patch__.m scripts/plot/private/__pie__.m scripts/plot/private/__plt__.m scripts/plot/private/__pltopt__.m scripts/plot/private/__print_parse_opts__.m scripts/plot/private/__quiver__.m scripts/plot/private/__scatter__.m scripts/plot/private/__stem__.m scripts/plot/private/__tight_eps_bbox__.m scripts/plot/private/__uigetdir_fltk__.m scripts/plot/private/__uigetfile_fltk__.m scripts/plot/private/__uiobject_split_args__.m scripts/plot/private/__uiputfile_fltk__.m scripts/plot/quiver.m scripts/plot/quiver3.m scripts/plot/rectangle.m scripts/plot/refresh.m scripts/plot/refreshdata.m scripts/plot/ribbon.m scripts/plot/rose.m scripts/plot/saveas.m scripts/plot/scatter.m scripts/plot/scatter3.m scripts/plot/semilogx.m scripts/plot/semilogxerr.m scripts/plot/semilogy.m scripts/plot/semilogyerr.m scripts/plot/shading.m scripts/plot/shg.m scripts/plot/shrinkfaces.m scripts/plot/slice.m scripts/plot/sombrero.m scripts/plot/specular.m scripts/plot/sphere.m scripts/plot/stairs.m scripts/plot/stem.m scripts/plot/stem3.m scripts/plot/stemleaf.m scripts/plot/struct2hdl.m scripts/plot/subplot.m scripts/plot/surf.m scripts/plot/surface.m scripts/plot/surfc.m scripts/plot/surfl.m scripts/plot/surfnorm.m scripts/plot/tetramesh.m scripts/plot/text.m scripts/plot/title.m scripts/plot/trimesh.m scripts/plot/triplot.m scripts/plot/trisurf.m scripts/plot/uicontextmenu.m scripts/plot/uicontrol.m scripts/plot/uigetdir.m scripts/plot/uigetfile.m scripts/plot/uimenu.m scripts/plot/uipanel.m scripts/plot/uipushtool.m scripts/plot/uiputfile.m scripts/plot/uiresume.m scripts/plot/uitoggletool.m scripts/plot/uitoolbar.m scripts/plot/uiwait.m scripts/plot/view.m scripts/plot/waitbar.m scripts/plot/waitforbuttonpress.m scripts/plot/waterfall.m scripts/plot/whitebg.m scripts/plot/xlabel.m scripts/plot/xlim.m scripts/plot/ylabel.m scripts/plot/ylim.m scripts/plot/zlabel.m scripts/plot/zlim.m |
| diffstat | 250 files changed, 4571 insertions(+), 2106 deletions(-) [+] |
line wrap: on
line diff
--- a/NEWS +++ b/NEWS @@ -141,6 +141,7 @@ ** A TeX parser has been implemented for the FLTK toolkit and is the default for any text object including titles and axis labels. The TeX parser is supported only for display on a monitor, not for printing. + A quick summary of features: Code Feature Example Comment @@ -231,11 +232,11 @@ [1,2] = 3 } - (2) By default, Matlab treats consecutive delimiters are as a single + (2) By default, Matlab treats consecutive delimiters as a single delimiter. By default, Octave's legacy behavior was to return an empty string for the part between the delmiters. - Where the legacy behavior is desired, the call to strsplit() may be + Where legacy behavior is desired, the call to strsplit() may be replaced by ostrsplit(), which is Octave's original implementation of strsplit().
--- a/bootstrap.conf +++ b/bootstrap.conf @@ -153,12 +153,6 @@ # This avoids the need for sha1sum or compatible utility in bootstrap. SKIP_PO=true -## Use --foreign since we auto-generate the AUTHORS file and the default -## --gnu strictness level doesn't like it if the AUTHORS file is missing. - -AUTOMAKE="automake --foreign --warnings=no-portability" -export AUTOMAKE - bootstrap_post_import_hook () { ## Check for files that automake --gnu would normally look for, except
--- a/configure.ac +++ b/configure.ac @@ -41,7 +41,7 @@ AC_CONFIG_AUX_DIR([build-aux]) AC_CONFIG_MACRO_DIR([m4]) -AM_INIT_AUTOMAKE([1.11 tar-ustar subdir-objects]) +AM_INIT_AUTOMAKE([1.11 foreign -Wno-portability -Wno-override tar-ustar subdir-objects]) ## Add the option to enable silent rules, available since Automake 1.11 ## and included by default starting with Automake 1.13. @@ -2104,7 +2104,7 @@ dnl These checks define/undefine HAVE_FUNCNAME in config.h. dnl Code tests HAVE_FUNCNAME and either uses function or provides workaround. dnl Use multiple AC_CHECKs to avoid line continuations '\' in list -AC_CHECK_FUNCS([canonicalize_file_name dup2]) +AC_CHECK_FUNCS([canonicalize_file_name ctermid dup2]) AC_CHECK_FUNCS([endgrent endpwent execvp expm1 expm1f fork]) AC_CHECK_FUNCS([getegid geteuid getgid getgrent getgrgid getgrnam]) AC_CHECK_FUNCS([getpgrp getpid getppid getpwent getpwuid getuid]) @@ -2666,7 +2666,7 @@ if test $build_gui = yes; then AC_CHECK_TOOLS(MOC, [moc-qt5 moc-qt4 moc]) AC_CHECK_TOOLS(UIC, [uic-qt5 uic-qt4 uic]) - AC_CHECK_TOOLS(RCC, [rcc]) + AC_CHECK_TOOLS(RCC, [rcc-qt5 rcc-qt4 rcc]) AC_CHECK_TOOLS(LRELEASE, [lrelease-qt5 lrelease-qt4 lrelease]) if test -n "$MOC" && test -n "$UIC" && test -n "$RCC" && test -n "$LRELEASE"; then AC_DEFINE(HAVE_QT, 1,
--- a/etc/HACKING +++ b/etc/HACKING @@ -271,6 +271,8 @@ geometry geometry algorithms + gui User-Interface (UI) functions + help help subsystem functions image image processing @@ -318,15 +320,15 @@ test_ .m fixed tests for the interpreter - fntests.m script to run function tests embedded in C++ and .m - files + fntests.m script to run function tests embedded in C++ and + .m files ---- John W. Eaton jwe@octave.org +Last updated: Fri, 4 Oct 2013 16:58:52 PDT -Last updated: Wed, 15 May 2013 03:02:45 EDT ################################################################################
--- a/libgui/languages/be_BY.ts +++ b/libgui/languages/be_BY.ts @@ -41,6 +41,645 @@ <source>persistent</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../qterminal/libqterminal/QTerminal.cc" line="+64"/> + <source>foreground</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>background</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>selection</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>cursor</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>QTerminal</name> + <message> + <location filename="../qterminal/libqterminal/QTerminal.h" line="+116"/> + <source>Copy</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+4"/> + <source>Paste</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+4"/> + <source>Clear All</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>QWinTerminalImpl</name> + <message> + <location filename="../qterminal/libqterminal/win32/QWinTerminalImpl.cpp" line="+1527"/> + <source>copied selection to clipboard</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>QsciLexerBatch</name> + <message> + <location filename="../../../qsci/qscilexerbatch.cpp" line="+179"/> + <source>Default</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> + <source>Comment</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> + <source>Keyword</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> + <source>Label</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> + <source>Hide command character</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> + <source>External command</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> + <source>Variable</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> + <source>Operator</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>QsciLexerCPP</name> + <message> + <location filename="../../../qsci/qscilexercpp.cpp" line="+352"/> + <source>Default</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> + <source>Inactive default</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> + <source>C comment</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> + <source>Inactive C comment</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> + <source>C++ comment</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> + <source>Inactive C++ comment</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> + <source>JavaDoc style C comment</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> + <source>Inactive JavaDoc style C comment</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> + <source>Number</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> + <source>Inactive number</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> + <source>Keyword</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> + <source>Inactive keyword</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> + <source>Double-quoted string</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> + <source>Inactive double-quoted string</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> + <source>Single-quoted string</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> + <source>Inactive single-quoted string</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> + <source>IDL UUID</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> + <source>Inactive IDL UUID</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> + <source>Pre-processor block</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> + <source>Inactive pre-processor block</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> + <source>Operator</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> + <source>Inactive operator</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> + <source>Identifier</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> + <source>Inactive identifier</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> + <source>Unclosed string</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> + <source>Inactive unclosed string</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> + <source>C# verbatim string</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> + <source>Inactive C# verbatim string</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> + <source>JavaScript regular expression</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> + <source>Inactive JavaScript regular expression</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> + <source>JavaDoc style C++ comment</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> + <source>Inactive JavaDoc style C++ comment</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> + <source>Secondary keywords and identifiers</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> + <source>Inactive secondary keywords and identifiers</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> + <source>JavaDoc keyword</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> + <source>Inactive JavaDoc keyword</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> + <source>JavaDoc keyword error</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> + <source>Inactive JavaDoc keyword error</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> + <source>Global classes and typedefs</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> + <source>Inactive global classes and typedefs</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> + <source>C++ raw string</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> + <source>Inactive C++ raw string</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>QsciLexerDiff</name> + <message> + <location filename="../../../qsci/qscilexerdiff.cpp" line="+107"/> + <source>Default</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> + <source>Comment</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> + <source>Command</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> + <source>Header</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> + <source>Position</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> + <source>Removed line</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> + <source>Added line</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> + <source>Changed line</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>QsciLexerMatlab</name> + <message> + <location filename="../../../qsci/qscilexermatlab.cpp" line="+138"/> + <source>Default</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> + <source>Comment</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> + <source>Command</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> + <source>Number</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> + <source>Keyword</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> + <source>Single-quoted string</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> + <source>Operator</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> + <source>Identifier</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> + <source>Double-quoted string</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>QsciLexerPerl</name> + <message> + <location filename="../../../qsci/qscilexerperl.cpp" line="+333"/> + <source>Default</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> + <source>Error</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> + <source>Comment</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> + <source>POD</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> + <source>Number</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> + <source>Keyword</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> + <source>Double-quoted string</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> + <source>Single-quoted string</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> + <source>Operator</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> + <source>Identifier</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> + <source>Scalar</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> + <source>Array</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> + <source>Hash</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> + <source>Symbol table</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> + <source>Regular expression</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> + <source>Substitution</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> + <source>Backticks</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> + <source>Data section</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> + <source>Here document delimiter</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> + <source>Single-quoted here document</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> + <source>Double-quoted here document</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> + <source>Backtick here document</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> + <source>Quoted string (q)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> + <source>Quoted string (qq)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> + <source>Quoted string (qx)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> + <source>Quoted string (qr)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> + <source>Quoted string (qw)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> + <source>POD verbatim</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> + <source>Subroutine prototype</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> + <source>Format identifier</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> + <source>Format body</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> + <source>Double-quoted string (interpolated variable)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> + <source>Translation</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> + <source>Regular expression (interpolated variable)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> + <source>Substitution (interpolated variable)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> + <source>Backticks (interpolated variable)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> + <source>Double-quoted here document (interpolated variable)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> + <source>Backtick here document (interpolated variable)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> + <source>Quoted string (qq, interpolated variable)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> + <source>Quoted string (qx, interpolated variable)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> + <source>Quoted string (qr, interpolated variable)</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>QsciScintilla</name> + <message> + <location filename="../../../qsci/qsciscintilla.cpp" line="+4201"/> + <source>&Undo</source> + <translation type="unfinished">&Адрабіць</translation> + </message> + <message> + <location line="+4"/> + <source>&Redo</source> + <translation type="unfinished">&Паўтарыць</translation> + </message> + <message> + <location line="+6"/> + <source>Cu&t</source> + <translation type="unfinished">Вы&разаць</translation> + </message> + <message> + <location line="+5"/> + <source>&Copy</source> + <translation type="unfinished">&Капіяваць</translation> + </message> + <message> + <location line="+6"/> + <source>&Paste</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+4"/> + <source>Delete</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+7"/> + <source>Select All</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>documentation_dock_widget</name> @@ -58,19 +697,19 @@ <context> <name>file_editor</name> <message> - <location filename="../src/m-editor/file-editor.cc" line="+294"/> + <location filename="../src/m-editor/file-editor.cc" line="+300"/> <location line="+49"/> <location line="+28"/> <source>Octave Editor</source> <translation type="unfinished"></translation> </message> <message> - <location line="-193"/> + <location line="-199"/> <source>Octave Files (*.m);;All Files (*)</source> <translation type="unfinished"></translation> </message> <message> - <location line="+117"/> + <location line="+123"/> <source>Could not open file %1 for read: %2.</source> <translation type="unfinished"></translation> @@ -93,7 +732,7 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+159"/> + <location line="+160"/> <source>&New File</source> <translation type="unfinished">&Новы файл</translation> </message> @@ -108,12 +747,12 @@ <translation type="unfinished">&Захаваць файл</translation> </message> <message> - <location line="+4"/> + <location line="+3"/> <source>Save File &As</source> <translation type="unfinished">Захаваць файл &як</translation> </message> <message> - <location line="+4"/> + <location line="+3"/> <source>Print</source> <translation type="unfinished"></translation> </message> @@ -143,17 +782,17 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+3"/> + <location line="+2"/> <source>&Next Bookmark</source> <translation type="unfinished">&Наступная закладка</translation> </message> <message> - <location line="+3"/> + <location line="+2"/> <source>Pre&vious Bookmark</source> <translation type="unfinished">Па&пярэдняя закладка</translation> </message> <message> - <location line="+3"/> + <location line="+2"/> <source>Toggle &Bookmark</source> <translation type="unfinished">&Паставіць/прыбраць закладку</translation> </message> @@ -193,27 +832,27 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+73"/> + <location line="+63"/> <source>&Recent Editor Files</source> <translation type="unfinished"></translation> </message> <message> - <location line="+15"/> + <location line="+16"/> <source>&Close</source> <translation type="unfinished"></translation> </message> <message> + <location line="+4"/> + <source>Close All</source> + <translation type="unfinished"></translation> + </message> + <message> <location line="+5"/> - <source>Close All</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+4"/> <source>Close Other Files</source> <translation type="unfinished"></translation> </message> <message> - <location line="-94"/> + <location line="-85"/> <source>&Find and Replace</source> <translation type="unfinished"></translation> </message> @@ -228,12 +867,12 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+63"/> + <location line="+53"/> <source>&File</source> <translation type="unfinished">&Файл</translation> </message> <message> - <location line="+35"/> + <location line="+36"/> <source>&Edit</source> <translation type="unfinished">&Змяніць</translation> </message> @@ -278,14 +917,14 @@ <message> <location line="+4"/> <location line="+114"/> - <location line="+104"/> + <location line="+109"/> <location line="+66"/> <location line="+22"/> <source>Octave Editor</source> <translation type="unfinished"></translation> </message> <message> - <location line="-305"/> + <location line="-310"/> <source>The file %1 is about to be closed but has been modified. @@ -293,7 +932,7 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+184"/> + <location line="+189"/> <source>Octave Files (*.m);;All Files (*)</source> <translation type="unfinished"></translation> </message> @@ -319,13 +958,13 @@ <translation type="unfinished"></translation> </message> <message> - <location line="-192"/> + <location line="-197"/> <source>Could not open file %1 for write: %2.</source> <translation type="unfinished"></translation> </message> <message> - <location line="+170"/> + <location line="+175"/> <source>It seems that '%1' has been modified by another application. Do you want to reload it?</source> <translation type="unfinished"></translation> </message> @@ -475,7 +1114,7 @@ </message> <message> <location line="-10"/> - <source>Are you sre you want to delete + <source>Are you sure you want to delete </source> <translation type="unfinished"></translation> </message> @@ -485,12 +1124,12 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+128"/> + <location line="+131"/> <source>Set directory of file browser</source> <translation type="unfinished"></translation> </message> <message> - <location line="+27"/> + <location line="+28"/> <source>Create File</source> <translation type="unfinished"></translation> </message> @@ -585,7 +1224,7 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+61"/> + <location line="+71"/> <source>Search from end</source> <translation type="unfinished"></translation> </message> @@ -708,12 +1347,12 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+10"/> + <location line="+11"/> <source>Search results</source> <translation type="unfinished"></translation> </message> <message> - <location line="+10"/> + <location line="+14"/> <source>Idle.</source> <translation type="unfinished"></translation> </message> @@ -748,7 +1387,7 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+100"/> + <location line="+99"/> <source>Searching...</source> <translation type="unfinished"></translation> </message> @@ -761,7 +1400,7 @@ <context> <name>find_files_model</name> <message> - <location filename="../src/find-files-model.cc" line="+29"/> + <location filename="../src/find-files-model.cc" line="+76"/> <source>Filename</source> <translation type="unfinished"></translation> </message> @@ -774,7 +1413,7 @@ <context> <name>history_dock_widget</name> <message> - <location filename="../src/history-dock-widget.cc" line="+42"/> + <location filename="../src/history-dock-widget.cc" line="+43"/> <source>Browse and search the command history.</source> <translation type="unfinished">Агляд і пошук па гісторыі загадаў.</translation> </message> @@ -812,23 +1451,23 @@ <context> <name>main_window</name> <message> - <location filename="../src/main-window.cc" line="+155"/> + <location filename="../src/main-window.cc" line="+160"/> <source>Load Workspace</source> <translation type="unfinished">Загрузіць прастору зменных</translation> </message> <message> - <location line="+355"/> - <location line="+769"/> + <location line="+388"/> + <location line="+835"/> <source>About Octave</source> <translation type="unfinished">Пра Octave</translation> </message> <message> - <location line="-338"/> + <location line="-354"/> <source>&File</source> <translation type="unfinished">&Файл</translation> </message> <message> - <location line="+52"/> + <location line="+54"/> <source>New</source> <translation type="unfinished"></translation> </message> @@ -838,7 +1477,7 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+2"/> + <location line="+3"/> <source>Function</source> <translation type="unfinished"></translation> </message> @@ -848,12 +1487,12 @@ <translation type="unfinished"></translation> </message> <message> - <location line="-55"/> + <location line="-58"/> <source>Open...</source> <translation type="unfinished"></translation> </message> <message> - <location line="+18"/> + <location line="+20"/> <source>Preferences...</source> <translation type="unfinished"></translation> </message> @@ -863,7 +1502,7 @@ <translation type="unfinished">Выйсці</translation> </message> <message> - <location line="+51"/> + <location line="+52"/> <source>&Edit</source> <translation type="unfinished">&Змяніць</translation> </message> @@ -878,28 +1517,33 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+5"/> + <location line="+6"/> <source>Paste</source> <translation type="unfinished"></translation> </message> <message> - <location line="-895"/> - <location line="+817"/> + <location line="-982"/> + <location line="+902"/> <source>Save Workspace As</source> <translation type="unfinished"></translation> </message> <message> - <location line="-602"/> + <location line="-655"/> <source>Set working directory</source> <translation type="unfinished"></translation> </message> <message> - <location line="+686"/> + <location line="+739"/> + <source>Clear Clipboard</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+5"/> <source>Find Files...</source> <translation type="unfinished"></translation> </message> <message> - <location line="+6"/> + <location line="+5"/> <source>Clear Command Window</source> <translation type="unfinished"></translation> </message> @@ -914,7 +1558,7 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+36"/> + <location line="+40"/> <source>De&bug</source> <translation type="unfinished"></translation> </message> @@ -959,7 +1603,27 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+106"/> + <location line="+77"/> + <source>Octave Packages</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> + <source>Share Code</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> + <source>Contribute to Octave</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> + <source>Octave Developer Resources</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+32"/> <source>On Disk</source> <translation type="unfinished"></translation> </message> @@ -989,12 +1653,12 @@ <translation type="unfinished"></translation> </message> <message> - <location line="-392"/> + <location line="-412"/> <source>Load workspace</source> <translation type="unfinished"></translation> </message> <message> - <location line="+192"/> + <location line="+200"/> <source>&Window</source> <translation type="unfinished"></translation> </message> @@ -1045,12 +1709,12 @@ </message> <message> <location line="+3"/> - <location line="+108"/> + <location line="+120"/> <source>Documentation</source> <translation type="unfinished">Дакументацыя</translation> </message> <message> - <location line="-36"/> + <location line="-48"/> <source>&Help</source> <translation type="unfinished"></translation> </message> @@ -1059,39 +1723,25 @@ <source>Report Bug</source> <translation type="unfinished">Паведаміць пра хібу</translation> </message> - <message> - <location line="+6"/> - <source>Visit Agora</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="-3"/> - <source>Visit Octave Forge</source> - <translation type="unfinished"></translation> - </message> </context> <context> <name>octave_dock_widget</name> <message> <location filename="../src/octave-dock-widget.cc" line="+52"/> + <location line="+129"/> <source>Undock widget</source> <translation type="unfinished"></translation> </message> <message> - <location line="+9"/> + <location line="-119"/> <source>Hide widget</source> <translation type="unfinished"></translation> </message> <message> - <location line="+82"/> + <location line="+86"/> <source>Dock widget</source> <translation type="unfinished"></translation> </message> - <message> - <location line="+29"/> - <source>Unock widget</source> - <translation type="unfinished"></translation> - </message> </context> <context> <name>octave_qscintilla</name> @@ -1157,12 +1807,7 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+7"/> - <source>Graphic icons</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+39"/> + <location line="+46"/> <source>Editor</source> <translation type="unfinished">Рэдактар</translation> </message> @@ -1272,12 +1917,12 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+46"/> + <location line="+45"/> <source>Font</source> <translation type="unfinished"></translation> </message> <message> - <location line="-745"/> + <location line="-744"/> <source>Show line numbers</source> <translation type="unfinished"></translation> </message> @@ -1297,7 +1942,12 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+548"/> + <location line="-72"/> + <source>Graphic icons</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+620"/> <source>emacs</source> <translation type="unfinished">emacs</translation> </message> @@ -1317,7 +1967,7 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+102"/> + <location line="+101"/> <source>Font size</source> <translation type="unfinished"></translation> </message> @@ -1387,7 +2037,7 @@ <translation type="unfinished">HttpProxy</translation> </message> <message> - <location line="-1108"/> + <location line="-1107"/> <source>Icon set for dock widgets</source> <translation type="unfinished"></translation> </message> @@ -1402,7 +2052,7 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+1099"/> + <location line="+1098"/> <source>Socks5Proxy</source> <translation type="unfinished">Socks5Proxy</translation> </message> @@ -1434,8 +2084,23 @@ <translation type="unfinished"></translation> </message> <message> - <location line="-137"/> - <source>Difference to the defalt size</source> + <location line="-268"/> + <source>IBeam Cursor</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>Block Cursor</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>Underline Cursor</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+129"/> + <source>Difference to the default size</source> <translation type="unfinished"></translation> </message> <message> @@ -1470,7 +2135,7 @@ <context> <name>webinfo</name> <message> - <location filename="../src/qtinfo/webinfo.cc" line="+78"/> + <location filename="../src/qtinfo/webinfo.cc" line="+80"/> <source>Type here and press 'Return' to search</source> <translation type="unfinished"></translation> </message> @@ -1483,48 +2148,38 @@ <context> <name>welcome_wizard</name> <message> - <location filename="../src/welcome-wizard.ui" line="+26"/> + <location filename="../src/welcome-wizard.ui" line="+29"/> <source>Welcome to GNU Octave</source> <translation type="unfinished"></translation> </message> <message> - <location line="+13"/> - <source>It appears that you have launched Octave GUI for the first time on this computer, since no configuration file could be found at '~/.octave-gui'. This wizard will guide you through the essential settings you should make before you can start using Octave GUI. If you want to transfer your settings you have previously made just close this dialog and copy over the settings file to your home folder. The presence of that file will automatically be detected and will skip this wizard. IMPORTANT: This wizard is not fully functional yet. Just click your way to the end and it will create a standard settings file.</source> + <location line="+20"/> + <source>You seem to be using the Octave graphical interface for the first time on this computer. Click 'Finish' to write a configuration file and launch Octave GUI. </source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+10"/> + <source>The configuration file is stored in __%1__. If that file exists, you will not see this dialog when Octave starts again.</source> <translation type="unfinished"></translation> </message> <message> - <location line="+41"/> - <location line="+50"/> - <location line="+52"/> - <location line="+52"/> - <source>Next</source> + <location line="+10"/> + <source><html><head/><body><p>For more information about Octave,</p> +<ul> +<li>visit <a href="http://octave.org"><span style=" text-decoration: underline; color:#0000ff;">http://octave.org</span></a>,</li> +<li> get the documentation online as <a href="http://www.gnu.org/software/octave/doc/interpreter/index.html"><span style=" text-decoration: underline; color:#0000ff;">html</span></a>- or <a href="http://www.gnu.org/software/octave/octave.pdf"><span style=" text-decoration: underline; color:#0000ff;">pdf</span></a>-document, or</li> +<li>open the documentation browser of Octave GUI with the help menu.</li> +</ul> +</body></html></source> <translation type="unfinished"></translation> </message> <message> - <location line="-124"/> - <location line="+52"/> - <location line="+52"/> - <location line="+87"/> - <source>Previous</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="-45"/> + <location line="-27"/> <source>Welcome to Octave!</source> <translation type="unfinished"></translation> </message> <message> - <location line="+7"/> - <source>This is the development version of Octave with the first official GUI.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+10"/> - <source>You seem to run Octave GUI for the first time on this computer. This assistant will help you to configure this software installation. Click 'Finish' to write a configuration file and launch Octave GUI.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+48"/> + <location line="+74"/> <source>Finish</source> <translation type="unfinished"></translation> </message>
--- a/libgui/languages/de_DE.ts +++ b/libgui/languages/de_DE.ts @@ -876,13 +876,13 @@ <translation>Lade Arbeitsumgebung</translation> </message> <message> - <location line="+375"/> - <location line="+828"/> + <location line="+388"/> + <location line="+835"/> <source>About Octave</source> <translation>Über Octave</translation> </message> <message> - <location line="-348"/> + <location line="-354"/> <source>&File</source> <translation>&Datei</translation> </message> @@ -942,18 +942,18 @@ <translation>Einfügen</translation> </message> <message> - <location line="-968"/> - <location line="+888"/> + <location line="-982"/> + <location line="+902"/> <source>Save Workspace As</source> <translation>Arbeitsumgebung speichern als</translation> </message> <message> - <location line="-653"/> + <location line="-655"/> <source>Set working directory</source> <translation>Arbeitsverzeichnis setzen</translation> </message> <message> - <location line="+737"/> + <location line="+739"/> <source>Clear Clipboard</source> <translation>Zwischenablage leeren</translation> </message> @@ -1023,7 +1023,27 @@ <translation>Fensterlayout auf Grundeinstellung zurücksetzen</translation> </message> <message> - <location line="+106"/> + <location line="+77"/> + <source>Octave Packages</source> + <translation>Octave Pakete</translation> + </message> + <message> + <location line="+3"/> + <source>Share Code</source> + <translation>Code teilen</translation> + </message> + <message> + <location line="+3"/> + <source>Contribute to Octave</source> + <translation>Bei Octave mitwirken</translation> + </message> + <message> + <location line="+3"/> + <source>Octave Developer Resources</source> + <translation>Ressourcen für Octave Entwickler</translation> + </message> + <message> + <location line="+32"/> <source>On Disk</source> <translation>Auf der Festplatte</translation> </message> @@ -1053,7 +1073,7 @@ <translation>Verzeichnis suchen</translation> </message> <message> - <location line="-400"/> + <location line="-412"/> <source>Load workspace</source> <translation>Arbeitsumgebung laden</translation> </message> @@ -1109,12 +1129,12 @@ </message> <message> <location line="+3"/> - <location line="+108"/> + <location line="+120"/> <source>Documentation</source> <translation>Dokumentation</translation> </message> <message> - <location line="-36"/> + <location line="-48"/> <source>&Help</source> <translation>&Hilfe</translation> </message> @@ -1123,16 +1143,6 @@ <source>Report Bug</source> <translation>Fehler melden</translation> </message> - <message> - <location line="+6"/> - <source>Visit Agora</source> - <translation>Agora Webseite</translation> - </message> - <message> - <location line="-3"/> - <source>Visit Octave Forge</source> - <translation>Octave Forge Webseite</translation> - </message> </context> <context> <name>octave_dock_widget</name> @@ -1558,52 +1568,44 @@ <context> <name>welcome_wizard</name> <message> - <location filename="../src/welcome-wizard.ui" line="+26"/> + <location filename="../src/welcome-wizard.ui" line="+29"/> <source>Welcome to GNU Octave</source> <translation>Willkommen zu GNU Octave</translation> </message> <message> - <location line="+13"/> - <source>It appears that you have launched Octave GUI for the first time on this computer, since no configuration file could be found at '~/.octave-gui'. This wizard will guide you through the essential settings you should make before you can start using Octave GUI. If you want to transfer your settings you have previously made just close this dialog and copy over the settings file to your home folder. The presence of that file will automatically be detected and will skip this wizard. IMPORTANT: This wizard is not fully functional yet. Just click your way to the end and it will create a standard settings file.</source> - <translation>Es scheint, dass Sie Octave-GUI das erste Mal auf diesem Computer ausführen, da die Konfigurationsdatei -~/.config/octave/qt-settings -nicht gefunden wurde. Die Standard-Konfiguration wird beim Fortfahren an diese Stelle kopiert. Wenn bestehende Einstellungen verwendet werden sollen, muss dieser Dialog geschlossen und die vorhandene Datei an die oben angegebene Stelle kopiert werden. Eine vorhandene Konfigurationsdatei wird beim nächsten Start automatisch erkannt. - -Nach dem Programmstart können die Einstellungen im Menü "Datei/Einstellungen" angepasst werden.</translation> + <location line="+20"/> + <source>You seem to be using the Octave graphical interface for the first time on this computer. Click 'Finish' to write a configuration file and launch Octave GUI. </source> + <translation>Die grafische Nutzerschnittstelle von Octave wird offenbar das erste Mal gestartet. Ein Klick auf 'Beenden' erstellt eine Standard-Konfigurationsdatei und startet Octave GUI.</translation> + </message> + <message> + <location line="+10"/> + <source>The configuration file is stored in __%1__. If that file exists, you will not see this dialog when Octave starts again.</source> + <translation>Die Konfigurationsdatei wid in __%1__ gespeichert. Wenn diese Datei existiert, erscheint dieser Dialog beim nächsten Start von Octave nicht mehr.</translation> </message> <message> - <location line="+41"/> - <location line="+50"/> - <location line="+52"/> - <location line="+52"/> - <source>Next</source> - <translation>Weiter</translation> + <location line="+10"/> + <source><html><head/><body><p>For more information about Octave,</p> +<ul> +<li>visit <a href="http://octave.org"><span style=" text-decoration: underline; color:#0000ff;">http://octave.org</span></a>,</li> +<li> get the documentation online as <a href="http://www.gnu.org/software/octave/doc/interpreter/index.html"><span style=" text-decoration: underline; color:#0000ff;">html</span></a>- or <a href="http://www.gnu.org/software/octave/octave.pdf"><span style=" text-decoration: underline; color:#0000ff;">pdf</span></a>-document, or</li> +<li>open the documentation browser of Octave GUI with the help menu.</li> +</ul> +</body></html></source> + <translation><html><head/><body><p>Weitere Informationsquellen zu Octave:</p> +<ul> +<li>Homepage <a href="http://octave.org"><span style=" text-decoration: underline; color:#0000ff;">http://octave.org</span></a>,</li> +<li> Online-Dokumentation als <a href="http://www.gnu.org/software/octave/doc/interpreter/index.html"><span style=" text-decoration: underline; color:#0000ff;">html</span></a>- oder <a href="http://www.gnu.org/software/octave/octave.pdf"><span style=" text-decoration: underline; color:#0000ff;">pdf</span></a>-Dokument</li> +<li>Dokumentations-Browser von Octave GUI im Hilfe-Menü</li> +</ul> +</body></html></translation> </message> <message> - <location line="-124"/> - <location line="+52"/> - <location line="+52"/> - <location line="+87"/> - <source>Previous</source> - <translation>Zurück</translation> - </message> - <message> - <location line="-45"/> + <location line="-27"/> <source>Welcome to Octave!</source> <translation>Willkommen zu Octave!</translation> </message> <message> - <location line="+7"/> - <source>This is the development version of Octave with the first official GUI.</source> - <translation>Dies ist die Entwicklungsversion von Octave mit der ersten offiziellen GUI.</translation> - </message> - <message> - <location line="+10"/> - <source>You seem to run Octave GUI for the first time on this computer. This assistant will help you to configure this software installation. Click 'Finish' to write a configuration file and launch Octave GUI.</source> - <translation>Die Octave GUI wird offenbar erstmals auf diesem Computer ausgeführt. Dieser Assistent erstellt beim Klick auf 'Beenden' eine Standardkonfiguration und startet die Octave GUI.</translation> - </message> - <message> - <location line="+48"/> + <location line="+74"/> <source>Finish</source> <translation>Beenden</translation> </message>
--- a/libgui/languages/en_US.ts +++ b/libgui/languages/en_US.ts @@ -41,6 +41,52 @@ <source>persistent</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../qterminal/libqterminal/QTerminal.cc" line="+64"/> + <source>foreground</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>background</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>selection</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>cursor</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>QTerminal</name> + <message> + <location filename="../qterminal/libqterminal/QTerminal.h" line="+116"/> + <source>Copy</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+4"/> + <source>Paste</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+4"/> + <source>Clear All</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>QWinTerminalImpl</name> + <message> + <location filename="../qterminal/libqterminal/win32/QWinTerminalImpl.cpp" line="+1527"/> + <source>copied selection to clipboard</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>documentation_dock_widget</name> @@ -58,19 +104,19 @@ <context> <name>file_editor</name> <message> - <location filename="../src/m-editor/file-editor.cc" line="+294"/> + <location filename="../src/m-editor/file-editor.cc" line="+300"/> <location line="+49"/> <location line="+28"/> <source>Octave Editor</source> <translation type="unfinished"></translation> </message> <message> - <location line="-193"/> + <location line="-199"/> <source>Octave Files (*.m);;All Files (*)</source> <translation type="unfinished"></translation> </message> <message> - <location line="+117"/> + <location line="+123"/> <source>Could not open file %1 for read: %2.</source> <translation type="unfinished"></translation> @@ -93,7 +139,7 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+159"/> + <location line="+160"/> <source>&New File</source> <translation type="unfinished"></translation> </message> @@ -108,12 +154,12 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+4"/> + <location line="+3"/> <source>Save File &As</source> <translation type="unfinished"></translation> </message> <message> - <location line="+4"/> + <location line="+3"/> <source>Print</source> <translation type="unfinished"></translation> </message> @@ -143,17 +189,17 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+3"/> + <location line="+2"/> <source>&Next Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location line="+3"/> + <location line="+2"/> <source>Pre&vious Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location line="+3"/> + <location line="+2"/> <source>Toggle &Bookmark</source> <translation type="unfinished"></translation> </message> @@ -193,27 +239,27 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+73"/> + <location line="+63"/> <source>&Recent Editor Files</source> <translation type="unfinished"></translation> </message> <message> - <location line="+15"/> + <location line="+16"/> <source>&Close</source> <translation type="unfinished"></translation> </message> <message> + <location line="+4"/> + <source>Close All</source> + <translation type="unfinished"></translation> + </message> + <message> <location line="+5"/> - <source>Close All</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+4"/> <source>Close Other Files</source> <translation type="unfinished"></translation> </message> <message> - <location line="-94"/> + <location line="-85"/> <source>&Find and Replace</source> <translation type="unfinished"></translation> </message> @@ -228,12 +274,12 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+63"/> + <location line="+53"/> <source>&File</source> <translation type="unfinished"></translation> </message> <message> - <location line="+35"/> + <location line="+36"/> <source>&Edit</source> <translation type="unfinished"></translation> </message> @@ -278,14 +324,14 @@ <message> <location line="+4"/> <location line="+114"/> - <location line="+104"/> + <location line="+109"/> <location line="+66"/> <location line="+22"/> <source>Octave Editor</source> <translation type="unfinished"></translation> </message> <message> - <location line="-305"/> + <location line="-310"/> <source>The file %1 is about to be closed but has been modified. @@ -293,7 +339,7 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+184"/> + <location line="+189"/> <source>Octave Files (*.m);;All Files (*)</source> <translation type="unfinished"></translation> </message> @@ -319,13 +365,13 @@ <translation type="unfinished"></translation> </message> <message> - <location line="-192"/> + <location line="-197"/> <source>Could not open file %1 for write: %2.</source> <translation type="unfinished"></translation> </message> <message> - <location line="+170"/> + <location line="+175"/> <source>It seems that '%1' has been modified by another application. Do you want to reload it?</source> <translation type="unfinished"></translation> </message> @@ -475,7 +521,7 @@ </message> <message> <location line="-10"/> - <source>Are you sre you want to delete + <source>Are you sure you want to delete </source> <translation type="unfinished"></translation> </message> @@ -485,12 +531,12 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+128"/> + <location line="+131"/> <source>Set directory of file browser</source> <translation type="unfinished"></translation> </message> <message> - <location line="+27"/> + <location line="+28"/> <source>Create File</source> <translation type="unfinished"></translation> </message> @@ -585,7 +631,7 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+61"/> + <location line="+71"/> <source>Search from end</source> <translation type="unfinished"></translation> </message> @@ -708,12 +754,12 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+10"/> + <location line="+11"/> <source>Search results</source> <translation type="unfinished"></translation> </message> <message> - <location line="+10"/> + <location line="+14"/> <source>Idle.</source> <translation type="unfinished"></translation> </message> @@ -748,7 +794,7 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+100"/> + <location line="+99"/> <source>Searching...</source> <translation type="unfinished"></translation> </message> @@ -761,7 +807,7 @@ <context> <name>find_files_model</name> <message> - <location filename="../src/find-files-model.cc" line="+29"/> + <location filename="../src/find-files-model.cc" line="+76"/> <source>Filename</source> <translation type="unfinished"></translation> </message> @@ -774,7 +820,7 @@ <context> <name>history_dock_widget</name> <message> - <location filename="../src/history-dock-widget.cc" line="+42"/> + <location filename="../src/history-dock-widget.cc" line="+43"/> <source>Browse and search the command history.</source> <translation type="unfinished"></translation> </message> @@ -812,23 +858,23 @@ <context> <name>main_window</name> <message> - <location filename="../src/main-window.cc" line="+155"/> + <location filename="../src/main-window.cc" line="+160"/> <source>Load Workspace</source> <translation type="unfinished"></translation> </message> <message> - <location line="+355"/> - <location line="+769"/> + <location line="+388"/> + <location line="+835"/> <source>About Octave</source> <translation type="unfinished"></translation> </message> <message> - <location line="-338"/> + <location line="-354"/> <source>&File</source> <translation type="unfinished"></translation> </message> <message> - <location line="+52"/> + <location line="+54"/> <source>New</source> <translation type="unfinished"></translation> </message> @@ -838,7 +884,7 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+2"/> + <location line="+3"/> <source>Function</source> <translation type="unfinished"></translation> </message> @@ -848,12 +894,12 @@ <translation type="unfinished"></translation> </message> <message> - <location line="-55"/> + <location line="-58"/> <source>Open...</source> <translation type="unfinished"></translation> </message> <message> - <location line="+18"/> + <location line="+20"/> <source>Preferences...</source> <translation type="unfinished"></translation> </message> @@ -863,7 +909,7 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+51"/> + <location line="+52"/> <source>&Edit</source> <translation type="unfinished"></translation> </message> @@ -878,28 +924,33 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+5"/> + <location line="+6"/> <source>Paste</source> <translation type="unfinished"></translation> </message> <message> - <location line="-895"/> - <location line="+817"/> + <location line="-982"/> + <location line="+902"/> <source>Save Workspace As</source> <translation type="unfinished"></translation> </message> <message> - <location line="-602"/> + <location line="-655"/> <source>Set working directory</source> <translation type="unfinished"></translation> </message> <message> - <location line="+686"/> + <location line="+739"/> + <source>Clear Clipboard</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+5"/> <source>Find Files...</source> <translation type="unfinished"></translation> </message> <message> - <location line="+6"/> + <location line="+5"/> <source>Clear Command Window</source> <translation type="unfinished"></translation> </message> @@ -914,7 +965,7 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+36"/> + <location line="+40"/> <source>De&bug</source> <translation type="unfinished"></translation> </message> @@ -959,7 +1010,27 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+106"/> + <location line="+77"/> + <source>Octave Packages</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> + <source>Share Code</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> + <source>Contribute to Octave</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> + <source>Octave Developer Resources</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+32"/> <source>On Disk</source> <translation type="unfinished"></translation> </message> @@ -989,12 +1060,12 @@ <translation type="unfinished"></translation> </message> <message> - <location line="-392"/> + <location line="-412"/> <source>Load workspace</source> <translation type="unfinished"></translation> </message> <message> - <location line="+192"/> + <location line="+200"/> <source>&Window</source> <translation type="unfinished"></translation> </message> @@ -1045,12 +1116,12 @@ </message> <message> <location line="+3"/> - <location line="+108"/> + <location line="+120"/> <source>Documentation</source> <translation type="unfinished"></translation> </message> <message> - <location line="-36"/> + <location line="-48"/> <source>&Help</source> <translation type="unfinished"></translation> </message> @@ -1059,39 +1130,25 @@ <source>Report Bug</source> <translation type="unfinished"></translation> </message> - <message> - <location line="+6"/> - <source>Visit Agora</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="-3"/> - <source>Visit Octave Forge</source> - <translation type="unfinished"></translation> - </message> </context> <context> <name>octave_dock_widget</name> <message> <location filename="../src/octave-dock-widget.cc" line="+52"/> + <location line="+129"/> <source>Undock widget</source> <translation type="unfinished"></translation> </message> <message> - <location line="+9"/> + <location line="-119"/> <source>Hide widget</source> <translation type="unfinished"></translation> </message> <message> - <location line="+82"/> + <location line="+86"/> <source>Dock widget</source> <translation type="unfinished"></translation> </message> - <message> - <location line="+29"/> - <source>Unock widget</source> - <translation type="unfinished"></translation> - </message> </context> <context> <name>octave_qscintilla</name> @@ -1157,12 +1214,7 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+7"/> - <source>Graphic icons</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+39"/> + <location line="+46"/> <source>Editor</source> <translation type="unfinished"></translation> </message> @@ -1272,12 +1324,12 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+46"/> + <location line="+45"/> <source>Font</source> <translation type="unfinished"></translation> </message> <message> - <location line="-745"/> + <location line="-744"/> <source>Show line numbers</source> <translation type="unfinished"></translation> </message> @@ -1297,7 +1349,12 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+548"/> + <location line="-72"/> + <source>Graphic icons</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+620"/> <source>emacs</source> <translation type="unfinished"></translation> </message> @@ -1317,7 +1374,7 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+102"/> + <location line="+101"/> <source>Font size</source> <translation type="unfinished"></translation> </message> @@ -1387,7 +1444,7 @@ <translation type="unfinished"></translation> </message> <message> - <location line="-1108"/> + <location line="-1107"/> <source>Icon set for dock widgets</source> <translation type="unfinished"></translation> </message> @@ -1402,7 +1459,7 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+1099"/> + <location line="+1098"/> <source>Socks5Proxy</source> <translation type="unfinished"></translation> </message> @@ -1434,8 +1491,23 @@ <translation type="unfinished"></translation> </message> <message> - <location line="-137"/> - <source>Difference to the defalt size</source> + <location line="-268"/> + <source>IBeam Cursor</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>Block Cursor</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>Underline Cursor</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+129"/> + <source>Difference to the default size</source> <translation type="unfinished"></translation> </message> <message> @@ -1470,7 +1542,7 @@ <context> <name>webinfo</name> <message> - <location filename="../src/qtinfo/webinfo.cc" line="+78"/> + <location filename="../src/qtinfo/webinfo.cc" line="+80"/> <source>Type here and press 'Return' to search</source> <translation type="unfinished"></translation> </message> @@ -1483,48 +1555,38 @@ <context> <name>welcome_wizard</name> <message> - <location filename="../src/welcome-wizard.ui" line="+26"/> + <location filename="../src/welcome-wizard.ui" line="+29"/> <source>Welcome to GNU Octave</source> <translation type="unfinished"></translation> </message> <message> - <location line="+13"/> - <source>It appears that you have launched Octave GUI for the first time on this computer, since no configuration file could be found at '~/.octave-gui'. This wizard will guide you through the essential settings you should make before you can start using Octave GUI. If you want to transfer your settings you have previously made just close this dialog and copy over the settings file to your home folder. The presence of that file will automatically be detected and will skip this wizard. IMPORTANT: This wizard is not fully functional yet. Just click your way to the end and it will create a standard settings file.</source> + <location line="+20"/> + <source>You seem to be using the Octave graphical interface for the first time on this computer. Click 'Finish' to write a configuration file and launch Octave GUI. </source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+10"/> + <source>The configuration file is stored in __%1__. If that file exists, you will not see this dialog when Octave starts again.</source> <translation type="unfinished"></translation> </message> <message> - <location line="+41"/> - <location line="+50"/> - <location line="+52"/> - <location line="+52"/> - <source>Next</source> + <location line="+10"/> + <source><html><head/><body><p>For more information about Octave,</p> +<ul> +<li>visit <a href="http://octave.org"><span style=" text-decoration: underline; color:#0000ff;">http://octave.org</span></a>,</li> +<li> get the documentation online as <a href="http://www.gnu.org/software/octave/doc/interpreter/index.html"><span style=" text-decoration: underline; color:#0000ff;">html</span></a>- or <a href="http://www.gnu.org/software/octave/octave.pdf"><span style=" text-decoration: underline; color:#0000ff;">pdf</span></a>-document, or</li> +<li>open the documentation browser of Octave GUI with the help menu.</li> +</ul> +</body></html></source> <translation type="unfinished"></translation> </message> <message> - <location line="-124"/> - <location line="+52"/> - <location line="+52"/> - <location line="+87"/> - <source>Previous</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="-45"/> + <location line="-27"/> <source>Welcome to Octave!</source> <translation type="unfinished"></translation> </message> <message> - <location line="+7"/> - <source>This is the development version of Octave with the first official GUI.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+10"/> - <source>You seem to run Octave GUI for the first time on this computer. This assistant will help you to configure this software installation. Click 'Finish' to write a configuration file and launch Octave GUI.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+48"/> + <location line="+74"/> <source>Finish</source> <translation type="unfinished"></translation> </message>
--- a/libgui/languages/es_ES.ts +++ b/libgui/languages/es_ES.ts @@ -864,13 +864,13 @@ <translation>Cargar espacio de trabajo</translation> </message> <message> - <location line="+375"/> - <location line="+828"/> + <location line="+388"/> + <location line="+835"/> <source>About Octave</source> <translation>Acerca de Octave</translation> </message> <message> - <location line="-348"/> + <location line="-354"/> <source>&File</source> <translation>&Archivo</translation> </message> @@ -931,18 +931,18 @@ <translation>Pegar</translation> </message> <message> - <location line="-968"/> - <location line="+888"/> + <location line="-982"/> + <location line="+902"/> <source>Save Workspace As</source> <translation>Guardar espacio de trabajo como</translation> </message> <message> - <location line="-653"/> + <location line="-655"/> <source>Set working directory</source> <translation>Fijar directorio de trabajo</translation> </message> <message> - <location line="+737"/> + <location line="+739"/> <source>Clear Clipboard</source> <translation>Limpiar el Portapapeles</translation> </message> @@ -1012,7 +1012,27 @@ <translation>Reestablecer esquema de ventana predeterminado</translation> </message> <message> - <location line="+106"/> + <location line="+77"/> + <source>Octave Packages</source> + <translation>Paquetes de Octave</translation> + </message> + <message> + <location line="+3"/> + <source>Share Code</source> + <translation>Compartir código</translation> + </message> + <message> + <location line="+3"/> + <source>Contribute to Octave</source> + <translation>Contribuir a octave</translation> + </message> + <message> + <location line="+3"/> + <source>Octave Developer Resources</source> + <translation>Recursos para el desarrollador de Octave</translation> + </message> + <message> + <location line="+32"/> <source>On Disk</source> <translation>En disco</translation> </message> @@ -1042,7 +1062,7 @@ <translation>Explorar directorios</translation> </message> <message> - <location line="-400"/> + <location line="-412"/> <source>Load workspace</source> <translation>Cargar espacio de trabajo</translation> </message> @@ -1098,12 +1118,12 @@ </message> <message> <location line="+3"/> - <location line="+108"/> + <location line="+120"/> <source>Documentation</source> <translation>Documentación</translation> </message> <message> - <location line="-36"/> + <location line="-48"/> <source>&Help</source> <translation>&Ayuda</translation> </message> @@ -1112,16 +1132,6 @@ <source>Report Bug</source> <translation>Informar de fallo</translation> </message> - <message> - <location line="+6"/> - <source>Visit Agora</source> - <translation>Visitar Agora</translation> - </message> - <message> - <location line="-3"/> - <source>Visit Octave Forge</source> - <translation>Visitar Octave Forge</translation> - </message> </context> <context> <name>octave_dock_widget</name> @@ -1552,53 +1562,44 @@ <context> <name>welcome_wizard</name> <message> - <location filename="../src/welcome-wizard.ui" line="+26"/> + <location filename="../src/welcome-wizard.ui" line="+29"/> <source>Welcome to GNU Octave</source> <translation>Bienvenido a GNU Octave</translation> </message> <message> - <location line="+13"/> - <source>It appears that you have launched Octave GUI for the first time on this computer, since no configuration file could be found at '~/.octave-gui'. This wizard will guide you through the essential settings you should make before you can start using Octave GUI. If you want to transfer your settings you have previously made just close this dialog and copy over the settings file to your home folder. The presence of that file will automatically be detected and will skip this wizard. IMPORTANT: This wizard is not fully functional yet. Just click your way to the end and it will create a standard settings file.</source> - <translation> Al parecer ha iniciado Octave GUI por primera vez en su - computadora/ordenador, ya que no se ha encontrado un archivo - de configuración en '~/.octave-gui'. Este asistente lo guiará con los ajustes esenciales que - debe hacer antes de empezar a usar Octave GUI. Si desea transferir su configuración hecha con anterioridad - solamente cierre este diálogo y copie el archivo de configuración en su carpeta de inicio. La presencia de dicho archivo de configuración será detectada automáticamente y evitará esta ventana de asistencia. - IMPORTANTE: Este asistente no es completamente funcional aún. Simplemente haga clic de inicio a fin y el asistente creará un archivo de configuración estándar. </translation> + <location line="+20"/> + <source>You seem to be using the Octave graphical interface for the first time on this computer. Click 'Finish' to write a configuration file and launch Octave GUI. </source> + <translation>Al parecer usted utiiza la interfase gráfica de Octave por primera vez en este ordenador. Presione 'Finalizar' para generar un archivo de configuración e iniciar Octave GUI.</translation> + </message> + <message> + <location line="+10"/> + <source>The configuration file is stored in __%1__. If that file exists, you will not see this dialog when Octave starts again.</source> + <translation>La configuración ha sido guardada en __%1__. Si ese archivo existe, usted no verá este diálogo cuando Octave inicie de nuevo.</translation> </message> <message> - <location line="+41"/> - <location line="+50"/> - <location line="+52"/> - <location line="+52"/> - <source>Next</source> - <translation>Siguiente</translation> + <location line="+10"/> + <source><html><head/><body><p>For more information about Octave,</p> +<ul> +<li>visit <a href="http://octave.org"><span style=" text-decoration: underline; color:#0000ff;">http://octave.org</span></a>,</li> +<li> get the documentation online as <a href="http://www.gnu.org/software/octave/doc/interpreter/index.html"><span style=" text-decoration: underline; color:#0000ff;">html</span></a>- or <a href="http://www.gnu.org/software/octave/octave.pdf"><span style=" text-decoration: underline; color:#0000ff;">pdf</span></a>-document, or</li> +<li>open the documentation browser of Octave GUI with the help menu.</li> +</ul> +</body></html></source> + <translation><html><head/><body><p>Para mayor información acerca de Octave,</p> +<ul> +<li>visite <a href="http://octave.org"><span style=" text-decoration: underline; color:#0000ff;">http://octave.org</span></a>,</li> +<li> para obtener la documentación en linea como <a href="http://www.gnu.org/software/octave/doc/interpreter/index.html"><span style=" text-decoration: underline; color:#0000ff;">html</span></a>- o <a href="http://www.gnu.org/software/octave/octave.pdf"><span style=" text-decoration: underline; color:#0000ff;">como documento </span></a>-pdf, o</li> +<li>abrir el navegador de documentación de Octave GUI con el menú de ayuda.</li> +</ul> +</body></html></translation> </message> <message> - <location line="-124"/> - <location line="+52"/> - <location line="+52"/> - <location line="+87"/> - <source>Previous</source> - <translation>Anterior</translation> - </message> - <message> - <location line="-45"/> + <location line="-27"/> <source>Welcome to Octave!</source> <translation>¡Bienvenido a Octave!</translation> </message> <message> - <location line="+7"/> - <source>This is the development version of Octave with the first official GUI.</source> - <translation>Esta es la versión en desarrollo de Octave con su primer GUI oficial.</translation> - </message> - <message> - <location line="+10"/> - <source>You seem to run Octave GUI for the first time on this computer. This assistant will help you to configure this software installation. Click 'Finish' to write a configuration file and launch Octave GUI.</source> - <translation>Parece que ejecuta Octave GUI por primera vez en esta computadora/ordenador. Este asistente le ayudará a configurar la instalación del programa. Presione "Terminar" para escribir un archivo de configuración e iniciar Octave GUI. </translation> - </message> - <message> - <location line="+48"/> + <location line="+74"/> <source>Finish</source> <translation>Terminar</translation> </message>
--- a/libgui/languages/fr_FR.ts +++ b/libgui/languages/fr_FR.ts @@ -83,7 +83,7 @@ <context> <name>QWinTerminalImpl</name> <message> - <location filename="../qterminal/libqterminal/win32/QWinTerminalImpl.cpp" line="+1451"/> + <location filename="../qterminal/libqterminal/win32/QWinTerminalImpl.cpp" line="+1527"/> <source>copied selection to clipboard</source> <translation>sélection copiée vers le presse-papier</translation> </message> @@ -104,19 +104,19 @@ <context> <name>file_editor</name> <message> - <location filename="../src/m-editor/file-editor.cc" line="+294"/> + <location filename="../src/m-editor/file-editor.cc" line="+300"/> <location line="+49"/> <location line="+28"/> <source>Octave Editor</source> <translation>Éditeur d'Octave</translation> </message> <message> - <location line="-193"/> + <location line="-199"/> <source>Octave Files (*.m);;All Files (*)</source> <translation>Fichiers d'Octave (*.m);;Tous les fichiers (*)</translation> </message> <message> - <location line="+117"/> + <location line="+123"/> <source>Could not open file %1 for read: %2.</source> <translation>Impossible d'ouvrir le fichier %1 pour lecture : @@ -142,7 +142,7 @@ <translation>&%1 %2</translation> </message> <message> - <location line="+159"/> + <location line="+160"/> <source>&New File</source> <translation>&Nouveau</translation> </message> @@ -157,12 +157,12 @@ <translation>&Enregistrer</translation> </message> <message> - <location line="+4"/> + <location line="+3"/> <source>Save File &As</source> <translation>Enregistrer &sous</translation> </message> <message> - <location line="+4"/> + <location line="+3"/> <source>Print</source> <translation>Imprimer</translation> </message> @@ -192,17 +192,17 @@ <translation>Coller</translation> </message> <message> - <location line="+3"/> + <location line="+2"/> <source>&Next Bookmark</source> <translation>Marque page &suivant</translation> </message> <message> - <location line="+3"/> + <location line="+2"/> <source>Pre&vious Bookmark</source> <translation>Marque page &précédent</translation> </message> <message> - <location line="+3"/> + <location line="+2"/> <source>Toggle &Bookmark</source> <translation>Basculer &marque page</translation> </message> @@ -242,27 +242,27 @@ <translation>&Décommenter</translation> </message> <message> - <location line="+73"/> + <location line="+63"/> <source>&Recent Editor Files</source> <translation>Fichiers &récents</translation> </message> <message> - <location line="+15"/> + <location line="+16"/> <source>&Close</source> <translation>&Fermer</translation> </message> <message> - <location line="+5"/> + <location line="+4"/> <source>Close All</source> <translation>Tout fermer</translation> </message> <message> - <location line="+4"/> + <location line="+5"/> <source>Close Other Files</source> <translation>Fermer les autres fichiers</translation> </message> <message> - <location line="-94"/> + <location line="-85"/> <source>&Find and Replace</source> <translation>&Rechercher et remplacer</translation> </message> @@ -277,12 +277,12 @@ <translation>&Aller à la ligne</translation> </message> <message> - <location line="+63"/> + <location line="+53"/> <source>&File</source> <translation>&Fichier</translation> </message> <message> - <location line="+35"/> + <location line="+36"/> <source>&Edit</source> <translation>&Editer</translation> </message> @@ -327,14 +327,14 @@ <message> <location line="+4"/> <location line="+114"/> - <location line="+104"/> + <location line="+109"/> <location line="+66"/> <location line="+22"/> <source>Octave Editor</source> <translation>Éditeur d'Octave</translation> </message> <message> - <location line="-305"/> + <location line="-310"/> <source>The file %1 is about to be closed but has been modified. @@ -345,7 +345,7 @@ %2</translation> </message> <message> - <location line="+184"/> + <location line="+189"/> <source>Octave Files (*.m);;All Files (*)</source> <translation>Fichiers d'Octave (*.m);;Tous les fichiers (*)</translation> </message> @@ -377,14 +377,14 @@ a été supprimé ou rénommé. Voulez-vous l'enregistrer maintenant ?%2</translation> </message> <message> - <location line="-192"/> + <location line="-197"/> <source>Could not open file %1 for write: %2.</source> <translation>Impossible d'ouvrir le fichier %1 pour écrire : %2.</translation> </message> <message> - <location line="+170"/> + <location line="+175"/> <source>It seems that '%1' has been modified by another application. Do you want to reload it?</source> <translation>Il semblerait que '%1' a été modifié par une autre application. Voulez-vous le récharger ?</translation> </message> @@ -547,12 +547,12 @@ <translation>Impossible de supprimer un répertoire qui n'est pas vide</translation> </message> <message> - <location line="+128"/> + <location line="+131"/> <source>Set directory of file browser</source> <translation>Définir le répertoire de l'explorateur de fichiers</translation> </message> <message> - <location line="+27"/> + <location line="+28"/> <source>Create File</source> <translation>Créer un fichier</translation> </message> @@ -649,7 +649,7 @@ <translation>Recherche dans la sé&lection</translation> </message> <message> - <location line="+61"/> + <location line="+71"/> <source>Search from end</source> <translation>Rechercher depuis la fin</translation> </message> @@ -772,12 +772,12 @@ <translation>Le texte recherché est insensible à la casse</translation> </message> <message> - <location line="+10"/> + <location line="+11"/> <source>Search results</source> <translation>Résultats de la recherche</translation> </message> <message> - <location line="+11"/> + <location line="+14"/> <source>Idle.</source> <translation>Inoccupé.</translation> </message> @@ -825,7 +825,7 @@ <context> <name>find_files_model</name> <message> - <location filename="../src/find-files-model.cc" line="+29"/> + <location filename="../src/find-files-model.cc" line="+76"/> <source>Filename</source> <translation>Nom du fichier</translation> </message> @@ -838,7 +838,7 @@ <context> <name>history_dock_widget</name> <message> - <location filename="../src/history-dock-widget.cc" line="+42"/> + <location filename="../src/history-dock-widget.cc" line="+43"/> <source>Browse and search the command history.</source> <translation>Naviguer et rechercher l'historique des commandes.</translation> </message> @@ -876,23 +876,23 @@ <context> <name>main_window</name> <message> - <location filename="../src/main-window.cc" line="+155"/> + <location filename="../src/main-window.cc" line="+160"/> <source>Load Workspace</source> <translation>Charger l'espace de travail</translation> </message> <message> - <location line="+355"/> - <location line="+769"/> + <location line="+388"/> + <location line="+835"/> <source>About Octave</source> <translation>À propos d'Octave</translation> </message> <message> - <location line="-338"/> + <location line="-354"/> <source>&File</source> <translation>&Fichier</translation> </message> <message> - <location line="+52"/> + <location line="+54"/> <source>New</source> <translation>Nouveau</translation> </message> @@ -902,7 +902,7 @@ <translation>Fichier de script</translation> </message> <message> - <location line="+2"/> + <location line="+3"/> <source>Function</source> <translation>Fonction</translation> </message> @@ -912,12 +912,12 @@ <translation>Figure</translation> </message> <message> - <location line="-55"/> + <location line="-58"/> <source>Open...</source> <translation>Ouvrir...</translation> </message> <message> - <location line="+18"/> + <location line="+20"/> <source>Preferences...</source> <translation>Préférences...</translation> </message> @@ -927,7 +927,7 @@ <translation>Quitter</translation> </message> <message> - <location line="+51"/> + <location line="+52"/> <source>&Edit</source> <translation>&Editer</translation> </message> @@ -942,28 +942,33 @@ <translation>Copier</translation> </message> <message> - <location line="+5"/> + <location line="+6"/> <source>Paste</source> <translation>Coller</translation> </message> <message> - <location line="-895"/> - <location line="+817"/> + <location line="-982"/> + <location line="+902"/> <source>Save Workspace As</source> <translation>Enregistrer l'espace de travail sous</translation> </message> <message> - <location line="-602"/> + <location line="-655"/> <source>Set working directory</source> <translation>Définir le répertoire de travail</translation> </message> <message> - <location line="+686"/> + <location line="+739"/> + <source>Clear Clipboard</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+5"/> <source>Find Files...</source> <translation>Rechercher des fichiers...</translation> </message> <message> - <location line="+6"/> + <location line="+5"/> <source>Clear Command Window</source> <translation>Nettoyer la fenêtre de commande</translation> </message> @@ -978,7 +983,7 @@ <translation>Nettoyer l'espace de travail</translation> </message> <message> - <location line="+36"/> + <location line="+40"/> <source>De&bug</source> <translation>Dé&boguer</translation> </message> @@ -1023,7 +1028,27 @@ <translation>Rétablir la disposition par défaut des fenêtres</translation> </message> <message> - <location line="+106"/> + <location line="+77"/> + <source>Octave Packages</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> + <source>Share Code</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> + <source>Contribute to Octave</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> + <source>Octave Developer Resources</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+32"/> <source>On Disk</source> <translation>Installé localement</translation> </message> @@ -1053,12 +1078,12 @@ <translation>Naviguer dans les répertoires</translation> </message> <message> - <location line="-392"/> + <location line="-412"/> <source>Load workspace</source> <translation>Charger l'espace de travail</translation> </message> <message> - <location line="+192"/> + <location line="+200"/> <source>&Window</source> <translation>&Fenêtre</translation> </message> @@ -1109,12 +1134,12 @@ </message> <message> <location line="+3"/> - <location line="+108"/> + <location line="+120"/> <source>Documentation</source> <translation>Documentation</translation> </message> <message> - <location line="-36"/> + <location line="-48"/> <source>&Help</source> <translation>&Aide</translation> </message> @@ -1123,31 +1148,22 @@ <source>Report Bug</source> <translation>Signaler un bogue</translation> </message> - <message> - <location line="+6"/> - <source>Visit Agora</source> - <translation>Visiter Agora</translation> - </message> - <message> - <location line="-3"/> - <source>Visit Octave Forge</source> - <translation>Visiter Octave Forge</translation> - </message> </context> <context> <name>octave_dock_widget</name> <message> <location filename="../src/octave-dock-widget.cc" line="+52"/> + <location line="+129"/> <source>Undock widget</source> <translation>Détacher le widget</translation> </message> <message> - <location line="+9"/> + <location line="-119"/> <source>Hide widget</source> <translation>Cacher le widget</translation> </message> <message> - <location line="+82"/> + <location line="+86"/> <source>Dock widget</source> <translation>Attacher le widget</translation> </message> @@ -1544,7 +1560,7 @@ <context> <name>webinfo</name> <message> - <location filename="../src/qtinfo/webinfo.cc" line="+78"/> + <location filename="../src/qtinfo/webinfo.cc" line="+80"/> <source>Type here and press 'Return' to search</source> <translation>Entrez le texte ici et appuyez sur 'Entrée' pour lancer la recherche</translation> </message> @@ -1557,48 +1573,38 @@ <context> <name>welcome_wizard</name> <message> - <location filename="../src/welcome-wizard.ui" line="+26"/> + <location filename="../src/welcome-wizard.ui" line="+29"/> <source>Welcome to GNU Octave</source> <translation>Bienvenu dans GNU Octave</translation> </message> <message> - <location line="+13"/> - <source>It appears that you have launched Octave GUI for the first time on this computer, since no configuration file could be found at '~/.octave-gui'. This wizard will guide you through the essential settings you should make before you can start using Octave GUI. If you want to transfer your settings you have previously made just close this dialog and copy over the settings file to your home folder. The presence of that file will automatically be detected and will skip this wizard. IMPORTANT: This wizard is not fully functional yet. Just click your way to the end and it will create a standard settings file.</source> - <translation>Il semble que vous avez lancé Octave GUI pour la première fois sur cet ordinateur puisque aucun fichier de configuration '~/.octave-gui' n'a été trouvé. Cet assistant va vous guider pour faire les réglages nécessaires avant de pouvoir utiliser Octave GUI. Si vous voulez transferer des réglages que vous avez déjà faits, fermez ce dialogue et copiez le fichier de configuration dans votre répertoire personnel. La présence de ce fichier sera détectée automatiquement et cet assistant ne s'affichera plus. IMPORTANT : Cet assistant n'est pas encore complètement fonctionnel. Passez les pages jusqu'à la fin et il créera un fichier de configuration standard.</translation> + <location line="+20"/> + <source>You seem to be using the Octave graphical interface for the first time on this computer. Click 'Finish' to write a configuration file and launch Octave GUI. </source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+10"/> + <source>The configuration file is stored in __%1__. If that file exists, you will not see this dialog when Octave starts again.</source> + <translation type="unfinished"></translation> </message> <message> - <location line="+41"/> - <location line="+50"/> - <location line="+52"/> - <location line="+52"/> - <source>Next</source> - <translation>Suivant</translation> + <location line="+10"/> + <source><html><head/><body><p>For more information about Octave,</p> +<ul> +<li>visit <a href="http://octave.org"><span style=" text-decoration: underline; color:#0000ff;">http://octave.org</span></a>,</li> +<li> get the documentation online as <a href="http://www.gnu.org/software/octave/doc/interpreter/index.html"><span style=" text-decoration: underline; color:#0000ff;">html</span></a>- or <a href="http://www.gnu.org/software/octave/octave.pdf"><span style=" text-decoration: underline; color:#0000ff;">pdf</span></a>-document, or</li> +<li>open the documentation browser of Octave GUI with the help menu.</li> +</ul> +</body></html></source> + <translation type="unfinished"></translation> </message> <message> - <location line="-124"/> - <location line="+52"/> - <location line="+52"/> - <location line="+87"/> - <source>Previous</source> - <translation>Précédent</translation> - </message> - <message> - <location line="-45"/> + <location line="-27"/> <source>Welcome to Octave!</source> <translation>Bienvenu dans Octave!</translation> </message> <message> - <location line="+7"/> - <source>This is the development version of Octave with the first official GUI.</source> - <translation>Ceci est la version de développement de Octave avec le premier GUI officiel.</translation> - </message> - <message> - <location line="+10"/> - <source>You seem to run Octave GUI for the first time on this computer. This assistant will help you to configure this software installation. Click 'Finish' to write a configuration file and launch Octave GUI.</source> - <translation>Il semble que vous exécutez Octave GUI pour la premiere fois sur cet ordinateur. Cet assistant va vous aider à configurer ce logiciel. Appuyez sur 'Fin' pour créer le fichier de configuration et lancer Octave GUI.</translation> - </message> - <message> - <location line="+48"/> + <location line="+74"/> <source>Finish</source> <translation>Fin</translation> </message>
--- a/libgui/languages/nl_NL.ts +++ b/libgui/languages/nl_NL.ts @@ -83,7 +83,7 @@ <context> <name>QWinTerminalImpl</name> <message> - <location filename="../qterminal/libqterminal/win32/QWinTerminalImpl.cpp" line="+1451"/> + <location filename="../qterminal/libqterminal/win32/QWinTerminalImpl.cpp" line="+1527"/> <source>copied selection to clipboard</source> <translation type="unfinished">selectie naar klembord gekopieerd</translation> </message> @@ -246,7 +246,7 @@ <message> <location line="+3"/> <source>Identifier</source> - <translation type="unfinished"></translation> + <translation type="unfinished">Identifier</translation> </message> <message> <location line="+3"/> @@ -697,19 +697,19 @@ <context> <name>file_editor</name> <message> - <location filename="../src/m-editor/file-editor.cc" line="+294"/> + <location filename="../src/m-editor/file-editor.cc" line="+300"/> <location line="+49"/> <location line="+28"/> <source>Octave Editor</source> <translation></translation> </message> <message> - <location line="-193"/> + <location line="-199"/> <source>Octave Files (*.m);;All Files (*)</source> <translation type="unfinished">Octave bestanden (*.m);;Alle bestanden (*)</translation> </message> <message> - <location line="+117"/> + <location line="+123"/> <source>Could not open file %1 for read: %2.</source> <translation>Bestand %1 kon niet geopend worden om te lezen: @@ -735,7 +735,7 @@ <translation></translation> </message> <message> - <location line="+159"/> + <location line="+160"/> <source>&New File</source> <translation>&Nieuw Bestand</translation> </message> @@ -750,12 +750,12 @@ <translation>Op&slaan</translation> </message> <message> - <location line="+4"/> + <location line="+3"/> <source>Save File &As</source> <translation>Opslaan &als</translation> </message> <message> - <location line="+4"/> + <location line="+3"/> <source>Print</source> <translation type="unfinished">Afdrukken</translation> </message> @@ -785,17 +785,17 @@ <translation>Plakken</translation> </message> <message> - <location line="+3"/> + <location line="+2"/> <source>&Next Bookmark</source> <translation>Volge&nde bladwijzer</translation> </message> <message> - <location line="+3"/> + <location line="+2"/> <source>Pre&vious Bookmark</source> <translation>&Vorige bladwijzer</translation> </message> <message> - <location line="+3"/> + <location line="+2"/> <source>Toggle &Bookmark</source> <translation>&Bladwijzer invoegen</translation> </message> @@ -835,27 +835,27 @@ <translation type="unfinished">Zet om naar code</translation> </message> <message> - <location line="+73"/> + <location line="+63"/> <source>&Recent Editor Files</source> <translation type="unfinished">Recent geopend</translation> </message> <message> - <location line="+15"/> + <location line="+16"/> <source>&Close</source> <translation type="unfinished">Sluit bestand</translation> </message> <message> - <location line="+5"/> + <location line="+4"/> <source>Close All</source> <translation type="unfinished">Alle bestanden sluiten</translation> </message> <message> - <location line="+4"/> + <location line="+5"/> <source>Close Other Files</source> <translation type="unfinished">Andere bestanden sluiten</translation> </message> <message> - <location line="-94"/> + <location line="-85"/> <source>&Find and Replace</source> <translation>Zoek en Vervang</translation> </message> @@ -870,12 +870,12 @@ <translation type="unfinished">Ga naar regel</translation> </message> <message> - <location line="+63"/> + <location line="+53"/> <source>&File</source> <translation>Bestand</translation> </message> <message> - <location line="+35"/> + <location line="+36"/> <source>&Edit</source> <translation>B&ewerken</translation> </message> @@ -920,14 +920,14 @@ <message> <location line="+4"/> <location line="+114"/> - <location line="+104"/> + <location line="+109"/> <location line="+66"/> <location line="+22"/> <source>Octave Editor</source> <translation></translation> </message> <message> - <location line="-305"/> + <location line="-310"/> <source>The file %1 is about to be closed but has been modified. @@ -937,7 +937,7 @@ dat gesloten moet worden is gewijzigd.</translation> </message> <message> - <location line="+184"/> + <location line="+189"/> <source>Octave Files (*.m);;All Files (*)</source> <translation type="unfinished">Octave bestanden (*.m);;Alle bestanden (*)</translation> </message> @@ -968,14 +968,14 @@ is gewist of hernoemd. Wil je het nu opslaan?</translation> </message> <message> - <location line="-192"/> + <location line="-197"/> <source>Could not open file %1 for write: %2.</source> <translation>Kon bestand %1 niet openen om te schrijven: %2.</translation> </message> <message> - <location line="+170"/> + <location line="+175"/> <source>It seems that '%1' has been modified by another application. Do you want to reload it?</source> <translation>Het lijkt erop dat '%1' is gewijzigd door een ander programma. Wil je het opnieuw laden?</translation> </message> @@ -1137,12 +1137,12 @@ <translation type="unfinished">Kan geen niet-lege map wissen</translation> </message> <message> - <location line="+128"/> + <location line="+131"/> <source>Set directory of file browser</source> <translation type="unfinished">Stel file browser map in</translation> </message> <message> - <location line="+27"/> + <location line="+28"/> <source>Create File</source> <translation type="unfinished">Maak nieuw bestand</translation> </message> @@ -1239,7 +1239,7 @@ <translation>In se&lectie zoeken</translation> </message> <message> - <location line="+61"/> + <location line="+71"/> <source>Search from end</source> <translation type="unfinished">vanaf einde terug zoeken</translation> </message> @@ -1362,12 +1362,12 @@ <translation type="unfinished">Tekst instellen op niet-hoofdlettergevoelig</translation> </message> <message> - <location line="+10"/> + <location line="+11"/> <source>Search results</source> <translation type="unfinished">Zoekresultaten</translation> </message> <message> - <location line="+11"/> + <location line="+14"/> <source>Idle.</source> <translation type="unfinished">Niet bezig.</translation> </message> @@ -1415,7 +1415,7 @@ <context> <name>find_files_model</name> <message> - <location filename="../src/find-files-model.cc" line="+29"/> + <location filename="../src/find-files-model.cc" line="+76"/> <source>Filename</source> <translation type="unfinished">Bestandsnaam</translation> </message> @@ -1428,7 +1428,7 @@ <context> <name>history_dock_widget</name> <message> - <location filename="../src/history-dock-widget.cc" line="+42"/> + <location filename="../src/history-dock-widget.cc" line="+43"/> <source>Browse and search the command history.</source> <translation type="unfinished">Bladeren en zoeken door de opdrachtgeschiedenis.</translation> </message> @@ -1466,23 +1466,23 @@ <context> <name>main_window</name> <message> - <location filename="../src/main-window.cc" line="+155"/> + <location filename="../src/main-window.cc" line="+160"/> <source>Load Workspace</source> <translation>Werkruimte laden</translation> </message> <message> - <location line="+355"/> - <location line="+769"/> + <location line="+388"/> + <location line="+835"/> <source>About Octave</source> <translation>Over Octave</translation> </message> <message> - <location line="-338"/> + <location line="-354"/> <source>&File</source> <translation>Bestand</translation> </message> <message> - <location line="+52"/> + <location line="+54"/> <source>New</source> <translation>Nieuw</translation> </message> @@ -1492,7 +1492,7 @@ <translation>Script</translation> </message> <message> - <location line="+2"/> + <location line="+3"/> <source>Function</source> <translation>Functie</translation> </message> @@ -1502,12 +1502,12 @@ <translation>Figuur</translation> </message> <message> - <location line="-55"/> + <location line="-58"/> <source>Open...</source> <translation>Open...</translation> </message> <message> - <location line="+18"/> + <location line="+20"/> <source>Preferences...</source> <translation>Voorkeuren...</translation> </message> @@ -1517,7 +1517,7 @@ <translation>Afsluiten</translation> </message> <message> - <location line="+51"/> + <location line="+52"/> <source>&Edit</source> <translation>B&ewerken</translation> </message> @@ -1532,28 +1532,33 @@ <translation>Kopiëren</translation> </message> <message> - <location line="+5"/> + <location line="+6"/> <source>Paste</source> <translation>Plakken</translation> </message> <message> - <location line="-895"/> - <location line="+817"/> + <location line="-982"/> + <location line="+902"/> <source>Save Workspace As</source> <translation type="unfinished">Bewaar werkruimte als ...</translation> </message> <message> - <location line="-602"/> + <location line="-655"/> <source>Set working directory</source> <translation type="unfinished">Stel werkmap in</translation> </message> <message> - <location line="+686"/> + <location line="+739"/> + <source>Clear Clipboard</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+5"/> <source>Find Files...</source> <translation>Zoek bestanden...</translation> </message> <message> - <location line="+6"/> + <location line="+5"/> <source>Clear Command Window</source> <translation>Veeg opdrachtvenster schoon</translation> </message> @@ -1568,7 +1573,7 @@ <translation>Wis werkruimte</translation> </message> <message> - <location line="+36"/> + <location line="+40"/> <source>De&bug</source> <translation>De&buggen</translation> </message> @@ -1613,7 +1618,27 @@ <translation type="unfinished">Stel oorspronkelijke window layout opnieuw in</translation> </message> <message> - <location line="+106"/> + <location line="+77"/> + <source>Octave Packages</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> + <source>Share Code</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> + <source>Contribute to Octave</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> + <source>Octave Developer Resources</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+32"/> <source>On Disk</source> <translation type="unfinished">Op schijf</translation> </message> @@ -1643,12 +1668,12 @@ <translation type="unfinished">Blader door mappen</translation> </message> <message> - <location line="-392"/> + <location line="-412"/> <source>Load workspace</source> <translation>Werkruimte laden</translation> </message> <message> - <location line="+192"/> + <location line="+200"/> <source>&Window</source> <translation>Venster</translation> </message> @@ -1699,12 +1724,12 @@ </message> <message> <location line="+3"/> - <location line="+108"/> + <location line="+120"/> <source>Documentation</source> <translation>Documentatie</translation> </message> <message> - <location line="-36"/> + <location line="-48"/> <source>&Help</source> <translation>Hulp</translation> </message> @@ -1713,31 +1738,22 @@ <source>Report Bug</source> <translation>Probleem rapporteren</translation> </message> - <message> - <location line="+6"/> - <source>Visit Agora</source> - <translation>Bezoek Agora</translation> - </message> - <message> - <location line="-3"/> - <source>Visit Octave Forge</source> - <translation>Bezoek Octave Forge</translation> - </message> </context> <context> <name>octave_dock_widget</name> <message> <location filename="../src/octave-dock-widget.cc" line="+52"/> + <location line="+129"/> <source>Undock widget</source> <translation type="unfinished">Widget laten zweven</translation> </message> <message> - <location line="+9"/> + <location line="-119"/> <source>Hide widget</source> <translation type="unfinished">Widget verbergen</translation> </message> <message> - <location line="+82"/> + <location line="+86"/> <source>Dock widget</source> <translation type="unfinished">Widget in venster opnemen</translation> </message> @@ -2134,7 +2150,7 @@ <context> <name>webinfo</name> <message> - <location filename="../src/qtinfo/webinfo.cc" line="+78"/> + <location filename="../src/qtinfo/webinfo.cc" line="+80"/> <source>Type here and press 'Return' to search</source> <translation>Typ hier en druk op 'Enter' om te zoeken</translation> </message> @@ -2147,48 +2163,38 @@ <context> <name>welcome_wizard</name> <message> - <location filename="../src/welcome-wizard.ui" line="+26"/> + <location filename="../src/welcome-wizard.ui" line="+29"/> <source>Welcome to GNU Octave</source> <translation>Welkom bij GNU Octave</translation> </message> <message> - <location line="+13"/> - <source>It appears that you have launched Octave GUI for the first time on this computer, since no configuration file could be found at '~/.octave-gui'. This wizard will guide you through the essential settings you should make before you can start using Octave GUI. If you want to transfer your settings you have previously made just close this dialog and copy over the settings file to your home folder. The presence of that file will automatically be detected and will skip this wizard. IMPORTANT: This wizard is not fully functional yet. Just click your way to the end and it will create a standard settings file.</source> - <translation>Het lijkt erop dat je de Octave GUI voor de eerste keer opstart op deze computer omdat er geen configuratiebestand in '~/.octave-gui' is gevonden. Deze wizard zal je begeleiden tijdens het instellen van de belangrijkste zaken voordat je de Octave GUI kan gebruiken. Wil je eerder gemaakte instellingen overzetten, sluit dan dit dialoogvenster en kopieer het configuratiebestand naar je home map. De aanwezigheid van het bestand zal automatisch gedetecteerd worden en deze wizard doen overslaan. BELANGRIJK: Deze wizard is nog niet volledig functioneel. Klik door tot het einde voor standaardinstellingen.</translation> + <location line="+20"/> + <source>You seem to be using the Octave graphical interface for the first time on this computer. Click 'Finish' to write a configuration file and launch Octave GUI. </source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+10"/> + <source>The configuration file is stored in __%1__. If that file exists, you will not see this dialog when Octave starts again.</source> + <translation type="unfinished"></translation> </message> <message> - <location line="+41"/> - <location line="+50"/> - <location line="+52"/> - <location line="+52"/> - <source>Next</source> - <translation>Volgende</translation> + <location line="+10"/> + <source><html><head/><body><p>For more information about Octave,</p> +<ul> +<li>visit <a href="http://octave.org"><span style=" text-decoration: underline; color:#0000ff;">http://octave.org</span></a>,</li> +<li> get the documentation online as <a href="http://www.gnu.org/software/octave/doc/interpreter/index.html"><span style=" text-decoration: underline; color:#0000ff;">html</span></a>- or <a href="http://www.gnu.org/software/octave/octave.pdf"><span style=" text-decoration: underline; color:#0000ff;">pdf</span></a>-document, or</li> +<li>open the documentation browser of Octave GUI with the help menu.</li> +</ul> +</body></html></source> + <translation type="unfinished"></translation> </message> <message> - <location line="-124"/> - <location line="+52"/> - <location line="+52"/> - <location line="+87"/> - <source>Previous</source> - <translation>Vorige</translation> - </message> - <message> - <location line="-45"/> + <location line="-27"/> <source>Welcome to Octave!</source> <translation>Welkom bij Octave!</translation> </message> <message> - <location line="+7"/> - <source>This is the development version of Octave with the first official GUI.</source> - <translation>Dit is de ontwikkelvariant van Octave met de eerste officiële GUI.</translation> - </message> - <message> - <location line="+10"/> - <source>You seem to run Octave GUI for the first time on this computer. This assistant will help you to configure this software installation. Click 'Finish' to write a configuration file and launch Octave GUI.</source> - <translation>Het lijkt erop dat je de Octave GUI voor de eerste keer uitvoert op deze computer. Deze assistent zal je helpen het programma te configureren. Klik 'Voltooien' om een configuratiebestand te maken en de Octave GUI te starten.</translation> - </message> - <message> - <location line="+48"/> + <location line="+74"/> <source>Finish</source> <translation>Voltooien</translation> </message>
--- a/libgui/languages/pt_BR.ts +++ b/libgui/languages/pt_BR.ts @@ -83,7 +83,7 @@ <context> <name>QWinTerminalImpl</name> <message> - <location filename="../qterminal/libqterminal/win32/QWinTerminalImpl.cpp" line="+1451"/> + <location filename="../qterminal/libqterminal/win32/QWinTerminalImpl.cpp" line="+1527"/> <source>copied selection to clipboard</source> <translation type="unfinished"></translation> </message> @@ -104,19 +104,19 @@ <context> <name>file_editor</name> <message> - <location filename="../src/m-editor/file-editor.cc" line="+294"/> + <location filename="../src/m-editor/file-editor.cc" line="+300"/> <location line="+49"/> <location line="+28"/> <source>Octave Editor</source> <translation>Editor Octave</translation> </message> <message> - <location line="-193"/> + <location line="-199"/> <source>Octave Files (*.m);;All Files (*)</source> <translation>Scripts Octave (*.m);;Todos Arquivos (*)</translation> </message> <message> - <location line="+117"/> + <location line="+123"/> <source>Could not open file %1 for read: %2.</source> <translation>Não foi possível abrir arquivo %1 para leitura: %2.</translation> @@ -139,7 +139,7 @@ <translation>&%1 %2</translation> </message> <message> - <location line="+159"/> + <location line="+160"/> <source>&New File</source> <translation>&Novo Arquivo</translation> </message> @@ -154,12 +154,12 @@ <translation>&Salvar Arquivo</translation> </message> <message> - <location line="+4"/> + <location line="+3"/> <source>Save File &As</source> <translation>Salvar Arquivo &Como</translation> </message> <message> - <location line="+4"/> + <location line="+3"/> <source>Print</source> <translation>Imprimir</translation> </message> @@ -189,17 +189,17 @@ <translation>Co&lar</translation> </message> <message> - <location line="+3"/> + <location line="+2"/> <source>&Next Bookmark</source> <translation>&Próximo Marcador</translation> </message> <message> - <location line="+3"/> + <location line="+2"/> <source>Pre&vious Bookmark</source> <translation>Marcardor &Anterior</translation> </message> <message> - <location line="+3"/> + <location line="+2"/> <source>Toggle &Bookmark</source> <translation>Visualizar &Marcador</translation> </message> @@ -239,27 +239,27 @@ <translation>&Descomentar</translation> </message> <message> - <location line="+73"/> + <location line="+63"/> <source>&Recent Editor Files</source> <translation>Arquivos &recentes</translation> </message> <message> - <location line="+15"/> + <location line="+16"/> <source>&Close</source> <translation>&Fechar</translation> </message> <message> - <location line="+5"/> + <location line="+4"/> <source>Close All</source> <translation>Fechar &Todos</translation> </message> <message> - <location line="+4"/> + <location line="+5"/> <source>Close Other Files</source> <translation>Fechar Outros Arquivos</translation> </message> <message> - <location line="-94"/> + <location line="-85"/> <source>&Find and Replace</source> <translation>Procurar e Substituir</translation> </message> @@ -274,12 +274,12 @@ <translation>Vá para Linha</translation> </message> <message> - <location line="+63"/> + <location line="+53"/> <source>&File</source> <translation>&Arquivo</translation> </message> <message> - <location line="+35"/> + <location line="+36"/> <source>&Edit</source> <translation>&Editar</translation> </message> @@ -324,14 +324,14 @@ <message> <location line="+4"/> <location line="+114"/> - <location line="+104"/> + <location line="+109"/> <location line="+66"/> <location line="+22"/> <source>Octave Editor</source> <translation>Editor Octave</translation> </message> <message> - <location line="-305"/> + <location line="-310"/> <source>The file %1 is about to be closed but has been modified. @@ -342,7 +342,7 @@ %2</translation> </message> <message> - <location line="+184"/> + <location line="+189"/> <source>Octave Files (*.m);;All Files (*)</source> <translation>Scripts Octave (*.m);; Todos Arquivos (*)</translation> </message> @@ -374,14 +374,14 @@ foi removido ou renomeado. Pretende salvá-lo agora?%2</translation> </message> <message> - <location line="-192"/> + <location line="-197"/> <source>Could not open file %1 for write: %2.</source> <translation>Não foi possível abrir arquivo %1 para escrita: %2.</translation> </message> <message> - <location line="+170"/> + <location line="+175"/> <source>It seems that '%1' has been modified by another application. Do you want to reload it?</source> <translation>Parece que o arquivo '%1' foi modificado por outra aplicação. Deseja recarregá-lo?</translation> </message> @@ -542,12 +542,12 @@ <translation>Não é possível remover um diretório que não está vázio</translation> </message> <message> - <location line="+128"/> + <location line="+131"/> <source>Set directory of file browser</source> <translation>Alterar diretório do navegador de arquivos</translation> </message> <message> - <location line="+27"/> + <location line="+28"/> <source>Create File</source> <translation>Criar Arquivo</translation> </message> @@ -642,7 +642,7 @@ <translation>Seleção de busca</translation> </message> <message> - <location line="+61"/> + <location line="+71"/> <source>Search from end</source> <translation>Procurar do final</translation> </message> @@ -765,12 +765,12 @@ <translation>Altere se conteúdo do texto é insensível a caixa alta/baixa</translation> </message> <message> - <location line="+10"/> + <location line="+11"/> <source>Search results</source> <translation>Resultados de Busca</translation> </message> <message> - <location line="+11"/> + <location line="+14"/> <source>Idle.</source> <translation>Ocupado.</translation> </message> @@ -818,7 +818,7 @@ <context> <name>find_files_model</name> <message> - <location filename="../src/find-files-model.cc" line="+29"/> + <location filename="../src/find-files-model.cc" line="+76"/> <source>Filename</source> <translation>Nome do Arquivo</translation> </message> @@ -831,7 +831,7 @@ <context> <name>history_dock_widget</name> <message> - <location filename="../src/history-dock-widget.cc" line="+42"/> + <location filename="../src/history-dock-widget.cc" line="+43"/> <source>Browse and search the command history.</source> <translation>Pesquise no histórico de comandos.</translation> </message> @@ -869,23 +869,23 @@ <context> <name>main_window</name> <message> - <location filename="../src/main-window.cc" line="+155"/> + <location filename="../src/main-window.cc" line="+160"/> <source>Load Workspace</source> <translation>Carregar ambiente de trabalho</translation> </message> <message> - <location line="+355"/> - <location line="+769"/> + <location line="+388"/> + <location line="+835"/> <source>About Octave</source> <translation>Sobre o Octave</translation> </message> <message> - <location line="-338"/> + <location line="-354"/> <source>&File</source> <translation>Arquivo</translation> </message> <message> - <location line="+52"/> + <location line="+54"/> <source>New</source> <translation>Novo</translation> </message> @@ -895,7 +895,7 @@ <translation>Script</translation> </message> <message> - <location line="+2"/> + <location line="+3"/> <source>Function</source> <translation>Função</translation> </message> @@ -905,12 +905,12 @@ <translation>Figura</translation> </message> <message> - <location line="-55"/> + <location line="-58"/> <source>Open...</source> <translation>Abrir...</translation> </message> <message> - <location line="+18"/> + <location line="+20"/> <source>Preferences...</source> <translation>Preferências...</translation> </message> @@ -920,7 +920,7 @@ <translation>Sair</translation> </message> <message> - <location line="+51"/> + <location line="+52"/> <source>&Edit</source> <translation>Editar</translation> </message> @@ -935,28 +935,33 @@ <translation>Copiar</translation> </message> <message> - <location line="+5"/> + <location line="+6"/> <source>Paste</source> <translation>Colar</translation> </message> <message> - <location line="-895"/> - <location line="+817"/> + <location line="-982"/> + <location line="+902"/> <source>Save Workspace As</source> <translation>Salvar Ambiente de Trabalho como</translation> </message> <message> - <location line="-602"/> + <location line="-655"/> <source>Set working directory</source> <translation>Alterar diretório de trabalho</translation> </message> <message> - <location line="+686"/> + <location line="+739"/> + <source>Clear Clipboard</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+5"/> <source>Find Files...</source> <translation>Encontrar Arquivos...</translation> </message> <message> - <location line="+6"/> + <location line="+5"/> <source>Clear Command Window</source> <translation>Limpar Janela de Comandos</translation> </message> @@ -971,7 +976,7 @@ <translation>Limpar Ambiente de Trabalho</translation> </message> <message> - <location line="+36"/> + <location line="+40"/> <source>De&bug</source> <translation>Depurar</translation> </message> @@ -1016,7 +1021,27 @@ <translation>Recuperar Disposição de Janelas Padrão</translation> </message> <message> - <location line="+106"/> + <location line="+77"/> + <source>Octave Packages</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> + <source>Share Code</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> + <source>Contribute to Octave</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> + <source>Octave Developer Resources</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+32"/> <source>On Disk</source> <translation>No Disco</translation> </message> @@ -1046,12 +1071,12 @@ <translation>Procurar diretórios</translation> </message> <message> - <location line="-392"/> + <location line="-412"/> <source>Load workspace</source> <translation>Carregar ambiente de trabalho</translation> </message> <message> - <location line="+192"/> + <location line="+200"/> <source>&Window</source> <translation>&Janela</translation> </message> @@ -1102,12 +1127,12 @@ </message> <message> <location line="+3"/> - <location line="+108"/> + <location line="+120"/> <source>Documentation</source> <translation>Documentação</translation> </message> <message> - <location line="-36"/> + <location line="-48"/> <source>&Help</source> <translation>&Ajuda</translation> </message> @@ -1116,31 +1141,22 @@ <source>Report Bug</source> <translation>Reportar Bug</translation> </message> - <message> - <location line="+6"/> - <source>Visit Agora</source> - <translation>Visite Agora</translation> - </message> - <message> - <location line="-3"/> - <source>Visit Octave Forge</source> - <translation>Visite Octave Forge</translation> - </message> </context> <context> <name>octave_dock_widget</name> <message> <location filename="../src/octave-dock-widget.cc" line="+52"/> + <location line="+129"/> <source>Undock widget</source> <translation>Desacoplar widget</translation> </message> <message> - <location line="+9"/> + <location line="-119"/> <source>Hide widget</source> <translation>Esconder widget</translation> </message> <message> - <location line="+82"/> + <location line="+86"/> <source>Dock widget</source> <translation>Acoplar widget</translation> </message> @@ -1537,7 +1553,7 @@ <context> <name>webinfo</name> <message> - <location filename="../src/qtinfo/webinfo.cc" line="+78"/> + <location filename="../src/qtinfo/webinfo.cc" line="+80"/> <source>Type here and press 'Return' to search</source> <translation>Digite aqui e pressione 'Enter' para procurar</translation> </message> @@ -1550,48 +1566,38 @@ <context> <name>welcome_wizard</name> <message> - <location filename="../src/welcome-wizard.ui" line="+26"/> + <location filename="../src/welcome-wizard.ui" line="+29"/> <source>Welcome to GNU Octave</source> <translation>Bem-vindo ao GNU Octave</translation> </message> <message> - <location line="+13"/> - <source>It appears that you have launched Octave GUI for the first time on this computer, since no configuration file could be found at '~/.octave-gui'. This wizard will guide you through the essential settings you should make before you can start using Octave GUI. If you want to transfer your settings you have previously made just close this dialog and copy over the settings file to your home folder. The presence of that file will automatically be detected and will skip this wizard. IMPORTANT: This wizard is not fully functional yet. Just click your way to the end and it will create a standard settings file.</source> - <translation>Aparentemente o Octave GUI foi lançado pela primeira vez neste computador, já que nenhum arquivo de configuração foi encontrado em '~/.octave-gui'. Este tutorial irá guiá-lo para realizar configurações essenciais antes de utilizar o Octave. Se deseja transferir suas configurações definidas previamente, feche este diálogo e copie os arquivos para o local apropriado. IMPORTANT: Este tutorial não é totalmente funcional ainda. Simplesmente prossiga e configurações padrão serão criadas.</translation> + <location line="+20"/> + <source>You seem to be using the Octave graphical interface for the first time on this computer. Click 'Finish' to write a configuration file and launch Octave GUI. </source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+10"/> + <source>The configuration file is stored in __%1__. If that file exists, you will not see this dialog when Octave starts again.</source> + <translation type="unfinished"></translation> </message> <message> - <location line="+41"/> - <location line="+50"/> - <location line="+52"/> - <location line="+52"/> - <source>Next</source> - <translation>Próximo</translation> + <location line="+10"/> + <source><html><head/><body><p>For more information about Octave,</p> +<ul> +<li>visit <a href="http://octave.org"><span style=" text-decoration: underline; color:#0000ff;">http://octave.org</span></a>,</li> +<li> get the documentation online as <a href="http://www.gnu.org/software/octave/doc/interpreter/index.html"><span style=" text-decoration: underline; color:#0000ff;">html</span></a>- or <a href="http://www.gnu.org/software/octave/octave.pdf"><span style=" text-decoration: underline; color:#0000ff;">pdf</span></a>-document, or</li> +<li>open the documentation browser of Octave GUI with the help menu.</li> +</ul> +</body></html></source> + <translation type="unfinished"></translation> </message> <message> - <location line="-124"/> - <location line="+52"/> - <location line="+52"/> - <location line="+87"/> - <source>Previous</source> - <translation>Anterior</translation> - </message> - <message> - <location line="-45"/> + <location line="-27"/> <source>Welcome to Octave!</source> <translation>Bem-vindo ao Octave!</translation> </message> <message> - <location line="+7"/> - <source>This is the development version of Octave with the first official GUI.</source> - <translation>Esta é a versão de desenvolvimento do Octave com a primeira GUI oficial.</translation> - </message> - <message> - <location line="+10"/> - <source>You seem to run Octave GUI for the first time on this computer. This assistant will help you to configure this software installation. Click 'Finish' to write a configuration file and launch Octave GUI.</source> - <translation>Você parece ter executado o Octave GUI pela primeira vez neste computador. Este assistente irá ajudá-lo. Clique 'Finalizar' para escrever um arquivo de configuração padrão e lançar o Octave GUI.</translation> - </message> - <message> - <location line="+48"/> + <location line="+74"/> <source>Finish</source> <translation>Finalizar</translation> </message>
--- a/libgui/languages/ru_RU.ts +++ b/libgui/languages/ru_RU.ts @@ -41,6 +41,52 @@ <source>persistent</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../qterminal/libqterminal/QTerminal.cc" line="+64"/> + <source>foreground</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>background</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>selection</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>cursor</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>QTerminal</name> + <message> + <location filename="../qterminal/libqterminal/QTerminal.h" line="+116"/> + <source>Copy</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+4"/> + <source>Paste</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+4"/> + <source>Clear All</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>QWinTerminalImpl</name> + <message> + <location filename="../qterminal/libqterminal/win32/QWinTerminalImpl.cpp" line="+1527"/> + <source>copied selection to clipboard</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>documentation_dock_widget</name> @@ -58,19 +104,19 @@ <context> <name>file_editor</name> <message> - <location filename="../src/m-editor/file-editor.cc" line="+294"/> + <location filename="../src/m-editor/file-editor.cc" line="+300"/> <location line="+49"/> <location line="+28"/> <source>Octave Editor</source> <translation type="unfinished"></translation> </message> <message> - <location line="-193"/> + <location line="-199"/> <source>Octave Files (*.m);;All Files (*)</source> <translation type="unfinished"></translation> </message> <message> - <location line="+117"/> + <location line="+123"/> <source>Could not open file %1 for read: %2.</source> <translation type="unfinished"></translation> @@ -93,7 +139,7 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+159"/> + <location line="+160"/> <source>&New File</source> <translation type="unfinished">Созд&ать</translation> </message> @@ -108,12 +154,12 @@ <translation type="unfinished">&Сохранить</translation> </message> <message> - <location line="+4"/> + <location line="+3"/> <source>Save File &As</source> <translation type="unfinished">Сохранить &как</translation> </message> <message> - <location line="+4"/> + <location line="+3"/> <source>Print</source> <translation type="unfinished"></translation> </message> @@ -143,17 +189,17 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+3"/> + <location line="+2"/> <source>&Next Bookmark</source> <translation type="unfinished">С&ледующая закладка</translation> </message> <message> - <location line="+3"/> + <location line="+2"/> <source>Pre&vious Bookmark</source> <translation type="unfinished">Пр&едыдущая закладка</translation> </message> <message> - <location line="+3"/> + <location line="+2"/> <source>Toggle &Bookmark</source> <translation type="unfinished">&Установить/снять закладку</translation> </message> @@ -193,27 +239,27 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+73"/> + <location line="+63"/> <source>&Recent Editor Files</source> <translation type="unfinished"></translation> </message> <message> - <location line="+15"/> + <location line="+16"/> <source>&Close</source> <translation type="unfinished"></translation> </message> <message> + <location line="+4"/> + <source>Close All</source> + <translation type="unfinished"></translation> + </message> + <message> <location line="+5"/> - <source>Close All</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+4"/> <source>Close Other Files</source> <translation type="unfinished"></translation> </message> <message> - <location line="-94"/> + <location line="-85"/> <source>&Find and Replace</source> <translation type="unfinished"></translation> </message> @@ -228,12 +274,12 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+63"/> + <location line="+53"/> <source>&File</source> <translation type="unfinished">&Файл</translation> </message> <message> - <location line="+35"/> + <location line="+36"/> <source>&Edit</source> <translation type="unfinished">&Правка</translation> </message> @@ -278,14 +324,14 @@ <message> <location line="+4"/> <location line="+114"/> - <location line="+104"/> + <location line="+109"/> <location line="+66"/> <location line="+22"/> <source>Octave Editor</source> <translation type="unfinished"></translation> </message> <message> - <location line="-305"/> + <location line="-310"/> <source>The file %1 is about to be closed but has been modified. @@ -293,7 +339,7 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+184"/> + <location line="+189"/> <source>Octave Files (*.m);;All Files (*)</source> <translation type="unfinished"></translation> </message> @@ -319,13 +365,13 @@ <translation type="unfinished"></translation> </message> <message> - <location line="-192"/> + <location line="-197"/> <source>Could not open file %1 for write: %2.</source> <translation type="unfinished"></translation> </message> <message> - <location line="+170"/> + <location line="+175"/> <source>It seems that '%1' has been modified by another application. Do you want to reload it?</source> <translation type="unfinished"></translation> </message> @@ -475,7 +521,7 @@ </message> <message> <location line="-10"/> - <source>Are you sre you want to delete + <source>Are you sure you want to delete </source> <translation type="unfinished"></translation> </message> @@ -485,12 +531,12 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+128"/> + <location line="+131"/> <source>Set directory of file browser</source> <translation type="unfinished"></translation> </message> <message> - <location line="+27"/> + <location line="+28"/> <source>Create File</source> <translation type="unfinished"></translation> </message> @@ -585,7 +631,7 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+61"/> + <location line="+71"/> <source>Search from end</source> <translation type="unfinished"></translation> </message> @@ -708,12 +754,12 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+10"/> + <location line="+11"/> <source>Search results</source> <translation type="unfinished"></translation> </message> <message> - <location line="+10"/> + <location line="+14"/> <source>Idle.</source> <translation type="unfinished"></translation> </message> @@ -748,7 +794,7 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+100"/> + <location line="+99"/> <source>Searching...</source> <translation type="unfinished"></translation> </message> @@ -761,7 +807,7 @@ <context> <name>find_files_model</name> <message> - <location filename="../src/find-files-model.cc" line="+29"/> + <location filename="../src/find-files-model.cc" line="+76"/> <source>Filename</source> <translation type="unfinished"></translation> </message> @@ -774,7 +820,7 @@ <context> <name>history_dock_widget</name> <message> - <location filename="../src/history-dock-widget.cc" line="+42"/> + <location filename="../src/history-dock-widget.cc" line="+43"/> <source>Browse and search the command history.</source> <translation type="unfinished">Просмотр и поиск в журнале выполненных команд.</translation> </message> @@ -812,23 +858,23 @@ <context> <name>main_window</name> <message> - <location filename="../src/main-window.cc" line="+155"/> + <location filename="../src/main-window.cc" line="+160"/> <source>Load Workspace</source> <translation type="unfinished">Загрузить область переменных</translation> </message> <message> - <location line="+355"/> - <location line="+769"/> + <location line="+388"/> + <location line="+835"/> <source>About Octave</source> <translation type="unfinished">Об Octave</translation> </message> <message> - <location line="-338"/> + <location line="-354"/> <source>&File</source> <translation type="unfinished">&Файл</translation> </message> <message> - <location line="+52"/> + <location line="+54"/> <source>New</source> <translation type="unfinished"></translation> </message> @@ -838,7 +884,7 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+2"/> + <location line="+3"/> <source>Function</source> <translation type="unfinished"></translation> </message> @@ -848,12 +894,12 @@ <translation type="unfinished"></translation> </message> <message> - <location line="-55"/> + <location line="-58"/> <source>Open...</source> <translation type="unfinished"></translation> </message> <message> - <location line="+18"/> + <location line="+20"/> <source>Preferences...</source> <translation type="unfinished"></translation> </message> @@ -863,7 +909,7 @@ <translation type="unfinished">Выход</translation> </message> <message> - <location line="+51"/> + <location line="+52"/> <source>&Edit</source> <translation type="unfinished">&Правка</translation> </message> @@ -878,28 +924,33 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+5"/> + <location line="+6"/> <source>Paste</source> <translation type="unfinished"></translation> </message> <message> - <location line="-895"/> - <location line="+817"/> + <location line="-982"/> + <location line="+902"/> <source>Save Workspace As</source> <translation type="unfinished"></translation> </message> <message> - <location line="-602"/> + <location line="-655"/> <source>Set working directory</source> <translation type="unfinished"></translation> </message> <message> - <location line="+686"/> + <location line="+739"/> + <source>Clear Clipboard</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+5"/> <source>Find Files...</source> <translation type="unfinished"></translation> </message> <message> - <location line="+6"/> + <location line="+5"/> <source>Clear Command Window</source> <translation type="unfinished"></translation> </message> @@ -914,7 +965,7 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+36"/> + <location line="+40"/> <source>De&bug</source> <translation type="unfinished"></translation> </message> @@ -959,7 +1010,27 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+106"/> + <location line="+77"/> + <source>Octave Packages</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> + <source>Share Code</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> + <source>Contribute to Octave</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> + <source>Octave Developer Resources</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+32"/> <source>On Disk</source> <translation type="unfinished"></translation> </message> @@ -989,12 +1060,12 @@ <translation type="unfinished"></translation> </message> <message> - <location line="-392"/> + <location line="-412"/> <source>Load workspace</source> <translation type="unfinished"></translation> </message> <message> - <location line="+192"/> + <location line="+200"/> <source>&Window</source> <translation type="unfinished"></translation> </message> @@ -1045,12 +1116,12 @@ </message> <message> <location line="+3"/> - <location line="+108"/> + <location line="+120"/> <source>Documentation</source> <translation type="unfinished">Документация</translation> </message> <message> - <location line="-36"/> + <location line="-48"/> <source>&Help</source> <translation type="unfinished"></translation> </message> @@ -1059,39 +1130,25 @@ <source>Report Bug</source> <translation type="unfinished">Сообщить об ошибке</translation> </message> - <message> - <location line="+6"/> - <source>Visit Agora</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="-3"/> - <source>Visit Octave Forge</source> - <translation type="unfinished"></translation> - </message> </context> <context> <name>octave_dock_widget</name> <message> <location filename="../src/octave-dock-widget.cc" line="+52"/> + <location line="+129"/> <source>Undock widget</source> <translation type="unfinished"></translation> </message> <message> - <location line="+9"/> + <location line="-119"/> <source>Hide widget</source> <translation type="unfinished"></translation> </message> <message> - <location line="+82"/> + <location line="+86"/> <source>Dock widget</source> <translation type="unfinished"></translation> </message> - <message> - <location line="+29"/> - <source>Unock widget</source> - <translation type="unfinished"></translation> - </message> </context> <context> <name>octave_qscintilla</name> @@ -1157,12 +1214,7 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+7"/> - <source>Graphic icons</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+39"/> + <location line="+46"/> <source>Editor</source> <translation type="unfinished">Редактор</translation> </message> @@ -1272,12 +1324,12 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+46"/> + <location line="+45"/> <source>Font</source> <translation type="unfinished"></translation> </message> <message> - <location line="-745"/> + <location line="-744"/> <source>Show line numbers</source> <translation type="unfinished"></translation> </message> @@ -1297,7 +1349,12 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+548"/> + <location line="-72"/> + <source>Graphic icons</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+620"/> <source>emacs</source> <translation type="unfinished">emacs</translation> </message> @@ -1317,7 +1374,7 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+102"/> + <location line="+101"/> <source>Font size</source> <translation type="unfinished"></translation> </message> @@ -1387,7 +1444,7 @@ <translation type="unfinished"></translation> </message> <message> - <location line="-1108"/> + <location line="-1107"/> <source>Icon set for dock widgets</source> <translation type="unfinished"></translation> </message> @@ -1402,7 +1459,7 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+1099"/> + <location line="+1098"/> <source>Socks5Proxy</source> <translation type="unfinished"></translation> </message> @@ -1434,8 +1491,23 @@ <translation type="unfinished"></translation> </message> <message> - <location line="-137"/> - <source>Difference to the defalt size</source> + <location line="-268"/> + <source>IBeam Cursor</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>Block Cursor</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>Underline Cursor</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+129"/> + <source>Difference to the default size</source> <translation type="unfinished"></translation> </message> <message> @@ -1470,7 +1542,7 @@ <context> <name>webinfo</name> <message> - <location filename="../src/qtinfo/webinfo.cc" line="+78"/> + <location filename="../src/qtinfo/webinfo.cc" line="+80"/> <source>Type here and press 'Return' to search</source> <translation type="unfinished"></translation> </message> @@ -1483,48 +1555,38 @@ <context> <name>welcome_wizard</name> <message> - <location filename="../src/welcome-wizard.ui" line="+26"/> + <location filename="../src/welcome-wizard.ui" line="+29"/> <source>Welcome to GNU Octave</source> <translation type="unfinished"></translation> </message> <message> - <location line="+13"/> - <source>It appears that you have launched Octave GUI for the first time on this computer, since no configuration file could be found at '~/.octave-gui'. This wizard will guide you through the essential settings you should make before you can start using Octave GUI. If you want to transfer your settings you have previously made just close this dialog and copy over the settings file to your home folder. The presence of that file will automatically be detected and will skip this wizard. IMPORTANT: This wizard is not fully functional yet. Just click your way to the end and it will create a standard settings file.</source> + <location line="+20"/> + <source>You seem to be using the Octave graphical interface for the first time on this computer. Click 'Finish' to write a configuration file and launch Octave GUI. </source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+10"/> + <source>The configuration file is stored in __%1__. If that file exists, you will not see this dialog when Octave starts again.</source> <translation type="unfinished"></translation> </message> <message> - <location line="+41"/> - <location line="+50"/> - <location line="+52"/> - <location line="+52"/> - <source>Next</source> + <location line="+10"/> + <source><html><head/><body><p>For more information about Octave,</p> +<ul> +<li>visit <a href="http://octave.org"><span style=" text-decoration: underline; color:#0000ff;">http://octave.org</span></a>,</li> +<li> get the documentation online as <a href="http://www.gnu.org/software/octave/doc/interpreter/index.html"><span style=" text-decoration: underline; color:#0000ff;">html</span></a>- or <a href="http://www.gnu.org/software/octave/octave.pdf"><span style=" text-decoration: underline; color:#0000ff;">pdf</span></a>-document, or</li> +<li>open the documentation browser of Octave GUI with the help menu.</li> +</ul> +</body></html></source> <translation type="unfinished"></translation> </message> <message> - <location line="-124"/> - <location line="+52"/> - <location line="+52"/> - <location line="+87"/> - <source>Previous</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="-45"/> + <location line="-27"/> <source>Welcome to Octave!</source> <translation type="unfinished"></translation> </message> <message> - <location line="+7"/> - <source>This is the development version of Octave with the first official GUI.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+10"/> - <source>You seem to run Octave GUI for the first time on this computer. This assistant will help you to configure this software installation. Click 'Finish' to write a configuration file and launch Octave GUI.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+48"/> + <location line="+74"/> <source>Finish</source> <translation type="unfinished"></translation> </message>
--- a/libgui/languages/uk_UA.ts +++ b/libgui/languages/uk_UA.ts @@ -41,6 +41,645 @@ <source>persistent</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../qterminal/libqterminal/QTerminal.cc" line="+64"/> + <source>foreground</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>background</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>selection</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>cursor</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>QTerminal</name> + <message> + <location filename="../qterminal/libqterminal/QTerminal.h" line="+116"/> + <source>Copy</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+4"/> + <source>Paste</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+4"/> + <source>Clear All</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>QWinTerminalImpl</name> + <message> + <location filename="../qterminal/libqterminal/win32/QWinTerminalImpl.cpp" line="+1527"/> + <source>copied selection to clipboard</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>QsciLexerBatch</name> + <message> + <location filename="../../../qsci/qscilexerbatch.cpp" line="+179"/> + <source>Default</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> + <source>Comment</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> + <source>Keyword</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> + <source>Label</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> + <source>Hide command character</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> + <source>External command</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> + <source>Variable</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> + <source>Operator</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>QsciLexerCPP</name> + <message> + <location filename="../../../qsci/qscilexercpp.cpp" line="+352"/> + <source>Default</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> + <source>Inactive default</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> + <source>C comment</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> + <source>Inactive C comment</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> + <source>C++ comment</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> + <source>Inactive C++ comment</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> + <source>JavaDoc style C comment</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> + <source>Inactive JavaDoc style C comment</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> + <source>Number</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> + <source>Inactive number</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> + <source>Keyword</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> + <source>Inactive keyword</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> + <source>Double-quoted string</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> + <source>Inactive double-quoted string</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> + <source>Single-quoted string</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> + <source>Inactive single-quoted string</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> + <source>IDL UUID</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> + <source>Inactive IDL UUID</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> + <source>Pre-processor block</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> + <source>Inactive pre-processor block</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> + <source>Operator</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> + <source>Inactive operator</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> + <source>Identifier</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> + <source>Inactive identifier</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> + <source>Unclosed string</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> + <source>Inactive unclosed string</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> + <source>C# verbatim string</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> + <source>Inactive C# verbatim string</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> + <source>JavaScript regular expression</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> + <source>Inactive JavaScript regular expression</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> + <source>JavaDoc style C++ comment</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> + <source>Inactive JavaDoc style C++ comment</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> + <source>Secondary keywords and identifiers</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> + <source>Inactive secondary keywords and identifiers</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> + <source>JavaDoc keyword</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> + <source>Inactive JavaDoc keyword</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> + <source>JavaDoc keyword error</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> + <source>Inactive JavaDoc keyword error</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> + <source>Global classes and typedefs</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> + <source>Inactive global classes and typedefs</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> + <source>C++ raw string</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> + <source>Inactive C++ raw string</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>QsciLexerDiff</name> + <message> + <location filename="../../../qsci/qscilexerdiff.cpp" line="+107"/> + <source>Default</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> + <source>Comment</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> + <source>Command</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> + <source>Header</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> + <source>Position</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> + <source>Removed line</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> + <source>Added line</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> + <source>Changed line</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>QsciLexerMatlab</name> + <message> + <location filename="../../../qsci/qscilexermatlab.cpp" line="+138"/> + <source>Default</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> + <source>Comment</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> + <source>Command</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> + <source>Number</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> + <source>Keyword</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> + <source>Single-quoted string</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> + <source>Operator</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> + <source>Identifier</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> + <source>Double-quoted string</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>QsciLexerPerl</name> + <message> + <location filename="../../../qsci/qscilexerperl.cpp" line="+333"/> + <source>Default</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> + <source>Error</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> + <source>Comment</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> + <source>POD</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> + <source>Number</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> + <source>Keyword</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> + <source>Double-quoted string</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> + <source>Single-quoted string</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> + <source>Operator</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> + <source>Identifier</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> + <source>Scalar</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> + <source>Array</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> + <source>Hash</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> + <source>Symbol table</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> + <source>Regular expression</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> + <source>Substitution</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> + <source>Backticks</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> + <source>Data section</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> + <source>Here document delimiter</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> + <source>Single-quoted here document</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> + <source>Double-quoted here document</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> + <source>Backtick here document</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> + <source>Quoted string (q)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> + <source>Quoted string (qq)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> + <source>Quoted string (qx)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> + <source>Quoted string (qr)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> + <source>Quoted string (qw)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> + <source>POD verbatim</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> + <source>Subroutine prototype</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> + <source>Format identifier</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> + <source>Format body</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> + <source>Double-quoted string (interpolated variable)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> + <source>Translation</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> + <source>Regular expression (interpolated variable)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> + <source>Substitution (interpolated variable)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> + <source>Backticks (interpolated variable)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> + <source>Double-quoted here document (interpolated variable)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> + <source>Backtick here document (interpolated variable)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> + <source>Quoted string (qq, interpolated variable)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> + <source>Quoted string (qx, interpolated variable)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> + <source>Quoted string (qr, interpolated variable)</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>QsciScintilla</name> + <message> + <location filename="../../../qsci/qsciscintilla.cpp" line="+4201"/> + <source>&Undo</source> + <translation type="unfinished">В&ернути</translation> + </message> + <message> + <location line="+4"/> + <source>&Redo</source> + <translation type="unfinished">П&овторити</translation> + </message> + <message> + <location line="+6"/> + <source>Cu&t</source> + <translation type="unfinished">Виріза&ти</translation> + </message> + <message> + <location line="+5"/> + <source>&Copy</source> + <translation type="unfinished">&Копіювати</translation> + </message> + <message> + <location line="+6"/> + <source>&Paste</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+4"/> + <source>Delete</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+7"/> + <source>Select All</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>documentation_dock_widget</name> @@ -58,19 +697,19 @@ <context> <name>file_editor</name> <message> - <location filename="../src/m-editor/file-editor.cc" line="+294"/> + <location filename="../src/m-editor/file-editor.cc" line="+300"/> <location line="+49"/> <location line="+28"/> <source>Octave Editor</source> <translation type="unfinished"></translation> </message> <message> - <location line="-193"/> + <location line="-199"/> <source>Octave Files (*.m);;All Files (*)</source> <translation type="unfinished"></translation> </message> <message> - <location line="+117"/> + <location line="+123"/> <source>Could not open file %1 for read: %2.</source> <translation type="unfinished"></translation> @@ -93,7 +732,7 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+159"/> + <location line="+160"/> <source>&New File</source> <translation type="unfinished">&Створити</translation> </message> @@ -108,12 +747,12 @@ <translation type="unfinished">&Зберегти</translation> </message> <message> - <location line="+4"/> + <location line="+3"/> <source>Save File &As</source> <translation type="unfinished">Зберегти &як</translation> </message> <message> - <location line="+4"/> + <location line="+3"/> <source>Print</source> <translation type="unfinished"></translation> </message> @@ -143,17 +782,17 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+3"/> + <location line="+2"/> <source>&Next Bookmark</source> <translation type="unfinished">До &наступної закладки</translation> </message> <message> - <location line="+3"/> + <location line="+2"/> <source>Pre&vious Bookmark</source> <translation type="unfinished">До &попередньої закладки</translation> </message> <message> - <location line="+3"/> + <location line="+2"/> <source>Toggle &Bookmark</source> <translation type="unfinished">В&становити/видалити закладку</translation> </message> @@ -193,27 +832,27 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+73"/> + <location line="+63"/> <source>&Recent Editor Files</source> <translation type="unfinished"></translation> </message> <message> - <location line="+15"/> + <location line="+16"/> <source>&Close</source> <translation type="unfinished"></translation> </message> <message> + <location line="+4"/> + <source>Close All</source> + <translation type="unfinished"></translation> + </message> + <message> <location line="+5"/> - <source>Close All</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+4"/> <source>Close Other Files</source> <translation type="unfinished"></translation> </message> <message> - <location line="-94"/> + <location line="-85"/> <source>&Find and Replace</source> <translation type="unfinished"></translation> </message> @@ -228,12 +867,12 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+63"/> + <location line="+53"/> <source>&File</source> <translation type="unfinished">&Файл</translation> </message> <message> - <location line="+35"/> + <location line="+36"/> <source>&Edit</source> <translation type="unfinished">&Правка</translation> </message> @@ -278,14 +917,14 @@ <message> <location line="+4"/> <location line="+114"/> - <location line="+104"/> + <location line="+109"/> <location line="+66"/> <location line="+22"/> <source>Octave Editor</source> <translation type="unfinished"></translation> </message> <message> - <location line="-305"/> + <location line="-310"/> <source>The file %1 is about to be closed but has been modified. @@ -293,7 +932,7 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+184"/> + <location line="+189"/> <source>Octave Files (*.m);;All Files (*)</source> <translation type="unfinished"></translation> </message> @@ -319,13 +958,13 @@ <translation type="unfinished"></translation> </message> <message> - <location line="-192"/> + <location line="-197"/> <source>Could not open file %1 for write: %2.</source> <translation type="unfinished"></translation> </message> <message> - <location line="+170"/> + <location line="+175"/> <source>It seems that '%1' has been modified by another application. Do you want to reload it?</source> <translation type="unfinished"></translation> </message> @@ -475,7 +1114,7 @@ </message> <message> <location line="-10"/> - <source>Are you sre you want to delete + <source>Are you sure you want to delete </source> <translation type="unfinished"></translation> </message> @@ -485,12 +1124,12 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+128"/> + <location line="+131"/> <source>Set directory of file browser</source> <translation type="unfinished"></translation> </message> <message> - <location line="+27"/> + <location line="+28"/> <source>Create File</source> <translation type="unfinished"></translation> </message> @@ -585,7 +1224,7 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+61"/> + <location line="+71"/> <source>Search from end</source> <translation type="unfinished"></translation> </message> @@ -708,12 +1347,12 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+10"/> + <location line="+11"/> <source>Search results</source> <translation type="unfinished"></translation> </message> <message> - <location line="+10"/> + <location line="+14"/> <source>Idle.</source> <translation type="unfinished"></translation> </message> @@ -748,7 +1387,7 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+100"/> + <location line="+99"/> <source>Searching...</source> <translation type="unfinished"></translation> </message> @@ -761,7 +1400,7 @@ <context> <name>find_files_model</name> <message> - <location filename="../src/find-files-model.cc" line="+29"/> + <location filename="../src/find-files-model.cc" line="+76"/> <source>Filename</source> <translation type="unfinished"></translation> </message> @@ -774,7 +1413,7 @@ <context> <name>history_dock_widget</name> <message> - <location filename="../src/history-dock-widget.cc" line="+42"/> + <location filename="../src/history-dock-widget.cc" line="+43"/> <source>Browse and search the command history.</source> <translation type="unfinished">Перегляд і пошук серед історії виконаних команд.</translation> </message> @@ -812,23 +1451,23 @@ <context> <name>main_window</name> <message> - <location filename="../src/main-window.cc" line="+155"/> + <location filename="../src/main-window.cc" line="+160"/> <source>Load Workspace</source> <translation type="unfinished">Завантажити область змінних</translation> </message> <message> - <location line="+355"/> - <location line="+769"/> + <location line="+388"/> + <location line="+835"/> <source>About Octave</source> <translation type="unfinished">Про Octave</translation> </message> <message> - <location line="-338"/> + <location line="-354"/> <source>&File</source> <translation type="unfinished">&Файл</translation> </message> <message> - <location line="+52"/> + <location line="+54"/> <source>New</source> <translation type="unfinished"></translation> </message> @@ -838,7 +1477,7 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+2"/> + <location line="+3"/> <source>Function</source> <translation type="unfinished"></translation> </message> @@ -848,12 +1487,12 @@ <translation type="unfinished"></translation> </message> <message> - <location line="-55"/> + <location line="-58"/> <source>Open...</source> <translation type="unfinished"></translation> </message> <message> - <location line="+18"/> + <location line="+20"/> <source>Preferences...</source> <translation type="unfinished"></translation> </message> @@ -863,7 +1502,7 @@ <translation type="unfinished">Вийти</translation> </message> <message> - <location line="+51"/> + <location line="+52"/> <source>&Edit</source> <translation type="unfinished">&Правка</translation> </message> @@ -878,28 +1517,33 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+5"/> + <location line="+6"/> <source>Paste</source> <translation type="unfinished"></translation> </message> <message> - <location line="-895"/> - <location line="+817"/> + <location line="-982"/> + <location line="+902"/> <source>Save Workspace As</source> <translation type="unfinished"></translation> </message> <message> - <location line="-602"/> + <location line="-655"/> <source>Set working directory</source> <translation type="unfinished"></translation> </message> <message> - <location line="+686"/> + <location line="+739"/> + <source>Clear Clipboard</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+5"/> <source>Find Files...</source> <translation type="unfinished"></translation> </message> <message> - <location line="+6"/> + <location line="+5"/> <source>Clear Command Window</source> <translation type="unfinished"></translation> </message> @@ -914,7 +1558,7 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+36"/> + <location line="+40"/> <source>De&bug</source> <translation type="unfinished"></translation> </message> @@ -959,7 +1603,27 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+106"/> + <location line="+77"/> + <source>Octave Packages</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> + <source>Share Code</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> + <source>Contribute to Octave</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> + <source>Octave Developer Resources</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+32"/> <source>On Disk</source> <translation type="unfinished"></translation> </message> @@ -989,12 +1653,12 @@ <translation type="unfinished"></translation> </message> <message> - <location line="-392"/> + <location line="-412"/> <source>Load workspace</source> <translation type="unfinished"></translation> </message> <message> - <location line="+192"/> + <location line="+200"/> <source>&Window</source> <translation type="unfinished"></translation> </message> @@ -1045,12 +1709,12 @@ </message> <message> <location line="+3"/> - <location line="+108"/> + <location line="+120"/> <source>Documentation</source> <translation type="unfinished">Документація</translation> </message> <message> - <location line="-36"/> + <location line="-48"/> <source>&Help</source> <translation type="unfinished"></translation> </message> @@ -1059,39 +1723,25 @@ <source>Report Bug</source> <translation type="unfinished">Повідомити про помилку</translation> </message> - <message> - <location line="+6"/> - <source>Visit Agora</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="-3"/> - <source>Visit Octave Forge</source> - <translation type="unfinished"></translation> - </message> </context> <context> <name>octave_dock_widget</name> <message> <location filename="../src/octave-dock-widget.cc" line="+52"/> + <location line="+129"/> <source>Undock widget</source> <translation type="unfinished"></translation> </message> <message> - <location line="+9"/> + <location line="-119"/> <source>Hide widget</source> <translation type="unfinished"></translation> </message> <message> - <location line="+82"/> + <location line="+86"/> <source>Dock widget</source> <translation type="unfinished"></translation> </message> - <message> - <location line="+29"/> - <source>Unock widget</source> - <translation type="unfinished"></translation> - </message> </context> <context> <name>octave_qscintilla</name> @@ -1157,12 +1807,7 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+7"/> - <source>Graphic icons</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+39"/> + <location line="+46"/> <source>Editor</source> <translation type="unfinished">Редактор</translation> </message> @@ -1272,12 +1917,12 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+46"/> + <location line="+45"/> <source>Font</source> <translation type="unfinished"></translation> </message> <message> - <location line="-745"/> + <location line="-744"/> <source>Show line numbers</source> <translation type="unfinished"></translation> </message> @@ -1297,7 +1942,12 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+548"/> + <location line="-72"/> + <source>Graphic icons</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+620"/> <source>emacs</source> <translation type="unfinished">emacs</translation> </message> @@ -1317,7 +1967,7 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+102"/> + <location line="+101"/> <source>Font size</source> <translation type="unfinished"></translation> </message> @@ -1387,7 +2037,7 @@ <translation type="unfinished"></translation> </message> <message> - <location line="-1108"/> + <location line="-1107"/> <source>Icon set for dock widgets</source> <translation type="unfinished"></translation> </message> @@ -1402,7 +2052,7 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+1099"/> + <location line="+1098"/> <source>Socks5Proxy</source> <translation type="unfinished"></translation> </message> @@ -1434,8 +2084,23 @@ <translation type="unfinished"></translation> </message> <message> - <location line="-137"/> - <source>Difference to the defalt size</source> + <location line="-268"/> + <source>IBeam Cursor</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>Block Cursor</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>Underline Cursor</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+129"/> + <source>Difference to the default size</source> <translation type="unfinished"></translation> </message> <message> @@ -1470,7 +2135,7 @@ <context> <name>webinfo</name> <message> - <location filename="../src/qtinfo/webinfo.cc" line="+78"/> + <location filename="../src/qtinfo/webinfo.cc" line="+80"/> <source>Type here and press 'Return' to search</source> <translation type="unfinished"></translation> </message> @@ -1483,48 +2148,38 @@ <context> <name>welcome_wizard</name> <message> - <location filename="../src/welcome-wizard.ui" line="+26"/> + <location filename="../src/welcome-wizard.ui" line="+29"/> <source>Welcome to GNU Octave</source> <translation type="unfinished"></translation> </message> <message> - <location line="+13"/> - <source>It appears that you have launched Octave GUI for the first time on this computer, since no configuration file could be found at '~/.octave-gui'. This wizard will guide you through the essential settings you should make before you can start using Octave GUI. If you want to transfer your settings you have previously made just close this dialog and copy over the settings file to your home folder. The presence of that file will automatically be detected and will skip this wizard. IMPORTANT: This wizard is not fully functional yet. Just click your way to the end and it will create a standard settings file.</source> + <location line="+20"/> + <source>You seem to be using the Octave graphical interface for the first time on this computer. Click 'Finish' to write a configuration file and launch Octave GUI. </source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+10"/> + <source>The configuration file is stored in __%1__. If that file exists, you will not see this dialog when Octave starts again.</source> <translation type="unfinished"></translation> </message> <message> - <location line="+41"/> - <location line="+50"/> - <location line="+52"/> - <location line="+52"/> - <source>Next</source> + <location line="+10"/> + <source><html><head/><body><p>For more information about Octave,</p> +<ul> +<li>visit <a href="http://octave.org"><span style=" text-decoration: underline; color:#0000ff;">http://octave.org</span></a>,</li> +<li> get the documentation online as <a href="http://www.gnu.org/software/octave/doc/interpreter/index.html"><span style=" text-decoration: underline; color:#0000ff;">html</span></a>- or <a href="http://www.gnu.org/software/octave/octave.pdf"><span style=" text-decoration: underline; color:#0000ff;">pdf</span></a>-document, or</li> +<li>open the documentation browser of Octave GUI with the help menu.</li> +</ul> +</body></html></source> <translation type="unfinished"></translation> </message> <message> - <location line="-124"/> - <location line="+52"/> - <location line="+52"/> - <location line="+87"/> - <source>Previous</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="-45"/> + <location line="-27"/> <source>Welcome to Octave!</source> <translation type="unfinished"></translation> </message> <message> - <location line="+7"/> - <source>This is the development version of Octave with the first official GUI.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+10"/> - <source>You seem to run Octave GUI for the first time on this computer. This assistant will help you to configure this software installation. Click 'Finish' to write a configuration file and launch Octave GUI.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+48"/> + <location line="+74"/> <source>Finish</source> <translation type="unfinished"></translation> </message>
--- a/libgui/src/main-window.cc +++ b/libgui/src/main-window.cc @@ -273,7 +273,7 @@ void main_window::open_developer_page (void) { - QDesktopServices::openUrl (QUrl ("http://ocxtave.org/get-involved.html")); + QDesktopServices::openUrl (QUrl ("http://octave.org/get-involved.html")); } void
--- a/libgui/src/octave-gui.cc +++ b/libgui/src/octave-gui.cc @@ -38,8 +38,11 @@ #include "lo-utils.h" #include "oct-env.h" +#include "oct-syscalls.h" #include "syswait.h" +#include "sighandlers.h" + #include "welcome-wizard.h" #include "resource-manager.h" #include "main-window.h" @@ -73,8 +76,7 @@ { // Parent - // FIXME -- we should catch signals and pass them on to the child - // process in some way, possibly translating SIGINT to SIGTERM. + install_gui_driver_signal_handlers (pid); int status; @@ -88,12 +90,20 @@ } int -octave_start_gui (int argc, char *argv[]) +octave_start_gui (int argc, char *argv[], bool fork) { - dissociate_terminal (); + if (fork) + dissociate_terminal (); QApplication application (argc, argv); + // install translators for the gui and qt text + QTranslator gui_tr, qt_tr, qsci_tr; + resource_manager::config_translators (&qt_tr,&qsci_tr,&gui_tr); + application.installTranslator (&qt_tr); + application.installTranslator (&qsci_tr); + application.installTranslator (&gui_tr); + while (true) { if (resource_manager::is_first_run ()) @@ -104,13 +114,6 @@ } else { - // install translators for the gui and qt text - QTranslator gui_tr, qt_tr, qsci_tr; - resource_manager::config_translators (&qt_tr,&qsci_tr,&gui_tr); - application.installTranslator (&qt_tr); - application.installTranslator (&qsci_tr); - application.installTranslator (&gui_tr); - // update network-settings resource_manager::update_network_settings ();
--- a/libgui/src/octave-gui.h +++ b/libgui/src/octave-gui.h @@ -23,6 +23,7 @@ #if !defined (octave_octave_gui_h) #define octave_octave_gui_h 1 -extern OCTGUI_API int octave_start_gui (int argc, char **argv); +extern OCTGUI_API int octave_start_gui (int argc, char **argv, + bool fork = true); #endif
--- a/libinterp/corefcn/gl-render.cc +++ b/libinterp/corefcn/gl-render.cc @@ -1600,6 +1600,9 @@ i1 = i2 = j1 = j2 = 0; + if ((fc_mode > 0 && fc_mode < 3) || ec_mode > 0) + c = props.get_color_data ().array_value (); + boolMatrix clip (z.dims (), false); for (int i = 0; i < zr; i++) @@ -1613,12 +1616,11 @@ j1 = j; clip(i,j) = is_nan_or_inf (x(i1,j), y(i,j1), z(i,j)); + if (fc_mode == 1 || fc_mode == 2) + clip(i,j) |= (xisnan (c(i,j)) || xisinf (c(i,j))); } } - if ((fc_mode > 0 && fc_mode < 3) || ec_mode > 0) - c = props.get_color_data ().array_value (); - if (fa_mode > 0 || ea_mode > 0) { // FIXME: implement alphadata conversion
--- a/libinterp/corefcn/graphics.cc +++ b/libinterp/corefcn/graphics.cc @@ -1927,22 +1927,6 @@ return m; } -graphics_handle::graphics_handle (const octave_value& a) - : val (octave_NaN) -{ - if (a.is_empty ()) - /* do nothing */; - else - { - double tval = a.double_value (); - - if (! error_state) - val = tval; - else - error ("invalid graphics handle"); - } -} - // Set properties given as a cs-list of name, value pairs. void @@ -4630,7 +4614,7 @@ double yo = ylimits(yd > 0 ? 0 : 1); double zo = zlimits(zd > 0 ? 0 : 1); - Matrix pb = get_plotboxaspectratio ().matrix_value (); + Matrix pb = get_plotboxaspectratio ().matrix_value (); bool autocam = (camerapositionmode_is ("auto") && cameratargetmode_is ("auto") @@ -9104,25 +9088,27 @@ if (go.isa ("surface")) nd = 3; - - if ((go.isa ("line") || go.isa ("patch")) && ! go.get("zdata").is_empty ()) + else if ((go.isa ("line") || go.isa ("patch")) + && ! go.get ("zdata").is_empty ()) nd = 3; - - Matrix kids = go.get_properties ().get_children (); - - for (octave_idx_type i = 0; i < kids.length (); i++) - { - graphics_handle hnd = gh_manager::lookup (kids(i)); - - if (hnd.ok ()) - { - const graphics_object& kid = gh_manager::get_object (hnd); - - if (kid.valid_object ()) - nd = calc_dimensions (kid); - - if (nd == 3) - break; + else + { + Matrix kids = go.get_properties ().get_children (); + + for (octave_idx_type i = 0; i < kids.length (); i++) + { + graphics_handle hnd = gh_manager::lookup (kids(i)); + + if (hnd.ok ()) + { + const graphics_object& kid = gh_manager::get_object (hnd); + + if (kid.valid_object ()) + nd = calc_dimensions (kid); + + if (nd == 3) + break; + } } } @@ -9142,17 +9128,15 @@ int nargin = args.length (); - if (nargin == 1) - { - double h = args(0).double_value (); - - if (! error_state) - retval = calc_dimensions (gh_manager::get_object (h)); - else - error ("__calc_dimensions__: expecting graphics handle as only argument"); - } + if (nargin != 1) + print_usage (); + + double h = args(0).double_value (); + + if (! error_state) + retval = calc_dimensions (gh_manager::get_object (h)); else - print_usage (); + error ("__calc_dimensions__: expecting graphics handle as only argument"); return retval; }
--- a/libinterp/corefcn/graphics.in.h +++ b/libinterp/corefcn/graphics.in.h @@ -37,9 +37,9 @@ #include <string> #include "caseless-str.h" -#include "lo-ieee.h" #include "gripes.h" +#include "oct-handle.h" #include "oct-map.h" #include "oct-mutex.h" #include "oct-refcount.h" @@ -53,107 +53,7 @@ #define OCTAVE_DEFAULT_FONTNAME "*" #endif -// --------------------------------------------------------------------- - -class graphics_handle -{ -public: - graphics_handle (void) : val (octave_NaN) { } - - graphics_handle (const octave_value& a); - - graphics_handle (int a) : val (a) { } - - graphics_handle (double a) : val (a) { } - - graphics_handle (const graphics_handle& a) : val (a.val) { } - - graphics_handle& operator = (const graphics_handle& a) - { - if (&a != this) - val = a.val; - - return *this; - } - - ~graphics_handle (void) { } - - double value (void) const { return val; } - - octave_value as_octave_value (void) const - { - return ok () ? octave_value (val) : octave_value (Matrix ()); - } - - // Prefix increment/decrement operators. - graphics_handle& operator ++ (void) - { - ++val; - return *this; - } - - graphics_handle& operator -- (void) - { - --val; - return *this; - } - - // Postfix increment/decrement operators. - const graphics_handle operator ++ (int) - { - graphics_handle old_value = *this; - ++(*this); - return old_value; - } - - const graphics_handle operator -- (int) - { - graphics_handle old_value = *this; - --(*this); - return old_value; - } - - bool ok (void) const { return ! xisnan (val); } - -private: - double val; -}; - -inline bool -operator == (const graphics_handle& a, const graphics_handle& b) -{ - return a.value () == b.value (); -} - -inline bool -operator != (const graphics_handle& a, const graphics_handle& b) -{ - return a.value () != b.value (); -} - -inline bool -operator < (const graphics_handle& a, const graphics_handle& b) -{ - return a.value () < b.value (); -} - -inline bool -operator <= (const graphics_handle& a, const graphics_handle& b) -{ - return a.value () <= b.value (); -} - -inline bool -operator >= (const graphics_handle& a, const graphics_handle& b) -{ - return a.value () >= b.value (); -} - -inline bool -operator > (const graphics_handle& a, const graphics_handle& b) -{ - return a.value () > b.value (); -} +typedef octave_handle graphics_handle; // ---------------------------------------------------------------------
--- a/libinterp/corefcn/module.mk +++ b/libinterp/corefcn/module.mk @@ -44,7 +44,6 @@ COREFCN_INC = \ corefcn/Cell.h \ - corefcn/action-container.h \ corefcn/c-file-ptr-stream.h \ corefcn/comment-list.h \ corefcn/cutils.h \ @@ -81,6 +80,7 @@ corefcn/mxarray.in.h \ corefcn/oct-errno.h \ corefcn/oct-fstrm.h \ + corefcn/oct-handle.h \ corefcn/oct-hdf5.h \ corefcn/oct-hist.h \ corefcn/oct-iostrm.h \ @@ -107,7 +107,6 @@ corefcn/toplev.h \ corefcn/txt-eng-ft.h \ corefcn/txt-eng.h \ - corefcn/unwind-prot.h \ corefcn/utils.h \ corefcn/variables.h \ corefcn/workspace-element.h \ @@ -255,7 +254,7 @@ corefcn/txt-eng.cc \ corefcn/txt-eng-ft.cc \ corefcn/typecast.cc \ - corefcn/unwind-prot.cc \ + corefcn/urlwrite.cc \ corefcn/utils.cc \ corefcn/variables.cc \ corefcn/xdiv.cc \
new file mode 100644 --- /dev/null +++ b/libinterp/corefcn/oct-handle.h @@ -0,0 +1,147 @@ +/* + +Copyright (C) 2007-2012 John W. Eaton + +This file is part of Octave. + +Octave is free software; you can redistribute it and/or modify it +under the terms of the GNU General Public License as published by the +Free Software Foundation; either version 3 of the License, or (at your +option) any later version. + +Octave is distributed in the hope that it will be useful, but WITHOUT +ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +for more details. + +You should have received a copy of the GNU General Public License +along with Octave; see the file COPYING. If not, see +<http://www.gnu.org/licenses/>. + +*/ + +#if !defined (octave_handle_h) +#define octave_handle_h 1 + +#include "dMatrix.h" +#include "lo-ieee.h" + +#include "ov.h" + +// --------------------------------------------------------------------- + +class octave_handle +{ +public: + octave_handle (void) : val (octave_NaN) { } + + octave_handle (const octave_value& a) + : val (octave_NaN) + { + if (a.is_empty ()) + /* do nothing */; + else + { + double tval = a.double_value (); + + if (! error_state) + val = tval; + else + error ("invalid handle"); + } + } + + octave_handle (int a) : val (a) { } + + octave_handle (double a) : val (a) { } + + octave_handle (const octave_handle& a) : val (a.val) { } + + octave_handle& operator = (const octave_handle& a) + { + if (&a != this) + val = a.val; + + return *this; + } + + ~octave_handle (void) { } + + double value (void) const { return val; } + + octave_value as_octave_value (void) const + { + return ok () ? octave_value (val) : octave_value (Matrix ()); + } + + // Prefix increment/decrement operators. + octave_handle& operator ++ (void) + { + ++val; + return *this; + } + + octave_handle& operator -- (void) + { + --val; + return *this; + } + + // Postfix increment/decrement operators. + const octave_handle operator ++ (int) + { + octave_handle old_value = *this; + ++(*this); + return old_value; + } + + const octave_handle operator -- (int) + { + octave_handle old_value = *this; + --(*this); + return old_value; + } + + bool ok (void) const { return ! xisnan (val); } + +private: + double val; +}; + +inline bool +operator == (const octave_handle& a, const octave_handle& b) +{ + return a.value () == b.value (); +} + +inline bool +operator != (const octave_handle& a, const octave_handle& b) +{ + return a.value () != b.value (); +} + +inline bool +operator < (const octave_handle& a, const octave_handle& b) +{ + return a.value () < b.value (); +} + +inline bool +operator <= (const octave_handle& a, const octave_handle& b) +{ + return a.value () <= b.value (); +} + +inline bool +operator >= (const octave_handle& a, const octave_handle& b) +{ + return a.value () >= b.value (); +} + +inline bool +operator > (const octave_handle& a, const octave_handle& b) +{ + return a.value () > b.value (); +} + +#endif
--- a/libinterp/corefcn/sighandlers.cc +++ b/libinterp/corefcn/sighandlers.cc @@ -577,6 +577,137 @@ } +static pid_t gui_pid = 0; + +static void +gui_driver_sig_handler (int sig) +{ + if (gui_pid > 0) + octave_syscalls::kill (gui_pid, sig); +} + +void +install_gui_driver_signal_handlers (pid_t pid) +{ + gui_pid = pid; + +#ifdef SIGINT + octave_set_signal_handler (SIGINT, gui_driver_sig_handler); +#endif + +#ifdef SIGBREAK + octave_set_signal_handler (SIGBREAK, gui_driver_sig_handler); +#endif + +#ifdef SIGABRT + octave_set_signal_handler (SIGABRT, gui_driver_sig_handler); +#endif + +#ifdef SIGALRM + octave_set_signal_handler (SIGALRM, gui_driver_sig_handler); +#endif + +#ifdef SIGBUS + octave_set_signal_handler (SIGBUS, gui_driver_sig_handler); +#endif + + // SIGCHLD + // SIGCLD + // SIGCONT + +#ifdef SIGEMT + octave_set_signal_handler (SIGEMT, gui_driver_sig_handler); +#endif + +#ifdef SIGFPE + octave_set_signal_handler (SIGFPE, gui_driver_sig_handler); +#endif + +#ifdef SIGHUP + octave_set_signal_handler (SIGHUP, gui_driver_sig_handler); +#endif + +#ifdef SIGILL + octave_set_signal_handler (SIGILL, gui_driver_sig_handler); +#endif + + // SIGINFO + // SIGINT + +#ifdef SIGIOT + octave_set_signal_handler (SIGIOT, gui_driver_sig_handler); +#endif + +#ifdef SIGLOST + octave_set_signal_handler (SIGLOST, gui_driver_sig_handler); +#endif + +#ifdef SIGPIPE + octave_set_signal_handler (SIGPIPE, gui_driver_sig_handler); +#endif + +#ifdef SIGPOLL + octave_set_signal_handler (SIGPOLL, gui_driver_sig_handler); +#endif + + // SIGPROF + // SIGPWR + +#ifdef SIGQUIT + octave_set_signal_handler (SIGQUIT, gui_driver_sig_handler); +#endif + +#ifdef SIGSEGV + octave_set_signal_handler (SIGSEGV, gui_driver_sig_handler); +#endif + + // SIGSTOP + +#ifdef SIGSYS + octave_set_signal_handler (SIGSYS, gui_driver_sig_handler); +#endif + +#ifdef SIGTERM + octave_set_signal_handler (SIGTERM, gui_driver_sig_handler); +#endif + +#ifdef SIGTRAP + octave_set_signal_handler (SIGTRAP, gui_driver_sig_handler); +#endif + + // SIGTSTP + // SIGTTIN + // SIGTTOU + // SIGURG + +#ifdef SIGUSR1 + octave_set_signal_handler (SIGUSR1, gui_driver_sig_handler); +#endif + +#ifdef SIGUSR2 + octave_set_signal_handler (SIGUSR2, gui_driver_sig_handler); +#endif + +#ifdef SIGVTALRM + octave_set_signal_handler (SIGVTALRM, gui_driver_sig_handler); +#endif + +#ifdef SIGIO + octave_set_signal_handler (SIGIO, gui_driver_sig_handler); +#endif + + // SIGWINCH + +#ifdef SIGXCPU + octave_set_signal_handler (SIGXCPU, gui_driver_sig_handler); +#endif + +#ifdef SIGXFSZ + octave_set_signal_handler (SIGXFSZ, gui_driver_sig_handler); +#endif + +} + static octave_scalar_map make_sig_struct (void) {
--- a/libinterp/corefcn/sighandlers.h +++ b/libinterp/corefcn/sighandlers.h @@ -71,6 +71,8 @@ extern OCTINTERP_API void install_signal_handlers (void); +extern OCTINTERP_API void install_gui_driver_signal_handlers (pid_t pid); + extern OCTINTERP_API void octave_signal_handler (void); extern OCTINTERP_API octave_interrupt_handler octave_catch_interrupts (void);
rename from libinterp/dldfcn/urlwrite.cc rename to libinterp/corefcn/urlwrite.cc --- a/libinterp/dldfcn/urlwrite.cc +++ b/libinterp/corefcn/urlwrite.cc @@ -38,9 +38,12 @@ #include "file-ops.h" #include "file-stat.h" #include "oct-env.h" +#include "oct-handle.h" #include "glob-match.h" +#include "singleton-cleanup.h" +#include "url-transfer.h" -#include "defun-dld.h" +#include "defun.h" #include "error.h" #include "oct-obj.h" #include "ov-cell.h" @@ -48,643 +51,238 @@ #include "oct-map.h" #include "oct-refcount.h" #include "unwind-prot.h" -#include "gripes.h" -#ifdef HAVE_CURL - -#include <curl/curl.h> -#include <curl/curlver.h> -#include <curl/easy.h> - -static int -write_data (void *buffer, size_t size, size_t nmemb, void *streamp) +static void +delete_file (const std::string& file) { - std::ostream& stream = *(static_cast<std::ostream*> (streamp)); - stream.write (static_cast<const char*> (buffer), size*nmemb); - return (stream.fail () ? 0 : size * nmemb); -} - -static int -read_data (void *buffer, size_t size, size_t nmemb, void *streamp) -{ - std::istream& stream = *(static_cast<std::istream*> (streamp)); - stream.read (static_cast<char*> (buffer), size*nmemb); - if (stream.eof ()) - return stream.gcount (); - else - return (stream.fail () ? 0 : size * nmemb); -} - -static size_t -throw_away (void *, size_t size, size_t nmemb, void *) -{ - return static_cast<size_t>(size * nmemb); + octave_unlink (file); } -class -curl_handle -{ -private: - class - curl_handle_rep - { - public: - curl_handle_rep (void) : count (1), valid (true), ascii (false) - { - curl = curl_easy_init (); - if (!curl) - error ("can not create curl handle"); - } - - ~curl_handle_rep (void) - { - if (curl) - curl_easy_cleanup (curl); - } - - bool is_valid (void) const - { - return valid; - } - - bool perform (bool curlerror) const - { - bool retval = false; - if (!error_state) - { - BEGIN_INTERRUPT_IMMEDIATELY_IN_FOREIGN_CODE; +typedef octave_handle curl_handle; - errnum = curl_easy_perform (curl); - if (errnum != CURLE_OK) - { - if (curlerror) - error ("%s", curl_easy_strerror (errnum)); - } - else - retval = true; - - END_INTERRUPT_IMMEDIATELY_IN_FOREIGN_CODE; - } - return retval; - } - - CURL* handle (void) const - { - return curl; - } +class OCTINTERP_API ch_manager +{ +protected: - bool is_ascii (void) const - { - return ascii; - } - - bool is_binary (void) const - { - return !ascii; - } - - octave_refcount<size_t> count; - std::string host; - std::string url; - std::string userpwd; - bool valid; - bool ascii; - mutable CURLcode errnum; - - private: - CURL *curl; - - // No copying! - - curl_handle_rep (const curl_handle_rep& ov); - - curl_handle_rep& operator = (const curl_handle_rep&); - }; + ch_manager (void) + : handle_map (), handle_free_list (), + next_handle (-1.0 - (rand () + 1.0) / (RAND_MAX + 2.0)) { } public: -// I'd love to rewrite this as a private method of the curl_handle -// class, but you can't pass the va_list from the wrapper setopt to -// the curl_easy_setopt function. -#define setopt(option, parameter) \ - { \ - CURLcode res = curl_easy_setopt (rep->handle (), option, parameter); \ - if (res != CURLE_OK) \ - error ("%s", curl_easy_strerror (res)); \ + static void create_instance (void); + + static bool instance_ok (void) + { + bool retval = true; + + if (! instance) + create_instance (); + + if (! instance) + { + ::error ("unable to create ch_manager!"); + + retval = false; + } + + return retval; + } + + static void cleanup_instance (void) { delete instance; instance = 0; } + + static curl_handle get_handle (void) + { + return instance_ok () + ? instance->do_get_handle () : curl_handle (); + } + + static void free (const curl_handle& h) + { + if (instance_ok ()) + instance->do_free (h); + } + + static curl_handle lookup (double val) + { + return instance_ok () ? instance->do_lookup (val) : curl_handle (); + } + + static curl_handle lookup (const octave_value& val) + { + return val.is_real_scalar () + ? lookup (val.double_value ()) : curl_handle (); + } + + static url_transfer get_object (double val) + { + return get_object (lookup (val)); + } + + static url_transfer get_object (const octave_value& val) + { + return get_object (lookup (val)); + } + + static url_transfer get_object (const curl_handle& h) + { + return instance_ok () ? instance->do_get_object (h) : url_transfer (); + } + + static curl_handle make_curl_handle (const std::string& host, + const std::string& user, + const std::string& passwd, + std::ostream& os) + { + return instance_ok () + ? instance->do_make_curl_handle (host, user, passwd, os) : curl_handle (); + } + + static Matrix handle_list (void) + { + return instance_ok () ? instance->do_handle_list () : Matrix (); } - curl_handle (void) : rep (new curl_handle_rep ()) - { - rep->valid = false; - } +private: - curl_handle (const std::string& _host, const std::string& user, - const std::string& passwd) : - rep (new curl_handle_rep ()) - { - rep->host = _host; - init (user, passwd, std::cin, octave_stdout); + static ch_manager *instance; - rep->url = "ftp://" + _host; - setopt (CURLOPT_URL, rep->url.c_str ()); - - // Setup the link, with no transfer - if (!error_state) - perform (); - } + typedef std::map<curl_handle, url_transfer>::iterator iterator; + typedef std::map<curl_handle, url_transfer>::const_iterator const_iterator; - curl_handle (const std::string& url, const std::string& method, - const Cell& param, std::ostream& os, bool& retval) : - rep (new curl_handle_rep ()) - { - retval = false; + typedef std::set<curl_handle>::iterator free_list_iterator; + typedef std::set<curl_handle>::const_iterator const_free_list_iterator; - init ("", "", std::cin, os); + // A map of handles to curl objects. + std::map<curl_handle, url_transfer> handle_map; - setopt (CURLOPT_NOBODY, 0); + // The available curl handles. + std::set<curl_handle> handle_free_list; - // Restore the default HTTP request method to GET after setting - // NOBODY to true and back to false. This is needed for backward - // compatibility with versions of libcurl < 7.18.2. - setopt (CURLOPT_HTTPGET, 1); - - // Don't need to store the parameters here as we can't change - // the URL after the handle is created - std::string query_string = form_query_string (param); + // The next handle available if handle_free_list is empty. + double next_handle; - if (method == "get") - { - query_string = url + "?" + query_string; - setopt (CURLOPT_URL, query_string.c_str ()); - } - else if (method == "post") - { - setopt (CURLOPT_URL, url.c_str ()); - setopt (CURLOPT_POSTFIELDS, query_string.c_str ()); - } - else - setopt (CURLOPT_URL, url.c_str ()); + curl_handle do_get_handle (void); + + void do_free (const curl_handle& h); - if (!error_state) - retval = perform (false); - } + curl_handle do_lookup (double val) + { + iterator p = (xisnan (val) ? handle_map.end () : handle_map.find (val)); - curl_handle (const curl_handle& h) : rep (h.rep) - { - rep->count++; - } - - ~curl_handle (void) - { - if (--rep->count == 0) - delete rep; - } + return (p != handle_map.end ()) ? p->first : curl_handle (); + } - curl_handle& operator = (const curl_handle& h) - { - if (this != &h) - { - if (--rep->count == 0) - delete rep; + url_transfer do_get_object (const curl_handle& h) + { + iterator p = (h.ok () ? handle_map.find (h) : handle_map.end ()); - rep = h.rep; - rep->count++; - } - return *this; - } + return (p != handle_map.end ()) ? p->second : url_transfer (); + } - bool is_valid (void) const - { - return rep->is_valid (); - } - - std::string lasterror (void) const - { - return std::string (curl_easy_strerror (rep->errnum)); - } - - void set_ostream (std::ostream& os) const - { - setopt (CURLOPT_WRITEDATA, static_cast<void*> (&os)); - } + curl_handle do_make_curl_handle (const std::string& host, + const std::string& user, + const std::string& passwd, + std::ostream& os) + { + curl_handle h = get_handle (); - void set_istream (std::istream& is) const - { - setopt (CURLOPT_READDATA, static_cast<void*> (&is)); - } + url_transfer obj (host, user, passwd, os); - void ascii (void) const - { - setopt (CURLOPT_TRANSFERTEXT, 1); - rep->ascii = true; - } + if (! error_state) + handle_map[h] = obj; + else + h = curl_handle (); - void binary (void) const - { - setopt (CURLOPT_TRANSFERTEXT, 0); - rep->ascii = false; - } + return h; + } - bool is_ascii (void) const - { - return rep->is_ascii (); - } + Matrix do_handle_list (void) + { + Matrix retval (1, handle_map.size ()); - bool is_binary (void) const - { - return rep->is_binary (); - } + octave_idx_type i = 0; + for (const_iterator p = handle_map.begin (); p != handle_map.end (); p++) + { + curl_handle h = p->first; - void cwd (const std::string& path) const - { - struct curl_slist *slist = 0; - std::string cmd = "cwd " + path; - slist = curl_slist_append (slist, cmd.c_str ()); - setopt (CURLOPT_POSTQUOTE, slist); - if (! error_state) - perform (); - setopt (CURLOPT_POSTQUOTE, 0); - curl_slist_free_all (slist); - } + retval(i++) = h.value (); + } + + return retval; + } +}; + +void +ch_manager::create_instance (void) +{ + instance = new ch_manager (); - void del (const std::string& file) const - { - struct curl_slist *slist = 0; - std::string cmd = "dele " + file; - slist = curl_slist_append (slist, cmd.c_str ()); - setopt (CURLOPT_POSTQUOTE, slist); - if (! error_state) - perform (); - setopt (CURLOPT_POSTQUOTE, 0); - curl_slist_free_all (slist); - } + if (instance) + singleton_cleanup_list::add (cleanup_instance); +} + +static double +make_handle_fraction (void) +{ + static double maxrand = RAND_MAX + 2.0; + + return (rand () + 1.0) / maxrand; +} - void rmdir (const std::string& path) const - { - struct curl_slist *slist = 0; - std::string cmd = "rmd " + path; - slist = curl_slist_append (slist, cmd.c_str ()); - setopt (CURLOPT_POSTQUOTE, slist); - if (! error_state) - perform (); - setopt (CURLOPT_POSTQUOTE, 0); - curl_slist_free_all (slist); - } +curl_handle +ch_manager::do_get_handle (void) +{ + curl_handle retval; - bool mkdir (const std::string& path, bool curlerror = true) const + // Curl handles are negative integers plus some random fractional + // part. To avoid running out of integers, we recycle the integer + // part but tack on a new random part each time. + + free_list_iterator p = handle_free_list.begin (); + + if (p != handle_free_list.end ()) { - bool retval = false; - struct curl_slist *slist = 0; - std::string cmd = "mkd " + path; - slist = curl_slist_append (slist, cmd.c_str ()); - setopt (CURLOPT_POSTQUOTE, slist); - if (! error_state) - retval = perform (curlerror); - setopt (CURLOPT_POSTQUOTE, 0); - curl_slist_free_all (slist); - return retval; + retval = *p; + handle_free_list.erase (p); } - - void rename (const std::string& oldname, const std::string& newname) const - { - struct curl_slist *slist = 0; - std::string cmd = "rnfr " + oldname; - slist = curl_slist_append (slist, cmd.c_str ()); - cmd = "rnto " + newname; - slist = curl_slist_append (slist, cmd.c_str ()); - setopt (CURLOPT_POSTQUOTE, slist); - if (! error_state) - perform (); - setopt (CURLOPT_POSTQUOTE, 0); - curl_slist_free_all (slist); - } - - void put (const std::string& file, std::istream& is) const + else { - rep->url = "ftp://" + rep->host + "/" + file; - setopt (CURLOPT_URL, rep->url.c_str ()); - setopt (CURLOPT_UPLOAD, 1); - setopt (CURLOPT_NOBODY, 0); - set_istream (is); - if (! error_state) - perform (); - set_istream (std::cin); - setopt (CURLOPT_NOBODY, 1); - setopt (CURLOPT_UPLOAD, 0); - rep->url = "ftp://" + rep->host; - setopt (CURLOPT_URL, rep->url.c_str ()); - } + retval = curl_handle (next_handle); - void get (const std::string& file, std::ostream& os) const - { - rep->url = "ftp://" + rep->host + "/" + file; - setopt (CURLOPT_URL, rep->url.c_str ()); - setopt (CURLOPT_NOBODY, 0); - set_ostream (os); - if (! error_state) - perform (); - set_ostream (octave_stdout); - setopt (CURLOPT_NOBODY, 1); - rep->url = "ftp://" + rep->host; - setopt (CURLOPT_URL, rep->url.c_str ()); - } - - void dir (void) const - { - rep->url = "ftp://" + rep->host + "/"; - setopt (CURLOPT_URL, rep->url.c_str ()); - setopt (CURLOPT_NOBODY, 0); - if (! error_state) - perform (); - setopt (CURLOPT_NOBODY, 1); - rep->url = "ftp://" + rep->host; - setopt (CURLOPT_URL, rep->url.c_str ()); + next_handle = std::ceil (next_handle) - 1.0 - make_handle_fraction (); } - string_vector list (void) const - { - std::ostringstream buf; - rep->url = "ftp://" + rep->host + "/"; - setopt (CURLOPT_WRITEDATA, static_cast<void*> (&buf)); - setopt (CURLOPT_URL, rep->url.c_str ()); - setopt (CURLOPT_DIRLISTONLY, 1); - setopt (CURLOPT_NOBODY, 0); - if (! error_state) - perform (); - setopt (CURLOPT_NOBODY, 1); - rep->url = "ftp://" + rep->host; - setopt (CURLOPT_WRITEDATA, static_cast<void*> (&octave_stdout)); - setopt (CURLOPT_DIRLISTONLY, 0); - setopt (CURLOPT_URL, rep->url.c_str ()); - - // Count number of directory entries - std::string str = buf.str (); - octave_idx_type n = 0; - size_t pos = 0; - while (true) - { - pos = str.find_first_of ('\n', pos); - if (pos == std::string::npos) - break; - pos++; - n++; - } - string_vector retval (n); - pos = 0; - for (octave_idx_type i = 0; i < n; i++) - { - size_t newpos = str.find_first_of ('\n', pos); - if (newpos == std::string::npos) - break; - - retval(i) = str.substr(pos, newpos - pos); - pos = newpos + 1; - } - return retval; - } - - void get_fileinfo (const std::string& filename, double& filesize, - time_t& filetime, bool& fileisdir) const - { - std::string path = pwd (); - - rep->url = "ftp://" + rep->host + "/" + path + "/" + filename; - setopt (CURLOPT_URL, rep->url.c_str ()); - setopt (CURLOPT_FILETIME, 1); - setopt (CURLOPT_HEADERFUNCTION, throw_away); - setopt (CURLOPT_WRITEFUNCTION, throw_away); - - // FIXME - // The MDTM command fails for a directory on the servers I tested - // so this is a means of testing for directories. It also means - // I can't get the date of directories! - if (! error_state) - { - if (! perform (false)) - { - fileisdir = true; - filetime = -1; - filesize = 0; - } - else - { - fileisdir = false; - time_t ft; - curl_easy_getinfo (rep->handle (), CURLINFO_FILETIME, &ft); - filetime = ft; - double fs; - curl_easy_getinfo (rep->handle (), - CURLINFO_CONTENT_LENGTH_DOWNLOAD, &fs); - filesize = fs; - } - } - - setopt (CURLOPT_WRITEFUNCTION, write_data); - setopt (CURLOPT_HEADERFUNCTION, 0); - setopt (CURLOPT_FILETIME, 0); - rep->url = "ftp://" + rep->host; - setopt (CURLOPT_URL, rep->url.c_str ()); - - // The MDTM command seems to reset the path to the root with the - // servers I tested with, so cd again into the correct path. Make - // the path absolute so that this will work even with servers that - // don't end up in the root after an MDTM command. - cwd ("/" + path); - } - - std::string pwd (void) const - { - struct curl_slist *slist = 0; - std::string retval; - std::ostringstream buf; - - slist = curl_slist_append (slist, "pwd"); - setopt (CURLOPT_POSTQUOTE, slist); - setopt (CURLOPT_HEADERFUNCTION, write_data); - setopt (CURLOPT_WRITEHEADER, static_cast<void *>(&buf)); - - if (! error_state) - { - perform (); - retval = buf.str (); - - // Can I assume that the path is alway in "" on the last line - size_t pos2 = retval.rfind ('"'); - size_t pos1 = retval.rfind ('"', pos2 - 1); - retval = retval.substr (pos1 + 1, pos2 - pos1 - 1); - } - setopt (CURLOPT_HEADERFUNCTION, 0); - setopt (CURLOPT_WRITEHEADER, 0); - setopt (CURLOPT_POSTQUOTE, 0); - curl_slist_free_all (slist); - - return retval; - } - - bool perform (bool curlerror = true) const - { - return rep->perform (curlerror); - } - -private: - curl_handle_rep *rep; - - std::string form_query_string (const Cell& param) - { - std::ostringstream query; - - for (int i = 0; i < param.numel (); i += 2) - { - std::string name = param(i).string_value (); - std::string text = param(i+1).string_value (); - - // Encode strings. - char *enc_name = curl_easy_escape (rep->handle (), name.c_str (), - name.length ()); - char *enc_text = curl_easy_escape (rep->handle (), text.c_str (), - text.length ()); - - query << enc_name << "=" << enc_text; - - curl_free (enc_name); - curl_free (enc_text); - - if (i < param.numel ()-1) - query << "&"; - } - - query.flush (); - - return query.str (); - } - - void init (const std::string& user, const std::string& passwd, - std::istream& is, std::ostream& os) - { - // No data transfer by default - setopt (CURLOPT_NOBODY, 1); - - // Set the username and password - rep->userpwd = user; - if (! passwd.empty ()) - rep->userpwd += ":" + passwd; - if (! rep->userpwd.empty ()) - setopt (CURLOPT_USERPWD, rep->userpwd.c_str ()); - - // Define our callback to get called when there's data to be written. - setopt (CURLOPT_WRITEFUNCTION, write_data); - - // Set a pointer to our struct to pass to the callback. - setopt (CURLOPT_WRITEDATA, static_cast<void*> (&os)); - - // Define our callback to get called when there's data to be read - setopt (CURLOPT_READFUNCTION, read_data); - - // Set a pointer to our struct to pass to the callback. - setopt (CURLOPT_READDATA, static_cast<void*> (&is)); - - // Follow redirects. - setopt (CURLOPT_FOLLOWLOCATION, true); - - // Don't use EPSV since connecting to sites that don't support it - // will hang for some time (3 minutes?) before moving on to try PASV - // instead. - setopt (CURLOPT_FTP_USE_EPSV, false); - - setopt (CURLOPT_NOPROGRESS, true); - setopt (CURLOPT_FAILONERROR, true); - - setopt (CURLOPT_POSTQUOTE, 0); - setopt (CURLOPT_QUOTE, 0); - } - -#undef setopt -}; - -class -curl_handles -{ -public: - - typedef std::map<std::string, curl_handle>::iterator iterator; - typedef std::map<std::string, curl_handle>::const_iterator const_iterator; - - curl_handles (void) : map () - { - curl_global_init (CURL_GLOBAL_DEFAULT); - } - - ~curl_handles (void) - { - // Remove the elements of the map explicitly as they should - // be deleted before the call to curl_global_cleanup - map.erase (begin (), end ()); - - curl_global_cleanup (); - } - - iterator begin (void) { return iterator (map.begin ()); } - const_iterator begin (void) const { return const_iterator (map.begin ()); } - - iterator end (void) { return iterator (map.end ()); } - const_iterator end (void) const { return const_iterator (map.end ()); } - - iterator seek (const std::string& k) { return map.find (k); } - const_iterator seek (const std::string& k) const { return map.find (k); } - - std::string key (const_iterator p) const { return p->first; } - - curl_handle& contents (const std::string& k) - { - return map[k]; - } - - curl_handle contents (const std::string& k) const - { - const_iterator p = seek (k); - return p != end () ? p->second : curl_handle (); - } - - curl_handle& contents (iterator p) - { return p->second; } - - curl_handle contents (const_iterator p) const - { return p->second; } - - void del (const std::string& k) - { - iterator p = map.find (k); - - if (p != map.end ()) - map.erase (p); - } - -private: - std::map<std::string, curl_handle> map; -}; - -static curl_handles handles; - -static void -cleanup_urlwrite (std::string filename) -{ - octave_unlink (filename); + return retval; } -static void -reset_path (const curl_handle curl) +void +ch_manager::do_free (const curl_handle& h) { - curl.cwd (".."); + if (h.ok ()) + { + iterator p = handle_map.find (h); + + if (p != handle_map.end ()) + { + // Curl handles are negative integers plus some random + // fractional part. To avoid running out of integers, we + // recycle the integer part but tack on a new random part + // each time. + + handle_map.erase (p); + + if (h.value () < 0) + handle_free_list.insert (std::ceil (h.value ()) - make_handle_fraction ()); + } + else + error ("ch_manager::free: invalid object %g", h.value ()); + } } -static void -delete_file (std::string file) -{ - octave_unlink (file); -} -#endif +ch_manager *ch_manager::instance = 0; -DEFUN_DLD (urlwrite, args, nargout, +DEFUN (urlwrite, args, nargout, "-*- texinfo -*-\n\ @deftypefn {Loadable Function} {} urlwrite (@var{url}, @var{localfile})\n\ @deftypefnx {Loadable Function} {@var{f} =} urlwrite (@var{url}, @var{localfile})\n\ @@ -733,8 +331,6 @@ { octave_value_list retval; -#ifdef HAVE_CURL - int nargin = args.length (); // verify arguments @@ -762,7 +358,7 @@ } std::string method; - Cell param; // empty cell array + Array<std::string> param; if (nargin == 4) { @@ -780,11 +376,11 @@ return retval; } - param = args(3).cell_value (); + param = args(3).cellstr_value (); if (error_state) { - error ("urlwrite: parameters (PARAM) for get and post requests must be given as a cell"); + error ("urlwrite: parameters (PARAM) for get and post requests must be given as a cell array of character strings"); return retval; } @@ -812,21 +408,18 @@ unwind_protect_safe frame; - frame.add_fcn (cleanup_urlwrite, filename); + frame.add_fcn (delete_file, filename); - bool ok; - curl_handle curl = curl_handle (url, method, param, ofile, ok); + url_transfer curl = url_transfer (url, method, param, ofile); ofile.close (); - if (!error_state) + if (curl.good ()) frame.discard (); - else - frame.run (); if (nargout > 0) { - if (ok) + if (curl.good ()) { retval(2) = std::string (); retval(1) = true; @@ -840,17 +433,13 @@ } } - if (nargout < 2 && ! ok) - error ("urlwrite: curl: %s", curl.lasterror ().c_str ()); - -#else - gripe_disabled_feature ("urlwrite", "urlwrite"); -#endif + if (nargout < 2 && ! curl.good ()) + error ("urlwrite: %s", curl.lasterror ().c_str ()); return retval; } -DEFUN_DLD (urlread, args, nargout, +DEFUN (urlread, args, nargout, "-*- texinfo -*-\n\ @deftypefn {Loadable Function} {@var{s} =} urlread (@var{url})\n\ @deftypefnx {Loadable Function} {[@var{s}, @var{success}] =} urlread (@var{url})\n\ @@ -893,8 +482,6 @@ // Octave's return value octave_value_list retval; -#ifdef HAVE_CURL - int nargin = args.length (); // verify arguments @@ -913,7 +500,7 @@ } std::string method; - Cell param; // empty cell array + Array<std::string> param; if (nargin == 3) { @@ -931,11 +518,11 @@ return retval; } - param = args(2).cell_value (); + param = args(2).cellstr_value (); if (error_state) { - error ("urlread: parameters (PARAM) for get and post requests must be given as a cell"); + error ("urlread: parameters (PARAM) for get and post requests must be given as a cell array of character strings"); return retval; } @@ -948,584 +535,494 @@ std::ostringstream buf; - bool ok; - curl_handle curl = curl_handle (url, method, param, buf, ok); + url_transfer curl = url_transfer (url, method, param, buf); - if (nargout > 0) + if (curl.good ()) { - // Return empty string if no error occured. - retval(2) = ok ? "" : curl.lasterror (); - retval(1) = ok; - retval(0) = buf.str (); + if (nargout > 0) + { + // Return empty string if no error occured. + retval(2) = curl.good () ? "" : curl.lasterror (); + retval(1) = curl.good (); + retval(0) = buf.str (); + } } - if (nargout < 2 && ! ok) - error ("urlread: curl: %s", curl.lasterror().c_str()); - -#else - gripe_disabled_feature ("urlread", "urlread"); -#endif + if (nargout < 2 && ! curl.good ()) + error ("urlread: %s", curl.lasterror().c_str()); return retval; } -DEFUN_DLD (__ftp__, args, , +DEFUN (__ftp__, args, , "-*- texinfo -*-\n\ -@deftypefn {Loadable Function} {} __ftp__ (@var{handle}, @var{host})\n\ -@deftypefnx {Loadable Function} {} __ftp__ (@var{handle}, @var{host}, @var{username}, @var{password})\n\ +@deftypefn {Loadable Function} {@var{handle} =} __ftp__ (@var{host})\n\ +@deftypefnx {Loadable Function} {@var{handle} =} __ftp__ (@var{host}, @var{username}, @var{password})\n\ Undocumented internal function\n\ @end deftypefn") { -#ifdef HAVE_CURL + octave_value retval; + int nargin = args.length (); - std::string handle; std::string host; std::string user = "anonymous"; std::string passwd = ""; - if (nargin < 2 || nargin > 4) - error ("incorrect number of arguments"); + if (nargin < 1 || nargin > 3) + { + print_usage (); + return retval; + } else { - handle = args(0).string_value (); - host = args(1).string_value (); + host = args(0).string_value (); if (nargin > 1) - user = args(2).string_value (); + user = args(1).string_value (); if (nargin > 2) - passwd = args(3).string_value (); + passwd = args(2).string_value (); - if (!error_state) + if (! error_state) { - handles.contents (handle) = curl_handle (host, user, passwd); + curl_handle ch + = ch_manager::make_curl_handle (host, user, passwd, octave_stdout); - if (error_state) - handles.del (handle); + if (! error_state) + retval = ch.value (); } } -#else - gripe_disabled_feature ("__ftp__", "FTP"); -#endif - return octave_value (); + return retval; } -DEFUN_DLD (__ftp_pwd__, args, , +DEFUN (__ftp_pwd__, args, , "-*- texinfo -*-\n\ @deftypefn {Loadable Function} {} __ftp_pwd__ (@var{handle})\n\ Undocumented internal function\n\ @end deftypefn") { octave_value retval; -#ifdef HAVE_CURL + int nargin = args.length (); if (nargin != 1) error ("__ftp_pwd__: incorrect number of arguments"); else { - std::string handle = args(0).string_value (); + url_transfer curl = ch_manager::get_object (args(0)); - if (!error_state) - { - const curl_handle curl = handles.contents (handle); + if (error_state) + return retval; - if (curl.is_valid ()) - retval = curl.pwd (); - else - error ("__ftp_pwd__: invalid ftp handle"); - } + if (curl.is_valid ()) + retval = curl.pwd (); + else + error ("__ftp_pwd__: invalid ftp handle"); } -#else - gripe_disabled_feature ("__ftp_pwd__", "FTP"); -#endif return retval; } -DEFUN_DLD (__ftp_cwd__, args, , +DEFUN (__ftp_cwd__, args, , "-*- texinfo -*-\n\ @deftypefn {Loadable Function} {} __ftp_cwd__ (@var{handle}, @var{path})\n\ Undocumented internal function\n\ @end deftypefn") { -#ifdef HAVE_CURL + octave_value retval; + int nargin = args.length (); if (nargin != 1 && nargin != 2) error ("__ftp_cwd__: incorrect number of arguments"); else { - std::string handle = args(0).string_value (); - std::string path = ""; + url_transfer curl = ch_manager::get_object (args(0)); - if (nargin > 1) - path = args(1).string_value (); + if (error_state) + return retval; - if (!error_state) + if (curl.is_valid ()) { - const curl_handle curl = handles.contents (handle); + std::string path = ""; - if (curl.is_valid ()) + if (nargin > 1) + path = args(1).string_value (); + + if (! error_state) curl.cwd (path); else - error ("__ftp_cwd__: invalid ftp handle"); + error ("__ftp_cwd__: expecting path as second argument"); } + else + error ("__ftp_cwd__: invalid ftp handle"); } -#else - gripe_disabled_feature ("__ftp_cwd__", "FTP"); -#endif - return octave_value (); + return retval; } -DEFUN_DLD (__ftp_dir__, args, nargout, +DEFUN (__ftp_dir__, args, nargout, "-*- texinfo -*-\n\ @deftypefn {Loadable Function} {} __ftp_dir__ (@var{handle})\n\ Undocumented internal function\n\ @end deftypefn") { octave_value retval; -#ifdef HAVE_CURL + int nargin = args.length (); if (nargin != 1) error ("__ftp_dir__: incorrect number of arguments"); else { - std::string handle = args(0).string_value (); + url_transfer curl = ch_manager::get_object (args(0)); - if (!error_state) + if (error_state) + return retval; + + if (curl.is_valid ()) { - const curl_handle curl = handles.contents (handle); + if (nargout == 0) + curl.dir (); + else + { + string_vector sv = curl.list (); + octave_idx_type n = sv.length (); - if (curl.is_valid ()) - { - if (nargout == 0) - curl.dir (); + if (n == 0) + { + string_vector flds (5); + + flds(0) = "name"; + flds(1) = "date"; + flds(2) = "bytes"; + flds(3) = "isdir"; + flds(4) = "datenum"; + + retval = octave_map (flds); + } else { - string_vector sv = curl.list (); - octave_idx_type n = sv.length (); - if (n == 0) + octave_map st; + + Cell filectime (dim_vector (n, 1)); + Cell filesize (dim_vector (n, 1)); + Cell fileisdir (dim_vector (n, 1)); + Cell filedatenum (dim_vector (n, 1)); + + st.assign ("name", Cell (sv)); + + for (octave_idx_type i = 0; i < n; i++) { - string_vector flds (5); - flds(0) = "name"; - flds(1) = "date"; - flds(2) = "bytes"; - flds(3) = "isdir"; - flds(4) = "datenum"; - retval = octave_map (flds); - } - else - { - octave_map st; - Cell filectime (dim_vector (n, 1)); - Cell filesize (dim_vector (n, 1)); - Cell fileisdir (dim_vector (n, 1)); - Cell filedatenum (dim_vector (n, 1)); + time_t ftime; + bool fisdir; + double fsize; - st.assign ("name", Cell (sv)); - - for (octave_idx_type i = 0; i < n; i++) - { - time_t ftime; - bool fisdir; - double fsize; - - curl.get_fileinfo (sv(i), fsize, ftime, fisdir); + curl.get_fileinfo (sv(i), fsize, ftime, fisdir); - fileisdir (i) = fisdir; - filectime (i) = ctime (&ftime); - filesize (i) = fsize; - filedatenum (i) = double (ftime); - } - st.assign ("date", filectime); - st.assign ("bytes", filesize); - st.assign ("isdir", fileisdir); - st.assign ("datenum", filedatenum); - retval = st; + fileisdir (i) = fisdir; + filectime (i) = ctime (&ftime); + filesize (i) = fsize; + filedatenum (i) = double (ftime); } + + st.assign ("date", filectime); + st.assign ("bytes", filesize); + st.assign ("isdir", fileisdir); + st.assign ("datenum", filedatenum); + + retval = st; } } - else - error ("__ftp_dir__: invalid ftp handle"); } + else + error ("__ftp_dir__: invalid ftp handle"); } -#else - gripe_disabled_feature ("__ftp_dir__", "FTP"); -#endif return retval; } -DEFUN_DLD (__ftp_ascii__, args, , +DEFUN (__ftp_ascii__, args, , "-*- texinfo -*-\n\ @deftypefn {Loadable Function} {} __ftp_ascii__ (@var{handle})\n\ Undocumented internal function\n\ @end deftypefn") { -#ifdef HAVE_CURL + octave_value retval; + int nargin = args.length (); if (nargin != 1) error ("__ftp_ascii__: incorrect number of arguments"); else { - std::string handle = args(0).string_value (); + url_transfer curl = ch_manager::get_object (args(0)); - if (!error_state) - { - const curl_handle curl = handles.contents (handle); + if (error_state) + return retval; - if (curl.is_valid ()) - curl.ascii (); - else - error ("__ftp_ascii__: invalid ftp handle"); - } + if (curl.is_valid ()) + curl.ascii (); + else + error ("__ftp_ascii__: invalid ftp handle"); } -#else - gripe_disabled_feature ("__ftp_ascii__", "FTP"); -#endif - return octave_value (); + return retval; } -DEFUN_DLD (__ftp_binary__, args, , +DEFUN (__ftp_binary__, args, , "-*- texinfo -*-\n\ @deftypefn {Loadable Function} {} __ftp_binary__ (@var{handle})\n\ Undocumented internal function\n\ @end deftypefn") { -#ifdef HAVE_CURL + octave_value retval; + int nargin = args.length (); if (nargin != 1) error ("__ftp_binary__: incorrect number of arguments"); else { - std::string handle = args(0).string_value (); + url_transfer curl = ch_manager::get_object (args(0)); - if (!error_state) - { - const curl_handle curl = handles.contents (handle); + if (error_state) + return retval; - if (curl.is_valid ()) - curl.binary (); - else - error ("__ftp_binary__: invalid ftp handle"); - } + if (curl.is_valid ()) + curl.binary (); + else + error ("__ftp_binary__: invalid ftp handle"); } -#else - gripe_disabled_feature ("__ftp_binary__", "FTP"); -#endif - return octave_value (); + return retval; } -DEFUN_DLD (__ftp_close__, args, , +DEFUN (__ftp_close__, args, , "-*- texinfo -*-\n\ @deftypefn {Loadable Function} {} __ftp_close__ (@var{handle})\n\ Undocumented internal function\n\ @end deftypefn") { -#ifdef HAVE_CURL + octave_value retval; + int nargin = args.length (); if (nargin != 1) error ("__ftp_close__: incorrect number of arguments"); else { - std::string handle = args(0).string_value (); + curl_handle h = ch_manager::lookup (args(0)); + + if (error_state) + return retval; - if (! error_state) - handles.del (handle); + if (h.ok ()) + ch_manager::free (h); + else + error ("__ftp_close__: invalid ftp handle"); } -#else - gripe_disabled_feature ("__ftp_close__", "FTP"); -#endif - return octave_value (); + return retval; } -DEFUN_DLD (__ftp_mode__, args, , +DEFUN (__ftp_mode__, args, , "-*- texinfo -*-\n\ @deftypefn {Loadable Function} {} __ftp_mode__ (@var{handle})\n\ Undocumented internal function\n\ @end deftypefn") { octave_value retval; -#ifdef HAVE_CURL + int nargin = args.length (); if (nargin != 1) error ("__ftp_mode__: incorrect number of arguments"); else { - std::string handle = args(0).string_value (); - + url_transfer curl = ch_manager::get_object (args(0)); - if (! error_state) - { - const curl_handle curl = handles.contents (handle); + if (error_state) + return retval; - if (curl.is_valid ()) - retval = (curl.is_ascii () ? "ascii" : "binary"); - else - error ("__ftp_binary__: invalid ftp handle"); - } + if (curl.is_valid ()) + retval = (curl.is_ascii () ? "ascii" : "binary"); + else + error ("__ftp_binary__: invalid ftp handle"); } -#else - gripe_disabled_feature ("__ftp_mode__", "FTP"); -#endif return retval; } -DEFUN_DLD (__ftp_delete__, args, , +DEFUN (__ftp_delete__, args, , "-*- texinfo -*-\n\ @deftypefn {Loadable Function} {} __ftp_delete__ (@var{handle}, @var{path})\n\ Undocumented internal function\n\ @end deftypefn") { -#ifdef HAVE_CURL + octave_value retval; + int nargin = args.length (); if (nargin != 2) error ("__ftp_delete__: incorrect number of arguments"); else { - std::string handle = args(0).string_value (); - std::string file = args(1).string_value (); + url_transfer curl = ch_manager::get_object (args(0)); + + if (error_state) + return retval; - if (!error_state) + if (curl.is_valid ()) { - const curl_handle curl = handles.contents (handle); + std::string file = args(1).string_value (); - if (curl.is_valid ()) + if (! error_state) curl.del (file); else - error ("__ftp_delete__: invalid ftp handle"); + error ("__ftp_delete__: expecting file name as second argument"); } + else + error ("__ftp_delete__: invalid ftp handle"); } -#else - gripe_disabled_feature ("__ftp_delete__", "FTP"); -#endif - return octave_value (); + return retval; } -DEFUN_DLD (__ftp_rmdir__, args, , +DEFUN (__ftp_rmdir__, args, , "-*- texinfo -*-\n\ @deftypefn {Loadable Function} {} __ftp_rmdir__ (@var{handle}, @var{path})\n\ Undocumented internal function\n\ @end deftypefn") { -#ifdef HAVE_CURL + octave_value retval; + int nargin = args.length (); if (nargin != 2) error ("__ftp_rmdir__: incorrect number of arguments"); else { - std::string handle = args(0).string_value (); - std::string dir = args(1).string_value (); + url_transfer curl = ch_manager::get_object (args(0)); + + if (error_state) + return retval; - if (!error_state) + if (curl.is_valid ()) { - const curl_handle curl = handles.contents (handle); + std::string dir = args(1).string_value (); - if (curl.is_valid ()) + if (! error_state) curl.rmdir (dir); else - error ("__ftp_rmdir__: invalid ftp handle"); + error ("__ftp_rmdir__: expecting directory name as second argument"); } + else + error ("__ftp_rmdir__: invalid ftp handle"); } -#else - gripe_disabled_feature ("__ftp_rmdir__", "FTP"); -#endif - return octave_value (); + return retval; } -DEFUN_DLD (__ftp_mkdir__, args, , +DEFUN (__ftp_mkdir__, args, , "-*- texinfo -*-\n\ @deftypefn {Loadable Function} {} __ftp_mkdir__ (@var{handle}, @var{path})\n\ Undocumented internal function\n\ @end deftypefn") { -#ifdef HAVE_CURL + octave_value retval; + int nargin = args.length (); if (nargin != 2) error ("__ftp_mkdir__: incorrect number of arguments"); else { - std::string handle = args(0).string_value (); - std::string dir = args(1).string_value (); + url_transfer curl = ch_manager::get_object (args(0)); + + if (error_state) + return retval; - if (!error_state) + if (curl.is_valid ()) { - const curl_handle curl = handles.contents (handle); + std::string dir = args(1).string_value (); - if (curl.is_valid ()) + if (! error_state) curl.mkdir (dir); else - error ("__ftp_mkdir__: invalid ftp handle"); + error ("__ftp_mkdir__: expecting directory name as second argument"); } + else + error ("__ftp_mkdir__: invalid ftp handle"); } -#else - gripe_disabled_feature ("__ftp_mkdir__", "FTP"); -#endif - return octave_value (); + return retval; } -DEFUN_DLD (__ftp_rename__, args, , +DEFUN (__ftp_rename__, args, , "-*- texinfo -*-\n\ @deftypefn {Loadable Function} {} __ftp_rename__ (@var{handle}, @var{path})\n\ Undocumented internal function\n\ @end deftypefn") { -#ifdef HAVE_CURL + octave_value retval; + int nargin = args.length (); if (nargin != 3) error ("__ftp_rename__: incorrect number of arguments"); else { - std::string handle = args(0).string_value (); - std::string oldname = args(1).string_value (); - std::string newname = args(2).string_value (); + url_transfer curl = ch_manager::get_object (args(0)); + + if (error_state) + return retval; - if (!error_state) + if (curl.is_valid ()) { - const curl_handle curl = handles.contents (handle); + std::string oldname = args(1).string_value (); + std::string newname = args(2).string_value (); - if (curl.is_valid ()) + if (! error_state) curl.rename (oldname, newname); else - error ("__ftp_rename__: invalid ftp handle"); - } - } -#else - gripe_disabled_feature ("__ftp_rename__", "FTP"); -#endif - - return octave_value (); -} - -#ifdef HAVE_CURL -static string_vector -mput_directory (const curl_handle& curl, const std::string& base, - const std::string& dir) -{ - string_vector retval; - - if (! curl.mkdir (dir, false)) - warning ("__ftp_mput__: can not create the remote directory ""%s""", - (base.length () == 0 ? dir : base + - file_ops::dir_sep_str () + dir).c_str ()); - - curl.cwd (dir); - - if (! error_state) - { - unwind_protect_safe frame; - - frame.add_fcn (reset_path, curl); - - std::string realdir = base.length () == 0 ? dir : base + - file_ops::dir_sep_str () + dir; - - dir_entry dirlist (realdir); - - if (dirlist) - { - string_vector files = dirlist.read (); - - for (octave_idx_type i = 0; i < files.length (); i++) - { - std::string file = files (i); - - if (file == "." || file == "..") - continue; - - std::string realfile = realdir + file_ops::dir_sep_str () + file; - file_stat fs (realfile); - - if (! fs.exists ()) - { - error ("__ftp__mput: file ""%s"" does not exist", - realfile.c_str ()); - break; - } - - if (fs.is_dir ()) - { - retval.append (mput_directory (curl, realdir, file)); - - if (error_state) - break; - } - else - { - // FIXME Does ascii mode need to be flagged here? - std::ifstream ifile (realfile.c_str (), std::ios::in | - std::ios::binary); - - if (! ifile.is_open ()) - { - error ("__ftp_mput__: unable to open file ""%s""", - realfile.c_str ()); - break; - } - - curl.put (file, ifile); - - ifile.close (); - - if (error_state) - break; - - retval.append (realfile); - } - } + error ("__ftp_rename__: expecting file names for second and third arguments"); } else - error ("__ftp_mput__: can not read the directory ""%s""", - realdir.c_str ()); + error ("__ftp_rename__: invalid ftp handle"); } return retval; } -#endif -DEFUN_DLD (__ftp_mput__, args, nargout, +DEFUN (__ftp_mput__, args, nargout, "-*- texinfo -*-\n\ @deftypefn {Loadable Function} {} __ftp_mput__ (@var{handle}, @var{files})\n\ Undocumented internal function\n\ @end deftypefn") { - string_vector retval; + octave_value retval; -#ifdef HAVE_CURL int nargin = args.length (); if (nargin != 2) error ("__ftp_mput__: incorrect number of arguments"); else { - std::string handle = args(0).string_value (); - std::string pat = args(1).string_value (); + url_transfer curl = ch_manager::get_object (args(0)); - if (!error_state) + if (error_state) + return retval; + + if (curl.is_valid ()) { - const curl_handle curl = handles.contents (handle); + std::string pat = args(1).string_value (); - if (curl.is_valid ()) + if (! error_state) { + string_vector file_list; + glob_match pattern (file_ops::tilde_expand (pat)); string_vector files = pattern.glob (); @@ -1543,9 +1040,13 @@ if (fs.is_dir ()) { - retval.append (mput_directory (curl, "", file)); - if (error_state) - break; + file_list.append (curl.mput_directory ("", file)); + + if (! curl.good ()) + { + error ("__ftp_mput__: %s", curl.lasterror().c_str()); + break; + } } else { @@ -1563,129 +1064,63 @@ ifile.close (); - if (error_state) - break; + if (! curl.good ()) + { + error ("__ftp_mput__: %s", curl.lasterror().c_str()); + break; + } - retval.append (file); + file_list.append (file); } } + + if (nargout > 0) + retval = file_list; } else - error ("__ftp_mput__: invalid ftp handle"); + error ("__ftp_mput__: expecting file name patter as second argument"); } - } -#else - gripe_disabled_feature ("__ftp_mput__", "FTP"); -#endif - - return (nargout > 0 ? octave_value (retval) : octave_value ()); -} - -#ifdef HAVE_CURL -static void -getallfiles (const curl_handle& curl, const std::string& dir, - const std::string& target) -{ - std::string sep = file_ops::dir_sep_str (); - file_stat fs (dir); - - if (!fs || !fs.is_dir ()) - { - std::string msg; - int status = octave_mkdir (dir, 0777, msg); - - if (status < 0) - error ("__ftp_mget__: can't create directory %s%s%s. %s", - target.c_str (), sep.c_str (), dir.c_str (), msg.c_str ()); + else + error ("__ftp_mput__: invalid ftp handle"); } - if (! error_state) - { - curl.cwd (dir); - - if (! error_state) - { - unwind_protect_safe frame; - - frame.add_fcn (reset_path, curl); - - string_vector sv = curl.list (); - - for (octave_idx_type i = 0; i < sv.length (); i++) - { - time_t ftime; - bool fisdir; - double fsize; - - curl.get_fileinfo (sv(i), fsize, ftime, fisdir); - - if (fisdir) - getallfiles (curl, sv(i), target + dir + sep); - else - { - std::string realfile = target + dir + sep + sv(i); - std::ofstream ofile (realfile.c_str (), - std::ios::out | - std::ios::binary); + return retval; +} - if (! ofile.is_open ()) - { - error ("__ftp_mget__: unable to open file"); - break; - } - - unwind_protect_safe frame2; - - frame2.add_fcn (delete_file, realfile); - - curl.get (sv(i), ofile); - - ofile.close (); - - if (!error_state) - frame2.discard (); - else - frame2.run (); - } - - if (error_state) - break; - } - } - } -} -#endif - -DEFUN_DLD (__ftp_mget__, args, , +DEFUN (__ftp_mget__, args, , "-*- texinfo -*-\n\ @deftypefn {Loadable Function} {} __ftp_mget__ (@var{handle}, @var{files})\n\ Undocumented internal function\n\ @end deftypefn") { -#ifdef HAVE_CURL + octave_value retval; + int nargin = args.length (); if (nargin != 2 && nargin != 3) error ("__ftp_mget__: incorrect number of arguments"); else { - std::string handle = args(0).string_value (); - std::string file = args(1).string_value (); - std::string target; + url_transfer curl = ch_manager::get_object (args(0)); + + if (error_state) + return retval; - if (nargin == 3) - target = args(2).string_value () + file_ops::dir_sep_str (); + if (curl.is_valid ()) + { + std::string file = args(1).string_value (); + std::string target; - if (! error_state) - { - const curl_handle curl = handles.contents (handle); + if (nargin == 3) + target = args(2).string_value () + file_ops::dir_sep_str (); - if (curl.is_valid ()) + if (! error_state) { string_vector sv = curl.list (); octave_idx_type n = 0; glob_match pattern (file); + for (octave_idx_type i = 0; i < sv.length (); i++) { if (pattern.match (sv(i))) @@ -1699,7 +1134,7 @@ curl.get_fileinfo (sv(i), fsize, ftime, fisdir); if (fisdir) - getallfiles (curl, sv(i), target); + curl.mget_directory (sv(i), target); else { std::ofstream ofile ((target + sv(i)).c_str (), @@ -1720,24 +1155,26 @@ ofile.close (); - if (!error_state) + if (curl.good ()) frame.discard (); - else - frame.run (); } - if (error_state) - break; + if (! curl.good ()) + { + error ("__ftp_mget__: %s", curl.lasterror().c_str()); + break; + } } } if (n == 0) error ("__ftp_mget__: file not found"); } + else + error ("__ftp_mget__: expecting file name and target as second and third arguments"); } + else + error ("__ftp_mget__: invalid ftp handle"); } -#else - gripe_disabled_feature ("__ftp_mget__", "FTP"); -#endif - return octave_value (); + return retval; }
--- a/libinterp/dldfcn/__magick_read__.cc +++ b/libinterp/dldfcn/__magick_read__.cc @@ -1033,7 +1033,7 @@ // From GM documentation: // Color arguments are must be scaled to fit the Quantum size according to // the range of MaxRGB - const double divisor = static_cast<double>((1 << bitdepth) - 1) / MaxRGB; + const double divisor = static_cast<double>((uint64_t (1) << bitdepth) - 1) / MaxRGB; const P *img_fvec = img.fortran_vec (); const P *a_fvec = alpha.fortran_vec ();
--- a/libinterp/dldfcn/module-files +++ b/libinterp/dldfcn/module-files @@ -26,4 +26,3 @@ symbfact.cc|$(SPARSE_XCPPFLAGS)|$(SPARSE_XLDFLAGS)|$(SPARSE_XLIBS) symrcm.cc|$(SPARSE_XCPPFLAGS)|$(SPARSE_XLDFLAGS)|$(SPARSE_XLIBS) tsearch.cc -urlwrite.cc|$(CURL_CPPFLAGS)|$(CURL_LDFLAGS)|$(CURL_LIBS)
--- a/libinterp/octave.cc +++ b/libinterp/octave.cc @@ -33,6 +33,7 @@ #include <iostream> +#include <fcntl.h> #include <getopt.h> #include <sys/types.h> #include <unistd.h> @@ -125,6 +126,10 @@ // (--force-gui) static bool force_gui_option = false; +// If TRUE don't fork when starting the GUI. +// (--no-fork) +static bool no_fork_option = false; + // If TRUE don't start the GUI. // (--no-gui) static bool no_gui_option = false; @@ -159,7 +164,7 @@ [--echo-commands] [--eval CODE] [--exec-path path]\n\ [--force-gui] [--help] [--image-path path]\n\ [--info-file file] [--info-program prog] [--interactive]\n\ - [--line-editing] [--no-gui] [--no-history]\n\ + [--line-editing] [--no-fork] [--no-gui] [--no-history]\n\ [--no-init-file] [--no-init-path] [--no-jit-compiler]\n\ [--no-line-editing] [--no-site-file] [--no-window-system]\n\ [--norc] [-p path] [--path path] [--persist] [--silent]\n\ @@ -194,15 +199,16 @@ #define INFO_PROG_OPTION 8 #define DEBUG_JIT_OPTION 9 #define LINE_EDITING_OPTION 10 -#define NO_GUI_OPTION 11 -#define NO_INIT_FILE_OPTION 12 -#define NO_INIT_PATH_OPTION 13 -#define NO_JIT_COMPILER_OPTION 14 -#define NO_LINE_EDITING_OPTION 15 -#define NO_SITE_FILE_OPTION 16 -#define PERSIST_OPTION 17 -#define TEXI_MACROS_FILE_OPTION 18 -#define TRADITIONAL_OPTION 19 +#define NO_FORK_OPTION 11 +#define NO_GUI_OPTION 12 +#define NO_INIT_FILE_OPTION 13 +#define NO_INIT_PATH_OPTION 14 +#define NO_JIT_COMPILER_OPTION 15 +#define NO_LINE_EDITING_OPTION 16 +#define NO_SITE_FILE_OPTION 17 +#define PERSIST_OPTION 18 +#define TEXI_MACROS_FILE_OPTION 19 +#define TRADITIONAL_OPTION 20 struct option long_opts[] = { { "braindead", no_argument, 0, TRADITIONAL_OPTION }, { "built-in-docstrings-file", required_argument, 0, BUILT_IN_DOCSTRINGS_FILE_OPTION }, @@ -219,6 +225,7 @@ { "info-program", required_argument, 0, INFO_PROG_OPTION }, { "interactive", no_argument, 0, 'i' }, { "line-editing", no_argument, 0, LINE_EDITING_OPTION }, + { "no-fork", no_argument, 0, NO_FORK_OPTION }, { "no-gui", no_argument, 0, NO_GUI_OPTION }, { "no-history", no_argument, 0, 'H' }, { "no-init-file", no_argument, 0, NO_INIT_FILE_OPTION }, @@ -537,6 +544,7 @@ --info-program PROGRAM Use PROGRAM for reading info files.\n\ --interactive, -i Force interactive behavior.\n\ --line-editing Force readline use for command-line editing.\n\ + --no-fork Don't fork when starting the graphical user interface.\n\ --no-gui Disable the graphical user interface.\n\ --no-history, -H Don't save commands to the history list\n\ --no-init-file Don't read the ~/.octaverc or .octaverc files.\n\ @@ -787,6 +795,10 @@ forced_line_editing = true; break; + case NO_FORK_OPTION: + no_fork_option = true; + break; + case NO_GUI_OPTION: no_gui_option = true; break; @@ -1071,6 +1083,26 @@ return start_gui; } +int +octave_fork_gui (void) +{ + bool have_ctty = false; + +#if ! (defined (__WIN32__) || defined (__APPLE__)) || defined (__CYGWIN__) + +#if defined (HAVE_CTERMID) + const char *ctty = ctermid (0); +#else + const char *ctty = "/dev/tty"; +#endif + + have_ctty = gnulib::open (ctty, O_RDWR, 0) > 0; + +#endif + + return (have_ctty && ! no_fork_option); +} + DEFUN (isguirunning, args, , "-*- texinfo -*-\n\ @deftypefn {Built-in Function} {} isguirunning ()\n\
--- a/libinterp/octave.h +++ b/libinterp/octave.h @@ -41,6 +41,7 @@ extern OCTINTERP_API int octave_embedded; extern OCTINTERP_API int octave_starting_gui (void); +extern OCTINTERP_API int octave_fork_gui (void); #ifdef __cplusplus }
--- a/liboctave/link-deps.mk +++ b/liboctave/link-deps.mk @@ -15,6 +15,7 @@ LIBOCTAVE_LINK_DEPS = \ $(GNULIB_LINK_DEPS) \ + $(CURL_LIBS) \ $(SPARSE_XLIBS) \ $(ARPACK_LIBS) \ $(QRUPDATE_LIBS) \ @@ -31,6 +32,7 @@ $(LIBS) LIBOCTAVE_LINK_OPTS = \ + $(CURL_LDFLAGS) \ $(SPARSE_XLDFLAGS) \ $(ARPACK_LDFLAGS) \ $(QRUPDATE_LDFLAGS) \
--- a/liboctave/util/module.mk +++ b/liboctave/util/module.mk @@ -2,6 +2,7 @@ util/module.mk UTIL_INC = \ + util/action-container.h \ util/base-list.h \ util/byte-swap.h \ util/caseless-str.h \ @@ -40,7 +41,9 @@ util/sparse-util.h \ util/statdefs.h \ util/str-vec.h \ - util/sun-utils.h + util/sun-utils.h \ + util/unwind-prot.h \ + util/url-transfer.h UTIL_C_SRC = \ util/f2c-main.c \ @@ -71,6 +74,8 @@ util/sparse-sort.cc \ util/sparse-util.cc \ util/str-vec.cc \ + util/unwind-prot.cc \ + util/url-transfer.cc \ $(UTIL_C_SRC) TEMPLATE_SRC += \
rename from libinterp/corefcn/unwind-prot.cc rename to liboctave/util/unwind-prot.cc --- a/libinterp/corefcn/unwind-prot.cc +++ b/liboctave/util/unwind-prot.cc @@ -25,11 +25,14 @@ #include <config.h> #endif -#include "error.h" +#include "lo-error.h" #include "unwind-prot.h" -void unwind_protect_safe::gripe_exception (void) +void +unwind_protect_safe::gripe_exception (void) { // FIXME: can this throw an exception? - error ("internal: unhandled exception in unwind_protect handler"); + + (*current_liboctave_error_handler) + ("internal: unhandled exception in unwind_protect handler"); }
rename from libinterp/corefcn/unwind-prot.h rename to liboctave/util/unwind-prot.h --- a/libinterp/corefcn/unwind-prot.h +++ b/liboctave/util/unwind-prot.h @@ -24,6 +24,8 @@ #if !defined (octave_unwind_prot_h) #define octave_unwind_prot_h 1 +#include <cstddef> + #include <stack> #include <memory>
new file mode 100644 --- /dev/null +++ b/liboctave/util/url-transfer.cc @@ -0,0 +1,799 @@ +/* + +Copyright (C) 2013 John W. Eaton +Copyright (C) 2006-2012 Alexander Barth +Copyright (C) 2009 David Bateman + +This file is part of Octave. + +Octave is free software; you can redistribute it and/or modify it +under the terms of the GNU General Public License as published by the +Free Software Foundation; either version 3 of the License, or (at your +option) any later version. + +Octave is distributed in the hope that it will be useful, but WITHOUT +ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +for more details. + +You should have received a copy of the GNU General Public License +along with Octave; see the file COPYING. If not, see +<http://www.gnu.org/licenses/>. + +*/ + +// Author: Alexander Barth <abarth@marine.usf.edu> +// Author: jwe + +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif + +#include <fstream> +#include <iomanip> +#include <iostream> + +#include "dir-ops.h" +#include "file-ops.h" +#include "file-stat.h" +#include "unwind-prot.h" +#include "url-transfer.h" + +#ifdef HAVE_CURL +#include <curl/curl.h> +#include <curl/curlver.h> +#include <curl/easy.h> +#endif + +void base_url_transfer::delete_file (const std::string& file) +{ + octave_unlink (file); +} + +void +base_url_transfer::mget_directory (const std::string& directory, + const std::string& target) +{ + std::string sep = file_ops::dir_sep_str (); + file_stat fs (directory); + + if (!fs || !fs.is_dir ()) + { + std::string msg; + int status = octave_mkdir (directory, 0777, msg); + + if (status < 0) + { + ok = false; + errmsg = "__ftp_mget__: can not create directory '" + + target + sep + directory + "': " + msg; + return; + } + } + + cwd (directory); + + if (good ()) + { + unwind_protect_safe frame; + + frame.add_fcn (reset_path, this); + + string_vector sv = list (); + + for (octave_idx_type i = 0; i < sv.length (); i++) + { + time_t ftime; + bool fisdir; + double fsize; + + get_fileinfo (sv(i), fsize, ftime, fisdir); + + if (fisdir) + mget_directory (sv(i), target + directory + sep); + else + { + std::string realfile = target + directory + sep + sv(i); + + std::ofstream ofile (realfile.c_str (), + std::ios::out | std::ios::binary); + + if (! ofile.is_open ()) + { + ok = false; + errmsg = "__ftp_mget__: unable to open file"; + break; + } + + unwind_protect_safe frame2; + + frame2.add_fcn (delete_file, realfile); + + get (sv(i), ofile); + + ofile.close (); + + if (good ()) + frame2.discard (); + } + + if (! good ()) + break; + } + } +} + +string_vector +base_url_transfer::mput_directory (const std::string& base, + const std::string& directory) +{ + string_vector file_list; + + std::string realdir + = (base.length () == 0 + ? directory : base + file_ops::dir_sep_str () + directory); + + mkdir (directory); + + if (! good ()) + return file_list; + + cwd (directory); + + if (good ()) + { + unwind_protect_safe frame; + + frame.add_fcn (reset_path, this); + + dir_entry dirlist (realdir); + + if (dirlist) + { + string_vector files = dirlist.read (); + + for (octave_idx_type i = 0; i < files.length (); i++) + { + std::string file = files (i); + + if (file == "." || file == "..") + continue; + + std::string realfile = realdir + file_ops::dir_sep_str () + file; + file_stat fs (realfile); + + if (! fs.exists ()) + { + ok = false; + errmsg = "__ftp__mput: file '" + realfile + + "' does not exist"; + break; + } + + if (fs.is_dir ()) + { + file_list.append (mput_directory (realdir, file)); + + if (! good ()) + break; + } + else + { + // FIXME Does ascii mode need to be flagged here? + std::ifstream ifile (realfile.c_str (), std::ios::in | + std::ios::binary); + + if (! ifile.is_open ()) + { + ok = false; + errmsg = "__ftp_mput__: unable to open file '" + + realfile + "'"; + break; + } + + put (file, ifile); + + ifile.close (); + + if (! good ()) + break; + + file_list.append (realfile); + } + } + } + else + { + ok = false; + errmsg = "__ftp_mput__: can not read the directory '" + + realdir + "'"; + } + } +} + +#if defined (HAVE_CURL) + +static int +write_data (void *buffer, size_t size, size_t nmemb, void *streamp) +{ + std::ostream& stream = *(static_cast<std::ostream*> (streamp)); + stream.write (static_cast<const char*> (buffer), size*nmemb); + return (stream.fail () ? 0 : size * nmemb); +} + +static int +read_data (void *buffer, size_t size, size_t nmemb, void *streamp) +{ + std::istream& stream = *(static_cast<std::istream*> (streamp)); + stream.read (static_cast<char*> (buffer), size*nmemb); + if (stream.eof ()) + return stream.gcount (); + else + return (stream.fail () ? 0 : size * nmemb); +} + +static size_t +throw_away (void *, size_t size, size_t nmemb, void *) +{ + return static_cast<size_t>(size * nmemb); +} + +// I'd love to rewrite this as a private method of the url_transfer +// class, but you can't pass the va_list from the wrapper SETOPT to +// the curl_easy_setopt function. +#define SETOPT(option, parameter) \ + do \ + { \ + CURLcode res = curl_easy_setopt (curl, option, parameter); \ + if (res != CURLE_OK) \ + { \ + ok = false; \ + errmsg = curl_easy_strerror (res); \ + return; \ + } \ + } \ + while (0) + +// Same as above but with a return value. +#define SETOPTR(option, parameter) \ + do \ + { \ + CURLcode res = curl_easy_setopt (curl, option, parameter); \ + if (res != CURLE_OK) \ + { \ + ok = false; \ + errmsg = curl_easy_strerror (res); \ + return retval; \ + } \ + } \ + while (0) + +class curl_transfer : public base_url_transfer +{ +public: + + curl_transfer (void) + : base_url_transfer (), curl (curl_easy_init ()), errnum () + { + if (curl) + valid = true; + else + errmsg = "can not create curl object"; + } + + curl_transfer (const std::string& host_arg, const std::string& user_arg, + const std::string& passwd, std::ostream& os) + : base_url_transfer (host_arg, user_arg, passwd, os), + curl (curl_easy_init ()), errnum () + { + if (curl) + valid = true; + else + { + errmsg = "can not create curl object"; + return; + } + + init (user_arg, passwd, std::cin, os); + + std::string url ("ftp://" + host_arg); + SETOPT (CURLOPT_URL, url.c_str ()); + + // Setup the link, with no transfer. + perform (); + } + + curl_transfer (const std::string& url, const std::string& method, + const Array<std::string>& param, std::ostream& os) + : base_url_transfer (url, method, param, os), + curl (curl_easy_init ()), errnum () + { + if (curl) + valid = true; + else + { + errmsg = "can not create curl object"; + return; + } + + init ("", "", std::cin, os); + + SETOPT (CURLOPT_NOBODY, 0); + + // Restore the default HTTP request method to GET after setting + // NOBODY to true and back to false. This is needed for backward + // compatibility with versions of libcurl < 7.18.2. + SETOPT (CURLOPT_HTTPGET, 1); + + // Don't need to store the parameters here as we can't change + // the URL after the object is created + std::string query_string = form_query_string (param); + + if (method == "get") + { + query_string = url + "?" + query_string; + SETOPT (CURLOPT_URL, query_string.c_str ()); + } + else if (method == "post") + { + SETOPT (CURLOPT_URL, url.c_str ()); + SETOPT (CURLOPT_POSTFIELDS, query_string.c_str ()); + } + else + SETOPT (CURLOPT_URL, url.c_str ()); + + perform (); + } + + ~curl_transfer (void) + { + if (curl) + curl_easy_cleanup (curl); + } + + void perform (void) + { + BEGIN_INTERRUPT_IMMEDIATELY_IN_FOREIGN_CODE; + + errnum = curl_easy_perform (curl); + + if (errnum != CURLE_OK) + { + ok = false; + errmsg = curl_easy_strerror (errnum); + } + + END_INTERRUPT_IMMEDIATELY_IN_FOREIGN_CODE; + } + + std::string lasterror (void) const + { + return std::string (curl_easy_strerror (errnum)); + } + + std::ostream& set_ostream (std::ostream& os) + { + std::ostream& retval = *curr_ostream; + curr_ostream = &os; + SETOPTR (CURLOPT_WRITEDATA, static_cast<void*> (curr_ostream)); + return retval; + } + + std::istream& set_istream (std::istream& is) + { + std::istream& retval = *curr_istream; + curr_istream = &is; + SETOPTR (CURLOPT_READDATA, static_cast<void*> (curr_istream)); + return retval; + } + + void ascii (void) + { + ascii_mode = true; + SETOPT (CURLOPT_TRANSFERTEXT, 1); + } + + void binary (void) + { + ascii_mode = false; + SETOPT (CURLOPT_TRANSFERTEXT, 0); + } + + void cwd (const std::string& path) + { + struct curl_slist *slist = 0; + + unwind_protect frame; + frame.add_fcn (curl_slist_free_all, slist); + + std::string cmd = "cwd " + path; + slist = curl_slist_append (slist, cmd.c_str ()); + SETOPT (CURLOPT_POSTQUOTE, slist); + + perform (); + if (! good ()) + return; + + SETOPT (CURLOPT_POSTQUOTE, 0); + } + + void del (const std::string& file) + { + struct curl_slist *slist = 0; + + unwind_protect frame; + frame.add_fcn (curl_slist_free_all, slist); + + std::string cmd = "dele " + file; + slist = curl_slist_append (slist, cmd.c_str ()); + SETOPT (CURLOPT_POSTQUOTE, slist); + + perform (); + if (! good ()) + return; + + SETOPT (CURLOPT_POSTQUOTE, 0); + } + + void rmdir (const std::string& path) + { + struct curl_slist *slist = 0; + + unwind_protect frame; + frame.add_fcn (curl_slist_free_all, slist); + + std::string cmd = "rmd " + path; + slist = curl_slist_append (slist, cmd.c_str ()); + SETOPT (CURLOPT_POSTQUOTE, slist); + + perform (); + if (! good ()) + return; + + SETOPT (CURLOPT_POSTQUOTE, 0); + } + + void mkdir (const std::string& path) + { + struct curl_slist *slist = 0; + + unwind_protect frame; + frame.add_fcn (curl_slist_free_all, slist); + + std::string cmd = "mkd " + path; + slist = curl_slist_append (slist, cmd.c_str ()); + SETOPT (CURLOPT_POSTQUOTE, slist); + + perform (); + if (! good ()) + return; + + SETOPT (CURLOPT_POSTQUOTE, 0); + } + + void rename (const std::string& oldname, const std::string& newname) + { + struct curl_slist *slist = 0; + + unwind_protect frame; + frame.add_fcn (curl_slist_free_all, slist); + + std::string cmd = "rnfr " + oldname; + slist = curl_slist_append (slist, cmd.c_str ()); + cmd = "rnto " + newname; + slist = curl_slist_append (slist, cmd.c_str ()); + SETOPT (CURLOPT_POSTQUOTE, slist); + + perform (); + if (! good ()) + return; + + SETOPT (CURLOPT_POSTQUOTE, 0); + } + + void put (const std::string& file, std::istream& is) + { + std::string url = "ftp://" + host + "/" + file; + SETOPT (CURLOPT_URL, url.c_str ()); + SETOPT (CURLOPT_UPLOAD, 1); + SETOPT (CURLOPT_NOBODY, 0); + std::istream& old_is = set_istream (is); + + perform (); + if (! good ()) + return; + + set_istream (old_is); + SETOPT (CURLOPT_NOBODY, 1); + SETOPT (CURLOPT_UPLOAD, 0); + url = "ftp://" + host; + SETOPT (CURLOPT_URL, url.c_str ()); + } + + void get (const std::string& file, std::ostream& os) + { + std::string url = "ftp://" + host + "/" + file; + SETOPT (CURLOPT_URL, url.c_str ()); + SETOPT (CURLOPT_NOBODY, 0); + std::ostream& old_os = set_ostream (os); + + perform (); + if (! good ()) + return; + + set_ostream (old_os); + SETOPT (CURLOPT_NOBODY, 1); + url = "ftp://" + host; + SETOPT (CURLOPT_URL, url.c_str ()); + } + + void dir (void) + { + std::string url = "ftp://" + host + "/"; + SETOPT (CURLOPT_URL, url.c_str ()); + SETOPT (CURLOPT_NOBODY, 0); + + perform (); + if (! good ()) + return; + + SETOPT (CURLOPT_NOBODY, 1); + url = "ftp://" + host; + SETOPT (CURLOPT_URL, url.c_str ()); + } + + string_vector list (void) + { + string_vector retval; + + std::ostringstream buf; + std::string url = "ftp://" + host + "/"; + SETOPTR (CURLOPT_WRITEDATA, static_cast<void*> (&buf)); + SETOPTR (CURLOPT_URL, url.c_str ()); + SETOPTR (CURLOPT_DIRLISTONLY, 1); + SETOPTR (CURLOPT_NOBODY, 0); + + perform (); + if (! good ()) + return retval; + + SETOPTR (CURLOPT_NOBODY, 1); + url = "ftp://" + host; + SETOPTR (CURLOPT_WRITEDATA, static_cast<void*> (curr_ostream)); + SETOPTR (CURLOPT_DIRLISTONLY, 0); + SETOPTR (CURLOPT_URL, url.c_str ()); + + // Count number of directory entries + std::string str = buf.str (); + octave_idx_type n = 0; + size_t pos = 0; + while (true) + { + pos = str.find_first_of ('\n', pos); + if (pos == std::string::npos) + break; + pos++; + n++; + } + retval.resize (n); + pos = 0; + for (octave_idx_type i = 0; i < n; i++) + { + size_t newpos = str.find_first_of ('\n', pos); + if (newpos == std::string::npos) + break; + + retval(i) = str.substr(pos, newpos - pos); + pos = newpos + 1; + } + + return retval; + } + + void get_fileinfo (const std::string& filename, double& filesize, + time_t& filetime, bool& fileisdir) + { + std::string path = pwd (); + + std::string url = "ftp://" + host + "/" + path + "/" + filename; + SETOPT (CURLOPT_URL, url.c_str ()); + SETOPT (CURLOPT_FILETIME, 1); + SETOPT (CURLOPT_HEADERFUNCTION, throw_away); + SETOPT (CURLOPT_WRITEFUNCTION, throw_away); + + // FIXME + // The MDTM command fails for a directory on the servers I tested + // so this is a means of testing for directories. It also means + // I can't get the date of directories! + + perform (); + if (! good ()) + { + fileisdir = true; + filetime = -1; + filesize = 0; + + return; + } + + fileisdir = false; + time_t ft; + curl_easy_getinfo (curl, CURLINFO_FILETIME, &ft); + filetime = ft; + double fs; + curl_easy_getinfo (curl, CURLINFO_CONTENT_LENGTH_DOWNLOAD, &fs); + filesize = fs; + + SETOPT (CURLOPT_WRITEFUNCTION, write_data); + SETOPT (CURLOPT_HEADERFUNCTION, 0); + SETOPT (CURLOPT_FILETIME, 0); + url = "ftp://" + host; + SETOPT (CURLOPT_URL, url.c_str ()); + + // The MDTM command seems to reset the path to the root with the + // servers I tested with, so cd again into the correct path. Make + // the path absolute so that this will work even with servers that + // don't end up in the root after an MDTM command. + cwd ("/" + path); + } + + std::string pwd (void) + { + std::string retval; + + struct curl_slist *slist = 0; + + unwind_protect frame; + frame.add_fcn (curl_slist_free_all, slist); + + slist = curl_slist_append (slist, "pwd"); + SETOPTR (CURLOPT_POSTQUOTE, slist); + SETOPTR (CURLOPT_HEADERFUNCTION, write_data); + + std::ostringstream buf; + SETOPTR (CURLOPT_WRITEHEADER, static_cast<void *>(&buf)); + + perform (); + if (! good ()) + return retval; + + retval = buf.str (); + + // Can I assume that the path is alway in "" on the last line + size_t pos2 = retval.rfind ('"'); + size_t pos1 = retval.rfind ('"', pos2 - 1); + retval = retval.substr (pos1 + 1, pos2 - pos1 - 1); + + SETOPTR (CURLOPT_HEADERFUNCTION, 0); + SETOPTR (CURLOPT_WRITEHEADER, 0); + SETOPTR (CURLOPT_POSTQUOTE, 0); + + return retval; + } + +private: + + CURL *curl; + CURLcode errnum; + + // No copying! + + curl_transfer (const curl_transfer&); + + curl_transfer& operator = (const curl_transfer&); + + void init (const std::string& user, const std::string& passwd, + std::istream& is, std::ostream& os) + { + // No data transfer by default + SETOPT (CURLOPT_NOBODY, 1); + + // Set the username and password + userpwd = user; + if (! passwd.empty ()) + userpwd += ":" + passwd; + if (! userpwd.empty ()) + SETOPT (CURLOPT_USERPWD, userpwd.c_str ()); + + // Define our callback to get called when there's data to be written. + SETOPT (CURLOPT_WRITEFUNCTION, write_data); + + // Set a pointer to our struct to pass to the callback. + SETOPT (CURLOPT_WRITEDATA, static_cast<void*> (&os)); + + // Define our callback to get called when there's data to be read + SETOPT (CURLOPT_READFUNCTION, read_data); + + // Set a pointer to our struct to pass to the callback. + SETOPT (CURLOPT_READDATA, static_cast<void*> (&is)); + + // Follow redirects. + SETOPT (CURLOPT_FOLLOWLOCATION, true); + + // Don't use EPSV since connecting to sites that don't support it + // will hang for some time (3 minutes?) before moving on to try PASV + // instead. + SETOPT (CURLOPT_FTP_USE_EPSV, false); + + SETOPT (CURLOPT_NOPROGRESS, true); + SETOPT (CURLOPT_FAILONERROR, true); + + SETOPT (CURLOPT_POSTQUOTE, 0); + SETOPT (CURLOPT_QUOTE, 0); + } + + std::string form_query_string (const Array<std::string>& param) + { + std::ostringstream query; + + for (int i = 0; i < param.numel (); i += 2) + { + std::string name = param(i); + std::string text = param(i+1); + + // Encode strings. + char *enc_name = curl_easy_escape (curl, name.c_str (), + name.length ()); + char *enc_text = curl_easy_escape (curl, text.c_str (), + text.length ()); + + query << enc_name << "=" << enc_text; + + curl_free (enc_name); + curl_free (enc_text); + + if (i < param.numel ()-1) + query << "&"; + } + + query.flush (); + + return query.str (); + } +}; + +#undef SETOPT + +#else + +static void +disabled_error (void) +{ + (*current_liboctave_error_handler) + ("support for url transfers was disabled when Octave was built"); +} + +#endif + +#if defined (HAVE_CURL) +# define REP_CLASS curl_transfer +#else +# define REP_CLASS base_url_transfer +#endif + +url_transfer::url_transfer (void) : rep (new REP_CLASS ()) +{ +#if !defined (HAVE_CURL) + disabled_error (); +#endif +} + +url_transfer::url_transfer (const std::string& host, const std::string& user, + const std::string& passwd, std::ostream& os) + : rep (new REP_CLASS (host, user, passwd, os)) +{ +#if !defined (HAVE_CURL) + disabled_error (); +#endif +} + +url_transfer::url_transfer (const std::string& url, const std::string& method, + const Array<std::string>& param, std::ostream& os) + : rep (new REP_CLASS (url, method, param, os)) +{ +#if !defined (HAVE_CURL) + disabled_error (); +#endif +} + +#undef REP_CLASS
new file mode 100644 --- /dev/null +++ b/liboctave/util/url-transfer.h @@ -0,0 +1,265 @@ +/* + +Copyright (C) 2013 John W. Eaton +Copyright (C) 2006-2012 Alexander Barth +Copyright (C) 2009 David Bateman + +This file is part of Octave. + +Octave is free software; you can redistribute it and/or modify it +under the terms of the GNU General Public License as published by the +Free Software Foundation; either version 3 of the License, or (at your +option) any later version. + +Octave is distributed in the hope that it will be useful, but WITHOUT +ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +for more details. + +You should have received a copy of the GNU General Public License +along with Octave; see the file COPYING. If not, see +<http://www.gnu.org/licenses/>. + +*/ + +// Author: Alexander Barth <abarth@marine.usf.edu> +// Author: jwe + +#if !defined (octave_url_transfer_h) +#define octave_url_transfer_h 1 + +#include <iosfwd> +#include <string> + +class base_url_transfer +{ +private: + + static void delete_file (const std::string& file); + + static void reset_path (base_url_transfer *curl_xfer) + { + curl_xfer->cwd (".."); + } + +public: + + friend class url_transfer; + + base_url_transfer (void) + : count (1), host (), userpwd (), valid (false), ascii_mode (false), + ok (true), errmsg (), curr_istream (&std::cin), curr_ostream (&std::cout) + { } + + base_url_transfer (const std::string& host_arg, + const std::string& /* user_arg */, + const std::string& /* passwd */, + std::ostream& os) + : count (1), host (host_arg), userpwd (), valid (false), + ascii_mode (false), ok (true), errmsg (), curr_istream (&std::cin), + curr_ostream (&os) { } + + base_url_transfer (const std::string& /* url */, + const std::string& /* method */, + const Array<std::string>& /* param */, + std::ostream& os) + : count (1), host (), userpwd (), valid (false), ascii_mode (false), + ok (true), errmsg (), curr_istream (&std::cin), curr_ostream (&os) { } + + virtual ~base_url_transfer (void) { } + + bool is_valid (void) const { return valid; } + + bool good (void) const { return valid && ok; } + + virtual void perform (void) { } + + virtual std::string lasterror (void) const { return errmsg; } + + virtual std::ostream& set_ostream (std::ostream& /* os */) + { + return *curr_ostream; + } + + virtual std::istream& set_istream (std::istream& /* is */) + { + return *curr_istream; + } + + virtual void ascii (void) { } + + virtual void binary (void) { } + + bool is_ascii (void) const { return ascii_mode; } + + bool is_binary (void) const { return !ascii_mode; } + + virtual void cwd (const std::string& /* path */) { } + + virtual void del (const std::string& /* file */) { } + + virtual void rmdir (const std::string& /* path */) { } + + virtual void mkdir (const std::string& /* path */) { } + + virtual void rename (const std::string& /* oldname */, + const std::string& /* newname */) { } + + virtual void put (const std::string& /* file */, + std::istream& /* is */) { } + + virtual void get (const std::string& /* file */, + std::ostream& /* os */) { } + + void mget_directory (const std::string& directory, + const std::string& target); + + string_vector mput_directory (const std::string& base, + const std::string& directory); + + virtual void dir (void) { } + + virtual string_vector list (void) { return string_vector (); } + + virtual void get_fileinfo (const std::string& /* filename */, + double& /* filesize */, + time_t& /* filetime */, + bool& /* fileisdir */) { } + + virtual std::string pwd (void) { return std::string (); } + +protected: + + octave_refcount<size_t> count; + std::string host; + std::string userpwd; + bool valid; + bool ascii_mode; + bool ok; + std::string errmsg; + std::istream *curr_istream; + std::ostream *curr_ostream; + +private: + + // No copying! + + base_url_transfer (const base_url_transfer&); + + base_url_transfer& operator = (const base_url_transfer&); +}; + +class url_transfer +{ +public: + + url_transfer (void); + + url_transfer (const std::string& host, const std::string& user, + const std::string& passwd, std::ostream& os); + + url_transfer (const std::string& url, const std::string& method, + const Array<std::string>& param, std::ostream& os); + + url_transfer (const url_transfer& h) : rep (h.rep) + { + rep->count++; + } + + ~url_transfer (void) + { + if (--rep->count == 0) + delete rep; + } + + url_transfer& operator = (const url_transfer& h) + { + if (this != &h) + { + if (--rep->count == 0) + delete rep; + + rep = h.rep; + rep->count++; + } + + return *this; + } + + bool is_valid (void) const { return rep->is_valid (); } + + bool good (void) const { return rep->good (); } + + std::string lasterror (void) const { return rep->lasterror (); } + + std::ostream& set_ostream (std::ostream& os) + { + return rep->set_ostream (os); + } + + std::istream& set_istream (std::istream& is) + { + return rep->set_istream (is); + } + + void ascii (void) { rep->ascii (); } + + void binary (void) { rep->binary (); } + + bool is_ascii (void) const { return rep->is_ascii (); } + + bool is_binary (void) const { return rep->is_binary (); } + + void cwd (const std::string& path) { rep->cwd (path); } + + void del (const std::string& file) { rep->del (file); } + + void rmdir (const std::string& path) { rep->rmdir (path); } + + void mkdir (const std::string& path) { rep->mkdir (path); } + + void rename (const std::string& oldname, const std::string& newname) + { + rep->rename (oldname, newname); + } + + void put (const std::string& file, std::istream& is) + { + rep->put (file, is); + } + + void get (const std::string& file, std::ostream& os) + { + rep->get (file, os); + } + + void mget_directory (const std::string& directory, + const std::string& target) + { + rep->mget_directory (directory, target); + } + + string_vector mput_directory (const std::string& base, + const std::string& directory) + { + return rep->mput_directory (base, directory); + } + + void dir (void) { rep->dir (); } + + string_vector list (void) { return rep->list (); } + + void get_fileinfo (const std::string& filename, double& filesize, + time_t& filetime, bool& fileisdir) + { + rep->get_fileinfo (filename, filesize, filetime, fileisdir); + } + + std::string pwd (void) { return rep->pwd (); } + +private: + + base_url_transfer *rep; +}; + +#endif
--- a/scripts/@ftp/close.m +++ b/scripts/@ftp/close.m @@ -23,7 +23,7 @@ ## @var{f} is an FTP object returned by the @code{ftp} function. ## @end deftypefn -function dir (f) +function close (f) __ftp_close__ (f.curlhandle); endfunction
--- a/scripts/@ftp/ftp.m +++ b/scripts/@ftp/ftp.m @@ -53,7 +53,7 @@ p.password = password; p.curlhandle = tmpnam ("ftp-"); if (nargin > 0) - __ftp__ (p.curlhandle, host, username, password); + p.curlhandle = __ftp__ (host, username, password); endif obj = class (p, "ftp"); endif
--- a/scripts/@ftp/loadobj.m +++ b/scripts/@ftp/loadobj.m @@ -21,8 +21,7 @@ if (isfield (b, "jobject")) b = rmfield (b, "jobject"); endif - b.curlhandle = tmpnam ("ftp-"); - __ftp__ (b.curlhandle, b.host, b.username, b.password); + b.curlhandle = __ftp__ (b.host, b.username, b.password); if (isfield (b, "dir")) if (! isempty (b.dir)) __ftp_cwd__ (b.curlhandle, b.dir);
--- a/scripts/@ftp/saveobj.m +++ b/scripts/@ftp/saveobj.m @@ -19,6 +19,6 @@ function b = saveobj (a) b = a; b = rmfield (b, "curlhandle"); - b.dir = __ftp_pwd (a.curlhandle); + b.dir = __ftp_pwd__ (a.curlhandle); endfunction
--- a/scripts/Makefile.am +++ b/scripts/Makefile.am @@ -47,6 +47,7 @@ include elfun/module.mk include general/module.mk include geometry/module.mk +include gui/module.mk include help/module.mk include image/module.mk include io/module.mk @@ -56,7 +57,9 @@ include optimization/module.mk include path/module.mk include pkg/module.mk -include plot/module.mk +include plot/appearance/module.mk +include plot/draw/module.mk +include plot/util/module.mk include polynomial/module.mk include prefs/module.mk include set/module.mk @@ -112,6 +115,10 @@ $(srcdir)/mk-pkg-add $(srcdir) $(geometry_FCN_FILES) -- $(geometry_GEN_FCN_FILES) > $@-t mv $@-t $@ +gui/PKG_ADD: $(gui_FCN_FILES) $(gui_GEN_FCN_FILES) gui/$(octave_dirstamp) mk-pkg-add + $(srcdir)/mk-pkg-add $(srcdir) $(gui_FCN_FILES) -- $(gui_GEN_FCN_FILES) > $@-t + mv $@-t $@ + help/PKG_ADD: $(help_FCN_FILES) $(help_GEN_FCN_FILES) help/$(octave_dirstamp) mk-pkg-add $(srcdir)/mk-pkg-add $(srcdir) $(help_FCN_FILES) -- $(help_GEN_FCN_FILES) > $@-t mv $@-t $@ @@ -148,8 +155,16 @@ $(srcdir)/mk-pkg-add $(srcdir) $(pkg_FCN_FILES) -- $(pkg_GEN_FCN_FILES) > $@-t mv $@-t $@ -plot/PKG_ADD: $(plot_FCN_FILES) $(plot_GEN_FCN_FILES) plot/$(octave_dirstamp) mk-pkg-add - $(srcdir)/mk-pkg-add $(srcdir) $(plot_FCN_FILES) -- $(plot_GEN_FCN_FILES) > $@-t +plot/appearance/PKG_ADD: $(plot_appearance_FCN_FILES) $(plot_appearance_GEN_FCN_FILES) plot/appearance/$(octave_dirstamp) mk-pkg-add + $(srcdir)/mk-pkg-add $(srcdir) $(plot_appearance_FCN_FILES) -- $(plot_appearance_GEN_FCN_FILES) > $@-t + mv $@-t $@ + +plot/draw/PKG_ADD: $(plot_draw_FCN_FILES) $(plot_draw_GEN_FCN_FILES) plot/draw/$(octave_dirstamp) mk-pkg-add + $(srcdir)/mk-pkg-add $(srcdir) $(plot_draw_FCN_FILES) -- $(plot_draw_GEN_FCN_FILES) > $@-t + mv $@-t $@ + +plot/util/PKG_ADD: $(plot_util_FCN_FILES) $(plot_util_GEN_FCN_FILES) plot/util/$(octave_dirstamp) mk-pkg-add + $(srcdir)/mk-pkg-add $(srcdir) $(plot_util_FCN_FILES) -- $(plot_util_GEN_FCN_FILES) > $@-t mv $@-t $@ polynomial/PKG_ADD: $(polynomial_FCN_FILES) $(polynomial_GEN_FCN_FILES) polynomial/$(octave_dirstamp) mk-pkg-add @@ -222,6 +237,7 @@ $(elfun_GEN_FCN_FILES): elfun/$(octave_dirstamp) $(general_GEN_FCN_FILES): general/$(octave_dirstamp) $(geometry_GEN_FCN_FILES): geometry/$(octave_dirstamp) +$(gui_GEN_FCN_FILES): gui/$(octave_dirstamp) $(help_GEN_FCN_FILES): help/$(octave_dirstamp) $(image_GEN_FCN_FILES): image/$(octave_dirstamp) $(io_GEN_FCN_FILES): io/$(octave_dirstamp) @@ -231,7 +247,9 @@ $(optimization_GEN_FCN_FILES): optimization/$(octave_dirstamp) $(path_GEN_FCN_FILES): path/$(octave_dirstamp) $(pkg_GEN_FCN_FILES): pkg/$(octave_dirstamp) -$(plot_GEN_FCN_FILES): plot/$(octave_dirstamp) +$(plot_appearance_GEN_FCN_FILES): plot/appearance/$(octave_dirstamp) +$(plot_draw_GEN_FCN_FILES): plot/draw/$(octave_dirstamp) +$(plot_util_GEN_FCN_FILES): plot/util/$(octave_dirstamp) $(polynomial_GEN_FCN_FILES): polynomial/$(octave_dirstamp) $(prefs_GEN_FCN_FILES): prefs/$(octave_dirstamp) $(set_GEN_FCN_FILES): set/$(octave_dirstamp) @@ -267,6 +285,9 @@ geometry/$(octave_dirstamp): $(MKDIR_P) geometry : > geometry/$(octave_dirstamp) +gui/$(octave_dirstamp): + $(MKDIR_P) gui + : > gui/$(octave_dirstamp) help/$(octave_dirstamp): $(MKDIR_P) help : > help/$(octave_dirstamp) @@ -294,9 +315,15 @@ pkg/$(octave_dirstamp): $(MKDIR_P) pkg : > pkg/$(octave_dirstamp) -plot/$(octave_dirstamp): - $(MKDIR_P) plot - : > plot/$(octave_dirstamp) +plot/appearance/$(octave_dirstamp): + $(MKDIR_P) plot/appearance + : > plot/appearance/$(octave_dirstamp) +plot/draw/$(octave_dirstamp): + $(MKDIR_P) plot/draw + : > plot/draw/$(octave_dirstamp) +plot/util/$(octave_dirstamp): + $(MKDIR_P) plot/util + : > plot/util/$(octave_dirstamp) polynomial/$(octave_dirstamp): $(MKDIR_P) polynomial : > polynomial/$(octave_dirstamp)
new file mode 100644 --- /dev/null +++ b/scripts/gui/module.mk @@ -0,0 +1,35 @@ +FCN_FILE_DIRS += gui + +gui_PRIVATE_FCN_FILES = \ + gui/private/__file_filter__.m \ + gui/private/__fltk_file_filter__.m \ + gui/private/__is_function__.m \ + gui/private/__uigetdir_fltk__.m \ + gui/private/__uigetfile_fltk__.m \ + gui/private/__uiobject_split_args__.m \ + gui/private/__uiputfile_fltk__.m + +gui_FCN_FILES = \ + gui/guidata.m \ + gui/guihandles.m \ + gui/uicontextmenu.m \ + gui/uicontrol.m \ + gui/uigetdir.m \ + gui/uigetfile.m \ + gui/uimenu.m \ + gui/uipanel.m \ + gui/uipushtool.m \ + gui/uiputfile.m \ + gui/uiresume.m \ + gui/uitoggletool.m \ + gui/uitoolbar.m \ + gui/uiwait.m \ + gui/waitbar.m \ + gui/waitforbuttonpress.m \ + $(gui_PRIVATE_FCN_FILES) + +FCN_FILES += $(gui_FCN_FILES) + +PKG_ADD_FILES += gui/PKG_ADD + +DIRSTAMP_FILES += gui/$(octave_dirstamp)
rename from scripts/plot/private/__fltk_file_filter__.m rename to scripts/gui/private/__fltk_file_filter__.m
rename from scripts/plot/private/__uigetdir_fltk__.m rename to scripts/gui/private/__uigetdir_fltk__.m
rename from scripts/plot/private/__uigetfile_fltk__.m rename to scripts/gui/private/__uigetfile_fltk__.m
rename from scripts/plot/private/__uiobject_split_args__.m rename to scripts/gui/private/__uiobject_split_args__.m
rename from scripts/plot/private/__uiputfile_fltk__.m rename to scripts/gui/private/__uiputfile_fltk__.m
rename from scripts/plot/private/__getlegenddata__.m rename to scripts/plot/appearance/__getlegenddata__.m
rename from scripts/plot/axis.m rename to scripts/plot/appearance/axis.m --- a/scripts/plot/axis.m +++ b/scripts/plot/appearance/axis.m @@ -364,7 +364,9 @@ ylim = ylim .* (1 + eps () * [-1, 1]); endif set (ca, "xlim", xlim, "ylim", ylim) - if (__calc_dimensions__ (ca) > 2) + nd = __calc_dimensions__ (ca); + is3dview = (get (ca, "view")(2) != 90); + if (nd > 2 && is3dview) zlim = __get_tight_lims__ (ca, "z"); if (all (zlim == 0)) zlim = eps () * [-1 1];
rename from scripts/plot/daspect.m rename to scripts/plot/appearance/daspect.m --- a/scripts/plot/daspect.m +++ b/scripts/plot/appearance/daspect.m @@ -27,7 +27,7 @@ ## The aspect ratio is a normalized 3-element vector representing the span of ## the x, y, and z-axis limits. ## -## @code{(daspect (@var{mode}))} +## @code{daspect (@var{mode})} ## ## Set the data aspect ratio mode of the current axes. @var{mode} is ## either @qcode{"auto"} or @qcode{"manual"}.
rename from scripts/plot/legend.m rename to scripts/plot/appearance/legend.m --- a/scripts/plot/legend.m +++ b/scripts/plot/appearance/legend.m @@ -880,11 +880,12 @@ "cdata", cdata, "userdata", hplots(k)); hobjects(end+1) = p1; endif + ## FIXME: Probably need listeners, as for line objects case "surface" facecolor = get (hplots(k), "facecolor"); edgecolor = get (hplots(k), "edgecolor"); - cdata = sum (caxis ()) / 2; + cdata = sum (get (ca(1), "clim")) / 2; if (! strcmp (facecolor, "none") || ! strcmp (edgecolor, "none")) p1 = patch ("xdata", ([0, linelength, linelength, 0] + xoffset + xk * xstep) / lpos(3), @@ -894,6 +895,7 @@ "cdata", cdata, "userdata", hplots(k)); hobjects(end+1) = p1; endif + ## FIXME: Probably need listeners, as for line objects endswitch
new file mode 100644 --- /dev/null +++ b/scripts/plot/appearance/module.mk @@ -0,0 +1,41 @@ +FCN_FILE_DIRS += plot/appearance + +plot_appearance_PRIVATE_FCN_FILES = \ + plot/appearance/private/__axis_limits__.m \ + plot/appearance/private/__axis_label__.m + +plot_appearance_FCN_FILES = \ + plot/appearance/__clabel__.m \ + plot/appearance/__getlegenddata__.m \ + plot/appearance/axis.m \ + plot/appearance/box.m \ + plot/appearance/caxis.m \ + plot/appearance/clabel.m \ + plot/appearance/daspect.m \ + plot/appearance/diffuse.m \ + plot/appearance/grid.m \ + plot/appearance/gtext.m \ + plot/appearance/hidden.m \ + plot/appearance/legend.m \ + plot/appearance/orient.m \ + plot/appearance/pbaspect.m \ + plot/appearance/shading.m \ + plot/appearance/specular.m \ + plot/appearance/text.m \ + plot/appearance/title.m \ + plot/appearance/view.m \ + plot/appearance/whitebg.m \ + plot/appearance/xlabel.m \ + plot/appearance/xlim.m \ + plot/appearance/ylabel.m \ + plot/appearance/ylim.m \ + plot/appearance/zlabel.m \ + plot/appearance/zlim.m \ + $(plot_appearance_PRIVATE_FCN_FILES) + +FCN_FILES += $(plot_appearance_FCN_FILES) + +PKG_ADD_FILES += plot/appearance/PKG_ADD + +DIRSTAMP_FILES += plot/appearance/$(octave_dirstamp) +
rename from scripts/plot/private/__axis_label__.m rename to scripts/plot/appearance/private/__axis_label__.m
rename from scripts/plot/private/__axes_limits__.m rename to scripts/plot/appearance/private/__axis_limits__.m --- a/scripts/plot/private/__axes_limits__.m +++ b/scripts/plot/appearance/private/__axis_limits__.m @@ -17,11 +17,11 @@ ## <http://www.gnu.org/licenses/>. ## -*- texinfo -*- -## @deftypefn {Function File} {} __axes_limits__ (@var{fcn}, @dots{}) +## @deftypefn {Function File} {} __axis_limits__ (@var{fcn}, @dots{}) ## Undocumented internal function. ## @end deftypefn -function retval = __axes_limits__ (fcn, varargin) +function retval = __axis_limits__ (fcn, varargin) [hax, varargin, nargin] = __plt_get_axis_arg__ (fcn, varargin{:});
rename from scripts/plot/text.m rename to scripts/plot/appearance/text.m --- a/scripts/plot/text.m +++ b/scripts/plot/appearance/text.m @@ -131,11 +131,20 @@ hax = gca (); endif + ## Position argument may alse be in PROP/VAL pair + idx = find (strcmpi (varargin, "position"), 1); + if (idx) + pos = varargin{idx+1}; + varargin(idx:idx+1) = []; + else + pos = [x(:), y(:), z(:)]; + endif + if (nx == ny && nx == nz && (nt == nx || nt == 1 || nx == 1)) - pos = [x(:), y(:), z(:)]; htmp = zeros (nt, 1); if (nx == 1) htmp = __go_text__ (hax, "string", string{1}, + ## varargin first, in case "Units" set for pos. varargin{:}, "position", pos); elseif (nx == nt)
rename from scripts/plot/xlim.m rename to scripts/plot/appearance/xlim.m --- a/scripts/plot/xlim.m +++ b/scripts/plot/appearance/xlim.m @@ -41,7 +41,7 @@ ## @end deftypefn function retval = xlim (varargin) - ret = __axes_limits__ ("xlim", varargin{:}); + ret = __axis_limits__ ("xlim", varargin{:}); if (! isempty (ret)) retval = ret;
rename from scripts/plot/ylim.m rename to scripts/plot/appearance/ylim.m --- a/scripts/plot/ylim.m +++ b/scripts/plot/appearance/ylim.m @@ -41,7 +41,7 @@ ## @end deftypefn function retval = ylim (varargin) - ret = __axes_limits__ ("ylim", varargin{:}); + ret = __axis_limits__ ("ylim", varargin{:}); if (! isempty (ret)) retval = ret;
rename from scripts/plot/zlim.m rename to scripts/plot/appearance/zlim.m --- a/scripts/plot/zlim.m +++ b/scripts/plot/appearance/zlim.m @@ -41,7 +41,7 @@ ## @end deftypefn function retval = zlim (varargin) - ret = __axes_limits__ ("zlim", varargin{:}); + ret = __axis_limits__ ("zlim", varargin{:}); if (! isempty (ret)) retval = ret;
new file mode 100644 --- /dev/null +++ b/scripts/plot/draw/module.mk @@ -0,0 +1,104 @@ +FCN_FILE_DIRS += plot/draw + +plot_draw_PRIVATE_FCN_FILES = \ + plot/draw/private/__add_datasource__.m \ + plot/draw/private/__bar__.m \ + plot/draw/private/__contour__.m \ + plot/draw/private/__errcomm__.m \ + plot/draw/private/__errplot__.m \ + plot/draw/private/__ezplot__.m \ + plot/draw/private/__interp_cube__.m \ + plot/draw/private/__line__.m \ + plot/draw/private/__marching_cube__.m \ + plot/draw/private/__patch__.m \ + plot/draw/private/__pie__.m \ + plot/draw/private/__plt__.m \ + plot/draw/private/__quiver__.m \ + plot/draw/private/__scatter__.m \ + plot/draw/private/__stem__.m + +plot_draw_FCN_FILES = \ + plot/draw/area.m \ + plot/draw/barh.m \ + plot/draw/bar.m \ + plot/draw/colorbar.m \ + plot/draw/comet3.m \ + plot/draw/comet.m \ + plot/draw/compass.m \ + plot/draw/contour3.m \ + plot/draw/contourc.m \ + plot/draw/contourf.m \ + plot/draw/contour.m \ + plot/draw/cylinder.m \ + plot/draw/ellipsoid.m \ + plot/draw/errorbar.m \ + plot/draw/ezcontourf.m \ + plot/draw/ezcontour.m \ + plot/draw/ezmeshc.m \ + plot/draw/ezmesh.m \ + plot/draw/ezplot3.m \ + plot/draw/ezplot.m \ + plot/draw/ezpolar.m \ + plot/draw/ezsurfc.m \ + plot/draw/ezsurf.m \ + plot/draw/feather.m \ + plot/draw/fill.m \ + plot/draw/fplot.m \ + plot/draw/hist.m \ + plot/draw/isocolors.m \ + plot/draw/isonormals.m \ + plot/draw/isosurface.m \ + plot/draw/line.m \ + plot/draw/loglogerr.m \ + plot/draw/loglog.m \ + plot/draw/meshc.m \ + plot/draw/mesh.m \ + plot/draw/meshz.m \ + plot/draw/pareto.m \ + plot/draw/patch.m \ + plot/draw/pcolor.m \ + plot/draw/peaks.m \ + plot/draw/pie3.m \ + plot/draw/pie.m \ + plot/draw/plot3.m \ + plot/draw/plot.m \ + plot/draw/plotmatrix.m \ + plot/draw/plotyy.m \ + plot/draw/polar.m \ + plot/draw/quiver3.m \ + plot/draw/quiver.m \ + plot/draw/rectangle.m \ + plot/draw/ribbon.m \ + plot/draw/rose.m \ + plot/draw/scatter3.m \ + plot/draw/scatter.m \ + plot/draw/semilogxerr.m \ + plot/draw/semilogx.m \ + plot/draw/semilogyerr.m \ + plot/draw/semilogy.m \ + plot/draw/shrinkfaces.m \ + plot/draw/slice.m \ + plot/draw/sombrero.m \ + plot/draw/sphere.m \ + plot/draw/stairs.m \ + plot/draw/stem3.m \ + plot/draw/stemleaf.m \ + plot/draw/stem.m \ + plot/draw/surface.m \ + plot/draw/surfc.m \ + plot/draw/surfl.m \ + plot/draw/surf.m \ + plot/draw/surfnorm.m \ + plot/draw/tetramesh.m \ + plot/draw/trimesh.m \ + plot/draw/triplot.m \ + plot/draw/trisurf.m \ + plot/draw/waterfall.m \ + $(plot_draw_PRIVATE_FCN_FILES) + +FCN_FILES += $(plot_draw_FCN_FILES) + +PKG_ADD_FILES += plot/draw/PKG_ADD + +DIRSTAMP_FILES += plot/draw/$(octave_dirstamp) +
rename from scripts/plot/pcolor.m rename to scripts/plot/draw/pcolor.m --- a/scripts/plot/pcolor.m +++ b/scripts/plot/draw/pcolor.m @@ -83,9 +83,8 @@ htmp = surface (x, y, z, c); set (htmp, "facecolor", "flat"); - set (hax, "box", "on"); if (! ishold ()) - set (hax, "view", [0, 90]); + set (hax, "view", [0, 90], "box", "on"); endif unwind_protect_cleanup
rename from scripts/plot/private/__add_datasource__.m rename to scripts/plot/draw/private/__add_datasource__.m
rename from scripts/plot/private/__interp_cube__.m rename to scripts/plot/draw/private/__interp_cube__.m
rename from scripts/plot/private/__marching_cube__.m rename to scripts/plot/draw/private/__marching_cube__.m
rename from scripts/plot/stairs.m rename to scripts/plot/draw/stairs.m --- a/scripts/plot/stairs.m +++ b/scripts/plot/draw/stairs.m @@ -238,10 +238,10 @@ function update_props (h, ~) set (get (h, "children"), - {"color", "linestyle", "linewidth", "marker", "markeredgecolor", - "markerfacecolor", "markersize", "markersize"}, - get (h, {"color", "linestyle", "linewidth", "marker", "markeredgecolor", - "markerfacecolor", "markersize", "markersize"})); + {"color", "linestyle", "linewidth", "marker", ... + "markeredgecolor", "markerfacecolor", "markersize"}, + get (h, {"color", "linestyle", "linewidth", "marker", ... + "markeredgecolor", "markerfacecolor", "markersize"})); endfunction function update_data (h, ~)
rename from scripts/plot/private/__actual_axis_position__.m rename to scripts/plot/util/__actual_axis_position__.m
rename from scripts/plot/private/__default_plot_options__.m rename to scripts/plot/util/__default_plot_options__.m
rename from scripts/plot/private/__next_line_color__.m rename to scripts/plot/util/__next_line_color__.m
rename from scripts/plot/private/__next_line_style__.m rename to scripts/plot/util/__next_line_style__.m
rename from scripts/plot/copyobj.m rename to scripts/plot/util/copyobj.m --- a/scripts/plot/copyobj.m +++ b/scripts/plot/util/copyobj.m @@ -84,9 +84,10 @@ %! legend ('errorbar', 'line'); %! hnew = copyobj (hdl); -%!demo -%! ## FIXME: This demo fails occasionally for an obscure reason. +%!#demo +%! ## FIXME: This demo fails for an obscure reason. %! ## It appears that there is something wrong with Octave code for patches. +%! ## This demo must remain commented out until patch() has been reworked. %! unwind_protect %! hdl = figure (1234); %! clf;
new file mode 100644 --- /dev/null +++ b/scripts/plot/util/module.mk @@ -0,0 +1,80 @@ +FCN_FILE_DIRS += plot + +plot_util_GEN_FCN_FILES = \ + plot/util/gnuplot_binary.m + +GEN_FCN_FILES += $(plot_util_GEN_FCN_FILES) + +plot_util_PRIVATE_FCN_FILES = \ + plot/util/private/__add_default_menu__.m \ + plot/util/private/__fltk_ginput__.m \ + plot/util/private/__fltk_print__.m \ + plot/util/private/__ghostscript__.m \ + plot/util/private/__gnuplot_get_var__.m \ + plot/util/private/__gnuplot_ginput__.m \ + plot/util/private/__gnuplot_has_feature__.m \ + plot/util/private/__gnuplot_has_terminal__.m \ + plot/util/private/__gnuplot_open_stream__.m \ + plot/util/private/__gnuplot_print__.m \ + plot/util/private/__gnuplot_version__.m \ + plot/util/private/__go_draw_axes__.m \ + plot/util/private/__go_draw_figure__.m \ + plot/util/private/__print_parse_opts__.m \ + plot/util/private/__tight_eps_bbox__.m + +plot_util_FCN_FILES = \ + plot/util/__actual_axis_position__.m \ + plot/util/allchild.m \ + plot/util/ancestor.m \ + plot/util/axes.m \ + plot/util/cla.m \ + plot/util/clf.m \ + plot/util/close.m \ + plot/util/closereq.m \ + plot/util/colstyle.m \ + plot/util/copyobj.m \ + plot/util/__default_plot_options__.m \ + plot/util/figure.m \ + plot/util/findall.m \ + plot/util/findfigs.m \ + plot/util/findobj.m \ + plot/util/gca.m \ + plot/util/gcbf.m \ + plot/util/gcbo.m \ + plot/util/gcf.m \ + plot/util/gco.m \ + plot/util/ginput.m \ + plot/util/__gnuplot_drawnow__.m \ + plot/util/graphics_toolkit.m \ + plot/util/hdl2struct.m \ + plot/util/hggroup.m \ + plot/util/hold.m \ + plot/util/isaxes.m \ + plot/util/isfigure.m \ + plot/util/ishghandle.m \ + plot/util/ishold.m \ + plot/util/isprop.m \ + plot/util/linkprop.m \ + plot/util/meshgrid.m \ + plot/util/ndgrid.m \ + plot/util/newplot.m \ + plot/util/__next_line_color__.m \ + plot/util/__next_line_style__.m \ + plot/util/__plt_get_axis_arg__.m \ + plot/util/__pltopt__.m \ + plot/util/printd.m \ + plot/util/print.m \ + plot/util/refreshdata.m \ + plot/util/refresh.m \ + plot/util/saveas.m \ + plot/util/shg.m \ + plot/util/struct2hdl.m \ + plot/util/subplot.m \ + $(plot_util_PRIVATE_FCN_FILES) + +FCN_FILES += $(plot_util_FCN_FILES) + +PKG_ADD_FILES += plot/util/PKG_ADD + +DIRSTAMP_FILES += plot/util/$(octave_dirstamp) +
rename from scripts/plot/private/__add_default_menu__.m rename to scripts/plot/util/private/__add_default_menu__.m
rename from scripts/plot/private/__fltk_ginput__.m rename to scripts/plot/util/private/__fltk_ginput__.m
rename from scripts/plot/private/__fltk_print__.m rename to scripts/plot/util/private/__fltk_print__.m
rename from scripts/plot/private/__ghostscript__.m rename to scripts/plot/util/private/__ghostscript__.m
rename from scripts/plot/private/__gnuplot_get_var__.m rename to scripts/plot/util/private/__gnuplot_get_var__.m
rename from scripts/plot/private/__gnuplot_ginput__.m rename to scripts/plot/util/private/__gnuplot_ginput__.m
rename from scripts/plot/private/__gnuplot_has_feature__.m rename to scripts/plot/util/private/__gnuplot_has_feature__.m
rename from scripts/plot/private/__gnuplot_has_terminal__.m rename to scripts/plot/util/private/__gnuplot_has_terminal__.m
rename from scripts/plot/private/__gnuplot_open_stream__.m rename to scripts/plot/util/private/__gnuplot_open_stream__.m
rename from scripts/plot/private/__gnuplot_print__.m rename to scripts/plot/util/private/__gnuplot_print__.m
rename from scripts/plot/private/__gnuplot_version__.m rename to scripts/plot/util/private/__gnuplot_version__.m
rename from scripts/plot/private/__go_draw_axes__.m rename to scripts/plot/util/private/__go_draw_axes__.m
rename from scripts/plot/private/__go_draw_figure__.m rename to scripts/plot/util/private/__go_draw_figure__.m
rename from scripts/plot/private/__print_parse_opts__.m rename to scripts/plot/util/private/__print_parse_opts__.m
rename from scripts/plot/private/__tight_eps_bbox__.m rename to scripts/plot/util/private/__tight_eps_bbox__.m
rename from scripts/plot/struct2hdl.m rename to scripts/plot/util/struct2hdl.m --- a/scripts/plot/struct2hdl.m +++ b/scripts/plot/util/struct2hdl.m @@ -189,7 +189,7 @@ if (isfield (s.properties, "__plotyy_axes__")) plty = s.properties.__plotyy_axes__; - addproperty ("__plotyy_axes__", h, "any"); + addproperty ("__plotyy_axes__", h, "data"); tmp = [p [s.handle; h]]; tst = ismember (tmp(1:2:end), plty); if (sum (tst) == numel (plty))