octave: gui/src/octave-gui.cc annotate

annotate gui/src/octave-gui.cc @ 15139:bfc220d1de67 gui

include gui in default Octave binary * Makefile.am (GUIDIR): New variable. (SUBDIRS): Use it in the list instead of @GUIDIR@. List $(GUIDIR) before src. * gui/src/Makefile.am (bin_PROGRAMS): Delete. (octlib_LTLIBRARIES): New variable. (liboctgui_la_SOURCES): Rename from octave_gui_SOURCES. (liboctgui_la_CPPFLAGS): Rename from octave_gui_CPPFLAGS. (liboctgui_la_LIBADD): Rename from octave_gui_LDADD. Don't include Octave libraries in the list. Do include Qt libraries in the list. (liboctgui_la_LDFLAGS): Rename from octave_gui_LDFLAGS. Only include -L@QT_LIBDIR@ option in the list. (moc_%.cpp): Use $(liboctgui_la_CPPFLAGS) in rules, not $(octave_gui_CPPFLAGS). * octave-gui.h: New file. * octave-gui.cc: Include it. (dissociate_terminal): In parent, wait for child process and exit with exit status of child. (octave_start_gui): Rename from main. * run-octave.in: Start with GUI by default. Rename -gui option -cli to allow running octave-cli binary. * main.cc, main-cli.cc: New files. * main.c: Delete. * src/Makefile (bin_PROGRAMS): Include octave-cli in the list. (OCTAVE_CORE_LIBS): New variable. (octave_cli_SOURCES, octave_cli_LDADD, octave_cli_LDFLAGS): New variables. (octave_SOURCES): Define to main.cc, not main.c. (octave_CPPFLAGS): New variable. (octave_LDFLAGS): Include -DENABLE_GUI=1 in the list. (octave_LDADD): Use $(OCTAVE_CORE_LIBS) and link with GUI lib. * octave.cc (force_gui_option, no_gui_option): New static variables. (octave_starting_gui): New function. (usage_string): Update for new options. (FORCE_GUI_OPTION, NO_GUI_OPTION): New macros. (long_opts): Include "force-gui" and "no-gui" options in the list. (octave_main): Handle FORCE_GUI_OPTION and NO_GUI_OPTION cases. Error if both --force-gui and --no-gui are used. * octave.h (octave_starting_gui): Provide decl.

author	John W. Eaton <jwe@octave.org>
date	Fri, 10 Aug 2012 10:27:32 -0400
parents	16a6b0a6855d
children	9e62d5a3a45e

