r23054 by craig - Reimplement IconManager with better singleton approach
scribus-commit
scribus-commit at lists.scribus.net
Sat Jun 29 20:17:21 UTC 2019
Author: craig
Date: Sat Jun 29 20:17:20 2019
New Revision: 23054
URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=23054
Log:
Reimplement IconManager with better singleton approach
Modified:
trunk/Scribus/scribus/actionmanager.cpp
trunk/Scribus/scribus/actionmanager.h
trunk/Scribus/scribus/canvasgesture_pan.cpp
trunk/Scribus/scribus/canvasgesture_rulermove.cpp
trunk/Scribus/scribus/canvasmode.cpp
trunk/Scribus/scribus/canvasmode_edit.cpp
trunk/Scribus/scribus/canvasmode_edittable.cpp
trunk/Scribus/scribus/canvasmode_imageimport.cpp
trunk/Scribus/scribus/canvasmode_magnifier.cpp
trunk/Scribus/scribus/canvasmode_nodeedit.cpp
trunk/Scribus/scribus/canvasmode_normal.cpp
trunk/Scribus/scribus/canvasmode_rotate.cpp
trunk/Scribus/scribus/colorsetmanager.cpp
trunk/Scribus/scribus/docinfo.cpp
trunk/Scribus/scribus/fontlistmodel.cpp
trunk/Scribus/scribus/iconmanager.cpp
trunk/Scribus/scribus/iconmanager.h
trunk/Scribus/scribus/pageitem.cpp
trunk/Scribus/scribus/plugins/barcodegenerator/barcode.cpp
trunk/Scribus/scribus/plugins/barcodegenerator/barcodegenerator.cpp
trunk/Scribus/scribus/plugins/export/pixmapexport/dialog.cpp
trunk/Scribus/scribus/plugins/fontpreview/fontpreview.cpp
trunk/Scribus/scribus/plugins/gettext/csvim/csvdia.cpp
trunk/Scribus/scribus/plugins/gettext/sxwim/sxwdia.cpp
trunk/Scribus/scribus/plugins/gettext/textfilter/tfdia.cpp
trunk/Scribus/scribus/plugins/gettext/textfilter/tffilter.cpp
trunk/Scribus/scribus/plugins/import/pdf/pdfimportoptions.cpp
trunk/Scribus/scribus/plugins/import/xps/xpsimportoptions.cpp
trunk/Scribus/scribus/plugins/picbrowser/picturebrowser.cpp
trunk/Scribus/scribus/plugins/picbrowser/previewimage.cpp
trunk/Scribus/scribus/plugins/saveastemplateplugin/satdialog.cpp
trunk/Scribus/scribus/plugins/scriptplugin/pconsole.cpp
trunk/Scribus/scribus/plugins/scriptplugin/scriptplugin.cpp
trunk/Scribus/scribus/plugins/shapes/shapepalette.cpp
trunk/Scribus/scribus/plugins/short-words/shortwords.cpp
trunk/Scribus/scribus/plugins/tools/2geomtools/meshdistortion/meshdistortiondialog.cpp
trunk/Scribus/scribus/plugins/tools/lenseffects/lensdialog.cpp
trunk/Scribus/scribus/plugins/tools/pathcut/pathcut.cpp
trunk/Scribus/scribus/plugins/tools/pathfinder/pathfinderdialog.cpp
trunk/Scribus/scribus/scribus.cpp
trunk/Scribus/scribus/scribusapp.cpp
trunk/Scribus/scribus/scribuscore.cpp
trunk/Scribus/scribus/scribuscore.h
trunk/Scribus/scribus/scribusview.cpp
trunk/Scribus/scribus/scribuswin.cpp
trunk/Scribus/scribus/ui/about.cpp
trunk/Scribus/scribus/ui/adjustcmsdialog.cpp
trunk/Scribus/scribus/ui/aligndistribute.cpp
trunk/Scribus/scribus/ui/alignselect.cpp
trunk/Scribus/scribus/ui/annot.cpp
trunk/Scribus/scribus/ui/applytemplatedialog.cpp
trunk/Scribus/scribus/ui/autoformbuttongroup.cpp
trunk/Scribus/scribus/ui/buttonicon.cpp
trunk/Scribus/scribus/ui/charselect.cpp
trunk/Scribus/scribus/ui/checkDocument.cpp
trunk/Scribus/scribus/ui/cmykfw.cpp
trunk/Scribus/scribus/ui/colorchart.cpp
trunk/Scribus/scribus/ui/colorlistbox.cpp
trunk/Scribus/scribus/ui/colorsandfills.cpp
trunk/Scribus/scribus/ui/cpalette.cpp
trunk/Scribus/scribus/ui/cupsoptions.cpp
trunk/Scribus/scribus/ui/curvewidget.cpp
trunk/Scribus/scribus/ui/customfdialog.cpp
trunk/Scribus/scribus/ui/cxfimportdialog.cpp
trunk/Scribus/scribus/ui/dasheditor.cpp
trunk/Scribus/scribus/ui/dcolor.cpp
trunk/Scribus/scribus/ui/delpages.cpp
trunk/Scribus/scribus/ui/directionselect.cpp
trunk/Scribus/scribus/ui/editor.cpp
trunk/Scribus/scribus/ui/effectsdialog.cpp
trunk/Scribus/scribus/ui/extimageprops.cpp
trunk/Scribus/scribus/ui/fontcombo.cpp
trunk/Scribus/scribus/ui/fontreplacedialog.cpp
trunk/Scribus/scribus/ui/gradientpreview.cpp
trunk/Scribus/scribus/ui/gradientvectordialog.cpp
trunk/Scribus/scribus/ui/gtdialogs.cpp
trunk/Scribus/scribus/ui/helpbrowser.cpp
trunk/Scribus/scribus/ui/hruler.cpp
trunk/Scribus/scribus/ui/hyask.cpp
trunk/Scribus/scribus/ui/imageinfodialog.cpp
trunk/Scribus/scribus/ui/inlinepalette.cpp
trunk/Scribus/scribus/ui/insertTable.cpp
trunk/Scribus/scribus/ui/insertaframe.cpp
trunk/Scribus/scribus/ui/inspage.cpp
trunk/Scribus/scribus/ui/javadocs.cpp
trunk/Scribus/scribus/ui/layers.cpp
trunk/Scribus/scribus/ui/linkbutton.cpp
trunk/Scribus/scribus/ui/loremipsum.cpp
trunk/Scribus/scribus/ui/mergedoc.cpp
trunk/Scribus/scribus/ui/missing.cpp
trunk/Scribus/scribus/ui/movepage.cpp
trunk/Scribus/scribus/ui/newfile.cpp
trunk/Scribus/scribus/ui/newtemp.cpp
trunk/Scribus/scribus/ui/nftdialog.cpp
trunk/Scribus/scribus/ui/nftwidget.cpp
trunk/Scribus/scribus/ui/nodeeditpalette.cpp
trunk/Scribus/scribus/ui/oneclick.cpp
trunk/Scribus/scribus/ui/outlinepalette.cpp
trunk/Scribus/scribus/ui/pagelayout.cpp
trunk/Scribus/scribus/ui/pagepalette_masterpages.cpp
trunk/Scribus/scribus/ui/pagepalette_pages.cpp
trunk/Scribus/scribus/ui/pagepalette_widgets.cpp
trunk/Scribus/scribus/ui/pagepropertiesdialog.cpp
trunk/Scribus/scribus/ui/pageselector.cpp
trunk/Scribus/scribus/ui/patternpropsdialog.cpp
trunk/Scribus/scribus/ui/pdfexportdialog.cpp
trunk/Scribus/scribus/ui/picsearch.cpp
trunk/Scribus/scribus/ui/picstatus.cpp
trunk/Scribus/scribus/ui/polyprops.cpp
trunk/Scribus/scribus/ui/preferencesdialog.cpp
trunk/Scribus/scribus/ui/prefs_display.cpp
trunk/Scribus/scribus/ui/prefs_guides.cpp
trunk/Scribus/scribus/ui/prefs_hyphenator.cpp
trunk/Scribus/scribus/ui/prefs_keyboardshortcuts.cpp
trunk/Scribus/scribus/ui/prefs_pagesizes.cpp
trunk/Scribus/scribus/ui/prefs_pdfexport.cpp
trunk/Scribus/scribus/ui/prefs_userinterface.cpp
trunk/Scribus/scribus/ui/preview.cpp
trunk/Scribus/scribus/ui/printdialog.cpp
trunk/Scribus/scribus/ui/propertiespalette_group.cpp
trunk/Scribus/scribus/ui/propertiespalette_line.cpp
trunk/Scribus/scribus/ui/propertiespalette_shape.cpp
trunk/Scribus/scribus/ui/propertiespalette_table.cpp
trunk/Scribus/scribus/ui/propertiespalette_text.cpp
trunk/Scribus/scribus/ui/propertiespalette_xyz.cpp
trunk/Scribus/scribus/ui/propertywidget_advanced.cpp
trunk/Scribus/scribus/ui/propertywidget_pareffect.cpp
trunk/Scribus/scribus/ui/propertywidget_textcolor.cpp
trunk/Scribus/scribus/ui/query.cpp
trunk/Scribus/scribus/ui/recoverdialog.cpp
trunk/Scribus/scribus/ui/replacecolors.cpp
trunk/Scribus/scribus/ui/replaceonecolor.cpp
trunk/Scribus/scribus/ui/rulermover.cpp
trunk/Scribus/scribus/ui/scdockpalette.cpp
trunk/Scribus/scribus/ui/scinputdialog.cpp
trunk/Scribus/scribus/ui/scmenu.cpp
trunk/Scribus/scribus/ui/scrapbookpalette.cpp
trunk/Scribus/scribus/ui/scrpalettebase.cpp
trunk/Scribus/scribus/ui/search.cpp
trunk/Scribus/scribus/ui/selectobjects.cpp
trunk/Scribus/scribus/ui/selfield.cpp
trunk/Scribus/scribus/ui/smcellstylewidget.cpp
trunk/Scribus/scribus/ui/smcstylewidget.cpp
trunk/Scribus/scribus/ui/smlinestylewidget.cpp
trunk/Scribus/scribus/ui/smpstylewidget.cpp
trunk/Scribus/scribus/ui/smtablestylewidget.cpp
trunk/Scribus/scribus/ui/storyeditor.cpp
trunk/Scribus/scribus/ui/styleselect.cpp
trunk/Scribus/scribus/ui/tabmanager.cpp
trunk/Scribus/scribus/ui/tabpdfoptions.cpp
trunk/Scribus/scribus/ui/tabruler.cpp
trunk/Scribus/scribus/ui/transformdialog.cpp
trunk/Scribus/scribus/ui/transparencypalette.cpp
trunk/Scribus/scribus/undogui.cpp
trunk/Scribus/scribus/util_color.cpp
Modified: trunk/Scribus/scribus/actionmanager.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23054&path=/trunk/Scribus/scribus/actionmanager.cpp
==============================================================================
--- trunk/Scribus/scribus/actionmanager.cpp (original)
+++ trunk/Scribus/scribus/actionmanager.cpp Sat Jun 29 20:17:20 2019
@@ -38,7 +38,8 @@
QVector< QPair<QString, QStringList> > ActionManager::defNonMenuActions;
ActionManager::ActionManager ( QObject * parent ) :
- QObject ( parent)
+ QObject ( parent),
+ im (IconManager::instance())
{
}
@@ -65,10 +66,9 @@
nonEditActionNames=new QStringList();
unicodeCharActionNames=new QStringList();
undoManager = UndoManager::instance();
- im = IconManager::instance();
#ifdef Q_OS_MAC
- noIcon = im->loadPixmap("noicon.png");
+ noIcon = im.loadPixmap("noicon.png");
#endif
createActions();
@@ -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(im.loadPixmap("16/document-new.png"), im.loadPixmap("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(im.loadPixmap("16/document-open.png"), im.loadPixmap("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(im.loadPixmap("16/close.png"), im.loadPixmap("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(im.loadPixmap("16/document-save.png"), im.loadPixmap("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(im.loadPixmap("16/document-save-as.png"), im.loadPixmap("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(im.loadPixmap("revert.png"), QPixmap(), "", 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(im.loadPixmap("acroread16.png"), im.loadPixmap("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(im.loadPixmap("16/document-properties.png"), im.loadPixmap("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(im.loadPixmap("16/document-properties.png"), im.loadPixmap("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(im.loadPixmap("16/document-print.png"), im.loadPixmap("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(im.loadPixmap("16/document-print-preview.png"), im.loadPixmap("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(im.loadPixmap("exit.png"), QPixmap(), "", 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, im.loadPixmap("16/edit-undo.png"), im.loadPixmap("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, im.loadPixmap("16/edit-redo.png"), im.loadPixmap("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(im.loadPixmap("16/edit-cut.png"), im.loadPixmap("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(im.loadPixmap("16/edit-copy.png"), im.loadPixmap("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(im.loadPixmap("16/edit-paste.png"), im.loadPixmap("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(im.loadPixmap("16/edit-copy.png"), im.loadPixmap("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, im.loadPixmap("16/edit-paste.png"), QPixmap(), "", 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, im.loadPixmap("16/edit-paste.png"), QPixmap(), "", 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(im.loadPixmap("16/edit-paste.png"), im.loadPixmap("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(im.loadPixmap("16/edit-delete.png"), im.loadPixmap("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(im.loadPixmap("16/edit-find-replace.png"), im.loadPixmap("22/edit-find-replace.png"), "", defaultKey(name), mainWindow));
name="editEditWithImageEditor";
scrActions->insert(name, new ScrAction("", defaultKey(name), mainWindow));
name="editEditRenderSource";
@@ -426,13 +426,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(im.loadPixmap("16/go-bottom.png"), im.loadPixmap("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(im.loadPixmap("16/go-top.png"), im.loadPixmap("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(im.loadPixmap("16/go-down.png"), im.loadPixmap("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(im.loadPixmap("16/go-up.png"), im.loadPixmap("22/go-up.png"), "", defaultKey(name), mainWindow));
name="itemSendToPattern";
scrActions->insert(name, new ScrAction("", defaultKey(name), mainWindow));
name="itemSendToInline";
@@ -621,17 +621,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(im.loadPixmap("16/insert-table-rows.png"), im.loadPixmap("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(im.loadPixmap("16/insert-table-columns.png"), im.loadPixmap("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(im.loadPixmap("16/delete-table-rows.png"), im.loadPixmap("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(im.loadPixmap("16/delete-table-columns.png"), im.loadPixmap("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(im.loadPixmap("16/merge-table-cells.png"), im.loadPixmap("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(im.loadPixmap("16/split-table-cells.png"), im.loadPixmap("22/split-table-cells.png"), "", defaultKey(name), mainWindow));
name = "tableSetRowHeights";
scrActions->insert(name, new ScrAction("", defaultKey(name), mainWindow));
name = "tableSetColumnWidths";
@@ -658,17 +658,17 @@
name="viewFit75";
scrActions->insert(name, new ScrAction(ScrAction::DataDouble, QPixmap(), QPixmap(), "", 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, im.loadPixmap("16/zoom-original.png"), im.loadPixmap("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));
name="viewFit400";
scrActions->insert(name, new ScrAction(ScrAction::DataDouble, QPixmap(), QPixmap(), "", 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(im.loadPixmap("previewOn.png"), im.loadPixmap("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(im.loadPixmap("16/editdoc.png"), im.loadPixmap("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(im.loadPixmap("cmsOn.png"), im.loadPixmap("cmsOn.png"), "", defaultKey(name), mainWindow));
name="viewShowMargins";
scrActions->insert(name, new ScrAction("", defaultKey(name), mainWindow));
name="viewShowBleeds";
@@ -802,11 +802,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, im.loadPixmap("16/measure.png"), im.loadPixmap("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(im.loadPixmap("16/preflight-verifier.png"), im.loadPixmap("22/preflight-verifier.png"),"", defaultKey(name), mainWindow));
name="toolsAlignDistribute";
scrActions->insert(name, new ScrAction("", defaultKey(name), mainWindow));
name="toolsSymbols";
@@ -822,74 +822,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, im.loadPixmap("16/pointer.png"), im.loadPixmap("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, im.loadPixmap("16/insert-text-frame.png"), im.loadPixmap("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, im.loadPixmap("16/insert-image.png"), im.loadPixmap("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, im.loadPixmap("16/insert-renderframe.png"), im.loadPixmap("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, im.loadPixmap("16/insert-table.png"), im.loadPixmap("22/insert-table.png"), "", defaultKey(name), mainWindow, modeDrawTable2));
name="toolsInsertShape";
scrActions->insert(name, new ScrAction(ScrAction::DataInt, QPixmap(), QPixmap(), "", 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, im.loadPixmap("16/draw-polygon.png"), im.loadPixmap("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, im.loadPixmap("16/draw-arc.png"), im.loadPixmap("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, im.loadPixmap("16/draw-spiral.png"), im.loadPixmap("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, im.loadPixmap("Stift16.png"), im.loadPixmap("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, im.loadPixmap("16/draw-path.png"), im.loadPixmap("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, im.loadPixmap("16/draw-freehand.png"), im.loadPixmap("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, im.loadPixmap("16/draw-calligraphic.png"), im.loadPixmap("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, im.loadPixmap("16/transform-rotate.png"), im.loadPixmap("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, im.loadPixmap("16/zoom.png"), im.loadPixmap("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(im.loadPixmap("16/zoom-in.png"), im.loadPixmap("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(im.loadPixmap("16/zoom-out.png"), im.loadPixmap("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, im.loadPixmap("Editm16.png"), im.loadPixmap("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, im.loadPixmap("16/story-editor.png"), im.loadPixmap("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, im.loadPixmap("16/text-frame-link.png"), im.loadPixmap("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, im.loadPixmap("16/text-frame-unlink.png"), im.loadPixmap("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, im.loadPixmap("16/color-picker.png"), im.loadPixmap("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, im.loadPixmap("wizard16.png"), im.loadPixmap("wizard.png"), "", defaultKey(name), mainWindow, modeCopyProperties));
name="toolsUnlinkTextFrameAndCutText";
scrActions->insert(name, new ScrAction(ScrAction::DataInt, QPixmap(), QPixmap(), "", 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, im.loadPixmap("16/insert-button.png"), im.loadPixmap("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, im.loadPixmap("16/radiobutton.png"), im.loadPixmap("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, im.loadPixmap("16/text-field.png"), im.loadPixmap("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, im.loadPixmap("16/checkbox.png"), im.loadPixmap("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, im.loadPixmap("16/combobox.png"), im.loadPixmap("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, im.loadPixmap("16/list-box.png"), im.loadPixmap("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, im.loadPixmap("16/pdf-annotations.png"), im.loadPixmap("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, im.loadPixmap("goto16.png"), im.loadPixmap("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, im.loadPixmap("16/annot3d.png"), im.loadPixmap("22/annot3d.png"), "", defaultKey(name), mainWindow, modeInsertPDF3DAnnotation));
#endif
//Set the applicaton wide palette shortcuts
(*scrActions)["toolsProperties"]->setShortcutContext(Qt::ApplicationShortcut);
@@ -994,7 +994,7 @@
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(im.loadPixmap("16/help-browser.png"), QPixmap(), "", defaultKey(name), mainWindow));
name="helpOnlineWWW";
scrActions->insert(name, new ScrAction(ScrAction::DataQString, QPixmap(), QPixmap(), "", defaultKey(name), mainWindow, "http://www.scribus.net"));
name="helpOnlineDocs";
Modified: trunk/Scribus/scribus/actionmanager.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23054&path=/trunk/Scribus/scribus/actionmanager.h
==============================================================================
--- trunk/Scribus/scribus/actionmanager.h (original)
+++ trunk/Scribus/scribus/actionmanager.h Sat Jun 29 20:17:20 2019
@@ -115,7 +115,7 @@
QPixmap noIcon;
ScribusMainWindow *mainWindow {nullptr};
UndoManager *undoManager {nullptr};
- IconManager* im {nullptr};
+ IconManager& im;
QMap<QString, QPointer<ScrAction> > *scrActions {nullptr};
QMultiHash<QString, QActionGroup*> *scrActionGroups {nullptr};
QStringList *modeActionNames {nullptr};
Modified: trunk/Scribus/scribus/canvasgesture_pan.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23054&path=/trunk/Scribus/scribus/canvasgesture_pan.cpp
==============================================================================
--- trunk/Scribus/scribus/canvasgesture_pan.cpp (original)
+++ trunk/Scribus/scribus/canvasgesture_pan.cpp Sat Jun 29 20:17:20 2019
@@ -30,7 +30,7 @@
void PanGesture::activate(bool fromGesture)
{
m_cursor = m_view->cursor();
- m_view->setCursor(IconManager::instance()->loadCursor("handc.png"));
+ m_view->setCursor(IconManager::instance().loadCursor("handc.png"));
}
void PanGesture::deactivate(bool forgesture)
Modified: trunk/Scribus/scribus/canvasgesture_rulermove.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23054&path=/trunk/Scribus/scribus/canvasgesture_rulermove.cpp
==============================================================================
--- trunk/Scribus/scribus/canvasgesture_rulermove.cpp (original)
+++ trunk/Scribus/scribus/canvasgesture_rulermove.cpp Sat Jun 29 20:17:20 2019
@@ -238,7 +238,7 @@
{
if (m_haveGuide)
{
- qApp->changeOverrideCursor(IconManager::instance()->loadCursor("DelPoint.png"));
+ qApp->changeOverrideCursor(IconManager::instance().loadCursor("DelPoint.png"));
if (mouseRelease)
{
m_doc->Pages->at(m_page)->guides.deleteHorizontal( m_guide, GuideManagerCore::Standard);
@@ -294,7 +294,7 @@
{
if (m_haveGuide)
{
- qApp->changeOverrideCursor(IconManager::instance()->loadCursor("DelPoint.png"));
+ qApp->changeOverrideCursor(IconManager::instance().loadCursor("DelPoint.png"));
if (mouseRelease)
{
m_doc->Pages->at(m_page)->guides.deleteVertical( m_guide, GuideManagerCore::Standard);
Modified: trunk/Scribus/scribus/canvasmode.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23054&path=/trunk/Scribus/scribus/canvasmode.cpp
==============================================================================
--- trunk/Scribus/scribus/canvasmode.cpp (original)
+++ trunk/Scribus/scribus/canvasmode.cpp Sat Jun 29 20:17:20 2019
@@ -771,57 +771,57 @@
QCursor CanvasMode::modeCursor()
{
- IconManager* im=IconManager::instance();
+ IconManager& im=IconManager::instance();
QCursor cursor;
switch (m_doc->appMode)
{
case modeDrawShapes:
case modeDrawArc:
case modeDrawSpiral:
- cursor = im->loadCursor("drawframe.png");
+ cursor = im.loadCursor("drawframe.png");
break;
case modeDrawImage:
- cursor = im->loadCursor("drawimageframe.png");
+ cursor = im.loadCursor("drawimageframe.png");
break;
case modeDrawLatex:
- cursor = im->loadCursor("drawlatexframe.png");
+ cursor = im.loadCursor("drawlatexframe.png");
break;
case modeDrawText:
- cursor = im->loadCursor("drawtextframe.png");
+ cursor = im.loadCursor("drawtextframe.png");
break;
case modeDrawTable2:
- cursor = im->loadCursor("drawtable.png");
+ cursor = im.loadCursor("drawtable.png");
break;
case modeDrawRegularPolygon:
- cursor = im->loadCursor("drawpolyline.png");
+ cursor = im.loadCursor("drawpolyline.png");
break;
case modeDrawLine:
case modeDrawBezierLine:
cursor = QCursor(Qt::CrossCursor);
break;
case modeDrawFreehandLine:
- cursor = im->loadCursor("DrawFreeLine.png", 0, 31);
+ cursor = im.loadCursor("DrawFreeLine.png", 0, 31);
break;
case modeDrawCalligraphicLine:
- cursor = im->loadCursor("drawcalligraphy.png", 4, 4);
+ cursor = im.loadCursor("drawcalligraphy.png", 4, 4);
break;
case modeImportObject:
- cursor = im->loadCursor("dragpix.png");
+ cursor = im.loadCursor("dragpix.png");
break;
case modeMagnifier:
if (m_view->Magnify)
- cursor = im->loadCursor("lupez.png");
+ cursor = im.loadCursor("lupez.png");
else
- cursor = im->loadCursor("lupezm.png");
+ cursor = im.loadCursor("lupezm.png");
break;
case modePanning:
- cursor = im->loadCursor("handc.png");
+ cursor = im.loadCursor("handc.png");
break;
case modeEyeDropper:
- cursor = im->loadCursor("colorpickercursor.png", 0, 31);
+ cursor = im.loadCursor("colorpickercursor.png", 0, 31);
break;
case modeLinkFrames:
- cursor = im->loadCursor("LinkTextFrame.png", 0, 31);
+ cursor = im.loadCursor("LinkTextFrame.png", 0, 31);
break;
case modeMeasurementTool:
case modeEditGradientVectors:
@@ -851,57 +851,57 @@
void CanvasMode::setModeCursor()
{
- IconManager* im=IconManager::instance();
+ IconManager& im=IconManager::instance();
//NOTE: Merge with similar code in ScribusMainWindow::setAppMode()
switch (m_doc->appMode)
{
case modeDrawShapes:
case modeDrawArc:
case modeDrawSpiral:
- m_view->setCursor(im->loadCursor("drawframe.png"));
+ m_view->setCursor(im.loadCursor("drawframe.png"));
break;
case modeDrawImage:
- m_view->setCursor(im->loadCursor("drawimageframe.png"));
+ m_view->setCursor(im.loadCursor("drawimageframe.png"));
break;
case modeDrawLatex:
- m_view->setCursor(im->loadCursor("drawlatexframe.png"));
+ m_view->setCursor(im.loadCursor("drawlatexframe.png"));
break;
case modeDrawText:
- m_view->setCursor(im->loadCursor("drawtextframe.png"));
+ m_view->setCursor(im.loadCursor("drawtextframe.png"));
break;
case modeDrawTable2:
- m_view->setCursor(im->loadCursor("drawtable.png"));
+ m_view->setCursor(im.loadCursor("drawtable.png"));
break;
case modeDrawRegularPolygon:
- m_view->setCursor(im->loadCursor("drawpolyline.png"));
+ m_view->setCursor(im.loadCursor("drawpolyline.png"));
break;
case modeDrawLine:
case modeDrawBezierLine:
m_view->setCursor(QCursor(Qt::CrossCursor));
break;
case modeDrawFreehandLine:
- m_view->setCursor(im->loadCursor("DrawFreeLine.png", 0, 31));
+ m_view->setCursor(im.loadCursor("DrawFreeLine.png", 0, 31));
break;
case modeDrawCalligraphicLine:
- m_view->setCursor(im->loadCursor("drawcalligraphy.png", 4, 4));
+ m_view->setCursor(im.loadCursor("drawcalligraphy.png", 4, 4));
break;
case modeImportObject:
- m_view->setCursor(im->loadCursor("dragpix.png"));
+ m_view->setCursor(im.loadCursor("dragpix.png"));
break;
case modeMagnifier:
if (m_view->Magnify)
- m_view->setCursor(im->loadCursor("lupez.png"));
+ m_view->setCursor(im.loadCursor("lupez.png"));
else
- m_view->setCursor(im->loadCursor("lupezm.png"));
+ m_view->setCursor(im.loadCursor("lupezm.png"));
break;
case modePanning:
- m_view->setCursor(im->loadCursor("handc.png"));
+ m_view->setCursor(im.loadCursor("handc.png"));
break;
case modeEyeDropper:
- m_view->setCursor(im->loadCursor("colorpickercursor.png", 0, 31));
+ m_view->setCursor(im.loadCursor("colorpickercursor.png", 0, 31));
break;
case modeLinkFrames:
- m_view->setCursor(im->loadCursor("LinkTextFrame.png", 0, 31));
+ m_view->setCursor(im.loadCursor("LinkTextFrame.png", 0, 31));
break;
case modeMeasurementTool:
case modeEditGradientVectors:
@@ -1716,7 +1716,7 @@
if ((m_doc->appMode == modePanning) && (e->key() == Qt::Key_Control) && (QApplication::mouseButtons() & Qt::RightButton))
m_view->requestMode(modeNormal);
if (m_doc->appMode == modeMagnifier)
- m_view->setCursor(IconManager::instance()->loadCursor("lupez.png"));
+ m_view->setCursor(IconManager::instance().loadCursor("lupez.png"));
if (e->isAutoRepeat() || !m_arrowKeyDown)
return;
switch(e->key())
Modified: trunk/Scribus/scribus/canvasmode_edit.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23054&path=/trunk/Scribus/scribus/canvasmode_edit.cpp
==============================================================================
--- trunk/Scribus/scribus/canvasmode_edit.cpp (original)
+++ trunk/Scribus/scribus/canvasmode_edit.cpp Sat Jun 29 20:17:20 2019
@@ -417,7 +417,7 @@
{
if (m->modifiers() & Qt::ShiftModifier)
{
- m_view->setCursor(IconManager::instance()->loadCursor("Rotieren2.png"));
+ m_view->setCursor(IconManager::instance().loadCursor("Rotieren2.png"));
QTransform p = currItem->getTransform();
p.translate(currItem->imageXOffset()*currItem->imageXScale(), currItem->imageYOffset()*currItem->imageYScale());
QPointF rotP = p.map(QPointF(0.0, 0.0));
@@ -427,7 +427,7 @@
}
else
{
- m_view->setCursor(IconManager::instance()->loadCursor("handc.png"));
+ m_view->setCursor(IconManager::instance().loadCursor("handc.png"));
QTransform mm1 = currItem->getTransform();
QTransform mm2 = mm1.inverted();
QPointF rota = mm2.map(QPointF(newX, newY)) - mm2.map(QPointF(Mxp, Myp));
@@ -496,9 +496,9 @@
if (currItem->asImageFrame())
{
if (m->modifiers() & Qt::ShiftModifier)
- m_view->setCursor(IconManager::instance()->loadCursor("Rotieren2.png"));
+ m_view->setCursor(IconManager::instance().loadCursor("Rotieren2.png"));
else
- m_view->setCursor(IconManager::instance()->loadCursor("handc.png"));
+ m_view->setCursor(IconManager::instance().loadCursor("handc.png"));
}
}
}
Modified: trunk/Scribus/scribus/canvasmode_edittable.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23054&path=/trunk/Scribus/scribus/canvasmode_edittable.cpp
==============================================================================
--- trunk/Scribus/scribus/canvasmode_edittable.cpp (original)
+++ trunk/Scribus/scribus/canvasmode_edittable.cpp Sat Jun 29 20:17:20 2019
@@ -46,8 +46,8 @@
m_longBlink(false),
m_cursorVisible(false),
m_lastCursorPos(-1),
- m_selectRowCursor(IconManager::instance()->loadCursor("select_row.png")),
- m_selectColumnCursor(IconManager::instance()->loadCursor("select_column.png")),
+ m_selectRowCursor(IconManager::instance().loadCursor("select_row.png")),
+ m_selectColumnCursor(IconManager::instance().loadCursor("select_column.png")),
m_tableResizeGesture(new TableResize(this)),
m_rowResizeGesture(new RowResize(this)),
m_columnResizeGesture(new ColumnResize(this)),
Modified: trunk/Scribus/scribus/canvasmode_imageimport.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23054&path=/trunk/Scribus/scribus/canvasmode_imageimport.cpp
==============================================================================
--- trunk/Scribus/scribus/canvasmode_imageimport.cpp (original)
+++ trunk/Scribus/scribus/canvasmode_imageimport.cpp Sat Jun 29 20:17:20 2019
@@ -68,7 +68,7 @@
{
QPainter p;
QImage pm = QImage(80, 80, QImage::Format_ARGB32_Premultiplied);
- QBrush b(QColor(205,205,205), IconManager::instance()->loadPixmap("testfill.png"));
+ QBrush b(QColor(205,205,205), IconManager::instance().loadPixmap("testfill.png"));
p.begin(&pm);
p.fillRect(QRectF(0, 0, 80, 80), b);
QImage thumb;
@@ -170,12 +170,12 @@
{
PageItem_ImageFrame *currItem;
if ((currItem = item->asImageFrame()) != nullptr)
- m_view->setCursor(IconManager::instance()->loadCursor("drawimageframe.png"));
+ m_view->setCursor(IconManager::instance().loadCursor("drawimageframe.png"));
else
m_view->setCursor(QCursor(Qt::ArrowCursor));
}
else
- m_view->setCursor(IconManager::instance()->loadCursor("drawimageframe.png"));
+ m_view->setCursor(IconManager::instance().loadCursor("drawimageframe.png"));
if (commonMouseMove(m))
return;
}
Modified: trunk/Scribus/scribus/canvasmode_magnifier.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23054&path=/trunk/Scribus/scribus/canvasmode_magnifier.cpp
==============================================================================
--- trunk/Scribus/scribus/canvasmode_magnifier.cpp (original)
+++ trunk/Scribus/scribus/canvasmode_magnifier.cpp Sat Jun 29 20:17:20 2019
@@ -166,12 +166,12 @@
if ((m->modifiers() == Qt::ShiftModifier) || (m->button() == Qt::RightButton))
{
m_view->Magnify = false;
- m_view->setCursor(IconManager::instance()->loadCursor("lupezm.png"));
+ m_view->setCursor(IconManager::instance().loadCursor("lupezm.png"));
}
else
{
m_view->Magnify = true;
- m_view->setCursor(IconManager::instance()->loadCursor("lupez.png"));
+ m_view->setCursor(IconManager::instance().loadCursor("lupez.png"));
}
m_Mxp = mousePointDoc.x(); //m->globalPos().x();
m_Myp = mousePointDoc.y(); //m->globalPos().y();
@@ -223,9 +223,9 @@
else
{
if (m->modifiers() & Qt::ShiftModifier)
- m_view->setCursor(IconManager::instance()->loadCursor("lupezm.png"));
+ m_view->setCursor(IconManager::instance().loadCursor("lupezm.png"));
else
- m_view->setCursor(IconManager::instance()->loadCursor("lupez.png"));
+ m_view->setCursor(IconManager::instance().loadCursor("lupez.png"));
}
}
Modified: trunk/Scribus/scribus/canvasmode_nodeedit.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23054&path=/trunk/Scribus/scribus/canvasmode_nodeedit.cpp
==============================================================================
--- trunk/Scribus/scribus/canvasmode_nodeedit.cpp (original)
+++ trunk/Scribus/scribus/canvasmode_nodeedit.cpp Sat Jun 29 20:17:20 2019
@@ -1005,9 +1005,9 @@
if (m_doc->nodeEdit.submode() == NodeEditContext::MOVE_POINT)
m_view->setCursor(QCursor(Qt::SizeAllCursor));
if (m_doc->nodeEdit.submode() == NodeEditContext::DEL_POINT)
- m_view->setCursor(IconManager::instance()->loadCursor("DelPoint.png", 1, 1));
+ m_view->setCursor(IconManager::instance().loadCursor("DelPoint.png", 1, 1));
if (m_doc->nodeEdit.submode() == NodeEditContext::SPLIT_PATH)
- m_view->setCursor(IconManager::instance()->loadCursor("Split.png", 1, 1));
+ m_view->setCursor(IconManager::instance().loadCursor("Split.png", 1, 1));
return true;
}
}
@@ -1036,11 +1036,11 @@
if (m_canvas->hitsCanvasPoint(m->globalPos(), FPoint(pl.x(), pl.y())))
{
if (m_doc->nodeEdit.submode() == NodeEditContext::MOVE_POINT)
- m_view->setCursor(IconManager::instance()->loadCursor("handc.png"));
+ m_view->setCursor(IconManager::instance().loadCursor("handc.png"));
else if (m_doc->nodeEdit.submode() == NodeEditContext::ADD_POINT)
- m_view->setCursor(IconManager::instance()->loadCursor("AddPoint.png", 1, 1));
+ m_view->setCursor(IconManager::instance().loadCursor("AddPoint.png", 1, 1));
else if (m_doc->nodeEdit.submode() == NodeEditContext::SPLIT_PATH)
- m_view->setCursor(IconManager::instance()->loadCursor("Split.png", 1, 1));
+ m_view->setCursor(IconManager::instance().loadCursor("Split.png", 1, 1));
else
m_view->setCursor(QCursor(Qt::ArrowCursor));
m_doc->nodeEdit.setClre2(poi);
Modified: trunk/Scribus/scribus/canvasmode_normal.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23054&path=/trunk/Scribus/scribus/canvasmode_normal.cpp
==============================================================================
--- trunk/Scribus/scribus/canvasmode_normal.cpp (original)
+++ trunk/Scribus/scribus/canvasmode_normal.cpp Sat Jun 29 20:17:20 2019
@@ -483,7 +483,7 @@
ScElemMimeData* md = ScriXmlDoc::writeToMimeData(m_doc, m_doc->m_Selection);
QDrag* dr = new QDrag(m_view);
dr->setMimeData(md);
- const QPixmap& pm = IconManager::instance()->loadPixmap("dragpix.png");
+ const QPixmap& pm = IconManager::instance().loadPixmap("dragpix.png");
dr->setPixmap(pm);
// dr->setDragCursor(pm, Qt::CopyAction);
// dr->setDragCursor(pm, Qt::MoveAction);
Modified: trunk/Scribus/scribus/canvasmode_rotate.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23054&path=/trunk/Scribus/scribus/canvasmode_rotate.cpp
==============================================================================
--- trunk/Scribus/scribus/canvasmode_rotate.cpp (original)
+++ trunk/Scribus/scribus/canvasmode_rotate.cpp Sat Jun 29 20:17:20 2019
@@ -413,7 +413,7 @@
{
setResizeCursor(how);
}
- m_view->setCursor(IconManager::instance()->loadCursor("Rotieren2.png"));
+ m_view->setCursor(IconManager::instance().loadCursor("Rotieren2.png"));
}
else
{
@@ -433,7 +433,7 @@
{
QRect tx = p.mapRect(QRect(0, 0, static_cast<int>(currItem->width()), static_cast<int>(currItem->height())));
if ((tx.intersects(mpo)) && (!currItem->locked()))
- m_view->setCursor(IconManager::instance()->loadCursor("Rotieren2.png"));
+ m_view->setCursor(IconManager::instance().loadCursor("Rotieren2.png"));
}
}
}
Modified: trunk/Scribus/scribus/colorsetmanager.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23054&path=/trunk/Scribus/scribus/colorsetmanager.cpp
==============================================================================
--- trunk/Scribus/scribus/colorsetmanager.cpp (original)
+++ trunk/Scribus/scribus/colorsetmanager.cpp Sat Jun 29 20:17:20 2019
@@ -199,7 +199,7 @@
{
item = new QTreeWidgetItem(parent);
item->setFlags(Qt::ItemIsEditable | Qt::ItemIsUserCheckable | Qt::ItemIsEnabled);
- item->setIcon(0, QIcon(IconManager::instance()->loadIcon("16/folder.png")));
+ item->setIcon(0, QIcon(IconManager::instance().loadIcon("16/folder.png")));
item->setText(0, setName);
}
searchDir(path + dirs[dc] + "/", pList, item);
@@ -222,7 +222,7 @@
item->setText(0, setName);
item->setData(0, Qt::UserRole, fi.absolutePath());
if ((!fi.isWritable()) || (fi.absolutePath().contains(ScPaths::applicationDataDir()+"swatches/locked")))
- item->setIcon(0, QIcon(IconManager::instance()->loadIcon("16/lock.png")));
+ item->setIcon(0, QIcon(IconManager::instance().loadIcon("16/lock.png")));
}
}
}
Modified: trunk/Scribus/scribus/docinfo.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23054&path=/trunk/Scribus/scribus/docinfo.cpp
==============================================================================
--- trunk/Scribus/scribus/docinfo.cpp (original)
+++ trunk/Scribus/scribus/docinfo.cpp Sat Jun 29 20:17:20 2019
@@ -28,7 +28,7 @@
infos = docInfo;
setMaximumSize( QSize( 32767, 32767 ) );
setWindowTitle( tr( "Document Information" ) );
- setWindowIcon(QIcon(IconManager::instance()->loadIcon("AppIcon.png")));
+ setWindowIcon(QIcon(IconManager::instance().loadIcon("AppIcon.png")));
page1 = new QWidget( this );
layout1 = new QGridLayout(page1);
Modified: trunk/Scribus/scribus/fontlistmodel.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23054&path=/trunk/Scribus/scribus/fontlistmodel.cpp
==============================================================================
--- trunk/Scribus/scribus/fontlistmodel.cpp (original)
+++ trunk/Scribus/scribus/fontlistmodel.cpp Sat Jun 29 20:17:20 2019
@@ -19,10 +19,10 @@
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");
+ 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");
setFonts(m_fonts.keys());
}
Modified: trunk/Scribus/scribus/iconmanager.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23054&path=/trunk/Scribus/scribus/iconmanager.cpp
==============================================================================
--- trunk/Scribus/scribus/iconmanager.cpp (original)
+++ trunk/Scribus/scribus/iconmanager.cpp Sat Jun 29 20:17:20 2019
@@ -31,22 +31,10 @@
{
}
-IconManager::~IconManager()
-{
-}
-
-IconManager* IconManager::instance()
-{
- if (m_instance == nullptr)
- m_instance = new IconManager();
-
- return m_instance;
-}
-
-void IconManager::deleteInstance()
-{
- delete m_instance;
- m_instance = nullptr;
+IconManager& IconManager::instance()
+{
+ static IconManager _instance;
+ return _instance;
}
bool IconManager::setup()
Modified: trunk/Scribus/scribus/iconmanager.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23054&path=/trunk/Scribus/scribus/iconmanager.h
==============================================================================
--- trunk/Scribus/scribus/iconmanager.h (original)
+++ trunk/Scribus/scribus/iconmanager.h Sat Jun 29 20:17:20 2019
@@ -37,19 +37,14 @@
Q_OBJECT
public:
- IconManager(QObject *parent = 0);
- ~IconManager();
-
+ IconManager(IconManager const&) = delete;
+ void operator=(IconManager const&) = delete;
/**
* @brief Returns a pointer to the IconManager instance
* @return A pointer to the IconManager instance
*/
- static IconManager* instance();
- /**
- * @brief Deletes the IconManager Instance
- * Must be called when IconManager is no longer needed.
- */
- static void deleteInstance();
+ static IconManager& instance();
+
bool setup();
QCursor loadCursor(const QString& nam, int hotX = -1, int hotY = -1, bool forceUseColor=false);
QIcon loadIcon(const QString& nam, bool forceUseColor=false);
@@ -66,6 +61,8 @@
void languageChange();
private:
+ IconManager(QObject *parent = nullptr);
+ ~IconManager() = default;
/**
* @brief The only instance of IconManager available.
*
Modified: trunk/Scribus/scribus/pageitem.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23054&path=/trunk/Scribus/scribus/pageitem.cpp
==============================================================================
--- trunk/Scribus/scribus/pageitem.cpp (original)
+++ trunk/Scribus/scribus/pageitem.cpp Sat Jun 29 20:17:20 2019
@@ -2208,7 +2208,7 @@
{
p->save();
p->translate(ofx, ofy);
- QImage ico = IconManager::instance()->loadPixmap("22/dialog-warning.png").toImage();
+ QImage ico = IconManager::instance().loadPixmap("22/dialog-warning.png").toImage();
p->drawImage(&ico);
p->restore();
}
Modified: trunk/Scribus/scribus/plugins/barcodegenerator/barcode.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23054&path=/trunk/Scribus/scribus/plugins/barcodegenerator/barcode.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/barcodegenerator/barcode.cpp (original)
+++ trunk/Scribus/scribus/plugins/barcodegenerator/barcode.cpp Sat Jun 29 20:17:20 2019
@@ -17,7 +17,7 @@
languageChange();
}
-Barcode::~Barcode() {};
+Barcode::~Barcode() = default;
void Barcode::languageChange()
{
@@ -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.icon1 = IconManager::instance().loadPixmap("16/insert-barcode.png");
+ m_actionInfo.icon2 = IconManager::instance().loadPixmap("22/insert-barcode.png");
m_actionInfo.enabledOnStartup = false;
// m_actionInfo.forAppMode.append(modeNormal);
m_actionInfo.needsNumObjects = -1;
Modified: trunk/Scribus/scribus/plugins/barcodegenerator/barcodegenerator.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23054&path=/trunk/Scribus/scribus/plugins/barcodegenerator/barcodegenerator.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/barcodegenerator/barcodegenerator.cpp (original)
+++ trunk/Scribus/scribus/plugins/barcodegenerator/barcodegenerator.cpp Sat Jun 29 20:17:20 2019
@@ -274,7 +274,7 @@
ui.okButton->setText(CommonStrings::tr_OK);
ui.cancelButton->setText(CommonStrings::tr_Cancel);
- ui.resetButton->setIcon(IconManager::instance()->loadIcon("u_undo16.png"));
+ ui.resetButton->setIcon(IconManager::instance().loadIcon("u_undo16.png"));
if (ScCore->primaryMainWindow()->doc->PageColors.contains("Black"))
{
Modified: trunk/Scribus/scribus/plugins/export/pixmapexport/dialog.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23054&path=/trunk/Scribus/scribus/plugins/export/pixmapexport/dialog.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/export/pixmapexport/dialog.cpp (original)
+++ trunk/Scribus/scribus/plugins/export/pixmapexport/dialog.cpp Sat Jun 29 20:17:20 2019
@@ -44,7 +44,7 @@
DPIBox->setValue(size);
enlargementBox->setValue(size);
onePageRadio->setChecked( true );
- pageNrButton->setIcon(IconManager::instance()->loadIcon("ellipsis.png"));
+ pageNrButton->setIcon(IconManager::instance().loadIcon("ellipsis.png"));
rangeVal->setEnabled(false);
pageNrButton->setEnabled(false);
noBackground->setChecked(false);
Modified: trunk/Scribus/scribus/plugins/fontpreview/fontpreview.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23054&path=/trunk/Scribus/scribus/plugins/fontpreview/fontpreview.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/fontpreview/fontpreview.cpp (original)
+++ trunk/Scribus/scribus/plugins/fontpreview/fontpreview.cpp Sat Jun 29 20:17:20 2019
@@ -23,7 +23,7 @@
{
setupUi(this);
setModal(true);
- setWindowIcon(IconManager::instance()->loadIcon("AppIcon.png"));
+ setWindowIcon(IconManager::instance().loadIcon("AppIcon.png"));
m_Doc=doc;
sampleItem = new SampleItem();
Modified: trunk/Scribus/scribus/plugins/gettext/csvim/csvdia.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23054&path=/trunk/Scribus/scribus/plugins/gettext/csvim/csvdia.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/gettext/csvim/csvdia.cpp (original)
+++ trunk/Scribus/scribus/plugins/gettext/csvim/csvdia.cpp Sat Jun 29 20:17:20 2019
@@ -25,7 +25,7 @@
{
setModal(true);
setWindowTitle( tr("CSV Importer Options"));
- setWindowIcon(QIcon(IconManager::instance()->loadIcon("AppIcon.png")));
+ setWindowIcon(QIcon(IconManager::instance().loadIcon("AppIcon.png")));
QBoxLayout* layout = new QVBoxLayout(this);
layout->setMargin(0);
Modified: trunk/Scribus/scribus/plugins/gettext/sxwim/sxwdia.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23054&path=/trunk/Scribus/scribus/plugins/gettext/sxwim/sxwdia.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/gettext/sxwim/sxwdia.cpp (original)
+++ trunk/Scribus/scribus/plugins/gettext/sxwim/sxwdia.cpp Sat Jun 29 20:17:20 2019
@@ -20,7 +20,7 @@
SxwDialog::SxwDialog(bool update, bool prefix, bool pack) : QDialog(nullptr)
{
setModal(true);
- setWindowIcon(QIcon(IconManager::instance()->loadIcon("AppIcon.png")));
+ setWindowIcon(QIcon(IconManager::instance().loadIcon("AppIcon.png")));
setWindowTitle( tr("OpenOffice.org Writer Importer Options"));
QBoxLayout* layout = new QVBoxLayout(this);
Modified: trunk/Scribus/scribus/plugins/gettext/textfilter/tfdia.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23054&path=/trunk/Scribus/scribus/plugins/gettext/textfilter/tfdia.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/gettext/textfilter/tfdia.cpp (original)
+++ trunk/Scribus/scribus/plugins/gettext/textfilter/tfdia.cpp Sat Jun 29 20:17:20 2019
@@ -31,7 +31,7 @@
tfDia::tfDia()
{
setModal(true);
- setWindowIcon(QIcon(IconManager::instance()->loadIcon("AppIcon.png")));
+ setWindowIcon(QIcon(IconManager::instance().loadIcon("AppIcon.png")));
setWindowTitle( tr("Create filter"));
setMinimumWidth(524);
prefs = PrefsManager::instance()->prefsFile->getPluginContext("TextFilter");
Modified: trunk/Scribus/scribus/plugins/gettext/textfilter/tffilter.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23054&path=/trunk/Scribus/scribus/plugins/gettext/textfilter/tffilter.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/gettext/textfilter/tffilter.cpp (original)
+++ trunk/Scribus/scribus/plugins/gettext/textfilter/tffilter.cpp Sat Jun 29 20:17:20 2019
@@ -134,12 +134,12 @@
// layout->addStretch(10);
layout->addSpacing(20);
- removeButton = new QPushButton(IconManager::instance()->loadIcon("22/list-remove.png"), nullptr, this);
+ removeButton = new QPushButton(IconManager::instance().loadIcon("22/list-remove.png"), nullptr, this);
removeButton->setToolTip( tr("Remove this filter row"));
removeButton->setMaximumSize(QSize(25,25));
removeButton->setMinimumSize(QSize(25,25));
layout->addWidget(removeButton, 0, Qt::AlignTop);
- addButton = new QPushButton(IconManager::instance()->loadIcon("22/list-add.png"), nullptr, this);
+ addButton = new QPushButton(IconManager::instance().loadIcon("22/list-add.png"), nullptr, this);
addButton->setToolTip( tr("Add a new filter row"));
addButton->setMaximumSize(QSize(25,25));
addButton->setMinimumSize(QSize(25,25));
Modified: trunk/Scribus/scribus/plugins/import/pdf/pdfimportoptions.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23054&path=/trunk/Scribus/scribus/plugins/import/pdf/pdfimportoptions.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/pdf/pdfimportoptions.cpp (original)
+++ trunk/Scribus/scribus/plugins/import/pdf/pdfimportoptions.cpp Sat Jun 29 20:17:20 2019
@@ -14,7 +14,7 @@
PdfImportOptions::PdfImportOptions(QWidget *parent) : QDialog(parent), ui(new Ui::PdfImportOptions)
{
ui->setupUi(this);
- ui->pageSelectButton->setIcon(IconManager::instance()->loadIcon("ellipsis.png"));
+ ui->pageSelectButton->setIcon(IconManager::instance().loadIcon("ellipsis.png"));
m_plugin = nullptr;
m_maxPage = 0;
m_resized = false;
Modified: trunk/Scribus/scribus/plugins/import/xps/xpsimportoptions.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23054&path=/trunk/Scribus/scribus/plugins/import/xps/xpsimportoptions.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/xps/xpsimportoptions.cpp (original)
+++ trunk/Scribus/scribus/plugins/import/xps/xpsimportoptions.cpp Sat Jun 29 20:17:20 2019
@@ -13,7 +13,7 @@
XpsImportOptions::XpsImportOptions(QWidget *parent) : QDialog(parent), ui(new Ui::XpsImportOptions)
{
ui->setupUi(this);
- ui->pageSelectButton->setIcon(IconManager::instance()->loadIcon("ellipsis.png"));
+ ui->pageSelectButton->setIcon(IconManager::instance().loadIcon("ellipsis.png"));
m_maxPage = 0;
}
Modified: trunk/Scribus/scribus/plugins/picbrowser/picturebrowser.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23054&path=/trunk/Scribus/scribus/plugins/picbrowser/picturebrowser.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/picbrowser/picturebrowser.cpp (original)
+++ trunk/Scribus/scribus/plugins/picbrowser/picturebrowser.cpp Sat Jun 29 20:17:20 2019
@@ -1580,27 +1580,27 @@
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"));
+ 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);
Modified: trunk/Scribus/scribus/plugins/picbrowser/previewimage.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23054&path=/trunk/Scribus/scribus/plugins/picbrowser/previewimage.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/picbrowser/previewimage.cpp (original)
+++ trunk/Scribus/scribus/plugins/picbrowser/previewimage.cpp Sat Jun 29 20:17:20 2019
@@ -67,7 +67,7 @@
previewIcon = QPixmap ( size, size );
- QBrush b ( QColor ( 205,205,205 ), IconManager::instance()->loadPixmap( "testfill.png" ) );
+ QBrush b ( QColor ( 205,205,205 ), IconManager::instance().loadPixmap( "testfill.png" ) );
p.begin ( &previewIcon );
@@ -393,7 +393,7 @@
defaultIcon = QPixmap ( size, size );
- QBrush b ( QColor ( 205,205,205 ), IconManager::instance()->loadPixmap( "testfill.png" ) );
+ QBrush b ( QColor ( 205,205,205 ), IconManager::instance().loadPixmap( "testfill.png" ) );
p.begin ( &defaultIcon );
Modified: trunk/Scribus/scribus/plugins/saveastemplateplugin/satdialog.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23054&path=/trunk/Scribus/scribus/plugins/saveastemplateplugin/satdialog.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/saveastemplateplugin/satdialog.cpp (original)
+++ trunk/Scribus/scribus/plugins/saveastemplateplugin/satdialog.cpp Sat Jun 29 20:17:20 2019
@@ -41,7 +41,7 @@
setupUi(this);
setModal(true);
setWindowTitle( tr("Save as Template"));
- setWindowIcon(IconManager::instance()->loadIcon("AppIcon.png"));
+ setWindowIcon(IconManager::instance().loadIcon("AppIcon.png"));
readPrefs();
nameEdit->setText(tmplName);
Modified: trunk/Scribus/scribus/plugins/scriptplugin/pconsole.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23054&path=/trunk/Scribus/scribus/plugins/scriptplugin/pconsole.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/scriptplugin/pconsole.cpp (original)
+++ trunk/Scribus/scribus/plugins/scriptplugin/pconsole.cpp Sat Jun 29 20:17:20 2019
@@ -27,7 +27,7 @@
: QMainWindow( parent )
{
setupUi(this);
- setWindowIcon(IconManager::instance()->loadIcon("AppIcon.png"));
+ setWindowIcon(IconManager::instance().loadIcon("AppIcon.png"));
changedLabel = new QLabel(this);
cursorTemplate = tr("Col: %1 Row: %2/%3");
@@ -35,11 +35,11 @@
statusBar()->addPermanentWidget(changedLabel);
statusBar()->addPermanentWidget(cursorLabel);
- action_Open->setIcon(IconManager::instance()->loadIcon("16/document-open.png"));
- action_Save->setIcon(IconManager::instance()->loadIcon("16/document-save.png"));
- actionSave_As->setIcon(IconManager::instance()->loadIcon("16/document-save-as.png"));
- action_Exit->setIcon(IconManager::instance()->loadIcon("exit.png"));
- action_Run->setIcon(IconManager::instance()->loadIcon("ok.png"));
+ action_Open->setIcon(IconManager::instance().loadIcon("16/document-open.png"));
+ action_Save->setIcon(IconManager::instance().loadIcon("16/document-save.png"));
+ actionSave_As->setIcon(IconManager::instance().loadIcon("16/document-save-as.png"));
+ action_Exit->setIcon(IconManager::instance().loadIcon("exit.png"));
+ action_Run->setIcon(IconManager::instance().loadIcon("ok.png"));
action_Open->setShortcut(tr("Ctrl+O"));
action_Save->setShortcut(tr("Ctrl+S"));
Modified: trunk/Scribus/scribus/plugins/scriptplugin/scriptplugin.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23054&path=/trunk/Scribus/scribus/plugins/scriptplugin/scriptplugin.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/scriptplugin/scriptplugin.cpp (original)
+++ trunk/Scribus/scribus/plugins/scriptplugin/scriptplugin.cpp Sat Jun 29 20:17:20 2019
@@ -205,7 +205,7 @@
Q_CHECK_PTR(panel);
connect(panel, SIGNAL(prefsChanged()), scripterCore, SLOT(updateSyntaxHighlighter()));
caption = tr("Scripter");
- icon = IconManager::instance()->loadPixmap("python_16.png");
+ icon = IconManager::instance().loadPixmap("python_16.png");
return true;
}
Modified: trunk/Scribus/scribus/plugins/shapes/shapepalette.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23054&path=/trunk/Scribus/scribus/plugins/shapes/shapepalette.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/shapes/shapepalette.cpp (original)
+++ trunk/Scribus/scribus/plugins/shapes/shapepalette.cpp Sat Jun 29 20:17:20 2019
@@ -291,14 +291,14 @@
buttonLayout->setMargin( 0 );
importButton = new QToolButton(this);
importButton->setSizePolicy(QSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed));
- importButton->setIcon(IconManager::instance()->loadIcon("16/document-open.png"));
+ 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->setIcon(IconManager::instance().loadIcon("16/close.png"));
closeButton->setIconSize(QSize(16, 16));
buttonLayout->addWidget( closeButton );
vLayout->addLayout( buttonLayout );
Modified: trunk/Scribus/scribus/plugins/short-words/shortwords.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23054&path=/trunk/Scribus/scribus/plugins/short-words/shortwords.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/short-words/shortwords.cpp (original)
+++ trunk/Scribus/scribus/plugins/short-words/shortwords.cpp Sat Jun 29 20:17:20 2019
@@ -162,6 +162,6 @@
panel = new Prefs_ShortWords(parent);
Q_CHECK_PTR(panel);
caption = tr("Short Words");
- icon = IconManager::instance()->loadPixmap("shortwords_16.png");
+ icon = IconManager::instance().loadPixmap("shortwords_16.png");
return true;
}
Modified: trunk/Scribus/scribus/plugins/tools/2geomtools/meshdistortion/meshdistortiondialog.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23054&path=/trunk/Scribus/scribus/plugins/tools/2geomtools/meshdistortion/meshdistortiondialog.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/tools/2geomtools/meshdistortion/meshdistortiondialog.cpp (original)
+++ trunk/Scribus/scribus/plugins/tools/2geomtools/meshdistortion/meshdistortiondialog.cpp Sat Jun 29 20:17:20 2019
@@ -124,9 +124,9 @@
{
setupUi(this);
setModal(true);
- setWindowIcon(QIcon(IconManager::instance()->loadIcon("AppIcon.png")));
- buttonZoomOut->setIcon(QIcon(IconManager::instance()->loadIcon("16/zoom-out.png")));
- buttonZoomIn->setIcon(QIcon(IconManager::instance()->loadIcon("16/zoom-in.png")));
+ setWindowIcon(QIcon(IconManager::instance().loadIcon("AppIcon.png")));
+ buttonZoomOut->setIcon(QIcon(IconManager::instance().loadIcon("16/zoom-out.png")));
+ buttonZoomIn->setIcon(QIcon(IconManager::instance().loadIcon("16/zoom-in.png")));
m_doc = doc;
addItemsToScene(doc->m_Selection, doc, nullptr, nullptr);
for(unsigned dim = 0; dim < 2; dim++)
Modified: trunk/Scribus/scribus/plugins/tools/lenseffects/lensdialog.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23054&path=/trunk/Scribus/scribus/plugins/tools/lenseffects/lensdialog.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/tools/lenseffects/lensdialog.cpp (original)
+++ trunk/Scribus/scribus/plugins/tools/lenseffects/lensdialog.cpp Sat Jun 29 20:17:20 2019
@@ -253,8 +253,8 @@
setupUi(this);
buttonRemove->setEnabled(false);
setModal(true);
- buttonZoomOut->setIcon(QIcon(IconManager::instance()->loadIcon("16/zoom-out.png")));
- buttonZoomI->setIcon(QIcon(IconManager::instance()->loadIcon("16/zoom-in.png")));
+ buttonZoomOut->setIcon(QIcon(IconManager::instance().loadIcon("16/zoom-out.png")));
+ buttonZoomI->setIcon(QIcon(IconManager::instance().loadIcon("16/zoom-in.png")));
addItemsToScene(doc->m_Selection, doc, nullptr, nullptr);
previewWidget->setRenderHint(QPainter::Antialiasing);
previewWidget->setScene(&scene);
Modified: trunk/Scribus/scribus/plugins/tools/pathcut/pathcut.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23054&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 Sat Jun 29 20:17:20 2019
@@ -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.icon1 = IconManager::instance().loadPixmap("22/transform-crop-and-resize.png");
+ m_actionInfo.icon2 = IconManager::instance().loadPixmap("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/pathfinderdialog.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23054&path=/trunk/Scribus/scribus/plugins/tools/pathfinder/pathfinderdialog.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/tools/pathfinder/pathfinderdialog.cpp (original)
+++ trunk/Scribus/scribus/plugins/tools/pathfinder/pathfinderdialog.cpp Sat Jun 29 20:17:20 2019
@@ -38,17 +38,17 @@
m_doc = doc;
setupUi(this);
setModal(true);
- setWindowIcon(QIcon(IconManager::instance()->loadIcon("AppIcon.png")));
+ setWindowIcon(QIcon(IconManager::instance().loadIcon("AppIcon.png")));
opCombine->setText( QString() );
opSubtraction->setText( QString() );
opIntersection->setText( QString() );
opExclusion->setText( QString() );
opParts->setText( QString() );
- opExclusion->setIcon(QIcon(IconManager::instance()->loadIcon("pathexclusion.png")));
- opIntersection->setIcon(QIcon(IconManager::instance()->loadIcon("pathintersection.png")));
- opParts->setIcon(QIcon(IconManager::instance()->loadIcon("pathparts.png")));
- opSubtraction->setIcon(QIcon(IconManager::instance()->loadIcon("pathsubtraction.png")));
- opCombine->setIcon(QIcon(IconManager::instance()->loadIcon("pathunite.png")));
+ opExclusion->setIcon(QIcon(IconManager::instance().loadIcon("pathexclusion.png")));
+ opIntersection->setIcon(QIcon(IconManager::instance().loadIcon("pathintersection.png")));
+ opParts->setIcon(QIcon(IconManager::instance().loadIcon("pathparts.png")));
+ opSubtraction->setIcon(QIcon(IconManager::instance().loadIcon("pathsubtraction.png")));
+ opCombine->setIcon(QIcon(IconManager::instance().loadIcon("pathunite.png")));
otherColorComboLine->setPixmapType(ColorCombo::fancyPixmaps);
otherColorComboLine->setColors(m_doc->PageColors, true);
otherColorComboFill->setPixmapType(ColorCombo::fancyPixmaps);
@@ -151,7 +151,7 @@
QPainter p;
p.begin(&pm);
p.setRenderHint(QPainter::Antialiasing, true);
- QBrush b(QColor(205,205,205), IconManager::instance()->loadPixmap("testfill.png"));
+ QBrush b(QColor(205,205,205), IconManager::instance().loadPixmap("testfill.png"));
p.fillRect(0, 0, pm.width(), pm.height(), b);
QRectF bb = m_input1.boundingRect().united(m_input2.boundingRect());
p.translate(5, 5);
@@ -170,7 +170,7 @@
QPainter p;
p.begin(&pm);
p.setRenderHint(QPainter::Antialiasing, true);
- QBrush b(QColor(205,205,205), IconManager::instance()->loadPixmap("testfill.png"));
+ QBrush b(QColor(205,205,205), IconManager::instance().loadPixmap("testfill.png"));
p.fillRect(0, 0, pm.width(), pm.height(), b);
QRectF bb = m_input1.boundingRect().united(m_input2.boundingRect());
p.translate(5, 5);
Modified: trunk/Scribus/scribus/scribus.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23054&path=/trunk/Scribus/scribus/scribus.cpp
==============================================================================
--- trunk/Scribus/scribus/scribus.cpp (original)
+++ trunk/Scribus/scribus/scribus.cpp Sat Jun 29 20:17:20 2019
@@ -307,7 +307,7 @@
#ifdef Q_OS_MAC
//commenting this out until this is resolved :https://bugreports.qt.io/browse/QTBUG-44565
//ScQApp->setAttribute(Qt::AA_DontShowIconsInMenus);
- //noIcon = IconManager::instance()->loadPixmap("noicon.png");
+ //noIcon = IconManager::instance().loadPixmap("noicon.png");
#endif
m_doc = nullptr;
m_tocGenerator = nullptr;
@@ -345,7 +345,7 @@
setWindowTitle(scribusTitle);
setAttribute(Qt::WA_KeyCompression, false);
setAttribute(Qt::WA_InputMethodEnabled, true);
- setWindowIcon(IconManager::instance()->loadIcon("AppIcon.png"));
+ setWindowIcon(IconManager::instance().loadIcon("AppIcon.png"));
setObjectName("MainWindow");
scrActionGroups.clear();
scrActions.clear();
@@ -503,11 +503,11 @@
QByteArray stylesheet;
if (loadRawText(ScPaths::instance().libDir() + "scribus.css", stylesheet))
{
- QString downArrow(IconManager::instance()->pathForIcon("16/go-down.png"));
+ QString downArrow(IconManager::instance().pathForIcon("16/go-down.png"));
QByteArray da;
da.append(downArrow);
stylesheet.replace("___downArrow___", da);
- QString toolbararrow(IconManager::instance()->pathForIcon("stylesheet/down_arrow.png"));
+ QString toolbararrow(IconManager::instance().pathForIcon("stylesheet/down_arrow.png"));
QByteArray tba;
tba.append(toolbararrow);
stylesheet.replace("___tb_menu_arrow___", tba);
@@ -1279,9 +1279,9 @@
zoomInToolbarButton->setDefault( false );
zoomInToolbarButton->setAutoDefault( false );
- 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"));
+ 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 );
@@ -1659,7 +1659,7 @@
{
if ((doc->appMode == modeMagnifier) && (kk == Qt::Key_Shift))
{
- view->setCursor(IconManager::instance()->loadCursor("lupezm.png"));
+ view->setCursor(IconManager::instance().loadCursor("lupezm.png"));
return;
}
}
@@ -1889,7 +1889,7 @@
view->requestMode(modeNormal);
if (doc->appMode == modeMagnifier)
- view->setCursor(IconManager::instance()->loadCursor("lupez.png"));
+ view->setCursor(IconManager::instance().loadCursor("lupez.png"));
}
if (k->isAutoRepeat() || !m__arrowKeyDown)
return;
@@ -3182,7 +3182,7 @@
md->setUrls(urls);
QDrag* dr = new QDrag(this);
dr->setMimeData(md);
- const QPixmap& dragCursor = IconManager::instance()->loadPixmap("dragpix.png");
+ const QPixmap& dragCursor = IconManager::instance().loadPixmap("dragpix.png");
dr->setPixmap(dragCursor);
dr->exec();
}
Modified: trunk/Scribus/scribus/scribusapp.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23054&path=/trunk/Scribus/scribus/scribusapp.cpp
==============================================================================
--- trunk/Scribus/scribus/scribusapp.cpp (original)
+++ trunk/Scribus/scribus/scribusapp.cpp Sat Jun 29 20:17:20 2019
@@ -118,7 +118,6 @@
PrefsManager::deleteInstance();
LocaleManager::deleteInstance();
LanguageManager::deleteInstance();
- IconManager::deleteInstance();
}
void ScribusQApp::initLang()
Modified: trunk/Scribus/scribus/scribuscore.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23054&path=/trunk/Scribus/scribus/scribuscore.cpp
==============================================================================
--- trunk/Scribus/scribus/scribuscore.cpp (original)
+++ trunk/Scribus/scribus/scribuscore.cpp Sat Jun 29 20:17:20 2019
@@ -48,7 +48,8 @@
//extern ScribusQApp* ScQApp;
-ScribusCore::ScribusCore() : defaultEngine(colorMgmtEngineFactory.createDefaultEngine())
+ScribusCore::ScribusCore() : defaultEngine(colorMgmtEngineFactory.createDefaultEngine()),
+ m_iconManager(IconManager::instance())
{
m_ScribusInitialized = false;
m_currScMW = 0;
@@ -57,7 +58,6 @@
fileWatcher = nullptr;
m_SplashScreen = nullptr;
- m_iconManager = nullptr;
m_undoManager = nullptr;
m_prefsManager = nullptr;
@@ -165,8 +165,7 @@
CommonStrings::languageChange();
LanguageManager::instance()->languageChange();
- m_iconManager = IconManager::instance();
- if (!m_iconManager->setup())
+ if (!m_iconManager.setup())
return EXIT_FAILURE;
// FIXME: Splash needs the prefs loaded by initDefaults() to know if it must force the image to grayscale
@@ -191,10 +190,10 @@
setSplashStatus( tr("Reading Preferences") );
m_prefsManager->ReadPrefs();
m_prefsManager->appPrefs.uiPrefs.showSplashOnStartup=showSplash;
- if (!m_iconManager->setActiveFromPrefs(m_prefsManager->appPrefs.uiPrefs.iconSet))
+ if (!m_iconManager.setActiveFromPrefs(m_prefsManager->appPrefs.uiPrefs.iconSet))
{
//reset prefs name to chosen name based on version, when prefs is empty or not found
- m_prefsManager->appPrefs.uiPrefs.iconSet=m_iconManager->activeSetBasename();
+ m_prefsManager->appPrefs.uiPrefs.iconSet=m_iconManager.activeSetBasename();
}
m_HaveGS = testGSAvailability();
@@ -223,7 +222,7 @@
m_SplashScreen = nullptr;
if (!showSplash)
return;
- QPixmap pix = IconManager::instance()->loadPixmap("scribus_splash.png", true);
+ QPixmap pix = IconManager::instance().loadPixmap("scribus_splash.png", true);
m_SplashScreen = new ScSplashScreen(pix, Qt::WindowStaysOnTopHint);
if (m_SplashScreen != nullptr)
m_SplashScreen->show();
Modified: trunk/Scribus/scribus/scribuscore.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23054&path=/trunk/Scribus/scribus/scribuscore.h
==============================================================================
--- trunk/Scribus/scribus/scribuscore.h (original)
+++ trunk/Scribus/scribus/scribuscore.h Sat Jun 29 20:17:20 2019
@@ -132,7 +132,7 @@
int m_currScMW;
ScSplashScreen *m_SplashScreen;
- IconManager *m_iconManager;
+ IconManager& m_iconManager;
UndoManager *m_undoManager;
PrefsManager *m_prefsManager;
bool m_ScribusInitialized;
Modified: trunk/Scribus/scribus/scribusview.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23054&path=/trunk/Scribus/scribus/scribusview.cpp
==============================================================================
--- trunk/Scribus/scribus/scribusview.cpp (original)
+++ trunk/Scribus/scribus/scribusview.cpp Sat Jun 29 20:17:20 2019
@@ -223,7 +223,7 @@
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 = 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);
connect(endEditButton, SIGNAL(clicked()), m_ScMW, SLOT(slotEndSpecialEdit()));
Modified: trunk/Scribus/scribus/scribuswin.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23054&path=/trunk/Scribus/scribus/scribuswin.cpp
==============================================================================
--- trunk/Scribus/scribus/scribuswin.cpp (original)
+++ trunk/Scribus/scribus/scribuswin.cpp Sat Jun 29 20:17:20 2019
@@ -41,7 +41,7 @@
m_View(nullptr),
m_winIndex(0)
{
- setWindowIcon(IconManager::instance()->loadIcon("AppIcon2.png"));
+ setWindowIcon(IconManager::instance().loadIcon("AppIcon2.png"));
setAttribute(Qt::WA_DeleteOnClose);
m_Doc = doc;
}
Modified: trunk/Scribus/scribus/ui/about.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23054&path=/trunk/Scribus/scribus/ui/about.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/about.cpp (original)
+++ trunk/Scribus/scribus/ui/about.cpp Sat Jun 29 20:17:20 2019
@@ -95,7 +95,7 @@
m_mode = diaMode;
m_firstShow = true;
setWindowTitle( tr("About Scribus %1").arg(VERSION) );
- setWindowIcon(IconManager::instance()->loadIcon("AppIcon.png", true));
+ setWindowIcon(IconManager::instance().loadIcon("AppIcon.png", true));
setModal(true);
aboutLayout = new QVBoxLayout( this );
aboutLayout->setSpacing( 6 );
@@ -107,7 +107,7 @@
tabLayout1->setSpacing( 6 );
tabLayout1->setMargin( 15 );
pixmapLabel1 = new QLabel( tab );
- pixmapLabel1->setPixmap(IconManager::instance()->loadPixmap("scribus_splash.png", true));
+ pixmapLabel1->setPixmap(IconManager::instance().loadPixmap("scribus_splash.png", true));
pixmapLabel1->setFixedSize(QSize(pixmapLabel1->pixmap()->width(), pixmapLabel1->pixmap()->height()));
pixmapLabel1->setAlignment(Qt::AlignCenter);
tabLayout1->addWidget( pixmapLabel1 );
Modified: trunk/Scribus/scribus/ui/adjustcmsdialog.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23054&path=/trunk/Scribus/scribus/ui/adjustcmsdialog.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/adjustcmsdialog.cpp (original)
+++ trunk/Scribus/scribus/ui/adjustcmsdialog.cpp Sat Jun 29 20:17:20 2019
@@ -14,7 +14,7 @@
AdjustCmsDialog::AdjustCmsDialog( QWidget* parent, ScribusDoc* doc ) : QDialog( parent )
{
setWindowTitle( tr("CMS Settings") );
- setWindowIcon(IconManager::instance()->loadPixmap("AppIcon.png"));
+ setWindowIcon(IconManager::instance().loadPixmap("AppIcon.png"));
setModal(true);
queryLayout = new QVBoxLayout( this );
queryLayout->setMargin(5);
Modified: trunk/Scribus/scribus/ui/aligndistribute.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23054&path=/trunk/Scribus/scribus/ui/aligndistribute.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/aligndistribute.cpp (original)
+++ trunk/Scribus/scribus/ui/aligndistribute.cpp Sat Jun 29 20:17:20 2019
@@ -150,38 +150,38 @@
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"));
+ 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);
Modified: trunk/Scribus/scribus/ui/alignselect.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23054&path=/trunk/Scribus/scribus/ui/alignselect.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/alignselect.cpp (original)
+++ trunk/Scribus/scribus/ui/alignselect.cpp Sat Jun 29 20:17:20 2019
@@ -15,7 +15,7 @@
{
selected = 0;
- IconManager* im=IconManager::instance();
+ IconManager& im=IconManager::instance();
buttonGroup = new QButtonGroup(this);
GroupAlignLayout = new QHBoxLayout( this );
@@ -24,7 +24,7 @@
TextL = new QToolButton( this );
TextL->setMaximumSize( QSize( 22, 22 ) );
- TextL->setIcon(im->loadIcon("16/format-justify-left.png"));
+ TextL->setIcon(im.loadIcon("16/format-justify-left.png"));
TextL->setCheckable( true );
TextL->setChecked( true );
GroupAlignLayout->addWidget( TextL );
@@ -32,28 +32,28 @@
TextC = new QToolButton( this );
TextC->setMaximumSize( QSize( 22, 22 ) );
- TextC->setIcon(im->loadIcon("16/format-justify-center.png"));
+ TextC->setIcon(im.loadIcon("16/format-justify-center.png"));
TextC->setCheckable( true );
GroupAlignLayout->addWidget( TextC );
buttonGroup->addButton(TextC, 1);
TextR = new QToolButton( this );
TextR->setMaximumSize( QSize( 22, 22 ) );
- TextR->setIcon(im->loadIcon("16/format-justify-right.png"));
+ TextR->setIcon(im.loadIcon("16/format-justify-right.png"));
TextR->setCheckable( true );
GroupAlignLayout->addWidget( TextR );
buttonGroup->addButton(TextR, 2);
TextB = new QToolButton( this );
TextB->setMaximumSize( QSize( 22, 22 ) );
- TextB->setIcon(im->loadIcon("16/format-justify-fill-block.png"));
+ TextB->setIcon(im.loadIcon("16/format-justify-fill-block.png"));
TextB->setCheckable( true );
GroupAlignLayout->addWidget( TextB );
buttonGroup->addButton(TextB, 3);
TextF = new QToolButton( this );
TextF->setMaximumSize( QSize( 22, 22 ) );
- TextF->setIcon(im->loadIcon("16/format-justify-fill.png"));
+ TextF->setIcon(im.loadIcon("16/format-justify-fill.png"));
TextF->setCheckable( true );
GroupAlignLayout->addWidget( TextF );
buttonGroup->addButton(TextF, 4);
@@ -66,11 +66,10 @@
if ((s >= 0) && (s < 5))
buttonGroup->button(s)->setChecked(true);
- IconManager* im=IconManager::instance();
if (d == ParagraphStyle::RTL)
- TextB->setIcon(im->loadIcon("16/format-justify-fill-block-right.png"));
+ TextB->setIcon(IconManager::instance().loadIcon("16/format-justify-fill-block-right.png"));
else
- TextB->setIcon(im->loadIcon("16/format-justify-fill-block.png"));
+ TextB->setIcon(IconManager::instance().loadIcon("16/format-justify-fill-block.png"));
}
int AlignSelect::getStyle()
Modified: trunk/Scribus/scribus/ui/annot.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23054&path=/trunk/Scribus/scribus/ui/annot.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/annot.cpp (original)
+++ trunk/Scribus/scribus/ui/annot.cpp Sat Jun 29 20:17:20 2019
@@ -61,7 +61,7 @@
setupUi(this);
setModal(true);
setWindowTitle( tr( "Field Properties" ) );
- setWindowIcon(IconManager::instance()->loadIcon("AppIcon.png"));
+ setWindowIcon(IconManager::instance().loadIcon("AppIcon.png"));
item = it;
Width = b;
Height = h;
Modified: trunk/Scribus/scribus/ui/applytemplatedialog.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23054&path=/trunk/Scribus/scribus/ui/applytemplatedialog.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/applytemplatedialog.cpp (original)
+++ trunk/Scribus/scribus/ui/applytemplatedialog.cpp Sat Jun 29 20:17:20 2019
@@ -50,7 +50,7 @@
{
setModal(true);
setWindowTitle( tr( "Possible Hyphenation" ));
- setWindowIcon(IconManager::instance()->loadIcon("AppIcon.png"));
+ setWindowIcon(IconManager::instance().loadIcon("AppIcon.png"));
ApplyMasterPageDialogLayout = new QVBoxLayout(this);
ApplyMasterPageDialogLayout->setMargin(10);
ApplyMasterPageDialogLayout->setSpacing(5);
Modified: trunk/Scribus/scribus/ui/autoformbuttongroup.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23054&path=/trunk/Scribus/scribus/ui/autoformbuttongroup.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/autoformbuttongroup.cpp (original)
+++ trunk/Scribus/scribus/ui/autoformbuttongroup.cpp Sat Jun 29 20:17:20 2019
@@ -681,45 +681,45 @@
if (nr < 18)
{
QString strSize=QString("%1").arg(pixmapSize);
- IconManager* im=IconManager::instance();
+ IconManager& im=IconManager::instance();
switch (nr)
{
case 0:
- return im->loadPixmap(strSize+"/draw-rectangle.png");
+ return im.loadPixmap(strSize+"/draw-rectangle.png");
case 1:
- return im->loadPixmap(strSize+"/draw-ellipse.png");
+ return im.loadPixmap(strSize+"/draw-ellipse.png");
case 2:
- return im->loadPixmap(strSize+"/draw-triangle.png");
+ return im.loadPixmap(strSize+"/draw-triangle.png");
case 3:
- return im->loadPixmap(strSize+"/draw-cross.png");
+ return im.loadPixmap(strSize+"/draw-cross.png");
case 4:
- return im->loadPixmap(strSize+"/draw-arrow-back.png");
+ return im.loadPixmap(strSize+"/draw-arrow-back.png");
case 5:
- return im->loadPixmap(strSize+"/draw-arrow-forward.png");
+ return im.loadPixmap(strSize+"/draw-arrow-forward.png");
case 6:
- return im->loadPixmap(strSize+"/draw-arrow-up.png");
+ return im.loadPixmap(strSize+"/draw-arrow-up.png");
case 7:
- return im->loadPixmap(strSize+"/draw-arrow-down.png");
+ return im.loadPixmap(strSize+"/draw-arrow-down.png");
case 8:
- return im->loadPixmap(strSize+"/draw-halfcircle1.png");
+ return im.loadPixmap(strSize+"/draw-halfcircle1.png");
case 9:
- return im->loadPixmap(strSize+"/draw-halfcircle2.png");
+ return im.loadPixmap(strSize+"/draw-halfcircle2.png");
case 10:
- return im->loadPixmap(strSize+"/draw-halfcircle3.png");
+ return im.loadPixmap(strSize+"/draw-halfcircle3.png");
case 11:
- return im->loadPixmap(strSize+"/draw-halfcircle4.png");
+ return im.loadPixmap(strSize+"/draw-halfcircle4.png");
case 12:
- return im->loadPixmap(strSize+"/draw-triangle1.png");
+ return im.loadPixmap(strSize+"/draw-triangle1.png");
case 13:
- return im->loadPixmap(strSize+"/draw-triangle2.png");
+ return im.loadPixmap(strSize+"/draw-triangle2.png");
case 14:
- return im->loadPixmap(strSize+"/draw-triangle3.png");
+ return im.loadPixmap(strSize+"/draw-triangle3.png");
case 15:
- return im->loadPixmap(strSize+"/draw-triangle4.png");
+ return im.loadPixmap(strSize+"/draw-triangle4.png");
case 16:
- return im->loadPixmap(strSize+"/draw-square-inverted-corners.png");
+ return im.loadPixmap(strSize+"/draw-square-inverted-corners.png");
case 17:
- return im->loadPixmap(strSize+"/draw-donut.png");
+ return im.loadPixmap(strSize+"/draw-donut.png");
}
}
}
Modified: trunk/Scribus/scribus/ui/buttonicon.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23054&path=/trunk/Scribus/scribus/ui/buttonicon.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/buttonicon.cpp (original)
+++ trunk/Scribus/scribus/ui/buttonicon.cpp Sat Jun 29 20:17:20 2019
@@ -27,7 +27,7 @@
Item = ite;
setModal(true);
setWindowTitle( tr( "Icon Placement" ) );
- setWindowIcon(IconManager::instance()->loadPixmap("AppIcon.png"));
+ setWindowIcon(IconManager::instance().loadPixmap("AppIcon.png"));
ButtonIconLayout = new QVBoxLayout( this );
ButtonIconLayout->setMargin(10);
ButtonIconLayout->setSpacing(5);
Modified: trunk/Scribus/scribus/ui/charselect.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23054&path=/trunk/Scribus/scribus/ui/charselect.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/charselect.cpp (original)
+++ trunk/Scribus/scribus/ui/charselect.cpp Sat Jun 29 20:17:20 2019
@@ -28,11 +28,11 @@
paletteFileMask = tr("Scribus Char Palette (*.ucp);;All Files (*)");
- 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"));
+ 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");
Modified: trunk/Scribus/scribus/ui/checkDocument.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23054&path=/trunk/Scribus/scribus/ui/checkDocument.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/checkDocument.cpp (original)
+++ trunk/Scribus/scribus/ui/checkDocument.cpp Sat Jun 29 20:17:20 2019
@@ -48,9 +48,9 @@
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");
+ graveError = IconManager::instance().loadPixmap("22/dialog-error.png");
+ onlyWarning = IconManager::instance().loadPixmap("22/dialog-warning.png");
+ noErrors = IconManager::instance().loadPixmap("ok.png");
checkDocumentLayout = new QVBoxLayout( this );
checkDocumentLayout->setMargin(5);
checkDocumentLayout->setSpacing(5);
Modified: trunk/Scribus/scribus/ui/cmykfw.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23054&path=/trunk/Scribus/scribus/ui/cmykfw.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/cmykfw.cpp (original)
+++ trunk/Scribus/scribus/ui/cmykfw.cpp Sat Jun 29 20:17:20 2019
@@ -62,7 +62,7 @@
isHLC = false;
EColors = Colors;
CurrSwatch.clear();
- alertIcon = IconManager::instance()->loadPixmap("alert.png");
+ alertIcon = IconManager::instance().loadPixmap("alert.png");
imageA = QPixmap(50,50);
imageA.fill( ScColorEngine::getDisplayColor(orig, m_doc) );
if ( ScColorEngine::isOutOfGamut(orig, m_doc) )
@@ -75,7 +75,7 @@
resize( 498, 306 );
setWindowTitle( tr( "Edit Color" ) );
- setWindowIcon(IconManager::instance()->loadIcon("AppIcon.png"));
+ setWindowIcon(IconManager::instance().loadIcon("AppIcon.png"));
setupUi(this);
ColorMap->setDoc(doc);
Modified: trunk/Scribus/scribus/ui/colorchart.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23054&path=/trunk/Scribus/scribus/ui/colorchart.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/colorchart.cpp (original)
+++ trunk/Scribus/scribus/ui/colorchart.cpp Sat Jun 29 20:17:20 2019
@@ -127,7 +127,7 @@
if (doSoftProofing && doGamutCheck)
{
QPainter p;
- QBrush b(QColor(205,205,205), IconManager::instance()->loadPixmap("testfill.png"));
+ QBrush b(QColor(205,205,205), IconManager::instance().loadPixmap("testfill.png"));
p.begin(&image);
p.fillRect(0, 0, image.width(), image.height(), b);
p.end();
Modified: trunk/Scribus/scribus/ui/colorlistbox.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23054&path=/trunk/Scribus/scribus/ui/colorlistbox.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/colorlistbox.cpp (original)
+++ trunk/Scribus/scribus/ui/colorlistbox.cpp Sat Jun 29 20:17:20 2019
@@ -129,12 +129,12 @@
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);
+ 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;
}
Modified: trunk/Scribus/scribus/ui/colorsandfills.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23054&path=/trunk/Scribus/scribus/ui/colorsandfills.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/colorsandfills.cpp (original)
+++ trunk/Scribus/scribus/ui/colorsandfills.cpp Sat Jun 29 20:17:20 2019
@@ -76,7 +76,7 @@
m_doc = doc;
m_colorList = doco;
mainWin = scMW;
- setWindowIcon(IconManager::instance()->loadIcon("AppIcon.png"));
+ setWindowIcon(IconManager::instance().loadIcon("AppIcon.png"));
dataTree->setContextMenuPolicy(Qt::CustomContextMenu);
dataTree->setIconSize(QSize(60, 48));
colorItems = new QTreeWidgetItem(dataTree);
@@ -225,7 +225,7 @@
VGradient gr = dialogGradients.value(patK[a]);
QImage pixm(48, 12, QImage::Format_ARGB32);
QPainter pb;
- QBrush b(QColor(205,205,205), IconManager::instance()->loadPixmap("testfill.png"));
+ QBrush b(QColor(205,205,205), IconManager::instance().loadPixmap("testfill.png"));
pb.begin(&pixm);
pb.fillRect(0, 0, 48, 12, b);
pb.end();
Modified: trunk/Scribus/scribus/ui/cpalette.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23054&path=/trunk/Scribus/scribus/ui/cpalette.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/cpalette.cpp (original)
+++ trunk/Scribus/scribus/ui/cpalette.cpp Sat Jun 29 20:17:20 2019
@@ -721,7 +721,7 @@
VGradient gr = gradientList->value(patK[a]);
QImage pixm(48, 12, QImage::Format_ARGB32_Premultiplied);
QPainter pb;
- QBrush b(QColor(205,205,205), IconManager::instance()->loadPixmap("testfill.png"));
+ QBrush b(QColor(205,205,205), IconManager::instance().loadPixmap("testfill.png"));
pb.begin(&pixm);
pb.fillRect(0, 0, 48, 12, b);
pb.end();
Modified: trunk/Scribus/scribus/ui/cupsoptions.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23054&path=/trunk/Scribus/scribus/ui/cupsoptions.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/cupsoptions.cpp (original)
+++ trunk/Scribus/scribus/ui/cupsoptions.cpp Sat Jun 29 20:17:20 2019
@@ -53,7 +53,7 @@
FlagsOpt.clear();
setModal(true);
setWindowTitle( tr( "Printer Options" ) );
- setWindowIcon(IconManager::instance()->loadIcon("AppIcon.png"));
+ setWindowIcon(IconManager::instance().loadIcon("AppIcon.png"));
prefs = PrefsManager::instance()->prefsFile->getContext("cups_options");
setSizeGripEnabled(true);
CupsOptionsLayout = new QVBoxLayout( this );
Modified: trunk/Scribus/scribus/ui/curvewidget.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23054&path=/trunk/Scribus/scribus/ui/curvewidget.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/curvewidget.cpp (original)
+++ trunk/Scribus/scribus/ui/curvewidget.cpp Sat Jun 29 20:17:20 2019
@@ -329,19 +329,19 @@
invertButton = new QPushButton( this );
invertButton->setSizePolicy(QSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed));
- invertButton->setIcon( IconManager::instance()->loadIcon("invert.png") );
+ invertButton->setIcon( IconManager::instance().loadIcon("invert.png") );
invertButton->setIconSize(QSize(22, 22));
layout1->addWidget( invertButton );
resetButton = new QPushButton( this );
resetButton->setSizePolicy(QSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed));
- resetButton->setIcon( IconManager::instance()->loadIcon("reload.png") );
+ resetButton->setIcon( IconManager::instance().loadIcon("reload.png") );
resetButton->setIconSize(QSize(22, 22));
layout1->addWidget( resetButton );
linearButton = new QPushButton( this );
QIcon ic;
- ic.addPixmap(IconManager::instance()->loadPixmap("curvebezier.png"), QIcon::Normal, QIcon::Off);
- ic.addPixmap(IconManager::instance()->loadPixmap("curvelinear.png"), QIcon::Normal, QIcon::On);
+ ic.addPixmap(IconManager::instance().loadPixmap("curvebezier.png"), QIcon::Normal, QIcon::Off);
+ ic.addPixmap(IconManager::instance().loadPixmap("curvelinear.png"), QIcon::Normal, QIcon::On);
linearButton->setIcon(ic);
linearButton->setCheckable( true );
linearButton->setChecked(false);
@@ -352,13 +352,13 @@
layout1->addItem( spacer1 );
loadButton = new QPushButton( this );
- loadButton->setIcon( IconManager::instance()->loadIcon("22/document-open.png") );
+ loadButton->setIcon( IconManager::instance().loadIcon("22/document-open.png") );
loadButton->setIconSize(QSize(22, 22));
loadButton->setSizePolicy(QSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed));
layout1->addWidget( loadButton );
saveButton = new QPushButton( this );
- saveButton->setIcon( IconManager::instance()->loadIcon("22/document-save-as.png") );
+ saveButton->setIcon( IconManager::instance().loadIcon("22/document-save-as.png") );
saveButton->setIconSize(QSize(22, 22));
saveButton->setSizePolicy(QSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed));
layout1->addWidget( saveButton );
Modified: trunk/Scribus/scribus/ui/customfdialog.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23054&path=/trunk/Scribus/scribus/ui/customfdialog.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/customfdialog.cpp (original)
+++ trunk/Scribus/scribus/ui/customfdialog.cpp Sat Jun 29 20:17:20 2019
@@ -70,15 +70,15 @@
size_t array = sizeof(tmp) / sizeof(*tmp);
for (uint a = 0; a < array; ++a)
fmts.append(tmp[a]);
- IconManager* im=IconManager::instance();
- imagepm = im->loadIcon("16/image-x-generic.png");
- pspm = im->loadIcon("postscript.png");
- txtpm = im->loadIcon("txt.png");
- docpm = im->loadIcon("doc.png");
- pdfpm = im->loadIcon("pdf.png");
- oosxdpm = im->loadIcon("ooo_draw.png");
- oosxwpm = im->loadIcon("ooo_writer.png");
- vectorpm = im->loadIcon("vectorgfx.png");
+ IconManager& im=IconManager::instance();
+ imagepm = im.loadIcon("16/image-x-generic.png");
+ pspm = im.loadIcon("postscript.png");
+ txtpm = im.loadIcon("txt.png");
+ docpm = im.loadIcon("doc.png");
+ pdfpm = im.loadIcon("pdf.png");
+ oosxdpm = im.loadIcon("ooo_draw.png");
+ oosxwpm = im.loadIcon("ooo_writer.png");
+ vectorpm = im.loadIcon("vectorgfx.png");
}
QIcon ImIconProvider::icon(const QFileInfo &fi) const
@@ -175,7 +175,7 @@
QString tmp2 = "";
QImage im2 = im.scaled(w - 5, h - 44, Qt::KeepAspectRatio, Qt::SmoothTransformation);
QPainter p;
- QBrush b(QColor(205,205,205), IconManager::instance()->loadPixmap("testfill.png"));
+ QBrush b(QColor(205,205,205), IconManager::instance().loadPixmap("testfill.png"));
// Qt4 FIXME imho should be better
pm = *pixmap();
p.begin(&pm);
@@ -214,7 +214,7 @@
desc += value2String(im.text("YSize").toDouble(), PrefsManager::instance()->appPrefs.docSetupPrefs.docUnitIndex, true, true);
im = im.scaled(w - 5, h - 21, Qt::KeepAspectRatio, Qt::SmoothTransformation);
QPainter p;
- QBrush b(QColor(205,205,205), IconManager::instance()->loadPixmap("testfill.png"));
+ QBrush b(QColor(205,205,205), IconManager::instance().loadPixmap("testfill.png"));
pm = *pixmap();
p.begin(&pm);
p.fillRect(0, 0, w, h-21, b);
@@ -239,7 +239,7 @@
QImage im = pre->createPreview(f);
im = im.scaled(w - 5, h - 21, Qt::KeepAspectRatio, Qt::SmoothTransformation);
QPainter p;
- QBrush b(QColor(205,205,205), IconManager::instance()->loadPixmap("testfill.png"));
+ QBrush b(QColor(205,205,205), IconManager::instance().loadPixmap("testfill.png"));
pm = *pixmap();
p.begin(&pm);
p.fillRect(0, 0, w, h-21, b);
@@ -287,7 +287,7 @@
{
setModal(true);
setWindowTitle(caption);
- setWindowIcon(IconManager::instance()->loadIcon("AppIcon.png"));
+ setWindowIcon(IconManager::instance().loadIcon("AppIcon.png"));
vboxLayout = new QVBoxLayout(this);
vboxLayout->setSpacing(5);
vboxLayout->setMargin(10);
Modified: trunk/Scribus/scribus/ui/cxfimportdialog.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23054&path=/trunk/Scribus/scribus/ui/cxfimportdialog.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/cxfimportdialog.cpp (original)
+++ trunk/Scribus/scribus/ui/cxfimportdialog.cpp Sat Jun 29 20:17:20 2019
@@ -17,9 +17,9 @@
setupUi(this);
setDefaultPriorities();
- buttonUp->setIcon(IconManager::instance()->loadIcon("16/go-up.png"));
+ buttonUp->setIcon(IconManager::instance().loadIcon("16/go-up.png"));
buttonUp->setEnabled(false);
- buttonDown->setIcon(IconManager::instance()->loadIcon("16/go-down.png"));
+ buttonDown->setIcon(IconManager::instance().loadIcon("16/go-down.png"));
buttonDown->setEnabled(false);
connect(buttonUp, SIGNAL(clicked()), this, SLOT(moveUp()));
Modified: trunk/Scribus/scribus/ui/dasheditor.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23054&path=/trunk/Scribus/scribus/ui/dasheditor.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/dasheditor.cpp (original)
+++ trunk/Scribus/scribus/ui/dasheditor.cpp Sat Jun 29 20:17:20 2019
@@ -201,7 +201,7 @@
QRect fpo;
if ((!Mpressed) && (m->y() < height()) && (m->y() > 16) && (m->x() > 9) && (m->x() < width()-9) && (DashValues.count() < 10))
{
- setCursor(IconManager::instance()->loadCursor("AddPoint.png", 1, 1));
+ setCursor(IconManager::instance().loadCursor("AddPoint.png", 1, 1));
for (int yg = 0; yg < StopM.count(); ++yg)
{
fpo = QRect(static_cast<int>(StopM[yg])+6, 16, 8, 13);
@@ -244,7 +244,7 @@
emit currStep(StopM[ActStop] / 10.0 - startX);
}
if ((Mpressed) && (outside || m->y() > 30) && (ActStop >= 0) && (StopM.count() > 2))
- qApp->changeOverrideCursor(IconManager::instance()->loadCursor("DelPoint.png", 1, 1));
+ qApp->changeOverrideCursor(IconManager::instance().loadCursor("DelPoint.png", 1, 1));
}
void DashPreview::leaveEvent(QEvent*)
@@ -252,7 +252,7 @@
if (Mpressed)
{
if ((ActStop >= 0) && (StopM.count() > 2))
- qApp->changeOverrideCursor(IconManager::instance()->loadCursor("DelPoint.png", 1, 1));
+ qApp->changeOverrideCursor(IconManager::instance().loadCursor("DelPoint.png", 1, 1));
else
qApp->changeOverrideCursor(QCursor(Qt::ArrowCursor));
}
Modified: trunk/Scribus/scribus/ui/dcolor.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23054&path=/trunk/Scribus/scribus/ui/dcolor.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/dcolor.cpp (original)
+++ trunk/Scribus/scribus/ui/dcolor.cpp Sat Jun 29 20:17:20 2019
@@ -26,7 +26,7 @@
setModal(true);
cList = colorList;
setWindowTitle( tr( "Delete Color" ) );
- setWindowIcon(IconManager::instance()->loadIcon("AppIcon.png"));
+ setWindowIcon(IconManager::instance().loadIcon("AppIcon.png"));
dialogLayout = new QVBoxLayout( this );
dialogLayout->setMargin(10);
dialogLayout->setSpacing(5);
Modified: trunk/Scribus/scribus/ui/delpages.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23054&path=/trunk/Scribus/scribus/ui/delpages.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/delpages.cpp (original)
+++ trunk/Scribus/scribus/ui/delpages.cpp Sat Jun 29 20:17:20 2019
@@ -16,7 +16,7 @@
{
setWindowTitle( tr( "Delete Pages" ) );
setModal(true);
- setWindowIcon(IconManager::instance()->loadIcon("AppIcon.png"));
+ setWindowIcon(IconManager::instance().loadIcon("AppIcon.png"));
dialogLayout = new QVBoxLayout( this );
dialogLayout->setSpacing( 5 );
dialogLayout->setMargin( 10 );
Modified: trunk/Scribus/scribus/ui/directionselect.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23054&path=/trunk/Scribus/scribus/ui/directionselect.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/directionselect.cpp (original)
+++ trunk/Scribus/scribus/ui/directionselect.cpp Sat Jun 29 20:17:20 2019
@@ -13,78 +13,77 @@
DirectionSelect::DirectionSelect(QWidget* parent) : QWidget(parent)
{
- selected = 0;
+ selected = 0;
- IconManager* im=IconManager::instance();
- buttonGroup = new QButtonGroup(this);
+ buttonGroup = new QButtonGroup(this);
- GroupSelectLayout = new QHBoxLayout( this );
- GroupSelectLayout->setSpacing( 0 );
- GroupSelectLayout->setMargin( 5 );
- GroupSelectLayout->setAlignment(Qt::AlignRight);
+ GroupSelectLayout = new QHBoxLayout( this );
+ GroupSelectLayout->setSpacing( 0 );
+ GroupSelectLayout->setMargin( 5 );
+ GroupSelectLayout->setAlignment(Qt::AlignRight);
- LTR = new QToolButton( this );
- LTR->setMaximumSize( QSize( 22, 22 ) );
- LTR->setIcon(im->loadIcon("16/text-direction-ltr.png"));
- LTR->setCheckable( true );
- LTR->setChecked( true );
- GroupSelectLayout->addWidget( LTR );
- buttonGroup->addButton(LTR, 0);
+ LTR = new QToolButton( this );
+ LTR->setMaximumSize( QSize( 22, 22 ) );
+ LTR->setIcon(IconManager::instance().loadIcon("16/text-direction-ltr.png"));
+ LTR->setCheckable( true );
+ LTR->setChecked( true );
+ GroupSelectLayout->addWidget( LTR );
+ buttonGroup->addButton(LTR, 0);
- RTL = new QToolButton( this );
- RTL->setMaximumSize( QSize( 22, 22 ) );
- RTL->setIcon(im->loadIcon("16/text-direction-rtl.png"));
- RTL->setCheckable( true );
- GroupSelectLayout->addWidget( RTL );
- buttonGroup->addButton(RTL, 1);
+ RTL = new QToolButton( this );
+ RTL->setMaximumSize( QSize( 22, 22 ) );
+ RTL->setIcon(IconManager::instance().loadIcon("16/text-direction-rtl.png"));
+ RTL->setCheckable( true );
+ GroupSelectLayout->addWidget( RTL );
+ buttonGroup->addButton(RTL, 1);
- resize(minimumSizeHint());
- connect(buttonGroup, SIGNAL(buttonClicked(int)), this, SLOT(setTypeStyle(int)));
+ resize(minimumSizeHint());
+ connect(buttonGroup, SIGNAL(buttonClicked(int)), this, SLOT(setTypeStyle(int)));
}
void DirectionSelect::setStyle(int s)
{
- if ((s >= 0) && (s < 2))
- buttonGroup->button(s)->setChecked(true);
+ if ((s >= 0) && (s < 2))
+ buttonGroup->button(s)->setChecked(true);
}
int DirectionSelect::getStyle()
{
- int ret = 0;
- if (LTR->isChecked())
- ret = 0;
- if (RTL->isChecked())
+ int ret = 0;
+ if (LTR->isChecked())
+ ret = 0;
+ if (RTL->isChecked())
ret = 1;
- return ret;
+ return ret;
}
void DirectionSelect::setTypeStyle(int a)
{
- selected = a;
- emit State(a);
+ selected = a;
+ emit State(a);
}
int DirectionSelect::selectedId()
{
- return selected;
+ return selected;
}
void DirectionSelect::changeEvent(QEvent *e)
{
- if (e->type() == QEvent::LanguageChange)
- {
- languageChange();
- }
+ if (e->type() == QEvent::LanguageChange)
+ {
+ languageChange();
+ }
}
void DirectionSelect::languageChange()
{
- LTR->setToolTip("");
- RTL->setToolTip("");
+ LTR->setToolTip("");
+ RTL->setToolTip("");
- LTR->setToolTip( tr("Left to right paragraph"));
- RTL->setToolTip( tr("Right to left paragraph"));
+ LTR->setToolTip( tr("Left to right paragraph"));
+ RTL->setToolTip( tr("Right to left paragraph"));
}
Modified: trunk/Scribus/scribus/ui/editor.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23054&path=/trunk/Scribus/scribus/ui/editor.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/editor.cpp (original)
+++ trunk/Scribus/scribus/ui/editor.cpp Sat Jun 29 20:17:20 2019
@@ -32,16 +32,16 @@
{
setModal(true);
setWindowTitle(tr("Editor"));
- IconManager* im=IconManager::instance();
- setWindowIcon(im->loadIcon("AppIcon.png"));
+ IconManager& im=IconManager::instance();
+ setWindowIcon(im.loadIcon("AppIcon.png"));
view = vie;
dirs = PrefsManager::instance()->prefsFile->getContext("dirs");
EditorLayout = new QVBoxLayout(this);
EditTex = new QTextEdit(this);
- newAct = new QAction(im->loadIcon("16/document-new.png"), tr("&New"), this);
+ newAct = new QAction(im.loadIcon("16/document-new.png"), tr("&New"), this);
newAct->setShortcut(tr("Ctrl+N"));
connect(newAct, SIGNAL(triggered()), EditTex, SLOT(clear()));
- openAct = new QAction(im->loadIcon("16/document-open.png"), tr("&Open..."), this);
+ openAct = new QAction(im.loadIcon("16/document-open.png"), tr("&Open..."), this);
connect(openAct, SIGNAL(triggered()), this, SLOT(OpenScript()));
saveAsAct = new QAction( tr("Save &As..."), this);
connect(saveAsAct, SIGNAL(triggered()), this, SLOT(SaveAs()));
@@ -49,21 +49,21 @@
connect(saveExitAct, SIGNAL(triggered()), this, SLOT(accept()));
exitAct = new QAction( tr("&Exit without Saving"), this);
connect(exitAct, SIGNAL(triggered()), this, SLOT(reject()));
- undoAct = new QAction(im->loadIcon("16/edit-undo.png"), tr("&Undo"), this);
+ undoAct = new QAction(im.loadIcon("16/edit-undo.png"), tr("&Undo"), this);
undoAct->setShortcut(tr("Ctrl+Z"));
connect(undoAct, SIGNAL(triggered()), EditTex, SLOT(undo()));
- redoAct = new QAction(im->loadIcon("16/edit-redo.png"), tr("&Redo"), this);
+ redoAct = new QAction(im.loadIcon("16/edit-redo.png"), tr("&Redo"), this);
connect(redoAct, SIGNAL(triggered()), EditTex, SLOT(redo()));
- cutAct = new QAction(im->loadIcon("16/edit-cut.png"), tr("Cu&t"), this);
+ cutAct = new QAction(im.loadIcon("16/edit-cut.png"), tr("Cu&t"), this);
cutAct->setShortcut(tr("Ctrl+X"));
connect(cutAct, SIGNAL(triggered()), EditTex, SLOT(cut()));
- copyAct = new QAction(im->loadIcon("16/edit-copy.png"), tr("&Copy"), this);
+ copyAct = new QAction(im.loadIcon("16/edit-copy.png"), tr("&Copy"), this);
copyAct->setShortcut(tr("Ctrl+C"));
connect(copyAct, SIGNAL(triggered()), EditTex, SLOT(copy()));
- pasteAct = new QAction(im->loadIcon("16/edit-paste.png"), tr("&Paste"), this);
+ pasteAct = new QAction(im.loadIcon("16/edit-paste.png"), tr("&Paste"), this);
pasteAct->setShortcut(tr("Ctrl-V"));
connect(pasteAct, SIGNAL(triggered()), EditTex, SLOT(paste()));
- clearAct = new QAction(im->loadIcon("16/edit-delete.png"), tr("C&lear"), this);
+ clearAct = new QAction(im.loadIcon("16/edit-delete.png"), tr("C&lear"), this);
connect(clearAct, SIGNAL(triggered()), this, SLOT(del()));
getFieldAct = new QAction( tr("&Get Field Names"), this);
connect(getFieldAct, SIGNAL(triggered()), this, SLOT(GetFieldNames()));
Modified: trunk/Scribus/scribus/ui/effectsdialog.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23054&path=/trunk/Scribus/scribus/ui/effectsdialog.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/effectsdialog.cpp (original)
+++ trunk/Scribus/scribus/ui/effectsdialog.cpp Sat Jun 29 20:17:20 2019
@@ -44,7 +44,7 @@
{
setModal(true);
setWindowTitle( tr( "Image Effects" ) );
- setWindowIcon(IconManager::instance()->loadIcon("AppIcon.png"));
+ setWindowIcon(IconManager::instance().loadIcon("AppIcon.png"));
m_item = item;
effectsList = m_item->effectsInUse;
m_doc = docc;
@@ -257,7 +257,7 @@
CurveD1Button = new QToolButton( WStackPage_8 );
CurveD1Button->setText( "" );
CurveD1Button->setMaximumSize( QSize( 22, 22 ) );
- CurveD1Button->setIcon(IconManager::instance()->loadIcon("curve.png"));
+ CurveD1Button->setIcon(IconManager::instance().loadIcon("curve.png"));
CurveD1Button->setMenu(CurveD1Pop);
CurveD1Button->setPopupMode(QToolButton::InstantPopup);
WStackPage8Layout->addWidget( CurveD1Button, 1, 2 );
@@ -279,7 +279,7 @@
CurveD2Button = new QToolButton( WStackPage_8 );
CurveD2Button->setText( "" );
CurveD2Button->setMaximumSize( QSize( 22, 22 ) );
- CurveD2Button->setIcon(IconManager::instance()->loadIcon("curve.png"));
+ CurveD2Button->setIcon(IconManager::instance().loadIcon("curve.png"));
CurveD2Button->setMenu(CurveD2Pop);
CurveD2Button->setPopupMode(QToolButton::InstantPopup);
WStackPage8Layout->addWidget( CurveD2Button, 3, 2 );
@@ -309,7 +309,7 @@
CurveT1Button = new QToolButton( WStackPage_9 );
CurveT1Button->setText( "" );
CurveT1Button->setMaximumSize( QSize( 22, 22 ) );
- CurveT1Button->setIcon(IconManager::instance()->loadIcon("curve.png"));
+ CurveT1Button->setIcon(IconManager::instance().loadIcon("curve.png"));
CurveT1Button->setMenu(CurveT1Pop);
CurveT1Button->setPopupMode(QToolButton::InstantPopup);
WStackPage9Layout->addWidget( CurveT1Button, 1, 2 );
@@ -330,7 +330,7 @@
CurveT2Button = new QToolButton( WStackPage_9 );
CurveT2Button->setText( "" );
CurveT2Button->setMaximumSize( QSize( 22, 22 ) );
- CurveT2Button->setIcon(IconManager::instance()->loadIcon("curve.png"));
+ CurveT2Button->setIcon(IconManager::instance().loadIcon("curve.png"));
CurveT2Button->setMenu(CurveT2Pop);
CurveT2Button->setPopupMode(QToolButton::InstantPopup);
WStackPage9Layout->addWidget( CurveT2Button, 3, 2 );
@@ -351,7 +351,7 @@
CurveT3Button = new QToolButton( WStackPage_9 );
CurveT3Button->setText( "" );
CurveT3Button->setMaximumSize( QSize( 22, 22 ) );
- CurveT3Button->setIcon(IconManager::instance()->loadIcon("curve.png"));
+ CurveT3Button->setIcon(IconManager::instance().loadIcon("curve.png"));
CurveT3Button->setMenu(CurveT3Pop);
CurveT3Button->setPopupMode(QToolButton::InstantPopup);
WStackPage9Layout->addWidget( CurveT3Button, 5, 2 );
@@ -378,7 +378,7 @@
CurveQ1Button = new QToolButton( WStackPage_10 );
CurveQ1Button->setText( "" );
CurveQ1Button->setMaximumSize( QSize( 22, 22 ) );
- CurveQ1Button->setIcon(IconManager::instance()->loadIcon("curve.png"));
+ CurveQ1Button->setIcon(IconManager::instance().loadIcon("curve.png"));
CurveQ1Button->setMenu(CurveQ1Pop);
CurveQ1Button->setPopupMode(QToolButton::InstantPopup);
WStackPage10Layout->addWidget( CurveQ1Button, 1, 2 );
@@ -399,7 +399,7 @@
CurveQ2Button = new QToolButton( WStackPage_10 );
CurveQ2Button->setText( "" );
CurveQ2Button->setMaximumSize( QSize( 22, 22 ) );
- CurveQ2Button->setIcon(IconManager::instance()->loadIcon("curve.png"));
+ CurveQ2Button->setIcon(IconManager::instance().loadIcon("curve.png"));
CurveQ2Button->setMenu(CurveQ2Pop);
CurveQ2Button->setPopupMode(QToolButton::InstantPopup);
WStackPage10Layout->addWidget( CurveQ2Button, 3, 2 );
@@ -420,7 +420,7 @@
CurveQc3Button = new QToolButton( WStackPage_10 );
CurveQc3Button->setText( "" );
CurveQc3Button->setMaximumSize( QSize( 22, 22 ) );
- CurveQc3Button->setIcon(IconManager::instance()->loadIcon("curve.png"));
+ CurveQc3Button->setIcon(IconManager::instance().loadIcon("curve.png"));
CurveQc3Button->setMenu(CurveQc3Pop);
CurveQc3Button->setPopupMode(QToolButton::InstantPopup);
WStackPage10Layout->addWidget( CurveQc3Button, 5, 2 );
@@ -441,7 +441,7 @@
CurveQ4Button = new QToolButton( WStackPage_10 );
CurveQ4Button->setText( "" );
CurveQ4Button->setMaximumSize( QSize( 22, 22 ) );
- CurveQ4Button->setIcon(IconManager::instance()->loadIcon("curve.png"));
+ CurveQ4Button->setIcon(IconManager::instance().loadIcon("curve.png"));
CurveQ4Button->setMenu(CurveQ4Pop);
CurveQ4Button->setPopupMode(QToolButton::InstantPopup);
WStackPage10Layout->addWidget( CurveQ4Button, 7, 2 );
@@ -609,12 +609,12 @@
layout7->addItem( spacer4 );
effectUp = new QPushButton( this );
effectUp->setText( "" );
- effectUp->setIcon(IconManager::instance()->loadIcon("16/go-up.png"));
+ effectUp->setIcon(IconManager::instance().loadIcon("16/go-up.png"));
effectUp->setEnabled(false);
layout7->addWidget( effectUp );
effectDown = new QPushButton( this );
effectDown->setText( "" );
- effectDown->setIcon(IconManager::instance()->loadIcon("16/go-down.png"));
+ effectDown->setIcon(IconManager::instance().loadIcon("16/go-down.png"));
effectDown->setEnabled(false);
layout7->addWidget( effectDown );
QSpacerItem* spacer5 = new QSpacerItem( 1, 1, QSizePolicy::Expanding, QSizePolicy::Minimum );
@@ -649,7 +649,7 @@
int x = (pixmapLabel1->width() - im.qImage().width()) / 2;
int y = (pixmapLabel1->height() - im.qImage().height()) / 2;
QPainter p;
- QBrush b(QColor(205,205,205), IconManager::instance()->loadPixmap("testfill.png"));
+ QBrush b(QColor(205,205,205), IconManager::instance().loadPixmap("testfill.png"));
p.begin(&Bild);
p.fillRect(0, 0, pixmapLabel1->width(), pixmapLabel1->height(), b);
p.drawImage(x, y, im.qImage());
@@ -758,7 +758,7 @@
int x = (pixmapLabel1->width() - im.qImage().width()) / 2;
int y = (pixmapLabel1->height() - im.qImage().height()) / 2;
QPainter p;
- QBrush b(QColor(205,205,205), IconManager::instance()->loadPixmap("testfill.png"));
+ QBrush b(QColor(205,205,205), IconManager::instance().loadPixmap("testfill.png"));
p.begin(&Bild);
p.fillRect(0, 0, pixmapLabel1->width(), pixmapLabel1->height(), b);
p.drawImage(x, y, im.qImage());
Modified: trunk/Scribus/scribus/ui/extimageprops.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23054&path=/trunk/Scribus/scribus/ui/extimageprops.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/extimageprops.cpp (original)
+++ trunk/Scribus/scribus/ui/extimageprops.cpp Sat Jun 29 20:17:20 2019
@@ -38,7 +38,7 @@
{
setModal(true);
setWindowTitle( tr( "Extended Image Properties" ) );
- setWindowIcon(IconManager::instance()->loadIcon("AppIcon.png"));
+ setWindowIcon(IconManager::instance().loadIcon("AppIcon.png"));
ExtImagePropsLayout = new QVBoxLayout( this );
ExtImagePropsLayout->setMargin(6);
ExtImagePropsLayout->setSpacing(6);
@@ -146,7 +146,7 @@
layout1->addWidget( opacitySpinBox );
tabLayout->addLayout( layout1 );
layerTable = new QTableWidget(info->layerInfo.count(), 3, tab );
- layerTable->setHorizontalHeaderItem(0, new QTableWidgetItem(IconManager::instance()->loadIcon("16/show-object.png"), ""));
+ layerTable->setHorizontalHeaderItem(0, new QTableWidgetItem(IconManager::instance().loadIcon("16/show-object.png"), ""));
layerTable->setHorizontalHeaderItem(1, new QTableWidgetItem(""));
layerTable->setHorizontalHeaderItem(2, new QTableWidgetItem( tr("Name")));
QHeaderView* headerH = layerTable->horizontalHeader();
Modified: trunk/Scribus/scribus/ui/fontcombo.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23054&path=/trunk/Scribus/scribus/ui/fontcombo.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/fontcombo.cpp (original)
+++ trunk/Scribus/scribus/ui/fontcombo.cpp Sat Jun 29 20:17:20 2019
@@ -47,10 +47,10 @@
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");
+ 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");
setEditable(true);
setValidator(new FontComboValidator(this));
setInsertPolicy(QComboBox::NoInsert);
@@ -110,10 +110,10 @@
{
currDoc = nullptr;
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");
+ 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");
fontComboLayout = new QGridLayout(this);
fontComboLayout->setMargin(0);
fontComboLayout->setSpacing(0);
Modified: trunk/Scribus/scribus/ui/fontreplacedialog.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23054&path=/trunk/Scribus/scribus/ui/fontreplacedialog.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/fontreplacedialog.cpp (original)
+++ trunk/Scribus/scribus/ui/fontreplacedialog.cpp Sat Jun 29 20:17:20 2019
@@ -28,7 +28,7 @@
{
setModal(true);
setWindowTitle( tr( "Font Substitution" ) );
- setWindowIcon(IconManager::instance()->loadIcon("AppIcon.png"));
+ setWindowIcon(IconManager::instance().loadIcon("AppIcon.png"));
ReplaceList = RList;
FontReplaceDialogLayout = new QVBoxLayout( this );
FontReplaceDialogLayout->setMargin(10);
Modified: trunk/Scribus/scribus/ui/gradientpreview.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23054&path=/trunk/Scribus/scribus/ui/gradientpreview.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/gradientpreview.cpp (original)
+++ trunk/Scribus/scribus/ui/gradientpreview.cpp Sat Jun 29 20:17:20 2019
@@ -82,7 +82,7 @@
}
QImage pixm(width()-20, 37, QImage::Format_ARGB32_Premultiplied);
QPainter pb;
- QBrush b(QColor(205,205,205), IconManager::instance()->loadPixmap("testfill.png"));
+ QBrush b(QColor(205,205,205), IconManager::instance().loadPixmap("testfill.png"));
pb.begin(&pixm);
pb.fillRect(0, 0, pixm.width(), pixm.height(), b);
pb.end();
@@ -244,7 +244,7 @@
qApp->changeOverrideCursor(QCursor(Qt::ArrowCursor));
if ((!Mpressed) && (m->y() < height()) && (m->y() > 43) && (m->x() > 9) && (m->x() < width()-9))
{
- setCursor(IconManager::instance()->loadCursor("AddPoint.png", 1, 1));
+ setCursor(IconManager::instance().loadCursor("AddPoint.png", 1, 1));
for (int yg = 0; yg < static_cast<int>(StopM.count()); ++yg)
{
fpo = QRect(static_cast<int>(StopM[yg])-4, 43, 8, 13);
@@ -279,7 +279,7 @@
repaint();
}
if ((Mpressed) && (outside || !insideRect.contains(m->pos())) && (ActStop > 0) && (ActStop != static_cast<int>(StopM.count()-1)))
- qApp->changeOverrideCursor(IconManager::instance()->loadCursor("DelPoint.png", 1, 1));
+ qApp->changeOverrideCursor(IconManager::instance().loadCursor("DelPoint.png", 1, 1));
}
}
}
@@ -291,7 +291,7 @@
if (Mpressed)
{
if ((ActStop > 0) && (ActStop != static_cast<int>(StopM.count()-1)))
- qApp->changeOverrideCursor(IconManager::instance()->loadCursor("DelPoint.png", 1, 1));
+ qApp->changeOverrideCursor(IconManager::instance().loadCursor("DelPoint.png", 1, 1));
else
qApp->changeOverrideCursor(QCursor(Qt::ArrowCursor));
}
Modified: trunk/Scribus/scribus/ui/gradientvectordialog.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23054&path=/trunk/Scribus/scribus/ui/gradientvectordialog.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/gradientvectordialog.cpp (original)
+++ trunk/Scribus/scribus/ui/gradientvectordialog.cpp Sat Jun 29 20:17:20 2019
@@ -82,22 +82,22 @@
connect(resetAllPControlPoints, SIGNAL(clicked()), this, SIGNAL(resetAllControl()));
connect(snapToGrid, SIGNAL(clicked()), this, SLOT(handleSnapToGridBox()));
QSize iconSize = QSize(22, 22);
- IconManager* im=IconManager::instance();
- editPoints->setIcon(im->loadIcon("MoveNode.png"));
+ IconManager& im=IconManager::instance();
+ editPoints->setIcon(im.loadIcon("MoveNode.png"));
editPoints->setIconSize(iconSize);
- editControlPoints->setIcon(im->loadIcon("MoveKontrol.png"));
+ editControlPoints->setIcon(im.loadIcon("MoveKontrol.png"));
editControlPoints->setIconSize(iconSize);
- resetControlPoint->setIcon(im->loadIcon("Reset1Node.png"));
+ resetControlPoint->setIcon(im.loadIcon("Reset1Node.png"));
resetControlPoint->setIconSize(iconSize);
- resetAllControlPoints->setIcon(im->loadIcon("ResetNode.png"));
+ resetAllControlPoints->setIcon(im.loadIcon("ResetNode.png"));
resetAllControlPoints->setIconSize(iconSize);
- editPPoint->setIcon(im->loadIcon("MoveNode.png"));
+ editPPoint->setIcon(im.loadIcon("MoveNode.png"));
editPPoint->setIconSize(iconSize);
- editPControlPoints->setIcon(im->loadIcon("MoveKontrol.png"));
+ editPControlPoints->setIcon(im.loadIcon("MoveKontrol.png"));
editPControlPoints->setIconSize(iconSize);
- resetPControlPoint->setIcon(im->loadIcon("Reset1Node.png"));
+ resetPControlPoint->setIcon(im.loadIcon("Reset1Node.png"));
resetPControlPoint->setIconSize(iconSize);
- resetAllPControlPoints->setIcon(im->loadIcon("ResetNode.png"));
+ resetAllPControlPoints->setIcon(im.loadIcon("ResetNode.png"));
resetAllPControlPoints->setIconSize(iconSize);
languageChange();
selectLinear();
Modified: trunk/Scribus/scribus/ui/gtdialogs.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23054&path=/trunk/Scribus/scribus/ui/gtdialogs.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/gtdialogs.cpp (original)
+++ trunk/Scribus/scribus/ui/gtdialogs.cpp Sat Jun 29 20:17:20 2019
@@ -53,7 +53,7 @@
ext.prepend(".");
setWindowTitle( tr("Choose the importer to use"));
- setWindowIcon(IconManager::instance()->loadIcon("AppIcon.png"));
+ setWindowIcon(IconManager::instance().loadIcon("AppIcon.png"));
QBoxLayout* layout = new QVBoxLayout(this);
Modified: trunk/Scribus/scribus/ui/helpbrowser.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23054&path=/trunk/Scribus/scribus/ui/helpbrowser.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/helpbrowser.cpp (original)
+++ trunk/Scribus/scribus/ui/helpbrowser.cpp Sat Jun 29 20:17:20 2019
@@ -225,7 +225,7 @@
void HelpBrowser::setupLocalUI()
{
- setWindowIcon(IconManager::instance()->loadIcon("AppIcon.png"));
+ setWindowIcon(IconManager::instance().loadIcon("AppIcon.png"));
//Add Menus
fileMenu=menuBar()->addMenu("");
editMenu=menuBar()->addMenu("");
@@ -233,10 +233,10 @@
histMenu=new QMenu(this);
//Add Menu items
- filePrint=fileMenu->addAction(IconManager::instance()->loadIcon("16/document-print.png"), "", this, SLOT(print()), Qt::CTRL+Qt::Key_P);
+ filePrint=fileMenu->addAction(IconManager::instance().loadIcon("16/document-print.png"), "", this, SLOT(print()), Qt::CTRL+Qt::Key_P);
fileMenu->addSeparator();
- fileExit=fileMenu->addAction(IconManager::instance()->loadIcon("exit.png"), "", this, SLOT(close()), Qt::CTRL+Qt::Key_W);
- editFind=editMenu->addAction(IconManager::instance()->loadIcon("find.png"), "", this, SLOT(find()), Qt::CTRL+Qt::Key_F);
+ fileExit=fileMenu->addAction(IconManager::instance().loadIcon("exit.png"), "", this, SLOT(close()), Qt::CTRL+Qt::Key_W);
+ editFind=editMenu->addAction(IconManager::instance().loadIcon("find.png"), "", this, SLOT(find()), Qt::CTRL+Qt::Key_F);
editFindNext=editMenu->addAction( "", this, SLOT(findNext()), Qt::Key_F3);
editFindPrev=editMenu->addAction( "", this, SLOT(findPrevious()), Qt::SHIFT+Qt::Key_F3);
bookAdd=bookMenu->addAction( "", this, SLOT(bookmarkButton_clicked()), Qt::CTRL+Qt::Key_D);
@@ -244,9 +244,9 @@
bookDelAll=bookMenu->addAction( "", this, SLOT(deleteAllBookmarkButton_clicked()));
//Add Toolbar items
- goHome=toolBar->addAction(IconManager::instance()->loadIcon("16/go-home.png"), "", textBrowser, SLOT(home()));
- goBack=toolBar->addAction(IconManager::instance()->loadIcon("16/go-previous.png"), "", textBrowser, SLOT(backward()));
- goFwd=toolBar->addAction(IconManager::instance()->loadIcon("16/go-next.png"), "", textBrowser, SLOT(forward()));
+ goHome=toolBar->addAction(IconManager::instance().loadIcon("16/go-home.png"), "", textBrowser, SLOT(home()));
+ goBack=toolBar->addAction(IconManager::instance().loadIcon("16/go-previous.png"), "", textBrowser, SLOT(backward()));
+ goFwd=toolBar->addAction(IconManager::instance().loadIcon("16/go-next.png"), "", textBrowser, SLOT(forward()));
goBack->setMenu(histMenu);
helpNav->listView->header()->hide();
Modified: trunk/Scribus/scribus/ui/hruler.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23054&path=/trunk/Scribus/scribus/ui/hruler.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/hruler.cpp (original)
+++ trunk/Scribus/scribus/ui/hruler.cpp Sat Jun 29 20:17:20 2019
@@ -348,7 +348,7 @@
void Hruler::enterEvent(QEvent *e)
{
if (m_textEditMode)
- qApp->changeOverrideCursor(IconManager::instance()->loadCursor("tab.png", 3));
+ qApp->changeOverrideCursor(IconManager::instance().loadCursor("tab.png", 3));
}
void Hruler::leaveEvent(QEvent *m)
@@ -449,7 +449,7 @@
}
if ((!m_mousePressed) && (m->y() < height()) && (m->y() > 0) && (m->x() > ColStart - 2*m_doc->guidesPrefs().grabRadius) && (m->x() < ColEnd + 2*m_doc->guidesPrefs().grabRadius))
{
- setCursor(IconManager::instance()->loadCursor("tab.png", 3));
+ setCursor(IconManager::instance().loadCursor("tab.png", 3));
switch (findRulerHandle(m->pos(), m_doc->guidesPrefs().grabRadius))
{
case rc_leftFrameDist:
@@ -478,7 +478,7 @@
}
if ((m_mousePressed) && (m_rulerCode == rc_tab) && ((m->y() > height()) || (m->y() < 0)))
{
- setCursor(IconManager::instance()->loadCursor("DelPoint.png", 1, 1));
+ setCursor(IconManager::instance().loadCursor("DelPoint.png", 1, 1));
return;
}
setCursor(QCursor(Qt::ArrowCursor));
Modified: trunk/Scribus/scribus/ui/hyask.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23054&path=/trunk/Scribus/scribus/ui/hyask.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/hyask.cpp (original)
+++ trunk/Scribus/scribus/ui/hyask.cpp Sat Jun 29 20:17:20 2019
@@ -48,7 +48,7 @@
setModal(true);
setWindowTitle( tr( "Possible Hyphenation" ));
- setWindowIcon(IconManager::instance()->loadIcon("AppIcon.png"));
+ setWindowIcon(IconManager::instance().loadIcon("AppIcon.png"));
HyAskLayout = new QVBoxLayout(this);
HyAskLayout->setMargin(10);
HyAskLayout->setSpacing(5);
Modified: trunk/Scribus/scribus/ui/imageinfodialog.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23054&path=/trunk/Scribus/scribus/ui/imageinfodialog.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/imageinfodialog.cpp (original)
+++ trunk/Scribus/scribus/ui/imageinfodialog.cpp Sat Jun 29 20:17:20 2019
@@ -21,7 +21,7 @@
{
setModal(true);
setWindowTitle( tr( "Image Info" ) );
- setWindowIcon(IconManager::instance()->loadIcon("AppIcon.png"));
+ setWindowIcon(IconManager::instance().loadIcon("AppIcon.png"));
ImageInfoDialogLayout = new QVBoxLayout( this );
ImageInfoDialogLayout->setMargin(10);
Modified: trunk/Scribus/scribus/ui/inlinepalette.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23054&path=/trunk/Scribus/scribus/ui/inlinepalette.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/inlinepalette.cpp (original)
+++ trunk/Scribus/scribus/ui/inlinepalette.cpp Sat Jun 29 20:17:20 2019
@@ -263,7 +263,7 @@
pm2.fill(palette().color(QPalette::Base));
QPainter p;
p.begin(&pm2);
- QBrush b(QColor(205,205,205), IconManager::instance()->loadPixmap("testfill.png"));
+ QBrush b(QColor(205,205,205), IconManager::instance().loadPixmap("testfill.png"));
p.setBrush(b);
p.drawRect(0, 0, 50, 50);
p.drawPixmap(25 - pm.width() / 2, 25 - pm.height() / 2, pm);
Modified: trunk/Scribus/scribus/ui/insertTable.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23054&path=/trunk/Scribus/scribus/ui/insertTable.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/insertTable.cpp (original)
+++ trunk/Scribus/scribus/ui/insertTable.cpp Sat Jun 29 20:17:20 2019
@@ -13,7 +13,7 @@
{
setWindowTitle( tr( "Insert Table" ) );
- setWindowIcon(IconManager::instance()->loadIcon("AppIcon.png"));
+ setWindowIcon(IconManager::instance().loadIcon("AppIcon.png"));
setModal(true);
InsertTableLayout = new QVBoxLayout( this );
InsertTableLayout->setMargin(10);
Modified: trunk/Scribus/scribus/ui/insertaframe.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23054&path=/trunk/Scribus/scribus/ui/insertaframe.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/insertaframe.cpp (original)
+++ trunk/Scribus/scribus/ui/insertaframe.cpp Sat Jun 29 20:17:20 2019
@@ -45,7 +45,7 @@
{
setupUi(this);
- placementPagesRangeButton->setIcon(IconManager::instance()->loadIcon("ellipsis.png"));
+ placementPagesRangeButton->setIcon(IconManager::instance().loadIcon("ellipsis.png"));
//set tab order
QWidget::setTabOrder(radioButtonCustomPosition, xPosScrSpinBox);
Modified: trunk/Scribus/scribus/ui/inspage.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23054&path=/trunk/Scribus/scribus/ui/inspage.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/inspage.cpp (original)
+++ trunk/Scribus/scribus/ui/inspage.cpp Sat Jun 29 20:17:20 2019
@@ -31,7 +31,7 @@
masterPageCombos.clear();
setModal(true);
setWindowTitle( tr( "Insert Page" ) );
- setWindowIcon(IconManager::instance()->loadIcon("AppIcon.png"));
+ setWindowIcon(IconManager::instance().loadIcon("AppIcon.png"));
dialogLayout = new QVBoxLayout(this);
dialogLayout->setSpacing( 5 );
dialogLayout->setMargin( 5 );
Modified: trunk/Scribus/scribus/ui/javadocs.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23054&path=/trunk/Scribus/scribus/ui/javadocs.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/javadocs.cpp (original)
+++ trunk/Scribus/scribus/ui/javadocs.cpp Sat Jun 29 20:17:20 2019
@@ -29,7 +29,7 @@
{
setModal(true);
setWindowTitle( tr( "Edit JavaScripts" ) );
- setWindowIcon(IconManager::instance()->loadIcon("AppIcon.png"));
+ setWindowIcon(IconManager::instance().loadIcon("AppIcon.png"));
m_Doc = doc;
m_View = vie;
JavaDocsLayout = new QHBoxLayout(this);
Modified: trunk/Scribus/scribus/ui/layers.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23054&path=/trunk/Scribus/scribus/ui/layers.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/layers.cpp (original)
+++ trunk/Scribus/scribus/ui/layers.cpp Sat Jun 29 20:17:20 2019
@@ -68,15 +68,15 @@
layout1->addWidget( opacitySpinBox );
LayerPaletteLayout->addLayout( layout1 );
- IconManager* im = IconManager::instance();
+ IconManager& im = IconManager::instance();
Table = new QTableWidget(0, 8, this );
Table->setHorizontalHeaderItem(0, new QTableWidgetItem(""));
- Table->setHorizontalHeaderItem(1, new QTableWidgetItem(im->loadIcon("16/show-object.png"), ""));
- Table->setHorizontalHeaderItem(2, new QTableWidgetItem(im->loadIcon("16/document-print.png"), ""));
- Table->setHorizontalHeaderItem(3, new QTableWidgetItem(im->loadIcon("16/lock.png"), ""));
- Table->setHorizontalHeaderItem(4, new QTableWidgetItem(im->loadIcon("16/layer-flow-around.png"), ""));
- Table->setHorizontalHeaderItem(5, new QTableWidgetItem(im->loadIcon("layer-outline.png"), ""));
- Table->setHorizontalHeaderItem(6, new QTableWidgetItem(im->loadIcon("16/pointer.png"), ""));
+ Table->setHorizontalHeaderItem(1, new QTableWidgetItem(im.loadIcon("16/show-object.png"), ""));
+ Table->setHorizontalHeaderItem(2, new QTableWidgetItem(im.loadIcon("16/document-print.png"), ""));
+ Table->setHorizontalHeaderItem(3, new QTableWidgetItem(im.loadIcon("16/lock.png"), ""));
+ Table->setHorizontalHeaderItem(4, new QTableWidgetItem(im.loadIcon("16/layer-flow-around.png"), ""));
+ Table->setHorizontalHeaderItem(5, new QTableWidgetItem(im.loadIcon("layer-outline.png"), ""));
+ Table->setHorizontalHeaderItem(6, new QTableWidgetItem(im.loadIcon("16/pointer.png"), ""));
Table->setHorizontalHeaderItem(7, new QTableWidgetItem( tr("Name")));
QHeaderView *header = Table->horizontalHeader();
@@ -111,35 +111,35 @@
newLayerButton->setMinimumSize( QSize( 50, 24 ) );
newLayerButton->setMaximumSize( QSize( 50, 24 ) );
newLayerButton->setText( "" );
- newLayerButton->setIcon(IconManager::instance()->loadIcon("16/list-add.png"));
+ newLayerButton->setIcon(IconManager::instance().loadIcon("16/list-add.png"));
Layout1->addWidget( newLayerButton );
deleteLayerButton = new QPushButton( this );
deleteLayerButton->setMinimumSize( QSize( 50, 24 ) );
deleteLayerButton->setMaximumSize( QSize( 50, 24 ) );
deleteLayerButton->setText( "" );
- deleteLayerButton->setIcon(IconManager::instance()->loadIcon("16/list-remove.png"));
+ deleteLayerButton->setIcon(IconManager::instance().loadIcon("16/list-remove.png"));
Layout1->addWidget( deleteLayerButton );
duplicateLayerButton = new QPushButton( this );
duplicateLayerButton->setMinimumSize( QSize( 50, 24 ) );
duplicateLayerButton->setMaximumSize( QSize( 50, 24 ) );
duplicateLayerButton->setText( "" );
- duplicateLayerButton->setIcon(IconManager::instance()->loadIcon("16/edit-copy.png"));
+ duplicateLayerButton->setIcon(IconManager::instance().loadIcon("16/edit-copy.png"));
Layout1->addWidget( duplicateLayerButton );
raiseLayerButton = new QPushButton( this );
raiseLayerButton->setMinimumSize( QSize( 50, 24 ) );
raiseLayerButton->setMaximumSize( QSize( 50, 24 ) );
raiseLayerButton->setText( "" );
- raiseLayerButton->setIcon(IconManager::instance()->loadIcon("16/go-up.png"));
+ raiseLayerButton->setIcon(IconManager::instance().loadIcon("16/go-up.png"));
Layout1->addWidget( raiseLayerButton );
lowerLayerButton = new QPushButton( this );
lowerLayerButton->setMinimumSize( QSize( 50, 24 ) );
lowerLayerButton->setMaximumSize( QSize( 50, 24 ) );
lowerLayerButton->setText( "" );
- lowerLayerButton->setIcon(IconManager::instance()->loadIcon("16/go-down.png"));
+ lowerLayerButton->setIcon(IconManager::instance().loadIcon("16/go-down.png"));
Layout1->addWidget( lowerLayerButton );
LayerPaletteLayout->addLayout( Layout1 );
Modified: trunk/Scribus/scribus/ui/linkbutton.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23054&path=/trunk/Scribus/scribus/ui/linkbutton.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/linkbutton.cpp (original)
+++ trunk/Scribus/scribus/ui/linkbutton.cpp Sat Jun 29 20:17:20 2019
@@ -38,9 +38,9 @@
{
QIcon a=QIcon();
bool rtlLoad = QLocale(ScCore->getGuiLanguage()).textDirection() == Qt::RightToLeft;
- QPixmap closedPixmap(IconManager::instance()->loadPixmap("chain-closed.png", false, rtlLoad));
+ QPixmap closedPixmap(IconManager::instance().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::instance().loadPixmap("chain-open.png", false, rtlLoad), QIcon::Normal, QIcon::Off);
setIcon(a);
setIconSize(closedPixmap.size());
}
Modified: trunk/Scribus/scribus/ui/loremipsum.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23054&path=/trunk/Scribus/scribus/ui/loremipsum.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/loremipsum.cpp (original)
+++ trunk/Scribus/scribus/ui/loremipsum.cpp Sat Jun 29 20:17:20 2019
@@ -138,7 +138,7 @@
m_Doc=doc;
setModal(true);
setWindowTitle( tr( "Lorem Ipsum" ) );
- setWindowIcon(IconManager::instance()->loadIcon("AppIcon.png"));
+ setWindowIcon(IconManager::instance().loadIcon("AppIcon.png"));
LoremManagerLayout = new QGridLayout(this) ;
LoremManagerLayout->setMargin(10);
LoremManagerLayout->setSpacing(5);
Modified: trunk/Scribus/scribus/ui/mergedoc.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23054&path=/trunk/Scribus/scribus/ui/mergedoc.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/mergedoc.cpp (original)
+++ trunk/Scribus/scribus/ui/mergedoc.cpp Sat Jun 29 20:17:20 2019
@@ -36,7 +36,7 @@
masterPages = importMasterPages;
setModal(true);
setWindowTitle((masterPages) ? tr("Import Master Page") : tr( "Import Page(s)" ));
- setWindowIcon(IconManager::instance()->loadIcon("AppIcon.png"));
+ setWindowIcon(IconManager::instance().loadIcon("AppIcon.png"));
count = 0;
dialogLayout = new QVBoxLayout(this);
Modified: trunk/Scribus/scribus/ui/missing.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23054&path=/trunk/Scribus/scribus/ui/missing.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/missing.cpp (original)
+++ trunk/Scribus/scribus/ui/missing.cpp Sat Jun 29 20:17:20 2019
@@ -25,7 +25,7 @@
{
setModal(true);
setWindowTitle( tr("Missing Font"));
- setWindowIcon(IconManager::instance()->loadIcon("AppIcon.png"));
+ setWindowIcon(IconManager::instance().loadIcon("AppIcon.png"));
missingFontLayout = new QHBoxLayout( this );
missingFontLayout->setMargin(10);
missingFontLayout->setSpacing(0);
Modified: trunk/Scribus/scribus/ui/movepage.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23054&path=/trunk/Scribus/scribus/ui/movepage.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/movepage.cpp (original)
+++ trunk/Scribus/scribus/ui/movepage.cpp Sat Jun 29 20:17:20 2019
@@ -26,7 +26,7 @@
{
move = moving;
setWindowTitle (move ? tr("Move Pages") : tr("Copy Page"));
- setWindowIcon(IconManager::instance()->loadIcon("AppIcon.png"));
+ setWindowIcon(IconManager::instance().loadIcon("AppIcon.png"));
setModal(true);
dialogLayout = new QVBoxLayout( this );
dialogLayout->setSpacing( 5 );
Modified: trunk/Scribus/scribus/ui/newfile.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23054&path=/trunk/Scribus/scribus/ui/newfile.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/newfile.cpp (original)
+++ trunk/Scribus/scribus/ui/newfile.cpp Sat Jun 29 20:17:20 2019
@@ -102,7 +102,7 @@
m_unitSuffix = unitGetSuffixFromIndex(m_unitIndex);
m_orientation = prefsManager->appPrefs.docSetupPrefs.pageOrientation;
setWindowTitle( tr( "New Document" ) );
- setWindowIcon(IconManager::instance()->loadIcon("AppIcon.png"));
+ setWindowIcon(IconManager::instance().loadIcon("AppIcon.png"));
TabbedNewDocLayout = new QVBoxLayout( this );
TabbedNewDocLayout->setMargin(10);
TabbedNewDocLayout->setSpacing(5);
@@ -193,22 +193,22 @@
QString psname=CommonStrings::translatePageSetString(prefsManager->appPrefs.pageSets[pg].Name);
if (pg == 0)
{
- ic = new QListWidgetItem( IconManager::instance()->loadIcon("32/page-simple.png"), psname, layoutsView );
+ ic = new QListWidgetItem( IconManager::instance().loadIcon("32/page-simple.png"), psname, layoutsView );
ic->setFlags(Qt::ItemIsSelectable | Qt::ItemIsEnabled);
}
else if (pg == 1)
{
- ic = new QListWidgetItem( IconManager::instance()->loadIcon("32/page-doublesided.png"), psname, layoutsView );
+ ic = new QListWidgetItem( IconManager::instance().loadIcon("32/page-doublesided.png"), psname, layoutsView );
ic->setFlags(Qt::ItemIsSelectable | Qt::ItemIsEnabled);
}
else if (pg == 2 && prefsManager->appPrefs.docSetupPrefs.pagePositioning == 2)
{
- ic = new QListWidgetItem( IconManager::instance()->loadIcon("32/page-3fold.png"), psname, layoutsView );
+ ic = new QListWidgetItem( IconManager::instance().loadIcon("32/page-3fold.png"), psname, layoutsView );
ic->setFlags(Qt::ItemIsSelectable | Qt::ItemIsEnabled);
}
else if (pg == 3 && prefsManager->appPrefs.docSetupPrefs.pagePositioning == 3)
{
- ic = new QListWidgetItem( IconManager::instance()->loadIcon("32/page-4fold.png"), psname, layoutsView );
+ ic = new QListWidgetItem( IconManager::instance().loadIcon("32/page-4fold.png"), psname, layoutsView );
ic->setFlags(Qt::ItemIsSelectable | Qt::ItemIsEnabled);
}
}
Modified: trunk/Scribus/scribus/ui/newtemp.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23054&path=/trunk/Scribus/scribus/ui/newtemp.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/newtemp.cpp (original)
+++ trunk/Scribus/scribus/ui/newtemp.cpp Sat Jun 29 20:17:20 2019
@@ -26,7 +26,7 @@
{
setModal(true);
setWindowTitle(titel);
- setWindowIcon(IconManager::instance()->loadIcon("AppIcon.png"));
+ setWindowIcon(IconManager::instance().loadIcon("AppIcon.png"));
QueryLayout = new QVBoxLayout( this );
QueryLayout->setSpacing( 5 );
QueryLayout->setMargin( 5 );
Modified: trunk/Scribus/scribus/ui/nftdialog.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23054&path=/trunk/Scribus/scribus/ui/nftdialog.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/nftdialog.cpp (original)
+++ trunk/Scribus/scribus/ui/nftdialog.cpp Sat Jun 29 20:17:20 2019
@@ -19,7 +19,7 @@
{
setupUi(this);
setModal(true);
- setWindowIcon(IconManager::instance()->loadIcon("AppIcon.png"));
+ setWindowIcon(IconManager::instance().loadIcon("AppIcon.png"));
nftGui->setupSettings(lang);
buttonBox->button(QDialogButtonBox::Cancel)->setDefault(true);
buttonBox->button(QDialogButtonBox::Ok)->setDisabled(true);
Modified: trunk/Scribus/scribus/ui/nftwidget.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23054&path=/trunk/Scribus/scribus/ui/nftwidget.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/nftwidget.cpp (original)
+++ trunk/Scribus/scribus/ui/nftwidget.cpp Sat Jun 29 20:17:20 2019
@@ -34,9 +34,9 @@
tnailGrid->addAction(removeAction);
tnailGrid->addAction(openAction);
setupAbout();
- toolBox->setItemIcon(0, IconManager::instance()->loadIcon("16/information.png"));
- toolBox->setItemIcon(1, IconManager::instance()->loadIcon("16/image-x-generic.png"));
- toolBox->setItemIcon(2, IconManager::instance()->loadIcon("16/help-browser.png"));
+ toolBox->setItemIcon(0, IconManager::instance().loadIcon("16/information.png"));
+ toolBox->setItemIcon(1, IconManager::instance().loadIcon("16/image-x-generic.png"));
+ toolBox->setItemIcon(2, IconManager::instance().loadIcon("16/help-browser.png"));
tnailGrid->setIconSize(QSize(60, 60));
// Signals and Slots Connections
connect(categoryList, SIGNAL(itemSelectionChanged()), this, SLOT(setThumbnails()));
Modified: trunk/Scribus/scribus/ui/nodeeditpalette.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23054&path=/trunk/Scribus/scribus/ui/nodeeditpalette.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/nodeeditpalette.cpp (original)
+++ trunk/Scribus/scribus/ui/nodeeditpalette.cpp Sat Jun 29 20:17:20 2019
@@ -20,7 +20,7 @@
NodePalette::NodePalette( QWidget* parent) : ScrPaletteBase( parent, "nodePalette", false, nullptr)
{
- IconManager* im = IconManager::instance();
+ IconManager& im = IconManager::instance();
QSize iconSize = QSize(22, 22);
m_doc=nullptr;
unitRatio=1.0;
@@ -32,7 +32,7 @@
gridLayout->setMargin(0);
MoveNode = new QToolButton(this);
MoveNode->setText( "" );
- MoveNode->setIcon(im->loadIcon("MoveNode.png"));
+ MoveNode->setIcon(im.loadIcon("MoveNode.png"));
MoveNode->setIconSize(iconSize);
MoveNode->setContentsMargins(0, 0, 0, 0);
MoveNode->setCheckable(true);
@@ -41,7 +41,7 @@
gridLayout->addWidget(MoveNode, 0, 0, 1, 1);
AddNode = new QToolButton(this);
- AddNode->setIcon(im->loadIcon("AddNode.png"));
+ AddNode->setIcon(im.loadIcon("AddNode.png"));
AddNode->setIconSize(iconSize);
AddNode->setContentsMargins(0, 0, 0, 0);
AddNode->setEnabled(true);
@@ -50,7 +50,7 @@
gridLayout->addWidget(AddNode, 0, 1, 1, 1);
DeleteNode = new QToolButton(this);
- DeleteNode->setIcon(im->loadIcon("DeleteNode.png"));
+ DeleteNode->setIcon(im.loadIcon("DeleteNode.png"));
DeleteNode->setIconSize(iconSize);
DeleteNode->setContentsMargins(0, 0, 0, 0);
DeleteNode->setEnabled(true);
@@ -59,7 +59,7 @@
gridLayout->addWidget(DeleteNode, 0, 2, 1, 1);
ResNode = new QToolButton(this);
- ResNode->setIcon(im->loadIcon("ResetNode.png"));
+ ResNode->setIcon(im.loadIcon("ResetNode.png"));
ResNode->setIconSize(iconSize);
ResNode->setContentsMargins(0, 0, 0, 0);
ResNode->setEnabled(true);
@@ -67,7 +67,7 @@
gridLayout->addWidget(ResNode, 0, 3, 1, 1);
MoveControl = new QToolButton(this);
- MoveControl->setIcon(im->loadIcon("MoveKontrol.png"));
+ MoveControl->setIcon(im.loadIcon("MoveKontrol.png"));
MoveControl->setIconSize(iconSize);
MoveControl->setContentsMargins(0, 0, 0, 0);
MoveControl->setCheckable(true);
@@ -75,7 +75,7 @@
gridLayout->addWidget(MoveControl, 1, 0, 1, 1);
AsymMove = new QToolButton(this);
- AsymMove->setIcon(im->loadIcon("MoveAsym.png"));
+ AsymMove->setIcon(im.loadIcon("MoveAsym.png"));
AsymMove->setIconSize(iconSize);
AsymMove->setContentsMargins(0, 0, 0, 0);
AsymMove->setEnabled(false);
@@ -84,7 +84,7 @@
gridLayout->addWidget(AsymMove, 1, 1, 1, 1);
SymMove = new QToolButton(this);
- SymMove->setIcon(im->loadIcon("MoveSym.png"));
+ SymMove->setIcon(im.loadIcon("MoveSym.png"));
SymMove->setIconSize(iconSize);
SymMove->setContentsMargins(0, 0, 0, 0);
SymMove->setEnabled(false);
@@ -93,7 +93,7 @@
gridLayout->addWidget(SymMove, 1, 2, 1, 1);
Res1Node = new QToolButton(this);
- Res1Node->setIcon(im->loadIcon("Reset1Node.png"));
+ Res1Node->setIcon(im.loadIcon("Reset1Node.png"));
Res1Node->setIconSize(iconSize);
Res1Node->setContentsMargins(0, 0, 0, 0);
Res1Node->setEnabled(false);
@@ -103,7 +103,7 @@
PolySplit = new QToolButton(this);
PolySplit->setEnabled(false);
PolySplit->setCheckable(true);
- PolySplit->setIcon(im->loadIcon("PolyCut.png"));
+ PolySplit->setIcon(im.loadIcon("PolyCut.png"));
PolySplit->setIconSize(iconSize);
PolySplit->setContentsMargins(0, 0, 0, 0);
PolySplit->setSizePolicy(QSizePolicy(static_cast<QSizePolicy::Policy>(3), static_cast<QSizePolicy::Policy>(3)));
@@ -111,28 +111,28 @@
BezierClose = new QToolButton(this);
BezierClose->setEnabled(false);
- BezierClose->setIcon(im->loadIcon("BezierClose.png"));
+ BezierClose->setIcon(im.loadIcon("BezierClose.png"));
BezierClose->setIconSize(iconSize);
BezierClose->setContentsMargins(0, 0, 0, 0);
BezierClose->setSizePolicy(QSizePolicy(static_cast<QSizePolicy::Policy>(3), static_cast<QSizePolicy::Policy>(3)));
gridLayout->addWidget(BezierClose, 2, 1, 1, 1);
PolyMirrorH = new QToolButton(this);
- PolyMirrorH->setIcon(im->loadIcon("hmirror.png"));
+ PolyMirrorH->setIcon(im.loadIcon("hmirror.png"));
PolyMirrorH->setIconSize(iconSize);
PolyMirrorH->setContentsMargins(0, 0, 0, 0);
PolyMirrorH->setSizePolicy(QSizePolicy(static_cast<QSizePolicy::Policy>(3), static_cast<QSizePolicy::Policy>(3)));
gridLayout->addWidget(PolyMirrorH, 2, 2, 1, 1);
PolyMirrorV = new QToolButton(this);
- PolyMirrorV->setIcon(im->loadIcon("vmirror.png"));
+ PolyMirrorV->setIcon(im.loadIcon("vmirror.png"));
PolyMirrorV->setIconSize(iconSize);
PolyMirrorV->setContentsMargins(0, 0, 0, 0);
PolyMirrorV->setSizePolicy(QSizePolicy(static_cast<QSizePolicy::Policy>(3), static_cast<QSizePolicy::Policy>(3)));
gridLayout->addWidget(PolyMirrorV, 2, 3, 1, 1);
PolyShearL = new QToolButton(this);
- PolyShearL->setIcon(im->loadIcon("22/transform-shear-left.png"));
+ PolyShearL->setIcon(im.loadIcon("22/transform-shear-left.png"));
PolyShearL->setIconSize(iconSize);
PolyShearL->setContentsMargins(0, 0, 0, 0);
PolyShearL->setSizePolicy(QSizePolicy(static_cast<QSizePolicy::Policy>(3), static_cast<QSizePolicy::Policy>(3)));
@@ -140,7 +140,7 @@
gridLayout->addWidget(PolyShearL, 3, 0, 1, 1);
PolyShearR = new QToolButton(this);
- PolyShearR->setIcon(im->loadIcon("22/transform-shear-right.png"));
+ PolyShearR->setIcon(im.loadIcon("22/transform-shear-right.png"));
PolyShearR->setIconSize(iconSize);
PolyShearR->setContentsMargins(0, 0, 0, 0);
PolyShearR->setSizePolicy(QSizePolicy(static_cast<QSizePolicy::Policy>(3), static_cast<QSizePolicy::Policy>(3)));
@@ -148,7 +148,7 @@
gridLayout->addWidget(PolyShearR, 3, 1, 1, 1);
PolyShearU = new QToolButton(this);
- PolyShearU->setIcon(im->loadIcon("22/transform-shear-up.png"));
+ PolyShearU->setIcon(im.loadIcon("22/transform-shear-up.png"));
PolyShearU->setIconSize(iconSize);
PolyShearU->setContentsMargins(0, 0, 0, 0);
PolyShearU->setSizePolicy(QSizePolicy(static_cast<QSizePolicy::Policy>(3), static_cast<QSizePolicy::Policy>(3)));
@@ -156,7 +156,7 @@
gridLayout->addWidget(PolyShearU, 3, 2, 1, 1);
PolyShearD = new QToolButton(this);
- PolyShearD->setIcon(im->loadIcon("22/transform-shear-down.png"));
+ PolyShearD->setIcon(im.loadIcon("22/transform-shear-down.png"));
PolyShearD->setIconSize(iconSize);
PolyShearD->setContentsMargins(0, 0, 0, 0);
PolyShearD->setSizePolicy(QSizePolicy(static_cast<QSizePolicy::Policy>(3), static_cast<QSizePolicy::Policy>(3)));
@@ -169,14 +169,14 @@
gridLayout1->setMargin(0);
RotateCCW = new QToolButton(this);
- RotateCCW->setIcon(im->loadIcon("rotate_ccw.png"));
+ RotateCCW->setIcon(im.loadIcon("rotate_ccw.png"));
RotateCCW->setIconSize(iconSize);
RotateCCW->setContentsMargins(0, 0, 0, 0);
RotateCCW->setAutoRepeat(true);
gridLayout1->addWidget(RotateCCW, 0, 0, 1, 1);
RotateCW = new QToolButton(this);
- RotateCW->setIcon(im->loadIcon("rotate_cw.png"));
+ RotateCW->setIcon(im.loadIcon("rotate_cw.png"));
RotateCW->setIconSize(iconSize);
RotateCW->setContentsMargins(0, 0, 0, 0);
RotateCW->setAutoRepeat(true);
@@ -190,14 +190,14 @@
gridLayout1->addWidget(RotVal, 0, 2, 1, 1);
Expand = new QToolButton(this);
- Expand->setIcon(im->loadIcon("expand.png"));
+ Expand->setIcon(im.loadIcon("expand.png"));
Expand->setIconSize(iconSize);
Expand->setContentsMargins(0, 0, 0, 0);
Expand->setAutoRepeat(true);
gridLayout1->addWidget(Expand, 1, 0, 1, 1);
Shrink = new QToolButton(this);
- Shrink->setIcon(im->loadIcon("crop.png"));
+ Shrink->setIcon(im.loadIcon("crop.png"));
Shrink->setIconSize(iconSize);
Shrink->setContentsMargins(0, 0, 0, 0);
Shrink->setAutoRepeat(true);
@@ -210,14 +210,14 @@
gridLayout1->addWidget(scalePercentage, 1, 2, 1, 1);
Enlarge = new QToolButton(this);
- Enlarge->setIcon(im->loadIcon("expand.png"));
+ Enlarge->setIcon(im.loadIcon("expand.png"));
Enlarge->setIconSize(iconSize);
Enlarge->setContentsMargins(0, 0, 0, 0);
Enlarge->setAutoRepeat(true);
gridLayout1->addWidget(Enlarge, 2, 0, 1, 1);
Reduce = new QToolButton(this);
- Reduce->setIcon(im->loadIcon("crop.png"));
+ Reduce->setIcon(im.loadIcon("crop.png"));
Reduce->setIconSize(iconSize);
Reduce->setContentsMargins(0, 0, 0, 0);
Reduce->setAutoRepeat(true);
@@ -292,7 +292,7 @@
resetDefaultButton->setEnabled(true);
gridLayout2->addWidget(resetDefaultButton, 9, 0, 1, 2);
- editEditButton = new QPushButton(IconManager::instance()->loadIcon("22/exit.png"), tr("OK"), this);
+ editEditButton = new QPushButton(IconManager::instance().loadIcon("22/exit.png"), tr("OK"), this);
editEditButton->setEnabled(true);
editEditButton->setDefault(true);
gridLayout2->addWidget(editEditButton, 10, 0, 1, 1);
Modified: trunk/Scribus/scribus/ui/oneclick.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23054&path=/trunk/Scribus/scribus/ui/oneclick.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/oneclick.cpp (original)
+++ trunk/Scribus/scribus/ui/oneclick.cpp Sat Jun 29 20:17:20 2019
@@ -29,7 +29,7 @@
double m_unitRatio = unitGetRatioFromIndex(unitIndex);
QString m_suffix = unitGetSuffixFromIndex(unitIndex);
setWindowTitle( titel );
- setWindowIcon(IconManager::instance()->loadIcon("AppIcon.png"));
+ setWindowIcon(IconManager::instance().loadIcon("AppIcon.png"));
queryLayout = new QVBoxLayout( this );
queryLayout->setSpacing( 5 );
queryLayout->setMargin( 10 );
Modified: trunk/Scribus/scribus/ui/outlinepalette.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23054&path=/trunk/Scribus/scribus/ui/outlinepalette.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/outlinepalette.cpp (original)
+++ trunk/Scribus/scribus/ui/outlinepalette.cpp Sat Jun 29 20:17:20 2019
@@ -339,7 +339,7 @@
PageItem *pgItem = item->PageItemObject;
QPainter p;
QImage pm = QImage(80, 80, QImage::Format_ARGB32_Premultiplied);
- QBrush b(QColor(205,205,205), IconManager::instance()->loadPixmap("testfill.png"));
+ QBrush b(QColor(205,205,205), IconManager::instance().loadPixmap("testfill.png"));
p.begin(&pm);
p.fillRect(QRectF(0, 0, 80, 80), b);
QImage thumb = pgItem->DrawObj_toImage(80);
@@ -478,26 +478,26 @@
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");
+ 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;
Modified: trunk/Scribus/scribus/ui/pagelayout.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23054&path=/trunk/Scribus/scribus/ui/pagelayout.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/pagelayout.cpp (original)
+++ trunk/Scribus/scribus/ui/pagelayout.cpp Sat Jun 29 20:17:20 2019
@@ -129,15 +129,15 @@
{
QString psname=CommonStrings::translatePageSetString(pageSets[pg].Name);
if (pg == 0)
- layoutsCombo->addItem(IconManager::instance()->loadIcon("16/page-simple.png"), psname);
+ layoutsCombo->addItem(IconManager::instance().loadIcon("16/page-simple.png"), psname);
else if (pg == 1)
- layoutsCombo->addItem(IconManager::instance()->loadIcon("16/page-doublesided.png"), psname);
+ layoutsCombo->addItem(IconManager::instance().loadIcon("16/page-doublesided.png"), psname);
else if (pg == 2)
- layoutsCombo->addItem(IconManager::instance()->loadIcon("16/page-3fold.png"), psname);
+ layoutsCombo->addItem(IconManager::instance().loadIcon("16/page-3fold.png"), psname);
else if (pg == 3)
- layoutsCombo->addItem(IconManager::instance()->loadIcon("16/page-4fold.png"), psname);
+ layoutsCombo->addItem(IconManager::instance().loadIcon("16/page-4fold.png"), psname);
else
- layoutsCombo->addItem(IconManager::instance()->loadIcon("16/page-simple.png"), psname);
+ layoutsCombo->addItem(IconManager::instance().loadIcon("16/page-simple.png"), psname);
}
connect(layoutsCombo, SIGNAL(activated(int)), this, SLOT(itemSelected(int)));
}
@@ -234,27 +234,27 @@
QListWidgetItem *ic;
if (pg == 0)
{
- ic = new QListWidgetItem( IconManager::instance()->loadIcon("32/page-simple.png"), psname, layoutsView );
+ ic = new QListWidgetItem( IconManager::instance().loadIcon("32/page-simple.png"), psname, layoutsView );
ic->setFlags(Qt::ItemIsSelectable | Qt::ItemIsEnabled);
}
else if (pg == 1)
{
- ic = new QListWidgetItem( IconManager::instance()->loadIcon("32/page-doublesided.png"), psname, layoutsView );
+ ic = new QListWidgetItem( IconManager::instance().loadIcon("32/page-doublesided.png"), psname, layoutsView );
ic->setFlags(Qt::ItemIsSelectable | Qt::ItemIsEnabled);
}
else if (pg == 2)
{
- ic = new QListWidgetItem( IconManager::instance()->loadIcon("32/page-3fold.png"), psname, layoutsView );
+ ic = new QListWidgetItem( IconManager::instance().loadIcon("32/page-3fold.png"), psname, layoutsView );
ic->setFlags(Qt::ItemIsSelectable | Qt::ItemIsEnabled);
}
else if (pg == 3)
{
- ic = new QListWidgetItem( IconManager::instance()->loadIcon("32/page-4fold.png"), psname, layoutsView );
+ ic = new QListWidgetItem( IconManager::instance().loadIcon("32/page-4fold.png"), psname, layoutsView );
ic->setFlags(Qt::ItemIsSelectable | Qt::ItemIsEnabled);
}
else
{
- ic = new QListWidgetItem( IconManager::instance()->loadIcon("32/page-simple.png"), psname, layoutsView );
+ ic = new QListWidgetItem( IconManager::instance().loadIcon("32/page-simple.png"), psname, layoutsView );
ic->setFlags(Qt::ItemIsSelectable | Qt::ItemIsEnabled);
}
}
@@ -269,15 +269,15 @@
{
QString psname=CommonStrings::translatePageSetString(pageSets[pg].Name);
if (pg == 0)
- layoutsCombo->addItem(IconManager::instance()->loadIcon("16/page-simple.png"), psname);
+ layoutsCombo->addItem(IconManager::instance().loadIcon("16/page-simple.png"), psname);
else if (pg == 1)
- layoutsCombo->addItem(IconManager::instance()->loadIcon("16/page-doublesided.png"), psname);
+ layoutsCombo->addItem(IconManager::instance().loadIcon("16/page-doublesided.png"), psname);
else if (pg == 2)
- layoutsCombo->addItem(IconManager::instance()->loadIcon("16/page-3fold.png"), psname);
+ layoutsCombo->addItem(IconManager::instance().loadIcon("16/page-3fold.png"), psname);
else if (pg == 3)
- layoutsCombo->addItem(IconManager::instance()->loadIcon("16/page-4fold.png"), psname);
+ layoutsCombo->addItem(IconManager::instance().loadIcon("16/page-4fold.png"), psname);
else
- layoutsCombo->addItem(IconManager::instance()->loadIcon("16/page-simple.png"), psname);
+ layoutsCombo->addItem(IconManager::instance().loadIcon("16/page-simple.png"), psname);
}
layoutsCombo->setCurrentIndex(currIndex);
connect(layoutsCombo, SIGNAL(activated(int)), this, SLOT(itemSelected(int)));
Modified: trunk/Scribus/scribus/ui/pagepalette_masterpages.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23054&path=/trunk/Scribus/scribus/ui/pagepalette_masterpages.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/pagepalette_masterpages.cpp (original)
+++ trunk/Scribus/scribus/ui/pagepalette_masterpages.cpp Sat Jun 29 20:17:20 2019
@@ -44,10 +44,10 @@
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"));
+ 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"));
masterPageListBox->setSelectionMode(QAbstractItemView::ExtendedSelection);
styleChange();
Modified: trunk/Scribus/scribus/ui/pagepalette_pages.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23054&path=/trunk/Scribus/scribus/ui/pagepalette_pages.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/pagepalette_pages.cpp (original)
+++ trunk/Scribus/scribus/ui/pagepalette_pages.cpp Sat Jun 29 20:17:20 2019
@@ -60,7 +60,7 @@
trash->setMinimumSize(QSize(32,32));
trash->setMaximumSize(QSize(32,32));
- pix = IconManager::instance()->loadPixmap("32/page-simple.png");
+ pix = IconManager::instance().loadPixmap("32/page-simple.png");
currView = nullptr;
Rebuild();
Modified: trunk/Scribus/scribus/ui/pagepalette_widgets.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23054&path=/trunk/Scribus/scribus/ui/pagepalette_widgets.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/pagepalette_widgets.cpp (original)
+++ trunk/Scribus/scribus/ui/pagepalette_widgets.cpp Sat Jun 29 20:17:20 2019
@@ -101,7 +101,7 @@
mimeData->setText("1" + pageName);
QDrag *dr = new QDrag(this);
dr->setMimeData(mimeData);
- const QPixmap& pm = IconManager::instance()->loadPixmap("doc.png");
+ const QPixmap& pm = IconManager::instance().loadPixmap("doc.png");
dr->setPixmap(pm);
// dr->setDragCursor(pm, Qt::CopyAction);
// dr->setDragCursor(pm, Qt::MoveAction);
@@ -216,7 +216,7 @@
mimeData->setText("2 "+tmp.setNum(p)+" "+str);
QDrag *dr = new QDrag(this);
dr->setMimeData(mimeData);
- const QPixmap& pm = IconManager::instance()->loadPixmap("doc.png");
+ const QPixmap& pm = IconManager::instance().loadPixmap("doc.png");
dr->setPixmap(pm);
// dr->setDragCursor(pm, Qt::CopyAction);
// dr->setDragCursor(pm, Qt::MoveAction);
@@ -506,8 +506,8 @@
/* Der Muelleimer */
TrashBin::TrashBin(QWidget * parent) : QLabel(parent)
{
- Normal = IconManager::instance()->loadPixmap("trashcan.png");
- Offen = IconManager::instance()->loadPixmap("trashcan2.png");
+ Normal = IconManager::instance().loadPixmap("trashcan.png");
+ Offen = IconManager::instance().loadPixmap("trashcan2.png");
setPixmap(Normal);
setScaledContents(false);
setAcceptDrops(true);
Modified: trunk/Scribus/scribus/ui/pagepropertiesdialog.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23054&path=/trunk/Scribus/scribus/ui/pagepropertiesdialog.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/pagepropertiesdialog.cpp (original)
+++ trunk/Scribus/scribus/ui/pagepropertiesdialog.cpp Sat Jun 29 20:17:20 2019
@@ -30,7 +30,7 @@
{
setModal(true);
setWindowTitle( tr( "Manage Page Properties" ) );
- setWindowIcon(IconManager::instance()->loadIcon("AppIcon.png"));
+ setWindowIcon(IconManager::instance().loadIcon("AppIcon.png"));
unitRatio = doc->unitRatio();
dialogLayout = new QVBoxLayout(this);
dialogLayout->setMargin(10);
Modified: trunk/Scribus/scribus/ui/pageselector.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23054&path=/trunk/Scribus/scribus/ui/pageselector.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/pageselector.cpp (original)
+++ trunk/Scribus/scribus/ui/pageselector.cpp Sat Jun 29 20:17:20 2019
@@ -47,10 +47,10 @@
forwardButton->setAutoDefault( false );
lastButton->setAutoDefault( false );
- startButton->setIcon(IconManager::instance()->loadIcon("16/go-first.png"));
- backButton->setIcon(IconManager::instance()->loadIcon("16/go-previous.png"));
- forwardButton->setIcon(IconManager::instance()->loadIcon("16/go-next.png"));
- lastButton->setIcon(IconManager::instance()->loadIcon("16/go-last.png"));
+ startButton->setIcon(IconManager::instance().loadIcon("16/go-first.png"));
+ backButton->setIcon(IconManager::instance().loadIcon("16/go-previous.png"));
+ forwardButton->setIcon(IconManager::instance().loadIcon("16/go-next.png"));
+ lastButton->setIcon(IconManager::instance().loadIcon("16/go-last.png"));
startButton->setFocusPolicy(Qt::NoFocus);
backButton->setFocusPolicy(Qt::NoFocus);
@@ -88,7 +88,7 @@
QByteArray stylesheet;
if (loadRawText(ScPaths::instance().libDir() + "scribus.css", stylesheet))
{
- QString downArrow(IconManager::instance()->pathForIcon("16/go-down.png"));
+ QString downArrow(IconManager::instance().pathForIcon("16/go-down.png"));
QByteArray da;
da.append(downArrow);
stylesheet.replace("___downArrow___", da);
Modified: trunk/Scribus/scribus/ui/patternpropsdialog.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23054&path=/trunk/Scribus/scribus/ui/patternpropsdialog.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/patternpropsdialog.cpp (original)
+++ trunk/Scribus/scribus/ui/patternpropsdialog.cpp Sat Jun 29 20:17:20 2019
@@ -120,11 +120,11 @@
QSpacerItem* spacer = new QSpacerItem( 0, 0, QSizePolicy::Expanding, QSizePolicy::Minimum );
groupFlipLayout->addItem( spacer );
FlipH = new QToolButton( this );
- FlipH->setIcon(IconManager::instance()->loadIcon("16/flip-object-horizontal.png"));
+ FlipH->setIcon(IconManager::instance().loadIcon("16/flip-object-horizontal.png"));
FlipH->setCheckable( true );
groupFlipLayout->addWidget( FlipH );
FlipV = new QToolButton( this );
- FlipV->setIcon(IconManager::instance()->loadIcon("16/flip-object-vertical.png"));
+ FlipV->setIcon(IconManager::instance().loadIcon("16/flip-object-vertical.png"));
FlipV->setCheckable( true );
groupFlipLayout->addWidget( FlipV );
frame3Layout->addLayout( groupFlipLayout );
Modified: trunk/Scribus/scribus/ui/pdfexportdialog.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23054&path=/trunk/Scribus/scribus/ui/pdfexportdialog.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/pdfexportdialog.cpp (original)
+++ trunk/Scribus/scribus/ui/pdfexportdialog.cpp Sat Jun 29 20:17:20 2019
@@ -62,7 +62,7 @@
{
setModal(true);
setWindowTitle( tr( "Save as PDF" ) );
- setWindowIcon(IconManager::instance()->loadIcon("AppIcon.png"));
+ setWindowIcon(IconManager::instance().loadIcon("AppIcon.png"));
PDFExportLayout = new QVBoxLayout( this );
PDFExportLayout->setSpacing( 5 );
PDFExportLayout->setMargin( 10 );
Modified: trunk/Scribus/scribus/ui/picsearch.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23054&path=/trunk/Scribus/scribus/ui/picsearch.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/picsearch.cpp (original)
+++ trunk/Scribus/scribus/ui/picsearch.cpp Sat Jun 29 20:17:20 2019
@@ -102,7 +102,7 @@
else
im2 = im.qImage(); // no need to copy
QPainter p;
- QBrush b(QColor(205,205,205), IconManager::instance()->loadPixmap("testfill.png"));
+ QBrush b(QColor(205,205,205), IconManager::instance().loadPixmap("testfill.png"));
p.begin(&pm);
p.fillRect(0, 0, w, h-44, b);
p.fillRect(0, h-44, w, 44, QColor(255, 255, 255));
Modified: trunk/Scribus/scribus/ui/picstatus.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23054&path=/trunk/Scribus/scribus/ui/picstatus.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/picstatus.cpp (original)
+++ trunk/Scribus/scribus/ui/picstatus.cpp Sat Jun 29 20:17:20 2019
@@ -68,7 +68,7 @@
imageViewArea->setContextMenuPolicy(Qt::CustomContextMenu);
m_Doc = docu;
currItem = nullptr;
- setWindowIcon(IconManager::instance()->loadIcon("AppIcon.png"));
+ setWindowIcon(IconManager::instance().loadIcon("AppIcon.png"));
fillTable();
workTab->setCurrentIndex(0);
connect(closeButton, SIGNAL(clicked()), this, SLOT(accept()));
@@ -89,7 +89,7 @@
{
QPainter p;
QPixmap pm(128, 128);
- QBrush b(QColor(205,205,205), IconManager::instance()->loadPixmap("testfill.png"));
+ QBrush b(QColor(205,205,205), IconManager::instance().loadPixmap("testfill.png"));
p.begin(&pm);
p.fillRect(0, 0, 128, 128, imageViewArea->palette().window());
p.setPen(QPen(Qt::black, 1, Qt::SolidLine, Qt::FlatCap, Qt::MiterJoin));
Modified: trunk/Scribus/scribus/ui/polyprops.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23054&path=/trunk/Scribus/scribus/ui/polyprops.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/polyprops.cpp (original)
+++ trunk/Scribus/scribus/ui/polyprops.cpp Sat Jun 29 20:17:20 2019
@@ -17,7 +17,7 @@
PolyVectorDialog::PolyVectorDialog(QWidget* parent, int polyC, double polyF, bool polyS, double polyR, double polyCurvature, double polyInnerRot, double polyOuterCurvature) : ScrPaletteBase( parent, "PolyVectorDialog", false, nullptr )
{
setWindowTitle( tr( "Polygon Properties" ) );
- setWindowIcon(IconManager::instance()->loadIcon("AppIcon.png"));
+ setWindowIcon(IconManager::instance().loadIcon("AppIcon.png"));
PolygonPropsLayout = new QVBoxLayout( this );
PolygonPropsLayout->setMargin(10);
PolygonPropsLayout->setSpacing(5);
@@ -37,7 +37,7 @@
{
setModal(true);
setWindowTitle( tr( "Polygon Properties" ) );
- setWindowIcon(IconManager::instance()->loadIcon("AppIcon.png"));
+ setWindowIcon(IconManager::instance().loadIcon("AppIcon.png"));
PolygonPropsLayout = new QVBoxLayout( this );
PolygonPropsLayout->setMargin(10);
PolygonPropsLayout->setSpacing(5);
Modified: trunk/Scribus/scribus/ui/preferencesdialog.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23054&path=/trunk/Scribus/scribus/ui/preferencesdialog.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/preferencesdialog.cpp (original)
+++ trunk/Scribus/scribus/ui/preferencesdialog.cpp Sat Jun 29 20:17:20 2019
@@ -54,7 +54,7 @@
setupUi(this);
setObjectName(QString::fromLocal8Bit("PreferencesDialog"));
setupListWidget();
- IconManager* im = IconManager::instance();
+ IconManager& im = IconManager::instance();
while (prefsStackWidget->currentWidget()!=nullptr)
prefsStackWidget->removeWidget(prefsStackWidget->currentWidget());
@@ -104,47 +104,47 @@
// Add Stack Widgets if required
if (!doc)
{
- addItem( tr("User Interface"), im->loadPixmap("scribus16.png"), prefs_UserInterface);
- addItem( tr("Paths"), im->loadPixmap("16/folder.png"), prefs_Paths);
- addItem( tr("Keyboard Shortcuts"), im->loadPixmap("16/preferences-desktop-keyboard-shortcuts.png"), prefs_KeyboardShortcuts);
- }
- addItem( tr("Document Setup"), im->loadPixmap("scribusdoc16.png"), prefs_DocumentSetup);
- if (!doc)
- addItem( tr("Page Sizes"), im->loadPixmap("16/page-simple.png"), prefs_PageSizes);
- addItem( tr("Guides"), im->loadPixmap("16/edit-guides.png"), prefs_Guides);
+ addItem( tr("User Interface"), im.loadPixmap("scribus16.png"), prefs_UserInterface);
+ addItem( tr("Paths"), im.loadPixmap("16/folder.png"), prefs_Paths);
+ addItem( tr("Keyboard Shortcuts"), im.loadPixmap("16/preferences-desktop-keyboard-shortcuts.png"), prefs_KeyboardShortcuts);
+ }
+ addItem( tr("Document Setup"), im.loadPixmap("scribusdoc16.png"), prefs_DocumentSetup);
+ if (!doc)
+ addItem( tr("Page Sizes"), im.loadPixmap("16/page-simple.png"), prefs_PageSizes);
+ addItem( tr("Guides"), im.loadPixmap("16/edit-guides.png"), prefs_Guides);
if (doc)
- addItem( tr("Document Information"), im->loadPixmap("documentinfo.png"), prefs_DocumentInformation);
+ addItem( tr("Document Information"), im.loadPixmap("documentinfo.png"), prefs_DocumentInformation);
if (doc)
- addItem( tr("Sections"), im->loadPixmap("tabtocindex_16.png"), prefs_DocumentSections);
-
- addItem( tr("Item Tools"), im->loadPixmap("tools_16.png"), prefs_ItemTools);
- addItem( tr("Fonts"), im->loadPixmap("16/preferences-desktop-font.png"), prefs_Fonts);
- addItem( tr("Typography"), im->loadPixmap("16/draw-text.png"), prefs_Typography);
- addItem( tr("Hyphenator"), im->loadPixmap("signature_16.png"), prefs_Hyphenator);
+ addItem( tr("Sections"), im.loadPixmap("tabtocindex_16.png"), prefs_DocumentSections);
+
+ addItem( tr("Item Tools"), im.loadPixmap("tools_16.png"), prefs_ItemTools);
+ addItem( tr("Fonts"), im.loadPixmap("16/preferences-desktop-font.png"), prefs_Fonts);
+ addItem( tr("Typography"), im.loadPixmap("16/draw-text.png"), prefs_Typography);
+ addItem( tr("Hyphenator"), im.loadPixmap("signature_16.png"), prefs_Hyphenator);
//if (!doc)
- // addItem( tr("Spelling"), im->loadPixmap("signature_16.png"), prefs_Spelling);
-
-
-
- addItem( tr("Color Management"), im->loadPixmap("blend_16.png"), prefs_ColorManagement);
- if (!doc)
- addItem( tr("Image Cache"), im->loadPixmap("16/image-x-generic.png"), prefs_ImageCache);
- addItem( tr("Display"), im->loadPixmap("16/video-display.png"), prefs_Display);
- addItem( tr("Operator Tools"), im->loadPixmap("tools_16.png"), prefs_OperatorTools);
- if (!doc)
- addItem( tr("External Tools"), im->loadPixmap("gear_16.png"), prefs_ExternalTools);
- if (!doc)
- addItem( tr("Scrapbook"), im->loadPixmap("scrap_16.png"), prefs_Scrapbook);
- addItem( tr("Preflight Verifier"), im->loadPixmap("16/preflight-verifier.png"), prefs_PreflightVerifier);
- addItem( tr("Printer"), im->loadPixmap("16/printer.png"), prefs_Printer);
- addItem( tr("PDF Export"), im->loadPixmap("acroread16.png"), prefs_PDFExport);
- if (!doc)
- addItem( tr("Miscellaneous"), im->loadPixmap("misc_16.png"), prefs_Miscellaneous);
- addItem( tr("Document Item Attributes"), im->loadPixmap("docattributes_16.png"), prefs_DocumentItemAttributes);
- addItem( tr("Tables of Contents"), im->loadPixmap("tabtocindex_16.png"), prefs_TableOfContents);
-
- if (!doc)
- addItem( tr("Plugins"), im->loadPixmap("plugins_16.png"), prefs_Plugins);
+ // addItem( tr("Spelling"), im.loadPixmap("signature_16.png"), prefs_Spelling);
+
+
+
+ addItem( tr("Color Management"), im.loadPixmap("blend_16.png"), prefs_ColorManagement);
+ if (!doc)
+ addItem( tr("Image Cache"), im.loadPixmap("16/image-x-generic.png"), prefs_ImageCache);
+ addItem( tr("Display"), im.loadPixmap("16/video-display.png"), prefs_Display);
+ addItem( tr("Operator Tools"), im.loadPixmap("tools_16.png"), prefs_OperatorTools);
+ if (!doc)
+ addItem( tr("External Tools"), im.loadPixmap("gear_16.png"), prefs_ExternalTools);
+ if (!doc)
+ addItem( tr("Scrapbook"), im.loadPixmap("scrap_16.png"), prefs_Scrapbook);
+ addItem( tr("Preflight Verifier"), im.loadPixmap("16/preflight-verifier.png"), prefs_PreflightVerifier);
+ addItem( tr("Printer"), im.loadPixmap("16/printer.png"), prefs_Printer);
+ addItem( tr("PDF Export"), im.loadPixmap("acroread16.png"), prefs_PDFExport);
+ if (!doc)
+ addItem( tr("Miscellaneous"), im.loadPixmap("misc_16.png"), prefs_Miscellaneous);
+ addItem( tr("Document Item Attributes"), im.loadPixmap("docattributes_16.png"), prefs_DocumentItemAttributes);
+ addItem( tr("Tables of Contents"), im.loadPixmap("tabtocindex_16.png"), prefs_TableOfContents);
+
+ if (!doc)
+ addItem( tr("Plugins"), im.loadPixmap("plugins_16.png"), prefs_Plugins);
arrangeIcons();
Modified: trunk/Scribus/scribus/ui/prefs_display.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23054&path=/trunk/Scribus/scribus/ui/prefs_display.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/prefs_display.cpp (original)
+++ trunk/Scribus/scribus/ui/prefs_display.cpp Sat Jun 29 20:17:20 2019
@@ -23,7 +23,7 @@
setupUi(this);
languageChange();
- buttonRestoreDPI->setIcon(IconManager::instance()->loadIcon("screen.png"));
+ buttonRestoreDPI->setIcon(IconManager::instance().loadIcon("screen.png"));
connect(pageFillColorButton, SIGNAL(clicked()), this, SLOT(changePaperColor()));
Modified: trunk/Scribus/scribus/ui/prefs_guides.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23054&path=/trunk/Scribus/scribus/ui/prefs_guides.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/prefs_guides.cpp (original)
+++ trunk/Scribus/scribus/ui/prefs_guides.cpp Sat Jun 29 20:17:20 2019
@@ -20,9 +20,9 @@
{
setupUi(this);
languageChange();
- buttonUp->setIcon(IconManager::instance()->loadIcon("16/go-up.png"));
+ buttonUp->setIcon(IconManager::instance().loadIcon("16/go-up.png"));
buttonUp->setEnabled(false);
- buttonDown->setIcon(IconManager::instance()->loadIcon("16/go-down.png"));
+ buttonDown->setIcon(IconManager::instance().loadIcon("16/go-down.png"));
buttonDown->setEnabled(false);
QString pxSuffix = QString(" %1").arg(CommonStrings::trStrPX);
Modified: trunk/Scribus/scribus/ui/prefs_hyphenator.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23054&path=/trunk/Scribus/scribus/ui/prefs_hyphenator.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/prefs_hyphenator.cpp (original)
+++ trunk/Scribus/scribus/ui/prefs_hyphenator.cpp Sat Jun 29 20:17:20 2019
@@ -31,13 +31,13 @@
{
setupUi(this);
- exceptionAddButton->setIcon(IconManager::instance()->loadIcon("16/list-add.png"));
+ exceptionAddButton->setIcon(IconManager::instance().loadIcon("16/list-add.png"));
exceptionEditButton->setEnabled(false);
- exceptionRemoveButton->setIcon(IconManager::instance()->loadIcon("16/list-remove.png"));
+ exceptionRemoveButton->setIcon(IconManager::instance().loadIcon("16/list-remove.png"));
exceptionRemoveButton->setEnabled(false);
- ignoreAddButton->setIcon(IconManager::instance()->loadIcon("16/list-add.png"));
+ ignoreAddButton->setIcon(IconManager::instance().loadIcon("16/list-add.png"));
ignoreEditButton->setEnabled(false);
- ignoreRemoveButton->setIcon(IconManager::instance()->loadIcon("16/list-remove.png"));
+ ignoreRemoveButton->setIcon(IconManager::instance().loadIcon("16/list-remove.png"));
ignoreRemoveButton->setEnabled(false);
connect(ignoreAddButton, SIGNAL(clicked()), this, SLOT(addToIgnoreList()));
connect(ignoreEditButton, SIGNAL(clicked()), this, SLOT(editIgnoreListEntry()));
Modified: trunk/Scribus/scribus/ui/prefs_keyboardshortcuts.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23054&path=/trunk/Scribus/scribus/ui/prefs_keyboardshortcuts.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/prefs_keyboardshortcuts.cpp (original)
+++ trunk/Scribus/scribus/ui/prefs_keyboardshortcuts.cpp Sat Jun 29 20:17:20 2019
@@ -66,7 +66,7 @@
keyDisplay->setText("");
selectedLVI = nullptr;
- clearSearchButton->setIcon(IconManager::instance()->loadIcon("clear_right.png"));
+ clearSearchButton->setIcon(IconManager::instance().loadIcon("clear_right.png"));
// signals and slots connections
connect( keyTable, SIGNAL(currentItemChanged(QTreeWidgetItem*, QTreeWidgetItem*)), this, SLOT(dispKey(QTreeWidgetItem*, QTreeWidgetItem*)));
connect( noKey, SIGNAL(clicked()), this, SLOT(setNoKey()));
Modified: trunk/Scribus/scribus/ui/prefs_pagesizes.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23054&path=/trunk/Scribus/scribus/ui/prefs_pagesizes.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/prefs_pagesizes.cpp (original)
+++ trunk/Scribus/scribus/ui/prefs_pagesizes.cpp Sat Jun 29 20:17:20 2019
@@ -21,8 +21,8 @@
{
setupUi(this);
languageChange();
- toActiveButton->setIcon(IconManager::instance()->loadIcon("22/go-next.png"));
- fromActiveButton->setIcon(IconManager::instance()->loadIcon("22/go-previous.png"));
+ toActiveButton->setIcon(IconManager::instance().loadIcon("22/go-next.png"));
+ fromActiveButton->setIcon(IconManager::instance().loadIcon("22/go-previous.png"));
connect(toActiveButton, SIGNAL(clicked()), this, SLOT(moveToActive()));
connect(fromActiveButton, SIGNAL(clicked()), this, SLOT(moveFromActive()));
}
Modified: trunk/Scribus/scribus/ui/prefs_pdfexport.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23054&path=/trunk/Scribus/scribus/ui/prefs_pdfexport.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/prefs_pdfexport.cpp (original)
+++ trunk/Scribus/scribus/ui/prefs_pdfexport.cpp Sat Jun 29 20:17:20 2019
@@ -26,9 +26,9 @@
exportingPDF(false)
{
setupUi(this);
- exportRangeMorePushButton->setIcon(IconManager::instance()->loadIcon("ellipsis.png"));
- pageMirrorHorizontalToolButton->setIcon(IconManager::instance()->loadIcon("16/flip-object-horizontal.png"));
- pageMirrorVerticalToolButton->setIcon(IconManager::instance()->loadIcon("16/flip-object-vertical.png"));
+ exportRangeMorePushButton->setIcon(IconManager::instance().loadIcon("ellipsis.png"));
+ pageMirrorHorizontalToolButton->setIcon(IconManager::instance().loadIcon("16/flip-object-horizontal.png"));
+ pageMirrorVerticalToolButton->setIcon(IconManager::instance().loadIcon("16/flip-object-vertical.png"));
unitChange(0);
languageChange();
@@ -156,13 +156,13 @@
const ScFace face = AllFonts.value(fontName);
if (face.isReplacement())
- item = new QListWidgetItem( IconManager::instance()->loadIcon("font_subst16.png"), fontName, fontList );
+ item = new QListWidgetItem( IconManager::instance().loadIcon("font_subst16.png"), fontName, fontList );
else if (face.type() == ScFace::TYPE1)
- item = new QListWidgetItem( IconManager::instance()->loadIcon("font_type1_16.png"), fontName, fontList );
+ item = new QListWidgetItem( IconManager::instance().loadIcon("font_type1_16.png"), fontName, fontList );
else if (face.type() == ScFace::TTF)
- item = new QListWidgetItem( IconManager::instance()->loadIcon("font_truetype16.png"), fontName, fontList );
+ item = new QListWidgetItem( IconManager::instance().loadIcon("font_truetype16.png"), fontName, fontList );
else if (face.type() == ScFace::OTF)
- item = new QListWidgetItem( IconManager::instance()->loadIcon("font_otf16.png"), fontName, fontList );
+ item = new QListWidgetItem( IconManager::instance().loadIcon("font_otf16.png"), fontName, fontList );
return item;
}
Modified: trunk/Scribus/scribus/ui/prefs_userinterface.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23054&path=/trunk/Scribus/scribus/ui/prefs_userinterface.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/prefs_userinterface.cpp (original)
+++ trunk/Scribus/scribus/ui/prefs_userinterface.cpp Sat Jun 29 20:17:20 2019
@@ -45,7 +45,7 @@
themeComboBox->addItem("");
themeComboBox->addItems(styleList);
QStringList iconSetList;
- iconSetList=IconManager::instance()->nameList(ScQApp->currGUILanguage());
+ iconSetList=IconManager::instance().nameList(ScQApp->currGUILanguage());
iconSetComboBox->addItems(iconSetList);
connect(languageComboBox, SIGNAL(activated(const QString &)), this, SLOT(setSelectedGUILang(const QString &)));
@@ -115,7 +115,7 @@
{
prefsData->uiPrefs.language=selectedGUILang;
prefsData->uiPrefs.style=themeComboBox->currentText();
- prefsData->uiPrefs.iconSet=IconManager::instance()->baseNameForTranslation(iconSetComboBox->currentText());
+ prefsData->uiPrefs.iconSet=IconManager::instance().baseNameForTranslation(iconSetComboBox->currentText());
prefsData->uiPrefs.applicationFontSize=fontSizeMenuSpinBox->value();
prefsData->uiPrefs.paletteFontSize=fontSizePaletteSpinBox->value();
prefsData->uiPrefs.wheelJump=wheelJumpSpinBox->value();
Modified: trunk/Scribus/scribus/ui/preview.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23054&path=/trunk/Scribus/scribus/ui/preview.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/preview.cpp (original)
+++ trunk/Scribus/scribus/ui/preview.cpp Sat Jun 29 20:17:20 2019
@@ -75,7 +75,7 @@
PPreview::PPreview( QWidget* parent, ScribusView *vin, ScribusDoc *docu, const QString& printer, PrintEngine engine ) : QDialog( parent )
{
setModal(true);
- setWindowIcon(IconManager::instance()->loadIcon("AppIcon.png"));
+ setWindowIcon(IconManager::instance().loadIcon("AppIcon.png"));
Q_ASSERT(!docu->masterPageMode());
prefsManager=PrefsManager::instance();
postscriptPreview = usePostscriptPreview(printer, engine);
@@ -147,7 +147,7 @@
Table = new QTableWidget(spots.count()+4, 2, devTitle );
inkMax = (spots.count()+4) * 255;
- Table->setHorizontalHeaderItem(0, new QTableWidgetItem(IconManager::instance()->loadIcon("16/show-object.png"), ""));
+ Table->setHorizontalHeaderItem(0, new QTableWidgetItem(IconManager::instance().loadIcon("16/show-object.png"), ""));
Table->setHorizontalHeaderItem(1, new QTableWidgetItem( tr("Separation Name")));
QHeaderView *header = Table->horizontalHeader();
header->setStretchLastSection(true);
@@ -1140,7 +1140,7 @@
{
pixmap = QPixmap(image.width(), image.height());
QPainter p;
- QBrush b(QColor(205,205,205), IconManager::instance()->loadPixmap("testfill.png"));
+ QBrush b(QColor(205,205,205), IconManager::instance().loadPixmap("testfill.png"));
p.begin(&pixmap);
p.fillRect(0, 0, image.width(), image.height(), b);
p.drawImage(0, 0, image);
Modified: trunk/Scribus/scribus/ui/printdialog.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23054&path=/trunk/Scribus/scribus/ui/printdialog.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/printdialog.cpp (original)
+++ trunk/Scribus/scribus/ui/printdialog.cpp Sat Jun 29 20:17:20 2019
@@ -48,8 +48,8 @@
prefs = PrefsManager::instance()->prefsFile->getContext("print_options");
DevMode = printOptions.devMode;
PrinterOpts = "";
- setWindowIcon(IconManager::instance()->loadIcon("AppIcon.png"));
- pageNrButton->setIcon(IconManager::instance()->loadIcon("ellipsis.png"));
+ setWindowIcon(IconManager::instance().loadIcon("AppIcon.png"));
+ pageNrButton->setIcon(IconManager::instance().loadIcon("ellipsis.png"));
printEngines->addItem( CommonStrings::trPostScript1 );
printEngines->addItem( CommonStrings::trPostScript2 );
printEngines->addItem( CommonStrings::trPostScript3 );
Modified: trunk/Scribus/scribus/ui/propertiespalette_group.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23054&path=/trunk/Scribus/scribus/ui/propertiespalette_group.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/propertiespalette_group.cpp (original)
+++ trunk/Scribus/scribus/ui/propertiespalette_group.cpp Sat Jun 29 20:17:20 2019
@@ -86,11 +86,11 @@
setupUi(this);
setSizePolicy( QSizePolicy(QSizePolicy::Maximum, QSizePolicy::Maximum));
- 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"));
+ 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"));
textFlowDisabled->setSizePolicy(QSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding));
textFlowUsesFrameShape->setSizePolicy(QSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding));
Modified: trunk/Scribus/scribus/ui/propertiespalette_line.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23054&path=/trunk/Scribus/scribus/ui/propertiespalette_line.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/propertiespalette_line.cpp (original)
+++ trunk/Scribus/scribus/ui/propertiespalette_line.cpp Sat Jun 29 20:17:20 2019
@@ -685,18 +685,18 @@
QSignalBlocker lineJoinStyleBlocker(lineJoinStyle);
int oldLJoinStyle = lineJoinStyle->currentIndex();
lineJoinStyle->clear();
- 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"));
+ 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"));
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->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:"));
Modified: trunk/Scribus/scribus/ui/propertiespalette_shape.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23054&path=/trunk/Scribus/scribus/ui/propertiespalette_shape.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/propertiespalette_shape.cpp (original)
+++ trunk/Scribus/scribus/ui/propertiespalette_shape.cpp Sat Jun 29 20:17:20 2019
@@ -51,11 +51,11 @@
setupUi(this);
setSizePolicy( QSizePolicy(QSizePolicy::Maximum, QSizePolicy::Maximum));
- 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"));
+ 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"));
languageChange();
Modified: trunk/Scribus/scribus/ui/propertiespalette_table.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23054&path=/trunk/Scribus/scribus/ui/propertiespalette_table.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/propertiespalette_table.cpp (original)
+++ trunk/Scribus/scribus/ui/propertiespalette_table.cpp Sat Jun 29 20:17:20 2019
@@ -34,12 +34,12 @@
setupUi(this);
setSizePolicy( QSizePolicy(QSizePolicy::Maximum, QSizePolicy::Maximum));
- addBorderLineButton->setIcon(IconManager::instance()->loadIcon("penciladd.png"));
- removeBorderLineButton->setIcon(IconManager::instance()->loadIcon("pencilsub.png"));
+ addBorderLineButton->setIcon(IconManager::instance().loadIcon("penciladd.png"));
+ removeBorderLineButton->setIcon(IconManager::instance().loadIcon("pencilsub.png"));
labelTable->setBuddy(tableStyleCombo);
- buttonClearTableStyle->setIcon(IconManager::instance()->loadIcon("16/edit-clear.png"));
+ buttonClearTableStyle->setIcon(IconManager::instance().loadIcon("16/edit-clear.png"));
labelCells->setBuddy(cellStyleCombo);
- buttonClearCellStyle->setIcon(IconManager::instance()->loadIcon("16/edit-clear.png"));
+ buttonClearCellStyle->setIcon(IconManager::instance().loadIcon("16/edit-clear.png"));
connect(tableStyleCombo, SIGNAL(newStyle(const QString&)), this, SLOT(setTableStyle(const QString&)));
connect(cellStyleCombo, SIGNAL(newStyle(const QString&)), this, SLOT(setCellStyle(const QString&)));
}
Modified: trunk/Scribus/scribus/ui/propertiespalette_text.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23054&path=/trunk/Scribus/scribus/ui/propertiespalette_text.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/propertiespalette_text.cpp (original)
+++ trunk/Scribus/scribus/ui/propertiespalette_text.cpp Sat Jun 29 20:17:20 2019
@@ -63,13 +63,13 @@
setupUi(this);
fontSize->setPrefix( "" );
- fontSizeLabel->setPixmap(IconManager::instance()->loadPixmap("zeichen.png"));
- lineSpacingLabel->setPixmap(IconManager::instance()->loadPixmap("linespacing2.png"));
+ fontSizeLabel->setPixmap(IconManager::instance().loadPixmap("zeichen.png"));
+ lineSpacingLabel->setPixmap(IconManager::instance().loadPixmap("linespacing2.png"));
paraStyleLabel->setBuddy(paraStyleCombo);
- paraStyleClear->setIcon(IconManager::instance()->loadPixmap("16/edit-clear.png"));
+ paraStyleClear->setIcon(IconManager::instance().loadPixmap("16/edit-clear.png"));
charStyleLabel->setBuddy(charStyleCombo);
- charStyleClear->setIcon(IconManager::instance()->loadPixmap("16/edit-clear.png"));
+ charStyleClear->setIcon(IconManager::instance().loadPixmap("16/edit-clear.png"));
colorWidgets = new PropertyWidget_TextColor(textTree);
colorWidgetsItem = textTree->addItem( colorWidgets, tr("Color && Effects") );
Modified: trunk/Scribus/scribus/ui/propertiespalette_xyz.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23054&path=/trunk/Scribus/scribus/ui/propertiespalette_xyz.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/propertiespalette_xyz.cpp (original)
+++ trunk/Scribus/scribus/ui/propertiespalette_xyz.cpp Sat Jun 29 20:17:20 2019
@@ -78,37 +78,37 @@
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"));
+ 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"));
+ 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->setIcon(im.loadIcon("16/flip-object-vertical.png"));
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);
+ 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);
+ 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);
+ a3.addPixmap(im.loadPixmap("framenoresize.png"), QIcon::Normal, QIcon::On);
+ a3.addPixmap(im.loadPixmap("frameresize.png"), QIcon::Normal, QIcon::Off);
noResize->setIcon(a3);
m_lineMode = false;
Modified: trunk/Scribus/scribus/ui/propertywidget_advanced.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23054&path=/trunk/Scribus/scribus/ui/propertywidget_advanced.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/propertywidget_advanced.cpp (original)
+++ trunk/Scribus/scribus/ui/propertywidget_advanced.cpp Sat Jun 29 20:17:20 2019
@@ -30,14 +30,14 @@
layout()->setAlignment( Qt::AlignLeft );
textBase->setValue( 0 );
- textBaseLabel->setPixmap(IconManager::instance()->loadPixmap("textbase.png"));
- trackingLabel->setPixmap(IconManager::instance()->loadPixmap("textkern.png"));
+ 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"));
+ scaleHLabel->setPixmap(IconManager::instance().loadPixmap("textscaleh.png"));
scaleV->setValues(10, 400, 2, 100 );
- scaleVLabel->setPixmap(IconManager::instance()->loadPixmap("textscalev.png"));
+ scaleVLabel->setPixmap(IconManager::instance().loadPixmap("textscalev.png"));
minWordTrackingLabel->setBuddy(minWordTrackingSpinBox);
normWordTrackingLabel->setBuddy(normWordTrackingSpinBox);
Modified: trunk/Scribus/scribus/ui/propertywidget_pareffect.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23054&path=/trunk/Scribus/scribus/ui/propertywidget_pareffect.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/propertywidget_pareffect.cpp (original)
+++ trunk/Scribus/scribus/ui/propertywidget_pareffect.cpp Sat Jun 29 20:17:20 2019
@@ -35,7 +35,7 @@
peCharStyleCombo->updateFormatList();
fillBulletStrEditCombo();
enableParEffect(false);
- bulletCharTableButton->setIcon(IconManager::instance()->loadIcon("22/insert-table.png"));
+ bulletCharTableButton->setIcon(IconManager::instance().loadIcon("22/insert-table.png"));
numStart->setMinimum(1);
numStart->setMaximum(9999);
numLevelSpin->setMinimum(1);
Modified: trunk/Scribus/scribus/ui/propertywidget_textcolor.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23054&path=/trunk/Scribus/scribus/ui/propertywidget_textcolor.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/propertywidget_textcolor.cpp (original)
+++ trunk/Scribus/scribus/ui/propertywidget_textcolor.cpp Sat Jun 29 20:17:20 2019
@@ -27,21 +27,21 @@
fillLayout->setAlignment( Qt::AlignLeft );
fillColor->setPixmapType(ColorCombo::fancyPixmaps);
- fillIcon->setPixmap(IconManager::instance()->loadPixmap("16/color-fill.png"));
+ fillIcon->setPixmap(IconManager::instance().loadPixmap("16/color-fill.png"));
fillIcon->setScaledContents( false );
- fillShadeLabel->setPixmap(IconManager::instance()->loadPixmap("shade.png"));
+ 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->setPixmap(IconManager::instance().loadPixmap("16/color-stroke.png"));
strokeIcon->setScaledContents( false );
- strokeShadeLabel->setPixmap(IconManager::instance()->loadPixmap("shade.png"));
+ 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->setPixmap(IconManager::instance().loadPixmap("16/color-fill.png"));
backIcon->setScaledContents( false );
- backShadeLabel->setPixmap(IconManager::instance()->loadPixmap("shade.png"));
+ backShadeLabel->setPixmap(IconManager::instance().loadPixmap("shade.png"));
effectsLayout->setAlignment( Qt::AlignLeft );
Modified: trunk/Scribus/scribus/ui/query.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23054&path=/trunk/Scribus/scribus/ui/query.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/query.cpp (original)
+++ trunk/Scribus/scribus/ui/query.cpp Sat Jun 29 20:17:20 2019
@@ -20,7 +20,7 @@
Query::Query( QWidget* parent, const char* name, bool modal, const QString& text, const QString& titel ) : QDialog( parent )
{
setWindowTitle( titel );
- setWindowIcon(IconManager::instance()->loadIcon("AppIcon.png"));
+ setWindowIcon(IconManager::instance().loadIcon("AppIcon.png"));
setModal(modal);
queryLayout = new QVBoxLayout( this );
queryLayout->setMargin(5);
Modified: trunk/Scribus/scribus/ui/recoverdialog.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23054&path=/trunk/Scribus/scribus/ui/recoverdialog.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/recoverdialog.cpp (original)
+++ trunk/Scribus/scribus/ui/recoverdialog.cpp Sat Jun 29 20:17:20 2019
@@ -36,7 +36,7 @@
{
setupUi(this);
setModal(true);
- setWindowIcon(IconManager::instance()->loadPixmap("AppIcon.png"));
+ setWindowIcon(IconManager::instance().loadPixmap("AppIcon.png"));
m_files = files;
recoverFiles.clear();
filesList->setColumnWidth(0, 24);
Modified: trunk/Scribus/scribus/ui/replacecolors.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23054&path=/trunk/Scribus/scribus/ui/replacecolors.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/replacecolors.cpp (original)
+++ trunk/Scribus/scribus/ui/replacecolors.cpp Sat Jun 29 20:17:20 2019
@@ -36,17 +36,17 @@
{
setupUi(this);
setModal(true);
- setWindowIcon(IconManager::instance()->loadPixmap("AppIcon.png"));
+ setWindowIcon(IconManager::instance().loadPixmap("AppIcon.png"));
EditColors = colorList;
UsedColors = colorListUsed;
selectedRow = -1;
replaceMap.clear();
- 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);
+ 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);
replacementTable->horizontalHeader()->setSectionsClickable(false );
replacementTable->horizontalHeader()->setSectionsMovable( false );
replacementTable->horizontalHeader()->setSectionResizeMode(QHeaderView::Stretch);
Modified: trunk/Scribus/scribus/ui/replaceonecolor.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23054&path=/trunk/Scribus/scribus/ui/replaceonecolor.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/replaceonecolor.cpp (original)
+++ trunk/Scribus/scribus/ui/replaceonecolor.cpp Sat Jun 29 20:17:20 2019
@@ -32,7 +32,7 @@
{
setupUi(this);
setModal(true);
- setWindowIcon(IconManager::instance()->loadIcon("AppIcon.png" ));
+ setWindowIcon(IconManager::instance().loadIcon("AppIcon.png" ));
originalColor->setPixmapType(ColorCombo::fancyPixmaps);
originalColor->setColors(usedColors, true);
replacementColor->setPixmapType(ColorCombo::fancyPixmaps);
Modified: trunk/Scribus/scribus/ui/rulermover.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23054&path=/trunk/Scribus/scribus/ui/rulermover.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/rulermover.cpp (original)
+++ trunk/Scribus/scribus/ui/rulermover.cpp Sat Jun 29 20:17:20 2019
@@ -47,7 +47,7 @@
setAutoFillBackground(true);
QPalette palette;
palette.setBrush(QPalette::Window, QColor(240, 240, 240));
- palette.setBrush(backgroundRole(), QBrush(IconManager::instance()->loadPixmap("mover.png")));
+ palette.setBrush(backgroundRole(), QBrush(IconManager::instance().loadPixmap("mover.png")));
setPalette(palette);
currView = pa;
rulerGesture = new RulerGesture(currView, RulerGesture::ORIGIN);
Modified: trunk/Scribus/scribus/ui/scdockpalette.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23054&path=/trunk/Scribus/scribus/ui/scdockpalette.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/scdockpalette.cpp (original)
+++ trunk/Scribus/scribus/ui/scdockpalette.cpp Sat Jun 29 20:17:20 2019
@@ -65,7 +65,7 @@
m_originalParent=parent;
m_tempParent=nullptr;
setAllowedAreas(Qt::LeftDockWidgetArea | Qt::RightDockWidgetArea);
- setWindowIcon(IconManager::instance()->loadPixmap("AppIcon.png"));
+ setWindowIcon(IconManager::instance().loadPixmap("AppIcon.png"));
setPrefsContext(prefsContext);
setObjectName(prefsContext);
connect(PrefsManager::instance(), SIGNAL(prefsChanged()), this, SLOT(setFontSize()));
Modified: trunk/Scribus/scribus/ui/scinputdialog.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23054&path=/trunk/Scribus/scribus/ui/scinputdialog.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/scinputdialog.cpp (original)
+++ trunk/Scribus/scribus/ui/scinputdialog.cpp Sat Jun 29 20:17:20 2019
@@ -23,7 +23,7 @@
if ( !name )
setObjectName( "ScInputDialog" );
setModal(modal);
- setWindowIcon(IconManager::instance()->loadIcon("AppIcon.png"));
+ setWindowIcon(IconManager::instance().loadIcon("AppIcon.png"));
setSizeGripEnabled( true );
ScInputDialogLayout = new QVBoxLayout( this );
ScInputDialogLayout->setMargin(10);
Modified: trunk/Scribus/scribus/ui/scmenu.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23054&path=/trunk/Scribus/scribus/ui/scmenu.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/scmenu.cpp (original)
+++ trunk/Scribus/scribus/ui/scmenu.cpp Sat Jun 29 20:17:20 2019
@@ -164,7 +164,7 @@
}
}
if (newMenuAction->icon().isNull() && ! menuListHasNoIcons)
- newMenuAction->setIcon(IconManager::instance()->loadIcon("noicon.png"));
+ newMenuAction->setIcon(IconManager::instance().loadIcon("noicon.png"));
#endif
menuItemList.append(newMenuAction);
@@ -198,7 +198,7 @@
#ifdef Q_OS_MAC
if (newMenuAction && afterMenuAction)
if (newMenuAction->icon().isNull() && ! (afterMenuAction->icon().isNull()))
- newMenuAction->setIcon(IconManager::instance()->loadIcon("noicon.png"));
+ newMenuAction->setIcon(IconManager::instance().loadIcon("noicon.png"));
#endif
int pos=menuItemList.indexOf(QPointer<QObject>(afterMenuAction));
Modified: trunk/Scribus/scribus/ui/scrapbookpalette.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23054&path=/trunk/Scribus/scribus/ui/scrapbookpalette.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/scrapbookpalette.cpp (original)
+++ trunk/Scribus/scribus/ui/scrapbookpalette.cpp Sat Jun 29 20:17:20 2019
@@ -548,7 +548,7 @@
}
if (dd[dc].compare(".ScribusThumbs", Qt::CaseInsensitive) == 0)
continue;
- QPixmap pm = IconManager::instance()->loadPixmap("folder.png");
+ QPixmap pm = IconManager::instance().loadPixmap("folder.png");
addObject(dd[dc], "", pm, true);
}
}
@@ -731,23 +731,23 @@
buttonLayout->setMargin( 0 );
newButton = new QToolButton(this);
newButton->setSizePolicy(QSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed));
- newButton->setIcon(IconManager::instance()->loadPixmap("16/document-new.png"));
+ newButton->setIcon(IconManager::instance().loadPixmap("16/document-new.png"));
newButton->setIconSize(QSize(16, 16));
upButton = new QToolButton(this);
upButton->setSizePolicy(QSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed));
- upButton->setIcon(IconManager::instance()->loadPixmap("16/go-up.png"));
+ upButton->setIcon(IconManager::instance().loadPixmap("16/go-up.png"));
upButton->setIconSize(QSize(16, 16));
importButton = new QToolButton(this);
importButton->setSizePolicy(QSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed));
- importButton->setIcon(IconManager::instance()->loadPixmap("compfile16.png"));
+ importButton->setIcon(IconManager::instance().loadPixmap("compfile16.png"));
importButton->setIconSize(QSize(16, 16));
closeButton = new QToolButton(this);
closeButton->setSizePolicy(QSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed));
- closeButton->setIcon(IconManager::instance()->loadPixmap("16/close.png"));
+ closeButton->setIcon(IconManager::instance().loadPixmap("16/close.png"));
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->setIcon(IconManager::instance().loadPixmap("16/configure.png"));
configButton->setIconSize(QSize(16, 16));
configMenue = new QMenu();
conf_HideDirs = configMenue->addAction( tr("Hide Directories"));
@@ -821,7 +821,7 @@
if (activeBView->canWrite)
Frame3->addItem(activeBView, d.dirName());
else
- Frame3->addItem(activeBView, IconManager::instance()->loadIcon("16/lock.png"), d.dirName());
+ Frame3->addItem(activeBView, IconManager::instance().loadIcon("16/lock.png"), d.dirName());
activeBView->readContents(fileName);
activeBView->ScFilename = fileName;
activeBView->visibleName = d.dirName();
@@ -959,7 +959,7 @@
if (activeBView->canWrite)
Frame3->addItem(activeBView, d.dirName());
else
- Frame3->addItem(activeBView, IconManager::instance()->loadIcon("16/lock.png"), d.dirName());
+ Frame3->addItem(activeBView, IconManager::instance().loadIcon("16/lock.png"), d.dirName());
activeBView->readContents(fileName);
activeBView->ScFilename = fileName;
activeBView->visibleName = d.dirName();
@@ -1103,7 +1103,7 @@
if (fd.isWritable())
Frame3->addItem(activeBView, d.dirName());
else
- Frame3->addItem(activeBView, IconManager::instance()->loadIcon("16/lock.png"), d.dirName());
+ Frame3->addItem(activeBView, IconManager::instance().loadIcon("16/lock.png"), d.dirName());
}
activeBView->canWrite = fd.isWritable();
activeBView->setAcceptDrops(activeBView->canWrite);
@@ -1112,7 +1112,7 @@
activeBView->visibleName = d.dirName();
Frame3->setItemText(Frame3->indexOf(activeBView), d.dirName());
if (!activeBView->canWrite)
- Frame3->setItemIcon(Frame3->indexOf(activeBView), IconManager::instance()->loadIcon("16/lock.png"));
+ Frame3->setItemIcon(Frame3->indexOf(activeBView), IconManager::instance().loadIcon("16/lock.png"));
ScCore->fileWatcher->addDir(d.absolutePath(), true);
d.cdUp();
PrefsContext* dirs = PrefsManager::instance()->prefsFile->getContext("dirs");
@@ -1143,7 +1143,7 @@
activeBView->visibleName = d.dirName();
Frame3->setItemText(Frame3->indexOf(activeBView), d.dirName());
if (!activeBView->canWrite)
- Frame3->setItemIcon(Frame3->indexOf(activeBView), IconManager::instance()->loadIcon("16/lock.png"));
+ Frame3->setItemIcon(Frame3->indexOf(activeBView), IconManager::instance().loadIcon("16/lock.png"));
ScCore->fileWatcher->addDir(d.absolutePath(), true);
d.cdUp();
PrefsContext* dirs = PrefsManager::instance()->prefsFile->getContext("dirs");
Modified: trunk/Scribus/scribus/ui/scrpalettebase.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23054&path=/trunk/Scribus/scribus/ui/scrpalettebase.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/scrpalettebase.cpp (original)
+++ trunk/Scribus/scribus/ui/scrpalettebase.cpp Sat Jun 29 20:17:20 2019
@@ -61,7 +61,7 @@
}
m_originalParent=parent;
m_tempParent=nullptr;
- setWindowIcon(IconManager::instance()->loadIcon("AppIcon.png"));
+ setWindowIcon(IconManager::instance().loadIcon("AppIcon.png"));
setPrefsContext(prefsContext);
setModal(modal);
connect(PrefsManager::instance(), SIGNAL(prefsChanged()), this, SLOT(setFontSize()));
Modified: trunk/Scribus/scribus/ui/search.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23054&path=/trunk/Scribus/scribus/ui/search.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/search.cpp (original)
+++ trunk/Scribus/scribus/ui/search.cpp Sat Jun 29 20:17:20 2019
@@ -49,7 +49,7 @@
setModal(true);
setWindowTitle( tr( "Search/Replace" ) );
- setWindowIcon(IconManager::instance()->loadIcon("AppIcon.png"));
+ setWindowIcon(IconManager::instance().loadIcon("AppIcon.png"));
SearchReplaceLayout = new QVBoxLayout( this );
SearchReplaceLayout->setMargin(10);
Modified: trunk/Scribus/scribus/ui/selectobjects.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23054&path=/trunk/Scribus/scribus/ui/selectobjects.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/selectobjects.cpp (original)
+++ trunk/Scribus/scribus/ui/selectobjects.cpp Sat Jun 29 20:17:20 2019
@@ -32,7 +32,7 @@
{
setupUi(this);
setModal(true);
- setWindowIcon(IconManager::instance()->loadIcon("AppIcon.png"));
+ setWindowIcon(IconManager::instance().loadIcon("AppIcon.png"));
backgroundCombo->setPixmapType(ColorCombo::fancyPixmaps);
backgroundCombo->setColors(availableColors, true);
lineCombo->setPixmapType(ColorCombo::fancyPixmaps);
Modified: trunk/Scribus/scribus/ui/selfield.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23054&path=/trunk/Scribus/scribus/ui/selfield.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/selfield.cpp (original)
+++ trunk/Scribus/scribus/ui/selfield.cpp Sat Jun 29 20:17:20 2019
@@ -26,7 +26,7 @@
{
setModal(true);
setWindowTitle( tr( "Select Fields" ) );
- setWindowIcon(IconManager::instance()->loadIcon("AppIcon.png"));
+ setWindowIcon(IconManager::instance().loadIcon("AppIcon.png"));
FTyp = Art;
SelectFieldsLayout = new QVBoxLayout( this );
SelectFieldsLayout->setMargin(10);
Modified: trunk/Scribus/scribus/ui/smcellstylewidget.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23054&path=/trunk/Scribus/scribus/ui/smcellstylewidget.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/smcellstylewidget.cpp (original)
+++ trunk/Scribus/scribus/ui/smcellstylewidget.cpp Sat Jun 29 20:17:20 2019
@@ -16,10 +16,10 @@
{
setupUi(this);
- fillColorIcon->setPixmap(IconManager::instance()->loadPixmap("16/color-fill.png"));
+ 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") );
+ fillShadeLabel->setPixmap(IconManager::instance().loadPixmap("shade.png") );
}
SMCellStyleWidget::~SMCellStyleWidget()
Modified: trunk/Scribus/scribus/ui/smcstylewidget.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23054&path=/trunk/Scribus/scribus/ui/smcstylewidget.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/smcstylewidget.cpp (original)
+++ trunk/Scribus/scribus/ui/smcstylewidget.cpp Sat Jun 29 20:17:20 2019
@@ -21,19 +21,19 @@
{
setupUi(this);
- IconManager* im = IconManager::instance();
- fontSizeLabel_->setPixmap(im->loadPixmap("zeichen.png"));
- trackingLabel_->setPixmap(im->loadPixmap("textkern.png"));
- widthSpaceLabel->setPixmap(im->loadPixmap("spacewidth.png"));
- baselineOffsetLabel_->setPixmap(im->loadPixmap("textbase.png"));
- hscaleLabel_->setPixmap(im->loadPixmap("textscaleh.png"));
- vscaleLabel_->setPixmap(im->loadPixmap("textscalev.png"));
- FillIcon->setPixmap(im->loadPixmap("16/color-fill.png"));
- fillShadeLabel->setPixmap(im->loadPixmap("shade.png"));
- StrokeIcon->setPixmap(im->loadPixmap("16/color-stroke.png"));
- strokeShadeLabel->setPixmap(im->loadPixmap("shade.png"));
- backIcon->setPixmap(im->loadPixmap("16/color-fill.png"));
- backShadeLabel->setPixmap(im->loadPixmap("shade.png"));
+ IconManager& im = IconManager::instance();
+ fontSizeLabel_->setPixmap(im.loadPixmap("zeichen.png"));
+ trackingLabel_->setPixmap(im.loadPixmap("textkern.png"));
+ widthSpaceLabel->setPixmap(im.loadPixmap("spacewidth.png"));
+ baselineOffsetLabel_->setPixmap(im.loadPixmap("textbase.png"));
+ hscaleLabel_->setPixmap(im.loadPixmap("textscaleh.png"));
+ vscaleLabel_->setPixmap(im.loadPixmap("textscalev.png"));
+ FillIcon->setPixmap(im.loadPixmap("16/color-fill.png"));
+ fillShadeLabel->setPixmap(im.loadPixmap("shade.png"));
+ StrokeIcon->setPixmap(im.loadPixmap("16/color-stroke.png"));
+ 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();
Modified: trunk/Scribus/scribus/ui/smlinestylewidget.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23054&path=/trunk/Scribus/scribus/ui/smlinestylewidget.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/smlinestylewidget.cpp (original)
+++ trunk/Scribus/scribus/ui/smlinestylewidget.cpp Sat Jun 29 20:17:20 2019
@@ -24,9 +24,8 @@
colorCombo->setPixmapType(ColorCombo::fancyPixmaps);
- IconManager* im = IconManager::instance();
- addButton->setIcon(im->loadIcon("penciladd.png"));
- removeButton->setIcon(im->loadIcon("pencilsub.png"));
+ addButton->setIcon(IconManager::instance().loadIcon("penciladd.png"));
+ removeButton->setIcon(IconManager::instance().loadIcon("pencilsub.png"));
lineWidth->setMinimum(0.0);
lineWidth->setMaximum(300.0);
@@ -80,22 +79,22 @@
void SMLineStyleWidget::fillEndCombo()
{
- IconManager* im = IconManager::instance();
+ IconManager& im = IconManager::instance();
endCombo->clear();
- endCombo->addItem(im->loadIcon("ButtCap.png"), tr( "Flat Cap" ) );
- endCombo->addItem(im->loadIcon("SquareCap.png"), tr( "Square Cap" ) );
- endCombo->addItem(im->loadIcon("RoundCap.png"), tr( "Round Cap" ) );
+ endCombo->addItem(im.loadIcon("ButtCap.png"), tr( "Flat Cap" ) );
+ endCombo->addItem(im.loadIcon("SquareCap.png"), tr( "Square Cap" ) );
+ endCombo->addItem(im.loadIcon("RoundCap.png"), tr( "Round Cap" ) );
}
void SMLineStyleWidget::fillJoinCombo()
{
- IconManager* im = IconManager::instance();
+ IconManager& im = IconManager::instance();
joinCombo->clear();
- joinCombo->addItem(im->loadIcon("MiterJoin.png"), tr( "Miter Join" ) );
- joinCombo->addItem(im->loadIcon("BevelJoin.png"), tr( "Bevel Join" ) );
- joinCombo->addItem(im->loadIcon("RoundJoin.png"), tr( "Round Join" ) );
+ joinCombo->addItem(im.loadIcon("MiterJoin.png"), tr( "Miter Join" ) );
+ joinCombo->addItem(im.loadIcon("BevelJoin.png"), tr( "Bevel Join" ) );
+ joinCombo->addItem(im.loadIcon("RoundJoin.png"), tr( "Round Join" ) );
}
void SMLineStyleWidget::showStyle(const multiLine &lineStyle, ColorList &colorList, int subLine)
Modified: trunk/Scribus/scribus/ui/smpstylewidget.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23054&path=/trunk/Scribus/scribus/ui/smpstylewidget.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/smpstylewidget.cpp (original)
+++ trunk/Scribus/scribus/ui/smpstylewidget.cpp Sat Jun 29 20:17:20 2019
@@ -37,11 +37,11 @@
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"));
+ 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"));
backColor_->setPixmapType(ColorCombo::fancyPixmaps);
backColor_->clear();
@@ -66,7 +66,7 @@
parEffectOffset->setSuffix(unitGetSuffixFromIndex(0));
fillBulletStrEditCombo();
- bulletCharTableButton->setIcon(IconManager::instance()->loadPixmap("22/insert-table.png"));
+ bulletCharTableButton->setIcon(IconManager::instance().loadPixmap("22/insert-table.png"));
numStartSpin->setMinimum(1);
numStartSpin->setMaximum(9999);
numLevelSpin->setMinimum(1);
Modified: trunk/Scribus/scribus/ui/smtablestylewidget.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23054&path=/trunk/Scribus/scribus/ui/smtablestylewidget.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/smtablestylewidget.cpp (original)
+++ trunk/Scribus/scribus/ui/smtablestylewidget.cpp Sat Jun 29 20:17:20 2019
@@ -16,10 +16,10 @@
{
setupUi(this);
- fillColorIcon->setPixmap(IconManager::instance()->loadPixmap("16/color-fill.png"));
+ 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") );
+ fillShadeLabel->setPixmap(IconManager::instance().loadPixmap("shade.png") );
}
SMTableStyleWidget::~SMTableStyleWidget()
Modified: trunk/Scribus/scribus/ui/storyeditor.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23054&path=/trunk/Scribus/scribus/ui/storyeditor.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/storyeditor.cpp (original)
+++ trunk/Scribus/scribus/ui/storyeditor.cpp Sat Jun 29 20:17:20 2019
@@ -1132,7 +1132,7 @@
SToolBColorF::SToolBColorF(QMainWindow* parent, ScribusDoc *doc) : QToolBar( tr("Fill Color Settings"), parent)
{
FillIcon = new QLabel(this);
- FillIcon->setPixmap(IconManager::instance()->loadPixmap("16/color-fill.png"));
+ FillIcon->setPixmap(IconManager::instance().loadPixmap("16/color-fill.png"));
FillIcon->setScaledContents( false );
fillIconAction=addWidget(FillIcon);
fillIconAction->setVisible(true);
@@ -1199,7 +1199,7 @@
SToolBColorS::SToolBColorS(QMainWindow* parent, ScribusDoc *doc) : QToolBar( tr("Stroke Color Settings"), parent)
{
StrokeIcon = new QLabel( "", this );
- StrokeIcon->setPixmap(IconManager::instance()->loadPixmap("16/color-stroke.png"));
+ StrokeIcon->setPixmap(IconManager::instance().loadPixmap("16/color-stroke.png"));
StrokeIcon->setScaledContents( false );
strokeIconAction=addWidget(StrokeIcon);
strokeIconAction->setVisible(true);
@@ -1268,7 +1268,7 @@
seStyleAction->setVisible(true);
trackingLabel = new QLabel( this );
trackingLabel->setText("");
- trackingLabel->setPixmap(IconManager::instance()->loadPixmap("textkern.png"));
+ trackingLabel->setPixmap(IconManager::instance().loadPixmap("textkern.png"));
trackingLabelAction=addWidget(trackingLabel);
trackingLabelAction->setVisible(true);
Extra = new ScrSpinBox( this, SC_PERCENT );
@@ -1449,7 +1449,7 @@
sizeAction=addWidget(Size);
sizeAction->setVisible(true);
lblScaleTxtH = new QLabel("", this);
- lblScaleTxtH->setPixmap(IconManager::instance()->loadPixmap("textscaleh.png"));
+ lblScaleTxtH->setPixmap(IconManager::instance().loadPixmap("textscaleh.png"));
scaleTxtHAction=addWidget(lblScaleTxtH);
scaleTxtHAction->setVisible(true);
charScaleH = new ScrSpinBox( 10, 400, this, SC_PERCENT );
@@ -1458,7 +1458,7 @@
chScaleHAction=addWidget(charScaleH);
chScaleHAction->setVisible(true);
lblScaleTxtV = new QLabel("", this);
- lblScaleTxtV->setPixmap(IconManager::instance()->loadPixmap("textscalev.png"));
+ lblScaleTxtV->setPixmap(IconManager::instance().loadPixmap("textscalev.png"));
scaleTxtVAction=addWidget(lblScaleTxtV);
scaleTxtVAction->setVisible(true);
charScaleV = new ScrSpinBox( 10, 400, this, SC_PERCENT );
@@ -1562,7 +1562,7 @@
m_spellActive=false;
prefsManager=PrefsManager::instance();
#ifdef Q_OS_MAC
- noIcon = IconManager::instance()->loadPixmap("noicon.png");
+ noIcon = IconManager::instance().loadPixmap("noicon.png");
#endif
buildGUI();
/*
@@ -1666,15 +1666,15 @@
void StoryEditor::initActions()
{
- IconManager* im = IconManager::instance();
+ 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(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("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(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));
connect( seActions["fileNew"], SIGNAL(triggered()), this, SLOT(Do_new()) );
connect( seActions["fileRevert"], SIGNAL(triggered()), this, SLOT(slotFileRevert()) );
@@ -1685,15 +1685,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(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("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(im.loadPixmap("compfile16.png"),im.loadPixmap("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()) );
@@ -1856,7 +1856,7 @@
seActions["unicodeSoftHyphen"]->setEnabled(false);//CB TODO doesn't work in SE yet.
buildMenus();
- setWindowIcon(IconManager::instance()->loadPixmap("AppIcon.png"));
+ setWindowIcon(IconManager::instance().loadPixmap("AppIcon.png"));
StoryEd2Layout = new QHBoxLayout;
StoryEd2Layout->setSpacing( 5 );
StoryEd2Layout->setMargin( 5 );
Modified: trunk/Scribus/scribus/ui/styleselect.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23054&path=/trunk/Scribus/scribus/ui/styleselect.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/styleselect.cpp (original)
+++ trunk/Scribus/scribus/ui/styleselect.cpp Sat Jun 29 20:17:20 2019
@@ -129,7 +129,7 @@
StyleSelect::StyleSelect(QWidget* parent) : QWidget(parent)
{
- IconManager* im = IconManager::instance();
+ IconManager& im = IconManager::instance();
ssLayout = new QHBoxLayout(this);
ssLayout->setSpacing( 0 );
ssLayout->setMargin( 0 );
@@ -141,14 +141,14 @@
UnderlinePop->addAction(UnderlineValAct);
underlineButton = new QToolButton( this );
underlineButton->setText( "" );
- underlineButton->setIcon(im->loadIcon("unter.png"));
+ underlineButton->setIcon(im.loadIcon("unter.png"));
underlineButton->setCheckable( true );
underlineButton->setMenu(UnderlinePop);
underlineButton->setPopupMode(QToolButton::DelayedPopup);
ssLayout->addWidget( underlineButton );
underlineWordButton = new QToolButton( this );
underlineWordButton->setText( "" );
- underlineWordButton->setIcon(im->loadIcon("wordsOnly.png"));
+ underlineWordButton->setIcon(im.loadIcon("wordsOnly.png"));
underlineWordButton->setCheckable( true );
underlineWordButton->setMenu(UnderlinePop);
underlineWordButton->setPopupMode(QToolButton::DelayedPopup);
@@ -156,24 +156,24 @@
subscriptButton = new QToolButton( this );
subscriptButton->setText( "" );
- subscriptButton->setIcon(im->loadIcon("tief.png"));
+ subscriptButton->setIcon(im.loadIcon("tief.png"));
subscriptButton->setCheckable( true );
ssLayout->addWidget( subscriptButton );
superscriptButton = new QToolButton( this );
superscriptButton->setText( "" );
- superscriptButton->setIcon(im->loadIcon("hoch.png"));
+ superscriptButton->setIcon(im.loadIcon("hoch.png"));
superscriptButton->setCheckable( true );
ssLayout->addWidget( superscriptButton );
allcapsButton = new QToolButton( this );
allcapsButton->setMaximumSize( QSize( 22, 22 ) );
allcapsButton->setText("");
- allcapsButton->setIcon(im->loadIcon("AllCaps.png"));
+ allcapsButton->setIcon(im.loadIcon("AllCaps.png"));
allcapsButton->setCheckable( true );
ssLayout->addWidget( allcapsButton );
smallcapsButton = new QToolButton( this );
smallcapsButton->setText("");
- smallcapsButton->setIcon(im->loadIcon("kapital.png"));
+ smallcapsButton->setIcon(im.loadIcon("kapital.png"));
smallcapsButton->setCheckable( true );
ssLayout->addWidget( smallcapsButton );
@@ -184,7 +184,7 @@
StrikePop->addAction(StrikeValAct);
strikeoutButton = new QToolButton( this );
strikeoutButton->setText( "" );
- strikeoutButton->setIcon(im->loadIcon("strike.png"));
+ strikeoutButton->setIcon(im.loadIcon("strike.png"));
strikeoutButton->setCheckable( true );
strikeoutButton->setMenu(StrikePop);
strikeoutButton->setPopupMode(QToolButton::DelayedPopup);
@@ -197,7 +197,7 @@
OutlinePop->addAction(OutlineValAct);
outlineButton = new QToolButton( this );
outlineButton->setText( "" );
- outlineButton->setIcon(im->loadIcon("outlined.png"));
+ outlineButton->setIcon(im.loadIcon("outlined.png"));
outlineButton->setCheckable( true );
outlineButton->setMenu(OutlinePop);
outlineButton->setPopupMode(QToolButton::DelayedPopup);
@@ -210,7 +210,7 @@
ShadowPop->addAction(ShadowValAct);
shadowButton = new QToolButton( this );
shadowButton->setText( "" );
- shadowButton->setIcon(im->loadIcon("shadow.png"));
+ shadowButton->setIcon(im.loadIcon("shadow.png"));
shadowButton->setCheckable( true );
shadowButton->setMenu(ShadowPop);
shadowButton->setPopupMode(QToolButton::DelayedPopup);
Modified: trunk/Scribus/scribus/ui/tabmanager.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23054&path=/trunk/Scribus/scribus/ui/tabmanager.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/tabmanager.cpp (original)
+++ trunk/Scribus/scribus/ui/tabmanager.cpp Sat Jun 29 20:17:20 2019
@@ -21,7 +21,7 @@
{
setModal(true);
setWindowTitle( tr( "Manage Tabulators" ) );
- setWindowIcon(IconManager::instance()->loadIcon("AppIcon.png"));
+ setWindowIcon(IconManager::instance().loadIcon("AppIcon.png"));
docUnitRatio = unitGetRatioFromIndex(dEin);
tmpTab = inTab;
TabManagerLayout = new QVBoxLayout( this );
Modified: trunk/Scribus/scribus/ui/tabpdfoptions.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23054&path=/trunk/Scribus/scribus/ui/tabpdfoptions.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/tabpdfoptions.cpp (original)
+++ trunk/Scribus/scribus/ui/tabpdfoptions.cpp Sat Jun 29 20:17:20 2019
@@ -65,10 +65,10 @@
// General tab
rangeGroupLayout->setAlignment( Qt::AlignTop );
- pageNrButton->setIcon(IconManager::instance()->loadIcon("ellipsis.png"));
- MirrorH->setIcon(IconManager::instance()->loadIcon("16/flip-object-horizontal.png"));
+ pageNrButton->setIcon(IconManager::instance().loadIcon("ellipsis.png"));
+ MirrorH->setIcon(IconManager::instance().loadIcon("16/flip-object-horizontal.png"));
MirrorH->setCheckable( true );
- MirrorV->setIcon(IconManager::instance()->loadIcon("16/flip-object-vertical.png"));
+ MirrorV->setIcon(IconManager::instance().loadIcon("16/flip-object-vertical.png"));
MirrorV->setCheckable( true );
fileOptionsLayout->setAlignment( Qt::AlignTop );
@@ -92,8 +92,8 @@
EmbedList->setSelectionMode(QListWidget::ExtendedSelection);
SubsetList->setMaximumHeight(300);
SubsetList->setSelectionMode(QListWidget::ExtendedSelection);
- ToSubset->setIcon(IconManager::instance()->loadIcon("22/go-next.png"));
- FromSubset->setIcon(IconManager::instance()->loadIcon("22/go-previous.png"));
+ ToSubset->setIcon(IconManager::instance().loadIcon("22/go-next.png"));
+ FromSubset->setIcon(IconManager::instance().loadIcon("22/go-previous.png"));
// Presentation tab
effectsLayout->setAlignment( Qt::AlignTop );
@@ -1422,13 +1422,13 @@
const ScFace& face = AllFonts.value(fontName);
if (face.isReplacement())
- item = new QListWidgetItem( IconManager::instance()->loadIcon("font_subst16.png"), fontName, fontList );
+ item = new QListWidgetItem( IconManager::instance().loadIcon("font_subst16.png"), fontName, fontList );
else if (face.type() == ScFace::TYPE1)
- item = new QListWidgetItem( IconManager::instance()->loadIcon("font_type1_16.png"), fontName, fontList );
+ item = new QListWidgetItem( IconManager::instance().loadIcon("font_type1_16.png"), fontName, fontList );
else if (face.type() == ScFace::TTF)
- item = new QListWidgetItem( IconManager::instance()->loadIcon("font_truetype16.png"), fontName, fontList );
+ item = new QListWidgetItem( IconManager::instance().loadIcon("font_truetype16.png"), fontName, fontList );
else if (face.type() == ScFace::OTF)
- item = new QListWidgetItem( IconManager::instance()->loadIcon("font_otf16.png"), fontName, fontList );
+ item = new QListWidgetItem( IconManager::instance().loadIcon("font_otf16.png"), fontName, fontList );
return item;
}
Modified: trunk/Scribus/scribus/ui/tabruler.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23054&path=/trunk/Scribus/scribus/ui/tabruler.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/tabruler.cpp (original)
+++ trunk/Scribus/scribus/ui/tabruler.cpp Sat Jun 29 20:17:20 2019
@@ -320,7 +320,7 @@
}
if ((!mousePressed) && (m->y() < height()) && (m->y() > 0) && (m->x() > 0) && (m->x() < width()))
{
- setCursor(IconManager::instance()->loadCursor("tab.png", 3));
+ setCursor(IconManager::instance().loadCursor("tab.png", 3));
if (haveInd)
{
fpo = QRect(static_cast<int>(firstLine+leftIndent-offset)-4, 0, 8, 12);
@@ -351,7 +351,7 @@
}
if ((mousePressed) && ((m->y() > height()) || (m->y() < 0) || (m->x() < 0) || (m->x() > width())))
{
- qApp->changeOverrideCursor(IconManager::instance()->loadCursor("DelPoint.png", 1, 1));
+ qApp->changeOverrideCursor(IconManager::instance().loadCursor("DelPoint.png", 1, 1));
}
}
@@ -360,7 +360,7 @@
if (mousePressed)
{
if (rulerCode == 3)
- qApp->changeOverrideCursor(IconManager::instance()->loadCursor("DelPoint.png", 1, 1));
+ qApp->changeOverrideCursor(IconManager::instance().loadCursor("DelPoint.png", 1, 1));
else
qApp->changeOverrideCursor(QCursor(Qt::ArrowCursor));
}
@@ -565,20 +565,20 @@
firstLineData->setValue(0);
firstLineLabel = new QLabel(this);
firstLineLabel->setText("");
- firstLineLabel->setPixmap(IconManager::instance()->loadPixmap("firstline.png"));
+ firstLineLabel->setPixmap(IconManager::instance().loadPixmap("firstline.png"));
indentLayout->addWidget( firstLineLabel );
indentLayout->addWidget( firstLineData );
leftIndentData = new ScrSpinBox( 0, ww / docUnitRatio, this, dEin );
leftIndentData->setValue(0);
leftIndentLabel = new QLabel(this);
leftIndentLabel->setText("");
- leftIndentLabel->setPixmap(IconManager::instance()->loadPixmap("leftindent.png"));
+ leftIndentLabel->setPixmap(IconManager::instance().loadPixmap("leftindent.png"));
layout4->addWidget( leftIndentLabel );
layout4->addWidget( leftIndentData );
layout4->addStretch(10);
rightIndentLabel = new QLabel(this);
rightIndentLabel->setText("");
- rightIndentLabel->setPixmap(IconManager::instance()->loadPixmap("rightindent.png"));
+ rightIndentLabel->setPixmap(IconManager::instance().loadPixmap("rightindent.png"));
rightIndentData = new ScrSpinBox(0, ww / docUnitRatio, this, dEin);
rightIndentData->setValue(0);
indentLayout->addWidget(rightIndentLabel);
Modified: trunk/Scribus/scribus/ui/transformdialog.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23054&path=/trunk/Scribus/scribus/ui/transformdialog.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/transformdialog.cpp (original)
+++ trunk/Scribus/scribus/ui/transformdialog.cpp Sat Jun 29 20:17:20 2019
@@ -46,7 +46,7 @@
{
setupUi(this);
setModal(true);
- setWindowIcon(IconManager::instance()->loadIcon("AppIcon.png"));
+ setWindowIcon(IconManager::instance().loadIcon("AppIcon.png"));
transformStack->setCurrentIndex(0);
newTransformMenu = new QMenu(buttonAdd);
newTransformMenu->addAction( tr("Scaling"), this, SLOT(newScaling()));
@@ -56,9 +56,9 @@
buttonAdd->setMenu(newTransformMenu);
scaleLink->setChecked(true);
buttonUp->setText( "" );
- buttonUp->setIcon(IconManager::instance()->loadIcon("16/go-up.png"));
+ buttonUp->setIcon(IconManager::instance().loadIcon("16/go-up.png"));
buttonDown->setText( "" );
- buttonDown->setIcon(IconManager::instance()->loadIcon("16/go-down.png"));
+ buttonDown->setIcon(IconManager::instance().loadIcon("16/go-down.png"));
buttonBox->button(QDialogButtonBox::Ok)->setEnabled(false);
m_doc = doc;
m_unitRatio = unitGetRatioFromIndex(m_doc->unitIndex());
Modified: trunk/Scribus/scribus/ui/transparencypalette.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23054&path=/trunk/Scribus/scribus/ui/transparencypalette.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/transparencypalette.cpp (original)
+++ trunk/Scribus/scribus/ui/transparencypalette.cpp Sat Jun 29 20:17:20 2019
@@ -38,8 +38,8 @@
TGradDia = new GradientVectorDialog(this->parentWidget());
TGradDia->hide();
setupUi(this);
- editLineSelector->setIcon(IconManager::instance()->loadIcon("16/color-stroke.png"));
- editFillSelector->setIcon(IconManager::instance()->loadIcon("16/color-fill.png"));
+ editLineSelector->setIcon(IconManager::instance().loadIcon("16/color-stroke.png"));
+ editFillSelector->setIcon(IconManager::instance().loadIcon("16/color-fill.png"));
editFillSelector->setChecked(true);
strokeOpacity->setDecimals(0);
fillOpacity->setDecimals(0);
@@ -229,7 +229,7 @@
VGradient gr = gradientList->value(patK[a]);
QImage pixm(48, 12, QImage::Format_ARGB32_Premultiplied);
QPainter pb;
- QBrush b(QColor(205,205,205), IconManager::instance()->loadPixmap("testfill.png"));
+ QBrush b(QColor(205,205,205), IconManager::instance().loadPixmap("testfill.png"));
pb.begin(&pixm);
pb.fillRect(0, 0, 48, 12, b);
pb.end();
Modified: trunk/Scribus/scribus/undogui.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23054&path=/trunk/Scribus/scribus/undogui.cpp
==============================================================================
--- trunk/Scribus/scribus/undogui.cpp (original)
+++ trunk/Scribus/scribus/undogui.cpp Sat Jun 29 20:17:20 2019
@@ -211,9 +211,9 @@
QHBoxLayout* buttonLayout = new QHBoxLayout;
buttonLayout->setMargin(0);
buttonLayout->setSpacing(5);
- undoButton = new QPushButton(IconManager::instance()->loadPixmap("16/edit-undo.png"), "", this);
+ undoButton = new QPushButton(IconManager::instance().loadPixmap("16/edit-undo.png"), "", this);
buttonLayout->addWidget(undoButton);
- redoButton = new QPushButton(IconManager::instance()->loadPixmap("16/edit-redo.png"), "", this);
+ redoButton = new QPushButton(IconManager::instance().loadPixmap("16/edit-redo.png"), "", this);
buttonLayout->addWidget(redoButton);
//Save the translated key sequence - hopefully we get the translated one here!
initialUndoKS = undoButton->shortcut();
Modified: trunk/Scribus/scribus/util_color.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23054&path=/trunk/Scribus/scribus/util_color.cpp
==============================================================================
--- trunk/Scribus/scribus/util_color.cpp (original)
+++ trunk/Scribus/scribus/util_color.cpp Sat Jun 29 20:17:20 2019
@@ -256,13 +256,13 @@
if ( !iconsInitialized )
{
- IconManager* im=IconManager::instance();
- alertIcon = im->loadPixmap("alert.png");
- cmykIcon = im->loadPixmap("cmyk.png");
- rgbIcon = im->loadPixmap("rgb.png");
- labIcon = im->loadPixmap("lab.png");
- spotIcon = im->loadPixmap("spot.png");
- regIcon = im->loadPixmap("register.png");
+ IconManager& im=IconManager::instance();
+ alertIcon = im.loadPixmap("alert.png");
+ cmykIcon = im.loadPixmap("cmyk.png");
+ rgbIcon = im.loadPixmap("rgb.png");
+ labIcon = im.loadPixmap("lab.png");
+ spotIcon = im.loadPixmap("spot.png");
+ regIcon = im.loadPixmap("register.png");
iconsInitialized = true;
}
More information about the scribus-commit
mailing list