X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fapplicationwindow.h;h=339744b4ab1756bfc33c5648f861fbe418ff6f68;hb=6c1279871f6bb86bc59e2561b6a7f74ab081f71e;hp=34d8574b02ad6a39e31f06673642fd6cfd6f42d0;hpb=b8c3c411826c1df00e54daeaf6cd820685f4f460;p=architektonas

diff --git a/src/applicationwindow.h b/src/applicationwindow.h
index 34d8574..339744b 100644
--- a/src/applicationwindow.h
+++ b/src/applicationwindow.h
@@ -1,13 +1,15 @@
 #ifndef __APPLICATIONWINDOW_H__
 #define __APPLICATIONWINDOW_H__
 
-#include <QtGui>
+#include <QtWidgets>
 
 // Forward declarations
 
 //class EditWindow;
 //class CharWindow;
+class AboutWindow;
 class DrawingView;
+class QLabel;
 
 class ApplicationWindow: public QMainWindow
 {
@@ -21,30 +23,63 @@ class ApplicationWindow: public QMainWindow
 		void closeEvent(QCloseEvent * event);
 
 	private slots:
-//		void FileOpen();
+		void FileNew(void);
+		void FileOpen(void);
+		void FileSave(void);
+		void FileSaveAs(void);
+		void SnapToGridTool(void);
 		void FixAngle(void);
 		void FixLength(void);
 		void DeleteTool(void);
 		void DimensionTool(void);
+		void RotateTool(void);
+		void MirrorTool(void);
+		void TrimTool(void);
+		void TriangulateTool(void);
+		void AddLineTool(void);
+		void AddCircleTool(void);
+		void AddArcTool(void);
+		void AddPolygonTool(void);
+		void AddSplineTool(void);
+		void ZoomInTool(void);
+		void ZoomOutTool(void);
+		void HelpAbout(void);
+		void Settings(void);
+		void HandleGrouping(void);
+		void HandleConnection(void);
+		void HandleDisconnection(void);
+		void HandleGridSizeInPixels(int);
+		void HandleGridSizeInBaseUnits(QString);
+		void HandleDimensionSize(QString);
 
 	private:
+		void ClearUIToolStatesExcept(QAction *);
+		void SetInternalToolStates(void);
 		void CreateActions(void);
 		QAction * CreateAction(QString name, QString tooltip, QString statustip,
 			QIcon icon, QKeySequence key, bool checkable = false);
-		QAction * CreateAction2(QString name, QString tooltip, QString statustip,
+		QAction * CreateAction(QString name, QString tooltip, QString statustip,
 			QIcon icon, QKeySequence key1, QKeySequence key2, bool checkable = false);
 		void CreateMenus(void);
 		void CreateToolbars(void);
 		void ReadSettings(void);
 		void WriteSettings(void);
 
-//		EditWindow * editWnd;
-//		CharWindow * charWnd;
-		DrawingView * drawing;
+		AboutWindow * aboutWin;
+		QLabel * zoomIndicator;
+		QString documentName;
+		QLineEdit * baseUnitInput;
+		QLineEdit * dimensionSizeInput;
 
 		QSettings settings;
 
+		QAction * fileNewAct;
+		QAction * fileOpenAct;
+		QAction * fileSaveAct;
+		QAction * fileSaveAsAct;
+		QAction * fileCloseAct;
 		QAction * exitAct;
+		QAction * settingsAct;
 		QAction * fixAngleAct;
 		QAction * fixLengthAct;
 		QAction * deleteAct;
@@ -52,6 +87,23 @@ class ApplicationWindow: public QMainWindow
 		QAction * addLineAct;
 		QAction * addCircleAct;
 		QAction * addArcAct;
+		QAction * addPolygonAct;
+		QAction * addSplineAct;
+		QAction * aboutAct;
+		QAction * rotateAct;
+		QAction * zoomInAct;
+		QAction * zoomOutAct;
+		QAction * snapToGridAct;
+		QAction * groupAct;
+		QAction * connectAct;
+		QAction * disconnectAct;
+		QAction * mirrorAct;
+		QAction * trimAct;
+		QAction * triangulateAct;
+
+	// Class variables
+	public:
+		static DrawingView * drawing;
 };
 
 #endif	// __APPLICATIONWINDOW_H__