Mercurial > octave-nkf

diff gui/src/MainWindow.h @ 14676:35512b788af2 gui

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Editor can now handle multiple files in tabs. * FileEditorInterface (new class): Interface class fpr the file editor. * FileEditorTab (new class): File editor unit for editing a single file. * MainWindow: Adjusted includes and method calls. * FileEditor: Replaced code that allowed editing a file with code that manages tabs and delegates button clicks. * src.pro: Added new files.
author Jacob Dawid <jacob.dawid@googlemail.com>
date Wed, 23 May 2012 20:25:07 +0200
parents 252a86f8fe62
children d6d250812c01
line wrap: on
line diff
--- a/gui/src/MainWindow.h	Wed May 23 10:50:08 2012 +0200
+++ b/gui/src/MainWindow.h	Wed May 23 20:25:07 2012 +0200
@@ -30,9 +30,8 @@
 #include <QCloseEvent>
 #include <QToolButton>
 
-// QScintilla includes
-#include <Qsci/qsciapis.h>
-#include "lexeroctavegui.h"
+// Editor includes
+#include "FileEditorInterface.h"
 
 // QTerminal includes
 #include "QTerminal.h"
@@ -77,14 +76,13 @@
   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 openFile ();
   void openBugTrackerPage ();
   void openAgoraPage ();
   void openOctaveForgePage ();
@@ -102,16 +100,13 @@
   void establishOctaveLink ();
 
   QTerminal *m_terminalView;
+  FileEditorInterface *m_fileEditor;
 
   // Dock widgets.
   WorkspaceView *m_workspaceView;
   HistoryDockWidget *m_historyDockWidget;
   FilesDockWidget *m_filesDockWidget;
 
-  // Editor's lexer
-  LexerOctaveGui *m_lexer;
-  QsciAPIs *m_lexerAPI;
-
   // Toolbars.
   QStatusBar *m_statusBar;