X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fapplicationwindow.h;h=32ac8f6001d9ca2db668f5bc29ffac130ef276d7;hb=f507d97c1b1118834a70332f5f79d8479a6964c0;hp=199c4b23c735a81dc9245084b149800b3a8dc077;hpb=f19a3a172c425b7fcc5a648a94870f0247c6be89;p=architektonas

diff --git a/src/applicationwindow.h b/src/applicationwindow.h
index 199c4b2..32ac8f6 100644
--- a/src/applicationwindow.h
+++ b/src/applicationwindow.h
@@ -1,14 +1,13 @@
 #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
 {
@@ -22,30 +21,53 @@ 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);
 
-		DrawingView * drawing;
 		AboutWindow * aboutWin;
+		QLabel * zoomIndicator;
+		QString documentName;
+		QLineEdit * baseUnitInput;
+		QLineEdit * dimensionSizeInput;
 
 		QSettings settings;
 
@@ -63,10 +85,24 @@ 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__
+