Mercurial > hg > octave-lyh

diff gui/src/MainWindow.h @ 14599:97cb9286919c gui

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Cleaned up code. * .hgsub: Removed IRC Widget. * gui.pro: Removed dependency on IRC Widget and removed files. * class FileEditorMdiSubWindow: Renamed to FileEditor. File editor windows are now independent windows, thus removed the extra close button. * MainWindow: Removed MDI Area and replaced it with the terminal instead. * BrowserWidget: Removed browser widget. * SettingsDialog: Rearranged settings for the editor, removed tab for shortcuts. * OctaveCallbackThread: Raised update intervals from 0,5s to 1s. * OctaveLink: Replaced signals names for triggering updates on the symbol table. * WorkspaceView: Adjusted connect statements to fit the new signal names.
author Jacob Dawid <jacob.dawid@googlemail.com>
date Mon, 07 May 2012 00:53:54 +0200
parents fa52c6e84ae0
children c8453a013000
line wrap: on
line diff
--- a/gui/src/MainWindow.h
+++ b/gui/src/MainWindow.h
@@ -18,6 +18,7 @@
 #ifndef MAINWINDOW_H
 #define MAINWINDOW_H
 
+// Qt includes
 #include <QtGui/QMainWindow>
 #include <QThread>
 #include <QTabWidget>
@@ -25,32 +26,22 @@
 #include <QStatusBar>
 #include <QToolBar>
 #include <QQueue>
-#include <Qsci/qsciapis.h>
 #include <QMdiSubWindow>
 #include <QCloseEvent>
+
+// QScintilla includes
+#include <Qsci/qsciapis.h>
+#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"
-#include "BrowserWidget.h"
-#include "lexer/lexeroctavegui.h"
-#include "QTerminal.h"
-#include "QIRCWidget.h"
-
-class NonClosableMdiSubWindow : public QMdiSubWindow
-{
-  Q_OBJECT
-public:
-  explicit NonClosableMdiSubWindow (QWidget *parent = 0)
-    : QMdiSubWindow (parent) { }
-  virtual ~NonClosableMdiSubWindow () { }
-protected:
-  void closeEvent (QCloseEvent *closeEvent)
-  {
-    closeEvent->ignore ();
-  }
-};
 
 /**
   * \class MainWindow
@@ -85,23 +76,19 @@
   void settingsChanged ();
 
 public slots:
-  void handleOpenFileRequest (QString fileName);
+  void openExistingFile (QString fileName);
   void reportStatusMessage (QString statusMessage);
-  void openWebPage (QString url);
-  void openChat ();
   void handleSaveWorkspaceRequest ();
   void handleLoadWorkspaceRequest ();
   void handleClearWorkspaceRequest ();
   void handleCommandDoubleClicked (QString command);
-  void alignMdiWindows ();
-  void openEditor ();
-  void openEditorFile (QString fileName);
+  void newFile ();
+  void newEditorWindow (QString fileName);
   void openBugTrackerPage ();
   void openAgoraPage ();
   void openOctaveForgePage ();
   void processSettingsDialogRequest ();
   void showAboutOctave ();
-  void showAboutQt ();
   void updateTerminalFont ();
 
 protected:
@@ -112,15 +99,8 @@
 private:
   void construct ();
   void establishOctaveLink ();
-  QMdiArea *m_centralMdiArea;
 
-  // Mdi sub windows.
   QTerminal *m_terminalView;
-  BrowserWidget *m_documentationWidget;
-  QIRCWidget *m_ircWidget;
-
-  NonClosableMdiSubWindow *m_terminalViewSubWindow;
-  NonClosableMdiSubWindow *m_documentationWidgetSubWindow;
 
   // Dock widgets.
   WorkspaceView *m_workspaceView;