Created placeholder for Variables page in UI.

glabels/CMakeLists.txt

@@ -39,6 +39,7 @@ set (glabels_sources
   TemplatePicker.cpp
   TemplatePickerItem.cpp
   UndoRedoModel.cpp
+  VariablesView.cpp
 )
 
 set (glabels_qobject_headers
@@ -67,6 +68,7 @@ set (glabels_qobject_headers
   TemplateDesigner.h
   TemplatePicker.h
   UndoRedoModel.h
+  VariablesView.h
 )
 
 set (glabels_forms
@@ -92,6 +94,7 @@ set (glabels_forms
   ui/TemplateDesignerOneLayoutPage.ui
   ui/TemplateDesignerTwoLayoutPage.ui
   ui/TemplateDesignerApplyPage.ui
+  ui/VariablesView.ui
 )
 
 set (glabels_resource_files

glabels/Icons.h

@@ -473,6 +473,16 @@ namespace glabels
 		};
 
 
+		class Variables : public QIcon
+		{
+		public:
+			Variables()
+			{
+				addPixmap( QPixmap( ":icons/flat/48x48/glabels-variables.svg" ) );
+			}
+		};
+
+
 		class ZoomBestFit : public QIcon
 		{
 		public:

glabels/MainWindow.cpp

@@ -31,6 +31,7 @@
 #include "PropertiesView.h"
 #include "StartupView.h"
 #include "UndoRedoModel.h"
+#include "VariablesView.h"
 
 #include "model/Db.h"
 #include "model/Model.h"
@@ -51,7 +52,8 @@ namespace
 		EDITOR_PAGE_INDEX     = 1,
 		PROPERTIES_PAGE_INDEX = 2,
 		MERGE_PAGE_INDEX      = 3,
-		PRINT_PAGE_INDEX      = 4,
+		VARIABLES_PAGE_INDEX  = 4,
+		PRINT_PAGE_INDEX      = 5,
 	};
 }
 
@@ -76,6 +78,7 @@ namespace glabels
 		QWidget* editorPage = createEditorPage();
 		QWidget* propertiesPage = createPropertiesPage();
 		QWidget* mergePage = createMergePage();
+		QWidget* variablesPage = createVariablesPage();
 		QWidget* printPage = createPrintPage();
 
 		// Table of contents widget
@@ -141,6 +144,18 @@ namespace glabels
 		mMergeAction = mContents->addWidget( mMergeButton );
 		group->addButton( mMergeButton );
 
+		// Add "Variables" page
+		mPages->addWidget( variablesPage );
+		mVariablesButton = new QToolButton( this );
+		mVariablesButton->setIcon( Icons::Variables() );
+		mVariablesButton->setText( tr("Variables") );
+		mVariablesButton->setToolButtonStyle( Qt::ToolButtonTextUnderIcon );
+		mVariablesButton->setCheckable( true );
+		mVariablesButton->setSizePolicy( QSizePolicy::MinimumExpanding,
+		                             QSizePolicy::Preferred );
+		mVariablesAction = mContents->addWidget( mVariablesButton );
+		group->addButton( mVariablesButton );
+
 		// Add "Print" page
 		mPages->addWidget( printPage );
 		mPrintButton = new QToolButton( this );
@@ -175,6 +190,7 @@ namespace glabels
 		connect( mEditorButton, SIGNAL(toggled(bool)), this, SLOT(changePage(bool)));
 		connect( mPropertiesButton, SIGNAL(toggled(bool)), this, SLOT(changePage(bool)));
 		connect( mMergeButton, SIGNAL(toggled(bool)), this, SLOT(changePage(bool)));
+		connect( mVariablesButton, SIGNAL(toggled(bool)), this, SLOT(changePage(bool)));
 		connect( mPrintButton, SIGNAL(toggled(bool)), this, SLOT(changePage(bool)));
 		connect( mLabelEditor, SIGNAL(zoomChanged()), this, SLOT(onZoomChanged()) );
 		connect( QApplication::clipboard(), SIGNAL(dataChanged()), this, SLOT(clipboardChanged()) );
@@ -218,6 +234,7 @@ namespace glabels
 		mLabelEditor->setModel( mModel, mUndoRedoModel );
 		mObjectEditor->setModel( mModel, mUndoRedoModel );
 		mMergeView->setModel( mModel, mUndoRedoModel );
+		mVariablesView->setModel( mModel, mUndoRedoModel );
 		mPrintView->setModel( mModel );
 
 		mEditorButton->setChecked( true );
@@ -306,6 +323,11 @@ namespace glabels
 		fileShowMergePageAction->setStatusTip( tr("Select project Merge mode") );
 		connect( fileShowMergePageAction, SIGNAL(triggered()), this, SLOT(fileShowMergePage()) );
 
+		fileShowVariablesPageAction = new QAction( tr("&Variables") , this );
+		fileShowVariablesPageAction->setShortcut( QKeySequence( Qt::CTRL + Qt::Key_4 ) );
+		fileShowVariablesPageAction->setStatusTip( tr("Select project Variables mode") );
+		connect( fileShowVariablesPageAction, SIGNAL(triggered()), this, SLOT(fileShowVariablesPage()) );
+
 		fileShowPrintPageAction = new QAction( tr("&Print") , this );
 		fileShowPrintPageAction->setShortcut( QKeySequence::Print );
 		fileShowPrintPageAction->setStatusTip( tr("Select project Print mode") );
@@ -585,6 +607,7 @@ namespace glabels
 		fileMenu->addAction( fileShowEditorPageAction );
 		fileMenu->addAction( fileShowPropertiesPageAction );
 		fileMenu->addAction( fileShowMergePageAction );
+		fileMenu->addAction( fileShowVariablesPageAction );
 		fileMenu->addAction( fileShowPrintPageAction );
 		fileMenu->addSeparator();
 		fileMenu->addAction( fileTemplateDesignerAction );
@@ -795,6 +818,17 @@ namespace glabels
 	}
 
 
