diff --git a/glabels/Icons.h b/glabels/Icons.h index 4bf69fa..292d9d5 100644 --- a/glabels/Icons.h +++ b/glabels/Icons.h @@ -350,7 +350,7 @@ namespace glabels public: EditCopy() { - addFile( ":icons/24x24/actions/fallback-edit-copy.png" ); + addFile( ":icons/24x24/actions/edit-copy.png" ); } }; @@ -360,7 +360,7 @@ namespace glabels public: EditCut() { - addFile( ":icons/24x24/actions/fallback-edit-cut.png" ); + addFile( ":icons/24x24/actions/edit-cut.png" ); } }; @@ -370,7 +370,7 @@ namespace glabels public: EditPaste() { - addFile( ":icons/24x24/actions/fallback-edit-paste.png" ); + addFile( ":icons/24x24/actions/edit-paste.png" ); } }; @@ -380,7 +380,7 @@ namespace glabels public: FileNew() { - addFile( ":icons/24x24/actions/fallback-file-new.png" ); + addFile( ":icons/24x24/actions/file-new.png" ); } }; @@ -390,7 +390,7 @@ namespace glabels public: FileOpen() { - addFile( ":icons/24x24/actions/fallback-file-open.png" ); + addFile( ":icons/24x24/actions/file-open.png" ); } }; @@ -400,7 +400,8 @@ namespace glabels public: FilePrint() { - addFile( ":icons/24x24/actions/fallback-file-print.png" ); + addFile( ":icons/24x24/actions/file-print.png" ); + addFile( ":icons/32x32/actions/file-print.png" ); } }; @@ -410,7 +411,7 @@ namespace glabels public: FileSave() { - addFile( ":icons/24x24/actions/fallback-file-save.png" ); + addFile( ":icons/24x24/actions/file-save.png" ); } }; @@ -420,7 +421,7 @@ namespace glabels public: FileSaveAs() { - addFile( ":icons/24x24/actions/fallback-file-save-as.png" ); + addFile( ":icons/24x24/actions/file-save-as.png" ); } }; @@ -430,7 +431,7 @@ namespace glabels public: ZoomBestFit() { - addFile( ":icons/24x24/actions/fallback-zoom-best-fit.png" ); + addFile( ":icons/24x24/actions/zoom-best-fit.png" ); } }; @@ -440,7 +441,7 @@ namespace glabels public: ZoomIn() { - addFile( ":icons/24x24/actions/fallback-zoom-in.png" ); + addFile( ":icons/24x24/actions/zoom-in.png" ); } }; @@ -450,7 +451,7 @@ namespace glabels public: ZoomOriginal() { - addFile( ":icons/24x24/actions/fallback-zoom-original.png" ); + addFile( ":icons/24x24/actions/zoom-original.png" ); } }; @@ -460,7 +461,7 @@ namespace glabels public: ZoomOut() { - addFile( ":icons/24x24/actions/fallback-zoom-out.png" ); + addFile( ":icons/24x24/actions/zoom-out.png" ); } }; diff --git a/glabels/icons.qrc b/glabels/icons.qrc index a12dea9..8729ca3 100644 --- a/glabels/icons.qrc +++ b/glabels/icons.qrc @@ -52,20 +52,21 @@ icons/24x24/actions/glabels-valign-text-bottom.png icons/24x24/actions/glabels-valign-text-middle.png icons/24x24/actions/glabels-valign-text-top.png - icons/24x24/actions/fallback-edit-copy.png - icons/24x24/actions/fallback-edit-cut.png - icons/24x24/actions/fallback-edit-paste.png - icons/24x24/actions/fallback-file-new.png - icons/24x24/actions/fallback-file-open.png - icons/24x24/actions/fallback-file-print.png - icons/24x24/actions/fallback-file-save-as.png - icons/24x24/actions/fallback-file-save.png - icons/24x24/actions/fallback-zoom-best-fit.png - icons/24x24/actions/fallback-zoom-in.png - icons/24x24/actions/fallback-zoom-original.png - icons/24x24/actions/fallback-zoom-out.png + icons/24x24/actions/edit-copy.png + icons/24x24/actions/edit-cut.png + icons/24x24/actions/edit-paste.png + icons/24x24/actions/file-new.png + icons/24x24/actions/file-open.png + icons/24x24/actions/file-print.png + icons/24x24/actions/file-save-as.png + icons/24x24/actions/file-save.png + icons/24x24/actions/zoom-best-fit.png + icons/24x24/actions/zoom-in.png + icons/24x24/actions/zoom-original.png + icons/24x24/actions/zoom-out.png icons/24x24/apps/glabels.png icons/32x32/apps/glabels.png + icons/32x32/actions/file-print.png icons/32x32/actions/horizontal-orientation.png icons/32x32/actions/select-product.png icons/32x32/actions/vertical-orientation.png diff --git a/glabels/icons/24x24/actions/fallback-edit-copy.png b/glabels/icons/24x24/actions/edit-copy.png similarity index 100% rename from glabels/icons/24x24/actions/fallback-edit-copy.png rename to glabels/icons/24x24/actions/edit-copy.png diff --git a/glabels/icons/24x24/actions/fallback-edit-cut.png b/glabels/icons/24x24/actions/edit-cut.png similarity index 100% rename from glabels/icons/24x24/actions/fallback-edit-cut.png rename to glabels/icons/24x24/actions/edit-cut.png diff --git a/glabels/icons/24x24/actions/fallback-edit-paste.png b/glabels/icons/24x24/actions/edit-paste.png similarity index 100% rename from glabels/icons/24x24/actions/fallback-edit-paste.png rename to glabels/icons/24x24/actions/edit-paste.png diff --git a/glabels/icons/24x24/actions/fallback-file-new.png b/glabels/icons/24x24/actions/file-new.png similarity index 100% rename from glabels/icons/24x24/actions/fallback-file-new.png rename to glabels/icons/24x24/actions/file-new.png diff --git a/glabels/icons/24x24/actions/fallback-file-open.png b/glabels/icons/24x24/actions/file-open.png similarity index 100% rename from glabels/icons/24x24/actions/fallback-file-open.png rename to glabels/icons/24x24/actions/file-open.png diff --git a/glabels/icons/24x24/actions/fallback-file-print.png b/glabels/icons/24x24/actions/file-print.png similarity index 100% rename from glabels/icons/24x24/actions/fallback-file-print.png rename to glabels/icons/24x24/actions/file-print.png diff --git a/glabels/icons/24x24/actions/fallback-file-save-as.png b/glabels/icons/24x24/actions/file-save-as.png similarity index 100% rename from glabels/icons/24x24/actions/fallback-file-save-as.png rename to glabels/icons/24x24/actions/file-save-as.png diff --git a/glabels/icons/24x24/actions/fallback-file-save.png b/glabels/icons/24x24/actions/file-save.png similarity index 100% rename from glabels/icons/24x24/actions/fallback-file-save.png rename to glabels/icons/24x24/actions/file-save.png diff --git a/glabels/icons/24x24/actions/fallback-zoom-best-fit.png b/glabels/icons/24x24/actions/zoom-best-fit.png similarity index 100% rename from glabels/icons/24x24/actions/fallback-zoom-best-fit.png rename to glabels/icons/24x24/actions/zoom-best-fit.png diff --git a/glabels/icons/24x24/actions/fallback-zoom-in.png b/glabels/icons/24x24/actions/zoom-in.png similarity index 100% rename from glabels/icons/24x24/actions/fallback-zoom-in.png rename to glabels/icons/24x24/actions/zoom-in.png diff --git a/glabels/icons/24x24/actions/fallback-zoom-original.png b/glabels/icons/24x24/actions/zoom-original.png similarity index 100% rename from glabels/icons/24x24/actions/fallback-zoom-original.png rename to glabels/icons/24x24/actions/zoom-original.png diff --git a/glabels/icons/24x24/actions/fallback-zoom-out.png b/glabels/icons/24x24/actions/zoom-out.png similarity index 100% rename from glabels/icons/24x24/actions/fallback-zoom-out.png rename to glabels/icons/24x24/actions/zoom-out.png diff --git a/glabels/icons/32x32/actions/file-print.png b/glabels/icons/32x32/actions/file-print.png new file mode 100644 index 0000000..dfa03ba Binary files /dev/null and b/glabels/icons/32x32/actions/file-print.png differ diff --git a/glabels/ui/PrintView.ui b/glabels/ui/PrintView.ui index 4a919c9..178d373 100644 --- a/glabels/ui/PrintView.ui +++ b/glabels/ui/PrintView.ui @@ -414,7 +414,13 @@ - :/icons/24x24/actions/fallback-file-print.png:/icons/24x24/actions/fallback-file-print.png + :/icons/32x32/actions/file-print.png:/icons/32x32/actions/file-print.png + + + + 32 + 32 + Qt::ToolButtonTextBesideIcon