In the middle of chasing down MDI not activating bug, renaming of Graphic to

[architektonas] / src / mainapp / applicationwindow.h

diff --git a/src/mainapp/applicationwindow.h b/src/mainapp/applicationwindow.h
index 588de6d67a01b9ff162214a799534dad29ebf605..2ae43296c72e7d91c2c4a8f6dda30c1d5079a9b2 100644 (file)
--- a/src/mainapp/applicationwindow.h
+++ b/src/mainapp/applicationwindow.h
@@ -3,7 +3,7 @@
 
 #include <QtGui>
 
-#include "rs_document.h"
+#include "document.h"
 #include "qc_dialogfactory.h"
 #include "mdiwindow.h"
 #include "actionhandler.h"
@@ -15,13 +15,13 @@
 #include "commandwidget.h"
 #include "librarywidget.h"
 
-#ifdef RS_SCRIPTING
+#ifdef SCRIPTING
 #include "qs_scripter.h"
 #include <qsproject.h>
 #endif
 
 #ifdef RS_CAM
-#include "rs_simulationcontrols.h"
+#include "simulationcontrols.h"
 #endif
 
 class RecentFiles;
@@ -48,10 +48,10 @@ class ApplicationWindow: public QMainWindow, public QG_MainWindowInterface
                void storeSettings();
                void initMDI();
                void initView();
-               bool queryExit(bool force);
+               bool QueryExit(void);
 
                /** Catch hotkey for giving focus to command line. */
-               virtual void keyPressEvent(QKeyEvent* e);
+               virtual void keyPressEvent(QKeyEvent * e);
                virtual void keyReleaseEvent(QKeyEvent * e);
 
        public slots:
@@ -59,7 +59,6 @@ class ApplicationWindow: public QMainWindow, public QG_MainWindowInterface
                void finishSplashScreen();
                void slotFocus();
                void slotBack();
-               //void slotNext();
                void slotEnter();
                void slotFocusCommandLine();
                void slotError(const QString & msg);
@@ -70,20 +69,15 @@ class ApplicationWindow: public QMainWindow, public QG_MainWindowInterface
                void slotTileHorizontal();
                void slotTileVertical();
 
-               void slotPenChanged(RS_Pen p);
+               void slotPenChanged(Pen p);
 
                /** generates a new document for a graphic. */
-               MDIWindow * slotFileNew(RS_Document * doc = NULL);
+               MDIWindow * slotFileNew(Document * doc = NULL);
                /** opens a document */
                void slotFileOpen();
-               /**
-               * opens a recent file document
-               * @param id File Menu id of the file
-               */
+               /** opens a recent file document */
                void slotFileOpenRecent(void);
-               /**
-               * opens the given file.
-               */
+               /** opens the given file. */
                void slotFileOpen(const QString & fileName, RS2::FormatType type);
                /** saves a document */
                void slotFileSave();
@@ -104,25 +98,13 @@ class ApplicationWindow: public QMainWindow, public QG_MainWindowInterface
                /** exits the application */
                void slotFileQuit();
 
-               /** forces to quit QCad (demo) */
-               void slotFileDemoQuit();
-
                /** toggle the grid */
                void slotViewGrid(bool toggle);
                /** toggle the draft mode */
                void slotViewDraft(bool toggle);
                /** toggle the statusbar */
                void slotViewStatusBar(bool toggle);
-               /** toggle the layerlist */
-               //void slotViewLayerList(bool toggle);
-               /** toggle the blocklist */
-               //void slotViewBlockList(bool toggle);
-               /** toggle the command line */
-               //void slotViewCommandLine(bool toggle);
-               /** toggle the option toolbar */
-               //void slotViewOptionToolbar(bool toggle);
-
-               //void slotBlocksEdit();
+
                void slotOptionsGeneral();
 
                void slotScriptOpenIDE();
@@ -135,12 +117,12 @@ class ApplicationWindow: public QMainWindow, public QG_MainWindowInterface
                void slotInsertBlock();
                void slotInsertBlock(const QString & name);
 
-               /** shows an about dlg*/
+               /** shows an about dlg */
                void slotHelpAbout();
                void slotHelpManual();
 
                /** dumps entities to file */
-               void slotTestDumpEntities(RS_EntityContainer * d = NULL);
+               void slotTestDumpEntities(EntityContainer * d = NULL);
                /** dumps undo info to stdout */
                void slotTestDumpUndo();
                /** updates all inserts */
@@ -167,39 +149,32 @@ class ApplicationWindow: public QMainWindow, public QG_MainWindowInterface
                void slotTestResize1024();
 
        signals:
-               void gridChanged(bool on);
-               void draftChanged(bool on);
-               void printPreviewChanged(bool on);
-               void windowsChanged(bool windowsLeft);
+//             void gridChanged(bool on);
+//             void draftChanged(bool on);
+//             void printPreviewChanged(bool on);
+               void windowsChanged(bool);
 
        public:
                static ApplicationWindow * getAppWindow();
                QMdiArea * getWorkspace();
                MDIWindow * getMDIWindow();
-               virtual GraphicView * getGraphicView();
-               virtual RS_Document * getDocument();
-               virtual void createNewDocument(const QString & fileName = QString::null, RS_Document * doc = NULL);
-               virtual QMainWindow * GetMainWindow();
-               virtual ActionHandler * getActionHandler();
-               virtual void showSimulationControls();
-
-               //virtual QToolBar* createToolBar(const QString& name);
-               //virtual void addToolBarButton(QToolBar* tb);
 
+#ifdef SCRIPTING
                /**
-               * @return Pointer to the qsa object.
-               */
-#ifdef RS_SCRIPTING
+                * @return Pointer to the qsa object.
+                */
                QSProject * getQSAProject();
 #endif
 
                void redrawAll();
                void updateGrids();
 
-               /**
-               * Implementation from QG_MainWindowInterface.
-               */
+               /** Implementation from QG_MainWindowInterface. */
                virtual void setFocus2();
+               virtual GraphicView * getGraphicView();
+               virtual Document * getDocument();
+               virtual void createNewDocument(const QString & fileName = QString::null, Document * doc = NULL);
+               virtual void showSimulationControls();
 
        protected:
                void closeEvent(QCloseEvent *);
@@ -257,7 +232,7 @@ class ApplicationWindow: public QMainWindow, public QG_MainWindowInterface
                /** Action handler. */
                ActionHandler * actionHandler;
 
-#ifdef RS_SCRIPTING
+#ifdef SCRIPTING
                /** Scripting interface. */
                QS_Scripter * scripter;
 #endif
@@ -278,8 +253,6 @@ class ApplicationWindow: public QMainWindow, public QG_MainWindowInterface
                // Toolbar for CAD tools
                CadToolBar * cadToolBar;
 
-//No.  QAssistantClient * assistant;
-
                QAction * scriptOpenIDE;
                QAction * scriptRun;