rev	line source
13504 13e3d60aff2d Replaced Quint with OctaveGUI. Jacob Dawid <jacob.dawid@googlemail.com> parents: 13501 diff changeset	1 /* OctaveGUI - A graphical user interface for Octave
13674 c0e66d6e3dc8 Updated license headers and moved to AGPLv3. Jacob Dawid <jacob.dawid@googlemail.com> parents: 13672 diff changeset	2 * Copyright (C) 2011 Jacob Dawid (jacob.dawid@googlemail.com)
13501 86d6c3b90ad7 Added new gui files. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	3 *
86d6c3b90ad7 Added new gui files. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	4 * This program is free software: you can redistribute it and/or modify
14290 faece6b2ab90 Corrected license headers in all files to GPL. Jacob Dawid <jacob.dawid@googlemail.com> parents: 13674 diff changeset	5 * it under the terms of the GNU General Public License as
13674 c0e66d6e3dc8 Updated license headers and moved to AGPLv3. Jacob Dawid <jacob.dawid@googlemail.com> parents: 13672 diff changeset	6 * published by the Free Software Foundation, either version 3 of the
c0e66d6e3dc8 Updated license headers and moved to AGPLv3. Jacob Dawid <jacob.dawid@googlemail.com> parents: 13672 diff changeset	7 * License, or (at your option) any later version.
13501 86d6c3b90ad7 Added new gui files. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	8 *
86d6c3b90ad7 Added new gui files. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	9 * This program is distributed in the hope that it will be useful,
86d6c3b90ad7 Added new gui files. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	10 * but WITHOUT ANY WARRANTY; without even the implied warranty of
86d6c3b90ad7 Added new gui files. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14290 faece6b2ab90 Corrected license headers in all files to GPL. Jacob Dawid <jacob.dawid@googlemail.com> parents: 13674 diff changeset	12 * GNU General Public License for more details.
13501 86d6c3b90ad7 Added new gui files. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	13 *
14290 faece6b2ab90 Corrected license headers in all files to GPL. Jacob Dawid <jacob.dawid@googlemail.com> parents: 13674 diff changeset	14 * You should have received a copy of the GNU General Public License
13674 c0e66d6e3dc8 Updated license headers and moved to AGPLv3. Jacob Dawid <jacob.dawid@googlemail.com> parents: 13672 diff changeset	15 * along with this program. If not, see <http://www.gnu.org/licenses/>.
13501 86d6c3b90ad7 Added new gui files. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	16 */
86d6c3b90ad7 Added new gui files. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	17
86d6c3b90ad7 Added new gui files. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	18 #include <QtGui/QApplication>
86d6c3b90ad7 Added new gui files. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	19 #include <QTranslator>
86d6c3b90ad7 Added new gui files. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	20 #include <QSettings>
14707 674740c44c09 Changed various files to matche file naming conventions. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14703 diff changeset	21 #include "welcome-wizard.h"
674740c44c09 Changed various files to matche file naming conventions. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14703 diff changeset	22 #include "resource-manager.h"
674740c44c09 Changed various files to matche file naming conventions. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14703 diff changeset	23 #include "main-window.h"
15139 bfc220d1de67 include gui in default Octave binary John W. Eaton <jwe@octave.org> parents: 15137 diff changeset	24 #include "octave-gui.h"
13501 86d6c3b90ad7 Added new gui files. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	25
15137 16a6b0a6855d GUI: support for octave arguments and integrate with run-octave. John W. Eaton <jwe@octave.org> parents: 15081 diff changeset	26 // Dissociate from the controlling terminal, if any.
16a6b0a6855d GUI: support for octave arguments and integrate with run-octave. John W. Eaton <jwe@octave.org> parents: 15081 diff changeset	27
16a6b0a6855d GUI: support for octave arguments and integrate with run-octave. John W. Eaton <jwe@octave.org> parents: 15081 diff changeset	28 static void
16a6b0a6855d GUI: support for octave arguments and integrate with run-octave. John W. Eaton <jwe@octave.org> parents: 15081 diff changeset	29 dissociate_terminal (void)
13501 86d6c3b90ad7 Added new gui files. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	30 {
15137 16a6b0a6855d GUI: support for octave arguments and integrate with run-octave. John W. Eaton <jwe@octave.org> parents: 15081 diff changeset	31 #if ! defined (Q_OS_WIN32) \|\| defined (Q_OS_CYGWIN)
15139 bfc220d1de67 include gui in default Octave binary John W. Eaton <jwe@octave.org> parents: 15137 diff changeset	32
15137 16a6b0a6855d GUI: support for octave arguments and integrate with run-octave. John W. Eaton <jwe@octave.org> parents: 15081 diff changeset	33 pid_t pid = fork ();
14878 a6c44c28dabe Added patch from jwe that forks the GUI process in order to have less work. Jacob Dawid <jacob.dawid@gmail.com> parents: 14804 diff changeset	34
a6c44c28dabe Added patch from jwe that forks the GUI process in order to have less work. Jacob Dawid <jacob.dawid@gmail.com> parents: 14804 diff changeset	35 if (pid < 0)
a6c44c28dabe Added patch from jwe that forks the GUI process in order to have less work. Jacob Dawid <jacob.dawid@gmail.com> parents: 14804 diff changeset	36 {
15137 16a6b0a6855d GUI: support for octave arguments and integrate with run-octave. John W. Eaton <jwe@octave.org> parents: 15081 diff changeset	37 std::cerr << "fork failed!" << std::endl;;
16a6b0a6855d GUI: support for octave arguments and integrate with run-octave. John W. Eaton <jwe@octave.org> parents: 15081 diff changeset	38 exit (1);
14878 a6c44c28dabe Added patch from jwe that forks the GUI process in order to have less work. Jacob Dawid <jacob.dawid@gmail.com> parents: 14804 diff changeset	39 }
a6c44c28dabe Added patch from jwe that forks the GUI process in order to have less work. Jacob Dawid <jacob.dawid@gmail.com> parents: 14804 diff changeset	40 else if (pid == 0)
a6c44c28dabe Added patch from jwe that forks the GUI process in order to have less work. Jacob Dawid <jacob.dawid@gmail.com> parents: 14804 diff changeset	41 {
15137 16a6b0a6855d GUI: support for octave arguments and integrate with run-octave. John W. Eaton <jwe@octave.org> parents: 15081 diff changeset	42 // Child.
14878 a6c44c28dabe Added patch from jwe that forks the GUI process in order to have less work. Jacob Dawid <jacob.dawid@gmail.com> parents: 14804 diff changeset	43
a6c44c28dabe Added patch from jwe that forks the GUI process in order to have less work. Jacob Dawid <jacob.dawid@gmail.com> parents: 14804 diff changeset	44 if (setsid () < 0)
a6c44c28dabe Added patch from jwe that forks the GUI process in order to have less work. Jacob Dawid <jacob.dawid@gmail.com> parents: 14804 diff changeset	45 {
15137 16a6b0a6855d GUI: support for octave arguments and integrate with run-octave. John W. Eaton <jwe@octave.org> parents: 15081 diff changeset	46 std::cerr << "setsid error" << std::endl;
16a6b0a6855d GUI: support for octave arguments and integrate with run-octave. John W. Eaton <jwe@octave.org> parents: 15081 diff changeset	47 exit (1);
14878 a6c44c28dabe Added patch from jwe that forks the GUI process in order to have less work. Jacob Dawid <jacob.dawid@gmail.com> parents: 14804 diff changeset	48 }
a6c44c28dabe Added patch from jwe that forks the GUI process in order to have less work. Jacob Dawid <jacob.dawid@gmail.com> parents: 14804 diff changeset	49 }
a6c44c28dabe Added patch from jwe that forks the GUI process in order to have less work. Jacob Dawid <jacob.dawid@gmail.com> parents: 14804 diff changeset	50 else
15139 bfc220d1de67 include gui in default Octave binary John W. Eaton <jwe@octave.org> parents: 15137 diff changeset	51 {
bfc220d1de67 include gui in default Octave binary John W. Eaton <jwe@octave.org> parents: 15137 diff changeset	52 // Parent
bfc220d1de67 include gui in default Octave binary John W. Eaton <jwe@octave.org> parents: 15137 diff changeset	53
bfc220d1de67 include gui in default Octave binary John W. Eaton <jwe@octave.org> parents: 15137 diff changeset	54 int status;
bfc220d1de67 include gui in default Octave binary John W. Eaton <jwe@octave.org> parents: 15137 diff changeset	55
bfc220d1de67 include gui in default Octave binary John W. Eaton <jwe@octave.org> parents: 15137 diff changeset	56 waitpid (pid, &status, 0);
bfc220d1de67 include gui in default Octave binary John W. Eaton <jwe@octave.org> parents: 15137 diff changeset	57
bfc220d1de67 include gui in default Octave binary John W. Eaton <jwe@octave.org> parents: 15137 diff changeset	58 exit (WIFEXITED (status) ? WEXITSTATUS (status) : 127);
bfc220d1de67 include gui in default Octave binary John W. Eaton <jwe@octave.org> parents: 15137 diff changeset	59 }
bfc220d1de67 include gui in default Octave binary John W. Eaton <jwe@octave.org> parents: 15137 diff changeset	60
15137 16a6b0a6855d GUI: support for octave arguments and integrate with run-octave. John W. Eaton <jwe@octave.org> parents: 15081 diff changeset	61 #endif
16a6b0a6855d GUI: support for octave arguments and integrate with run-octave. John W. Eaton <jwe@octave.org> parents: 15081 diff changeset	62 }
16a6b0a6855d GUI: support for octave arguments and integrate with run-octave. John W. Eaton <jwe@octave.org> parents: 15081 diff changeset	63
16a6b0a6855d GUI: support for octave arguments and integrate with run-octave. John W. Eaton <jwe@octave.org> parents: 15081 diff changeset	64 int
15139 bfc220d1de67 include gui in default Octave binary John W. Eaton <jwe@octave.org> parents: 15137 diff changeset	65 octave_start_gui (int argc, char *argv[])
15137 16a6b0a6855d GUI: support for octave arguments and integrate with run-octave. John W. Eaton <jwe@octave.org> parents: 15081 diff changeset	66 {
16a6b0a6855d GUI: support for octave arguments and integrate with run-octave. John W. Eaton <jwe@octave.org> parents: 15081 diff changeset	67 dissociate_terminal ();
14878 a6c44c28dabe Added patch from jwe that forks the GUI process in order to have less work. Jacob Dawid <jacob.dawid@gmail.com> parents: 14804 diff changeset	68
13506 c70511cf64ee Reformatted to GNU Style. Jacob Dawid <jacob.dawid@googlemail.com> parents: 13504 diff changeset	69 QApplication application (argc, argv);
15137 16a6b0a6855d GUI: support for octave arguments and integrate with run-octave. John W. Eaton <jwe@octave.org> parents: 15081 diff changeset	70
13668 421afeae929b Added a settings wizard that appears at first startup of Octave GUI. Jacob Dawid <jacob.dawid@googlemail.com> parents: 13658 diff changeset	71 while (true)
421afeae929b Added a settings wizard that appears at first startup of Octave GUI. Jacob Dawid <jacob.dawid@googlemail.com> parents: 13658 diff changeset	72 {
14712 5cb54cca8a06 Completion of code reformatting. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14709 diff changeset	73 if (resource_manager::instance ()->is_first_run ())
13668 421afeae929b Added a settings wizard that appears at first startup of Octave GUI. Jacob Dawid <jacob.dawid@googlemail.com> parents: 13658 diff changeset	74 {
14709 f50591409306 Started to rename class names and methods from camel case to underscore- Jacob Dawid <jacob.dawid@googlemail.com> parents: 14707 diff changeset	75 welcome_wizard welcomeWizard;
14804 a565c560e654 Replaced a lot of terminal interaction with events: Clearing, loading and saving workspace, running a file. Default location for saving a new file is now the current working directory. Fixed bad settings with a fresh installation of the GUI by providing a file with default settings and installing it when appropriate. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14712 diff changeset	76 welcomeWizard.exec ();
14712 5cb54cca8a06 Completion of code reformatting. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14709 diff changeset	77 resource_manager::instance ()->reload_settings ();
13668 421afeae929b Added a settings wizard that appears at first startup of Octave GUI. Jacob Dawid <jacob.dawid@googlemail.com> parents: 13658 diff changeset	78 }
421afeae929b Added a settings wizard that appears at first startup of Octave GUI. Jacob Dawid <jacob.dawid@googlemail.com> parents: 13658 diff changeset	79 else
421afeae929b Added a settings wizard that appears at first startup of Octave GUI. Jacob Dawid <jacob.dawid@googlemail.com> parents: 13658 diff changeset	80 {
14712 5cb54cca8a06 Completion of code reformatting. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14709 diff changeset	81 QSettings *settings = resource_manager::instance ()->get_settings ();
13668 421afeae929b Added a settings wizard that appears at first startup of Octave GUI. Jacob Dawid <jacob.dawid@googlemail.com> parents: 13658 diff changeset	82 QString language = settings->value ("language").toString ();
13613 8728061cd0ec Icons are now maintained by the ResourceManager. Jacob Dawid <jacob.dawid@googlemail.com> parents: 13607 diff changeset	83
14712 5cb54cca8a06 Completion of code reformatting. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14709 diff changeset	84 QString translatorFile = resource_manager::instance ()->find_translator_file (language);
13668 421afeae929b Added a settings wizard that appears at first startup of Octave GUI. Jacob Dawid <jacob.dawid@googlemail.com> parents: 13658 diff changeset	85 QTranslator translator;
421afeae929b Added a settings wizard that appears at first startup of Octave GUI. Jacob Dawid <jacob.dawid@googlemail.com> parents: 13658 diff changeset	86 translator.load (translatorFile);
421afeae929b Added a settings wizard that appears at first startup of Octave GUI. Jacob Dawid <jacob.dawid@googlemail.com> parents: 13658 diff changeset	87 application.installTranslator (&translator);
421afeae929b Added a settings wizard that appears at first startup of Octave GUI. Jacob Dawid <jacob.dawid@googlemail.com> parents: 13658 diff changeset	88
14712 5cb54cca8a06 Completion of code reformatting. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14709 diff changeset	89 resource_manager::instance ()->update_network_settings ();
13668 421afeae929b Added a settings wizard that appears at first startup of Octave GUI. Jacob Dawid <jacob.dawid@googlemail.com> parents: 13658 diff changeset	90
14709 f50591409306 Started to rename class names and methods from camel case to underscore- Jacob Dawid <jacob.dawid@googlemail.com> parents: 14707 diff changeset	91 main_window w;
13668 421afeae929b Added a settings wizard that appears at first startup of Octave GUI. Jacob Dawid <jacob.dawid@googlemail.com> parents: 13658 diff changeset	92 w.show ();
421afeae929b Added a settings wizard that appears at first startup of Octave GUI. Jacob Dawid <jacob.dawid@googlemail.com> parents: 13658 diff changeset	93 return application.exec ();
421afeae929b Added a settings wizard that appears at first startup of Octave GUI. Jacob Dawid <jacob.dawid@googlemail.com> parents: 13658 diff changeset	94 }
421afeae929b Added a settings wizard that appears at first startup of Octave GUI. Jacob Dawid <jacob.dawid@googlemail.com> parents: 13658 diff changeset	95 }
13501 86d6c3b90ad7 Added new gui files. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	96 }

Mercurial > octave

annotate gui/src/octave-gui.cc @ 15139:bfc220d1de67 gui