Seth/sethLabels
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Some cosmetic layout changes. Added titles to Properties, Merge and Print views.

Browse Source
This commit is contained in:
Jim Evins
2017-02-19 22:31:02 -05:00
parent a864766472
commit f82a50d585
7 changed files with 129 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files
glabels/MainWindow.cpp
+7 -7
View File
@@ -68,8 +68,8 @@ namespace glabels
// Build pages // Build pages
QWidget* welcomePage = createWelcomePage(); QWidget* welcomePage = createWelcomePage();
QWidget* propertiesPage = createPropertiesPage();
QWidget* editorPage = createEditorPage(); QWidget* editorPage = createEditorPage();
QWidget* propertiesPage = createPropertiesPage();
QWidget* mergePage = createMergePage(); QWidget* mergePage = createMergePage();
QWidget* printPage = createPrintPage(); QWidget* printPage = createPrintPage();
@@ -90,18 +90,18 @@ namespace glabels
mWelcomeButton->setText(tr("Welcome")); mWelcomeButton->setText(tr("Welcome"));
mWelcomeButton->setFlags(Qt::ItemIsSelectable | Qt::ItemIsEnabled); 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 // Add "Properties" page
mPages->addWidget( propertiesPage ); mPages->addWidget( propertiesPage );
mPropertiesButton = new QListWidgetItem(mContents); mPropertiesButton = new QListWidgetItem(mContents);
mPropertiesButton->setText(tr("Properties")); mPropertiesButton->setText(tr("Properties"));
mPropertiesButton->setFlags(Qt::ItemIsSelectable | Qt::ItemIsEnabled); 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 // Add "Merge" page
mPages->addWidget( mergePage ); mPages->addWidget( mergePage );
mMergeButton = new QListWidgetItem(mContents); mMergeButton = new QListWidgetItem(mContents);
glabels/MergeView.cpp
+2
View File
@@ -41,6 +41,8 @@ namespace glabels
{ {
setupUi( this ); setupUi( this );
titleLabel->setText( QString( "<span style='font-size:18pt;'>%1</span>" ).arg( tr("Merge") ) );
mMergeFormatNames = merge::Factory::nameList(); mMergeFormatNames = merge::Factory::nameList();
formatCombo->addItems( mMergeFormatNames ); formatCombo->addItems( mMergeFormatNames );
} }
glabels/PrintView.cpp
+3 -1
View File
@@ -37,8 +37,10 @@ namespace glabels
: QWidget(parent), mModel(0), mBlocked(false) : QWidget(parent), mModel(0), mBlocked(false)
{ {
setupUi( this ); setupUi( this );
preview->setRenderer( &mRenderer );
titleLabel->setText( QString( "<span style='font-size:18pt;'>%1</span>" ).arg( tr("Print") ) );
preview->setRenderer( &mRenderer );
mPrinter = new QPrinter( QPrinter::HighResolution ); mPrinter = new QPrinter( QPrinter::HighResolution );
} }
glabels/PropertiesView.cpp
+2
View File
@@ -42,6 +42,8 @@ namespace glabels
{ {
setupUi( this ); setupUi( this );
titleLabel->setText( QString( "<span style='font-size:18pt;'>%1</span>" ).arg( tr("Properties") ) );
// Hack to get orientationCombo item height to follow icon size plus padding // Hack to get orientationCombo item height to follow icon size plus padding
QStyledItemDelegate* itemDelegate = new QStyledItemDelegate(); QStyledItemDelegate* itemDelegate = new QStyledItemDelegate();
orientationCombo->setItemDelegate( itemDelegate ); orientationCombo->setItemDelegate( itemDelegate );
glabels/ui/MergeView.ui
+97 -77
View File
@@ -13,99 +13,119 @@
<property name="windowTitle"> <property name="windowTitle">
<string>Form</string> <string>Form</string>
</property> </property>
<layout class="QGridLayout" name="gridLayout_4"> <layout class="QGridLayout" name="gridLayout_2">
<item row="0" column="0"> <item row="0" column="0">
<widget class="QGroupBox" name="groupBox"> <layout class="QVBoxLayout" name="verticalLayout">
<property name="title"> <property name="margin">
<string>Source</string> <number>12</number>
</property> </property>
<layout class="QGridLayout" name="gridLayout_2"> <item>
<item row="0" column="0"> <widget class="QLabel" name="titleLabel">
<layout class="QGridLayout" name="gridLayout"> <property name="sizePolicy">
<item row="1" column="1"> <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
<widget class="QPushButton" name="locationButton"> <horstretch>0</horstretch>
<property name="text"> <verstretch>0</verstretch>
<string>Location</string> </sizepolicy>
</property> </property>
</widget> <property name="text">
</item> <string notr="true">&lt;span style=&quot; font-size:18pt;&quot;&gt;Merge&lt;/span&gt;</string>
</property>
</widget>
</item>
<item>
<widget class="QGroupBox" name="groupBox">
<property name="title">
<string>Source</string>
</property>
<layout class="QGridLayout" name="gridLayout_3">
<item row="0" column="0"> <item row="0" column="0">
<widget class="QLabel" name="label"> <layout class="QGridLayout" name="gridLayout">
<property name="text"> <item row="1" column="1">
<string>Format:</string> <widget class="QPushButton" name="locationButton">
</property> <property name="text">
</widget> <string>Location</string>
</item> </property>
<item row="1" column="0"> </widget>
<widget class="QLabel" name="locationLabel"> </item>
<property name="text"> <item row="0" column="0">
<string>Location:</string> <widget class="QLabel" name="label">
</property> <property name="text">
</widget> <string>Format:</string>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QLabel" name="locationLabel">
<property name="text">
<string>Location:</string>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QComboBox" name="formatCombo"/>
</item>
</layout>
</item> </item>
<item row="0" column="1"> <item row="0" column="1">
<widget class="QComboBox" name="formatCombo"/> <spacer name="horizontalSpacer">
</item>
</layout>
</item>
<item row="0" column="1">
<spacer name="horizontalSpacer">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>360</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
</layout>
</widget>
</item>
<item row="1" column="0">
<widget class="QGroupBox" name="groupBox_2">
<property name="title">
<string>Records</string>
</property>
<layout class="QGridLayout" name="gridLayout_3">
<item row="0" column="0">
<widget class="QTableWidget" name="recordsTable"/>
</item>
<item row="1" column="0">
<layout class="QHBoxLayout" name="horizontalLayout">
<item>
<widget class="QPushButton" name="selectAllButton">
<property name="text">
<string>Select all</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="unselectAllButton">
<property name="text">
<string>Unselect all</string>
</property>
</widget>
</item>
<item>
<spacer name="horizontalSpacer_2">
<property name="orientation"> <property name="orientation">
<enum>Qt::Horizontal</enum> <enum>Qt::Horizontal</enum>
</property> </property>
<property name="sizeHint" stdset="0"> <property name="sizeHint" stdset="0">
<size> <size>
<width>40</width> <width>360</width>
<height>20</height> <height>20</height>
</size> </size>
</property> </property>
</spacer> </spacer>
</item> </item>
</layout> </layout>
</item> </widget>
</layout> </item>
</widget> <item>
<widget class="QGroupBox" name="groupBox_2">
<property name="title">
<string>Records</string>
</property>
<layout class="QGridLayout" name="gridLayout_4">
<item row="0" column="0">
<widget class="QTableWidget" name="recordsTable"/>
</item>
<item row="1" column="0">
<layout class="QHBoxLayout" name="horizontalLayout">
<item>
<widget class="QPushButton" name="selectAllButton">
<property name="text">
<string>Select all</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="unselectAllButton">
<property name="text">
<string>Unselect all</string>
</property>
</widget>
</item>
<item>
<spacer name="horizontalSpacer_2">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
</layout>
</item>
</layout>
</widget>
</item>
</layout>
</item> </item>
</layout> </layout>
</widget> </widget>
glabels/ui/PrintView.ui
+7
View File
@@ -112,6 +112,13 @@
<property name="margin"> <property name="margin">
<number>12</number> <number>12</number>
</property> </property>
<item>
<widget class="QLabel" name="titleLabel">
<property name="text">
<string notr="true">&lt;span style=&quot; font-size:18pt;&quot;&gt;Print&lt;/span&gt;</string>
</property>
</widget>
</item>
<item> <item>
<widget class="QGroupBox" name="copiesBox"> <widget class="QGroupBox" name="copiesBox">
<property name="sizePolicy"> <property name="sizePolicy">
glabels/ui/PropertiesView.ui
+11 -4
View File
@@ -45,6 +45,13 @@
<property name="margin"> <property name="margin">
<number>12</number> <number>12</number>
</property> </property>
<item>
<widget class="QLabel" name="titleLabel">
<property name="text">
<string notr="true">&lt;span style=&quot; font-size:18pt;&quot;&gt;Properties&lt;/span&gt;</string>
</property>
</widget>
</item>
<item> <item>
<widget class="QGroupBox" name="productGroupBox"> <widget class="QGroupBox" name="productGroupBox">
<property name="sizePolicy"> <property name="sizePolicy">
@@ -378,8 +385,8 @@
<slot>onChangeProductButtonClicked()</slot> <slot>onChangeProductButtonClicked()</slot>
<hints> <hints>
<hint type="sourcelabel"> <hint type="sourcelabel">
<x>311</x> <x>309</x>
<y>221</y> <y>239</y>
</hint> </hint>
<hint type="destinationlabel"> <hint type="destinationlabel">
<x>728</x> <x>728</x>
@@ -394,8 +401,8 @@
<slot>onOrientationActivated()</slot> <slot>onOrientationActivated()</slot>
<hints> <hints>
<hint type="sourcelabel"> <hint type="sourcelabel">
<x>285</x> <x>308</x>
<y>280</y> <y>334</y>
</hint> </hint>
<hint type="destinationlabel"> <hint type="destinationlabel">
<x>802</x> <x>802</x>