# HG changeset patch # User Jordi Gutiérrez Hermoso # Date 1337411700 14400 # Node ID 7925a7d6547bd153a778df91dd44830dc8ac5a02 # Parent c8d0095b374456839ea4ab6f57d77fa5ab7bf20e# Parent 97e3d1769be06028139748dd1ac8b8382d7aeaed main: Periodic merge of default to gui diff -r 97e3d1769be0 -r 7925a7d6547b .hgsub --- a/.hgsub Sat May 19 00:35:15 2012 -0400 +++ b/.hgsub Sat May 19 03:15:00 2012 -0400 @@ -1,1 +1,2 @@ gnulib = [git]git://git.sv.gnu.org/gnulib +gui/qterminal = [git]https://code.google.com/p/qterminal/ diff -r 97e3d1769be0 -r 7925a7d6547b .hgsubstate --- a/.hgsubstate Sat May 19 00:35:15 2012 -0400 +++ b/.hgsubstate Sat May 19 03:15:00 2012 -0400 @@ -1,1 +1,2 @@ f9813bce2c06a6130a68db4478d1b16ddadaf276 gnulib +a81f99b9b77d9a402b92463b41c5fdb82324349a gui/qterminal diff -r 97e3d1769be0 -r 7925a7d6547b NEWS --- a/NEWS Sat May 19 00:35:15 2012 -0400 +++ b/NEWS Sat May 19 03:15:00 2012 -0400 @@ -1,3 +1,8 @@ +Summary of important user-visible changes for version 4.0: +--------------------------------------------------------- + + ** A new GUI is now available with Octave. + Summary of important user-visible changes for version 3.8: --------------------------------------------------------- diff -r 97e3d1769be0 -r 7925a7d6547b configure.ac --- a/configure.ac Sat May 19 00:35:15 2012 -0400 +++ b/configure.ac Sat May 19 03:15:00 2012 -0400 @@ -738,6 +738,520 @@ FFT_DIR="fftpack" AC_SUBST(FFT_DIR) +dnl @synopsis BNV_HAVE_QT [--with-Qt-dir=DIR] [--with-Qt-lib-dir=DIR] [--with-Qt-lib=LIB] +dnl @synopsis BNV_HAVE_QT [--with-Qt-include-dir=DIR] [--with-Qt-bin-dir=DIR] [--with-Qt-lib-dir=DIR] [--with-Qt-lib=LIB] +dnl +dnl @summary Search for Trolltech's Qt GUI framework. +dnl +dnl Searches common directories for Qt include files, libraries and Qt +dnl binary utilities. The macro supports several different versions of +dnl the Qt framework being installed on the same machine. Without +dnl options, the macro is designed to look for the latest library, +dnl i.e., the highest definition of QT_VERSION in qglobal.h. By use of +dnl one or more options a different library may be selected. There are +dnl two different sets of options. Both sets contain the option +dnl --with-Qt-lib=LIB which can be used to force the use of a +dnl particular version of the library file when more than one are +dnl available. LIB must be in the form as it would appear behind the +dnl "-l" option to the compiler. Examples for LIB would be "qt-mt" for +dnl the multi-threaded version and "qt" for the regular version. In +dnl addition to this, the first set consists of an option +dnl --with-Qt-dir=DIR which can be used when the installation conforms +dnl to Trolltech's standard installation, which means that header files +dnl are in DIR/include, binary utilities are in DIR/bin and the library +dnl is in DIR/lib. The second set of options can be used to indicate +dnl individual locations for the header files, the binary utilities and +dnl the library file, in addition to the specific version of the +dnl library file. +dnl +dnl The following shell variable is set to either "yes" or "no": +dnl +dnl have_qt +dnl +dnl Additionally, the following variables are exported: +dnl +dnl QT_CXXFLAGS +dnl QT_LIBS +dnl QT_MOC +dnl QT_UIC +dnl QT_DIR +dnl +dnl which respectively contain an "-I" flag pointing to the Qt include +dnl directory (and "-DQT_THREAD_SUPPORT" when LIB is "qt-mt"), link +dnl flags necessary to link with Qt and X, the name of the meta object +dnl compiler and the user interface compiler both with full path, and +dnl finaly the variable QTDIR as Trolltech likes to see it defined (if +dnl possible). +dnl +dnl Example lines for Makefile.in: +dnl +dnl CXXFLAGS = @QT_CXXFLAGS@ +dnl MOC = @QT_MOC@ +dnl +dnl After the variables have been set, a trial compile and link is +dnl performed to check the correct functioning of the meta object +dnl compiler. This test may fail when the different detected elements +dnl stem from different releases of the Qt framework. In that case, an +dnl error message is emitted and configure stops. +dnl +dnl No common variables such as $LIBS or $CFLAGS are polluted. +dnl +dnl Options: +dnl +dnl --with-Qt-dir=DIR: DIR is equal to $QTDIR if you have followed the +dnl installation instructions of Trolltech. Header files are in +dnl DIR/include, binary utilities are in DIR/bin and the library is in +dnl DIR/lib. +dnl +dnl --with-Qt-include-dir=DIR: Qt header files are in DIR. +dnl +dnl --with-Qt-bin-dir=DIR: Qt utilities such as moc and uic are in DIR. +dnl +dnl --with-Qt-lib-dir=DIR: The Qt library is in DIR. +dnl +dnl --with-Qt-lib=LIB: Use -lLIB to link with the Qt library. +dnl +dnl If some option "=no" or, equivalently, a --without-Qt-* version is +dnl given in stead of a --with-Qt-*, "have_qt" is set to "no" and the +dnl other variables are set to the empty string. +dnl +dnl @category InstalledPackages +dnl @author Bastiaan Veelo +dnl @version 2006-03-12 +dnl @license AllPermissive + +dnl Copyright (C) 2001, 2002, 2003, 2005, 2006 Bastiaan Veelo + +dnl THANKS! This code includes bug fixes and contributions made by: +dnl Tim McClarren, +dnl Dennis R. Weilert, +dnl Qingning Huo, +dnl Brian Mingus, +dnl Jens Hannemann, +dnl Pavel Roskin, +dnl Scott J. Bertin. + +dnl ChangeLog +dnl 2006-03-12 * Hide output of ls and fix an m4 quoting problem (due to Scott J. Bertin). +dnl 2006-02-13 * Check compiler return value instead of parsing the error stream, +dnl which detected warnings as false negatives (due to Jens Hannemann). +dnl 2006-02-02 * Spelling of "Success". +dnl * Fixed unsave test for $bnv_qt_lib without quotes. +dnl * Put dnl in front of all comments. +dnl * Changed -l$bnv_qt_lib_dir into -L$bnv_qt_lib_dir (all due to Pavel Roskin). +dnl 2006-01-19 * Support for 64bit architectures. +dnl * Updated documentation. +dnl 2006-01-18: * Fix "cat: bnv_qt_test.c: No such file or directory" (due to Jens Hannemann). +dnl * Hide output of failing ls. +dnl 2006-01-11: * Check in /Developer on Mac OS X; Check in $QTDIR (due to Brian Mingus). + +dnl Calls BNV_PATH_QT_DIRECT (contained in this file) as a subroutine. +AC_DEFUN([BNV_HAVE_QT], +[ + AC_REQUIRE([AC_PROG_CXX]) + AC_REQUIRE([AC_PATH_X]) + AC_REQUIRE([AC_PATH_XTRA]) + + AC_MSG_CHECKING(for Qt) + + AC_ARG_WITH([Qt-dir], + [ --with-Qt-dir=DIR DIR is equal to $QTDIR if you have followed the + installation instructions of Trolltech. Header + files are in DIR/include, binary utilities are + in DIR/bin. The library is in DIR/lib, unless + --with-Qt-lib-dir is also set.]) + AC_ARG_WITH([Qt-include-dir], + [ --with-Qt-include-dir=DIR + Qt header files are in DIR]) + AC_ARG_WITH([Qt-bin-dir], + [ --with-Qt-bin-dir=DIR Qt utilities such as moc and uic are in DIR]) + AC_ARG_WITH([Qt-lib-dir], + [ --with-Qt-lib-dir=DIR The Qt library is in DIR]) + AC_ARG_WITH([Qt-lib], + [ --with-Qt-lib=LIB Use -lLIB to link with the Qt library]) + if test x"$with_Qt_dir" = x"no" || + test x"$with_Qt_include-dir" = x"no" || + test x"$with_Qt_bin_dir" = x"no" || + test x"$with_Qt_lib_dir" = x"no" || + test x"$with_Qt_lib" = x"no"; then + # user disabled Qt. Leave cache alone. + have_qt="User disabled Qt." + else + # "yes" is a bogus option + if test x"$with_Qt_dir" = xyes; then + with_Qt_dir= + fi + if test x"$with_Qt_include_dir" = xyes; then + with_Qt_include_dir= + fi + if test x"$with_Qt_bin_dir" = xyes; then + with_Qt_bin_dir= + fi + if test x"$with_Qt_lib_dir" = xyes; then + with_Qt_lib_dir= + fi + if test x"$with_Qt_lib" = xyes; then + with_Qt_lib= + fi + # No Qt unless we discover otherwise + have_qt=no + # Check whether we are requested to link with a specific version + if test x"$with_Qt_lib" != x; then + bnv_qt_lib="$with_Qt_lib" + fi + # Check whether we were supplied with an answer already + if test x"$with_Qt_dir" != x; then + have_qt=yes + bnv_qt_dir="$with_Qt_dir" + bnv_qt_include_dir="$with_Qt_dir/include" + bnv_qt_bin_dir="$with_Qt_dir/bin" + bnv_qt_lib_dir="$with_Qt_dir/lib" + # Only search for the lib if the user did not define one already + if test x"$bnv_qt_lib" = x; then + bnv_qt_lib="`ls $bnv_qt_lib_dir/libqt* | sed -n 1p | + sed s@$bnv_qt_lib_dir/lib@@ | [sed s@[.].*@@]`" + fi + bnv_qt_LIBS="-L$bnv_qt_lib_dir -l$bnv_qt_lib $X_PRE_LIBS $X_LIBS -lX11 -lXext -lXmu -lXt -lXi $X_EXTRA_LIBS" + else + # Use cached value or do search, starting with suggestions from + # the command line + AC_CACHE_VAL(bnv_cv_have_qt, + [ + # We are not given a solution and there is no cached value. + bnv_qt_dir=NO + bnv_qt_include_dir=NO + bnv_qt_lib_dir=NO + if test x"$bnv_qt_lib" = x; then + bnv_qt_lib=NO + fi + BNV_PATH_QT_DIRECT + if test "$bnv_qt_dir" = NO || + test "$bnv_qt_include_dir" = NO || + test "$bnv_qt_lib_dir" = NO || + test "$bnv_qt_lib" = NO; then + # Problem with finding complete Qt. Cache the known absence of Qt. + bnv_cv_have_qt="have_qt=no" + else + # Record where we found Qt for the cache. + bnv_cv_have_qt="have_qt=yes \ + bnv_qt_dir=$bnv_qt_dir \ + bnv_qt_include_dir=$bnv_qt_include_dir \ + bnv_qt_bin_dir=$bnv_qt_bin_dir \ + bnv_qt_LIBS=\"$bnv_qt_LIBS\"" + fi + ])dnl + eval "$bnv_cv_have_qt" + fi # all $bnv_qt_* are set + fi # $have_qt reflects the system status + if test x"$have_qt" = xyes; then + QT_CXXFLAGS="-I$bnv_qt_include_dir" + if test x"$bnv_qt_lib" = xqt-mt; then + QT_CXXFLAGS="$QT_CXXFLAGS -DQT_THREAD_SUPPORT" + fi + QT_DIR="$bnv_qt_dir" + QT_LIBS="$bnv_qt_LIBS" + # If bnv_qt_dir is defined, utilities are expected to be in the + # bin subdirectory + if test x"$bnv_qt_dir" != x; then + if test -x "$bnv_qt_dir/bin/uic"; then + QT_UIC="$bnv_qt_dir/bin/uic" + else + # Old versions of Qt don't have uic + QT_UIC= + fi + QT_MOC="$bnv_qt_dir/bin/moc" + else + # Or maybe we are told where to look for the utilities + if test x"$bnv_qt_bin_dir" != x; then + if test -x "$bnv_qt_bin_dir/uic"; then + QT_UIC="$bnv_qt_bin_dir/uic" + else + # Old versions of Qt don't have uic + QT_UIC= + fi + QT_MOC="$bnv_qt_bin_dir/moc" + else + # Last possibility is that they are in $PATH + QT_UIC="`which uic`" + QT_MOC="`which moc`" + fi + fi + # All variables are defined, report the result + AC_MSG_RESULT([$have_qt: + QT_CXXFLAGS=$QT_CXXFLAGS + QT_DIR=$QT_DIR + QT_LIBS=$QT_LIBS + QT_UIC=$QT_UIC + QT_MOC=$QT_MOC]) + else + # Qt was not found + QT_CXXFLAGS= + QT_DIR= + QT_LIBS= + QT_UIC= + QT_MOC= + AC_MSG_RESULT($have_qt) + fi + AC_SUBST(QT_CXXFLAGS) + AC_SUBST(QT_DIR) + AC_SUBST(QT_LIBS) + AC_SUBST(QT_UIC) + AC_SUBST(QT_MOC) + + #### Being paranoid: + if test x"$have_qt" = xyes; then + AC_MSG_CHECKING(correct functioning of Qt installation) + AC_CACHE_VAL(bnv_cv_qt_test_result, + [ + cat > bnv_qt_test.h << EOF +#include +class Test : public QObject +{ +Q_OBJECT +public: + Test() {} + ~Test() {} +public slots: + void receive() {} +signals: + void send(); +}; +EOF + + cat > bnv_qt_main.$ac_ext << EOF +#include "bnv_qt_test.h" +#include +int main( int argc, char **argv ) +{ + QApplication app( argc, argv ); + Test t; + QObject::connect( &t, SIGNAL(send()), &t, SLOT(receive()) ); +} +EOF + + bnv_cv_qt_test_result="failure" + bnv_try_1="$QT_MOC bnv_qt_test.h -o moc_bnv_qt_test.$ac_ext >/dev/null 2>/dev/null" + AC_TRY_EVAL(bnv_try_1) + if test x"$ac_status" != x0; then + echo "$bnv_err_1" >&AC_FD_CC + echo "configure: could not run $QT_MOC on:" >&AC_FD_CC + cat bnv_qt_test.h >&AC_FD_CC + else + bnv_try_2="$CXX $QT_CXXFLAGS -c $CXXFLAGS -o moc_bnv_qt_test.o moc_bnv_qt_test.$ac_ext >/dev/null 2>/dev/null" + AC_TRY_EVAL(bnv_try_2) + if test x"$ac_status" != x0; then + echo "$bnv_err_2" >&AC_FD_CC + echo "configure: could not compile:" >&AC_FD_CC + cat moc_bnv_qt_test.$ac_ext >&AC_FD_CC + else + bnv_try_3="$CXX $QT_CXXFLAGS -c $CXXFLAGS -o bnv_qt_main.o bnv_qt_main.$ac_ext >/dev/null 2>/dev/null" + AC_TRY_EVAL(bnv_try_3) + if test x"$ac_status" != x0; then + echo "$bnv_err_3" >&AC_FD_CC + echo "configure: could not compile:" >&AC_FD_CC + cat bnv_qt_main.$ac_ext >&AC_FD_CC + else + bnv_try_4="$CXX $QT_LIBS $LIBS -o bnv_qt_main bnv_qt_main.o moc_bnv_qt_test.o >/dev/null 2>/dev/null" + AC_TRY_EVAL(bnv_try_4) + if test x"$ac_status" != x0; then + echo "$bnv_err_4" >&AC_FD_CC + else + bnv_cv_qt_test_result="success" + fi + fi + fi + fi + ])dnl AC_CACHE_VAL bnv_cv_qt_test_result + AC_MSG_RESULT([$bnv_cv_qt_test_result]); + if test x"$bnv_cv_qt_test_result" = "xfailure"; then + AC_MSG_ERROR([Failed to find matching components of a complete + Qt installation. Try using more options, + see ./configure --help.]) + fi + + rm -f bnv_qt_test.h moc_bnv_qt_test.$ac_ext moc_bnv_qt_test.o \ + bnv_qt_main.$ac_ext bnv_qt_main.o bnv_qt_main + fi +]) + +dnl Internal subroutine of BNV_HAVE_QT +dnl Set bnv_qt_dir bnv_qt_include_dir bnv_qt_bin_dir bnv_qt_lib_dir bnv_qt_lib +AC_DEFUN([BNV_PATH_QT_DIRECT], +[ + ## Binary utilities ## + if test x"$with_Qt_bin_dir" != x; then + bnv_qt_bin_dir=$with_Qt_bin_dir + fi + ## Look for header files ## + if test x"$with_Qt_include_dir" != x; then + bnv_qt_include_dir="$with_Qt_include_dir" + else + # The following header file is expected to define QT_VERSION. + qt_direct_test_header=qglobal.h + # Look for the header file in a standard set of common directories. + bnv_include_path_list=" + /usr/include + `ls -dr ${QTDIR}/include 2>/dev/null` + `ls -dr /usr/include/qt* 2>/dev/null` + `ls -dr /usr/lib/qt*/include 2>/dev/null` + `ls -dr /usr/local/qt*/include 2>/dev/null` + `ls -dr /opt/qt*/include 2>/dev/null` + `ls -dr /Developer/qt*/include 2>/dev/null` + " + for bnv_dir in $bnv_include_path_list; do + if test -r "$bnv_dir/$qt_direct_test_header"; then + bnv_dirs="$bnv_dirs $bnv_dir" + fi + done + # Now look for the newest in this list + bnv_prev_ver=0 + for bnv_dir in $bnv_dirs; do + bnv_this_ver=`egrep -w '#define QT_VERSION' $bnv_dir/$qt_direct_test_header | sed s/'#define QT_VERSION'//` + if expr $bnv_this_ver '>' $bnv_prev_ver > /dev/null; then + bnv_qt_include_dir=$bnv_dir + bnv_prev_ver=$bnv_this_ver + fi + done + fi dnl Found header files. + + # Are these headers located in a traditional Trolltech installation? + # That would be $bnv_qt_include_dir stripped from its last element: + bnv_possible_qt_dir=`dirname $bnv_qt_include_dir` + if (test -x $bnv_possible_qt_dir/bin/moc) && + ((ls $bnv_possible_qt_dir/lib/libqt* > /dev/null 2>/dev/null) || + (ls $bnv_possible_qt_dir/lib64/libqt* > /dev/null 2>/dev/null)); then + # Then the rest is a piece of cake + bnv_qt_dir=$bnv_possible_qt_dir + bnv_qt_bin_dir="$bnv_qt_dir/bin" + if test x"$with_Qt_lib_dir" != x; then + bnv_qt_lib_dir="$with_Qt_lib_dir" + else + if (test -d $bnv_qt_dir/lib64); then + bnv_qt_lib_dir="$bnv_qt_dir/lib64" + else + bnv_qt_lib_dir="$bnv_qt_dir/lib" + fi + fi + # Only look for lib if the user did not supply it already + if test x"$bnv_qt_lib" = xNO; then + bnv_qt_lib="`ls $bnv_qt_lib_dir/libqt* | sed -n 1p | + sed s@$bnv_qt_lib_dir/lib@@ | [sed s@[.].*@@]`" + fi + bnv_qt_LIBS="-L$bnv_qt_lib_dir -l$bnv_qt_lib $X_PRE_LIBS $X_LIBS -lX11 -lXext -lXmu -lXt -lXi $X_EXTRA_LIBS" + else + # There is no valid definition for $QTDIR as Trolltech likes to see it + bnv_qt_dir= + ## Look for Qt library ## + if test x"$with_Qt_lib_dir" != x; then + bnv_qt_lib_dir="$with_Qt_lib_dir" + # Only look for lib if the user did not supply it already + if test x"$bnv_qt_lib" = xNO; then + bnv_qt_lib="`ls $bnv_qt_lib_dir/libqt* | sed -n 1p | + sed s@$bnv_qt_lib_dir/lib@@ | [sed s@[.].*@@]`" + fi + bnv_qt_LIBS="-L$bnv_qt_lib_dir -l$bnv_qt_lib $X_PRE_LIBS $X_LIBS -lX11 -lXext -lXmu -lXt -lXi $X_EXTRA_LIBS" + else + # Normally, when there is no traditional Trolltech installation, + # the library is installed in a place where the linker finds it + # automatically. + # If the user did not define the library name, try with qt + if test x"$bnv_qt_lib" = xNO; then + bnv_qt_lib=qt + fi + qt_direct_test_header=qapplication.h + qt_direct_test_main=" + int argc; + char ** argv; + QApplication app(argc,argv); + " + # See if we find the library without any special options. + # Don't add top $LIBS permanently yet + bnv_save_LIBS="$LIBS" + LIBS="-l$bnv_qt_lib $X_PRE_LIBS $X_LIBS -lX11 -lXext -lXmu -lXt -lXi $X_EXTRA_LIBS" + bnv_qt_LIBS="$LIBS" + bnv_save_CXXFLAGS="$CXXFLAGS" + CXXFLAGS="-I$bnv_qt_include_dir" + AC_TRY_LINK([#include <$qt_direct_test_header>], + $qt_direct_test_main, + [ + # Success. + # We can link with no special library directory. + bnv_qt_lib_dir= + ], [ + # That did not work. Try the multi-threaded version + echo "Non-critical error, please neglect the above." >&AC_FD_CC + bnv_qt_lib=qt-mt + LIBS="-l$bnv_qt_lib $X_PRE_LIBS $X_LIBS -lX11 -lXext -lXmu -lXt -lXi $X_EXTRA_LIBS" + AC_TRY_LINK([#include <$qt_direct_test_header>], + $qt_direct_test_main, + [ + # Success. + # We can link with no special library directory. + bnv_qt_lib_dir= + ], [ + # That did not work. Try the OpenGL version + echo "Non-critical error, please neglect the above." >&AC_FD_CC + bnv_qt_lib=qt-gl + LIBS="-l$bnv_qt_lib $X_PRE_LIBS $X_LIBS -lX11 -lXext -lXmu -lXt -lXi $X_EXTRA_LIBS" + AC_TRY_LINK([#include <$qt_direct_test_header>], + $qt_direct_test_main, + [ + # Success. + # We can link with no special library directory. + bnv_qt_lib_dir= + ], [ + # That did not work. Maybe a library version I don't know about? + echo "Non-critical error, please neglect the above." >&AC_FD_CC + # Look for some Qt lib in a standard set of common directories. + bnv_dir_list=" + `echo $bnv_qt_includes | sed ss/includess` + /lib + /usr/lib64 + /usr/lib + /usr/local/lib64 + /usr/local/lib + /opt/lib64 + /opt/lib + `ls -dr /usr/lib64/qt* 2>/dev/null` + `ls -dr /usr/lib64/qt*/lib64 2>/dev/null` + `ls -dr /usr/lib/qt* 2>/dev/null` + `ls -dr /usr/local/qt* 2>/dev/null` + `ls -dr /opt/qt* 2>/dev/null` + " + for bnv_dir in $bnv_dir_list; do + if ls $bnv_dir/libqt* >/dev/null 2>/dev/null; then + # Gamble that it's the first one... + bnv_qt_lib="`ls $bnv_dir/libqt* | sed -n 1p | + sed s@$bnv_dir/lib@@ | sed s/[[.]].*//`" + bnv_qt_lib_dir="$bnv_dir" + break + fi + done + # Try with that one + LIBS="-l$bnv_qt_lib $X_PRE_LIBS $X_LIBS -lX11 -lXext -lXmu -lXt -lXi $X_EXTRA_LIBS" + AC_TRY_LINK([#include <$qt_direct_test_header>], + $qt_direct_test_main, + [ + # Success. + # We can link with no special library directory. + bnv_qt_lib_dir= + ], [ + # Leave bnv_qt_lib_dir defined + ]) + ]) + ]) + ]) + if test x"$bnv_qt_lib_dir" != x; then + bnv_qt_LIBS="-L$bnv_qt_lib_dir $LIBS" + else + bnv_qt_LIBS="$LIBS" + fi + LIBS="$bnv_save_LIBS" + CXXFLAGS="$bnv_save_CXXFLAGS" + fi dnl $with_Qt_lib_dir was not given + fi dnl Done setting up for non-traditional Trolltech installation +]) + # Checks for FFTW header and library. OCTAVE_CHECK_LIBRARY(fftw3, FFTW3, diff -r 97e3d1769be0 -r 7925a7d6547b doc/interpreter/contributors.in --- a/doc/interpreter/contributors.in Sat May 19 00:35:15 2012 -0400 +++ b/doc/interpreter/contributors.in Sat May 19 03:15:00 2012 -0400 @@ -291,3 +291,6 @@ Michael Zeising Federico Zenith Alex Zvoleff +Valentin Ortega-Clavero +Jacob Dawid +Júlio Hoffimann diff -r 97e3d1769be0 -r 7925a7d6547b gui/bin/bin diff -r 97e3d1769be0 -r 7925a7d6547b gui/gui.pro --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/gui/gui.pro Sat May 19 03:15:00 2012 -0400 @@ -0,0 +1,2 @@ +TEMPLATE = subdirs +SUBDIRS = qterminal src diff -r 97e3d1769be0 -r 7925a7d6547b gui/kb-layouts/default.keytab --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/gui/kb-layouts/default.keytab Sat May 19 03:15:00 2012 -0400 @@ -0,0 +1,133 @@ +# [README.default.Keytab] Buildin Keyboard Table +# +# To customize your keyboard, copy this file to something +# ending with .keytab and change it to meet you needs. +# Please read the README.KeyTab and the README.keyboard +# in this case. +# +# -------------------------------------------------------------- + +keyboard "Default (XFree 4)" + +# -------------------------------------------------------------- +# +# Note that this particular table is a "risc" version made to +# ease customization without bothering with obsolete details. +# See VT100.keytab for the more hairy stuff. +# +# -------------------------------------------------------------- + +# common keys + +key Escape : "\E" + +key Tab -Shift : "\t" +key Tab +Shift+Ansi : "\E[Z" +key Tab +Shift-Ansi : "\t" +key Backtab +Ansi : "\E[Z" +key Backtab -Ansi : "\t" + +key Return-Shift-NewLine : "\r" +key Return-Shift+NewLine : "\r\n" + +key Return+Shift : "\EOM" + +# Backspace and Delete codes are preserving CTRL-H. + +key Backspace : "\x7f" + +# Arrow keys in VT52 mode +# shift up/down are reserved for scrolling. +# shift left/right are reserved for switching between tabs (this is hardcoded). + +key Up -Shift-Ansi : "\EA" +key Down -Shift-Ansi : "\EB" +key Right-Shift-Ansi : "\EC" +key Left -Shift-Ansi : "\ED" + +# Arrow keys in ANSI mode with Application - and Normal Cursor Mode) + +key Up -Shift-AnyMod+Ansi+AppCuKeys : "\EOA" +key Down -Shift-AnyMod+Ansi+AppCuKeys : "\EOB" +key Right -Shift-AnyMod+Ansi+AppCuKeys : "\EOC" +key Left -Shift-AnyMod+Ansi+AppCuKeys : "\EOD" + +key Up -Shift-AnyMod+Ansi-AppCuKeys : "\E[A" +key Down -Shift-AnyMod+Ansi-AppCuKeys : "\E[B" +key Right -Shift-AnyMod+Ansi-AppCuKeys : "\E[C" +key Left -Shift-AnyMod+Ansi-AppCuKeys : "\E[D" + +key Up -Shift+AnyMod+Ansi : "\E[1;*A" +key Down -Shift+AnyMod+Ansi : "\E[1;*B" +key Right -Shift+AnyMod+Ansi : "\E[1;*C" +key Left -Shift+AnyMod+Ansi : "\E[1;*D" + +# other grey PC keys + +key Enter+NewLine : "\r\n" +key Enter-NewLine : "\r" + +key Home -AnyMod -AppCuKeys : "\E[H" +key End -AnyMod -AppCuKeys : "\E[F" +key Home -AnyMod +AppCuKeys : "\EOH" +key End -AnyMod +AppCuKeys : "\EOF" +key Home +AnyMod : "\E[1;*H" +key End +AnyMod : "\E[1;*F" + +key Insert -AnyMod : "\E[2~" +key Delete -AnyMod : "\E[3~" +key Insert +AnyMod : "\E[2;*~" +key Delete +AnyMod : "\E[3;*~" + +key Prior -Shift-AnyMod : "\E[5~" +key Next -Shift-AnyMod : "\E[6~" +key Prior -Shift+AnyMod : "\E[5;*~" +key Next -Shift+AnyMod : "\E[6;*~" + +# Function keys +key F1 -AnyMod : "\EOP" +key F2 -AnyMod : "\EOQ" +key F3 -AnyMod : "\EOR" +key F4 -AnyMod : "\EOS" +key F5 -AnyMod : "\E[15~" +key F6 -AnyMod : "\E[17~" +key F7 -AnyMod : "\E[18~" +key F8 -AnyMod : "\E[19~" +key F9 -AnyMod : "\E[20~" +key F10 -AnyMod : "\E[21~" +key F11 -AnyMod : "\E[23~" +key F12 -AnyMod : "\E[24~" + +key F1 +AnyMod : "\EO*P" +key F2 +AnyMod : "\EO*Q" +key F3 +AnyMod : "\EO*R" +key F4 +AnyMod : "\EO*S" +key F5 +AnyMod : "\E[15;*~" +key F6 +AnyMod : "\E[17;*~" +key F7 +AnyMod : "\E[18;*~" +key F8 +AnyMod : "\E[19;*~" +key F9 +AnyMod : "\E[20;*~" +key F10 +AnyMod : "\E[21;*~" +key F11 +AnyMod : "\E[23;*~" +key F12 +AnyMod : "\E[24;*~" + +# Work around dead keys + +key Space +Control : "\x00" + +# Some keys are used by konsole to cause operations. +# The scroll* operations refer to the history buffer. + +key Up +Shift-AppScreen : scrollLineUp +key Prior +Shift-AppScreen : scrollPageUp +key Down +Shift-AppScreen : scrollLineDown +key Next +Shift-AppScreen : scrollPageDown + +#key Up +Shift : scrollLineUp +#key Prior +Shift : scrollPageUp +#key Down +Shift : scrollLineDown +#key Next +Shift : scrollPageDown + +key ScrollLock : scrollLock + +# keypad characters are not offered differently by Qt. diff -r 97e3d1769be0 -r 7925a7d6547b gui/kb-layouts/linux.keytab --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/gui/kb-layouts/linux.keytab Sat May 19 03:15:00 2012 -0400 @@ -0,0 +1,133 @@ +# [linux.keytab] Konsole Keyboard Table (Linux console keys) +# +# -------------------------------------------------------------- + +# NOT TESTED, MAY NEED SOME CLEANUPS +keyboard "Linux console" + +# -------------------------------------------------------------- +# +# This configuration table allows to customize the +# meaning of the keys. +# +# The syntax is that each entry has the form : +# +# "key" Keyname { ("+"|"-") Modename } ":" (String|Operation) +# +# Keynames are those defined in with the +# "Qt::Key_" removed. (We'd better insert the list here) +# +# Mode names are : +# +# - Shift +# - Alt +# - Control +# +# The VT100 emulation has two modes that can affect the +# sequences emitted by certain keys. These modes are +# under control of the client program. +# +# - Newline : effects Return and Enter key. +# - Application : effects Up and Down key. +# +# - Ansi : effects Up and Down key (This is for VT52, really). +# +# Operations are +# +# - scrollUpLine +# - scrollUpPage +# - scrollDownLine +# - scrollDownPage +# +# - emitSelection +# +# If the key is not found here, the text of the +# key event as provided by QT is emitted, possibly +# preceeded by ESC if the Alt key is pressed. +# +# -------------------------------------------------------------- + +key Escape : "\E" +key Tab : "\t" + +# VT100 can add an extra \n after return. +# The NewLine mode is set by an escape sequence. + +key Return-NewLine : "\r" +key Return+NewLine : "\r\n" + +# Some desperately try to save the ^H. + +key Backspace : "\x7f" +key Delete : "\E[3~" + +# These codes are for the VT52 mode of VT100 +# The Ansi mode (i.e. VT100 mode) is set by +# an escape sequence + +key Up -Shift-Ansi : "\EA" +key Down -Shift-Ansi : "\EB" +key Right-Shift-Ansi : "\EC" +key Left -Shift-Ansi : "\ED" + +# VT100 emits a mode bit together +# with the arrow keys.The AppCuKeys +# mode is set by an escape sequence. + +key Up -Shift+Ansi+AppCuKeys : "\EOA" +key Down -Shift+Ansi+AppCuKeys : "\EOB" +key Right-Shift+Ansi+AppCuKeys : "\EOC" +key Left -Shift+Ansi+AppCuKeys : "\EOD" + +key Up -Shift+Ansi-AppCuKeys : "\E[A" +key Down -Shift+Ansi-AppCuKeys : "\E[B" +key Right-Shift+Ansi-AppCuKeys : "\E[C" +key Left -Shift+Ansi-AppCuKeys : "\E[D" + +# linux functions keys F1-F5 differ from xterm + +key F1 : "\E[[A" +key F2 : "\E[[B" +key F3 : "\E[[C" +key F4 : "\E[[D" +key F5 : "\E[[E" + +key F6 : "\E[17~" +key F7 : "\E[18~" +key F8 : "\E[19~" +key F9 : "\E[20~" +key F10 : "\E[21~" +key F11 : "\E[23~" +key F12 : "\E[24~" + +key Home : "\E[1~" +key End : "\E[4~" + +key Prior -Shift : "\E[5~" +key Next -Shift : "\E[6~" +key Insert-Shift : "\E[2~" + +# Keypad-Enter. See comment on Return above. + +key Enter+NewLine : "\r\n" +key Enter-NewLine : "\r" + +key Space +Control : "\x00" + +# some of keys are used by konsole. + +key Up +Shift : scrollLineUp +key Prior +Shift : scrollPageUp +key Down +Shift : scrollLineDown +key Next +Shift : scrollPageDown + +key ScrollLock : scrollLock + +#---------------------------------------------------------- + +# keypad characters as offered by Qt +# cannot be recognized as such. + +#---------------------------------------------------------- + +# Following other strings as emitted by konsole. diff -r 97e3d1769be0 -r 7925a7d6547b gui/kb-layouts/vt420pc.keytab --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/gui/kb-layouts/vt420pc.keytab Sat May 19 03:15:00 2012 -0400 @@ -0,0 +1,163 @@ +# [vt420pc.keytab] Konsole Keyboard Table (VT420pc keys) +# adapted by ferdinand gassauer f.gassauer@aon.at +# Nov 2000 +# +################################################################ +# +# The escape sequences emmited by the +# keys Shift+F1 to Shift+F12 might not fit your needs +# +################# IMPORTANT NOTICE ############################# +# the key bindings (Kcontrol -> look and feel -> keybindgs) +# overrule the settings in this file. The key bindings might be +# changed by the user WITHOUT notification of the maintainer of +# the keytab file. Konsole will not work as expected by +# the maintainer of the keytab file. +################################################################ +# +# -------------------------------------------------------------- + +keyboard "DEC VT420 Terminal" + +# -------------------------------------------------------------- +# +# This configuration table allows to customize the +# meaning of the keys. +# +# The syntax is that each entry has the form : +# +# "key" Keyname { ("+"|"-") Modename } ":" (String|Operation) +# +# Keynames are those defined in with the +# "Qt::Key_" removed. (We'd better insert the list here) +# +# Mode names are : +# +# - Shift +# - Alt +# - Control +# +# The VT100 emulation has two modes that can affect the +# sequences emitted by certain keys. These modes are +# under control of the client program. +# +# - Newline : effects Return and Enter key. +# - Application : effects Up and Down key. +# +# - Ansi : effects Up and Down key (This is for VT52, really). +# +# Operations are +# +# - scrollUpLine +# - scrollUpPage +# - scrollDownLine +# - scrollDownPage +# +# - emitSelection +# +# If the key is not found here, the text of the +# key event as provided by QT is emitted, possibly +# preceeded by ESC if the Alt key is pressed. +# +# -------------------------------------------------------------- + +key Escape : "\E" +key Tab : "\t" +key Backtab: "\E[Z" + +# VT100 can add an extra \n after return. +# The NewLine mode is set by an escape sequence. + +key Return-NewLine : "\r" +key Return+NewLine : "\r\n" + +# Some desperately try to save the ^H. +# may be not everyone wants this + +key Backspace : "\x08" # Control H +key Delete : "\x7f" + +# These codes are for the VT420pc +# The Ansi mode (i.e. VT100 mode) is set by +# an escape sequence + +key Up -Shift-Ansi : "\EA" +key Down -Shift-Ansi : "\EB" +key Right-Shift-Ansi : "\EC" +key Left -Shift-Ansi : "\ED" + +# VT100 emits a mode bit together +# with the arrow keys.The AppCuKeys +# mode is set by an escape sequence. + +key Up -Shift+Ansi+AppCuKeys : "\EOA" +key Down -Shift+Ansi+AppCuKeys : "\EOB" +key Right-Shift+Ansi+AppCuKeys : "\EOC" +key Left -Shift+Ansi+AppCuKeys : "\EOD" + +key Up -Shift+Ansi-AppCuKeys : "\E[A" +key Down -Shift+Ansi-AppCuKeys : "\E[B" +key Right-Shift+Ansi-AppCuKeys : "\E[C" +key Left -Shift+Ansi-AppCuKeys : "\E[D" + +# function keys + +key F1 -Shift : "\E[11~" +key F2 -Shift : "\E[12~" +key F3 -Shift : "\E[13~" +key F4 -Shift : "\E[14~" +key F5 -Shift : "\E[15~" +key F6 -Shift : "\E[17~" +key F7 -Shift : "\E[18~" +key F8 -Shift : "\E[19~" +key F9 -Shift : "\E[20~" +key F10-Shift : "\E[21~" +key F11-Shift : "\E[23~" +key F12-Shift : "\E[24~" +# +# Shift F1-F12 +# +key F1 +Shift : "\E[11;2~" +key F2 +Shift : "\E[12;2~" +key F3 +Shift : "\E[13;2~" +key F4 +Shift : "\E[14;2~" +key F5 +Shift : "\E[15;2~" +key F6 +Shift : "\E[17;2~" +key F7 +Shift : "\E[18;2~" +key F8 +Shift : "\E[19;2~" +key F9 +Shift : "\E[20;2~" +key F10+Shift : "\E[21;2~" +key F11+Shift : "\E[23;2~" +key F12+Shift : "\E[24;2~" + +key Home : "\E[H" +key End : "\E[F" + +key Prior -Shift : "\E[5~" +key Next -Shift : "\E[6~" +key Insert-Shift : "\E[2~" + +# Keypad-Enter. See comment on Return above. + +key Enter+NewLine : "\r\n" +key Enter-NewLine : "\r" + +key Space +Control : "\x00" + +# some of keys are used by konsole. + +key Up +Shift : scrollLineUp +key Prior +Shift : scrollPageUp +key Down +Shift : scrollLineDown +key Next +Shift : scrollPageDown + +key ScrollLock : scrollLock + +#---------------------------------------------------------- + +# keypad characters as offered by Qt +# cannot be recognized as such. + +#---------------------------------------------------------- + +# Following other strings as emitted by konsole. diff -r 97e3d1769be0 -r 7925a7d6547b gui/languages/de-de.qm Binary file gui/languages/de-de.qm has changed diff -r 97e3d1769be0 -r 7925a7d6547b gui/languages/de-de.ts --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/gui/languages/de-de.ts Sat May 19 03:15:00 2012 -0400 @@ -0,0 +1,642 @@ + + + + + FileEditorMdiSubWindow + + + + File Editor + Dateieditor + + + + Cannot read file %1: +%2. + Konnte Datei %1 nicht lesen: +%2. + + + + File loaded. + Datei geladen. + + + + Do you want to save the current file +%1 ? + Möchten Sie die Datei %1 sichern ? + + + + Cannot write file %1: +%2. + Konnte Datei %1 nicht schreiben: +%2. + + + + File %1 saved + Datei %1 gesichert + + + + &Close File + &Datei schließen + + + + &New File + &Neue Datei + + + + &Open File + &Öffne Datei + + + + &Save File + &Sichere Datei + + + + Save File &As + Sichere Datei &als + + + + &Undo + &Rückgängig + + + + &Redo + &Wiederholen + + + + &Copy + &Kopieren + + + + Cu&t + &Ausschneiden + + + + &Paste + &Einfügen + + + + &Next Bookmark + &Nächstes Bookmark + + + + Pre&vious Bookmark + &Voriges Bookmark + + + + Toggle &Bookmark + &Bookmark setzen + + + + &Run File + &Ausführen + + + + &File + &Datei + + + + &Edit + &Editieren + + + + &Run + &Ausführen + + + + FilesDockWidget + + Current Folder + Aktuelles Verzeichnis + + + + Current Directory + Aktuelles Verzeichnis + + + + Move up one directory. + Ein Verzeichnis höher wechseln. + + + + Enter the path or filename. + Geben Sie einen Pfad oder Dateinamen ein. + + + + Doubleclick a file to open it. + Führen Sie einen Doppelklick aus, um eine Datei zu öffnen. + + + + HistoryDockWidget + + + Doubleclick a command to transfer it to the terminal. + Führen Sie einen Doppelklick aus, um den Befehl in das Terminal zu übertragen. + + + + Enter text to filter the command history. + Geben Sie Text ein, um die Befehlshistorie zu filtern. + + + + Command History + Befehlshistorie + + + History updated. + Befehlshistorie aktualisiert. + + + + LexerOctaveGui + + + Default + Standard + + + + Comment + Kommentar + + + + Command + Befehl + + + + Number + Zahl + + + + Keyword + Schlüsselwort + + + + Single-quoted string + Zeichenkette in einfachen Hochkommata + + + + Operator + Operator + + + + Identifier + Bezeichner + + + + Double-quoted string + Zeichenkette in doppelten Hochkommata + + + + MainWindow + + + Opening file. + Öffne Datei. + + + + Save Workspace + Speichere Arbeitsumgebung + + + + Load Workspace + Lade Arbeitsumgebung + + + + + About Octave + Über Octave + + + + Saving data and shutting down. + Speichere Daten und schließe. + + + + View the variables in the active workspace. + Sehen Sie die Variablen ein, die sich in der aktiven Arbeitsumgebung befinden. + + + + Browse and search the command history. + Durchsuchen Sie die Befehlshistorie. + + + + Browse your files. + Durchsuchen Sie Ihre Dateien. + + + + Terminal + Terminal + + + + Enter your commands into the Octave terminal. + Geben Sie Ihre Befehle in das Octave Terminal ein. + + + + Browse the Octave documentation for help. + Durchsuchen Sie die Octave Dokumentation, um Hilfe zu erhalten. + + + + Chat + Chat + + + + Instantly chat with other Octave users for help. + Tauschen Sie sich direkt mit anderen Octave Benutzern aus, um Hilfe zu erhalten. + + + + Octave + Octave + + + + Settings + Einstellungen + + + + Exit + Beenden + + + + Interface + Oberfläche + + + + Align Windows + Fenster ausrichten + + + + + Workspace + Arbeitsumgebung + + + + History + Befehlshistorie + + + + File Browser + Dateibrowser + + + + Open New Editor Window + Neues Editorfenster öffnen + + + + Load + Laden + + + + Save + Sichern + + + + Clear + Löschen + + + + Community + Gemeinschaft + + + + Report Bug + Fehler melden + + + + Agora + Agora + + + + Octave Forge + Octave Forge + + + + About Qt + Über Qt + + + Octave Toolbar + Octave Werkzeugleiste + + + Command Window + Konsolenfenster + + + File Editor + Dateieditor + + + + Documentation + Dokumentation + + + Service + Service + + + Established link to Octave. + Verbindung zu Octave hergestellt. + + + + NumberBar + + Stop Here + Stoppe hier + + + Current Line + Aktuelle Zeile + + + Error Line + Fehlerzeile + + + + NumberedCodeEdit + + This file name is not valid. + Dieser Dateiname ist nicht gültig. + + + Octave doesn't understand this file name: + + Octave versteht diesen Dateityp nicht: + + + +Please, change it. + Do you want to save your changes? + Bitte ändern Sie dies. Möchten Sie Ihre Änderungen sichern? + + + + SettingsDialog + + + Settings + Einstellungen + + + + Chat + Char + + + + Connect to #octave on startup + Beim Start mit #octave verbinden + + + + Show message of the day + Nachricht des Tages anzeigen (MOTD) + + + + Show topic + Thema des Chatkanals anzeigen + + + + Automatically identify on NickServ + Automatisch bei NickServ identifizieren + + + + Warning: Your password will be stored in ~/.octavegui in human-readable format. Do not enter your password if you worry about security issues. + Warnung: Ihre Passwort wird unter ~/.octave-gui in einem menschenlesbaren Format gesichert. Hinterlegen Sie nicht Ihr Password, wenn Sie Bedenken über die Sicherheit haben. + + + + + Password: + Passwort: + + + + Editor + Editor + + + + Use custom file editor: + Benutzerdefinierten Editor verwenden: + + + + emacs + emacs + + + + File Browser + Dateibrowser + + + + Show filenames + Dateinamen anzeigen + + + + Show file size + Dateigröße anzeigen + + + + Show file type + Dateityp anzeigen + + + + Show date of last modification + Datum der letzten Änderung anzeigen + + + + Show hidden files + Versteckte Dateien anzeigen + + + + Alternating row colors + Alternierende Farben verwenden + + + + Network + + + + + Use proxy server + + + + + Proxy Type: + + + + + HttpProxy + + + + + Socks5Proxy + + + + + Hostname: + + + + + Port: + + + + + Username: + + + + + Reset to defaults + Standardeinstellungen wiederherstellen + + + + Export + Exportieren + + + + Import + Importieren + + + + VariablesDockWidget + + + Name + Bezeichner + + + + Type + Typ + + + + Value + Wert + + + + Workspace + Arbeitsumgebung + + + Save + Sichern + + + Load + Laden + + + Clear + Löschen + + + + Local + Lokal + + + + Global + Global + + + + Persistent + Persistent + + + + Hidden + Versteckt + + + diff -r 97e3d1769be0 -r 7925a7d6547b gui/languages/es-es.qm Binary file gui/languages/es-es.qm has changed diff -r 97e3d1769be0 -r 7925a7d6547b gui/languages/es-es.ts --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/gui/languages/es-es.ts Sat May 19 03:15:00 2012 -0400 @@ -0,0 +1,576 @@ + + + + + FileEditorMdiSubWindow + + + + File Editor + Editor de archivos + + + + Cannot read file %1: +%2. + No se puede leer archivo %1: +%2. + + + + File loaded. + Archivo cargado. + + + + Do you want to save the current file +%1 ? + ¿Desea guardar archivo actual +%1 ? + + + + Cannot write file %1: +%2. + No se puede escribir archivo %1: +%2. + + + + File %1 saved + Archivo %1 guardado + + + + &Close File + &Cerrar archivo + + + + &New File + Archivo &nuevo + + + + &Open File + &Abrir archivo + + + + &Save File + &Guardar archivo + + + + Save File &As + Search for proper shortcut for this command + Guardar archivo &como + + + + &Undo + &Deshacer + + + + &Redo + &Rehacer + + + + &Copy + &Copiar + + + + Cu&t + Cor&tar + + + + &Paste + &Pegar + + + + &Next Bookmark + + + + + Pre&vious Bookmark + + + + + Toggle &Bookmark + + + + + &Run File + &Ejecutar archivo + + + + &File + &Archivo + + + + &Edit + &Editar + + + + &Run + &Ejecutar + + + + FilesDockWidget + + Current Folder + Carpeta actual + + + + Current Directory + + + + + Move up one directory. + Subir un directorio. + + + + Enter the path or filename. + Introduzca dirección o nombre de archivo. + + + + Doubleclick a file to open it. + Haga doble clic para abir archivo. + + + + HistoryDockWidget + + + Doubleclick a command to transfer it to the terminal. + Haga doble clic para transferir el comando a la terminal. + + + + Enter text to filter the command history. + Introduzca texto para filtrar el historial de comandos. + + + + Command History + Historial de comandos + + + + LexerOctaveGui + + + Default + Valores predeterminados + + + + Comment + Comentario + + + + Command + Comando + + + + Number + Número + + + + Keyword + Contraseña + + + + Single-quoted string + Cadena entre comillas simples + + + + Operator + Operador + + + + Identifier + Identificador + + + + Double-quoted string + Cadena entre comillas dobles + + + + MainWindow + + + Opening file. + Abriendo archivo. + + + + Save Workspace + Guardar espacio de trabajo + + + + Load Workspace + Cargar espacio de trabajo + + + + + About Octave + Acerca de Octave + + + + Saving data and shutting down. + Guardando datos y cerrando el sistema. + + + + View the variables in the active workspace. + Ver variables en el espacio de trabajo activo. + + + + Browse and search the command history. + Navegar y buscar en el historial de comandos. + + + + Browse your files. + Explorar sus archivos. + + + + Terminal + Terminal + + + + Enter your commands into the Octave terminal. + Introducir su comando a la terminal de Octave. + + + + Documentation + Documentación + + + + Browse the Octave documentation for help. + Consultar la documentación de Octave para obtener ayuda. + + + + Chat + Chat/conversación instantanea + + + + Instantly chat with other Octave users for help. + Coversación instantanea con otros usuarios de octave para obtener ayuda. + + + + Octave + Octave + + + + Settings + Configuración + + + + Exit + Salir + + + + Interface + Interfase + + + + Align Windows + Alinear ventanas + + + + + Workspace + Espacio de trabajo + + + + History + Historial + + + + File Browser + Explorador de archivos + + + + Open New Editor Window + Abrir nueva ventana de editor + + + + Load + Cargar + + + + Save + Guardar + + + + Clear + Limpiar + + + + Community + Comunidad + + + + Report Bug + Reportar error de software/Bug + + + + Agora + Ágora + + + + Octave Forge + Octave Forge + + + + About Qt + Acerca de Qt + + + + SettingsDialog + + + Settings + Configuración + + + + Chat + Chat/conversación instantanea + + + + Connect to #octave on startup + Conectar a #octave en el arranque + + + + Show message of the day + Mostrar mensaje del día + + + + Show topic + Mostrar tema + + + + Automatically identify on NickServ + Identificar automáticamente el NickServ + + + + Warning: Your password will be stored in ~/.octavegui in human-readable format. Do not enter your password if you worry about security issues. + Advertencia: La contraseña se guarda en ~ / octavegui en formato legible. No introduzca su contraseña en caso de que le preocupen los aspectos de seguridad. + + + + + + Password: + Contraseña: + + + + Editor + Editor + + + + Use custom file editor: + Usar editor de archivos personalizados: + + + + emacs + emacs + + + + File Browser + Explorador de archivos + + + + Show filenames + Mostrar nombres de archivos + + + + Show file size + Mostrar tamaño de archivo + + + + Show file type + Mostrar tipo de archivo + + + + Show date of last modification + Mostrar fecha de la última modificación + + + + Show hidden files + Mostrar archivos ocultos + + + + Alternating row colors + Colores alternos de filas + + + + Network + + + + + Use proxy server + + + + + Proxy Type: + + + + + HttpProxy + + + + + Socks5Proxy + + + + + Hostname: + + + + + Port: + + + + + Username: + + + + + Reset to defaults + Restaurar los valores predeterminados + + + + Export + Exportar + + + + Import + Importar + + + + VariablesDockWidget + + + Workspace + Espacio de trabajo + + + + Name + Nombre + + + + Type + Tipo + + + + Value + Valor + + + + Local + Local + + + + Global + Global + + + + Persistent + Persistente + + + + Hidden + Oculto + + + diff -r 97e3d1769be0 -r 7925a7d6547b gui/languages/generic.qm --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/gui/languages/generic.qm Sat May 19 03:15:00 2012 -0400 @@ -0,0 +1,1 @@ + + + + + FileEditorMdiSubWindow + + + + File Editor + + + + + Cannot read file %1: +%2. + + + + + File loaded. + + + + + Do you want to save the current file +%1 ? + + + + + Cannot write file %1: +%2. + + + + + File %1 saved + + + + + &Close File + + + + + &New File + + + + + &Open File + + + + + &Save File + + + + + Save File &As + + + + + &Undo + + + + + &Redo + + + + + &Copy + + + + + Cu&t + + + + + &Paste + + + + + &Next Bookmark + + + + + Pre&vious Bookmark + + + + + Toggle &Bookmark + + + + + &Run File + + + + + &File + + + + + &Edit + + + + + &Run + + + + + FilesDockWidget + + + Current Directory + + + + + Move up one directory. + + + + + Enter the path or filename. + + + + + Doubleclick a file to open it. + + + + + HistoryDockWidget + + + Doubleclick a command to transfer it to the terminal. + + + + + Enter text to filter the command history. + + + + + Command History + + + + + LexerOctaveGui + + + Default + + + + + Comment + + + + + Command + + + + + Number + + + + + Keyword + + + + + Single-quoted string + + + + + Operator + + + + + Identifier + + + + + Double-quoted string + + + + + MainWindow + + + Opening file. + + + + + Save Workspace + + + + + Load Workspace + + + + + + About Octave + + + + + Saving data and shutting down. + + + + + View the variables in the active workspace. + + + + + Browse and search the command history. + + + + + Browse your files. + + + + + Terminal + + + + + Enter your commands into the Octave terminal. + + + + + Documentation + + + + + Browse the Octave documentation for help. + + + + + Chat + + + + + Instantly chat with other Octave users for help. + + + + + Octave + + + + + Settings + + + + + Exit + + + + + Interface + + + + + Align Windows + + + + + + Workspace + + + + + History + + + + + File Browser + + + + + Open New Editor Window + + + + + Load + + + + + Save + + + + + Clear + + + + + Community + + + + + Report Bug + + + + + Agora + + + + + Octave Forge + + + + + About Qt + + + + + SettingsDialog + + + Settings + + + + + Chat + + + + + Connect to #octave on startup + + + + + Show message of the day + + + + + Show topic + + + + + Automatically identify on NickServ + + + + + Warning: Your password will be stored in ~/.octavegui in human-readable format. Do not enter your password if you worry about security issues. + + + + + + Password: + + + + + Editor + + + + + Use custom file editor: + + + + + emacs + + + + + File Browser + + + + + Show filenames + + + + + Show file size + + + + + Show file type + + + + + Show date of last modification + + + + + Show hidden files + + + + + Alternating row colors + + + + + Network + + + + + Use proxy server + + + + + Proxy Type: + + + + + HttpProxy + + + + + Socks5Proxy + + + + + Hostname: + + + + + Port: + + + + + Username: + + + + + Reset to defaults + + + + + Export + + + + + Import + + + + + VariablesDockWidget + + + Workspace + + + + + Name + + + + + Type + + + + + Value + + + + + Local + + + + + Global + + + + + Persistent + + + + + Hidden + + + + diff -r 97e3d1769be0 -r 7925a7d6547b gui/languages/pt-br.qm Binary file gui/languages/pt-br.qm has changed diff -r 97e3d1769be0 -r 7925a7d6547b gui/languages/pt-br.ts --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/gui/languages/pt-br.ts Sat May 19 03:15:00 2012 -0400 @@ -0,0 +1,571 @@ + + + + + FileEditorMdiSubWindow + + + + File Editor + Editor de Arquivos + + + + Cannot read file %1: +%2. + Não foi possível ler o arquivo %1: %2. + + + + File loaded. + Arquivo carregado. + + + + Do you want to save the current file +%1 ? + Você deseja salvar o arquivo atual %1 ? + + + + Cannot write file %1: +%2. + Não foi possível escrever no arquivo %1: %2. + + + + File %1 saved + Arquivo %1 salvo + + + + &Close File + &Fechar Arquivo + + + + &New File + &Novo Arquivo + + + + &Open File + &Abrir Arquivo + + + + &Save File + &Salvar Arquivo + + + + Save File &As + Salvar Arquivo &Como + + + + &Undo + &Desfazer + + + + &Redo + &Refazer + + + + &Copy + + + + + Cu&t + + + + + &Paste + + + + + &Next Bookmark + + + + + Pre&vious Bookmark + + + + + Toggle &Bookmark + + + + + &Run File + + + + + &File + + + + + &Edit + + + + + &Run + + + + + FilesDockWidget + + Current Folder + Diretório Atual + + + + Current Directory + + + + + Move up one directory. + Subir um diretório. + + + + Enter the path or filename. + Digite o caminho ou o nome do arquivo. + + + + Doubleclick a file to open it. + Clique duas vezes num arquivo para abrí-lo. + + + + HistoryDockWidget + + + Doubleclick a command to transfer it to the terminal. + Clique duas vezes num comando para transferí-lo ao terminal. + + + + Enter text to filter the command history. + Digite um texto para filtrar o hitórico de comandos. + + + + Command History + Histórico de Comandos + + + + LexerOctaveGui + + + Default + Padrão + + + + Comment + Comentário + + + + Command + Comando + + + + Number + Número + + + + Keyword + Palavra-Chave + + + + Single-quoted string + String com aspas simples + + + + Operator + Operador + + + + Identifier + Identificador + + + + Double-quoted string + String com aspas duplas + + + + MainWindow + + + Opening file. + Abrindo arquivo. + + + + Save Workspace + Salvar ambiente de trabalho + + + + Load Workspace + Carregar ambiente de trabalho + + + + + About Octave + Sobre o Octave + + + + Saving data and shutting down. + Salvando dados e encerrando a sessão. + + + + View the variables in the active workspace. + Visualizar variáveis no ambiente de trabalho. + + + + Browse and search the command history. + Pesquise no histórico de comandos. + + + + Browse your files. + Procure seus arquivos. + + + + Terminal + Terminal + + + + Enter your commands into the Octave terminal. + Digite seus comandos no terminal do Octave. + + + + Documentation + Documentação + + + + Browse the Octave documentation for help. + Procure na documentação do Octave. + + + + Chat + Chat + + + + Instantly chat with other Octave users for help. + Converse instantaneamente com outros usuários do Octave para pedir ajuda. + + + + Octave + Octave + + + + Settings + Configurações + + + + Exit + Sair + + + + Interface + Interface + + + + Align Windows + Alinhar Janelas + + + + + Workspace + Ambiente de trabalho + + + + History + Histórico + + + + File Browser + Navegador de Arquivos + + + + Open New Editor Window + Abrir nova janela de edição + + + + Load + Carregar + + + + Save + Salvar + + + + Clear + Limpar + + + + Community + Comunidade + + + + Report Bug + Reportar Bug + + + + Agora + Agora + + + + Octave Forge + Octave Forge + + + + About Qt + Sobre o Qt + + + + SettingsDialog + + + Settings + Configurações + + + + Chat + Chat + + + + Connect to #octave on startup + Conectar ao #octave ao iniciar + + + + Show message of the day + Mostrar mensagem do dia + + + + Show topic + Mostrar tópico + + + + Automatically identify on NickServ + Identificar-se automaticamente com o NickServ + + + + Warning: Your password will be stored in ~/.octavegui in human-readable format. Do not enter your password if you worry about security issues. + Aviso: Sua senha será salva em ~/.octavegui em um formato legível. Não digite sua senha se você tem problemas com segurança. + + + + + Password: + Senha: + + + + Editor + Editor + + + + Use custom file editor: + Usar editor de arquivos personalizado: + + + + emacs + emacs + + + + File Browser + Navegador de Arquivos + + + + Show filenames + Mostrar nomes de arquivo + + + + Show file size + Mostrar tamanho do arquivo + + + + Show file type + Mostrar tipo do arquivo + + + + Show date of last modification + Mostrar data de última modificação + + + + Show hidden files + Mostrar arquivos ocultos + + + + Alternating row colors + Alternar cores das linhas + + + + Network + + + + + Use proxy server + + + + + Proxy Type: + + + + + HttpProxy + + + + + Socks5Proxy + + + + + Hostname: + + + + + Port: + + + + + Username: + + + + + Reset to defaults + Resetar ao padrão + + + + Export + Exportar + + + + Import + Importar + + + + VariablesDockWidget + + + Workspace + Ambiente de trabalho + + + + Name + Nome + + + + Type + Tipo + + + + Value + Valor + + + + Local + Local + + + + Global + Global + + + + Persistent + Persistente + + + + Hidden + Oculto + + + diff -r 97e3d1769be0 -r 7925a7d6547b gui/languages/ru-ru.qm Binary file gui/languages/ru-ru.qm has changed diff -r 97e3d1769be0 -r 7925a7d6547b gui/languages/ru-ru.ts --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/gui/languages/ru-ru.ts Sat May 19 03:15:00 2012 -0400 @@ -0,0 +1,574 @@ + + + + + FileEditorMdiSubWindow + + + + File Editor + Редактор файлов + + + + Cannot read file %1: +%2. + Не удалось прочитать файл %1: +%2. + + + + File loaded. + Файл загружен. + + + + Do you want to save the current file +%1 ? + Сохранить текущий файл +%1? + + + + Cannot write file %1: +%2. + Не удалось сохранить файл %1: +%2. + + + + File %1 saved + Файл %1 сохранён + + + + &Close File + &Закрыть + + + + &New File + Созд&ать + + + + &Open File + &Открыть + + + + &Save File + &Сохранить + + + + Save File &As + Сохранить &как + + + + &Undo + О&тменить + + + + &Redo + &Повторить + + + + &Copy + &Копировать + + + + Cu&t + Вы&резать + + + + &Paste + &Вставить + + + + &Next Bookmark + С&ледующая закладка + + + + Pre&vious Bookmark + Пр&едыдущая закладка + + + + Toggle &Bookmark + &Установить/снять закладку + + + + &Run File + &Запустить файл + + + + &File + &Файл + + + + &Edit + &Правка + + + + &Run + &Запуск + + + + FilesDockWidget + + Current Folder + Текущий каталог + + + + Current Directory + Текущий каталог + + + + Move up one directory. + Перейти на уровень выше. + + + + Enter the path or filename. + Введите путь или имя файла. + + + + Doubleclick a file to open it. + Двойной щелчок по файлу откроет его. + + + + HistoryDockWidget + + + Doubleclick a command to transfer it to the terminal. + Двойной щелчок по команде перенесёт её в командную строку. + + + + Enter text to filter the command history. + Введите текст для фильтрации выполненных команд. + + + + Command History + Журнал выполненных команд + + + + LexerOctaveGui + + + Default + По умолчанию + + + + Comment + Комментарий + + + + Command + Команда + + + + Number + Число + + + + Keyword + Зарезервированное слово + + + + Single-quoted string + Строка в одинарных кавычках + + + + Operator + Оператор + + + + Identifier + Идентификатор + + + + Double-quoted string + Строка в двойных кавычках + + + + MainWindow + + + Opening file. + Открывается файл. + + + + Save Workspace + Сохранить область переменных + + + + Load Workspace + Загрузить область переменных + + + + + About Octave + Об Octave + + + + Saving data and shutting down. + Сохранить и завершить работу. + + + + View the variables in the active workspace. + Просмотр содержимого текущей области переменных. + + + + Browse and search the command history. + Просмотр и поиск в журнале выполненных команд. + + + + Browse your files. + Просмотр файлов. + + + + Terminal + Командная строка + + + + Enter your commands into the Octave terminal. + Введите команды в командной строке Octave. + + + + Documentation + Документация + + + + Browse the Octave documentation for help. + Открыть документацию по Octave. + + + + Chat + Чат + + + + Instantly chat with other Octave users for help. + Чат с пользователями Octave. + + + + Octave + Octave + + + + Settings + Параметры + + + + Exit + Выход + + + + Interface + Интерфейс + + + + Align Windows + Выровнять окна + + + + + Workspace + Область переменных + + + + History + Журнал выполненных команд + + + + File Browser + Файловый менеджер + + + + Open New Editor Window + Открыть новое окно редактора + + + + Load + Загрузить + + + + Save + Сохранить + + + + Clear + Очистить + + + + Community + Сообщество + + + + Report Bug + Сообщить об ошибке + + + + Agora + Agora + + + + Octave Forge + Octave Forge + + + + About Qt + О Qt + + + + SettingsDialog + + + Settings + Параметры + + + + Chat + Чат + + + + Connect to #octave on startup + Подключиться к #octave при запуске + + + + Show message of the day + Показывать совет дня + + + + Show topic + Показывать тему обсуждения при подключении + + + + Automatically identify on NickServ + Автоматически идентифицироваться у NickServ + + + + Warning: Your password will be stored in ~/.octavegui in human-readable format. Do not enter your password if you worry about security issues. + Предупреждение: пароль будет сохранён в ~/.octavegui обычным текстом. Не вводите пароль, если переживаете о возможных уязвимостях в безопасности приложения. + + + + + Password: + Пароль: + + + + Editor + Редактор + + + + Use custom file editor: + Выбрать редактор: + + + + emacs + emacs + + + + File Browser + Файловый менеджер + + + + Show filenames + Показывать имена файлов + + + + Show file size + Показывать размер файлов + + + + Show file type + Показывать типы файлов + + + + Show date of last modification + Показывать дату последнего изменения + + + + Show hidden files + Показывать скрытые файлы + + + + Alternating row colors + Чередующиеся цвета строк + + + + Network + + + + + Use proxy server + + + + + Proxy Type: + + + + + HttpProxy + + + + + Socks5Proxy + + + + + Hostname: + + + + + Port: + + + + + Username: + + + + + Reset to defaults + Установить параметры по умолчанию + + + + Export + Экспортировать + + + + Import + Импортировать + + + + VariablesDockWidget + + + Workspace + Область переменных + + + + Name + Идентификатор + + + + Type + Тип + + + + Value + Значение + + + + Local + Локальная + + + + Global + Глобальная + + + + Persistent + Статическая + + + + Hidden + Скрытая + + + diff -r 97e3d1769be0 -r 7925a7d6547b gui/languages/uk-ua.qm Binary file gui/languages/uk-ua.qm has changed diff -r 97e3d1769be0 -r 7925a7d6547b gui/languages/uk-ua.ts --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/gui/languages/uk-ua.ts Sat May 19 03:15:00 2012 -0400 @@ -0,0 +1,574 @@ + + + + + FileEditorMdiSubWindow + + + + File Editor + Редактор файлів + + + + Cannot read file %1: +%2. + Не вдалося прочитати файл %1: +%2. + + + + File loaded. + Файл завантажено. + + + + Do you want to save the current file +%1 ? + Справді зберегти поточний файл +%1? + + + + Cannot write file %1: +%2. + Не вдалося зберегти файл %1: +%2. + + + + File %1 saved + Файл %1 збережено + + + + &Close File + За&крити + + + + &New File + &Створити + + + + &Open File + &Відкрити + + + + &Save File + &Зберегти + + + + Save File &As + Зберегти &як + + + + &Undo + В&ернути + + + + &Redo + П&овторити + + + + &Copy + &Копіювати + + + + Cu&t + Виріза&ти + + + + &Paste + &Вставити + + + + &Next Bookmark + До &наступної закладки + + + + Pre&vious Bookmark + До &попередньої закладки + + + + Toggle &Bookmark + В&становити/видалити закладку + + + + &Run File + &Виконати файл + + + + &File + &Файл + + + + &Edit + &Правка + + + + &Run + &Виконання + + + + FilesDockWidget + + Current Folder + Поточний каталог + + + + Current Directory + Поточний каталог + + + + Move up one directory. + Перейти вгору деревом каталогів. + + + + Enter the path or filename. + Введіть повний шлях до файлу або назву файлу. + + + + Doubleclick a file to open it. + Подвійне клацання відкриє файл. + + + + HistoryDockWidget + + + Doubleclick a command to transfer it to the terminal. + Подвійне клацання перенесе команду до командного рядку. + + + + Enter text to filter the command history. + Введіть текст для фільтрування історії виконаних команд. + + + + Command History + Історія виконаних команд + + + + LexerOctaveGui + + + Default + Стандартні налаштування + + + + Comment + Коментар + + + + Command + Команда + + + + Number + Число + + + + Keyword + Зарезервоване слово + + + + Single-quoted string + Рядок в одинарних лапках + + + + Operator + Оператор + + + + Identifier + Ідентифікатор + + + + Double-quoted string + Рядок у подвійних лапках + + + + MainWindow + + + Opening file. + Відкривається файл. + + + + Save Workspace + Зберегти область змінних + + + + Load Workspace + Завантажити область змінних + + + + + About Octave + Про Octave + + + + Saving data and shutting down. + Зберегти дані і завершити роботу. + + + + View the variables in the active workspace. + Перегляд змісту поточної області змінних. + + + + Browse and search the command history. + Перегляд і пошук серед історії виконаних команд. + + + + Browse your files. + Переглянути файли. + + + + Terminal + Командний рядок + + + + Enter your commands into the Octave terminal. + Введіть команди до командного рядка Octave. + + + + Documentation + Документація + + + + Browse the Octave documentation for help. + Переглянути документацію до Octave. + + + + Chat + Чат + + + + Instantly chat with other Octave users for help. + Чат з користувачами Octave. + + + + Octave + Octave + + + + Settings + Налаштування + + + + Exit + Вийти + + + + Interface + Інтерфейс + + + + Align Windows + Вирівняти вікна + + + + + Workspace + Область змінних + + + + History + Історія виконаних команд + + + + File Browser + Файловий менеджер + + + + Open New Editor Window + Відкрити нове вікно редактора + + + + Load + Завантажити + + + + Save + Зберегти + + + + Clear + Очистити + + + + Community + Спільнота + + + + Report Bug + Повідомити про помилку + + + + Agora + Agora + + + + Octave Forge + Octave Forge + + + + About Qt + Про Qt + + + + SettingsDialog + + + Settings + Налаштування + + + + Chat + Чат + + + + Connect to #octave on startup + З'єднатися з #octave при запуску + + + + Show message of the day + Показувати пораду дня + + + + Show topic + Показувати тему чату при з'єднанні + + + + Automatically identify on NickServ + Автоматично ідентифікуватися в NickServ + + + + Warning: Your password will be stored in ~/.octavegui in human-readable format. Do not enter your password if you worry about security issues. + Попередження: пароль буде збережено в ~/.octavegui звичайним текстом. Не вводьте пароль, якщо переймаєтесь потенційними проблемами із захистом даних в програмі. + + + + + Password: + Пароль: + + + + Editor + Редактор + + + + Use custom file editor: + Використовувати інший редактор: + + + + emacs + emacs + + + + File Browser + Файловий менеджер + + + + Show filenames + Показувати назви файлів + + + + Show file size + Показувати розмір файлів + + + + Show file type + Показувати типи файлів + + + + Show date of last modification + Показувати дату останньої зміни + + + + Show hidden files + Показувати приховані файли + + + + Alternating row colors + Чергувати колір рядків + + + + Network + + + + + Use proxy server + + + + + Proxy Type: + + + + + HttpProxy + + + + + Socks5Proxy + + + + + Hostname: + + + + + Port: + + + + + Username: + + + + + Reset to defaults + Встановити стандартні налаштування + + + + Export + Експортувати + + + + Import + Імпортувати + + + + VariablesDockWidget + + + Workspace + Область змінних + + + + Name + Ідентифікатор + + + + Type + Тип + + + + Value + Значення + + + + Local + Локальна + + + + Global + Глобальна + + + + Persistent + Статична + + + + Hidden + Прихована + + + diff -r 97e3d1769be0 -r 7925a7d6547b gui/media/chat.png Binary file gui/media/chat.png has changed diff -r 97e3d1769be0 -r 7925a7d6547b gui/media/help_index.png Binary file gui/media/help_index.png has changed diff -r 97e3d1769be0 -r 7925a7d6547b gui/media/icons_license --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/gui/media/icons_license Sat May 19 03:15:00 2012 -0400 @@ -0,0 +1,104 @@ +Icons license for: +chat.png +help_index.png +terminal.png +jabber_protocol.png + +by http://www.everaldo.com/ on 17.07.2011: + +The Crystal Project are released under LGPL. +GNU General Public License. + +This License Agreement applies to any software library or other program which contains a notice placed by the copyright holder or other authorized party saying it may be distributed under the terms of this Lesser General Public License (also called "this License"). Each licensee is addressed as "you". + +A "library" means a collection of software functions and/or data prepared so as to be conveniently linked with application programs (which use some of those functions and data) to form executables. + +The "Library", below, refers to any such software library or work which has been distributed under these terms. A "work based on the Library" means either the Library or any derivative work under copyright law: that is to say, a work containing the Library or a portion of it, either verbatim or with modifications and/or translated straightforwardly into another language. (Hereinafter, translation is included without limitation in the term "modification".) + +"Source code" for a work means the preferred form of the work for making modifications to it. For a library, complete source code means all the source code for all modules it contains, plus any associated interface definition files, plus the scripts used to control compilation and installation of the library. + +Activities other than copying, distribution and modification are not covered by this License; they are outside its scope. The act of running a program using the Library is not restricted, and output from such a program is covered only if its contents constitute a work based on the Library (independent of the use of the Library in a tool for writing it). Whether that is true depends on what the Library does and what the program that uses the Library does. + +You may copy and distribute verbatim copies of the Library's complete source code as you receive it, in any medium, provided that you conspicuously and appropriately publish on each copy an appropriate copyright notice and disclaimer of warranty; keep intact all the notices that refer to this License and to the absence of any warranty; and distribute a copy of this License along with the Library. + +You may charge a fee for the physical act of transferring a copy, and you may at your option offer warranty protection in exchange for a fee. + +You may modify your copy or copies of the Library or any portion of it, thus forming a work based on the Library, and copy and distribute such modifications or work under the terms of Section 1 above, provided that you also meet all of these conditions: + +The modified work must itself be a software library. +You must cause the files modified to carry prominent notices stating that you changed the files and the date of any change. +You must cause the whole of the work to be licensed at no charge to all third parties under the terms of this License. +If a facility in the modified Library refers to a function or a table of data to be supplied by an application program that uses the facility, other than as an argument passed when the facility is invoked, then you must make a good faith effort to ensure that, in the event an application does not supply such function or table, the facility still operates, and performs whatever part of its purpose remains meaningful. +(For example, a function in a library to compute square roots has a purpose that is entirely well-defined independent of the application. Therefore, Subsection 2d requires that any application-supplied function or table used by this function must be optional: if the application does not supply it, the square root function must still compute square roots.) + +These requirements apply to the modified work as a whole. If identifiable sections of that work are not derived from the Library, and can be reasonably considered independent and separate works in themselves, then this License, and its terms, do not apply to those sections when you distribute them as separate works. But when you distribute the same sections as part of a whole which is a work based on the Library, the distribution of the whole must be on the terms of this License, whose permissions for other licensees extend to the entire whole, and thus to each and every part regardless of who wrote it. + +Thus, it is not the intent of this section to claim rights or contest your rights to work written entirely by you; rather, the intent is to exercise the right to control the distribution of derivative or collective works based on the Library. + +In addition, mere aggregation of another work not based on the Library with the Library (or with a work based on the Library) on a volume of a storage or distribution medium does not bring the other work under the scope of this License. + +You may opt to apply the terms of the ordinary GNU General Public License instead of this License to a given copy of the Library. To do this, you must alter all the notices that refer to this License, so that they refer to the ordinary GNU General Public License, version 2, instead of to this License. (If a newer version than version 2 of the ordinary GNU General Public License has appeared, then you can specify that version instead if you wish.) Do not make any other change in these notices. + +Once this change is made in a given copy, it is irreversible for that copy, so the ordinary GNU General Public License applies to all subsequent copies and derivative works made from that copy. + +This option is useful when you wish to copy part of the code of the Library into a program that is not a library. + +You may copy and distribute the Library (or a portion or derivative of it, under Section 2) in object code or executable form under the terms of Sections 1 and 2 above provided that you accompany it with the complete corresponding machine-readable source code, which must be distributed under the terms of Sections 1 and 2 above on a medium customarily used for software interchange. + +If distribution of object code is made by offering access to copy from a designated place, then offering equivalent access to copy the source code from the same place satisfies the requirement to distribute the source code, even though third parties are not compelled to copy the source along with the object code. + +A program that contains no derivative of any portion of the Library, but is designed to work with the Library by being compiled or linked with it, is called a "work that uses the Library". Such a work, in isolation, is not a derivative work of the Library, and therefore falls outside the scope of this License. + +However, linking a "work that uses the Library" with the Library creates an executable that is a derivative of the Library (because it contains portions of the Library), rather than a "work that uses the library". The executable is therefore covered by this License. Section 6 states terms for distribution of such executables. +When a "work that uses the Library" uses material from a header file that is part of the Library, the object code for the work may be a derivative work of the Library even though the source code is not. Whether this is true is especially significant if the work can be linked without the Library, or if the work is itself a library. The threshold for this to be true is not precisely defined by law. + +If such an object file uses only numerical parameters, data structure layouts and accessors, and small macros and small inline functions (ten lines or less in length), then the use of the object file is unrestricted, regardless of whether it is legally a derivative work. (Executables containing this object code plus portions of the Library will still fall under Section 6.) + +Otherwise, if the work is a derivative of the Library, you may distribute the object code for the work under the terms of Section 6. Any executables containing that work also fall under Section 6, whether or not they are linked directly with the Library itself. + +As an exception to the Sections above, you may also combine or link a "work that uses the Library" with the Library to produce a work containing portions of the Library, and distribute that work under terms of your choice, provided that the terms permit modification of the work for the customer's own use and reverse engineering for debugging such modifications. + +You must give prominent notice with each copy of the work that the Library is used in it and that the Library and its use are covered by this License. You must supply a copy of this License. If the work during execution displays copyright notices, you must include the copyright notice for the Library among them, as well as a reference directing the user to the copy of this License. Also, you must do one of these things: + +Accompany the work with the complete corresponding machine-readable source code for the Library including whatever changes were used in the work (which must be distributed under Sections 1 and 2 above); and, if the work is an executable linked with the Library, with the complete machine-readable "work that uses the Library", as object code and/or source code, so that the user can modify the Library and then relink to produce a modified executable containing the modified Library. (It is understood that the user who changes the contents of definitions files in the Library will not necessarily be able to recompile the application to use the modified definitions.) . +Use a suitable shared library mechanism for linking with the Library. A suitable mechanism is one that (1) uses at run time a copy of the library already present on the user's computer system, rather than copying library functions into the executable, and (2) will operate properly with a modified version of the library, if the user installs one, as long as the modified version is interface-compatible with the version that the work was made with. +Accompany the work with a written offer, valid for at least three years, to give the same user the materials specified in Subsection 6a, above, for a charge no more than the cost of performing this distribution. +If distribution of the work is made by offering access to copy from a designated place, offer equivalent access to copy the above specified materials from the same place. +Verify that the user has already received a copy of these materials or that you have already sent this user a copy. +For an executable, the required form of the "work that uses the Library" must include any data and utility programs needed for reproducing the executable from it. However, as a special exception, the materials to be distributed need not include anything that is normally distributed (in either source or binary form) with the major components (compiler, kernel, and so on) of the operating system on which the executable runs, unless that component itself accompanies the executable. + +It may happen that this requirement contradicts the license restrictions of other proprietary libraries that do not normally accompany the operating system. Such a contradiction means you cannot use both them and the Library together in an executable that you distribute. + +You may place library facilities that are a work based on the Library side-by-side in a single library together with other library facilities not covered by this License, and distribute such a combined library, provided that the separate distribution of the work based on the Library and of the other library facilities is otherwise permitted, and provided that you do these two things: + +Accompany the combined library with a copy of the same work based on the Library, uncombined with any other library facilities. This must be distributed under the terms of the Sections above. + +Give prominent notice with the combined library of the fact that part of it is a work based on the Library, and explaining where to find the accompanying uncombined form of the same work. + +You may not copy, modify, sublicense, link with, or distribute the Library except as expressly provided under this License. Any attempt otherwise to copy, modify, sublicense, link with, or distribute the Library is void, and will automatically terminate your rights under this License. However, parties who have received copies, or rights, from you under this License will not have their licenses terminated so long as such parties remain in full compliance. + +You are not required to accept this License, since you have not signed it. However, nothing else grants you permission to modify or distribute the Library or its derivative works. These actions are prohibited by law if you do not accept this License. Therefore, by modifying or distributing the Library (or any work based on the Library), you indicate your acceptance of this License to do so, and all its terms and conditions for copying, distributing or modifying the Library or works based on it. + +Each time you redistribute the Library (or any work based on the Library), the recipient automatically receives a license from the original licensor to copy, distribute, link with or modify the Library subject to these terms and conditions. You may not impose any further restrictions on the recipients' exercise of the rights granted herein. You are not responsible for enforcing compliance by third parties with this License. + +If, as a consequence of a court judgment or allegation of patent infringement or for any other reason (not limited to patent issues), conditions are imposed on you (whether by court order, agreement or otherwise) that contradict the conditions of this License, they do not excuse you from the conditions of this License. If you cannot distribute so as to satisfy simultaneously your obligations under this License and any other pertinent obligations, then as a consequence you may not distribute the Library at all. For example, if a patent license would not permit royalty-free redistribution of the Library by all those who receive copies directly or indirectly through you, then the only way you could satisfy both it and this License would be to refrain entirely from distribution of the Library. + +If any portion of this section is held invalid or unenforceable under any particular circumstance, the balance of the section is intended to apply, and the section as a whole is intended to apply in other circumstances. + +It is not the purpose of this section to induce you to infringe any patents or other property right claims or to contest validity of any such claims; this section has the sole purpose of protecting the integrity of the free software distribution system which is implemented by public license practices. Many people have made generous contributions to the wide range of software distributed through that system in reliance on consistent application of that system; it is up to the author/donor to decide if he or she is willing to distribute software through any other system and a licensee cannot impose that choice. + +This section is intended to make thoroughly clear what is believed to be a consequence of the rest of this License. + +If the distribution and/or use of the Library is restricted in certain countries either by patents or by copyrighted interfaces, the original copyright holder who places the Library under this License may add an explicit geographical distribution limitation excluding those countries, so that distribution is permitted only in or among countries not thus excluded. In such case, this License incorporates the limitation as if written in the body of this License. + +The Free Software Foundation may publish revised and/or new versions of the Lesser General Public License from time to time. Such new versions will be similar in spirit to the present version, but may differ in detail to address new problems or concerns. + +Each version is given a distinguishing version number. If the Library specifies a version number of this License which applies to it and "any later version", you have the option of following the terms and conditions either of that version or of any later version published by the Free Software Foundation. If the Library does not specify a license version number, you may choose any version ever published by the Free Software Foundation. + +If you wish to incorporate parts of the Library into other free programs whose distribution conditions are incompatible with these, write to the author to ask for permission. For software which is copyrighted by the Free Software Foundation, write to the Free Software Foundation; we sometimes make exceptions for this. Our decision will be guided by the two goals of preserving the free status of all derivatives of our free software and of promoting the sharing and reuse of software generally. + +No Warranty + +Because the library is licensed free of charge, there is no warranty for the library, to the extent permitted by applicable law. Except when otherwise stated in writing the copyright holders and/or other parties provide the library "as is" without warranty of any kind, either expressed or implied, including, but not limited to, the implied warranties of merchantability and fitness for a particular purpose. The entire risk as to the quality and performance of the library is with you. Should the library prove defective, you assume the cost of all necessary servicing, repair or correction. + +In no event unless required by applicable law or agreed to in writing will any copyright holder, or any other party who may modify and/or redistribute the library as permitted above, be liable to you for damages, including any general, special, incidental or consequential damages arising out of the use or inability to use the library (including but not limited to loss of data or data being rendered inaccurate or losses sustained by you or third parties or a failure of the library to operate with any other software), even if such holder or other party has been advised of the possibility of such damages. diff -r 97e3d1769be0 -r 7925a7d6547b gui/media/jabber_protocol.png Binary file gui/media/jabber_protocol.png has changed diff -r 97e3d1769be0 -r 7925a7d6547b gui/media/logo.png Binary file gui/media/logo.png has changed diff -r 97e3d1769be0 -r 7925a7d6547b gui/media/terminal.png Binary file gui/media/terminal.png has changed diff -r 97e3d1769be0 -r 7925a7d6547b gui/src/CommandLineParser.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/gui/src/CommandLineParser.cpp Sat May 19 03:15:00 2012 -0400 @@ -0,0 +1,47 @@ +/* OctaveGUI - A graphical user interface for Octave + * Copyright (C) 2011 Jacob Dawid (jacob.dawid@googlemail.com) + * + * 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. + * + * 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 this program. If not, see . + */ + +#include "CommandLineParser.h" + +CommandLineParser::CommandLineParser () +{ +} + +void +CommandLineParser::registerOption (CommandLineOption commandLineOption) +{ + if (m_registeredCommandLineOptions.contains(commandLineOption)) + m_registeredCommandLineOptions.append(commandLineOption); +} + +void +CommandLineParser::registerOption (QString longOption, QString shortOption, QString description, bool withArgument) +{ + CommandLineOption commandLineOption; + commandLineOption.longOption = longOption; + commandLineOption.shortOption = shortOption; + commandLineOption.description = description; + commandLineOption.withArgument = withArgument; + registerOption (commandLineOption); +} + +void +CommandLineParser::parse (int argc, char** argv) +{ + Q_UNUSED(argc); + Q_UNUSED(argv); +} diff -r 97e3d1769be0 -r 7925a7d6547b gui/src/CommandLineParser.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/gui/src/CommandLineParser.h Sat May 19 03:15:00 2012 -0400 @@ -0,0 +1,50 @@ +/* OctaveGUI - A graphical user interface for Octave + * Copyright (C) 2011 Jacob Dawid (jacob.dawid@googlemail.com) + * + * 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. + * + * 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 this program. If not, see . + */ + +#ifndef COMMANDLINEPARSER_H +#define COMMANDLINEPARSER_H + +#include +#include + +class CommandLineParser +{ +public: + struct CommandLineOption + { + QString longOption; + QString shortOption; + QString description; + bool withArgument; + + bool operator== (CommandLineOption other) + { + return longOption == other.longOption + || shortOption == other.shortOption; + } + }; + + CommandLineParser (); + void registerOption (CommandLineOption commandLineOption); + void registerOption (QString longOption, QString shortOption, QString description, bool withArgument); + void parse (int argc, char** argv); + +private: + QList m_registeredCommandLineOptions; +}; + +#endif // COMMANDLINEPARSER_H diff -r 97e3d1769be0 -r 7925a7d6547b gui/src/FileEditor.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/gui/src/FileEditor.cpp Sat May 19 03:15:00 2012 -0400 @@ -0,0 +1,548 @@ +/* OctaveGUI - A graphical user interface for Octave + * Copyright (C) 2011 Jacob Dawid (jacob.dawid@googlemail.com) + * + * 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. + * + * 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 this program. If not, see . + */ + +#include "FileEditor.h" +#include +#include +#include +#include +#include +#include +#include +#include + +FileEditor::FileEditor (QWidget * parent) + : QWidget (parent) +{ + construct (); +} + +FileEditor::~FileEditor () +{ +} + +void +FileEditor::closeEvent(QCloseEvent *event) +{ + if ( m_mainWindow->closing () ) + { + // close wohle application: save file or not if modified + checkFileModified ("Closing Octave", 0); // no cancel possible + event->accept (); + } + else + { + // ignore close event if file is not saved and user cancels closing this window + if (checkFileModified ("Close File",QMessageBox::Cancel) == QMessageBox::Cancel) + { + event->ignore (); + } + else + { + event->accept(); + } + } +} + +void +FileEditor::handleMarginClicked(int margin, int line, Qt::KeyboardModifiers state) +{ + Q_UNUSED (state); + if ( margin == 1 ) // marker margin + { + unsigned int mask = m_editor->markersAtLine (line); + if (mask && (1 << MARKER_BOOKMARK)) + m_editor->markerDelete(line,MARKER_BOOKMARK); + else + m_editor->markerAdd(line,MARKER_BOOKMARK); + } +} + +void +FileEditor::newWindowTitle(bool modified) +{ + QString title(m_fileName); + if ( !m_longTitle ) + { + QFileInfo file(m_fileName); + title = file.fileName(); + } + if ( modified ) + { + setWindowTitle(title.prepend("* ")); + } + else + setWindowTitle (title); +} + +void +FileEditor::handleCopyAvailable(bool enableCopy) +{ + m_copyAction->setEnabled(enableCopy); + m_cutAction->setEnabled(enableCopy); +} + + +void +FileEditor::openFile () +{ + if (checkFileModified ("Open File",QMessageBox::Cancel)==QMessageBox::Cancel) + { + return; // existing file not saved and opening another file canceled by user + } + QString openFileName; + QFileDialog dlg(this); + dlg.setNameFilter(SAVE_FILE_FILTER); + dlg.setAcceptMode(QFileDialog::AcceptOpen); + dlg.setViewMode(QFileDialog::Detail); + if ( dlg.exec() ) + { + openFileName = dlg.selectedFiles().at(0); + if (openFileName.isEmpty ()) + return; + loadFile(openFileName); + } +} + +void +FileEditor::loadFile (QString fileName) +{ + QFile file (fileName); + if (!file.open (QFile::ReadOnly)) + { + QMessageBox::warning (this, tr ("File Editor"), + tr ("Cannot read file %1:\n%2.").arg (fileName). + arg (file.errorString ())); + return; + } + + QTextStream in (&file); + QApplication::setOverrideCursor (Qt::WaitCursor); + m_editor->setText (in.readAll ()); + QApplication::restoreOverrideCursor (); + + m_fileName = fileName; + newWindowTitle (false); // window title (no modification) + m_statusBar->showMessage (tr ("File loaded."), 2000); + m_editor->setModified (false); // loaded file is not modified yet +} + +void +FileEditor::newFile () +{ + if (checkFileModified ("Create New File",QMessageBox::Cancel)==QMessageBox::Cancel) + { + return; // existing file not saved and creating new file canceled by user + } + + m_fileName = UNNAMED_FILE; + newWindowTitle (false); // window title (no modification) + m_editor->setText (""); + m_editor->setModified (false); // new file is not modified yet +} + +int +FileEditor::checkFileModified (QString msg, int cancelButton) +{ + int decision = QMessageBox::Yes; + if (m_editor->isModified ()) + { + // file is modified but not saved, aks user what to do + decision = QMessageBox::warning (this, + msg, + tr ("The file %1\n" + "has been modified. Do you want to save the changes?"). + arg (m_fileName), + QMessageBox::Save, QMessageBox::Discard, cancelButton ); + if (decision == QMessageBox::Save) + { + saveFile (); + if (m_editor->isModified ()) + { + // If the user attempted to save the file, but it's still + // modified, then probably something went wrong, so return cancel + // for cancel this operation or try to save files as if cancel not + // possible + if ( cancelButton ) + return (QMessageBox::Cancel); + else + saveFileAs (); + } + } + } + return (decision); +} + +void +FileEditor::saveFile () +{ + saveFile(m_fileName); +} + +void +FileEditor::saveFile (QString saveFileName) +{ + // it is a new file with the name "" -> call saveFielAs + if (saveFileName==UNNAMED_FILE || saveFileName.isEmpty ()) + { + saveFileAs(); + return; + } + + // open the file for writing + QFile file (saveFileName); + if (!file.open (QFile::WriteOnly)) + { + QMessageBox::warning (this, tr ("File Editor"), + tr ("Cannot write file %1:\n%2."). + arg (saveFileName).arg (file.errorString ())); + return; + } + + // save the contents into the file + QTextStream out (&file); + QApplication::setOverrideCursor (Qt::WaitCursor); + out << m_editor->text (); + QApplication::restoreOverrideCursor (); + m_fileName = saveFileName; // save file name for later use + newWindowTitle(false); // set the window title to actual file name (not modified) + m_statusBar->showMessage (tr ("File %1 saved").arg(m_fileName), 2000); + m_editor->setModified (false); // files is save -> not modified +} + +void +FileEditor::saveFileAs () +{ + QString saveFileName(m_fileName); + QFileDialog dlg(this); + if (saveFileName==UNNAMED_FILE || saveFileName.isEmpty ()) + { + saveFileName = QDir::homePath(); + dlg.setDirectory(saveFileName); + } + else + { + dlg.selectFile(saveFileName); + } + dlg.setNameFilter(SAVE_FILE_FILTER); + dlg.setDefaultSuffix("m"); + dlg.setAcceptMode(QFileDialog::AcceptSave); + dlg.setViewMode(QFileDialog::Detail); + if ( dlg.exec() ) + { + saveFileName = dlg.selectedFiles().at(0); + if (saveFileName.isEmpty ()) + return; + saveFile(saveFileName); + } +} + +// handle the run command +void +FileEditor::runFile () +{ + if (m_editor->isModified ()) + saveFile(m_fileName); + m_terminalView->sendText (QString ("run \'%1\'\n").arg (m_fileName)); + m_terminalView->setFocus (); +} + + +// (un)comment selected text +void +FileEditor::commentSelectedText () +{ + doCommentSelectedText (true); +} +void +FileEditor::uncommentSelectedText () +{ + doCommentSelectedText (false); +} +void +FileEditor::doCommentSelectedText (bool comment) +{ + if ( m_editor->hasSelectedText() ) + { + int lineFrom, lineTo, colFrom, colTo, i; + m_editor->getSelection (&lineFrom,&colFrom,&lineTo,&colTo); + if ( colTo == 0 ) // the beginning of last line is not selected + lineTo--; // stop at line above + m_editor->beginUndoAction (); + for ( i=lineFrom; i<=lineTo; i++ ) + { + if ( comment ) + m_editor->insertAt("%",i,0); + else + { + QString line(m_editor->text(i)); + if ( line.startsWith("%") ) + { + m_editor->setSelection(i,0,i,1); + m_editor->removeSelectedText(); + } + } + } + m_editor->endUndoAction (); + } +} + + +// remove bookmarks +void +FileEditor::removeBookmark () +{ + m_editor->markerDeleteAll(MARKER_BOOKMARK); +} +// toggle bookmark +void +FileEditor::toggleBookmark () +{ + int line,cur; + m_editor->getCursorPosition(&line,&cur); + if ( m_editor->markersAtLine (line) && (1 << MARKER_BOOKMARK) ) + m_editor->markerDelete(line,MARKER_BOOKMARK); + else + m_editor->markerAdd(line,MARKER_BOOKMARK); +} +// goto next bookmark +void +FileEditor::nextBookmark () +{ + int line,cur,nextline; + m_editor->getCursorPosition(&line,&cur); + if ( m_editor->markersAtLine(line) && (1 << MARKER_BOOKMARK) ) + line++; // we have a bookmark here, so start search from next line + nextline = m_editor->markerFindNext(line,(1 << MARKER_BOOKMARK)); + m_editor->setCursorPosition(nextline,0); +} +// goto previous bookmark +void +FileEditor::prevBookmark () +{ + int line,cur,prevline; + m_editor->getCursorPosition(&line,&cur); + if ( m_editor->markersAtLine(line) && (1 << MARKER_BOOKMARK) ) + line--; // we have a bookmark here, so start search from prev line + prevline = m_editor->markerFindPrevious(line,(1 << MARKER_BOOKMARK)); + m_editor->setCursorPosition(prevline,0); +} + +// function for setting the already existing lexer from MainWindow +void +FileEditor::initEditor (QTerminal* terminalView, + LexerOctaveGui* lexer, + MainWindow* mainWindow) +{ + m_editor->setLexer(lexer); + m_terminalView = terminalView; // for sending commands to octave + // TODO: make a global commandOctave function? + m_mainWindow = mainWindow; // get the MainWindow for chekcing state at subwindow close +} + +void +FileEditor::setModified (bool modified) +{ + m_modified = modified; +} + +void +FileEditor::construct () +{ + QSettings *settings = ResourceManager::instance ()->settings (); + QStyle *style = QApplication::style (); + + m_menuBar = new QMenuBar (this); + m_toolBar = new QToolBar (this); + m_statusBar = new QStatusBar (this); + m_editor = new QsciScintilla (this); + + // markers + m_editor->setMarginType (1, QsciScintilla::SymbolMargin); + m_editor->setMarginSensitivity(1,true); + m_editor->markerDefine(QsciScintilla::RightTriangle,MARKER_BOOKMARK); + connect(m_editor,SIGNAL(marginClicked(int,int,Qt::KeyboardModifiers)), + this,SLOT(handleMarginClicked(int,int,Qt::KeyboardModifiers))); + + // line numbers + m_editor->setMarginsForegroundColor(QColor(96,96,96)); + m_editor->setMarginsBackgroundColor(QColor(232,232,220)); + if ( settings->value ("editor/showLineNumbers",true).toBool () ) + { + QFont marginFont( settings->value ("editor/fontName","Courier").toString () , + settings->value ("editor/fontSize",10).toInt () ); + m_editor->setMarginsFont( marginFont ); + QFontMetrics metrics(marginFont); + m_editor->setMarginType (2, QsciScintilla::TextMargin); + m_editor->setMarginWidth(2, metrics.width("99999")); + m_editor->setMarginLineNumbers(2, true); + } + // code folding + m_editor->setMarginType (3, QsciScintilla::SymbolMargin); + m_editor->setFolding (QsciScintilla::BoxedTreeFoldStyle , 3); + // other features + if ( settings->value ("editor/highlightCurrentLine",true).toBool () ) + { + m_editor->setCaretLineVisible(true); + m_editor->setCaretLineBackgroundColor(QColor(245,245,245)); + } + m_editor->setBraceMatching (QsciScintilla::StrictBraceMatch); + m_editor->setAutoIndent (true); + m_editor->setIndentationWidth (2); + m_editor->setIndentationsUseTabs (false); + if ( settings->value ("editor/codeCompletion",true).toBool () ) + { + m_editor->autoCompleteFromAll (); + m_editor->setAutoCompletionSource(QsciScintilla::AcsAll); + m_editor->setAutoCompletionThreshold (1); + } + m_editor->setUtf8 (true); + m_longTitle = settings->value ("editor/longWindowTitle",true).toBool (); + + // The Actions + + // Theme icons with QStyle icons as fallback + QAction *newAction = new QAction ( + QIcon::fromTheme("document-new",style->standardIcon (QStyle::SP_FileIcon)), + tr("&New File"), m_toolBar); + QAction *openAction = new QAction ( + QIcon::fromTheme("document-open",style->standardIcon (QStyle::SP_DirOpenIcon)), + tr("&Open File"), m_toolBar); + QAction *saveAction = new QAction ( + QIcon::fromTheme("document-save",style->standardIcon (QStyle::SP_DriveHDIcon)), + tr("&Save File"), m_toolBar); + QAction *saveAsAction = new QAction ( + QIcon::fromTheme("document-save-as",style->standardIcon (QStyle::SP_DriveFDIcon)), + tr("Save File &As"), m_toolBar); + QAction *undoAction = new QAction ( + QIcon::fromTheme("edit-undo",style->standardIcon (QStyle::SP_ArrowLeft)), + tr("&Undo"), m_toolBar); + QAction *redoAction = new QAction ( + QIcon::fromTheme("edit-redo",style->standardIcon (QStyle::SP_ArrowRight)), + tr("&Redo"), m_toolBar); + m_copyAction = new QAction (QIcon::fromTheme("edit-copy"),tr("&Copy"),m_toolBar); + m_cutAction = new QAction (QIcon::fromTheme("edit-cut"),tr("Cu&t"),m_toolBar); + QAction *pasteAction = new QAction (QIcon::fromTheme("edit-paste"),tr("&Paste"),m_toolBar); + QAction *nextBookmarkAction = new QAction (tr("&Next Bookmark"),m_toolBar); + QAction *prevBookmarkAction = new QAction (tr("Pre&vious Bookmark"),m_toolBar); + QAction *toggleBookmarkAction = new QAction (tr("Toggle &Bookmark"),m_toolBar); + QAction *removeBookmarkAction = new QAction (tr("&Remove All Bookmarks"),m_toolBar); + QAction *commentSelectedAction = new QAction (tr("&Comment Selected Text"),m_toolBar); + QAction *uncommentSelectedAction = new QAction (tr("&Uncomment Selected Text"),m_toolBar); + QAction *runAction = new QAction ( + QIcon::fromTheme("media-play",style->standardIcon (QStyle::SP_MediaPlay)), + tr("&Run File"), m_toolBar); + + // some actions are disabled from the beginning + m_copyAction->setEnabled(false); + m_cutAction->setEnabled(false); + connect(m_editor,SIGNAL(copyAvailable(bool)),this,SLOT(handleCopyAvailable(bool))); + + // short cuts + newAction->setShortcut(QKeySequence::New); + openAction->setShortcut(QKeySequence::Open); + saveAction->setShortcut(QKeySequence::Save); + saveAsAction->setShortcut(QKeySequence::SaveAs); + undoAction->setShortcut(QKeySequence::Undo); + redoAction->setShortcut(QKeySequence::Redo); + m_copyAction->setShortcut(QKeySequence::Copy); + m_cutAction->setShortcut(QKeySequence::Cut); + pasteAction->setShortcut(QKeySequence::Paste); + runAction->setShortcut(Qt::Key_F5); + nextBookmarkAction->setShortcut(Qt::Key_F2); + prevBookmarkAction->setShortcut(Qt::SHIFT + Qt::Key_F2); + toggleBookmarkAction->setShortcut(Qt::Key_F7); + commentSelectedAction->setShortcut(Qt::CTRL + Qt::Key_R); + uncommentSelectedAction->setShortcut(Qt::CTRL + Qt::Key_T); + + // toolbar + m_toolBar->addAction (newAction); + m_toolBar->addAction (openAction); + m_toolBar->addAction (saveAction); + m_toolBar->addAction (saveAsAction); + m_toolBar->addSeparator(); + m_toolBar->addAction (undoAction); + m_toolBar->addAction (redoAction); + m_toolBar->addAction (m_copyAction); + m_toolBar->addAction (m_cutAction); + m_toolBar->addAction (pasteAction); + m_toolBar->addSeparator(); + m_toolBar->addAction (runAction); + + // menu bar + QMenu *fileMenu = new QMenu(tr("&File"),m_menuBar); + fileMenu->addAction(newAction); + fileMenu->addAction(openAction); + fileMenu->addAction(saveAction); + fileMenu->addAction(saveAsAction); + fileMenu->addSeparator(); + m_menuBar->addMenu(fileMenu); + QMenu *editMenu = new QMenu(tr("&Edit"),m_menuBar); + editMenu->addAction(undoAction); + editMenu->addAction(redoAction); + editMenu->addSeparator(); + editMenu->addAction(m_copyAction); + editMenu->addAction(m_cutAction); + editMenu->addAction(pasteAction); + editMenu->addSeparator(); + editMenu->addAction(commentSelectedAction); + editMenu->addAction(uncommentSelectedAction); + editMenu->addSeparator(); + editMenu->addAction(toggleBookmarkAction); + editMenu->addAction(nextBookmarkAction); + editMenu->addAction(prevBookmarkAction); + editMenu->addAction(removeBookmarkAction); + m_menuBar->addMenu(editMenu); + QMenu *runMenu = new QMenu(tr("&Run"),m_menuBar); + runMenu->addAction(runAction); + m_menuBar->addMenu(runMenu); + + + QVBoxLayout *layout = new QVBoxLayout (); + layout->addWidget (m_menuBar); + layout->addWidget (m_toolBar); + layout->addWidget (m_editor); + layout->addWidget (m_statusBar); + layout->setMargin (2); + setLayout (layout); + + connect (newAction, SIGNAL (triggered ()), this, SLOT (newFile ())); + connect (openAction, SIGNAL (triggered ()), this, SLOT (openFile ())); + connect (undoAction, SIGNAL (triggered ()), m_editor, SLOT (undo ())); + connect (redoAction, SIGNAL (triggered ()), m_editor, SLOT (redo ())); + connect (m_copyAction, SIGNAL (triggered ()), m_editor, SLOT (copy ())); + connect (m_cutAction, SIGNAL (triggered ()), m_editor, SLOT (cut ())); + connect (pasteAction, SIGNAL (triggered ()), m_editor, SLOT (paste ())); + connect (saveAction, SIGNAL (triggered ()), this, SLOT (saveFile ())); + connect (saveAsAction, SIGNAL (triggered ()), this, SLOT (saveFileAs ())); + connect (runAction, SIGNAL (triggered ()), this, SLOT (runFile ())); + connect (toggleBookmarkAction, SIGNAL (triggered ()), this, SLOT (toggleBookmark ())); + connect (nextBookmarkAction, SIGNAL (triggered ()), this, SLOT (nextBookmark ())); + connect (prevBookmarkAction, SIGNAL (triggered ()), this, SLOT (prevBookmark ())); + connect (removeBookmarkAction, SIGNAL (triggered ()), this, SLOT (removeBookmark ())); + connect (commentSelectedAction, SIGNAL (triggered ()), this, SLOT (commentSelectedText ())); + connect (uncommentSelectedAction, SIGNAL (triggered ()), this, SLOT (uncommentSelectedText ())); + + + // connect modified signal + connect (m_editor, SIGNAL (modificationChanged(bool)), this, SLOT (newWindowTitle(bool)) ); + + m_fileName = ""; + newWindowTitle (false); + setWindowIcon(QIcon::fromTheme("accessories-text-editor",style->standardIcon (QStyle::SP_FileIcon))); + show (); +} diff -r 97e3d1769be0 -r 7925a7d6547b gui/src/FileEditor.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/gui/src/FileEditor.h Sat May 19 03:15:00 2012 -0400 @@ -0,0 +1,99 @@ +/* OctaveGUI - A graphical user interface for Octave + * Copyright (C) 2011 Jacob Dawid (jacob.dawid@googlemail.com) + * + * 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. + * + * 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 this program. If not, see . + */ + +#ifndef FILEEDITORMDISUBWINDOW_H +#define FILEEDITORMDISUBWINDOW_H + +#include "MainWindow.h" + +#include +#include +#include +#include +#include +#include +#include +// Not available in the Debian repos yet! +// #include +#include "lexer/lexeroctavegui.h" + +const char UNNAMED_FILE[] = ""; +const char SAVE_FILE_FILTER[] = "Octave Files (*.m);;All Files (*.*)"; +enum MARKER + { + MARKER_BOOKMARK, + MARKER_BREAKPOINT + }; + +class FileEditor : public QWidget +{ +Q_OBJECT + +public: + FileEditor (QWidget * parent = 0); + ~FileEditor (); + void loadFile (QString fileName); + void initEditor (QTerminal *terminalView, + LexerOctaveGui *lexer, + MainWindow *mainWindow); + +public slots: + + void newFile (); + void openFile (); + void saveFile (); + void saveFile (QString fileName); + void saveFileAs (); + + void setModified (bool modified); + +protected: + void closeEvent(QCloseEvent *event); + +private: + int checkFileModified (QString msg, int cancelButton); + void construct (); + void doCommentSelectedText (bool comment); + QMenuBar *m_menuBar; + QToolBar *m_toolBar; + QsciScintilla *m_editor; + QStatusBar *m_statusBar; + QString m_fileName; + QString m_fileNameShort; + QTerminal* m_terminalView; + QAction* m_copyAction; + QAction* m_cutAction; + MainWindow* m_mainWindow; + int m_markerBookmark; + bool m_modified; + bool m_longTitle; + +private slots: + void newWindowTitle(bool modified); + void handleMarginClicked(int line, int margin, Qt::KeyboardModifiers state); + void handleCopyAvailable(bool enableCopy); + void runFile(); + void removeBookmark (); + void toggleBookmark (); + void nextBookmark(); + void prevBookmark(); + void commentSelectedText(); + void uncommentSelectedText(); + +}; + +#endif // FILEEDITORMDISUBWINDOW_H diff -r 97e3d1769be0 -r 7925a7d6547b gui/src/FilesDockWidget.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/gui/src/FilesDockWidget.cpp Sat May 19 03:15:00 2012 -0400 @@ -0,0 +1,198 @@ +/* OctaveGUI - A graphical user interface for Octave + * Copyright (C) 2011 Jacob Dawid (jacob.dawid@googlemail.com) + * + * 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. + * + * 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 this program. If not, see . + */ + +#include "ResourceManager.h" +#include "FilesDockWidget.h" + +#include +#include +#include +#include +#include +#include + +FilesDockWidget::FilesDockWidget (QWidget * parent):QDockWidget (parent) +{ + setObjectName ("FilesDockWidget"); + setWindowTitle (tr ("Current Directory")); + setWidget (new QWidget (this)); + + // Create a toolbar + m_navigationToolBar = new QToolBar ("", widget ()); + m_navigationToolBar->setAllowedAreas (Qt::TopToolBarArea); + m_navigationToolBar->setMovable (false); + m_navigationToolBar->setIconSize (QSize (20, 20)); + + // Add a button to the toolbar with the QT standard icon for up-directory + // TODO: Maybe change this to be an up-directory icon that is OS specific??? + QStyle *style = QApplication::style (); + m_directoryIcon = style->standardIcon (QStyle::SP_FileDialogToParent); + m_directoryUpAction = new QAction (m_directoryIcon, "", m_navigationToolBar); + m_directoryUpAction->setStatusTip (tr ("Move up one directory.")); + + m_currentDirectory = new QLineEdit (m_navigationToolBar); + m_currentDirectory->setStatusTip (tr ("Enter the path or filename.")); + + m_navigationToolBar->addAction (m_directoryUpAction); + m_navigationToolBar->addWidget (m_currentDirectory); + connect (m_directoryUpAction, SIGNAL (triggered ()), this, + SLOT (onUpDirectory ())); + + // TODO: Add other buttons for creating directories + + // Create the QFileSystemModel starting in the home directory + QString + homePath = QDir::homePath (); + // TODO: This should occur after Octave has been initialized and the startup directory of Octave is established + + m_fileSystemModel = new QFileSystemModel (this); + m_fileSystemModel->setFilter (QDir::NoDotAndDotDot | QDir::AllEntries); + QModelIndex + rootPathIndex = m_fileSystemModel->setRootPath (homePath); + + // Attach the model to the QTreeView and set the root index + m_fileTreeView = new QTreeView (widget ()); + m_fileTreeView->setModel (m_fileSystemModel); + m_fileTreeView->setRootIndex (rootPathIndex); + m_fileTreeView->setSortingEnabled (true); + m_fileTreeView->setAlternatingRowColors (true); + m_fileTreeView->setAnimated (true); + m_fileTreeView->setColumnHidden (1, true); + m_fileTreeView->setColumnHidden (2, true); + m_fileTreeView->setColumnHidden (3, true); + m_fileTreeView->setStatusTip (tr ("Doubleclick a file to open it.")); + + setCurrentDirectory (m_fileSystemModel->fileInfo (rootPathIndex). + absoluteFilePath ()); + + connect (m_fileTreeView, SIGNAL (doubleClicked (const QModelIndex &)), this, + SLOT (itemDoubleClicked (const QModelIndex &))); + + // Layout the widgets vertically with the toolbar on top + QVBoxLayout * + layout = new QVBoxLayout (); + layout->setSpacing (0); + layout->addWidget (m_navigationToolBar); + layout->addWidget (m_fileTreeView); + layout->setMargin (1); + widget ()->setLayout (layout); + // TODO: Add right-click contextual menus for copying, pasting, deleting files (and others) + + connect (m_currentDirectory, SIGNAL (returnPressed ()), this, + SLOT (currentDirectoryEntered ())); + QCompleter * + completer = new QCompleter (m_fileSystemModel, this); + m_currentDirectory->setCompleter (completer); + + connect (this, SIGNAL (visibilityChanged(bool)), this, SLOT(handleVisibilityChanged(bool))); +} + +void +FilesDockWidget::itemDoubleClicked (const QModelIndex & index) +{ + // Retrieve the file info associated with the model index. + QFileInfo fileInfo = m_fileSystemModel->fileInfo (index); + + // If it is a directory, cd into it. + if (fileInfo.isDir ()) + { + m_fileSystemModel->setRootPath (fileInfo.absolutePath ()); + m_fileTreeView->setRootIndex (index); + setCurrentDirectory (m_fileSystemModel->fileInfo (index). + absoluteFilePath ()); + } + // Otherwise attempt to open it. + else + { + // Check if the user wants to use a custom file editor. + QSettings *settings = ResourceManager::instance ()->settings (); + if (settings->value ("useCustomFileEditor").toBool ()) + { + QString editor = settings->value ("customFileEditor").toString (); + QStringList arguments; + arguments << fileInfo.filePath (); + QProcess::startDetached (editor, arguments); + } + else + { + emit openFile (fileInfo.filePath ()); + } + } +} + +void +FilesDockWidget::setCurrentDirectory (QString currentDirectory) +{ + m_currentDirectory->setText (currentDirectory); +} + +void +FilesDockWidget::onUpDirectory (void) +{ + QDir dir = + QDir (m_fileSystemModel->filePath (m_fileTreeView->rootIndex ())); + dir.cdUp (); + m_fileSystemModel->setRootPath (dir.absolutePath ()); + m_fileTreeView->setRootIndex (m_fileSystemModel-> + index (dir.absolutePath ())); + setCurrentDirectory (dir.absolutePath ()); +} + +void +FilesDockWidget::currentDirectoryEntered () +{ + QFileInfo fileInfo (m_currentDirectory->text ()); + if (fileInfo.isDir ()) + { + m_fileTreeView->setRootIndex (m_fileSystemModel-> + index (fileInfo.absolutePath ())); + m_fileSystemModel->setRootPath (fileInfo.absolutePath ()); + setCurrentDirectory (fileInfo.absoluteFilePath ()); + } + else + { + if (QFile::exists (fileInfo.absoluteFilePath ())) + emit openFile (fileInfo.absoluteFilePath ()); + } +} + +void +FilesDockWidget::noticeSettings () +{ + QSettings *settings = ResourceManager::instance ()->settings (); + m_fileTreeView->setColumnHidden (0, !settings->value ("showFilenames").toBool ()); + m_fileTreeView->setColumnHidden (1, !settings->value ("showFileSize").toBool ()); + m_fileTreeView->setColumnHidden (2, !settings->value ("showFileType").toBool ()); + m_fileTreeView->setColumnHidden (3, !settings->value ("showLastModified").toBool ()); + m_fileTreeView->setAlternatingRowColors (settings->value ("useAlternatingRowColors").toBool ()); + //if (settings.value ("showHiddenFiles").toBool ()) + // TODO: React on option for hidden files. +} + +void +FilesDockWidget::handleVisibilityChanged (bool visible) +{ + if (visible) + emit activeChanged (true); +} + +void +FilesDockWidget::closeEvent (QCloseEvent *event) +{ + emit activeChanged (false); + QDockWidget::closeEvent (event); +} diff -r 97e3d1769be0 -r 7925a7d6547b gui/src/FilesDockWidget.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/gui/src/FilesDockWidget.h Sat May 19 03:15:00 2012 -0400 @@ -0,0 +1,85 @@ +/* OctaveGUI - A graphical user interface for Octave + * Copyright (C) 2011 Jacob Dawid (jacob.dawid@googlemail.com) + * + * 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. + * + * 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 this program. If not, see . + */ + +#ifndef FILESDOCKWIDGET_H +#define FILESDOCKWIDGET_H + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include +#include + +class FilesDockWidget:public QDockWidget +{ + Q_OBJECT +public: + FilesDockWidget (QWidget * parent = 0); + +public slots: + /** Slot for handling a change in directory via double click. */ + void itemDoubleClicked (const QModelIndex & index); + + /** Slot for handling the up-directory button in the toolbar. */ + void onUpDirectory (); + + void setCurrentDirectory (QString currentDirectory); + + void currentDirectoryEntered (); + + /** Tells the widget to notice settings that are probably new. */ + void noticeSettings (); + void handleVisibilityChanged (bool visible); + +signals: + void openFile (QString fileName); + + /** Custom signal that tells if a user has clicke away that dock widget. */ + void activeChanged (bool active); + +protected: + void closeEvent (QCloseEvent *event); + +private: + // TODO: Add toolbar with buttons for navigating the path, creating dirs, etc + + /** Toolbar for file and directory manipulation. */ + QToolBar * m_navigationToolBar; + + /** Variables for the up-directory action. */ + QIcon m_directoryIcon; + QAction *m_directoryUpAction; + QToolButton *upDirectoryButton; + + /** The file system model. */ + QFileSystemModel *m_fileSystemModel; + + /** The file system view. */ + QTreeView *m_fileTreeView; + QLineEdit *m_currentDirectory; +}; + +#endif // FILESDOCKWIDGET_H diff -r 97e3d1769be0 -r 7925a7d6547b gui/src/HistoryDockWidget.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/gui/src/HistoryDockWidget.cpp Sat May 19 03:15:00 2012 -0400 @@ -0,0 +1,72 @@ +/* OctaveGUI - A graphical user interface for Octave + * Copyright (C) 2011 Jacob Dawid (jacob.dawid@googlemail.com) + * + * 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. + * + * 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 this program. If not, see . + */ + +#include "HistoryDockWidget.h" +#include + +HistoryDockWidget::HistoryDockWidget (QWidget * parent):QDockWidget (parent) +{ + setObjectName ("HistoryDockWidget"); + construct (); +} + +void +HistoryDockWidget::construct () +{ + m_sortFilterProxyModel.setSourceModel(OctaveLink::instance ()->historyModel()); + m_historyListView = new QListView (this); + m_historyListView->setModel (&m_sortFilterProxyModel); + m_historyListView->setAlternatingRowColors (true); + m_historyListView->setEditTriggers (QAbstractItemView::NoEditTriggers); + m_historyListView->setStatusTip (tr ("Doubleclick a command to transfer it to the terminal.")); + m_filterLineEdit = new QLineEdit (this); + m_filterLineEdit->setStatusTip (tr ("Enter text to filter the command history.")); + QVBoxLayout *layout = new QVBoxLayout (); + + setWindowTitle (tr ("Command History")); + setWidget (new QWidget ()); + + layout->addWidget (m_historyListView); + layout->addWidget (m_filterLineEdit); + layout->setMargin (2); + + widget ()->setLayout (layout); + + connect (m_filterLineEdit, SIGNAL (textEdited (QString)), &m_sortFilterProxyModel, SLOT (setFilterWildcard(QString))); + connect (m_historyListView, SIGNAL (doubleClicked (QModelIndex)), this, SLOT (handleDoubleClick (QModelIndex))); + connect (this, SIGNAL (visibilityChanged(bool)), this, SLOT(handleVisibilityChanged(bool))); +} + +void +HistoryDockWidget::handleDoubleClick (QModelIndex modelIndex) +{ + emit commandDoubleClicked (modelIndex.data().toString()); +} + +void +HistoryDockWidget::handleVisibilityChanged (bool visible) +{ + if (visible) + emit activeChanged (true); +} + +void +HistoryDockWidget::closeEvent (QCloseEvent *event) +{ + emit activeChanged (false); + QDockWidget::closeEvent (event); +} diff -r 97e3d1769be0 -r 7925a7d6547b gui/src/HistoryDockWidget.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/gui/src/HistoryDockWidget.h Sat May 19 03:15:00 2012 -0400 @@ -0,0 +1,54 @@ +/* OctaveGUI - A graphical user interface for Octave + * Copyright (C) 2011 Jacob Dawid (jacob.dawid@googlemail.com) + * + * 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. + * + * 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 this program. If not, see . + */ + +#ifndef HISTORYDOCKWIDGET_H +#define HISTORYDOCKWIDGET_H + +#include +#include +#include +#include +#include "OctaveLink.h" + +class HistoryDockWidget:public QDockWidget +{ +Q_OBJECT +public: + HistoryDockWidget (QWidget *parent = 0); + void updateHistory (QStringList history); + +public slots: + void handleVisibilityChanged (bool visible); + +signals: + void information (QString message); + void commandDoubleClicked (QString command); + /** Custom signal that tells if a user has clicked away that dock widget. */ + void activeChanged (bool active); +protected: + void closeEvent (QCloseEvent *event); +private slots: + void handleDoubleClick (QModelIndex modelIndex); + +private: + void construct (); + QListView *m_historyListView; + QLineEdit *m_filterLineEdit; + QSortFilterProxyModel m_sortFilterProxyModel; +}; + +#endif // HISTORYDOCKWIDGET_H diff -r 97e3d1769be0 -r 7925a7d6547b gui/src/MainWindow.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/gui/src/MainWindow.cpp Sat May 19 03:15:00 2012 -0400 @@ -0,0 +1,322 @@ +/* OctaveGUI - A graphical user interface for Octave + * Copyright (C) 2011 Jacob Dawid (jacob.dawid@googlemail.com) + * + * 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. + * + * 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 this program. If not, see . + */ + +#include +#include +#include +#include +#include +#include +#include +#include "MainWindow.h" +#include "FileEditor.h" +#include "SettingsDialog.h" + +MainWindow::MainWindow (QWidget * parent):QMainWindow (parent) +{ + // We have to set up all our windows, before we finally launch octave. + construct (); + OctaveLink::instance ()->launchOctave(); +} + +MainWindow::~MainWindow () +{ +} + +void +MainWindow::openExistingFile (QString fileName) +{ + reportStatusMessage (tr ("Opening file..")); + newEditorWindow(fileName); +} + +void +MainWindow::newFile () +{ + newEditorWindow(QString()); +} + +void +MainWindow::newEditorWindow (QString fileName) +{ + FileEditor *fileEditor = new FileEditor (); + fileEditor->setAttribute (Qt::WA_DeleteOnClose); + fileEditor->initEditor(m_terminalView, m_lexer, this); // init necessary informations for editor + + if (fileName.isEmpty ()) + fileEditor->newFile (); + else + fileEditor->loadFile (fileName); +} + + +void +MainWindow::reportStatusMessage (QString statusMessage) +{ + m_statusBar->showMessage (statusMessage, 1000); +} + +void +MainWindow::handleSaveWorkspaceRequest () +{ + QString selectedFile = + QFileDialog::getSaveFileName (this, tr ("Save Workspace"), + ResourceManager::instance ()->homePath ()); + m_terminalView->sendText (QString ("save \'%1\'\n").arg (selectedFile)); + m_terminalView->setFocus (); +} + +void +MainWindow::handleLoadWorkspaceRequest () +{ + QString selectedFile = + QFileDialog::getOpenFileName (this, tr ("Load Workspace"), + ResourceManager::instance ()->homePath ()); + m_terminalView->sendText (QString ("load \'%1\'\n").arg (selectedFile)); + m_terminalView->setFocus (); +} + +void +MainWindow::handleClearWorkspaceRequest () +{ + m_terminalView->sendText ("clear\n"); + m_terminalView->setFocus (); +} + +void +MainWindow::handleCommandDoubleClicked (QString command) +{ + m_terminalView->sendText(command); + m_terminalView->setFocus (); +} + +void +MainWindow::openBugTrackerPage () +{ + QDesktopServices::openUrl (QUrl ("http://savannah.gnu.org/bugs/?group=octave")); +} + +void +MainWindow::openAgoraPage () +{ + QDesktopServices::openUrl (QUrl ("http://agora.panocha.org.mx/")); +} + +void +MainWindow::openOctaveForgePage () +{ + QDesktopServices::openUrl (QUrl ("http://octave.sourceforge.net/")); +} + +void +MainWindow::processSettingsDialogRequest () +{ + SettingsDialog *settingsDialog = new SettingsDialog (this); + settingsDialog->exec (); + delete settingsDialog; + emit settingsChanged (); + ResourceManager::instance ()->updateNetworkSettings (); + updateTerminalFont(); +} + +void +MainWindow::updateTerminalFont () +{ + QSettings *settings = ResourceManager::instance ()->settings (); + QFont font = QFont(); + //font.setStyleHint(QFont::TypeWriter); + font.setFamily(settings->value("terminal/fontName").toString()); + font.setPointSize(settings->value("terminal/fontSize").toInt ()); + m_terminalView->setTerminalFont(font); +} + +void +MainWindow::showAboutOctave () +{ + QString message = + "GNU Octave\n" + "Copyright (C) 2009 John W. Eaton and others.\n" + "This is free software; see the source code for copying conditions." + "There is ABSOLUTELY NO WARRANTY; not even for MERCHANTABILITY or" + "FITNESS FOR A PARTICULAR PURPOSE. For details, type `warranty'.\n" + "\n" + "Octave was configured for \"x86_64-pc-linux-gnu\".\n" + "\n" + "Additional information about Octave is available at http://www.octave.org.\n" + "\n" + "Please contribute if you find this software useful." + "For more information, visit http://www.octave.org/help-wanted.html\n" + "\n" + "Report bugs to (but first, please read" + "http://www.octave.org/bugs.html to learn how to write a helpful report).\n" + "\n" + "For information about changes from previous versions, type `news'.\n"; + + QMessageBox::about (this, tr ("About Octave"), message); +} + +void +MainWindow::closeEvent (QCloseEvent * closeEvent) +{ + reportStatusMessage (tr ("Saving data and shutting down.")); + writeSettings (); + m_closing = true; // inform editor window that whole application is closed + OctaveLink::instance ()->terminateOctave(); + + QMainWindow::closeEvent (closeEvent); +} + +void +MainWindow::readSettings () +{ + QSettings *settings = ResourceManager::instance ()->settings (); + restoreGeometry (settings->value ("MainWindow/geometry").toByteArray ()); + restoreState (settings->value ("MainWindow/windowState").toByteArray ()); + emit settingsChanged (); +} + +void +MainWindow::writeSettings () +{ + QSettings *settings = ResourceManager::instance ()->settings (); + settings->setValue ("MainWindow/geometry", saveGeometry ()); + settings->setValue ("MainWindow/windowState", saveState ()); +} + +void +MainWindow::construct () +{ + // TODO: Check this. + m_closing = false; // flag for editor files when closed + setWindowIcon (ResourceManager::instance ()->icon (ResourceManager::Octave)); + + // Setup dockable widgets and the status bar. + m_workspaceView = new WorkspaceView (this); + m_workspaceView->setStatusTip (tr ("View the variables in the active workspace.")); + m_historyDockWidget = new HistoryDockWidget (this); + m_historyDockWidget->setStatusTip (tr ("Browse and search the command history.")); + m_filesDockWidget = new FilesDockWidget (this); + m_filesDockWidget->setStatusTip (tr ("Browse your files.")); + m_statusBar = new QStatusBar (this); + + // Octave Terminal subwindow. + m_terminalView = new QTerminal(this); + setCentralWidget (m_terminalView); + + m_lexer = NULL; // initialise the empty lexer for the edtiors + + QMenu *controlMenu = menuBar ()->addMenu (tr ("Octave")); + QAction *settingsAction = controlMenu->addAction (tr ("Settings")); + controlMenu->addSeparator (); + QAction *exitAction = controlMenu->addAction (tr ("Exit")); + + QMenu *interfaceMenu = menuBar ()->addMenu (tr ("Interface")); + + QAction *showWorkspaceAction = interfaceMenu->addAction (tr ("Workspace")); + showWorkspaceAction->setCheckable (true); + + QAction *showHistoryAction = interfaceMenu->addAction (tr ("History")); + showHistoryAction->setCheckable (true); + + QAction *showFileBrowserAction = interfaceMenu->addAction (tr ("File Browser")); + showFileBrowserAction->setCheckable (true); + + interfaceMenu->addSeparator (); + QAction *openEditorAction = interfaceMenu->addAction (tr ("Open New Editor Window")); + + QMenu *workspaceMenu = menuBar ()->addMenu (tr ("Workspace")); + QAction *loadWorkspaceAction = workspaceMenu->addAction (tr ("Load")); + QAction *saveWorkspaceAction = workspaceMenu->addAction (tr ("Save")); + workspaceMenu->addSeparator (); + QAction *clearWorkspaceAction = workspaceMenu->addAction (tr ("Clear")); + + QMenu *communityMenu = menuBar ()->addMenu (tr ("Community")); + QAction *reportBugAction = communityMenu->addAction (tr ("Report Bug")); + QAction *agoraAction = communityMenu->addAction (tr ("Agora")); + QAction *octaveForgeAction = communityMenu->addAction (tr ("Octave Forge")); + communityMenu->addSeparator (); + QAction *aboutOctaveAction = communityMenu->addAction (tr ("About Octave")); + + connect (settingsAction, SIGNAL (triggered ()), this, SLOT (processSettingsDialogRequest ())); + connect (exitAction, SIGNAL (triggered ()), this, SLOT (close ())); + connect (openEditorAction, SIGNAL (triggered ()), this, SLOT (newFile ())); + connect (reportBugAction, SIGNAL (triggered ()), this, SLOT (openBugTrackerPage ())); + connect (agoraAction, SIGNAL (triggered ()), this, SLOT (openAgoraPage ())); + connect (octaveForgeAction, SIGNAL (triggered ()), this, SLOT (openOctaveForgePage ())); + connect (aboutOctaveAction, SIGNAL (triggered ()), this, SLOT (showAboutOctave ())); + + connect (showWorkspaceAction, SIGNAL (toggled (bool)), m_workspaceView, SLOT (setShown (bool))); + connect (m_workspaceView, SIGNAL (activeChanged (bool)), showWorkspaceAction, SLOT (setChecked (bool))); + connect (showHistoryAction, SIGNAL (toggled (bool)), m_historyDockWidget, SLOT (setShown (bool))); + connect (m_historyDockWidget, SIGNAL (activeChanged (bool)), showHistoryAction, SLOT (setChecked (bool))); + connect (showFileBrowserAction, SIGNAL (toggled (bool)), m_filesDockWidget, SLOT (setShown (bool))); + connect (m_filesDockWidget, SIGNAL (activeChanged (bool)), showFileBrowserAction, SLOT (setChecked (bool))); + + //connect (this, SIGNAL (settingsChanged ()), m_workspaceView, SLOT (noticeSettings ())); + //connect (this, SIGNAL (settingsChanged ()), m_historyDockWidget, SLOT (noticeSettings ())); + connect (this, SIGNAL (settingsChanged ()), m_filesDockWidget, SLOT (noticeSettings ())); + + connect (m_filesDockWidget, SIGNAL (openFile (QString)), this, SLOT (openExistingFile (QString))); + connect (m_historyDockWidget, SIGNAL (information (QString)), this, SLOT (reportStatusMessage (QString))); + connect (m_historyDockWidget, SIGNAL (commandDoubleClicked (QString)), this, SLOT (handleCommandDoubleClicked (QString))); + connect (saveWorkspaceAction, SIGNAL (triggered ()), this, SLOT (handleSaveWorkspaceRequest ())); + connect (loadWorkspaceAction, SIGNAL (triggered ()), this, SLOT (handleLoadWorkspaceRequest ())); + connect (clearWorkspaceAction, SIGNAL (triggered ()), this, SLOT (handleClearWorkspaceRequest ())); + + setWindowTitle ("Octave"); + + addDockWidget (Qt::LeftDockWidgetArea, m_workspaceView); + addDockWidget (Qt::LeftDockWidgetArea, m_historyDockWidget); + addDockWidget (Qt::RightDockWidgetArea, m_filesDockWidget); + setStatusBar (m_statusBar); + + // this has to be done only once, not for each editor + m_lexer = new LexerOctaveGui (); + + // Editor font (default or from settings) + QSettings *settings = ResourceManager::instance ()->settings (); + m_lexer->setDefaultFont (QFont ( + settings->value ("editor/fontName","Courier").toString (), + settings->value ("editor/fontSize",10).toInt ())); + + // TODO: Autoindent not working as it should + m_lexer->setAutoIndentStyle (QsciScintilla::AiMaintain || + QsciScintilla::AiOpening || + QsciScintilla::AiClosing); + + // The API info that is used for auto completion + // TODO: Where to store a file with API info (raw or prepared?)? + // TODO: Also provide infos on octave-forge functions? + // TODO: Also provide infos on function parameters? + // By now, use the keywords-list from syntax highlighting + m_lexerAPI = new QsciAPIs (m_lexer); + + QString keyword; + QStringList keywordList; + keyword = m_lexer->keywords (1); // get whole string with all keywords + keywordList = keyword.split (QRegExp ("\\s+")); // split into single strings + int i; + for (i=0; iadd (keywordList.at (i)); // add single strings to the API + } + m_lexerAPI->prepare (); // prepare API info ... this make take some time + + readSettings (); + updateTerminalFont(); +} + diff -r 97e3d1769be0 -r 7925a7d6547b gui/src/MainWindow.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/gui/src/MainWindow.h Sat May 19 03:15:00 2012 -0400 @@ -0,0 +1,121 @@ +/* OctaveGUI - A graphical user interface for Octave + * Copyright (C) 2011 Jacob Dawid (jacob.dawid@googlemail.com) + * + * 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. + * + * 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 this program. If not, see . + */ + +#ifndef MAINWINDOW_H +#define MAINWINDOW_H + +// Qt includes +#include +#include +#include +#include +#include +#include +#include +#include +#include + +// QScintilla includes +#include +#include "lexer/lexeroctavegui.h" + +// QTerminal includes +#include "QTerminal.h" + +// Own includes +#include "ResourceManager.h" +#include "OctaveLink.h" +#include "WorkspaceView.h" +#include "HistoryDockWidget.h" +#include "FilesDockWidget.h" + +/** + * \class MainWindow + * + * Represents the main window. + */ +class MainWindow:public QMainWindow +{ +Q_OBJECT public: + MainWindow (QWidget * parent = 0); + ~MainWindow (); + + QTerminal *terminalView () + { + return m_terminalView; + } + + HistoryDockWidget *historyDockWidget () + { + return m_historyDockWidget; + } + FilesDockWidget *filesDockWidget () + { + return m_filesDockWidget; + } + bool closing () + { + return m_closing; + } + +signals: + void settingsChanged (); + +public slots: + void openExistingFile (QString fileName); + void reportStatusMessage (QString statusMessage); + void handleSaveWorkspaceRequest (); + void handleLoadWorkspaceRequest (); + void handleClearWorkspaceRequest (); + void handleCommandDoubleClicked (QString command); + void newFile (); + void newEditorWindow (QString fileName); + void openBugTrackerPage (); + void openAgoraPage (); + void openOctaveForgePage (); + void processSettingsDialogRequest (); + void showAboutOctave (); + void updateTerminalFont (); + +protected: + void closeEvent (QCloseEvent * closeEvent); + void readSettings (); + void writeSettings (); + +private: + void construct (); + void establishOctaveLink (); + + QTerminal *m_terminalView; + + // Dock widgets. + WorkspaceView *m_workspaceView; + HistoryDockWidget *m_historyDockWidget; + FilesDockWidget *m_filesDockWidget; + + // Editor's lexer + LexerOctaveGui *m_lexer; + QsciAPIs *m_lexerAPI; + + // Toolbars. + QStatusBar *m_statusBar; + + // Flag for closing whole application + bool m_closing; +}; + +#endif // MAINWINDOW_H diff -r 97e3d1769be0 -r 7925a7d6547b gui/src/OctaveGUI.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/gui/src/OctaveGUI.cpp Sat May 19 03:15:00 2012 -0400 @@ -0,0 +1,95 @@ +/* OctaveGUI - A graphical user interface for Octave + * Copyright (C) 2011 Jacob Dawid (jacob.dawid@googlemail.com) + * + * 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. + * + * 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 this program. If not, see . + */ + +#include +#include +#include +#include "CommandLineParser.h" +#include "WelcomeWizard.h" +#include "ResourceManager.h" +#include "MainWindow.h" + +int +main (int argc, char *argv[]) +{ + QApplication application (argc, argv); + while (true) + { + if (ResourceManager::instance ()->isFirstRun ()) + { + WelcomeWizard welcomeWizard; + int returnCode = welcomeWizard.exec (); + + QSettings *settings = ResourceManager::instance ()->settings (); + settings->setValue ("connectOnStartup", true); + settings->setValue ("showMessageOfTheDay", true); + settings->setValue ("showTopic", true); + settings->setValue ("autoIdentification", false); + settings->setValue ("nickServPassword", ""); + settings->setValue ("useCustomFileEditor", false); + settings->setValue ("customFileEditor", "emacs"); + settings->setValue ("editor/showLineNumbers", true); + settings->setValue ("editor/highlightCurrentLine", true); + settings->setValue ("editor/codeCompletion", true); + settings->setValue ("editor/fontName", "Monospace"); + settings->setValue ("editor/fontSize", 10); + settings->setValue ("editor/shortWindowTitle", true); + settings->setValue ("showFilenames", true); + settings->setValue ("showFileSize", false); + settings->setValue ("showFileType", false); + settings->setValue ("showLastModified", false); + settings->setValue ("showHiddenFiles", false); + settings->setValue ("useAlternatingRowColors", true); + settings->setValue ("useProxyServer", false); + settings->setValue ("proxyType", "Sock5Proxy"); + settings->setValue ("proxyHostName", "none"); + settings->setValue ("proxyPort", 8080); + settings->setValue ("proxyUserName", ""); + settings->setValue ("proxyPassword", ""); + settings->sync (); + ResourceManager::instance ()->reloadSettings (); + + application.quit (); + // We are in an infinite loop, so everything else than a return + // will cause the application to restart from the very beginning. + if (returnCode == QDialog::Rejected) + return 0; + } + else + { + CommandLineParser commandLineParser; + commandLineParser.registerOption ("--config", "-c", "Tells OctaveGUI to use that configuration file.", true); + commandLineParser.parse (argc, argv); + + QSettings *settings = ResourceManager::instance ()->settings (); + QString language = settings->value ("language").toString (); + + QString translatorFile = ResourceManager::instance ()->findTranslatorFile (language); + QTranslator translator; + translator.load (translatorFile); + application.installTranslator (&translator); + + ResourceManager::instance ()->updateNetworkSettings (); + ResourceManager::instance ()->loadIcons (); + + MainWindow w; + w.show (); + w.activateWindow(); + return application.exec (); + } + } +} diff -r 97e3d1769be0 -r 7925a7d6547b gui/src/ResourceManager.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/gui/src/ResourceManager.cpp Sat May 19 03:15:00 2012 -0400 @@ -0,0 +1,1687 @@ +/* OctaveGUI - A graphical user interface for Octave + * Copyright (C) 2011 Jacob Dawid (jacob.dawid@googlemail.com) + * + * 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. + * + * 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 this program. If not, see . + */ + +#include "ResourceManager.h" +#include +#include + +ResourceManager ResourceManager::m_singleton; + +ResourceManager::ResourceManager () +{ + m_settings = 0; + reloadSettings (); +} + +ResourceManager::~ResourceManager () +{ + delete m_settings; +} + +QSettings * +ResourceManager::settings () +{ + return m_settings; +} + +QString +ResourceManager::homePath () +{ + return m_homePath; +} + +void +ResourceManager::reloadSettings () +{ + QDesktopServices desktopServices; + m_homePath = desktopServices.storageLocation (QDesktopServices::HomeLocation); + setSettings(m_homePath + "/.config/octave-gui/settings"); +} + +void +ResourceManager::setSettings (QString file) +{ + delete m_settings; + + m_firstRun = false; + if (!QFile::exists (file)) + m_firstRun = true; + + // If the settings file does not exist, QSettings automatically creates it. + // Therefore we have to check if it exists before instantiating the settings object. + // That way we can detect if the user ran this application before. + m_settings = new QSettings (file, QSettings::IniFormat); +} + +QString +ResourceManager::findTranslatorFile (QString language) +{ + // TODO: Quick hack to be able to test language files. + return QString("../languages/%1.qm").arg(language); +} + +QIcon +ResourceManager::icon (Icon icon) +{ + if (m_icons.contains (icon)) + { + return m_icons [icon]; + } + return QIcon (); +} + +bool +ResourceManager::isFirstRun () +{ + return m_firstRun; +} + +void +ResourceManager::updateNetworkSettings () +{ + QNetworkProxy::ProxyType proxyType = QNetworkProxy::NoProxy; + if (m_settings->value ("useProxyServer").toBool ()) + { + QString proxyTypeString = m_settings->value ("proxyType").toString (); + if (proxyTypeString == "Socks5Proxy") + { + proxyType = QNetworkProxy::Socks5Proxy; + } + else if (proxyTypeString == "HttpProxy") + { + proxyType = QNetworkProxy::HttpProxy; + } + } + + QNetworkProxy proxy; + proxy.setType (proxyType); + proxy.setHostName (m_settings->value ("proxyHostName").toString ()); + proxy.setPort (m_settings->value ("proxyPort").toInt ()); + proxy.setUser (m_settings->value ("proxyUserName").toString ()); + proxy.setPassword (m_settings->value ("proxyPassword").toString ()); + QNetworkProxy::setApplicationProxy (proxy); +} + +void +ResourceManager::loadIcons () +{ + m_icons [ResourceManager::Octave] = QIcon ("../media/logo.png"); + m_icons [ResourceManager::Terminal] = QIcon ("../media/terminal.png"); + m_icons [ResourceManager::Documentation] = QIcon ("../media/help_index.png"); + m_icons [ResourceManager::Chat] = QIcon ("../media/chat.png"); + m_icons [ResourceManager::ChatNewMessage] = QIcon ("../media/jabber_protocol.png"); +} + +const char* +ResourceManager::octaveKeywords () +{ + return + ".nargin. " + "EDITOR " + "EXEC_PATH " + "F_DUPFD " + "F_GETFD " + "F_GETFL " + "F_SETFD " + "F_SETFL " + "I " + "IMAGE_PATH " + "Inf " + "J " + "NA " + "NaN " + "OCTAVE_HOME " + "OCTAVE_VERSION " + "O_APPEND " + "O_ASYNC " + "O_CREAT " + "O_EXCL " + "O_NONBLOCK " + "O_RDONLY " + "O_RDWR " + "O_SYNC " + "O_TRUNC " + "O_WRONLY " + "PAGER " + "PAGER_FLAGS " + "PS1 " + "PS2 " + "PS4 " + "P_tmpdir " + "SEEK_CUR " + "SEEK_END " + "SEEK_SET " + "SIG " + "S_ISBLK " + "S_ISCHR " + "S_ISDIR " + "S_ISFIFO " + "S_ISLNK " + "S_ISREG " + "S_ISSOCK " + "WCONTINUE " + "WCOREDUMP " + "WEXITSTATUS " + "WIFCONTINUED " + "WIFEXITED " + "WIFSIGNALED " + "WIFSTOPPED " + "WNOHANG " + "WSTOPSIG " + "WTERMSIG " + "WUNTRACED " + "__accumarray_max__ " + "__accumarray_min__ " + "__accumarray_sum__ " + "__accumdim_sum__ " + "__all_opts__ " + "__builtins__ " + "__calc_dimensions__ " + "__contourc__ " + "__current_scope__ " + "__delaunayn__ " + "__dispatch__ " + "__display_tokens__ " + "__dsearchn__ " + "__dump_symtab_info__ " + "__end__ " + "__error_text__ " + "__finish__ " + "__fltk_ginput__ " + "__fltk_print__ " + "__fltk_uigetfile__ " + "__ftp__ " + "__ftp_ascii__ " + "__ftp_binary__ " + "__ftp_close__ " + "__ftp_cwd__ " + "__ftp_delete__ " + "__ftp_dir__ " + "__ftp_mget__ " + "__ftp_mkdir__ " + "__ftp_mode__ " + "__ftp_mput__ " + "__ftp_pwd__ " + "__ftp_rename__ " + "__ftp_rmdir__ " + "__get__ " + "__glpk__ " + "__gnuplot_drawnow__ " + "__gnuplot_get_var__ " + "__gnuplot_ginput__ " + "__gnuplot_has_feature__ " + "__gnuplot_open_stream__ " + "__gnuplot_print__ " + "__gnuplot_version__ " + "__go_axes__ " + "__go_axes_init__ " + "__go_close_all__ " + "__go_delete__ " + "__go_draw_axes__ " + "__go_draw_figure__ " + "__go_execute_callback__ " + "__go_figure__ " + "__go_figure_handles__ " + "__go_handles__ " + "__go_hggroup__ " + "__go_image__ " + "__go_line__ " + "__go_patch__ " + "__go_surface__ " + "__go_text__ " + "__go_uimenu__ " + "__gud_mode__ " + "__image_pixel_size__ " + "__init_fltk__ " + "__isa_parent__ " + "__keywords__ " + "__lexer_debug_flag__ " + "__lin_interpn__ " + "__list_functions__ " + "__magick_finfo__ " + "__magick_format_list__ " + "__magick_read__ " + "__magick_write__ " + "__makeinfo__ " + "__marching_cube__ " + "__next_line_color__ " + "__next_line_style__ " + "__operators__ " + "__parent_classes__ " + "__parser_debug_flag__ " + "__pathorig__ " + "__pchip_deriv__ " + "__plt_get_axis_arg__ " + "__print_parse_opts__ " + "__qp__ " + "__request_drawnow__ " + "__sort_rows_idx__ " + "__strip_html_tags__ " + "__token_count__ " + "__varval__ " + "__version_info__ " + "__voronoi__ " + "__which__ " + "abs " + "accumarray " + "accumdim " + "acos " + "acosd " + "acosh " + "acot " + "acotd " + "acoth " + "acsc " + "acscd " + "acsch " + "add_input_event_hook " + "addlistener " + "addpath " + "addproperty " + "addtodate " + "airy " + "all " + "allchild " + "allow_noninteger_range_as_index " + "amd " + "ancestor " + "and " + "angle " + "anova " + "ans " + "any " + "arch_fit " + "arch_rnd " + "arch_test " + "area " + "arg " + "argnames " + "argv " + "arma_rnd " + "arrayfun " + "asctime " + "asec " + "asecd " + "asech " + "asin " + "asind " + "asinh " + "assert " + "assignin " + "atan " + "atan2 " + "atand " + "atanh " + "atexit " + "autocor " + "autocov " + "autoload " + "autoreg_matrix " + "autumn " + "available_graphics_toolkits " + "axes " + "axis " + "balance " + "bar " + "barh " + "bartlett " + "bartlett_test " + "base2dec " + "beep " + "beep_on_error " + "bessel " + "besselh " + "besseli " + "besselj " + "besselk " + "bessely " + "beta " + "betacdf " + "betai " + "betainc " + "betainv " + "betaln " + "betapdf " + "betarnd " + "bicgstab " + "bicubic " + "bin2dec " + "bincoeff " + "binocdf " + "binoinv " + "binopdf " + "binornd " + "bitand " + "bitcmp " + "bitget " + "bitmax " + "bitor " + "bitpack " + "bitset " + "bitshift " + "bitunpack " + "bitxor " + "blackman " + "blanks " + "blkdiag " + "blkmm " + "bone " + "box " + "break " + "brighten " + "bsxfun " + "bug_report " + "builtin " + "bunzip2 " + "bzip2 " + "calendar " + "canonicalize_file_name " + "cart2pol " + "cart2sph " + "case " + "cast " + "cat " + "catch " + "cauchy_cdf " + "cauchy_inv " + "cauchy_pdf " + "cauchy_rnd " + "caxis " + "cbrt " + "ccolamd " + "cd " + "ceil " + "cell " + "cell2mat " + "cell2struct " + "celldisp " + "cellfun " + "cellidx " + "cellindexmat " + "cellslices " + "cellstr " + "center " + "cgs " + "char " + "chdir " + "chi2cdf " + "chi2inv " + "chi2pdf " + "chi2rnd " + "chisquare_test_homogeneity " + "chisquare_test_independence " + "chol " + "chol2inv " + "choldelete " + "cholinsert " + "cholinv " + "cholshift " + "cholupdate " + "chop " + "circshift " + "cla " + "clabel " + "class " + "clc " + "clear " + "clf " + "clg " + "clock " + "cloglog " + "close " + "closereq " + "colamd " + "colloc " + "colon " + "colorbar " + "colormap " + "colperm " + "colstyle " + "columns " + "comet " + "comet3 " + "comma " + "command_line_path " + "common_size " + "commutation_matrix " + "compan " + "compare_versions " + "compass " + "complement " + "completion_append_char " + "completion_matches " + "complex " + "computer " + "cond " + "condest " + "confirm_recursive_rmdir " + "conj " + "continue " + "contour " + "contour3 " + "contourc " + "contourf " + "contrast " + "conv " + "conv2 " + "convhull " + "convhulln " + "convn " + "cool " + "copper " + "copyfile " + "cor " + "cor_test " + "corrcoef " + "cos " + "cosd " + "cosh " + "cot " + "cotd " + "coth " + "cov " + "cplxpair " + "cputime " + "cquad " + "crash_dumps_octave_core " + "create_set " + "cross " + "csc " + "cscd " + "csch " + "cstrcat " + "csvread " + "csvwrite " + "csymamd " + "ctime " + "ctranspose " + "cummax " + "cummin " + "cumprod " + "cumsum " + "cumtrapz " + "curl " + "cut " + "cylinder " + "daspect " + "daspk " + "daspk_options " + "dasrt " + "dasrt_options " + "dassl " + "dassl_options " + "date " + "datenum " + "datestr " + "datetick " + "datevec " + "dbclear " + "dbcont " + "dbdown " + "dblquad " + "dbnext " + "dbquit " + "dbstack " + "dbstatus " + "dbstep " + "dbstop " + "dbtype " + "dbup " + "dbwhere " + "deal " + "deblank " + "debug " + "debug_on_error " + "debug_on_interrupt " + "debug_on_warning " + "dec2base " + "dec2bin " + "dec2hex " + "deconv " + "default_save_options " + "del2 " + "delaunay " + "delaunay3 " + "delaunayn " + "delete " + "dellistener " + "demo " + "det " + "detrend " + "diag " + "diary " + "diff " + "diffpara " + "diffuse " + "dir " + "discrete_cdf " + "discrete_inv " + "discrete_pdf " + "discrete_rnd " + "disp " + "dispatch " + "display " + "divergence " + "dlmread " + "dlmwrite " + "dmperm " + "dmult " + "do " + "do_braindead_shortcircuit_evaluation " + "do_string_escapes " + "doc " + "doc_cache_file " + "dos " + "dot " + "double " + "drawnow " + "dsearch " + "dsearchn " + "dump_prefs " + "dup2 " + "duplication_matrix " + "durbinlevinson " + "e " + "echo " + "echo_executing_commands " + "edit " + "edit_history " + "eig " + "eigs " + "ellipsoid " + "else " + "elseif " + "empirical_cdf " + "empirical_inv " + "empirical_pdf " + "empirical_rnd " + "end " + "end_try_catch " + "end_unwind_protect " + "endfor " + "endfunction " + "endgrent " + "endif " + "endpwent " + "endswitch " + "endwhile " + "eomday " + "eps " + "eq " + "erf " + "erfc " + "erfcx " + "erfinv " + "errno " + "errno_list " + "error " + "error_text " + "errorbar " + "etime " + "etree " + "etreeplot " + "eval " + "evalin " + "example " + "exec " + "exist " + "exit " + "exp " + "expcdf " + "expinv " + "expm " + "expm1 " + "exppdf " + "exprnd " + "eye " + "ezcontour " + "ezcontourf " + "ezmesh " + "ezmeshc " + "ezplot " + "ezplot3 " + "ezpolar " + "ezsurf " + "ezsurfc " + "f_test_regression " + "factor " + "factorial " + "fail " + "false " + "fcdf " + "fclear " + "fclose " + "fcntl " + "fdisp " + "feather " + "feof " + "ferror " + "feval " + "fflush " + "fft " + "fft2 " + "fftconv " + "fftfilt " + "fftn " + "fftshift " + "fftw " + "fgetl " + "fgets " + "fieldnames " + "figure " + "file_in_loadpath " + "file_in_path " + "fileattrib " + "filemarker " + "fileparts " + "fileread " + "filesep " + "fill " + "filter " + "filter2 " + "find " + "find_dir_in_path " + "findall " + "findobj " + "findstr " + "finite " + "finv " + "fix " + "fixed_point_format " + "flag " + "flipdim " + "fliplr " + "flipud " + "floor " + "fminbnd " + "fminunc " + "fmod " + "fnmatch " + "fopen " + "for " + "fork " + "format " + "formula " + "fpdf " + "fplot " + "fprintf " + "fputs " + "fractdiff " + "fread " + "freport " + "freqz " + "freqz_plot " + "frewind " + "frnd " + "fscanf " + "fseek " + "fskipl " + "fsolve " + "fstat " + "ftell " + "full " + "fullfile " + "func2str " + "function " + "functions " + "fwrite " + "fzero " + "gamcdf " + "gaminv " + "gamma " + "gammai " + "gammainc " + "gammaln " + "gampdf " + "gamrnd " + "gca " + "gcbf " + "gcbo " + "gcd " + "gcf " + "ge " + "gen_doc_cache " + "genpath " + "genvarname " + "geocdf " + "geoinv " + "geopdf " + "geornd " + "get " + "get_first_help_sentence " + "get_help_text " + "get_help_text_from_file " + "getappdata " + "getegid " + "getenv " + "geteuid " + "getfield " + "getgid " + "getgrent " + "getgrgid " + "getgrnam " + "gethostname " + "getpgrp " + "getpid " + "getppid " + "getpwent " + "getpwnam " + "getpwuid " + "getrusage " + "getuid " + "ginput " + "givens " + "glob " + "global " + "glpk " + "glpkmex " + "gls " + "gmap40 " + "gmres " + "gmtime " + "gnuplot_binary " + "gplot " + "gradient " + "graphics_toolkit " + "gray " + "gray2ind " + "grid " + "griddata " + "griddata3 " + "griddatan " + "gt " + "gtext " + "gunzip " + "gzip " + "hadamard " + "hamming " + "hankel " + "hanning " + "help " + "hess " + "hex2dec " + "hex2num " + "hggroup " + "hidden " + "hilb " + "hist " + "histc " + "history " + "history_control " + "history_file " + "history_size " + "history_timestamp_format_string " + "hold " + "home " + "horzcat " + "hot " + "hotelling_test " + "hotelling_test_2 " + "housh " + "hsv " + "hsv2rgb " + "hurst " + "hygecdf " + "hygeinv " + "hygepdf " + "hygernd " + "hypot " + "i " + "idivide " + "if " + "ifelse " + "ifft " + "ifft2 " + "ifftn " + "ifftshift " + "ignore_function_time_stamp " + "imag " + "image " + "imagesc " + "imfinfo " + "imread " + "imshow " + "imwrite " + "ind2gray " + "ind2rgb " + "ind2sub " + "index " + "inf " + "inferiorto " + "info " + "info_file " + "info_program " + "inline " + "inpolygon " + "input " + "inputname " + "int16 " + "int2str " + "int32 " + "int64 " + "int8 " + "interp1 " + "interp1q " + "interp2 " + "interp3 " + "interpft " + "interpn " + "intersect " + "intmax " + "intmin " + "intwarning " + "inv " + "inverse " + "invhilb " + "ipermute " + "iqr " + "is_absolute_filename " + "is_duplicate_entry " + "is_global " + "is_leap_year " + "is_rooted_relative_filename " + "is_valid_file_id " + "isa " + "isalnum " + "isalpha " + "isappdata " + "isargout " + "isascii " + "isbool " + "iscell " + "iscellstr " + "ischar " + "iscntrl " + "iscolumn " + "iscommand " + "iscomplex " + "isdebugmode " + "isdefinite " + "isdeployed " + "isdigit " + "isdir " + "isempty " + "isequal " + "isequalwithequalnans " + "isfield " + "isfigure " + "isfinite " + "isfloat " + "isglobal " + "isgraph " + "ishandle " + "ishermitian " + "ishghandle " + "ishold " + "isieee " + "isindex " + "isinf " + "isinteger " + "iskeyword " + "isletter " + "islogical " + "islower " + "ismac " + "ismatrix " + "ismember " + "ismethod " + "isna " + "isnan " + "isnull " + "isnumeric " + "isobject " + "isocolors " + "isonormals " + "isosurface " + "ispc " + "isprime " + "isprint " + "isprop " + "ispunct " + "israwcommand " + "isreal " + "isrow " + "isscalar " + "issorted " + "isspace " + "issparse " + "issquare " + "isstr " + "isstrprop " + "isstruct " + "issymmetric " + "isunix " + "isupper " + "isvarname " + "isvector " + "isxdigit " + "j " + "jet " + "kbhit " + "kendall " + "keyboard " + "kill " + "kolmogorov_smirnov_cdf " + "kolmogorov_smirnov_test " + "kolmogorov_smirnov_test_2 " + "kron " + "kruskal_wallis_test " + "krylov " + "krylovb " + "kurtosis " + "laplace_cdf " + "laplace_inv " + "laplace_pdf " + "laplace_rnd " + "lasterr " + "lasterror " + "lastwarn " + "lchol " + "lcm " + "ldivide " + "le " + "legend " + "legendre " + "length " + "lgamma " + "license " + "lin2mu " + "line " + "link " + "linkprop " + "linspace " + "list " + "list_in_columns " + "list_primes " + "load " + "loadaudio " + "loadimage " + "loadobj " + "localtime " + "log " + "log10 " + "log1p " + "log2 " + "logical " + "logistic_cdf " + "logistic_inv " + "logistic_pdf " + "logistic_regression " + "logistic_rnd " + "logit " + "loglog " + "loglogerr " + "logm " + "logncdf " + "logninv " + "lognpdf " + "lognrnd " + "logspace " + "lookfor " + "lookup " + "lower " + "ls " + "ls_command " + "lsode " + "lsode_options " + "lsqnonneg " + "lstat " + "lt " + "lu " + "luinc " + "luupdate " + "magic " + "mahalanobis " + "make_absolute_filename " + "makeinfo_program " + "manova " + "mark_as_command " + "mark_as_rawcommand " + "mat2cell " + "mat2str " + "matlabroot " + "matrix_type " + "max " + "max_recursion_depth " + "mcnemar_test " + "md5sum " + "mean " + "meansq " + "median " + "menu " + "merge " + "mesh " + "meshc " + "meshgrid " + "meshz " + "methods " + "mex " + "mexext " + "mfilename " + "mgorth " + "min " + "minus " + "mislocked " + "missing_function_hook " + "mist " + "mkdir " + "mkfifo " + "mkoctfile " + "mkpp " + "mkstemp " + "mktime " + "mldivide " + "mlock " + "mod " + "mode " + "moment " + "more " + "most " + "movefile " + "mpoles " + "mpower " + "mrdivide " + "mtimes " + "mu2lin " + "munlock " + "namelengthmax " + "nan " + "nargchk " + "nargin " + "nargout " + "nargoutchk " + "native_float_format " + "nbincdf " + "nbininv " + "nbinpdf " + "nbinrnd " + "nchoosek " + "ndgrid " + "ndims " + "ne " + "newplot " + "news " + "nextpow2 " + "nfields " + "nnz " + "nonzeros " + "norm " + "normcdf " + "normest " + "norminv " + "normpdf " + "normrnd " + "not " + "now " + "nproc " + "nth_element " + "nthroot " + "ntsc2rgb " + "null " + "num2cell " + "num2hex " + "num2str " + "numel " + "nzmax " + "ocean " + "octave_config_info " + "octave_core_file_limit " + "octave_core_file_name " + "octave_core_file_options " + "octave_tmp_file_name " + "ols " + "onCleanup " + "onenormest " + "ones " + "optimget " + "optimize_subsasgn_calls " + "optimset " + "or " + "orderfields " + "orient " + "orth " + "otherwise " + "output_max_field_width " + "output_precision " + "pack " + "page_output_immediately " + "page_screen_output " + "paren " + "pareto " + "parseparams " + "pascal " + "patch " + "path " + "pathdef " + "pathsep " + "pause " + "pbaspect " + "pcg " + "pchip " + "pclose " + "pcolor " + "pcr " + "peaks " + "periodogram " + "perl " + "perms " + "permute " + "perror " + "persistent " + "pi " + "pie " + "pie3 " + "pink " + "pinv " + "pipe " + "pkg " + "planerot " + "playaudio " + "plot " + "plot3 " + "plotmatrix " + "plotyy " + "plus " + "poisscdf " + "poissinv " + "poisspdf " + "poissrnd " + "pol2cart " + "polar " + "poly " + "polyaffine " + "polyarea " + "polyder " + "polyderiv " + "polyfit " + "polygcd " + "polyint " + "polyout " + "polyreduce " + "polyval " + "polyvalm " + "popen " + "popen2 " + "postpad " + "pow2 " + "power " + "powerset " + "ppder " + "ppint " + "ppjumps " + "ppplot " + "ppval " + "pqpnonneg " + "prctile " + "prepad " + "primes " + "print " + "print_empty_dimensions " + "print_struct_array_contents " + "print_usage " + "printf " + "prism " + "probit " + "prod " + "program_invocation_name " + "program_name " + "prop_test_2 " + "putenv " + "puts " + "pwd " + "qp " + "qqplot " + "qr " + "qrdelete " + "qrinsert " + "qrshift " + "qrupdate " + "quad " + "quad_options " + "quadcc " + "quadgk " + "quadl " + "quadv " + "quantile " + "quit " + "quiver " + "quiver3 " + "qz " + "qzhess " + "rainbow " + "rand " + "rande " + "randg " + "randi " + "randn " + "randp " + "randperm " + "range " + "rank " + "ranks " + "rat " + "rats " + "rcond " + "rdivide " + "re_read_readline_init_file " + "read_readline_init_file " + "readdir " + "readlink " + "real " + "reallog " + "realmax " + "realmin " + "realpow " + "realsqrt " + "record " + "rectangle " + "rectint " + "refresh " + "refreshdata " + "regexp " + "regexpi " + "regexprep " + "regexptranslate " + "rehash " + "rem " + "remove_input_event_hook " + "rename " + "repelems " + "replot " + "repmat " + "reset " + "reshape " + "residue " + "resize " + "restoredefaultpath " + "rethrow " + "return " + "rgb2hsv " + "rgb2ind " + "rgb2ntsc " + "ribbon " + "rindex " + "rmappdata " + "rmdir " + "rmfield " + "rmpath " + "roots " + "rose " + "rosser " + "rot90 " + "rotdim " + "round " + "roundb " + "rows " + "rref " + "rsf2csf " + "run " + "run_count " + "run_history " + "run_test " + "rundemos " + "runlength " + "runtests " + "save " + "save_header_format_string " + "save_precision " + "saveas " + "saveaudio " + "saveimage " + "saveobj " + "savepath " + "saving_history " + "scanf " + "scatter " + "scatter3 " + "schur " + "sec " + "secd " + "sech " + "semicolon " + "semilogx " + "semilogxerr " + "semilogy " + "semilogyerr " + "set " + "setappdata " + "setaudio " + "setdiff " + "setenv " + "setfield " + "setgrent " + "setpwent " + "setstr " + "setxor " + "shading " + "shell_cmd " + "shg " + "shift " + "shiftdim " + "sighup_dumps_octave_core " + "sign " + "sign_test " + "sigterm_dumps_octave_core " + "silent_functions " + "sin " + "sinc " + "sind " + "sinetone " + "sinewave " + "single " + "sinh " + "size " + "size_equal " + "sizemax " + "sizeof " + "skewness " + "sleep " + "slice " + "sombrero " + "sort " + "sortrows " + "source " + "spalloc " + "sparse " + "sparse_auto_mutate " + "spatan2 " + "spaugment " + "spchol " + "spchol2inv " + "spcholinv " + "spconvert " + "spcumprod " + "spcumsum " + "spdet " + "spdiag " + "spdiags " + "spearman " + "spectral_adf " + "spectral_xdf " + "specular " + "speed " + "spencer " + "speye " + "spfind " + "spfun " + "sph2cart " + "sphcat " + "sphere " + "spinmap " + "spinv " + "spkron " + "splchol " + "spline " + "split " + "split_long_rows " + "splu " + "spmax " + "spmin " + "spones " + "spparms " + "spprod " + "spqr " + "sprand " + "sprandn " + "sprandsym " + "sprank " + "spring " + "sprintf " + "spstats " + "spsum " + "spsumsq " + "spvcat " + "spy " + "sqp " + "sqrt " + "sqrtm " + "squeeze " + "sscanf " + "stairs " + "stat " + "static " + "statistics " + "std " + "stderr " + "stdin " + "stdnormal_cdf " + "stdnormal_inv " + "stdnormal_pdf " + "stdnormal_rnd " + "stdout " + "stem " + "stem3 " + "stft " + "str2double " + "str2func " + "str2mat " + "str2num " + "strcat " + "strchr " + "strcmp " + "strcmpi " + "strerror " + "strfind " + "strftime " + "string_fill_char " + "strjust " + "strmatch " + "strncmp " + "strncmpi " + "strptime " + "strread " + "strrep " + "strsplit " + "strtok " + "strtrim " + "strtrunc " + "struct " + "struct2cell " + "struct_levels_to_print " + "structfun " + "strvcat " + "studentize " + "sub2ind " + "subplot " + "subsasgn " + "subsindex " + "subspace " + "subsref " + "substr " + "substruct " + "sum " + "summer " + "sumsq " + "superiorto " + "suppress_verbose_help_message " + "surf " + "surface " + "surfc " + "surfl " + "surfnorm " + "svd " + "svd_driver " + "svds " + "swapbytes " + "switch " + "syl " + "sylvester_matrix " + "symamd " + "symbfact " + "symlink " + "symrcm " + "symvar " + "synthesis " + "system " + "t_test " + "t_test_2 " + "t_test_regression " + "table " + "tan " + "tand " + "tanh " + "tar " + "tcdf " + "tempdir " + "tempname " + "terminal_size " + "test " + "test2 " + "test3 " + "text " + "textread " + "textscan " + "tic " + "tilde_expand " + "time " + "times " + "tinv " + "title " + "tmpfile " + "tmpnam " + "toascii " + "toc " + "toeplitz " + "tolower " + "toupper " + "tpdf " + "trace " + "transpose " + "trapz " + "treelayout " + "treeplot " + "tril " + "trimesh " + "triplequad " + "triplot " + "trisurf " + "triu " + "trnd " + "true " + "try " + "tsearch " + "tsearchn " + "type " + "typecast " + "typeinfo " + "u_test " + "uigetdir " + "uigetfile " + "uimenu " + "uint16 " + "uint32 " + "uint64 " + "uint8 " + "uiputfile " + "umask " + "uminus " + "uname " + "undo_string_escapes " + "unidcdf " + "unidinv " + "unidpdf " + "unidrnd " + "unifcdf " + "unifinv " + "unifpdf " + "unifrnd " + "unimplemented " + "union " + "unique " + "unix " + "unlink " + "unmark_command " + "unmark_rawcommand " + "unmkpp " + "unpack " + "untabify " + "untar " + "until " + "unwind_protect " + "unwind_protect_cleanup " + "unwrap " + "unzip " + "uplus " + "upper " + "urlread " + "urlwrite " + "usage " + "usleep " + "validatestring " + "values " + "vander " + "var " + "var_test " + "varargin " + "varargout " + "vec " + "vech " + "vectorize " + "ver " + "version " + "vertcat " + "view " + "voronoi " + "voronoin " + "waitforbuttonpress " + "waitpid " + "warning " + "warning_ids " + "warranty " + "wavread " + "wavwrite " + "wblcdf " + "wblinv " + "wblpdf " + "wblrnd " + "weekday " + "weibcdf " + "weibinv " + "weibpdf " + "weibrnd " + "welch_test " + "what " + "which " + "while " + "white " + "whitebg " + "who " + "whos " + "whos_line_format " + "wienrnd " + "wilcoxon_test " + "wilkinson " + "winter " + "xlabel " + "xlim " + "xor " + "yes_or_no " + "ylabel " + "ylim " + "yulewalker " + "z_test " + "z_test_2 " + "zeros " + "zip " + "zlabel " + "zlim "; + /* "break case catch continue do else elseif end end_unwind_protect " + "endfor endfunction endif endswitch endwhile for function " + "global if otherwise persistent return switch try until " + "unwind_protect unwind_protect_cleanup while"; + */ +} diff -r 97e3d1769be0 -r 7925a7d6547b gui/src/ResourceManager.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/gui/src/ResourceManager.h Sat May 19 03:15:00 2012 -0400 @@ -0,0 +1,67 @@ +/* OctaveGUI - A graphical user interface for Octave + * Copyright (C) 2011 Jacob Dawid (jacob.dawid@googlemail.com) + * + * 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. + * + * 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 this program. If not, see . + */ + +#ifndef RESOURCEMANAGER_H +#define RESOURCEMANAGER_H + +#include +#include +#include +#include + +class ResourceManager +{ +public: + enum Icon + { + Octave, + Terminal, + Documentation, + Chat, + ChatNewMessage + }; + + ~ResourceManager (); + + static ResourceManager * + instance () + { + return &m_singleton; + } + + QSettings *settings (); + QString homePath (); + void reloadSettings (); + void setSettings (QString file); + QString findTranslatorFile (QString language); + void updateNetworkSettings (); + void loadIcons (); + QIcon icon (Icon icon); + bool isFirstRun (); + + const char *octaveKeywords (); +private: + ResourceManager (); + + QSettings *m_settings; + QString m_homePath; + QMap m_icons; + static ResourceManager m_singleton; + bool m_firstRun; +}; + +#endif // RESOURCEMANAGER_H diff -r 97e3d1769be0 -r 7925a7d6547b gui/src/SettingsDialog.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/gui/src/SettingsDialog.cpp Sat May 19 03:15:00 2012 -0400 @@ -0,0 +1,87 @@ +/* OctaveGUI - A graphical user interface for Octave + * Copyright (C) 2011 Jacob Dawid (jacob.dawid@googlemail.com) + * + * 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. + * + * 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 this program. If not, see . + */ + +#include "ResourceManager.h" +#include "SettingsDialog.h" +#include "ui_SettingsDialog.h" +#include + +SettingsDialog::SettingsDialog (QWidget * parent): +QDialog (parent), ui (new Ui::SettingsDialog) +{ + ui->setupUi (this); + + QSettings *settings = ResourceManager::instance ()->settings (); + ui->useCustomFileEditor->setChecked (settings->value ("useCustomFileEditor").toBool ()); + ui->customFileEditor->setText (settings->value ("customFileEditor").toString ()); + ui->editor_showLineNumbers->setChecked (settings->value ("editor/showLineNumbers",true).toBool () ); + ui->editor_highlightCurrentLine->setChecked (settings->value ("editor/highlightCurrentLine",true).toBool () ); + ui->editor_codeCompletion->setChecked (settings->value ("editor/codeCompletion",true).toBool () ); + ui->editor_fontName->setCurrentFont (QFont (settings->value ("editor/fontName","Courier").toString()) ); + ui->editor_fontSize->setValue (settings->value ("editor/fontSize",10).toInt ()); + ui->editor_longWindowTitle->setChecked (settings->value ("editor/longWindowTitle",true).toBool ()); + ui->terminal_fontName->setCurrentFont (QFont (settings->value ("terminal/fontName","Courier").toString()) ); + ui->terminal_fontSize->setValue (settings->value ("terminal/fontSize",10).toInt ()); + ui->showFilenames->setChecked (settings->value ("showFilenames").toBool()); + ui->showFileSize->setChecked (settings->value ("showFileSize").toBool()); + ui->showFileType->setChecked (settings->value ("showFileType").toBool()); + ui->showLastModified->setChecked (settings->value ("showLastModified").toBool()); + ui->showHiddenFiles->setChecked (settings->value ("showHiddenFiles").toBool()); + ui->useAlternatingRowColors->setChecked (settings->value ("useAlternatingRowColors").toBool()); + ui->useProxyServer->setChecked (settings->value ("useProxyServer").toBool ()); + ui->proxyHostName->setText (settings->value ("proxyHostName").toString ()); + + int currentIndex = 0; + QString proxyTypeString = settings->value ("proxyType").toString (); + while ( (currentIndex < ui->proxyType->count ()) && (ui->proxyType->currentText () != proxyTypeString)) + { + currentIndex++; + ui->proxyType->setCurrentIndex (currentIndex); + } + + ui->proxyPort->setText (settings->value ("proxyPort").toString ()); + ui->proxyUserName->setText (settings->value ("proxyUserName").toString ()); + ui->proxyPassword->setText (settings->value ("proxyPassword").toString ()); +} + +SettingsDialog::~SettingsDialog () +{ + QSettings *settings = ResourceManager::instance ()->settings (); + settings->setValue ("useCustomFileEditor", ui->useCustomFileEditor->isChecked ()); + settings->setValue ("customFileEditor", ui->customFileEditor->text ()); + settings->setValue ("editor/showLineNumbers", ui->editor_showLineNumbers->isChecked ()); + settings->setValue ("editor/highlightCurrentLine", ui->editor_highlightCurrentLine->isChecked ()); + settings->setValue ("editor/codeCompletion", ui->editor_codeCompletion->isChecked ()); + settings->setValue ("editor/fontName", ui->editor_fontName->currentFont().family()); + settings->setValue ("editor/fontSize", ui->editor_fontSize->value()); + settings->setValue ("editor/longWindowTitle", ui->editor_longWindowTitle->isChecked()); + settings->setValue ("terminal/fontSize", ui->terminal_fontSize->value()); + settings->setValue ("terminal/fontName", ui->terminal_fontName->currentFont().family()); + settings->setValue ("showFilenames", ui->showFilenames->isChecked ()); + settings->setValue ("showFileSize", ui->showFileSize->isChecked ()); + settings->setValue ("showFileType", ui->showFileType->isChecked ()); + settings->setValue ("showLastModified", ui->showLastModified->isChecked ()); + settings->setValue ("showHiddenFiles", ui->showHiddenFiles->isChecked ()); + settings->setValue ("useAlternatingRowColors", ui->useAlternatingRowColors->isChecked ()); + settings->setValue ("useProxyServer", ui->useProxyServer->isChecked ()); + settings->setValue ("proxyType", ui->proxyType->currentText ()); + settings->setValue ("proxyHostName", ui->proxyHostName->text ()); + settings->setValue ("proxyPort", ui->proxyPort->text ()); + settings->setValue ("proxyUserName", ui->proxyUserName->text ()); + settings->setValue ("proxyPassword", ui->proxyPassword->text ()); + delete ui; +} diff -r 97e3d1769be0 -r 7925a7d6547b gui/src/SettingsDialog.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/gui/src/SettingsDialog.h Sat May 19 03:15:00 2012 -0400 @@ -0,0 +1,39 @@ +/* OctaveGUI - A graphical user interface for Octave + * Copyright (C) 2011 Jacob Dawid (jacob.dawid@googlemail.com) + * + * 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. + * + * 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. + *md5 + + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#ifndef SETTINGSDIALOG_H +#define SETTINGSDIALOG_H + +#include + +namespace Ui +{ + class SettingsDialog; +} + +class SettingsDialog:public QDialog +{ +Q_OBJECT public: + explicit SettingsDialog (QWidget * parent); + ~SettingsDialog (); + +private: + Ui::SettingsDialog * ui; +}; + +#endif // SETTINGSDIALOG_H diff -r 97e3d1769be0 -r 7925a7d6547b gui/src/SettingsDialog.ui --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/gui/src/SettingsDialog.ui Sat May 19 03:15:00 2012 -0400 @@ -0,0 +1,662 @@ + + + SettingsDialog + + + Qt::ApplicationModal + + + + 0 + 0 + 600 + 400 + + + + + 600 + 400 + + + + + 600 + 400 + + + + Settings + + + + + + 0 + + + + Editor + + + + + + + + + + Font + + + + + + + false + + + + + + + Font Size + + + + + + + 2 + + + 96 + + + 10 + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + + + true + + + Show line numbers + + + false + + + + + + + true + + + Highlight current line + + + false + + + + + + + true + + + Code completion + + + false + + + + + + + Show complete path in window title + + + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + + + + true + + + Use custom file editor: + + + + + + + false + + + emacs + + + + + + + + + + Terminal + + + + + + + + Font + + + + + + + false + + + + + + + Font Size + + + + + + + 2 + + + 96 + + + 10 + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + + + Qt::Vertical + + + + 20 + 321 + + + + + + + + + File Browser + + + + + + Show filenames + + + + + + + Show file size + + + + + + + Show file type + + + + + + + Show date of last modification + + + + + + + Show hidden files + + + + + + + Alternating row colors + + + + + + + Qt::Vertical + + + + 20 + 360 + + + + + + + + + Network + + + + + + Use proxy server + + + + + + + + + false + + + Proxy Type: + + + + + + + false + + + + HttpProxy + + + + + Socks5Proxy + + + + + + + + false + + + Hostname: + + + + + + + false + + + + + + + false + + + Port: + + + + + + + false + + + + + + + false + + + Username: + + + + + + + false + + + + + + + false + + + Password: + + + + + + + false + + + QLineEdit::Password + + + + + + + + + + + + + + + useProxyServer + toggled(bool) + label_4 + setEnabled(bool) + + + 249 + 59 + + + 69 + 122 + + + + + useProxyServer + toggled(bool) + label_3 + setEnabled(bool) + + + 249 + 59 + + + 59 + 91 + + + + + useProxyServer + toggled(bool) + label_5 + setEnabled(bool) + + + 249 + 59 + + + 44 + 152 + + + + + useProxyServer + toggled(bool) + proxyType + setEnabled(bool) + + + 249 + 59 + + + 291 + 91 + + + + + useProxyServer + toggled(bool) + proxyHostName + setEnabled(bool) + + + 249 + 59 + + + 291 + 124 + + + + + useProxyServer + toggled(bool) + proxyPort + setEnabled(bool) + + + 249 + 59 + + + 364 + 154 + + + + + useCustomFileEditor + toggled(bool) + customFileEditor + setEnabled(bool) + + + 111 + 62 + + + 343 + 63 + + + + + useProxyServer + toggled(bool) + label_7 + setEnabled(bool) + + + 249 + 59 + + + 67 + 212 + + + + + editor_showLineNumbers + toggled(bool) + editor_showLineNumbers + setEnabled(bool) + + + 249 + 87 + + + 249 + 87 + + + + + editor_highlightCurrentLine + toggled(bool) + editor_highlightCurrentLine + setEnabled(bool) + + + 249 + 112 + + + 249 + 112 + + + + + useProxyServer + toggled(bool) + proxyUserName + setEnabled(bool) + + + 249 + 59 + + + 364 + 184 + + + + + useProxyServer + toggled(bool) + proxyPassword + setEnabled(bool) + + + 249 + 59 + + + 364 + 214 + + + + + useProxyServer + toggled(bool) + label_6 + setEnabled(bool) + + + 249 + 59 + + + 68 + 182 + + + + + editor_codeCompletion + toggled(bool) + editor_codeCompletion + setEnabled(bool) + + + 249 + 137 + + + 249 + 137 + + + + + diff -r 97e3d1769be0 -r 7925a7d6547b gui/src/WelcomeWizard.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/gui/src/WelcomeWizard.cpp Sat May 19 03:15:00 2012 -0400 @@ -0,0 +1,53 @@ +/* OctaveGUI - A graphical user interface for Octave + * Copyright (C) 2011 Jacob Dawid (jacob.dawid@googlemail.com) + * + * 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. + * + * 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 this program. If not, see . + */ + +#include "WelcomeWizard.h" +#include "ui_WelcomeWizard.h" + +WelcomeWizard::WelcomeWizard (QWidget *parent) : + QDialog (parent), + ui (new Ui::WelcomeWizard) +{ + ui->setupUi (this); + connect (ui->nextButton1, SIGNAL (clicked ()), this, SLOT (next ())); + connect (ui->nextButton2, SIGNAL (clicked ()), this, SLOT (next ())); + connect (ui->nextButton3, SIGNAL (clicked ()), this, SLOT (next ())); + connect (ui->nextButton4, SIGNAL (clicked ()), this, SLOT (next ())); + + connect (ui->previousButton2, SIGNAL (clicked ()), this, SLOT (previous ())); + connect (ui->previousButton3, SIGNAL (clicked ()), this, SLOT (previous ())); + connect (ui->previousButton4, SIGNAL (clicked ()), this, SLOT (previous ())); + connect (ui->previousButton5, SIGNAL (clicked ()), this, SLOT (previous ())); +} + +WelcomeWizard::~WelcomeWizard() +{ + delete ui; +} + +void +WelcomeWizard::next () +{ + ui->stackedWidget->setCurrentIndex (ui->stackedWidget->currentIndex () + 1); +} + +void +WelcomeWizard::previous () +{ + ui->stackedWidget->setCurrentIndex (ui->stackedWidget->currentIndex () - 1); +} + diff -r 97e3d1769be0 -r 7925a7d6547b gui/src/WelcomeWizard.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/gui/src/WelcomeWizard.h Sat May 19 03:15:00 2012 -0400 @@ -0,0 +1,43 @@ +/* OctaveGUI - A graphical user interface for Octave + * Copyright (C) 2011 Jacob Dawid (jacob.dawid@googlemail.com) + * + * 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. + * + * 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 this program. If not, see . + */ + +#ifndef WELCOMEWIZARD_H +#define WELCOMEWIZARD_H + +#include + +namespace Ui { +class WelcomeWizard; +} + +class WelcomeWizard : public QDialog +{ + Q_OBJECT + +public: + explicit WelcomeWizard(QWidget *parent = 0); + ~WelcomeWizard(); + +public slots: + void next (); + void previous (); + +private: + Ui::WelcomeWizard *ui; +}; + +#endif // WELCOMEWIZARD_H diff -r 97e3d1769be0 -r 7925a7d6547b gui/src/WelcomeWizard.ui --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/gui/src/WelcomeWizard.ui Sat May 19 03:15:00 2012 -0400 @@ -0,0 +1,354 @@ + + + WelcomeWizard + + + + 0 + 0 + 647 + 400 + + + + + 647 + 400 + + + + + 647 + 400 + + + + Welcome to GNU Octave + + + + + + 4 + + + + + + + It appears that you have launched Octave GUI for the first time on this computer, since no configuration file could be found at '~/.octave-gui'. This wizard will guide you through the essential settings you should make before you can start using Octave GUI. If you want to transfer your settings you have previously made just close this dialog and copy over the settings file to your home folder. The presence of that file will automatically be detected and will skip this wizard. IMPORTANT: This wizard is not fully functional yet. Just click your way to the end and it will create a standard settings file. + + + Qt::AlignJustify|Qt::AlignVCenter + + + true + + + + + + + Qt::Vertical + + + + 20 + 218 + + + + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + Next + + + + + + + + + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + + + + Previous + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + Next + + + + + + + + + + + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + + + + Previous + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + Next + + + + + + + + + + + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + + + + Previous + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + Next + + + + + + + + + + + + + + + + + + 20 + + + + Welcome to Octave! + + + + + + + This is the development version of Octave with the first official GUI. + + + true + + + + + + + You seem to run Octave GUI for the first time on this computer. This assistant will help you to configure this software installation. Click 'Finish' to write a configuration file and launch Octave GUI. + + + true + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + + + + false + + + Previous + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + Finish + + + + + + + + + + + + + + + + + finishButton + clicked() + WelcomeWizard + accept() + + + 577 + 372 + + + 323 + 199 + + + + + diff -r 97e3d1769be0 -r 7925a7d6547b gui/src/WorkspaceView.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/gui/src/WorkspaceView.cpp Sat May 19 03:15:00 2012 -0400 @@ -0,0 +1,209 @@ +/* OctaveGUI - A graphical user interface for Octave + * Copyright (C) 2011 Jacob Dawid (jacob.dawid@googlemail.com) + * + * 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. + * + * 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 this program. If not, see . + */ + +#include "WorkspaceView.h" +#include +#include +#include + +WorkspaceView::WorkspaceView (QWidget * parent) : QDockWidget + (parent) +{ + setObjectName ("WorkspaceView"); + setWindowTitle (tr ("Workspace")); + + m_updateSemaphore = new QSemaphore (1); + QStringList headerLabels; + headerLabels << tr ("Name") << tr ("Type") << tr ("Value"); + m_variablesTreeWidget = new QTreeWidget (this); + m_variablesTreeWidget->setHeaderHidden (false); + m_variablesTreeWidget->setHeaderLabels (headerLabels); + + setWidget (new QWidget (this)); + QVBoxLayout *layout = new QVBoxLayout (); + layout->addWidget (m_variablesTreeWidget); + layout->setMargin (2); + widget ()->setLayout (layout); + + QTreeWidgetItem *treeWidgetItem = new QTreeWidgetItem (); + treeWidgetItem->setData (0, 0, QString (tr ("Local"))); + m_variablesTreeWidget->insertTopLevelItem (0, treeWidgetItem); + + treeWidgetItem = new QTreeWidgetItem (); + treeWidgetItem->setData (0, 0, QString (tr ("Global"))); + m_variablesTreeWidget->insertTopLevelItem (1, treeWidgetItem); + + treeWidgetItem = new QTreeWidgetItem (); + treeWidgetItem->setData (0, 0, QString (tr ("Persistent"))); + m_variablesTreeWidget->insertTopLevelItem (2, treeWidgetItem); + + treeWidgetItem = new QTreeWidgetItem (); + treeWidgetItem->setData (0, 0, QString (tr ("Hidden"))); + m_variablesTreeWidget->insertTopLevelItem (3, treeWidgetItem); + + m_variablesTreeWidget->expandAll (); + m_variablesTreeWidget->setAlternatingRowColors (true); + m_variablesTreeWidget->setAnimated (true); + + connect (this, SIGNAL (visibilityChanged (bool)), + this, SLOT(handleVisibilityChanged (bool))); + connect (OctaveLink::instance(), SIGNAL (updateSymbolTable ()), + this, SLOT (fetchSymbolTable ())); +} + +void +WorkspaceView::updateTreeEntry (QTreeWidgetItem * treeItem, SymbolRecord symbolRecord) +{ + treeItem->setData (0, 0, QString (symbolRecord.name ().c_str ())); + treeItem->setData (1, 0, + QString (symbolRecord.varval ().type_name ().c_str ())); + treeItem->setData (2, 0, + OctaveLink::octaveValueAsQString (symbolRecord. + varval ())); +} + +void +WorkspaceView::updateFromSymbolTable (QList < SymbolRecord > symbolTable) +{ + m_updateSemaphore->acquire (); + // Split the symbol table into its different scopes. + QList < SymbolRecord > localSymbolTable; + QList < SymbolRecord > globalSymbolTable; + QList < SymbolRecord > persistentSymbolTable; + QList < SymbolRecord > hiddenSymbolTable; + + foreach (SymbolRecord symbolRecord, symbolTable) + { + // It's true that being global or hidden includes it's can mean it's also locally visible, + // but we want to distinguish that here. + if (symbolRecord.is_local () && !symbolRecord.is_global () + && !symbolRecord.is_hidden ()) + { + localSymbolTable.append (symbolRecord); + } + + if (symbolRecord.is_global ()) + { + globalSymbolTable.append (symbolRecord); + } + + if (symbolRecord.is_persistent ()) + { + persistentSymbolTable.append (symbolRecord); + } + + if (symbolRecord.is_hidden ()) + { + hiddenSymbolTable.append (symbolRecord); + } + } + + updateScope (0, localSymbolTable); + updateScope (1, globalSymbolTable); + updateScope (2, persistentSymbolTable); + updateScope (3, hiddenSymbolTable); + m_updateSemaphore->release (); +} + +void +WorkspaceView::updateScope (int topLevelItemIndex, QList < SymbolRecord > symbolTable) +{ + // This method may be a little bit confusing; variablesList is a complete list of all + // variables that are in the workspace currently. + QTreeWidgetItem *topLevelItem = + m_variablesTreeWidget->topLevelItem (topLevelItemIndex); + + // First we check, if any variables that exist in the model tree have to be updated + // or created. So we walk the variablesList check against the tree. + foreach (SymbolRecord symbolRecord, symbolTable) + { + int childCount = topLevelItem->childCount (); + bool alreadyExists = false; + QTreeWidgetItem *child; + + // Search for the corresponding item in the tree. If it has been found, child + // will contain the appropriate QTreeWidgetItem* pointing at it. + for (int i = 0; i < childCount; i++) + { + child = topLevelItem->child (i); + if (child->data (0, 0).toString () == + QString (symbolRecord.name ().c_str ())) + { + alreadyExists = true; + break; + } + } + + // If it already exists, just update it. + if (alreadyExists) + { + updateTreeEntry (child, symbolRecord); + } + else + { + // It does not exist, so create a new one and set the right values. + child = new QTreeWidgetItem (); + updateTreeEntry (child, symbolRecord); + topLevelItem->addChild (child); + } + } + + // Check the tree against the list for deleted variables. + for (int i = 0; i < topLevelItem->childCount (); i++) + { + bool existsInVariableList = false; + QTreeWidgetItem *child = topLevelItem->child (i); + foreach (SymbolRecord symbolRecord, symbolTable) + { + if (QString (symbolRecord.name ().c_str ()) == + child->data (0, 0).toString ()) + { + existsInVariableList = true; + } + } + + if (!existsInVariableList) + { + topLevelItem->removeChild (child); + delete child; + i--; + } + } +} + +void +WorkspaceView::fetchSymbolTable () +{ + OctaveLink::instance ()->acquireSymbolTable(); + QList < SymbolRecord > symbolTable = OctaveLink::instance ()->symbolTable(); + updateFromSymbolTable (symbolTable); + OctaveLink::instance ()->releaseSymbolTable(); +} + +void +WorkspaceView::handleVisibilityChanged (bool visible) +{ + if (visible) + emit activeChanged (true); +} + +void +WorkspaceView::closeEvent (QCloseEvent *event) +{ + emit activeChanged (false); + QDockWidget::closeEvent (event); +} diff -r 97e3d1769be0 -r 7925a7d6547b gui/src/WorkspaceView.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/gui/src/WorkspaceView.h Sat May 19 03:15:00 2012 -0400 @@ -0,0 +1,52 @@ +/* OctaveGUI - A graphical user interface for Octave + * Copyright (C) 2011 Jacob Dawid (jacob.dawid@googlemail.com) + * + * 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. + * + * 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 this program. If not, see . + */ + +#ifndef WORKSPACEVIEW_H +#define WORKSPACEVIEW_H + +#include +#include +#include +#include "OctaveLink.h" + +class WorkspaceView:public QDockWidget +{ + Q_OBJECT +public: + WorkspaceView (QWidget * parent = 0); + +public slots: + void fetchSymbolTable (); + void handleVisibilityChanged (bool visible); + +signals: + /** Custom signal that tells if a user has clicke away that dock widget. */ + void activeChanged (bool active); + +protected: + void closeEvent (QCloseEvent *event); + +private: + void updateFromSymbolTable (QList < SymbolRecord > symbolTable); + void updateTreeEntry (QTreeWidgetItem * treeItem, SymbolRecord symbolRecord); + void updateScope (int topLevelItemIndex, QList < SymbolRecord > symbolTable); + + QTreeWidget *m_variablesTreeWidget; + QSemaphore *m_updateSemaphore; +}; + +#endif // WORKSPACEVIEW_H diff -r 97e3d1769be0 -r 7925a7d6547b gui/src/backend/OctaveCallbackThread.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/gui/src/backend/OctaveCallbackThread.cpp Sat May 19 03:15:00 2012 -0400 @@ -0,0 +1,50 @@ +/* OctaveGUI - A graphical user interface for Octave + * Copyright (C) 2011 Jacob Dawid (jacob.dawid@googlemail.com) + * + * 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. + * + * 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 this program. If not, see . + */ + +#include "OctaveCallbackThread.h" +#include "MainWindow.h" + +OctaveCallbackThread::OctaveCallbackThread (QObject * parent) + : QThread (parent) +{ + m_runningSemaphore = new QSemaphore(1); + m_running = true; +} + +void +OctaveCallbackThread::halt () +{ + m_runningSemaphore->acquire (); + m_running = false; + m_runningSemaphore->release (); +} + +void +OctaveCallbackThread::run () +{ + bool running = true; + while (running) + { + OctaveLink::instance ()->triggerUpdateSymbolTable (); + OctaveLink::instance ()->triggerUpdateHistoryModel (); + usleep (1000000); + + m_runningSemaphore->acquire (); + running = m_running; + m_runningSemaphore->release (); + } +} diff -r 97e3d1769be0 -r 7925a7d6547b gui/src/backend/OctaveCallbackThread.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/gui/src/backend/OctaveCallbackThread.h Sat May 19 03:15:00 2012 -0400 @@ -0,0 +1,37 @@ +/* OctaveGUI - A graphical user interface for Octave + * Copyright (C) 2011 Jacob Dawid (jacob.dawid@googlemail.com) + * + * 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. + * + * 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 this program. If not, see . + */ + +#ifndef OCTAVECALLBACKTHREAD_H +#define OCTAVECALLBACKTHREAD_H + +#include +#include + +class OctaveCallbackThread:public QThread +{ + Q_OBJECT +public: + void halt(); + OctaveCallbackThread (QObject * parent); +protected: + void run (); +private: + QSemaphore *m_runningSemaphore; + bool m_running; +}; + +#endif // OCTAVECALLBACKTHREAD_H diff -r 97e3d1769be0 -r 7925a7d6547b gui/src/backend/OctaveLink.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/gui/src/backend/OctaveLink.cpp Sat May 19 03:15:00 2012 -0400 @@ -0,0 +1,153 @@ +/* OctaveGUI - A graphical user interface for Octave + * Copyright (C) 2011 John P. Swensen, Jacob Dawid (jacob.dawid@googlemail.com) + * + * 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. + * + * 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 this program. If not, see . + */ + +#include "OctaveLink.h" + +OctaveLink OctaveLink::m_singleton; + +OctaveLink::OctaveLink ():QObject () +{ + m_symbolTableSemaphore = new QSemaphore (1); + m_historyModel = new QStringListModel (this); +} + +OctaveLink::~OctaveLink () +{ +} + +QString +OctaveLink::octaveValueAsQString (OctaveValue octaveValue) +{ + // Convert single qouted string. + if (octaveValue.is_sq_string ()) + { + return QString ("\'%1\'").arg (octaveValue.string_value ().c_str ()); + + // Convert double qouted string. + } + else if (octaveValue.is_dq_string ()) + { + return QString ("\"%1\"").arg (octaveValue.string_value ().c_str ()); + + // Convert real scalar. + } + else if (octaveValue.is_real_scalar ()) + { + return QString ("%1").arg (octaveValue.scalar_value ()); + + // Convert complex scalar. + } + else if (octaveValue.is_complex_scalar ()) + { + return QString ("%1 + %2i").arg (octaveValue.scalar_value ()). + arg (octaveValue.complex_value ().imag ()); + + // Convert range. + } + else if (octaveValue.is_range ()) + { + return QString ("%1 : %2 : %3").arg (octaveValue.range_value (). + base ()).arg (octaveValue. + range_value (). + inc ()). + arg (octaveValue.range_value ().limit ()); + + // Convert real matrix. + } + else if (octaveValue.is_real_matrix ()) + { + return QString ("%1x%2 matrix") + .arg (octaveValue.matrix_value ().rows ()) + .arg (octaveValue.matrix_value ().cols ()); + + // Convert complex matrix. + } + else if (octaveValue.is_complex_matrix ()) + { + return QString ("%1x%2 complex matrix") + .arg (octaveValue.matrix_value ().rows ()) + .arg (octaveValue.matrix_value ().cols ()); + + // If everything else does not fit, we could not recognize the type. + } + else + { + return QString (""); + } +} + +void +OctaveLink::launchOctave () +{ + // Create both threads. + m_octaveMainThread = new OctaveMainThread (this); + m_octaveCallbackThread = new OctaveCallbackThread (this); + + // Launch the second as soon as the first ist ready. + connect (m_octaveMainThread, SIGNAL(ready()), m_octaveCallbackThread, SLOT(start())); + + // Start the first one. + m_octaveMainThread->start (); +} + +void +OctaveLink::terminateOctave () +{ + m_octaveCallbackThread->halt(); + m_octaveCallbackThread->wait (); + + m_octaveMainThread->terminate (); + //m_octaveMainThread->wait(); +} + +QList < SymbolRecord > OctaveLink::symbolTable () +{ + m_symbolTableBuffer.clear (); + std::list < SymbolRecord > allVariables = symbol_table::all_variables (); + std::list < SymbolRecord >::iterator iterator; + for (iterator = allVariables.begin (); iterator != allVariables.end (); + iterator++) + { + SymbolRecord s = iterator->dup (symbol_table::global_scope ()); + m_symbolTableBuffer.append (s); + } + return m_symbolTableBuffer; +} + +void +OctaveLink::triggerUpdateHistoryModel () +{ + // Determine the client's (our) history length and the one of the server. + int clientHistoryLength = m_historyModel->rowCount (); + int serverHistoryLength = command_history::length (); + + // If were behind the server, iterate through all new entries and add them to our history. + if (clientHistoryLength < serverHistoryLength) + { + for (int i = clientHistoryLength; i < serverHistoryLength; i++) + { + m_historyModel->insertRow (0); + m_historyModel->setData (m_historyModel->index (0), QString (command_history::get_entry (i).c_str ())); + } + } +} + +QStringListModel * +OctaveLink::historyModel () +{ + return m_historyModel; +} diff -r 97e3d1769be0 -r 7925a7d6547b gui/src/backend/OctaveLink.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/gui/src/backend/OctaveLink.h Sat May 19 03:15:00 2012 -0400 @@ -0,0 +1,138 @@ +/* OctaveGUI - A graphical user interface for Octave + * Copyright (C) 2011 John P. Swensen, Jacob Dawid (jacob.dawid@googlemail.com) + * + * 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. + * + * 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 this program. If not, see . + */ + +#ifndef OCTAVELINK_H +#define OCTAVELINK_H + +// Octave includes +#undef PACKAGE_BUGREPORT +#undef PACKAGE_NAME +#undef PACKAGE_STRING +#undef PACKAGE_TARNAME +#undef PACKAGE_VERSION +#undef PACKAGE_URL +#include "octave/config.h" +#include "octave/cmd-edit.h" +#include "octave/error.h" +#include "octave/file-io.h" +#include "octave/input.h" +#include "octave/lex.h" +#include "octave/load-path.h" +#include "octave/octave.h" +#include "octave/oct-hist.h" +#include "octave/oct-map.h" +#include "octave/oct-obj.h" +#include "octave/ops.h" +#include "octave/ov.h" +#include "octave/ov-usr-fcn.h" +#include "octave/symtab.h" +#include "octave/pt.h" +#include "octave/pt-eval.h" +#include "octave/config.h" +#include "octave/Range.h" +#include "octave/toplev.h" +#include "octave/procstream.h" +#include "octave/sighandlers.h" +#include "octave/debug.h" +#include "octave/sysdep.h" +#include "octave/ov.h" +#include "octave/unwind-prot.h" +#include "octave/utils.h" +#include "octave/variables.h" + +// Standard includes +#include +#include +#include +#include + +// Qt includes +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include "OctaveCallbackThread.h" +#include "OctaveMainThread.h" + +typedef symbol_table::symbol_record SymbolRecord; +typedef octave_value OctaveValue; + +/** + * \class OctaveLink + * Manages a link to an octave instance. + */ +class OctaveLink:public QObject +{ + Q_OBJECT +public: + static OctaveLink * + instance () + { + return &m_singleton; + } + static QString + octaveValueAsQString (OctaveValue octaveValue); + + void launchOctave (); + void terminateOctave (); + void acquireSymbolTable () { m_symbolTableSemaphore->acquire (); } + void releaseSymbolTable () { m_symbolTableSemaphore->release (); } + + /** + * For performance reasons this is not thread safe. Before you use this, + * acquire a lock with acquireSymbolTable and releaseSymbolTable. + */ + QList < SymbolRecord > symbolTable (); + + /** + * Returns a copy of the current symbol table buffer. + * \return Copy of the current symbol table buffer. + */ + QList < SymbolRecord > copyCurrentSymbolTable (); + + void triggerUpdateHistoryModel (); + QStringListModel *historyModel (); + void triggerUpdateSymbolTable() { emit updateSymbolTable(); } + +signals: + void updateSymbolTable (); + +private: + OctaveLink (); + ~OctaveLink (); + + /** Variable related member variables. */ + QSemaphore * m_symbolTableSemaphore; + QList < SymbolRecord > m_symbolTableBuffer; + + /** History related member variables. */ + QStringListModel *m_historyModel; + + // Threads for running octave and managing the data interaction. + OctaveMainThread *m_octaveMainThread; + OctaveCallbackThread *m_octaveCallbackThread; + + static OctaveLink m_singleton; +}; +#endif // OCTAVELINK_H diff -r 97e3d1769be0 -r 7925a7d6547b gui/src/backend/OctaveMainThread.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/gui/src/backend/OctaveMainThread.cpp Sat May 19 03:15:00 2012 -0400 @@ -0,0 +1,33 @@ +/* OctaveGUI - A graphical user interface for Octave + * Copyright (C) 2011 Jacob Dawid (jacob.dawid@googlemail.com) + * + * 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. + * + * 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 this program. If not, see . + */ + +#include "OctaveMainThread.h" +#include "OctaveLink.h" + +OctaveMainThread::OctaveMainThread (QObject * parent):QThread (parent) +{ +} + +void +OctaveMainThread::run () +{ + setlocale(LC_ALL, "en_US.UTF-8"); + int argc = 1; + const char *argv[] = { "octave" }; + emit ready(); + octave_main (argc, (char **) argv, 0); +} diff -r 97e3d1769be0 -r 7925a7d6547b gui/src/backend/OctaveMainThread.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/gui/src/backend/OctaveMainThread.h Sat May 19 03:15:00 2012 -0400 @@ -0,0 +1,35 @@ +/* OctaveGUI - A graphical user interface for Octave + * Copyright (C) 2011 Jacob Dawid (jacob.dawid@googlemail.com) + * + * 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. + * + * 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 this program. If not, see . + */ + +#ifndef OCTAVEMAINTHREAD_H +#define OCTAVEMAINTHREAD_H + +#include +class OctaveMainThread:public QThread +{ + Q_OBJECT +public: + OctaveMainThread (QObject * parent); + +signals: + void ready(); + +protected: + void run (); +}; + +#endif // OCTAVEMAINTHREAD_H diff -r 97e3d1769be0 -r 7925a7d6547b gui/src/backend/ReadlineAdapter.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/gui/src/backend/ReadlineAdapter.cpp Sat May 19 03:15:00 2012 -0400 @@ -0,0 +1,23 @@ +/* OctaveGUI - A graphical user interface for Octave + * Copyright (C) 2011 Jacob Dawid (jacob.dawid@googlemail.com) + * + * 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. + * + * 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 this program. If not, see . + */ + +#include "ReadlineAdapter.h" + +ReadlineAdapter::ReadlineAdapter (QObject *parent) : + QObject (parent), command_editor () +{ +} diff -r 97e3d1769be0 -r 7925a7d6547b gui/src/backend/ReadlineAdapter.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/gui/src/backend/ReadlineAdapter.h Sat May 19 03:15:00 2012 -0400 @@ -0,0 +1,37 @@ +/* OctaveGUI - A graphical user interface for Octave + * Copyright (C) 2011 Jacob Dawid (jacob.dawid@googlemail.com) + * + * 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. + * + * 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 this program. If not, see . + */ + +#ifndef READLINEADAPTER_H +#define READLINEADAPTER_H + +#include "octave/config.h" +#include "octave/cmd-edit.h" +#include + +class ReadlineAdapter : public QObject, public command_editor +{ + Q_OBJECT +public: + explicit ReadlineAdapter (QObject *parent = 0); + +signals: + +public slots: + +}; + +#endif // READLINEADAPTER_H diff -r 97e3d1769be0 -r 7925a7d6547b gui/src/lexer/lexeroctavegui.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/gui/src/lexer/lexeroctavegui.cpp Sat May 19 03:15:00 2012 -0400 @@ -0,0 +1,141 @@ +/* OctaveGUI - A graphical user interface for Octave + * Copyright (C) 2011 Jacob Dawid (jacob.dawid@googlemail.com) + * + * 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. + * + * 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 this program. If not, see . + */ + +#include "lexeroctavegui.h" +#include +#include + +// ----------------------------------------------------- +// Some basic functions +// ----------------------------------------------------- +LexerOctaveGui::LexerOctaveGui(QObject *parent) + : QsciLexer(parent) // inherit from base lexer +{ +} + +LexerOctaveGui::~LexerOctaveGui() +{ +} + +const char *LexerOctaveGui::language() const +{ + return "Octave"; // return the name of the language +} + +const char *LexerOctaveGui::lexer() const +{ + return "octave"; // return the name of the lexer +} + +// ----------------------------------------------------- +// The colors for syntax highlighting +// ----------------------------------------------------- +QColor LexerOctaveGui::defaultColor(int style) const +{ + switch (style) + { + case Default: // black + return QColor(0x00,0x00,0x00); + case Operator: // red + return QColor(0xef,0x00,0x00); + case Comment: // gray + return QColor(0x7f,0x7f,0x7f); + case Command: // blue-green + return QColor(0x00,0x7f,0x7f); + case Number: // orange + return QColor(0x7f,0x7f,0x00); + case Keyword: // blue + return QColor(0x00,0x00,0xbf); + case SingleQuotedString: // green + return QColor(0x00,0x7f,0x00); + case DoubleQuotedString: // green-yellow + return QColor(0x4f,0x7f,0x00); + } + return QsciLexer::defaultColor(style); +} + + +// ----------------------------------------------------- +// The font decorations for highlighting +// ----------------------------------------------------- +QFont LexerOctaveGui::defaultFont(int style) const +{ + QFont f; + + switch (style) + { + case Comment: // default but italic + f = QsciLexer::defaultFont(style); + f.setItalic(true); + break; + case Keyword: // default + f = QsciLexer::defaultFont(style); + break; + case Operator: // default + f = QsciLexer::defaultFont(style); + break; + default: // default + f = QsciLexer::defaultFont(style); + break; + } + return f; // return the selected font +} + + +// ----------------------------------------------------- +// Style names +// ----------------------------------------------------- +QString LexerOctaveGui::description(int style) const +{ + switch (style) + { + case Default: + return tr("Default"); + case Comment: + return tr("Comment"); + case Command: + return tr("Command"); + case Number: + return tr("Number"); + case Keyword: + return tr("Keyword"); + case SingleQuotedString: + return tr("Single-quoted string"); + case Operator: + return tr("Operator"); + case Identifier: + return tr("Identifier"); + case DoubleQuotedString: + return tr("Double-quoted string"); + } + return QString(); +} + + +// ----------------------------------------------------- +// The set of keywords for highlighting +// TODO: How to define a second set? +// ----------------------------------------------------- +const char *LexerOctaveGui::keywords(int set) const +{ + if (set == 1) + { + return ResourceManager::instance ()->octaveKeywords (); + } + return 0; +} + diff -r 97e3d1769be0 -r 7925a7d6547b gui/src/lexer/lexeroctavegui.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/gui/src/lexer/lexeroctavegui.h Sat May 19 03:15:00 2012 -0400 @@ -0,0 +1,61 @@ +/* OctaveGUI - A graphical user interface for Octave + * Copyright (C) 2011 Jacob Dawid (jacob.dawid@googlemail.com) + * + * 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. + * + * 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 this program. If not, see . + */ + +#ifndef LEXEROCTAVE_H +#define LEXEROCTAVE_H + +#include "ResourceManager.h" +#include + +#include +#include + + +class LexerOctaveGui : public QsciLexer +{ + Q_OBJECT + +public: + // the used styles + enum + { + Default = 0, + Comment = 1, + Command = 2, + Number = 3, + Keyword = 4, + SingleQuotedString = 5, + Operator = 6, + Identifier = 7, + DoubleQuotedString = 8 + }; + + LexerOctaveGui(QObject *parent = 0); + virtual ~LexerOctaveGui(); + const char *language() const; + const char *lexer() const; + QColor defaultColor(int style) const; + QFont defaultFont(int style) const; + const char *keywords(int set) const; + QString description(int style) const; + +private: + LexerOctaveGui(const LexerOctaveGui &); + LexerOctaveGui &operator=(const LexerOctaveGui &); +}; + +#endif diff -r 97e3d1769be0 -r 7925a7d6547b gui/src/msvc-debug.pri --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/gui/src/msvc-debug.pri Sat May 19 03:15:00 2012 -0400 @@ -0,0 +1,24 @@ +# OctaveGUI - A graphical user interface for Octave +# Copyright (C) 2011 Jacob Dawid (jacob.dawid@googlemail.com) +# +# 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. +# +# 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 this program. If not, see . + +win32-msvc* { + CONFIG += release warn_off + QMAKE_CXXFLAGS += -MP + QMAKE_CXXFLAGS_RELEASE += -Zi + QMAKE_CXXFLAGS_RELEASE -= -O2 + QMAKE_LFLAGS_RELEASE += -debug + QMAKE_CLEAN += $(DESTDIR)$(QMAKE_TARGET).pdb +} diff -r 97e3d1769be0 -r 7925a7d6547b gui/src/msvc.pri --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/gui/src/msvc.pri Sat May 19 03:15:00 2012 -0400 @@ -0,0 +1,11 @@ +CONFIG += release + +QMAKE_CXXFLAGS += -MP +LIBDIR_SUFFIX = release + +msvc-debug { + QMAKE_CXXFLAGS_RELEASE += -Zi + QMAKE_CXXFLAGS_RELEASE -= -O2 + QMAKE_LFLAGS_RELEASE += -debug + QMAKE_CLEAN += $(DESTDIR)$(QMAKE_TARGET).pdb +} diff -r 97e3d1769be0 -r 7925a7d6547b gui/src/src.pro --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/gui/src/src.pro Sat May 19 03:15:00 2012 -0400 @@ -0,0 +1,111 @@ +# OctaveGUI - A graphical user interface for Octave +# Copyright (C) 2011 Jacob Dawid (jacob.dawid@googlemail.com) +# +# 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. +# +# 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 this program. If not, see . + +# Basic settings: +QT += core gui webkit network # Qt modules +TEMPLATE = app # Build as application +TARGET = octave-gui # Name of the target binary + +DESTDIR = ../bin # Destination of the output + +TRANSLATIONS += languages/generic.ts \ + languages/de-de.ts \ + languages/pt-br.ts \ + languages/es-es.ts \ + languages/ru-ru.ts \ + languages/uk-ua.ts # Available translations + +win32-msvc*: include(msvc.pri) + +LIBS += -lqscintilla2 \ + -L../qterminal/libqterminal/$$LIBDIR_SUFFIX -lqterminal \ + $$system(mkoctfile -p LIBS) \ + $$system(mkoctfile -p OCTAVE_LIBS) + +mac { + CONFIG -= app_bundle +} + +# Includepaths and libraries to link against: +INCLUDEPATH += . backend ../qterminal/libqterminal \ + $$system(mkoctfile -p INCFLAGS) +INCFLAGS += $$system(mkoctfile -p INCFLAGS) +mac { + INCFLAGS += -I/opt/local/include +} + +QMAKE_LIBDIR += $$system(octave-config -p OCTLIBDIR) +unix { + QMAKE_RPATHDIR += $$system(octave-config -p OCTLIBDIR) +} + +mac { + LFLAGS += -L/opt/local/lib +} + +unix { + LIBS += -lutil +} + +win32-g++ { + QMAKE_LFLAGS += --enable-auto-import +} + +win32-msvc* { + DEFINES += QSCINTILLA_DLL + QMAKE_CXXFLAGS += -wd4244 +} + +QMAKE_LFLAGS += $$LFLAGS $$system(mkoctfile -p RLD_FLAG) +QMAKE_CXXFLAGS += $$INCFLAGS + +# Files associated with the project: +SOURCES +=\ + lexer/lexeroctavegui.cpp \ + MainWindow.cpp \ + WorkspaceView.cpp \ + HistoryDockWidget.cpp \ + FilesDockWidget.cpp \ + SettingsDialog.cpp \ + OctaveGUI.cpp \ + ResourceManager.cpp \ + CommandLineParser.cpp \ + backend/OctaveCallbackThread.cpp \ + backend/OctaveLink.cpp \ + backend/OctaveMainThread.cpp \ + backend/ReadlineAdapter.cpp \ + WelcomeWizard.cpp \ + FileEditor.cpp + +HEADERS += \ + lexer/lexeroctavegui.h \ + MainWindow.h \ + WorkspaceView.h \ + HistoryDockWidget.h \ + FilesDockWidget.h \ + SettingsDialog.h \ + ResourceManager.h \ + CommandLineParser.h \ + backend/OctaveCallbackThread.h \ + backend/OctaveLink.h \ + backend/OctaveMainThread.h \ + backend/ReadlineAdapter.h \ + WelcomeWizard.h \ + FileEditor.h + +FORMS += \ + SettingsDialog.ui \ + WelcomeWizard.ui diff -r 97e3d1769be0 -r 7925a7d6547b gui/translators --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/gui/translators Sat May 19 03:15:00 2012 -0400 @@ -0,0 +1,8 @@ +# Below Octave GUI translators are listed with their e-mails +# to be able inform them about generic translation file changes +en-en Jacob Dawid +es-es Valentin Ortega-Clavero +de-de Jacob Dawid +pt-br Júlio Hoffimann Mendes +ru-ru Andriy Shinkarchuck +uk-ua Andriy Shinkarchuck diff -r 97e3d1769be0 -r 7925a7d6547b scripts/plot/__gnuplot_drawnow__.m diff -r 97e3d1769be0 -r 7925a7d6547b src/symtab.h