# HG changeset patch
# User John W. Eaton
# Date 1383672462 18000
# Node ID 97e49b588f5d631a9a7f67055b1d50aa0ef4a3ce
# Parent c4f5c781c3ca007a845b2a5b5875af1e2355f356# Parent bfbe5dcc99435aa7f5295d09f91c3b7fe10f15c4
maint: periodic merge of default to classdef
diff -r c4f5c781c3ca -r 97e49b588f5d .hgsubstate
--- a/.hgsubstate Wed Oct 23 22:48:29 2013 -0400
+++ b/.hgsubstate Tue Nov 05 12:27:42 2013 -0500
@@ -1,1 +1,1 @@
-6057744acd2c71c069a4b171c5fe1ff0d86c9e5f gnulib-hg
+6d4e36653a40da6604507406f2a97e3e64bf9dbf gnulib-hg
diff -r c4f5c781c3ca -r 97e49b588f5d Makefile.am
--- a/Makefile.am Wed Oct 23 22:48:29 2013 -0400
+++ b/Makefile.am Tue Nov 05 12:27:42 2013 -0500
@@ -64,6 +64,7 @@
etc/README.gnuplot \
etc/README.kpathsea \
etc/gdbinit \
+ etc/octave.appdata.xml \
run-octave.in
include m4/module.mk
diff -r c4f5c781c3ca -r 97e49b588f5d NEWS
--- a/NEWS Wed Oct 23 22:48:29 2013 -0400
+++ b/NEWS Tue Nov 05 12:27:42 2013 -0500
@@ -1,22 +1,10 @@
-
-Summary of important user-visible changes for version 4.0:
+Summary of important user-visible changes for version 3.8:
---------------------------------------------------------
- ** A new GUI is now available with Octave.
-
- ** Warning states may now be set temporarily, until the end of the
- current function, using the syntax
-
- warning STATE ID "local"
-
- in which STATE may be "on", "off", or "error". Changes to warning
- states that are set locally affect the current function and all
- functions called from the current scope. The previous warning state
- is restored on return from the current function. The "local"
- option is ignored if used in the top-level workspace.
-
-Summary of important user-visible changes for version 3.8:
----------------------------------------------------------
+ ** A GUI is now available with Octave and is the default when starting
+ an interactive session. The original command line interface is also
+ available and can be entered by using the "--no-gui" option when
+ invoking Octave.
** Octave now uses OpenGL graphics by default with FLTK widgets. If
OpenGL libraries or FLTK widgets are not available when Octave is
@@ -28,6 +16,12 @@
Adding this command to your ~/.octaverc file will set the default
for each session.
+ ** Printing or saving figures with OpenGL graphics requires the
+ gl2ps library which is no longer distributed with Octave. The
+ software is widely available in most package managers. If a
+ pre-compiled package does not exist for your system, you can find
+ the current sources at http://www.geuz.org/gl2ps/.
+
** Octave now supports nested functions with scoping rules that are
compatible with Matlab. A nested function is one declared and defined
within the body of another function. The nested function is only
@@ -110,6 +104,17 @@
When classdef-style classes are added to Octave, the exception-id
will become an MException object.
+ ** Warning states may now be set temporarily, until the end of the
+ current function, using the syntax
+
+ warning STATE ID "local"
+
+ in which STATE may be "on", "off", or "error". Changes to warning
+ states that are set locally affect the current function and all
+ functions called from the current scope. The previous warning state
+ is restored on return from the current function. The "local"
+ option is ignored if used in the top-level workspace.
+
** Warning IDs renamed:
Octave:array-as-scalar => Octave:array-to-scalar
@@ -158,7 +163,7 @@
\sl slanted \slOblique Text slanted font
\rm normal \bfBold\rmNormal normal font
{} group {\bf Bold}Normal group objects
- e^{i*\pi} = -1 complex example
+ e^{i*\pi} = -1 group objects
** The m-files in the plot directory have been overhauled.
@@ -305,12 +310,12 @@
copyobj history_save rgbplot
dawson imformats save_default_options
dblist importdata shrinkfaces
- debug_jit isaxes splinefit
- desktop iscolormap stemleaf
- doc_cache_create isequaln strjoin
- ellipj jit_debug struct2hdl
- ellipke jit_enable tetramesh
- erfcinv jit_startcnt waterfall
+ desktop isaxes splinefit
+ doc_cache_create iscolormap stemleaf
+ ellipj isequaln strjoin
+ ellipke jit_debug struct2hdl
+ erfcinv jit_enable tetramesh
+ jit_startcnt waterfall
** Deprecated functions.
@@ -1477,4 +1482,3 @@
spchol2inv splu
See NEWS.3 for old news.
-
diff -r c4f5c781c3ca -r 97e49b588f5d bootstrap.conf
--- a/bootstrap.conf Wed Oct 23 22:48:29 2013 -0400
+++ b/bootstrap.conf Tue Nov 05 12:27:42 2013 -0500
@@ -38,6 +38,8 @@
fnmatch
fopen
fpucw
+ frexp
+ frexpf
fseek
ftell
getcwd
@@ -70,7 +72,6 @@
round
roundf
select
- setenv
sigaction
signal
sigprocmask
diff -r c4f5c781c3ca -r 97e49b588f5d build-aux/common.mk
--- a/build-aux/common.mk Wed Oct 23 22:48:29 2013 -0400
+++ b/build-aux/common.mk Tue Nov 05 12:27:42 2013 -0500
@@ -228,6 +228,13 @@
FFTW_XLDFLAGS = $(FFTW3_LDFLAGS) $(FFTW3F_LDFLAGS)
FFTW_XLIBS = $(FFTW3_LIBS) $(FFTW3F_LIBS)
+## Alias CPPFLAGS to CFLAGS.
+## This is closer to the true meaning of `pkg-config --cflags` output.
+FONTCONFIG_CPPFLAGS = @FONTCONFIG_CFLAGS@
+FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@
+
+## Alias CPPFLAGS to CFLAGS.
+FT2_CPPFLAGS = @FT2_CFLAGS@
FT2_CFLAGS = @FT2_CFLAGS@
FT2_LIBS = @FT2_LIBS@
@@ -238,6 +245,8 @@
GRAPHICS_CFLAGS = @GRAPHICS_CFLAGS@
GRAPHICS_LIBS = @GRAPHICS_LIBS@
+GL2PS_LIBS = @GL2PS_LIBS@
+
HDF5_CPPFLAGS = @HDF5_CPPFLAGS@
HDF5_LDFLAGS = @HDF5_LDFLAGS@
HDF5_LIBS = @HDF5_LIBS@
@@ -257,6 +266,9 @@
OPENGL_LIBS = @OPENGL_LIBS@
+PCRE_CPPFLAGS = @PCRE_CPPFLAGS@
+PCRE_LIBS = @PCRE_LIBS@
+
PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
PTHREAD_LIBS = @PTHREAD_LIBS@
@@ -268,8 +280,6 @@
QRUPDATE_LDFLAGS = @QRUPDATE_LDFLAGS@
QRUPDATE_LIBS = @QRUPDATE_LIBS@
-REGEX_LIBS = @REGEX_LIBS@
-
READLINE_LIBS = @READLINE_LIBS@
SPARSE_XCPPFLAGS = \
@@ -553,6 +563,7 @@
-e "s|%OCTAVE_CONF_FFTW3F_LDFLAGS%|\"${FFTW3F_LDFLAGS}\"|" \
-e "s|%OCTAVE_CONF_FFTW3F_LIBS%|\"${FFTW3F_LIBS}\"|" \
-e "s|%OCTAVE_CONF_FLIBS%|\"${FLIBS}\"|" \
+ -e "s|%OCTAVE_CONF_FONTCONFIG_CFLAGS%|\"${FONTCONFIG_CFLAGS}\"|" \
-e "s|%OCTAVE_CONF_FPICFLAG%|\"${FPICFLAG}\"|" \
-e "s|%OCTAVE_CONF_FT2_CFLAGS%|\"${FT2_CFLAGS}\"|" \
-e "s|%OCTAVE_CONF_FT2_LIBS%|\"${FT2_LIBS}\"|" \
@@ -601,6 +612,8 @@
-e "s|%OCTAVE_CONF_OCT_LINK_DEPS%|\"${OCT_LINK_DEPS}\"|" \
-e "s|%OCTAVE_CONF_OCT_LINK_OPTS%|\"${OCT_LINK_OPTS}\"|" \
-e "s|%OCTAVE_CONF_OPENGL_LIBS%|\"${OPENGL_LIBS}\"|" \
+ -e "s|%OCTAVE_CONF_PCRE_CPPFLAGS%|\"${PCRE_CPPFLAGS}\"|" \
+ -e "s|%OCTAVE_CONF_PCRE_LIBS%|\"${PCRE_LIBS}\"|" \
-e "s|%OCTAVE_CONF_PREFIX%|\"${prefix}\"|" \
-e "s|%OCTAVE_CONF_PTHREAD_CFLAGS%|\"${PTHREAD_CFLAGS}\"|" \
-e "s|%OCTAVE_CONF_PTHREAD_LIBS%|\"${PTHREAD_LIBS}\"|" \
@@ -616,7 +629,6 @@
-e "s|%OCTAVE_CONF_RANLIB%|\"${RANLIB}\"|" \
-e "s|%OCTAVE_CONF_RDYNAMIC_FLAG%|\"${RDYNAMIC_FLAG}\"|" \
-e "s|%OCTAVE_CONF_READLINE_LIBS%|\"${READLINE_LIBS}\"|" \
- -e "s|%OCTAVE_CONF_REGEX_LIBS%|\"${REGEX_LIBS}\"|" \
-e "s|%OCTAVE_CONF_SED%|\"${SED}\"|" \
-e "s|%OCTAVE_CONF_SHARED_LIBS%|\"${SHARED_LIBS}\"|" \
-e "s|%OCTAVE_CONF_SHLEXT%|\"${SHLEXT}\"|" \
diff -r c4f5c781c3ca -r 97e49b588f5d configure.ac
--- a/configure.ac Wed Oct 23 22:48:29 2013 -0400
+++ b/configure.ac Tue Nov 05 12:27:42 2013 -0500
@@ -664,7 +664,7 @@
### Check for PCRE regex library.
-REGEX_LIBS=
+PCRE_LIBS=
pcre_fail_msg="to build Octave, you must have the PCRE library and header files installed"
@@ -687,18 +687,19 @@
ac_cv_pcre_h_macros_present=yes, ac_cv_pcre_h_macros_present=no)])
if test $ac_cv_pcre_h_macros_present = yes; then
- ## check for pcre-config, and if so, set XTRA_CXXFLAGS appropriately
+ ## check for pcre-config, and if so, get build variables
AC_CHECK_PROG(HAVE_PCRE_CONFIG, pcre-config, [yes], [no])
if test $HAVE_PCRE_CONFIG = yes; then
- XTRA_CXXFLAGS="$XTRA_CXXFLAGS `pcre-config --cflags`"
- REGEX_LIBS=`pcre-config --libs`
+ PCRE_CPPFLAGS=`pcre-config --cflags`
+ PCRE_LIBS=`pcre-config --libs`
else
- REGEX_LIBS="-lpcre"
+ PCRE_LIBS="-lpcre"
fi
save_LIBS="$LIBS"
- LIBS="$REGEX_LIBS $LIBS"
+ LIBS="$PCRE_LIBS $LIBS"
AC_CHECK_FUNCS([pcre_compile],
- [AC_SUBST(REGEX_LIBS)],
+ [AC_SUBST(PCRE_CPPFLAGS)
+ AC_SUBST(PCRE_LIBS)],
[AC_MSG_ERROR([$pcre_fail_msg])])
LIBS="$save_LIBS"
else
@@ -718,12 +719,12 @@
### Check for the LLVM library
-build_jit=no
+build_jit=yes
AC_ARG_ENABLE([jit],
[AS_HELP_STRING([--enable-jit],
[(EXPERIMENTAL) enable JIT compiler])],
- [if test "$enableval" = yes; then
- build_jit=yes
+ [if test "$enableval" = no; then
+ build_jit=no
fi],
[])
@@ -772,9 +773,7 @@
CPPFLAGS="-D__STDC_CONSTANT_MACROS -D__STDC_LIMIT_MACROS $LLVM_CPPFLAGS $CPPFLAGS"
CXXFLAGS="$LLVM_CXXFLAGS $CXXFLAGS"
AC_LANG_PUSH(C++)
- AC_CHECK_HEADER([llvm/Support/TargetSelect.h], [
- warn_llvm=
- XTRA_CXXFLAGS="$XTRA_CXXFLAGS $LLVM_CXXFLAGS $LLVM_CPPFLAGS"])
+ AC_CHECK_HEADER([llvm/Support/TargetSelect.h], [warn_llvm=""])
have_function_h=no
AC_CHECK_HEADERS([llvm/IR/Function.h llvm/Function.h],
@@ -953,9 +952,9 @@
## packages add extra flags that are useful when building
## Graphics/ImageMagick++ extentions. These extra flags break the
## Octave build.
+ MAGICK_CPPFLAGS=`$PKG_CONFIG --cflags-only-I $magick++`
MAGICK_LDFLAGS=`$PKG_CONFIG --libs-only-L $magick++`
MAGICK_LIBS=`$PKG_CONFIG --libs-only-l $magick++`
- MAGICK_CPPFLAGS=`$PKG_CONFIG --cflags-only-I $magick++`
warn_magick="$magick++ library fails tests. The imread function for reading image files will not be fully functional."
@@ -1072,25 +1071,24 @@
PKG_CHECK_MODULES([FT2], [freetype2], [
min_ft2_version=9.03
- AC_MSG_CHECKING([for FreeType -- version >= $min_ft2_version])
+ AC_MSG_CHECKING([for FreeType2 version >= $min_ft2_version])
$PKG_CONFIG freetype2 --atleast-version=$min_ft2_version
ac_status=$?
if test $ac_status = 0; then
AC_MSG_RESULT(yes)
AC_DEFINE(HAVE_FREETYPE, 1, [Define to 1 if you have Freetype library.])
- XTRA_CXXFLAGS="$XTRA_CXXFLAGS $FT2_CFLAGS"
save_LIBS="$LIBS"
LIBS="$FT2_LIBS $LIBS"
AC_CHECK_FUNCS([FT_Reference_Face])
LIBS="$save_LIBS"
else
AC_MSG_RESULT(no)
- warn_freetype="FreeType library not found. Native graphics will be disabled."
+ warn_freetype="FreeType library >= 9.03 not found. Native graphics will be disabled."
fi])
if test -n "$warn_freetype"; then
+ native_graphics=no
OCTAVE_CONFIGURE_WARNING([warn_freetype])
- native_graphics=no
fi
## Check for fontconfig library
@@ -1100,7 +1098,6 @@
PKG_CHECK_MODULES(FONTCONFIG, [fontconfig],
[have_fontconfig=yes
OPENGL_LIBS="$FONTCONFIG_LIBS $OPENGL_LIBS"
- XTRA_CXXFLAGS="$XTRA_CXXFLAGS $FONTCONFIG_CFLAGS"
AC_DEFINE(HAVE_FONTCONFIG, 1, [Define to 1 if fontconfig is present.])],
[have_fontconfig=no
warn_fontconfig="Fontconfig library not found. Native graphics will be disabled."])
@@ -1190,6 +1187,15 @@
AC_SUBST(GRAPHICS_CFLAGS)
AC_SUBST(GRAPHICS_LIBS)
+## Check for gl2ps which is required for printing with OpenGL graphics
+if test $native_graphics = yes; then
+ AC_CHECK_HEADERS([gl2ps.h],
+ [GL2PS_LIBS="-lgl2ps"],
+ [AC_MSG_WARN([gl2ps library not found. OpenGL printing is disabled.])])
+fi
+
+AC_SUBST(GL2PS_LIBS)
+
### Start determination of shared vs. static libraries
## Use -static if compiling on Alpha OSF/1 1.3 systems.
@@ -1904,13 +1910,13 @@
if test "$cross_compiling" = yes && test -n "$ac_tool_prefix"; then
CROSS_TOOL_PREFIX="$ac_tool_prefix"
- MKOCTFILE_AR='$(shell echo $(AR) | $SED "s,$(CROSS_TOOL_PREFIX),,")'
- MKOCTFILE_CC='$(shell echo $(CC) | $SED "s,$(CROSS_TOOL_PREFIX),,")'
- MKOCTFILE_CXX='$(shell echo $(CXX) | $SED "s,$(CROSS_TOOL_PREFIX),,")'
- MKOCTFILE_DL_LD='$(shell echo $(DL_LD) | $SED "s,$(CROSS_TOOL_PREFIX),,")'
- MKOCTFILE_F77='$(shell echo $(F77) | $SED "s,$(CROSS_TOOL_PREFIX),,")'
- MKOCTFILE_LD_CXX='$(shell echo $(LD_CXX) | $SED "s,$(CROSS_TOOL_PREFIX),,")'
- MKOCTFILE_RANLIB='$(shell echo $(RANLIB) | $SED "s,$(CROSS_TOOL_PREFIX),,")'
+ MKOCTFILE_AR='$(shell echo $(AR) | $(SED) "s,$(CROSS_TOOL_PREFIX),,")'
+ MKOCTFILE_CC='$(shell echo $(CC) | $(SED) "s,$(CROSS_TOOL_PREFIX),,")'
+ MKOCTFILE_CXX='$(shell echo $(CXX) | $(SED) "s,$(CROSS_TOOL_PREFIX),,")'
+ MKOCTFILE_DL_LD='$(shell echo $(DL_LD) | $(SED) "s,$(CROSS_TOOL_PREFIX),,")'
+ MKOCTFILE_F77='$(shell echo $(F77) | $(SED) "s,$(CROSS_TOOL_PREFIX),,")'
+ MKOCTFILE_LD_CXX='$(shell echo $(LD_CXX) | $(SED) "s,$(CROSS_TOOL_PREFIX),,")'
+ MKOCTFILE_RANLIB='$(shell echo $(RANLIB) | $(SED) "s,$(CROSS_TOOL_PREFIX),,")'
else
MKOCTFILE_AR="$AR"
MKOCTFILE_CC="$CC"
@@ -2374,6 +2380,7 @@
JAVA_LIBS=
## Fake loop so that "break" can be used to skip code blocks.
+warn_java=""
while test $build_java = yes
do
## Unset build_java. Variable is set only if all configuration tests pass.
@@ -2381,8 +2388,8 @@
## Warn if JAVA_HOME is unset. It is *strongly* advised to specify JAVA_HOME.
if test -z "$JAVA_HOME"; then
- AC_MSG_WARN([JAVA_HOME environment variable not initialized.])
- AC_MSG_WARN([Auto-detection will proceed but is unreliable.])
+ warn_java_home="JAVA_HOME environment variable not initialized. Auto-detection will proceed but is unreliable."
+ OCTAVE_CONFIGURE_WARNING([warn_java_home])
fi
## Search for a viable Java executable.
@@ -2394,7 +2401,7 @@
AC_PATH_PROG(JAVA, java, [], [$JAVA_PATH])
if test -z "$JAVA"; then
- AC_MSG_WARN([No Java executable found. Octave will not be able to call Java methods.])
+ warn_java="No Java executable found. Octave will not be able to call Java methods."
break
fi
@@ -2447,13 +2454,13 @@
if test $java_major -ge 1 && test $java_minor -ge 5; then
: # Version is ok. Do nothing.
else
- AC_MSG_WARN([Java version is too old (< 1.5). Octave will not be able to call Java methods.])
+ warn_java="Java version is too old (< 1.5). Octave will not be able to call Java methods."
break
fi
- ## At this point Win32/MSVC systems have enough configuration data. We
- ## assume that all appropriate variables (e.g. INCLUDE and LIB) already have
- ## the required paths to compile and link against JDK.
+ ## At this point Win32 systems have enough configuration data.
+ ## We assume that all appropriate variables (e.g. INCLUDE and LIB) already
+ ## contain the required paths to compile and link against JDK.
case $host_os in
msdosmsvc)
build_java=yes
@@ -2462,14 +2469,20 @@
[Define to 1 if Java is available and is at least version 1.5])
break
;;
- mingw*)
- if test $have_msvc = yes; then
- build_java=yes
- JAVA_LIBS=-ladvapi32
- AC_DEFINE(HAVE_JAVA, 1,
- [Define to 1 if Java is available and is at least version 1.5])
- break
+ mingw* | cygwin*)
+ build_java=yes
+ JAVA_LIBS=-ladvapi32
+ if test $have_msvc = no; then
+ if test -n "$JAVA_CPPFLAGS"; then
+ JAVA_CPPFLAGS="-I${JAVA_CPPFLAGS}/include -I${JAVA_CPPFLAGS}/include/win32"
+ else
+ JAVA_CPPFLAGS="-I${JAVA_HOME}/include -I${JAVA_HOME}/include/win32"
+ fi
+ LDFLAGS="$LDFLAGS -Wl,--export-all-symbols"
fi
+ AC_DEFINE(HAVE_JAVA, 1,
+ [Define to 1 if Java is available and is at least version 1.5])
+ break
;;
esac
@@ -2478,9 +2491,6 @@
darwin*)
jvmlib=libjvm.dylib
;;
- mingw* | cygwin*)
- jvmlib=jvm.dll
- ;;
*)
jvmlib=libjvm.so
;;
@@ -2539,7 +2549,7 @@
if test -z "$JAVA_LDPATH"; then
AC_MSG_RESULT([not found])
- AC_MSG_WARN([Library $jvmlib not found. Octave will not be able to call Java methods.])
+ warn_java="Library $jvmlib not found. Octave will not be able to call Java methods."
break
else
AC_MSG_RESULT([$JAVA_LDPATH])
@@ -2562,15 +2572,6 @@
fi
JAVA_LIBS="-framework JavaVM"
;;
- mingw* | cygwin*)
- if test -n "$JAVA_CPPFLAGS"; then
- JAVA_CPPFLAGS="-I${JAVA_CPPFLAGS}/include -I${JAVA_CPPFLAGS}/include/win32"
- else
- JAVA_CPPFLAGS="-I${JAVA_HOME}/include -I${JAVA_HOME}/include/win32"
- fi
- JAVA_LIBS=-ladvapi32
- LDFLAGS="$LDFLAGS -Wl,--export-all-symbols"
- ;;
*)
if test -n "$JAVA_CPPFLAGS"; then
JAVA_CPPFLAGS="-I${JAVA_CPPFLAGS}/include -I${JAVA_CPPFLAGS}/include/linux"
@@ -2590,7 +2591,7 @@
AC_MSG_RESULT([$dir])
else
AC_MSG_RESULT([not found])
- AC_MSG_WARN([Include file not found. Octave will not be able to call Java methods.])
+ warn_java="Include file not found. Octave will not be able to call Java methods."
break
fi
@@ -2600,6 +2601,9 @@
[Define to 1 if Java is available and is at least version 1.5])
break
done
+if test -n "$warn_java"; then
+ OCTAVE_CONFIGURE_WARNING([warn_java])
+fi
AM_CONDITIONAL([AMCOND_HAVE_JAVA], [test $build_java = yes])
AC_SUBST(JAVA)
@@ -2622,10 +2626,12 @@
[if test "$enableval" = no; then build_gui=no; fi], [])
if test $build_gui = yes; then
+
+ warn_gui=""
## Check for Qt libraries
PKG_CHECK_MODULES(QT, [QtCore, QtGui, QtNetwork],
[],
- [AC_MSG_WARN([Qt libraries not found -- disabling GUI])
+ [warn_gui="Qt libraries not found -- disabling GUI"
build_gui=no])
if test $build_gui = yes; then
@@ -2636,7 +2642,7 @@
## Check for Qt4
if ! `$PKG_CONFIG --atleast-version=4.0.0 QtCore`; then
- AC_MSG_WARN([Qt >= 4.0.0 not found -- disabling GUI])
+ warn_gui="Qt >= 4.0.0 not found -- disabling GUI"
build_gui=no
fi
fi
@@ -2650,7 +2656,7 @@
AC_DEFINE(HAVE_QT, 1,
[Define to 1 if Qt is available (libraries, developer header files, utility programs (moc, uic, rcc, and lrelease))])
else
- AC_MSG_WARN([Qt utility programs moc, uic, rcc, and lrelease not found -- disabling GUI])
+ warn_gui="Qt utility programs moc, uic, rcc, and lrelease not found -- disabling GUI"
build_gui=no
fi
fi
@@ -2658,7 +2664,7 @@
if test $build_gui = yes; then
OCTAVE_CHECK_FUNC_QABSTRACTITEMMODEL_BEGINRESETMODEL
if test $octave_cv_func_qabstractitemmodel_beginresetmodel = no; then
- AC_MSG_WARN([QAbstractItemModel::beginResetModel() not found -- disabling GUI])
+ warn_gui="QAbstractItemModel::beginResetModel() not found -- disabling GUI"
build_gui=no
fi
fi
@@ -2691,7 +2697,8 @@
AC_LANG_POP([C++])
])
if test $octave_cv_lib_qscintilla = no; then
- AC_MSG_WARN([Qscintilla library not found -- disabling built-in GUI editor])
+ warn_gui_editor="Qscintilla library not found -- disabling built-in GUI editor"
+ OCTAVE_CONFIGURE_WARNING([warn_gui_editor])
else
## Let's assume Qscintilla library is at the same location as
## other regular Qt libraries.
@@ -2709,14 +2716,14 @@
fi
AC_CHECK_FUNCS([setlocale], [],
- [AC_MSG_WARN([setlocale not found -- disabling GUI])
+ [warn_gui="setlocale not found -- disabling GUI"
build_gui=no])
if test $build_gui = yes; then
case $host_os in
mingw* | msdosmsvc*)
AC_CHECK_FUNCS([setvbuf], [win32_terminal=yes],
- [AC_MSG_WARN([setvbuf not found -- disabling GUI])
+ [warn_gui="setvbuf not found -- disabling GUI"
build_gui=no])
;;
*)
@@ -2730,6 +2737,10 @@
esac
fi
fi
+
+ if test -n "$warn_gui"; then
+ OCTAVE_CONFIGURE_WARNING([warn_gui])
+ fi
fi
AM_CONDITIONAL([AMCOND_BUILD_GUI], [test $build_gui = yes])
@@ -2853,6 +2864,8 @@
Magick++ LDFLAGS: $MAGICK_LDFLAGS
Magick++ libraries: $MAGICK_LIBS
OPENGL libraries: $OPENGL_LIBS
+ PCRE CPPFLAGS: $PCRE_CPPFLAGS
+ PCRE libraries: $PCRE_LIBS
PTHREAD flags: $PTHREAD_CFLAGS
PTHREAD libraries: $PTHREAD_LIBS
QHULL CPPFLAGS: $QHULL_CPPFLAGS
@@ -2865,7 +2878,6 @@
Qt LDFLAGS: $QT_LDFLAGS
Qt libraries: $QT_LIBS
READLINE libraries: $READLINE_LIBS
- REGEX libraries: $REGEX_LIBS
TERM libraries: $TERM_LIBS
UMFPACK CPPFLAGS: $UMFPACK_CPPFLAGS
UMFPACK LDFLAGS: $UMFPACK_LDFLAGS
diff -r c4f5c781c3ca -r 97e49b588f5d doc/interpreter/basics.txi
--- a/doc/interpreter/basics.txi Wed Oct 23 22:48:29 2013 -0400
+++ b/doc/interpreter/basics.txi Tue Nov 05 12:27:42 2013 -0500
@@ -156,6 +156,10 @@
remote shell command or inside an Emacs shell buffer. For another way
to run Octave within Emacs, @pxref{Emacs Octave Support}.
+@item --jit-compiler
+@cindex @code{--jit-compiler}
+Enable the JIT compiler used for accelerating loops.
+
@item --line-editing
@cindex @code{--line-editing}
Force readline use for command-line editing.
@@ -180,10 +184,6 @@
Don't initialize the search path for function files to include default
locations.
-@item --no-jit-compiler
-@cindex @code{--no-jit-compiler}
-Disable the JIT compiler used for accelerating loops.
-
@item --no-line-editing
@cindex @code{--no-line-editing}
Disable command-line editing.
diff -r c4f5c781c3ca -r 97e49b588f5d doc/interpreter/contributors.in
--- a/doc/interpreter/contributors.in Wed Oct 23 22:48:29 2013 -0400
+++ b/doc/interpreter/contributors.in Tue Nov 05 12:27:42 2013 -0500
@@ -138,6 +138,7 @@
Daniel Kraft
Aravindh Krishnamoorthy
Oyvind Kristiansen
+Artem Krosheninnikov
Piotr Krzyzanowski
Volker Kuhlmann
Tetsuro Kurita
@@ -190,6 +191,7 @@
Todd Neal
Philip Nienhuis
Al Niessner
+Felipe G. Nievinski
Rick Niles
Takuji Nishimura
Kai Noda
diff -r c4f5c781c3ca -r 97e49b588f5d doc/interpreter/debug.txi
--- a/doc/interpreter/debug.txi Wed Oct 23 22:48:29 2013 -0400
+++ b/doc/interpreter/debug.txi Tue Nov 05 12:27:42 2013 -0500
@@ -306,7 +306,7 @@
foo;
profile off;
-data = profile ('info');
+data = profile ("info");
profshow (data, 10);
@end group
@end example
@@ -386,7 +386,7 @@
bar (20);
profile off;
-profshow (profile ('info'));
+profshow (profile ("info"));
@end group
@end example
@@ -424,7 +424,7 @@
foo;
profile off;
-profshow (profile ('info'), 10);
+profshow (profile ("info"), 10);
@end group
@end example
diff -r c4f5c781c3ca -r 97e49b588f5d doc/interpreter/doccheck/aspell-octave.en.pws
--- a/doc/interpreter/doccheck/aspell-octave.en.pws Wed Oct 23 22:48:29 2013 -0400
+++ b/doc/interpreter/doccheck/aspell-octave.en.pws Tue Nov 05 12:27:42 2013 -0500
@@ -409,6 +409,7 @@
Haddad
HandleVisibility
Hankel
+hanning
Hanning
hardcode
hardcoding
@@ -429,6 +430,7 @@
Higham
Hindmarsh
Hindmarsh's
+histc
Hodel
holomorphic
Horner's
@@ -1167,6 +1169,7 @@
xb
xc
xcorr
+xdata
xdigit
xerrorbar
xerrorbars
@@ -1176,6 +1179,7 @@
xGETRF
xGTSV
xl
+xmax
xmin
xPBTRF
xPOTRF
@@ -1193,6 +1197,8 @@
yerrorbar
yerrorbars
ylim
+ymax
+ymin
yy
YY
yyyy
diff -r c4f5c781c3ca -r 97e49b588f5d doc/interpreter/doccheck/mk_undocumented_list
--- a/doc/interpreter/doccheck/mk_undocumented_list Wed Oct 23 22:48:29 2013 -0400
+++ b/doc/interpreter/doccheck/mk_undocumented_list Tue Nov 05 12:27:42 2013 -0500
@@ -82,6 +82,7 @@
comma
debug
dbnext
+end
exit
F_DUPFD
F_GETFD
diff -r c4f5c781c3ca -r 97e49b588f5d doc/interpreter/errors.txi
--- a/doc/interpreter/errors.txi Wed Oct 23 22:48:29 2013 -0400
+++ b/doc/interpreter/errors.txi Tue Nov 05 12:27:42 2013 -0500
@@ -268,9 +268,9 @@
@example
@group
function rand42
- old_state = rand ('state');
- restore_state = onCleanup (@@() rand ('state', old_state);
- rand ('state', 42);
+ old_state = rand ("state");
+ restore_state = onCleanup (@@() rand ("state", old_state);
+ rand ("state", 42);
@dots{}
endfunction # rand generator state restored by onCleanup
@end group
diff -r c4f5c781c3ca -r 97e49b588f5d doc/interpreter/gui.txi
--- a/doc/interpreter/gui.txi Wed Oct 23 22:48:29 2013 -0400
+++ b/doc/interpreter/gui.txi Tue Nov 05 12:27:42 2013 -0500
@@ -68,10 +68,14 @@
programs that do. @strong{Warning:} The functions @code{uiwait},
@code{uiresume}, and @code{waitfor} are only available for the FLTK tooolkit.
+@DOCSTRING(desktop)
+
@DOCSTRING(guidata)
@DOCSTRING(guihandles)
+@DOCSTRING(isguirunning)
+
@DOCSTRING(uiwait)
@DOCSTRING(uiresume)
diff -r c4f5c781c3ca -r 97e49b588f5d doc/interpreter/install.txi
--- a/doc/interpreter/install.txi Wed Oct 23 22:48:29 2013 -0400
+++ b/doc/interpreter/install.txi Tue Nov 05 12:27:42 2013 -0500
@@ -45,7 +45,7 @@
@cindex installing Octave
The procedure for installing Octave from source on a Unix-like system is
-described below. Building on other platforms will follow similar
+described next. Building on other platforms will follow similar
steps. Note that this description applies to Octave releases. Building
the development sources from the Mercurial archive requires additional
steps as described in @ref{Building the Development Sources}.
@@ -514,14 +514,15 @@
instead of just @command{make}.
@item
-If you encounter errors while compiling Octave, first check the list of
-known problems below to see if there is a workaround or solution for
-your problem. If not,
+If you encounter errors while compiling Octave, first
+see @ref{Installation Problems} for a list of
+known problems and if there is a workaround or solution for
+your problem. If not, see
@ifclear INSTALLONLY
-@pxref{Trouble},
+@ref{Trouble}
@end ifclear
@ifset INSTALLONLY
-see the file BUGS
+the file BUGS
@end ifset
for information about how to report bugs.
diff -r c4f5c781c3ca -r 97e49b588f5d doc/interpreter/interp.txi
--- a/doc/interpreter/interp.txi Wed Oct 23 22:48:29 2013 -0400
+++ b/doc/interpreter/interp.txi Tue Nov 05 12:27:42 2013 -0500
@@ -56,10 +56,10 @@
ddys = diff (diff (ys)./dti) ./ dti;
ddyp = diff (diff (yp)./dti) ./ dti;
figure (1);
-plot (ti,ys,'r-', ti,yp,'g-');
+plot (ti,ys,"r-", ti,yp,"g-");
legend ("spline", "pchip", 4);
figure (2);
-plot (ti,ddys,'r+', ti,ddyp,'g*');
+plot (ti,ddys,"r+", ti,ddyp,"g*");
legend ("spline", "pchip");
@end group
@end example
@@ -102,8 +102,8 @@
y = sin (4*t + 0.3) .* cos (3*t - 0.1);
yp = sin (4*ti + 0.3) .* cos (3*ti - 0.1);
plot (ti, yp, "g", ti, interp1 (t, y, ti, "spline"), "b", ...
- ti, interpft (y, k), "c", t, y, 'r+');
-legend ('sin(4t+0.3)cos(3t-0.1', "spline", "interpft", "data");
+ ti, interpft (y, k), "c", t, y, "r+");
+legend ("sin(4t+0.3)cos(3t-0.1)", "spline", "interpft", "data");
@end group
@end example
diff -r c4f5c781c3ca -r 97e49b588f5d doc/interpreter/intro.txi
--- a/doc/interpreter/intro.txi Wed Oct 23 22:48:29 2013 -0400
+++ b/doc/interpreter/intro.txi Tue Nov 05 12:27:42 2013 -0500
@@ -524,7 +524,7 @@
@example
@group
fieldnames ([1, 2; 3, 4])
-error: fieldnames: wrong type argument 'matrix'
+error: fieldnames: Invalid input argument
@end group
@end example
diff -r c4f5c781c3ca -r 97e49b588f5d doc/interpreter/java.txi
--- a/doc/interpreter/java.txi Wed Oct 23 22:48:29 2013 -0400
+++ b/doc/interpreter/java.txi Tue Nov 05 12:27:42 2013 -0500
@@ -173,7 +173,7 @@
persistent cacheval; % speeds up repeated calls
if isempty (cacheval)
- cacheval = (exist ('OCTAVE_VERSION', 'builtin') > 0);
+ cacheval = (exist ("OCTAVE_VERSION", "builtin") > 0);
end
retval = cacheval;
@@ -253,11 +253,11 @@
Example:
@example
-octave> base_path = 'C:/Octave/java_files';
+octave> base_path = "C:/Octave/java_files";
octave> % add two JARchives to the dynamic classpath
-octave> javaaddpath ([base_path, '/someclasses.jar']);
-octave> javaaddpath ([base_path, '/moreclasses.jar']);
+octave> javaaddpath ([base_path, "/someclasses.jar"]);
+octave> javaaddpath ([base_path, "/moreclasses.jar"]);
octave> % check the dynamic classpath
octave> p = javaclasspath;
@@ -267,7 +267,7 @@
C:/Octave/java_files/moreclasses.jar
octave> % remove the first element from the classpath
-octave> javarmpath ([base_path, '/someclasses.jar']);
+octave> javarmpath ([base_path, "/someclasses.jar"]);
octave> p = javaclasspath;
octave> disp (p@{1@});
C:/Octave/java_files/moreclasses.jar
@@ -287,8 +287,8 @@
@example
@group
% contents of .octaverc:
-addpath ('~/octave');
-javaaddpath ('~/octave/myclasses.jar');
+addpath ("~/octave");
+javaaddpath ("~/octave/myclasses.jar");
@end group
@end example
@@ -305,7 +305,7 @@
Example:
@example
-Passenger = javaObject ('package.FirstClass', row, seat);
+Passenger = javaObject ("package.FirstClass", row, seat);
@end example
@c ------------------------------------------------------------------------
@@ -377,7 +377,7 @@
@example
@group
-octave> javaMethod ('getProperty', 'java.lang.System', 'MyProperty');
+octave> javaMethod ("getProperty", "java.lang.System", "MyProperty");
ans = 12.34
@end group
@end example
diff -r c4f5c781c3ca -r 97e49b588f5d doc/interpreter/octave.texi
--- a/doc/interpreter/octave.texi Wed Oct 23 22:48:29 2013 -0400
+++ b/doc/interpreter/octave.texi Tue Nov 05 12:27:42 2013 -0500
@@ -795,6 +795,7 @@
* The DESCRIPTION File::
* The INDEX File::
* PKG_ADD and PKG_DEL Directives::
+* Missing Components::
External Code Interface
diff -r c4f5c781c3ca -r 97e49b588f5d doc/interpreter/package.txi
--- a/doc/interpreter/package.txi Wed Oct 23 22:48:29 2013 -0400
+++ b/doc/interpreter/package.txi Tue Nov 05 12:27:42 2013 -0500
@@ -309,6 +309,7 @@
* The DESCRIPTION File::
* The INDEX File::
* PKG_ADD and PKG_DEL Directives::
+* Missing Components::
@end menu
@node The DESCRIPTION File
@@ -575,3 +576,13 @@
@w{@code{PKG_ADD}} keyword is replaced with @w{@code{PKG_DEL}} and the commands
get added to the @w{@code{PKG_DEL}} file.
+@node Missing Components
+@subsection Missing Components
+
+If a package relies on a component, such as another Octave package, that may
+not be present it may be useful to install a function which informs users what
+to do when a particular component is missing. The function must be written by
+the package maintainer and registered with Octave using
+@code{missing_component_hook}.
+
+@DOCSTRING(missing_component_hook)
diff -r c4f5c781c3ca -r 97e49b588f5d etc/HACKING
--- a/etc/HACKING Wed Oct 23 22:48:29 2013 -0400
+++ b/etc/HACKING Tue Nov 05 12:27:42 2013 -0500
@@ -131,10 +131,17 @@
An overview of the directory layout of Octave's source files:
+ build-aux -- scripts which support the build process
+
+
doc -- Texinfo documentation for Octave
- examples -- some example files
+ etc -- miscellaneous files, such as this HACKING howto
+
+
+ examples -- some example files (mkoctfile and mex samples, old class
+ programming interface)
gnulib-hg -- gnulib subrepo. This is a clone of the gnulib source
@@ -192,81 +199,75 @@
numeric C++ numerical algorithms and interfaces to the Fortran
algorithms
- operators code for operators that act on base classes such as Array
+ operators code for operators that act on base classes (such as Array)
system OS-related functions
util utility and miscellaneous functions
- libinterp -- The interpreter itself plus lots of infrastructure
+ libinterp -- the interpreter itself plus lots of infrastructure
around it. Octave's extensive octave_value class
hierarchy for polymorphically handling all Octave
types is defined here. The built-in functions are
also defined here.
- octave-value The octave_value class hierarchy. These are the
+ octave-value the octave_value class hierarchy. These are the
container classes that hold various Octave data
types like struct numerical arrays, structure
arrays, and cell arrays.
parse-tree Classes that define the parse tree for the
- interpreter.
-
- interp-core Core utilities for the interpreter. There are no
- DEFUN functions (callable from the scripting
- language) defined here.
+ interpreter
- interpfcn Functions closely related to the interpreter.
- Includes DEFUN functions (callable from the
- scripting language). Also may export C++ functions
- that are used in other parts of the interpreter.
+ corefcn statically linked DEFUN functions (callable from
+ the scripting langauge) as well as internal C++
+ functions used by the interpreter.
- corefcn Statically linked DEFUN functions (callable from
- the scripting langauge). No C++ functions exported
- for use in other parts of the interpreter.
-
- dldfcn Dynamically linked DEFUN functions (callable
+ dldfcn dynamically linked DEFUN functions (callable
from the scripting language). If you see "help
foo" telling you that foo is defined in foo.oct,
then foo.cc will be found here and contain the
source code.
- operators Definitions and template instantiations for
+ operators definitions and template instantiations for
operators for all possible Octave type
- combinations.
+ combinations
- template-inst Some C++ template instantiations.
+ template-inst some C++ template instantiations
libgui -- the graphical user interface of GNU Octave
- src source files.
-
- m-editor source files for the m-file editor.
+ kb-layouts various files need by the qterminal widget that has
+ been derived from Konsole
- qtinfo source files for the Qt texinfo browser.
-
- icons icon files that will be compiled into the
- executable via a resource file.
+ languages translation files and list of translators
qterminal Qt terminal widget
- languages translation files and list of translators.
+ src source files
+
+ icons icon files that will be compiled into the
+ executable via a resource file
- kb-layouts various files need by the qterminal widget that has
- been derived from Konsole.
-
+ m-editor source files for the m-file editor
+
+ qtinfo source files for the Qt texinfo browser
+
+
+ m4 -- m4 scripts used by configure during the build process
+
scripts -- functions written in the Octave language
+ @ftp ftp object class
+
audio play and record sound files (system dependent)
deprecated older deprecated functions
elfun elementary mathematical functions
- @ftp ftp object class
-
general utility functions
geometry geometry algorithms
@@ -316,9 +317,14 @@
time time and date functions
+ src -- code for the actual executables that are created. This
+ includes octave, octave-cli, octave-gui, as well as
+ mkoctfile.
+
+
test -- tests for the interpreter
- test_ .m fixed tests for the interpreter
+ *.tst fixed tests for the interpreter
fntests.m script to run function tests embedded in C++ and
.m files
@@ -327,7 +333,7 @@
John W. Eaton
jwe@octave.org
-Last updated: Fri, 4 Oct 2013 16:58:52 PDT
+Last updated: Tue, 29 Oct 2013 11:42:47 PDT
diff -r c4f5c781c3ca -r 97e49b588f5d etc/octave.appdata.xml
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/etc/octave.appdata.xml Tue Nov 05 12:27:42 2013 -0500
@@ -0,0 +1,56 @@
+
+
+
+ octave.desktop
+ GPLv3+
+ GNU Octave
+ Interactive programming environment for numerical computations
+
+
+ GNU Octave is a high-level interpreted language, primarily intended for
+ numerical computations. It provides capabilities for the numerical
+ solution of linear and nonlinear problems, and for performing other
+ numerical experiments. It also provides extensive graphics capabilities
+ for data visualization and manipulation. Octave is normally used through
+ its interactive command line interface, but it can also be used to write
+ non-interactive programs. The Octave language is quite similar to
+ Matlab so that most programs are easily portable.
+
+
+ Octave has extensive tools for solving common numerical linear algebra
+ problems, finding the roots of nonlinear equations, integrating ordinary
+ functions, manipulating polynomials, and integrating ordinary
+ differential and differential-algebraic equations. It is easily
+ extensible and customizable via user-defined functions written in
+ Octave's own language, or using dynamically loaded modules written in
+ C++, C, Fortran, or other languages.
+
+
+
+
+ http://www.gnu.org/software/octave/images/screenshot.png
+
+ http://www.octave.org
+ maintainers@octave.org
+ GNU
+
diff -r c4f5c781c3ca -r 97e49b588f5d examples/embedded.cc
--- a/examples/embedded.cc Wed Oct 23 22:48:29 2013 -0400
+++ b/examples/embedded.cc Tue Nov 05 12:27:42 2013 -0500
@@ -2,6 +2,7 @@
#include
#include
#include
+#include
int
main (void)
@@ -15,20 +16,20 @@
octave_idx_type n = 2;
octave_value_list in;
- for (octave_idx_type i = 0; i < n; i++)
+ for (octave_idx_type i = 0; i < n; i++)
in(i) = octave_value (5 * (i + 2));
-
+
octave_value_list out = feval ("gcd", in, 1);
- if (!error_state && out.length () > 0)
- std::cout << "GCD of ["
- << in(0).int_value ()
- << ", "
+ if (! error_state && out.length () > 0)
+ std::cout << "GCD of ["
+ << in(0).int_value ()
+ << ", "
<< in(1).int_value ()
- << "] is " << out(0).int_value ()
+ << "] is " << out(0).int_value ()
<< std::endl;
else
std::cout << "invalid\n";
- return 0;
+ clean_up_and_exit (0);
}
diff -r c4f5c781c3ca -r 97e49b588f5d examples/fortdemo.cc
--- a/examples/fortdemo.cc Wed Oct 23 22:48:29 2013 -0400
+++ b/examples/fortdemo.cc Tue Nov 05 12:27:42 2013 -0500
@@ -5,8 +5,7 @@
{
F77_RET_T
F77_FUNC (fortsub, FORTSUB)
- (const int&, double*, F77_CHAR_ARG_DECL
- F77_CHAR_ARG_LEN_DECL);
+ (const int&, double*, F77_CHAR_ARG_DECL F77_CHAR_ARG_LEN_DECL);
}
DEFUN_DLD (fortdemo, args, , "Fortran Demo")
@@ -25,8 +24,8 @@
octave_idx_type na = a.numel ();
OCTAVE_LOCAL_BUFFER (char, ctmp, 128);
- F77_XFCN (fortsub, FORTSUB, (na, av, ctmp
- F77_CHAR_ARG_LEN (128)));
+ F77_XFCN (fortsub, FORTSUB,
+ (na, av, ctmp F77_CHAR_ARG_LEN (128)));
retval(1) = std::string (ctmp);
retval(0) = a;
diff -r c4f5c781c3ca -r 97e49b588f5d examples/helloworld.cc
--- a/examples/helloworld.cc Wed Oct 23 22:48:29 2013 -0400
+++ b/examples/helloworld.cc Tue Nov 05 12:27:42 2013 -0500
@@ -1,7 +1,7 @@
#include
DEFUN_DLD (helloworld, args, nargout,
- "Hello World Help String")
+ "Hello World Help String")
{
int nargin = args.length ();
diff -r c4f5c781c3ca -r 97e49b588f5d examples/make_int.cc
--- a/examples/make_int.cc Wed Oct 23 22:48:29 2013 -0400
+++ b/examples/make_int.cc Tue Nov 05 12:27:42 2013 -0500
@@ -72,10 +72,10 @@
bool is_numeric_type (void) const { return true; }
bool valid_as_scalar_index (void) const
- { return scalar == 1; }
+ { return scalar == 1; }
bool valid_as_zero_index (void) const
- { return scalar == 0; }
+ { return scalar == 0; }
bool is_true (void) const { return (scalar != 0); }
@@ -88,7 +88,7 @@
Complex complex_value (bool = false) const { return scalar; }
ComplexMatrix complex_matrix_value (bool = false) const
- { return ComplexMatrix (1, 1, Complex (scalar)); }
+ { return ComplexMatrix (1, 1, Complex (scalar)); }
octave_value gnot (void) const { return octave_value ((double) ! scalar); }
@@ -231,7 +231,7 @@
DEFBINOP_OP (el_or, integer, integer, ||)
DEFUN_DLD (make_int, args, ,
- "int_val = make_int (val)\n\
+ "int_val = make_int (val)\n\
\n\
Creates an integer variable from VAL.")
{
@@ -243,7 +243,7 @@
mlock ();
octave_stdout << "installing integer type at type-id = "
- << octave_integer::static_type_id () << "\n";
+ << octave_integer::static_type_id () << "\n";
INSTALL_UNOP (op_not, octave_integer, gnot);
INSTALL_UNOP (op_uminus, octave_integer, uminus);
@@ -289,7 +289,7 @@
}
DEFUN_DLD (doit, args, ,
- "doit (I)")
+ "doit (I)")
{
octave_value_list retval;
diff -r c4f5c781c3ca -r 97e49b588f5d examples/mycell.c
--- a/examples/mycell.c Wed Oct 23 22:48:29 2013 -0400
+++ b/examples/mycell.c Tue Nov 05 12:27:42 2013 -0500
@@ -12,7 +12,7 @@
n = mxGetNumberOfElements (prhs[0]);
n = (n > nlhs ? nlhs : n);
-
+
for (i = 0; i < n; i++)
plhs[i] = mxDuplicateArray (mxGetCell (prhs[0], i));
}
diff -r c4f5c781c3ca -r 97e49b588f5d examples/myfeval.c
--- a/examples/myfeval.c Wed Oct 23 22:48:29 2013 -0400
+++ b/examples/myfeval.c Tue Nov 05 12:27:42 2013 -0500
@@ -10,7 +10,7 @@
mexPrintf ("I have %d inputs and %d outputs\n", nrhs, nlhs);
- if (nrhs < 1 || ! mxIsString (prhs[0]))
+ if (nrhs < 1 || ! mxIsString (prhs[0]))
mexErrMsgTxt ("ARG1 must be a function name");
str = mxArrayToString (prhs[0]);
diff -r c4f5c781c3ca -r 97e49b588f5d examples/myfunc.c
--- a/examples/myfunc.c Wed Oct 23 22:48:29 2013 -0400
+++ b/examples/myfunc.c Tue Nov 05 12:27:42 2013 -0500
@@ -11,5 +11,5 @@
if (strcmp (nm, "myfunc") == 0)
mexPrintf ("This is the principal function\n", nm);
- return;
+ return;
}
diff -r c4f5c781c3ca -r 97e49b588f5d examples/mypow2.c
--- a/examples/mypow2.c Wed Oct 23 22:48:29 2013 -0400
+++ b/examples/mypow2.c Tue Nov 05 12:27:42 2013 -0500
@@ -7,14 +7,15 @@
mwSize n;
mwIndex i;
double *vri, *vro;
-
+
if (nrhs != 1 || ! mxIsNumeric (prhs[0]))
mexErrMsgTxt ("ARG1 must be a matrix");
n = mxGetNumberOfElements (prhs[0]);
- plhs[0] = mxCreateNumericArray
- (mxGetNumberOfDimensions (prhs[0]), mxGetDimensions (prhs[0]),
- mxGetClassID (prhs[0]), mxIsComplex (prhs[0]));
+ plhs[0] = mxCreateNumericArray (mxGetNumberOfDimensions (prhs[0]),
+ mxGetDimensions (prhs[0]),
+ mxGetClassID (prhs[0]),
+ mxIsComplex (prhs[0]));
vri = mxGetPr (prhs[0]);
vro = mxGetPr (plhs[0]);
diff -r c4f5c781c3ca -r 97e49b588f5d examples/myprop.c
--- a/examples/myprop.c Wed Oct 23 22:48:29 2013 -0400
+++ b/examples/myprop.c Tue Nov 05 12:27:42 2013 -0500
@@ -13,11 +13,11 @@
mexErrMsgTxt ("handle expected to be a double scalar");
if (!mxIsChar (prhs[1]))
mexErrMsgTxt ("expected property to be a string");
-
+
handle = mxGetScalar (prhs[0]);
mxGetString (prhs[1], property, 256);
plhs[0] = mxDuplicateArray (mexGet (handle, property));
-
+
if (nrhs == 3)
if (mexSet (handle, property, mxDuplicateArray (prhs[2])))
mexErrMsgTxt ("failed to set property");
diff -r c4f5c781c3ca -r 97e49b588f5d examples/myset.c
--- a/examples/myset.c Wed Oct 23 22:48:29 2013 -0400
+++ b/examples/myset.c Tue Nov 05 12:27:42 2013 -0500
@@ -29,6 +29,6 @@
}
// WARNING!! Can't do this in MATLAB! Must copy variable first.
- mxSetName (prhs[1], str);
+ mxSetName (prhs[1], str);
mexPutArray (prhs[1], "caller");
}
diff -r c4f5c781c3ca -r 97e49b588f5d examples/mystring.c
--- a/examples/mystring.c Wed Oct 23 22:48:29 2013 -0400
+++ b/examples/mystring.c Tue Nov 05 12:27:42 2013 -0500
@@ -9,8 +9,8 @@
mwIndex i, j;
mxChar *pi, *po;
- if (nrhs != 1 || ! mxIsChar (prhs[0]) ||
- mxGetNumberOfDimensions (prhs[0]) > 2)
+ if (nrhs != 1 || ! mxIsChar (prhs[0])
+ || mxGetNumberOfDimensions (prhs[0]) > 2)
mexErrMsgTxt ("ARG1 must be a char matrix");
m = mxGetM (prhs[0]);
diff -r c4f5c781c3ca -r 97e49b588f5d examples/mystruct.c
--- a/examples/mystruct.c Wed Oct 23 22:48:29 2013 -0400
+++ b/examples/mystruct.c Tue Nov 05 12:27:42 2013 -0500
@@ -15,8 +15,7 @@
for (i = 0; i < mxGetNumberOfFields (prhs[0]); i++)
for (j = 0; j < mxGetNumberOfElements (prhs[0]); j++)
{
- mexPrintf ("field %s(%d) = ",
- mxGetFieldNameByNumber (prhs[0], i), j);
+ mexPrintf ("field %s(%d) = ", mxGetFieldNameByNumber (prhs[0], i), j);
v = mxGetFieldByNumber (prhs[0], j, i);
mexCallMATLAB (0, NULL, 1, &v, "disp");
}
diff -r c4f5c781c3ca -r 97e49b588f5d examples/oct_demo.cc
--- a/examples/oct_demo.cc Wed Oct 23 22:48:29 2013 -0400
+++ b/examples/oct_demo.cc Tue Nov 05 12:27:42 2013 -0500
@@ -51,7 +51,7 @@
// from gcc about an unused function parameter.
DEFUN_DLD (oct_demo, args, ,
- "[...] = oct_demo (...)\n\
+ "[...] = oct_demo (...)\n\
\n\
Print a greeting followed by the values of all the arguments passed.\n\
Return all arguments in reverse order.")
diff -r c4f5c781c3ca -r 97e49b588f5d examples/oregonator.cc
--- a/examples/oregonator.cc Wed Oct 23 22:48:29 2013 -0400
+++ b/examples/oregonator.cc Tue Nov 05 12:27:42 2013 -0500
@@ -1,7 +1,7 @@
#include
DEFUN_DLD (oregonator, args, ,
- "The `oregonator'.\n\
+ "The `oregonator'.\n\
\n\
Reference:\n\
\n\
diff -r c4f5c781c3ca -r 97e49b588f5d libgui/Makefile.am
--- a/libgui/Makefile.am Wed Oct 23 22:48:29 2013 -0400
+++ b/libgui/Makefile.am Tue Nov 05 12:27:42 2013 -0500
@@ -32,6 +32,7 @@
languages/fr_FR.ts \
languages/nl_NL.ts \
languages/pt_BR.ts \
+ languages/pt_PT.ts \
languages/ru_RU.ts \
languages/uk_UA.ts
diff -r c4f5c781c3ca -r 97e49b588f5d libgui/languages/be_BY.ts
--- a/libgui/languages/be_BY.ts Wed Oct 23 22:48:29 2013 -0400
+++ b/libgui/languages/be_BY.ts Tue Nov 05 12:27:42 2013 -0500
@@ -89,6 +89,79 @@
+ QsciLexerBash
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+QsciLexerBatch
@@ -697,25 +770,21 @@
file_editor
-
-
+
+
+
+
-
+
-
-
-
-
-
-
+
@@ -727,12 +796,12 @@
-
+
-
+ &Новы файл
@@ -772,12 +841,12 @@
&Капіяваць
-
+ Вы&разаць
-
+
@@ -827,7 +896,7 @@
-
+
@@ -837,7 +906,12 @@
-
+
+
+
+
+
+
@@ -852,12 +926,53 @@
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -872,12 +987,22 @@
&Файл
-
+ &Змяніць
-
+
+
+
+
+
+
+
+
+
+
+
@@ -890,7 +1015,7 @@
file_editor_tab
-
+
@@ -916,15 +1041,15 @@
-
-
+
+
-
+
-
+
@@ -958,13 +1083,13 @@
-
+
-
+
@@ -1451,18 +1576,18 @@
main_window
-
+ Загрузіць прастору зменных
-
-
+
+ Пра Octave
-
+ &Файл
@@ -1522,18 +1647,33 @@
-
-
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
@@ -1593,17 +1733,27 @@
-
+
+
+
+
+
+ Файлавы аглядальнік
-
+
+
+
+
+
+
-
+
@@ -1633,6 +1783,21 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -1653,7 +1818,7 @@
-
+
@@ -1688,7 +1853,7 @@
-
+
@@ -1709,7 +1874,7 @@
-
+ Дакументацыя
@@ -1725,20 +1890,28 @@
+ news_dock_widget
+
+
+
+
+
+
+octave_dock_widget
-
-
+
+
-
+
-
+
@@ -1746,8 +1919,23 @@
octave_qscintilla
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -1887,6 +2075,11 @@
+
+
+
+
+
@@ -1922,7 +2115,7 @@
-
+
@@ -1947,7 +2140,7 @@
-
+ emacs
@@ -2037,7 +2230,7 @@
HttpProxy
-
+
@@ -2052,7 +2245,7 @@
-
+ Socks5Proxy
@@ -2077,14 +2270,14 @@
Пароль:
-
+
-
+
-
+
@@ -2099,7 +2292,7 @@
-
+
@@ -2135,7 +2328,7 @@
webinfo
-
+
@@ -2148,38 +2341,43 @@
welcome_wizard
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff -r c4f5c781c3ca -r 97e49b588f5d libgui/languages/de_DE.ts
--- a/libgui/languages/de_DE.ts Wed Oct 23 22:48:29 2013 -0400
+++ b/libgui/languages/de_DE.ts Tue Nov 05 12:27:42 2013 -0500
@@ -104,26 +104,21 @@
file_editor
-
-
+
+
+
+ Octave Editor
-
+ Octave Dateien (*.m);;Alle Dateien (*)
-
-
- Kann die Datei <b>%1</b> nicht zum Lesen öffnen:
-%2.
-
-
-
+
@@ -137,12 +132,12 @@
Der zugehörige Editor-Reiter ist nicht mehr vorhanden und wurde wahrscheinlich geschlossen.
-
+ &%1 %2
-
+ &Neue Datei
@@ -182,12 +177,12 @@
&Kopieren
-
+ &Ausschneiden
-
+ Einfügen
@@ -237,7 +232,7 @@
&Kommentieren
-
+ Kommentar &entfernen
@@ -247,7 +242,12 @@
&Zuletzt bearbeitete Dateien
-
+
+
+ Funktion b&earbeiten
+
+
+ S&chließen
@@ -262,12 +262,61 @@
Andere Dokumente schließen
-
+
+
+ Markierten Quellcode au&sführen
+
+
+
+
+ &Hilfe
+
+
+
+
+ &Hilfe zum Schlüsselwort
+
+
+
+
+ &Dokumentation zum Schlüsselwort
+
+
+ &Suchen und Ersetzen
-
+
+
+ Die Datei
+%1
+konnte nicht zum Lesen geöffnet werden:
+%2.
+
+
+
+
+ Die Datei
+%1
+existiert nicht. Soll sie erzeugt werden?
+
+
+
+
+ Die Datei
+%1
+konnte nicht zum Schreiben geöffnet werden:
+%2.
+
+
+ Datei speichern und ausführen
@@ -282,12 +331,22 @@
&Datei
-
+
- &Editieren
+ &Bearbeiten
-
+
+
+ &Einstellungen
+
+
+
+
+ &Stil-Einstellungen
+
+
+ &Debuggen
@@ -300,7 +359,7 @@
file_editor_tab
-
+ Gehe zu Zeile
@@ -326,15 +385,15 @@
-
-
+
+ Octave Editor
-
+
-
+ Octave Dateien (*.m);;All Files (*)
@@ -375,14 +434,14 @@
wurde gelöscht oder umbenannt. Soll die Datei jetzt gespeichert werden?%2
-
+ Die Datei %1 konnte nicht zum Schreiben geöffnet werden:
%2.
-
+ Die Datei %1 wurde von einer anderen Anwendung verändert. Soll der neue Inhalt geladen werden?
@@ -871,18 +930,18 @@
main_window
-
+ Lade Arbeitsumgebung
-
-
+
+ Über Octave
-
+ &Datei
@@ -924,7 +983,7 @@
- &Editieren
+ &Bearbeiten
@@ -942,18 +1001,33 @@
Einfügen
-
-
+
+ Arbeitsumgebung speichern als
-
+
+
+ Die Datei '%1' mit Versionshinweisen ist leer.
+
+
+
+
+ Die Datei '%1' mit Versionshinweisen kann nicht gelesen werden.
+
+
+
+
+ Versionshinweise zu Octave
+
+
+ Arbeitsverzeichnis setzen
-
+ Zwischenablage leeren
@@ -1013,17 +1087,27 @@
Dateibrowser anzeigen
-
+
+
+ Fenster mit Neuigkeiten anzeigen
+
+
+ Dateibrowser
-
+
+
+ Neuigkeiten
+
+
+ Fensterlayout auf Grundeinstellung zurücksetzen
-
+ Octave Pakete
@@ -1035,7 +1119,7 @@
- Bei Octave mitwirken
+ Zu Octave beitragen
@@ -1053,6 +1137,21 @@
Im Internet
+
+
+ &Neuigkeiten
+
+
+
+
+ Versionshinweise
+
+
+
+
+ Neuigkeiten der Gemeinschaft
+
+ Neues Verzeichnis eingeben
@@ -1073,7 +1172,7 @@
Verzeichnis suchen
-
+ Arbeitsumgebung laden
@@ -1108,7 +1207,7 @@
Dokumentation anzeigen
-
+ Befehlsfenster
@@ -1129,7 +1228,7 @@
-
+ Dokumentation
@@ -1145,20 +1244,28 @@
+ news_dock_widget
+
+
+
+ Neuigkeiten der Gemeinschaft
+
+
+octave_dock_widget
-
-
+
+ Fenster lösen
-
+ Fenster verbergen
-
+ Fenster andocken
@@ -1166,10 +1273,25 @@
octave_qscintilla
-
-
+
+
Hilfe zu
+
+
+
+ Dokumentation zu
+
+
+
+
+ Bearbeite
+
+
+
+
+ Markierter Quellcode au&sführen
+ octave_qt_link
@@ -1307,6 +1429,11 @@
Editor Dateien der letzten Sitzung wiederherstellen
+
+
+ Nicht existente Dateien ohne Nachfrage erzeugen
+
+ Externen Editor verwenden
@@ -1342,7 +1469,7 @@
Schriftart
-
+ Zeilennummern anzeigen
@@ -1367,7 +1494,7 @@
Grafische Icons
-
+ emacs
@@ -1457,7 +1584,7 @@
HTTP Proxy
-
+ Icons der Unterfenster
@@ -1472,7 +1599,7 @@
Icongröße
-
+ Socks5Proxy
@@ -1497,14 +1624,14 @@
Passwort:
-
+
-
+ Systemeinstellung
-
+ IBeam-Cursor
@@ -1519,7 +1646,7 @@
Unterstrichener Cursor
-
+ Differenz zur Standardgröße
@@ -1555,7 +1682,7 @@
webinfo
-
+ Suchbegriff eingeben und mit 'Enter' die Suche starten
@@ -1568,44 +1695,54 @@
welcome_wizard
-
+ Willkommen zu GNU Octave
-
-
+
+
+ Willkommen zu Octave!
+
+
+
+
Die grafische Nutzerschnittstelle von Octave wird offenbar das erste Mal gestartet. Ein Klick auf 'Beenden' erstellt eine Standard-Konfigurationsdatei und startet Octave GUI.
-
-
- Die Konfigurationsdatei wid in __%1__ gespeichert. Wenn diese Datei existiert, erscheint dieser Dialog beim nächsten Start von Octave nicht mehr.
+
+
+ Die Konfigurationsdatei wird in %1 gespeichert. Wenn diese Datei existiert, erscheint dieser Dialog beim nächsten Start von Octave nicht mehr.
-
-
-
- Welcome to Octave!
- Willkommen zu Octave!
-
-
-
+ FinishBeenden
diff -r c4f5c781c3ca -r 97e49b588f5d libgui/languages/en_US.ts
--- a/libgui/languages/en_US.ts Wed Oct 23 22:48:29 2013 -0400
+++ b/libgui/languages/en_US.ts Tue Nov 05 12:27:42 2013 -0500
@@ -104,25 +104,21 @@
file_editor
-
-
+
+
+
+ Octave Editor
-
+ Octave Files (*.m);;All Files (*)
-
- Could not open file %1 for read:
-%2.
-
-
-
-
+ File not saved! A file with the selected name
%1
is already open in the editor
@@ -134,12 +130,12 @@
-
+ &%1 %2
-
+ &New File
@@ -179,12 +175,12 @@
-
+ Cu&t
-
+ Paste
@@ -234,7 +230,7 @@
-
+ &Uncomment
@@ -244,7 +240,12 @@
-
+
+ &Edit Function
+
+
+
+ &Close
@@ -259,12 +260,53 @@
-
+
+ Run &Selection
+
+
+
+
+ &Help
+
+
+
+
+ &Help on Keyword
+
+
+
+
+ &Documentation on Keyword
+
+
+
+ &Find and Replace
-
+
+ Could not open file
+%1
+for read: %2.
+
+
+
+
+ File
+%1
+does not exist. Do you want to create it?
+
+
+
+
+ Could not open file
+%1
+for write: %2.
+
+
+
+ Save File And Run
@@ -279,12 +321,22 @@
-
+ &Edit
-
+
+ &Preferences
+
+
+
+
+ &Styles Preferences
+
+
+
+ &Debug
@@ -297,7 +349,7 @@
file_editor_tab
-
+ Goto line
@@ -323,15 +375,15 @@
-
-
+
+ Octave Editor
-
+ The file
%1
is about to be closed but has been modified.
@@ -339,7 +391,7 @@
-
+ Octave Files (*.m);;All Files (*)
@@ -365,13 +417,13 @@
-
+ Could not open file %1 for write:
%2.
-
+ It seems that '%1' has been modified by another application. Do you want to reload it?
@@ -858,18 +910,18 @@
main_window
-
+ Load Workspace
-
-
+
+ About Octave
-
+ &File
@@ -929,18 +981,33 @@
-
-
+
+ Save Workspace As
-
+
+ The release notes file '%1' is empty.
+
+
+
+
+ The release notes file '%1' cannot be read.
+
+
+
+
+ Octave Release Notes
+
+
+
+ Set working directory
-
+ Clear Clipboard
@@ -1000,17 +1067,27 @@
-
+
+ Show News Window
+
+
+
+ File Browser
-
+
+ News
+
+
+
+ Reset Default Window Layout
-
+ Octave Packages
@@ -1040,6 +1117,21 @@
+
+ &News
+
+
+
+
+ Release Notes
+
+
+
+
+ Community News
+
+
+ Enter directory name
@@ -1060,7 +1152,7 @@
-
+ Load workspace
@@ -1095,7 +1187,7 @@
-
+ Command Window
@@ -1116,7 +1208,7 @@
-
+ Documentation
@@ -1132,20 +1224,28 @@
+ news_dock_widget
+
+
+ Community News
+
+
+
+octave_dock_widget
-
-
+
+ Undock widget
-
+ Hide widget
-
+ Dock widget
@@ -1153,8 +1253,23 @@
octave_qscintilla
-
- help
+
+ Help on
+
+
+
+
+ Documentation on
+
+
+
+
+ Edit
+
+
+
+
+ &Run Selection
@@ -1294,6 +1409,11 @@
+
+ Create non existing files without prompting
+
+
+ Use custom file editor
@@ -1329,7 +1449,7 @@
-
+ Show line numbers
@@ -1354,7 +1474,7 @@
-
+ emacs
@@ -1444,7 +1564,7 @@
-
+ Icon set for dock widgets
@@ -1459,7 +1579,7 @@
-
+ Socks5Proxy
@@ -1484,14 +1604,14 @@
-
+
-
+ System setting
-
+ IBeam Cursor
@@ -1506,7 +1626,7 @@
-
+ Difference to the default size
@@ -1542,7 +1662,7 @@
webinfo
-
+ Type here and press 'Return' to search
@@ -1555,38 +1675,43 @@
welcome_wizard
-
+ Welcome to GNU Octave
-
- 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.
+
+ Welcome to Octave!
+
+
+
+
+ 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.
-
- The configuration file is stored in __%1__. If that file exists, you will not see this dialog when Octave starts again.
+
+ The configuration file is stored in %1. If that file exists, you will not see this dialog when Octave starts again.
-
- <html><head/><body><p>For more information about Octave,</p>
+
+ <html><head>
+<style>
+a:link { text-decoration: underline; color: #0000ff; }
+</style>
+<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>
+<li>Visit <a href="http://octave.org">http://octave.org</a></li>
+<li>Get the documentation online as <a href="http://www.gnu.org/software/octave/doc/interpreter/index.html">html</a>- or <a href="http://www.gnu.org/software/octave/octave.pdf">pdf</span></a>-document</li>
+<li>Open the documentation browser of Octave GUI with the help menu</li>
</ul>
</body></html>
-
- Welcome to Octave!
-
-
-
-
+ Finish
diff -r c4f5c781c3ca -r 97e49b588f5d libgui/languages/es_ES.ts
--- a/libgui/languages/es_ES.ts Wed Oct 23 22:48:29 2013 -0400
+++ b/libgui/languages/es_ES.ts Tue Nov 05 12:27:42 2013 -0500
@@ -104,25 +104,21 @@
file_editor
-
-
+
+
+
+ Octave EditorEditor de Octave
-
+ Octave Files (*.m);;All Files (*)Archivos de Octave (*.m);;Todos los archivos (*)
-
- Could not open file %1 for read:
-%2.
- No se ha podido abrir el archivo %1 para su lectura:\n%2.
-
-
-
+ File not saved! A file with the selected name
%1
is already open in the editor
@@ -134,12 +130,12 @@
La pestaña para la edición del archivo ha desaparecido. Es probable que se haya cerrado por algún medio.
-
+ &%1 %2&%1 %2
-
+ &New FileArchivo &nuevo
@@ -179,12 +175,12 @@
&Copiar
-
+ Cu&tCor&tar
-
+ PastePegar
@@ -234,7 +230,7 @@
&Comentar
-
+ &Uncomment&Eliminar comentario
@@ -244,7 +240,12 @@
Archivos &recientes
-
+
+ &Edit Function
+ &Editar función
+
+
+ &CloseC&errar
@@ -259,12 +260,55 @@
Cerrar otros archivos
-
+
+ Run &Selection
+ Ejecutar &Selección
+
+
+
+ &Help
+ &Ayuda
+
+
+
+ &Help on Keyword
+ &Ayuda en palabras clave
+
+
+
+ &Documentation on Keyword
+ &Documentación de palabras clave
+
+
+ &Find and Replace&Buscar y reemplazar
-
+
+ Could not open file
+%1
+for read: %2.
+ No se ha podido abrir el archivo %1 para lectura: %2.
+
+
+
+ File
+%1
+does not exist. Do you want to create it?
+ El archivo %1 no existe. ¿Desea crearlo?
+
+
+
+ Could not open file
+%1
+for write: %2.
+ No se ha podido abrir el archivo
+%1
+para escritura: %2.
+
+
+ Save File And RunGuardar archivo y ejecutar
@@ -279,12 +323,22 @@
&Archivo
-
+ &Edit&Editar
-
+
+ &Preferences
+ &Preferencias
+
+
+
+ &Styles Preferences
+ Preferencias de &estilos
+
+
+ &Debug&Depurar
@@ -297,7 +351,7 @@
file_editor_tab
-
+ Goto lineIr a línea
@@ -323,15 +377,15 @@
-
-
+
+ Octave EditorEditor de Octave
-
+ The file
%1
is about to be closed but has been modified.
@@ -339,7 +393,7 @@
El archivo\n%1\n está a punto de ser cerrado pero ha sido modificado.\n%2
-
+ Octave Files (*.m);;All Files (*)Archivos de Octave(*.m);;Todos los archivos(*)
@@ -365,13 +419,13 @@
Al parecer el archivo\n%1\n ha sido eliminado o renombrado.¿Desea guardarlo ahora?%2
-
+ Could not open file %1 for write:
%2.No se ha podido abrir el archivo %1 para escritura:\n%2.
-
+ It seems that '%1' has been modified by another application. Do you want to reload it?Al parecer el archivo \'%1\' ha sido modificado por otra aplicación. ¿Desea recargarlo?
@@ -859,18 +913,18 @@
main_window
-
+ Load WorkspaceCargar espacio de trabajo
-
-
+
+ About OctaveAcerca de Octave
-
+ &File&Archivo
@@ -931,18 +985,33 @@
Pegar
-
-
+
+ Save Workspace AsGuardar espacio de trabajo como
-
+
+ The release notes file '%1' is empty.
+ El archivo de las notas de versión %1 está vacío.
+
+
+
+ The release notes file '%1' cannot be read.
+ El archivo de las notas de versión %1 no puede ser leído.
+
+
+
+ Octave Release Notes
+ Notas de la versión de Octave
+
+
+ Set working directoryFijar directorio de trabajo
-
+ Clear ClipboardLimpiar el Portapapeles
@@ -1002,17 +1071,27 @@
Mostrar explorador de archivos
-
+
+ Show News Window
+ Mostrar ventana de noticias
+
+
+ File BrowserExplorador de archivos
-
+
+ News
+ Noticias
+
+
+ Reset Default Window LayoutReestablecer esquema de ventana predeterminado
-
+ Octave PackagesPaquetes de Octave
@@ -1042,6 +1121,21 @@
En línea
+
+ &News
+ &Noticias
+
+
+
+ Release Notes
+ Notas de la versión
+
+
+
+ Community News
+ Noticias de la comunidad
+
+ Enter directory nameIntroducir nombre de directorio
@@ -1062,7 +1156,7 @@
Explorar directorios
-
+ Load workspaceCargar espacio de trabajo
@@ -1097,7 +1191,7 @@
Mostrar documentación
-
+ Command WindowVentana de comandos
@@ -1118,7 +1212,7 @@
-
+ DocumentationDocumentación
@@ -1134,22 +1228,30 @@
+ news_dock_widget
+
+
+ Community News
+ Noticias de la comunidad
+
+
+octave_dock_widget
-
-
+
+ Undock widgetUso "widget" por ser el término usual: http://es.wikipedia.org/wiki/WidgetDesacoplar widget
-
+ Hide widgetUso "widget" por ser el término usual: http://es.wikipedia.org/wiki/WidgetOcultar widget
-
+ Dock widgetUso "widget" por ser el término usual: http://es.wikipedia.org/wiki/WidgetAcoplar widget
@@ -1158,9 +1260,24 @@
octave_qscintilla
-
- help
- Ayuda
+
+ Help on
+ Ayuda sobre
+
+
+
+ Documentation on
+ Documentación sobre
+
+
+
+ Edit
+ Editar
+
+
+
+ &Run Selection
+ &Ejecutar selección
@@ -1306,6 +1423,11 @@
Restaurar las pestañas del editor de la sesión anterior en el arranque
+
+ Create non existing files without prompting
+ Crear archivos no existentes sin preguntar
+
+ Use custom file editorUtilizar editor de archivos personalizado
@@ -1341,7 +1463,7 @@
Tipo de fuente
-
+ Show line numbersMostrar numeros de línea
@@ -1361,7 +1483,7 @@
Mostrar ruta completa en el título de la ventana
-
+ emacsemacs
@@ -1451,7 +1573,7 @@
HttpProxy
-
+ Icon set for dock widgetsÍconos para widget acoplados
@@ -1466,7 +1588,7 @@
Tamaño de ícono
-
+ Socks5Proxy"Socks5Proxy"
@@ -1491,14 +1613,14 @@
Contraseña:
-
+
-
+ System settingConfiguración del sistema
-
+ IBeam Cursorcursor IBeam
@@ -1513,7 +1635,7 @@
cursor subrayado
-
+ Difference to the default sizeDiferencia con el tamaño predeterminado
@@ -1549,7 +1671,7 @@
webinfo
-
+ Type here and press 'Return' to searchEscriba aquí y pulse la tecla de 'Retorno' para buscar
@@ -1562,44 +1684,54 @@
welcome_wizard
-
+ Welcome to GNU OctaveBienvenido a GNU Octave
-
- 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.
- 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.
+
+ Welcome to Octave!
+ ¡Bienvenido a Octave!
-
- The configuration file is stored in __%1__. If that file exists, you will not see this dialog when Octave starts again.
- La configuración ha sido guardada en __%1__. Si ese archivo existe, usted no verá este diálogo cuando Octave inicie de nuevo.
+
+ 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.
+ Al parecer usted utilza la interfaz gráfica de Octave por primera vez en este dispositivo de cómputo. Presione el botón 'Finalizar' para escribir un archivo de configuración e iniciar Octave GUI.
+
+
+
+ The configuration file is stored in %1. If that file exists, you will not see this dialog when Octave starts again.
+ El archivo de configuración ha sido guardado en %1. Si ese archivo existe, usted no verá este diálogo cuando Octave comience de nuevo.
-
- <html><head/><body><p>For more information about Octave,</p>
+
+ <html><head>
+<style>
+a:link { text-decoration: underline; color: #0000ff; }
+</style>
+<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>
+<li>Visit <a href="http://octave.org">http://octave.org</a></li>
+<li>Get the documentation online as <a href="http://www.gnu.org/software/octave/doc/interpreter/index.html">html</a>- or <a href="http://www.gnu.org/software/octave/octave.pdf">pdf</span></a>-document</li>
+<li>Open the documentation browser of Octave GUI with the help menu</li>
</ul>
</body></html>
- <html><head/><body><p>Para mayor información acerca de Octave,</p>
+ <html><head>
+<style>
+a:link { text-decoration: underline; color: #0000ff; }
+</style>
+<head/><body>
+<p>Para mas 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>
+<li>Visite <a href="http://octave.org">http://octave.org</a></li>
+<li>Obtenga la información en linea como <a href="http://www.gnu.org/software/octave/doc/interpreter/index.html">html</a>- o <a href="http://www.gnu.org/software/octave/octave.pdf">documento </span></a>-pdf</li>
+<li>Abrir el navegador de la documentación de octave GUI con el menú de ayuda</li>
</ul>
</body></html>
-
- Welcome to Octave!
- ¡Bienvenido a Octave!
-
-
-
+ FinishTerminar
diff -r c4f5c781c3ca -r 97e49b588f5d libgui/languages/fr_FR.ts
--- a/libgui/languages/fr_FR.ts Wed Oct 23 22:48:29 2013 -0400
+++ b/libgui/languages/fr_FR.ts Tue Nov 05 12:27:42 2013 -0500
@@ -104,26 +104,21 @@
file_editor
-
-
+
+
+
+ Octave EditorÉditeur d'Octave
-
+ Octave Files (*.m);;All Files (*)Fichiers d'Octave (*.m);;Tous les fichiers (*)
-
- Could not open file %1 for read:
-%2.
- Impossible d'ouvrir le fichier %1 pour lecture :
-%2.
-
-
-
+ File not saved! A file with the selected name
%1
is already open in the editor
@@ -137,12 +132,12 @@
L'onglet éditeur de fichier associé a disparu. Il a probablement été fermé par un moyen quelconque.
-
+ &%1 %2&%1 %2
-
+ &New File&Nouveau
@@ -182,12 +177,12 @@
&Copier
-
+ Cu&tCo&uper
-
+ PasteColler
@@ -237,7 +232,7 @@
&Commenter
-
+ &Uncomment&Décommenter
@@ -247,7 +242,12 @@
Fichiers &récents
-
+
+ &Edit Function
+ &Editer Fonction
+
+
+ &Close&Fermer
@@ -262,12 +262,59 @@
Fermer les autres fichiers
-
+
+ Run &Selection
+ Exécuter la &Selection
+
+
+
+ &Help
+ &Aide
+
+
+
+ &Help on Keyword
+ Aide sur le mot de clés
+
+
+
+ &Documentation on Keyword
+ Documentation sur le mot de clés
+
+
+ &Find and Replace&Rechercher et remplacer
-
+
+ Could not open file
+%1
+for read: %2.
+ Impossible d'ouvrir le fichier
+%1
+pour lecture : %2.
+
+
+
+ File
+%1
+does not exist. Do you want to create it?
+ Le fichier
+%1
+n'existe pas. Voulez-vous le créer.
+
+
+
+ Could not open file
+%1
+for write: %2.
+ Impossible d'ouvrir le fichier
+%1
+pour écrire : %2.
+
+
+ Save File And RunEnregistrer et exécuter
@@ -282,12 +329,22 @@
&Fichier
-
+ &Edit&Editer
-
+
+ &Preferences
+ &Préférences
+
+
+
+ &Styles Preferences
+ Préférences de &Style
+
+
+ &Debug&Déboguer
@@ -300,7 +357,7 @@
file_editor_tab
-
+ Goto lineAller à la ligne
@@ -326,15 +383,15 @@
-
-
+
+ Octave EditorÉditeur d'Octave
-
+ The file
%1
is about to be closed but has been modified.
@@ -345,7 +402,7 @@
%2
-
+ Octave Files (*.m);;All Files (*)Fichiers d'Octave (*.m);;Tous les fichiers (*)
@@ -377,14 +434,14 @@
a été supprimé ou rénommé. Voulez-vous l'enregistrer maintenant ?%2
-
+ Could not open file %1 for write:
%2.Impossible d'ouvrir le fichier %1 pour écrire :
%2.
-
+ It seems that '%1' has been modified by another application. Do you want to reload it?Il semblerait que '%1' a été modifié par une autre application. Voulez-vous le récharger ?
@@ -876,18 +933,18 @@
main_window
-
+ Load WorkspaceCharger l'espace de travail
-
-
+
+ About OctaveÀ propos d'Octave
-
+ &File&Fichier
@@ -947,18 +1004,33 @@
Coller
-
-
+
+ Save Workspace AsEnregistrer l'espace de travail sous
-
+
+ The release notes file '%1' is empty.
+
+
+
+
+ The release notes file '%1' cannot be read.
+
+
+
+
+ Octave Release Notes
+ Notes de la version d'Octave
+
+
+ Set working directoryDéfinir le répertoire de travail
-
+ Clear ClipboardEffacer le presse-papiers
@@ -1018,17 +1090,27 @@
Afficher l'explorateur de fichiers
-
+
+ Show News Window
+ Afficher Fenêtre des Nouvelles
+
+
+ File BrowserExplorateur de fichiers
-
+
+ News
+ Nouvelles
+
+
+ Reset Default Window LayoutRétablir la disposition par défaut des fenêtres
-
+ Octave PackagesPaquets d'Octave
@@ -1045,7 +1127,7 @@
Octave Developer Resources
- Ressources développeurs d'Octave
+ Ressources développeurs d'Octave
@@ -1058,6 +1140,21 @@
En ligne
+
+ &News
+ &Nouvelles
+
+
+
+ Release Notes
+ Notes de la version
+
+
+
+ Community News
+ Nouvelles de la Communauté
+
+ Enter directory nameEntrez le nom du répertoire
@@ -1078,7 +1175,7 @@
Naviguer dans les répertoires
-
+ Load workspaceCharger l'espace de travail
@@ -1113,7 +1210,7 @@
Afficher la documentation
-
+ Command WindowFenêtre de commande
@@ -1134,7 +1231,7 @@
-
+ DocumentationDocumentation
@@ -1150,20 +1247,28 @@
+ news_dock_widget
+
+
+ Community News
+ Nouvelles de la Communauté
+
+
+octave_dock_widget
-
-
+
+ Undock widgetDétacher le widget
-
+ Hide widgetCacher le widget
-
+ Dock widgetAttacher le widget
@@ -1171,9 +1276,24 @@
octave_qscintilla
-
- help
- aide
+
+ Help on
+ Aide sur
+
+
+
+ Documentation on
+ Documentation sur
+
+
+
+ Edit
+ Editer
+
+
+
+ &Run Selection
+ &Exécuter la Selection
@@ -1317,6 +1437,11 @@
Restaurer les onglets de la session précédente
+
+ Create non existing files without prompting
+ Créer des fichiers non existants sans demander
+
+ Use custom file editorUtiliser un éditeur externe
@@ -1352,7 +1477,7 @@
Police
-
+ Show line numbersAfficher les numéros des lignes
@@ -1372,7 +1497,7 @@
Afficher le chemin complet dans le titre de la fenetre
-
+ emacsemacs
@@ -1462,7 +1587,7 @@
Proxy HTTP
-
+ Icon set for dock widgetsJeu d'icones pour les widgets
@@ -1477,7 +1602,7 @@
Taille des icones
-
+ Socks5ProxyProxy Socks5
@@ -1502,14 +1627,14 @@
Mot de passe :
-
+
-
+ System settingReglages système
-
+ IBeam CursorCurseur Trait Vertical
@@ -1524,7 +1649,7 @@
Curseur Tiret Bas
-
+ Difference to the default sizeDifférence avec la taille par défaut
@@ -1560,7 +1685,7 @@
webinfo
-
+ Type here and press 'Return' to searchEntrez le texte ici et appuyez sur 'Entrée' pour lancer la recherche
@@ -1573,44 +1698,56 @@
welcome_wizard
-
+ Welcome to GNU OctaveBienvenu dans GNU Octave
-
- 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.
+
+ Welcome to Octave!
+ Bienvenu dans Octave!
+
+
+
+ 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.Il semble que vous exécutez l'interface graphique d'Octave pour la première fois sur cet ordinateur. Cliquez sur 'Fin' pour écrire un fichier de configuration et lancez l'interface graphique d'Octave.
-
- The configuration file is stored in __%1__. If that file exists, you will not see this dialog when Octave starts again.
- Le fichier de configuration est stockée dans __% 1__. Si ce fichier existe, vous ne verrez pas cette boîte de dialogue lorsque d'Octave recommence.
+
+ The configuration file is stored in %1. If that file exists, you will not see this dialog when Octave starts again.
+ Le fichier de configuration est stockée dans % 1. Si ce fichier existe, vous ne verrez pas cette boîte de dialogue lorsque d'Octave recommence.
-
- <html><head/><body><p>For more information about Octave,</p>
+
+ <html><head>
+<style>
+a:link { text-decoration: underline; color: #0000ff; }
+</style>
+<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>
+<li>Visit <a href="http://octave.org">http://octave.org</a></li>
+<li>Get the documentation online as <a href="http://www.gnu.org/software/octave/doc/interpreter/index.html">html</a>- or <a href="http://www.gnu.org/software/octave/octave.pdf">pdf</span></a>-document</li>
+<li>Open the documentation browser of Octave GUI with the help menu</li>
</ul>
</body></html>
- <html><head/><body><p>Pour plus d'information sur d'Octave,lt;/p>
+ <html><head>
+<style>
+a:link { text-decoration: underline; color: #0000ff; }
+</style>
+<head/><body>
+<p>Pour plus d'information sur d'Octave :</p>
<ul>
-<li>visiter <a href="http://octave.org"><span style=" text-decoration: underline; color:#0000ff;">http://octave.org</span></a>,</li>
-<li> obtenir le documentation en ligne comme <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, ou</li>
-<li>ouvrir le navigateur de documentation de l'interface graphique d'Octave avec le menu d'aide.</li>
+<li>Visiter <a href="http://octave.org">http://octave.org</a></li>
+<li>Obtenir le documentation en ligne comme <a href="http://www.gnu.org/software/octave/doc/interpreter/index.html">html</a>- or <a href="http://www.gnu.org/software/octave/octave.pdf">pdf</span></a>-document</li>
+
+;/a>-document</li>
+<li>Ouvrir le navigateur de documentation de l'interface graphique d'Octave avec le menu d'aide.</li>
</ul>
</body></html>
-
- Welcome to Octave!
- Bienvenu dans Octave!
-
-
-
+ FinishFin
diff -r c4f5c781c3ca -r 97e49b588f5d libgui/languages/nl_NL.ts
--- a/libgui/languages/nl_NL.ts Wed Oct 23 22:48:29 2013 -0400
+++ b/libgui/languages/nl_NL.ts Tue Nov 05 12:27:42 2013 -0500
@@ -6,7 +6,7 @@
Select All
- Alles selecteren
+ Alles selecteren
@@ -14,52 +14,52 @@
automatic
- Automatisch
+ Automatischfunction
- Functie
+ Functieglobal
- Gobaal
+ Gobaalhidden
- Verborgen
+ Verborgeninherited
- Overgeërfd
+ Overgeërfdpersistent
- Blijvend
+ Blijvendforeground
- Voorgrond
+ Voorgrondbackground
- Achtergrond
+ Achtergrondselection
- Selectie
+ Selectiecursor
- Aanwijzer
+ Aanwijzer
@@ -67,17 +67,17 @@
Copy
- Kopiëren
+ KopiërenPaste
- Plakken
+ PlakkenClear All
-
+ Alles wissen
@@ -85,7 +85,80 @@
copied selection to clipboard
- selectie naar klembord gekopieerd
+ selectie is naar klembord gekopieerd
+
+
+
+ QsciLexerBash
+
+
+ Default
+ Standaardtekst
+
+
+
+ Error
+ Fout
+
+
+
+ Comment
+ Commentaar
+
+
+
+ Number
+ Getal
+
+
+
+ Keyword
+ Trefwoord
+
+
+
+ Double-quoted string
+ Tekst tussen dubbele aanhalingstekens
+
+
+
+ Single-quoted string
+ Tekst tussen aanhalingstekens
+
+
+
+ Operator
+ Operator
+
+
+
+ Identifier
+ Identifier
+
+
+
+ Scalar
+ Skalair getal
+
+
+
+ Parameter expansion
+ Geëxpandeerde parameter
+
+
+
+ Backticks
+ Backticks
+
+
+
+ Here document delimiter
+ Here document scheidingsteken
+
+
+
+ Single-quoted here document
+ Here document tussen aanhalingstekens
@@ -93,42 +166,42 @@
Default
- Standaard
+ StandaardtekstComment
- Commentaar
+ CommentaarKeyword
- Trefwoord
+ TrefwoordLabel
- Etiket
+ LabelHide command character
- Verberg opdrachtteken
+ Verberg opdrachttekenExternal command
- Externe opdracht
+ Externe opdrachtVariable
- Variabele
+ VariabeleOperator
- Operator
+ Operator
@@ -136,212 +209,212 @@
Default
- Verstekwaarde
+ StandaardtekstInactive default
- Inactieve verstekwaarde
+ Inactieve standaardtekstC comment
- C commentaar
+ C commentaarInactive C comment
- Inactief C commentaar
+ Inactief C commentaarC++ comment
- C++ commentaar
+ C++ commentaarInactive C++ comment
- Inactief C++ commentaar
+ Inactief C++ commentaarJavaDoc style C comment
- C commentaar in JavaDoc stijl
+ C commentaar in JavaDoc stijlInactive JavaDoc style C comment
- Inactief C commentaar in JavaDoc stijl
+ Inactief C commentaar in JavaDoc stijlNumber
- Getal
+ GetalInactive number
- Inactief getal
+ Inactief getalKeyword
- Trefwoord
+ TrefwoordInactive keyword
- Inactief trefwoord
+ Inactief trefwoordDouble-quoted string
- Tekst met dubbele aanhalingstekens
+ Tekst met dubbele aanhalingstekensInactive double-quoted string
- Inactieve tekst met dubbele aanhalingstekens
+ Inactieve tekst met dubbele aanhalingstekensSingle-quoted string
- Tekst met aanhalingstekens
+ Tekst met aanhalingstekensInactive single-quoted string
- Inactieve tekst met aanhalingstekens
+ Inactieve tekst met aanhalingstekensIDL UUID
-
+ IDL UUIDInactive IDL UUID
-
+ Inactieve IDL UUIDPre-processor block
- Preprocessor blok
+ Preprocessor blokInactive pre-processor block
- Inactief preprocessor blok
+ Inactief preprocessor blokOperator
- Operator
+ OperatorInactive operator
- Inactieve operator
+ Inactieve operatorIdentifier
- Identifier
+ IdentifierInactive identifier
- Inactieve identifier
+ Inactieve identifierUnclosed string
- Niet afgesloten tekst
+ Niet afgesloten tekstInactive unclosed string
- Inactieve niet afgesloten tekst
+ Inactieve niet afgesloten tekstC# verbatim string
- C# letterlijke tekst
+ C# letterlijke tekstInactive C# verbatim string
- Inactieve C# letterlijke tekst
+ Inactieve C# letterlijke tekstJavaScript regular expression
- Javascript reguliere uitdrukking
+ Javascript reguliere uitdrukkingInactive JavaScript regular expression
- Inatieve Javascript reguliere uitdrukking
+ Inatieve Javascript reguliere uitdrukkingJavaDoc style C++ comment
- C++ commentaar in JavaDoc stijl
+ C++ commentaar in JavaDoc stijlInactive JavaDoc style C++ comment
- Inactief C++ commentaar in JavaDoc stijl
+ Inactief C++ commentaar in JavaDoc stijlSecondary keywords and identifiers
- Secundaire trefwoorden en identifiers
+ Secundaire trefwoorden en identifiersInactive secondary keywords and identifiers
- Inactieve secundaire trefwoorden en identifiers
+ Inactieve secundaire trefwoorden en identifiersJavaDoc keyword
- JavaDoc sleutelwoord
+ JavaDoc sleutelwoordInactive JavaDoc keyword
- Inactief JavaDoc sleutelwoord
+ Inactief JavaDoc sleutelwoordJavaDoc keyword error
- fout JavaDoc trefwoord
+ fout JavaDoc trefwoordInactive JavaDoc keyword error
- Inactief fout JavaDoc trefwoord
+ Inactief fout JavaDoc trefwoordGlobal classes and typedefs
- Globale klassen en typedefs
+ Globale klassen en typedefsInactive global classes and typedefs
- Inactieve globale klassen en typedefs
+ Inactieve globale klassen en typedefsC++ raw string
- C++ ruwe tekst
+ C++ ruwe tekstInactive C++ raw string
- Inactieve C++ ruwe tekst
+ Inactieve C++ ruwe tekst
@@ -349,42 +422,42 @@
Default
- Verstekwaarde
+ StandaardtekstComment
- Commentaar
+ CommentaarCommand
- Opdracht
+ OpdrachtHeader
- Koptekst
+ KoptekstPosition
- Positie
+ PositieRemoved line
- Verwijderde regel
+ Verwijderde regelAdded line
- Toegevoegde regel
+ Toegevoegde regelChanged line
- Gewijzigde regel
+ Gewijzigde regel
@@ -392,47 +465,47 @@
Default
- Verstekwaarde
+ StandaardtekstComment
- Commentaar
+ CommentaarCommand
- Opdracht
+ OpdrachtNumber
- Getal
+ GetalKeyword
- Trefwoord
+ TrefwoordSingle-quoted string
- Tekst tussen aanhalingstekens
+ Tekst tussen aanhalingstekensOperator
- Operator
+ OperatorIdentifier
- Identifier
+ IdentifierDouble-quoted string
- Tekst tussen dubbele aanhalingstekens
+ Tekst tussen dubbele aanhalingstekens
@@ -440,207 +513,207 @@
Default
- Verstekwaarde
+ StandaardtekstError
- Fout
+ FoutComment
- Commentaar
+ CommentaarPOD
- POD
+ PODNumber
- Getal
+ GetalKeyword
- Trefwoord
+ TrefwoordDouble-quoted string
- Tekst tussen dubbele aanhalingstekens
+ Tekst tussen dubbele aanhalingstekensSingle-quoted string
- Tekst tussen aanhalingstekens
+ Tekst tussen aanhalingstekensOperator
- Operator
+ OperatorIdentifier
- Identifier
+ IdentifierScalar
- Enkel getal
+ Skalair getalArray
- Array
+ ArrayHash
- Hash
+ HashSymbol table
- Symbooltabel
+ SymbooltabelRegular expression
- Reguliere uitdrukking
+ Reguliere uitdrukkingSubstitution
- Vervanging
+ VervangingBackticks
-
+ BackticksData section
- Data sectie
+ Data sectieHere document delimiter
- Here document scheidingsteken
+ Here document scheidingstekenSingle-quoted here document
- Here document tussen aanhalingstekens
+ Here document tussen aanhalingstekensDouble-quoted here document
- Here dicument tussen dubbele aanhalingstekens
+ Here dicument tussen dubbele aanhalingstekensBacktick here document
- Backtick here document
+ Backtick here documentQuoted string (q)
- q tekst tussen aanhalingstekens
+ q tekst tussen aanhalingstekensQuoted string (qq)
- qq tekst tussen aanhalingstekens
+ qq tekst tussen aanhalingstekensQuoted string (qx)
- qx tekst tussen aanhalingstekens
+ qx tekst tussen aanhalingstekensQuoted string (qr)
- qr tekst tussen aanhalingstekens
+ qr tekst tussen aanhalingstekensQuoted string (qw)
- qw tekst tussen aanhalingstekens
+ qw tekst tussen aanhalingstekensPOD verbatim
- POD letterlijk
+ POD letterlijkSubroutine prototype
-
+ Subroutine prototypeFormat identifier
- Sjabloon identifier
+ Sjabloon identifierFormat body
- Sjabloon inhoud
+ Sjabloon inhoudDouble-quoted string (interpolated variable)
- Tekst tussen aanhalingstekens (geïnterpoleerde variabele)
+ Tekst tussen aanhalingstekens (geïnterpoleerde variabele)Translation
- Vertaling
+ VertalingRegular expression (interpolated variable)
- Reguliere uitdrukking (Geïnterpoleerde variabele)
+ Reguliere uitdrukking (Geïnterpoleerde variabele)Substitution (interpolated variable)
- Vervanging
+ VervangingBackticks (interpolated variable)
-
+ Backticks (geïnterpoleerde variabele)Double-quoted here document (interpolated variable)
- Here document tussen dubbele aanhalingstekens (geïnterpoleerde variabele
+ Here document tussen dubbele aanhalingstekens (geïnterpoleerde variabeleBacktick here document (interpolated variable)
- Backtick here document (geïnterpoleerde variabele)
+ Backtick here document (geïnterpoleerde variabele)Quoted string (qq, interpolated variable)
- Tekst tussen aanhalingstekens (qq, geïnterpoleerde variabele)
+ Tekst tussen aanhalingstekens (qq, geïnterpoleerde variabele)Quoted string (qx, interpolated variable)
- Tekst tussen aanhalingstekens (qx, geïnterpoleerde variabele)
+ Tekst tussen aanhalingstekens (qx, geïnterpoleerde variabele)Quoted string (qr, interpolated variable)
- Tekst tussen aanhalingstekens (qr, geïnterpoleerde variabele)
+ Tekst tussen aanhalingstekens (qr, geïnterpoleerde variabele)
@@ -648,37 +721,37 @@
&Undo
- Ongedaan maken
+ Ongedaan maken&Redo
- He&rhalen
+ He&rhalenCu&t
- Knippen
+ Knippen&Copy
- Kopiëren
+ Kopiëren&Paste
- Plakken
+ PlakkenDelete
- Verwijderen
+ VerwijderenSelect All
- Alles kiezen
+ Alles selecteren
@@ -691,32 +764,27 @@
See the documentation for help.
- Kijk in de documentatie voor hulp.
+ Kijk in de documentatie voor hulp.file_editor
-
-
+
+
+
+ Octave Editor
-
+ Octave Files (*.m);;All Files (*)
- Octave bestanden (*.m);;Alle bestanden (*)
-
-
-
- Could not open file %1 for read:
-%2.
- Bestand %1 kon niet geopend worden om te lezen:
-%2.
-
-
-
+ Octave bestanden (*.m);;Alle bestanden (*)
+
+
+ File not saved! A file with the selected name
%1
is already open in the editor
@@ -730,12 +798,12 @@
Het bijbehorende tabblad in de editor is verdwenen. Het is waarschijnlijk op een of andere manier gesloten.
-
+ &%1 %2
-
+ &New File&Nieuw Bestand
@@ -757,7 +825,7 @@
Print
- Afdrukken
+ Afdrukken
@@ -775,12 +843,12 @@
Kopiëren
-
+ Cu&tKnippen
-
+ PastePlakken
@@ -827,47 +895,99 @@
&Comment
- Zet om naar commentaar
-
-
-
+ Zet om naar commentaar
+
+
+ &Uncomment
- Zet om naar code
+ Zet om naar code&Recent Editor Files
- Recent geopend
-
-
-
+ Recent geopend
+
+
+
+ &Edit Function
+ Edit functie
+
+
+ &Close
- Sluit bestand
+ Sluit bestandClose All
- Alle bestanden sluiten
+ Alle bestanden sluitenClose Other Files
- Andere bestanden sluiten
-
-
-
- &Find and Replace
- Zoek en Vervang
+ Andere bestanden sluiten
+
+
+
+ Run &Selection
+ Geselecteerde tekst uitvoeren
+
+
+
+ &Help
+ Hulp
+
+
+
+ &Help on Keyword
+ Hulp bij sleutelwoord
+ &Documentation on Keyword
+ Documentatie bij sleutelwoord
+
+
+
+ &Find and Replace
+ Zoek en Vervang
+
+
+
+ Could not open file
+%1
+for read: %2.
+ Kon bestand
+%1
+niet openen om in te lezen: %2.
+
+
+
+ File
+%1
+does not exist. Do you want to create it?
+ Bestand
+%1
+bestaat niet. Wilt u het laten aanmaken?
+
+
+
+ Could not open file
+%1
+for write: %2.
+ Kon bestand
+%1
+niet openen om te schrijven: %2.
+
+
+ Save File And RunBestand opslaan en uitvoerenGo&to Line
- Ga naar regel
+ Ga naar regel
@@ -875,12 +995,22 @@
Bestand
-
+ &EditB&ewerken
-
+
+ &Preferences
+ Voorkeuren
+
+
+
+ &Styles Preferences
+ Stijlvoorkeuren
+
+
+ &Debug&Debuggen
@@ -893,60 +1023,61 @@
file_editor_tab
-
+ Goto line
- Ga naar regel ...
+ Ga naar regel ...Line number
- Regelnummer
+ Regelnummer<unnamed>
- naamloos
+ naamloosDo you want to save or discard the changes?
- Wil je de wijzigingen opslaan of niet?
+ Wil je de wijzigingen opslaan of niet?Do you want to cancel closing, save or discard the changes?
- Wil je niet meer afsluiten, het gewijzigde, of het originele bestand opslaan?
+ Wil je niet meer afsluiten, danwel het gewijzigde of het originele bestand opslaan?
-
-
+
+ Octave Editor
-
+ The file
%1
is about to be closed but has been modified.
%2
- Het bestand
+ Het bestand
%1
-dat gesloten moet worden is gewijzigd.
-
-
-
+dat gesloten moet worden is gewijzigd.
+%2
+
+
+ Octave Files (*.m);;All Files (*)
- Octave bestanden (*.m);;Alle bestanden (*)
+ Octave bestanden (*.m);;Alle bestanden (*)File not saved! The selected file name
%1
is the same as the current file name
- Bestand niet opgeslagen! De gekozen bestandsnaam
+ Bestand niet opgeslagen! De gekozen bestandsnaam
%1
is identiek aan de huidige bestandsnaam
@@ -955,7 +1086,7 @@
Warning: The contents in the editor is modified!
-
+
Opgelet: Het bestand in de editor is gewijzigd!
@@ -963,19 +1094,19 @@
It seems that the file
%1
has been deleted or renamed. Do you want to save it now?%2
- Het lijkt er op dat bestand
+ Het lijkt er op dat bestand
%1
-is gewist of hernoemd. Wil je het nu opslaan?
-
-
-
+is gewist of hernoemd. Wil je het nu opslaan?%2
+
+
+ Could not open file %1 for write:
%2.Kon bestand %1 niet openen om te schrijven:
%2.
-
+ It seems that '%1' has been modified by another application. Do you want to reload it?Het lijkt erop dat '%1' is gewijzigd door een ander programma. Wil je het opnieuw laden?
@@ -985,184 +1116,185 @@
File Browser
- Bestandsbrowser
+ BestandsbrowserBrowse your files.
- Blader door uw bestanden.
+ Blader door uw bestanden.Enter the path or filename
- Voer pad- of bestandsnaam in
+ Voer pad- of bestandsnaam inMove up one directory
- Eén mapniveau omhoog
+ Eén mapniveau omhoogShow octave directory
- Laat octave map zien
+ Laat octave map zienGoto current octave directory
- Ga naar huidige octave map
+ Ga naar huidige octave mapSet octave directory
- Stel octave map in
+ Stel octave map inSet octave directroy to current browser directory
- Maak huidige browser map de Octave map
+ Maak huidige browser map de Octave mapActions on current directory
- Bewerkingen op huidige map
+ Bewerkingen op huidige mapShow Home directory
- Laat home map zien
+ Laat home map zienSearch directory
- Zoek in map
+ Zoek in mapFind Files ...
- Zoek bestanden ...
+ Zoek bestanden ...New File
- Nieuw bestand
+ Nieuw bestandNew Directory
- Nieuwe map
+ Nieuwe mapDoubleclick a file to open it
- Dubbelklik op bestandsnaam om te openen
+ Dubbelklik op bestandsnaam om te openenOpen
- Open
+ OpenOpen in Default Application
- Open met bijbehorend programma
+ Open met bijbehorend programmaCopy Selection to Clipboard
- Kopieer selectie naar klembord
+ Kopieer selectie naar klembordRun
- Voer uit
+ Voer uitLoad Data
- Lees data in
+ Lees data inSet Current Directory
- Stel huidige map in
+ Stel huidige map inRename
- Hernoemen
+ HernoemenDelete
- Verwijderen
+ VerwijderenRename file/directory
- Hernoem bestand/map
+ Hernoem bestand/mapRename file/directory:
- Hernoem bestand
+ Hernoem bestand
+
to:
-
+
naar: Delete file/directory
- Wis bestand/map
+ Wis bestand/mapAre you sure you want to delete
- Weet u zeker dat u dit wilt verwijderen
-
+ Weet u zeker dat u dit wilt verwijderen:
+Can not delete a directory that is not empty
- Kan geen niet-lege map wissen
+ Kan een niet-lege map niet wissenSet directory of file browser
- Stel file browser map in
+ Stel file browser map inCreate File
- Maak nieuw bestand
+ Maak nieuw bestandCreate file in
- Maak nieuw bestand in
+ Maak nieuw bestand in
Create Directory
- Maak nieuwe map
+ Maak nieuwe mapCreate folder in
- Maak nieuwe map in
+ Maak nieuwe map in
@@ -1201,7 +1333,7 @@
Find &Previous
- Vorige zoeken
+ Vorige zoeken
@@ -1241,32 +1373,32 @@
Search from end
- vanaf einde terug zoeken
+ vanaf einde terug zoekenSearch from start
- Zoeken vanaf begin
+ Zoeken vanaf beginReplace Result
- Resultaat vervangen
+ Resultaat vervangen%1 items replaced
- %1 vervangingen
+ %1 vervangingenFind Result
- Zoek resultaat
+ Zoek resultaatNo more matches found
- Geen overeenkomsten meer gevonden
+ Geen overeenkomsten meer gevonden
@@ -1274,142 +1406,142 @@
Find Files
- Zoek bestanden
+ Zoek bestandenNamed:
- Genaamd:
+ Genaamd:Enter the filename expression
- Voer de bestandnaam-expressie in
+ Voer de bestandnaam-expressie inStart in:
- Begin in:
+ Begin in:Enter the start directory
- Geef startmap op
+ Geef startmap opBrowse...
- Bladeren ...
+ Bladeren ...Browse for start directory
- Blader naar begin map
+ Blader naar begin mapRecurse directories
- Ook in onderliggende mappen
+ Ook in onderliggende mappenSearch recursively through directories for matching files
- Zoek ook in onderliggende mappen naar overeenkomende bestanden
+ Zoek ook in onderliggende mappen naar overeenkomende bestandenInclude directories
- Neem mappen ook mee
+ Neem mappen ook meeInclude matching directories in search results
- Neem overeenkomende mappen mee in zoekresultaten
+ Neem overeenkomende mappen mee in zoekresultatenName case insensitive
- Niet-hoofdlettergevoelige naam
+ Niet-hoofdlettergevoelige naamSet matching name is case insensitive
- Naam instellen op niet-hoofdlettergevoelig
+ Naam instellen op niet-hoofdlettergevoeligContains text:
- Met tekst:
+ Met tekst:Search must match text
- Zoeken naar overeenkomende tekst
+ Zoeken naar overeenkomende tekstText to match
- Overeen te komen tekst
+ Overeen te komen tekstText case insensitive
- Niet-hoofdlettergevoelige tekst
+ Niet-hoofdlettergevoelige tekstSet text content is case insensitive
- Tekst instellen op niet-hoofdlettergevoelig
+ Tekst instellen op niet-hoofdlettergevoeligSearch results
- Zoekresultaten
+ ZoekresultatenIdle.
- Niet bezig.
+ Niet bezig.Find
- Zoek
+ ZoekStart search for matching files
- begin met zoeken naar overeenkomende bestanden
+ begin met zoeken naar overeenkomende bestandenStop
- Stop
+ StopStop searching
- Stop met zoeken
+ Stop met zoekenFile name/location
- Bestandsnaam/lokatie
+ Bestandsnaam/lokatieFile contents
- Inhoud van bestand
+ Inhoud van bestandSearching...
- Bezig met zoeken...
+ Bezig met zoeken...Set search directory
- Stel zoekmap in
+ Stel zoekmap in
@@ -1417,12 +1549,12 @@
Filename
- Bestandsnaam
+ BestandsnaamDirectory
- Map
+ Map
@@ -1430,7 +1562,7 @@
Browse and search the command history.
- Bladeren en zoeken door de opdrachtgeschiedenis.
+ Bladeren en zoeken door de opdrachtgeschiedenis.
@@ -1460,24 +1592,24 @@
Create script
- Nieuw script
+ Nieuw scriptmain_window
-
+ Load WorkspaceWerkruimte laden
-
-
+
+ About OctaveOver Octave
-
+ &FileBestand
@@ -1537,20 +1669,35 @@
Plakken
-
-
+
+ Save Workspace As
- Bewaar werkruimte als ...
-
-
-
+ Bewaar werkruimte als ...
+
+
+
+ The release notes file '%1' is empty.
+ Bestand met Release Notes '%1' is leeg.
+
+
+
+ The release notes file '%1' cannot be read.
+ Bestand met Rlease Notes '%1' kan nit worden gelezen.
+
+
+
+ Octave Release Notes
+ Octave Release Notes
+
+
+ Set working directory
- Stel werkmap in
-
-
-
+ Stel werkmap in
+
+
+ Clear Clipboard
-
+ Wis klembord
@@ -1605,70 +1752,95 @@
Show File Browser
- Laat bestandsbrowser zien
-
-
-
+ Laat bestandsbrowser zien
+
+
+
+ Show News Window
+ Laat Nieuwsvenster zien
+
+
+ File Browser
- Bestandsbrowser
-
-
-
+ Bestandsbrowser
+
+
+
+ News
+ Nieuws
+
+
+ Reset Default Window Layout
- Stel oorspronkelijke window layout opnieuw in
-
-
-
+ Stel oorspronkelijke window layout opnieuw in
+
+
+ Octave Packages
-
+ Octave packagesShare Code
-
+ Deel codeContribute to Octave
-
+ Doneer aan Octave projectOctave Developer Resources
-
+ Octave Ontwikkelaar ResurcesOn Disk
- Op schijf
+ Op schijfOnline
- Online
+ Online
+
+
+
+ &News
+ Nieuws
+
+
+
+ Release Notes
+ Release notes
+
+
+
+ Community News
+ Community NieuwsEnter directory name
- Geef mapnaam op
+ Geef mapnaam opCurrent Directory:
- Huidige map:
+ Huidige map:One directory up
- Eén mapniveau omhoog
+ Eén mapniveau omhoogBrowse directories
- Blader door mappen
-
-
-
+ Blader door mappen
+
+
+ Load workspaceWerkruimte laden
@@ -1703,7 +1875,7 @@
Documentatie weergeven
-
+ Command WindowOpdrachtvenster
@@ -1724,7 +1896,7 @@
-
+ DocumentationDocumentatie
@@ -1740,30 +1912,53 @@
+ news_dock_widget
+
+
+ Community News
+ Community nieuws
+
+
+octave_dock_widget
-
-
+
+ Undock widget
- Widget laten zweven
-
-
-
+ Widget laten zweven
+
+
+ Hide widget
- Widget verbergen
-
-
-
+ Widget verbergen
+
+
+ Dock widget
- Widget in venster opnemen
+ Widget in venster opnemenoctave_qscintilla
-
- help
- hulp
+
+ Help on
+ Help over
+
+
+
+ Documentation on
+ Documentatie over
+
+
+
+ Edit
+ Edit
+
+
+
+ &Run Selection
+ Voer selectie uit
@@ -1771,32 +1966,32 @@
The file %1 does not exist in the load path. To debug the function you are editing, you must either change to the directory %2 or add that directory to the load path.
- Het bestand %1 is niet in zoekpad. Om de functie die je edit te debuggen moet je òf naar debetreffende map %2 gaan, of die map aan het zoekpad toevoegen.
+ Het bestand %1 is niet in zoekpad. Om de functie die je edit te debuggen moet je òf naar debetreffende map %2 gaan, of die map aan het zoekpad toevoegen.The file %1 is shadowed by a file with the same name in the load path. To debug the function you are editing, change to the directory %2.
- Het bestand %1 is overschaduwd door een bestand met dezelfde naam in het zoekpad. Ga naar de map %2 om de functie de je edit te kunnen debuggen.
+ Het bestand %1 is overschaduwd door een bestand met dezelfde naam in het zoekpad. Ga naar de map %2 om de functie de je edit te kunnen debuggen.Change Directory or Add Directory to Load Path
- Ga naar andere map of Voeg map toe aan zoekpad
+ Ga naar andere map of Voeg map toe aan zoekpadChange Directory
- Ga naar andere map
+ Ga naar andere mapAdd Directory to Load Path
- Voeg map toe aan zoekpad
+ Voeg map toe aan zoekpadCancel
- Afbreken
+ Afbreken
@@ -1834,107 +2029,112 @@
Show white space
- Laat witruimtetekens zien
+ Laat witruimtetekens zienDo not show white spaces used for indentation
- Verberg witruimtetekens die worden gebruikt voor inspringen
+ Verberg witruimtetekens die worden gebruikt voor inspringenColor
- Kleur
+ KleurIndent width
- Inspringafstand
+ InspringafstandTab indents line
- Inspringen met tab
+ Inspringen met tabAuto indentation
- Automatisch inspringen
+ Automatisch inspringenTab width
- Tab breedte
+ Tab breedteShow indentation guides
- Laat inspringraster zien
+ Laat inspringraster zienBackspace unindents line
- Backspace doet terug inspringen
+ Backspace doet terug inspringenCharacters before list with suggestions is displayed
- Aantal tekens voordat lijst met suggesties wordt weergegeven
+ Aantal tekens voordat lijst met suggesties wordt weergegevenMatch keywords
- Zoek op overeenkomende sleutelwoorden
+ Zoek overeenkomende sleutelwoordenCase sensitive
- Hoofdlettergevoelig
+ HoofdlettergevoeligReplace word by suggested one
- Vervang woord door suggestie
+ Vervang woord door suggestieMatch words in document
- Zoek overeenkomende worden in document
+ Zoek overeenkomende woorden in documentRestore editor tabs from previous session on startup
- Herstel bij opstarten de editor tabs uit de vorige sessie
+ Herstel bij opstarten de editor tabs uit de vorige sessie
+
+
+
+ Create non existing files without prompting
+ Maak nieuwe bestanden aan zonder meldingUse custom file editor
- Gebruik een andere editor
+ Gebruik een andere editorCommand line (%f=file, %l=line):
- Opdrachtregel (%f=bestand, %l=regel):
+ Opdrachtregel (%f=bestand, %l=regel):Editor Styles
- Editorstijlen
+ Editorstijlen<html><head/><body><p>Select font, font size (as difference to the default size), font decoration (bold, italic, underline), textcolor and background color (for the latter, the color pink (255,0,255) is a placeholder for the default background color)</p></body></html>
- Kies font, fontgrootte (als verschil met standaardgrootte), fonttype (vet, schuin, onderstreept), tekstkleur en achtergrondkleur (de kleur roze (255,0,255) dient alleen om de standaard-achtergrondkleur aan te duiden)
+ Kies font, fontgrootte (als verschil met standaardgrootte), fonttype (vet, schuin, onderstreept), tekstkleur en achtergrondkleur (de kleur roze (255,0,255) dient alleen om de standaard-achtergrondkleur aan te duiden)Use Foreground Color
- Gebruik voorgrondkleur
+ Gebruik voorgrondkleurTerminal Colors
- Terminalkleuren
+ Terminalkleuren
@@ -1942,7 +2142,7 @@
Lettertype
-
+ Show line numbersRegelnummers weergeven
@@ -1962,7 +2162,7 @@
Hele pad in schermtitel weergeven
-
+ emacs
@@ -1984,7 +2184,7 @@
Font size
- Lettergrootte
+ Lettergrootte
@@ -2014,7 +2214,7 @@
Synchronize octave directory with the file browser
- Synchroniseer octave map met die van bestandsbrowser
+ Synchroniseer octave map met die van bestandsbrowser
@@ -2024,12 +2224,12 @@
Workspace
- Werkruimte
+ WerkruimteStorage Class Colors
- Kleuren voor klasse
+ Kleuren voor klasse
@@ -2052,22 +2252,22 @@
http proxy
-
+ Icon set for dock widgets
- Iconenset voor dock widgets
+ Iconenset voor dock widgetsLanguage (requires restart)
- Taal instellen (vereist herstart)
+ Taal instellen (vereist herstart)Icon size
- Icoongrootte
-
-
-
+ Icoongrootte
+
+
+ Socks5Proxy
@@ -2092,51 +2292,51 @@
Wachtwoord:
-
+
-
+ System setting
- Systeeminstelling
-
-
-
+ Systeeminstelling
+
+
+ IBeam Cursor
- I-balkje
+ I-balkjeBlock Cursor
- Blokje
+ BlokjeUnderline Cursor
- Liggend streepje
-
-
-
+ Liggend streepje
+
+
+ Difference to the default size
- Verschil met standaardgrootte
+ Verschil met standaardgrootteBackground color, pink (255,0,255) means default
- Achtergrondkleur; roze (255,0,255) staat voor standaardkleur
+ Achtergrondkleur; roze (255,0,255) staat voor standaardkleurb
-
+ bi
-
+ iu
-
+ u
@@ -2150,7 +2350,7 @@
webinfo
-
+ Type here and press 'Return' to searchTyp hier en druk op 'Enter' om te zoeken
@@ -2163,38 +2363,54 @@
welcome_wizard
-
+ Welcome to GNU OctaveWelkom bij GNU Octave
+
+ Welcome to Octave!
+ Welkom bij Octave!
+
+
+
+ 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.
+ Kennelijk gebruik je Octave's grafische interface voor het eerst. Klik op Finish, dan wordt er een standaard configuratiebestand aangemaakt en daarna de Octave GUI gestart.
+
+
+
+ The configuration file is stored in %1. If that file exists, you will not see this dialog when Octave starts again.
+ Het configuratiebestand is opgeslagen als %1. Als dat bestand bestaat zal Octave bij een volgende start dee dialoog overslaan.
+
+
+
+ <html><head>
+<style>
+a:link { text-decoration: underline; color: #0000ff; }
+</style>
+<head/><body>
+<p>For more information about Octave:</p>
+<ul>
+<li>Visit <a href="http://octave.org">http://octave.org</a></li>
+<li>Get the documentation online as <a href="http://www.gnu.org/software/octave/doc/interpreter/index.html">html</a>- or <a href="http://www.gnu.org/software/octave/octave.pdf">pdf</span></a>-document</li>
+<li>Open the documentation browser of Octave GUI with the help menu</li>
+</ul>
+</body></html>
+ <html><head>
+<style>
+a:link { text-decoration: underline; color: #0000ff; }
+</style>
+<head/><body>
+<p>Voor meer informatie over Octave:</p>
+<ul>
+<li>ga naar <a href="http://octave.org">http://octave.org</a></li>
+<li>Bekijk de documentatie online hier <a href="http://www.gnu.org/software/octave/doc/interpreter/index.html">html</a>- of hier <a href="http://www.gnu.org/software/octave/octave.pdf">pdf</span></a>-document</li>
+<li>Open de documentatie browser van de Octave GUI met het help menu</li>
+</ul>
+</body></html>
+
+
- 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.
-
-
-
-
- The configuration file is stored in __%1__. If that file exists, you will not see this dialog when Octave starts again.
-
-
-
-
- <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>
-
-
-
-
- Welcome to Octave!
- Welkom bij Octave!
-
-
- FinishVoltooien
@@ -2224,12 +2440,12 @@
Storage Class
- Klasse
+ KlasseRight click to copy, rename, or display
- Klik rechts om te kopiëren, hernoemen of weergeven
+ Klik rechts om te kopiëren, hernoemen of weergeven
@@ -2242,32 +2458,32 @@
View the variables in the active workspace.
- Bekijk de variabelen in de huidige werkruimte.
+ Bekijk de variabelen in de huidige werkruimte.Copy
- Kopiëren
+ KopiërenRename
- Hernoemen
+ HernoemenOnly top-level symbols may be renamed.
- Alleen hoofdsymbolen kunnen worden hernoemd.
+ Alleen hoofdsymbolen kunnen worden hernoemd.View the variables in the active workspace.<br>
- Bekijk variabelen in actieve werkruimte
+ Bekijk variabelen in actieve werkruimteColors for the storage class:
- Kleuren voor klasse:
+ Kleuren voor klasse:
diff -r c4f5c781c3ca -r 97e49b588f5d libgui/languages/pt_BR.ts
--- a/libgui/languages/pt_BR.ts Wed Oct 23 22:48:29 2013 -0400
+++ b/libgui/languages/pt_BR.ts Tue Nov 05 12:27:42 2013 -0500
@@ -14,7 +14,7 @@
automatic
- automática
+ automático(a)
@@ -29,7 +29,7 @@
hidden
- oculta
+ oculto(a)
@@ -44,22 +44,22 @@
foreground
-
+ primeiro planobackground
-
+ fundoselection
-
+ seleçãocursor
-
+ indicador
@@ -67,17 +67,17 @@
Copy
- Copiar
+ CopiarPaste
-
+ ColarClear All
-
+ Limpar Tudo
@@ -85,7 +85,7 @@
copied selection to clipboard
-
+ seleção copiada para a área de transferência
@@ -104,42 +104,38 @@
file_editor
-
-
+
+
+
+ Octave Editor
- Editor Octave
+ Editor do Octave
-
+ Octave Files (*.m);;All Files (*)
- Scripts Octave (*.m);;Todos Arquivos (*)
+ Scripts do Octave (*.m);;Todos os Arquivos (*)
-
- Could not open file %1 for read:
-%2.
- Não foi possível abrir arquivo %1 para leitura: %2.
-
-
-
+ File not saved! A file with the selected name
%1
is already open in the editor
- Arquivo não salvo! Um arquivo com o nome selecionado %1 se encontra aberto no editor
+ Arquivo não salvo! Um arquivo com o nome selecionado %1 já está aberto no editorThe associated file editor tab has disappeared. It was likely closed by some means.
- A aba do editor associada ao arquivo desapareceu. Foi provavelmente fechada de alguma maneira.
+ A aba do editor associada ao arquivo desapareceu. Provavelmente foi fechada de alguma maneira.
-
+ &%1 %2&%1 %2
-
+ &New File&Novo Arquivo
@@ -179,14 +175,14 @@
&Copiar
-
+ Cu&tRecor&tar
-
+ Paste
- Co&lar
+ Colar
@@ -201,12 +197,12 @@
Toggle &Bookmark
- Visualizar &Marcador
+ Habilitar/desabilitar &Marcador&Remove All Bookmarks
- &Remover Todos Marcadores
+ &Remover Todos os Marcadores
@@ -221,7 +217,7 @@
Toggle &breakpoint
- Visualizar ponto de &interrupção
+ Habilitar/desabilitar ponto de &interrupção
@@ -234,24 +230,29 @@
&Comentar
-
+ &Uncomment&Descomentar&Recent Editor Files
- Arquivos &recentes
+ Arquivos &Recentes
-
+
+ &Edit Function
+ &Editar Função
+
+
+ &Close&FecharClose All
- Fechar &Todos
+ Fechar Todos
@@ -259,19 +260,66 @@
Fechar Outros Arquivos
-
- &Find and Replace
- Procurar e Substituir
+
+ Run &Selection
+ Executar &Seleção
+
+
+
+ &Help
+ &Ajuda
+
+
+
+ &Help on Keyword
+ &Ajuda na Palavra-chave
+ &Documentation on Keyword
+ &Documentação na Palavra-chave
+
+
+
+ &Find and Replace
+ &Buscar e Substituir
+
+
+
+ Could not open file
+%1
+for read: %2.
+ Não foi possível abrir aquivo
+%1
+para leitura: %2.
+
+
+
+ File
+%1
+does not exist. Do you want to create it?
+ Arquivo
+%1
+não existe. Deseja criá-lo?
+
+
+
+ Could not open file
+%1
+for write: %2.
+ Não foi possível abrir arquivo
+%1
+para escrita: %2.
+
+
+ Save File And Run
- Salvar e Executar
+ Salvar Arquivo e ExecutarGo&to Line
- Vá para Linha
+ Vá para &Linha
@@ -279,12 +327,22 @@
&Arquivo
-
+ &Edit&Editar
-
+
+ &Preferences
+ &Preferências
+
+
+
+ &Styles Preferences
+ Preferências de &Estilo
+
+
+ &Debug&Depurar
@@ -297,7 +355,7 @@
file_editor_tab
-
+ Goto lineVá para linha
@@ -319,32 +377,32 @@
Do you want to cancel closing, save or discard the changes?
- Você deseja salvar, descartar as alterações ou cancelar fechamento?
+ Você deseja cancelar fechamento, salvar ou descartar as alterações?
-
-
+
+ Octave Editor
- Editor Octave
+ Editor do Octave
-
+ The file
%1
is about to be closed but has been modified.
%2O arquivo
%1
-está prestes a ser fechado com modificações.
+está prestes a ser fechado mas foi modificado.
%2
-
+ Octave Files (*.m);;All Files (*)
- Scripts Octave (*.m);; Todos Arquivos (*)
+ Scripts Octave (*.m);; Todos os Arquivos (*)
@@ -362,7 +420,7 @@
Warning: The contents in the editor is modified!
-Aviso: Os arquivos no editor foram modificados!
+Aviso: O conteúdo no editor foi modificado!
@@ -374,14 +432,14 @@
foi removido ou renomeado. Pretende salvá-lo agora?%2
-
+ Could not open file %1 for write:
%2.Não foi possível abrir arquivo %1 para escrita:
%2.
-
+ It seems that '%1' has been modified by another application. Do you want to reload it?Parece que o arquivo '%1' foi modificado por outra aplicação. Deseja recarregá-lo?
@@ -396,58 +454,58 @@
Browse your files.
- Procure seus arquivos.
+ Explore seus arquivos.Enter the path or filename
- Informe o caminho ou nome do arquivo
+ Digite o caminho ou nome de arquivoMove up one directory
- Mova um diretório acima
+ Subir um nível de diretórioShow octave directory
- Mostre o diretório corrente
+ Exibir o diretório do OctaveGoto current octave directory
- Vá para o diretório corrente
+ Vá para o diretório atual do OctaveSet octave directory
- Mude o diretório corrente
+ Definir o diretório do OctaveSet octave directroy to current browser directory
- Mude diretório corrente para o diretório atual do navegador
+ Definir diretório do Octave igual ao diretório atual no navegadorActions on current directory
- Ações no diretório corrente
+ Ações no diretório atualShow Home directory
- Mostre diretório corrente
+ Exibir diretório pessoalSearch directory
- Procure no diretório
+ Buscar no diretórioFind Files ...
- Procurar arquivos...
+ Buscar arquivos...
@@ -494,7 +552,7 @@
Set Current Directory
- Alterar Diretório Corrente
+ Definir Diretório Atual
@@ -504,7 +562,7 @@
Delete
- Remover
+ Excluir
@@ -534,17 +592,17 @@
Are you sure you want to delete
- Você tem certeza que deseja remover
+ Você tem certeza que deseja excluirCan not delete a directory that is not empty
- Não é possível remover um diretório que não está vázio
+ Não é possível excluir um diretório que não está vázioSet directory of file browser
- Alterar diretório do navegador de arquivos
+ Definir diretório do navegador de arquivos
@@ -574,82 +632,82 @@
Find &what:
- Procure por:
+ &Buscar por:Re&place with:
- Substituir com:
+ &Substituir por:Match &case
- Considerar caixa alta/baixa
+ Considerar &maiúsculas/minúsculasSearch from &start
- Procurar do começo
+ Buscar a paritr do &início&Wrap while searching
- Destacar durante busca
+ Retornar ao começo se encontrar &final durante busca&Find Next
- Procurar Próximo
+ Buscar &PróximoFind &Previous
- Procurar Anterior
+ Buscar &Anterior&Replace
- Substituir
+ &SubstituirReplace &All
- Substituir Todos
+ Substituir &Todos(as)&More
- Mais
+ &Mais&Whole words
- Todas as palavras
+ Palavras &inteirasRegular E&xpressions
- Expressões Regulares
+ Expressões &RegularesSearch &backward
- Procure para trás
+ Buscar para &trásSearch se&lection
- Seleção de busca
+ Buscar dentre &seleçãoSearch from end
- Procurar do final
+ Buscar desde o finalSearch from start
- Procurar do começo
+ Buscar desde o início
@@ -664,7 +722,7 @@
Find Result
- Procurar Resultado
+ Buscar Resultado
@@ -677,7 +735,7 @@
Find Files
- Encontrar Arquivos
+ Buscar Arquivos
@@ -687,7 +745,7 @@
Enter the filename expression
- Informe a expressão do nome do arquivo
+ Digite expressão para os nomes de arquivo
@@ -697,47 +755,47 @@
Enter the start directory
- Entrar no diretório de início
+ Digite diretório inicialBrowse...
- Procurar...
+ Explorar...Browse for start directory
- Procurar por diretório de início
+ Explorar diretório inicialRecurse directories
- Recursão nos diretórios
+ Entrar em sub-diretóriosSearch recursively through directories for matching files
- Procure recursivamente pelos diretórios para encontrar arquivos
+ Buscar recursivamente nos diretórios por arquivos que correspondamInclude directories
- Inclua diretórios
+ Inclur diretóriosInclude matching directories in search results
- Inclua diretórios explorados no resultado da busca
+ Incluir diretórios encontrados no resultado da buscaName case insensitive
- Não insensível a caixa alta/baixa
+ Insensível a maiúsculas/minúsculasSet matching name is case insensitive
- Altere se o nome é insensível a caixa do texto
+ Definir se nome é insensível a maúscula/minúscula
@@ -747,42 +805,42 @@
Search must match text
- Busca precisa honrar texto
+ Busca deve encontrar textoText to match
- Texto para honrar
+ Texto para encontrarText case insensitive
- Texto insensível a caixa alta/baixa
+ Texto insensível a maiúscula/minúsculaSet text content is case insensitive
- Altere se conteúdo do texto é insensível a caixa alta/baixa
+ Definir se texto é insensível a maiúscula/minúsculaSearch results
- Resultados de Busca
+ Resultados da BuscaIdle.
- Ocupado.
+ Parado.Find
- Procurar
+ BuscarStart search for matching files
- Iniciar procura por arquivos encontrados
+ Iniciar busca por arquivos
@@ -797,7 +855,7 @@
File name/location
- Nome do arquivo/localização
+ Nome/local do arquivo
@@ -833,17 +891,17 @@
Browse and search the command history.
- Pesquise no histórico de comandos.
+ Naveguar e buscar no histórico de comandos.Doubleclick a command to transfer it to the terminal.
- Clique duas vezes num comando para transferí-lo ao terminal.
+ Clique duas vezes em um comando para transferí-lo ao terminal.Enter text to filter the command history.
- Digite um texto para filtrar o hitórico de comandos.
+ Digite para filtrar o hitórico de comandos.
@@ -869,20 +927,20 @@
main_window
-
+ Load WorkspaceCarregar ambiente de trabalho
-
-
+
+ About OctaveSobre o Octave
-
+ &File
- Arquivo
+ &Arquivo
@@ -922,7 +980,7 @@
&Edit
- Editar
+ &Editar
@@ -940,25 +998,40 @@
Colar
-
-
+
+ Save Workspace As
- Salvar Ambiente de Trabalho como
+ Salvar Ambiente de Trabalho Como
+
+
+
+ The release notes file '%1' is empty.
+ O arquivo de notas da versão '%1' está vazio.
-
- Set working directory
- Alterar diretório de trabalho
+
+ The release notes file '%1' cannot be read.
+ O arquivo de notas da versão '%1' não pode ser lido.
-
+
+ Octave Release Notes
+ Notas da Versão do Octave
+
+
+
+ Set working directory
+ Definir diretório de trabalho
+
+
+ Clear Clipboard
-
+ Limpar Área de TransferênciaFind Files...
- Encontrar Arquivos...
+ Buscar Arquivos...
@@ -978,12 +1051,12 @@
De&bug
- Depurar
+ De&purarStep
- Passo
+ Passo-a-passo
@@ -1008,37 +1081,47 @@
Show File Browser
- Mostrar Navegador de Arquivos
+ Exibir Navegador de Arquivos
-
+
+ Show News Window
+ Exibir Janela de Novidades
+
+
+ File BrowserNavegador de Arquivos
-
- Reset Default Window Layout
- Recuperar Disposição de Janelas Padrão
+
+ News
+ Novidades
-
+
+ Reset Default Window Layout
+ Restaurar Disposição de Janelas Padrão
+
+
+ Octave Packages
-
+ Pacotes do OctaveShare Code
-
+ Compartilhar o CódigoContribute to Octave
-
+ Contribuir com o OctaveOctave Developer Resources
-
+ Recursos para Desenvolvedores do Octave
@@ -1048,30 +1131,45 @@
Online
- Online
+ Na Internet
+
+
+
+ &News
+ &Novidades
+
+
+
+ Release Notes
+ Notas da Versão
+
+
+
+ Community News
+ Novidades da ComunidadeEnter directory name
- Informe nome do diretório
+ Digite nome do diretórioCurrent Directory:
- Diretório Atual
+ Diretório Atual:One directory up
- Um diretório acima
+ Um nível de diretório acimaBrowse directories
- Procurar diretórios
+ Navegar por diretórios
-
+ Load workspaceCarregar ambiente de trabalho
@@ -1083,30 +1181,30 @@
Show Command Window
- Mostrar Janela de Comandos
+ Exibir Janela de ComandosShow Command History
- Mostrar Histórico de Comandos
+ Exibir Histórico de ComandosShow Workspace
- Mostrar Ambiente de Trabalho
+ Exibir Ambiente de TrabalhoShow Editor
- Mostrar Editor
+ Exibir EditorShow Documentation
- Mostrar Documentação
+ Exibir Documentação
-
+ Command WindowJanela de Comandos
@@ -1127,7 +1225,7 @@
-
+ DocumentationDocumentação
@@ -1139,34 +1237,57 @@
Report Bug
- Reportar Bug
+ Reportar Defeito
+
+
+
+ news_dock_widget
+
+
+ Community News
+ Novidades da Comunidadeoctave_dock_widget
-
-
+
+ Undock widget
- Desacoplar widget
+ Desacoplar painel
-
+ Hide widget
- Esconder widget
+ Esconder painel
-
+ Dock widget
- Acoplar widget
+ Acoplar paineloctave_qscintilla
-
- help
- ajuda
+
+ Help on
+ Ajuda sobre
+
+
+
+ Documentation on
+ Documentação sobre
+
+
+
+ Edit
+ Editar
+
+
+
+ &Run Selection
+ &Executar Seleção
@@ -1174,27 +1295,27 @@
The file %1 does not exist in the load path. To debug the function you are editing, you must either change to the directory %2 or add that directory to the load path.
- O arquivo %1 não existe no path. Para depurar a função, você precisa mudar para o diretório %2 ou adicionar esse diretório ao path.
+ O arquivo %1 não existe no caminho de pesquisa. Para depurar a função que você está editando, é preciso ou mudar para o diretório %2 ou adicionar esse diretório ao caminho de pesquisa.The file %1 is shadowed by a file with the same name in the load path. To debug the function you are editing, change to the directory %2.
- O arquivo %1 é desconsiderado em prol de outro arquivo com mesmo nome no path. Para depurar a função, mude para o diretório %2.
+ Existe um arquivo com o mesmo nome %1 no caminho de pesquisa. Para depurar a função que você está editando, é preciso mudar para o diretório %2.Change Directory or Add Directory to Load Path
- Alterar diretório ou adicionar ao path
+ Mudar para Diretório ou Adicionar Diretório ao Caminho de PesquisaChange Directory
- Alterar Diretório
+ Mudar para DiretórioAdd Directory to Load Path
- Adicionar diretório ao path
+ Adicionar diretório ao caminho de pesquisa
@@ -1217,17 +1338,17 @@
Octave logo only
- Apenas logotipo Octave
+ Apenas logotipo do OctaveLetter icons
- Ícones de letra
+ Ícones de textoGraphic icons
- Ícones de gráficos
+ Ícones gráficos
@@ -1237,12 +1358,12 @@
Show white space
- Mostrar espaço em branco
+ Exibir espaço em brancoDo not show white spaces used for indentation
- Não mostre espaços em branco usados para identação
+ Não exibir espaços em branco usados para identação
@@ -1252,62 +1373,67 @@
Indent width
- Tamanho de identação
+ Largura de identaçãoTab indents line
- Tab identa linha
+ Tecla Tab causa identação na linhaAuto indentation
- Autoidentação
+ Auto-identaçãoTab width
- Tamanho de TAB
+ Largura do TabShow indentation guides
- Mostrar guias de identação
+ Exibir guias de identaçãoBackspace unindents line
- Apagar remove identação na linha
+ Tecla Apagar remove identação na linhaCharacters before list with suggestions is displayed
- Número de caracteres para ativar lista de sugestões
+ Mínimo de caracteres para exibir lista de sugestõesMatch keywords
- Honrar palavras-chave
+ Buscar palavras-chaveCase sensitive
- Caixa alta/baixa
+ Sensível a maiúscula/minúsculaReplace word by suggested one
- Substituir palavra por outra sugerida
+ Substituir palavra por aquela sugeridaMatch words in document
- Honrar palavras no documento
+ Buscar palavras no documentoRestore editor tabs from previous session on startup
- Reabrir abas da sessão anterior durante inicialização
+ Restaurar abas de edição da sessão anterior durante inicialização
+
+
+
+ Create non existing files without prompting
+ Criar arquivos inexistentes sem perguntar
@@ -1317,7 +1443,7 @@
Command line (%f=file, %l=line):
- Linha de comando (%f=file, %l=line):
+ Linha de comando (%f=arquivo, %l=linha):
@@ -1327,12 +1453,12 @@
<html><head/><body><p>Select font, font size (as difference to the default size), font decoration (bold, italic, underline), textcolor and background color (for the latter, the color pink (255,0,255) is a placeholder for the default background color)</p></body></html>
- <html><head/><body><p>Selecionar fonte, tamanho de fonte (como diferença para o tamanho padrão), decoração de fonte (negrito, itálico, sublinhado), cor de texto e cor de fundo de tela (para o último, a cor rosa (255,0,255) é sinônimo da cor de fundo padrão)</p></body></html>
+ <html><head/><body><p>Selecionar fonte, tamanho de fonte (na forma de diferença com relação a tamanho padrão), decoração da fonte (negrito, itálico, sublinhado), cor do texto e cor de fundo de tela (para o último, a cor rosa (255,0,255) é sinônimo da cor de fundo padrão)</p></body></html>Use Foreground Color
- Usar Cor do Plano de Frente
+ Usar Cor do Primeiro Plano
@@ -1345,27 +1471,27 @@
Fonte
-
+ Show line numbers
- Mostra número das linhas
+ Exibir número de linhaHighlight current line
- Enfatizar linha corrente
+ Enfatizar linha atualCode completion
- Completação de código
+ Sguestões para copletar códigoShow complete path in window title
- Mostrar caminho completo no título da janela
+ Exibir caminho completo no título da janela
-
+ emacsemacs
@@ -1377,12 +1503,12 @@
Cursor type:
- Tipo do Cursor:
+ Tipo do Indicador:Cursor blinking
- Cursor piscando
+ Indicador piscante
@@ -1397,22 +1523,22 @@
Show file size
- Mostrar tamanho do arquivo
+ Exibir tamanho do arquivoShow file type
- Mostrar tipo do arquivo
+ Exibir tipo do arquivoShow date of last modification
- Mostrar data de última modificação
+ Exibir data de última modificaçãoShow hidden files
- Mostrar arquivos ocultos
+ Exibir arquivos ocultos
@@ -1422,7 +1548,7 @@
Alternating row colors
- Alternar cores das linhas
+ Cores de linhas alternantes
@@ -1432,7 +1558,7 @@
Storage Class Colors
- Armazenar cores de classes
+ Cores das Classes de Armazenamento
@@ -1452,32 +1578,32 @@
HttpProxy
- HttpProxy
+ Proxy HTTP
-
+ Icon set for dock widgets
- Conjunto de ícones para widgets
+ Conjunto de ícones para paineisLanguage (requires restart)
- Linguagem (requer reinicialização)
+ Idioma (reinicialização do Octave necessária)Icon size
- Tamanho de Ícone
+ Tamanho do Ícone
-
+ Socks5Proxy
- Socks5Proxy
+ Proxy Socks 5Hostname:
- Hostname:
+ Nome do servidor:
@@ -1487,7 +1613,7 @@
Username:
- Nome do usuário:
+ Nome de usuário:
@@ -1495,31 +1621,31 @@
Senha:
-
+
-
+ System settingConfiguração do sistema
-
+ IBeam Cursor
-
+ Indicador IBeamBlock Cursor
-
+ Indicador em BlocoUnderline Cursor
-
+ Indicador Sublinhado
-
+ Difference to the default size
- Diferença do tamanho padrão
+ Diferença com relação ao tamanho de fonto padrão
@@ -1553,9 +1679,9 @@
webinfo
-
+ Type here and press 'Return' to search
- Digite aqui e pressione 'Enter' para procurar
+ Digite aqui e pressione 'Enter' para buscar
@@ -1566,38 +1692,54 @@
welcome_wizard
-
+ Welcome to GNU OctaveBem-vindo ao GNU Octave
-
- 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.
-
-
-
-
- The configuration file is stored in __%1__. If that file exists, you will not see this dialog when Octave starts again.
-
-
-
-
- <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>
-
-
-
-
+ Welcome to Octave!Bem-vindo ao Octave!
-
+
+ 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.
+ Parece que você está usando a interface gráfica do Octave pela primeira vez neste computador. Clique 'Finalizar' para gravar um arquivo de configuração e iniciar a interface do Octave.
+
+
+
+ The configuration file is stored in %1. If that file exists, you will not see this dialog when Octave starts again.
+ O arquivo de configuração é armazenado em %1. Se o arquivo existir, você não verá esta caixa de diálogo quando o Octave reiniciar.
+
+
+
+ <html><head>
+<style>
+a:link { text-decoration: underline; color: #0000ff; }
+</style>
+<head/><body>
+<p>For more information about Octave:</p>
+<ul>
+<li>Visit <a href="http://octave.org">http://octave.org</a></li>
+<li>Get the documentation online as <a href="http://www.gnu.org/software/octave/doc/interpreter/index.html">html</a>- or <a href="http://www.gnu.org/software/octave/octave.pdf">pdf</span></a>-document</li>
+<li>Open the documentation browser of Octave GUI with the help menu</li>
+</ul>
+</body></html>
+ <html><head>
+<style>
+a:link { text-decoration: underline; color: #0000ff; }
+</style>
+<head/><body>
+<p>Para mais informações sobre o Octave:</p>
+<ul>
+<li>Visite <a href="http://octave.org">http://octave.org</a></li>
+<li>Veja a documentação na Internet em <a href="http://www.gnu.org/software/octave/doc/interpreter/index.html">html</a>- or <a href="http://www.gnu.org/software/octave/octave.pdf">pdf</span></a></li>
+<li>Abra a documentação do Octave no menu de ajuda</li>
+</ul>
+</body></html>
+
+
+ FinishFinalizar
@@ -1632,7 +1774,7 @@
Right click to copy, rename, or display
- Clique com botão direito para copiar, renomear ou mostrar
+ Clique com botão direito para copiar, renomear ou exibir
@@ -1645,7 +1787,7 @@
View the variables in the active workspace.
- Visualizar variáveis no ambiente de trabalho.
+ Visualizar variáveis no ambiente de trabalho ativo.
@@ -1660,12 +1802,12 @@
Only top-level symbols may be renamed.
- Somente símbolos do nível de topo podem ser renomeados.
+ Somente símbolos do nível mais alto podem ser renomeados.View the variables in the active workspace.<br>
- Veja as variáveis no ambiente de trabalho ativo.<br>
+ Visualizar as variáveis no ambiente de trabalho ativo.<br>
diff -r c4f5c781c3ca -r 97e49b588f5d libgui/languages/pt_PT.ts
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/libgui/languages/pt_PT.ts Tue Nov 05 12:27:42 2013 -0500
@@ -0,0 +1,1824 @@
+
+
+
+
+ ListDialog
+
+
+ Select All
+ Seleccionar Tudo
+
+
+
+ QObject
+
+
+ automatic
+ automático(a)
+
+
+
+ function
+ função
+
+
+
+ global
+ global
+
+
+
+ hidden
+ oculto(a)
+
+
+
+ inherited
+ herdada
+
+
+
+ persistent
+ persistente
+
+
+
+ foreground
+ primeiro plano
+
+
+
+ background
+ fundo
+
+
+
+ selection
+ selecçao
+
+
+
+ cursor
+ indicador
+
+
+
+ QTerminal
+
+
+ Copy
+ Copiar
+
+
+
+ Paste
+ Colar
+
+
+
+ Clear All
+ Limpar Tudo
+
+
+
+ QWinTerminalImpl
+
+
+ copied selection to clipboard
+ selecçao copiada para a área de transferência
+
+
+
+ documentation_dock_widget
+
+
+ Documentation
+ Documentação
+
+
+
+ See the documentation for help.
+ Veja a documentação para ajuda.
+
+
+
+ file_editor
+
+
+
+
+
+
+ Octave Editor
+ Editor do Octave
+
+
+
+ Octave Files (*.m);;All Files (*)
+ Scripts de Octave (*.m);;Todos os Ficheiros (*)
+
+
+
+ File not saved! A file with the selected name
+%1
+is already open in the editor
+ Ficheiro não foi gravado! Um ficheiro com o nome selecionado
+%1
+já está aberto no editor
+
+
+
+ The associated file editor tab has disappeared. It was likely closed by some means.
+ A aba do editor associada ao ficheiro desapareceu. Foi provavelmente fechada de alguma maneira.
+
+
+
+ &%1 %2
+ &%1 %2
+
+
+
+ &New File
+ &Novo Ficheiro
+
+
+
+ &Open File
+ &Abrir Ficheiro
+
+
+
+ &Save File
+ &Guardar Ficheiro
+
+
+
+ Save File &As
+ Guardar Ficheiro &Como
+
+
+
+ Print
+ Imprimir
+
+
+
+ &Undo
+ &Desfazer
+
+
+
+ &Redo
+ &Refazer
+
+
+
+ &Copy
+ &Copiar
+
+
+
+ Cu&t
+ Cor&tar
+
+
+
+ Paste
+ Colar
+
+
+
+ &Next Bookmark
+ &Próximo Marcador
+
+
+
+ Pre&vious Bookmark
+ Marcardor &Anterior
+
+
+
+ Toggle &Bookmark
+ Habilitar/desabilitar &Marcador
+
+
+
+ &Remove All Bookmarks
+ &Remover Todos os Marcadores
+
+
+
+ &Next breakpoint
+ Ponto de interrupção &seguinte
+
+
+
+ Pre&vious breakpoint
+ Ponto de interrupção &anterior
+
+
+
+ Toggle &breakpoint
+ Habilitar/desabilitar ponto de &interrupção
+
+
+
+ &Remove All breakpoints
+ &Remover Todos os Pontos de interrupção
+
+
+
+ &Comment
+ &Comentar
+
+
+
+ &Uncomment
+ &Descomentar
+
+
+
+ &Recent Editor Files
+ Ficheiros &recentes
+
+
+
+ &Edit Function
+ &Editar Função
+
+
+
+ &Close
+ &Fechar
+
+
+
+ Close All
+ Fechar Todos
+
+
+
+ Close Other Files
+ Fechar os Outros Ficheiros
+
+
+
+ Run &Selection
+ Executar &Selecção
+
+
+
+ &Help
+ &Ajuda
+
+
+
+ &Help on Keyword
+ &Ajuda da Palavra-chave
+
+
+
+ &Documentation on Keyword
+ &Documentação da Palavra-chave
+
+
+
+ &Find and Replace
+ &Buscar e Substituir
+
+
+
+ Could not open file
+%1
+for read: %2.
+ Não foi possível abrir o ficheiro
+%1
+para leitura: %2.
+
+
+
+ File
+%1
+does not exist. Do you want to create it?
+ O ficheiro
+%1
+não existe. Deseja criá-lo?
+
+
+
+ Could not open file
+%1
+for write: %2.
+ Não foi possível abrir o ficheiro
+%1
+para escrita: %2.
+
+
+
+ Save File And Run
+ Guardar Ficheiro e Executar
+
+
+
+ Go&to Line
+ Ir para &Linha
+
+
+
+ &File
+ &Ficheiro
+
+
+
+ &Edit
+ &Editar
+
+
+
+ &Preferences
+ &Preferências
+
+
+
+ &Styles Preferences
+ Preferências de &Estilo
+
+
+
+ &Debug
+ &Depurar
+
+
+
+ &Run
+ &Executar
+
+
+
+ file_editor_tab
+
+
+ Goto line
+ Ir para linha
+
+
+
+ Line number
+ Número da linha
+
+
+
+ <unnamed>
+ <sem_nome>
+
+
+
+ Do you want to save or discard the changes?
+ Você deseja guardar ou descartar as alterações?
+
+
+
+ Do you want to cancel closing, save or discard the changes?
+ Você deseja cancelar o fecho, guardar, ou descartar as alterações?
+
+
+
+
+
+
+
+ Octave Editor
+ Editor do Octave
+
+
+
+ The file
+%1
+is about to be closed but has been modified.
+%2
+ O ficheiro
+%1
+está prestes a ser fechado mas foi modificado.
+%2
+
+
+
+ Octave Files (*.m);;All Files (*)
+ Ficheiros de Octave (*.m);; Todos os Ficheiros (*)
+
+
+
+ File not saved! The selected file name
+%1
+is the same as the current file name
+ O ficheiro não foi guardado! O nome seleccionado
+%1
+é o mesmo do que o ficheiro actual
+
+
+
+
+
+Warning: The contents in the editor is modified!
+
+
+Aviso: O conteúdo no editor foi modificado!
+
+
+
+ It seems that the file
+%1
+has been deleted or renamed. Do you want to save it now?%2
+ Parece que o ficheiro
+%1
+foi removido ou renomeado. Pretende guardá-lo agora?%2
+
+
+
+ Could not open file %1 for write:
+%2.
+ Não foi possível abrir o ficheiro %1 para escrita:
+%2.
+
+
+
+ It seems that '%1' has been modified by another application. Do you want to reload it?
+ Parece que o ficheiro '%1' foi modificado por outro aplicativo. Deseja recarregá-lo?
+
+
+
+ files_dock_widget
+
+
+ File Browser
+ Navegador de Ficheiros
+
+
+
+ Browse your files.
+ Navegue pelos seus ficheiros.
+
+
+
+ Enter the path or filename
+ Introduza o caminho ou nome do ficheiro
+
+
+
+ Move up one directory
+ Subir um nível de directório
+
+
+
+ Show octave directory
+ Mostrar o directório actual do Octave
+
+
+
+ Goto current octave directory
+ Ir para o directório actual do Octave
+
+
+
+ Set octave directory
+ Definir o directório actual do Octave
+
+
+
+ Set octave directroy to current browser directory
+ Definir o directório actual do Octave para o directório actual do navegador
+
+
+
+ Actions on current directory
+ Acções no directório actual
+
+
+
+ Show Home directory
+ Mostrar directório pessoal
+
+
+
+ Search directory
+ Procurar no directório
+
+
+
+
+ Find Files ...
+ Procurar Ficheiros...
+
+
+
+
+ New File
+ Novo Ficheiro
+
+
+
+
+ New Directory
+ Novo Directório
+
+
+
+ Doubleclick a file to open it
+ Clique duas vezes num ficheiro para abri-lo
+
+
+
+ Open
+ Abrir
+
+
+
+ Open in Default Application
+ Abrir no Aplicativo Padrão
+
+
+
+ Copy Selection to Clipboard
+ Copiar Selecção para Área de Transferência
+
+
+
+ Run
+ Executar
+
+
+
+ Load Data
+ Carregar Dados
+
+
+
+ Set Current Directory
+ Definir Directório Actual
+
+
+
+ Rename
+ Renomear
+
+
+
+ Delete
+ Excluir
+
+
+
+ Rename file/directory
+ Renomear ficheiro/directório
+
+
+
+ Rename file/directory:
+
+ Renomear ficheiro/directório:
+
+
+
+
+
+ to:
+
+ para:
+
+
+
+
+ Delete file/directory
+ Remover ficheiro/directório
+
+
+
+ Are you sure you want to delete
+
+ Tem a certeza que deseja remover
+
+
+
+
+ Can not delete a directory that is not empty
+ Não é possível remover um directório que não está vazio
+
+
+
+ Set directory of file browser
+ Definir directório do navegador de ficheiros
+
+
+
+ Create File
+ Criar Ficheiro
+
+
+
+ Create file in
+
+ Criar ficheiro em
+
+
+
+
+ Create Directory
+ Criar Directório
+
+
+
+ Create folder in
+
+ Criar directório em
+
+
+
+
+ find_dialog
+
+
+ Find &what:
+ Procurar por:
+
+
+
+ Re&place with:
+ &Substituir por:
+
+
+
+ Match &case
+ Equivaler capitalização
+
+
+
+ Search from &start
+ Procurar a partir do início
+
+
+
+ &Wrap while searching
+ Dar a volta durante a procura
+
+
+
+ &Find Next
+ Buscar &Próximo
+
+
+
+ Find &Previous
+ Buscar &Anterior
+
+
+
+ &Replace
+ &Substituir
+
+
+
+ Replace &All
+ Substituir &Todos(as)
+
+
+
+ &More
+ &Mais
+
+
+
+ &Whole words
+ Palavras inteiras
+
+
+
+ Regular E&xpressions
+ Expressões &Regulares
+
+
+
+ Search &backward
+ Procurar para trás
+
+
+
+ Search se&lection
+ Procurar dentro da selecção
+
+
+
+ Search from end
+ Procurar a partir do fim
+
+
+
+ Search from start
+ Procurar a partir do início
+
+
+
+ Replace Result
+ Substituir Resultado
+
+
+
+ %1 items replaced
+ %1 itens substituidos
+
+
+
+ Find Result
+ Buscar Resultado
+
+
+
+ No more matches found
+ Não foi encontrado mais nenhum resultado
+
+
+
+ find_files_dialog
+
+
+ Find Files
+ Procurar Ficheiros
+
+
+
+ Named:
+ Chamados:
+
+
+
+ Enter the filename expression
+ Introduza a expressão para o nome do ficheiro
+
+
+
+ Start in:
+ Iniciar em:
+
+
+
+ Enter the start directory
+ Introduzir o directório inicial
+
+
+
+ Browse...
+ Navegar...
+
+
+
+ Browse for start directory
+ Navegar por directório inicial
+
+
+
+ Recurse directories
+ Entrar em sub-directórios
+
+
+
+ Search recursively through directories for matching files
+ Procurar recursivamente pelos directórios por ficheiros correspondentes
+
+
+
+ Include directories
+ Incluir directórios
+
+
+
+ Include matching directories in search results
+ Incluir directórios correspondentes nos resultado da pesquisa
+
+
+
+ Name case insensitive
+ Insensível à capitalização
+
+
+
+ Set matching name is case insensitive
+ Definir se o nome é insensível à capitalização
+
+
+
+ Contains text:
+ Contém texto:
+
+
+
+ Search must match text
+ Pesquisa precisa corresponder ao texto
+
+
+
+ Text to match
+ Texto para corresponder
+
+
+
+ Text case insensitive
+ Texto insensível à capitalização
+
+
+
+ Set text content is case insensitive
+ Definir se o texto é insensível à capitalização
+
+
+
+ Search results
+ Resultados de pesquisa
+
+
+
+ Idle.
+ Parado.
+
+
+
+ Find
+ Buscar
+
+
+
+ Start search for matching files
+ Iniciar procura por ficheiros correspondentes
+
+
+
+ Stop
+ Parar
+
+
+
+ Stop searching
+ Parar procura
+
+
+
+ File name/location
+ Nome/localização do ficheiro
+
+
+
+ File contents
+ Conteúdo do ficheiro
+
+
+
+ Searching...
+ Procurando...
+
+
+
+ Set search directory
+ Definir directório de procura
+
+
+
+ find_files_model
+
+
+ Filename
+ Nome do Ficheiro
+
+
+
+ Directory
+ Directório
+
+
+
+ history_dock_widget
+
+
+ Browse and search the command history.
+ Navegar e procurar no histórico de comandos.
+
+
+
+ Doubleclick a command to transfer it to the terminal.
+ Clique duas vezes num comando para transferí-lo para o terminal.
+
+
+
+ Enter text to filter the command history.
+ Introduza texto para filtrar o histórico de comandos.
+
+
+
+ Command History
+ Histórico de Comandos
+
+
+
+ Copy
+ Copiar
+
+
+
+ Evaluate
+ Avaliar
+
+
+
+ Create script
+ Criar script
+
+
+
+ main_window
+
+
+ Load Workspace
+ Carregar ambiente de trabalho
+
+
+
+
+ About Octave
+ Sobre o Octave
+
+
+
+ &File
+ Ficheiro
+
+
+
+ New
+ Novo
+
+
+
+ Script
+ Script
+
+
+
+ Function
+ Função
+
+
+
+ Figure
+ Figura
+
+
+
+ Open...
+ Abrir...
+
+
+
+ Preferences...
+ Preferências...
+
+
+
+ Exit
+ Sair
+
+
+
+ &Edit
+ &Editar
+
+
+
+ Undo
+ Desfazer
+
+
+
+ Copy
+ Copiar
+
+
+
+ Paste
+ Colar
+
+
+
+
+ Save Workspace As
+ Guardar Ambiente de Trabalho como
+
+
+
+ The release notes file '%1' is empty.
+ O ficheiro de notas da versão '%1' está vazio.
+
+
+
+ The release notes file '%1' cannot be read.
+ O ficheiro de notas da versão '%1' não pode ser lido.
+
+
+
+ Octave Release Notes
+ Notas da Versão do Octave
+
+
+
+ Set working directory
+ Definir directório de trabalho
+
+
+
+ Clear Clipboard
+ Limpar Área de Transferência
+
+
+
+ Find Files...
+ Encontrar Ficheiros...
+
+
+
+ Clear Command Window
+ Limpar Janela de Comandos
+
+
+
+ Clear Command History
+ Limpar Histórico de Comandos
+
+
+
+ Clear Workspace
+ Limpar Ambiente de Trabalho
+
+
+
+ De&bug
+ De&purar
+
+
+
+ Step
+ Passo-a-passo
+
+
+
+ Step in
+ Passo adentro
+
+
+
+ Step out
+ Passo a fora
+
+
+
+ Continue
+ Continuar
+
+
+
+ Exit Debug Mode
+ Sair do Modo de Depuração
+
+
+
+ Show File Browser
+ Mostrar Navegador de Ficheiros
+
+
+
+ Show News Window
+ Exibir Janela de Novidades
+
+
+
+ File Browser
+ Navegador de Ficheiros
+
+
+
+ News
+ Novidades
+
+
+
+ Reset Default Window Layout
+ Restaurar Disposição de Janelas Padrão
+
+
+
+ Octave Packages
+ Pacotes do Octave
+
+
+
+ Share Code
+ Partilhar Código
+
+
+
+ Contribute to Octave
+ Contribuir para o Octave
+
+
+
+ Octave Developer Resources
+ Recursos para Programadores do Octave
+
+
+
+ On Disk
+ No Disco
+
+
+
+ Online
+ Na Internet
+
+
+
+ &News
+ &Novidades
+
+
+
+ Release Notes
+ Notas da Versão
+
+
+
+ Community News
+ Novidades da Comunidade
+
+
+
+ Enter directory name
+ Introduzir nome do directório
+
+
+
+ Current Directory:
+ Directório Actual
+
+
+
+ One directory up
+ Um nível de directório acima
+
+
+
+ Browse directories
+ Navegar directórios
+
+
+
+ Load workspace
+ Carregar ambiente de trabalho
+
+
+
+ &Window
+ &Janela
+
+
+
+ Show Command Window
+ Exibir Janela de Comandos
+
+
+
+ Show Command History
+ Exibir Histórico de Comandos
+
+
+
+ Show Workspace
+ Exibir Ambiente de Trabalho
+
+
+
+ Show Editor
+ Exibir Editor
+
+
+
+ Show Documentation
+ Exibir Documentação
+
+
+
+ Command Window
+ Janela de Comandos
+
+
+
+ Command History
+ Histórico de Comandos
+
+
+
+ Workspace
+ Ambiente de trabalho
+
+
+
+ Editor
+ Editor
+
+
+
+
+ Documentation
+ Documentação
+
+
+
+ &Help
+ &Ajuda
+
+
+
+ Report Bug
+ Reportar Defeito
+
+
+
+ news_dock_widget
+
+
+ Community News
+ Novidades da Comunidade
+
+
+
+ octave_dock_widget
+
+
+
+ Undock widget
+ Desacoplar painel
+
+
+
+ Hide widget
+ Esconder painel
+
+
+
+ Dock widget
+ Acoplar painel
+
+
+
+ octave_qscintilla
+
+
+ Help on
+ Ajuda sobre
+
+
+
+ Documentation on
+ Documentação sobre
+
+
+
+ Edit
+ Editar
+
+
+
+ &Run Selection
+ &Executar Selecção
+
+
+
+ octave_qt_link
+
+
+ The file %1 does not exist in the load path. To debug the function you are editing, you must either change to the directory %2 or add that directory to the load path.
+ O ficheiro %1 não existe no caminho de pesquisa. Para depurar a função que está a ser editada, é preciso mudar para o directório %2 ou adicionar esse directório ao caminho de pesquisa.
+
+
+
+ The file %1 is shadowed by a file with the same name in the load path. To debug the function you are editing, change to the directory %2.
+ O ficheiro %1 é ignorado a favor de outro ficheiro no caminho de pesquisa com o mesmo nome. Para depurar a função, é preciso mudar para o directório %2.
+
+
+
+ Change Directory or Add Directory to Load Path
+ Alterar directório ou adicionar ao caminho de pesquisa
+
+
+
+ Change Directory
+ Alterar Directório
+
+
+
+ Add Directory to Load Path
+ Adicionar directório ao caminho de pesquisa
+
+
+
+ Cancel
+ Cancelar
+
+
+
+ settings_dialog
+
+
+ Settings
+ Configurações
+
+
+
+ General
+ Geral
+
+
+
+ Octave logo only
+ Apenas logotipo do Octave
+
+
+
+ Letter icons
+ Ícones de letras
+
+
+
+ Graphic icons
+ Ícones gráficos
+
+
+
+ Editor
+ Editor
+
+
+
+ Show white space
+ Mostrar espaços em branco
+
+
+
+ Do not show white spaces used for indentation
+ Não mostrar espaços em branco usados para identação
+
+
+
+ Color
+ Cor
+
+
+
+ Indent width
+ Largura da identação
+
+
+
+ Tab indents line
+ Tabulador identa linha
+
+
+
+ Auto indentation
+ Auto-identação
+
+
+
+ Tab width
+ Largura do tabulador
+
+
+
+ Show indentation guides
+ Exibir guias de identação
+
+
+
+ Backspace unindents line
+ Tecla Apagar remove identação na linha
+
+
+
+ Characters before list with suggestions is displayed
+ Número de caracteres para activar lista de sugestões
+
+
+
+ Match keywords
+ Buscar palavras-chave
+
+
+
+ Case sensitive
+ Sensível à capitalização
+
+
+
+ Replace word by suggested one
+ Substituir palavra pela sugerida
+
+
+
+ Match words in document
+ Buscar palavras no documento
+
+
+
+ Restore editor tabs from previous session on startup
+ Restaurar abas de edição da sessão anterior durante inicialização
+
+
+
+ Create non existing files without prompting
+ Criar ficheiros inexistentes sem perguntar
+
+
+
+ Use custom file editor
+ Usar editor de texto externo
+
+
+
+ Command line (%f=file, %l=line):
+ Linha de comando (%f=arquivo, %l=linha):
+
+
+
+ Editor Styles
+ Estilos do Editor
+
+
+
+ <html><head/><body><p>Select font, font size (as difference to the default size), font decoration (bold, italic, underline), textcolor and background color (for the latter, the color pink (255,0,255) is a placeholder for the default background color)</p></body></html>
+ <html><head/><body><p>Seleccionar tipo de letra, tamanho (como diferença para o tamanho padrão), decoração (negrito, itálico, sublinhado), cor do texto e cor do fundo de tela (para o último, a cor rosa (255,0,255) é sinônimo da cor de fundo padrão)</p></body></html>
+
+
+
+ Use Foreground Color
+ Usar Cor do Primeiro Plano
+
+
+
+ Terminal Colors
+ Cores do Terminal
+
+
+
+ Font
+ Tipo de Letra
+
+
+
+ Show line numbers
+ Exibir número de linha
+
+
+
+ Highlight current line
+ Enfatizar linha actual
+
+
+
+ Code completion
+ Sguestões para copletar código
+
+
+
+ Show complete path in window title
+ Exibir caminho completo no título da janela
+
+
+
+ emacs
+ emacs
+
+
+
+ Terminal
+ Terminal
+
+
+
+ Cursor type:
+ Tipo de Cursor:
+
+
+
+ Cursor blinking
+ Indicador piscante
+
+
+
+ Font size
+ Tamanho da letra
+
+
+
+ File Browser
+ Navegador de Ficheiros
+
+
+
+ Show file size
+ Mostrar tamanho do ficheiro
+
+
+
+ Show file type
+ Mostrar tipo de ficheiro
+
+
+
+ Show date of last modification
+ Mostrar data da última modificação
+
+
+
+ Show hidden files
+ Mostrar ficheiros escondidos
+
+
+
+ Synchronize octave directory with the file browser
+ Sincronizar directório do Octave com directório do navegador de ficheiros
+
+
+
+ Alternating row colors
+ Cores de linhas alternantes
+
+
+
+ Workspace
+ Ambiente de trabalho
+
+
+
+ Storage Class Colors
+ Cores das Classes de Armazenamento
+
+
+
+ Network
+ Rede
+
+
+
+ Use proxy server
+ Usar servidor proxy
+
+
+
+ Proxy Type:
+ Tipo de Proxy:
+
+
+
+ HttpProxy
+ Proxy HTTP
+
+
+
+ Icon set for dock widgets
+ Conjunto de ícones para paineis
+
+
+
+ Language (requires restart)
+ Idioma (reinicialização do Octave necessária)
+
+
+
+ Icon size
+ Tamanho do Ícone
+
+
+
+ Socks5Proxy
+ Proxy Socks 5
+
+
+
+ Hostname:
+ Nome do servidor:
+
+
+
+ Port:
+ Porta:
+
+
+
+ Username:
+ Nome do utilizador:
+
+
+
+ Password:
+ Senha:
+
+
+
+
+
+ System setting
+ Configuração do sistema
+
+
+
+ IBeam Cursor
+ Indicador IBeam
+
+
+
+ Block Cursor
+ Indicador em Bloco
+
+
+
+ Underline Cursor
+ Indicador Sublinhado
+
+
+
+ Difference to the default size
+ Diferença com relação ao tamanho de fonto padrão
+
+
+
+ Background color, pink (255,0,255) means default
+ Cor de fundo, rosa (255,0,255) significa padrão
+
+
+
+ b
+ b
+
+
+
+ i
+ i
+
+
+
+ u
+ u
+
+
+
+ terminal_dock_widget
+
+
+ Command Window
+ Janela de Comandos
+
+
+
+ webinfo
+
+
+ Type here and press 'Return' to search
+ Digite aqui e pressione 'Enter' para buscar
+
+
+
+ Global search
+ Procura global
+
+
+
+ welcome_wizard
+
+
+ Welcome to GNU Octave
+ Bem-vindo ao GNU Octave
+
+
+
+ Welcome to Octave!
+ Bem-vindo ao Octave!
+
+
+
+ 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.
+ Parece que você está a usar a interface gráfica do Octave pela primeira vez neste computador. Clique 'Finalizar' para escrever um ficheiro de configuração e iniciar o Octave.
+
+
+
+ The configuration file is stored in %1. If that file exists, you will not see this dialog when Octave starts again.
+ O ficheiro de configuração é armazenado em %1. Se o ficheiro existir, este diálogo não volta aparecer quando o Octave reiniciar.
+
+
+
+ <html><head>
+<style>
+a:link { text-decoration: underline; color: #0000ff; }
+</style>
+<head/><body>
+<p>For more information about Octave:</p>
+<ul>
+<li>Visit <a href="http://octave.org">http://octave.org</a></li>
+<li>Get the documentation online as <a href="http://www.gnu.org/software/octave/doc/interpreter/index.html">html</a>- or <a href="http://www.gnu.org/software/octave/octave.pdf">pdf</span></a>-document</li>
+<li>Open the documentation browser of Octave GUI with the help menu</li>
+</ul>
+</body></html>
+ <html><head>
+<style>
+a:link { text-decoration: underline; color: #0000ff; }
+</style>
+<head/><body>
+<p>Para mais informações sobre o Octave:</p>
+<ul>
+<li>Visite <a href="http://octave.org">http://octave.org</a></li>
+<li>Veja a documentação na Internet em <a href="http://www.gnu.org/software/octave/doc/interpreter/index.html">html</a>- or <a href="http://www.gnu.org/software/octave/octave.pdf">pdf</span></a></li>
+<li>Abra a documentação do Octave no menu de ajuda</li>
+</ul>
+</body></html>
+
+
+
+ Finish
+ Finalizar
+
+
+
+ workspace_model
+
+
+ Name
+ Nome
+
+
+
+ Class
+ Classe
+
+
+
+ Dimension
+ Dimensão
+
+
+
+ Value
+ Valor
+
+
+
+ Storage Class
+ Classe de Armazenamento
+
+
+
+ Right click to copy, rename, or display
+ Clique com botão direito para copiar, renomear ou exibir
+
+
+
+ workspace_view
+
+
+ Workspace
+ Ambiente de trabalho
+
+
+
+ View the variables in the active workspace.
+ Visualizar variáveis no ambiente de trabalho ativo.
+
+
+
+ Copy
+ Copiar
+
+
+
+ Rename
+ Renomear
+
+
+
+ Only top-level symbols may be renamed.
+ Apenas símbolos do nível maisl alto podem ser renomeados.
+
+
+
+ View the variables in the active workspace.<br>
+ Visualizar as variáveis no ambiente de trabalho ativo.<br>
+
+
+
+ Colors for the storage class:
+ Cores para classe de armazenamento:
+
+
+
diff -r c4f5c781c3ca -r 97e49b588f5d libgui/languages/ru_RU.ts
--- a/libgui/languages/ru_RU.ts Wed Oct 23 22:48:29 2013 -0400
+++ b/libgui/languages/ru_RU.ts Tue Nov 05 12:27:42 2013 -0500
@@ -6,7 +6,7 @@
Select All
-
+ Выбрать всё
@@ -67,17 +67,17 @@
Copy
-
+ КопироватьPaste
-
+ ВставитьClear All
-
+ Очистить всё
@@ -85,7 +85,7 @@
copied selection to clipboard
-
+ выделенное скопировано в буфер обмена
@@ -93,40 +93,38 @@
Documentation
- Документация
+ ДокументацияSee the documentation for help.
-
+ Для получения помощи смотрите документацию.file_editor
-
-
+
+
+
+ Octave Editor
-
+ Редактор Octave
-
+ Octave Files (*.m);;All Files (*)
-
+ Файлы Octave (*.m);;Все файлы (*)
-
- Could not open file %1 for read:
-%2.
-
-
-
-
+ File not saved! A file with the selected name
%1
is already open in the editor
-
+ Файл не сохранен! Файл с выбранным именем
+%1
+уже открыт в редакторе
@@ -134,172 +132,234 @@
-
+ &%1 %2
-
+ &%1 %2
-
+ &New File
- Созд&ать
+ Созд&ать&Open File
- &Открыть
+ &Открыть&Save File
- &Сохранить
+ &СохранитьSave File &As
- Сохранить &как
+ Сохранить &какPrint
-
+ Печать&Undo
- О&тменить
+ О&тменить&Redo
- &Повторить
+ &Повторить&Copy
- &Копировать
-
-
-
- Cu&t
- Вы&резать
+ &Копировать
+ Cu&t
+ Вы&резать
+
+
+ Paste
-
+ Вставить&Next Bookmark
- С&ледующая закладка
+ С&ледующая закладкаPre&vious Bookmark
- Пр&едыдущая закладка
+ Пр&едыдущая закладкаToggle &Bookmark
- &Установить/снять закладку
+ &Установить/снять закладку&Remove All Bookmarks
-
+ &Удалить все закладки&Next breakpoint
-
+ &Следующая точка остановаPre&vious breakpoint
-
+ &Предыдущая точка остановаToggle &breakpoint
-
+ Установить/снять &точку останова&Remove All breakpoints
-
+ &Удалить все точки останова&Comment
-
+ &Закомментировать
-
+ &Uncomment
-
+ &Раскомментировать&Recent Editor Files
-
+ &Недавние файлы редактора
-
+
+ &Edit Function
+ &Редактировать функцию
+
+
+ &Close
-
+ &ЗакрытьClose All
-
+ Закрыть всёClose Other Files
+ Закрыть другие файлы
+
+
+
+ Run &Selection
-
- &Find and Replace
-
+
+ &Help
+ &Помощь
+
+
+
+ &Help on Keyword
+ &Помощь по зарезервированному слову
+ &Documentation on Keyword
+ &Документация по зарезервированному слову
+
+
+
+ &Find and Replace
+ &Найти и заменить
+
+
+
+ Could not open file
+%1
+for read: %2.
+ Не удалось открыть файл
+%1
+для чтения: %2.
+
+
+
+ File
+%1
+does not exist. Do you want to create it?
+ Файл
+%1
+не существует. Вы хотите создать его?
+
+
+
+ Could not open file
+%1
+for write: %2.
+ Не удалось открыть файл
+%1
+для записи: %2.
+
+
+ Save File And Run
-
+ Сохранить и запустить файлGo&to Line
-
+ &Перейти к строчке&File
- &Файл
+ &Файл
+
+
+
+ &Edit
+ &Правка
-
- &Edit
- &Правка
+
+ &Preferences
+ &Настройки
-
+
+ &Styles Preferences
+ Настройки &стиля
+
+
+ &Debug
-
+ &Отладка&Run
- &Запуск
+ &Запускfile_editor_tab
-
+ Goto line
-
+ Перейти к строчке
@@ -309,71 +369,81 @@
<unnamed>
-
+ <без названия>Do you want to save or discard the changes?
-
+ Вы хотите сохранить или отменить изменения?Do you want to cancel closing, save or discard the changes?
-
+ Вы хотите отменить закрытие, сохранить или отменить изменения?
-
-
+
+ Octave Editor
-
+ Редактор Octave
-
+ The file
%1
is about to be closed but has been modified.
%2
-
+ Файл
+%1
+должен быть закрыть, но он был изменен.
+%2
-
+ Octave Files (*.m);;All Files (*)
-
+ Файлы Octave (*.m);;Все файлы (*)File not saved! The selected file name
%1
is the same as the current file name
-
+ Файл не сохранен! Выбранное имя файла
+%1
+такое же, как и название текущего файла
Warning: The contents in the editor is modified!
-
+
+
+Предупреждение: содержимое в редакторе было изменено!It seems that the file
%1
has been deleted or renamed. Do you want to save it now?%2
-
+ Кажется, файл
+%1
+был удален или переименован. Вы хотите сохранить его?%2
-
+ Could not open file %1 for write:
%2.
-
+ Не удалось открыть файл %1 для записи:
+%2.
-
+ It seems that '%1' has been modified by another application. Do you want to reload it?
-
+ Кажется, файл '%1' был изменен другим приложением. Вы хотите обновить его содержимое?
@@ -381,17 +451,17 @@
File Browser
- Файловый менеджер
+ Файловый менеджерBrowse your files.
- Просмотр файлов.
+ Просмотр файлов.Enter the path or filename
-
+ Введите путь или имя файла
@@ -401,17 +471,17 @@
Show octave directory
-
+ Показывать директорию OctaveGoto current octave directory
-
+ Перейти к текущей директории OctaveSet octave directory
-
+ Установить директорию Octave
@@ -426,7 +496,7 @@
Show Home directory
-
+ Показывать домашнюю директорию
@@ -437,98 +507,98 @@
Find Files ...
-
+ Найти файлы...New File
-
+ Новый файлNew Directory
-
+ Новая директорияDoubleclick a file to open it
-
+ Двойной щелчок по файлу для открытияOpen
-
+ ОткрытьOpen in Default Application
-
+ Открыть в приложении по умолчаниюCopy Selection to Clipboard
-
+ Скопировать выделенное в буфер обменаRun
-
+ ЗапускLoad Data
-
+ Загрузить данныеSet Current Directory
-
+ Установить текущую директориюRename
-
+ ПереименоватьDelete
-
+ УдалитьRename file/directory
-
+ Переименовать файл/директориюRename file/directory:
-
+ Переименовать файл/директорию:
to:
-
+ в: Delete file/directory
-
+ Удалить файл/директориюAre you sure you want to delete
-
+ Вы уверены, что хотите удалитьCan not delete a directory that is not empty
-
+ Невозможно удалить непустую директорию
@@ -538,24 +608,24 @@
Create File
-
+ Создать файлCreate file in
-
+ Создать файл вCreate Directory
-
+ Создать директориюCreate folder in
-
+ Создать папку в
@@ -563,22 +633,22 @@
Find &what:
-
+ &Найти:Re&place with:
-
+ За&менить на:Match &case
-
+ &Учитывать регистрSearch from &start
-
+ И&скать с начала
@@ -588,27 +658,27 @@
&Find Next
-
+ Найти &следующееFind &Previous
-
+ Найти п&редыдущее&Replace
-
+ &ЗаменитьReplace &All
-
+ Заменить &все&More
-
+ &Больше
@@ -618,12 +688,12 @@
Regular E&xpressions
-
+ &Регулярные выраженияSearch &backward
-
+ &Искать в обратном направлении
@@ -633,12 +703,12 @@
Search from end
-
+ Искать с концаSearch from start
-
+ Искать с начала
@@ -658,7 +728,7 @@
No more matches found
-
+ Больше совпадений не найдено
@@ -666,7 +736,7 @@
Find Files
-
+ Найти файлы
@@ -706,7 +776,7 @@
Search recursively through directories for matching files
-
+ Искать рекурсивно в директориях подходящие файлы
@@ -731,7 +801,7 @@
Contains text:
-
+ Содержит текст:
@@ -766,7 +836,7 @@
Find
-
+ Найти
@@ -776,7 +846,7 @@
Stop
-
+ Завершить
@@ -786,12 +856,12 @@
File name/location
-
+ Имя/местоположение файлаFile contents
-
+ Содержимое файла
@@ -801,7 +871,7 @@
Set search directory
-
+ Установить директорию для поиска
@@ -809,12 +879,12 @@
Filename
-
+ Имя файлаDirectory
-
+ Директория
@@ -822,71 +892,71 @@
Browse and search the command history.
- Просмотр и поиск в журнале выполненных команд.
+ Просмотр и поиск в журнале выполненных команд.Doubleclick a command to transfer it to the terminal.
- Двойной щелчок по команде перенесёт её в командную строку.
+ Двойной щелчок по команде перенесёт её в командную строку.Enter text to filter the command history.
- Введите текст для фильтрации выполненных команд.
+ Введите текст для фильтрации выполненных команд.Command History
- Журнал выполненных команд
+ Журнал выполненных командCopy
-
+ КопироватьEvaluate
-
+ ВыполнитьCreate script
-
+ Создать скриптmain_window
-
+ Load Workspace
- Загрузить область переменных
+ Загрузить область переменных
-
-
+
+ About Octave
- Об Octave
+ Об Octave
-
+ &File
- &Файл
+ &ФайлNew
-
+ НовыйScript
-
+ СкриптFunction
-
+ Функция
@@ -896,68 +966,83 @@
Open...
-
+ Открыть...Preferences...
-
+ Настройки...Exit
- Выход
+ Выход&Edit
- &Правка
+ &ПравкаUndo
-
+ ОтменитьCopy
-
+ КопироватьPaste
-
+ Вставить
-
-
+
+ Save Workspace As
-
+
+ The release notes file '%1' is empty.
+
+
+
+
+ The release notes file '%1' cannot be read.
+
+
+
+
+ Octave Release Notes
+
+
+
+ Set working directory
-
+ Clear ClipboardFind Files...
-
+ Найти файлы...Clear Command Window
-
+ Очистить командное окноClear Command History
-
+ Очистить журнал выполненных команд
@@ -967,57 +1052,67 @@
De&bug
-
+ &ОтладкаStep
-
+ ШагStep in
-
+ Шаг впередStep out
-
+ Шаг назадContinue
-
+ ПродолжитьExit Debug Mode
-
+ Выйти из режима отладкиShow File Browser
-
+ Показывать файловый менеджер
+
+
+
+ Show News Window
+ Показывать окно новостей
-
+ File Browser
- Файловый менеджер
+ Файловый менеджер
-
+
+ News
+ Новости
+
+
+ Reset Default Window Layout
-
+ Octave Packages
-
+ Пакеты OctaveShare Code
-
+ Поделиться кодом
@@ -1027,134 +1122,172 @@
Octave Developer Resources
-
+ Ресурсы разработчика OctaveOn Disk
-
+ На дискеOnline
+ Онлайн
+
+
+
+ &News
+ &Новости
+
+
+
+ Release Notes
+
+ Community News
+ Новости сообщества
+
+ Enter directory name
-
+ Введите название директорииCurrent Directory:
-
+ Текущая директория: One directory up
-
+ Одной директорией вверхBrowse directories
-
+ Просмотр директорий
-
+ Load workspace
-
+ Загрузить область переменных&Window
-
+ &ОкноShow Command Window
-
+ Показывать командное окноShow Command History
-
+ Показывать журнал выполненных командShow Workspace
-
+ Показывать область переменныхShow Editor
-
+ Показывать редакторShow Documentation
-
+ Показывать документацию
-
+ Command Window
-
+ Командное окноCommand History
- Журнал выполненных команд
+ Журнал выполненных командWorkspace
- Область переменных
+ Область переменныхEditor
- Редактор
+ Редактор
-
+ Documentation
- Документация
+ Документация&Help
-
+ &ПомощьReport Bug
- Сообщить об ошибке
+ Сообщить об ошибке
+
+
+
+ news_dock_widget
+
+
+ Community News
+ Новости сообществаoctave_dock_widget
-
-
+
+ Undock widget
-
+ Открепить виджет
-
+ Hide widget
-
+ Спрятать виджет
-
+ Dock widget
-
+ Закрепить виджетoctave_qscintilla
-
- help
+
+ Help on
+
+
+
+
+ Documentation on
+
+
+
+
+ Edit
+ Редактировать
+
+
+
+ &Run Selection
@@ -1163,7 +1296,7 @@
The file %1 does not exist in the load path. To debug the function you are editing, you must either change to the directory %2 or add that directory to the load path.
-
+ Файл %1 не существует в пути загрузки. Чтобы отладить редактируемую вами функцию, вы должны либо изменить директорию на %2, или добавить эту директорию в путь загрузки.
@@ -1173,22 +1306,22 @@
Change Directory or Add Directory to Load Path
-
+ Изменить директорию или добавить директорию в путь загрузкиChange Directory
-
+ Изменить директориюAdd Directory to Load Path
-
+ Добавить директорию в путь загрузкиCancel
-
+ Отмена
@@ -1196,17 +1329,17 @@
Settings
- Параметры
+ ПараметрыGeneral
-
+ ОсновноеOctave logo only
-
+ Только логотип Octave
@@ -1216,27 +1349,27 @@
Editor
- Редактор
+ РедакторShow white space
-
+ Показывать пробелыDo not show white spaces used for indentation
-
+ Не показывать пробелы, используемые для отступовColor
-
+ ЦветIndent width
-
+ Ширина отступа
@@ -1246,7 +1379,7 @@
Auto indentation
-
+ Авто-отступы
@@ -1276,7 +1409,7 @@
Case sensitive
-
+ Чувствительный к регистру
@@ -1291,6 +1424,11 @@
Restore editor tabs from previous session on startup
+ Восстанавливать вкладки редактора с предыдущей сессии во время запуска
+
+
+
+ Create non existing files without prompting
@@ -1311,7 +1449,7 @@
<html><head/><body><p>Select font, font size (as difference to the default size), font decoration (bold, italic, underline), textcolor and background color (for the latter, the color pink (255,0,255) is a placeholder for the default background color)</p></body></html>
-
+ <html><head/><body><p>Выберите шрифт, размер шрифта (отличный от размера по умолчанию), стиль шрифта (жирный, курсив, подчеркнутый),цвет текста и цвет заднего фона (для последнего розовый цвет (255,0,255) используется по умолчанию)</p></body></html>
@@ -1326,27 +1464,27 @@
Font
-
+ Шрифт
-
+ Show line numbers
-
+ Показывать количество строкHighlight current line
-
+ Подсвечивать текущую строкуCode completion
-
+ Дополнение кодаShow complete path in window title
-
+ Показывать полный путь в заголовке окна
@@ -1354,69 +1492,69 @@
-
+ emacs
- emacs
+ emacsTerminal
- Командная строка
+ Командная строкаCursor type:
-
+ Тип курсора:Cursor blinking
-
+ Мигающий курсорFont size
-
+ Размер шрифтаFile Browser
- Файловый менеджер
+ Файловый менеджерShow file size
- Показывать размер файлов
+ Показывать размер файловShow file type
- Показывать типы файлов
+ Показывать типы файловShow date of last modification
- Показывать дату последнего изменения
+ Показывать дату последнего измененияShow hidden files
- Показывать скрытые файлы
+ Показывать скрытые файлыSynchronize octave directory with the file browser
-
+ Синхронизировать директорию octave с файловым менеджеромAlternating row colors
- Чередующиеся цвета строк
+ Чередующиеся цвета строкWorkspace
- Область переменных
+ Область переменных
@@ -1426,72 +1564,72 @@
Network
-
+ СетьUse proxy server
-
+ Использовать прокси-серверProxy Type:
-
+ Тип прокси:HttpProxy
-
+ HttpProxy
-
+ Icon set for dock widgetsLanguage (requires restart)
-
+ Язык (требуется перезапуск)Icon size
-
+ Размер иконок
-
+ Socks5Proxy
-
+ Socks5ProxyHostname:
-
+ Имя хоста:Port:
-
+ Порт:Username:
-
+ Имя пользователя:Password:
- Пароль:
+ Пароль:
-
+
-
+ System setting
-
+ IBeam Cursor
@@ -1506,29 +1644,29 @@
-
+ Difference to the default size
-
+ Отличие то размера по умолчаниюBackground color, pink (255,0,255) means default
-
+ Цвет заднего фона, розовый (255,0,255) по умолчаниюb
-
+ bi
-
+ iu
-
+ u
@@ -1536,59 +1674,75 @@
Command Window
-
+ Командное окноwebinfo
-
+ Type here and press 'Return' to search
-
+ Вводите сюда и нажмите 'Enter', чтобы начать поискGlobal search
-
+ Глобальный поискwelcome_wizard
-
+ Welcome to GNU Octave
-
+ Добро пожаловать в GNU Octave
+
+
+
+ Welcome to Octave!
+ Добро пожаловать в Octave!
+
+
+
+ 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.
+ Кажется, вы используете графический интерфейс для Octave впервые на этом компьютере. Щелкните на кнопку 'Завершить', чтобы записать конфигурационный файл и запустить интерфейс для Octave.
+
+
+
+ The configuration file is stored in %1. If that file exists, you will not see this dialog when Octave starts again.
+ Конфигурационный файл хранится в %1. Если этот файл существует, вы больше не увидите это всплывающее окно при запуске Octave.
+
+
+
+ <html><head>
+<style>
+a:link { text-decoration: underline; color: #0000ff; }
+</style>
+<head/><body>
+<p>For more information about Octave:</p>
+<ul>
+<li>Visit <a href="http://octave.org">http://octave.org</a></li>
+<li>Get the documentation online as <a href="http://www.gnu.org/software/octave/doc/interpreter/index.html">html</a>- or <a href="http://www.gnu.org/software/octave/octave.pdf">pdf</span></a>-document</li>
+<li>Open the documentation browser of Octave GUI with the help menu</li>
+</ul>
+</body></html>
+ <html><head>
+<style>
+a:link { text-decoration: underline; color: #0000ff; }
+</style>
+<head/><body>
+<p>Для получения дополнительной информации об Octave:</p>
+<ul>
+<li>Посетите <a href="http://octave.org">http://octave.org</a></li>
+<li>Получите документацию онлайн в виде<a href="http://www.gnu.org/software/octave/doc/interpreter/index.html">html</a>- или <a href="http://www.gnu.org/software/octave/octave.pdf">pdf</span></a>-документа</li>
+<li>Откройте просмотрщик документации через меню "Помощь"</li>
+</ul>
+</body></html>
- 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.
-
-
-
-
- The configuration file is stored in __%1__. If that file exists, you will not see this dialog when Octave starts again.
-
-
-
-
- <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>
-
-
-
-
- Welcome to Octave!
-
-
-
- Finish
-
+ Завершить
@@ -1596,22 +1750,22 @@
Name
- Идентификатор
+ ИдентификаторClass
-
+ ТипDimension
-
+ РазмерностьValue
- Значение
+ Значение
@@ -1621,7 +1775,7 @@
Right click to copy, rename, or display
-
+ Правый щелчок для копирования, переименования или отображения
@@ -1629,22 +1783,22 @@
Workspace
- Область переменных
+ Область переменныхView the variables in the active workspace.
- Просмотр содержимого текущей области переменных.
+ Просмотр содержимого текущей области переменных.Copy
-
+ КопироватьRename
-
+ Переименовать
@@ -1654,7 +1808,7 @@
View the variables in the active workspace.<br>
-
+ Просмотр содержимого текущей области переменных.<br>
diff -r c4f5c781c3ca -r 97e49b588f5d libgui/languages/translators
--- a/libgui/languages/translators Wed Oct 23 22:48:29 2013 -0400
+++ b/libgui/languages/translators Tue Nov 05 12:27:42 2013 -0500
@@ -1,6 +1,6 @@
# Below Octave GUI translators are listed with their e-mails
# to be able to inform them about generic translation file changes.
-# The gerenic file that can be used as a template for new
+# The generic file that can be used as a template for new
# translation files is en_US.ts
be_BY Mihas Varantsou
de_DE Jacob Dawid
@@ -8,6 +8,7 @@
es_ES Valentin Ortega-Clavero
fr_FR David Bateman , Catalin Codreanu
pt_BR Júlio Hoffimann Mendes
+pt_PT Carnë Draug
ru_RU Andriy Shinkarchuck
uk_UA Andriy Shinkarchuck
nl_NL Sander van Rijn
diff -r c4f5c781c3ca -r 97e49b588f5d libgui/languages/uk_UA.ts
--- a/libgui/languages/uk_UA.ts Wed Oct 23 22:48:29 2013 -0400
+++ b/libgui/languages/uk_UA.ts Tue Nov 05 12:27:42 2013 -0500
@@ -89,6 +89,79 @@
+ QsciLexerBash
+
+
+ Default
+
+
+
+
+ Error
+
+
+
+
+ Comment
+
+
+
+
+ Number
+
+
+
+
+ Keyword
+
+
+
+
+ Double-quoted string
+
+
+
+
+ Single-quoted string
+
+
+
+
+ Operator
+
+
+
+
+ Identifier
+
+
+
+
+ Scalar
+
+
+
+
+ Parameter expansion
+
+
+
+
+ Backticks
+
+
+
+
+ Here document delimiter
+
+
+
+
+ Single-quoted here document
+
+
+
+QsciLexerBatch
@@ -697,25 +770,21 @@
file_editor
-
-
+
+
+
+ Octave Editor
-
+ Octave Files (*.m);;All Files (*)
-
- Could not open file %1 for read:
-%2.
-
-
-
-
+ File not saved! A file with the selected name
%1
is already open in the editor
@@ -727,12 +796,12 @@
-
+ &%1 %2
-
+ &New File&Створити
@@ -772,12 +841,12 @@
&Копіювати
-
+ Cu&tВиріза&ти
-
+ Paste
@@ -827,7 +896,7 @@
-
+ &Uncomment
@@ -837,7 +906,12 @@
-
+
+ &Edit Function
+
+
+
+ &Close
@@ -852,12 +926,53 @@
-
- &Find and Replace
+
+ Run &Selection
+
+
+
+
+ &Help
+
+
+
+
+ &Help on Keyword
+ &Documentation on Keyword
+
+
+
+
+ &Find and Replace
+
+
+
+
+ Could not open file
+%1
+for read: %2.
+
+
+
+
+ File
+%1
+does not exist. Do you want to create it?
+
+
+
+
+ Could not open file
+%1
+for write: %2.
+
+
+
+ Save File And Run
@@ -872,12 +987,22 @@
&Файл
-
+ &Edit&Правка
-
+
+ &Preferences
+
+
+
+
+ &Styles Preferences
+
+
+
+ &Debug
@@ -890,7 +1015,7 @@
file_editor_tab
-
+ Goto line
@@ -916,15 +1041,15 @@
-
-
+
+ Octave Editor
-
+ The file
%1
is about to be closed but has been modified.
@@ -932,7 +1057,7 @@
-
+ Octave Files (*.m);;All Files (*)
@@ -958,13 +1083,13 @@
-
+ Could not open file %1 for write:
%2.
-
+ It seems that '%1' has been modified by another application. Do you want to reload it?
@@ -1451,18 +1576,18 @@
main_window
-
+ Load WorkspaceЗавантажити область змінних
-
-
+
+ About OctaveПро Octave
-
+ &File&Файл
@@ -1522,18 +1647,33 @@
-
-
+
+ Save Workspace As
-
+
+ The release notes file '%1' is empty.
+
+
+
+
+ The release notes file '%1' cannot be read.
+
+
+
+
+ Octave Release Notes
+
+
+
+ Set working directory
-
+ Clear Clipboard
@@ -1593,17 +1733,27 @@
-
+
+ Show News Window
+
+
+
+ File BrowserФайловий менеджер
-
+
+ News
+
+
+
+ Reset Default Window Layout
-
+ Octave Packages
@@ -1633,6 +1783,21 @@
+
+ &News
+
+
+
+
+ Release Notes
+
+
+
+
+ Community News
+
+
+ Enter directory name
@@ -1653,7 +1818,7 @@
-
+ Load workspace
@@ -1688,7 +1853,7 @@
-
+ Command Window
@@ -1709,7 +1874,7 @@
-
+ DocumentationДокументація
@@ -1725,20 +1890,28 @@
+ news_dock_widget
+
+
+ Community News
+
+
+
+octave_dock_widget
-
-
+
+ Undock widget
-
+ Hide widget
-
+ Dock widget
@@ -1746,8 +1919,23 @@
octave_qscintilla
-
- help
+
+ Help on
+
+
+
+
+ Documentation on
+
+
+
+
+ Edit
+
+
+
+
+ &Run Selection
@@ -1887,6 +2075,11 @@
+
+ Create non existing files without prompting
+
+
+ Use custom file editor
@@ -1922,7 +2115,7 @@
-
+ Show line numbers
@@ -1947,7 +2140,7 @@
-
+ emacsemacs
@@ -2037,7 +2230,7 @@
-
+ Icon set for dock widgets
@@ -2052,7 +2245,7 @@
-
+ Socks5Proxy
@@ -2077,14 +2270,14 @@
Пароль:
-
+
-
+ System setting
-
+ IBeam Cursor
@@ -2099,7 +2292,7 @@
-
+ Difference to the default size
@@ -2135,7 +2328,7 @@
webinfo
-
+ Type here and press 'Return' to search
@@ -2148,38 +2341,43 @@
welcome_wizard
-
+ Welcome to GNU Octave
+
+ Welcome to Octave!
+
+
+
+
+ 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.
+
+
+
+
+ The configuration file is stored in %1. If that file exists, you will not see this dialog when Octave starts again.
+
+
+
+
+ <html><head>
+<style>
+a:link { text-decoration: underline; color: #0000ff; }
+</style>
+<head/><body>
+<p>For more information about Octave:</p>
+<ul>
+<li>Visit <a href="http://octave.org">http://octave.org</a></li>
+<li>Get the documentation online as <a href="http://www.gnu.org/software/octave/doc/interpreter/index.html">html</a>- or <a href="http://www.gnu.org/software/octave/octave.pdf">pdf</span></a>-document</li>
+<li>Open the documentation browser of Octave GUI with the help menu</li>
+</ul>
+</body></html>
+
+
+
- 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.
-
-
-
-
- The configuration file is stored in __%1__. If that file exists, you will not see this dialog when Octave starts again.
-
-
-
-
- <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>
-
-
-
-
- Welcome to Octave!
-
-
-
- Finish
diff -r c4f5c781c3ca -r 97e49b588f5d libgui/qterminal/libqterminal/QTerminal.cc
--- a/libgui/qterminal/libqterminal/QTerminal.cc Wed Oct 23 22:48:29 2013 -0400
+++ b/libgui/qterminal/libqterminal/QTerminal.cc Tue Nov 05 12:27:42 2013 -0500
@@ -5,18 +5,19 @@
This file is part of QTerminal.
-Foobar is free software: you can redistribute it and/or modify
+This program 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.
-QTerminal is distributed in the hope that it will be useful,
+This program 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 Foobar. If not, see .
+along with this program. If not,
+see .
*/
diff -r c4f5c781c3ca -r 97e49b588f5d libgui/qterminal/libqterminal/QTerminal.h
--- a/libgui/qterminal/libqterminal/QTerminal.h Wed Oct 23 22:48:29 2013 -0400
+++ b/libgui/qterminal/libqterminal/QTerminal.h Tue Nov 05 12:27:42 2013 -0500
@@ -5,18 +5,19 @@
This file is part of QTerminal.
-Foobar is free software: you can redistribute it and/or modify
+This program 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.
-QTerminal is distributed in the hope that it will be useful,
+This program 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 Foobar. If not, see .
+along with this program. If not,
+see .
*/
@@ -56,11 +57,11 @@
virtual QString selectedText () = 0;
enum CursorType
- {
- UnderlineCursor,
- BlockCursor,
- IBeamCursor
- };
+ {
+ UnderlineCursor,
+ BlockCursor,
+ IBeamCursor
+ };
virtual void setCursorType (CursorType type, bool blinking)
{
@@ -96,7 +97,7 @@
_paste_action->setEnabled (cb->text().length() > 0);
_copy_action->setEnabled (selectedText().length() > 0);
-
+
_contextMenu->move (mapToGlobal (at));
_contextMenu->show ();
}
@@ -112,12 +113,12 @@
_contextMenu = new QMenu (this);
_copy_action = _contextMenu->addAction (
- QIcon (":/actions/icons/editcopy.png"),
- tr ("Copy"), this, SLOT (copyClipboard ()));
+ QIcon (":/actions/icons/editcopy.png"),
+ tr ("Copy"), this, SLOT (copyClipboard ()));
_paste_action = _contextMenu->addAction (
- QIcon (":/actions/icons/editpaste.png"),
- tr ("Paste"), this, SLOT (pasteClipboard ()));
+ QIcon (":/actions/icons/editpaste.png"),
+ tr ("Paste"), this, SLOT (pasteClipboard ()));
_contextMenu->addSeparator ();
@@ -142,9 +143,9 @@
private:
- QMenu *_contextMenu;
- QAction * _copy_action;
- QAction * _paste_action;
+ QMenu *_contextMenu;
+ QAction * _copy_action;
+ QAction * _paste_action;
};
#endif // QTERMINAL_H
diff -r c4f5c781c3ca -r 97e49b588f5d libgui/qterminal/libqterminal/unix/CharacterColor.h
--- a/libgui/qterminal/libqterminal/unix/CharacterColor.h Wed Oct 23 22:48:29 2013 -0400
+++ b/libgui/qterminal/libqterminal/unix/CharacterColor.h Tue Nov 05 12:27:42 2013 -0500
@@ -26,7 +26,7 @@
#define CHARACTERCOLOR_H
// Qt
-#include
+#include
/**
* An entry in a terminal display's color palette.
diff -r c4f5c781c3ca -r 97e49b588f5d libgui/qterminal/libqterminal/unix/Emulation.cpp
--- a/libgui/qterminal/libqterminal/unix/Emulation.cpp Wed Oct 23 22:48:29 2013 -0400
+++ b/libgui/qterminal/libqterminal/unix/Emulation.cpp Tue Nov 05 12:27:42 2013 -0500
@@ -33,10 +33,10 @@
#include
// Qt
-#include
-#include
+#include
+#include
#include
-#include
+#include
#include
#include
#include
diff -r c4f5c781c3ca -r 97e49b588f5d libgui/qterminal/libqterminal/unix/Emulation.h
--- a/libgui/qterminal/libqterminal/unix/Emulation.h Wed Oct 23 22:48:29 2013 -0400
+++ b/libgui/qterminal/libqterminal/unix/Emulation.h Tue Nov 05 12:27:42 2013 -0500
@@ -29,7 +29,7 @@
#include
// Qt
-#include
+#include
#include
#include
diff -r c4f5c781c3ca -r 97e49b588f5d libgui/qterminal/libqterminal/unix/Filter.cpp
--- a/libgui/qterminal/libqterminal/unix/Filter.cpp Wed Oct 23 22:48:29 2013 -0400
+++ b/libgui/qterminal/libqterminal/unix/Filter.cpp Tue Nov 05 12:27:42 2013 -0500
@@ -26,9 +26,9 @@
#include
// Qt
-#include
-#include
-#include
+#include
+#include
+#include
#include
#include
diff -r c4f5c781c3ca -r 97e49b588f5d libgui/qterminal/libqterminal/unix/Filter.h
--- a/libgui/qterminal/libqterminal/unix/Filter.h Wed Oct 23 22:48:29 2013 -0400
+++ b/libgui/qterminal/libqterminal/unix/Filter.h Tue Nov 05 12:27:42 2013 -0500
@@ -23,7 +23,7 @@
#define FILTER_H
// Qt
-#include
+#include
#include
#include
#include
diff -r c4f5c781c3ca -r 97e49b588f5d libgui/qterminal/libqterminal/unix/KeyboardTranslator.h
--- a/libgui/qterminal/libqterminal/unix/KeyboardTranslator.h Wed Oct 23 22:48:29 2013 -0400
+++ b/libgui/qterminal/libqterminal/unix/KeyboardTranslator.h Tue Nov 05 12:27:42 2013 -0500
@@ -27,7 +27,7 @@
// Qt
#include
#include
-#include
+#include
#include
#include
#include
diff -r c4f5c781c3ca -r 97e49b588f5d libgui/qterminal/libqterminal/unix/TerminalModel.cpp
--- a/libgui/qterminal/libqterminal/unix/TerminalModel.cpp Wed Oct 23 22:48:29 2013 -0400
+++ b/libgui/qterminal/libqterminal/unix/TerminalModel.cpp Tue Nov 05 12:27:42 2013 -0500
@@ -31,7 +31,7 @@
#include
// Qt
-#include
+#include
#include
#include
#include
diff -r c4f5c781c3ca -r 97e49b588f5d libgui/qterminal/libqterminal/unix/TerminalView.cpp
--- a/libgui/qterminal/libqterminal/unix/TerminalView.cpp Wed Oct 23 22:48:29 2013 -0400
+++ b/libgui/qterminal/libqterminal/unix/TerminalView.cpp Tue Nov 05 12:27:42 2013 -0500
@@ -27,20 +27,20 @@
#include "unix/TerminalView.h"
// Qt
-#include
-#include
-#include
-#include
+#include
+#include
+#include
+#include
#include
#include
#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
#include
#include
@@ -661,9 +661,10 @@
*/
void TerminalDisplay::setCursorPos(const int curx, const int cury)
{
- QPoint tL = contentsRect().topLeft();
- int tLx = tL.x();
- int tLy = tL.y();
+ // Align contents with bottom of view by computing top coordinate
+ QPoint bL = contentsRect().bottomLeft();
+ int tLx = bL.x();
+ int tLy = bL.y()-2*_topMargin-_fontHeight*_lines+1;
int xpos, ypos;
ypos = _topMargin + tLy + _fontHeight*(cury-1) + _fontAscent;
@@ -715,7 +716,7 @@
void* firstCharPos = &_image[ region.top() * this->_columns ];
void* lastCharPos = &_image[ (region.top() + abs(lines)) * this->_columns ];
- int top = _topMargin + (region.top() * _fontHeight);
+ int top = contentsRect().height() - _topMargin - (_lines * _fontHeight) + (region.top() * _fontHeight);
int linesToMove = region.height() - abs(lines);
int bytesToMove = linesToMove *
this->_columns *
@@ -830,10 +831,10 @@
int y,x,len;
- QPoint tL = contentsRect().topLeft();
-
- int tLx = tL.x();
- int tLy = tL.y();
+ // Align contents with bottom of view by computing top coordinate
+ QPoint bL = contentsRect().bottomLeft();
+ int tLx = bL.x();
+ int tLy = bL.y()-2*_topMargin-_fontHeight*_lines+1;
_hasBlinker = false;
CharacterColor cf; // undefined
@@ -1098,8 +1099,13 @@
if ( preeditLength == 0 )
return QRect();
+ // Align contents with bottom of view by computing top coordinate
+ QPoint bL = contentsRect().bottomLeft();
+ int tLx = bL.x();
+ int tLy = bL.y()-2*_topMargin-_fontHeight*_lines+1;
+
return QRect(_leftMargin + _fontWidth*cursorPosition().x(),
- _topMargin + _fontHeight*cursorPosition().y(),
+ _topMargin + tLy + _fontHeight*cursorPosition().y(),
_fontWidth*preeditLength,
_fontHeight);
}
@@ -1213,9 +1219,10 @@
{
//qDebug("%s %d drawContents and rect x=%d y=%d w=%d h=%d", __FILE__, __LINE__, rect.x(), rect.y(),rect.width(),rect.height());
- QPoint topLeft = contentsRect().topLeft();
- // Take the topmost vertical position for the view.
- int topLeftY = topLeft.y();
+ // Align contents with bottom of view by computing top coordinate
+ QPoint bottomLeft = contentsRect().bottomLeft();
+ int bottomLeftY = bottomLeft.y();
+ int topLeftY = bottomLeftY-2*_topMargin-_fontHeight*_lines+1;
// In Konsole, the view has been centered. Don't do that here, since there
// are strange hopping effects during a resize when the view does no match
@@ -1361,10 +1368,15 @@
QRect TerminalView::imageToWidget(const QRect& imageArea) const
{
+ // Align contents with bottom of view by computing top coordinate
+ QPoint bL = contentsRect().bottomLeft();
+ int tLx = bL.x();
+ int tLy = bL.y()-2*_topMargin-_fontHeight*_lines+1;
+
//qDebug("%s %d imageToWidget", __FILE__, __LINE__);
QRect result;
result.setLeft( _leftMargin + _fontWidth * imageArea.left() );
- result.setTop( _topMargin + _fontHeight * imageArea.top() );
+ result.setTop( _topMargin + tLy + _fontHeight * imageArea.top() );
result.setWidth( _fontWidth * imageArea.width() );
result.setHeight( _fontHeight * imageArea.height() );
@@ -1730,9 +1742,10 @@
return;
}
- QPoint tL = contentsRect().topLeft();
- int tLx = tL.x();
- int tLy = tL.y();
+ // Align contents with bottom of view by computing top coordinate
+ QPoint bL = contentsRect().bottomLeft();
+ int tLx = bL.x();
+ int tLy = bL.y()-2*_topMargin-_fontHeight*_lines+1;
int scroll = _scrollBar->value();
// we're in the process of moving the mouse with the left button pressed
diff -r c4f5c781c3ca -r 97e49b588f5d libgui/qterminal/libqterminal/unix/TerminalView.h
--- a/libgui/qterminal/libqterminal/unix/TerminalView.h Wed Oct 23 22:48:29 2013 -0400
+++ b/libgui/qterminal/libqterminal/unix/TerminalView.h Tue Nov 05 12:27:42 2013 -0500
@@ -25,9 +25,9 @@
#define TERMINALVIEW_H
// Qt
-#include
+#include
#include
-#include
+#include
// Konsole
#include "unix/Filter.h"
diff -r c4f5c781c3ca -r 97e49b588f5d libgui/qterminal/libqterminal/unix/Vt102Emulation.cpp
--- a/libgui/qterminal/libqterminal/unix/Vt102Emulation.cpp Wed Oct 23 22:48:29 2013 -0400
+++ b/libgui/qterminal/libqterminal/unix/Vt102Emulation.cpp Tue Nov 05 12:27:42 2013 -0500
@@ -40,7 +40,7 @@
// Qt
#include
-#include
+#include
#include
// Konsole
diff -r c4f5c781c3ca -r 97e49b588f5d libgui/qterminal/libqterminal/unix/Vt102Emulation.h
--- a/libgui/qterminal/libqterminal/unix/Vt102Emulation.h Wed Oct 23 22:48:29 2013 -0400
+++ b/libgui/qterminal/libqterminal/unix/Vt102Emulation.h Tue Nov 05 12:27:42 2013 -0500
@@ -29,7 +29,7 @@
#include
// Qt
-#include
+#include
#include
#include
diff -r c4f5c781c3ca -r 97e49b588f5d libgui/qterminal/libqterminal/win32/QTerminalColors.cpp
--- a/libgui/qterminal/libqterminal/win32/QTerminalColors.cpp Wed Oct 23 22:48:29 2013 -0400
+++ b/libgui/qterminal/libqterminal/win32/QTerminalColors.cpp Tue Nov 05 12:27:42 2013 -0500
@@ -4,18 +4,19 @@
This file is part of QConsole.
-Foobar is free software: you can redistribute it and/or modify
+This program 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.
-QConsole is distributed in the hope that it will be useful,
+This program 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 Foobar. If not, see .
+along with this program. If not,
+see .
*/
diff -r c4f5c781c3ca -r 97e49b588f5d libgui/qterminal/libqterminal/win32/QTerminalColors.h
--- a/libgui/qterminal/libqterminal/win32/QTerminalColors.h Wed Oct 23 22:48:29 2013 -0400
+++ b/libgui/qterminal/libqterminal/win32/QTerminalColors.h Tue Nov 05 12:27:42 2013 -0500
@@ -4,18 +4,19 @@
This file is part of QConsole.
-Foobar is free software: you can redistribute it and/or modify
+This program 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.
-QConsole is distributed in the hope that it will be useful,
+This program 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 Foobar. If not, see .
+along with this program. If not,
+see .
*/
diff -r c4f5c781c3ca -r 97e49b588f5d libgui/qterminal/libqterminal/win32/QWinTerminalImpl.cpp
--- a/libgui/qterminal/libqterminal/win32/QWinTerminalImpl.cpp Wed Oct 23 22:48:29 2013 -0400
+++ b/libgui/qterminal/libqterminal/win32/QWinTerminalImpl.cpp Tue Nov 05 12:27:42 2013 -0500
@@ -4,18 +4,19 @@
This file is part of QConsole.
-Foobar is free software: you can redistribute it and/or modify
+This program 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.
-QConsole is distributed in the hope that it will be useful,
+This program 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 Foobar. If not, see .
+along with this program. If not,
+see .
*/
diff -r c4f5c781c3ca -r 97e49b588f5d libgui/qterminal/libqterminal/win32/QWinTerminalImpl.h
--- a/libgui/qterminal/libqterminal/win32/QWinTerminalImpl.h Wed Oct 23 22:48:29 2013 -0400
+++ b/libgui/qterminal/libqterminal/win32/QWinTerminalImpl.h Tue Nov 05 12:27:42 2013 -0500
@@ -4,18 +4,19 @@
This file is part of QConsole.
-Foobar is free software: you can redistribute it and/or modify
+This program 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.
-QConsole is distributed in the hope that it will be useful,
+This program 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 Foobar. If not, see .
+along with this program. If not,
+see .
*/
diff -r c4f5c781c3ca -r 97e49b588f5d libgui/src/color-picker.cc
--- a/libgui/src/color-picker.cc Wed Oct 23 22:48:29 2013 -0400
+++ b/libgui/src/color-picker.cc Tue Nov 05 12:27:42 2013 -0500
@@ -31,9 +31,9 @@
{
_color = old_color;
setFlat (true);
- setFocusPolicy(Qt::NoFocus); // no focus, would changes the color
+ setFocusPolicy (Qt::NoFocus); // no focus, would changes the color
update_button ();
- connect(this, SIGNAL (clicked ()), SLOT (select_color ()));
+ connect (this, SIGNAL (clicked ()), SLOT (select_color ()));
}
// slot for bitton clicked: selct a new color using QColorDialog
@@ -56,12 +56,12 @@
QWidget *p = parentWidget ();
QString bordercolor
- = p ? p->palette().text().color().name() : QString ("#000000");
+ = p ? p->palette ().text ().color ().name () : QString ("#000000");
- QString css = QString("background-color: %1; border: 1px solid %2;")
- .arg(_color.name())
- .arg(bordercolor);
+ QString css = QString ("background-color: %1; border: 1px solid %2;")
+ .arg (_color.name ())
+ .arg (bordercolor);
- setStyleSheet(css);
+ setStyleSheet (css);
repaint ();
}
diff -r c4f5c781c3ca -r 97e49b588f5d libgui/src/color-picker.h
--- a/libgui/src/color-picker.h Wed Oct 23 22:48:29 2013 -0400
+++ b/libgui/src/color-picker.h Tue Nov 05 12:27:42 2013 -0500
@@ -35,7 +35,7 @@
Q_OBJECT
public:
- color_picker (QColor color = QColor(0,0,0), QWidget *parent = 0);
+ color_picker (QColor color = QColor (0,0,0), QWidget *parent = 0);
QColor color () const { return _color; }
private slots:
diff -r c4f5c781c3ca -r 97e49b588f5d libgui/src/dialog.cc
--- a/libgui/src/dialog.cc Wed Oct 23 22:48:29 2013 -0400
+++ b/libgui/src/dialog.cc Tue Nov 05 12:27:42 2013 -0500
@@ -46,7 +46,8 @@
QUIWidgetCreator::QUIWidgetCreator (void)
: QObject (), dialog_result (-1), dialog_button (),
- string_list (new QStringList ()), list_index (new QIntList ()), path_name (new QString ())
+ string_list (new QStringList ()), list_index (new QIntList ()),
+ path_name (new QString ())
{ }
@@ -264,7 +265,7 @@
mainLayout->addLayout (buttonsLayout);
setLayout (mainLayout);
if (fixed_layout)
- layout()->setSizeConstraint (QLayout::SetFixedSize);
+ layout ()->setSizeConstraint (QLayout::SetFixedSize);
// If empty, make blank rather than use default OS behavior.
setWindowTitle (title.isEmpty () ? " " : title);
@@ -330,64 +331,64 @@
#define LINE_EDIT_FOLLOWS_PROMPT 0
#if LINE_EDIT_FOLLOWS_PROMPT
- // Prompt on left followed by input on right.
- QGridLayout *promptInputLayout = new QGridLayout;
+ // Prompt on left followed by input on right.
+ QGridLayout *promptInputLayout = new QGridLayout;
#else
- // Prompt aligned above input.
- QVBoxLayout *promptInputLayout = new QVBoxLayout;
+ // Prompt aligned above input.
+ QVBoxLayout *promptInputLayout = new QVBoxLayout;
#endif
- int N_gridrows = prompt.size ();
- for (int i = 0; i < N_gridrows; i++)
- {
- QLabel *label = new QLabel (prompt.at (i));
- QLineEdit *line_edit = new QLineEdit (defaults.at (i));
- if (nr.at (i) > 0)
- {
- QSize qsize = line_edit->sizeHint ();
- int intval = qsize.height () * nr.at (i);
- line_edit->setFixedHeight (intval);
- if (nc.at (i) > 0)
- {
- intval = qsize.height () * nc.at (i) / 2;
- line_edit->setFixedWidth (intval);
- }
- }
- input_line << line_edit;
+ int N_gridrows = prompt.size ();
+ for (int i = 0; i < N_gridrows; i++)
+ {
+ QLabel *label = new QLabel (prompt.at (i));
+ QLineEdit *line_edit = new QLineEdit (defaults.at (i));
+ if (nr.at (i) > 0)
+ {
+ QSize qsize = line_edit->sizeHint ();
+ int intval = qsize.height () * nr.at (i);
+ line_edit->setFixedHeight (intval);
+ if (nc.at (i) > 0)
+ {
+ intval = qsize.height () * nc.at (i) / 2;
+ line_edit->setFixedWidth (intval);
+ }
+ }
+ input_line << line_edit;
#if LINE_EDIT_FOLLOWS_PROMPT
- promptInputLayout->addWidget (label, i + 1, 0);
- promptInputLayout->addWidget (line_edit, i + 1, 1);
+ promptInputLayout->addWidget (label, i + 1, 0);
+ promptInputLayout->addWidget (line_edit, i + 1, 1);
#else
- promptInputLayout->addWidget (label);
- promptInputLayout->addWidget (line_edit);
+ promptInputLayout->addWidget (label);
+ promptInputLayout->addWidget (line_edit);
#endif
- }
+ }
#undef LINE_EDIT_FOLLOWS_PROMPT
- QPushButton *buttonOk = new QPushButton("OK");
- QPushButton *buttonCancel = new QPushButton("Cancel");
- QHBoxLayout *buttonsLayout = new QHBoxLayout;
- buttonsLayout->addStretch (1);
- buttonsLayout->addWidget (buttonOk);
- buttonsLayout->addWidget (buttonCancel);
+ QPushButton *buttonOk = new QPushButton ("OK");
+ QPushButton *buttonCancel = new QPushButton ("Cancel");
+ QHBoxLayout *buttonsLayout = new QHBoxLayout;
+ buttonsLayout->addStretch (1);
+ buttonsLayout->addWidget (buttonOk);
+ buttonsLayout->addWidget (buttonCancel);
- QVBoxLayout *mainLayout = new QVBoxLayout;
- mainLayout->addLayout (promptInputLayout);
- mainLayout->addSpacing (12);
- mainLayout->addLayout (buttonsLayout);
- setLayout (mainLayout);
+ QVBoxLayout *mainLayout = new QVBoxLayout;
+ mainLayout->addLayout (promptInputLayout);
+ mainLayout->addSpacing (12);
+ mainLayout->addLayout (buttonsLayout);
+ setLayout (mainLayout);
- // If empty, make blank rather than use default OS behavior.
- setWindowTitle (title.isEmpty () ? " " : title);
+ // If empty, make blank rather than use default OS behavior.
+ setWindowTitle (title.isEmpty () ? " " : title);
- connect (buttonOk, SIGNAL (clicked ()),
- this, SLOT (buttonOk_clicked ()));
+ connect (buttonOk, SIGNAL (clicked ()),
+ this, SLOT (buttonOk_clicked ()));
- connect (buttonCancel, SIGNAL (clicked ()),
- this, SLOT (buttonCancel_clicked ()));
+ connect (buttonCancel, SIGNAL (clicked ()),
+ this, SLOT (buttonCancel_clicked ()));
- connect (this, SIGNAL (finish_input (const QStringList&, int)),
- &uiwidget_creator,
- SLOT (input_finished (const QStringList&, int)));
+ connect (this, SIGNAL (finish_input (const QStringList&, int)),
+ &uiwidget_creator,
+ SLOT (input_finished (const QStringList&, int)));
}
@@ -413,7 +414,7 @@
done (QDialog::Rejected);
}
-
+
void
InputDialog::reject (void)
{
@@ -423,7 +424,7 @@
FileDialog::FileDialog (const QStringList& name_filters, const QString& title,
const QString& filename, const QString& dirname,
const QString& multimode)
- : QFileDialog()
+ : QFileDialog ()
{
// Create a NonModal message.
setWindowModality (Qt::NonModal);
@@ -438,10 +439,10 @@
}
else if (multimode == "create") // uiputfile
{
- setFileMode (QFileDialog::AnyFile);
+ setFileMode (QFileDialog::AnyFile);
setAcceptMode (QFileDialog::AcceptSave);
setOption (QFileDialog::DontConfirmOverwrite, false);
- setConfirmOverwrite(true);
+ setConfirmOverwrite (true);
}
else if (multimode == "dir") // uigetdir
{
@@ -459,7 +460,7 @@
setNameFilters (name_filters);
selectFile (filename);
-
+
connect (this,
SIGNAL (finish_input (const QStringList&, const QString&, int)),
&uiwidget_creator,
@@ -476,7 +477,7 @@
}
-void FileDialog::accept(void)
+void FileDialog::accept (void)
{
QStringList string_result;
QString path;
@@ -495,7 +496,7 @@
QStringList name_filters = nameFilters ();
idx = name_filters.indexOf (selectedNameFilter ()) + 1;
-
+
// send the selected info
emit finish_input (string_result, path, idx);
done (QDialog::Accepted);
diff -r c4f5c781c3ca -r 97e49b588f5d libgui/src/dialog.h
--- a/libgui/src/dialog.h Wed Oct 23 22:48:29 2013 -0400
+++ b/libgui/src/dialog.h Tue Nov 05 12:27:42 2013 -0500
@@ -21,8 +21,8 @@
*/
-#if !defined (octave_guifcn_dialog_h)
-#define octave_guifcn_dialog_h 1
+#if !defined (octave_dialog_h)
+#define octave_dialog_h 1
#include
#include
@@ -104,8 +104,8 @@
const QStringList *get_string_list (void) { return string_list; }
- bool signal_filedialog (const QStringList& filters, const QString& title,
- const QString& filename, const QString& dirname,
+ bool signal_filedialog (const QStringList& filters, const QString& title,
+ const QString& filename, const QString& dirname,
const QString &multimode)
{
emit create_filedialog (filters, title, filename, dirname, multimode);
@@ -252,7 +252,7 @@
public:
explicit FileDialog (const QStringList& filters,
- const QString& title, const QString& filename,
+ const QString& title, const QString& filename,
const QString& dirname, const QString& multimode);
signals:
diff -r c4f5c781c3ca -r 97e49b588f5d libgui/src/documentation-dock-widget.cc
--- a/libgui/src/documentation-dock-widget.cc Wed Oct 23 22:48:29 2013 -0400
+++ b/libgui/src/documentation-dock-widget.cc Tue Nov 05 12:27:42 2013 -0500
@@ -37,8 +37,8 @@
_webinfo = new webinfo (this);
setWidget (_webinfo);
- connect (p, SIGNAL(show_doc_signal(const QString &)),
- this, SLOT(showDoc(const QString &)));
+ connect (p, SIGNAL (show_doc_signal (const QString &)),
+ this, SLOT (showDoc (const QString &)));
}
void
diff -r c4f5c781c3ca -r 97e49b588f5d libgui/src/files-dock-widget.cc
--- a/libgui/src/files-dock-widget.cc Wed Oct 23 22:48:29 2013 -0400
+++ b/libgui/src/files-dock-widget.cc Tue Nov 05 12:27:42 2013 -0500
@@ -63,7 +63,7 @@
: octave_dock_widget (p)
{
setObjectName ("FilesDockWidget");
- setWindowIcon (QIcon(":/actions/icons/logo.png"));
+ setWindowIcon (QIcon (":/actions/icons/logo.png"));
set_title (tr ("File Browser"));
setToolTip (tr ("Browse your files."));
@@ -84,53 +84,60 @@
_current_directory = new QComboBox (_navigation_tool_bar);
_current_directory->setToolTip (tr ("Enter the path or filename"));
- _current_directory->setEditable(true);
- _current_directory->setMaxCount(MaxMRUDirs);
- _current_directory->setInsertPolicy(QComboBox::NoInsert);
- _current_directory->setSizeAdjustPolicy (QComboBox::AdjustToMinimumContentsLengthWithIcon);
- QSizePolicy sizePol(QSizePolicy::Expanding, QSizePolicy::Preferred);
- _current_directory->setSizePolicy(sizePol);
+ _current_directory->setEditable (true);
+ _current_directory->setMaxCount (MaxMRUDirs);
+ _current_directory->setInsertPolicy (QComboBox::NoInsert);
+ _current_directory->setSizeAdjustPolicy (
+ QComboBox::AdjustToMinimumContentsLengthWithIcon);
+ QSizePolicy sizePol (QSizePolicy::Expanding, QSizePolicy::Preferred);
+ _current_directory->setSizePolicy (sizePol);
- QAction *directory_up_action = new QAction (QIcon(":/actions/icons/up.png"),
+ QAction *directory_up_action = new QAction (QIcon (":/actions/icons/up.png"),
"", _navigation_tool_bar);
directory_up_action->setToolTip (tr ("Move up one directory"));
- _sync_browser_directory_action = new QAction (QIcon(":/actions/icons/reload.png"),
- tr("Show octave directory"), _navigation_tool_bar);
- _sync_browser_directory_action->setToolTip (tr ("Goto current octave directory"));
+ _sync_browser_directory_action
+ = new QAction (QIcon (":/actions/icons/reload.png"),
+ tr ("Show octave directory"), _navigation_tool_bar);
+ _sync_browser_directory_action->setToolTip (
+ tr ("Goto current octave directory"));
_sync_browser_directory_action->setEnabled ("false");
- _sync_octave_directory_action = new QAction (QIcon(":/actions/icons/ok.png"),
- tr("Set octave directory"), _navigation_tool_bar);
- _sync_octave_directory_action->setToolTip (tr ("Set octave directroy to current browser directory"));
+ _sync_octave_directory_action
+ = new QAction (QIcon (":/actions/icons/ok.png"),
+ tr ("Set octave directory"), _navigation_tool_bar);
+ _sync_octave_directory_action->setToolTip (
+ tr ("Set octave directroy to current browser directory"));
_sync_octave_directory_action->setEnabled ("false");
- QToolButton * popdown_button = new QToolButton();
- popdown_button->setToolTip(tr ("Actions on current directory"));
- QMenu * popdown_menu = new QMenu();
+ QToolButton * popdown_button = new QToolButton ();
+ popdown_button->setToolTip (tr ("Actions on current directory"));
+ QMenu * popdown_menu = new QMenu ();
popdown_menu->addAction (QIcon (":/actions/icons/home.png"),
tr ("Show Home directory"),
this, SLOT (popdownmenu_home (bool)));
- popdown_menu->addAction(_sync_browser_directory_action);
- popdown_menu->addAction(_sync_octave_directory_action);
- popdown_button->setMenu(popdown_menu);
- popdown_button->setPopupMode(QToolButton::InstantPopup);
- popdown_button->setDefaultAction(new QAction(QIcon(":/actions/icons/gear.png"),"", _navigation_tool_bar));
+ popdown_menu->addAction (_sync_browser_directory_action);
+ popdown_menu->addAction (_sync_octave_directory_action);
+ popdown_button->setMenu (popdown_menu);
+ popdown_button->setPopupMode (QToolButton::InstantPopup);
+ popdown_button->setDefaultAction (new QAction (
+ QIcon (":/actions/icons/gear.png"), "",
+ _navigation_tool_bar));
- popdown_menu->addSeparator();
+ popdown_menu->addSeparator ();
popdown_menu->addAction (QIcon (":/actions/icons/search.png"),
tr ("Search directory"),
this, SLOT (popdownmenu_search_dir (bool)));
- popdown_menu->addSeparator();
- popdown_menu->addAction( tr ("Find Files ..."),
- this, SLOT(popdownmenu_findfiles(bool)));
- popdown_menu->addSeparator();
- popdown_menu->addAction(QIcon(":/actions/icons/filenew.png"),
- tr ("New File"),
- this, SLOT(popdownmenu_newfile(bool)));
- popdown_menu->addAction(QIcon(":/actions/icons/folder_new.png"),
- tr ("New Directory"),
- this, SLOT(popdownmenu_newdir(bool)));
+ popdown_menu->addSeparator ();
+ popdown_menu->addAction ( tr ("Find Files ..."),
+ this, SLOT (popdownmenu_findfiles (bool)));
+ popdown_menu->addSeparator ();
+ popdown_menu->addAction (QIcon (":/actions/icons/filenew.png"),
+ tr ("New File"),
+ this, SLOT (popdownmenu_newfile (bool)));
+ popdown_menu->addAction (QIcon (":/actions/icons/folder_new.png"),
+ tr ("New Directory"),
+ this, SLOT (popdownmenu_newdir (bool)));
_navigation_tool_bar->addWidget (_current_directory);
_navigation_tool_bar->addAction (directory_up_action);
@@ -148,7 +155,7 @@
_file_system_model = new QFileSystemModel (this);
_file_system_model->setFilter (QDir::NoDotAndDotDot | QDir::AllEntries);
QModelIndex rootPathIndex = _file_system_model->setRootPath (
- curr_dir.absolutePath ());
+ curr_dir.absolutePath ());
// Attach the model to the QTreeView and set the root index
_file_tree_view = new FileTreeViewer (container);
@@ -162,26 +169,31 @@
// get sort column and order as well as cloumn state (order and width)
QSettings *settings = resource_manager::get_settings ();
- // FIXME -- what should happen if settings is 0?
+ // FIXME: what should happen if settings is 0?
_file_tree_view->sortByColumn (
- settings->value ("filesdockwidget/sort_files_by_column",0).toInt (),
- static_cast(settings->value ("filesdockwidget/sort_files_by_order",Qt::AscendingOrder).toUInt ())
+ settings->value ("filesdockwidget/sort_files_by_column",0).toInt (),
+ static_cast
+ (settings->value ("filesdockwidget/sort_files_by_order",
+ Qt::AscendingOrder).toUInt ())
);
- _file_tree_view->header ()->restoreState (settings->value ("filesdockwidget/column_state").toByteArray ());
-
- QStringList mru_dirs = settings->value ("filesdockwidget/mru_dir_list").toStringList ();
- _current_directory->addItems(mru_dirs);
+ _file_tree_view->header ()->restoreState (
+ settings->value ("filesdockwidget/column_state").toByteArray ());
- _current_directory->setEditText(_file_system_model->fileInfo (rootPathIndex).
- absoluteFilePath ());
+ QStringList mru_dirs =
+ settings->value ("filesdockwidget/mru_dir_list").toStringList ();
+ _current_directory->addItems (mru_dirs);
+
+ _current_directory->setEditText (
+ _file_system_model->fileInfo (rootPathIndex). absoluteFilePath ());
connect (_file_tree_view, SIGNAL (doubleClicked (const QModelIndex &)),
this, SLOT (item_double_clicked (const QModelIndex &)));
// add context menu to tree_view
- _file_tree_view->setContextMenuPolicy(Qt::CustomContextMenu);
- connect(_file_tree_view, SIGNAL(customContextMenuRequested(const QPoint &)),
- this, SLOT(contextmenu_requested(const QPoint &)));
+ _file_tree_view->setContextMenuPolicy (Qt::CustomContextMenu);
+ connect (_file_tree_view,
+ SIGNAL (customContextMenuRequested (const QPoint &)),
+ this, SLOT (contextmenu_requested (const QPoint &)));
// Layout the widgets vertically with the toolbar on top
QVBoxLayout *vbox_layout = new QVBoxLayout ();
@@ -192,10 +204,11 @@
container->setLayout (vbox_layout);
- // TODO: Add right-click contextual menus for copying, pasting, deleting files (and others)
+ // TODO: Add right-click contextual menus for copying, pasting,
+ // deleting files (and others).
- connect (_current_directory->lineEdit(), SIGNAL (returnPressed ()),
- this, SLOT (accept_directory_line_edit ()));
+ connect (_current_directory->lineEdit (), SIGNAL (returnPressed ()),
+ this, SLOT (accept_directory_line_edit ()));
connect (_current_directory, SIGNAL (activated (const QString &)),
this, SLOT (set_current_directory (const QString &)));
@@ -207,7 +220,7 @@
_current_directory->setCompleter (completer);
setFocusProxy (_current_directory);
-
+
_sync_octave_dir = true; // default, overwirtten with notice_settings ()
_octave_dir = "";
}
@@ -219,13 +232,14 @@
Qt::SortOrder sort_order = _file_tree_view->header ()->sortIndicatorOrder ();
settings->setValue ("filesdockwidget/sort_files_by_column", sort_column);
settings->setValue ("filesdockwidget/sort_files_by_order", sort_order);
- settings->setValue ("filesdockwidget/column_state", _file_tree_view->header ()->saveState ());
+ settings->setValue ("filesdockwidget/column_state",
+ _file_tree_view->header ()->saveState ());
QStringList dirs;
- for(int i=0; i< _current_directory->count(); i++)
- {
- dirs.append(_current_directory->itemText(i));
- }
+ for (int i=0; i< _current_directory->count (); i++)
+ {
+ dirs.append (_current_directory->itemText (i));
+ }
settings->setValue ("filesdockwidget/mru_dir_list", dirs);
settings->sync ();
@@ -254,7 +268,9 @@
void
files_dock_widget::change_directory_up (void)
{
- QDir dir = QDir (_file_system_model->filePath (_file_tree_view->rootIndex ()));
+ QDir dir
+ = QDir (_file_system_model->filePath (_file_tree_view->rootIndex ()));
+
dir.cdUp ();
display_directory (dir.absolutePath ());
}
@@ -262,7 +278,9 @@
void
files_dock_widget::do_sync_octave_directory (void)
{
- QDir dir = QDir (_file_system_model->filePath (_file_tree_view->rootIndex ()));
+ QDir dir
+ = QDir (_file_system_model->filePath (_file_tree_view->rootIndex ()));
+
emit displayed_directory_changed (dir.absolutePath ());
}
@@ -293,16 +311,18 @@
_file_system_model->setRootPath (fileInfo.absoluteFilePath ());
_file_system_model->sort (0, Qt::AscendingOrder);
if (_sync_octave_dir && set_octave_dir)
- process_set_current_dir(fileInfo.absoluteFilePath ());
+ process_set_current_dir (fileInfo.absoluteFilePath ());
- // see if its in the list, and if it is, remove it and then, put at top of the list
- int index = _current_directory->findText(fileInfo.absoluteFilePath ());
- if(index != -1)
- {
- _current_directory->removeItem(index);
- }
- _current_directory->insertItem(0, fileInfo.absoluteFilePath ());
- _current_directory->setCurrentIndex(0);
+ // see if its in the list, and if it is,
+ // remove it and then, put at top of the list
+ int index
+ = _current_directory->findText (fileInfo.absoluteFilePath ());
+ if (index != -1)
+ {
+ _current_directory->removeItem (index);
+ }
+ _current_directory->insertItem (0, fileInfo.absoluteFilePath ());
+ _current_directory->setCurrentIndex (0);
}
else
{
@@ -330,34 +350,34 @@
QDesktopServices::openUrl (QUrl::fromLocalFile (file));
}
-void
+void
files_dock_widget::contextmenu_requested (const QPoint& mpos)
{
- QMenu menu(this);
+ QMenu menu (this);
QModelIndex index = _file_tree_view->indexAt (mpos);
//QAbstractItemModel *m = _file_tree_view->model ();
- if (index.isValid())
- {
- QFileInfo info = _file_system_model->fileInfo(index);
+ if (index.isValid ())
+ {
+ QFileInfo info = _file_system_model->fileInfo (index);
- menu.addAction (QIcon (":/actions/icons/fileopen.png"), tr("Open"),
- this, SLOT(contextmenu_open(bool)));
+ menu.addAction (QIcon (":/actions/icons/fileopen.png"), tr ("Open"),
+ this, SLOT (contextmenu_open (bool)));
- menu.addAction (tr("Open in Default Application"),
+ menu.addAction (tr ("Open in Default Application"),
this, SLOT (contextmenu_open_in_app (bool)));
- menu.addAction (tr("Copy Selection to Clipboard"),
+ menu.addAction (tr ("Copy Selection to Clipboard"),
this, SLOT (contextmenu_copy_selection (bool)));
if (info.isFile () && info.suffix () == "m")
menu.addAction (QIcon (":/actions/icons/artsbuilderexecute.png"),
- tr("Run"), this, SLOT(contextmenu_run(bool)));
+ tr ("Run"), this, SLOT (contextmenu_run (bool)));
if (info.isFile ())
- menu.addAction (tr("Load Data"), this, SLOT(contextmenu_load(bool)));
+ menu.addAction (tr ("Load Data"), this, SLOT (contextmenu_load (bool)));
if (info.isDir ())
{
@@ -366,26 +386,27 @@
tr ("Set Current Directory"),
this, SLOT (contextmenu_setcurrentdir (bool)));
menu.addSeparator ();
- menu.addAction (tr ("Find Files ..."), this, SLOT(contextmenu_findfiles(bool)));
+ menu.addAction (tr ("Find Files ..."), this,
+ SLOT (contextmenu_findfiles (bool)));
}
- menu.addSeparator();
- menu.addAction (tr ("Rename"), this, SLOT(contextmenu_rename(bool)));
- menu.addAction (QIcon(":/actions/icons/editdelete.png"), tr("Delete"),
- this, SLOT(contextmenu_delete(bool)));
+ menu.addSeparator ();
+ menu.addAction (tr ("Rename"), this, SLOT (contextmenu_rename (bool)));
+ menu.addAction (QIcon (":/actions/icons/editdelete.png"), tr ("Delete"),
+ this, SLOT (contextmenu_delete (bool)));
- if (info.isDir())
+ if (info.isDir ())
{
- menu.addSeparator();
+ menu.addSeparator ();
menu.addAction (QIcon (":/actions/icons/filenew.png"),
tr ("New File"),
- this, SLOT(contextmenu_newfile(bool)));
+ this, SLOT (contextmenu_newfile (bool)));
menu.addAction (QIcon (":/actions/icons/folder_new.png"),
- tr("New Directory"),
- this, SLOT(contextmenu_newdir(bool)));
+ tr ("New Directory"),
+ this, SLOT (contextmenu_newdir (bool)));
}
- menu.exec(_file_tree_view->mapToGlobal(mpos));
+ menu.exec (_file_tree_view->mapToGlobal (mpos));
}
}
@@ -397,9 +418,9 @@
QItemSelectionModel *m = _file_tree_view->selectionModel ();
QModelIndexList rows = m->selectedRows ();
- for( QModelIndexList::iterator it = rows.begin (); it != rows.end (); it++)
+ for ( QModelIndexList::iterator it = rows.begin (); it != rows.end (); it++)
{
- item_double_clicked(*it);
+ item_double_clicked (*it);
}
}
@@ -443,7 +464,7 @@
{
QModelIndex index = rows[0];
- QFileInfo info = _file_system_model->fileInfo(index);
+ QFileInfo info = _file_system_model->fileInfo (index);
emit load_file_signal (info.fileName ());
}
@@ -459,146 +480,151 @@
{
QModelIndex index = rows[0];
- QFileInfo info = _file_system_model->fileInfo(index);
+ QFileInfo info = _file_system_model->fileInfo (index);
emit run_file_signal (info);
}
}
-void
+void
files_dock_widget::contextmenu_rename (bool)
{
QItemSelectionModel *m = _file_tree_view->selectionModel ();
QModelIndexList rows = m->selectedRows ();
- if(rows.size() > 0)
+ if (rows.size () > 0)
{
QModelIndex index = rows[0];
- QFileInfo info = _file_system_model->fileInfo(index);
- QDir path = info.absoluteDir();
- QString old_name = info.fileName();
+ QFileInfo info = _file_system_model->fileInfo (index);
+ QDir path = info.absoluteDir ();
+ QString old_name = info.fileName ();
bool ok;
- QString new_name = QInputDialog::getText (this, tr("Rename file/directory"),
- tr("Rename file/directory:\n") + old_name + tr("\n to: "),
- QLineEdit::Normal, old_name, &ok);
- if(ok && new_name.length()>0)
+ QString new_name
+ = QInputDialog::getText (this, tr ("Rename file/directory"),
+ tr ("Rename file/directory:\n")
+ + old_name + tr ("\n to: "),
+ QLineEdit::Normal, old_name, &ok);
+ if (ok && new_name.length () > 0)
{
- new_name = path.absolutePath() + "/" + new_name;
- old_name = path.absolutePath() + "/" + old_name;
- path.rename(old_name, new_name);
- _file_system_model->revert();
+ new_name = path.absolutePath () + "/" + new_name;
+ old_name = path.absolutePath () + "/" + old_name;
+ path.rename (old_name, new_name);
+ _file_system_model->revert ();
}
}
}
-void
+void
files_dock_widget::contextmenu_delete (bool)
{
QItemSelectionModel *m = _file_tree_view->selectionModel ();
QModelIndexList rows = m->selectedRows ();
- for( QModelIndexList::iterator it = rows.begin (); it != rows.end (); it++)
+ for ( QModelIndexList::iterator it = rows.begin (); it != rows.end (); it++)
{
QModelIndex index = *it;
- QFileInfo info = _file_system_model->fileInfo(index);
-
- if(QMessageBox::question(this, tr("Delete file/directory"),
- tr("Are you sure you want to delete\n") + info.filePath(),
- QMessageBox::Yes|QMessageBox::No) == QMessageBox::Yes)
- {
- if(info.isDir())
- {
- // see if direcory is empty
- QDir path(info.absoluteFilePath());
- QList fileLst = path.entryInfoList(QDir::AllEntries | QDir::NoDotAndDotDot);
+ QFileInfo info = _file_system_model->fileInfo (index);
- if(fileLst.count() != 0)
- QMessageBox::warning(this, tr("Delete file/directory"),
- tr("Can not delete a directory that is not empty"));
- else
- _file_system_model->rmdir(index);
- }
- else
- {
- _file_system_model->remove(index);
- }
+ if (QMessageBox::question (this, tr ("Delete file/directory"),
+ tr ("Are you sure you want to delete\n")
+ + info.filePath (),
+ QMessageBox::Yes|QMessageBox::No)
+ == QMessageBox::Yes)
+ {
+ if (info.isDir ())
+ {
+ // see if direcory is empty
+ QDir path (info.absoluteFilePath ());
+ QList fileLst = path.entryInfoList (QDir::AllEntries |
+ QDir::NoDotAndDotDot);
- _file_system_model->revert();
+ if (fileLst.count () != 0)
+ QMessageBox::warning (this, tr ("Delete file/directory"),
+ tr ("Can not delete a directory that is not empty"));
+ else
+ _file_system_model->rmdir (index);
+ }
+ else
+ {
+ _file_system_model->remove (index);
+ }
+
+ _file_system_model->revert ();
}
}
}
-void
+void
files_dock_widget::contextmenu_newfile (bool)
{
QItemSelectionModel *m = _file_tree_view->selectionModel ();
QModelIndexList rows = m->selectedRows ();
- if(rows.size() > 0)
+ if (rows.size () > 0)
{
QModelIndex index = rows[0];
- QFileInfo info = _file_system_model->fileInfo(index);
- QString parent_dir = info.filePath();
+ QFileInfo info = _file_system_model->fileInfo (index);
+ QString parent_dir = info.filePath ();
- process_new_file(parent_dir);
+ process_new_file (parent_dir);
}
}
-void
+void
files_dock_widget::contextmenu_newdir (bool)
{
QItemSelectionModel *m = _file_tree_view->selectionModel ();
QModelIndexList rows = m->selectedRows ();
- if(rows.size() > 0)
+ if (rows.size () > 0)
{
QModelIndex index = rows[0];
- QFileInfo info = _file_system_model->fileInfo(index);
- QString parent_dir = info.filePath();
+ QFileInfo info = _file_system_model->fileInfo (index);
+ QString parent_dir = info.filePath ();
- process_new_dir(parent_dir);
+ process_new_dir (parent_dir);
}
}
-void
+void
files_dock_widget::contextmenu_setcurrentdir (bool)
{
QItemSelectionModel *m = _file_tree_view->selectionModel ();
QModelIndexList rows = m->selectedRows ();
- if(rows.size() > 0)
+ if (rows.size () > 0)
{
QModelIndex index = rows[0];
- QFileInfo info = _file_system_model->fileInfo(index);
+ QFileInfo info = _file_system_model->fileInfo (index);
- if(info.isDir())
+ if (info.isDir ())
{
- process_set_current_dir(info.absoluteFilePath ());
+ process_set_current_dir (info.absoluteFilePath ());
}
}
}
-void
+void
files_dock_widget::contextmenu_findfiles (bool)
{
QItemSelectionModel *m = _file_tree_view->selectionModel ();
QModelIndexList rows = m->selectedRows ();
- if(rows.size() > 0)
+ if (rows.size () > 0)
{
QModelIndex index = rows[0];
- QFileInfo info = _file_system_model->fileInfo(index);
+ QFileInfo info = _file_system_model->fileInfo (index);
- if(info.isDir())
+ if (info.isDir ())
{
- process_find_files(info.absoluteFilePath ());
+ process_find_files (info.absoluteFilePath ());
}
}
}
@@ -615,16 +641,22 @@
// file names are always shown, other columns can be hidden by settings
_file_tree_view->setColumnHidden (0, false);
- _file_tree_view->setColumnHidden (1, !settings->value ("filesdockwidget/showFileSize",false).toBool ());
- _file_tree_view->setColumnHidden (2, !settings->value ("filesdockwidget/showFileType",false).toBool ());
- _file_tree_view->setColumnHidden (3, !settings->value ("filesdockwidget/showLastModified",false).toBool ());
- _file_tree_view->setAlternatingRowColors (settings->value ("filesdockwidget/useAlternatingRowColors",true).toBool ());
+ _file_tree_view->setColumnHidden (1,
+ !settings->value ("filesdockwidget/showFileSize",false).toBool ());
+ _file_tree_view->setColumnHidden (2,
+ !settings->value ("filesdockwidget/showFileType",false).toBool ());
+ _file_tree_view->setColumnHidden (3,
+ !settings->value ("filesdockwidget/showLastModified",false).toBool ());
+ _file_tree_view->setAlternatingRowColors (
+ settings->value ("filesdockwidget/useAlternatingRowColors",true).toBool ());
if (settings->value ("filesdockwidget/showHiddenFiles",false).toBool ())
{
// TODO: React on option for hidden files.
}
- // enalbe the buttons to sync octave/browser dir only if this is not done by default
- _sync_octave_dir = settings->value ("filesdockwidget/sync_octave_directory",false).toBool ();
+ // enable the buttons to sync octave/browser dir
+ // only if this is not done by default
+ _sync_octave_dir
+ = settings->value ("filesdockwidget/sync_octave_directory",false).toBool ();
_sync_octave_directory_action->setEnabled (!_sync_octave_dir);
_sync_browser_directory_action->setEnabled (!_sync_octave_dir);
@@ -637,9 +669,9 @@
files_dock_widget::popdownmenu_home (bool)
{
QString dir = qgetenv ("HOME");
- if (dir.isEmpty())
+ if (dir.isEmpty ())
dir = QDir::homePath ();
-
+
set_current_directory (dir);
}
@@ -647,27 +679,28 @@
files_dock_widget::popdownmenu_search_dir (bool)
{
QString dir = QFileDialog::getExistingDirectory
- (this, tr ("Set directory of file browser"),_file_system_model->rootPath(),
- QFileDialog::DontUseNativeDialog);
+ (this, tr ("Set directory of file browser"),
+ _file_system_model->rootPath (),
+ QFileDialog::DontUseNativeDialog);
set_current_directory (dir);
}
void
files_dock_widget::popdownmenu_findfiles (bool)
{
- process_find_files(_file_system_model->rootPath());
+ process_find_files (_file_system_model->rootPath ());
}
void
files_dock_widget::popdownmenu_newdir (bool)
{
- process_new_dir(_file_system_model->rootPath());
+ process_new_dir (_file_system_model->rootPath ());
}
void
files_dock_widget::popdownmenu_newfile (bool)
{
- process_new_file(_file_system_model->rootPath());
+ process_new_file (_file_system_model->rootPath ());
}
void
@@ -675,15 +708,16 @@
{
bool ok;
- QString name = QInputDialog::getText (this, tr("Create File"), tr("Create file in\n") + parent_dir,
- QLineEdit::Normal, "New File.txt", &ok);
- if(ok && name.length()>0)
+ QString name = QInputDialog::getText (this, tr ("Create File"),
+ tr ("Create file in\n") + parent_dir,
+ QLineEdit::Normal, "New File.txt", &ok);
+ if (ok && name.length () > 0)
{
name = parent_dir + "/" + name;
- QFile file(name);
- file.open(QIODevice::WriteOnly);
- _file_system_model->revert();
+ QFile file (name);
+ file.open (QIODevice::WriteOnly);
+ _file_system_model->revert ();
}
}
@@ -692,24 +726,26 @@
{
bool ok;
- QString name = QInputDialog::getText (this, tr("Create Directory"), tr("Create folder in\n") + parent_dir,
- QLineEdit::Normal, "New Directory", &ok);
- if(ok && name.length()>0)
+ QString name = QInputDialog::getText (this, tr ("Create Directory"),
+ tr ("Create folder in\n") + parent_dir,
+ QLineEdit::Normal, "New Directory",
+ &ok);
+ if (ok && name.length () > 0)
{
- QDir dir(parent_dir);
- dir.mkdir(name);
- _file_system_model->revert();
+ QDir dir (parent_dir);
+ dir.mkdir (name);
+ _file_system_model->revert ();
}
}
-void files_dock_widget::process_set_current_dir(const QString & dir)
+void files_dock_widget::process_set_current_dir (const QString & dir)
{
emit displayed_directory_changed (dir);
}
-void files_dock_widget::process_find_files(const QString & dir)
+void files_dock_widget::process_find_files (const QString & dir)
{
- emit find_files_signal(dir);
+ emit find_files_signal (dir);
}
void
@@ -737,7 +773,7 @@
QClipboard *clipboard = QApplication::clipboard ();
QString str = clipboard->text ();
QLineEdit * edit = _current_directory->lineEdit ();
- if (edit && str.length () > 0)
+ if (edit && str.length () > 0)
edit->insert (str);
}
}
diff -r c4f5c781c3ca -r 97e49b588f5d libgui/src/files-dock-widget.h
--- a/libgui/src/files-dock-widget.h Wed Oct 23 22:48:29 2013 -0400
+++ b/libgui/src/files-dock-widget.h Tue Nov 05 12:27:42 2013 -0500
@@ -97,8 +97,8 @@
void contextmenu_findfiles (bool);
/* popdown menu options */
- void popdownmenu_newfile(bool);
- void popdownmenu_newdir(bool);
+ void popdownmenu_newfile (bool);
+ void popdownmenu_newdir (bool);
void popdownmenu_search_dir (bool);
void popdownmenu_findfiles (bool);
void popdownmenu_home (bool);
@@ -125,10 +125,10 @@
void find_files_signal (const QString &startdir);
private:
- void process_new_file(const QString &parent_name);
- void process_new_dir(const QString &parent_name);
- void process_set_current_dir(const QString &parent_name);
- void process_find_files(const QString &dir_name);
+ void process_new_file (const QString &parent_name);
+ void process_new_dir (const QString &parent_name);
+ void process_set_current_dir (const QString &parent_name);
+ void process_find_files (const QString &dir_name);
/** set a new directory or open a file **/
void display_directory (const QString& dir, bool set_octave_dir = true);
diff -r c4f5c781c3ca -r 97e49b588f5d libgui/src/find-files-dialog.cc
--- a/libgui/src/find-files-dialog.cc Wed Oct 23 22:48:29 2013 -0400
+++ b/libgui/src/find-files-dialog.cc Tue Nov 05 12:27:42 2013 -0500
@@ -42,15 +42,15 @@
#include
find_files_dialog::find_files_dialog (QWidget * p)
- : QDialog (p)
+ : QDialog (p)
{
- setWindowTitle (tr("Find Files"));
+ setWindowTitle (tr ("Find Files"));
setWindowIcon (QIcon (":/actions/icons/search.png"));
_dir_iterator = 0;
_timer = new QTimer (this);
- connect(_timer, SIGNAL(timeout()), this, SLOT(look_for_files()));
+ connect (_timer, SIGNAL (timeout ()), this, SLOT (look_for_files ()));
QSettings *settings = resource_manager::get_settings ();
@@ -58,77 +58,90 @@
_file_name_edit = new QLineEdit;
_file_name_edit->setToolTip (tr ("Enter the filename expression"));
- _file_name_edit->setText (settings->value ("findfiles/file_name","*").toString ());
+ _file_name_edit->setText (settings->value ("findfiles/file_name",
+ "*").toString ());
file_name_label->setBuddy (_file_name_edit);
QLabel * start_dir_label = new QLabel (tr ("Start in:"));
_start_dir_edit = new QLineEdit;
- _start_dir_edit->setText (settings->value ("findfiles/start_dir",QDir::currentPath()).toString());
+ _start_dir_edit->setText (settings->value ("findfiles/start_dir",
+ QDir::currentPath ()).toString ());
_start_dir_edit->setToolTip (tr ("Enter the start directory"));
start_dir_label->setBuddy (_start_dir_edit);
_browse_button = new QPushButton (tr ("Browse..."));
_browse_button->setToolTip (tr ("Browse for start directory"));
- connect(_browse_button, SIGNAL(clicked()), this, SLOT(browse_folders()));
+ connect (_browse_button, SIGNAL (clicked ()), this, SLOT (browse_folders ()));
_recurse_dirs_check = new QCheckBox (tr ("Recurse directories"));
- _recurse_dirs_check->setChecked (settings->value ("findfiles/recurse_dirs", false).toBool());
- _recurse_dirs_check->setToolTip (tr ("Search recursively through directories for matching files"));
+ _recurse_dirs_check->setChecked (settings->value ("findfiles/recurse_dirs",
+ false).toBool ());
+ _recurse_dirs_check->setToolTip (
+ tr ("Search recursively through directories for matching files"));
_include_dirs_check = new QCheckBox (tr ("Include directories"));
- _include_dirs_check->setChecked (settings->value ("findfiles/include_dirs", false).toBool());
- _include_dirs_check->setToolTip (tr ("Include matching directories in search results"));
+ _include_dirs_check->setChecked (settings->value ("findfiles/include_dirs",
+ false).toBool ());
+ _include_dirs_check->setToolTip (
+ tr ("Include matching directories in search results"));
_name_case_check = new QCheckBox (tr ("Name case insensitive"));
- _name_case_check->setChecked (settings->value ("findfiles/name_case", false).toBool());
+ _name_case_check->setChecked (settings->value ("findfiles/name_case",
+ false).toBool ());
_name_case_check->setToolTip (tr ("Set matching name is case insensitive"));
- _contains_text_check = new QCheckBox (tr("Contains text:"));
+ _contains_text_check = new QCheckBox (tr ("Contains text:"));
_contains_text_check->setToolTip (tr ("Search must match text"));
- _contains_text_check->setChecked (settings->value ("findfiles/check_text", false).toBool());
+ _contains_text_check->setChecked (settings->value ("findfiles/check_text",
+ false).toBool ());
_contains_text_edit = new QLineEdit ();
_contains_text_edit->setToolTip (tr ("Text to match"));
- _contains_text_edit->setText (settings->value ("findfiles/contains_text", "").toString());
+ _contains_text_edit->setText (settings->value ("findfiles/contains_text",
+ "").toString ());
- _content_case_check = new QCheckBox (tr("Text case insensitive"));
- _content_case_check->setChecked (settings->value ("findfiles/content_case", false).toBool());
+ _content_case_check = new QCheckBox (tr ("Text case insensitive"));
+ _content_case_check->setChecked (settings->value ("findfiles/content_case",
+ false).toBool ());
_content_case_check->setToolTip (tr ("Set text content is case insensitive"));
-
+
find_files_model * model = new find_files_model (this);
_file_list = new QTableView;
_file_list->setWordWrap (false);
_file_list->setModel (model);
_file_list->setShowGrid (false);
- _file_list->setSelectionBehavior(QAbstractItemView::SelectRows);
- _file_list->setSelectionMode(QAbstractItemView::SingleSelection);
- _file_list->setAlternatingRowColors(true);
+ _file_list->setSelectionBehavior (QAbstractItemView::SelectRows);
+ _file_list->setSelectionMode (QAbstractItemView::SingleSelection);
+ _file_list->setAlternatingRowColors (true);
_file_list->setToolTip (tr ("Search results"));
_file_list->setSortingEnabled (true);
- _file_list->horizontalHeader ()->restoreState (settings->value ("findfiles/column_state").toByteArray ());
+ _file_list->horizontalHeader ()->restoreState (
+ settings->value ("findfiles/column_state").toByteArray ());
_file_list->horizontalHeader ()->setSortIndicatorShown (true);
_file_list->horizontalHeader ()->setClickable (true);
_file_list->horizontalHeader ()->setStretchLastSection (true);
_file_list->sortByColumn (
- settings->value ("findfiles/sort_files_by_column",0).toInt (),
- static_cast(settings->value ("findfiles/sort_files_by_order",Qt::AscendingOrder).toUInt ()));
+ settings->value ("findfiles/sort_files_by_column",0).toInt (),
+ static_cast
+ (settings->value ("findfiles/sort_files_by_order",
+ Qt::AscendingOrder).toUInt ()));
- connect (_file_list, SIGNAL(doubleClicked(const QModelIndex&)),
- this, SLOT(item_double_clicked(const QModelIndex &)));
+ connect (_file_list, SIGNAL (doubleClicked (const QModelIndex&)),
+ this, SLOT (item_double_clicked (const QModelIndex &)));
_status_bar = new QStatusBar;
- _status_bar->showMessage (tr("Idle."));
+ _status_bar->showMessage (tr ("Idle."));
- _find_button = new QPushButton (tr("Find"));
+ _find_button = new QPushButton (tr ("Find"));
_find_button->setToolTip (tr ("Start search for matching files"));
- connect (_find_button, SIGNAL(clicked()), this, SLOT(start_find()));
+ connect (_find_button, SIGNAL (clicked ()), this, SLOT (start_find ()));
- _stop_button = new QPushButton (tr("Stop"));
+ _stop_button = new QPushButton (tr ("Stop"));
_stop_button->setToolTip (tr ("Stop searching"));
_stop_button->setEnabled (false);
- connect (_stop_button, SIGNAL(clicked()), this, SLOT(stop_find()));
+ connect (_stop_button, SIGNAL (clicked ()), this, SLOT (stop_find ()));
// layout everything
QDialogButtonBox * button_box = new QDialogButtonBox (Qt::Vertical);
@@ -141,9 +154,9 @@
this, SLOT (close ()));
// name options
- QGroupBox * name_group = new QGroupBox(tr("File name/location"));
+ QGroupBox * name_group = new QGroupBox (tr ("File name/location"));
QGridLayout * name_layout = new QGridLayout;
- name_group->setLayout(name_layout);
+ name_group->setLayout (name_layout);
name_layout->addWidget (file_name_label,1,1, 1,1);
name_layout->addWidget (_file_name_edit,1,2, 1,-1);
@@ -158,9 +171,9 @@
name_layout->addWidget (_name_case_check,3,3);
// content options
- QGroupBox * content_group = new QGroupBox(tr("File contents"));
+ QGroupBox * content_group = new QGroupBox (tr ("File contents"));
QGridLayout * content_layout = new QGridLayout;
- content_group->setLayout(content_layout);
+ content_group->setLayout (content_layout);
content_layout->addWidget (_contains_text_check,4,1);
content_layout->addWidget (_contains_text_edit,4,2,1,3);
content_layout->setColumnStretch (2,1);
@@ -178,7 +191,7 @@
setLayout (main_layout);
- connect (this, SIGNAL(finished(int)), this, SLOT(handle_done(int)));
+ connect (this, SIGNAL (finished (int)), this, SLOT (handle_done (int)));
}
find_files_dialog::~find_files_dialog ()
@@ -186,64 +199,70 @@
QSettings *settings = resource_manager::get_settings ();
int sort_column = _file_list->horizontalHeader ()->sortIndicatorSection ();
- Qt::SortOrder sort_order = _file_list->horizontalHeader ()->sortIndicatorOrder ();
+ Qt::SortOrder sort_order
+ = _file_list->horizontalHeader ()->sortIndicatorOrder ();
settings->setValue ("findfiles/sort_files_by_column", sort_column);
settings->setValue ("findfiles/sort_files_by_order", sort_order);
- settings->setValue ("findfiles/column_state", _file_list->horizontalHeader ()->saveState ());
+ settings->setValue ("findfiles/column_state",
+ _file_list->horizontalHeader ()->saveState ());
- settings->setValue ("findfiles/file_name", _file_name_edit->text());
+ settings->setValue ("findfiles/file_name", _file_name_edit->text ());
- settings->setValue ("findfiles/start_dir", _start_dir_edit->text());
+ settings->setValue ("findfiles/start_dir", _start_dir_edit->text ());
- settings->setValue ("findfiles/recurse_dirs", _recurse_dirs_check->text());
- settings->setValue ("findfiles/include_dirs", _include_dirs_check->text());
- settings->setValue ("findfiles/name_case", _name_case_check->text());
+ settings->setValue ("findfiles/recurse_dirs", _recurse_dirs_check->text ());
+ settings->setValue ("findfiles/include_dirs", _include_dirs_check->text ());
+ settings->setValue ("findfiles/name_case", _name_case_check->text ());
- settings->setValue ("findfiles/contains_text", _contains_text_edit->text());
- settings->setValue ("findfiles/check_text", _contains_text_check->isChecked ());
- settings->setValue ("findfiles/content_case", _content_case_check->isChecked ());
+ settings->setValue ("findfiles/contains_text", _contains_text_edit->text ());
+ settings->setValue ("findfiles/check_text",
+ _contains_text_check->isChecked ());
+ settings->setValue ("findfiles/content_case",
+ _content_case_check->isChecked ());
settings->sync ();
- if(_dir_iterator)
+ if (_dir_iterator)
delete _dir_iterator;
}
void find_files_dialog::handle_done (int)
{
- // make sure we stopped processing
+ // make sure we stopped processing
stop_find ();
}
-void find_files_dialog::set_search_dir(const QString &dir)
+void find_files_dialog::set_search_dir (const QString &dir)
{
- stop_find();
- _start_dir_edit->setText(dir);
+ stop_find ();
+ _start_dir_edit->setText (dir);
}
-void
+void
find_files_dialog::start_find ()
{
- stop_find();
+ stop_find ();
- find_files_model *m = static_cast (_file_list->model());
- m->clear();
+ find_files_model *m = static_cast (_file_list->model ());
+ m->clear ();
QDirIterator::IteratorFlags flags = QDirIterator::NoIteratorFlags;
- if (_recurse_dirs_check->isChecked ()) flags |= QDirIterator::Subdirectories;
+ if (_recurse_dirs_check->isChecked ())
+ flags |= QDirIterator::Subdirectories;
QDir::Filters filters = QDir::Dirs|QDir::NoDotAndDotDot|QDir::Files;
if (!_name_case_check->isChecked ())
filters |= QDir::CaseSensitive;
QStringList nameFilters;
- nameFilters.append (_file_name_edit->text());
+ nameFilters.append (_file_name_edit->text ());
if (_dir_iterator) delete _dir_iterator;
- _dir_iterator = new QDirIterator (_start_dir_edit->text(), nameFilters, filters, flags);
-
- // enable/disable widgets
+ _dir_iterator = new QDirIterator (_start_dir_edit->text (), nameFilters,
+ filters, flags);
+
+ // enable/disable widgets
_find_button->setEnabled (false);
_stop_button->setEnabled (true);
_close_button->setEnabled (false);
@@ -257,11 +276,11 @@
_content_case_check->setEnabled (false);
_contains_text_edit->setEnabled (false);
- _status_bar->showMessage (tr("Searching..."));
+ _status_bar->showMessage (tr ("Searching..."));
_timer->start (0);
}
-void
+void
find_files_dialog::stop_find ()
{
_timer->stop ();
@@ -279,18 +298,18 @@
_content_case_check->setEnabled (true);
_contains_text_edit->setEnabled (true);
- find_files_model *m = static_cast (_file_list->model());
- QString res_str = QString ("%1 matches").arg(m->rowCount());
+ find_files_model *m = static_cast (_file_list->model ());
+ QString res_str = QString ("%1 matches").arg (m->rowCount ());
_status_bar->showMessage (res_str);
}
-void
+void
find_files_dialog::browse_folders ()
{
QString dir =
- QFileDialog::getExistingDirectory (this, tr ("Set search directory"),
- _start_dir_edit->text());
+ QFileDialog::getExistingDirectory (this, tr ("Set search directory"),
+ _start_dir_edit->text ());
if (! dir.isEmpty ())
{
@@ -298,43 +317,44 @@
}
}
-void
+void
find_files_dialog::item_double_clicked (const QModelIndex &idx)
{
find_files_model *m = static_cast (_file_list->model ());
QFileInfo info = m->fileInfo (idx);
- if(idx.column () == 1)
+ if (idx.column () == 1)
{
// clicked in directory part
- emit dir_selected (info.absolutePath());
+ emit dir_selected (info.absolutePath ());
}
else
{
// clicked in filename part
- if(info.isDir ())
- emit dir_selected (info.absoluteFilePath());
+ if (info.isDir ())
+ emit dir_selected (info.absoluteFilePath ());
else
- emit file_selected (info.absoluteFilePath());
+ emit file_selected (info.absoluteFilePath ());
}
}
void
find_files_dialog::look_for_files ()
{
- if(_dir_iterator && _dir_iterator->hasNext ())
+ if (_dir_iterator && _dir_iterator->hasNext ())
{
QFileInfo info (_dir_iterator->next ());
-
- find_files_model *m = static_cast (_file_list->model ());
+
+ find_files_model *m
+ = static_cast (_file_list->model ());
- if(is_match (info))
+ if (is_match (info))
m->addFile (info);
- }
+ }
else
{
- stop_find ();
+ stop_find ();
}
}
@@ -343,8 +363,8 @@
bool match = true;
if (info.isDir ())
{
- if(!_include_dirs_check->isChecked ()) match = false;
- if(_contains_text_check->isChecked ()) match = false;
+ if (!_include_dirs_check->isChecked ()) match = false;
+ if (_contains_text_check->isChecked ()) match = false;
}
else
{
@@ -353,7 +373,7 @@
{
match = false;
- QFile file(info.absoluteFilePath ());
+ QFile file (info.absoluteFilePath ());
if (file.open (QIODevice::ReadOnly))
{
QTextStream stream (&file);
@@ -362,19 +382,19 @@
QString match_str = _contains_text_edit->text ();
Qt::CaseSensitivity cs = _content_case_check->isChecked () ?
- Qt::CaseInsensitive : Qt::CaseSensitive;
+ Qt::CaseInsensitive : Qt::CaseSensitive;
do
{
line = stream.readLine ();
match = line.contains (match_str, cs);
}
- while(!line.isNull () && match == false);
+ while (!line.isNull () && match == false);
}
}
}
- return match;
+ return match;
}
diff -r c4f5c781c3ca -r 97e49b588f5d libgui/src/find-files-dialog.h
--- a/libgui/src/find-files-dialog.h Wed Oct 23 22:48:29 2013 -0400
+++ b/libgui/src/find-files-dialog.h Tue Nov 05 12:27:42 2013 -0500
@@ -19,8 +19,8 @@
.
*/
-#if !defined (find_files_dialog_h)
-#define find_files_dialog_h
+#if !defined (octave_find_files_dialog_h)
+#define octave_find_files_dialog_h
#include
#include
@@ -46,7 +46,7 @@
void dir_selected (const QString &fileName);
public slots:
- void set_search_dir(const QString &dir);
+ void set_search_dir (const QString &dir);
private slots:
void start_find ();
@@ -54,9 +54,9 @@
void browse_folders ();
void look_for_files ();
void item_double_clicked (const QModelIndex&);
- void handle_done(int);
+ void handle_done (int);
private:
- bool is_match(const QFileInfo &info);
+ bool is_match (const QFileInfo &info);
QLineEdit * _start_dir_edit;
QLineEdit * _file_name_edit;
QPushButton * _stop_button;
@@ -75,5 +75,5 @@
QStatusBar * _status_bar;
};
-#endif // find_files_dialog_h
+#endif // octave_find_files_dialog_h
diff -r c4f5c781c3ca -r 97e49b588f5d libgui/src/find-files-model.cc
--- a/libgui/src/find-files-model.cc Wed Oct 23 22:48:29 2013 -0400
+++ b/libgui/src/find-files-model.cc Tue Nov 05 12:27:42 2013 -0500
@@ -33,37 +33,38 @@
}
QVariant getValue (const QFileInfo &f) const
{
- QVariant val;
- int col = (_sortorder > 0) ? _sortorder : -_sortorder;
+ QVariant val;
+ int col = (_sortorder > 0) ? _sortorder : -_sortorder;
- switch (col-1)
- {
- case 0:
- val = QVariant (f.fileName());
- break;
+ switch (col-1)
+ {
+ case 0:
+ val = QVariant (f.fileName ());
+ break;
- case 1:
- val = QVariant (f.absolutePath());
- break;
+ case 1:
+ val = QVariant (f.absolutePath ());
+ break;
- default:
- break;
- }
- return val;
+ default:
+ break;
+ }
+ return val;
}
bool lessThan (const QVariant &left, const QVariant &right) const
{
- return left.toString ().compare (right.toString (), Qt::CaseInsensitive) < 0;
+ return
+ left.toString ().compare (right.toString (), Qt::CaseInsensitive) < 0;
}
bool operator () (const QFileInfo &left, const QFileInfo &right) const
{
- QVariant leftval = getValue(left);
- QVariant rightval = getValue(right);
+ QVariant leftval = getValue (left);
+ QVariant rightval = getValue (right);
- if (_sortorder > 0)
- return lessThan(leftval, rightval);
- else
- return ! lessThan(leftval, rightval);
+ if (_sortorder > 0)
+ return lessThan (leftval, rightval);
+ else
+ return ! lessThan (leftval, rightval);
}
private:
int _sortorder;
@@ -71,7 +72,7 @@
find_files_model::find_files_model (QObject *p)
- : QAbstractListModel(p)
+ : QAbstractListModel (p)
{
_columnNames.append (tr ("Filename"));
_columnNames.append (tr ("Directory"));
@@ -82,86 +83,87 @@
{
}
-void
+void
find_files_model::clear ()
{
- beginResetModel();
+ beginResetModel ();
- _files.clear();
+ _files.clear ();
endResetModel ();
}
-void
+void
find_files_model::addFile (const QFileInfo &info)
{
beginInsertRows (QModelIndex (), _files.size (), _files.size () );
- QList::Iterator it;
- find_file_less_than less_than(_sortorder);
+ QList::Iterator it;
+ find_file_less_than less_than (_sortorder);
- for (it=_files.begin ();it!=_files.end ();it++)
+ for (it=_files.begin (); it!=_files.end (); it++)
{
if (less_than (info, *it)) break;
}
_files.insert (it, info);
- endInsertRows ();
+ endInsertRows ();
}
-int
+int
find_files_model::rowCount (const QModelIndex &) const
{
- return _files.size();
+ return _files.size ();
}
-int
+int
find_files_model::columnCount (const QModelIndex &) const
{
return _columnNames.size ();
}
-QVariant
+QVariant
find_files_model::data (const QModelIndex& idx, int role) const
{
QVariant retval;
if (idx.isValid ())
{
- if(role == Qt::DisplayRole)
- {
- switch (idx.column ())
- {
- case 0:
- retval = QVariant (_files[idx.row()].fileName());
- break;
+ if (role == Qt::DisplayRole)
+ {
+ switch (idx.column ())
+ {
+ case 0:
+ retval = QVariant (_files[idx.row ()].fileName ());
+ break;
- case 1:
- retval = QVariant (_files[idx.row()].absolutePath());
- break;
+ case 1:
+ retval = QVariant (_files[idx.row ()].absolutePath ());
+ break;
- default:
- break;
- }
- }
- else if(role == Qt:: DecorationRole)
- {
- switch (idx.column())
- {
- case 0:
- retval = fileIcon(idx);
- default:
- break;
- }
- }
+ default:
+ break;
+ }
+ }
+ else if (role == Qt:: DecorationRole)
+ {
+ switch (idx.column ())
+ {
+ case 0:
+ retval = fileIcon (idx);
+ default:
+ break;
+ }
+ }
}
return retval;
}
-QVariant
-find_files_model::headerData (int section, Qt::Orientation orientation, int role) const
+QVariant
+find_files_model::headerData (int section, Qt::Orientation orientation,
+ int role) const
{
if (orientation == Qt::Horizontal && role == Qt::DisplayRole)
return _columnNames[section];
@@ -172,7 +174,7 @@
void
find_files_model::sort (int column, Qt::SortOrder order)
{
- if(column >= 0)
+ if (column >= 0)
{
if (order == Qt::DescendingOrder)
_sortorder = -(column+1);
@@ -190,13 +192,13 @@
}
}
-QFileInfo
+QFileInfo
find_files_model::fileInfo (const QModelIndex & p) const
{
- if(p.isValid ())
- {
- return _files[p.row()];
- }
+ if (p.isValid ())
+ {
+ return _files[p.row ()];
+ }
return QFileInfo ();
}
@@ -204,9 +206,9 @@
find_files_model::fileIcon (const QModelIndex &p) const
{
QFileIconProvider icon_provider;
- if(p.isValid ())
- {
- return icon_provider.icon (_files[p.row()]);
- }
+ if (p.isValid ())
+ {
+ return icon_provider.icon (_files[p.row ()]);
+ }
return QIcon ();
}
diff -r c4f5c781c3ca -r 97e49b588f5d libgui/src/find-files-model.h
--- a/libgui/src/find-files-model.h Wed Oct 23 22:48:29 2013 -0400
+++ b/libgui/src/find-files-model.h Tue Nov 05 12:27:42 2013 -0500
@@ -19,8 +19,8 @@
.
*/
-#if !defined (find_files_model_h)
-#define find_files_model_h
+#if !defined (octave_find_files_model_h)
+#define octave_find_files_model_h
#include
#include
@@ -34,16 +34,16 @@
Q_OBJECT
public:
- find_files_model(QObject *p=0);
+ find_files_model (QObject *p=0);
~find_files_model ();
- void clear();
+ void clear ();
- void addFile(const QFileInfo &info);
+ void addFile (const QFileInfo &info);
- int rowCount(const QModelIndex & p=QModelIndex()) const;
+ int rowCount (const QModelIndex & p=QModelIndex ()) const;
- int columnCount(const QModelIndex & p=QModelIndex()) const;
+ int columnCount (const QModelIndex & p=QModelIndex ()) const;
QVariant data (const QModelIndex& idx, int role) const;
@@ -60,5 +60,5 @@
int _sortorder;
};
-#endif // find_files_model_h
+#endif // octave_find_files_model_h
diff -r c4f5c781c3ca -r 97e49b588f5d libgui/src/history-dock-widget.cc
--- a/libgui/src/history-dock-widget.cc Wed Oct 23 22:48:29 2013 -0400
+++ b/libgui/src/history-dock-widget.cc Tue Nov 05 12:27:42 2013 -0500
@@ -63,16 +63,20 @@
_history_list_view->setModel (&_sort_filter_proxy_model);
_history_list_view->setAlternatingRowColors (true);
_history_list_view->setEditTriggers (QAbstractItemView::NoEditTriggers);
- _history_list_view->setStatusTip (tr ("Doubleclick a command to transfer it to the terminal."));
+ _history_list_view->setStatusTip (
+ tr ("Doubleclick a command to transfer it to the terminal."));
_history_list_view->setSelectionMode (QAbstractItemView::ExtendedSelection);
- _history_list_view->setContextMenuPolicy(Qt::CustomContextMenu);
- connect(_history_list_view, SIGNAL(customContextMenuRequested(const QPoint &)), this, SLOT(ctxMenu(const QPoint &)));
+ _history_list_view->setContextMenuPolicy (Qt::CustomContextMenu);
+ connect (_history_list_view,
+ SIGNAL (customContextMenuRequested (const QPoint &)), this,
+ SLOT (ctxMenu (const QPoint &)));
_filter_line_edit = new QLineEdit (this);
- _filter_line_edit->setStatusTip (tr ("Enter text to filter the command history."));
+ _filter_line_edit->setStatusTip (
+ tr ("Enter text to filter the command history."));
QVBoxLayout *vbox_layout = new QVBoxLayout ();
- setWindowIcon (QIcon(":/actions/icons/logo.png"));
+ setWindowIcon (QIcon (":/actions/icons/logo.png"));
set_title (tr ("Command History"));
setWidget (new QWidget ());
@@ -91,43 +95,46 @@
setFocusProxy (_filter_line_edit);
}
-void history_dock_widget::ctxMenu(const QPoint &xpos) {
- QMenu menu(this);
- menu.addAction(tr("Copy"), this, SLOT(handle_contextmenu_copy(bool)));
- menu.addAction(tr("Evaluate"), this, SLOT(handle_contextmenu_evaluate(bool)));
- menu.addAction(tr("Create script"), this, SLOT(handle_contextmenu_create_script(bool)));
- menu.exec(_history_list_view->mapToGlobal(xpos));
+void history_dock_widget::ctxMenu (const QPoint &xpos)
+{
+ QMenu menu (this);
+ menu.addAction (tr ("Copy"), this, SLOT (handle_contextmenu_copy (bool)));
+ menu.addAction (tr ("Evaluate"), this,
+ SLOT (handle_contextmenu_evaluate (bool)));
+ menu.addAction (tr ("Create script"), this,
+ SLOT (handle_contextmenu_create_script (bool)));
+ menu.exec (_history_list_view->mapToGlobal (xpos));
}
-void history_dock_widget::handle_contextmenu_copy(bool)
+void history_dock_widget::handle_contextmenu_copy (bool)
{
QString text;
- QItemSelectionModel *selectionModel = _history_list_view->selectionModel();
- QModelIndexList rows = selectionModel->selectedRows();
+ QItemSelectionModel *selectionModel = _history_list_view->selectionModel ();
+ QModelIndexList rows = selectionModel->selectedRows ();
QModelIndexList::iterator it;
bool prev_valid_row = false;
- for (it = rows.begin(); it != rows.end(); it++)
+ for (it = rows.begin (); it != rows.end (); it++)
{
- if ((*it).isValid())
+ if ((*it).isValid ())
{
if (prev_valid_row)
text += "\n";
- text += (*it).data().toString();
+ text += (*it).data ().toString ();
prev_valid_row = true;
}
}
- QApplication::clipboard()->setText(text);
+ QApplication::clipboard ()->setText (text);
}
-void history_dock_widget::handle_contextmenu_evaluate(bool)
+void history_dock_widget::handle_contextmenu_evaluate (bool)
{
- QItemSelectionModel *selectionModel = _history_list_view->selectionModel();
- QModelIndexList rows = selectionModel->selectedRows();
+ QItemSelectionModel *selectionModel = _history_list_view->selectionModel ();
+ QModelIndexList rows = selectionModel->selectedRows ();
QModelIndexList::iterator it;
- for (it = rows.begin() ; it != rows.end(); it++)
+ for (it = rows.begin () ; it != rows.end (); it++)
{
- if ((*it).isValid())
- emit command_double_clicked ((*it).data().toString());
+ if ((*it).isValid ())
+ emit command_double_clicked ((*it).data ().toString ());
}
}
@@ -145,7 +152,7 @@
{
if (prev_valid_row)
text += "\n";
- text += (*it).data().toString();
+ text += (*it).data ().toString ();
prev_valid_row = true;
}
}
@@ -158,7 +165,7 @@
void
history_dock_widget::handle_double_click (QModelIndex modelIndex)
{
- emit command_double_clicked (modelIndex.data().toString());
+ emit command_double_clicked (modelIndex.data ().toString ());
}
void
@@ -194,9 +201,9 @@
void
history_dock_widget::copyClipboard ()
{
- if(_history_list_view->hasFocus())
- handle_contextmenu_copy(true);
- if(_filter_line_edit->hasFocus () && _filter_line_edit->hasSelectedText ())
+ if (_history_list_view->hasFocus ())
+ handle_contextmenu_copy (true);
+ if (_filter_line_edit->hasFocus () && _filter_line_edit->hasSelectedText ())
{
QClipboard *clipboard = QApplication::clipboard ();
clipboard->setText ( _filter_line_edit->selectedText ());
@@ -206,11 +213,11 @@
void
history_dock_widget::pasteClipboard ()
{
- if(_filter_line_edit->hasFocus ())
+ if (_filter_line_edit->hasFocus ())
{
QClipboard *clipboard = QApplication::clipboard ();
QString str = clipboard->text ();
- if (str.length() > 0)
+ if (str.length () > 0)
_filter_line_edit->insert (str);
}
}
diff -r c4f5c781c3ca -r 97e49b588f5d libgui/src/history-dock-widget.h
--- a/libgui/src/history-dock-widget.h Wed Oct 23 22:48:29 2013 -0400
+++ b/libgui/src/history-dock-widget.h Tue Nov 05 12:27:42 2013 -0500
@@ -57,10 +57,10 @@
private slots:
void handle_double_click (QModelIndex modelIndex);
- void handle_contextmenu_copy(bool flag);
- void handle_contextmenu_evaluate(bool flag);
- void handle_contextmenu_create_script(bool flag);
- void ctxMenu(const QPoint &pos);
+ void handle_contextmenu_copy (bool flag);
+ void handle_contextmenu_evaluate (bool flag);
+ void handle_contextmenu_create_script (bool flag);
+ void ctxMenu (const QPoint &pos);
void copyClipboard ();
void pasteClipboard ();
diff -r c4f5c781c3ca -r 97e49b588f5d libgui/src/icons/zoom-in.png
Binary file libgui/src/icons/zoom-in.png has changed
diff -r c4f5c781c3ca -r 97e49b588f5d libgui/src/icons/zoom-out.png
Binary file libgui/src/icons/zoom-out.png has changed
diff -r c4f5c781c3ca -r 97e49b588f5d libgui/src/m-editor/file-editor-interface.h
--- a/libgui/src/m-editor/file-editor-interface.h Wed Oct 23 22:48:29 2013 -0400
+++ b/libgui/src/m-editor/file-editor-interface.h Tue Nov 05 12:27:42 2013 -0500
@@ -31,7 +31,7 @@
{
Q_OBJECT
- public:
+public:
file_editor_interface (QWidget *p)
: octave_dock_widget (p)
{
diff -r c4f5c781c3ca -r 97e49b588f5d libgui/src/m-editor/file-editor-tab.cc
--- a/libgui/src/m-editor/file-editor-tab.cc Wed Oct 23 22:48:29 2013 -0400
+++ b/libgui/src/m-editor/file-editor-tab.cc Tue Nov 05 12:27:42 2013 -0500
@@ -198,7 +198,7 @@
void
file_editor_tab::handle_margin_clicked (int margin, int line,
- Qt::KeyboardModifiers state)
+ Qt::KeyboardModifiers state)
{
if (margin == 1)
{
@@ -268,8 +268,9 @@
lexer = new QsciLexerDiff ();
}
else if (_file_name.isEmpty ()
- || _file_name.at (_file_name.count () - 1) == '/')
- { // new, no yet named file: let us assume it is octave
+ || _file_name.at (_file_name.count () - 1) == '/')
+ {
+ // new, no yet named file: let us assume it is octave
#if defined (HAVE_LEXER_OCTAVE)
lexer = new QsciLexerOctave ();
#elif defined (HAVE_LEXER_MATLAB)
@@ -279,7 +280,8 @@
#endif
}
else
- { // other or no extension
+ {
+ // other or no extension
lexer = new QsciLexerBash ();
}
}
@@ -290,12 +292,13 @@
// get path to prepared api info
QDesktopServices desktopServices;
QString prep_apis_path
- = desktopServices.storageLocation (QDesktopServices::HomeLocation)
- + "/.config/octave/" + QString(OCTAVE_VERSION) + "/qsci/";
+ = desktopServices.storageLocation (QDesktopServices::HomeLocation)
+ + "/.config/octave/" + QString(OCTAVE_VERSION) + "/qsci/";
_prep_apis_file = prep_apis_path + lexer->lexer () + ".pap";
if (!_lexer_apis->loadPrepared (_prep_apis_file))
- { // no prepared info loaded, prepare and save if possible
+ {
+ // no prepared info loaded, prepare and save if possible
// create raw apis info
QString keyword;
@@ -313,7 +316,8 @@
disconnect (_lexer_apis, SIGNAL (apiPreparationFinished ()), 0, 0);
// check whether path for prepared info exists or can be created
if (QDir("/").mkpath (prep_apis_path))
- { // path exists, apis info can be saved there
+ {
+ // path exists, apis info can be saved there
connect (_lexer_apis, SIGNAL (apiPreparationFinished ()),
this, SLOT (save_apis_info ()));
}
@@ -721,7 +725,7 @@
if (!_find_dialog)
{
- _find_dialog = new find_dialog (_edit_area,
+ _find_dialog = new find_dialog (_edit_area,
qobject_cast (sender ()));
connect (_find_dialog, SIGNAL (finished (int)),
this, SLOT (handle_find_dialog_finished (int)));
@@ -795,7 +799,8 @@
}
}
//set selection on (un)commented section
- _edit_area->setSelection (lineFrom, 0, lineTo, _edit_area->text (lineTo).length ());
+ _edit_area->setSelection (lineFrom, 0, lineTo,
+ _edit_area->text (lineTo).length ());
}
else
{
@@ -863,7 +868,7 @@
QString available_actions;
if (_app_closing)
- available_actions = tr ("Do you want to save or discard the changes?");
+ available_actions = tr ("Do you want to save or discard the changes?");
else
{
buttons = buttons | QMessageBox::Cancel; // cancel is allowed
@@ -900,7 +905,7 @@
// Nothing was modified, just remove from editor.
emit tab_remove_request ();
}
-
+
return decision;
}
@@ -972,7 +977,7 @@
// should be performed.
if (saveFileName.isEmpty ()
|| saveFileName.at (saveFileName.count () - 1) == '/')
- {
+ {
save_file_as (remove_on_success);
return;
}
@@ -1240,9 +1245,9 @@
if (settings->value ("editor/codeCompletion", true).toBool ()) // auto compl.
{
bool match_keywords = settings->value
- ("editor/codeCompletion_keywords",true).toBool ();
+ ("editor/codeCompletion_keywords",true).toBool ();
bool match_document = settings->value
- ("editor/codeCompletion_document",true).toBool ();
+ ("editor/codeCompletion_document",true).toBool ();
QsciScintilla::AutoCompletionSource source = QsciScintilla::AcsNone;
if (match_keywords)
@@ -1250,9 +1255,8 @@
source = QsciScintilla::AcsAll;
else
source = QsciScintilla::AcsAPIs;
- else
- if (match_document)
- source = QsciScintilla::AcsDocument;
+ else if (match_document)
+ source = QsciScintilla::AcsDocument;
_edit_area->setAutoCompletionSource (source);
_edit_area->setAutoCompletionReplaceWord
diff -r c4f5c781c3ca -r 97e49b588f5d libgui/src/m-editor/file-editor-tab.h
--- a/libgui/src/m-editor/file-editor-tab.h Wed Oct 23 22:48:29 2013 -0400
+++ b/libgui/src/m-editor/file-editor-tab.h Tue Nov 05 12:27:42 2013 -0500
@@ -20,8 +20,8 @@
*/
-#if !defined (file_editor_tab_h)
-#define file_editor_tab_h 1
+#if !defined (octave_file_editor_tab_h)
+#define octave_file_editor_tab_h 1
#include
#include
@@ -153,11 +153,11 @@
private:
enum editor_markers
- {
- bookmark,
- breakpoint,
- debugger_position
- };
+ {
+ bookmark,
+ breakpoint,
+ debugger_position
+ };
struct bp_info
{
diff -r c4f5c781c3ca -r 97e49b588f5d libgui/src/m-editor/file-editor.cc
--- a/libgui/src/m-editor/file-editor.cc Wed Oct 23 22:48:29 2013 -0400
+++ b/libgui/src/m-editor/file-editor.cc Tue Nov 05 12:27:42 2013 -0500
@@ -75,7 +75,10 @@
settings->sync ();
for (int index = _tab_widget->count ()-1; index >= 0; index--)
- emit fetab_close_request (_tab_widget->widget (index),true); // true: app closing
+ {
+ // true: app closing
+ emit fetab_close_request (_tab_widget->widget (index), true);
+ }
if (_mru_file_menu)
delete _mru_file_menu;
@@ -213,7 +216,7 @@
}
return retval;
-}
+}
void
file_editor::request_open_file (const QString& openFileName, int line,
@@ -298,13 +301,14 @@
if (QFile::exists (openFileName))
{
- // File not readable: create a NonModal message about error.
+ // File not readable:
+ // create a NonModal message about error.
QMessageBox *msgBox
= new QMessageBox (QMessageBox::Critical,
- tr ("Octave Editor"),
- tr ("Could not open file\n%1\nfor read: %2.").
- arg (openFileName).arg (result),
- QMessageBox::Ok, this);
+ tr ("Octave Editor"),
+ tr ("Could not open file\n%1\nfor read: %2.").
+ arg (openFileName).arg (result),
+ QMessageBox::Ok, this);
msgBox->setWindowModality (Qt::NonModal);
msgBox->setAttribute (Qt::WA_DeleteOnClose);
@@ -315,17 +319,19 @@
// File does not exist, should it be crated?
QMessageBox *msgBox;
int answer;
- if (settings->value ("editor/create_new_file",false).toBool ())
+ if (settings->value ("editor/create_new_file",
+ false).toBool ())
{
answer = QMessageBox::Yes;
}
else
{
- msgBox = new QMessageBox (QMessageBox::Question,
- tr ("Octave Editor"),
- tr ("File\n%1\ndoes not exist. "
- "Do you want to create it?").arg (openFileName),
- QMessageBox::Yes | QMessageBox::No, this);
+ msgBox = new QMessageBox (QMessageBox::Question,
+ tr ("Octave Editor"),
+ tr ("File\n%1\ndoes not exist. "
+ "Do you want to create it?").arg (openFileName),
+ QMessageBox::Yes
+ | QMessageBox::No, this);
msgBox->setAttribute (Qt::WA_DeleteOnClose);
answer = msgBox->exec ();
@@ -339,10 +345,10 @@
{
// error opening the file
msgBox = new QMessageBox (QMessageBox::Critical,
- tr ("Octave Editor"),
- tr ("Could not open file\n%1\nfor write: %2.").
- arg (openFileName).arg (file.errorString ()),
- QMessageBox::Ok, this);
+ tr ("Octave Editor"),
+ tr ("Could not open file\n%1\nfor write: %2.").
+ arg (openFileName).arg (file.errorString ()),
+ QMessageBox::Ok, this);
msgBox->setWindowModality (Qt::NonModal);
msgBox->setAttribute (Qt::WA_DeleteOnClose);
@@ -376,7 +382,8 @@
void
-file_editor::check_conflict_save (const QString& saveFileName, bool remove_on_success)
+file_editor::check_conflict_save (const QString& saveFileName,
+ bool remove_on_success)
{
// Have all file editor tabs signal what their file names are.
editor_tab_map.clear ();
@@ -542,13 +549,13 @@
void
file_editor::request_save_file_as (void)
{
- emit fetab_save_file_as (_tab_widget->currentWidget ());
+ emit fetab_save_file_as (_tab_widget->currentWidget ());
}
void
file_editor::request_print_file (void)
{
- emit fetab_print_file (_tab_widget->currentWidget ());
+ emit fetab_print_file (_tab_widget->currentWidget ());
}
@@ -654,26 +661,26 @@
for (int i = 0; i < num_files; ++i)
{
QString text = tr ("&%1 %2").
- arg ((i+1) % int (MaxMRUFiles)).arg (_mru_files.at (i));
+ arg ((i+1) % int (MaxMRUFiles)).arg (_mru_files.at (i));
_mru_file_actions[i]->setText (text);
_mru_file_actions[i]->setData (_mru_files.at (i));
_mru_file_actions[i]->setVisible (true);
}
- // hide unused mru-menu entries
- for (int j = num_files; j < MaxMRUFiles; ++j)
- _mru_file_actions[j]->setVisible (false);
+ // hide unused mru-menu entries
+ for (int j = num_files; j < MaxMRUFiles; ++j)
+ _mru_file_actions[j]->setVisible (false);
- // delete entries in string-list beyond MaxMRUFiles
- while (_mru_files.size () > MaxMRUFiles)
- _mru_files.removeLast ();
+ // delete entries in string-list beyond MaxMRUFiles
+ while (_mru_files.size () > MaxMRUFiles)
+ _mru_files.removeLast ();
- // save actual mru-list in settings
- QSettings *settings = resource_manager::get_settings ();
+ // save actual mru-list in settings
+ QSettings *settings = resource_manager::get_settings ();
- // FIXME -- what should happen if settings is 0?
- settings->setValue ("editor/mru_file_list", _mru_files);
- settings->sync ();
+ // FIXME: what should happen if settings is 0?
+ settings->setValue ("editor/mru_file_list", _mru_files);
+ settings->sync ();
}
void
@@ -747,7 +754,7 @@
}
}
}
- check_actions ();
+ check_actions ();
}
void
@@ -817,7 +824,7 @@
{
QWidget *editor_widget = new QWidget (this);
- // FIXME -- what was the intended purpose of this unused variable?
+ // FIXME: what was the intended purpose of this unused variable?
// QStyle *editor_style = QApplication::style ();
_menu_bar = new QMenuBar (editor_widget);
@@ -832,26 +839,26 @@
tr ("&Open File"), _tool_bar);
_save_action = new QAction (QIcon (":/actions/icons/filesave.png"),
- tr ("&Save File"), _tool_bar);
+ tr ("&Save File"), _tool_bar);
_save_as_action = new QAction (QIcon (":/actions/icons/filesaveas.png"),
- tr ("Save File &As"), _tool_bar);
+ tr ("Save File &As"), _tool_bar);
_print_action = new QAction ( QIcon (":/actions/icons/fileprint.png"),
tr ("Print"), _tool_bar);
_undo_action = new QAction (QIcon (":/actions/icons/undo.png"),
- tr ("&Undo"), _tool_bar);
+ tr ("&Undo"), _tool_bar);
_redo_action = new QAction (QIcon (":/actions/icons/redo.png"),
- tr ("&Redo"), _tool_bar);
+ tr ("&Redo"), _tool_bar);
_copy_action = new QAction (QIcon (":/actions/icons/editcopy.png"),
tr ("&Copy"), _tool_bar);
_copy_action->setEnabled (false);
_cut_action = new QAction (QIcon (":/actions/icons/editcut.png"),
- tr ("Cu&t"), _tool_bar);
+ tr ("Cu&t"), _tool_bar);
_cut_action->setEnabled (false);
_paste_action
@@ -860,7 +867,8 @@
_next_bookmark_action = new QAction (tr ("&Next Bookmark"), _tool_bar);
- _previous_bookmark_action = new QAction (tr ("Pre&vious Bookmark"), _tool_bar);
+ _previous_bookmark_action = new QAction (tr ("Pre&vious Bookmark"),
+ _tool_bar);
_toggle_bookmark_action = new QAction (tr ("Toggle &Bookmark"), _tool_bar);
@@ -886,7 +894,7 @@
= new QAction (tr ("&Uncomment"), _tool_bar);
_find_action = new QAction (QIcon (":/actions/icons/search.png"),
- tr ("&Find and Replace"), _tool_bar);
+ tr ("&Find and Replace"), _tool_bar);
_run_action = new QAction (QIcon (":/actions/icons/artsbuilderexecute.png"),
tr ("Save File And Run"), _tool_bar);
@@ -895,12 +903,12 @@
// the mru-list and an empty array of actions
QSettings *settings = resource_manager::get_settings ();
- // FIXME -- what should happen if settings is 0?
+ // FIXME: what should happen if settings is 0?
_mru_files = settings->value ("editor/mru_file_list").toStringList ();
for (int i = 0; i < MaxMRUFiles; ++i)
{
- _mru_file_actions[i] = new QAction (this);
- _mru_file_actions[i]->setVisible (false);
+ _mru_file_actions[i] = new QAction (this);
+ _mru_file_actions[i]->setVisible (false);
}
// some actions are disabled from the beginning
@@ -963,19 +971,19 @@
fileMenu->addSeparator ();
_close_action =
- fileMenu->addAction (QIcon::fromTheme("window-close",
- QIcon (":/actions/icons/fileclose.png")),
- tr ("&Close"), this, SLOT (request_close_file (bool)));
+ fileMenu->addAction (QIcon::fromTheme("window-close",
+ QIcon (":/actions/icons/fileclose.png")),
+ tr ("&Close"), this, SLOT (request_close_file (bool)));
_close_all_action =
- fileMenu->addAction (QIcon::fromTheme("window-close",
- QIcon (":/actions/icons/fileclose.png")),
- tr ("Close All"),
- this, SLOT (request_close_all_files (bool)));
- _close_others_action =
- fileMenu->addAction (QIcon::fromTheme("window-close",
- QIcon (":/actions/icons/fileclose.png")),
- tr ("Close Other Files"),
- this, SLOT (request_close_other_files (bool)));
+ fileMenu->addAction (QIcon::fromTheme("window-close",
+ QIcon (":/actions/icons/fileclose.png")),
+ tr ("Close All"),
+ this, SLOT (request_close_all_files (bool)));
+ _close_others_action =
+ fileMenu->addAction (QIcon::fromTheme("window-close",
+ QIcon (":/actions/icons/fileclose.png")),
+ tr ("Close Other Files"),
+ this, SLOT (request_close_other_files (bool)));
fileMenu->addSeparator ();
fileMenu->addAction (_print_action);
@@ -1004,11 +1012,13 @@
editMenu->addAction (_goto_line_action);
editMenu->addSeparator ();
_preferences_action =
- editMenu->addAction (QIcon (":/actions/icons/configure.png"),
- tr ("&Preferences"), this, SLOT (request_preferences (bool)));
+ editMenu->addAction (QIcon (":/actions/icons/configure.png"),
+ tr ("&Preferences"),
+ this, SLOT (request_preferences (bool)));
_styles_preferences_action =
editMenu->addAction (QIcon (":/actions/icons/configure.png"),
- tr ("&Styles Preferences"), this, SLOT (request_styles_preferences (bool)));
+ tr ("&Styles Preferences"),
+ this, SLOT (request_styles_preferences (bool)));
_menu_bar->addMenu (editMenu);
_debug_menu = new QMenu (tr ("&Debug"), _menu_bar);
@@ -1024,7 +1034,7 @@
_run_menu->addAction (_run_action);
_context_run_action =
_run_menu->addAction (QIcon (), tr ("Run &Selection"),
- this, SLOT (request_context_run (bool)));
+ this, SLOT (request_context_run (bool)));
_context_run_action->setEnabled (false);
_menu_bar->addMenu (_run_menu);
@@ -1051,7 +1061,8 @@
// signals
connect (this, SIGNAL (request_settings_dialog (const QString&)),
- main_win (), SLOT (process_settings_dialog_request (const QString&)));
+ main_win (),
+ SLOT (process_settings_dialog_request (const QString&)));
connect (main_win (), SIGNAL (new_file_signal (const QString&)),
this, SLOT (request_new_file (const QString&)));
@@ -1147,13 +1158,14 @@
if (settings->value ("editor/restoreSession", true).toBool ())
{
QStringList sessionFileNames
- = settings->value ("editor/savedSessionTabs", QStringList ()).toStringList ();
+ = settings->value ("editor/savedSessionTabs",
+ QStringList ()).toStringList ();
for (int n = 0; n < sessionFileNames.count (); ++n)
request_open_file (sessionFileNames.at (n));
}
- check_actions ();
+ check_actions ();
}
void
@@ -1183,7 +1195,7 @@
connect (f, SIGNAL (run_file_signal (const QFileInfo&)),
main_win (), SLOT (run_file_in_terminal (const QFileInfo&)));
-
+
connect (f, SIGNAL (execute_command_in_terminal_signal (const QString&)),
main_win (), SLOT (execute_command_in_terminal (const QString&)));
@@ -1300,20 +1312,20 @@
{
QWidget * foc_w = focusWidget ();
- if(foc_w && foc_w->inherits ("octave_qscintilla"))
- {
- request_copy ();
- }
+ if (foc_w && foc_w->inherits ("octave_qscintilla"))
+ {
+ request_copy ();
+ }
}
void
file_editor::pasteClipboard ()
{
QWidget * foc_w = focusWidget ();
- if(foc_w && foc_w->inherits ("octave_qscintilla"))
- {
- request_paste ();
- }
+ if (foc_w && foc_w->inherits ("octave_qscintilla"))
+ {
+ request_paste ();
+ }
}
void
@@ -1322,7 +1334,9 @@
if (set)
{
_comment_selection_action->setShortcut (Qt::ControlModifier + Qt::Key_R);
- _uncomment_selection_action->setShortcut (Qt::SHIFT + Qt::ControlModifier + Qt::Key_R);
+ _uncomment_selection_action->setShortcut (Qt::SHIFT
+ + Qt::ControlModifier
+ + Qt::Key_R);
_copy_action->setShortcut (QKeySequence::Copy);
_cut_action->setShortcut (QKeySequence::Cut);
diff -r c4f5c781c3ca -r 97e49b588f5d libgui/src/m-editor/find-dialog.cc
--- a/libgui/src/m-editor/find-dialog.cc Wed Oct 23 22:48:29 2013 -0400
+++ b/libgui/src/m-editor/find-dialog.cc Tue Nov 05 12:27:42 2013 -0500
@@ -158,7 +158,7 @@
_find_next_button->setDefault (true);
_find_result_available = false;
- // move to dialog to side of the parent if there is room on the desktop to do so.
+ // move dialog to side of the parent if there is room on the desktop to do so.
QWidget * desktop = QApplication::desktop ();
int xp = p->x () + p->frameGeometry ().width ();
int yp= p->y ();
@@ -215,9 +215,11 @@
bool do_forward = true;
if (_find_result_available)
- { // we found a match last time, cursor is at the end of the match
+ {
+ // we found a match last time, cursor is at the end of the match
if (!forward)
- { // backward: go back one position or we will find the same again
+ {
+ // backward: go back one position or we will find the same again
do_forward = false;
_edit_area->getCursorPosition (&line,&col);
if (col > 0)
@@ -237,18 +239,19 @@
if (_edit_area)
{
- _find_result_available = _edit_area->findFirst (_search_line_edit->text (),
- _regex_check_box->isChecked (),
- _case_check_box->isChecked (),
- _whole_words_check_box->isChecked (),
- do_wrap,
- do_forward,
- line,col,
- true
+ _find_result_available
+ = _edit_area->findFirst (_search_line_edit->text (),
+ _regex_check_box->isChecked (),
+ _case_check_box->isChecked (),
+ _whole_words_check_box->isChecked (),
+ do_wrap,
+ do_forward,
+ line,col,
+ true
#ifdef HAVE_QSCI_VERSION_2_6_0
- , true
+ , true
#endif
- );
+ );
}
if (_find_result_available)
_from_start_check_box->setChecked (0);
@@ -284,7 +287,8 @@
{
cs = Qt::CaseInsensitive;
}
- strDiff = QString::compare(_search_line_edit->text(),_replace_line_edit->text(),cs);
+ strDiff = QString::compare (_search_line_edit->text(),
+ _replace_line_edit->text(), cs);
// replace all if strings are different
if (_edit_area && strDiff )
@@ -307,7 +311,7 @@
void
find_dialog::no_matches_message ()
{
- QMessageBox msg_box (QMessageBox::Information, tr ("Find Result"),
+ QMessageBox msg_box (QMessageBox::Information, tr ("Find Result"),
tr ("No more matches found"), QMessageBox::Ok, this);
msg_box.exec ();
}
diff -r c4f5c781c3ca -r 97e49b588f5d libgui/src/m-editor/find-dialog.h
--- a/libgui/src/m-editor/find-dialog.h Wed Oct 23 22:48:29 2013 -0400
+++ b/libgui/src/m-editor/find-dialog.h Tue Nov 05 12:27:42 2013 -0500
@@ -74,7 +74,7 @@
class find_dialog : public QDialog
{
Q_OBJECT
- public:
+public:
find_dialog (QsciScintilla* edit_area, QWidget *parent = 0);
void init_search_text ();
diff -r c4f5c781c3ca -r 97e49b588f5d libgui/src/m-editor/octave-qscintilla.cc
--- a/libgui/src/m-editor/octave-qscintilla.cc Wed Oct 23 22:48:29 2013 -0400
+++ b/libgui/src/m-editor/octave-qscintilla.cc Tue Nov 05 12:27:42 2013 -0500
@@ -34,14 +34,15 @@
#include "file-editor-tab.h"
octave_qscintilla::octave_qscintilla (QWidget *p)
- : QsciScintilla (p)
+ : QsciScintilla (p)
{ }
octave_qscintilla::~octave_qscintilla ()
{ }
void
-octave_qscintilla::get_global_textcursor_pos (QPoint *global_pos, QPoint *local_pos)
+octave_qscintilla::get_global_textcursor_pos (QPoint *global_pos,
+ QPoint *local_pos)
{
long position = SendScintilla (QsciScintillaBase::SCI_GETCURRENTPOS);
long point_x = SendScintilla
@@ -99,16 +100,18 @@
QPoint global_pos, local_pos;
if (e->reason () == QContextMenuEvent::Mouse)
- { // context menu by mouse
+ {
+ // context menu by mouse
global_pos = e->globalPos (); // global mouse position
local_pos = e->pos (); // local mouse position
}
else
- { // context menu by keyboard or other: get point of text cursor
+ {
+ // context menu by keyboard or other: get point of text cursor
get_global_textcursor_pos (&global_pos, &local_pos);
QRect editor_rect = geometry (); // editor rect mapped to global
editor_rect.moveTopLeft
- (parentWidget ()->mapToGlobal (editor_rect.topLeft ()));
+ (parentWidget ()->mapToGlobal (editor_rect.topLeft ()));
if (!editor_rect.contains (global_pos)) // is cursor outside editor?
global_pos = editor_rect.topLeft (); // yes, take top left corner
}
@@ -125,11 +128,12 @@
if (!_word_at_cursor.isEmpty ())
{
context_menu->addAction (tr ("Help on") + " " + _word_at_cursor,
- this, SLOT (contextmenu_help (bool)));
- context_menu->addAction (tr ("Documentation on") + " " + _word_at_cursor,
- this, SLOT (contextmenu_doc (bool)));
+ this, SLOT (contextmenu_help (bool)));
+ context_menu->addAction (tr ("Documentation on")
+ + " " + _word_at_cursor,
+ this, SLOT (contextmenu_doc (bool)));
context_menu->addAction (tr ("Edit") + " " + _word_at_cursor,
- this, SLOT (contextmenu_edit (bool)));
+ this, SLOT (contextmenu_edit (bool)));
}
context_menu->addSeparator (); // separator before custom entries
if (hasSelectedText ())
@@ -176,7 +180,8 @@
void
octave_qscintilla::contextmenu_run (bool)
{
- QStringList commands = selectedText ().split (QRegExp("[\r\n]"),QString::SkipEmptyParts);
+ QStringList commands = selectedText ().split (QRegExp("[\r\n]"),
+ QString::SkipEmptyParts);
for (int i = 0; i < commands.size (); i++ )
emit execute_command_in_terminal_signal (commands.at (i));
}
diff -r c4f5c781c3ca -r 97e49b588f5d libgui/src/m-editor/octave-qscintilla.h
--- a/libgui/src/m-editor/octave-qscintilla.h Wed Oct 23 22:48:29 2013 -0400
+++ b/libgui/src/m-editor/octave-qscintilla.h Tue Nov 05 12:27:42 2013 -0500
@@ -22,8 +22,8 @@
// Author: Torsten
-#if !defined (octave_qscintilla_h)
-#define octave_qscintilla_h 1
+#if !defined (octave_octave_qscintilla_h)
+#define octave_octave_qscintilla_h 1
#include
#include
diff -r c4f5c781c3ca -r 97e49b588f5d libgui/src/main-window.cc
--- a/libgui/src/main-window.cc Wed Oct 23 22:48:29 2013 -0400
+++ b/libgui/src/main-window.cc Tue Nov 05 12:27:42 2013 -0500
@@ -39,6 +39,7 @@
#include
#include
#include
+#include
#include
@@ -102,7 +103,7 @@
delete history_window;
delete status_bar;
delete _workspace_model;
- if (find_files_dlg)
+ if (find_files_dlg)
{
delete find_files_dlg;
find_files_dlg = 0;
@@ -146,7 +147,8 @@
main_window::handle_save_workspace_request (void)
{
QString file =
- QFileDialog::getSaveFileName (this, tr ("Save Workspace As"), ".", 0, 0, QFileDialog::DontUseNativeDialog);
+ QFileDialog::getSaveFileName (this, tr ("Save Workspace As"), ".", 0, 0,
+ QFileDialog::DontUseNativeDialog);
if (! file.isEmpty ())
octave_link::post_event (this, &main_window::save_workspace_callback,
@@ -159,7 +161,8 @@
QString file = file_arg;
if (file.isEmpty ())
- file = QFileDialog::getOpenFileName (this, tr ("Load Workspace"), ".", 0, 0, QFileDialog::DontUseNativeDialog);
+ file = QFileDialog::getOpenFileName (this, tr ("Load Workspace"), ".", 0, 0,
+ QFileDialog::DontUseNativeDialog);
if (! file.isEmpty ())
octave_link::post_event (this, &main_window::load_workspace_callback,
@@ -232,7 +235,7 @@
_cmd_queue->append (command); // queue command
_cmd_queue_mutex.unlock ();
- if (_cmd_processing.tryAcquire ()) // if callback is not processing, post event
+ if (_cmd_processing.tryAcquire ()) // if callback not processing, post event
octave_link::post_event (this, &main_window::execute_command_callback);
}
@@ -251,18 +254,33 @@
void
main_window::display_release_notes (void)
{
- std::string news_file = "file://" + Voct_etc_dir + "/NEWS";
+ std::string news_file = Voct_etc_dir + "/NEWS";
+
+ QString news;
- display_url_in_window (QUrl (QString::fromStdString (news_file)));
-}
+ QFile *file = new QFile (QString::fromStdString (news_file));
+ if (file->open (QFile::ReadOnly))
+ {
+ QTextStream *stream = new QTextStream (file);
+ news = stream->readAll ();
+ if (! news.isEmpty ())
+ {
+ news.prepend ("
");
+ news.append ("
");
+ }
+ else
+ news = (tr ("The release notes file '%1' is empty.")
+ . arg (QString::fromStdString (news_file)));
+ }
+ else
+ news = (tr ("The release notes file '%1' cannot be read.")
+ . arg (QString::fromStdString (news_file)));
-void
-main_window::display_url_in_window (const QUrl& url)
-{
+
QWidget *w = new QWidget;
QTextBrowser *browser = new QTextBrowser (w);
- browser->setSource (url);
+ browser->setText (news);
QVBoxLayout *vlayout = new QVBoxLayout;
vlayout->addWidget (browser);
@@ -331,27 +349,30 @@
= settings->value ("DockWidgets/widget_icon_set", "NONE").toString ();
static struct
- {
- QString name;
- QString path;
- }
+ {
+ QString name;
+ QString path;
+ }
widget_icon_data[] =
- { // array of possible icon sets (name, path (complete for NONE))
- // the first entry here is the default!
- {"NONE", ":/actions/icons/logo.png"},
- {"GRAPHIC", ":/actions/icons/graphic_logo_"},
- {"LETTER", ":/actions/icons/letter_logo_"},
- {"", ""} // end marker has empty name
- };
+ {
+ // array of possible icon sets (name, path (complete for NONE))
+ // the first entry here is the default!
+ {"NONE", ":/actions/icons/logo.png"},
+ {"GRAPHIC", ":/actions/icons/graphic_logo_"},
+ {"LETTER", ":/actions/icons/letter_logo_"},
+ {"", ""} // end marker has empty name
+ };
int count = 0;
int icon_set_found = 0; // default
while (!widget_icon_data[count].name.isEmpty ())
- { // while not end of data
+ {
+ // while not end of data
if (widget_icon_data[count].name == icon_set)
- { // data of desired icon set found
+ {
+ // data of desired icon set found
icon_set_found = count;
break;
}
@@ -371,10 +392,10 @@
}
}
if (widget_icon_data[icon_set_found].name != "NONE")
- _release_notes_icon = widget_icon_data[icon_set_found].path
- + "ReleaseWidget.png";
+ _release_notes_icon = widget_icon_data[icon_set_found].path
+ + "ReleaseWidget.png";
else
- _release_notes_icon = ":/actions/icons/logo.png";
+ _release_notes_icon = ":/actions/icons/logo.png";
int icon_size = settings->value ("toolbar_icon_size",24).toInt ();
_main_tool_bar->setIconSize (QSize (icon_size,icon_size));
@@ -425,11 +446,12 @@
main_window::browse_for_directory (void)
{
QString dir
- = QFileDialog::getExistingDirectory (this, tr ("Set working directory"), 0, QFileDialog::DontUseNativeDialog);
+ = QFileDialog::getExistingDirectory (this, tr ("Set working directory"), 0,
+ QFileDialog::DontUseNativeDialog);
set_current_working_directory (dir);
- // FIXME -- on Windows systems, the command window freezes after the
+ // FIXME: on Windows systems, the command window freezes after the
// previous actions. Forcing the focus appears to unstick it.
focus_command_window ();
@@ -441,7 +463,7 @@
// Change to dir if it is an existing directory.
QString xdir = dir.isEmpty () ? "." : dir;
-
+
QFileInfo fileInfo (xdir);
if (fileInfo.exists () && fileInfo.isDir ())
@@ -597,14 +619,15 @@
if (!settings)
{
- qDebug("Error: QSettings pointer from resource manager is NULL.");
+ qDebug ("Error: QSettings pointer from resource manager is NULL.");
return;
}
set_window_layout (settings);
// restore the list of the last directories
- QStringList curr_dirs = settings->value ("MainWindow/current_directory_list").toStringList ();
+ QStringList curr_dirs
+ = settings->value ("MainWindow/current_directory_list").toStringList ();
for (int i=0; i < curr_dirs.size (); i++)
{
_current_directory_combo_box->addItem (curr_dirs.at (i));
@@ -655,7 +678,7 @@
// show floating widgets after main win to ensure "Octave" in central menu
foreach (octave_dock_widget *widget, float_and_visible)
- widget->setVisible (true);
+ widget->setVisible (true);
}
@@ -665,7 +688,7 @@
QSettings *settings = resource_manager::get_settings ();
if (!settings)
{
- qDebug("Error: QSettings pointer from resource manager is NULL.");
+ qDebug ("Error: QSettings pointer from resource manager is NULL.");
return;
}
@@ -700,9 +723,9 @@
if (edit && edit->hasSelectedText ())
{
QClipboard *clipboard = QApplication::clipboard ();
- clipboard->setText (edit->selectedText ());
+ clipboard->setText (edit->selectedText ());
}
- }
+ }
else
emit copyClipboard_signal ();
}
@@ -717,9 +740,9 @@
QString str = clipboard->text ();
if (edit && str.length () > 0)
{
- edit->insert (str);
+ edit->insert (str);
}
- }
+ }
else
emit pasteClipboard_signal ();
}
@@ -762,12 +785,14 @@
const QStringList&)),
this,
SLOT (handle_create_inputlayout (const QStringList&, const QString&,
- const QFloatList&, const QFloatList&,
+ const QFloatList&,
+ const QFloatList&,
const QStringList&)));
connect (&uiwidget_creator,
SIGNAL (create_filedialog (const QStringList &,const QString&,
- const QString&, const QString&, const QString&)),
+ const QString&, const QString&,
+ const QString&)),
this,
SLOT (handle_create_filedialog (const QStringList &, const QString&,
const QString&, const QString&,
@@ -830,8 +855,8 @@
void
main_window::handle_create_filedialog (const QStringList& filters,
- const QString& title,
- const QString& filename,
+ const QString& title,
+ const QString& filename,
const QString& dirname,
const QString& multimode)
{
@@ -905,8 +930,8 @@
addDockWidget (Qt::LeftDockWidgetArea, workspace_window);
addDockWidget (Qt::LeftDockWidgetArea, history_window);
- int win_x = QApplication::desktop()->width();
- int win_y = QApplication::desktop()->height();
+ int win_x = QApplication::desktop ()->width ();
+ int win_y = QApplication::desktop ()->height ();
if (win_x > 960)
win_x = 960;
@@ -934,7 +959,9 @@
connect (this,
SIGNAL (update_breakpoint_marker_signal (bool, const QString&, int)),
editor_window,
- SLOT (handle_update_breakpoint_marker_request (bool, const QString&, int)));
+ SLOT (handle_update_breakpoint_marker_request (bool,
+ const QString&,
+ int)));
#endif
QDir curr_dir;
@@ -960,12 +987,12 @@
SIGNAL (set_workspace_signal
(bool, const QString&, const QStringList&,
const QStringList&, const QStringList&,
- const QStringList&)),
+ const QStringList&, const QIntList&)),
_workspace_model,
SLOT (set_workspace
(bool, const QString&, const QStringList&,
const QStringList&, const QStringList&,
- const QStringList&)));
+ const QStringList&, const QIntList&)));
connect (_octave_qt_link, SIGNAL (clear_workspace_signal ()),
_workspace_model, SLOT (clear_workspace ()));
@@ -1019,7 +1046,8 @@
connect (_octave_qt_link,
SIGNAL (update_breakpoint_marker_signal (bool, const QString&, int)),
this,
- SLOT (handle_update_breakpoint_marker_request (bool, const QString&, int)));
+ SLOT (handle_update_breakpoint_marker_request (bool, const QString&,
+ int)));
connect (_octave_qt_link,
SIGNAL (show_doc_signal (const QString &)),
@@ -1174,12 +1202,12 @@
= edit_menu->addAction (tr ("Clear Command Window"));
QAction *clear_command_history
- = edit_menu->addAction(tr ("Clear Command History"));
+ = edit_menu->addAction (tr ("Clear Command History"));
QAction *clear_workspace_action
= edit_menu->addAction (tr ("Clear Workspace"));
- connect (_find_files_action, SIGNAL (triggered()),
+ connect (_find_files_action, SIGNAL (triggered ()),
this, SLOT (find_files ()));
connect (clear_command_window_action, SIGNAL (triggered ()),
@@ -1220,17 +1248,20 @@
_debug_menu = p->addMenu (tr ("De&bug"));
_debug_step_over = construct_debug_menu_item
- (":/actions/icons/db_step.png", tr ("Step"), Qt::Key_F10);
+ (":/actions/icons/db_step.png", tr ("Step"),
+ Qt::Key_F10);
_debug_step_into = construct_debug_menu_item
- (":/actions/icons/db_step_in.png", tr ("Step in"), Qt::Key_F11);
+ (":/actions/icons/db_step_in.png", tr ("Step in"),
+ Qt::Key_F11);
_debug_step_out = construct_debug_menu_item
- (":/actions/icons/db_step_out.png", tr ("Step out"),
- Qt::ShiftModifier + Qt::Key_F11);
+ (":/actions/icons/db_step_out.png", tr ("Step out"),
+ Qt::ShiftModifier + Qt::Key_F11);
_debug_continue = construct_debug_menu_item
- (":/actions/icons/db_cont.png", tr ("Continue"), Qt::Key_F5);
+ (":/actions/icons/db_cont.png", tr ("Continue"),
+ Qt::Key_F5);
_debug_menu->addSeparator ();
#ifdef HAVE_QSCINTILLA
@@ -1238,8 +1269,8 @@
#endif
_debug_quit = construct_debug_menu_item
- (":/actions/icons/db_stop.png", tr ("Exit Debug Mode"),
- Qt::ShiftModifier + Qt::Key_F5);
+ (":/actions/icons/db_stop.png", tr ("Exit Debug Mode"),
+ Qt::ShiftModifier + Qt::Key_F5);
connect (_debug_step_over, SIGNAL (triggered ()),
this, SLOT (debug_step_over ()));
@@ -1280,48 +1311,62 @@
QKeySequence ctrl_shift = Qt::ControlModifier + Qt::ShiftModifier;
QAction *show_command_window_action = construct_window_menu_item
- (window_menu, tr ("Show Command Window"), true, ctrl_shift + Qt::Key_0);
+ (window_menu,
+ tr ("Show Command Window"), true,
+ ctrl_shift + Qt::Key_0);
QAction *show_history_action = construct_window_menu_item
- (window_menu, tr ("Show Command History"), true, ctrl_shift + Qt::Key_1);
+ (window_menu, tr ("Show Command History"),
+ true, ctrl_shift + Qt::Key_1);
QAction *show_file_browser_action = construct_window_menu_item
- (window_menu, tr ("Show File Browser"), true, ctrl_shift + Qt::Key_2);
+ (window_menu, tr ("Show File Browser"),
+ true, ctrl_shift + Qt::Key_2);
QAction *show_workspace_action = construct_window_menu_item
- (window_menu, tr ("Show Workspace"), true, ctrl_shift + Qt::Key_3);
+ (window_menu, tr ("Show Workspace"), true,
+ ctrl_shift + Qt::Key_3);
QAction *show_editor_action = construct_window_menu_item
- (window_menu, tr ("Show Editor"), true, ctrl_shift + Qt::Key_4);
+ (window_menu, tr ("Show Editor"), true,
+ ctrl_shift + Qt::Key_4);
QAction *show_documentation_action = construct_window_menu_item
- (window_menu, tr ("Show Documentation"), true, ctrl_shift + Qt::Key_5);
+ (window_menu, tr ("Show Documentation"),
+ true, ctrl_shift + Qt::Key_5);
QAction *show_news_action = construct_window_menu_item
- (window_menu, tr ("Show News Window"), true, ctrl_shift + Qt::Key_6);
+ (window_menu, tr ("Show News Window"), true,
+ ctrl_shift + Qt::Key_6);
window_menu->addSeparator ();
QAction *command_window_action = construct_window_menu_item
- (window_menu, tr ("Command Window"), false, ctrl + Qt::Key_0);
+ (window_menu, tr ("Command Window"), false,
+ ctrl + Qt::Key_0);
QAction *history_action = construct_window_menu_item
- (window_menu, tr ("Command History"), false, ctrl + Qt::Key_1);
+ (window_menu, tr ("Command History"), false,
+ ctrl + Qt::Key_1);
QAction *file_browser_action = construct_window_menu_item
- (window_menu, tr ("File Browser"), false, ctrl + Qt::Key_2);
+ (window_menu, tr ("File Browser"), false,
+ ctrl + Qt::Key_2);
QAction *workspace_action = construct_window_menu_item
- (window_menu, tr ("Workspace"), false, ctrl + Qt::Key_3);
+ (window_menu, tr ("Workspace"), false,
+ ctrl + Qt::Key_3);
QAction *editor_action = construct_window_menu_item
- (window_menu, tr ("Editor"), false, ctrl + Qt::Key_4);
+ (window_menu, tr ("Editor"), false,
+ ctrl + Qt::Key_4);
QAction *documentation_action = construct_window_menu_item
- (window_menu, tr ("Documentation"), false, ctrl + Qt::Key_5);
+ (window_menu, tr ("Documentation"), false,
+ ctrl + Qt::Key_5);
QAction *news_action = construct_window_menu_item
- (window_menu, tr ("News"), false, ctrl + Qt::Key_6);
+ (window_menu, tr ("News"), false, ctrl + Qt::Key_6);
window_menu->addSeparator ();
@@ -1503,29 +1548,30 @@
_current_directory_combo_box = new QComboBox (this);
_current_directory_combo_box->setFixedWidth (current_directory_width);
_current_directory_combo_box->setEditable (true);
- _current_directory_combo_box->setInsertPolicy(QComboBox::NoInsert);
+ _current_directory_combo_box->setInsertPolicy (QComboBox::NoInsert);
_current_directory_combo_box->setToolTip (tr ("Enter directory name"));
- _current_directory_combo_box->setMaxVisibleItems (current_directory_max_visible);
+ _current_directory_combo_box->setMaxVisibleItems (
+ current_directory_max_visible);
_current_directory_combo_box->setMaxCount (current_directory_max_count);
- QSizePolicy sizePol(QSizePolicy::Expanding, QSizePolicy::Preferred);
- _current_directory_combo_box->setSizePolicy(sizePol);
+ QSizePolicy sizePol (QSizePolicy::Expanding, QSizePolicy::Preferred);
+ _current_directory_combo_box->setSizePolicy (sizePol);
// addWidget takes ownership of the objects so there is no
// need to delete these upon destroying this main_window.
_main_tool_bar->addWidget (new QLabel (tr ("Current Directory: ")));
_main_tool_bar->addWidget (_current_directory_combo_box);
QAction *current_dir_up = _main_tool_bar->addAction (
- QIcon (":/actions/icons/up.png"),
- tr ("One directory up"));
+ QIcon (":/actions/icons/up.png"),
+ tr ("One directory up"));
QAction *current_dir_search = _main_tool_bar->addAction (
- QIcon (":/actions/icons/search.png"),
- tr ("Browse directories"));
+ QIcon (":/actions/icons/search.png"),
+ tr ("Browse directories"));
connect (_current_directory_combo_box, SIGNAL (activated (QString)),
this, SLOT (set_current_working_directory (QString)));
- connect (_current_directory_combo_box->lineEdit(), SIGNAL (returnPressed ()),
- this, SLOT (accept_directory_line_edit ()));
+ connect (_current_directory_combo_box->lineEdit (), SIGNAL (returnPressed ()),
+ this, SLOT (accept_directory_line_edit ()));
connect (current_dir_search, SIGNAL (triggered ()),
this, SLOT (browse_for_directory ()));
@@ -1563,7 +1609,7 @@
/* bool status = */ symbol_table::rename (names.first, names.second);
// if (status)
- octave_link::set_workspace (true, symbol_table::workspace_info ());
+ octave_link::set_workspace (true, symbol_table::workspace_info ());
// else
// ; // we need an octave_link action that runs a GUI error option.
@@ -1608,7 +1654,7 @@
_cmd_queue_mutex.lock (); // critical path
std::string command = _cmd_queue->takeFirst ().toStdString ();
if (_cmd_queue->isEmpty ())
- _cmd_processing.release (); // command queue empty, processing will stop
+ _cmd_processing.release (); // cmd queue empty, processing will stop
else
repost = true; // not empty, repost at end
_cmd_queue_mutex.unlock ();
@@ -1693,7 +1739,7 @@
}
void
-main_window::find_files(const QString &start_dir)
+main_window::find_files (const QString &start_dir)
{
if (! find_files_dlg)
@@ -1703,11 +1749,12 @@
connect (find_files_dlg, SIGNAL (finished (int)),
this, SLOT (find_files_finished (int)));
- connect (find_files_dlg, SIGNAL (dir_selected(const QString &)),
- file_browser_window, SLOT(set_current_directory(const QString&)));
+ connect (find_files_dlg, SIGNAL (dir_selected (const QString &)),
+ file_browser_window,
+ SLOT (set_current_directory (const QString&)));
- connect (find_files_dlg, SIGNAL (file_selected(const QString &)),
- this, SLOT(open_file(const QString &)));
+ connect (find_files_dlg, SIGNAL (file_selected (const QString &)),
+ this, SLOT (open_file (const QString &)));
find_files_dlg->setWindowModality (Qt::NonModal);
}
@@ -1717,14 +1764,14 @@
find_files_dlg->show ();
}
- find_files_dlg->set_search_dir(start_dir);
+ find_files_dlg->set_search_dir (start_dir);
find_files_dlg->activateWindow ();
}
-void
-main_window::find_files_finished(int)
+void
+main_window::find_files_finished (int)
{
}
@@ -1740,7 +1787,9 @@
_exit_action->setShortcut (QKeySequence::Quit);
- _find_files_action->setShortcut (Qt::ControlModifier + Qt::ShiftModifier + Qt::Key_F);
+ _find_files_action->setShortcut (Qt::ControlModifier
+ + Qt::ShiftModifier
+ + Qt::Key_F);
}
else
diff -r c4f5c781c3ca -r 97e49b588f5d libgui/src/main-window.h
--- a/libgui/src/main-window.h Wed Oct 23 22:48:29 2013 -0400
+++ b/libgui/src/main-window.h Tue Nov 05 12:27:42 2013 -0500
@@ -21,11 +21,11 @@
*/
-#if !defined (main_window_h)
-#define main_window_h 1
+#if !defined (octave_main_window_h)
+#define octave_main_window_h 1
// Qt includes
-#include
+#include
#include
#include
#include
@@ -115,7 +115,8 @@
void open_agora_page (void);
void open_contribute_page (void);
void open_developer_page (void);
- void process_settings_dialog_request (const QString& desired_tab = QString ());
+ void process_settings_dialog_request (const QString& desired_tab
+ = QString ());
void show_about_octave (void);
void notice_settings (const QSettings *settings);
void prepare_to_exit (void);
@@ -128,8 +129,8 @@
void change_directory_up (void);
void accept_directory_line_edit (void);
- void execute_command_in_terminal(const QString& dir);
- void run_file_in_terminal(const QFileInfo& info);
+ void execute_command_in_terminal (const QString& dir);
+ void run_file_in_terminal (const QFileInfo& info);
void handle_new_figure_request (void);
@@ -173,16 +174,16 @@
const QFloatList&, const QFloatList&,
const QStringList&);
- void handle_create_filedialog (const QStringList &filters,
- const QString& title, const QString& filename,
+ void handle_create_filedialog (const QStringList &filters,
+ const QString& title, const QString& filename,
const QString &dirname,
const QString& multimode);
void handle_show_doc (const QString &file);
- // find files dialog
- void find_files(const QString &startdir=QDir::currentPath());
- void find_files_finished(int);
+ // find files dialog
+ void find_files (const QString &startdir=QDir::currentPath ());
+ void find_files_finished (int);
// setting global shortcuts
void set_global_shortcuts (bool enable);
@@ -222,8 +223,6 @@
void construct_tool_bar (void);
- void display_url_in_window (const QUrl& url);
-
void establish_octave_link (void);
void save_workspace_callback (const std::string& file);
diff -r c4f5c781c3ca -r 97e49b588f5d libgui/src/news-dock-widget.h
--- a/libgui/src/news-dock-widget.h Wed Oct 23 22:48:29 2013 -0400
+++ b/libgui/src/news-dock-widget.h Tue Nov 05 12:27:42 2013 -0500
@@ -52,22 +52,22 @@
class news_reader : public QObject
{
Q_OBJECT
-
+
public:
news_reader (const QString& xbase_url, const QString& xpage)
: QObject (), base_url (xbase_url), page (xpage) { }
-
+
public slots:
- void process (void);
-
+ void process (void);
+
signals:
void display_news_signal (const QString& news);
void finished (void);
-
+
private:
QString base_url;
diff -r c4f5c781c3ca -r 97e49b588f5d libgui/src/octave-dock-widget.cc
--- a/libgui/src/octave-dock-widget.cc Wed Oct 23 22:48:29 2013 -0400
+++ b/libgui/src/octave-dock-widget.cc Tue Nov 05 12:27:42 2013 -0500
@@ -34,7 +34,7 @@
octave_dock_widget::octave_dock_widget (QWidget *p)
- : QDockWidget (p)
+ : QDockWidget (p)
{
_parent = static_cast (p); // store main window
@@ -58,8 +58,8 @@
this, SLOT (change_floating (bool)));
QToolButton *dock_button = new QToolButton (this);
dock_button->setDefaultAction (_dock_action);
- dock_button->setFocusPolicy(Qt::NoFocus);
- dock_button->setIconSize(QSize(12,12));
+ dock_button->setFocusPolicy (Qt::NoFocus);
+ dock_button->setIconSize (QSize (12,12));
QAction *close_action = new QAction
(QIcon (":/actions/icons/widget-close.png"), "", this );
@@ -68,8 +68,8 @@
this, SLOT (change_visibility (bool)));
QToolButton *close_button = new QToolButton (this);
close_button->setDefaultAction (close_action);
- close_button->setFocusPolicy(Qt::NoFocus);
- close_button->setIconSize(QSize(12,12));
+ close_button->setFocusPolicy (Qt::NoFocus);
+ close_button->setIconSize (QSize (12,12));
QHBoxLayout *h_layout = new QHBoxLayout ();
h_layout->addStretch (100);
@@ -95,8 +95,10 @@
#endif
// copy & paste handling
- connect (p, SIGNAL (copyClipboard_signal ()), this, SLOT (copyClipboard ()));
- connect (p, SIGNAL (pasteClipboard_signal()), this, SLOT (pasteClipboard ()));
+ connect (p, SIGNAL (copyClipboard_signal ()),
+ this, SLOT (copyClipboard ()));
+ connect (p, SIGNAL (pasteClipboard_signal ()),
+ this, SLOT (pasteClipboard ()));
}
octave_dock_widget::~octave_dock_widget ()
@@ -110,7 +112,8 @@
settings->beginGroup ("DockWidgets");
if (!parent ())
- { // widget is floating (windows), save actual floating geometry
+ {
+ // widget is floating (windows), save actual floating geometry
floating = true;
settings->setValue (name+"_floating_geometry", saveGeometry ());
}
@@ -141,7 +144,7 @@
{
#if defined (Q_OS_WIN32)
QHBoxLayout* h_layout =
- static_cast (titleBarWidget ()->layout ());
+ static_cast (titleBarWidget ()->layout ());
QLabel *label = new QLabel (title);
h_layout->insertWidget (0,label);
#endif
@@ -170,8 +173,8 @@
_dock_action->setToolTip (tr ("Dock widget"));
// restore the last geometry when floating
- restoreGeometry (settings->value
- ("DockWidgets/" + objectName ()+"_floating_geometry").toByteArray ());
+ restoreGeometry (settings->value ("DockWidgets/" + objectName ()
+ + "_floating_geometry").toByteArray ());
#else
@@ -198,12 +201,14 @@
settings->sync ();
if (dock)
- { // add widget to last saved docking area (dock=true is default)
+ {
+ // add widget to last saved docking area (dock=true is default)
int area = settings->value ("DockWidgets/" + objectName () + "_dock_area",
- Qt::TopDockWidgetArea).toInt ();
+ Qt::TopDockWidgetArea).toInt ();
_parent->addDockWidget (static_cast (area), this);
- // FIXME: restoreGeometry is ignored for docked widgets and its child widget
+ // FIXME: restoreGeometry is ignored for docked widgets
+ // and its child widget
// restoreGeometry (settings->value
// ("DockWidgets/" + objectName ()).toByteArray ());
}
@@ -225,9 +230,9 @@
// slot for (un)dock action
void
octave_dock_widget::change_floating (bool floating)
- {
+{
#if defined (Q_OS_WIN32)
- if (parent())
+ if (parent ())
#else
if (floating)
#endif
@@ -251,7 +256,7 @@
QWidget *
octave_dock_widget::focusWidget ()
{
- QWidget * w = QApplication::focusWidget ();
- if(w && w->focusProxy ()) w = w->focusProxy ();
- return w;
+ QWidget * w = QApplication::focusWidget ();
+ if (w && w->focusProxy ()) w = w->focusProxy ();
+ return w;
}
diff -r c4f5c781c3ca -r 97e49b588f5d libgui/src/octave-dock-widget.h
--- a/libgui/src/octave-dock-widget.h Wed Oct 23 22:48:29 2013 -0400
+++ b/libgui/src/octave-dock-widget.h Tue Nov 05 12:27:42 2013 -0500
@@ -20,8 +20,8 @@
*/
-#if !defined (octave_dock_widget_h)
-#define octave_dock_widget_h 1
+#if !defined (octave_octave_dock_widget_h)
+#define octave_octave_dock_widget_h 1
#include
#include
@@ -58,7 +58,7 @@
QDockWidget::closeEvent (e);
}
- QWidget * focusWidget();
+ QWidget * focusWidget ();
public slots:
diff -r c4f5c781c3ca -r 97e49b588f5d libgui/src/octave-gui.cc
--- a/libgui/src/octave-gui.cc Wed Oct 23 22:48:29 2013 -0400
+++ b/libgui/src/octave-gui.cc Tue Nov 05 12:27:42 2013 -0500
@@ -24,8 +24,10 @@
#include
#endif
-#include
+#include
+#include
#include
+#include
#include
#include
@@ -42,6 +44,7 @@
#include "oct-syscalls.h"
#include "syswait.h"
+#include "octave.h"
#include "sighandlers.h"
#include "welcome-wizard.h"
@@ -49,126 +52,136 @@
#include "main-window.h"
#include "octave-gui.h"
+// Allow the Octave interpreter to start as in CLI mode with a
+// QApplication context so that it can use Qt for things like plotting
+// and UI widgets.
-// custom message handler for filtering some messages from qt
-void message_handler (QtMsgType type, const char *msg)
- {
- switch (type) {
- case QtDebugMsg:
- if (strcmp(msg,"QFileSystemWatcher: skipping native engine") > 0)
- break;
- fprintf(stderr, "Debug: %s\n", msg);
- break;
- case QtWarningMsg:
- fprintf(stderr, "Warning: %s\n", msg);
- break;
- case QtCriticalMsg:
- fprintf(stderr, "Critical: %s\n", msg);
- break;
- case QtFatalMsg:
- fprintf(stderr, "Fatal: %s\n", msg);
- abort();
- }
- }
+class octave_cli_thread : public QThread
+{
+public:
+
+ octave_cli_thread (int argc, char **argv)
+ : m_argc (argc), m_argv (argv), m_result (0) { }
+
+ int result (void) const { return m_result; }
+
+protected:
+
+ void run (void)
+ {
+ octave_initialize_interpreter (m_argc, m_argv, 0);
+
+ m_result = octave_execute_interpreter ();
+
+ QCoreApplication::exit (m_result);
+ }
+
+private:
+
+ int m_argc;
+ char** m_argv;
+ int m_result;
+};
-// Dissociate from the controlling terminal, if any.
+// Custom message handler for filtering some messages from Qt.
-static void
-dissociate_terminal (void)
+void message_handler (QtMsgType type, const char *msg)
{
-#if ! (defined (__WIN32__) || defined (__APPLE__)) || defined (__CYGWIN__)
-
- pid_t pid = fork ();
+ switch (type)
+ {
+ case QtDebugMsg:
+ if (strncmp (msg, "QFileSystemWatcher: skipping native engine",42) != 0)
+ std::cerr << "Debug: " << msg << std::endl;
+ break;
+
+ case QtWarningMsg:
+ std::cerr << "Warning: " << msg << std::endl;
+ break;
+
+ case QtCriticalMsg:
+ std::cerr << "Critical: " << msg << std::endl;
+ break;
- if (pid < 0)
+ case QtFatalMsg:
+ std::cerr << "Fatal: " << msg << std::endl;
+ abort ();
+
+ default:
+ break;
+ }
+}
+
+// If START_GUI is false, we still set up the QApplication so that we
+// can use Qt widgets for plot windows.
+
+int
+octave_start_gui (int argc, char *argv[], bool start_gui)
+{
+ qInstallMsgHandler (message_handler);
+
+ if (start_gui)
{
- std::cerr << "fork failed!" << std::endl;;
- exit (1);
- }
- else if (pid == 0)
- {
- // Child.
+ QApplication application (argc, argv);
+
+ // Set the codec for all strings
+ QTextCodec::setCodecForCStrings (QTextCodec::codecForName ("UTF-8"));
+
+ // 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 ())
+ {
+ welcome_wizard welcomeWizard;
+ welcomeWizard.exec ();
+ resource_manager::reload_settings ();
+ }
+ else
+ {
+ // update network-settings
+ resource_manager::update_network_settings ();
- if (setsid () < 0)
- {
- std::cerr << "setsid error" << std::endl;
- exit (1);
+#if ! defined (__WIN32__) || defined (__CYGWIN__)
+ // If we were started from a launcher, TERM might not be
+ // defined, but we provide a terminal with xterm
+ // capabilities.
+
+ std::string term = octave_env::getenv ("TERM");
+
+ if (term.empty ())
+ octave_env::putenv ("TERM", "xterm");
+#else
+ std::string term = octave_env::getenv ("TERM");
+
+ if (term.empty ())
+ octave_env::putenv ("TERM", "cygwin");
+#endif
+
+ // create main window, read settings, and show window
+ main_window w;
+ w.read_settings (); // get widget settings and window layout
+ w.focus_command_window ();
+ w.connect_visibility_changed (); // connect signals for changes
+ // in visibility not before w
+ // is shown
+ return application.exec ();
+ }
}
}
else
{
- // Parent
-
- install_gui_driver_signal_handlers (pid);
-
- int status;
-
- waitpid (pid, &status, 0);
-
- exit (octave_wait::ifexited (status)
- ? octave_wait::exitstatus (status) : 127);
- }
-
-#endif
-}
+ QCoreApplication application (argc, argv);
-int
-octave_start_gui (int argc, char *argv[], bool fork)
-{
- if (fork)
- dissociate_terminal ();
-
- qInstallMsgHandler(message_handler);
-
- QApplication application (argc, argv);
-
- // Set the codec for all strings
- QTextCodec::setCodecForCStrings(QTextCodec::codecForName("UTF-8"));
-
- // 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);
+ octave_cli_thread main_thread (argc, argv);
- while (true)
- {
- if (resource_manager::is_first_run ())
- {
- welcome_wizard welcomeWizard;
- welcomeWizard.exec ();
- resource_manager::reload_settings ();
- }
- else
- {
- // update network-settings
- resource_manager::update_network_settings ();
-
-#if ! defined (__WIN32__) || defined (__CYGWIN__)
- // If we were started from a launcher, TERM might not be
- // defined, but we provide a terminal with xterm
- // capabilities.
+ main_thread.start ();
- std::string term = octave_env::getenv ("TERM");
-
- if (term.empty ())
- octave_env::putenv ("TERM", "xterm");
-#else
- std::string term = octave_env::getenv ("TERM");
-
- if (term.empty ())
- octave_env::putenv ("TERM", "cygwin");
-#endif
-
- // create main window, read settings, and show window
- main_window w;
- w.read_settings (); // get widget settings and window layout
- w.focus_command_window ();
- w.connect_visibility_changed (); // connect signals for changes in
- // visibility not before w is shown
- return application.exec ();
- }
+ return application.exec ();
}
}
diff -r c4f5c781c3ca -r 97e49b588f5d libgui/src/octave-gui.h
--- a/libgui/src/octave-gui.h Wed Oct 23 22:48:29 2013 -0400
+++ b/libgui/src/octave-gui.h Tue Nov 05 12:27:42 2013 -0500
@@ -24,6 +24,6 @@
#define octave_octave_gui_h 1
extern OCTGUI_API int octave_start_gui (int argc, char **argv,
- bool fork = true);
+ bool start_gui = true);
#endif
diff -r c4f5c781c3ca -r 97e49b588f5d libgui/src/octave-main-thread.cc
--- a/libgui/src/octave-main-thread.cc Wed Oct 23 22:48:29 2013 -0400
+++ b/libgui/src/octave-main-thread.cc Tue Nov 05 12:27:42 2013 -0500
@@ -25,7 +25,6 @@
#include
#endif
-#include
#include
#include "builtin-defun-decls.h"
@@ -39,9 +38,6 @@
void
octave_main_thread::run (void)
{
- // Matlab uses "C" locale for LC_NUMERIC class regardless of local setting
- setlocale (LC_NUMERIC, "C");
-
octave_initialize_interpreter (octave_cmdline_argc, octave_cmdline_argv,
octave_embedded);
diff -r c4f5c781c3ca -r 97e49b588f5d libgui/src/octave-qt-link.cc
--- a/libgui/src/octave-qt-link.cc Wed Oct 23 22:48:29 2013 -0400
+++ b/libgui/src/octave-qt-link.cc Tue Nov 05 12:27:42 2013 -0500
@@ -114,7 +114,7 @@
uiwidget_creator.wait ();
// The GUI has sent a signal and the process has been awakened.
- return uiwidget_creator.get_dialog_button().toStdString ();
+ return uiwidget_creator.get_dialog_button ().toStdString ();
}
static QStringList
@@ -153,10 +153,10 @@
name.replace (QRegExp ("\\(.*\\)"), "");
ext.replace (";", " ");
- if (name.length() == 0)
+ if (name.length () == 0)
{
// No name field. Build one from the extensions.
- name = ext.toUpper() + " Files";
+ name = ext.toUpper () + " Files";
}
retval.append (name + " (" + ext + ")");
@@ -250,7 +250,8 @@
retval.push_back (it->toStdString ());
retval.push_back (uiwidget_creator.get_dialog_path ()->toStdString ());
- retval.push_back ((QString ("%1").arg (uiwidget_creator.get_dialog_result ())).toStdString ());
+ retval.push_back ((QString ("%1").arg (
+ uiwidget_creator.get_dialog_result ())).toStdString ());
return retval;
}
@@ -267,8 +268,8 @@
QString msg
= (addpath_option
- ? tr ("The file %1 does not exist in the load path. To debug the function you are editing, you must either change to the directory %2 or add that directory to the load path.").arg(qfile).arg(qdir)
- : tr ("The file %1 is shadowed by a file with the same name in the load path. To debug the function you are editing, change to the directory %2.").arg(qfile).arg(qdir));
+ ? tr ("The file %1 does not exist in the load path. To debug the function you are editing, you must either change to the directory %2 or add that directory to the load path.").arg (qfile).arg (qdir)
+ : tr ("The file %1 is shadowed by a file with the same name in the load path. To debug the function you are editing, change to the directory %2.").arg (qfile).arg (qdir));
QString title = tr ("Change Directory or Add Directory to Load Path");
@@ -324,6 +325,7 @@
QStringList class_names;
QStringList dimensions;
QStringList values;
+ QIntList complex_flags;
for (std::list::const_iterator it = ws.begin ();
it != ws.end (); it++)
@@ -333,10 +335,11 @@
class_names.append (QString::fromStdString (it->class_name ()));
dimensions.append (QString::fromStdString (it->dimension ()));
values.append (QString::fromStdString (it->value ()));
+ complex_flags.append (it->complex_flag ());
}
emit set_workspace_signal (top_level, scopes, symbols, class_names,
- dimensions, values);
+ dimensions, values, complex_flags);
}
void
@@ -402,7 +405,8 @@
octave_qt_link::do_update_breakpoint (bool insert,
const std::string& file, int line)
{
- emit update_breakpoint_marker_signal (insert, QString::fromStdString (file), line);
+ emit update_breakpoint_marker_signal (insert, QString::fromStdString (file),
+ line);
}
void
diff -r c4f5c781c3ca -r 97e49b588f5d libgui/src/octave-qt-link.h
--- a/libgui/src/octave-qt-link.h Wed Oct 23 22:48:29 2013 -0400
+++ b/libgui/src/octave-qt-link.h Tue Nov 05 12:27:42 2013 -0500
@@ -35,6 +35,9 @@
#include "octave-link.h"
#include "octave-main-thread.h"
+// Defined for purposes of sending QList as part of signal.
+typedef QList QIntList;
+
// \class OctaveLink
// \brief Provides threadsafe access to octave.
// \author Jacob Dawid
@@ -85,7 +88,7 @@
const std::list& defaults);
std::list
- do_file_dialog (const filter_list& filter, const std::string& title,
+ do_file_dialog (const filter_list& filter, const std::string& title,
const std::string &filename, const std::string &pathname,
const std::string& multimode);
@@ -153,7 +156,8 @@
const QStringList& symbols,
const QStringList& class_names,
const QStringList& dimensions,
- const QStringList& values);
+ const QStringList& values,
+ const QIntList& complex_flags);
void clear_workspace_signal (void);
diff -r c4f5c781c3ca -r 97e49b588f5d libgui/src/qtinfo/parser.cc
--- a/libgui/src/qtinfo/parser.cc Wed Oct 23 22:48:29 2013 -0400
+++ b/libgui/src/qtinfo/parser.cc Tue Nov 05 12:27:42 2013 -0500
@@ -166,7 +166,7 @@
while (!io->atEnd ())
{
QString text = get_next_node (io);
- if(node == get_node_name (text))
+ if (node == get_node_name (text))
{
return text;
}
@@ -187,12 +187,14 @@
{
io->getChar (&c);
if (c)
- { // first char is not equal 0
+ {
+ // first char is not equal 0
io->ungetChar (c);
line = io->readLine ();
}
else
- { // 0 was read -> image -> text length changes
+ {
+ // 0 was read -> image -> text length changes
line_buffer = io->readLine (); // image tag that is not needed
line = io->readLine (); // firsts line of text message
for (i=1; i","");
url_link = QUrl::toPercentEncoding (url_link, "", "'");
- QString href;
- if (type=="\n*")
- {
- href="\n";
- }
- else
- {
- href="";
- }
- href += re.cap(2) + "" + note + ":" + link + "" + spaces;
+ href += "";
+ href += " " + note + "" + term;
f = re.matchedLength ();
text.replace (i,f,href);
i += href.size ();
@@ -325,7 +333,8 @@
while ( (i = re.indexIn (text, i)) != -1)
{
QString t = re.cap (1);
- QString bold = "" + t + "";
+ QString bold = "" + t +
+ "";
f = re.matchedLength ();
text.replace (i,f,bold);
@@ -340,10 +349,12 @@
text.replace ("<", "<");
text.replace (">", ">");
- text.replace ("\n* Menu:", "\nMenu:");
- text.replace ("See also:", "See also:");
+ text.replace ("\n* Menu:",
+ "\nMenu:");
+ text.replace ("See also:",
+ "See also:");
+ replace_links (text);
replace_colons (text);
- replace_links (text);
}
QString
@@ -369,8 +380,8 @@
info_to_html (text2);
text = text1 + " "
- + text2;
+ + "'/> "
+ + text2;
}
else
{
@@ -380,7 +391,7 @@
}
QString navigationLinks = QString (
- "Section: %1 "
+ "Section: %1 "
" Previous Section:%3 "
" Next Section:%5 "
" Up:%7 \n"
@@ -393,7 +404,6 @@
.arg (QString (QUrl::toPercentEncoding (nodeUp, "", "'")))
.arg (nodeUp);
-
text.prepend ("\n
");
text.append ("
\n\n");
text.prepend (navigationLinks);
@@ -412,7 +422,7 @@
QRegExp re_files ("([^:]+): (\\d+)\n");
int foundCount = 0;
- for(int i = 0; i < _info_files.size (); i++)
+ for (int i = 0; i < _info_files.size (); i++)
{
QFileInfo fileInfo = _info_files.at (i);
@@ -432,7 +442,8 @@
int pos = 0;
QString last_node;
- while ((pos = re.indexIn (nodeText, pos)) != -1) {
+ while ((pos = re.indexIn (nodeText, pos)) != -1)
+ {
QString type = re.cap (1);
QString node = re.cap (2);
int index = re.cap (3).toInt ();
@@ -460,12 +471,13 @@
foundCount++;
int pos = 0;
- while ( (pos = re_files.indexIn (nodeText, pos)) != -1) {
+ while ( (pos = re_files.indexIn (nodeText, pos)) != -1)
+ {
QString fileCap = re_files.cap (1).trimmed ();
int index = re_files.cap (2).toInt ();
info_file_item item;
- for (int j = 0;j < _info_files.size (); j++)
+ for (int j = 0; j < _info_files.size (); j++)
{
QFileInfo info = _info_files.at (j);
if (info.fileName ().startsWith (fileCap))
@@ -581,7 +593,8 @@
int pos = 0;
int founds = 0;
- for (; founds < words.size () && node_text.indexOf (words.at (founds)) >= 0; founds++)
+ for (; founds < words.size ()
+ && node_text.indexOf (words.at (founds)) >= 0; founds++)
{ }
if (founds\n ");
+ " \n ");
results.append (node);
results.append (" \n");
}
@@ -623,13 +638,13 @@
return results;
}
-QString
+QString
parser::find_ref (const QString &ref_name)
{
QString text = "";
QHash::iterator it;
- for (it=_ref_map.begin ();it!=_ref_map.end ();++it)
+ for (it=_ref_map.begin (); it!=_ref_map.end (); ++it)
{
QString k = it.key ();
node_position p = it.value ();
diff -r c4f5c781c3ca -r 97e49b588f5d libgui/src/qtinfo/parser.h
--- a/libgui/src/qtinfo/parser.h Wed Oct 23 22:48:29 2013 -0400
+++ b/libgui/src/qtinfo/parser.h Tue Nov 05 12:27:42 2013 -0500
@@ -39,14 +39,15 @@
* If you make a queue with info files, position will be the number of bytes
* from begining to node position.
*
- * But is not so easy. There is headers, and qtinfo must not take these headers into account.
+ * But is not so easy. There is headers, and qtinfo must not take these
+ * headers into account.
*
*
* This class also translates info files to html.
*