r23474 by jghali - #16022: Changing icon set requires restarting Scribus
scribus-commit
scribus-commit at lists.scribus.net
Tue Feb 25 20:01:15 UTC 2020
Author: jghali
Date: Tue Feb 25 20:01:15 2020
New Revision: 23474
URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=23474
Log:
#16022: Changing icon set requires restarting Scribus
Modified:
trunk/Scribus/scribus/actionmanager.cpp
trunk/Scribus/scribus/fontlistmodel.cpp
trunk/Scribus/scribus/fontlistmodel.h
trunk/Scribus/scribus/iconmanager.cpp
trunk/Scribus/scribus/iconmanager.h
trunk/Scribus/scribus/pluginmanager.cpp
trunk/Scribus/scribus/plugins/barcodegenerator/barcode.cpp
trunk/Scribus/scribus/plugins/picbrowser/picturebrowser.cpp
trunk/Scribus/scribus/plugins/picbrowser/picturebrowser.h
trunk/Scribus/scribus/plugins/shapes/shapepalette.cpp
trunk/Scribus/scribus/plugins/shapes/shapepalette.h
trunk/Scribus/scribus/plugins/tools/pathcut/pathcut.cpp
trunk/Scribus/scribus/plugins/tools/pathfinder/pathfinder.cpp
trunk/Scribus/scribus/prefsmanager.cpp
trunk/Scribus/scribus/prefsmanager.h
trunk/Scribus/scribus/scpaths.cpp
trunk/Scribus/scribus/scplugin.cpp
trunk/Scribus/scribus/scplugin.h
trunk/Scribus/scribus/scraction.cpp
trunk/Scribus/scribus/scraction.h
trunk/Scribus/scribus/scribus.cpp
trunk/Scribus/scribus/scribus.h
trunk/Scribus/scribus/scribusapp.cpp
trunk/Scribus/scribus/scribusapp.h
trunk/Scribus/scribus/scribusview.cpp
trunk/Scribus/scribus/scribusview.h
trunk/Scribus/scribus/scribuswin.h
trunk/Scribus/scribus/ui/aligndistribute.cpp
trunk/Scribus/scribus/ui/aligndistribute.h
trunk/Scribus/scribus/ui/alignselect.cpp
trunk/Scribus/scribus/ui/alignselect.h
trunk/Scribus/scribus/ui/charselect.cpp
trunk/Scribus/scribus/ui/charselect.h
trunk/Scribus/scribus/ui/checkDocument.cpp
trunk/Scribus/scribus/ui/checkDocument.h
trunk/Scribus/scribus/ui/colorlistbox.cpp
trunk/Scribus/scribus/ui/colorlistbox.h
trunk/Scribus/scribus/ui/contextmenu.cpp
trunk/Scribus/scribus/ui/directionselect.cpp
trunk/Scribus/scribus/ui/directionselect.h
trunk/Scribus/scribus/ui/editor.cpp
trunk/Scribus/scribus/ui/editor.h
trunk/Scribus/scribus/ui/fontcombo.cpp
trunk/Scribus/scribus/ui/fontcombo.h
trunk/Scribus/scribus/ui/layers.cpp
trunk/Scribus/scribus/ui/layers.h
trunk/Scribus/scribus/ui/linkbutton.cpp
trunk/Scribus/scribus/ui/linkbutton.h
trunk/Scribus/scribus/ui/nodeeditpalette.cpp
trunk/Scribus/scribus/ui/nodeeditpalette.h
trunk/Scribus/scribus/ui/outlinepalette.cpp
trunk/Scribus/scribus/ui/outlinepalette.h
trunk/Scribus/scribus/ui/pagepalette_masterpages.cpp
trunk/Scribus/scribus/ui/pagepalette_masterpages.h
trunk/Scribus/scribus/ui/pagepalette_pages.cpp
trunk/Scribus/scribus/ui/pagepalette_pages.h
trunk/Scribus/scribus/ui/pagepalette_widgets.cpp
trunk/Scribus/scribus/ui/pagepalette_widgets.h
trunk/Scribus/scribus/ui/prefs_hyphenator.cpp
trunk/Scribus/scribus/ui/prefs_spelling.cpp
trunk/Scribus/scribus/ui/prefs_userinterface.cpp
trunk/Scribus/scribus/ui/propertiespalette_line.cpp
trunk/Scribus/scribus/ui/propertiespalette_line.h
trunk/Scribus/scribus/ui/propertiespalette_shape.cpp
trunk/Scribus/scribus/ui/propertiespalette_shape.h
trunk/Scribus/scribus/ui/propertiespalette_table.cpp
trunk/Scribus/scribus/ui/propertiespalette_table.h
trunk/Scribus/scribus/ui/propertiespalette_xyz.cpp
trunk/Scribus/scribus/ui/propertiespalette_xyz.h
trunk/Scribus/scribus/ui/propertywidget_advanced.cpp
trunk/Scribus/scribus/ui/propertywidget_advanced.h
trunk/Scribus/scribus/ui/propertywidget_pareffect.cpp
trunk/Scribus/scribus/ui/propertywidget_pareffect.h
trunk/Scribus/scribus/ui/propertywidget_textcolor.cpp
trunk/Scribus/scribus/ui/propertywidget_textcolor.h
trunk/Scribus/scribus/ui/resourcemanager.cpp
trunk/Scribus/scribus/ui/scdockpalette.cpp
trunk/Scribus/scribus/ui/scrapbookpalette.cpp
trunk/Scribus/scribus/ui/scrapbookpalette.h
trunk/Scribus/scribus/ui/smcellstylewidget.cpp
trunk/Scribus/scribus/ui/smcellstylewidget.h
trunk/Scribus/scribus/ui/smcstylewidget.cpp
trunk/Scribus/scribus/ui/smcstylewidget.h
trunk/Scribus/scribus/ui/smlinestylewidget.cpp
trunk/Scribus/scribus/ui/smlinestylewidget.h
trunk/Scribus/scribus/ui/smpstylewidget.cpp
trunk/Scribus/scribus/ui/smpstylewidget.h
trunk/Scribus/scribus/ui/smtablestylewidget.cpp
trunk/Scribus/scribus/ui/smtablestylewidget.h
trunk/Scribus/scribus/ui/smtabruler.cpp
trunk/Scribus/scribus/ui/storyeditor.cpp
trunk/Scribus/scribus/ui/storyeditor.h
trunk/Scribus/scribus/ui/stylemanager.cpp
trunk/Scribus/scribus/ui/styleselect.cpp
trunk/Scribus/scribus/ui/styleselect.h
trunk/Scribus/scribus/ui/tabruler.cpp
trunk/Scribus/scribus/ui/tabruler.h
trunk/Scribus/scribus/util_color.cpp
trunk/Scribus/scribus/util_color.h
Modified: trunk/Scribus/scribus/actionmanager.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23474&path=/trunk/Scribus/scribus/actionmanager.cpp
==============================================================================
--- trunk/Scribus/scribus/actionmanager.cpp (original)
+++ trunk/Scribus/scribus/actionmanager.cpp Tue Feb 25 20:01:15 2020
@@ -115,19 +115,19 @@
QString name;
//File Menu
name = "fileNew";
- scrActions->insert(name, new ScrAction(im.loadPixmap("16/document-new.png"), im.loadPixmap("22/document-new.png"), "", defaultKey(name), mainWindow));
+ scrActions->insert(name, new ScrAction("16/document-new.png", "22/document-new.png", "", defaultKey(name), mainWindow));
name = "fileNewFromTemplate";
scrActions->insert(name, new ScrAction("", defaultKey(name), mainWindow));
name = "fileOpen";
- scrActions->insert(name, new ScrAction(im.loadPixmap("16/document-open.png"), im.loadPixmap("22/document-open.png"), "", defaultKey(name), mainWindow));
+ scrActions->insert(name, new ScrAction("16/document-open.png", "22/document-open.png", "", defaultKey(name), mainWindow));
name = "fileClose";
- scrActions->insert(name, new ScrAction(im.loadPixmap("16/close.png"), im.loadPixmap("22/close.png"), "", defaultKey(name), mainWindow));
+ scrActions->insert(name, new ScrAction("16/close.png", "22/close.png", "", defaultKey(name), mainWindow));
name = "fileSave";
- scrActions->insert(name, new ScrAction(im.loadPixmap("16/document-save.png"), im.loadPixmap("22/document-save.png"), "", defaultKey(name), mainWindow));
+ scrActions->insert(name, new ScrAction("16/document-save.png", "22/document-save.png", "", defaultKey(name), mainWindow));
name = "fileSaveAs";
- scrActions->insert(name, new ScrAction(im.loadPixmap("16/document-save-as.png"), im.loadPixmap("22/document-save-as.png"), "", defaultKey(name), mainWindow));
+ scrActions->insert(name, new ScrAction("16/document-save-as.png", "22/document-save-as.png", "", defaultKey(name), mainWindow));
name = "fileRevert";
- scrActions->insert(name, new ScrAction(im.loadPixmap("revert.png"), QPixmap(), "", defaultKey(name), mainWindow));
+ scrActions->insert(name, new ScrAction("revert.png", QString(), "", defaultKey(name), mainWindow));
name = "fileCollect";
scrActions->insert(name, new ScrAction("", defaultKey(name), mainWindow));
//File Import Menu
@@ -148,12 +148,12 @@
name = "fileExportAsEPS";
scrActions->insert(name, new ScrAction("", defaultKey(name), mainWindow));
name = "fileExportAsPDF";
- scrActions->insert(name, new ScrAction(im.loadPixmap("acroread16.png"), im.loadPixmap("acroread22.png"), "", defaultKey(name), mainWindow));
+ scrActions->insert(name, new ScrAction("acroread16.png", "acroread22.png", "", defaultKey(name), mainWindow));
//Rest of File Menu
// name = "fileDocSetup";
-// scrActions->insert(name, new ScrAction(im.loadPixmap("16/document-properties.png"), im.loadPixmap("22/document-properties.png"), "", defaultKey(name), mainWindow));
+// scrActions->insert(name, new ScrAction("16/document-properties.png", "22/document-properties.png", "", defaultKey(name), mainWindow));
name = "fileDocSetup150";
- scrActions->insert(name, new ScrAction(im.loadPixmap("16/document-properties.png"), im.loadPixmap("22/document-properties.png"), "", defaultKey(name), mainWindow));
+ scrActions->insert(name, new ScrAction("16/document-properties.png", "22/document-properties.png", "", defaultKey(name), mainWindow));
// name = "filePreferences";
// scrActions->insert(name, new ScrAction("", defaultKey(name), mainWindow));
// (*scrActions)[name]->setMenuRole(QAction::NoRole);
@@ -161,11 +161,11 @@
scrActions->insert(name, new ScrAction("", defaultKey(name), mainWindow));
(*scrActions)[name]->setMenuRole(QAction::PreferencesRole);
name = "filePrint";
- scrActions->insert(name, new ScrAction(im.loadPixmap("16/document-print.png"), im.loadPixmap("22/document-print.png"), "", defaultKey(name), mainWindow));
+ scrActions->insert(name, new ScrAction("16/document-print.png", "22/document-print.png", "", defaultKey(name), mainWindow));
name = "PrintPreview";
- scrActions->insert(name, new ScrAction(im.loadPixmap("16/document-print-preview.png"), im.loadPixmap("22/document-print-preview.png"), "", defaultKey(name), mainWindow));
+ scrActions->insert(name, new ScrAction("16/document-print-preview.png", "22/document-print-preview.png", "", defaultKey(name), mainWindow));
name = "fileQuit";
- scrActions->insert(name, new ScrAction(im.loadPixmap("exit.png"), QPixmap(), "", defaultKey(name), mainWindow));
+ scrActions->insert(name, new ScrAction("exit.png", QString(), "", defaultKey(name), mainWindow));
(*scrActions)[name]->setMenuRole(QAction::QuitRole);
//Connect our signals and slots
@@ -204,29 +204,29 @@
QString name;
//Edit Menu
name = "editUndoAction";
- scrActions->insert(name, new ScrAction(ScrAction::DataInt, im.loadPixmap("16/edit-undo.png"), im.loadPixmap("22/edit-undo.png"), "", defaultKey(name), mainWindow, 1));
+ scrActions->insert(name, new ScrAction(ScrAction::DataInt, "16/edit-undo.png", "22/edit-undo.png", "", defaultKey(name), mainWindow, 1));
name = "editRedoAction";
- scrActions->insert(name, new ScrAction(ScrAction::DataInt, im.loadPixmap("16/edit-redo.png"), im.loadPixmap("22/edit-redo.png"), "", defaultKey(name), mainWindow, 1));
+ scrActions->insert(name, new ScrAction(ScrAction::DataInt, "16/edit-redo.png", "22/edit-redo.png", "", defaultKey(name), mainWindow, 1));
name = "editActionMode";
scrActions->insert(name, new ScrAction("", defaultKey(name), mainWindow));
(*scrActions)["editActionMode"]->setToggleAction(true);
name = "editCut";
- scrActions->insert(name, new ScrAction(im.loadPixmap("16/edit-cut.png"), im.loadPixmap("22/edit-cut.png"), "", defaultKey(name), mainWindow));
+ scrActions->insert(name, new ScrAction("16/edit-cut.png", "22/edit-cut.png", "", defaultKey(name), mainWindow));
name = "editCopy";
- scrActions->insert(name, new ScrAction(im.loadPixmap("16/edit-copy.png"), im.loadPixmap("22/edit-copy.png"), "", defaultKey(name), mainWindow));
+ scrActions->insert(name, new ScrAction("16/edit-copy.png", "22/edit-copy.png", "", defaultKey(name), mainWindow));
name = "editPaste";
- scrActions->insert(name, new ScrAction(im.loadPixmap("16/edit-paste.png"), im.loadPixmap("22/edit-paste.png"), "", defaultKey(name), mainWindow));
+ scrActions->insert(name, new ScrAction("16/edit-paste.png", "22/edit-paste.png", "", defaultKey(name), mainWindow));
name = "editCopyContents";
- scrActions->insert(name, new ScrAction(im.loadPixmap("16/edit-copy.png"), im.loadPixmap("22/edit-copy.png"), "", defaultKey(name), mainWindow));
+ scrActions->insert(name, new ScrAction("16/edit-copy.png", "22/edit-copy.png", "", defaultKey(name), mainWindow));
name = "editPasteContents";
- scrActions->insert(name, new ScrAction(ScrAction::DataInt, im.loadPixmap("16/edit-paste.png"), QPixmap(), "", defaultKey(name), mainWindow, 0));
+ scrActions->insert(name, new ScrAction(ScrAction::DataInt, "16/edit-paste.png", QString(), "", defaultKey(name), mainWindow, 0));
name = "editPasteContentsAbs";
- scrActions->insert(name, new ScrAction(ScrAction::DataInt, im.loadPixmap("16/edit-paste.png"), QPixmap(), "", defaultKey(name), mainWindow, 1));
+ scrActions->insert(name, new ScrAction(ScrAction::DataInt, "16/edit-paste.png", QString(), "", defaultKey(name), mainWindow, 1));
name = "editPasteImageFromClipboard";
- scrActions->insert(name, new ScrAction(im.loadPixmap("16/edit-paste.png"), im.loadPixmap("22/edit-paste.png"), "", defaultKey(name), mainWindow));
+ scrActions->insert(name, new ScrAction("16/edit-paste.png", "22/edit-paste.png", "", defaultKey(name), mainWindow));
name = "editClearContents";
- scrActions->insert(name, new ScrAction(im.loadPixmap("16/edit-delete.png"), im.loadPixmap("22/edit-delete.png"), "", defaultKey(name), mainWindow));
+ scrActions->insert(name, new ScrAction("16/edit-delete.png", "22/edit-delete.png", "", defaultKey(name), mainWindow));
name = "editTruncateContents";
scrActions->insert(name, new ScrAction("", defaultKey(name), mainWindow));
name = "editSelectAll";
@@ -236,7 +236,7 @@
name = "editDeselectAll";
scrActions->insert(name, new ScrAction("", defaultKey(name), mainWindow));
name = "editSearchReplace";
- scrActions->insert(name, new ScrAction(im.loadPixmap("16/edit-find-replace.png"), im.loadPixmap("22/edit-find-replace.png"), "", defaultKey(name), mainWindow));
+ scrActions->insert(name, new ScrAction("16/edit-find-replace.png", "22/edit-find-replace.png", "", defaultKey(name), mainWindow));
name = "editEditWithImageEditor";
scrActions->insert(name, new ScrAction("", defaultKey(name), mainWindow));
name = "editEditRenderSource";
@@ -287,7 +287,7 @@
//Text Size actions
scrActionGroups->insert("fontSize", new QActionGroup(mainWindow));
QString name("fontSizeOther");
- scrActions->insert(name, new ScrAction(ScrAction::DataInt, QPixmap(), QPixmap(), "", defaultKey(name), scrActionGroups->value("fontSize"), -1));
+ scrActions->insert(name, new ScrAction(ScrAction::DataInt, QString(), QString(), "", defaultKey(name), scrActionGroups->value("fontSize"), -1));
connect( (*scrActions)["fontSizeOther"], SIGNAL(triggeredData(int)), mainWindow, SLOT(setItemFontSize(int)));
int font_sizes[] = {7, 9, 10, 11, 12, 14, 18, 24, 36, 48, 60, 72};
@@ -295,22 +295,22 @@
for (uint s = 0; s < f_size; ++s)
{
QString fontSizeName=QString("fontSize%1").arg(font_sizes[s]);
- scrActions->insert(fontSizeName, new ScrAction(ScrAction::DataInt, QPixmap(), QPixmap(), "", defaultKey(name), scrActionGroups->value("fontSize"), font_sizes[s]));
+ scrActions->insert(fontSizeName, new ScrAction(ScrAction::DataInt, QString(), QString(), "", defaultKey(name), scrActionGroups->value("fontSize"), font_sizes[s]));
(*scrActions)[fontSizeName]->setToggleAction(true);
connect( (*scrActions)[fontSizeName], SIGNAL(triggeredData(int)), mainWindow, SLOT(setItemFontSize(int)));
}
//Alignment actions
name = "alignLeft";
- scrActions->insert(name, new ScrAction(ScrAction::DataInt, QPixmap(), QPixmap(), "", defaultKey(name), mainWindow, 0));
+ scrActions->insert(name, new ScrAction(ScrAction::DataInt, QString(), QString(), "", defaultKey(name), mainWindow, 0));
name = "alignCenter";
- scrActions->insert(name, new ScrAction(ScrAction::DataInt, QPixmap(), QPixmap(), "", defaultKey(name), mainWindow, 1));
+ scrActions->insert(name, new ScrAction(ScrAction::DataInt, QString(), QString(), "", defaultKey(name), mainWindow, 1));
name = "alignRight";
- scrActions->insert(name, new ScrAction(ScrAction::DataInt, QPixmap(), QPixmap(), "", defaultKey(name), mainWindow, 2));
+ scrActions->insert(name, new ScrAction(ScrAction::DataInt, QString(), QString(), "", defaultKey(name), mainWindow, 2));
name = "alignBlock";
- scrActions->insert(name, new ScrAction(ScrAction::DataInt, QPixmap(), QPixmap(), "", defaultKey(name), mainWindow, 3));
+ scrActions->insert(name, new ScrAction(ScrAction::DataInt, QString(), QString(), "", defaultKey(name), mainWindow, 3));
name = "alignForced";
- scrActions->insert(name, new ScrAction(ScrAction::DataInt, QPixmap(), QPixmap(), "", defaultKey(name), mainWindow, 4));
+ scrActions->insert(name, new ScrAction(ScrAction::DataInt, QString(), QString(), "", defaultKey(name), mainWindow, 4));
(*scrActions)["alignLeft"]->setToggleAction(true);
(*scrActions)["alignCenter"]->setToggleAction(true);
@@ -328,12 +328,12 @@
/*
scrActionGroups->insert("shade", new QActionGroup(mainWindow));
name = "shadeOther";
- scrActions->insert(name, new ScrAction(ScrAction::DataInt, QPixmap(), QPixmap(), "", defaultKey(name), scrActionGroups->value("shade"), -1));
+ scrActions->insert(name, new ScrAction(ScrAction::DataInt, QString(), QString(), "", defaultKey(name), scrActionGroups->value("shade"), -1));
connect( (*scrActions)["shadeOther"], SIGNAL(triggeredData(int)), mainWindow, SLOT(setItemShade(int)));
for (uint i=0; i<=100 ; i+=10)
{
QString shadeName=QString("shade%1").arg(i);
- scrActions->insert(shadeName, new ScrAction(ScrAction::DataInt, QPixmap(), QPixmap(), "", defaultKey(name), scrActionGroups->value("shade"), i));
+ scrActions->insert(shadeName, new ScrAction(ScrAction::DataInt, QString(), QString(), "", defaultKey(name), scrActionGroups->value("shade"), i));
(*scrActions)[shadeName]->setToggleAction(true);
connect( (*scrActions)[shadeName], SIGNAL(triggeredData(int)), mainWindow, SLOT(setItemShade(int)));
}
@@ -342,25 +342,25 @@
//Type Effects actions
scrActionGroups->insert("typeEffects", new QActionGroup(mainWindow));
name = "typeEffectNormal";
- scrActions->insert(name, new ScrAction(ScrAction::DataInt, QPixmap(), QPixmap(), "", defaultKey(name), scrActionGroups->value("typeEffects"), 0));
+ scrActions->insert(name, new ScrAction(ScrAction::DataInt, QString(), QString(), "", defaultKey(name), scrActionGroups->value("typeEffects"), 0));
name = "typeEffectUnderline";
- scrActions->insert(name, new ScrAction(ScrAction::DataInt, QPixmap(), QPixmap(), "", defaultKey(name), scrActionGroups->value("typeEffects"), 1));
+ scrActions->insert(name, new ScrAction(ScrAction::DataInt, QString(), QString(), "", defaultKey(name), scrActionGroups->value("typeEffects"), 1));
name = "typeEffectUnderlineWords";
- scrActions->insert(name, new ScrAction(ScrAction::DataInt, QPixmap(), QPixmap(), "", defaultKey(name), scrActionGroups->value("typeEffects"), 8));
+ scrActions->insert(name, new ScrAction(ScrAction::DataInt, QString(), QString(), "", defaultKey(name), scrActionGroups->value("typeEffects"), 8));
name = "typeEffectStrikeThrough";
- scrActions->insert(name, new ScrAction(ScrAction::DataInt, QPixmap(), QPixmap(), "", defaultKey(name), scrActionGroups->value("typeEffects"), 2));
+ scrActions->insert(name, new ScrAction(ScrAction::DataInt, QString(), QString(), "", defaultKey(name), scrActionGroups->value("typeEffects"), 2));
name = "typeEffectAllCaps";
- scrActions->insert(name, new ScrAction(ScrAction::DataInt, QPixmap(), QPixmap(), "", defaultKey(name), scrActionGroups->value("typeEffects"), 7));
+ scrActions->insert(name, new ScrAction(ScrAction::DataInt, QString(), QString(), "", defaultKey(name), scrActionGroups->value("typeEffects"), 7));
name = "typeEffectSmallCaps";
- scrActions->insert(name, new ScrAction(ScrAction::DataInt, QPixmap(), QPixmap(), "", defaultKey(name), scrActionGroups->value("typeEffects"), 3));
+ scrActions->insert(name, new ScrAction(ScrAction::DataInt, QString(), QString(), "", defaultKey(name), scrActionGroups->value("typeEffects"), 3));
name = "typeEffectSuperscript";
- scrActions->insert(name, new ScrAction(ScrAction::DataInt, QPixmap(), QPixmap(), "", defaultKey(name), scrActionGroups->value("typeEffects"), 4));
+ scrActions->insert(name, new ScrAction(ScrAction::DataInt, QString(), QString(), "", defaultKey(name), scrActionGroups->value("typeEffects"), 4));
name = "typeEffectSubscript";
- scrActions->insert(name, new ScrAction(ScrAction::DataInt, QPixmap(), QPixmap(), "", defaultKey(name), scrActionGroups->value("typeEffects"), 5));
+ scrActions->insert(name, new ScrAction(ScrAction::DataInt, QString(), QString(), "", defaultKey(name), scrActionGroups->value("typeEffects"), 5));
name = "typeEffectOutline";
- scrActions->insert(name, new ScrAction(ScrAction::DataInt, QPixmap(), QPixmap(), "", defaultKey(name), scrActionGroups->value("typeEffects"), 6));
+ scrActions->insert(name, new ScrAction(ScrAction::DataInt, QString(), QString(), "", defaultKey(name), scrActionGroups->value("typeEffects"), 6));
name = "typeEffectShadow";
- scrActions->insert(name, new ScrAction(ScrAction::DataInt, QPixmap(), QPixmap(), "", defaultKey(name), scrActionGroups->value("typeEffects"), 9));
+ scrActions->insert(name, new ScrAction(ScrAction::DataInt, QString(), QString(), "", defaultKey(name), scrActionGroups->value("typeEffects"), 9));
(*scrActions)["typeEffectNormal"]->setToggleAction(true);
(*scrActions)["typeEffectUnderline"]->setToggleAction(true);
(*scrActions)["typeEffectUnderlineWords"]->setToggleAction(true);
@@ -425,13 +425,13 @@
(*scrActions)["itemFlipH"]->setToggleAction(true, true);
(*scrActions)["itemFlipV"]->setToggleAction(true, true);
name = "itemLowerToBottom";
- scrActions->insert(name, new ScrAction(im.loadPixmap("16/go-bottom.png"), im.loadPixmap("22/go-bottom.png"), "", defaultKey(name), mainWindow));
+ scrActions->insert(name, new ScrAction("16/go-bottom.png", "22/go-bottom.png", "", defaultKey(name), mainWindow));
name = "itemRaiseToTop";
- scrActions->insert(name, new ScrAction(im.loadPixmap("16/go-top.png"), im.loadPixmap("22/go-top.png"), "", defaultKey(name), mainWindow));
+ scrActions->insert(name, new ScrAction("16/go-top.png", "22/go-top.png", "", defaultKey(name), mainWindow));
name = "itemLower";
- scrActions->insert(name, new ScrAction(im.loadPixmap("16/go-down.png"), im.loadPixmap("22/go-down.png"), "", defaultKey(name), mainWindow));
+ scrActions->insert(name, new ScrAction("16/go-down.png", "22/go-down.png", "", defaultKey(name), mainWindow));
name = "itemRaise";
- scrActions->insert(name, new ScrAction(im.loadPixmap("16/go-up.png"), im.loadPixmap("22/go-up.png"), "", defaultKey(name), mainWindow));
+ scrActions->insert(name, new ScrAction("16/go-up.png", "22/go-up.png", "", defaultKey(name), mainWindow));
name = "itemSendToPattern";
scrActions->insert(name, new ScrAction("", defaultKey(name), mainWindow));
name = "itemSendToInline";
@@ -459,11 +459,11 @@
scrActionGroups->insert("itemPreview", itemPreviewGroup);
itemPreviewGroup->setExclusive(true);
name = "itemPreviewFull";
- scrActions->insert(name, new ScrAction(ScrAction::DataInt, QPixmap(), QPixmap(), "", defaultKey(name), itemPreviewGroup, 0));
+ scrActions->insert(name, new ScrAction(ScrAction::DataInt, QString(), QString(), "", defaultKey(name), itemPreviewGroup, 0));
name = "itemPreviewNormal";
- scrActions->insert(name, new ScrAction(ScrAction::DataInt, QPixmap(), QPixmap(), "", defaultKey(name), itemPreviewGroup, 1));
+ scrActions->insert(name, new ScrAction(ScrAction::DataInt, QString(), QString(), "", defaultKey(name), itemPreviewGroup, 1));
name = "itemPreviewLow";
- scrActions->insert(name, new ScrAction(ScrAction::DataInt, QPixmap(), QPixmap(), "", defaultKey(name), itemPreviewGroup, 2));
+ scrActions->insert(name, new ScrAction(ScrAction::DataInt, QString(), QString(), "", defaultKey(name), itemPreviewGroup, 2));
(*scrActions)["itemImageIsVisible"]->setToggleAction(true);
(*scrActions)["itemPreviewFull"]->setToggleAction(true);
@@ -625,17 +625,17 @@
QString name;
name = "tableInsertRows";
- scrActions->insert(name, new ScrAction(im.loadPixmap("16/insert-table-rows.png"), im.loadPixmap("22/insert-table-rows.png"), "", defaultKey(name), mainWindow));
+ scrActions->insert(name, new ScrAction("16/insert-table-rows.png", "22/insert-table-rows.png", "", defaultKey(name), mainWindow));
name = "tableInsertColumns";
- scrActions->insert(name, new ScrAction(im.loadPixmap("16/insert-table-columns.png"), im.loadPixmap("22/insert-table-columns.png"), "", defaultKey(name), mainWindow));
+ scrActions->insert(name, new ScrAction("16/insert-table-columns.png", "22/insert-table-columns.png", "", defaultKey(name), mainWindow));
name = "tableDeleteRows";
- scrActions->insert(name, new ScrAction(im.loadPixmap("16/delete-table-rows.png"), im.loadPixmap("22/delete-table-rows.png"), "", defaultKey(name), mainWindow));
+ scrActions->insert(name, new ScrAction("16/delete-table-rows.png", "22/delete-table-rows.png", "", defaultKey(name), mainWindow));
name = "tableDeleteColumns";
- scrActions->insert(name, new ScrAction(im.loadPixmap("16/delete-table-columns.png"), im.loadPixmap("22/delete-table-columns.png"), "", defaultKey(name), mainWindow));
+ scrActions->insert(name, new ScrAction("16/delete-table-columns.png", "22/delete-table-columns.png", "", defaultKey(name), mainWindow));
name = "tableMergeCells";
- scrActions->insert(name, new ScrAction(im.loadPixmap("16/merge-table-cells.png"), im.loadPixmap("22/merge-table-cells.png"), "", defaultKey(name), mainWindow));
+ scrActions->insert(name, new ScrAction("16/merge-table-cells.png", "22/merge-table-cells.png", "", defaultKey(name), mainWindow));
name = "tableSplitCells";
- scrActions->insert(name, new ScrAction(im.loadPixmap("16/split-table-cells.png"), im.loadPixmap("22/split-table-cells.png"), "", defaultKey(name), mainWindow));
+ scrActions->insert(name, new ScrAction("16/split-table-cells.png", "22/split-table-cells.png", "", defaultKey(name), mainWindow));
name = "tableSetRowHeights";
scrActions->insert(name, new ScrAction("", defaultKey(name), mainWindow));
name = "tableSetColumnWidths";
@@ -654,25 +654,25 @@
{
QString name;
name = "viewFitInWindow";
- scrActions->insert(name, new ScrAction(ScrAction::DataDouble, QPixmap(), QPixmap(), "", defaultKey(name), mainWindow, -100.0));
+ scrActions->insert(name, new ScrAction(ScrAction::DataDouble, QString(), QString(), "", defaultKey(name), mainWindow, -100.0));
name = "viewFitWidth";
- scrActions->insert(name, new ScrAction(ScrAction::DataDouble, QPixmap(), QPixmap(), "", defaultKey(name), mainWindow, -200.0));
+ scrActions->insert(name, new ScrAction(ScrAction::DataDouble, QString(), QString(), "", defaultKey(name), mainWindow, -200.0));
name = "viewFit50";
- scrActions->insert(name, new ScrAction(ScrAction::DataDouble, QPixmap(), QPixmap(), "", defaultKey(name), mainWindow, 50.0));
+ scrActions->insert(name, new ScrAction(ScrAction::DataDouble, QString(), QString(), "", defaultKey(name), mainWindow, 50.0));
name = "viewFit75";
- scrActions->insert(name, new ScrAction(ScrAction::DataDouble, QPixmap(), QPixmap(), "", defaultKey(name), mainWindow, 75.0));
+ scrActions->insert(name, new ScrAction(ScrAction::DataDouble, QString(), QString(), "", defaultKey(name), mainWindow, 75.0));
name = "viewFit100";
- scrActions->insert(name, new ScrAction(ScrAction::DataDouble, im.loadPixmap("16/zoom-original.png"), im.loadPixmap("22/zoom-original.png"), "", defaultKey(name), mainWindow, 100.0));
+ scrActions->insert(name, new ScrAction(ScrAction::DataDouble, "16/zoom-original.png", "22/zoom-original.png", "", defaultKey(name), mainWindow, 100.0));
name = "viewFit200";
- scrActions->insert(name, new ScrAction(ScrAction::DataDouble, QPixmap(), QPixmap(), "", defaultKey(name), mainWindow, 200.0));
+ scrActions->insert(name, new ScrAction(ScrAction::DataDouble, QString(), QString(), "", defaultKey(name), mainWindow, 200.0));
name = "viewFit400";
- scrActions->insert(name, new ScrAction(ScrAction::DataDouble, QPixmap(), QPixmap(), "", defaultKey(name), mainWindow, 400.0));
+ scrActions->insert(name, new ScrAction(ScrAction::DataDouble, QString(), QString(), "", defaultKey(name), mainWindow, 400.0));
name = "viewPreviewMode";
- scrActions->insert(name, new ScrAction(im.loadPixmap("previewOn.png"), im.loadPixmap("previewOn.png"), "", defaultKey(name), mainWindow));
+ scrActions->insert(name, new ScrAction("previewOn.png", "previewOn.png", "", defaultKey(name), mainWindow));
name = "viewEditInPreview";
- scrActions->insert(name, new ScrAction(im.loadPixmap("16/editdoc.png"), im.loadPixmap("16/editdoc.png"), "", defaultKey(name), mainWindow));
+ scrActions->insert(name, new ScrAction("16/editdoc.png", "16/editdoc.png", "", defaultKey(name), mainWindow));
name = "viewToggleCMS";
- scrActions->insert(name, new ScrAction(im.loadPixmap("cmsOn.png"), im.loadPixmap("cmsOn.png"), "", defaultKey(name), mainWindow));
+ scrActions->insert(name, new ScrAction("cmsOn.png", "cmsOn.png", "", defaultKey(name), mainWindow));
name = "viewShowMargins";
scrActions->insert(name, new ScrAction("", defaultKey(name), mainWindow));
name = "viewShowBleeds";
@@ -806,11 +806,11 @@
name = "toolsResources";
scrActions->insert(name, new ScrAction("", defaultKey(name), mainWindow));
name = "toolsMeasurements";
- scrActions->insert(name, new ScrAction(ScrAction::DataInt, im.loadPixmap("16/measure.png"), im.loadPixmap("22/measure.png"), "", defaultKey(name), mainWindow, modeMeasurementTool));
+ scrActions->insert(name, new ScrAction(ScrAction::DataInt, "16/measure.png", "22/measure.png", "", defaultKey(name), mainWindow, modeMeasurementTool));
name = "toolsActionHistory";
scrActions->insert(name, new ScrAction("", defaultKey(name), mainWindow));
name = "toolsPreflightVerifier";
- scrActions->insert(name, new ScrAction(im.loadPixmap("16/preflight-verifier.png"), im.loadPixmap("22/preflight-verifier.png"),"", defaultKey(name), mainWindow));
+ scrActions->insert(name, new ScrAction("16/preflight-verifier.png", "22/preflight-verifier.png","", defaultKey(name), mainWindow));
name = "toolsAlignDistribute";
scrActions->insert(name, new ScrAction("", defaultKey(name), mainWindow));
name = "toolsSymbols";
@@ -826,74 +826,74 @@
//toolbar only items
name = "toolsSelect";
- scrActions->insert(name, new ScrAction(ScrAction::DataInt, im.loadPixmap("16/pointer.png"), im.loadPixmap("22/pointer.png"), "", defaultKey(name), mainWindow, modeNormal));
+ scrActions->insert(name, new ScrAction(ScrAction::DataInt, "16/pointer.png", "22/pointer.png", "", defaultKey(name), mainWindow, modeNormal));
name = "toolsInsertTextFrame";
- scrActions->insert(name, new ScrAction(ScrAction::DataInt, im.loadPixmap("16/insert-text-frame.png"), im.loadPixmap("22/insert-text-frame.png"), "", defaultKey(name), mainWindow, modeDrawText));
+ scrActions->insert(name, new ScrAction(ScrAction::DataInt, "16/insert-text-frame.png", "22/insert-text-frame.png", "", defaultKey(name), mainWindow, modeDrawText));
name = "toolsInsertImageFrame";
- scrActions->insert(name, new ScrAction(ScrAction::DataInt, im.loadPixmap("16/insert-image.png"), im.loadPixmap("22/insert-image.png"), "", defaultKey(name), mainWindow, modeDrawImage));
+ scrActions->insert(name, new ScrAction(ScrAction::DataInt, "16/insert-image.png", "22/insert-image.png", "", defaultKey(name), mainWindow, modeDrawImage));
name = "toolsInsertRenderFrame";
- scrActions->insert(name, new ScrAction(ScrAction::DataInt, im.loadPixmap("16/insert-renderframe.png"), im.loadPixmap("22/insert-renderframe.png"), "", defaultKey(name), mainWindow, modeDrawLatex));
+ scrActions->insert(name, new ScrAction(ScrAction::DataInt, "16/insert-renderframe.png", "22/insert-renderframe.png", "", defaultKey(name), mainWindow, modeDrawLatex));
name = "toolsInsertTable";
- scrActions->insert(name, new ScrAction(ScrAction::DataInt, im.loadPixmap("16/insert-table.png"), im.loadPixmap("22/insert-table.png"), "", defaultKey(name), mainWindow, modeDrawTable2));
+ scrActions->insert(name, new ScrAction(ScrAction::DataInt, "16/insert-table.png", "22/insert-table.png", "", defaultKey(name), mainWindow, modeDrawTable2));
name = "toolsInsertShape";
- scrActions->insert(name, new ScrAction(ScrAction::DataInt, QPixmap(), QPixmap(), "", defaultKey(name), mainWindow, modeDrawShapes));
+ scrActions->insert(name, new ScrAction(ScrAction::DataInt, QString(), QString(), "", defaultKey(name), mainWindow, modeDrawShapes));
name = "toolsInsertPolygon";
- scrActions->insert(name, new ScrAction(ScrAction::DataInt, im.loadPixmap("16/draw-polygon.png"), im.loadPixmap("22/draw-polygon.png"), "", defaultKey(name), mainWindow, modeDrawRegularPolygon));
+ scrActions->insert(name, new ScrAction(ScrAction::DataInt, "16/draw-polygon.png", "22/draw-polygon.png", "", defaultKey(name), mainWindow, modeDrawRegularPolygon));
name = "toolsInsertArc";
- scrActions->insert(name, new ScrAction(ScrAction::DataInt, im.loadPixmap("16/draw-arc.png"), im.loadPixmap("22/draw-arc.png"), "", defaultKey(name), mainWindow, modeDrawArc));
+ scrActions->insert(name, new ScrAction(ScrAction::DataInt, "16/draw-arc.png", "22/draw-arc.png", "", defaultKey(name), mainWindow, modeDrawArc));
name = "toolsInsertSpiral";
- scrActions->insert(name, new ScrAction(ScrAction::DataInt, im.loadPixmap("16/draw-spiral.png"), im.loadPixmap("22/draw-spiral.png"), "", defaultKey(name), mainWindow, modeDrawSpiral));
+ scrActions->insert(name, new ScrAction(ScrAction::DataInt, "16/draw-spiral.png", "22/draw-spiral.png", "", defaultKey(name), mainWindow, modeDrawSpiral));
name = "toolsInsertLine";
- scrActions->insert(name, new ScrAction(ScrAction::DataInt, im.loadPixmap("Stift16.png"), im.loadPixmap("stift.png"), "", defaultKey(name), mainWindow, modeDrawLine));
+ scrActions->insert(name, new ScrAction(ScrAction::DataInt, "Stift16.png", "stift.png", "", defaultKey(name), mainWindow, modeDrawLine));
name = "toolsInsertBezier";
- scrActions->insert(name, new ScrAction(ScrAction::DataInt, im.loadPixmap("16/draw-path.png"), im.loadPixmap("22/draw-path.png"), "", defaultKey(name), mainWindow, modeDrawBezierLine));
+ scrActions->insert(name, new ScrAction(ScrAction::DataInt, "16/draw-path.png", "22/draw-path.png", "", defaultKey(name), mainWindow, modeDrawBezierLine));
name = "toolsInsertFreehandLine";
- scrActions->insert(name, new ScrAction(ScrAction::DataInt, im.loadPixmap("16/draw-freehand.png"), im.loadPixmap("22/draw-freehand.png"), "", defaultKey(name), mainWindow, modeDrawFreehandLine));
+ scrActions->insert(name, new ScrAction(ScrAction::DataInt, "16/draw-freehand.png", "22/draw-freehand.png", "", defaultKey(name), mainWindow, modeDrawFreehandLine));
name = "toolsInsertCalligraphicLine";
- scrActions->insert(name, new ScrAction(ScrAction::DataInt, im.loadPixmap("16/draw-calligraphic.png"), im.loadPixmap("22/draw-calligraphic.png"), "", defaultKey(name), mainWindow, modeDrawCalligraphicLine));
+ scrActions->insert(name, new ScrAction(ScrAction::DataInt, "16/draw-calligraphic.png", "22/draw-calligraphic.png", "", defaultKey(name), mainWindow, modeDrawCalligraphicLine));
name = "toolsRotate";
- scrActions->insert(name, new ScrAction(ScrAction::DataInt, im.loadPixmap("16/transform-rotate.png"), im.loadPixmap("22/transform-rotate.png"), "", defaultKey(name), mainWindow, modeRotation));
+ scrActions->insert(name, new ScrAction(ScrAction::DataInt, "16/transform-rotate.png", "22/transform-rotate.png", "", defaultKey(name), mainWindow, modeRotation));
name = "toolsZoom";
- scrActions->insert(name, new ScrAction(ScrAction::DataInt, im.loadPixmap("16/zoom.png"), im.loadPixmap("22/zoom.png"), "", defaultKey(name), mainWindow, modeMagnifier));
+ scrActions->insert(name, new ScrAction(ScrAction::DataInt, "16/zoom.png", "22/zoom.png", "", defaultKey(name), mainWindow, modeMagnifier));
name = "toolsZoomIn";
- scrActions->insert(name, new ScrAction(im.loadPixmap("16/zoom-in.png"), im.loadPixmap("22/zoom-in.png"), "", defaultKey(name), mainWindow));
+ scrActions->insert(name, new ScrAction("16/zoom-in.png", "22/zoom-in.png", "", defaultKey(name), mainWindow));
name = "toolsZoomOut";
- scrActions->insert(name, new ScrAction(im.loadPixmap("16/zoom-out.png"), im.loadPixmap("22/zoom-out.png"), "", defaultKey(name), mainWindow));
+ scrActions->insert(name, new ScrAction("16/zoom-out.png", "22/zoom-out.png", "", defaultKey(name), mainWindow));
name = "toolsEditContents";
- scrActions->insert(name, new ScrAction(ScrAction::DataInt, im.loadPixmap("Editm16.png"), im.loadPixmap("editm.png"), "", defaultKey(name), mainWindow, modeEdit));
+ scrActions->insert(name, new ScrAction(ScrAction::DataInt, "Editm16.png", "editm.png", "", defaultKey(name), mainWindow, modeEdit));
name = "toolsEditWithStoryEditor";
- scrActions->insert(name, new ScrAction(ScrAction::DataInt, im.loadPixmap("16/story-editor.png"), im.loadPixmap("22/story-editor.png"), "", defaultKey(name), mainWindow, modeStoryEditor));
+ scrActions->insert(name, new ScrAction(ScrAction::DataInt, "16/story-editor.png", "22/story-editor.png", "", defaultKey(name), mainWindow, modeStoryEditor));
name = "toolsLinkTextFrame";
- scrActions->insert(name, new ScrAction(ScrAction::DataInt, im.loadPixmap("16/text-frame-link.png"), im.loadPixmap("22/text-frame-link.png"), "", defaultKey(name), mainWindow, modeLinkFrames));
+ scrActions->insert(name, new ScrAction(ScrAction::DataInt, "16/text-frame-link.png", "22/text-frame-link.png", "", defaultKey(name), mainWindow, modeLinkFrames));
name = "toolsUnlinkTextFrame";
- scrActions->insert(name, new ScrAction(ScrAction::DataInt, im.loadPixmap("16/text-frame-unlink.png"), im.loadPixmap("22/text-frame-unlink.png"), "", defaultKey(name), mainWindow, modeUnlinkFrames));
+ scrActions->insert(name, new ScrAction(ScrAction::DataInt, "16/text-frame-unlink.png", "22/text-frame-unlink.png", "", defaultKey(name), mainWindow, modeUnlinkFrames));
name = "toolsEyeDropper";
- scrActions->insert(name, new ScrAction(ScrAction::DataInt, im.loadPixmap("16/color-picker.png"), im.loadPixmap("22/color-picker.png"), "", defaultKey(name), mainWindow, modeEyeDropper));
+ scrActions->insert(name, new ScrAction(ScrAction::DataInt, "16/color-picker.png", "22/color-picker.png", "", defaultKey(name), mainWindow, modeEyeDropper));
name = "toolsCopyProperties";
- scrActions->insert(name, new ScrAction(ScrAction::DataInt, im.loadPixmap("wizard16.png"), im.loadPixmap("wizard.png"), "", defaultKey(name), mainWindow, modeCopyProperties));
+ scrActions->insert(name, new ScrAction(ScrAction::DataInt, "wizard16.png", "wizard.png", "", defaultKey(name), mainWindow, modeCopyProperties));
name = "toolsUnlinkTextFrameAndCutText";
- scrActions->insert(name, new ScrAction(ScrAction::DataInt, QPixmap(), QPixmap(), "", defaultKey(name), mainWindow, modeUnlinkFrames));
+ scrActions->insert(name, new ScrAction(ScrAction::DataInt, QString(), QString(), "", defaultKey(name), mainWindow, modeUnlinkFrames));
//PDF toolbar
name = "toolsPDFPushButton";
- scrActions->insert(name, new ScrAction(ScrAction::DataInt, im.loadPixmap("16/insert-button.png"), im.loadPixmap("22/insert-button.png"), "", defaultKey(name), mainWindow, modeInsertPDFButton));
+ scrActions->insert(name, new ScrAction(ScrAction::DataInt, "16/insert-button.png", "22/insert-button.png", "", defaultKey(name), mainWindow, modeInsertPDFButton));
name = "toolsPDFRadioButton";
- scrActions->insert(name, new ScrAction(ScrAction::DataInt, im.loadPixmap("16/radiobutton.png"), im.loadPixmap("22/radiobutton.png"), "", defaultKey(name), mainWindow, modeInsertPDFRadioButton));
+ scrActions->insert(name, new ScrAction(ScrAction::DataInt, "16/radiobutton.png", "22/radiobutton.png", "", defaultKey(name), mainWindow, modeInsertPDFRadioButton));
name = "toolsPDFTextField";
- scrActions->insert(name, new ScrAction(ScrAction::DataInt, im.loadPixmap("16/text-field.png"), im.loadPixmap("22/text-field.png"), "", defaultKey(name), mainWindow, modeInsertPDFTextfield));
+ scrActions->insert(name, new ScrAction(ScrAction::DataInt, "16/text-field.png", "22/text-field.png", "", defaultKey(name), mainWindow, modeInsertPDFTextfield));
name = "toolsPDFCheckBox";
- scrActions->insert(name, new ScrAction(ScrAction::DataInt, im.loadPixmap("16/checkbox.png"), im.loadPixmap("22/checkbox.png"), "", defaultKey(name), mainWindow, modeInsertPDFCheckbox));
+ scrActions->insert(name, new ScrAction(ScrAction::DataInt, "16/checkbox.png", "22/checkbox.png", "", defaultKey(name), mainWindow, modeInsertPDFCheckbox));
name = "toolsPDFComboBox";
- scrActions->insert(name, new ScrAction(ScrAction::DataInt, im.loadPixmap("16/combobox.png"), im.loadPixmap("22/combobox.png"), "", defaultKey(name), mainWindow, modeInsertPDFCombobox));
+ scrActions->insert(name, new ScrAction(ScrAction::DataInt, "16/combobox.png", "22/combobox.png", "", defaultKey(name), mainWindow, modeInsertPDFCombobox));
name = "toolsPDFListBox";
- scrActions->insert(name, new ScrAction(ScrAction::DataInt, im.loadPixmap("16/list-box.png"), im.loadPixmap("22/list-box.png"), "", defaultKey(name), mainWindow, modeInsertPDFListbox));
+ scrActions->insert(name, new ScrAction(ScrAction::DataInt, "16/list-box.png", "22/list-box.png", "", defaultKey(name), mainWindow, modeInsertPDFListbox));
name = "toolsPDFAnnotText";
- scrActions->insert(name, new ScrAction(ScrAction::DataInt, im.loadPixmap("16/pdf-annotations.png"), im.loadPixmap("22/pdf-annotations.png"), "", defaultKey(name), mainWindow, modeInsertPDFTextAnnotation));
+ scrActions->insert(name, new ScrAction(ScrAction::DataInt, "16/pdf-annotations.png", "22/pdf-annotations.png", "", defaultKey(name), mainWindow, modeInsertPDFTextAnnotation));
name = "toolsPDFAnnotLink";
- scrActions->insert(name, new ScrAction(ScrAction::DataInt, im.loadPixmap("goto16.png"), im.loadPixmap("goto.png"), "", defaultKey(name), mainWindow, modeInsertPDFLinkAnnotation));
+ scrActions->insert(name, new ScrAction(ScrAction::DataInt, "goto16.png", "goto.png", "", defaultKey(name), mainWindow, modeInsertPDFLinkAnnotation));
#ifdef HAVE_OSG
name = "toolsPDFAnnot3D";
- scrActions->insert(name, new ScrAction(ScrAction::DataInt, im.loadPixmap("16/annot3d.png"), im.loadPixmap("22/annot3d.png"), "", defaultKey(name), mainWindow, modeInsertPDF3DAnnotation));
+ scrActions->insert(name, new ScrAction(ScrAction::DataInt, "16/annot3d.png", "22/annot3d.png", "", defaultKey(name), mainWindow, modeInsertPDF3DAnnotation));
#endif
//Set the applicaton wide palette shortcuts
(*scrActions)["toolsProperties"]->setShortcutContext(Qt::ApplicationShortcut);
@@ -1000,17 +1000,17 @@
name = "helpTooltips";
scrActions->insert(name, new ScrAction("", defaultKey(name), mainWindow));
name = "helpManual";
- scrActions->insert(name, new ScrAction(im.loadPixmap("16/help-browser.png"), QPixmap(), "", defaultKey(name), mainWindow));
+ scrActions->insert(name, new ScrAction("16/help-browser.png", QString(), "", defaultKey(name), mainWindow));
name = "helpOnlineWWW";
- scrActions->insert(name, new ScrAction(ScrAction::DataQString, QPixmap(), QPixmap(), "", defaultKey(name), mainWindow, "http://www.scribus.net"));
+ scrActions->insert(name, new ScrAction(ScrAction::DataQString, QString(), QString(), "", defaultKey(name), mainWindow, "http://www.scribus.net"));
name = "helpOnlineDocs";
- scrActions->insert(name, new ScrAction(ScrAction::DataQString, QPixmap(), QPixmap(), "", defaultKey(name), mainWindow, "http://docs.scribus.net"));
+ scrActions->insert(name, new ScrAction(ScrAction::DataQString, QString(), QString(), "", defaultKey(name), mainWindow, "http://docs.scribus.net"));
name = "helpOnlineWiki";
- scrActions->insert(name, new ScrAction(ScrAction::DataQString, QPixmap(), QPixmap(), "", defaultKey(name), mainWindow, "http://wiki.scribus.net"));
+ scrActions->insert(name, new ScrAction(ScrAction::DataQString, QString(), QString(), "", defaultKey(name), mainWindow, "http://wiki.scribus.net"));
name = "helpOnlineTutorial1";
- scrActions->insert(name, new ScrAction(ScrAction::DataQString, QPixmap(), QPixmap(), "", defaultKey(name), mainWindow, ""));
+ scrActions->insert(name, new ScrAction(ScrAction::DataQString, QString(), QString(), "", defaultKey(name), mainWindow, ""));
name = "helpChat";
- scrActions->insert(name, new ScrAction(ScrAction::DataQString, QPixmap(), QPixmap(), "", defaultKey(name), mainWindow, "http://webchat.freenode.net/?channels=scribus"));
+ scrActions->insert(name, new ScrAction(ScrAction::DataQString, QString(), QString(), "", defaultKey(name), mainWindow, "http://webchat.freenode.net/?channels=scribus"));
name = "helpCheckUpdates";
scrActions->insert(name, new ScrAction("", defaultKey(name), mainWindow));
Modified: trunk/Scribus/scribus/fontlistmodel.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23474&path=/trunk/Scribus/scribus/fontlistmodel.cpp
==============================================================================
--- trunk/Scribus/scribus/fontlistmodel.cpp (original)
+++ trunk/Scribus/scribus/fontlistmodel.cpp Tue Feb 25 20:01:15 2020
@@ -11,6 +11,7 @@
#include "fontlistmodel.h"
#include "iconmanager.h"
#include "prefsmanager.h"
+#include "scribusapp.h"
#include "scribusdoc.h"
FontListModel::FontListModel(QObject * parent, ScribusDoc * doc, bool includeDisabled)
@@ -19,12 +20,19 @@
m_fonts(PrefsManager::instance().appPrefs.fontPrefs.AvailFonts),
m_includeDisabled(includeDisabled)
{
- ttfFont = IconManager::instance().loadPixmap("font_truetype16.png");
- otfFont = IconManager::instance().loadPixmap("font_otf16.png");
- psFont = IconManager::instance().loadPixmap("font_type1_16.png");
- substFont = IconManager::instance().loadPixmap("font_subst16.png");
-
+ iconSetChange();
setFonts(m_fonts.keys());
+
+ connect(ScQApp, SIGNAL(iconSetChanged()), this, SLOT(iconSetChange()));
+}
+
+void FontListModel::iconSetChange()
+{
+ IconManager& iconManager = IconManager::instance();
+ ttfFont = iconManager.loadPixmap("font_truetype16.png");
+ otfFont = iconManager.loadPixmap("font_otf16.png");
+ psFont = iconManager.loadPixmap("font_type1_16.png");
+ substFont = iconManager.loadPixmap("font_subst16.png");
}
void FontListModel::setFonts(QList<QString> f)
Modified: trunk/Scribus/scribus/fontlistmodel.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23474&path=/trunk/Scribus/scribus/fontlistmodel.h
==============================================================================
--- trunk/Scribus/scribus/fontlistmodel.h (original)
+++ trunk/Scribus/scribus/fontlistmodel.h Tue Feb 25 20:01:15 2020
@@ -79,8 +79,8 @@
QString nameForIndex(const QModelIndex & index);
bool isLive() const { return m_embedFlags.count() == 0; }
+
private:
-
enum EmbedMethod {
DontEmbed = 0,
EmbedFont = 1,
@@ -113,6 +113,9 @@
int role = Qt::DisplayRole) const;
bool m_includeDisabled;
+
+ private slots:
+ void iconSetChange();
};
#endif
Modified: trunk/Scribus/scribus/iconmanager.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23474&path=/trunk/Scribus/scribus/iconmanager.cpp
==============================================================================
--- trunk/Scribus/scribus/iconmanager.cpp (original)
+++ trunk/Scribus/scribus/iconmanager.cpp Tue Feb 25 20:01:15 2020
@@ -35,6 +35,11 @@
{
static IconManager m_instance;
return m_instance;
+}
+
+void IconManager::clearCache()
+{
+ m_pxCache.clear();
}
bool IconManager::setup()
Modified: trunk/Scribus/scribus/iconmanager.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23474&path=/trunk/Scribus/scribus/iconmanager.h
==============================================================================
--- trunk/Scribus/scribus/iconmanager.h (original)
+++ trunk/Scribus/scribus/iconmanager.h Tue Feb 25 20:01:15 2020
@@ -44,8 +44,10 @@
* @return A pointer to the IconManager instance
*/
static IconManager& instance();
+
+ void clearCache();
+ bool setup();
- bool setup();
QCursor loadCursor(const QString& nam, int hotX = -1, int hotY = -1, bool forceUseColor=false);
QIcon loadIcon(const QString& nam, bool forceUseColor=false);
QPixmap loadPixmap(const QString& nam, bool forceUseColor=false, bool rtlFlip=false);
Modified: trunk/Scribus/scribus/pluginmanager.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23474&path=/trunk/Scribus/scribus/pluginmanager.cpp
==============================================================================
--- trunk/Scribus/scribus/pluginmanager.cpp (original)
+++ trunk/Scribus/scribus/pluginmanager.cpp Tue Feb 25 20:01:15 2020
@@ -287,7 +287,7 @@
plugin = dynamic_cast<ScActionPlugin*>(it.value().plugin);
assert(plugin);
ScActionPlugin::ActionInfo ai(plugin->actionInfo());
- ScrAction* action = new ScrAction(ScrAction::ActionDLL, ai.icon1, ai.icon2, ai.text, ai.keySequence, mw);
+ ScrAction* action = new ScrAction(ScrAction::ActionDLL, ai.iconPath1, ai.iconPath2, ai.text, ai.keySequence, mw);
Q_CHECK_PTR(action);
action->setStatusTip(ai.helpText);
action->setToolTip(ai.helpText);
@@ -390,7 +390,7 @@
ScActionPlugin::ActionInfo ai(plugin->actionInfo());
if (ai.enabledForStoryEditor)
{
- ScrAction* action = new ScrAction(ScrAction::ActionDLLSE, ai.icon1, ai.icon2, ai.text, ai.keySequence, sew);
+ ScrAction* action = new ScrAction(ScrAction::ActionDLLSE, ai.iconPath1, ai.iconPath2, ai.text, ai.keySequence, sew);
Q_CHECK_PTR(action);
sew->seActions.insert(ai.name, action);
Modified: trunk/Scribus/scribus/plugins/barcodegenerator/barcode.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23474&path=/trunk/Scribus/scribus/plugins/barcodegenerator/barcode.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/barcodegenerator/barcode.cpp (original)
+++ trunk/Scribus/scribus/plugins/barcodegenerator/barcode.cpp Tue Feb 25 20:01:15 2020
@@ -30,8 +30,8 @@
m_actionInfo.menuAfterName = "toolsInsertRenderFrame";
m_actionInfo.toolbar = "Tools";
}
- m_actionInfo.icon1 = IconManager::instance().loadPixmap("16/insert-barcode.png");
- m_actionInfo.icon2 = IconManager::instance().loadPixmap("22/insert-barcode.png");
+ m_actionInfo.iconPath1 = "16/insert-barcode.png";
+ m_actionInfo.iconPath2 = "22/insert-barcode.png";
m_actionInfo.enabledOnStartup = false;
// m_actionInfo.forAppMode.append(modeNormal);
m_actionInfo.needsNumObjects = -1;
Modified: trunk/Scribus/scribus/plugins/picbrowser/picturebrowser.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23474&path=/trunk/Scribus/scribus/plugins/picbrowser/picturebrowser.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/picbrowser/picturebrowser.cpp (original)
+++ trunk/Scribus/scribus/plugins/picbrowser/picturebrowser.cpp Tue Feb 25 20:01:15 2020
@@ -9,22 +9,23 @@
#include <QSignalBlocker>
#include <iostream>
+
#include "picturebrowser.h"
+
#include "collection.h"
+#include "fileloader.h"
#include "findimage.h"
-#include "previewimage.h"
+#include "iconmanager.h"
#include "loadimage.h"
-#include "ui/scmessagebox.h"
-
-#include "fileloader.h"
#include "loadsaveplugin.h"
-#include "../../plugins/formatidlist.h"
-
#include "prefsfile.h"
#include "prefsmanager.h"
-
-#include "iconmanager.h"
+#include "previewimage.h"
+#include "scribusapp.h"
+#include "ui/scmessagebox.h"
#include "util_formats.h"
+
+#include "../../plugins/formatidlist.h"
PictureBrowser::PictureBrowser(ScribusDoc* doc, QWidget *parent):
QDialog(parent),
@@ -194,7 +195,6 @@
insertFramesCombobox->addItem("All Frames", 0);
insertFramesCombobox->addItem("All Empty Frames", 0);
-
PageItem *pItem;
QList<PageItem*> allItems;
for (int a = 0; a < m_Doc->MasterItems.count(); ++a)
@@ -219,6 +219,7 @@
}
allItems.clear();
}
+
for (int a = 0; a < m_Doc->Items->count(); ++a)
{
PageItem *currItem = m_Doc->Items->at(a);
@@ -242,7 +243,6 @@
allItems.clear();
}
-
//set namefilters for global use
// nameFilters << "*.jpg" << "*.jpeg" << "*.gif" << "*.png" << "*.ps" << "*.psd" << "*.tif" << "*.tiff" << "*.xpm" << "*.eps" << "*.epsf" << "*.epsi" << "*.eps2" << "*.eps3" << "*.epi" << "*.epg";
@@ -267,7 +267,6 @@
filters = new imageFilters;
-
filterTypeCombobox->addItem("All Supported Formats", 1);
for (int i = 0; i < nameFilters.size(); ++i)
@@ -281,9 +280,10 @@
//imageViewArea->setVerticalScrollMode(QAbstractItemView::ScrollPerItem);
//imageViewArea->setHorizontalScrollMode(QAbstractItemView::ScrollPerItem);
-
//Actually select the current folder to generate the preview from it's contents
dirChosen(folderModel.index( QDir::currentPath()));
+
+ connect(ScQApp, SIGNAL(iconSetChanged()), this, SLOT(iconSetChange()));
}
@@ -475,12 +475,12 @@
if (!pbSettings.sortOrder)
{
pbSettings.sortOrder = true;
- sortOrderButton->setIcon(*iconArrowUp);
+ sortOrderButton->setIcon(iconArrowUp);
}
else
{
pbSettings.sortOrder = false;
- sortOrderButton->setIcon(*iconArrowDown);
+ sortOrderButton->setIcon(iconArrowDown);
}
if (saveSettingsCheckbox->isChecked())
@@ -766,7 +766,7 @@
tmpItem->setFlags(Qt::ItemIsSelectable|Qt::ItemIsEditable|Qt::ItemIsEnabled);
tmpItem->setData(0, Qt::UserRole, crt->collection->file);
- tmpItem->setIcon(0, *iconCollection);
+ tmpItem->setIcon(0, iconCollection);
collectionsWidget->blockSignals(false);
collectionsWidget->setCurrentItem(tmpItem);
@@ -1277,7 +1277,7 @@
tmpItem->setFlags(Qt::ItemIsSelectable|Qt::ItemIsEditable|Qt::ItemIsEnabled);
tmpItem->setData(0, Qt::UserRole, newCollectionFile);
- tmpItem->setIcon(0, *iconCollection);
+ tmpItem->setIcon(0, iconCollection);
collectionsWidget->blockSignals(false);
collectionsWidget->setCurrentItem(tmpItem);
@@ -1580,52 +1580,53 @@
void PictureBrowser::loadIcons()
{
- IconManager& im=IconManager::instance();
- iconArrowUp = new QIcon(im.loadIcon("pitr_green_arrows_set_1.svg"));
- iconArrowDown = new QIcon(im.loadIcon("pitr_green_arrows_set_5.svg"));
- iconFolderBrowser = new QIcon(im.loadIcon("sarxos_Simple_Folder_Seek.svg"));
- iconCollectionsBrowser = new QIcon(im.loadIcon("sarxos_Simple_Green_Yellow_Blue_Violet_Folders.svg"));
- iconDocumentBrowser = new QIcon(im.loadIcon("sarxos_Paper_Sheets.svg"));
- iconDocument = new QIcon(im.loadIcon("doc.png"));
- iconCollection = new QIcon(im.loadIcon("cmyk.png"));
- iconOk = new QIcon(im.loadIcon("ok22.png"));
- iconClose = new QIcon(im.loadIcon("/16/close.png"));
- iconZoomPlus = new QIcon(im.loadIcon("viewmagin.png"));
- iconZoomMinus = new QIcon(im.loadIcon("viewmagout.png"));
- iconNew = new QIcon(im.loadIcon("/16/insert-table.png"));
- iconNew2 = new QIcon(im.loadIcon("/16/document-new.png"));
- iconEdit = new QIcon(im.loadIcon("/16/document-properties.png"));
- iconRemove = new QIcon(im.loadIcon("/16/edit-cut.png"));
- iconLoad = new QIcon(im.loadIcon("/16/document-open.png"));
- iconSave = new QIcon(im.loadIcon("/16/document-save.png"));
- iconPlus = new QIcon(im.loadIcon("/16/list-add.png"));
- iconMinus = new QIcon(im.loadIcon("/16/list-remove.png"));
- iconPen = new QIcon(im.loadIcon("/16/story-editor.png"));
-
- collectionsNewCategoryButton->setIcon(*iconNew);
- collectionsNewButton->setIcon(*iconNew2);
- collectionsRenameButton->setIcon(*iconEdit);
- collectionsDeleteButton->setIcon(*iconRemove);
- collectionsImportButton->setIcon(*iconLoad);
- collectionsExportButton->setIcon(*iconSave);
- collectionsAddImagesButton->setIcon(*iconPlus);
- collectionsRemoveImagesButton->setIcon(*iconMinus);
- collectionsTagImagesButton->setIcon(*iconPen);
- collectionsAddImagesOkButton->setIcon(*iconOk);
- collectionsAddImagesCancelButton->setIcon(*iconClose);
-
- navigationBox->setItemIcon(0, *iconFolderBrowser);
- navigationBox->setItemIcon(1, *iconCollectionsBrowser);
- navigationBox->setItemIcon(2, *iconDocumentBrowser);
-
- zoomPlusButton->setIcon(*iconZoomPlus);
- zoomMinusButton->setIcon(*iconZoomMinus);
-
- actionsGoButton->setIcon(*iconOk);
-
- closeButton->setIcon(*iconClose);
-
- moreButton->setIcon(*iconArrowDown);
+ IconManager& im = IconManager::instance();
+
+ iconArrowUp = QIcon(im.loadIcon("pitr_green_arrows_set_1.svg"));
+ iconArrowDown = QIcon(im.loadIcon("pitr_green_arrows_set_5.svg"));
+ iconFolderBrowser = QIcon(im.loadIcon("sarxos_Simple_Folder_Seek.svg"));
+ iconCollectionsBrowser = QIcon(im.loadIcon("sarxos_Simple_Green_Yellow_Blue_Violet_Folders.svg"));
+ iconDocumentBrowser = QIcon(im.loadIcon("sarxos_Paper_Sheets.svg"));
+ iconDocument = QIcon(im.loadIcon("doc.png"));
+ iconCollection = QIcon(im.loadIcon("cmyk.png"));
+ iconOk = QIcon(im.loadIcon("ok22.png"));
+ iconClose = QIcon(im.loadIcon("/16/close.png"));
+ iconZoomPlus = QIcon(im.loadIcon("viewmagin.png"));
+ iconZoomMinus = QIcon(im.loadIcon("viewmagout.png"));
+ iconNew = QIcon(im.loadIcon("/16/insert-table.png"));
+ iconNew2 = QIcon(im.loadIcon("/16/document-new.png"));
+ iconEdit = QIcon(im.loadIcon("/16/document-properties.png"));
+ iconRemove = QIcon(im.loadIcon("/16/edit-cut.png"));
+ iconLoad = QIcon(im.loadIcon("/16/document-open.png"));
+ iconSave = QIcon(im.loadIcon("/16/document-save.png"));
+ iconPlus = QIcon(im.loadIcon("/16/list-add.png"));
+ iconMinus = QIcon(im.loadIcon("/16/list-remove.png"));
+ iconPen = QIcon(im.loadIcon("/16/story-editor.png"));
+
+ collectionsNewCategoryButton->setIcon(iconNew);
+ collectionsNewButton->setIcon(iconNew2);
+ collectionsRenameButton->setIcon(iconEdit);
+ collectionsDeleteButton->setIcon(iconRemove);
+ collectionsImportButton->setIcon(iconLoad);
+ collectionsExportButton->setIcon(iconSave);
+ collectionsAddImagesButton->setIcon(iconPlus);
+ collectionsRemoveImagesButton->setIcon(iconMinus);
+ collectionsTagImagesButton->setIcon(iconPen);
+ collectionsAddImagesOkButton->setIcon(iconOk);
+ collectionsAddImagesCancelButton->setIcon(iconClose);
+
+ navigationBox->setItemIcon(0, iconFolderBrowser);
+ navigationBox->setItemIcon(1, iconCollectionsBrowser);
+ navigationBox->setItemIcon(2, iconDocumentBrowser);
+
+ zoomPlusButton->setIcon(iconZoomPlus);
+ zoomMinusButton->setIcon(iconZoomMinus);
+
+ actionsGoButton->setIcon(iconOk);
+
+ closeButton->setIcon(iconClose);
+
+ moreButton->setIcon(iconArrowDown);
}
@@ -1648,11 +1649,11 @@
if (pbSettings.sortOrder)
{
- sortOrderButton->setIcon(*iconArrowUp);
+ sortOrderButton->setIcon(iconArrowUp);
}
else
{
- sortOrderButton->setIcon(*iconArrowDown);
+ sortOrderButton->setIcon(iconArrowDown);
}
sortCombobox->setCurrentIndex(pbSettings.sortSetting);
@@ -1703,7 +1704,7 @@
{
tmpItem = new QTreeWidgetItem(allpages, QStringList(QString("Page %1").arg(i+1)));
tmpItem->setData(0, Qt::UserRole,(i+1));
- tmpItem->setIcon(0, *iconDocument);
+ tmpItem->setIcon(0, iconDocument);
documentItems.append(tmpItem);
}
@@ -1853,7 +1854,7 @@
}
tmpItem->setData(0, Qt::UserRole, tmpCollections->collectionFiles.at(j));
- tmpItem->setIcon(0, *iconCollection);
+ tmpItem->setIcon(0, iconCollection);
}
}
@@ -1886,7 +1887,7 @@
resize(872, 550);
moreButton->setText(tr("Hide"));
- moreButton->setIcon(*iconArrowUp);
+ moreButton->setIcon(iconArrowUp);
}
else
{
@@ -1894,7 +1895,7 @@
resize(872, 385);
moreButton->setText(tr("More"));
- moreButton->setIcon(*iconArrowDown);
+ moreButton->setIcon(iconArrowDown);
}
}
@@ -2074,6 +2075,11 @@
collectionsTagImagesCombobox->setCheckstate(i, 2);
}
}
+}
+
+void PictureBrowser::iconSetChange()
+{
+ loadIcons();
}
void PictureBrowser::unitChange()
Modified: trunk/Scribus/scribus/plugins/picbrowser/picturebrowser.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23474&path=/trunk/Scribus/scribus/plugins/picbrowser/picturebrowser.h
==============================================================================
--- trunk/Scribus/scribus/plugins/picbrowser/picturebrowser.h (original)
+++ trunk/Scribus/scribus/plugins/picbrowser/picturebrowser.h Tue Feb 25 20:01:15 2020
@@ -132,6 +132,7 @@
void unitChange();
private slots:
+ void iconSetChange();
//slot for the navigation combobox, sets current browsingmode (folderbrowser, collectionsbrowser, documentbrowser)
void navigate ( int index );
//called when a previewicon was clicked
@@ -236,7 +237,26 @@
//a list containing the items in the documentbrowser treewidget
QList<QTreeWidgetItem *> documentItems;
//contain the icons needed
- QIcon *iconArrowUp, *iconArrowDown, *iconFolderBrowser, *iconCollectionsBrowser, *iconDocumentBrowser, *iconDocument, *iconCollection, *iconZoomPlus, *iconZoomMinus, *iconOk, *iconClose, *iconNew, *iconNew2, *iconEdit, *iconRemove, *iconLoad, *iconSave, *iconPlus, *iconMinus, *iconPen;
+ QIcon iconArrowUp;
+ QIcon iconArrowDown;
+ QIcon iconFolderBrowser;
+ QIcon iconCollectionsBrowser;
+ QIcon iconDocumentBrowser;
+ QIcon iconDocument;
+ QIcon iconCollection;
+ QIcon iconZoomPlus;
+ QIcon iconZoomMinus;
+ QIcon iconOk;
+ QIcon iconClose;
+ QIcon iconNew;
+ QIcon iconNew2;
+ QIcon iconEdit;
+ QIcon iconRemove;
+ QIcon iconLoad;
+ QIcon iconSave;
+ QIcon iconPlus;
+ QIcon iconMinus;
+ QIcon iconPen;
//thread for searching dirs
findImagesThread *fit;
//the current set of previewimages
Modified: trunk/Scribus/scribus/plugins/shapes/shapepalette.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23474&path=/trunk/Scribus/scribus/plugins/shapes/shapepalette.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/shapes/shapepalette.cpp (original)
+++ trunk/Scribus/scribus/plugins/shapes/shapepalette.cpp Tue Feb 25 20:01:15 2020
@@ -26,8 +26,9 @@
#include "scmimedata.h"
#include "scpainter.h"
#include "scribus.h"
+#include "scribusapp.h"
+#include "scribusdoc.h"
#include "scribusXml.h"
-#include "scribusdoc.h"
#include "selection.h"
#include "shapepalette.h"
#include "ui/scmessagebox.h"
@@ -289,26 +290,34 @@
buttonLayout = new QHBoxLayout;
buttonLayout->setSpacing( 5 );
buttonLayout->setMargin( 0 );
+
importButton = new QToolButton(this);
importButton->setSizePolicy(QSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed));
importButton->setIcon(IconManager::instance().loadIcon("16/document-open.png"));
importButton->setIconSize(QSize(16, 16));
buttonLayout->addWidget( importButton );
+
QSpacerItem* spacer = new QSpacerItem( 1, 1, QSizePolicy::Expanding, QSizePolicy::Minimum );
buttonLayout->addItem( spacer );
+
closeButton = new QToolButton(this);
closeButton->setSizePolicy(QSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed));
closeButton->setIcon(IconManager::instance().loadIcon("16/close.png"));
closeButton->setIconSize(QSize(16, 16));
buttonLayout->addWidget( closeButton );
vLayout->addLayout( buttonLayout );
+
Frame3 = new QToolBox( this );
vLayout->addWidget(Frame3);
setWidget(containerWidget);
unsetDoc();
m_scMW = nullptr;
+
languageChange();
+
+ connect(ScQApp, SIGNAL(iconSetChanged()), this, SLOT(iconSetChange()));
+
connect(importButton, SIGNAL(clicked()), this, SLOT(Import()));
connect(closeButton, SIGNAL(clicked()), this, SLOT(closeTab()));
}
@@ -587,6 +596,17 @@
ScDockPalette::changeEvent(e);
}
+void ShapePalette::iconSetChange()
+{
+ IconManager& iconManager = IconManager::instance();
+
+ importButton->setIcon(iconManager.loadIcon("16/document-open.png"));
+ importButton->setIconSize(QSize(16, 16));
+
+ closeButton->setIcon(iconManager.loadIcon("16/close.png"));
+ closeButton->setIconSize(QSize(16, 16));
+}
+
void ShapePalette::languageChange()
{
setWindowTitle( tr( "Custom Shapes" ) );
Modified: trunk/Scribus/scribus/plugins/shapes/shapepalette.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23474&path=/trunk/Scribus/scribus/plugins/shapes/shapepalette.h
==============================================================================
--- trunk/Scribus/scribus/plugins/shapes/shapepalette.h (original)
+++ trunk/Scribus/scribus/plugins/shapes/shapepalette.h Tue Feb 25 20:01:15 2020
@@ -106,6 +106,7 @@
public slots:
void closeTab();
void Import();
+ void iconSetChange();
void languageChange();
protected:
Modified: trunk/Scribus/scribus/plugins/tools/pathcut/pathcut.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23474&path=/trunk/Scribus/scribus/plugins/tools/pathcut/pathcut.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/tools/pathcut/pathcut.cpp (original)
+++ trunk/Scribus/scribus/plugins/tools/pathcut/pathcut.cpp Tue Feb 25 20:01:15 2020
@@ -73,8 +73,8 @@
m_actionInfo.text = tr("Cut Polygon");
m_actionInfo.helpText = tr("Cuts a Polygon with a Path.");
// Menu
- m_actionInfo.icon1 = IconManager::instance().loadPixmap("22/transform-crop-and-resize.png");
- m_actionInfo.icon2 = IconManager::instance().loadPixmap("22/transform-crop-and-resize.png");
+ m_actionInfo.iconPath1 = "22/transform-crop-and-resize.png";
+ m_actionInfo.iconPath2 = "22/transform-crop-and-resize.png";
m_actionInfo.menu = "ItemPathOps";
m_actionInfo.parentMenu = "Item";
m_actionInfo.subMenuName = tr("Path Tools");
Modified: trunk/Scribus/scribus/plugins/tools/pathfinder/pathfinder.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23474&path=/trunk/Scribus/scribus/plugins/tools/pathfinder/pathfinder.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/tools/pathfinder/pathfinder.cpp (original)
+++ trunk/Scribus/scribus/plugins/tools/pathfinder/pathfinder.cpp Tue Feb 25 20:01:15 2020
@@ -84,8 +84,8 @@
m_actionInfo.subMenuName = tr("Path Tools");
// m_actionInfo.toolbar = "Vector";
// m_actionInfo.toolBarName = tr("Vector-Tools");
-// m_actionInfo.icon1 = loadIcon("pathintersection.png");
-// m_actionInfo.icon2 = loadIcon("pathintersection.png");
+// m_actionInfo.iconPath1 = "pathintersection.png";
+// m_actionInfo.iconPath2 = "pathintersection.png";
m_actionInfo.enabledOnStartup = false;
m_actionInfo.notSuitableFor.append(PageItem::Line);
m_actionInfo.notSuitableFor.append(PageItem::TextFrame);
Modified: trunk/Scribus/scribus/prefsmanager.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23474&path=/trunk/Scribus/scribus/prefsmanager.cpp
==============================================================================
--- trunk/Scribus/scribus/prefsmanager.cpp (original)
+++ trunk/Scribus/scribus/prefsmanager.cpp Tue Feb 25 20:01:15 2020
@@ -1342,6 +1342,11 @@
return appPrefs.ui_SystemTheme;
}
+const QString& PrefsManager::guiIconSet() const
+{
+ return appPrefs.uiPrefs.iconSet;
+}
+
const int& PrefsManager::guiFontSize() const
{
return appPrefs.uiPrefs.applicationFontSize;
Modified: trunk/Scribus/scribus/prefsmanager.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23474&path=/trunk/Scribus/scribus/prefsmanager.h
==============================================================================
--- trunk/Scribus/scribus/prefsmanager.h (original)
+++ trunk/Scribus/scribus/prefsmanager.h Tue Feb 25 20:01:15 2020
@@ -153,6 +153,8 @@
//! \brief Get the GUI style from preferences
const QString& guiStyle() const;
const QString& guiSystemStyle() const;
+ //! \brief Get the GUI icon set from preferences
+ const QString& guiIconSet() const;
//! \brief Get the GUI style from preferences
const int& guiFontSize() const;
const int& paletteFontSize() const;
Modified: trunk/Scribus/scribus/scpaths.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23474&path=/trunk/Scribus/scribus/scpaths.cpp
==============================================================================
--- trunk/Scribus/scribus/scpaths.cpp (original)
+++ trunk/Scribus/scribus/scpaths.cpp Tue Feb 25 20:01:15 2020
@@ -14,8 +14,6 @@
#include "prefsmanager.h"
#include "scconfig.h"
#include "scribusapp.h"
-
-extern ScribusQApp* ScQApp;
// On Qt/Mac we need CoreFoundation to discover the location
// of the app bundle.
Modified: trunk/Scribus/scribus/scplugin.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23474&path=/trunk/Scribus/scribus/scplugin.cpp
==============================================================================
--- trunk/Scribus/scribus/scplugin.cpp (original)
+++ trunk/Scribus/scribus/scplugin.cpp Tue Feb 25 20:01:15 2020
@@ -90,8 +90,8 @@
m_actionInfo.subMenuName = "";
m_actionInfo.toolbar = "";
m_actionInfo.toolBarName = "";
- m_actionInfo.icon1 = QPixmap();
- m_actionInfo.icon2 = QPixmap();
+ m_actionInfo.iconPath1 = QString();
+ m_actionInfo.iconPath2 = QString();
m_actionInfo.notSuitableFor.clear();
m_actionInfo.forAppMode.clear();
m_actionInfo.needsNumObjects = -1;
Modified: trunk/Scribus/scribus/scplugin.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23474&path=/trunk/Scribus/scribus/scplugin.h
==============================================================================
--- trunk/Scribus/scribus/scplugin.h (original)
+++ trunk/Scribus/scribus/scplugin.h Tue Feb 25 20:01:15 2020
@@ -268,8 +268,8 @@
QString subMenuName;
QString toolbar; // Name of the ToolBar the action is to be inserted, if that toolbar doesn't exits it will be created
QString toolBarName; // translateable ToolBar title
- QPixmap icon1;
- QPixmap icon2;
+ QString iconPath1;
+ QString iconPath2;
QList<int> notSuitableFor; // a list of PageItem type values which the plugin can *not* handle
QList<int> forAppMode; // a list of AppMode values for which the plugin will be active, an empty list indicates that the plugin is always active
int needsNumObjects; // plugin needs this number of selected Objects. -1 = needs no Object, num > 2 any number of Objects is allowed
Modified: trunk/Scribus/scribus/scraction.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23474&path=/trunk/Scribus/scribus/scraction.cpp
==============================================================================
--- trunk/Scribus/scribus/scraction.cpp (original)
+++ trunk/Scribus/scribus/scraction.cpp Tue Feb 25 20:01:15 2020
@@ -22,8 +22,11 @@
#include <QIcon>
#include <QSysInfo>
#include <QVector>
+
+#include "iconmanager.h"
#include "scraction.h"
#include "scribus.h"
+#include "scribusapp.h"
#include "scribusdoc.h"
ScrAction::ScrAction( QObject * parent ) : QAction( parent )
@@ -31,13 +34,13 @@
initScrAction();
}
-ScrAction::ScrAction( const QString & menuText, QKeySequence accel, QObject * parent ) : QAction( menuText, parent )
-{
- setShortcut(accel);
- initScrAction();
-}
-
-ScrAction::ScrAction(ActionType aType, const QString & menuText, QKeySequence accel, QObject * parent, QVariant d) : QAction( menuText, parent )
+ScrAction::ScrAction(const QString & menuText, QKeySequence accel, QObject * parent ) : QAction(menuText, parent)
+{
+ setShortcut(accel);
+ initScrAction();
+}
+
+ScrAction::ScrAction(ActionType aType, const QString & menuText, QKeySequence accel, QObject * parent, QVariant d) : QAction(menuText, parent)
{
setShortcut(accel);
initScrAction();
@@ -48,7 +51,8 @@
connect (this, SIGNAL(triggered()), this, SLOT(triggeredToTriggeredData()));
}
-ScrAction::ScrAction(ActionType aType, const QPixmap & icon16, const QPixmap & icon22, const QString & menuText, QKeySequence accel, QObject * parent, QVariant d) : QAction( QIcon(icon16), menuText, parent )
+ScrAction::ScrAction(ActionType aType, const QPixmap& icon16, const QPixmap& icon22, const QString & menuText, QKeySequence accel, QObject * parent, QVariant d)
+ : QAction(QIcon(icon16), menuText, parent)
{
setShortcut(accel);
initScrAction();
@@ -60,12 +64,30 @@
connect (this, SIGNAL(triggered()), this, SLOT(triggeredToTriggeredData()));
}
-ScrAction::ScrAction( const QPixmap & icon16, const QPixmap & icon22, const QString & menuText, QKeySequence accel, QObject * parent ) : QAction( QIcon(icon16), menuText, parent )
+ScrAction::ScrAction(ActionType aType, const QString& icon16Path, const QString& icon22Path, const QString & menuText, QKeySequence accel, QObject * parent, QVariant d)
+ : QAction(menuText, parent), m_iconPath16(icon16Path), m_iconPath22(icon22Path)
+{
+ setShortcut(accel);
+ initScrAction();
+ loadIcon();
+
+ m_actionType = aType;
+ setData(d);
+ if (m_actionType != Normal)
+ connect (this, SIGNAL(triggered()), this, SLOT(triggeredToTriggeredData()));
+ if (!m_iconPath16.isEmpty() || !m_iconPath22.isEmpty())
+ connect(ScQApp, SIGNAL(iconSetChanged()), this, SLOT(loadIcon()));
+}
+
+ScrAction::ScrAction(const QString& icon16Path, const QString& icon22Path, const QString & menuText, QKeySequence accel, QObject * parent )
+ : QAction(menuText, parent), m_iconPath16(icon16Path), m_iconPath22(icon22Path)
{
setShortcut(accel);
setMenuRole(QAction::NoRole);
initScrAction();
- icon().addPixmap(icon22, QIcon::Normal, QIcon::On);
+ loadIcon();
+ if (!m_iconPath16.isEmpty() || !m_iconPath22.isEmpty())
+ connect(ScQApp, SIGNAL(iconSetChanged()), this, SLOT(loadIcon()));
}
@@ -97,28 +119,28 @@
void ScrAction::triggeredToTriggeredData()
{
- if (m_actionType==ScrAction::DataInt)
+ if (m_actionType == ScrAction::DataInt)
emit triggeredData(data().toInt());
- if (m_actionType==ScrAction::DataDouble)
+ if (m_actionType == ScrAction::DataDouble)
emit triggeredData(data().toDouble());
- if (m_actionType==ScrAction::DataQString)
+ if (m_actionType == ScrAction::DataQString)
emit triggeredData(data().toString());
- if (m_actionType==ScrAction::DLL)
+ if (m_actionType == ScrAction::DLL)
qDebug()<<"if (_actionType==ScrAction::DLL): please fix in ScrAction::triggeredToTriggeredData()";
// emit triggeredData(pluginID);
- if (m_actionType==ScrAction::Window)
+ if (m_actionType == ScrAction::Window)
emit triggeredData(data().toInt());
- if (m_actionType==ScrAction::RecentFile)
+ if (m_actionType == ScrAction::RecentFile)
emit triggeredData(data().toString());
- if (m_actionType==ScrAction::RecentPaste)
+ if (m_actionType == ScrAction::RecentPaste)
emit triggeredData(data().toString());
- if (m_actionType==ScrAction::RecentScript)
+ if (m_actionType == ScrAction::RecentScript)
emit triggeredData(data().toString());
- if (m_actionType==ScrAction::UnicodeChar)
+ if (m_actionType == ScrAction::UnicodeChar)
emit triggeredUnicodeShortcut(data().toInt());
- if (m_actionType==ScrAction::Layer)
+ if (m_actionType == ScrAction::Layer)
emit triggeredData(data().toInt());
- if (m_actionType==ScrAction::ActionDLL)
+ if (m_actionType == ScrAction::ActionDLL)
emit triggeredData(((ScribusMainWindow*)parent())->doc);
}
@@ -126,35 +148,35 @@
{
if (isCheckable())
{
- if (m_actionType==ScrAction::DataInt)
+ if (m_actionType == ScrAction::DataInt)
emit toggledData(ison, data().toInt());
- if (m_actionType==ScrAction::DataDouble)
+ if (m_actionType == ScrAction::DataDouble)
emit toggledData(ison, data().toDouble());
- if (m_actionType==ScrAction::DataQString)
+ if (m_actionType == ScrAction::DataQString)
emit toggledData(ison, data().toString());
- if (m_actionType==ScrAction::DLL)
+ if (m_actionType == ScrAction::DLL)
qDebug()<<"if (_actionType==ScrAction::DLL): please fix in ScrAction::toggledToToggledData(bool ison)";
// emit toggledData(ison, pluginID);
- if (m_actionType==ScrAction::Window)
+ if (m_actionType == ScrAction::Window)
emit toggledData(ison, data().toInt());
- if (m_actionType==ScrAction::RecentFile)
+ if (m_actionType == ScrAction::RecentFile)
emit toggledData(ison, data().toString());
- if (m_actionType==ScrAction::RecentPaste)
+ if (m_actionType == ScrAction::RecentPaste)
emit toggledData(ison, data().toString());
- if (m_actionType==ScrAction::RecentScript)
+ if (m_actionType == ScrAction::RecentScript)
emit toggledData(ison, text());
- if (m_actionType==ScrAction::Layer)
+ if (m_actionType == ScrAction::Layer)
emit toggledData(ison, data().toInt());
// no toggle for UnicodeChar
}
}
-void ScrAction::addedTo ( int index, QMenu * menu )
-{
- if (m_menuIndex==-1) // Add the first time, not for secondary popups.
- {
- m_menuIndex=index;
- m_popupMenuAddedTo=menu;
+void ScrAction::addedTo(int index, QMenu * menu)
+{
+ if (m_menuIndex == -1) // Add the first time, not for secondary popups.
+ {
+ m_menuIndex = index;
+ m_popupMenuAddedTo =menu;
}
}
@@ -188,19 +210,19 @@
bool ScrAction::isDLLAction() const
{
- return m_actionType==ScrAction::DLL;
+ return m_actionType == ScrAction::DLL;
}
int ScrAction::dllID() const
{
- if (m_actionType==ScrAction::DLL)
+ if (m_actionType == ScrAction::DLL)
return data().toInt();
return -1;
}
void ScrAction::setToggleAction(bool isToggle, bool isFakeToggle)
{
- if (m_actionType!=Normal)
+ if (m_actionType != Normal)
{
if (isToggle)
connect(this, SIGNAL(toggled(bool)), this, SLOT(toggledToToggledData(bool)));
@@ -209,18 +231,18 @@
}
QAction::setCheckable(isToggle);
setChecked(isToggle); // set default state of the action's checkbox - PV
- m_fakeToggle=isFakeToggle;
+ m_fakeToggle = isFakeToggle;
//if (fakeToggle)
//connect(this, toggled(bool), this, triggered());
}
void ScrAction::saveShortcut()
{
- if(!m_shortcutSaved)
- {
- m_savedKeySequence=shortcut();
+ if (!m_shortcutSaved)
+ {
+ m_savedKeySequence = shortcut();
setShortcut(QKeySequence(""));
- m_shortcutSaved=true;
+ m_shortcutSaved = true;
}
}
@@ -273,3 +295,27 @@
setData(s);
}
+void ScrAction::loadIcon()
+{
+ if (m_iconPath16.isEmpty() && m_iconPath22.isEmpty())
+ return;
+
+ IconManager& iconManager = IconManager::instance();
+ QIcon newIcon;
+
+ if (!m_iconPath16.isEmpty())
+ {
+ QPixmap pix = iconManager.loadPixmap(m_iconPath16);
+ if (!pix.isNull())
+ newIcon.addPixmap(pix, QIcon::Normal, QIcon::On);
+ }
+
+ if (!m_iconPath22.isEmpty())
+ {
+ QPixmap pix = iconManager.loadPixmap(m_iconPath22);
+ if (!pix.isNull())
+ newIcon.addPixmap(pix, QIcon::Normal, QIcon::On);
+ }
+
+ setIcon(newIcon);
+}
Modified: trunk/Scribus/scribus/scraction.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23474&path=/trunk/Scribus/scribus/scraction.h
==============================================================================
--- trunk/Scribus/scribus/scraction.h (original)
+++ trunk/Scribus/scribus/scraction.h Tue Feb 25 20:01:15 2020
@@ -25,6 +25,8 @@
#include <QAction>
#include <QPixmap>
#include <QMenu>
+#include <QString>
+
#include "scribusapi.h"
class ScribusDoc;
/**
@@ -43,7 +45,7 @@
\brief Constructor from QAction, sets menuType to Normal
\param parent Parent object of this action
*/
- ScrAction ( QObject *parent ) ;
+ ScrAction (QObject *parent) ;
/*!
\author Craig Bradney
@@ -53,15 +55,15 @@
\param accel Accelerator QKeySequence
\param parent Parent object of this action
*/
- ScrAction( const QString &menuText, QKeySequence accel, QObject *parent );
+ ScrAction(const QString &menuText, QKeySequence accel, QObject *parent);
/*!
\author Craig Bradney
\date Jan 2005
\brief Constructor for an action that may require a specific menu type, such as a DLL menu
\param mType menuType, of Normal, RecentFile or DLL
- \param icon16 Iconset for the action
- \param icon22 Iconset for the action
+ \param icon16Path path of icon for the action
+ \param icon22Path path of icon for the action
\param menuText Text to be in the menus for this action
\param accel Accelerator QKeySequence
\param parent Parent of this action
@@ -69,20 +71,22 @@
\param extraDouble extra double value
\param extraQString extra QString value
*/
- ScrAction( ActionType aType,
+ ScrAction(ActionType aType,
const QString &menuText, QKeySequence accel, QObject *parent, QVariant d = QVariant());
- ScrAction( ActionType aType, const QPixmap & icon16, const QPixmap & icon22,
+ ScrAction(ActionType aType, const QPixmap& icon16, const QPixmap& icon22,
const QString &menuText, QKeySequence accel, QObject *parent, QVariant d = QVariant());
+ ScrAction(ActionType aType, const QString& icon16Path, const QString& icon22Path,
+ const QString &menuText, QKeySequence accel, QObject *parent, QVariant d = QVariant());
/*!
\author Craig Bradney
\date Jan 2005
\brief Constructor for a normal action. Stores iconset.
- \param icon Iconset for the action
+ \param icon path of icon for the action
\param menuText Text to be in the menus for this action
\param accel Accelerator QKeySequence
\param parent Parent of this action
*/
- ScrAction( const QPixmap & icon16, const QPixmap & icon22, const QString & menuText, QKeySequence accel, QObject *parent );
+ ScrAction(const QString& icon16Path, const QString& icon22Path, const QString & menuText, QKeySequence accel, QObject *parent);
/*!
\author Craig Bradney
\date Mar 2008
@@ -92,7 +96,7 @@
\param extraInt extra int value
\param extraQString extra QString value
*/
- ScrAction( QKeySequence accel, QObject *parent, QVariant data = QVariant());
+ ScrAction(QKeySequence accel, QObject *parent, QVariant data = QVariant());
~ScrAction();
/*!
@@ -186,15 +190,17 @@
void triggeredUnicodeShortcut(int);
protected:
- void initScrAction();
int m_menuIndex;
ActionType m_actionType;
QMenu *m_popupMenuAddedTo;
QKeySequence m_savedKeySequence;
bool m_shortcutSaved;
bool m_fakeToggle;
- QIcon m_icon;
-
+
+ QString m_iconPath16;
+ QString m_iconPath22;
+
+ void initScrAction();
/*!
\author Craig Bradney
\date Jan 2005
@@ -206,6 +212,12 @@
private slots:
/*!
+ \author Jean Ghali
+ \date Feb 2020
+ \brief Reload action icon following an icon set change for eg.
+ */
+ void loadIcon();
+ /*!
\author Craig Bradney
\date Jan 2005
\brief This passed the triggered() action signal in and back out but with some data, easier than overriding menu and menu bar classes for now.
Modified: trunk/Scribus/scribus/scribus.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23474&path=/trunk/Scribus/scribus/scribus.cpp
==============================================================================
--- trunk/Scribus/scribus/scribus.cpp (original)
+++ trunk/Scribus/scribus/scribus.cpp Tue Feb 25 20:01:15 2020
@@ -424,11 +424,13 @@
if (scrActions["SaveAsDocumentTemplate"])
scrActions["SaveAsDocumentTemplate"]->setEnabled(false);
+ connect(ScQApp, SIGNAL(iconSetChanged()), this, SLOT(iconSetChange()));
connect(ScCore->fileWatcher, SIGNAL(fileDeleted(QString)), this, SLOT(removeRecentFromWatcher(QString)));
connect(ClipB, SIGNAL(dataChanged()), this, SLOT(ClipChange()));
setAcceptDrops(true);
QCoreApplication::instance()->installEventFilter(this);
scrActions["toolsSelect"]->setChecked(true);
+
ColorSetManager csm;
csm.findPaletteLocations();
csm.findPalettes();
@@ -1281,7 +1283,6 @@
zoomDefaultToolbarButton->setIcon(IconManager::instance().loadIcon("16/zoom-original.png"));
zoomOutToolbarButton->setIcon(IconManager::instance().loadIcon("16/zoom-out.png"));
zoomInToolbarButton->setIcon(IconManager::instance().loadIcon("16/zoom-in.png"));
-
zoomLayout->addWidget( zoomSpinBox );
zoomLayout->addWidget( zoomOutToolbarButton );
@@ -2441,7 +2442,7 @@
for ( int i = 0; i < windowCount; ++i )
{
QString docInWindow(windows.at(i)->windowTitle());
- scrWindowsActions.insert(docInWindow, new ScrAction( ScrAction::Window, QPixmap(), QPixmap(), docInWindow, QKeySequence(), this, i));
+ scrWindowsActions.insert(docInWindow, new ScrAction( ScrAction::Window, QString(), QString(), docInWindow, QKeySequence(), this, i));
scrWindowsActions[docInWindow]->setToggleAction(true);
connect( scrWindowsActions[docInWindow], SIGNAL(triggeredData(int)), this, SLOT(windowsMenuActivated(int)) );
scrWindowsActions[docInWindow]->setChecked(mdiArea->activeSubWindow() == windows.at(i));
@@ -2965,7 +2966,7 @@
strippedName = localName = QDir::toNativeSeparators(m_recentDocsList[i]);
strippedName.remove(QDir::separator());
strippedName.prepend(QString("%1").arg(i+1, 2, 10, QChar('0')));
- scrRecentFileActions.insert(strippedName, new ScrAction(ScrAction::RecentFile, QPixmap(), QPixmap(), QString("&%1 %2").arg(i + 1).arg(localName.replace("&","&&")), QKeySequence(), this, m_recentDocsList[i]));
+ scrRecentFileActions.insert(strippedName, new ScrAction(ScrAction::RecentFile, QString(), QString(), QString("&%1 %2").arg(i + 1).arg(localName.replace("&","&&")), QKeySequence(), this, m_recentDocsList[i]));
connect( scrRecentFileActions[strippedName], SIGNAL(triggeredData(QString)), this, SLOT(loadRecent(QString)) );
scrMenuMgr->addMenuItemString(strippedName, "FileOpenRecent");
}
@@ -2989,7 +2990,7 @@
{
strippedName = it.key();
QPixmap pm = it.value().Preview;
- scrRecentPasteActions.insert(strippedName, new ScrAction(ScrAction::RecentPaste, pm, QPixmap(), QString("&%1 %2").arg(m+1).arg(strippedName), QKeySequence(), this, it.key()));
+ scrRecentPasteActions.insert(strippedName, new ScrAction(ScrAction::RecentPaste, pm, QString(), QString("&%1 %2").arg(m+1).arg(strippedName), QKeySequence(), this, it.key()));
connect( scrRecentPasteActions[strippedName], SIGNAL(triggeredData(QString)), this, SLOT(pasteRecent(QString)) );
scrMenuMgr->addMenuItemString(strippedName, "EditPasteRecent");
it--;
@@ -3008,7 +3009,7 @@
scrapNames.removeAt(1);
for (int i = 0; i < scrapNames.count(); ++i)
{
- ScrAction *act = new ScrAction( ScrAction::DataInt, QPixmap(), QPixmap(), scrapNames[i], QKeySequence(), this, i);
+ ScrAction *act = new ScrAction( ScrAction::DataInt, QString(), QString(), scrapNames[i], QKeySequence(), this, i);
scrScrapActions.insert(scrapNames[i], act);
connect(act, SIGNAL(triggeredData(int)), this, SLOT(PutScrap(int)));
scrMenuMgr->addMenuItemString(scrapNames[i], "ItemSendToScrapbook");
@@ -3197,7 +3198,7 @@
{
for (it = doc->Layers.begin(); it != doc->Layers.end(); ++it)
{
- scrLayersActions.insert(QString("%1").arg((*it).ID), new ScrAction( ScrAction::Layer, QPixmap(), QPixmap(), (*it).Name, QKeySequence(), this, (*it).ID));
+ scrLayersActions.insert(QString("%1").arg((*it).ID), new ScrAction(ScrAction::Layer, QString(), QString(), (*it).Name, QKeySequence(), this, (*it).ID));
scrLayersActions[QString("%1").arg((*it).ID)]->setToggleAction(true);
QPixmap pm(20,15);
pm.fill((*it).markerColor);
@@ -6648,9 +6649,10 @@
ScQApp->neverSplash(!m_prefsManager.appPrefs.uiPrefs.showSplashOnStartup);
QString newUILanguage = m_prefsManager.uiLanguage();
- if (oldPrefs.uiPrefs.language != newUILanguage || ScQApp->currGUILanguage()!=newUILanguage)
+ if (oldPrefs.uiPrefs.language != newUILanguage || ScQApp->currGUILanguage() != newUILanguage)
ScQApp->changeGUILanguage(newUILanguage);
m_prefsManager.appPrefs.uiPrefs.language = ScQApp->currGUILanguage();
+
QString newUIStyle = m_prefsManager.guiStyle();
if (oldPrefs.uiPrefs.style != newUIStyle)
{
@@ -6663,6 +6665,11 @@
else
m_prefsManager.appPrefs.uiPrefs.style = oldPrefs.uiPrefs.style;
}
+
+ QString newIconSet = m_prefsManager.guiIconSet();
+ if (oldPrefs.uiPrefs.iconSet != newIconSet)
+ ScQApp->changeIconSet(newIconSet);
+
int newUIFontSize = m_prefsManager.guiFontSize();
if (oldPrefs.uiPrefs.applicationFontSize != newUIFontSize)
{
@@ -8615,6 +8622,17 @@
if (loremMgr.exec())
loremMgr.insertLoremIpsum(loremMgr.getName(), loremMgr.paragraphCount(), loremMgr.randomize());
+}
+
+void ScribusMainWindow::iconSetChange()
+{
+ IconManager& iconManager = IconManager::instance();
+
+ setWindowIcon(iconManager.loadIcon("AppIcon.png"));
+
+ zoomDefaultToolbarButton->setIcon(iconManager.loadIcon("16/zoom-original.png"));
+ zoomOutToolbarButton->setIcon(iconManager.loadIcon("16/zoom-out.png"));
+ zoomInToolbarButton->setIcon(iconManager.loadIcon("16/zoom-in.png"));
}
void ScribusMainWindow::languageChange()
Modified: trunk/Scribus/scribus/scribus.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23474&path=/trunk/Scribus/scribus/scribus.h
==============================================================================
--- trunk/Scribus/scribus/scribus.h (original)
+++ trunk/Scribus/scribus/scribus.h Tue Feb 25 20:01:15 2020
@@ -270,6 +270,7 @@
QStringList patternsDependingOnThis;
public slots:
+ void iconSetChange();
void languageChange();
void statusBarLanguageChange();
void specialActionKeyEvent(int unicodevalue);
@@ -603,7 +604,6 @@
void initKeyboardShortcuts();
void initPalettes();
void initScrapbook();
-
void updateColorMenu(QProgressBar* progressBar=nullptr);
int m_ScriptRunning;
Modified: trunk/Scribus/scribus/scribusapp.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23474&path=/trunk/Scribus/scribus/scribusapp.cpp
==============================================================================
--- trunk/Scribus/scribus/scribusapp.cpp (original)
+++ trunk/Scribus/scribus/scribusapp.cpp Tue Feb 25 20:01:15 2020
@@ -558,6 +558,14 @@
newLangs.append(newGUILang);
if (newLangs[0] != m_GUILang)
installTranslators(newLangs);
+}
+
+void ScribusQApp::changeIconSet(const QString& newIconSet)
+{
+ IconManager& iconManager = IconManager::instance();
+ iconManager.clearCache();
+ iconManager.setActiveFromPrefs(newIconSet);
+ emit iconSetChanged();
}
/*! \brief Format an arguments line for printing
Modified: trunk/Scribus/scribus/scribusapp.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23474&path=/trunk/Scribus/scribus/scribusapp.h
==============================================================================
--- trunk/Scribus/scribus/scribusapp.h (original)
+++ trunk/Scribus/scribus/scribusapp.h Tue Feb 25 20:01:15 2020
@@ -45,7 +45,10 @@
void initLang();
void initDLMgr();
void parseCommandLine();
- void changeGUILanguage(const QString & m_lang);
+
+ void changeGUILanguage(const QString & newGUILang);
+ void changeIconSet(const QString& newIconSet);
+
/*!
\author Franz Schmid
\author Alessandro Rimoldi
@@ -117,6 +120,9 @@
signals:
void appStarted();
+ void iconSetChanged();
};
+extern SCRIBUS_API ScribusQApp * ScQApp;
+
#endif
Modified: trunk/Scribus/scribus/scribusview.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23474&path=/trunk/Scribus/scribus/scribusview.cpp
==============================================================================
--- trunk/Scribus/scribus/scribusview.cpp (original)
+++ trunk/Scribus/scribus/scribusview.cpp Tue Feb 25 20:01:15 2020
@@ -100,9 +100,10 @@
#include "scpage.h"
#include "scpainter.h"
#include "scpaths.h"
-#include "scribusXml.h"
+#include "scribusapp.h"
#include "scribuscore.h"
#include "scribuswin.h"
+#include "scribusXml.h"
#include "selection.h"
#include "selectionrubberband.h"
#include "serializer.h"
@@ -175,15 +176,18 @@
// in case ClearType is not enabled
int posi = fo.pointSize() - (ScCore->isWinGUI() ? 1 : 2);
fo.setPointSize(posi);
+
horizRuler = new Hruler(this, Doc);
vertRuler = new Vruler(this, Doc);
horizRuler->installEventFilter(this);
vertRuler->installEventFilter(this);
+
rulerMover = new RulerMover(this);
rulerMover->setFocusPolicy(Qt::NoFocus);
horizRuler->setGeometry(m_vhRulerHW, 1, width()-m_vhRulerHW-1, m_vhRulerHW);
vertRuler->setGeometry(1, m_vhRulerHW, m_vhRulerHW, height()-m_vhRulerHW-1);
rulerMover->setGeometry(1, 1, m_vhRulerHW, m_vhRulerHW);
+
m_ready = true;
m_canvas->setMouseTracking(true);
setAcceptDrops(true);
@@ -195,11 +199,14 @@
storedFramesShown = Doc->guidesPrefs().framesShown;
storedShowControls = Doc->guidesPrefs().showControls;
setRulersShown(Doc->guidesPrefs().rulersShown);
+
m_canvas->m_viewMode.viewAsPreview = false;
m_canvas->setPreviewVisual(-1);
m_previousMode = -1;
+
redrawMarker = new SelectionRubberBand(QRubberBand::Rectangle, this);
redrawMarker->hide();
+
m_canvas->newRedrawPolygon();
m_canvas->resetRenderMode();
// #13101 : "viewPreviewMode" is checked if necessary in ScribusMainWindow::newActWin()
@@ -214,15 +221,19 @@
// connect(m_dragTimer, SIGNAL(timeout()), this, SLOT(dragTimerTimeOut()));
// m_dragTimer->stop();
m_dragTimerFired = false;
+
clockLabel = new ClockWidget(this, Doc);
clockLabel->setGeometry(m_vhRulerHW + 1, height() - m_vhRulerHW - 61, 60, 60);
clockLabel->setVisible(false);
+
endEditButton = new QPushButton(IconManager::instance().loadIcon("22/exit.png"), tr("End Edit"), this);
endEditButton->setGeometry(m_vhRulerHW + 1, height() - m_vhRulerHW - endEditButton->minimumSizeHint().height() - 1, endEditButton->minimumSizeHint().width(), endEditButton->minimumSizeHint().height());
endEditButton->setVisible(false);
+
+ languageChange();
+
+ connect(ScQApp, SIGNAL(iconSetChanged()), this, SLOT(iconSetChange()));
connect(endEditButton, SIGNAL(clicked()), m_ScMW, SLOT(slotEndSpecialEdit()));
-
- languageChange();
}
ScribusView::~ScribusView()
@@ -242,6 +253,12 @@
}
else
QFrame::changeEvent(e);
+}
+
+void ScribusView::iconSetChange()
+{
+ IconManager& iconManager = IconManager::instance();
+ endEditButton->setIcon(iconManager.loadIcon("22/exit.png"));
}
void ScribusView::languageChange()
Modified: trunk/Scribus/scribus/scribusview.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23474&path=/trunk/Scribus/scribus/scribusview.h
==============================================================================
--- trunk/Scribus/scribus/scribusview.h (original)
+++ trunk/Scribus/scribus/scribusview.h Tue Feb 25 20:01:15 2020
@@ -231,6 +231,7 @@
void zoom(int canvasX, int canvasY, double scale, bool preservePoint);
public slots: // Public slots
+ void iconSetChange();
void languageChange();
void toggleCMS(bool cmsOn);
void switchPreviewVisual(int vis);
Modified: trunk/Scribus/scribus/scribuswin.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23474&path=/trunk/Scribus/scribus/scribuswin.h
==============================================================================
--- trunk/Scribus/scribus/scribuswin.h (original)
+++ trunk/Scribus/scribus/scribuswin.h Tue Feb 25 20:01:15 2020
@@ -44,6 +44,7 @@
public:
ScribusWin(QWidget* parent, ScribusDoc* doc);
~ScribusWin() {};
+
void closeEvent(QCloseEvent *ce);
void setView(ScribusView* newView);
void setMainWindow(ScribusMainWindow *);
Modified: trunk/Scribus/scribus/ui/aligndistribute.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23474&path=/trunk/Scribus/scribus/ui/aligndistribute.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/aligndistribute.cpp (original)
+++ trunk/Scribus/scribus/ui/aligndistribute.cpp Tue Feb 25 20:01:15 2020
@@ -38,6 +38,7 @@
#include "commonstrings.h"
#include "iconmanager.h"
#include "scpage.h"
+#include "scribusapp.h"
#include "scribusdoc.h"
#include "scribusstructs.h"
#include "selection.h"
@@ -71,6 +72,8 @@
languageChange();
init();
setDoc(nullptr);
+
+ connect(ScQApp, SIGNAL(iconSetChanged()), this, SLOT(iconSetChange()));
}
AlignDistributePalette::~AlignDistributePalette()
@@ -82,9 +85,9 @@
if (e->type() == QEvent::LanguageChange)
{
languageChange();
+ return;
}
- else
- ScDockPalette::changeEvent(e);
+ ScDockPalette::changeEvent(e);
}
void AlignDistributePalette::languageChange()
@@ -150,104 +153,8 @@
void AlignDistributePalette::init()
{
undoManager = UndoManager::instance();
- IconManager& im = IconManager::instance();
- alignLeftOutToolButton->setIcon(im.loadIcon("22/align-horizontal-left-out.png"));
- alignLeftInToolButton->setIcon(im.loadIcon("22/align-horizontal-left.png"));
- alignCenterHorToolButton->setIcon(im.loadIcon("22/align-horizontal-center.png"));
- alignRightInToolButton->setIcon(im.loadIcon("22/align-horizontal-right.png"));
- alignRightOutToolButton->setIcon(im.loadIcon("22/align-horizontal-right-out.png"));
-
- alignTopOutToolButton->setIcon(im.loadIcon("22/align-vertical-top-out.png"));
- alignTopInToolButton->setIcon(im.loadIcon("22/align-vertical-top.png"));
- alignCenterVerToolButton->setIcon(im.loadIcon("22/align-vertical-center.png"));
- alignBottomInToolButton->setIcon(im.loadIcon("22/align-vertical-bottom.png"));
- alignBottomOutToolButton->setIcon(im.loadIcon("22/align-vertical-bottom-out.png"));
-
- distributeLeftToolButton->setIcon(im.loadIcon("22/distribute-horizontal-left.png"));
- distributeCenterHToolButton->setIcon(im.loadIcon("22/distribute-horizontal-center.png"));
- distributeRightToolButton->setIcon(im.loadIcon("22/distribute-horizontal-right.png"));
- distributeDistHToolButton->setIcon(im.loadIcon("22/distribute-horizontal-equal.png"));
-
- distributeBottomToolButton->setIcon(im.loadIcon("22/distribute-vertical-bottom.png"));
- distributeCenterVToolButton->setIcon(im.loadIcon("22/distribute-vertical-center.png"));
- distributeTopToolButton->setIcon(im.loadIcon("22/distribute-vertical-top.png"));
- distributeDistVToolButton->setIcon(im.loadIcon("22/distribute-vertical-equal.png"));
-
- distributeAcrossPageToolButton->setIcon(im.loadIcon("22/distribute-horizontal-page.png"));
- distributeDownPageToolButton->setIcon(im.loadIcon("22/distribute-vertical-page.png"));
- distributeAcrossMarginsToolButton->setIcon(im.loadIcon("22/distribute-horizontal-margin.png"));
- distributeDownMarginsToolButton->setIcon(im.loadIcon("22/distribute-vertical-margin.png"));
- distributeDistValueHToolButton->setIcon(im.loadIcon("22/distribute-horizontal-x.png"));
- distributeDistValueVToolButton->setIcon(im.loadIcon("22/distribute-vertical-y.png"));
-
- swapLeftToolButton->setIcon(im.loadIcon("22/swap-left.png"));
- swapRightToolButton->setIcon(im.loadIcon("22/swap-right.png"));
-
- QSize s(24,24);
- alignLeftOutToolButton->setMinimumSize(s);
- alignLeftInToolButton->setMinimumSize(s);
- alignCenterHorToolButton->setMinimumSize(s);
- alignRightInToolButton->setMinimumSize(s);
- alignRightOutToolButton->setMinimumSize(s);
-
- alignTopOutToolButton->setMinimumSize(s);
- alignTopInToolButton->setMinimumSize(s);
- alignCenterVerToolButton->setMinimumSize(s);
- alignBottomInToolButton->setMinimumSize(s);
- alignBottomOutToolButton->setMinimumSize(s);
-
- distributeLeftToolButton->setMinimumSize(s);
- distributeCenterHToolButton->setMinimumSize(s);
- distributeRightToolButton->setMinimumSize(s);
- distributeDistHToolButton->setMinimumSize(s);
-
- distributeBottomToolButton->setMinimumSize(s);
- distributeCenterVToolButton->setMinimumSize(s);
- distributeTopToolButton->setMinimumSize(s);
- distributeDistVToolButton->setMinimumSize(s);
-
- distributeAcrossPageToolButton->setMinimumSize(s);
- distributeDownPageToolButton->setMinimumSize(s);
- distributeAcrossMarginsToolButton->setMinimumSize(s);
- distributeDownMarginsToolButton->setMinimumSize(s);
- distributeDistValueHToolButton->setMinimumSize(s);
- distributeDistValueVToolButton->setMinimumSize(s);
-
- swapLeftToolButton->setMinimumSize(s);
- swapRightToolButton->setMinimumSize(s);
-
- alignLeftOutToolButton->setMaximumSize(s);
- alignLeftInToolButton->setMaximumSize(s);
- alignCenterHorToolButton->setMaximumSize(s);
- alignRightInToolButton->setMaximumSize(s);
- alignRightOutToolButton->setMaximumSize(s);
-
- alignTopOutToolButton->setMaximumSize(s);
- alignTopInToolButton->setMaximumSize(s);
- alignCenterVerToolButton->setMaximumSize(s);
- alignBottomInToolButton->setMaximumSize(s);
- alignBottomOutToolButton->setMaximumSize(s);
-
- distributeLeftToolButton->setMaximumSize(s);
- distributeCenterHToolButton->setMaximumSize(s);
- distributeRightToolButton->setMaximumSize(s);
- distributeDistHToolButton->setMaximumSize(s);
-
- distributeBottomToolButton->setMaximumSize(s);
- distributeCenterVToolButton->setMaximumSize(s);
- distributeTopToolButton->setMaximumSize(s);
- distributeDistVToolButton->setMaximumSize(s);
-
- distributeAcrossPageToolButton->setMaximumSize(s);
- distributeDownPageToolButton->setMaximumSize(s);
- distributeAcrossMarginsToolButton->setMaximumSize(s);
- distributeDownMarginsToolButton->setMaximumSize(s);
- distributeDistValueHToolButton->setMaximumSize(s);
- distributeDistValueVToolButton->setMaximumSize(s);
-
- swapLeftToolButton->setMaximumSize(s);
- swapRightToolButton->setMaximumSize(s);
-
+
+ iconSetChange();
connect(alignLeftOutToolButton, SIGNAL(clicked()), this, SLOT(alignLeftOut()));
connect(alignRightOutToolButton, SIGNAL(clicked()), this, SLOT(alignRightOut()));
@@ -287,6 +194,108 @@
guideInfoText = guideInfoTextNone;
alignGuideLineEdit->setText(guideInfoTextNone);
+}
+
+void AlignDistributePalette::iconSetChange()
+{
+ IconManager& im = IconManager::instance();
+
+ alignLeftOutToolButton->setIcon(im.loadIcon("22/align-horizontal-left-out.png"));
+ alignLeftInToolButton->setIcon(im.loadIcon("22/align-horizontal-left.png"));
+ alignCenterHorToolButton->setIcon(im.loadIcon("22/align-horizontal-center.png"));
+ alignRightInToolButton->setIcon(im.loadIcon("22/align-horizontal-right.png"));
+ alignRightOutToolButton->setIcon(im.loadIcon("22/align-horizontal-right-out.png"));
+
+ alignTopOutToolButton->setIcon(im.loadIcon("22/align-vertical-top-out.png"));
+ alignTopInToolButton->setIcon(im.loadIcon("22/align-vertical-top.png"));
+ alignCenterVerToolButton->setIcon(im.loadIcon("22/align-vertical-center.png"));
+ alignBottomInToolButton->setIcon(im.loadIcon("22/align-vertical-bottom.png"));
+ alignBottomOutToolButton->setIcon(im.loadIcon("22/align-vertical-bottom-out.png"));
+
+ distributeLeftToolButton->setIcon(im.loadIcon("22/distribute-horizontal-left.png"));
+ distributeCenterHToolButton->setIcon(im.loadIcon("22/distribute-horizontal-center.png"));
+ distributeRightToolButton->setIcon(im.loadIcon("22/distribute-horizontal-right.png"));
+ distributeDistHToolButton->setIcon(im.loadIcon("22/distribute-horizontal-equal.png"));
+
+ distributeBottomToolButton->setIcon(im.loadIcon("22/distribute-vertical-bottom.png"));
+ distributeCenterVToolButton->setIcon(im.loadIcon("22/distribute-vertical-center.png"));
+ distributeTopToolButton->setIcon(im.loadIcon("22/distribute-vertical-top.png"));
+ distributeDistVToolButton->setIcon(im.loadIcon("22/distribute-vertical-equal.png"));
+
+ distributeAcrossPageToolButton->setIcon(im.loadIcon("22/distribute-horizontal-page.png"));
+ distributeDownPageToolButton->setIcon(im.loadIcon("22/distribute-vertical-page.png"));
+ distributeAcrossMarginsToolButton->setIcon(im.loadIcon("22/distribute-horizontal-margin.png"));
+ distributeDownMarginsToolButton->setIcon(im.loadIcon("22/distribute-vertical-margin.png"));
+ distributeDistValueHToolButton->setIcon(im.loadIcon("22/distribute-horizontal-x.png"));
+ distributeDistValueVToolButton->setIcon(im.loadIcon("22/distribute-vertical-y.png"));
+
+ swapLeftToolButton->setIcon(im.loadIcon("22/swap-left.png"));
+ swapRightToolButton->setIcon(im.loadIcon("22/swap-right.png"));
+
+ QSize s(24,24);
+ alignLeftOutToolButton->setMinimumSize(s);
+ alignLeftInToolButton->setMinimumSize(s);
+ alignCenterHorToolButton->setMinimumSize(s);
+ alignRightInToolButton->setMinimumSize(s);
+ alignRightOutToolButton->setMinimumSize(s);
+
+ alignTopOutToolButton->setMinimumSize(s);
+ alignTopInToolButton->setMinimumSize(s);
+ alignCenterVerToolButton->setMinimumSize(s);
+ alignBottomInToolButton->setMinimumSize(s);
+ alignBottomOutToolButton->setMinimumSize(s);
+
+ distributeLeftToolButton->setMinimumSize(s);
+ distributeCenterHToolButton->setMinimumSize(s);
+ distributeRightToolButton->setMinimumSize(s);
+ distributeDistHToolButton->setMinimumSize(s);
+
+ distributeBottomToolButton->setMinimumSize(s);
+ distributeCenterVToolButton->setMinimumSize(s);
+ distributeTopToolButton->setMinimumSize(s);
+ distributeDistVToolButton->setMinimumSize(s);
+
+ distributeAcrossPageToolButton->setMinimumSize(s);
+ distributeDownPageToolButton->setMinimumSize(s);
+ distributeAcrossMarginsToolButton->setMinimumSize(s);
+ distributeDownMarginsToolButton->setMinimumSize(s);
+ distributeDistValueHToolButton->setMinimumSize(s);
+ distributeDistValueVToolButton->setMinimumSize(s);
+
+ swapLeftToolButton->setMinimumSize(s);
+ swapRightToolButton->setMinimumSize(s);
+
+ alignLeftOutToolButton->setMaximumSize(s);
+ alignLeftInToolButton->setMaximumSize(s);
+ alignCenterHorToolButton->setMaximumSize(s);
+ alignRightInToolButton->setMaximumSize(s);
+ alignRightOutToolButton->setMaximumSize(s);
+
+ alignTopOutToolButton->setMaximumSize(s);
+ alignTopInToolButton->setMaximumSize(s);
+ alignCenterVerToolButton->setMaximumSize(s);
+ alignBottomInToolButton->setMaximumSize(s);
+ alignBottomOutToolButton->setMaximumSize(s);
+
+ distributeLeftToolButton->setMaximumSize(s);
+ distributeCenterHToolButton->setMaximumSize(s);
+ distributeRightToolButton->setMaximumSize(s);
+ distributeDistHToolButton->setMaximumSize(s);
+
+ distributeBottomToolButton->setMaximumSize(s);
+ distributeCenterVToolButton->setMaximumSize(s);
+ distributeTopToolButton->setMaximumSize(s);
+ distributeDistVToolButton->setMaximumSize(s);
+
+ distributeAcrossPageToolButton->setMaximumSize(s);
+ distributeDownPageToolButton->setMaximumSize(s);
+ distributeAcrossMarginsToolButton->setMaximumSize(s);
+ distributeDownMarginsToolButton->setMaximumSize(s);
+ distributeDistValueHToolButton->setMaximumSize(s);
+ distributeDistValueVToolButton->setMaximumSize(s);
+
+ swapLeftToolButton->setMaximumSize(s);
+ swapRightToolButton->setMaximumSize(s);
}
void AlignDistributePalette::unitChange()
Modified: trunk/Scribus/scribus/ui/aligndistribute.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23474&path=/trunk/Scribus/scribus/ui/aligndistribute.h
==============================================================================
--- trunk/Scribus/scribus/ui/aligndistribute.h (original)
+++ trunk/Scribus/scribus/ui/aligndistribute.h Tue Feb 25 20:01:15 2020
@@ -71,6 +71,7 @@
ScribusView *currView;
protected slots:
+ virtual void iconSetChange();
virtual void languageChange();
void alignLeftOut();
Modified: trunk/Scribus/scribus/ui/alignselect.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23474&path=/trunk/Scribus/scribus/ui/alignselect.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/alignselect.cpp (original)
+++ trunk/Scribus/scribus/ui/alignselect.cpp Tue Feb 25 20:01:15 2020
@@ -6,16 +6,19 @@
*/
#include "alignselect.h"
+
#include <QEvent>
#include <QPixmap>
#include <QToolTip>
+
#include "iconmanager.h"
+#include "scribusapp.h"
AlignSelect::AlignSelect(QWidget* parent) : QWidget(parent)
{
selected = 0;
- IconManager& im=IconManager::instance();
+ IconManager& im = IconManager::instance();
buttonGroup = new QButtonGroup(this);
GroupAlignLayout = new QHBoxLayout( this );
@@ -58,6 +61,8 @@
GroupAlignLayout->addWidget( TextF );
buttonGroup->addButton(TextF, 4);
resize(minimumSizeHint());
+
+ connect(ScQApp, SIGNAL(iconSetChanged()), this, SLOT(iconSetChange()));
connect(buttonGroup, SIGNAL(buttonClicked(int)), this, SLOT(setTypeStyle(int)));
}
@@ -107,6 +112,17 @@
QWidget::changeEvent(e);
}
+void AlignSelect::iconSetChange()
+{
+ IconManager& im = IconManager::instance();
+
+ TextL->setIcon(im.loadIcon("16/format-justify-left.png"));
+ TextC->setIcon(im.loadIcon("16/format-justify-center.png"));
+ TextR->setIcon(im.loadIcon("16/format-justify-right.png"));
+ TextB->setIcon(im.loadIcon("16/format-justify-fill-block.png"));
+ TextF->setIcon(im.loadIcon("16/format-justify-fill.png"));
+}
+
void AlignSelect::languageChange()
{
TextL->setToolTip( tr("Align Text Left"));
Modified: trunk/Scribus/scribus/ui/alignselect.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23474&path=/trunk/Scribus/scribus/ui/alignselect.h
==============================================================================
--- trunk/Scribus/scribus/ui/alignselect.h (original)
+++ trunk/Scribus/scribus/ui/alignselect.h Tue Feb 25 20:01:15 2020
@@ -23,6 +23,7 @@
public:
AlignSelect(QWidget* parent);
~AlignSelect() {};
+
void setStyle(int s, int d);
int getStyle();
int selectedId();
@@ -38,6 +39,7 @@
QToolButton* TextF;
public slots:
+ void iconSetChange();
void languageChange();
void setTypeStyle(int a);
Modified: trunk/Scribus/scribus/ui/charselect.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23474&path=/trunk/Scribus/scribus/ui/charselect.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/charselect.cpp (original)
+++ trunk/Scribus/scribus/ui/charselect.cpp Tue Feb 25 20:01:15 2020
@@ -16,6 +16,7 @@
#include "pageitem_textframe.h"
#include "prefsmanager.h"
#include "scpaths.h"
+#include "scribusapp.h"
#include "scribusdoc.h"
#include "scribusview.h"
#include "ui/scmessagebox.h"
@@ -28,35 +29,42 @@
paletteFileMask = tr("Scribus Char Palette (*.ucp);;All Files (*)");
+ iconSetChange();
+
+ m_userTableModel = new CharTableModel(this, 6, m_doc, PrefsManager::instance().appPrefs.itemToolPrefs.textFont);
+ loadUserContent(ScPaths::applicationDataDir() + "charpalette.ucp");
+
+ m_unicodeSearchModel = new UnicodeSearchModel(this);
+
+ m_userTable->setModel(m_userTableModel);
+ m_userTable->setAcceptDrops(true);
+
+ // signals and slots connections
+ connect(ScQApp, SIGNAL(iconSetChanged()), this, SLOT(iconSetChange()));
+
+ connect(m_userTable, SIGNAL(selectChar(uint,QString)), this, SLOT(userNewChar(uint,QString)));
+ connect(m_userTable->selectionModel(), SIGNAL(selectionChanged(const QItemSelection&,const QItemSelection&)), this, SLOT(slot_selectionChanged(const QItemSelection&,const QItemSelection&)));
+ connect(m_userTableModel, SIGNAL(rowAppended()),m_userTable, SLOT(resizeLastRow()));
+ connect(unicodeButton, SIGNAL(chosenUnicode(const QString&)),m_userTableModel, SLOT(appendUnicode(const QString&)));
+ connect(enhancedDialogButton, SIGNAL(toggled(bool)), this, SLOT(enhancedDialogButton_toggled(bool)));
+ connect(this, SIGNAL(insertUserSpecialChar(QChar,QString)), this, SLOT(slot_insertUserSpecialChar(QChar,QString)));
+ connect(uniLoadButton, SIGNAL(clicked()), this, SLOT(uniLoadButton_clicked()));
+ connect(uniSaveButton, SIGNAL(clicked()), this, SLOT(uniSaveButton_clicked()));
+ connect(uniClearButton, SIGNAL(clicked()), this, SLOT(uniClearButton_clicked()));
+}
+
+CharSelect::~CharSelect()
+{
+ delete m_unicodeSearchModel;
+}
+
+void CharSelect::iconSetChange()
+{
enhancedDialogButton->setIcon(IconManager::instance().loadIcon("16/insert-table.png"));
unicodeButton->setIcon(IconManager::instance().loadIcon("find.png"));
uniLoadButton->setIcon(IconManager::instance().loadIcon("16/document-open.png"));
uniSaveButton->setIcon(IconManager::instance().loadIcon("16/document-save.png"));
uniClearButton->setIcon(IconManager::instance().loadIcon("16/document-new.png"));
-
- m_userTableModel = new CharTableModel(this, 6, m_doc, PrefsManager::instance().appPrefs.itemToolPrefs.textFont);
- loadUserContent(ScPaths::applicationDataDir() + "charpalette.ucp");
-
- m_unicodeSearchModel = new UnicodeSearchModel(this);
-
- m_userTable->setModel(m_userTableModel);
- m_userTable->setAcceptDrops(true);
-
- // signals and slots connections
- connect(m_userTable, SIGNAL(selectChar(uint,QString)),this,SLOT(userNewChar(uint,QString)));
- connect(m_userTable->selectionModel(),SIGNAL(selectionChanged(const QItemSelection&,const QItemSelection&)),this,SLOT(slot_selectionChanged(const QItemSelection&,const QItemSelection&)));
- connect(m_userTableModel,SIGNAL(rowAppended()),m_userTable,SLOT(resizeLastRow()));
- connect(unicodeButton,SIGNAL(chosenUnicode(const QString&)),m_userTableModel,SLOT(appendUnicode(const QString&)));
- connect(enhancedDialogButton, SIGNAL(toggled(bool)),this,SLOT(enhancedDialogButton_toggled(bool)));
- connect(this,SIGNAL(insertUserSpecialChar(QChar,QString)),this,SLOT(slot_insertUserSpecialChar(QChar,QString)));
- connect(uniLoadButton,SIGNAL(clicked()),this,SLOT(uniLoadButton_clicked()));
- connect(uniSaveButton,SIGNAL(clicked()),this,SLOT(uniSaveButton_clicked()));
- connect(uniClearButton,SIGNAL(clicked()),this,SLOT(uniClearButton_clicked()));
-}
-
-CharSelect::~CharSelect()
-{
- delete m_unicodeSearchModel;
}
void CharSelect::setDoc(ScribusDoc* doc)
Modified: trunk/Scribus/scribus/ui/charselect.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23474&path=/trunk/Scribus/scribus/ui/charselect.h
==============================================================================
--- trunk/Scribus/scribus/ui/charselect.h (original)
+++ trunk/Scribus/scribus/ui/charselect.h Tue Feb 25 20:01:15 2020
@@ -83,6 +83,7 @@
void closeEnhanced();
private slots:
+ void iconSetChange();
void enhancedDialogButton_toggled(bool);
void slot_insertSpecialChar();
void slot_insertSpecialChars(const QVector<uint> & chars);
Modified: trunk/Scribus/scribus/ui/checkDocument.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23474&path=/trunk/Scribus/scribus/ui/checkDocument.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/checkDocument.cpp (original)
+++ trunk/Scribus/scribus/ui/checkDocument.cpp Tue Feb 25 20:01:15 2020
@@ -25,11 +25,11 @@
#include "pdfoptions.h"
#include "prefsmanager.h"
#include "scpage.h"
+#include "scribusapp.h"
#include "scribuscore.h"
#include "scribusdoc.h"
#include "iconmanager.h"
#include "util.h"
-
// readable constants for QTreeWidgetItem column ids
#define COLUMN_ITEM 0
@@ -45,12 +45,11 @@
minResDPI(0),
maxResDPI(0)
{
- showPagesWithoutErrors=PrefsManager::instance().appPrefs.verifierPrefs.showPagesWithoutErrors;
- showNonPrintingLayerErrors=PrefsManager::instance().appPrefs.verifierPrefs.showNonPrintingLayerErrors;
-
- graveError = IconManager::instance().loadPixmap("22/dialog-error.png");
- onlyWarning = IconManager::instance().loadPixmap("22/dialog-warning.png");
- noErrors = IconManager::instance().loadPixmap("ok.png");
+ showPagesWithoutErrors = PrefsManager::instance().appPrefs.verifierPrefs.showPagesWithoutErrors;
+ showNonPrintingLayerErrors = PrefsManager::instance().appPrefs.verifierPrefs.showNonPrintingLayerErrors;
+
+ iconSetChange();
+
checkDocumentLayout = new QVBoxLayout( this );
checkDocumentLayout->setMargin(5);
checkDocumentLayout->setSpacing(5);
@@ -91,6 +90,8 @@
masterPageItemMap.clear();
resize( QSize(320, 260).expandedTo(minimumSizeHint()) );
+ connect(ScQApp, SIGNAL(iconSetChanged()), this, SLOT(iconSetChange()));
+
connect(ignoreErrors, SIGNAL(clicked()), this, SIGNAL(ignoreAllErrors()));
connect(curCheckProfile, SIGNAL(activated(const QString&)), this, SLOT(newScan(const QString&)));
connect(reScan, SIGNAL(clicked()), this, SLOT(doReScan()));
@@ -104,6 +105,13 @@
}
else
QWidget::changeEvent(e);
+}
+
+void CheckDocument::iconSetChange()
+{
+ graveError = IconManager::instance().loadPixmap("22/dialog-error.png");
+ onlyWarning = IconManager::instance().loadPixmap("22/dialog-warning.png");
+ noErrors = IconManager::instance().loadPixmap("ok.png");
}
void CheckDocument::languageChange()
@@ -290,19 +298,19 @@
case MissingGlyph:
item->setText(COLUMN_PROBLEM, warnMap[PV_MISSING_GLYPH].first);
item->setToolTip(COLUMN_PROBLEM, warnMap[PV_MISSING_GLYPH].second);
- item->setIcon(COLUMN_ITEM, graveError );
+ item->setIcon(COLUMN_ITEM, graveError);
pageGraveError = true;
itemError = true;
break;
case TextOverflow:
item->setText(COLUMN_PROBLEM, warnMap[PV_TEXT_OVERFLOW].first);
item->setToolTip(COLUMN_PROBLEM, warnMap[PV_TEXT_OVERFLOW].second);
- item->setIcon(COLUMN_ITEM, onlyWarning );
+ item->setIcon(COLUMN_ITEM, onlyWarning);
break;
case ObjectNotOnPage:
item->setText(COLUMN_PROBLEM, warnMap[PV_NON_ON_PAGE].first);
item->setToolTip(COLUMN_PROBLEM, warnMap[PV_NON_ON_PAGE].second);
- item->setIcon(COLUMN_ITEM, onlyWarning );
+ item->setIcon(COLUMN_ITEM, onlyWarning);
break;
case MissingImage:
if (pageItem->externalFile().isEmpty())
Modified: trunk/Scribus/scribus/ui/checkDocument.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23474&path=/trunk/Scribus/scribus/ui/checkDocument.h
==============================================================================
--- trunk/Scribus/scribus/ui/checkDocument.h (original)
+++ trunk/Scribus/scribus/ui/checkDocument.h Tue Feb 25 20:01:15 2020
@@ -108,6 +108,7 @@
protected slots:
+ virtual void iconSetChange();
virtual void languageChange();
protected:
Modified: trunk/Scribus/scribus/ui/colorlistbox.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23474&path=/trunk/Scribus/scribus/ui/colorlistbox.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/colorlistbox.cpp (original)
+++ trunk/Scribus/scribus/ui/colorlistbox.cpp Tue Feb 25 20:01:15 2020
@@ -23,6 +23,7 @@
#include "iconmanager.h"
#include "sccolorengine.h"
#include "scconfig.h"
+#include "scribusapp.h"
#include "scribusdoc.h"
#include "util_color.h"
@@ -49,13 +50,26 @@
class SCRIBUS_API ColorFancyItemDelegate : public ScListBoxPixmap<60, 15>
{
public:
- ColorFancyItemDelegate(): ScListBoxPixmap<60, 15>() {};
+ ColorFancyItemDelegate();
~ColorFancyItemDelegate() {};
+ void iconSetChange();
void redraw(const QVariant&) const override;
QString text(const QVariant&) const override;
+
+private:
+ QPixmap alertIcon;
+ QPixmap cmykIcon;
+ QPixmap rgbIcon;
+ QPixmap labIcon;
+ QPixmap spotIcon;
+ QPixmap regIcon;
};
+ColorFancyItemDelegate::ColorFancyItemDelegate() : ScListBoxPixmap<60, 15>()
+{
+ iconSetChange();
+}
void ColorSmallItemDelegate::redraw(const QVariant& data) const
{
@@ -87,28 +101,9 @@
}
}
-
void ColorFancyItemDelegate::redraw(const QVariant& data) const
{
static QPixmap smallPix(15, 15);
- static QPixmap alertIcon;
- static QPixmap cmykIcon;
- static QPixmap rgbIcon;
- static QPixmap labIcon;
- static QPixmap spotIcon;
- static QPixmap regIcon;
- static bool iconsInitialized = false;
-
- if ( !iconsInitialized )
- {
- alertIcon = IconManager::instance().loadPixmap("alert.png", true);
- cmykIcon = IconManager::instance().loadPixmap("cmyk.png", true);
- rgbIcon = IconManager::instance().loadPixmap("rgb.png", true);
- labIcon = IconManager::instance().loadPixmap("lab.png", true);
- spotIcon = IconManager::instance().loadPixmap("spot.png", true);
- regIcon = IconManager::instance().loadPixmap("register.png", true);
- iconsInitialized = true;
- }
QPixmap* pPixmap = ScListBoxPixmap<60, 15>::pmap.data();
pPixmap->fill(Qt::transparent);
@@ -165,6 +160,17 @@
return data.toString();
}
+void ColorFancyItemDelegate::iconSetChange()
+{
+ IconManager& iconManager = IconManager::instance();
+
+ alertIcon = iconManager.loadPixmap("alert.png", true);
+ cmykIcon = iconManager.loadPixmap("cmyk.png", true);
+ rgbIcon = iconManager.loadPixmap("rgb.png", true);
+ labIcon = iconManager.loadPixmap("lab.png", true);
+ spotIcon = iconManager.loadPixmap("spot.png", true);
+ regIcon = iconManager.loadPixmap("register.png", true);
+}
int ColorListBox::initialized;
int ColorListBox::sortRule;
@@ -198,6 +204,8 @@
QListView::setModel(new ColorListModel(this));
setPixmapType(type);
+ connect(ScQApp, SIGNAL(iconSetChanged()), this, SLOT(iconSetChange()));
+
connect(this, SIGNAL(clicked(QModelIndex)), this, SLOT(emitItemClicked(QModelIndex)));
connect(this, SIGNAL(doubleClicked(QModelIndex)), this, SLOT(emitItemDoubleClicked(QModelIndex)));
connect(this->selectionModel(), SIGNAL(currentChanged(QModelIndex, QModelIndex)),
@@ -254,6 +262,20 @@
{
QPersistentModelIndex persistentCurrent = current;
emit itemDoubleClicked(persistentCurrent.row());
+}
+
+void ColorListBox::iconSetChange()
+{
+ if (m_type == ColorListBox::fancyPixmap)
+ {
+ QAbstractItemDelegate* curDelegate = itemDelegate();
+ ColorFancyItemDelegate* colorDelegate = dynamic_cast<ColorFancyItemDelegate*>(curDelegate);
+ if (colorDelegate)
+ {
+ colorDelegate->iconSetChange();
+ this->update();
+ }
+ }
}
void ColorListBox::languageChange()
Modified: trunk/Scribus/scribus/ui/colorlistbox.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23474&path=/trunk/Scribus/scribus/ui/colorlistbox.h
==============================================================================
--- trunk/Scribus/scribus/ui/colorlistbox.h (original)
+++ trunk/Scribus/scribus/ui/colorlistbox.h Tue Feb 25 20:01:15 2020
@@ -7,12 +7,14 @@
#ifndef COLORLISTBOX_H
#define COLORLISTBOX_H
+#include <QColor>
#include <QListView>
#include <QListWidget>
-#include <QColor>
+#include <QPixmap>
#include <QPointer>
#include <QString>
#include <QStringList>
+#include <QVariant>
#include "colorlistmodel.h"
#include "colorsetmanager.h"
@@ -123,6 +125,8 @@
void emitCurrentChanged(const QModelIndex ¤t, const QModelIndex &previous);
void emitItemClicked(const QModelIndex ¤t);
void emitItemDoubleClicked(const QModelIndex ¤t);
+
+ virtual void iconSetChange();
virtual void languageChange();
signals:
Modified: trunk/Scribus/scribus/ui/contextmenu.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23474&path=/trunk/Scribus/scribus/ui/contextmenu.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/contextmenu.cpp (original)
+++ trunk/Scribus/scribus/ui/contextmenu.cpp Tue Feb 25 20:01:15 2020
@@ -381,7 +381,7 @@
scrapNames.removeAt(1);
for (int i = 0; i < scrapNames.count(); i++)
{
- ScrAction *act = new ScrAction( ScrAction::DataInt, QPixmap(), QPixmap(), scrapNames[i], QKeySequence(), this, i);
+ ScrAction *act = new ScrAction(ScrAction::DataInt, QString(), QString(), scrapNames[i], QKeySequence(), this, i);
menuScrapbook->addAction(act);
connect(act, SIGNAL(triggeredData(int)), m_ScMW, SLOT(PutScrap(int)));
}
Modified: trunk/Scribus/scribus/ui/directionselect.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23474&path=/trunk/Scribus/scribus/ui/directionselect.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/directionselect.cpp (original)
+++ trunk/Scribus/scribus/ui/directionselect.cpp Tue Feb 25 20:01:15 2020
@@ -9,7 +9,9 @@
#include <QEvent>
#include <QPixmap>
#include <QToolTip>
+
#include "iconmanager.h"
+#include "scribusapp.h"
DirectionSelect::DirectionSelect(QWidget* parent) : QWidget(parent)
{
@@ -38,6 +40,8 @@
buttonGroup->addButton(RTL, 1);
resize(minimumSizeHint());
+
+ connect(ScQApp, SIGNAL(iconSetChanged()), this, SLOT(iconSetChange()));
connect(buttonGroup, SIGNAL(buttonClicked(int)), this, SLOT(setTypeStyle(int)));
}
@@ -76,14 +80,16 @@
}
}
+void DirectionSelect::iconSetChange()
+{
+ IconManager& iconManager = IconManager::instance();
+ LTR->setIcon(iconManager.loadIcon("16/text-direction-ltr.png"));
+ RTL->setIcon(iconManager.loadIcon("16/text-direction-rtl.png"));
+}
+
void DirectionSelect::languageChange()
{
- LTR->setToolTip("");
- RTL->setToolTip("");
-
-
LTR->setToolTip( tr("Left to right paragraph"));
RTL->setToolTip( tr("Right to left paragraph"));
-
}
Modified: trunk/Scribus/scribus/ui/directionselect.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23474&path=/trunk/Scribus/scribus/ui/directionselect.h
==============================================================================
--- trunk/Scribus/scribus/ui/directionselect.h (original)
+++ trunk/Scribus/scribus/ui/directionselect.h Tue Feb 25 20:01:15 2020
@@ -20,32 +20,35 @@
class SCRIBUS_API DirectionSelect : public QWidget
{
Q_OBJECT
+
public:
- DirectionSelect(QWidget* parent);
- ~DirectionSelect() {};
- void setStyle(int s);
- int getStyle();
- int selectedId();
+ DirectionSelect(QWidget* parent);
+ ~DirectionSelect() {};
- virtual void changeEvent(QEvent *e);
+ void setStyle(int s);
+ int getStyle();
+ int selectedId();
- QButtonGroup* buttonGroup;
- int selected;
- QToolButton* RTL;
- QToolButton* LTR;
+ virtual void changeEvent(QEvent *e);
+
+ QButtonGroup* buttonGroup;
+ int selected;
+ QToolButton* RTL;
+ QToolButton* LTR;
public slots:
- void languageChange();
+ void iconSetChange();
+ void languageChange();
private slots:
- void setTypeStyle(int a);
+ void setTypeStyle(int a);
signals:
- void State(int);
+ void State(int);
protected:
- QHBoxLayout* GroupSelectLayout;
+ QHBoxLayout* GroupSelectLayout;
};
#endif // DIRECTIONSELECT_H
Modified: trunk/Scribus/scribus/ui/editor.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23474&path=/trunk/Scribus/scribus/ui/editor.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/editor.cpp (original)
+++ trunk/Scribus/scribus/ui/editor.cpp Tue Feb 25 20:01:15 2020
@@ -5,11 +5,13 @@
for which a new license (GPL+exception) is in place.
*/
#include "editor.h"
-#include "selfield.h"
+#include "iconmanager.h"
#include "prefsmanager.h"
#include "prefsfile.h"
#include "prefscontext.h"
+#include "scribusapp.h"
#include "scribusview.h"
+#include "selfield.h"
#include <QFile>
#include <QTextStream>
@@ -26,13 +28,14 @@
#include <QVBoxLayout>
#endif
-#include "iconmanager.h"
+
Editor::Editor( QWidget* parent, const QString& daten, ScribusView* vie) : QDialog( parent )
{
setModal(true);
setWindowTitle(tr("Editor"));
- IconManager& im=IconManager::instance();
+
+ IconManager& im = IconManager::instance();
setWindowIcon(im.loadIcon("AppIcon.png"));
view = vie;
dirs = PrefsManager::instance().prefsFile->getContext("dirs");
@@ -108,6 +111,8 @@
connect(PushButton1, SIGNAL(clicked()), this, SLOT(accept()));
connect(PushButton2, SIGNAL(clicked()), this, SLOT(reject()));
#endif
+
+ connect(ScQApp, SIGNAL(iconSetChanged()), this, SLOT(iconSetChange()));
}
void Editor::del()
@@ -115,6 +120,22 @@
QTextCursor curs = EditTex->textCursor();
curs.deleteChar();
EditTex->setTextCursor(curs);
+}
+
+void Editor::iconSetChange()
+{
+ IconManager& im=IconManager::instance();
+
+ setWindowIcon(im.loadIcon("AppIcon.png"));
+
+ newAct->setIcon(im.loadIcon("16/document-new.png"));
+ openAct->setIcon(im.loadIcon("16/document-open.png"));
+ undoAct->setIcon(im.loadIcon("16/edit-undo.png"));
+ redoAct->setIcon(im.loadIcon("16/edit-redo.png"));
+ cutAct->setIcon(im.loadIcon("16/edit-cut.png"));
+ copyAct->setIcon(im.loadIcon("16/edit-copy.png"));
+ pasteAct->setIcon(im.loadIcon("16/edit-paste.png"));
+ clearAct->setIcon(im.loadIcon("16/edit-delete.png"));
}
void Editor::GetFieldNames()
Modified: trunk/Scribus/scribus/ui/editor.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23474&path=/trunk/Scribus/scribus/ui/editor.h
==============================================================================
--- trunk/Scribus/scribus/ui/editor.h (original)
+++ trunk/Scribus/scribus/ui/editor.h Tue Feb 25 20:01:15 2020
@@ -30,6 +30,7 @@
public:
Editor (QWidget* parent, const QString& daten, ScribusView* vie = 0 );
~Editor() {};
+
QTextEdit* EditTex;
QMenu* fmenu;
QMenu* emenu;
@@ -54,6 +55,7 @@
private slots:
void del();
+ void iconSetChange();
void OpenScript();
void SaveAs();
void GetFieldNames();
Modified: trunk/Scribus/scribus/ui/fontcombo.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23474&path=/trunk/Scribus/scribus/ui/fontcombo.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/fontcombo.cpp (original)
+++ trunk/Scribus/scribus/ui/fontcombo.cpp Tue Feb 25 20:01:15 2020
@@ -41,27 +41,32 @@
#include "fonts/scface.h"
-extern ScribusQApp* ScQApp;
-
FontCombo::FontCombo(QWidget* pa) : QComboBox(pa),
prefsManager(PrefsManager::instance())
{
- ttfFont = IconManager::instance().loadPixmap("font_truetype16.png");
- otfFont = IconManager::instance().loadPixmap("font_otf16.png");
- psFont = IconManager::instance().loadPixmap("font_type1_16.png");
- substFont = IconManager::instance().loadPixmap("font_subst16.png");
+ iconSetChange();
setEditable(true);
setValidator(new FontComboValidator(this));
setInsertPolicy(QComboBox::NoInsert);
setItemDelegate(new FontFamilyDelegate(this));
RebuildList(nullptr);
+
+ connect(ScQApp, SIGNAL(iconSetChanged()), this, SLOT(iconSetChange()));
+}
+
+void FontCombo::iconSetChange()
+{
+ IconManager& iconManager = IconManager::instance();
+ ttfFont = iconManager.loadPixmap("font_truetype16.png");
+ otfFont = iconManager.loadPixmap("font_otf16.png");
+ psFont = iconManager.loadPixmap("font_type1_16.png");
+ substFont = iconManager.loadPixmap("font_subst16.png");
}
void FontCombo::RebuildList(ScribusDoc *currentDoc, bool forAnnotation, bool forSubstitute)
{
clear();
QMap<QString, QString> rlist;
- rlist.clear();
SCFontsIterator it(prefsManager.appPrefs.fontPrefs.AvailFonts);
for ( ; it.hasNext(); it.next())
{
Modified: trunk/Scribus/scribus/ui/fontcombo.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23474&path=/trunk/Scribus/scribus/ui/fontcombo.h
==============================================================================
--- trunk/Scribus/scribus/ui/fontcombo.h (original)
+++ trunk/Scribus/scribus/ui/fontcombo.h Tue Feb 25 20:01:15 2020
@@ -61,6 +61,9 @@
QPixmap otfFont;
QPixmap psFont;
QPixmap substFont;
+
+private slots:
+ void iconSetChange();
};
class SCRIBUS_API FontComboH : public QWidget
Modified: trunk/Scribus/scribus/ui/layers.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23474&path=/trunk/Scribus/scribus/ui/layers.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/layers.cpp (original)
+++ trunk/Scribus/scribus/ui/layers.cpp Tue Feb 25 20:01:15 2020
@@ -34,6 +34,7 @@
#include "iconmanager.h"
#include "scribus.h"
+#include "scribusapp.h"
#include "scribusdoc.h"
#include "selection.h"
#include "ui/scrspinbox.h"
@@ -148,6 +149,8 @@
setWidget( containerWidget );
clearContent();
languageChange();
+
+ connect(ScQApp, SIGNAL(iconSetChanged()), this, SLOT(iconSetChange()));
connect(newLayerButton, SIGNAL(clicked()), this, SLOT(addLayer()));
connect(duplicateLayerButton, SIGNAL(clicked()), this, SLOT(dupLayer()));
@@ -674,6 +677,24 @@
ScDockPalette::changeEvent(e);
}
+void LayerPalette::iconSetChange()
+{
+ IconManager& iconManager = IconManager::instance();
+
+ Table->horizontalHeaderItem(1)->setIcon(iconManager.loadIcon("16/show-object.png"));
+ Table->horizontalHeaderItem(2)->setIcon(iconManager.loadIcon("16/document-print.png"));
+ Table->horizontalHeaderItem(3)->setIcon(iconManager.loadIcon("16/lock.png"));
+ Table->horizontalHeaderItem(4)->setIcon(iconManager.loadIcon("16/layer-flow-around.png"));
+ Table->horizontalHeaderItem(5)->setIcon(iconManager.loadIcon("layer-outline.png"));
+ Table->horizontalHeaderItem(6)->setIcon(iconManager.loadIcon("16/pointer.png"));
+
+ newLayerButton->setIcon(iconManager.loadIcon("16/list-add.png"));
+ deleteLayerButton->setIcon(iconManager.loadIcon("16/list-remove.png"));
+ duplicateLayerButton->setIcon(iconManager.loadIcon("16/edit-copy.png"));
+ raiseLayerButton->setIcon(iconManager.loadIcon("16/go-up.png"));
+ lowerLayerButton->setIcon(iconManager.loadIcon("16/go-down.png"));
+}
+
void LayerPalette::languageChange()
{
setWindowTitle( tr( "Layers" ) );
Modified: trunk/Scribus/scribus/ui/layers.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23474&path=/trunk/Scribus/scribus/ui/layers.h
==============================================================================
--- trunk/Scribus/scribus/ui/layers.h (original)
+++ trunk/Scribus/scribus/ui/layers.h Tue Feb 25 20:01:15 2020
@@ -63,6 +63,7 @@
void setActiveLayer(int row, int col);
void clearContent();
void markActiveLayer(int layerID=-1);
+ void iconSetChange();
void languageChange();
signals:
Modified: trunk/Scribus/scribus/ui/linkbutton.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23474&path=/trunk/Scribus/scribus/ui/linkbutton.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/linkbutton.cpp (original)
+++ trunk/Scribus/scribus/ui/linkbutton.cpp Tue Feb 25 20:01:15 2020
@@ -21,26 +21,31 @@
* *
***************************************************************************/
-#include "linkbutton.h"
-#include "iconmanager.h"
-#include "scribuscore.h"
#include <QIcon>
#include <QPixmap>
+#include "linkbutton.h"
+#include "iconmanager.h"
+#include "scribusapp.h"
+#include "scribuscore.h"
LinkButton::LinkButton(QWidget *pa) : QToolButton(pa)
{
setBackgroundRole(QPalette::Window);
- setNewIcon();
+ iconSetChange();
+
+ connect(ScQApp, SIGNAL(iconSetChanged()), this, SLOT(iconSetChange()));
}
-void LinkButton::setNewIcon()
+void LinkButton::iconSetChange()
{
- QIcon a=QIcon();
+ QIcon a = QIcon();
+ IconManager& iconManager = IconManager::instance();
bool rtlLoad = QLocale(ScCore->getGuiLanguage()).textDirection() == Qt::RightToLeft;
- QPixmap closedPixmap(IconManager::instance().loadPixmap("chain-closed.png", false, rtlLoad));
+
+ QPixmap closedPixmap(iconManager.loadPixmap("chain-closed.png", false, rtlLoad));
a.addPixmap(closedPixmap, QIcon::Normal, QIcon::On);
- a.addPixmap(IconManager::instance().loadPixmap("chain-open.png", false, rtlLoad), QIcon::Normal, QIcon::Off);
+ a.addPixmap(iconManager.loadPixmap("chain-open.png", false, rtlLoad), QIcon::Normal, QIcon::Off);
setIcon(a);
setIconSize(closedPixmap.size());
}
Modified: trunk/Scribus/scribus/ui/linkbutton.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23474&path=/trunk/Scribus/scribus/ui/linkbutton.h
==============================================================================
--- trunk/Scribus/scribus/ui/linkbutton.h (original)
+++ trunk/Scribus/scribus/ui/linkbutton.h Tue Feb 25 20:01:15 2020
@@ -43,7 +43,7 @@
*/
LinkButton(QWidget *pa);
~LinkButton() {};
- void setNewIcon();
+
/*!
\author Franz Schmid
\brief Returns size of QPixmap, see the Qt-Documentation for further explaining of that.
@@ -56,6 +56,9 @@
\retval QSize size
*/
virtual QSize minimumSizeHint() const;
+
+protected slots:
+ void iconSetChange();
};
#endif
Modified: trunk/Scribus/scribus/ui/nodeeditpalette.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23474&path=/trunk/Scribus/scribus/ui/nodeeditpalette.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/nodeeditpalette.cpp (original)
+++ trunk/Scribus/scribus/ui/nodeeditpalette.cpp Tue Feb 25 20:01:15 2020
@@ -10,6 +10,7 @@
#include "nodeeditpalette.h"
#include "pageitem.h"
#include "scpage.h"
+#include "scribusapp.h"
#include "scribusdoc.h"
#include "scribusview.h"
#include "selection.h"
@@ -22,8 +23,8 @@
{
IconManager& im = IconManager::instance();
QSize iconSize = QSize(22, 22);
- m_doc=nullptr;
- unitRatio=1.0;
+ m_doc = nullptr;
+ unitRatio = 1.0;
vboxLayout = new QVBoxLayout(this);
vboxLayout->setSpacing(2);
vboxLayout->setMargin(5);
@@ -305,6 +306,8 @@
resize(QSize(170, 380).expandedTo(minimumSizeHint()));
languageChange();
+
+ connect(ScQApp, SIGNAL(iconSetChanged()), this, SLOT(iconSetChange()));
}
void NodePalette::connectSignals()
@@ -1030,6 +1033,78 @@
yPos = currItem->yPos();
itemPath = currItem->PoLine.copy();
itemContourPath = currItem->ContourLine.copy();
+}
+
+void NodePalette::iconSetChange()
+{
+ IconManager& im = IconManager::instance();
+ QSize iconSize = QSize(22, 22);
+
+ MoveNode->setIcon(im.loadIcon("MoveNode.png"));
+ MoveNode->setIconSize(iconSize);
+
+ AddNode->setIcon(im.loadIcon("AddNode.png"));
+ AddNode->setIconSize(iconSize);
+
+ DeleteNode->setIcon(im.loadIcon("DeleteNode.png"));
+ DeleteNode->setIconSize(iconSize);
+
+ ResNode->setIcon(im.loadIcon("ResetNode.png"));
+ ResNode->setIconSize(iconSize);
+
+ MoveControl->setIcon(im.loadIcon("MoveKontrol.png"));
+ MoveControl->setIconSize(iconSize);
+
+ AsymMove->setIcon(im.loadIcon("MoveAsym.png"));
+ AsymMove->setIconSize(iconSize);
+
+ SymMove->setIcon(im.loadIcon("MoveSym.png"));
+ SymMove->setIconSize(iconSize);
+
+ Res1Node->setIcon(im.loadIcon("Reset1Node.png"));
+ Res1Node->setIconSize(iconSize);
+
+ PolySplit->setIcon(im.loadIcon("PolyCut.png"));
+ PolySplit->setIconSize(iconSize);
+
+ BezierClose->setIcon(im.loadIcon("BezierClose.png"));
+ BezierClose->setIconSize(iconSize);
+
+ PolyMirrorH->setIcon(im.loadIcon("hmirror.png"));
+ PolyMirrorH->setIconSize(iconSize);
+
+ PolyMirrorV->setIcon(im.loadIcon("vmirror.png"));
+ PolyMirrorV->setIconSize(iconSize);
+
+ PolyShearL->setIcon(im.loadIcon("22/transform-shear-left.png"));
+ PolyShearL->setIconSize(iconSize);
+
+ PolyShearR->setIcon(im.loadIcon("22/transform-shear-right.png"));
+ PolyShearR->setIconSize(iconSize);
+
+ PolyShearU->setIcon(im.loadIcon("22/transform-shear-up.png"));
+ PolyShearU->setIconSize(iconSize);
+
+ PolyShearD->setIcon(im.loadIcon("22/transform-shear-down.png"));
+ PolyShearD->setIconSize(iconSize);
+
+ RotateCCW->setIcon(im.loadIcon("rotate_ccw.png"));
+ RotateCCW->setIconSize(iconSize);
+
+ RotateCW->setIcon(im.loadIcon("rotate_cw.png"));
+ RotateCW->setIconSize(iconSize);
+
+ Expand->setIcon(im.loadIcon("expand.png"));
+ Expand->setIconSize(iconSize);
+
+ Shrink->setIcon(im.loadIcon("crop.png"));
+ Shrink->setIconSize(iconSize);
+
+ Enlarge->setIcon(im.loadIcon("expand.png"));
+ Enlarge->setIconSize(iconSize);
+
+ Reduce->setIcon(im.loadIcon("crop.png"));
+ Reduce->setIconSize(iconSize);
}
void NodePalette::languageChange()
Modified: trunk/Scribus/scribus/ui/nodeeditpalette.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23474&path=/trunk/Scribus/scribus/ui/nodeeditpalette.h
==============================================================================
--- trunk/Scribus/scribus/ui/nodeeditpalette.h (original)
+++ trunk/Scribus/scribus/ui/nodeeditpalette.h Tue Feb 25 20:01:15 2020
@@ -37,6 +37,7 @@
public:
NodePalette( QWidget* parent);
~NodePalette() {};
+
void setDefaults(PageItem* currItem);
QToolButton* MoveNode;
@@ -118,6 +119,7 @@
void HaveNode(bool have, bool mov);
void IsOpen();
void PolyStatus(int typ, uint size);
+ void iconSetChange();
void languageChange();
void unitChange();
void EndEdit(); // allow remote close
Modified: trunk/Scribus/scribus/ui/outlinepalette.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23474&path=/trunk/Scribus/scribus/ui/outlinepalette.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/outlinepalette.cpp (original)
+++ trunk/Scribus/scribus/ui/outlinepalette.cpp Tue Feb 25 20:01:15 2020
@@ -35,6 +35,7 @@
#include "propertiespalette.h"
#include "scpage.h"
#include "scribus.h"
+#include "scribusapp.h"
#include "scribusdoc.h"
#include "scribusview.h"
#include "selection.h"
@@ -43,7 +44,6 @@
#include "util.h"
#include "util_color.h"
#include "util_formats.h"
-
OutlineTreeItem::OutlineTreeItem(OutlineTreeItem* parent, OutlineTreeItem* after) : QTreeWidgetItem(parent, after)
{
@@ -478,33 +478,19 @@
setWidget( containerWidget );
unsetDoc();
- IconManager& im = IconManager::instance();
- imageIcon = im.loadPixmap("22/insert-image.png");
- latexIcon = im.loadPixmap("22/insert-latex.png");
- lineIcon = im.loadPixmap("stift.png");
- textIcon = im.loadPixmap("22/insert-text-frame.png");
- polylineIcon = im.loadPixmap("22/draw-path.png");
- polygonIcon = im.loadPixmap("22/draw-polygon.png");
- arcIcon = im.loadPixmap("22/draw-arc.png");
- spiralIcon = im.loadPixmap("22/draw-spiral.png");
- tableIcon = im.loadPixmap("22/insert-table.png");
- groupIcon = im.loadPixmap("u_group.png");
- buttonIcon = im.loadPixmap("22/insert-button.png");
- radiobuttonIcon = im.loadPixmap("22/radiobutton.png");
- textFieldIcon = im.loadPixmap("22/text-field.png");
- checkBoxIcon = im.loadPixmap("22/checkbox.png");
- comboBoxIcon = im.loadPixmap("22/combobox.png");
- listBoxIcon = im.loadPixmap("22/list-box.png");
- annotTextIcon = im.loadPixmap("22/pdf-annotations.png");
- annotLinkIcon = im.loadPixmap("goto.png");
- annot3DIcon = im.loadPixmap("22/annot3d.png");
+
selectionTriggered = false;
m_MainWindow = nullptr;
freeObjects = nullptr;
rootObject = nullptr;
currentObject = nullptr;
+
+ iconSetChange();
languageChange();
+
// signals and slots connections
+ connect(ScQApp, SIGNAL(iconSetChanged()), this, SLOT(iconSetChange()));
+
connect(reportDisplay, SIGNAL(customContextMenuRequested (const QPoint &)), this, SLOT(slotRightClick(QPoint)));
connect(reportDisplay, SIGNAL(itemSelectionChanged()), this, SLOT(slotMultiSelect()));
connect(reportDisplay, SIGNAL(itemChanged(QTreeWidgetItem*, int)), this, SLOT(slotDoRename(QTreeWidgetItem*, int)));
@@ -1484,6 +1470,33 @@
ScDockPalette::changeEvent(e);
}
+void OutlinePalette::iconSetChange()
+{
+ IconManager& im = IconManager::instance();
+ imageIcon = im.loadPixmap("22/insert-image.png");
+ latexIcon = im.loadPixmap("22/insert-latex.png");
+ lineIcon = im.loadPixmap("stift.png");
+ textIcon = im.loadPixmap("22/insert-text-frame.png");
+ polylineIcon = im.loadPixmap("22/draw-path.png");
+ polygonIcon = im.loadPixmap("22/draw-polygon.png");
+ arcIcon = im.loadPixmap("22/draw-arc.png");
+ spiralIcon = im.loadPixmap("22/draw-spiral.png");
+ tableIcon = im.loadPixmap("22/insert-table.png");
+ groupIcon = im.loadPixmap("u_group.png");
+ buttonIcon = im.loadPixmap("22/insert-button.png");
+ radiobuttonIcon = im.loadPixmap("22/radiobutton.png");
+ textFieldIcon = im.loadPixmap("22/text-field.png");
+ checkBoxIcon = im.loadPixmap("22/checkbox.png");
+ comboBoxIcon = im.loadPixmap("22/combobox.png");
+ listBoxIcon = im.loadPixmap("22/list-box.png");
+ annotTextIcon = im.loadPixmap("22/pdf-annotations.png");
+ annotLinkIcon = im.loadPixmap("goto.png");
+ annot3DIcon = im.loadPixmap("22/annot3d.png");
+
+ if (this->isVisible() && (currDoc != nullptr))
+ BuildTree();
+}
+
void OutlinePalette::languageChange()
{
setWindowTitle( tr("Outline"));
Modified: trunk/Scribus/scribus/ui/outlinepalette.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23474&path=/trunk/Scribus/scribus/ui/outlinepalette.h
==============================================================================
--- trunk/Scribus/scribus/ui/outlinepalette.h (original)
+++ trunk/Scribus/scribus/ui/outlinepalette.h Tue Feb 25 20:01:15 2020
@@ -75,6 +75,7 @@
public slots:
void BuildTree(bool storeVals = true);
void filterTree(const QString& keyword);
+ void iconSetChange();
void languageChange();
void slotShowSelect(int SNr, PageItem *Nr);
void setPaletteShown(bool);
@@ -96,6 +97,7 @@
void slotMultiSelect();
void slotSelect(QTreeWidgetItem* ite, int col);
void slotDoubleClick(QTreeWidgetItem* ite, int col);
+
protected:
void filterTree();
void clearPalette();
Modified: trunk/Scribus/scribus/ui/pagepalette_masterpages.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23474&path=/trunk/Scribus/scribus/ui/pagepalette_masterpages.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/pagepalette_masterpages.cpp (original)
+++ trunk/Scribus/scribus/ui/pagepalette_masterpages.cpp Tue Feb 25 20:01:15 2020
@@ -32,9 +32,10 @@
#include "prefsmanager.h"
#include "scpage.h"
#include "scribus.h"
-#include "scribusXml.h"
+#include "scribusapp.h"
#include "scribusdoc.h"
#include "scribusview.h"
+#include "scribusXml.h"
#include "selection.h"
#include "util.h"
#include "util_os.h"
@@ -46,11 +47,7 @@
m_view = pCurrentView;
setupUi(this);
-
- importButton->setIcon(IconManager::instance().loadIcon("16/document-open.png"));
- newButton->setIcon(IconManager::instance().loadIcon("16/document-new.png"));
- duplicateButton->setIcon(IconManager::instance().loadIcon("16/edit-copy.png"));
- deleteButton->setIcon(IconManager::instance().loadIcon("16/edit-delete.png"));
+ iconSetChange();
masterPageListBox->setSelectionMode(QAbstractItemView::ExtendedSelection);
styleChange();
@@ -66,6 +63,7 @@
setMinimumSize(sizeHint());
// signals and slots connections
+ connect(ScQApp, SIGNAL(iconSetChanged()), this, SLOT(iconSetChange()));
connectSignals();
}
@@ -125,6 +123,16 @@
disconnect(masterPageListBox, SIGNAL(itemChanged(QListWidgetItem*)),
this, SLOT(renameMasterPage( QListWidgetItem*)));
disconnect(finishButton , SIGNAL(released()), this, SIGNAL(finished()));
+}
+
+void PagePalette_MasterPages::iconSetChange()
+{
+ IconManager& iconManager = IconManager::instance();
+
+ importButton->setIcon(iconManager.loadIcon("16/document-open.png"));
+ newButton->setIcon(iconManager.loadIcon("16/document-new.png"));
+ duplicateButton->setIcon(iconManager.loadIcon("16/edit-copy.png"));
+ deleteButton->setIcon(iconManager.loadIcon("16/edit-delete.png"));
}
void PagePalette_MasterPages::languageChange()
Modified: trunk/Scribus/scribus/ui/pagepalette_masterpages.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23474&path=/trunk/Scribus/scribus/ui/pagepalette_masterpages.h
==============================================================================
--- trunk/Scribus/scribus/ui/pagepalette_masterpages.h (original)
+++ trunk/Scribus/scribus/ui/pagepalette_masterpages.h Tue Feb 25 20:01:15 2020
@@ -38,6 +38,7 @@
void updateMasterPageList(QString MasterPageName);
public slots:
+ void iconSetChange();
void languageChange();
void styleChange();
void selectMasterPage(const QString& name);
Modified: trunk/Scribus/scribus/ui/pagepalette_pages.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23474&path=/trunk/Scribus/scribus/ui/pagepalette_pages.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/pagepalette_pages.cpp (original)
+++ trunk/Scribus/scribus/ui/pagepalette_pages.cpp Tue Feb 25 20:01:15 2020
@@ -25,12 +25,14 @@
#include "pagepalette_pages.h"
#include "pagepalette_widgets.h"
#include "scpage.h"
+#include "scribusapp.h"
#include "scribuscore.h"
#include "scribusdoc.h"
#include "scribusview.h"
PagePalette_Pages::PagePalette_Pages(QWidget* parent) : QWidget(parent)
{
+ currView = nullptr;
m_scMW = ScCore->primaryMainWindow();
setupUi(this);
@@ -61,9 +63,10 @@
pix = IconManager::instance().loadPixmap("32/page-simple.png");
- currView = nullptr;
Rebuild();
languageChange();
+
+ connect(ScQApp, SIGNAL(iconSetChanged()), this, SLOT(iconSetChange()));
connect(masterPageList, SIGNAL(itemDoubleClicked(QListWidgetItem*)), this, SLOT(selMasterPage()));
connect(masterPageList, SIGNAL(thumbnailChanged()), this, SLOT(rebuildMasters()));
@@ -394,6 +397,13 @@
QWidget::changeEvent(e);
}
+void PagePalette_Pages::iconSetChange()
+{
+ pix = IconManager::instance().loadPixmap("32/page-simple.png");
+ if (currView != nullptr)
+ Rebuild();
+}
+
void PagePalette_Pages::languageChange()
{
retranslateUi(this);
Modified: trunk/Scribus/scribus/ui/pagepalette_pages.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23474&path=/trunk/Scribus/scribus/ui/pagepalette_pages.h
==============================================================================
--- trunk/Scribus/scribus/ui/pagepalette_pages.h (original)
+++ trunk/Scribus/scribus/ui/pagepalette_pages.h Tue Feb 25 20:01:15 2020
@@ -52,6 +52,7 @@
void languageChange();
private slots:
+ void iconSetChange();
void pageView_applyMasterPage(const QString& masterpageName, int pageIndex);
void pageView_movePage(int r, int c);
void pageView_gotoPage(int r, int c, int b);
Modified: trunk/Scribus/scribus/ui/pagepalette_widgets.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23474&path=/trunk/Scribus/scribus/ui/pagepalette_widgets.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/pagepalette_widgets.cpp (original)
+++ trunk/Scribus/scribus/ui/pagepalette_widgets.cpp Tue Feb 25 20:01:15 2020
@@ -23,6 +23,7 @@
#include "pagelayout.h"
#include "pagepalette_widgets.h"
#include "scpage.h"
+#include "scribusapp.h"
#include "ui/scmessagebox.h"
@@ -488,6 +489,8 @@
setPixmap(Normal);
setScaledContents(false);
setAcceptDrops(true);
+
+ connect(ScQApp, SIGNAL(iconSetChanged()), this, SLOT(iconSetChange()));
}
void TrashBin::dragEnterEvent(QDragEnterEvent *e)
@@ -525,3 +528,10 @@
}
}
}
+
+void TrashBin::iconSetChange()
+{
+ Normal = IconManager::instance().loadPixmap("trashcan.png");
+ Offen = IconManager::instance().loadPixmap("trashcan2.png");
+ setPixmap(Normal);
+}
Modified: trunk/Scribus/scribus/ui/pagepalette_widgets.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23474&path=/trunk/Scribus/scribus/ui/pagepalette_widgets.h
==============================================================================
--- trunk/Scribus/scribus/ui/pagepalette_widgets.h (original)
+++ trunk/Scribus/scribus/ui/pagepalette_widgets.h Tue Feb 25 20:01:15 2020
@@ -144,6 +144,9 @@
protected:
QPixmap Normal;
QPixmap Offen;
+
+protected slots:
+ void iconSetChange();
signals:
void DelPage(int);
Modified: trunk/Scribus/scribus/ui/prefs_hyphenator.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23474&path=/trunk/Scribus/scribus/ui/prefs_hyphenator.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/prefs_hyphenator.cpp (original)
+++ trunk/Scribus/scribus/ui/prefs_hyphenator.cpp Tue Feb 25 20:01:15 2020
@@ -23,8 +23,6 @@
#include "third_party/zip/scribus_zip.h"
#include "util.h"
#include "util_file.h"
-
-extern ScribusQApp* ScQApp;
Prefs_Hyphenator::Prefs_Hyphenator(QWidget* parent, ScribusDoc* doc)
: Prefs_Pane(parent)
Modified: trunk/Scribus/scribus/ui/prefs_spelling.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23474&path=/trunk/Scribus/scribus/ui/prefs_spelling.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/prefs_spelling.cpp (original)
+++ trunk/Scribus/scribus/ui/prefs_spelling.cpp Tue Feb 25 20:01:15 2020
@@ -26,10 +26,6 @@
#include "third_party/zip/scribus_zip.h"
#include "util.h"
#include "util_file.h"
-
-
-
-extern ScribusQApp* ScQApp;
Prefs_Spelling::Prefs_Spelling(QWidget* parent, ScribusDoc* doc)
: Prefs_Pane(parent)
Modified: trunk/Scribus/scribus/ui/prefs_userinterface.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23474&path=/trunk/Scribus/scribus/ui/prefs_userinterface.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/prefs_userinterface.cpp (original)
+++ trunk/Scribus/scribus/ui/prefs_userinterface.cpp Tue Feb 25 20:01:15 2020
@@ -18,8 +18,6 @@
#include "scribusdoc.h"
#include "util.h"
#include "util_text.h"
-
-extern ScribusQApp *ScQApp;
Prefs_UserInterface::Prefs_UserInterface(QWidget* parent, ScribusDoc* doc)
: Prefs_Pane(parent)
Modified: trunk/Scribus/scribus/ui/propertiespalette_line.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23474&path=/trunk/Scribus/scribus/ui/propertiespalette_line.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/propertiespalette_line.cpp (original)
+++ trunk/Scribus/scribus/ui/propertiespalette_line.cpp Tue Feb 25 20:01:15 2020
@@ -21,6 +21,7 @@
#include "pageitem_textframe.h"
#include "sccolorengine.h"
#include "scraction.h"
+#include "scribusapp.h"
#include "scribuscore.h"
#include "selection.h"
#include "ui/propertiespalette_utils.h"
@@ -70,6 +71,8 @@
lineStyles->addItem( "No Style" );
languageChange();
+
+ connect(ScQApp, SIGNAL(iconSetChanged()), this, SLOT(iconSetChange()));
connect(lineWidth, SIGNAL(valueChanged(double)), this, SLOT(handleLineWidth()));
connect(lineType, SIGNAL(activated(int)), this, SLOT(handleLineStyle()));
@@ -645,6 +648,28 @@
lineEndStyle->setEnabled(setter);
}
+void PropertiesPalette_Line::iconSetChange()
+{
+ IconManager& im = IconManager::instance();
+
+ QSignalBlocker lineJoinStyleBlocker(lineJoinStyle);
+ int oldLJoinStyle = lineJoinStyle->currentIndex();
+ lineJoinStyle->clear();
+ lineJoinStyle->addItem(im.loadIcon("16/stroke-join-miter.png"), tr("Miter Join"));
+ lineJoinStyle->addItem(im.loadIcon("16/stroke-join-bevel.png"), tr("Bevel Join"));
+ lineJoinStyle->addItem(im.loadIcon("16/stroke-join-round.png"), tr("Round Join"));
+ lineJoinStyle->setCurrentIndex(oldLJoinStyle);
+
+ QSignalBlocker lineEndStyleBlocker(lineEndStyle);
+ int oldLEndStyle = lineEndStyle->currentIndex();
+ lineEndStyle->clear();
+ lineEndStyle->addItem(im.loadIcon("16/stroke-cap-butt.png"), tr("Flat Cap"));
+ lineEndStyle->addItem(im.loadIcon("16/stroke-cap-square.png"), tr("Square Cap"));
+ lineEndStyle->addItem(im.loadIcon("16/stroke-cap-round.png"), tr("Round Cap"));
+ lineEndStyle->setCurrentIndex(oldLEndStyle);
+ lineEndLabel->setText( tr("&Endings:"));
+}
+
void PropertiesPalette_Line::languageChange()
{
QSignalBlocker lineTypeBlocker(lineType);
@@ -684,7 +709,7 @@
QSignalBlocker lineJoinStyleBlocker(lineJoinStyle);
int oldLJoinStyle = lineJoinStyle->currentIndex();
lineJoinStyle->clear();
- IconManager& im=IconManager::instance();
+ IconManager& im = IconManager::instance();
lineJoinStyle->addItem(im.loadIcon("16/stroke-join-miter.png"), tr("Miter Join"));
lineJoinStyle->addItem(im.loadIcon("16/stroke-join-bevel.png"), tr("Bevel Join"));
lineJoinStyle->addItem(im.loadIcon("16/stroke-join-round.png"), tr("Round Join"));
Modified: trunk/Scribus/scribus/ui/propertiespalette_line.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23474&path=/trunk/Scribus/scribus/ui/propertiespalette_line.h
==============================================================================
--- trunk/Scribus/scribus/ui/propertiespalette_line.h (original)
+++ trunk/Scribus/scribus/ui/propertiespalette_line.h Tue Feb 25 20:01:15 2020
@@ -64,6 +64,7 @@
void showLineWidth(double s);
void showLineValues(Qt::PenStyle p, Qt::PenCapStyle pc, Qt::PenJoinStyle pj);
+ void iconSetChange();
void languageChange();
void unitChange();
Modified: trunk/Scribus/scribus/ui/propertiespalette_shape.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23474&path=/trunk/Scribus/scribus/ui/propertiespalette_shape.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/propertiespalette_shape.cpp (original)
+++ trunk/Scribus/scribus/ui/propertiespalette_shape.cpp Tue Feb 25 20:01:15 2020
@@ -22,6 +22,7 @@
#include "polyprops.h"
#include "sccolorengine.h"
#include "scraction.h"
+#include "scribusapp.h"
#include "scribuscore.h"
#include "scribusdoc.h"
#include "scribusview.h"
@@ -49,18 +50,10 @@
setupUi(this);
setSizePolicy( QSizePolicy(QSizePolicy::Maximum, QSizePolicy::Maximum));
- roundRectIcon->setPixmap(IconManager::instance().loadPixmap("round-corners.png"));
-
- textFlowDisabled->setIcon(IconManager::instance().loadIcon("flow-none.png"));
- textFlowUsesFrameShape->setIcon(IconManager::instance().loadIcon("flow-frame.png"));
- textFlowUsesBoundingBox->setIcon(IconManager::instance().loadIcon("flow-bounding.png"));
- textFlowUsesContourLine->setIcon(IconManager::instance().loadIcon("flow-contour.png"));
- textFlowUsesImageClipping->setIcon(IconManager::instance().loadIcon("flow-contour.png"));
-
- evenOdd->setIcon(IconManager::instance().loadIcon("fill-rule-even-odd.png"));
- nonZero->setIcon(IconManager::instance().loadIcon("fill-rule-nonzero.png"));
-
+ iconSetChange();
languageChange();
+
+ connect(ScQApp, SIGNAL(iconSetChanged()), this, SLOT(iconSetChange()));
connect(textFlowBtnGroup, SIGNAL(buttonClicked(int)), this, SLOT(handleTextFlow()));
connect(editShape , SIGNAL(clicked()) , this, SLOT(handleShapeEdit()));
@@ -530,6 +523,22 @@
textFlowUsesImageClipping->setEnabled(false);
}
+void PropertiesPalette_Shape::iconSetChange()
+{
+ IconManager& iconManager = IconManager::instance();
+
+ roundRectIcon->setPixmap(iconManager.loadPixmap("round-corners.png"));
+
+ textFlowDisabled->setIcon(iconManager.loadIcon("flow-none.png"));
+ textFlowUsesFrameShape->setIcon(iconManager.loadIcon("flow-frame.png"));
+ textFlowUsesBoundingBox->setIcon(iconManager.loadIcon("flow-bounding.png"));
+ textFlowUsesContourLine->setIcon(iconManager.loadIcon("flow-contour.png"));
+ textFlowUsesImageClipping->setIcon(iconManager.loadIcon("flow-contour.png"));
+
+ evenOdd->setIcon(iconManager.loadIcon("fill-rule-even-odd.png"));
+ nonZero->setIcon(iconManager.loadIcon("fill-rule-nonzero.png"));
+}
+
void PropertiesPalette_Shape::languageChange()
{
QString ptSuffix = unitGetSuffixFromIndex(SC_PT);
Modified: trunk/Scribus/scribus/ui/propertiespalette_shape.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23474&path=/trunk/Scribus/scribus/ui/propertiespalette_shape.h
==============================================================================
--- trunk/Scribus/scribus/ui/propertiespalette_shape.h (original)
+++ trunk/Scribus/scribus/ui/propertiespalette_shape.h Tue Feb 25 20:01:15 2020
@@ -70,6 +70,7 @@
void handleSelectionChanged();
void handleUpdateRequest(int);
+ void iconSetChange();
void languageChange();
void unitChange();
Modified: trunk/Scribus/scribus/ui/propertiespalette_table.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23474&path=/trunk/Scribus/scribus/ui/propertiespalette_table.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/propertiespalette_table.cpp (original)
+++ trunk/Scribus/scribus/ui/propertiespalette_table.cpp Tue Feb 25 20:01:15 2020
@@ -20,6 +20,7 @@
#include "propertiespalette_table.h"
#include "sccolorengine.h"
#include "scribus.h"
+#include "scribusapp.h"
#include "selection.h"
#include "tableborder.h"
#include "tablesideselector.h"
@@ -34,14 +35,24 @@
setupUi(this);
setSizePolicy( QSizePolicy(QSizePolicy::Maximum, QSizePolicy::Maximum));
- addBorderLineButton->setIcon(IconManager::instance().loadIcon("penciladd.png"));
- removeBorderLineButton->setIcon(IconManager::instance().loadIcon("pencilsub.png"));
+ iconSetChange();
labelTable->setBuddy(tableStyleCombo);
- buttonClearTableStyle->setIcon(IconManager::instance().loadIcon("16/edit-clear.png"));
labelCells->setBuddy(cellStyleCombo);
- buttonClearCellStyle->setIcon(IconManager::instance().loadIcon("16/edit-clear.png"));
+
+ connect(ScQApp, SIGNAL(iconSetChanged()), this, SLOT(iconSetChange()));
+
connect(tableStyleCombo, SIGNAL(newStyle(const QString&)), this, SLOT(setTableStyle(const QString&)));
connect(cellStyleCombo, SIGNAL(newStyle(const QString&)), this, SLOT(setCellStyle(const QString&)));
+}
+
+void PropertiesPalette_Table::iconSetChange()
+{
+ IconManager& iconManager = IconManager::instance();
+
+ addBorderLineButton->setIcon(iconManager.loadIcon("penciladd.png"));
+ removeBorderLineButton->setIcon(iconManager.loadIcon("pencilsub.png"));
+ buttonClearTableStyle->setIcon(iconManager.loadIcon("16/edit-clear.png"));
+ buttonClearCellStyle->setIcon(iconManager.loadIcon("16/edit-clear.png"));
}
void PropertiesPalette_Table::handleUpdateRequest(int updateFlags)
Modified: trunk/Scribus/scribus/ui/propertiespalette_table.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23474&path=/trunk/Scribus/scribus/ui/propertiespalette_table.h
==============================================================================
--- trunk/Scribus/scribus/ui/propertiespalette_table.h (original)
+++ trunk/Scribus/scribus/ui/propertiespalette_table.h Tue Feb 25 20:01:15 2020
@@ -55,6 +55,8 @@
void handleCellSelectionChanged();
/// Handles update requests from the main window.
void handleUpdateRequest(int updateFlags);
+ /// Handles icon set changes.
+ void iconSetChange();
/// Handles language changes.
void languageChange();
/// Handles unit changes.
Modified: trunk/Scribus/scribus/ui/propertiespalette_xyz.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23474&path=/trunk/Scribus/scribus/ui/propertiespalette_xyz.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/propertiespalette_xyz.cpp (original)
+++ trunk/Scribus/scribus/ui/propertiespalette_xyz.cpp Tue Feb 25 20:01:15 2020
@@ -31,6 +31,7 @@
#include "scribuscore.h"
#include "scraction.h"
+#include "scribusapp.h"
#include "scribusdoc.h"
#include "scribusview.h"
#include "selection.h"
@@ -45,8 +46,8 @@
PropertiesPalette_XYZ::PropertiesPalette_XYZ( QWidget* parent) : QWidget(parent)
{
- m_ScMW=nullptr;
- m_doc=nullptr;
+ m_ScMW = nullptr;
+ m_doc = nullptr;
m_haveDoc = false;
m_haveItem = false;
m_lineMode = false;
@@ -78,42 +79,21 @@
installSniffer(rotationSpin);
rotationLabel->setBuddy(rotationSpin);
- IconManager& im=IconManager::instance();
- levelUp->setIcon(im.loadIcon("16/go-up.png"));
- levelDown->setIcon(im.loadIcon("16/go-down.png"));
- levelTop->setIcon(im.loadIcon("16/go-top.png"));
- levelBottom->setIcon(im.loadIcon("16/go-bottom.png"));
levelLabel->setAlignment( Qt::AlignCenter );
- doGroup->setIcon(im.loadIcon("group.png"));
- doUnGroup->setIcon(im.loadIcon("ungroup.png"));
-
- flipH->setIcon(im.loadIcon("16/flip-object-horizontal.png"));
- flipH->setCheckable( true );
- flipV->setIcon(im.loadIcon("16/flip-object-vertical.png"));
- flipV->setCheckable( true );
+ flipH->setCheckable(true);
+ flipV->setCheckable(true);
- doLock->setCheckable( true );
- QIcon a = QIcon();
- a.addPixmap(im.loadPixmap("16/lock.png"), QIcon::Normal, QIcon::On);
- a.addPixmap(im.loadPixmap("16/lock-unlocked.png"), QIcon::Normal, QIcon::Off);
- doLock->setIcon(a);
-
- noPrint->setCheckable( true );
- QIcon a2 = QIcon();
- a2.addPixmap(im.loadPixmap("NoPrint.png"), QIcon::Normal, QIcon::On);
- a2.addPixmap(im.loadPixmap("16/document-print.png"), QIcon::Normal, QIcon::Off);
- noPrint->setIcon(a2);
-
- noResize->setCheckable( true );
- QIcon a3 = QIcon();
- a3.addPixmap(im.loadPixmap("framenoresize.png"), QIcon::Normal, QIcon::On);
- a3.addPixmap(im.loadPixmap("frameresize.png"), QIcon::Normal, QIcon::Off);
- noResize->setIcon(a3);
+ doLock->setCheckable(true);
+ noPrint->setCheckable(true);
+ noResize->setCheckable(true);
m_lineMode = false;
+ iconSetChange();
languageChange();
+
+ connect(ScQApp, SIGNAL(iconSetChanged()), this, SLOT(iconSetChange()));
connect(xposSpin, SIGNAL(valueChanged(double)), this, SLOT(handleNewX()));
connect(yposSpin, SIGNAL(valueChanged(double)), this, SLOT(handleNewY()));
@@ -1268,6 +1248,37 @@
QWidget::changeEvent(e);
}
+void PropertiesPalette_XYZ::iconSetChange()
+{
+ IconManager& im = IconManager::instance();
+
+ levelUp->setIcon(im.loadIcon("16/go-up.png"));
+ levelDown->setIcon(im.loadIcon("16/go-down.png"));
+ levelTop->setIcon(im.loadIcon("16/go-top.png"));
+ levelBottom->setIcon(im.loadIcon("16/go-bottom.png"));
+
+ doGroup->setIcon(im.loadIcon("group.png"));
+ doUnGroup->setIcon(im.loadIcon("ungroup.png"));
+
+ flipH->setIcon(im.loadIcon("16/flip-object-horizontal.png"));
+ flipV->setIcon(im.loadIcon("16/flip-object-vertical.png"));
+
+ QIcon a = QIcon();
+ a.addPixmap(im.loadPixmap("16/lock.png"), QIcon::Normal, QIcon::On);
+ a.addPixmap(im.loadPixmap("16/lock-unlocked.png"), QIcon::Normal, QIcon::Off);
+ doLock->setIcon(a);
+
+ QIcon a2 = QIcon();
+ a2.addPixmap(im.loadPixmap("NoPrint.png"), QIcon::Normal, QIcon::On);
+ a2.addPixmap(im.loadPixmap("16/document-print.png"), QIcon::Normal, QIcon::Off);
+ noPrint->setIcon(a2);
+
+ QIcon a3 = QIcon();
+ a3.addPixmap(im.loadPixmap("framenoresize.png"), QIcon::Normal, QIcon::On);
+ a3.addPixmap(im.loadPixmap("frameresize.png"), QIcon::Normal, QIcon::Off);
+ noResize->setIcon(a3);
+}
+
void PropertiesPalette_XYZ::languageChange()
{
setWindowTitle( tr("Properties"));
Modified: trunk/Scribus/scribus/ui/propertiespalette_xyz.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23474&path=/trunk/Scribus/scribus/ui/propertiespalette_xyz.h
==============================================================================
--- trunk/Scribus/scribus/ui/propertiespalette_xyz.h (original)
+++ trunk/Scribus/scribus/ui/propertiespalette_xyz.h Tue Feb 25 20:01:15 2020
@@ -53,6 +53,7 @@
void unsetDoc();
void unsetItem();
+ void iconSetChange();
void languageChange();
void unitChange();
Modified: trunk/Scribus/scribus/ui/propertywidget_advanced.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23474&path=/trunk/Scribus/scribus/ui/propertywidget_advanced.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/propertywidget_advanced.cpp (original)
+++ trunk/Scribus/scribus/ui/propertywidget_advanced.cpp Tue Feb 25 20:01:15 2020
@@ -11,6 +11,7 @@
#include "iconmanager.h"
#include "pageitem_table.h"
#include "scribus.h"
+#include "scribusapp.h"
#include "scribusdoc.h"
#include "selection.h"
#include "units.h"
@@ -30,14 +31,9 @@
layout()->setAlignment( Qt::AlignLeft );
textBase->setValue( 0 );
- textBaseLabel->setPixmap(IconManager::instance().loadPixmap("textbase.png"));
- trackingLabel->setPixmap(IconManager::instance().loadPixmap("textkern.png"));
scaleH->setValues(10, 400, 2, 100 );
- scaleHLabel->setPixmap(IconManager::instance().loadPixmap("textscaleh.png"));
-
scaleV->setValues(10, 400, 2, 100 );
- scaleVLabel->setPixmap(IconManager::instance().loadPixmap("textscalev.png"));
minWordTrackingLabel->setBuddy(minWordTrackingSpinBox);
normWordTrackingLabel->setBuddy(normWordTrackingSpinBox);
@@ -45,7 +41,10 @@
minGlyphExtensionLabel->setBuddy(minGlyphExtSpinBox);
maxGlyphExtensionLabel->setBuddy(maxGlyphExtSpinBox);
+ iconSetChange();
languageChange();
+
+ connect(ScQApp, SIGNAL(iconSetChanged()), this, SLOT(iconSetChange()));
}
void PropertyWidget_Advanced::setMainWindow(ScribusMainWindow *mw)
@@ -366,6 +365,15 @@
QWidget::changeEvent(e);
}
+void PropertyWidget_Advanced::iconSetChange()
+{
+ textBaseLabel->setPixmap(IconManager::instance().loadPixmap("textbase.png"));
+ trackingLabel->setPixmap(IconManager::instance().loadPixmap("textkern.png"));
+
+ scaleHLabel->setPixmap(IconManager::instance().loadPixmap("textscaleh.png"));
+ scaleVLabel->setPixmap(IconManager::instance().loadPixmap("textscalev.png"));
+}
+
void PropertyWidget_Advanced::languageChange()
{
retranslateUi(this);
Modified: trunk/Scribus/scribus/ui/propertywidget_advanced.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23474&path=/trunk/Scribus/scribus/ui/propertywidget_advanced.h
==============================================================================
--- trunk/Scribus/scribus/ui/propertywidget_advanced.h (original)
+++ trunk/Scribus/scribus/ui/propertywidget_advanced.h Tue Feb 25 20:01:15 2020
@@ -46,6 +46,7 @@
void handleSelectionChanged();
+ void iconSetChange();
void languageChange();
void unitChange() {};
Modified: trunk/Scribus/scribus/ui/propertywidget_pareffect.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23474&path=/trunk/Scribus/scribus/ui/propertywidget_pareffect.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/propertywidget_pareffect.cpp (original)
+++ trunk/Scribus/scribus/ui/propertywidget_pareffect.cpp Tue Feb 25 20:01:15 2020
@@ -15,6 +15,7 @@
#include "pageitem.h"
#include "pageitem_table.h"
#include "scribus.h"
+#include "scribusapp.h"
#include "scribusdoc.h"
#include "selection.h"
#include "ui/sctreewidget.h"
@@ -42,6 +43,8 @@
numLevelSpin->setMaximum(3);
dropCapLines->setMinimum(2);
dropCapLines->setMaximum(99);
+
+ connect(ScQApp, SIGNAL(iconSetChanged()), this, SLOT(iconSetChange()));
}
void PropertyWidget_ParEffect::setMainWindow(ScribusMainWindow* mw)
@@ -103,6 +106,12 @@
updateStyle(parStyle);
connectSignals();
}
+}
+
+void PropertyWidget_ParEffect::iconSetChange()
+{
+ IconManager& iconManager = IconManager::instance();
+ bulletCharTableButton->setIcon(iconManager.loadIcon("22/insert-table.png"));
}
void PropertyWidget_ParEffect::unitChange()
Modified: trunk/Scribus/scribus/ui/propertywidget_pareffect.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23474&path=/trunk/Scribus/scribus/ui/propertywidget_pareffect.h
==============================================================================
--- trunk/Scribus/scribus/ui/propertywidget_pareffect.h (original)
+++ trunk/Scribus/scribus/ui/propertywidget_pareffect.h Tue Feb 25 20:01:15 2020
@@ -51,6 +51,7 @@
void handleSelectionChanged();
void handleUpdateRequest(int);
+ void iconSetChange();
void languageChange();
void unitChange();
Modified: trunk/Scribus/scribus/ui/propertywidget_textcolor.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23474&path=/trunk/Scribus/scribus/ui/propertywidget_textcolor.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/propertywidget_textcolor.cpp (original)
+++ trunk/Scribus/scribus/ui/propertywidget_textcolor.cpp Tue Feb 25 20:01:15 2020
@@ -11,6 +11,7 @@
#include "pageitem_table.h"
#include "propertywidget_textcolor.h"
#include "scribus.h"
+#include "scribusapp.h"
#include "selection.h"
PropertyWidget_TextColor::PropertyWidget_TextColor(QWidget* parent) : QFrame(parent)
@@ -27,29 +28,26 @@
fillLayout->setAlignment( Qt::AlignLeft );
fillColor->setPixmapType(ColorCombo::fancyPixmaps);
- fillIcon->setPixmap(IconManager::instance().loadPixmap("16/color-fill.png"));
fillIcon->setScaledContents( false );
- fillShadeLabel->setPixmap(IconManager::instance().loadPixmap("shade.png"));
strokeLayout->setAlignment( Qt::AlignLeft );
strokeColor->setPixmapType(ColorCombo::fancyPixmaps);
- strokeIcon->setPixmap(IconManager::instance().loadPixmap("16/color-stroke.png"));
strokeIcon->setScaledContents( false );
- strokeShadeLabel->setPixmap(IconManager::instance().loadPixmap("shade.png"));
backLayout->setAlignment( Qt::AlignLeft );
backColor->setPixmapType(ColorCombo::fancyPixmaps);
- backIcon->setPixmap(IconManager::instance().loadPixmap("16/color-fill.png"));
backIcon->setScaledContents( false );
- backShadeLabel->setPixmap(IconManager::instance().loadPixmap("shade.png"));
effectsLayout->setAlignment( Qt::AlignLeft );
+ iconSetChange();
languageChange();
strokeIcon->setEnabled(false);
strokeColor->setEnabled(false);
strokeShade->setEnabled(false);
+
+ connect(ScQApp, SIGNAL(iconSetChanged()), this, SLOT(iconSetChange()));
}
void PropertyWidget_TextColor::setMainWindow(ScribusMainWindow *mw)
@@ -492,6 +490,20 @@
QWidget::changeEvent(e);
}
+void PropertyWidget_TextColor::iconSetChange()
+{
+ IconManager& iconManager = IconManager::instance();
+
+ fillIcon->setPixmap(iconManager.loadPixmap("16/color-fill.png"));
+ fillShadeLabel->setPixmap(iconManager.loadPixmap("shade.png"));
+
+ strokeIcon->setPixmap(iconManager.loadPixmap("16/color-stroke.png"));
+ strokeShadeLabel->setPixmap(iconManager.loadPixmap("shade.png"));
+
+ backIcon->setPixmap(iconManager.loadPixmap("16/color-fill.png"));
+ backShadeLabel->setPixmap(iconManager.loadPixmap("shade.png"));
+}
+
void PropertyWidget_TextColor::languageChange()
{
retranslateUi(this);
Modified: trunk/Scribus/scribus/ui/propertywidget_textcolor.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23474&path=/trunk/Scribus/scribus/ui/propertywidget_textcolor.h
==============================================================================
--- trunk/Scribus/scribus/ui/propertywidget_textcolor.h (original)
+++ trunk/Scribus/scribus/ui/propertywidget_textcolor.h Tue Feb 25 20:01:15 2020
@@ -44,6 +44,7 @@
void handleSelectionChanged();
void handleUpdateRequest(int);
+ void iconSetChange();
void languageChange();
void unitChange() {};
Modified: trunk/Scribus/scribus/ui/resourcemanager.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23474&path=/trunk/Scribus/scribus/ui/resourcemanager.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/resourcemanager.cpp (original)
+++ trunk/Scribus/scribus/ui/resourcemanager.cpp Tue Feb 25 20:01:15 2020
@@ -45,8 +45,6 @@
#include "third_party/zip/scribus_zip.h"
#include "util.h"
#include "util_file.h"
-
-extern ScribusQApp* ScQApp;
ResourceManager::ResourceManager(QWidget* parent)
{
Modified: trunk/Scribus/scribus/ui/scdockpalette.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23474&path=/trunk/Scribus/scribus/ui/scdockpalette.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/scdockpalette.cpp (original)
+++ trunk/Scribus/scribus/ui/scdockpalette.cpp Tue Feb 25 20:01:15 2020
@@ -62,8 +62,8 @@
QToolBox::tab { font-size: 10px; padding: 0px; margin: 0px; } \
");
}
- m_originalParent=parent;
- m_tempParent=nullptr;
+ m_originalParent = parent;
+ m_tempParent = nullptr;
setAllowedAreas(Qt::LeftDockWidgetArea | Qt::RightDockWidgetArea);
setWindowIcon(IconManager::instance().loadPixmap("AppIcon.png"));
setPrefsContext(prefsContext);
Modified: trunk/Scribus/scribus/ui/scrapbookpalette.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23474&path=/trunk/Scribus/scribus/ui/scrapbookpalette.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/scrapbookpalette.cpp (original)
+++ trunk/Scribus/scribus/ui/scrapbookpalette.cpp Tue Feb 25 20:01:15 2020
@@ -49,6 +49,7 @@
#include "scimage.h"
#include "scpaths.h"
#include "scpreview.h"
+#include "scribusapp.h"
#include "scribuscore.h"
#include "util.h"
#include "util_color.h"
@@ -716,7 +717,7 @@
}
/* This is the main Dialog-Class for the Scrapbook */
-Biblio::Biblio( QWidget* parent) : ScDockPalette(parent, "Sclib", nullptr)
+Biblio::Biblio(QWidget* parent) : ScDockPalette(parent, "Sclib", nullptr)
{
// resize( 230, 190 );
setObjectName(QString::fromLocal8Bit("Sclib"));
@@ -747,8 +748,7 @@
closeButton->setIconSize(QSize(16, 16));
configButton = new QToolButton(this);
configButton->setSizePolicy(QSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed));
- configButton->setIcon(IconManager::instance().loadPixmap("16/configure.png"));
- configButton->setIconSize(QSize(16, 16));
+
configMenue = new QMenu();
conf_HideDirs = configMenue->addAction( tr("Hide Directories"));
conf_HideDirs->setCheckable(true);
@@ -792,6 +792,8 @@
conf_HideImages->setChecked(m_prefs->getBool("hideImages", false));
conf_HideVectors->setChecked(m_prefs->getBool("hideVectors", false));
conf_OpenMode->setChecked(m_prefs->getBool("openMode", false));
+
+ connect(ScQApp, SIGNAL(iconSetChanged()), this, SLOT(iconSetChange()));
connect(newButton, SIGNAL(clicked()), this, SLOT(newLib()));
connect(upButton, SIGNAL(clicked()), this, SLOT(goOneDirUp()));
@@ -1992,6 +1994,26 @@
ScDockPalette::changeEvent(e);
}
+void Biblio::iconSetChange()
+{
+ IconManager& iconManager = IconManager::instance();
+
+ newButton->setIcon(iconManager.loadPixmap("16/document-new.png"));
+ newButton->setIconSize(QSize(16, 16));
+
+ upButton->setIcon(iconManager.loadPixmap("16/go-up.png"));
+ upButton->setIconSize(QSize(16, 16));
+
+ importButton->setIcon(iconManager.loadPixmap("compfile16.png"));
+ importButton->setIconSize(QSize(16, 16));
+
+ closeButton->setIcon(iconManager.loadPixmap("16/close.png"));
+ closeButton->setIconSize(QSize(16, 16));
+
+ configButton->setIcon(iconManager.loadPixmap("16/configure.png"));
+ configButton->setIconSize(QSize(16, 16));
+}
+
void Biblio::languageChange()
{
setWindowTitle( tr( "Scrapbook" ) );
Modified: trunk/Scribus/scribus/ui/scrapbookpalette.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23474&path=/trunk/Scribus/scribus/ui/scrapbookpalette.h
==============================================================================
--- trunk/Scribus/scribus/ui/scrapbookpalette.h (original)
+++ trunk/Scribus/scribus/ui/scrapbookpalette.h Tue Feb 25 20:01:15 2020
@@ -99,6 +99,7 @@
QListWidgetItem *actItem;
public slots:
+ void iconSetChange();
void languageChange();
void objFromFile(const QString& path, int testResult);
void objFromMenu(QString text);
Modified: trunk/Scribus/scribus/ui/smcellstylewidget.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23474&path=/trunk/Scribus/scribus/ui/smcellstylewidget.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/smcellstylewidget.cpp (original)
+++ trunk/Scribus/scribus/ui/smcellstylewidget.cpp Tue Feb 25 20:01:15 2020
@@ -9,6 +9,7 @@
#include "iconmanager.h"
#include "scribus.h"
+#include "scribusapp.h"
#include "smcellstylewidget.h"
SMCellStyleWidget::SMCellStyleWidget(QWidget *parent) :
@@ -16,10 +17,12 @@
{
setupUi(this);
- fillColorIcon->setPixmap(IconManager::instance().loadPixmap("16/color-fill.png"));
fillColor->setPixmapType(ColorCombo::fancyPixmaps);
fillColor->addItem(CommonStrings::tr_NoneColor);
- fillShadeLabel->setPixmap(IconManager::instance().loadPixmap("shade.png") );
+
+ iconSetChange();
+
+ connect(ScQApp, SIGNAL(iconSetChanged()), this, SLOT(iconSetChange()));
}
SMCellStyleWidget::~SMCellStyleWidget()
@@ -32,6 +35,25 @@
languageChange();
else
QWidget::changeEvent(e);
+}
+
+void SMCellStyleWidget::iconSetChange()
+{
+ IconManager& iconManager = IconManager::instance();
+ fillColorIcon->setPixmap(iconManager.loadPixmap("16/color-fill.png"));
+ fillShadeLabel->setPixmap(iconManager.loadPixmap("shade.png") );
+}
+
+void SMCellStyleWidget::languageChange()
+{
+ retranslateUi(this);
+
+ if (fillColor->count() > 0)
+ {
+ bool fillColorBlocked = fillColor->blockSignals(true);
+ fillColor->setItemText(0, CommonStrings::tr_NoneColor);
+ fillColor->blockSignals(fillColorBlocked);
+ }
}
void SMCellStyleWidget::handleUpdateRequest(int updateFlags)
@@ -151,18 +173,6 @@
fillColor->setCurrentText(s);
}
-void SMCellStyleWidget::languageChange()
-{
- retranslateUi(this);
-
- if (fillColor->count() > 0)
- {
- bool fillColorBlocked = fillColor->blockSignals(true);
- fillColor->setItemText(0, CommonStrings::tr_NoneColor);
- fillColor->blockSignals(fillColorBlocked);
- }
-}
-
void SMCellStyleWidget::fillFillColorCombo(ColorList &colors)
{
fillColor->clear();
Modified: trunk/Scribus/scribus/ui/smcellstylewidget.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23474&path=/trunk/Scribus/scribus/ui/smcellstylewidget.h
==============================================================================
--- trunk/Scribus/scribus/ui/smcellstylewidget.h (original)
+++ trunk/Scribus/scribus/ui/smcellstylewidget.h Tue Feb 25 20:01:15 2020
@@ -23,6 +23,7 @@
class SMCellStyleWidget : public QWidget, public Ui::SMCellStyleWidget
{
Q_OBJECT
+
public:
/// Constructor.
SMCellStyleWidget(QWidget *parent = 0);
@@ -72,6 +73,7 @@
private slots:
void handleUpdateRequest(int);
+ void iconSetChange();
};
#endif // SMCELLSTYLEWIDGET_H
Modified: trunk/Scribus/scribus/ui/smcstylewidget.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23474&path=/trunk/Scribus/scribus/ui/smcstylewidget.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/smcstylewidget.cpp (original)
+++ trunk/Scribus/scribus/ui/smcstylewidget.cpp Tue Feb 25 20:01:15 2020
@@ -11,6 +11,7 @@
#include "langmgr.h"
#include "prefsmanager.h"
#include "scribus.h"
+#include "scribusapp.h"
#include "smcstylewidget.h"
#include "util.h"
#include "units.h"
@@ -21,7 +22,47 @@
{
setupUi(this);
+ iconSetChange();
+
+ fillColor_->setPixmapType(ColorCombo::fancyPixmaps);
+ fillColor_->clear();
+ fillColor_->addItem(CommonStrings::tr_NoneColor);
+
+ strokeColor_->setPixmapType(ColorCombo::fancyPixmaps);
+ strokeColor_->clear();
+ strokeColor_->addItem(CommonStrings::tr_NoneColor);
+
+ backColor_->setPixmapType(ColorCombo::fancyPixmaps);
+ backColor_->clear();
+ backColor_->addItem(CommonStrings::tr_NoneColor);
+
+ StrokeIcon->setEnabled(false);
+ strokeShade_->setEnabled(false);
+ strokeColor_->setEnabled(false);
+ fontfeaturesSetting->resetFontFeatures();
+
+ hyphenCharLineEdit->setMaxLength(1);
+
+ connect(ScQApp, SIGNAL(iconSetChanged()), this, SLOT(iconSetChange()));
+
+ connect(effects_, SIGNAL(State(int)), this, SLOT(slotColorChange()));
+ connect(fontFace_, SIGNAL(fontSelected(QString)), this, SLOT(slotEnableFontFeatures(QString)));
+}
+
+void SMCStyleWidget::changeEvent(QEvent *e)
+{
+ if (e->type() == QEvent::LanguageChange)
+ {
+ languageChange();
+ }
+ else
+ QWidget::changeEvent(e);
+}
+
+void SMCStyleWidget::iconSetChange()
+{
IconManager& im = IconManager::instance();
+
fontSizeLabel_->setPixmap(im.loadPixmap("zeichen.png"));
trackingLabel_->setPixmap(im.loadPixmap("textkern.png"));
widthSpaceLabel->setPixmap(im.loadPixmap("spacewidth.png"));
@@ -34,38 +75,6 @@
strokeShadeLabel->setPixmap(im.loadPixmap("shade.png"));
backIcon->setPixmap(im.loadPixmap("16/color-fill.png"));
backShadeLabel->setPixmap(im.loadPixmap("shade.png"));
-
- fillColor_->setPixmapType(ColorCombo::fancyPixmaps);
- fillColor_->clear();
- fillColor_->addItem(CommonStrings::tr_NoneColor);
-
- strokeColor_->setPixmapType(ColorCombo::fancyPixmaps);
- strokeColor_->clear();
- strokeColor_->addItem(CommonStrings::tr_NoneColor);
-
- backColor_->setPixmapType(ColorCombo::fancyPixmaps);
- backColor_->clear();
- backColor_->addItem(CommonStrings::tr_NoneColor);
-
- StrokeIcon->setEnabled(false);
- strokeShade_->setEnabled(false);
- strokeColor_->setEnabled(false);
- fontfeaturesSetting->resetFontFeatures();
-
- hyphenCharLineEdit->setMaxLength(1);
-
- connect(effects_, SIGNAL(State(int)), this, SLOT(slotColorChange()));
- connect(fontFace_, SIGNAL(fontSelected(QString)), this, SLOT(slotEnableFontFeatures(QString)));
-}
-
-void SMCStyleWidget::changeEvent(QEvent *e)
-{
- if (e->type() == QEvent::LanguageChange)
- {
- languageChange();
- }
- else
- QWidget::changeEvent(e);
}
void SMCStyleWidget::languageChange()
Modified: trunk/Scribus/scribus/ui/smcstylewidget.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23474&path=/trunk/Scribus/scribus/ui/smcstylewidget.h
==============================================================================
--- trunk/Scribus/scribus/ui/smcstylewidget.h (original)
+++ trunk/Scribus/scribus/ui/smcstylewidget.h Tue Feb 25 20:01:15 2020
@@ -50,6 +50,7 @@
friend class SMCharacterStyle;
private slots:
+ void iconSetChange();
void slotColorChange();
void handleUpdateRequest(int);
void slotEnableFontFeatures(const QString& s);
Modified: trunk/Scribus/scribus/ui/smlinestylewidget.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23474&path=/trunk/Scribus/scribus/ui/smlinestylewidget.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/smlinestylewidget.cpp (original)
+++ trunk/Scribus/scribus/ui/smlinestylewidget.cpp Tue Feb 25 20:01:15 2020
@@ -10,11 +10,12 @@
#include "smlinestylewidget.h"
#include "colorcombo.h"
+#include "iconmanager.h"
#include "linecombo.h"
#include "sccolorengine.h"
+#include "scribusapp.h"
#include "scrspinbox.h"
#include "util_color.h"
-#include "iconmanager.h"
#include "util.h"
@@ -34,6 +35,8 @@
fillJoinCombo();
languageChange();
+
+ connect(ScQApp, SIGNAL(iconSetChanged()), this, SLOT(iconSetChange()));
}
void SMLineStyleWidget::changeEvent(QEvent *e)
@@ -42,6 +45,29 @@
{
languageChange();
}
+}
+
+void SMLineStyleWidget::iconSetChange()
+{
+ IconManager& iconManager = IconManager::instance();
+
+ addButton->setIcon(iconManager.loadIcon("penciladd.png"));
+ removeButton->setIcon(iconManager.loadIcon("pencilsub.png"));
+
+ int oldEndComboIndex = endCombo->currentIndex();
+ bool endComboBlocked = endCombo->blockSignals(true);
+
+ int oldJoinComboIndex = joinCombo->currentIndex();
+ bool joinComboBlocked = joinCombo->blockSignals(true);
+
+ fillEndCombo();
+ fillJoinCombo();
+
+ endCombo->setCurrentIndex(oldEndComboIndex);
+ endCombo->blockSignals(endComboBlocked);
+
+ joinCombo->setCurrentIndex(oldJoinComboIndex);
+ joinCombo->blockSignals(joinComboBlocked);
}
void SMLineStyleWidget::languageChange()
Modified: trunk/Scribus/scribus/ui/smlinestylewidget.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23474&path=/trunk/Scribus/scribus/ui/smlinestylewidget.h
==============================================================================
--- trunk/Scribus/scribus/ui/smlinestylewidget.h (original)
+++ trunk/Scribus/scribus/ui/smlinestylewidget.h Tue Feb 25 20:01:15 2020
@@ -21,6 +21,7 @@
class SMLineStyleWidget : public QWidget, Ui::SMLineStyleWidget
{
Q_OBJECT
+
public:
SMLineStyleWidget();
~SMLineStyleWidget();
@@ -28,7 +29,6 @@
virtual void changeEvent(QEvent *e);
void showStyle(const multiLine &lineStyle, ColorList &colorList, int subLine = 0);
- void languageChange();
void unitChange(int unitIndex);
private:
@@ -44,6 +44,8 @@
friend class SMLineStyle;
protected slots:
+ void iconSetChange();
+ void languageChange();
void slotEditNewLine(int i);
};
Modified: trunk/Scribus/scribus/ui/smpstylewidget.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23474&path=/trunk/Scribus/scribus/ui/smpstylewidget.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/smpstylewidget.cpp (original)
+++ trunk/Scribus/scribus/ui/smpstylewidget.cpp Tue Feb 25 20:01:15 2020
@@ -7,12 +7,14 @@
#include <QEvent>
+
+#include "iconmanager.h"
#include "numeration.h"
#include "smpstylewidget.h"
#include "scribus.h"
+#include "scribusapp.h"
#include "units.h"
#include "util.h"
-#include "iconmanager.h"
#include "ui/charselectenhanced.h"
static bool isEqual(double a, double b)
@@ -35,13 +37,11 @@
m_cstyles = cstyles;
setupUi(this);
+
//Not used yet
// optMarginCheckLeftProtruding->setVisible(false);
- lineSpacingLabel->setPixmap(IconManager::instance().loadPixmap("linespacing2.png"));
- spaceAboveLabel->setPixmap(IconManager::instance().loadPixmap("above.png") );
- spaceBelowLabel->setPixmap(IconManager::instance().loadPixmap("below.png") );
- backIcon->setPixmap(IconManager::instance().loadPixmap("16/color-fill.png"));
- backShadeLabel->setPixmap(IconManager::instance().loadPixmap("shade.png"));
+
+ iconSetChange();
backColor_->setPixmapType(ColorCombo::fancyPixmaps);
backColor_->clear();
@@ -66,7 +66,7 @@
parEffectOffset->setSuffix(unitGetSuffixFromIndex(0));
fillBulletStrEditCombo();
- bulletCharTableButton->setIcon(IconManager::instance().loadPixmap("22/insert-table.png"));
+
numStartSpin->setMinimum(1);
numStartSpin->setMaximum(9999);
numLevelSpin->setMinimum(1);
@@ -79,6 +79,8 @@
minGlyphExtSpin->setSuffix(unitGetSuffixFromIndex(SC_PERCENT));
maxGlyphExtSpin->setSuffix(unitGetSuffixFromIndex(SC_PERCENT));
+ connect(ScQApp, SIGNAL(iconSetChanged()), this, SLOT(iconSetChange()));
+
connect(optMarginDefaultButton, SIGNAL(clicked()), this, SLOT(slotDefaultOpticalMargins()));
if (m_Doc)
connect(m_Doc->scMW(), SIGNAL(UpdateRequest(int)), this , SLOT(handleUpdateRequest(int)));
@@ -98,6 +100,19 @@
}
else
QWidget::changeEvent(e);
+}
+
+void SMPStyleWidget::iconSetChange()
+{
+ IconManager& iconManager = IconManager::instance();
+
+ lineSpacingLabel->setPixmap(iconManager.loadPixmap("linespacing2.png"));
+ spaceAboveLabel->setPixmap(iconManager.loadPixmap("above.png") );
+ spaceBelowLabel->setPixmap(iconManager.loadPixmap("below.png") );
+ backIcon->setPixmap(iconManager.loadPixmap("16/color-fill.png"));
+ backShadeLabel->setPixmap(iconManager.loadPixmap("shade.png"));
+
+ bulletCharTableButton->setIcon(IconManager::instance().loadPixmap("22/insert-table.png"));
}
void SMPStyleWidget::languageChange()
Modified: trunk/Scribus/scribus/ui/smpstylewidget.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23474&path=/trunk/Scribus/scribus/ui/smpstylewidget.h
==============================================================================
--- trunk/Scribus/scribus/ui/smpstylewidget.h (original)
+++ trunk/Scribus/scribus/ui/smpstylewidget.h Tue Feb 25 20:01:15 2020
@@ -76,6 +76,7 @@
friend class SMParagraphStyle;
private slots:
+ void iconSetChange();
void slotLineSpacingModeChanged(int);
void slotDropCap(bool isOn);
void slotBullets(bool isOn);
Modified: trunk/Scribus/scribus/ui/smtablestylewidget.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23474&path=/trunk/Scribus/scribus/ui/smtablestylewidget.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/smtablestylewidget.cpp (original)
+++ trunk/Scribus/scribus/ui/smtablestylewidget.cpp Tue Feb 25 20:01:15 2020
@@ -9,6 +9,7 @@
#include "iconmanager.h"
#include "scribus.h"
+#include "scribusapp.h"
#include "smtablestylewidget.h"
SMTableStyleWidget::SMTableStyleWidget(QWidget *parent) :
@@ -16,10 +17,12 @@
{
setupUi(this);
- fillColorIcon->setPixmap(IconManager::instance().loadPixmap("16/color-fill.png"));
fillColor->setPixmapType(ColorCombo::fancyPixmaps);
fillColor->addItem(CommonStrings::tr_NoneColor);
- fillShadeLabel->setPixmap(IconManager::instance().loadPixmap("shade.png") );
+
+ iconSetChange();
+
+ connect(ScQApp, SIGNAL(iconSetChanged()), this, SLOT(iconSetChange()));
}
SMTableStyleWidget::~SMTableStyleWidget()
@@ -32,6 +35,12 @@
languageChange();
else
QWidget::changeEvent(e);
+}
+
+void SMTableStyleWidget::iconSetChange()
+{
+ fillColorIcon->setPixmap(IconManager::instance().loadPixmap("16/color-fill.png"));
+ fillShadeLabel->setPixmap(IconManager::instance().loadPixmap("shade.png") );
}
void SMTableStyleWidget::handleUpdateRequest(int updateFlags)
Modified: trunk/Scribus/scribus/ui/smtablestylewidget.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23474&path=/trunk/Scribus/scribus/ui/smtablestylewidget.h
==============================================================================
--- trunk/Scribus/scribus/ui/smtablestylewidget.h (original)
+++ trunk/Scribus/scribus/ui/smtablestylewidget.h Tue Feb 25 20:01:15 2020
@@ -72,6 +72,7 @@
private slots:
void handleUpdateRequest(int);
+ void iconSetChange();
};
#endif // SMTABLESTYLEWIDGET_H
Modified: trunk/Scribus/scribus/ui/smtabruler.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23474&path=/trunk/Scribus/scribus/ui/smtabruler.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/smtabruler.cpp (original)
+++ trunk/Scribus/scribus/ui/smtabruler.cpp Tue Feb 25 20:01:15 2020
@@ -382,7 +382,7 @@
double a, b, value;
int c;
first_->getValues(&a, &b, &c, &value);
- setFirstLineData(value / docUnitRatio);
+ setFirstLineData(value / m_docUnitRatio);
setFirstLine();
setLeftIndent();
setRightIndent();
@@ -400,7 +400,7 @@
double a, b, value;
int c;
left_->getValues(&a, &b, &c, &value);
- setLeftIndentData(value / docUnitRatio);
+ setLeftIndentData(value / m_docUnitRatio);
setLeftIndent();
// setFirstLine();
setRightIndent();
@@ -418,7 +418,7 @@
double a, b, value;
int c;
right_->getValues(&a, &b, &c, &value);
- setRightIndentData(value / docUnitRatio);
+ setRightIndentData(value / m_docUnitRatio);
setLeftIndent();
setFirstLine();
setRightIndent();
Modified: trunk/Scribus/scribus/ui/storyeditor.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23474&path=/trunk/Scribus/scribus/ui/storyeditor.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/storyeditor.cpp (original)
+++ trunk/Scribus/scribus/ui/storyeditor.cpp Tue Feb 25 20:01:15 2020
@@ -72,6 +72,7 @@
#include "scfonts.h"
#include "scplugin.h"
#include "scraction.h"
+#include "scribusapp.h"
#include "scribuscore.h"
#include "scribusview.h"
#include "scrspinbox.h"
@@ -1159,18 +1160,20 @@
FillIcon = new QLabel(this);
FillIcon->setPixmap(IconManager::instance().loadPixmap("16/color-fill.png"));
FillIcon->setScaledContents( false );
- fillIconAction=addWidget(FillIcon);
+ fillIconAction = addWidget(FillIcon);
fillIconAction->setVisible(true);
TxFill = new ColorCombo(false, this);
TxFill->setPixmapType(ColorCombo::smallPixmaps);
- txFillAction=addWidget(TxFill);
+ txFillAction = addWidget(TxFill);
txFillAction->setVisible(true);
PM2 = new ShadeButton(this);
- pm2Action=addWidget(PM2);
+ pm2Action = addWidget(PM2);
pm2Action->setVisible(true);
setCurrentDocument(doc);
//TxFill->listBox()->setMinimumWidth(TxFill->listBox()->maxItemWidth()+24);
+
+ connect(ScQApp, SIGNAL(iconSetChanged()), this, SLOT(iconSetChange()));
connect(TxFill, SIGNAL(activated(int)), this, SLOT(newShadeHandler()));
connect(PM2, SIGNAL(clicked()), this, SLOT(newShadeHandler()));
@@ -1182,11 +1185,15 @@
if (e->type() == QEvent::LanguageChange)
{
languageChange();
- }
- else
- QToolBar::changeEvent(e);
-}
-
+ return;
+ }
+ QToolBar::changeEvent(e);
+}
+
+void SToolBColorF::iconSetChange()
+{
+ FillIcon->setPixmap(IconManager::instance().loadPixmap("16/color-fill.png"));
+}
void SToolBColorF::languageChange()
{
@@ -1225,18 +1232,25 @@
{
StrokeIcon = new QLabel( "", this );
StrokeIcon->setPixmap(IconManager::instance().loadPixmap("16/color-stroke.png"));
- StrokeIcon->setScaledContents( false );
- strokeIconAction=addWidget(StrokeIcon);
+ StrokeIcon->setScaledContents(false);
+
+ strokeIconAction = addWidget(StrokeIcon);
strokeIconAction->setVisible(true);
+
TxStroke = new ColorCombo(false, this);
TxStroke->setPixmapType(ColorCombo::smallPixmaps);
- txStrokeAction=addWidget(TxStroke);
+ txStrokeAction = addWidget(TxStroke);
txStrokeAction->setVisible(true);
+
PM1 = new ShadeButton(this);
- pm1Action=addWidget(PM1);
+ pm1Action = addWidget(PM1);
pm1Action->setVisible(true);
+
setCurrentDocument(doc);
+
//TxStroke->listBox()->setMinimumWidth(TxStroke->listBox()->maxItemWidth()+24);
+
+ connect(ScQApp, SIGNAL(iconSetChanged()), this, SLOT(iconSetChange()));
connect(TxStroke, SIGNAL(activated(int)), this, SLOT(newShadeHandler()));
connect(PM1, SIGNAL(clicked()), this, SLOT(newShadeHandler()));
@@ -1248,9 +1262,15 @@
if (e->type() == QEvent::LanguageChange)
{
languageChange();
- }
- else
- QToolBar::changeEvent(e);
+ return;
+ }
+ QToolBar::changeEvent(e);
+}
+
+void SToolBColorS::iconSetChange()
+{
+ IconManager& iconManager = IconManager::instance();
+ StrokeIcon->setPixmap(iconManager.loadPixmap("16/color-stroke.png"));
}
void SToolBColorS::languageChange()
@@ -1289,18 +1309,22 @@
SToolBStyle::SToolBStyle(QMainWindow* parent) : QToolBar( tr("Character Settings"), parent)
{
SeStyle = new StyleSelect(this);
- seStyleAction=addWidget(SeStyle);
+ seStyleAction = addWidget(SeStyle);
seStyleAction->setVisible(true);
+
trackingLabel = new QLabel( this );
trackingLabel->setText("");
trackingLabel->setPixmap(IconManager::instance().loadPixmap("textkern.png"));
- trackingLabelAction=addWidget(trackingLabel);
+ trackingLabelAction = addWidget(trackingLabel);
trackingLabelAction->setVisible(true);
+
Extra = new ScrSpinBox( this, SC_PERCENT );
Extra->setValues( -300, 300, 2, 0);
Extra->setSuffix( unitGetSuffixFromIndex(SC_PERCENT) );
extraAction=addWidget(Extra);
extraAction->setVisible(true);
+
+ connect(ScQApp, SIGNAL(iconSetChanged()), this, SLOT(iconSetChange()));
connect(SeStyle, SIGNAL(State(int)), this, SIGNAL(newStyle(int)));
connect(Extra, SIGNAL(valueChanged(double)), this, SLOT(newKernHandler()));
@@ -1323,6 +1347,12 @@
}
else
QToolBar::changeEvent(e);
+}
+
+void SToolBStyle::iconSetChange()
+{
+ IconManager& iconManager = IconManager::instance();
+ trackingLabel->setPixmap(iconManager.loadPixmap("textkern.png"));
}
void SToolBStyle::languageChange()
@@ -1467,30 +1497,39 @@
Fonts->setMaximumSize(190, 30);
fontsAction=addWidget(Fonts);
fontsAction->setVisible(true);
+
Size = new ScrSpinBox( 0.5, 2048, this, SC_POINTS );
PrefsManager& prefsManager = PrefsManager::instance();
Size->setSuffix( unitGetSuffixFromIndex(SC_POINTS) );
Size->setValue(prefsManager.appPrefs.itemToolPrefs.textSize / 10.0);
- sizeAction=addWidget(Size);
+
+ sizeAction = addWidget(Size);
sizeAction->setVisible(true);
+
lblScaleTxtH = new QLabel("", this);
lblScaleTxtH->setPixmap(IconManager::instance().loadPixmap("textscaleh.png"));
- scaleTxtHAction=addWidget(lblScaleTxtH);
+ scaleTxtHAction = addWidget(lblScaleTxtH);
scaleTxtHAction->setVisible(true);
+
charScaleH = new ScrSpinBox( 10, 400, this, SC_PERCENT );
charScaleH->setValue( 100 );
charScaleH->setSuffix( unitGetSuffixFromIndex(SC_PERCENT) );
- chScaleHAction=addWidget(charScaleH);
+
+ chScaleHAction = addWidget(charScaleH);
chScaleHAction->setVisible(true);
+
lblScaleTxtV = new QLabel("", this);
lblScaleTxtV->setPixmap(IconManager::instance().loadPixmap("textscalev.png"));
- scaleTxtVAction=addWidget(lblScaleTxtV);
+
+ scaleTxtVAction = addWidget(lblScaleTxtV);
scaleTxtVAction->setVisible(true);
charScaleV = new ScrSpinBox( 10, 400, this, SC_PERCENT );
charScaleV->setValue( 100 );
charScaleV->setSuffix( unitGetSuffixFromIndex(SC_PERCENT) );
- chScaleVAction=addWidget(charScaleV);
+ chScaleVAction = addWidget(charScaleV);
chScaleVAction->setVisible(true);
+
+ connect(ScQApp, SIGNAL(iconSetChanged()), this, SLOT(iconSetChange()));
connect(charScaleH, SIGNAL(valueChanged(double)), this, SIGNAL(newScaleH(double)));
connect(charScaleV, SIGNAL(valueChanged(double)), this, SIGNAL(newScaleV(double)));
@@ -1508,6 +1547,13 @@
}
else
QToolBar::changeEvent(e);
+}
+
+void SToolBFont::iconSetChange()
+{
+ IconManager& iconManager = IconManager::instance();
+ lblScaleTxtH->setPixmap(iconManager.loadPixmap("textscaleh.png"));
+ lblScaleTxtV->setPixmap(iconManager.loadPixmap("textscalev.png"));
}
void SToolBFont::languageChange()
@@ -1598,6 +1644,8 @@
Editor->setFocus();
Editor->setColor(false);
loadPrefs();
+
+ connect(ScQApp, SIGNAL(iconSetChanged()), this, SLOT(iconSetChange()));
}
StoryEditor::~StoryEditor()
@@ -1693,13 +1741,13 @@
{
IconManager& im = IconManager::instance();
//File Menu
- seActions.insert("fileNew", new ScrAction(im.loadPixmap("16/document-new.png"), im.loadPixmap("22/document-new.png"), "", Qt::CTRL+Qt::Key_N, this));
- seActions.insert("fileRevert", new ScrAction(im.loadPixmap("reload16.png"), im.loadPixmap("reload.png"), "", QKeySequence(), this));
- seActions.insert("fileSaveToFile", new ScrAction(im.loadPixmap("16/document-save.png"), im.loadPixmap("22/document-save.png"), "", QKeySequence(), this));
- seActions.insert("fileLoadFromFile", new ScrAction(im.loadPixmap("16/document-open.png"), im.loadPixmap("22/document-open.png"), "", QKeySequence(), this));
+ seActions.insert("fileNew", new ScrAction("16/document-new.png", "22/document-new.png", "", Qt::CTRL+Qt::Key_N, this));
+ seActions.insert("fileRevert", new ScrAction("reload16.png", "reload.png", "", QKeySequence(), this));
+ seActions.insert("fileSaveToFile", new ScrAction("16/document-save.png", "22/document-save.png", "", QKeySequence(), this));
+ seActions.insert("fileLoadFromFile", new ScrAction("16/document-open.png", "22/document-open.png", "", QKeySequence(), this));
seActions.insert("fileSaveDocument", new ScrAction("", Qt::CTRL+Qt::Key_S, this));
- seActions.insert("fileUpdateAndExit", new ScrAction(im.loadPixmap("ok.png"), im.loadPixmap("ok22.png"), "", Qt::CTRL+Qt::Key_W, this));
- seActions.insert("fileExit", new ScrAction(im.loadPixmap("exit.png"), im.loadPixmap("exit22.png"), "", QKeySequence(), this));
+ seActions.insert("fileUpdateAndExit", new ScrAction("ok.png", "ok22.png", "", Qt::CTRL+Qt::Key_W, this));
+ seActions.insert("fileExit", new ScrAction("exit.png", "exit22.png", "", QKeySequence(), this));
connect( seActions["fileNew"], SIGNAL(triggered()), this, SLOT(Do_new()) );
connect( seActions["fileRevert"], SIGNAL(triggered()), this, SLOT(slotFileRevert()) );
@@ -1710,15 +1758,15 @@
connect( seActions["fileExit"], SIGNAL(triggered()), this, SLOT(Do_leave()) );
//Edit Menu
- seActions.insert("editCut", new ScrAction(im.loadPixmap("16/edit-cut.png"), QPixmap(), "", Qt::CTRL+Qt::Key_X, this));
- seActions.insert("editCopy", new ScrAction(im.loadPixmap("16/edit-copy.png"), QPixmap(), "", Qt::CTRL+Qt::Key_C, this));
- seActions.insert("editPaste", new ScrAction(im.loadPixmap("16/edit-paste.png"), QPixmap(), "", Qt::CTRL+Qt::Key_V, this));
- seActions.insert("editClear", new ScrAction(im.loadPixmap("16/edit-delete.png"), QPixmap(), "", Qt::Key_Delete, this));
- seActions.insert("editSelectAll", new ScrAction(im.loadPixmap("16/edit-select-all.png"), QPixmap(), "", Qt::CTRL+Qt::Key_A, this));
- seActions.insert("editSearchReplace", new ScrAction(im.loadPixmap("16/edit-find-replace.png"), QPixmap(), "", Qt::CTRL+Qt::Key_F, this));
+ seActions.insert("editCut", new ScrAction("16/edit-cut.png", QString(), "", Qt::CTRL+Qt::Key_X, this));
+ seActions.insert("editCopy", new ScrAction("16/edit-copy.png", QString(), "", Qt::CTRL+Qt::Key_C, this));
+ seActions.insert("editPaste", new ScrAction("16/edit-paste.png", QString(), "", Qt::CTRL+Qt::Key_V, this));
+ seActions.insert("editClear", new ScrAction("16/edit-delete.png", QString(), "", Qt::Key_Delete, this));
+ seActions.insert("editSelectAll", new ScrAction("16/edit-select-all.png", QString(), "", Qt::CTRL+Qt::Key_A, this));
+ seActions.insert("editSearchReplace", new ScrAction("16/edit-find-replace.png", QString(), "", Qt::CTRL+Qt::Key_F, this));
//seActions.insert("editEditStyle", new ScrAction("", QKeySequence(), this));
seActions.insert("editFontPreview", new ScrAction("", QKeySequence(), this));
- seActions.insert("editUpdateFrame", new ScrAction(im.loadPixmap("compfile16.png"),im.loadPixmap("compfile.png"), "", Qt::CTRL+Qt::Key_U, this));
+ seActions.insert("editUpdateFrame", new ScrAction("compfile16.png", "compfile.png", "", Qt::CTRL+Qt::Key_U, this));
connect( seActions["editCut"], SIGNAL(triggered()), this, SLOT(Do_cut()) );
connect( seActions["editCopy"], SIGNAL(triggered()), this, SLOT(Do_copy()) );
@@ -1731,9 +1779,9 @@
connect( seActions["editUpdateFrame"], SIGNAL(triggered()), this, SLOT(updateTextFrame()) );
//Insert Menu
- seActions.insert("insertGlyph", new ScrAction(QPixmap(), QPixmap(), "", QKeySequence(), this));
+ seActions.insert("insertGlyph", new ScrAction(QString(), QString(), "", QKeySequence(), this));
connect( seActions["insertGlyph"], SIGNAL(triggered()), this, SLOT(Do_insSp()) );
- seActions.insert("insertSampleText", new ScrAction(QPixmap(), QPixmap(), "", QKeySequence(), this));
+ seActions.insert("insertSampleText", new ScrAction(QString(), QString(), "", QKeySequence(), this));
connect(seActions["insertSampleText"], SIGNAL(triggered()), this, SLOT(insertSampleText()));
//Settings Menu
@@ -2036,6 +2084,15 @@
QWidget::changeEvent(e);
}
+void StoryEditor::iconSetChange()
+{
+ IconManager& iconManager = IconManager::instance();
+#ifdef Q_OS_MAC
+ noIcon = iconManager.loadPixmap("noicon.png");
+#endif
+ setWindowIcon(iconManager.loadPixmap("AppIcon.png"));
+}
+
void StoryEditor::languageChange()
{
setWindowTitle( tr( "Story Editor" ) );
Modified: trunk/Scribus/scribus/ui/storyeditor.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23474&path=/trunk/Scribus/scribus/ui/storyeditor.h
==============================================================================
--- trunk/Scribus/scribus/ui/storyeditor.h (original)
+++ trunk/Scribus/scribus/ui/storyeditor.h Tue Feb 25 20:01:15 2020
@@ -250,6 +250,7 @@
void SetColor(int c);
void SetShade(double s);
void newShadeHandler();
+ void iconSetChange();
void languageChange();
signals:
@@ -279,6 +280,7 @@
void SetColor(int c);
void SetShade(double s);
void newShadeHandler();
+ void iconSetChange();
void languageChange();
signals:
@@ -314,6 +316,7 @@
void setOutline(double o);
void SetStyle(int s);
void SetKern(double k);
+ void iconSetChange();
void languageChange();
signals:
@@ -392,6 +395,7 @@
QAction* scaleTxtVAction;
private slots:
+ void iconSetChange();
void languageChange();
};
@@ -495,6 +499,8 @@
void LoadTextFile();
void SaveTextFile();
void setSmart(bool);
+
+ void iconSetChange();
void languageChange();
void specialActionKeyEvent(int unicodevalue);
Modified: trunk/Scribus/scribus/ui/stylemanager.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23474&path=/trunk/Scribus/scribus/ui/stylemanager.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/stylemanager.cpp (original)
+++ trunk/Scribus/scribus/ui/stylemanager.cpp Tue Feb 25 20:01:15 2020
@@ -923,7 +923,7 @@
if (m_styleActions.contains(key))
continue;
- m_styleActions[key] = new ScrAction(ScrAction::DataQString, QPixmap(), QPixmap(), tr("&Apply"), shortcutValue, m_doc->view(), key);
+ m_styleActions[key] = new ScrAction(ScrAction::DataQString, QString(), QString(), tr("&Apply"), shortcutValue, m_doc->view(), key);
connect(m_styleActions[key], SIGNAL(triggeredData(QString)), this, SLOT(slotApplyStyle(QString)));
}
}
@@ -1081,7 +1081,7 @@
{
ScrAction *a = m_styleActions[oldKey];
disconnect(a, SIGNAL(triggeredData(QString)), this, SLOT(slotApplyStyle(QString)));
- ScrAction *b = new ScrAction(ScrAction::DataQString, QPixmap(), QPixmap(), tr("&Apply"),
+ ScrAction *b = new ScrAction(ScrAction::DataQString, QString(), QString(), tr("&Apply"),
a->shortcut(), m_doc->view(), newKey);
m_styleActions.remove(oldKey);
if (m_selectedStyleAction == a)
@@ -1119,7 +1119,7 @@
m_styleActions[key]->setShortcut(shortcut);
else
{
- m_styleActions[key] = new ScrAction(ScrAction::DataQString, QPixmap(), QPixmap(), tr("&Apply"), shortcut, m_doc->view(), key);
+ m_styleActions[key] = new ScrAction(ScrAction::DataQString, QString(), QString(), tr("&Apply"), shortcut, m_doc->view(), key);
connect(m_styleActions[key], SIGNAL(triggeredData(QString)), this, SLOT(slotApplyStyle(QString)));
}
Modified: trunk/Scribus/scribus/ui/styleselect.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23474&path=/trunk/Scribus/scribus/ui/styleselect.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/styleselect.cpp (original)
+++ trunk/Scribus/scribus/ui/styleselect.cpp Tue Feb 25 20:01:15 2020
@@ -7,9 +7,9 @@
#include <QEvent>
+#include "iconmanager.h"
+#include "scribusapp.h"
#include "styleselect.h"
-#include "iconmanager.h"
-
StrikeValues::StrikeValues( QWidget* parent ) : QFrame( parent )
{
@@ -236,10 +236,9 @@
outlineButton->setMaximumSize(s);
shadowButton->setMaximumSize(s);
-
languageChange();
-
+ connect(ScQApp, SIGNAL(iconSetChanged()), this, SLOT(iconSetChange()));
connect(allcapsButton, SIGNAL(clicked()), this, SLOT(setTypeStyle()));
connect(smallcapsButton, SIGNAL(clicked()), this, SLOT(setTypeStyle()));
@@ -262,6 +261,41 @@
}
else
QWidget::changeEvent(e);
+}
+
+void StyleSelect::iconSetChange()
+{
+ IconManager& im = IconManager::instance();
+
+ underlineButton->setIcon(im.loadIcon("unter.png"));
+ underlineWordButton->setIcon(im.loadIcon("wordsOnly.png"));
+ subscriptButton->setIcon(im.loadIcon("tief.png"));
+ superscriptButton->setIcon(im.loadIcon("hoch.png"));
+ allcapsButton->setIcon(im.loadIcon("AllCaps.png"));
+ smallcapsButton->setIcon(im.loadIcon("kapital.png"));
+ strikeoutButton->setIcon(im.loadIcon("strike.png"));
+ outlineButton->setIcon(im.loadIcon("outlined.png"));
+ shadowButton->setIcon(im.loadIcon("shadow.png"));
+
+ QSize s(24,24);
+ underlineButton->setMinimumSize(s);
+ underlineWordButton->setMinimumSize(s);
+ subscriptButton->setMinimumSize(s);
+ superscriptButton->setMinimumSize(s);
+ smallcapsButton->setMinimumSize(s);
+ allcapsButton->setMinimumSize(s);
+ strikeoutButton->setMinimumSize(s);
+ outlineButton->setMinimumSize(s);
+ shadowButton->setMinimumSize(s);
+ underlineButton->setMaximumSize(s);
+ underlineWordButton->setMaximumSize(s);
+ subscriptButton->setMaximumSize(s);
+ superscriptButton->setMaximumSize(s);
+ smallcapsButton->setMaximumSize(s);
+ allcapsButton->setMaximumSize(s);
+ strikeoutButton->setMaximumSize(s);
+ outlineButton->setMaximumSize(s);
+ shadowButton->setMaximumSize(s);
}
void StyleSelect::languageChange()
Modified: trunk/Scribus/scribus/ui/styleselect.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23474&path=/trunk/Scribus/scribus/ui/styleselect.h
==============================================================================
--- trunk/Scribus/scribus/ui/styleselect.h (original)
+++ trunk/Scribus/scribus/ui/styleselect.h Tue Feb 25 20:01:15 2020
@@ -119,6 +119,7 @@
StrikeValues* StrikeVal;
public slots:
+ void iconSetChange();
void languageChange();
private slots:
Modified: trunk/Scribus/scribus/ui/tabruler.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23474&path=/trunk/Scribus/scribus/ui/tabruler.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/tabruler.cpp (original)
+++ trunk/Scribus/scribus/ui/tabruler.cpp Tue Feb 25 20:01:15 2020
@@ -24,10 +24,11 @@
#include <QVariant>
#include "commonstrings.h"
-#include "units.h"
+#include "iconmanager.h"
+#include "scribusapp.h"
#include "scribusstructs.h"
#include "scrspinbox.h"
-#include "iconmanager.h"
+#include "units.h"
#include "util.h"
RulerT::RulerT(QWidget *pa, int ein, const QList<ParagraphStyle::TabRecord>& Tabs, bool ind, double wid) : QWidget(pa),
@@ -500,7 +501,7 @@
leftIndentData(nullptr),
rightIndentData(nullptr)
{
- docUnitRatio=unitGetRatioFromIndex(dEin);
+ m_docUnitRatio=unitGetRatioFromIndex(dEin);
double ww = (wid < 0) ? 4000 : wid;
tabrulerLayout = new QVBoxLayout( this );
tabrulerLayout->setMargin(0);
@@ -534,7 +535,7 @@
typeCombo->addItem( tr( "Comma" ) );
typeCombo->addItem( tr( "Center" ) );
layout1->addWidget( typeCombo );
- tabData = new ScrSpinBox( 0, ww / docUnitRatio, this, dEin );
+ tabData = new ScrSpinBox( 0, ww / m_docUnitRatio, this, dEin );
tabData->setValue(0);
positionLabel = new QLabel( tr("&Position:"), this );
positionLabel->setBuddy(tabData);
@@ -561,14 +562,14 @@
indentLayout->setSpacing(5);
if (haveFirst)
{
- firstLineData = new ScrSpinBox( -3000, ww / docUnitRatio, this, dEin);
+ firstLineData = new ScrSpinBox( -3000, ww / m_docUnitRatio, this, dEin);
firstLineData->setValue(0);
firstLineLabel = new QLabel(this);
firstLineLabel->setText("");
firstLineLabel->setPixmap(IconManager::instance().loadPixmap("firstline.png"));
indentLayout->addWidget( firstLineLabel );
indentLayout->addWidget( firstLineData );
- leftIndentData = new ScrSpinBox( 0, ww / docUnitRatio, this, dEin );
+ leftIndentData = new ScrSpinBox( 0, ww / m_docUnitRatio, this, dEin );
leftIndentData->setValue(0);
leftIndentLabel = new QLabel(this);
leftIndentLabel->setText("");
@@ -579,7 +580,7 @@
rightIndentLabel = new QLabel(this);
rightIndentLabel->setText("");
rightIndentLabel->setPixmap(IconManager::instance().loadPixmap("rightindent.png"));
- rightIndentData = new ScrSpinBox(0, ww / docUnitRatio, this, dEin);
+ rightIndentData = new ScrSpinBox(0, ww / m_docUnitRatio, this, dEin);
rightIndentData->setValue(0);
indentLayout->addWidget(rightIndentLabel);
indentLayout->addWidget(rightIndentData);
@@ -612,6 +613,7 @@
clearButton->setEnabled(false);
clearOneButton->setEnabled(false);
resize( minimumSizeHint() );
+
connect(rulerScrollL, SIGNAL(clicked()), ruler, SLOT(decreaseOffset()));
connect(rulerScrollR, SIGNAL(clicked()), ruler, SLOT(increaseOffset()));
connect(rulerScrollL, SIGNAL(released()), this, SLOT(resetOFfL()));
@@ -651,6 +653,7 @@
}
clearButton->setToolTip( tr( "Delete all Tabulators" ) );
clearOneButton->setToolTip( tr("Delete selected Tabulator"));
+
QString ein = unitGetSuffixFromIndex(dEin);
if (dEin == 2)
{
@@ -669,7 +672,9 @@
rightIndentData->setSuffix(ein);
}
tabData->setSuffix(ein);
- haveF = haveFirst;
+ m_haveFirst = haveFirst;
+
+ connect(ScQApp, SIGNAL(iconSetChanged()), this, SLOT(iconSetChange()));
}
void Tabruler::changeEvent(QEvent *e)
@@ -680,6 +685,20 @@
return;
}
QWidget::changeEvent(e);
+}
+
+void Tabruler::iconSetChange()
+{
+ IconManager& iconManager = IconManager::instance();
+
+ if (firstLineLabel)
+ firstLineLabel->setPixmap(iconManager.loadPixmap("firstline.png"));
+
+ if (leftIndentLabel)
+ leftIndentLabel->setPixmap(iconManager.loadPixmap("leftindent.png"));
+
+ if (rightIndentLabel)
+ rightIndentLabel->setPixmap(iconManager.loadPixmap("rightindent.png"));
}
void Tabruler::languageChange()
@@ -717,7 +736,7 @@
typeCombo->setToolTip( tr( "Type/Orientation of Tab" ) );
tabData->setToolTip( tr( "Position of Tab" ) );
- if (haveF)
+ if (m_haveFirst)
{
firstLineData->setToolTip( tr( "Indentation for first line of the paragraph" ) );
leftIndentData->setToolTip( tr( "Indentation from the left for the whole paragraph" ) );
@@ -730,7 +749,7 @@
clearOneButton->setToolTip( tr("Delete selected Tabulator"));
QString unitSuffix = unitGetSuffixFromIndex(tabData->unitIndex());
- if (haveF)
+ if (m_haveFirst)
{
firstLineData->setSuffix(unitSuffix);
leftIndentData->setSuffix(unitSuffix);
@@ -741,9 +760,9 @@
void Tabruler::setTabs(const QList<ParagraphStyle::TabRecord>& Tabs, int dEin)
{
- docUnitRatio=unitGetRatioFromIndex(dEin);
+ m_docUnitRatio = unitGetRatioFromIndex(dEin);
tabData->setNewUnit(dEin);
- if (haveF)
+ if (m_haveFirst)
{
firstLineData->setNewUnit(dEin);
leftIndentData->setNewUnit(dEin);
@@ -916,7 +935,7 @@
void Tabruler::setTabData(double t)
{
tabData->blockSignals(true);
- tabData->setValue(t * docUnitRatio);
+ tabData->setValue(t * m_docUnitRatio);
tabData->blockSignals(false);
if (!ruler->mousePressed)
{
@@ -927,7 +946,7 @@
void Tabruler::setTab()
{
- ruler->moveTab(tabData->value() / docUnitRatio);
+ ruler->moveTab(tabData->value() / m_docUnitRatio);
emit tabrulerChanged();
emit tabsChanged();
}
@@ -935,7 +954,7 @@
void Tabruler::setFirstLineData(double t)
{
// firstLineData->blockSignals(true);
- firstLineData->setValue(t * docUnitRatio);
+ firstLineData->setValue(t * m_docUnitRatio);
// firstLineData->blockSignals(false);
if (!ruler->mousePressed)
{
@@ -949,7 +968,7 @@
void Tabruler::setFirstLine()
{
- ruler->moveFirstLine(firstLineData->value() / docUnitRatio);
+ ruler->moveFirstLine(firstLineData->value() / m_docUnitRatio);
emit tabrulerChanged();
double a, b, value;
int c;
@@ -960,7 +979,7 @@
void Tabruler::setLeftIndentData(double t)
{
// leftIndentData->blockSignals(true);
- leftIndentData->setValue(t * docUnitRatio);
+ leftIndentData->setValue(t * m_docUnitRatio);
// leftIndentData->blockSignals(false);
if (!ruler->mousePressed)
{
@@ -974,7 +993,7 @@
void Tabruler::setLeftIndent()
{
- ruler->moveLeftIndent(leftIndentData->value() / docUnitRatio);
+ ruler->moveLeftIndent(leftIndentData->value() / m_docUnitRatio);
emit tabrulerChanged();
double a, b, value;
int c;
@@ -989,18 +1008,18 @@
double Tabruler::getFirstLine()
{
- return firstLineData->value() / docUnitRatio;
+ return firstLineData->value() / m_docUnitRatio;
}
double Tabruler::getLeftIndent()
{
- return leftIndentData->value() / docUnitRatio;
+ return leftIndentData->value() / m_docUnitRatio;
}
void Tabruler::setRightIndentData(double t)
{
rightIndentData->blockSignals(true);
- rightIndentData->setValue(t * docUnitRatio);
+ rightIndentData->setValue(t * m_docUnitRatio);
rightIndentData->blockSignals(false);
if (!ruler->mousePressed)
{
@@ -1023,7 +1042,7 @@
double Tabruler::getRightIndent()
{
- return rightIndentData->value() / docUnitRatio;
+ return rightIndentData->value() / m_docUnitRatio;
}
void Tabruler::slotMouseReleased()
Modified: trunk/Scribus/scribus/ui/tabruler.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23474&path=/trunk/Scribus/scribus/ui/tabruler.h
==============================================================================
--- trunk/Scribus/scribus/ui/tabruler.h (original)
+++ trunk/Scribus/scribus/ui/tabruler.h Tue Feb 25 20:01:15 2020
@@ -96,11 +96,9 @@
virtual void changeEvent(QEvent *e);
- void languageChange();
virtual void setTabs(const QList<ParagraphStyle::TabRecord>& Tabs, int dEin);
QList<ParagraphStyle::TabRecord> getTabVals();
- bool haveF;
double getFirstLine();
double getLeftIndent();
double getRightIndent();
@@ -142,31 +140,35 @@
void mouseReleased();
protected:
- QVBoxLayout* tabrulerLayout;
- QHBoxLayout* layout2;
- QHBoxLayout* layout1;
- QHBoxLayout* indentLayout;
-// QVBoxLayout* layout3;
- QHBoxLayout* layout4;
- QComboBox* typeCombo;
- QComboBox* tabFillCombo;
- QLabel* tabFillComboT;
- RulerT* ruler;
- QToolButton* rulerScrollL;
- QToolButton* rulerScrollR;
- QLabel* positionLabel;
- QLabel* firstLineLabel;
- QLabel* leftIndentLabel;
- QLabel* rightIndentLabel;
- ScrSpinBox* tabData;
- ScrSpinBox* firstLineData;
- ScrSpinBox* leftIndentData;
- ScrSpinBox* rightIndentData;
- QPushButton* clearButton;
- QPushButton* clearOneButton;
+ QVBoxLayout* tabrulerLayout { nullptr };
+ QHBoxLayout* layout2 { nullptr };
+ QHBoxLayout* layout1 { nullptr };
+ QHBoxLayout* indentLayout { nullptr };
+// QVBoxLayout* layout3 { nullptr };
+ QHBoxLayout* layout4 { nullptr };
+ QComboBox* typeCombo { nullptr };
+ QComboBox* tabFillCombo { nullptr };
+ QLabel* tabFillComboT { nullptr };
+ RulerT* ruler { nullptr };
+ QToolButton* rulerScrollL { nullptr };
+ QToolButton* rulerScrollR { nullptr };
+ QLabel* positionLabel { nullptr };
+ QLabel* firstLineLabel { nullptr };
+ QLabel* leftIndentLabel { nullptr };
+ QLabel* rightIndentLabel { nullptr };
+ ScrSpinBox* tabData { nullptr };
+ ScrSpinBox* firstLineData { nullptr };
+ ScrSpinBox* leftIndentData { nullptr };
+ ScrSpinBox* rightIndentData { nullptr };
+ QPushButton* clearButton { nullptr };
+ QPushButton* clearOneButton { nullptr };
- double docUnitRatio;
+ bool m_haveFirst;
+ double m_docUnitRatio;
+
protected slots:
+ void iconSetChange();
+ void languageChange();
void slotMouseReleased();
};
Modified: trunk/Scribus/scribus/util_color.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23474&path=/trunk/Scribus/scribus/util_color.cpp
==============================================================================
--- trunk/Scribus/scribus/util_color.cpp (original)
+++ trunk/Scribus/scribus/util_color.cpp Tue Feb 25 20:01:15 2020
@@ -292,7 +292,7 @@
}
-void paintAlert(QPixmap &toPaint, QPixmap &target, int x, int y, bool useMask)
+void paintAlert(const QPixmap &toPaint, QPixmap &target, int x, int y, bool useMask)
{
// there is no alpha mask in the beginning
// if (useMask)
Modified: trunk/Scribus/scribus/util_color.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23474&path=/trunk/Scribus/scribus/util_color.h
==============================================================================
--- trunk/Scribus/scribus/util_color.h (original)
+++ trunk/Scribus/scribus/util_color.h Tue Feb 25 20:01:15 2020
@@ -40,7 +40,7 @@
\param y coordinate
\param useMask unused now
*/
-void SCRIBUS_API paintAlert(QPixmap &toPaint, QPixmap &target, int x = 0, int y = 0, bool useMask = true);
+void SCRIBUS_API paintAlert(const QPixmap &toPaint, QPixmap &target, int x = 0, int y = 0, bool useMask = true);
QImage SCRIBUS_API ProofImage(QImage *Im, ScribusDoc* doc);
/*! \brief Associate a color shade to a document color according to pre-1.3.4cvs rgb shade calculation method,
More information about the scribus-commit
mailing list