+	///
+	/// Create Variables Page
+	///
+	QWidget* MainWindow::createVariablesPage()
+	{
+		mVariablesView = new VariablesView();
+
+		return mVariablesView;
+	}
+
+
 	///
 	/// Create Print Page
 	///
@@ -819,6 +853,7 @@ namespace glabels
 		bool isEditorPage     = mEditorButton->isChecked();
 		bool isPropertiesPage = mPropertiesButton->isChecked();
 		bool isMergePage      = mMergeButton->isChecked();
+		bool isVariablesPage  = mVariablesButton->isChecked();
 		bool isPrintPage      = mPrintButton->isChecked();
 
 		// What is the current selection state?
@@ -831,6 +866,7 @@ namespace glabels
 		mEditorAction->setVisible( !isWelcomePage );
 		mPropertiesAction->setVisible( !isWelcomePage );
 		mMergeAction->setVisible( !isWelcomePage );
+		mVariablesAction->setVisible( !isWelcomePage );
 		mPrintAction->setVisible( !isWelcomePage );
 
 		// File actions
@@ -841,6 +877,7 @@ namespace glabels
 		fileShowEditorPageAction->setEnabled( !isWelcomePage && !isEditorPage );
 		fileShowPropertiesPageAction->setEnabled( !isWelcomePage && !isPropertiesPage );
 		fileShowMergePageAction->setEnabled( !isWelcomePage && !isMergePage );
+		fileShowVariablesPageAction->setEnabled( !isWelcomePage && !isVariablesPage );
 		fileShowPrintPageAction->setEnabled( !isWelcomePage && !isPrintPage );
 		fileTemplateDesignerAction->setEnabled( true );
 		fileCloseAction->setEnabled( true );
@@ -1036,6 +1073,10 @@ namespace glabels
 			{
 				mPages->setCurrentIndex( MERGE_PAGE_INDEX );
 			}
+			else if ( mVariablesButton->isChecked() )
+			{
+				mPages->setCurrentIndex( VARIABLES_PAGE_INDEX );
+			}
 			else if ( mPrintButton->isChecked() )
 			{
 				mPages->setCurrentIndex( PRINT_PAGE_INDEX );
@@ -1118,6 +1159,15 @@ namespace glabels
 	}
 
 
+	///
+	/// File->Show Variables Page
+	///
+	void MainWindow::fileShowVariablesPage()
+	{
+		mVariablesButton->setChecked( true );
+	}
+
+
 	///
 	/// File->Show Print Page
 	///

glabels/MainWindow.h

@@ -47,6 +47,7 @@ namespace glabels
 	class PropertiesView;
 	class StartupView;
 	class UndoRedoModel;
