diff --git a/glabels/MainWindow.cpp b/glabels/MainWindow.cpp
index 0f9a666..c84eac5 100644
--- a/glabels/MainWindow.cpp
+++ b/glabels/MainWindow.cpp
@@ -68,8 +68,8 @@ namespace glabels
// Build pages
QWidget* welcomePage = createWelcomePage();
- QWidget* propertiesPage = createPropertiesPage();
QWidget* editorPage = createEditorPage();
+ QWidget* propertiesPage = createPropertiesPage();
QWidget* mergePage = createMergePage();
QWidget* printPage = createPrintPage();
@@ -90,18 +90,18 @@ namespace glabels
mWelcomeButton->setText(tr("Welcome"));
mWelcomeButton->setFlags(Qt::ItemIsSelectable | Qt::ItemIsEnabled);
+ // Add "Editor" page
+ mPages->addWidget( editorPage );
+ mEditorButton = new QListWidgetItem(mContents);
+ mEditorButton->setText(tr("Home"));
+ mEditorButton->setFlags(Qt::ItemIsSelectable | Qt::ItemIsEnabled);
+
// Add "Properties" page
mPages->addWidget( propertiesPage );
mPropertiesButton = new QListWidgetItem(mContents);
mPropertiesButton->setText(tr("Properties"));
mPropertiesButton->setFlags(Qt::ItemIsSelectable | Qt::ItemIsEnabled);
- // Add "Editor" page
- mPages->addWidget( editorPage );
- mEditorButton = new QListWidgetItem(mContents);
- mEditorButton->setText(tr("Editor"));
- mEditorButton->setFlags(Qt::ItemIsSelectable | Qt::ItemIsEnabled);
-
// Add "Merge" page
mPages->addWidget( mergePage );
mMergeButton = new QListWidgetItem(mContents);
diff --git a/glabels/MergeView.cpp b/glabels/MergeView.cpp
index 087d184..b84b5b2 100644
--- a/glabels/MergeView.cpp
+++ b/glabels/MergeView.cpp
@@ -41,6 +41,8 @@ namespace glabels
{
setupUi( this );
+ titleLabel->setText( QString( "%1" ).arg( tr("Merge") ) );
+
mMergeFormatNames = merge::Factory::nameList();
formatCombo->addItems( mMergeFormatNames );
}
diff --git a/glabels/PrintView.cpp b/glabels/PrintView.cpp
index 55dd454..5eedbb8 100644
--- a/glabels/PrintView.cpp
+++ b/glabels/PrintView.cpp
@@ -37,8 +37,10 @@ namespace glabels
: QWidget(parent), mModel(0), mBlocked(false)
{
setupUi( this );
- preview->setRenderer( &mRenderer );
+ titleLabel->setText( QString( "%1" ).arg( tr("Print") ) );
+
+ preview->setRenderer( &mRenderer );
mPrinter = new QPrinter( QPrinter::HighResolution );
}
diff --git a/glabels/PropertiesView.cpp b/glabels/PropertiesView.cpp
index 085695e..230886d 100644
--- a/glabels/PropertiesView.cpp
+++ b/glabels/PropertiesView.cpp
@@ -42,6 +42,8 @@ namespace glabels
{
setupUi( this );
+ titleLabel->setText( QString( "%1" ).arg( tr("Properties") ) );
+
// Hack to get orientationCombo item height to follow icon size plus padding
QStyledItemDelegate* itemDelegate = new QStyledItemDelegate();
orientationCombo->setItemDelegate( itemDelegate );
diff --git a/glabels/ui/MergeView.ui b/glabels/ui/MergeView.ui
index fbb9ee6..e73b77a 100644
--- a/glabels/ui/MergeView.ui
+++ b/glabels/ui/MergeView.ui
@@ -13,99 +13,119 @@
Form
-
+
-
-
-
- Source
+
+
+ 12
-
-
-
-
-
-
-
-
- Location
-
-
-
+ -
+
+
+
+ 0
+ 0
+
+
+
+ <span style=" font-size:18pt;">Merge</span>
+
+
+
+ -
+
+
+ Source
+
+
-
-
-
- Format:
-
-
-
- -
-
-
- Location:
-
-
+
+
-
+
+
+ Location
+
+
+
+ -
+
+
+ Format:
+
+
+
+ -
+
+
+ Location:
+
+
+
+ -
+
+
+
-
-
-
-
-
- -
-
-
- Qt::Horizontal
-
-
-
- 360
- 20
-
-
-
-
-
-
-
- -
-
-
- Records
-
-
-
-
-
-
- -
-
-
-
-
-
- Select all
-
-
-
- -
-
-
- Unselect all
-
-
-
- -
-
+
Qt::Horizontal
- 40
+ 360
20
-
-
-
+
+
+ -
+
+
+ Records
+
+
+
-
+
+
+ -
+
+
-
+
+
+ Select all
+
+
+
+ -
+
+
+ Unselect all
+
+
+
+ -
+
+
+ Qt::Horizontal
+
+
+
+ 40
+ 20
+
+
+
+
+
+
+
+
+
+
diff --git a/glabels/ui/PrintView.ui b/glabels/ui/PrintView.ui
index eaa0673..bf4e3ef 100644
--- a/glabels/ui/PrintView.ui
+++ b/glabels/ui/PrintView.ui
@@ -112,6 +112,13 @@
12
+ -
+
+
+ <span style=" font-size:18pt;">Print</span>
+
+
+
-
diff --git a/glabels/ui/PropertiesView.ui b/glabels/ui/PropertiesView.ui
index 7f57efe..c005184 100644
--- a/glabels/ui/PropertiesView.ui
+++ b/glabels/ui/PropertiesView.ui
@@ -45,6 +45,13 @@
12
+
-
+
+
+ <span style=" font-size:18pt;">Properties</span>
+
+
+
-
@@ -378,8 +385,8 @@
onChangeProductButtonClicked()
- 311
- 221
+ 309
+ 239
728
@@ -394,8 +401,8 @@
onOrientationActivated()
- 285
- 280
+ 308
+ 334
802