Mercurial > octave-nkf
diff gui/src/MainWindow.h @ 13506:c70511cf64ee
Reformatted to GNU Style.
author | Jacob Dawid <jacob.dawid@googlemail.com> |
---|---|
date | Sun, 17 Jul 2011 22:59:28 +0200 |
parents | 13e3d60aff2d |
children | 86adc9c4ec4b |
line wrap: on
line diff
--- a/gui/src/MainWindow.h Sun Jul 17 20:37:14 2011 +0200 +++ b/gui/src/MainWindow.h Sun Jul 17 22:59:28 2011 +0200 @@ -63,7 +63,7 @@ #include "cmd-edit.h" typedef struct yy_buffer_state *YY_BUFFER_STATE; -extern OCTINTERP_API YY_BUFFER_STATE create_buffer (FILE *f); +extern OCTINTERP_API YY_BUFFER_STATE create_buffer (FILE * f); extern OCTINTERP_API void switch_to_buffer (YY_BUFFER_STATE buf); extern OCTINTERP_API FILE *get_input_from_stdin (void); @@ -85,110 +85,133 @@ * * Represents the main window. */ -class MainWindow : public QMainWindow { - Q_OBJECT -public: - MainWindow(QWidget *parent = 0); - ~MainWindow(); - - bool isRunning() { return m_isRunning; } - OctaveTerminal *octaveTerminal() { return m_octaveTerminal; } - VariablesDockWidget *variablesDockWidget() { return m_variablesDockWidget; } - HistoryDockWidget *historyDockWidget() { return m_historyDockWidget; } - FilesDockWidget *filesDockWidget() { return m_filesDockWidget; } +class MainWindow:public QMainWindow +{ +Q_OBJECT public: + MainWindow (QWidget * parent = 0); + ~MainWindow (); -public slots: - void handleOpenFileRequest(QString fileName); - void reportStatusMessage(QString statusMessage); - void openWebPage(QString url); - void handleSaveWorkspaceRequest(); - void handleLoadWorkspaceRequest(); - void handleClearWorkspaceRequest(); - void handleCommandDoubleClicked(QString command); - void alignMdiWindows(); - void openBugTrackerPage(); - void processSettingsDialogRequest(); + bool isRunning () + { + return m_isRunning; + } + OctaveTerminal *octaveTerminal () + { + return m_octaveTerminal; + } + VariablesDockWidget *variablesDockWidget () + { + return m_variablesDockWidget; + } + HistoryDockWidget *historyDockWidget () + { + return m_historyDockWidget; + } + FilesDockWidget *filesDockWidget () + { + return m_filesDockWidget; + } + + public slots:void handleOpenFileRequest (QString fileName); + void reportStatusMessage (QString statusMessage); + void openWebPage (QString url); + void handleSaveWorkspaceRequest (); + void handleLoadWorkspaceRequest (); + void handleClearWorkspaceRequest (); + void handleCommandDoubleClicked (QString command); + void alignMdiWindows (); + void openBugTrackerPage (); + void processSettingsDialogRequest (); protected: - void closeEvent(QCloseEvent *closeEvent); - void readSettings(); - void writeSettings(); + void closeEvent (QCloseEvent * closeEvent); + void readSettings (); + void writeSettings (); private: - void construct(); - void establishOctaveLink(); - QMdiArea *m_centralMdiArea; + void construct (); + void establishOctaveLink (); + QMdiArea *m_centralMdiArea; - // Mdi sub windows. - OctaveTerminal *m_octaveTerminal; - BrowserWidget *m_documentationWidget; - IRCWidget *m_ircWidget; + // Mdi sub windows. + OctaveTerminal *m_octaveTerminal; + BrowserWidget *m_documentationWidget; + IRCWidget *m_ircWidget; - QMdiSubWindow *m_octaveTerminalSubWindow; - QMdiSubWindow *m_documentationWidgetSubWindow; - QMdiSubWindow *m_ircWidgetSubWindow; + QMdiSubWindow *m_octaveTerminalSubWindow; + QMdiSubWindow *m_documentationWidgetSubWindow; + QMdiSubWindow *m_ircWidgetSubWindow; - // Dock widgets. - VariablesDockWidget *m_variablesDockWidget; - HistoryDockWidget *m_historyDockWidget; - FilesDockWidget *m_filesDockWidget; + // Dock widgets. + VariablesDockWidget *m_variablesDockWidget; + HistoryDockWidget *m_historyDockWidget; + FilesDockWidget *m_filesDockWidget; - // Toolbars. - QStatusBar *m_statusBar; + // Toolbars. + QStatusBar *m_statusBar; - QString m_settingsFile; + QString m_settingsFile; - // Threads for running octave and managing the data interaction. - OctaveMainThread *m_octaveMainThread; - OctaveCallbackThread *m_octaveCallbackThread; - bool m_isRunning; + // Threads for running octave and managing the data interaction. + OctaveMainThread *m_octaveMainThread; + OctaveCallbackThread *m_octaveCallbackThread; + bool m_isRunning; }; -class OctaveMainThread : public QThread { - Q_OBJECT -public: - OctaveMainThread(QObject *parent) - : QThread(parent) { - } +class OctaveMainThread:public QThread +{ +Q_OBJECT public: + OctaveMainThread (QObject * parent):QThread (parent) + { + } protected: - void run() { - int argc = 3; - const char* argv[] = {"octave", "--interactive", "--line-editing"}; - octave_main(argc, (char**)argv, 1); - main_loop(); - clean_up_and_exit(0); - } + void run () + { + int argc = 3; + const char *argv[] = { "octave", "--interactive", "--line-editing" }; + octave_main (argc, (char **) argv, 1); + main_loop (); + clean_up_and_exit (0); + } }; -class OctaveCallbackThread : public QThread { - Q_OBJECT -public: - OctaveCallbackThread(QObject *parent, MainWindow *mainWindow) - : QThread(parent), - m_mainWindow(mainWindow) { - } +class OctaveCallbackThread:public QThread +{ +Q_OBJECT public: + OctaveCallbackThread (QObject * parent, + MainWindow * mainWindow):QThread (parent), + m_mainWindow (mainWindow) + { + } protected: - void run() { - while(m_mainWindow->isRunning()) { + void run () + { + while (m_mainWindow->isRunning ()) + { - // Get a full variable list. - QList<SymbolRecord> symbolTable = OctaveLink::instance()->currentSymbolTable(); - if(symbolTable.size()) { - m_mainWindow->variablesDockWidget()->setVariablesList(symbolTable); - } + // Get a full variable list. + QList < SymbolRecord > symbolTable = + OctaveLink::instance ()->currentSymbolTable (); + if (symbolTable.size ()) + { + m_mainWindow->variablesDockWidget ()-> + setVariablesList (symbolTable); + } - // Collect history list. - string_vector historyList = OctaveLink::instance()->currentHistory(); - if(historyList.length()) { - m_mainWindow->historyDockWidget()->updateHistory(historyList); - } + // Collect history list. + string_vector historyList = + OctaveLink::instance ()->currentHistory (); + if (historyList.length ()) + { + m_mainWindow->historyDockWidget ()->updateHistory (historyList); + } - usleep(100000); - } - } + usleep (100000); + } + } private: - MainWindow *m_mainWindow; + MainWindow * m_mainWindow; }; #endif // MAINWINDOW_H