UserVariables branch merge

glabels/MainWindow.h

@@ -47,6 +47,7 @@ namespace glabels
 	class PropertiesView;
 	class StartupView;
 	class UndoRedoModel;
+	class VariablesView;
 
 
 	///
@@ -97,6 +98,7 @@ namespace glabels
 		void fileShowEditorPage();
 		void fileShowPropertiesPage();
 		void fileShowMergePage();
+		void fileShowVariablesPage();
 		void fileShowPrintPage();
 		void fileTemplateDesigner();
 		void fileClose();
@@ -175,6 +177,7 @@ namespace glabels
 		QWidget* createEditorPage();
 		QWidget* createPropertiesPage();
 		QWidget* createMergePage();
+		QWidget* createVariablesPage();
 		QWidget* createPrintPage();
 
 		void manageActions();
@@ -222,12 +225,14 @@ namespace glabels
 		QToolButton*         mEditorButton;
 		QToolButton*         mPropertiesButton;
 		QToolButton*         mMergeButton;
+		QToolButton*         mVariablesButton;
 		QToolButton*         mPrintButton;
 
 		QAction*             mWelcomeAction;
 		QAction*             mEditorAction;
 		QAction*             mPropertiesAction;
 		QAction*             mMergeAction;
+		QAction*             mVariablesAction;
 		QAction*             mPrintAction;
 
 		QStackedWidget*      mPages;
@@ -237,6 +242,7 @@ namespace glabels
 		ObjectEditor*        mObjectEditor;
 		PropertiesView*      mPropertiesView;
 		MergeView*           mMergeView;
+		VariablesView*       mVariablesView;
 		PrintView*           mPrintView;
 
 		QLabel*   zoomInfoLabel;
@@ -249,6 +255,7 @@ namespace glabels
 		QAction*  fileShowEditorPageAction;
 		QAction*  fileShowPropertiesPageAction;
 		QAction*  fileShowMergePageAction;
+		QAction*  fileShowVariablesPageAction;
 		QAction*  fileShowPrintPageAction;
 		QAction*  fileTemplateDesignerAction;
 		QAction*  fileCloseAction;