Implemented MainWindow's TOC as a toolbar with icons and text.

This commit is contained in:
Jim Evins
2018-11-04 16:39:57 -05:00
parent b8166315b2
commit f5b494d714
152 changed files with 2351 additions and 2686 deletions
+9 -9
View File
@@ -136,16 +136,16 @@ target_link_libraries (glabels-qt
#=======================================
install (TARGETS glabels-qt RUNTIME DESTINATION bin)
install (FILES icons/scalable/apps/glabels.svg DESTINATION share/icons/hicolor/scalable/apps)
install (FILES icons/16x16/apps/glabels.svg DESTINATION share/icons/hicolor/16x16/apps)
install (FILES icons/22x22/apps/glabels.svg DESTINATION share/icons/hicolor/22x22/apps)
install (FILES icons/32x32/apps/glabels.svg DESTINATION share/icons/hicolor/32x32/apps)
install (FILES icons/48x48/apps/glabels.svg DESTINATION share/icons/hicolor/48x48/apps)
install (FILES icons/apps/scalable/glabels.svg DESTINATION share/icons/hicolor/scalable/apps)
install (FILES icons/apps/16x16/glabels.svg DESTINATION share/icons/hicolor/16x16/apps)
install (FILES icons/apps/22x22/glabels.svg DESTINATION share/icons/hicolor/22x22/apps)
install (FILES icons/apps/32x32/glabels.svg DESTINATION share/icons/hicolor/32x32/apps)
install (FILES icons/apps/48x48/glabels.svg DESTINATION share/icons/hicolor/48x48/apps)
install (FILES icons/scalable/mimetypes/x-glabels-project.svg DESTINATION share/icons/hicolor/scalable/mimetypes)
install (FILES icons/16x16/mimetypes/x-glabels-project.svg DESTINATION share/icons/hicolor/16x16/mimetypes)
install (FILES icons/22x22/mimetypes/x-glabels-project.svg DESTINATION share/icons/hicolor/22x22/mimetypes)
install (FILES icons/24x24/mimetypes/x-glabels-project.svg DESTINATION share/icons/hicolor/24x24/mimetypes)
install (FILES icons/mimetypes/scalable/x-glabels-project.svg DESTINATION share/icons/hicolor/scalable/mimetypes)
install (FILES icons/mimetypes/16x16/x-glabels-project.svg DESTINATION share/icons/hicolor/16x16/mimetypes)
install (FILES icons/mimetypes/22x22/x-glabels-project.svg DESTINATION share/icons/hicolor/22x22/mimetypes)
install (FILES icons/mimetypes/24x24/x-glabels-project.svg DESTINATION share/icons/hicolor/24x24/mimetypes)
#
# Windows Runtime
+114 -83
View File
@@ -39,9 +39,9 @@ namespace glabels
public:
Arrow()
{
addPixmap( QPixmap( ":icons/16x16/actions/glabels-arrow.svg" ) );
addPixmap( QPixmap( ":icons/22x22/actions/glabels-arrow.svg" ) );
addPixmap( QPixmap( ":icons/24x24/actions/glabels-arrow.svg" ) );
addPixmap( QPixmap( ":icons/flat/16x16/glabels-arrow.svg" ) );
addPixmap( QPixmap( ":icons/flat/22x22/glabels-arrow.svg" ) );
addPixmap( QPixmap( ":icons/flat/24x24/glabels-arrow.svg" ) );
}
};
@@ -51,9 +51,9 @@ namespace glabels
public:
Barcode()
{
addPixmap( QPixmap( ":icons/16x16/actions/glabels-barcode.svg" ) );
addPixmap( QPixmap( ":icons/22x22/actions/glabels-barcode.svg" ) );
addPixmap( QPixmap( ":icons/24x24/actions/glabels-barcode.svg" ) );
addPixmap( QPixmap( ":icons/flat/16x16/glabels-barcode.svg" ) );
addPixmap( QPixmap( ":icons/flat/22x22/glabels-barcode.svg" ) );
addPixmap( QPixmap( ":icons/flat/24x24/glabels-barcode.svg" ) );
}
};
@@ -63,9 +63,9 @@ namespace glabels
public:
Box()
{
addPixmap( QPixmap( ":icons/16x16/actions/glabels-box.svg" ) );
addPixmap( QPixmap( ":icons/22x22/actions/glabels-box.svg" ) );
addPixmap( QPixmap( ":icons/24x24/actions/glabels-box.svg" ) );
addPixmap( QPixmap( ":icons/flat/16x16/glabels-box.svg" ) );
addPixmap( QPixmap( ":icons/flat/22x22/glabels-box.svg" ) );
addPixmap( QPixmap( ":icons/flat/24x24/glabels-box.svg" ) );
}
};
@@ -75,9 +75,9 @@ namespace glabels
public:
Ellipse()
{
addPixmap( QPixmap( ":icons/16x16/actions/glabels-ellipse.svg" ) );
addPixmap( QPixmap( ":icons/22x22/actions/glabels-ellipse.svg" ) );
addPixmap( QPixmap( ":icons/24x24/actions/glabels-ellipse.svg" ) );
addPixmap( QPixmap( ":icons/flat/16x16/glabels-ellipse.svg" ) );
addPixmap( QPixmap( ":icons/flat/22x22/glabels-ellipse.svg" ) );
addPixmap( QPixmap( ":icons/flat/24x24/glabels-ellipse.svg" ) );
}
};
@@ -87,9 +87,9 @@ namespace glabels
public:
Image()
{
addPixmap( QPixmap( ":icons/16x16/actions/glabels-image.svg" ) );
addPixmap( QPixmap( ":icons/22x22/actions/glabels-image.svg" ) );
addPixmap( QPixmap( ":icons/24x24/actions/glabels-image.svg" ) );
addPixmap( QPixmap( ":icons/flat/16x16/glabels-image.svg" ) );
addPixmap( QPixmap( ":icons/flat/22x22/glabels-image.svg" ) );
addPixmap( QPixmap( ":icons/flat/24x24/glabels-image.svg" ) );
}
};
@@ -99,9 +99,9 @@ namespace glabels
public:
Line()
{
addPixmap( QPixmap( ":icons/16x16/actions/glabels-line.svg" ) );
addPixmap( QPixmap( ":icons/22x22/actions/glabels-line.svg" ) );
addPixmap( QPixmap( ":icons/24x24/actions/glabels-line.svg" ) );
addPixmap( QPixmap( ":icons/flat/16x16/glabels-line.svg" ) );
addPixmap( QPixmap( ":icons/flat/22x22/glabels-line.svg" ) );
addPixmap( QPixmap( ":icons/flat/24x24/glabels-line.svg" ) );
}
};
@@ -111,9 +111,9 @@ namespace glabels
public:
Text()
{
addPixmap( QPixmap( ":icons/16x16/actions/glabels-text.svg" ) );
addPixmap( QPixmap( ":icons/22x22/actions/glabels-text.svg" ) );
addPixmap( QPixmap( ":icons/24x24/actions/glabels-text.svg" ) );
addPixmap( QPixmap( ":icons/flat/16x16/glabels-text.svg" ) );
addPixmap( QPixmap( ":icons/flat/22x22/glabels-text.svg" ) );
addPixmap( QPixmap( ":icons/flat/24x24/glabels-text.svg" ) );
}
};
@@ -123,7 +123,7 @@ namespace glabels
public:
ObjectProperties()
{
addPixmap( QPixmap( ":icons/24x24/actions/glabels-object-properties.svg" ) );
addPixmap( QPixmap( ":icons/flat/24x24/glabels-object-properties.svg" ) );
}
};
@@ -133,7 +133,7 @@ namespace glabels
public:
AlignLeft()
{
addPixmap( QPixmap( ":icons/16x16/actions/glabels-align-left.svg" ) );
addPixmap( QPixmap( ":icons/flat/16x16/glabels-align-left.svg" ) );
}
};
@@ -143,7 +143,7 @@ namespace glabels
public:
AlignHCenter()
{
addPixmap( QPixmap( ":icons/16x16/actions/glabels-align-hcenter.svg" ) );
addPixmap( QPixmap( ":icons/flat/16x16/glabels-align-hcenter.svg" ) );
}
};
@@ -153,7 +153,7 @@ namespace glabels
public:
AlignRight()
{
addPixmap( QPixmap( ":icons/16x16/actions/glabels-align-right.svg" ) );
addPixmap( QPixmap( ":icons/flat/16x16/glabels-align-right.svg" ) );
}
};
@@ -163,7 +163,7 @@ namespace glabels
public:
AlignBottom()
{
addPixmap( QPixmap( ":icons/16x16/actions/glabels-align-bottom.svg" ) );
addPixmap( QPixmap( ":icons/flat/16x16/glabels-align-bottom.svg" ) );
}
};
@@ -173,7 +173,7 @@ namespace glabels
public:
AlignVCenter()
{
addPixmap( QPixmap( ":icons/16x16/actions/glabels-align-vcenter.svg" ) );
addPixmap( QPixmap( ":icons/flat/16x16/glabels-align-vcenter.svg" ) );
}
};
@@ -183,7 +183,7 @@ namespace glabels
public:
AlignTop()
{
addPixmap( QPixmap( ":icons/16x16/actions/glabels-align-top.svg" ) );
addPixmap( QPixmap( ":icons/flat/16x16/glabels-align-top.svg" ) );
}
};
@@ -193,7 +193,7 @@ namespace glabels
public:
CenterHoriz()
{
addPixmap( QPixmap( ":icons/16x16/actions/glabels-center-horiz.svg" ) );
addPixmap( QPixmap( ":icons/flat/16x16/glabels-center-horiz.svg" ) );
}
};
@@ -203,7 +203,7 @@ namespace glabels
public:
CenterVert()
{
addPixmap( QPixmap( ":icons/16x16/actions/glabels-center-vert.svg" ) );
addPixmap( QPixmap( ":icons/flat/16x16/glabels-center-vert.svg" ) );
}
};
@@ -213,7 +213,7 @@ namespace glabels
public:
FlipHoriz()
{
addPixmap( QPixmap( ":icons/16x16/actions/glabels-flip-horiz.svg" ) );
addPixmap( QPixmap( ":icons/flat/16x16/glabels-flip-horiz.svg" ) );
}
};
@@ -223,7 +223,7 @@ namespace glabels
public:
FlipVert()
{
addPixmap( QPixmap( ":icons/16x16/actions/glabels-flip-vert.svg" ) );
addPixmap( QPixmap( ":icons/flat/16x16/glabels-flip-vert.svg" ) );
}
};
@@ -233,7 +233,7 @@ namespace glabels
public:
RotateLeft()
{
addPixmap( QPixmap( ":icons/16x16/actions/glabels-rotate-left.svg" ) );
addPixmap( QPixmap( ":icons/flat/16x16/glabels-rotate-left.svg" ) );
}
};
@@ -243,7 +243,7 @@ namespace glabels
public:
RotateRight()
{
addPixmap( QPixmap( ":icons/16x16/actions/glabels-rotate-right.svg" ) );
addPixmap( QPixmap( ":icons/flat/16x16/glabels-rotate-right.svg" ) );
}
};
@@ -253,7 +253,7 @@ namespace glabels
public:
OrderBottom()
{
addPixmap( QPixmap( ":icons/16x16/actions/glabels-order-bottom.svg" ) );
addPixmap( QPixmap( ":icons/flat/16x16/glabels-order-bottom.svg" ) );
}
};
@@ -263,7 +263,7 @@ namespace glabels
public:
OrderTop()
{
addPixmap( QPixmap( ":icons/16x16/actions/glabels-order-top.svg" ) );
addPixmap( QPixmap( ":icons/flat/16x16/glabels-order-top.svg" ) );
}
};
@@ -273,8 +273,8 @@ namespace glabels
public:
AlignTextLeft()
{
addPixmap( QPixmap( ":icons/22x22/actions/glabels-align-text-left.svg" ) );
addPixmap( QPixmap( ":icons/24x24/actions/glabels-align-text-left.svg" ) );
addPixmap( QPixmap( ":icons/flat/22x22/glabels-align-text-left.svg" ) );
addPixmap( QPixmap( ":icons/flat/24x24/glabels-align-text-left.svg" ) );
}
};
@@ -284,8 +284,8 @@ namespace glabels
public:
AlignTextCenter()
{
addPixmap( QPixmap( ":icons/22x22/actions/glabels-align-text-center.svg" ) );
addPixmap( QPixmap( ":icons/24x24/actions/glabels-align-text-center.svg" ) );
addPixmap( QPixmap( ":icons/flat/22x22/glabels-align-text-center.svg" ) );
addPixmap( QPixmap( ":icons/flat/24x24/glabels-align-text-center.svg" ) );
}
};
@@ -295,8 +295,8 @@ namespace glabels
public:
AlignTextRight()
{
addPixmap( QPixmap( ":icons/22x22/actions/glabels-align-text-right.svg" ) );
addPixmap( QPixmap( ":icons/24x24/actions/glabels-align-text-right.svg" ) );
addPixmap( QPixmap( ":icons/flat/22x22/glabels-align-text-right.svg" ) );
addPixmap( QPixmap( ":icons/flat/24x24/glabels-align-text-right.svg" ) );
}
};
@@ -306,8 +306,8 @@ namespace glabels
public:
AlignTextBottom()
{
addPixmap( QPixmap( ":icons/22x22/actions/glabels-valign-text-bottom.svg" ) );
addPixmap( QPixmap( ":icons/24x24/actions/glabels-valign-text-bottom.svg" ) );
addPixmap( QPixmap( ":icons/flat/22x22/glabels-valign-text-bottom.svg" ) );
addPixmap( QPixmap( ":icons/flat/24x24/glabels-valign-text-bottom.svg" ) );
}
};
@@ -317,8 +317,8 @@ namespace glabels
public:
AlignTextMiddle()
{
addPixmap( QPixmap( ":icons/22x22/actions/glabels-valign-text-middle.svg" ) );
addPixmap( QPixmap( ":icons/24x24/actions/glabels-valign-text-middle.svg" ) );
addPixmap( QPixmap( ":icons/flat/22x22/glabels-valign-text-middle.svg" ) );
addPixmap( QPixmap( ":icons/flat/24x24/glabels-valign-text-middle.svg" ) );
}
};
@@ -328,8 +328,8 @@ namespace glabels
public:
AlignTextTop()
{
addPixmap( QPixmap( ":icons/22x22/actions/glabels-valign-text-top.svg" ) );
addPixmap( QPixmap( ":icons/24x24/actions/glabels-valign-text-top.svg" ) );
addPixmap( QPixmap( ":icons/flat/22x22/glabels-valign-text-top.svg" ) );
addPixmap( QPixmap( ":icons/flat/24x24/glabels-valign-text-top.svg" ) );
}
};
@@ -339,11 +339,21 @@ namespace glabels
public:
Glabels()
{
addFile( ":icons/16x16/apps/glabels.svg" );
addFile( ":icons/22x22/apps/glabels.svg" );
addFile( ":icons/32x32/apps/glabels.svg" );
addFile( ":icons/48x48/apps/glabels.svg" );
addFile( ":icons/scalable/apps/glabels.svg" );
addFile( ":icons/apps/16x16/glabels.svg" );
addFile( ":icons/apps/22x22/glabels.svg" );
addFile( ":icons/apps/32x32/glabels.svg" );
addFile( ":icons/apps/48x48/glabels.svg" );
addFile( ":icons/apps/scalable/glabels.svg" );
}
};
class Edit : public QIcon
{
public:
Edit()
{
addPixmap( QPixmap( ":icons/flat/48x48/glabels-edit.svg" ) );
}
};
@@ -353,9 +363,9 @@ namespace glabels
public:
EditCopy()
{
addPixmap( QPixmap( ":icons/16x16/actions/edit-copy.svg" ) );
addPixmap( QPixmap( ":icons/22x22/actions/edit-copy.svg" ) );
addPixmap( QPixmap( ":icons/24x24/actions/edit-copy.svg" ) );
addPixmap( QPixmap( ":icons/flat/16x16/glabels-edit-copy.svg" ) );
addPixmap( QPixmap( ":icons/flat/22x22/glabels-edit-copy.svg" ) );
addPixmap( QPixmap( ":icons/flat/24x24/glabels-edit-copy.svg" ) );
}
};
@@ -365,9 +375,9 @@ namespace glabels
public:
EditCut()
{
addPixmap( QPixmap( ":icons/16x16/actions/edit-cut.svg" ) );
addPixmap( QPixmap( ":icons/22x22/actions/edit-cut.svg" ) );
addPixmap( QPixmap( ":icons/24x24/actions/edit-cut.svg" ) );
addPixmap( QPixmap( ":icons/flat/16x16/glabels-edit-cut.svg" ) );
addPixmap( QPixmap( ":icons/flat/22x22/glabels-edit-cut.svg" ) );
addPixmap( QPixmap( ":icons/flat/24x24/glabels-edit-cut.svg" ) );
}
};
@@ -377,9 +387,9 @@ namespace glabels
public:
EditPaste()
{
addPixmap( QPixmap( ":icons/16x16/actions/edit-paste.svg" ) );
addPixmap( QPixmap( ":icons/22x22/actions/edit-paste.svg" ) );
addPixmap( QPixmap( ":icons/24x24/actions/edit-paste.svg" ) );
addPixmap( QPixmap( ":icons/flat/16x16/glabels-edit-paste.svg" ) );
addPixmap( QPixmap( ":icons/flat/22x22/glabels-edit-paste.svg" ) );
addPixmap( QPixmap( ":icons/flat/24x24/glabels-edit-paste.svg" ) );
}
};
@@ -389,9 +399,9 @@ namespace glabels
public:
FileNew()
{
addPixmap( QPixmap( ":icons/16x16/actions/file-new.svg" ) );
addPixmap( QPixmap( ":icons/22x22/actions/file-new.svg" ) );
addPixmap( QPixmap( ":icons/24x24/actions/file-new.svg" ) );
addPixmap( QPixmap( ":icons/flat/16x16/glabels-file-new.svg" ) );
addPixmap( QPixmap( ":icons/flat/22x22/glabels-file-new.svg" ) );
addPixmap( QPixmap( ":icons/flat/24x24/glabels-file-new.svg" ) );
}
};
@@ -401,9 +411,9 @@ namespace glabels
public:
FileOpen()
{
addPixmap( QPixmap( ":icons/16x16/actions/file-open.svg" ) );
addPixmap( QPixmap( ":icons/22x22/actions/file-open.svg" ) );
addPixmap( QPixmap( ":icons/24x24/actions/file-open.svg" ) );
addPixmap( QPixmap( ":icons/flat/16x16/glabels-file-open.svg" ) );
addPixmap( QPixmap( ":icons/flat/22x22/glabels-file-open.svg" ) );
addPixmap( QPixmap( ":icons/flat/24x24/glabels-file-open.svg" ) );
}
};
@@ -413,7 +423,8 @@ namespace glabels
public:
FilePrint()
{
addPixmap( QPixmap( ":icons/32x32/actions/print.svg" ) );
addPixmap( QPixmap( ":icons/flat/32x32/glabels-print.svg" ) );
addPixmap( QPixmap( ":icons/flat/48x48/glabels-print.svg" ) );
}
};
@@ -423,9 +434,9 @@ namespace glabels
public:
FileSave()
{
addPixmap( QPixmap( ":icons/16x16/actions/file-save.svg" ) );
addPixmap( QPixmap( ":icons/22x22/actions/file-save.svg" ) );
addPixmap( QPixmap( ":icons/24x24/actions/file-save.svg" ) );
addPixmap( QPixmap( ":icons/flat/16x16/glabels-file-save.svg" ) );
addPixmap( QPixmap( ":icons/flat/22x22/glabels-file-save.svg" ) );
addPixmap( QPixmap( ":icons/flat/24x24/glabels-file-save.svg" ) );
}
};
@@ -435,9 +446,29 @@ namespace glabels
public:
FileSaveAs()
{
addPixmap( QPixmap( ":icons/16x16/actions/file-save-as.svg" ) );
addPixmap( QPixmap( ":icons/22x22/actions/file-save-as.svg" ) );
addPixmap( QPixmap( ":icons/24x24/actions/file-save-as.svg" ) );
addPixmap( QPixmap( ":icons/flat/16x16/glabels-file-save-as.svg" ) );
addPixmap( QPixmap( ":icons/flat/22x22/glabels-file-save-as.svg" ) );
addPixmap( QPixmap( ":icons/flat/24x24/glabels-file-save-as.svg" ) );
}
};
class Merge : public QIcon
{
public:
Merge()
{
addPixmap( QPixmap( ":icons/flat/48x48/glabels-merge.svg" ) );
}
};
class Properties : public QIcon
{
public:
Properties()
{
addPixmap( QPixmap( ":icons/flat/48x48/glabels-properties.svg" ) );
}
};
@@ -447,8 +478,8 @@ namespace glabels
public:
ZoomBestFit()
{
addPixmap( QPixmap( ":icons/16x16/actions/glabels-zoom-to-fit.svg" ) );
addPixmap( QPixmap( ":icons/22x22/actions/glabels-zoom-to-fit.svg" ) );
addPixmap( QPixmap( ":icons/flat/16x16/glabels-zoom-to-fit.svg" ) );
addPixmap( QPixmap( ":icons/flat/22x22/glabels-zoom-to-fit.svg" ) );
}
};
@@ -458,8 +489,8 @@ namespace glabels
public:
ZoomIn()
{
addPixmap( QPixmap( ":icons/16x16/actions/glabels-zoom-in.svg" ) );
addPixmap( QPixmap( ":icons/22x22/actions/glabels-zoom-in.svg" ) );
addPixmap( QPixmap( ":icons/flat/16x16/glabels-zoom-in.svg" ) );
addPixmap( QPixmap( ":icons/flat/22x22/glabels-zoom-in.svg" ) );
}
};
@@ -469,8 +500,8 @@ namespace glabels
public:
ZoomOriginal()
{
addPixmap( QPixmap( ":icons/16x16/actions/glabels-zoom-one-to-one.svg" ) );
addPixmap( QPixmap( ":icons/22x22/actions/glabels-zoom-one-to-one.svg" ) );
addPixmap( QPixmap( ":icons/flat/16x16/glabels-zoom-one-to-one.svg" ) );
addPixmap( QPixmap( ":icons/flat/22x22/glabels-zoom-one-to-one.svg" ) );
}
};
@@ -480,8 +511,8 @@ namespace glabels
public:
ZoomOut()
{
addPixmap( QPixmap( ":icons/16x16/actions/glabels-zoom-out.svg" ) );
addPixmap( QPixmap( ":icons/22x22/actions/glabels-zoom-out.svg" ) );
addPixmap( QPixmap( ":icons/flat/16x16/glabels-zoom-out.svg" ) );
addPixmap( QPixmap( ":icons/flat/22x22/glabels-zoom-out.svg" ) );
}
};
+137 -67
View File
@@ -43,14 +43,26 @@
#include <QtDebug>
namespace
{
enum PageIndex
{
WELCOME_PAGE_INDEX = 0,
EDITOR_PAGE_INDEX = 1,
PROPERTIES_PAGE_INDEX = 2,
MERGE_PAGE_INDEX = 3,
PRINT_PAGE_INDEX = 4,
};
}
namespace glabels
{
///
/// Constructor
///
MainWindow::MainWindow()
: mModel(nullptr)
MainWindow::MainWindow() : mModel(nullptr)
{
setWindowIcon( Icons::Glabels() );
@@ -67,57 +79,83 @@ namespace glabels
QWidget* printPage = createPrintPage();
// Table of contents widget
mContents = new QListWidget();
mContents->setViewMode(QListView::ListMode);
mContents->setMovement(QListView::Static);
mContents->setSpacing(6);
mContents = new QToolBar();
mContents->setOrientation( Qt::Vertical );
mContents->setIconSize( QSize(48,48) );
mContents->setSizePolicy( QSizePolicy::MinimumExpanding,
QSizePolicy::Preferred );
mContents->setStyleSheet( "* { background: #CCCCCC }" );
// Table of contents button group
auto group = new QButtonGroup( this );
group->setExclusive( true );
// Pages widget
mPages = new QStackedWidget();
// Add "Welcome" page
mPages->addWidget( welcomePage );
mWelcomeButton = new QListWidgetItem(mContents);
mWelcomeButton->setText(tr("Welcome"));
mWelcomeButton->setFlags(Qt::ItemIsSelectable | Qt::ItemIsEnabled);
mWelcomeButton = new QToolButton( this );
mWelcomeButton->setIcon( Icons::Glabels() );
mWelcomeButton->setText( tr("Welcome") );
mWelcomeButton->setToolButtonStyle( Qt::ToolButtonTextUnderIcon );
mWelcomeButton->setCheckable( true );
mWelcomeButton->setSizePolicy( QSizePolicy::MinimumExpanding,
QSizePolicy::Preferred );
mWelcomeAction = mContents->addWidget( mWelcomeButton );
group->addButton( mWelcomeButton );
// Add "Editor" page
mPages->addWidget( editorPage );
mEditorButton = new QListWidgetItem(mContents);
mEditorButton->setText(tr("Edit"));
mEditorButton->setToolTip( tr("Select <b>Edit</b> mode") );
mEditorButton->setFlags(Qt::ItemIsSelectable | Qt::ItemIsEnabled);
mEditorButton = new QToolButton( this );
mEditorButton->setIcon( Icons::Edit() );
mEditorButton->setText( tr("Edit") );
mEditorButton->setToolButtonStyle( Qt::ToolButtonTextUnderIcon );
mEditorButton->setCheckable( true );
mEditorButton->setSizePolicy( QSizePolicy::MinimumExpanding,
QSizePolicy::Preferred );
mEditorAction = mContents->addWidget( mEditorButton );
group->addButton( mEditorButton );
// Add "Properties" page
mPages->addWidget( propertiesPage );
mPropertiesButton = new QListWidgetItem(mContents);
mPropertiesButton->setText(tr("Properties"));
mPropertiesButton->setToolTip( tr("Select <b>Properties</b> mode") );
mPropertiesButton->setFlags(Qt::ItemIsSelectable | Qt::ItemIsEnabled);
mPropertiesButton = new QToolButton( this );
mPropertiesButton->setIcon( Icons::Properties() );
mPropertiesButton->setText( tr("Properties") );
mPropertiesButton->setToolButtonStyle( Qt::ToolButtonTextUnderIcon );
mPropertiesButton->setCheckable( true );
mPropertiesButton->setSizePolicy( QSizePolicy::MinimumExpanding,
QSizePolicy::Preferred );
mPropertiesAction = mContents->addWidget( mPropertiesButton );
group->addButton( mPropertiesButton );
// Add "Merge" page
mPages->addWidget( mergePage );
mMergeButton = new QListWidgetItem(mContents);
mMergeButton->setText(tr("Merge"));
mMergeButton->setToolTip( tr("Select <b>Merge</b> mode") );
mMergeButton->setFlags(Qt::ItemIsSelectable | Qt::ItemIsEnabled);
mMergeButton = new QToolButton( this );
mMergeButton->setIcon( Icons::Merge() );
mMergeButton->setText( tr("Merge") );
mMergeButton->setToolButtonStyle( Qt::ToolButtonTextUnderIcon );
mMergeButton->setCheckable( true );
mMergeButton->setSizePolicy( QSizePolicy::MinimumExpanding,
QSizePolicy::Preferred );
mMergeAction = mContents->addWidget( mMergeButton );
group->addButton( mMergeButton );
// Add "Print" page
mPages->addWidget( printPage );
mPrintButton = new QListWidgetItem(mContents);
mPrintButton->setText(tr("Print"));
mPrintButton->setToolTip( tr("Select <b>Print</b> mode") );
mPrintButton->setFlags(Qt::ItemIsSelectable | Qt::ItemIsEnabled);
// Adjust width of list view based on its contents
mContents->setHorizontalScrollBarPolicy( Qt::ScrollBarAlwaysOff );
mContents->setVerticalScrollBarPolicy( Qt::ScrollBarAlwaysOff );
mContents->setMinimumWidth( mContents->sizeHintForColumn(0) + 24 );
mContents->setMaximumWidth( mContents->sizeHintForColumn(0) + 24 );
mPrintButton = new QToolButton( this );
mPrintButton->setIcon( Icons::FilePrint() );
mPrintButton->setText( tr("Print") );
mPrintButton->setToolButtonStyle( Qt::ToolButtonTextUnderIcon );
mPrintButton->setCheckable( true );
mPrintButton->setSizePolicy( QSizePolicy::MinimumExpanding,
QSizePolicy::Preferred );
mPrintAction = mContents->addWidget( mPrintButton );
group->addButton( mPrintButton );
// Set initial page selection
mWelcomeButton->setSelected( true );
mPages->setCurrentIndex(mContents->row(mWelcomeButton));
mWelcomeButton->setChecked( true );
mPages->setCurrentIndex( WELCOME_PAGE_INDEX );
// Create central widget
QWidget *centralWidget = new QWidget();
@@ -125,17 +163,22 @@ namespace glabels
hLayout->setContentsMargins( 0, 0, 0, 0 );
hLayout->addWidget( mContents );
hLayout->addWidget( mPages );
hLayout->setStretch( 0, 0 );
hLayout->setStretch( 1, 1 );
centralWidget->setLayout( hLayout );
setCentralWidget( centralWidget );
setDocVerbsEnabled( false );
setSelectionVerbsEnabled( false );
setPasteVerbsEnabled( false );
setWelcomeMode( true );
setTitle();
// Connect
connect( mContents, SIGNAL(currentItemChanged(QListWidgetItem*,QListWidgetItem*)),
this, SLOT(changePage(QListWidgetItem*,QListWidgetItem*)));
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( mPrintButton, SIGNAL(toggled(bool)), this, SLOT(changePage(bool)));
connect( mLabelEditor, SIGNAL(zoomChanged()), this, SLOT(onZoomChanged()) );
connect( QApplication::clipboard(), SIGNAL(dataChanged()), this, SLOT(clipboardChanged()) );
#if 0
@@ -180,8 +223,8 @@ namespace glabels
mMergeView->setModel( mModel , mUndoRedoModel );
mPrintView->setModel( mModel );
mContents->setCurrentItem( mEditorButton );
mPages->setCurrentIndex(mContents->row(mEditorButton));
mEditorButton->setChecked( true );
mPages->setCurrentIndex( EDITOR_PAGE_INDEX );
setDocVerbsEnabled( true );
setSelectionVerbsEnabled( false );
@@ -774,11 +817,16 @@ namespace glabels
///
void MainWindow::setWelcomeMode( bool enabled )
{
mWelcomeButton->setHidden( !enabled );
mPropertiesButton->setHidden( enabled );
mEditorButton->setHidden( enabled );
mMergeButton->setHidden( enabled );
mPrintButton->setHidden( enabled );
mWelcomeAction->setVisible( enabled );
mEditorAction->setVisible( !enabled );
mPropertiesAction->setVisible( !enabled );
mMergeAction->setVisible( !enabled );
mPrintAction->setVisible( !enabled );
fileShowEditorPageAction->setEnabled( !enabled && !mEditorButton->isChecked() );
fileShowPropertiesPageAction->setEnabled( !enabled && !mPropertiesButton->isChecked() );
fileShowMergePageAction->setEnabled( !enabled && !mMergeButton->isChecked() );
fileShowPrintPageAction->setEnabled( !enabled && !mPrintButton->isChecked() );
}
@@ -1005,28 +1053,50 @@ namespace glabels
///
/// Change page
///
void MainWindow::changePage(QListWidgetItem *current, QListWidgetItem *previous)
void MainWindow::changePage( bool checked )
{
if (!current)
if ( checked )
{
current = previous;
setWelcomeMode( false );
if ( mEditorButton->isChecked() )
{
mPages->setCurrentIndex( EDITOR_PAGE_INDEX );
setDocVerbsEnabled( true );
setSelectionVerbsEnabled( !mModel->isSelectionEmpty() );
setMultiSelectionVerbsEnabled( !mModel->isSelectionEmpty() &&
!mModel->isSelectionAtomic() );
setPasteVerbsEnabled( mModel->canPaste() );
}
else if ( mPropertiesButton->isChecked() )
{
mPages->setCurrentIndex( PROPERTIES_PAGE_INDEX );
setDocVerbsEnabled( false );
setSelectionVerbsEnabled( false );
setMultiSelectionVerbsEnabled( false );
setPasteVerbsEnabled( false );
}
else if ( mMergeButton->isChecked() )
{
mPages->setCurrentIndex( MERGE_PAGE_INDEX );
setDocVerbsEnabled( false );
setSelectionVerbsEnabled( false );
setMultiSelectionVerbsEnabled( false );
setPasteVerbsEnabled( false );
}
else if ( mPrintButton->isChecked() )
{
mPages->setCurrentIndex( PRINT_PAGE_INDEX );
setDocVerbsEnabled( false );
setSelectionVerbsEnabled( false );
setMultiSelectionVerbsEnabled( false );
setPasteVerbsEnabled( false );
}
}
int row = mContents->row(current);
mPages->setCurrentIndex(row);
bool isEditorPage = ( row == mContents->row(mEditorButton) );
setDocVerbsEnabled( isEditorPage );
setSelectionVerbsEnabled( isEditorPage && !mModel->isSelectionEmpty() );
setMultiSelectionVerbsEnabled( isEditorPage && !mModel->isSelectionEmpty() && !mModel->isSelectionAtomic() );
setPasteVerbsEnabled( isEditorPage && mModel->canPaste() );
bool isWelcome = ( current == mWelcomeButton );
fileShowEditorPageAction->setEnabled( !isWelcome && (current != mEditorButton) );
fileShowPropertiesPageAction->setEnabled( !isWelcome && (current != mPropertiesButton) );
fileShowMergePageAction->setEnabled( !isWelcome && (current != mMergeButton) );
fileShowPrintPageAction->setEnabled( !isWelcome && (current != mPrintButton) );
}
@@ -1080,7 +1150,7 @@ namespace glabels
///
void MainWindow::fileShowEditorPage()
{
mContents->setCurrentItem( mEditorButton );
mEditorButton->setChecked( true );
}
@@ -1089,7 +1159,7 @@ namespace glabels
///
void MainWindow::fileShowPropertiesPage()
{
mContents->setCurrentItem( mPropertiesButton );
mPropertiesButton->setChecked( true );
}
@@ -1098,7 +1168,7 @@ namespace glabels
///
void MainWindow::fileShowMergePage()
{
mContents->setCurrentItem( mMergeButton );
mMergeButton->setChecked( true );
}
@@ -1107,7 +1177,7 @@ namespace glabels
///
void MainWindow::fileShowPrintPage()
{
mContents->setCurrentItem( mPrintButton );
mPrintButton->setChecked( true );
}
+16 -9
View File
@@ -33,6 +33,7 @@
#include <QScrollArea>
#include <QStackedWidget>
#include <QToolBar>
#include <QToolButton>
namespace glabels
@@ -84,7 +85,7 @@ namespace glabels
// Slots
/////////////////////////////////////
private slots:
void changePage(QListWidgetItem *current, QListWidgetItem *previous);
void changePage( bool checked );
void clipboardChanged();
@@ -167,8 +168,8 @@ namespace glabels
void createStatusBar();
QWidget* createWelcomePage();
QWidget* createPropertiesPage();
QWidget* createEditorPage();
QWidget* createPropertiesPage();
QWidget* createMergePage();
QWidget* createPrintPage();
@@ -216,19 +217,25 @@ namespace glabels
model::Model* mModel;
UndoRedoModel* mUndoRedoModel;
QListWidget* mContents;
QListWidgetItem* mWelcomeButton;
QListWidgetItem* mPropertiesButton;
QListWidgetItem* mEditorButton;
QListWidgetItem* mMergeButton;
QListWidgetItem* mPrintButton;
QToolBar* mContents;
QToolButton* mWelcomeButton;
QToolButton* mEditorButton;
QToolButton* mPropertiesButton;
QToolButton* mMergeButton;
QToolButton* mPrintButton;
QAction* mWelcomeAction;
QAction* mEditorAction;
QAction* mPropertiesAction;
QAction* mMergeAction;
QAction* mPrintAction;
QStackedWidget* mPages;
StartupView* mWelcomeView;
PropertiesView* mPropertiesView;
QScrollArea* mLabelEditorScrollArea;
LabelEditor* mLabelEditor;
ObjectEditor* mObjectEditor;
PropertiesView* mPropertiesView;
MergeView* mMergeView;
PrintView* mPrintView;
+7 -7
View File
@@ -358,7 +358,7 @@ namespace glabels
if ( dynamic_cast<model::ModelBoxObject*>(mObject) )
{
titleImageLabel->setPixmap( QPixmap(":icons/24x24/actions/glabels-box.svg") );
titleImageLabel->setPixmap( QPixmap(":icons/flat/24x24/glabels-box.svg") );
titleLabel->setText( tr("Box object properties") );
notebook->addTab( lineFillPage, tr("line/fill") );
@@ -379,7 +379,7 @@ namespace glabels
}
else if ( dynamic_cast<model::ModelEllipseObject*>(mObject) )
{
titleImageLabel->setPixmap( QPixmap(":icons/24x24/actions/glabels-ellipse.svg") );
titleImageLabel->setPixmap( QPixmap(":icons/flat/24x24/glabels-ellipse.svg") );
titleLabel->setText( tr("Ellipse object properties") );
notebook->addTab( lineFillPage, tr("line/fill") );
@@ -400,7 +400,7 @@ namespace glabels
}
else if ( dynamic_cast<model::ModelImageObject*>(mObject) )
{
titleImageLabel->setPixmap( QPixmap(":icons/24x24/actions/glabels-image.svg") );
titleImageLabel->setPixmap( QPixmap(":icons/flat/24x24/glabels-image.svg") );
titleLabel->setText( tr("Image object properties") );
notebook->addTab( imagePage, tr("image") );
@@ -420,7 +420,7 @@ namespace glabels
}
else if ( dynamic_cast<model::ModelLineObject*>(mObject) )
{
titleImageLabel->setPixmap( QPixmap(":icons/24x24/actions/glabels-line.svg") );
titleImageLabel->setPixmap( QPixmap(":icons/flat/24x24/glabels-line.svg") );
titleLabel->setText( tr("Line object properties") );
notebook->addTab( lineFillPage, tr("line/fill") );
@@ -441,7 +441,7 @@ namespace glabels
}
else if ( dynamic_cast<model::ModelTextObject*>(mObject) )
{
titleImageLabel->setPixmap( QPixmap(":icons/24x24/actions/glabels-text.svg") );
titleImageLabel->setPixmap( QPixmap(":icons/flat/24x24/glabels-text.svg") );
titleLabel->setText( tr("Text object properties") );
notebook->addTab( textPage, tr("text") );
@@ -460,7 +460,7 @@ namespace glabels
}
else if ( dynamic_cast<model::ModelBarcodeObject*>(mObject) )
{
titleImageLabel->setPixmap( QPixmap(":icons/24x24/actions/glabels-barcode.svg") );
titleImageLabel->setPixmap( QPixmap(":icons/flat/24x24/glabels-barcode.svg") );
titleLabel->setText( tr("Barcode object properties") );
notebook->addTab( barcodePage, tr("barcode") );
@@ -488,7 +488,7 @@ namespace glabels
{
mObject = nullptr;
titleImageLabel->setPixmap( QPixmap(":icons/24x24/actions/glabels-object-properties.svg") );
titleImageLabel->setPixmap( QPixmap(":icons/flat/24x24/glabels-object-properties.svg") );
titleLabel->setText( tr("Object properties") );
setEnabled( false );
}
+1 -1
View File
@@ -109,7 +109,7 @@ namespace glabels
: mIsBasedOnCopy(false), QWizard(parent)
{
setWindowTitle( tr("Product Template Designer") );
setPixmap( QWizard::LogoPixmap, QPixmap( ":icons/48x48/apps/glabels.svg" ) );
setPixmap( QWizard::LogoPixmap, QPixmap( ":icons/apps/48x48/glabels.svg" ) );
setWizardStyle( QWizard::ModernStyle );
setOption( QWizard::IndependentPages, false );
setOption( QWizard::NoBackButtonOnStartPage, true );
+98 -94
View File
@@ -3,106 +3,110 @@
<RCC version="1.0">
<qresource>
<file>icons/16x16/actions/edit-clear.svg</file>
<file>icons/16x16/actions/edit-copy.svg</file>
<file>icons/16x16/actions/edit-cut.svg</file>
<file>icons/16x16/actions/edit-paste.svg</file>
<file>icons/16x16/actions/file-new.svg</file>
<file>icons/16x16/actions/file-open.svg</file>
<file>icons/16x16/actions/file-save.svg</file>
<file>icons/16x16/actions/file-save-as.svg</file>
<file>icons/16x16/actions/glabels-align-bottom.svg</file>
<file>icons/16x16/actions/glabels-align-hcenter.svg</file>
<file>icons/16x16/actions/glabels-align-left.svg</file>
<file>icons/16x16/actions/glabels-align-right.svg</file>
<file>icons/16x16/actions/glabels-align-top.svg</file>
<file>icons/16x16/actions/glabels-align-vcenter.svg</file>
<file>icons/16x16/actions/glabels-arrow.svg</file>
<file>icons/16x16/actions/glabels-barcode.svg</file>
<file>icons/16x16/actions/glabels-box.svg</file>
<file>icons/16x16/actions/glabels-center-horiz.svg</file>
<file>icons/16x16/actions/glabels-center-vert.svg</file>
<file>icons/16x16/actions/glabels-ellipse.svg</file>
<file>icons/16x16/actions/glabels-flip-horiz.svg</file>
<file>icons/16x16/actions/glabels-flip-vert.svg</file>
<file>icons/16x16/actions/glabels-image.svg</file>
<file>icons/16x16/actions/glabels-line.svg</file>
<file>icons/16x16/actions/glabels-order-bottom.svg</file>
<file>icons/16x16/actions/glabels-order-top.svg</file>
<file>icons/16x16/actions/glabels-rotate-left.svg</file>
<file>icons/16x16/actions/glabels-rotate-right.svg</file>
<file>icons/16x16/actions/glabels-text.svg</file>
<file>icons/16x16/actions/glabels-zoom-in.svg</file>
<file>icons/16x16/actions/glabels-zoom-one-to-one.svg</file>
<file>icons/16x16/actions/glabels-zoom-out.svg</file>
<file>icons/16x16/actions/glabels-zoom-to-fit.svg</file>
<file>icons/16x16/apps/glabels.svg</file>
<file>icons/flat/16x16/glabels-align-bottom.svg</file>
<file>icons/flat/16x16/glabels-align-hcenter.svg</file>
<file>icons/flat/16x16/glabels-align-left.svg</file>
<file>icons/flat/16x16/glabels-align-right.svg</file>
<file>icons/flat/16x16/glabels-align-top.svg</file>
<file>icons/flat/16x16/glabels-align-vcenter.svg</file>
<file>icons/flat/16x16/glabels-arrow.svg</file>
<file>icons/flat/16x16/glabels-barcode.svg</file>
<file>icons/flat/16x16/glabels-box.svg</file>
<file>icons/flat/16x16/glabels-center-horiz.svg</file>
<file>icons/flat/16x16/glabels-center-vert.svg</file>
<file>icons/flat/16x16/glabels-edit-clear.svg</file>
<file>icons/flat/16x16/glabels-edit-copy.svg</file>
<file>icons/flat/16x16/glabels-edit-cut.svg</file>
<file>icons/flat/16x16/glabels-edit-paste.svg</file>
<file>icons/flat/16x16/glabels-ellipse.svg</file>
<file>icons/flat/16x16/glabels-file-new.svg</file>
<file>icons/flat/16x16/glabels-file-open.svg</file>
<file>icons/flat/16x16/glabels-file-save.svg</file>
<file>icons/flat/16x16/glabels-file-save-as.svg</file>
<file>icons/flat/16x16/glabels-flip-horiz.svg</file>
<file>icons/flat/16x16/glabels-flip-vert.svg</file>
<file>icons/flat/16x16/glabels-image.svg</file>
<file>icons/flat/16x16/glabels-line.svg</file>
<file>icons/flat/16x16/glabels-order-bottom.svg</file>
<file>icons/flat/16x16/glabels-order-top.svg</file>
<file>icons/flat/16x16/glabels-rotate-left.svg</file>
<file>icons/flat/16x16/glabels-rotate-right.svg</file>
<file>icons/flat/16x16/glabels-text.svg</file>
<file>icons/flat/16x16/glabels-zoom-in.svg</file>
<file>icons/flat/16x16/glabels-zoom-one-to-one.svg</file>
<file>icons/flat/16x16/glabels-zoom-out.svg</file>
<file>icons/flat/16x16/glabels-zoom-to-fit.svg</file>
<file>icons/apps/16x16/glabels.svg</file>
<file>icons/22x22/actions/edit-copy.svg</file>
<file>icons/22x22/actions/edit-cut.svg</file>
<file>icons/22x22/actions/edit-paste.svg</file>
<file>icons/22x22/actions/file-new.svg</file>
<file>icons/22x22/actions/file-open.svg</file>
<file>icons/22x22/actions/file-save.svg</file>
<file>icons/22x22/actions/file-save-as.svg</file>
<file>icons/22x22/actions/glabels-align-text-center.svg</file>
<file>icons/22x22/actions/glabels-align-text-left.svg</file>
<file>icons/22x22/actions/glabels-align-text-right.svg</file>
<file>icons/22x22/actions/glabels-arrow.svg</file>
<file>icons/22x22/actions/glabels-barcode.svg</file>
<file>icons/22x22/actions/glabels-box.svg</file>
<file>icons/22x22/actions/glabels-ellipse.svg</file>
<file>icons/22x22/actions/glabels-format-text-bold.svg</file>
<file>icons/22x22/actions/glabels-format-text-italic.svg</file>
<file>icons/22x22/actions/glabels-format-text-underline.svg</file>
<file>icons/22x22/actions/glabels-image.svg</file>
<file>icons/22x22/actions/glabels-line.svg</file>
<file>icons/22x22/actions/glabels-text.svg</file>
<file>icons/22x22/actions/glabels-valign-text-bottom.svg</file>
<file>icons/22x22/actions/glabels-valign-text-middle.svg</file>
<file>icons/22x22/actions/glabels-valign-text-top.svg</file>
<file>icons/22x22/actions/glabels-zoom-in.svg</file>
<file>icons/22x22/actions/glabels-zoom-one-to-one.svg</file>
<file>icons/22x22/actions/glabels-zoom-out.svg</file>
<file>icons/22x22/actions/glabels-zoom-to-fit.svg</file>
<file>icons/22x22/apps/glabels.svg</file>
<file>icons/flat/22x22/glabels-align-text-center.svg</file>
<file>icons/flat/22x22/glabels-align-text-left.svg</file>
<file>icons/flat/22x22/glabels-align-text-right.svg</file>
<file>icons/flat/22x22/glabels-arrow.svg</file>
<file>icons/flat/22x22/glabels-barcode.svg</file>
<file>icons/flat/22x22/glabels-box.svg</file>
<file>icons/flat/22x22/glabels-edit-copy.svg</file>
<file>icons/flat/22x22/glabels-edit-cut.svg</file>
<file>icons/flat/22x22/glabels-edit-paste.svg</file>
<file>icons/flat/22x22/glabels-ellipse.svg</file>
<file>icons/flat/22x22/glabels-file-new.svg</file>
<file>icons/flat/22x22/glabels-file-open.svg</file>
<file>icons/flat/22x22/glabels-file-save.svg</file>
<file>icons/flat/22x22/glabels-file-save-as.svg</file>
<file>icons/flat/22x22/glabels-format-text-bold.svg</file>
<file>icons/flat/22x22/glabels-format-text-italic.svg</file>
<file>icons/flat/22x22/glabels-format-text-underline.svg</file>
<file>icons/flat/22x22/glabels-image.svg</file>
<file>icons/flat/22x22/glabels-line.svg</file>
<file>icons/flat/22x22/glabels-text.svg</file>
<file>icons/flat/22x22/glabels-valign-text-bottom.svg</file>
<file>icons/flat/22x22/glabels-valign-text-middle.svg</file>
<file>icons/flat/22x22/glabels-valign-text-top.svg</file>
<file>icons/flat/22x22/glabels-zoom-in.svg</file>
<file>icons/flat/22x22/glabels-zoom-one-to-one.svg</file>
<file>icons/flat/22x22/glabels-zoom-out.svg</file>
<file>icons/flat/22x22/glabels-zoom-to-fit.svg</file>
<file>icons/apps/22x22/glabels.svg</file>
<file>icons/24x24/actions/edit-copy.svg</file>
<file>icons/24x24/actions/edit-cut.svg</file>
<file>icons/24x24/actions/edit-paste.svg</file>
<file>icons/24x24/actions/file-new.svg</file>
<file>icons/24x24/actions/file-open.svg</file>
<file>icons/24x24/actions/file-save.svg</file>
<file>icons/24x24/actions/file-save-as.svg</file>
<file>icons/24x24/actions/glabels-align-text-center.svg</file>
<file>icons/24x24/actions/glabels-align-text-left.svg</file>
<file>icons/24x24/actions/glabels-align-text-right.svg</file>
<file>icons/24x24/actions/glabels-arrow.svg</file>
<file>icons/24x24/actions/glabels-barcode.svg</file>
<file>icons/24x24/actions/glabels-box.svg</file>
<file>icons/24x24/actions/glabels-ellipse.svg</file>
<file>icons/24x24/actions/glabels-format-text-bold.svg</file>
<file>icons/24x24/actions/glabels-format-text-italic.svg</file>
<file>icons/24x24/actions/glabels-format-text-underline.svg</file>
<file>icons/24x24/actions/glabels-image.svg</file>
<file>icons/24x24/actions/glabels-line.svg</file>
<file>icons/24x24/actions/glabels-object-properties.svg</file>
<file>icons/24x24/actions/glabels-text.svg</file>
<file>icons/24x24/actions/glabels-valign-text-bottom.svg</file>
<file>icons/24x24/actions/glabels-valign-text-middle.svg</file>
<file>icons/24x24/actions/glabels-valign-text-top.svg</file>
<file>icons/flat/24x24/glabels-align-text-center.svg</file>
<file>icons/flat/24x24/glabels-align-text-left.svg</file>
<file>icons/flat/24x24/glabels-align-text-right.svg</file>
<file>icons/flat/24x24/glabels-arrow.svg</file>
<file>icons/flat/24x24/glabels-barcode.svg</file>
<file>icons/flat/24x24/glabels-box.svg</file>
<file>icons/flat/24x24/glabels-edit-copy.svg</file>
<file>icons/flat/24x24/glabels-edit-cut.svg</file>
<file>icons/flat/24x24/glabels-edit-paste.svg</file>
<file>icons/flat/24x24/glabels-ellipse.svg</file>
<file>icons/flat/24x24/glabels-file-new.svg</file>
<file>icons/flat/24x24/glabels-file-open.svg</file>
<file>icons/flat/24x24/glabels-file-save.svg</file>
<file>icons/flat/24x24/glabels-file-save-as.svg</file>
<file>icons/flat/24x24/glabels-format-text-bold.svg</file>
<file>icons/flat/24x24/glabels-format-text-italic.svg</file>
<file>icons/flat/24x24/glabels-format-text-underline.svg</file>
<file>icons/flat/24x24/glabels-image.svg</file>
<file>icons/flat/24x24/glabels-line.svg</file>
<file>icons/flat/24x24/glabels-object-properties.svg</file>
<file>icons/flat/24x24/glabels-text.svg</file>
<file>icons/flat/24x24/glabels-valign-text-bottom.svg</file>
<file>icons/flat/24x24/glabels-valign-text-middle.svg</file>
<file>icons/flat/24x24/glabels-valign-text-top.svg</file>
<file>icons/32x32/actions/label-orientation-horiz.svg</file>
<file>icons/32x32/actions/label-orientation-vert.svg</file>
<file>icons/32x32/actions/print.svg</file>
<file>icons/32x32/actions/select-product.svg</file>
<file>icons/32x32/apps/glabels.svg</file>
<file>icons/flat/32x32/glabels-label-orientation-horiz.svg</file>
<file>icons/flat/32x32/glabels-label-orientation-vert.svg</file>
<file>icons/flat/32x32/glabels-print.svg</file>
<file>icons/flat/32x32/glabels-select-product.svg</file>
<file>icons/apps/32x32/glabels.svg</file>
<file>icons/48x48/apps/glabels.svg</file>
<file>icons/flat/48x48/glabels-edit.svg</file>
<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/apps/48x48/glabels.svg</file>
<file>icons/128x128/apps/glabels.svg</file>
<file>icons/apps/128x128/glabels.svg</file>
<file>icons/scalable/apps/glabels.svg</file>
<file>icons/apps/scalable/glabels.svg</file>
</qresource>
</RCC>

Before

Width:  |  Height:  |  Size: 1.8 KiB

After

Width:  |  Height:  |  Size: 1.8 KiB

Before

Width:  |  Height:  |  Size: 1.6 KiB

After

Width:  |  Height:  |  Size: 1.6 KiB

Before

Width:  |  Height:  |  Size: 1.6 KiB

After

Width:  |  Height:  |  Size: 1.6 KiB

Before

Width:  |  Height:  |  Size: 1.8 KiB

After

Width:  |  Height:  |  Size: 1.8 KiB

Before

Width:  |  Height:  |  Size: 1.8 KiB

After

Width:  |  Height:  |  Size: 1.8 KiB

Before

Width:  |  Height:  |  Size: 1.8 KiB

After

Width:  |  Height:  |  Size: 1.8 KiB

Before

Width:  |  Height:  |  Size: 625 B

After

Width:  |  Height:  |  Size: 625 B

Before

Width:  |  Height:  |  Size: 623 B

After

Width:  |  Height:  |  Size: 623 B

Before

Width:  |  Height:  |  Size: 623 B

After

Width:  |  Height:  |  Size: 623 B

Before

Width:  |  Height:  |  Size: 625 B

After

Width:  |  Height:  |  Size: 625 B

Before

Width:  |  Height:  |  Size: 623 B

After

Width:  |  Height:  |  Size: 623 B

Before

Width:  |  Height:  |  Size: 623 B

After

Width:  |  Height:  |  Size: 623 B

Before

Width:  |  Height:  |  Size: 308 B

After

Width:  |  Height:  |  Size: 308 B

Before

Width:  |  Height:  |  Size: 584 B

After

Width:  |  Height:  |  Size: 584 B

Before

Width:  |  Height:  |  Size: 231 B

After

Width:  |  Height:  |  Size: 231 B

Before

Width:  |  Height:  |  Size: 636 B

After

Width:  |  Height:  |  Size: 636 B

Before

Width:  |  Height:  |  Size: 636 B

After

Width:  |  Height:  |  Size: 636 B

Before

Width:  |  Height:  |  Size: 443 B

After

Width:  |  Height:  |  Size: 443 B

Before

Width:  |  Height:  |  Size: 1.0 KiB

After

Width:  |  Height:  |  Size: 1.0 KiB

Before

Width:  |  Height:  |  Size: 503 B

After

Width:  |  Height:  |  Size: 503 B

Before

Width:  |  Height:  |  Size: 833 B

After

Width:  |  Height:  |  Size: 833 B

Before

Width:  |  Height:  |  Size: 214 B

After

Width:  |  Height:  |  Size: 214 B

Before

Width:  |  Height:  |  Size: 1.0 KiB

After

Width:  |  Height:  |  Size: 1.0 KiB

Before

Width:  |  Height:  |  Size: 403 B

After

Width:  |  Height:  |  Size: 403 B

Before

Width:  |  Height:  |  Size: 635 B

After

Width:  |  Height:  |  Size: 635 B

Before

Width:  |  Height:  |  Size: 500 B

After

Width:  |  Height:  |  Size: 500 B

Before

Width:  |  Height:  |  Size: 544 B

After

Width:  |  Height:  |  Size: 544 B

Before

Width:  |  Height:  |  Size: 544 B

After

Width:  |  Height:  |  Size: 544 B

Before

Width:  |  Height:  |  Size: 402 B

After

Width:  |  Height:  |  Size: 402 B

Before

Width:  |  Height:  |  Size: 204 B

After

Width:  |  Height:  |  Size: 204 B

Before

Width:  |  Height:  |  Size: 367 B

After

Width:  |  Height:  |  Size: 367 B

Before

Width:  |  Height:  |  Size: 367 B

After

Width:  |  Height:  |  Size: 367 B

Before

Width:  |  Height:  |  Size: 552 B

After

Width:  |  Height:  |  Size: 552 B

Before

Width:  |  Height:  |  Size: 555 B

After

Width:  |  Height:  |  Size: 555 B

Before

Width:  |  Height:  |  Size: 235 B

After

Width:  |  Height:  |  Size: 235 B

Before

Width:  |  Height:  |  Size: 699 B

After

Width:  |  Height:  |  Size: 699 B

Before

Width:  |  Height:  |  Size: 773 B

After

Width:  |  Height:  |  Size: 773 B

Before

Width:  |  Height:  |  Size: 665 B

After

Width:  |  Height:  |  Size: 665 B

Before

Width:  |  Height:  |  Size: 965 B

After

Width:  |  Height:  |  Size: 965 B

Before

Width:  |  Height:  |  Size: 485 B

After

Width:  |  Height:  |  Size: 485 B

Before

Width:  |  Height:  |  Size: 487 B

After

Width:  |  Height:  |  Size: 487 B

Before

Width:  |  Height:  |  Size: 485 B

After

Width:  |  Height:  |  Size: 485 B

Before

Width:  |  Height:  |  Size: 311 B

After

Width:  |  Height:  |  Size: 311 B

Before

Width:  |  Height:  |  Size: 784 B

After

Width:  |  Height:  |  Size: 784 B

Before

Width:  |  Height:  |  Size: 231 B

After

Width:  |  Height:  |  Size: 231 B

Before

Width:  |  Height:  |  Size: 1.3 KiB

After

Width:  |  Height:  |  Size: 1.3 KiB

Before

Width:  |  Height:  |  Size: 505 B

After

Width:  |  Height:  |  Size: 505 B

Before

Width:  |  Height:  |  Size: 957 B

After

Width:  |  Height:  |  Size: 957 B

Before

Width:  |  Height:  |  Size: 216 B

After

Width:  |  Height:  |  Size: 216 B

Before

Width:  |  Height:  |  Size: 1.2 KiB

After

Width:  |  Height:  |  Size: 1.2 KiB

Before

Width:  |  Height:  |  Size: 414 B

After

Width:  |  Height:  |  Size: 414 B

Before

Width:  |  Height:  |  Size: 638 B

After

Width:  |  Height:  |  Size: 638 B

Before

Width:  |  Height:  |  Size: 502 B

After

Width:  |  Height:  |  Size: 502 B

Before

Width:  |  Height:  |  Size: 402 B

After

Width:  |  Height:  |  Size: 402 B

Before

Width:  |  Height:  |  Size: 403 B

After

Width:  |  Height:  |  Size: 403 B

Before

Width:  |  Height:  |  Size: 509 B

After

Width:  |  Height:  |  Size: 509 B

Before

Width:  |  Height:  |  Size: 402 B

After

Width:  |  Height:  |  Size: 402 B

Before

Width:  |  Height:  |  Size: 204 B

After

Width:  |  Height:  |  Size: 204 B

Before

Width:  |  Height:  |  Size: 244 B

After

Width:  |  Height:  |  Size: 244 B

Before

Width:  |  Height:  |  Size: 399 B

After

Width:  |  Height:  |  Size: 399 B

Before

Width:  |  Height:  |  Size: 513 B

After

Width:  |  Height:  |  Size: 513 B

Before

Width:  |  Height:  |  Size: 403 B

After

Width:  |  Height:  |  Size: 403 B

Before

Width:  |  Height:  |  Size: 715 B

After

Width:  |  Height:  |  Size: 715 B

Before

Width:  |  Height:  |  Size: 777 B

After

Width:  |  Height:  |  Size: 777 B

Before

Width:  |  Height:  |  Size: 669 B

After

Width:  |  Height:  |  Size: 669 B

Before

Width:  |  Height:  |  Size: 973 B

After

Width:  |  Height:  |  Size: 973 B

Before

Width:  |  Height:  |  Size: 485 B

After

Width:  |  Height:  |  Size: 485 B

Before

Width:  |  Height:  |  Size: 487 B

After

Width:  |  Height:  |  Size: 487 B

Before

Width:  |  Height:  |  Size: 486 B

After

Width:  |  Height:  |  Size: 486 B

Before

Width:  |  Height:  |  Size: 311 B

After

Width:  |  Height:  |  Size: 311 B

Before

Width:  |  Height:  |  Size: 784 B

After

Width:  |  Height:  |  Size: 784 B

Before

Width:  |  Height:  |  Size: 231 B

After

Width:  |  Height:  |  Size: 231 B

Before

Width:  |  Height:  |  Size: 1.3 KiB

After

Width:  |  Height:  |  Size: 1.3 KiB

Before

Width:  |  Height:  |  Size: 506 B

After

Width:  |  Height:  |  Size: 506 B

Before

Width:  |  Height:  |  Size: 957 B

After

Width:  |  Height:  |  Size: 957 B

Before

Width:  |  Height:  |  Size: 216 B

After

Width:  |  Height:  |  Size: 216 B

Before

Width:  |  Height:  |  Size: 1.2 KiB

After

Width:  |  Height:  |  Size: 1.2 KiB

Before

Width:  |  Height:  |  Size: 415 B

After

Width:  |  Height:  |  Size: 415 B

Before

Width:  |  Height:  |  Size: 641 B

After

Width:  |  Height:  |  Size: 641 B

Before

Width:  |  Height:  |  Size: 503 B

After

Width:  |  Height:  |  Size: 503 B

Before

Width:  |  Height:  |  Size: 403 B

After

Width:  |  Height:  |  Size: 403 B

Before

Width:  |  Height:  |  Size: 403 B

After

Width:  |  Height:  |  Size: 403 B

Before

Width:  |  Height:  |  Size: 509 B

After

Width:  |  Height:  |  Size: 509 B

Before

Width:  |  Height:  |  Size: 404 B

After

Width:  |  Height:  |  Size: 404 B

Before

Width:  |  Height:  |  Size: 204 B

After

Width:  |  Height:  |  Size: 204 B

Before

Width:  |  Height:  |  Size: 561 B

After

Width:  |  Height:  |  Size: 561 B

Before

Width:  |  Height:  |  Size: 245 B

After

Width:  |  Height:  |  Size: 245 B

Before

Width:  |  Height:  |  Size: 404 B

After

Width:  |  Height:  |  Size: 404 B

Before

Width:  |  Height:  |  Size: 515 B

After

Width:  |  Height:  |  Size: 515 B

Before

Width:  |  Height:  |  Size: 404 B

After

Width:  |  Height:  |  Size: 404 B

Before

Width:  |  Height:  |  Size: 245 B

After

Width:  |  Height:  |  Size: 245 B

Before

Width:  |  Height:  |  Size: 245 B

After

Width:  |  Height:  |  Size: 245 B

Before

Width:  |  Height:  |  Size: 924 B

After

Width:  |  Height:  |  Size: 924 B

Some files were not shown because too many files have changed in this diff Show More