+	class VariablesView;
 
 
 	///
@@ -96,6 +97,7 @@ namespace glabels
 		void fileShowEditorPage();
 		void fileShowPropertiesPage();
 		void fileShowMergePage();
+		void fileShowVariablesPage();
 		void fileShowPrintPage();
 		void fileTemplateDesigner();
 		void fileClose();
@@ -171,6 +173,7 @@ namespace glabels
 		QWidget* createEditorPage();
 		QWidget* createPropertiesPage();
 		QWidget* createMergePage();
+		QWidget* createVariablesPage();
 		QWidget* createPrintPage();
 
 		void manageActions();
@@ -217,12 +220,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;
@@ -232,6 +237,7 @@ namespace glabels
 		ObjectEditor*        mObjectEditor;
 		PropertiesView*      mPropertiesView;
 		MergeView*           mMergeView;
+		VariablesView*       mVariablesView;
 		PrintView*           mPrintView;
 
 		QLabel*   zoomInfoLabel;
@@ -244,6 +250,7 @@ namespace glabels
 		QAction*  fileShowEditorPageAction;
 		QAction*  fileShowPropertiesPageAction;
 		QAction*  fileShowMergePageAction;
+		QAction*  fileShowVariablesPageAction;
 		QAction*  fileShowPrintPageAction;
 		QAction*  fileTemplateDesignerAction;
 		QAction*  fileCloseAction;

glabels/VariablesView.cpp

@@ -0,0 +1,62 @@
+/*  VariablesView.cpp
+ *
+ *  Copyright (C) 2016  Jim Evins <evins@snaught.com>
+ *
+ *  This file is part of gLabels-qt.
+ *
+ *  gLabels-qt is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  gLabels-qt is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with gLabels-qt.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "VariablesView.h"
+
+#include <QtDebug>
+
+
+namespace glabels
+{
+
+	///
+	/// Constructor
+	///
+	VariablesView::VariablesView( QWidget *parent )
+		: QWidget(parent), mModel(nullptr), mUndoRedoModel(nullptr)
+	{
+		setupUi( this );
+
+		titleLabel->setText( QString( "<span style='font-size:18pt;'>%1</span>" ).arg( tr("Variables") ) );
+	}
+
+
+	///
+	/// Destructor
+	///
+	VariablesView::~VariablesView()
+	{
+		// empty
+	}
+
+
+	///
+	/// Set Model
+	///
+	void VariablesView::setModel( model::Model* model, UndoRedoModel* undoRedoModel )
+	{
+		mModel = model;
+		mUndoRedoModel = undoRedoModel;
+
+		//connect( mModel, SIGNAL(variablesChanged()), this, SLOT(onVariablesChanged()) );
+	}
+
+
+} // namespace glabels

glabels/VariablesView.h

@@ -0,0 +1,83 @@
+/*  VariablesView.h
+ *
+ *  Copyright (C) 2016  Jim Evins <evins@snaught.com>
+ *
+ *  This file is part of gLabels-qt.
+ *
+ *  gLabels-qt is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  gLabels-qt is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with gLabels-qt.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef VariablesView_h
+#define VariablesView_h
+
+
+#include "ui_VariablesView.h"
+
+#include "model/Model.h"
+
+
+namespace glabels
+{
+
+	// Forward references
+	class UndoRedoModel;
+	
+
+	///
+	/// Variables Property Editor Widget
+	///
+	class VariablesView : public QWidget, public Ui_VariablesView
+	{
+		Q_OBJECT
+
+
+		/////////////////////////////////
+		// Life Cycle
+		/////////////////////////////////
+	public:
+		VariablesView( QWidget *parent = nullptr );
+		~VariablesView() override;
+
+
+		/////////////////////////////////
+		// Public methods
+		/////////////////////////////////
+		void setModel( model::Model* model, UndoRedoModel* undoRedoModel );
+
+
+		/////////////////////////////////
+		// Slots
+		/////////////////////////////////
+	private slots:
+
+
+		/////////////////////////////////
+		// Private methods
+		/////////////////////////////////
+	private:
+
+
+		/////////////////////////////////
+		// Private Data
+		/////////////////////////////////
+	private:
+		model::Model*  mModel;
+		UndoRedoModel* mUndoRedoModel;
+
+	};
+
+}
+
+
+#endif // VariablesView_h

glabels/icons.qrc

@@ -102,6 +102,7 @@
 	<file>icons/flat/48x48/glabels-merge.svg</file>
 	<file>icons/flat/48x48/glabels-print.svg</file>
 	<file>icons/flat/48x48/glabels-properties.svg</file>
+	<file>icons/flat/48x48/glabels-variables.svg</file>
 	<file>icons/apps/48x48/glabels.svg</file>
 
 	<file>icons/apps/128x128/glabels.svg</file>

glabels/icons/flat/48x48/glabels-variables.svg

@@ -0,0 +1,15 @@
+<svg xmlns="http://www.w3.org/2000/svg" version="1.1"  width="48" height="48" >
+
+  <g transform="translate(0,-282.3)" >
+    <g style="fill:#333333;fill-opacity:1;stroke:none" transform="scale(0.87836138,1.1384836)" >
+      <path
+         d="M 7.9978635,276.23327 Q 6.4616456,276.08696 5.5106536,275.74558 4.584046,275.4042 4.1207422,275.13597 l 0.9266076,-2.38967 q 0.7803012,0.36576 1.8288308,0.68276 1.0485297,0.29261 2.2189814,0.29261 1.365527,0 1.901984,-0.34138 0.536457,-0.36576 0.536457,-1.12168 0,-0.43892 -0.21946,-0.75592 -0.195075,-0.31699 -0.60961,-0.56084 -0.39015,-0.26823 -0.9753763,-0.4633 -0.5852259,-0.21946 -1.3167582,-0.48769 -0.7071479,-0.24384 -1.3899114,-0.56084 -0.6827635,-0.317 -1.2192206,-0.75592 -0.536457,-0.4633 -0.8778387,-1.0973 -0.3169974,-0.65838 -0.3169974,-1.60937 0,-0.68276 0.1706909,-1.31676 0.1950753,-0.63399 0.5852259,-1.17045 0.4145349,-0.53646 1.072914,-0.92661 0.6583791,-0.41453 1.6093711,-0.63399 v -2.36529 h 2.7798227 v 2.24337 q 1.121683,0.0975 1.975137,0.34138 0.877839,0.24384 1.365527,0.43892 l -0.682763,2.51159 q -0.707148,-0.29261 -1.682524,-0.51207 -0.950992,-0.24384 -1.9751377,-0.24384 -1.1704517,0 -1.6337555,0.41453 -0.4389194,0.41454 -0.4389194,0.97538 0,0.39015 0.1463065,0.65838 0.1706909,0.24384 0.4876882,0.43892 0.3413818,0.19507 0.8046856,0.39015 0.4633038,0.17069 1.0972983,0.39015 0.950992,0.36576 1.755678,0.7803 0.804685,0.39015 1.389911,0.92661 0.585226,0.51207 0.902223,1.21922 0.341382,0.70714 0.341382,1.65814 0,0.65838 -0.195075,1.31675 -0.195075,0.634 -0.658379,1.19484 -0.43892,0.53646 -1.194836,0.95099 -0.731533,0.39015 -1.853216,0.56084 v 2.60914 H 7.9978635 Z" />
+      <path
+         d="m 20.043762,269.96647 q 1.316759,0.24385 1.8776,1.07292 0.585226,0.82907 0.585226,2.38967 v 2.75544 q 0,1.02415 0.292613,1.48745 0.292613,0.4633 1.072914,0.4633 h 2.26775 v 2.34091 h -2.535979 q -2.194597,0 -3.048051,-0.951 -0.82907,-0.95099 -0.82907,-2.75543 v -3.58451 q 0,-1.02415 -0.316997,-1.53622 -0.316998,-0.53646 -1.072914,-0.53646 h -1.316758 v -2.3409 h 1.316758 q 0.755916,0 1.072914,-0.51207 0.316997,-0.53646 0.316997,-1.53622 v -3.60889 q 0,-1.80445 0.82907,-2.75544 0.853454,-0.95099 3.048051,-0.95099 h 2.535979 v 2.3409 h -2.26775 q -0.780301,0 -1.072914,0.4633 -0.292613,0.43892 -0.292613,1.48745 v 2.75544 q 0,1.5606 -0.585226,2.38967 -0.560841,0.82907 -1.8776,1.12168 z" />
+      <path
+         d="m 33.869723,268.57656 2.340904,-3.5845 h 3.048051 l -3.70643,5.51087 q 0.585226,0.70715 1.146067,1.51184 0.560842,0.7803 1.072914,1.58498 0.512073,0.80469 0.926608,1.53622 0.414535,0.73153 0.707148,1.31676 H 36.28378 q -0.658379,-1.24361 -1.316758,-2.21898 -0.658379,-0.97538 -1.243605,-1.75568 -0.731532,0.97538 -1.316758,1.90198 -0.585226,0.92661 -1.194836,2.07268 h -3.048052 q 0.365766,-0.68277 0.82907,-1.4143 0.487688,-0.75591 0.999761,-1.51183 0.536457,-0.7803 1.097299,-1.53622 0.585225,-0.75592 1.121683,-1.43868 l -4.023428,-5.55964 h 3.145589 z" />
+      <path
+         d="m 47.500607,269.91771 q -1.316758,-0.24385 -1.901984,-1.07292 -0.585226,-0.82907 -0.585226,-2.38967 v -2.75544 q 0,-1.02414 -0.292613,-1.48745 -0.292613,-0.4633 -1.072914,-0.4633 h -2.243366 v -2.3409 h 2.511595 q 1.097298,0 1.828831,0.24384 0.755916,0.24384 1.194836,0.70715 0.463304,0.4633 0.658379,1.17045 0.195075,0.68276 0.195075,1.58499 v 3.5845 q 0,1.02415 0.316997,1.56061 0.316998,0.51207 1.072915,0.51207 h 1.341142 v 2.3409 h -1.341142 q -0.755917,0 -1.072915,0.53646 -0.316997,0.51207 -0.316997,1.51183 v 3.6089 q 0,0.90222 -0.195075,1.58498 -0.195075,0.70715 -0.658379,1.17045 -0.43892,0.46331 -1.194836,0.70715 -0.731533,0.24385 -1.828831,0.24385 h -2.511595 v -2.34091 h 2.243366 q 0.780301,0 1.072914,-0.4633 0.292613,-0.43892 0.292613,-1.48745 v -2.75544 q 0,-1.5606 0.585226,-2.38967 0.585226,-0.82907 1.901984,-1.12168 z" />
+    </g>
+  </g>
+</svg>

glabels/ui/MergeView.ui

@@ -11,12 +11,21 @@
    </rect>
   </property>
   <property name="windowTitle">
-   <string>Form</string>
+   <string notr="true">Form</string>
   </property>
   <layout class="QGridLayout" name="gridLayout_2">
    <item row="0" column="0">
     <layout class="QVBoxLayout" name="verticalLayout">
-     <property name="margin">
+     <property name="leftMargin">
+      <number>12</number>
+     </property>
+     <property name="topMargin">
+      <number>12</number>
+     </property>
+     <property name="rightMargin">
+      <number>12</number>
+     </property>
+     <property name="bottomMargin">
       <number>12</number>
      </property>
      <item>

glabels/ui/ObjectEditor.ui

@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>400</width>
-    <height>640</height>
+    <height>648</height>
    </rect>
   </property>
   <property name="sizePolicy">
@@ -29,7 +29,7 @@
    </size>
   </property>
   <property name="windowTitle">
-   <string>Form</string>
+   <string notr="true">Form</string>
   </property>
   <layout class="QGridLayout" name="gridLayout_5">
    <item row="0" column="0">

glabels/ui/PrintView.ui

@@ -17,7 +17,7 @@
    </sizepolicy>
   </property>
   <property name="windowTitle">
-   <string>Form</string>
+   <string notr="true">Form</string>
   </property>
   <layout class="QHBoxLayout" name="horizontalLayout" stretch="0,0,1">
    <item>

glabels/ui/PropertiesView.ui

@@ -23,7 +23,7 @@
    </size>
   </property>
   <property name="windowTitle">
-   <string>Form</string>
+   <string notr="true">Form</string>
   </property>
   <layout class="QGridLayout" name="gridLayout_5" columnstretch="0,0,0,0,1">
    <item row="0" column="4">

glabels/ui/StartupView.ui

@@ -11,7 +11,7 @@
    </rect>
   </property>
   <property name="windowTitle">
-   <string>Form</string>
+   <string notr="true">Form</string>
   </property>
   <layout class="QGridLayout" name="gridLayout">
    <item row="0" column="0">

glabels/ui/TemplateDesignerApplyPage.ui

@@ -23,7 +23,7 @@
    </size>
   </property>
   <property name="windowTitle">
-   <string>Form</string>
+   <string notr="true">Form</string>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
    <property name="spacing">

glabels/ui/TemplateDesignerCdPage.ui

@@ -23,7 +23,7 @@
    </size>
   </property>
   <property name="windowTitle">
-   <string>Form</string>
+   <string notr="true">Form</string>
   </property>
   <layout class="QGridLayout" name="gridLayout_2">
    <item row="0" column="0">

glabels/ui/TemplateDesignerContinuousPage.ui

@@ -23,7 +23,7 @@
    </size>
   </property>
   <property name="windowTitle">
-   <string>Form</string>
+   <string notr="true">Form</string>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
    <property name="spacing">

glabels/ui/TemplateDesignerEllipsePage.ui

@@ -23,7 +23,7 @@
    </size>
   </property>
   <property name="windowTitle">
-   <string>Form</string>
+   <string notr="true">Form</string>
   </property>
   <layout class="QGridLayout" name="gridLayout_2">
    <item row="0" column="0">

glabels/ui/TemplateDesignerIntroPage.ui

@@ -23,7 +23,7 @@
    </size>
   </property>
   <property name="windowTitle">
-   <string>Form</string>
+   <string notr="true">Form</string>
   </property>
   <layout class="QGridLayout" name="gridLayout">
    <property name="verticalSpacing">

glabels/ui/TemplateDesignerNLayoutsPage.ui

@@ -23,7 +23,7 @@
    </size>
   </property>
   <property name="windowTitle">
-   <string>Form</string>
+   <string notr="true">Form</string>
   </property>
   <layout class="QGridLayout" name="gridLayout">
    <property name="sizeConstraint">

glabels/ui/TemplateDesignerNamePage.ui

@@ -23,7 +23,7 @@
    </size>
   </property>
   <property name="windowTitle">
-   <string>Form</string>
+   <string notr="true">Form</string>
   </property>
   <layout class="QGridLayout" name="gridLayout_2">
    <property name="verticalSpacing">

glabels/ui/TemplateDesignerOneLayoutPage.ui

@@ -23,7 +23,7 @@
    </size>
   </property>
   <property name="windowTitle">
-   <string>Form</string>
+   <string notr="true">Form</string>
   </property>
   <layout class="QGridLayout" name="gridLayout_2">
    <item row="0" column="0">

glabels/ui/TemplateDesignerPageSizePage.ui

@@ -23,7 +23,7 @@
    </size>
   </property>
   <property name="windowTitle">
-   <string>Form</string>
+   <string notr="true">Form</string>
   </property>
   <layout class="QGridLayout" name="gridLayout_3">
    <item row="1" column="0">

glabels/ui/TemplateDesignerPathPage.ui

@@ -23,7 +23,7 @@
    </size>
   </property>
   <property name="windowTitle">
-   <string>Form</string>
+   <string notr="true">Form</string>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
    <property name="spacing">

glabels/ui/TemplateDesignerRectPage.ui

@@ -23,7 +23,7 @@
    </size>
   </property>
   <property name="windowTitle">
-   <string>Form</string>
+   <string notr="true">Form</string>
   </property>
   <layout class="QGridLayout" name="gridLayout_2">
    <item row="0" column="0">

glabels/ui/TemplateDesignerRoundPage.ui

@@ -23,7 +23,7 @@
    </size>
   </property>
   <property name="windowTitle">
-   <string>Form</string>
+   <string notr="true">Form</string>
   </property>
   <layout class="QGridLayout" name="gridLayout_2">
    <item row="0" column="0">

glabels/ui/TemplateDesignerShapePage.ui

@@ -23,7 +23,7 @@
    </size>
   </property>
   <property name="windowTitle">
-   <string>Form</string>
+   <string notr="true">Form</string>
   </property>
   <layout class="QGridLayout" name="gridLayout">
    <item row="0" column="0">

glabels/ui/TemplateDesignerTwoLayoutPage.ui

@@ -23,7 +23,7 @@
    </size>
   </property>
   <property name="windowTitle">
-   <string>Form</string>
+   <string notr="true">Form</string>
   </property>
   <layout class="QGridLayout" name="gridLayout_2">
    <item row="0" column="0">

glabels/ui/VariablesView.ui

@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>VariablesView</class>
+ <widget class="QWidget" name="VariablesView">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>570</width>
+    <height>605</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string notr="true">Form</string>
+  </property>
+  <layout class="QGridLayout" name="gridLayout_2">
+   <item row="0" column="0">
+    <layout class="QVBoxLayout" name="verticalLayout">
+     <property name="leftMargin">
+      <number>12</number>
+     </property>
+     <property name="topMargin">
+      <number>12</number>
+     </property>
+     <property name="rightMargin">
+      <number>12</number>
+     </property>
+     <property name="bottomMargin">
+      <number>12</number>
+     </property>
+     <item>
+      <widget class="QLabel" name="titleLabel">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="text">
+        <string notr="true">&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:18pt;&quot;&gt;Variables&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <spacer name="verticalSpacer">
+       <property name="orientation">
+        <enum>Qt::Vertical</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>20</width>
+         <height>40</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+    </layout>
+   </item>
+  </layout>
+ </widget>
+ <resources/>
+ <connections/>
+ <slots>
+  <slot>onSelectAllButtonClicked()</slot>
+  <slot>onUnselectAllButtonClicked()</slot>
+  <slot>onLocationButtonClicked()</slot>
+  <slot>onFormatComboActivated()</slot>
+ </slots>
+</ui>

translations/glabels_C.ts

@@ -251,10 +251,6 @@
 </context>
 <context>
     <name>MergeView</name>
-    <message>
-        <source>Form</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Source</source>
         <translation type="unfinished"></translation>
@@ -287,7 +283,7 @@
 <context>
     <name>ObjectEditor</name>
     <message>
-        <source>Form</source>
+        <source>Object properties</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -314,6 +310,14 @@
         <source>Word</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Anywhere</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>None</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <source>Allow printing to shrink text to fit object</source>
         <translation type="unfinished"></translation>
@@ -374,14 +378,6 @@
         <source>File</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>None</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Anywhere</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Select File...</source>
         <translation type="unfinished"></translation>
@@ -470,10 +466,6 @@
         <source>Opacity:</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Object properties</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>PreferencesDialog</name>
@@ -516,22 +508,6 @@
 </context>
 <context>
     <name>PrintView</name>
-    <message>
-        <source>Form</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Page</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>of</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>nn</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Copies</source>
         <translation type="unfinished"></translation>
@@ -568,13 +544,21 @@
         <source>Print</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Page</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>of</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>nn</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>PropertiesView</name>
-    <message>
-        <source>Form</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Product</source>
         <translation type="unfinished"></translation>
@@ -615,6 +599,14 @@
         <source>Change product</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Adjustable Parameters</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Label length:</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <source>Orientation</source>
         <translation type="unfinished"></translation>
@@ -635,14 +627,6 @@
         <source>Similar Products</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Adjustable Parameters</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Label length:</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>SelectProductDialog</name>
@@ -705,10 +689,6 @@
 </context>
 <context>
     <name>StartupView</name>
-    <message>
-        <source>Form</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Welcome to gLabels.  Let&apos;s get started:</source>
         <translation type="unfinished"></translation>
@@ -732,10 +712,6 @@
 </context>
 <context>
     <name>TemplateDesignerApplyPage</name>
-    <message>
-        <source>Form</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>You have completed the gLabels Product Template Designer.  If you wish to accept and save your product template, click &quot;Save.&quot;</source>
         <translation type="unfinished"></translation>
@@ -748,7 +724,11 @@
 <context>
     <name>TemplateDesignerCdPage</name>
     <message>
-        <source>Form</source>
+        <source>6. Margin:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>1. Outer radius:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -760,28 +740,16 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>1. Outer radius:</source>
+        <source>3. Clipping width:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>5. Waste:</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>3. Clipping width:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>6. Margin:</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>TemplateDesignerContinuousPage</name>
-    <message>
-        <source>Form</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Click &amp;quot;Cancel&amp;quot; to quit, or click &amp;quot;Back&amp;quot; to begin with a different product.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
@@ -789,14 +757,6 @@
 </context>
 <context>
     <name>TemplateDesignerEllipsePage</name>
-    <message>
-        <source>Form</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>3. Waste:</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>2. Height:</source>
         <translation type="unfinished"></translation>
@@ -805,6 +765,10 @@
         <source>1. Width:</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>3. Waste:</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <source>4. Margin:</source>
         <translation type="unfinished"></translation>
@@ -812,10 +776,6 @@
 </context>
 <context>
     <name>TemplateDesignerIntroPage</name>
-    <message>
-        <source>Form</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This dialog will help you create a custom product template. Let&apos;s get started:&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
@@ -839,10 +799,6 @@
 </context>
 <context>
     <name>TemplateDesignerNLayoutsPage</name>
-    <message>
-        <source>Form</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>A layout is a set of labels or cards that can be arranged in a simple grid.  Most products only need one layout, as in the first example below.  The second example illustrates when two layouts are needed.</source>
         <translation type="unfinished"></translation>
@@ -871,40 +827,32 @@
 <context>
     <name>TemplateDesignerNamePage</name>
     <message>
-        <source>Form</source>
+        <source>(e.g. &quot;Mailing Labels,&quot; &quot;Business Cards,&quot; ...)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Brand:</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>(e.g. Avery, Acme, ...)</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Part #:</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>(e.g. 8163A)</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Description:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>(e.g. &quot;Mailing Labels,&quot; &quot;Business Cards,&quot; ...)</source>
+        <source>(e.g. 8163A)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>(e.g. Avery, Acme, ...)</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TemplateDesignerOneLayoutPage</name>
-    <message>
-        <source>Form</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Number across (nx):</source>
         <translation type="unfinished"></translation>
@@ -937,15 +885,7 @@
 <context>
     <name>TemplateDesignerPageSizePage</name>
     <message>
-        <source>Form</source>
+        <source>Roll width:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Page size:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Width:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -953,16 +893,16 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Roll width:</source>
+        <source>Width:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Page size:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TemplateDesignerPathPage</name>
-    <message>
-        <source>Form</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Click &amp;quot;Cancel&amp;quot; to quit, or click &amp;quot;Back&amp;quot; to begin with a different product.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
@@ -971,15 +911,7 @@
 <context>
     <name>TemplateDesignerRectPage</name>
     <message>
-        <source>Form</source>
+        <source>4. Horizontal waste:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>1. Width:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>2. Height:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -987,13 +919,17 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>4. Horizontal waste:</source>
+        <source>1. Width:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>5. Vertical waste:</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>2. Height:</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <source>6. Margin (X):</source>
         <translation type="unfinished"></translation>
@@ -1010,11 +946,7 @@
 <context>
     <name>TemplateDesignerRoundPage</name>
     <message>
-        <source>Form</source>
+        <source>3. Margin</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>2. Waste:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -1022,16 +954,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>3. Margin</source>
+        <source>2. Waste:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TemplateDesignerShapePage</name>
-    <message>
-        <source>Form</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Rectangular or square (can have rounded corners)</source>
         <translation type="unfinished"></translation>
@@ -1051,10 +979,6 @@
 </context>
 <context>
     <name>TemplateDesignerTwoLayoutPage</name>
-    <message>
-        <source>Form</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Distance from left edge (x0):</source>
         <translation type="unfinished"></translation>
@@ -1197,6 +1121,10 @@
         <source>Welcome</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Edit</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <source>Properties</source>
         <translation type="unfinished"></translation>
@@ -1206,11 +1134,11 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Print</source>
+        <source>Variables</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Edit</source>
+        <source>Print</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -1269,6 +1197,14 @@
         <source>Select project Merge mode</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>&amp;Variables</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select project Variables mode</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <source>&amp;Print</source>
         <translation type="unfinished"></translation>
@@ -1920,11 +1856,11 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Copy</source>
+        <source>Roll</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Roll</source>
+        <source>Copy</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -2102,6 +2038,13 @@
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>glabels::VariablesView</name>
+    <message>
+        <source>Variables</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>glabels::barcode::Backends</name>
     <message>
@@ -2240,6 +2183,10 @@
         <source>IEC18004 (QRCode)</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Australia Post Standard</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <source>Australia Post Reply Paid</source>
         <translation type="unfinished"></translation>
@@ -2292,10 +2239,6 @@
         <source>Code 49</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Australia Post Standard</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Code 128 (Mode C suppression)</source>
         <translation type="unfinished"></translation>