r20185 by craig - Move util_icon to new IconManager for preparation for new xml base iconset definition

scribus-commit scribus-commit at lists.scribus.net
Sun Jun 21 21:46:55 UTC 2015


Author: craig
Date: Sun Jun 21 21:46:55 2015
New Revision: 20185

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=20185
Log:
Move util_icon to new IconManager for preparation for new xml base iconset definition

Added:
    trunk/Scribus/resources/iconsets/1_5_0/1_5_0.xml   (with props)
    trunk/Scribus/resources/iconsets/1_5_1/1_5_1.xml   (with props)
    trunk/Scribus/scribus/iconmanager.cpp   (with props)
    trunk/Scribus/scribus/iconmanager.h   (with props)
Modified:
    trunk/Scribus/resources/iconsets/CMakeLists.txt
    trunk/Scribus/scribus/CMakeLists.txt
    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/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/odtim/odtdia.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/gettext/xtgim/fontselectdialog.cpp
    trunk/Scribus/scribus/plugins/gettext/xtgim/xtgdialog.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/prefsstructs.h
    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/cpalette.cpp
    trunk/Scribus/scribus/ui/cupsoptions.cpp
    trunk/Scribus/scribus/ui/curvewidget.cpp
    trunk/Scribus/scribus/ui/customfdialog.cpp
    trunk/Scribus/scribus/ui/dasheditor.cpp
    trunk/Scribus/scribus/ui/dcolor.cpp
    trunk/Scribus/scribus/ui/delpages.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/margindialog.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/pageselector.cpp
    trunk/Scribus/scribus/ui/paintmanager.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/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/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
    trunk/Scribus/scribus/util_icon.cpp
    trunk/Scribus/scribus/util_icon.h

Modified: trunk/Scribus/resources/iconsets/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20185&path=/trunk/Scribus/resources/iconsets/CMakeLists.txt
==============================================================================
--- trunk/Scribus/resources/iconsets/CMakeLists.txt (original)
+++ trunk/Scribus/resources/iconsets/CMakeLists.txt Sun Jun 21 21:46:55 2015
@@ -2,6 +2,10 @@
 ${CMAKE_SOURCE_DIR}
 ${CMAKE_SOURCE_DIR}/scribus
 )
+
+
+##################
+
 
 #Install our 1.5.0 icons
 FILE( GLOB SCRIBUS_ICONS_1_5_0_UNSORTED 1_5_0/*.jpg 1_5_0/*.png 1_5_0/*.xpm )
@@ -23,6 +27,12 @@
 FILE( GLOB SCRIBUS_ICONS_1_5_0_32 1_5_0/32/*.jpg 1_5_0/32/*.png 1_5_0/32/*.xpm )
 INSTALL(FILES ${SCRIBUS_ICONS_1_5_0_32} DESTINATION ${ICONDIR}/1_5_0/32)
 
+#Install our XML
+FILE( GLOB SCRIBUS_XML_1_5_0 1_5_0/*.xml )
+INSTALL(FILES ${SCRIBUS_XML_1_5_0} DESTINATION ${ICONDIR})
+
+
+##################
 
 
 #Install our 1.5.1 icons
@@ -45,3 +55,9 @@
 FILE( GLOB SCRIBUS_ICONS_1_5_1_32 1_5_1/32/*.jpg 1_5_1/32/*.png 1_5_1/32/*.xpm )
 INSTALL(FILES ${SCRIBUS_ICONS_1_5_1_32} DESTINATION ${ICONDIR}/1_5_1/32)
 
+#Install our XML
+FILE( GLOB SCRIBUS_XML_1_5_1 1_5_1/*.xml )
+INSTALL(FILES ${SCRIBUS_XML_1_5_1} DESTINATION ${ICONDIR})
+
+
+##################

Modified: trunk/Scribus/scribus/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20185&path=/trunk/Scribus/scribus/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/CMakeLists.txt (original)
+++ trunk/Scribus/scribus/CMakeLists.txt Sun Jun 21 21:46:55 2015
@@ -245,6 +245,7 @@
 	guidesmodel.h
 	guidesview.h
 	hyphenator.h
+	iconmanager.h
 	latexhelpers.h
 	loadsaveplugin.h
 	menumanager.h
@@ -609,6 +610,7 @@
 	guidesmodel.cpp
 	guidesview.cpp
 	hyphenator.cpp
+	iconmanager.cpp
 	ioapi.c
 	KarbonCurveFit.cpp
 	langdef.cpp

Modified: trunk/Scribus/scribus/actionmanager.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20185&path=/trunk/Scribus/scribus/actionmanager.cpp
==============================================================================
--- trunk/Scribus/scribus/actionmanager.cpp (original)
+++ trunk/Scribus/scribus/actionmanager.cpp Sun Jun 21 21:46:55 2015
@@ -29,7 +29,7 @@
 #include "text/storytext.h"
 #include "undomanager.h"
 #include "urllauncher.h"
-#include "util_icon.h"
+#include "iconmanager.h"
 
 QMap<QString, QKeySequence> ActionManager::defKeys;
 QVector< QPair<QString, QStringList> > ActionManager::defMenuNames;
@@ -66,9 +66,10 @@
 	nonEditActionNames=new QStringList();
 	unicodeCharActionNames=new QStringList();
 	undoManager = UndoManager::instance();
+	im = IconManager::instance();
 
 #ifdef Q_OS_MAC
-	noIcon = loadIcon("noicon.xpm");
+	noIcon = im->loadPixmap("noicon.xpm");
 #endif
 
 	createActions();
@@ -116,19 +117,19 @@
 	QString name;
 	//File Menu
 	name="fileNew";
-	scrActions->insert(name, new ScrAction(loadIcon("16/document-new.png"), loadIcon("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(loadIcon("16/document-open.png"), loadIcon("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(loadIcon("16/close.png"), loadIcon("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(loadIcon("16/document-save.png"), loadIcon("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(loadIcon("16/document-save-as.png"), loadIcon("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(loadIcon("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
@@ -149,12 +150,12 @@
 	name="fileExportAsEPS";
 	scrActions->insert(name, new ScrAction("", defaultKey(name), mainWindow));
 	name="fileExportAsPDF";
-	scrActions->insert(name, new ScrAction(loadIcon("acroread16.png"), loadIcon("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(loadIcon("16/document-properties.png"), loadIcon("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(loadIcon("16/document-properties.png"), loadIcon("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);
@@ -162,11 +163,11 @@
 	scrActions->insert(name, new ScrAction("", defaultKey(name), mainWindow));
 	(*scrActions)[name]->setMenuRole(QAction::PreferencesRole);
 	name="filePrint";
-	scrActions->insert(name, new ScrAction(loadIcon("16/document-print.png"), loadIcon("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(loadIcon("16/document-print-preview.png"), loadIcon("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(loadIcon("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
@@ -205,29 +206,29 @@
 	QString name;
 	//Edit Menu
 	name="editUndoAction";
-	scrActions->insert(name, new ScrAction(ScrAction::DataInt, loadIcon("16/edit-undo.png"), loadIcon("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, loadIcon("16/edit-redo.png"), loadIcon("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(loadIcon("16/edit-cut.png"), loadIcon("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(loadIcon("16/edit-copy.png"), loadIcon("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(loadIcon("16/edit-paste.png"), loadIcon("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(loadIcon("16/edit-copy.png"), loadIcon("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, loadIcon("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, loadIcon("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(loadIcon("16/edit-paste.png"), loadIcon("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(loadIcon("16/edit-delete.png"), loadIcon("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";
@@ -237,7 +238,7 @@
 	name="editDeselectAll";
 	scrActions->insert(name, new ScrAction("", defaultKey(name), mainWindow));
 	name="editSearchReplace";
-	scrActions->insert(name, new ScrAction(loadIcon("16/edit-find-replace.png"), loadIcon("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";
@@ -428,13 +429,13 @@
 	(*scrActions)["itemFlipH"]->setToggleAction(true, true);
 	(*scrActions)["itemFlipV"]->setToggleAction(true, true);
 	name="itemLowerToBottom";
-	scrActions->insert(name, new ScrAction(loadIcon("16/go-bottom.png"), loadIcon("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(loadIcon("16/go-top.png"), loadIcon("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(loadIcon("16/go-down.png"), loadIcon("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(loadIcon("16/go-up.png"), loadIcon("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";
@@ -448,17 +449,17 @@
 	name="itemUpdateImage";
 	scrActions->insert(name, new ScrAction("", defaultKey(name), mainWindow));
 	name="tableInsertRows";
-	scrActions->insert(name, new ScrAction(loadIcon("16/insert-table-rows.png"), loadIcon("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(loadIcon("16/insert-table-columns.png"), loadIcon("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(loadIcon("16/delete-table-rows.png"), loadIcon("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(loadIcon("16/delete-table-columns.png"), loadIcon("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(loadIcon("16/merge-table-cells.png"), loadIcon("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(loadIcon("16/split-table-cells.png"), loadIcon("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";
@@ -654,17 +655,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, loadIcon("16/zoom-original.png"), loadIcon("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(loadIcon("previewOn.png"), loadIcon("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(loadIcon("16/editdoc.png"), loadIcon("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(loadIcon("cmsOn.png"), loadIcon("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";
@@ -796,11 +797,11 @@
 	name="toolsResources";
 	scrActions->insert(name, new ScrAction("", defaultKey(name), mainWindow));
 	name="toolsMeasurements";
-	scrActions->insert(name, new ScrAction(ScrAction::DataInt, loadIcon("16/measure.png"), loadIcon("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(loadIcon("16/preflight-verifier.png"), loadIcon("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";
@@ -816,51 +817,51 @@
 
 	//toolbar only items
 	name="toolsSelect";
-	scrActions->insert(name, new ScrAction(ScrAction::DataInt, loadIcon("16/pointer.png"), loadIcon("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, loadIcon("16/insert-text-frame.png"), loadIcon("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, loadIcon("16/insert-image.png"), loadIcon("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, loadIcon("16/insert-renderframe.png"), loadIcon("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, loadIcon("16/insert-table.png"), loadIcon("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, loadIcon("16/draw-polygon.png"), loadIcon("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, loadIcon("16/draw-arc.png"), loadIcon("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, loadIcon("16/draw-spiral.png"), loadIcon("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, loadIcon("Stift16.xpm"), loadIcon("Stift.xpm"), "", defaultKey(name), mainWindow, modeDrawLine));
+	scrActions->insert(name, new ScrAction(ScrAction::DataInt, im->loadPixmap("Stift16.xpm"), im->loadPixmap("Stift.xpm"), "", defaultKey(name), mainWindow, modeDrawLine));
 	name="toolsInsertBezier";
-	scrActions->insert(name, new ScrAction(ScrAction::DataInt, loadIcon("16/draw-path.png"), loadIcon("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, loadIcon("16/draw-freehand.png"), loadIcon("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, loadIcon("16/draw-calligraphic.png"), loadIcon("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, loadIcon("16/transform-rotate.png"), loadIcon("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, loadIcon("16/zoom.png"), loadIcon("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(loadIcon("16/zoom-in.png"), loadIcon("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(loadIcon("16/zoom-out.png"), loadIcon("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, loadIcon("Editm16.png"), loadIcon("Editm.xpm"), "", defaultKey(name), mainWindow, modeEdit));
+	scrActions->insert(name, new ScrAction(ScrAction::DataInt, im->loadPixmap("Editm16.png"), im->loadPixmap("Editm.xpm"), "", defaultKey(name), mainWindow, modeEdit));
 	name="toolsEditWithStoryEditor";
-	scrActions->insert(name, new ScrAction(ScrAction::DataInt, loadIcon("16/story-editor.png"), loadIcon("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, loadIcon("16/text-frame-link.png"), loadIcon("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, loadIcon("16/text-frame-unlink.png"), loadIcon("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, loadIcon("16/color-picker.png"), loadIcon("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, loadIcon("wizard16.png"), loadIcon("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="toolsUnlinkTextFrameWithTextCopy";
 	scrActions->insert(name, new ScrAction(ScrAction::DataInt, QPixmap(), QPixmap(), "", defaultKey(name), mainWindow, modeUnlinkFrames));
 	name="toolsUnlinkTextFrameWithTextCut";
@@ -868,24 +869,24 @@
 
 	//PDF toolbar
 	name="toolsPDFPushButton";
-	scrActions->insert(name, new ScrAction(ScrAction::DataInt, loadIcon("16/insert-button.png"), loadIcon("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, loadIcon("16/radiobutton.png"), loadIcon("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, loadIcon("16/text-field.png"), loadIcon("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, loadIcon("16/checkbox.png"), loadIcon("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, loadIcon("16/combobox.png"), loadIcon("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, loadIcon("16/list-box.png"), loadIcon("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, loadIcon("16/pdf-annotations.png"), loadIcon("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, loadIcon("goto16.png"), loadIcon("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, loadIcon("16/annot3d.png"), loadIcon("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);
@@ -991,7 +992,7 @@
 	name="helpTooltips";
 	scrActions->insert(name, new ScrAction("", defaultKey(name), mainWindow));
 	name="helpManual";
-	scrActions->insert(name, new ScrAction(loadIcon("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=20185&path=/trunk/Scribus/scribus/actionmanager.h
==============================================================================
--- trunk/Scribus/scribus/actionmanager.h (original)
+++ trunk/Scribus/scribus/actionmanager.h Sun Jun 21 21:46:55 2015
@@ -38,6 +38,7 @@
 #include "scribusapi.h"
 #include "scraction.h"
 
+class IconManager;
 class ScribusDoc;
 class ScribusMainWindow;
 class ScribusQApp;
@@ -114,6 +115,7 @@
 		ScribusMainWindow *mainWindow;
 		ScribusQApp *ScQApp;
 		UndoManager *undoManager;
+		IconManager* im;
 		QMap<QString, QPointer<ScrAction> > *scrActions;
 		QMultiHash<QString, QActionGroup*> *scrActionGroups;
 		QStringList *modeActionNames;

Modified: trunk/Scribus/scribus/canvasgesture_pan.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20185&path=/trunk/Scribus/scribus/canvasgesture_pan.cpp
==============================================================================
--- trunk/Scribus/scribus/canvasgesture_pan.cpp (original)
+++ trunk/Scribus/scribus/canvasgesture_pan.cpp Sun Jun 21 21:46:55 2015
@@ -21,7 +21,7 @@
 #include "canvas.h"
 #include "scribusapp.h" // for qApp
 #include "scribusview.h"
-#include "util_icon.h"
+#include "iconmanager.h"
 
 PanGesture::PanGesture (CanvasMode* parent) : CanvasGesture(parent)
 {
@@ -30,7 +30,7 @@
 void PanGesture::activate(bool fromGesture)
 {
 	m_cursor = m_view->cursor();
-	m_view->setCursor(QCursor(loadIcon("HandC.xpm")));
+	m_view->setCursor(IconManager::instance()->loadCursor("HandC.xpm"));
 }
 
 void PanGesture::deactivate(bool forgesture)

Modified: trunk/Scribus/scribus/canvasgesture_rulermove.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20185&path=/trunk/Scribus/scribus/canvasgesture_rulermove.cpp
==============================================================================
--- trunk/Scribus/scribus/canvasgesture_rulermove.cpp (original)
+++ trunk/Scribus/scribus/canvasgesture_rulermove.cpp Sun Jun 21 21:46:55 2015
@@ -25,7 +25,7 @@
 #include "scribusdoc.h"
 #include "scribusview.h"
 #include "ui/guidemanager.h"
-#include "util_icon.h"
+#include "iconmanager.h"
 
 
 RulerGesture::RulerGesture(ScribusView *view, RulerGesture::Mode mode) :
@@ -235,7 +235,7 @@
 			{ 
 				if (m_haveGuide)
 				{
-					qApp->changeOverrideCursor(QCursor(loadIcon("DelPoint.png")));
+					qApp->changeOverrideCursor(IconManager::instance()->loadCursor("DelPoint.png"));
 					if (mouseRelease)
 					{
 						m_doc->Pages->at(m_page)->guides.deleteHorizontal( m_guide, GuideManagerCore::Standard);
@@ -291,7 +291,7 @@
 			{ 
 				if (m_haveGuide)
 				{
-					qApp->changeOverrideCursor(QCursor(loadIcon("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=20185&path=/trunk/Scribus/scribus/canvasmode.cpp
==============================================================================
--- trunk/Scribus/scribus/canvasmode.cpp (original)
+++ trunk/Scribus/scribus/canvasmode.cpp Sun Jun 21 21:46:55 2015
@@ -66,7 +66,7 @@
 #include "ui/scresizecursor.h"
 #include "undomanager.h"
 #include "units.h"
-#include "util_icon.h"
+#include "iconmanager.h"
 #include "util_math.h"
 
 #include <QMdiArea>
@@ -747,56 +747,57 @@
 
 QCursor CanvasMode::modeCursor()
 {
+	IconManager* im=IconManager::instance();
 	QCursor cursor;
 	switch (m_doc->appMode)
 	{
 		case modeDrawShapes:
 		case modeDrawArc:
 		case modeDrawSpiral:
-			cursor = QCursor(loadIcon("DrawFrame.xpm"));
+			cursor = im->loadCursor("DrawFrame.xpm");
 			break;
 		case modeDrawImage:
-			cursor = QCursor(loadIcon("DrawImageFrame.xpm"));
+			cursor = im->loadCursor("DrawImageFrame.xpm");
 			break;
 		case modeDrawLatex:
-			cursor = QCursor(loadIcon("DrawLatexFrame.xpm"));
+			cursor = im->loadCursor("DrawLatexFrame.xpm");
 			break;
 		case modeDrawText:
-			cursor = QCursor(loadIcon("DrawTextFrame.xpm"));
+			cursor = im->loadCursor("DrawTextFrame.xpm");
 			break;
 		case modeDrawTable2:
-			cursor = QCursor(loadIcon("DrawTable.xpm"));
+			cursor = im->loadCursor("DrawTable.xpm");
 			break;
 		case modeDrawRegularPolygon:
-			cursor = QCursor(loadIcon("DrawPolylineFrame.xpm"));
+			cursor = im->loadCursor("DrawPolylineFrame.xpm");
 			break;
 		case modeDrawLine:
 		case modeDrawBezierLine:
 			cursor = QCursor(Qt::CrossCursor);
 			break;
 		case modeDrawFreehandLine:
-			cursor = QCursor(loadIcon("DrawFreeLine.png"), 0, 31);
+			cursor = QCursor(im->loadPixmap("DrawFreeLine.png"), 0, 31);
 			break;
 		case modeDrawCalligraphicLine:
-			cursor = QCursor(loadIcon("DrawCalligraphy.xpm"), 4, 4);
+			cursor = QCursor(im->loadPixmap("DrawCalligraphy.xpm"), 4, 4);
 			break;
 		case modeImportObject:
-			cursor = QCursor(loadIcon("DragPix.xpm"));
+			cursor = im->loadCursor("DragPix.xpm");
 			break;
 		case modeMagnifier:
 			if (m_view->Magnify)
-				cursor = QCursor(loadIcon("LupeZ.xpm"));
+				cursor = im->loadCursor("LupeZ.xpm");
 			else
-				cursor = QCursor(loadIcon("LupeZm.xpm"));
+				cursor = im->loadCursor("LupeZm.xpm");
 			break;
 		case modePanning:
-			cursor = QCursor(loadIcon("HandC.xpm"));
+			cursor = im->loadCursor("HandC.xpm");
 			break;
 		case modeEyeDropper:
-			cursor = QCursor(loadIcon("colorpickercursor.png"), 0, 31);
+			cursor = QCursor(im->loadPixmap("colorpickercursor.png"), 0, 31);
 			break;
 		case modeLinkFrames:
-			cursor = QCursor(loadIcon("LinkTextFrame.png"), 0, 31);
+			cursor = QCursor(im->loadPixmap("LinkTextFrame.png"), 0, 31);
 			break;
 		case modeMeasurementTool:
 		case modeEditGradientVectors:
@@ -826,56 +827,57 @@
 
 void CanvasMode::setModeCursor()
 {
+	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(QCursor(loadIcon("DrawFrame.xpm")));
+			m_view->setCursor(im->loadCursor("DrawFrame.xpm"));
 			break;
 		case modeDrawImage:
-			m_view->setCursor(QCursor(loadIcon("DrawImageFrame.xpm")));
+			m_view->setCursor(im->loadCursor("DrawImageFrame.xpm"));
 			break;
 		case modeDrawLatex:
-			m_view->setCursor(QCursor(loadIcon("DrawLatexFrame.xpm")));
+			m_view->setCursor(im->loadCursor("DrawLatexFrame.xpm"));
 			break;
 		case modeDrawText:
-			m_view->setCursor(QCursor(loadIcon("DrawTextFrame.xpm")));
+			m_view->setCursor(im->loadCursor("DrawTextFrame.xpm"));
 			break;
 		case modeDrawTable2:
-			m_view->setCursor(QCursor(loadIcon("DrawTable.xpm")));
+			m_view->setCursor(im->loadCursor("DrawTable.xpm"));
 			break;
 		case modeDrawRegularPolygon:
-			m_view->setCursor(QCursor(loadIcon("DrawPolylineFrame.xpm")));
+			m_view->setCursor(im->loadCursor("DrawPolylineFrame.xpm"));
 			break;
 		case modeDrawLine:
 		case modeDrawBezierLine:
 			m_view->setCursor(QCursor(Qt::CrossCursor));
 			break;
 		case modeDrawFreehandLine:
-			m_view->setCursor(QCursor(loadIcon("DrawFreeLine.png"), 0, 31));
+			m_view->setCursor(QCursor(im->loadPixmap("DrawFreeLine.png"), 0, 31));
 			break;
 		case modeDrawCalligraphicLine:
-			m_view->setCursor(QCursor(loadIcon("DrawCalligraphy.xpm"), 4, 4));
+			m_view->setCursor(QCursor(im->loadPixmap("DrawCalligraphy.xpm"), 4, 4));
 			break;
 		case modeImportObject:
-			m_view->setCursor(QCursor(loadIcon("DragPix.xpm")));
+			m_view->setCursor(im->loadCursor("DragPix.xpm"));
 			break;
 		case modeMagnifier:
 			if (m_view->Magnify)
-				m_view->setCursor(QCursor(loadIcon("LupeZ.xpm")));
+				m_view->setCursor(im->loadCursor("LupeZ.xpm"));
 			else
-				m_view->setCursor(QCursor(loadIcon("LupeZm.xpm")));
+				m_view->setCursor(im->loadCursor("LupeZm.xpm"));
 			break;
 		case modePanning:
-			m_view->setCursor(QCursor(loadIcon("HandC.xpm")));
+			m_view->setCursor(im->loadCursor("HandC.xpm"));
 			break;
 		case modeEyeDropper:
-			m_view->setCursor(QCursor(loadIcon("colorpickercursor.png"), 0, 31));
+			m_view->setCursor(QCursor(im->loadPixmap("colorpickercursor.png"), 0, 31));
 			break;
 		case modeLinkFrames:
-			m_view->setCursor(QCursor(loadIcon("LinkTextFrame.png"), 0, 31));
+			m_view->setCursor(QCursor(im->loadPixmap("LinkTextFrame.png"), 0, 31));
 			break;
 		case modeMeasurementTool:
 		case modeEditGradientVectors:
@@ -1730,7 +1732,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(QCursor(loadIcon("LupeZ.xpm")));
+		m_view->setCursor(IconManager::instance()->loadCursor("LupeZ.xpm"));
 	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=20185&path=/trunk/Scribus/scribus/canvasmode_edit.cpp
==============================================================================
--- trunk/Scribus/scribus/canvasmode_edit.cpp (original)
+++ trunk/Scribus/scribus/canvasmode_edit.cpp Sun Jun 21 21:46:55 2015
@@ -36,6 +36,7 @@
 #include "fpoint.h"
 #include "fpointarray.h"
 #include "hyphenator.h"
+#include "iconmanager.h"
 #include "pageitem_noteframe.h"
 #include "pageitem_textframe.h"
 #include "prefscontext.h"
@@ -57,8 +58,8 @@
 #include "undomanager.h"
 #include "units.h"
 #include "util.h"
-#include "util_icon.h"
 #include "util_math.h"
+
 
 CanvasMode_Edit::CanvasMode_Edit(ScribusView* view) : CanvasMode(view), m_ScMW(view->m_ScMW) 
 {
@@ -415,7 +416,7 @@
 			{
 				if (m->modifiers() & Qt::ShiftModifier)
 				{
-					m_view->setCursor(QCursor(loadIcon("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));
@@ -425,7 +426,7 @@
 				}
 				else
 				{
-					m_view->setCursor(QCursor(loadIcon("HandC.xpm")));
+					m_view->setCursor(IconManager::instance()->loadCursor("HandC.xpm"));
 					QTransform mm1 = currItem->getTransform();
 					QTransform mm2 = mm1.inverted();
 					QPointF rota = mm2.map(QPointF(newX, newY)) - mm2.map(QPointF(Mxp, Myp));
@@ -495,9 +496,9 @@
 						if (currItem->asImageFrame())
 						{
 							if (m->modifiers() & Qt::ShiftModifier)
-								m_view->setCursor(QCursor(loadIcon("Rotieren2.png")));
+								m_view->setCursor(IconManager::instance()->loadCursor("Rotieren2.png"));
 							else
-								m_view->setCursor(QCursor(loadIcon("HandC.xpm")));
+								m_view->setCursor(IconManager::instance()->loadCursor("HandC.xpm"));
 						}
 					}
 				}

Modified: trunk/Scribus/scribus/canvasmode_edittable.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20185&path=/trunk/Scribus/scribus/canvasmode_edittable.cpp
==============================================================================
--- trunk/Scribus/scribus/canvasmode_edittable.cpp (original)
+++ trunk/Scribus/scribus/canvasmode_edittable.cpp Sun Jun 21 21:46:55 2015
@@ -31,7 +31,7 @@
 #include "selection.h"
 #include "tablehandle.h"
 #include "ui/scmwmenumanager.h"
-#include "util_icon.h"
+#include "iconmanager.h"
 
 // TODO: We should have a preference for this instead.
 #ifdef Q_OS_MAC
@@ -46,8 +46,8 @@
 	m_longBlink(false),
 	m_cursorVisible(false),
 	m_lastCursorPos(-1),
-	m_selectRowCursor(loadIcon("select_row.png")),
-	m_selectColumnCursor(loadIcon("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=20185&path=/trunk/Scribus/scribus/canvasmode_imageimport.cpp
==============================================================================
--- trunk/Scribus/scribus/canvasmode_imageimport.cpp (original)
+++ trunk/Scribus/scribus/canvasmode_imageimport.cpp Sun Jun 21 21:46:55 2015
@@ -29,6 +29,7 @@
 
 #include "canvas.h"
 #include "canvasmode.h"
+#include "iconmanager.h"
 #include "prefsmanager.h"
 #include "scribus.h"
 #include "scribusdoc.h"
@@ -36,7 +37,6 @@
 #include "selection.h"
 #include "ui/propertiespalette.h"
 #include "ui/propertiespalette_image.h"
-#include "util_icon.h"
 
 CanvasMode_ImageImport::CanvasMode_ImageImport(ScribusView *view) : CanvasMode(view), m_ScMW(view->m_ScMW)
 {
@@ -67,7 +67,7 @@
 {
 	QPainter p;
 	QImage pm = QImage(80, 80, QImage::Format_ARGB32_Premultiplied);
-	QBrush b(QColor(205,205,205), loadIcon("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;
@@ -169,12 +169,12 @@
 	{
 		PageItem_ImageFrame *currItem;
 		if((currItem = item->asImageFrame()) != NULL)
-			m_view->setCursor(QCursor(loadIcon("DrawImageFrame.xpm")));
+			m_view->setCursor(IconManager::instance()->loadCursor("DrawImageFrame.xpm"));
 		else
 			m_view->setCursor(QCursor(Qt::ArrowCursor));
 	}
 	else
-		m_view->setCursor(QCursor(loadIcon("DrawImageFrame.xpm")));
+		m_view->setCursor(IconManager::instance()->loadCursor("DrawImageFrame.xpm"));
 	if (commonMouseMove(m))
 		return;
 }

Modified: trunk/Scribus/scribus/canvasmode_magnifier.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20185&path=/trunk/Scribus/scribus/canvasmode_magnifier.cpp
==============================================================================
--- trunk/Scribus/scribus/canvasmode_magnifier.cpp (original)
+++ trunk/Scribus/scribus/canvasmode_magnifier.cpp Sun Jun 21 21:46:55 2015
@@ -34,6 +34,7 @@
 #include "canvas.h"
 #include "fpoint.h"
 #include "fpointarray.h"
+#include "iconmanager.h"
 #include "pageitem_textframe.h"
 #include "prefscontext.h"
 #include "prefsfile.h"
@@ -48,9 +49,7 @@
 #include "undomanager.h"
 #include "units.h"
 #include "util.h"
-#include "util_icon.h"
 #include "util_math.h"
-
 
 CanvasMode_Magnifier::CanvasMode_Magnifier(ScribusView* view) : CanvasMode(view)
 {
@@ -165,12 +164,12 @@
 	if ((m->modifiers() == Qt::ShiftModifier) || (m->button() == Qt::RightButton))
 	{
 		m_view->Magnify = false;
-		m_view->setCursor(QCursor(loadIcon("LupeZm.xpm")));
+		m_view->setCursor(IconManager::instance()->loadCursor("LupeZm.xpm"));
 	}
 	else
 	{
 		m_view->Magnify = true;
-		m_view->setCursor(QCursor(loadIcon("LupeZ.xpm")));
+		m_view->setCursor(IconManager::instance()->loadCursor("LupeZ.xpm"));
 	}
 	Mxp = mousePointDoc.x(); //m->globalPos().x();
 	Myp = mousePointDoc.y(); //m->globalPos().y();
@@ -225,9 +224,9 @@
 			else
 			{
 				if (m->modifiers() & Qt::ShiftModifier)
-					m_view->setCursor(QCursor(loadIcon("LupeZm.xpm")));
+					m_view->setCursor(IconManager::instance()->loadCursor("LupeZm.xpm"));
 				else
-					m_view->setCursor(QCursor(loadIcon("LupeZ.xpm")));
+					m_view->setCursor(IconManager::instance()->loadCursor("LupeZ.xpm"));
 			}
 		}
 	}

Modified: trunk/Scribus/scribus/canvasmode_nodeedit.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20185&path=/trunk/Scribus/scribus/canvasmode_nodeedit.cpp
==============================================================================
--- trunk/Scribus/scribus/canvasmode_nodeedit.cpp (original)
+++ trunk/Scribus/scribus/canvasmode_nodeedit.cpp Sun Jun 21 21:46:55 2015
@@ -23,8 +23,9 @@
 #include "canvasgesture_pan.h"
 #include "canvasgesture_rectselect.h"
 #include "fpoint.h"
+#include "iconmanager.h"
+#include "nodeeditcontext.h"
 #include "pageitem.h"
-#include "nodeeditcontext.h"
 #include "scraction.h"
 #include "scribus.h"
 #include "scribusXml.h"
@@ -35,7 +36,6 @@
 #include "ui/propertiespalette.h"
 #include "ui/scrspinbox.h"
 #include "undomanager.h"
-#include "util_icon.h"
 #include "util_math.h"
 
 CanvasMode_NodeEdit::CanvasMode_NodeEdit(ScribusView* view) : CanvasMode(view), m_rectangleSelect(NULL)
@@ -1017,9 +1017,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(QCursor(loadIcon("DelPoint.png"), 1, 1));
+					m_view->setCursor(QCursor(IconManager::instance()->loadPixmap("DelPoint.png"), 1, 1));
 				if (m_doc->nodeEdit.submode() == NodeEditContext::SPLIT_PATH)
-					m_view->setCursor(QCursor(loadIcon("Split.png"), 1, 1));
+					m_view->setCursor(QCursor(IconManager::instance()->loadPixmap("Split.png"), 1, 1));
 				return true;
 			}
 		}
@@ -1048,11 +1048,11 @@
 					if (m_canvas->hitsCanvasPoint(m->globalPos(), FPoint(pl.x(), pl.y())))
 					{
 						if (m_doc->nodeEdit.submode() == NodeEditContext::MOVE_POINT)
-							m_view->setCursor(QCursor(loadIcon("HandC.xpm")));
+							m_view->setCursor(IconManager::instance()->loadCursor("HandC.xpm"));
 						else if (m_doc->nodeEdit.submode() == NodeEditContext::ADD_POINT)
-							m_view->setCursor(QCursor(loadIcon("AddPoint.png"), 1, 1));
+							m_view->setCursor(QCursor(IconManager::instance()->loadPixmap("AddPoint.png"), 1, 1));
 						else if (m_doc->nodeEdit.submode() == NodeEditContext::SPLIT_PATH)
-							m_view->setCursor(QCursor(loadIcon("Split.png"), 1, 1));
+							m_view->setCursor(QCursor(IconManager::instance()->loadPixmap("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=20185&path=/trunk/Scribus/scribus/canvasmode_normal.cpp
==============================================================================
--- trunk/Scribus/scribus/canvasmode_normal.cpp (original)
+++ trunk/Scribus/scribus/canvasmode_normal.cpp Sun Jun 21 21:46:55 2015
@@ -41,6 +41,7 @@
 #include "fpoint.h"
 #include "fpointarray.h"
 #include "hyphenator.h"
+#include "iconmanager.h"
 #include "loadsaveplugin.h"
 #include "pageitem_arc.h"
 #include "pageitem_line.h"
@@ -69,12 +70,7 @@
 #include "ui/propertiespalette_xyz.h"
 #include "undomanager.h"
 #include "util.h"
-#include "util_icon.h"
 #include "util_math.h"
-
-
-
-
 
 CanvasMode_Normal::CanvasMode_Normal(ScribusView* view) : CanvasMode(view), m_ScMW(view->m_ScMW) 
 {
@@ -485,7 +481,7 @@
 				ScElemMimeData* md = ScriXmlDoc::WriteToMimeData(m_doc, m_doc->m_Selection);
 				QDrag* dr = new QDrag(m_view);
 				dr->setMimeData(md);
-				const QPixmap& pm = loadIcon("DragPix.xpm");
+				const QPixmap& pm = IconManager::instance()->loadPixmap("DragPix.xpm");
 				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=20185&path=/trunk/Scribus/scribus/canvasmode_rotate.cpp
==============================================================================
--- trunk/Scribus/scribus/canvasmode_rotate.cpp (original)
+++ trunk/Scribus/scribus/canvasmode_rotate.cpp Sun Jun 21 21:46:55 2015
@@ -22,6 +22,7 @@
 #include "appmodes.h"
 #include "canvas.h"
 #include "fpoint.h"
+#include "iconmanager.h"
 #include "pageitem.h"
 #include "prefsmanager.h"
 #include "scribus.h"
@@ -32,9 +33,7 @@
 #include "ui/pageselector.h"
 #include "ui/scrspinbox.h"
 #include "undomanager.h"
-#include "util_icon.h"
 #include "util_math.h"
-
 
 CanvasMode_Rotate::CanvasMode_Rotate(ScribusView* view) : CanvasMode(view)
 {
@@ -410,7 +409,7 @@
 					{
 						setResizeCursor(how);
 					}
-					m_view->setCursor(QCursor(loadIcon("Rotieren2.png")));
+					m_view->setCursor(IconManager::instance()->loadCursor("Rotieren2.png"));
 				}
 				else
 				{
@@ -431,7 +430,7 @@
 					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(QCursor(loadIcon("Rotieren2.png")));
+						m_view->setCursor(IconManager::instance()->loadCursor("Rotieren2.png"));
 						if (!currItem->sizeLocked())
 							m_view->HandleCurs(currItem, mpo);
 					}

Modified: trunk/Scribus/scribus/colorsetmanager.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20185&path=/trunk/Scribus/scribus/colorsetmanager.cpp
==============================================================================
--- trunk/Scribus/scribus/colorsetmanager.cpp (original)
+++ trunk/Scribus/scribus/colorsetmanager.cpp Sun Jun 21 21:46:55 2015
@@ -12,7 +12,7 @@
 #include "colorsetmanager.h"
 #include "scpaths.h"
 #include "util.h"
-#include "util_icon.h"
+#include "iconmanager.h"
 #include "util_color.h"
 #include "util_formats.h"
 #include "commonstrings.h"
@@ -177,7 +177,7 @@
 						{
 							item = new QTreeWidgetItem(parent);
 							item->setFlags(Qt::ItemIsEditable | Qt::ItemIsUserCheckable | Qt::ItemIsEnabled);
-							item->setIcon(0, QIcon(loadIcon("16/folder.png")));
+							item->setIcon(0, QIcon(IconManager::instance()->loadIcon("16/folder.png")));
 							item->setText(0, setName);
 						}
 						searchDir(path + dirs[dc] + "/", pList, item);
@@ -200,7 +200,7 @@
 						item->setText(0, setName);
 						item->setData(0, Qt::UserRole, fi.absolutePath());
 						if ((!fi.isWritable()) || (fi.absolutePath().contains(ScPaths::getApplicationDataDir()+"swatches/locked")))
-							item->setIcon(0, QIcon(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=20185&path=/trunk/Scribus/scribus/docinfo.cpp
==============================================================================
--- trunk/Scribus/scribus/docinfo.cpp (original)
+++ trunk/Scribus/scribus/docinfo.cpp Sun Jun 21 21:46:55 2015
@@ -14,7 +14,7 @@
 
 #include "docinfo.h"
 #include "documentinformation.h"
-#include "util_icon.h"
+#include "iconmanager.h"
 
 /*
  *  Constructs a DocInfos which is a child of 'parent', with the
@@ -28,7 +28,7 @@
 	infos = docInfo;
 	setMaximumSize( QSize( 32767, 32767 ) );
 	setWindowTitle( tr( "Document Information" ) );
-	setWindowIcon(QIcon(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=20185&path=/trunk/Scribus/scribus/fontlistmodel.cpp
==============================================================================
--- trunk/Scribus/scribus/fontlistmodel.cpp (original)
+++ trunk/Scribus/scribus/fontlistmodel.cpp Sun Jun 21 21:46:55 2015
@@ -6,22 +6,22 @@
 */
 
 #include <QCheckBox>
+
+#include "commonstrings.h"
 #include "fontlistmodel.h"
+#include "iconmanager.h"
 #include "prefsmanager.h"
-#include "util_icon.h"
 #include "scribusdoc.h"
-#include "commonstrings.h"
-
 
 FontListModel::FontListModel(QObject * parent, ScribusDoc * doc)
 	: QAbstractTableModel(parent),
 	m_doc(doc),
 	m_fonts(PrefsManager::instance()->appPrefs.fontPrefs.AvailFonts)
 {
-	ttfFont = loadIcon("font_truetype16.png");
-	otfFont = loadIcon("font_otf16.png");
-	psFont = loadIcon("font_type1_16.png");
-	substFont = loadIcon("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");
 	m_font_values = m_fonts.values();
 	m_font_names = m_fonts.keys();
 }

Modified: trunk/Scribus/scribus/pageitem.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20185&path=/trunk/Scribus/scribus/pageitem.cpp
==============================================================================
--- trunk/Scribus/scribus/pageitem.cpp (original)
+++ trunk/Scribus/scribus/pageitem.cpp Sun Jun 21 21:46:55 2015
@@ -44,6 +44,7 @@
 #include "cmsettings.h"
 #include "colorblind.h"
 #include "desaxe/saxXML.h"
+#include "iconmanager.h"
 #include "marks.h"
 #include "pageitem_arc.h"
 #include "pageitem_group.h"
@@ -79,10 +80,8 @@
 #include "util.h"
 #include "util_file.h"
 #include "util_formats.h"
-#include "util_icon.h"
 #include "util_math.h"
 #include "util_text.h"
-
 
 #include <cairo.h>
 
@@ -2148,7 +2147,7 @@
 				{
 					p->save();
 					p->translate(ofx, ofy);
-					QImage ico = loadIcon("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=20185&path=/trunk/Scribus/scribus/plugins/barcodegenerator/barcode.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/barcodegenerator/barcode.cpp (original)
+++ trunk/Scribus/scribus/plugins/barcodegenerator/barcode.cpp Sun Jun 21 21:46:55 2015
@@ -9,7 +9,7 @@
 #include "barcodegenerator.h"
 #include "scribuscore.h"
 #include "scribusstructs.h"
-#include "util_icon.h"
+#include "iconmanager.h"
 
 Barcode::Barcode() : ScActionPlugin()
 {
@@ -29,8 +29,8 @@
 		m_actionInfo.menuAfterName = "toolsInsertRenderFrame";
 		m_actionInfo.toolbar = "Tools";
 	}
-	m_actionInfo.icon1 = loadIcon("16/insert-barcode.png");
-	m_actionInfo.icon2 = loadIcon("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=20185&path=/trunk/Scribus/scribus/plugins/barcodegenerator/barcodegenerator.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/barcodegenerator/barcodegenerator.cpp (original)
+++ trunk/Scribus/scribus/plugins/barcodegenerator/barcodegenerator.cpp Sun Jun 21 21:46:55 2015
@@ -5,17 +5,18 @@
 for which a new license (GPL+exception) is in place.
 */
 
+
 #include "../formatidlist.h"
 #include "barcodegenerator.h"
 #include "commonstrings.h"
+#include "iconmanager.h"
 #include "loadsaveplugin.h"
 #include "scpaths.h"
-
 #include "scribuscore.h"
+#include "ui/paintmanager.h"
 #include "undomanager.h"
 #include "util_ghostscript.h"
-#include "util_icon.h"
-#include "ui/paintmanager.h"
+
 
 #include <QTextStream>
 
@@ -111,7 +112,7 @@
 	ui.bcCombo->addItems(map.keys());
 	ui.okButton->setText(CommonStrings::tr_OK);
 	ui.cancelButton->setText(CommonStrings::tr_Cancel);
-	ui.resetButton->setIcon(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=20185&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 Sun Jun 21 21:46:55 2015
@@ -13,6 +13,7 @@
 
 #include "commonstrings.h"
 #include "dialog.h"
+#include "iconmanager.h"
 #include "prefscontext.h"
 #include "prefsfile.h"
 #include "prefsmanager.h"
@@ -21,7 +22,6 @@
 #include "ui/scrspinbox.h"
 #include "usertaskstructs.h"
 #include "util.h"
-#include "util_icon.h"
 
 ExportForm::ExportForm(QWidget* parent, ScribusDoc* doc, int size, int quality, QString type)
 	: QDialog(parent, 0), m_doc(doc), m_PageCount(doc->DocPages.count())
@@ -44,7 +44,7 @@
 	DPIBox->setValue(size);
 	enlargementBox->setValue(size);
 	onePageRadio->setChecked( true );
-	pageNrButton->setIcon(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=20185&path=/trunk/Scribus/scribus/plugins/fontpreview/fontpreview.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/fontpreview/fontpreview.cpp (original)
+++ trunk/Scribus/scribus/plugins/fontpreview/fontpreview.cpp Sun Jun 21 21:46:55 2015
@@ -15,7 +15,7 @@
 #include "selection.h"
 #include "sampleitem.h"
 #include "fontlistmodel.h"
-#include "util_icon.h"
+#include "iconmanager.h"
 
 
 FontPreview::FontPreview(QString fontName, QWidget* parent, ScribusDoc* doc)
@@ -23,7 +23,7 @@
 {
 	setupUi(this);
 	setModal(true);
-	setWindowIcon(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=20185&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 Sun Jun 21 21:46:55 2015
@@ -19,13 +19,13 @@
 #include <QString>
 #include <QStringList>
 
-#include "util_icon.h"
+#include "iconmanager.h"
 
 CsvDialog::CsvDialog() : QDialog(0)
 {
 	setModal(true);
 	setWindowTitle( tr("CSV Importer Options"));
-	setWindowIcon(QIcon(loadIcon ( "AppIcon.png" )));
+	setWindowIcon(QIcon(IconManager::instance()->loadIcon ( "AppIcon.png" )));
 
 	QBoxLayout* layout = new QVBoxLayout(this);
 	layout->setMargin(0);

Modified: trunk/Scribus/scribus/plugins/gettext/odtim/odtdia.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20185&path=/trunk/Scribus/scribus/plugins/gettext/odtim/odtdia.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/gettext/odtim/odtdia.cpp (original)
+++ trunk/Scribus/scribus/plugins/gettext/odtim/odtdia.cpp Sun Jun 21 21:46:55 2015
@@ -34,12 +34,12 @@
 #include <QCheckBox>
 #include <QPushButton>
 #include "scribusapi.h"
-#include "util_icon.h"
+#include "iconmanager.h"
 
 OdtDialog::OdtDialog(bool update, bool prefix, bool pack) : QDialog(0)
 {
 	setModal(true);
-	setWindowIcon(QIcon(loadIcon ( "AppIcon.png" )));
+	setWindowIcon(QIcon(IconManager::instance()->loadIcon ( "AppIcon.png" )));
 	setWindowTitle( tr("OpenDocument Importer Options"));
 
 	QBoxLayout* layout = new QVBoxLayout(this);

Modified: trunk/Scribus/scribus/plugins/gettext/sxwim/sxwdia.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20185&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 Sun Jun 21 21:46:55 2015
@@ -15,12 +15,12 @@
 #include <QPushButton>
 
 #include "scribusapi.h"
-#include "util_icon.h"
+#include "iconmanager.h"
 
 SxwDialog::SxwDialog(bool update, bool prefix, bool pack) : QDialog(0)
 {
 	setModal(true);
-	setWindowIcon(QIcon(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=20185&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 Sun Jun 21 21:46:55 2015
@@ -25,13 +25,13 @@
 #include <prefstable.h>
 
 #include "commonstrings.h"
-#include "util_icon.h"
+#include "iconmanager.h"
 #include "util.h"
 
 tfDia::tfDia() : QDialog()
 {
 	setModal(true);
-	setWindowIcon(QIcon(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=20185&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 Sun Jun 21 21:46:55 2015
@@ -21,7 +21,7 @@
 #include "scribusdoc.h"
 #include "prefsmanager.h"
 #include "prefsfile.h"
-#include "util_icon.h"
+#include "iconmanager.h"
 #include "util.h"
 
 tfFilter::tfFilter(QWidget *parent, const char *name,
@@ -133,12 +133,12 @@
 // 	layout->addStretch(10);
 
 	layout->addSpacing(20);
-	removeButton = new QPushButton(loadIcon("22/list-remove.png"), 0, this);
+	removeButton = new QPushButton(IconManager::instance()->loadIcon("22/list-remove.png"), 0, this);
 	removeButton->setToolTip( tr("Remove this filter row"));
 	removeButton->setMaximumSize(QSize(25,25));
 	removeButton->setMinimumSize(QSize(25,25));
 	layout->addWidget(removeButton);
-	addButton = new QPushButton(loadIcon("22/list-add.png"), 0, this);
+	addButton = new QPushButton(IconManager::instance()->loadIcon("22/list-add.png"), 0, this);
 	addButton->setToolTip( tr("Add a new filter row"));
 	addButton->setMaximumSize(QSize(25,25));
 	addButton->setMinimumSize(QSize(25,25));

Modified: trunk/Scribus/scribus/plugins/gettext/xtgim/fontselectdialog.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20185&path=/trunk/Scribus/scribus/plugins/gettext/xtgim/fontselectdialog.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/gettext/xtgim/fontselectdialog.cpp (original)
+++ trunk/Scribus/scribus/plugins/gettext/xtgim/fontselectdialog.cpp Sun Jun 21 21:46:55 2015
@@ -25,13 +25,13 @@
   ***************************************************************************/
 
 #include "fontselectdialog.h"
-#include "util_icon.h"
+#include "iconmanager.h"
 #include <QDebug>
 
 FontSelect::FontSelect(QStringList list):QDialog(0)
 {
 	setModal(true);
-	setWindowIcon(QIcon(loadIcon ( "AppIcon.png" )));
+	setWindowIcon(QIcon(IconManager::instance()->loadIcon ( "AppIcon.png" )));
 	setWindowTitle( tr("Select Alternate Font"));
 
 	resize(370, 83);
@@ -87,4 +87,4 @@
 void FontSelect::resetFont()
 {
 	font = "";
-}
+}

Modified: trunk/Scribus/scribus/plugins/gettext/xtgim/xtgdialog.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20185&path=/trunk/Scribus/scribus/plugins/gettext/xtgim/xtgdialog.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/gettext/xtgim/xtgdialog.cpp (original)
+++ trunk/Scribus/scribus/plugins/gettext/xtgim/xtgdialog.cpp Sun Jun 21 21:46:55 2015
@@ -35,12 +35,12 @@
 #include <QPushButton>
 
 #include "scribusapi.h"
-#include "util_icon.h"
+#include "iconmanager.h"
 
 XtgDialog::XtgDialog(bool prefix) : QDialog(0)
 {
 	setModal(true);
-	setWindowIcon(QIcon(loadIcon ( "AppIcon.png" )));
+	setWindowIcon(QIcon(IconManager::instance()->loadIcon ( "AppIcon.png" )));
 	setWindowTitle( tr("Quark XPress Tags Importer Options"));
 
 	QBoxLayout* layout = new QVBoxLayout(this);

Modified: trunk/Scribus/scribus/plugins/import/pdf/pdfimportoptions.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20185&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 Sun Jun 21 21:46:55 2015
@@ -9,12 +9,12 @@
 #include "importpdf.h"
 #include "ui/createrange.h"
 #include "usertaskstructs.h"
-#include "util_icon.h"
+#include "iconmanager.h"
 
 PdfImportOptions::PdfImportOptions(QWidget *parent) : QDialog(parent), ui(new Ui::PdfImportOptions)
 {
 	ui->setupUi(this);
-	ui->pageSelectButton->setIcon(QIcon(loadIcon("ellipsis.png")));
+	ui->pageSelectButton->setIcon(IconManager::instance()->loadIcon("ellipsis.png"));
 	m_plugin = NULL;
 	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=20185&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 Sun Jun 21 21:46:55 2015
@@ -8,12 +8,12 @@
 #include "ui_xpsimportoptions.h"
 #include "ui/createrange.h"
 #include "usertaskstructs.h"
-#include "util_icon.h"
+#include "iconmanager.h"
 
 XpsImportOptions::XpsImportOptions(QWidget *parent) : QDialog(parent), ui(new Ui::XpsImportOptions)
 {
 	ui->setupUi(this);
-	ui->pageSelectButton->setIcon(QIcon(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=20185&path=/trunk/Scribus/scribus/plugins/picbrowser/picturebrowser.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/picbrowser/picturebrowser.cpp (original)
+++ trunk/Scribus/scribus/plugins/picbrowser/picturebrowser.cpp Sun Jun 21 21:46:55 2015
@@ -21,8 +21,7 @@
 #include "prefsfile.h"
 #include "prefsmanager.h"
 
-//provides loadIcon()
-#include "util_icon.h"
+#include "iconmanager.h"
 #include "util_formats.h"
 
 PictureBrowser::PictureBrowser ( ScribusDoc* doc, QWidget *parent ) :
@@ -1605,26 +1604,27 @@
 
 void PictureBrowser::loadIcons()
 {
-	iconArrowUp = new QIcon ( loadIcon ( "pitr_green_arrows_set_1.svg" ) );
-	iconArrowDown = new QIcon ( loadIcon ( "pitr_green_arrows_set_5.svg" ) );
-	iconFolderBrowser = new QIcon ( loadIcon ( "sarxos_Simple_Folder_Seek.svg" ) );
-	iconCollectionsBrowser = new QIcon ( loadIcon ( "sarxos_Simple_Green_Yellow_Blue_Violet_Folders.svg" ) );
-	iconDocumentBrowser = new QIcon ( loadIcon ( "sarxos_Paper_Sheets.svg" ) );
-	iconDocument = new QIcon ( loadIcon ( "doc.png" ) );
-	iconCollection = new QIcon ( loadIcon ( "cmyk.png" ) );
-	iconOk = new QIcon ( loadIcon ( "ok22.png" ) );
-	iconClose = new QIcon ( loadIcon ( "/16/close.png" ) );
-	iconZoomPlus = new QIcon ( loadIcon ( "viewmagin.png" ) );
-	iconZoomMinus = new QIcon ( loadIcon ( "viewmagout.png" ) );
-	iconNew = new QIcon ( loadIcon ( "/16/insert-table.png" ) );
-	iconNew2 = new QIcon ( loadIcon ( "/16/document-new.png" ) );
-	iconEdit = new QIcon ( loadIcon ( "/16/document-properties.png" ) );
-	iconRemove = new QIcon ( loadIcon ( "/16/edit-cut.png" ) );
-	iconLoad = new QIcon ( loadIcon ( "/16/document-open.png" ) );
-	iconSave = new QIcon ( loadIcon ( "/16/document-save.png" ) );
-	iconPlus = new QIcon ( loadIcon ( "/16/list-add.png" ) );
-	iconMinus = new QIcon ( loadIcon ( "/16/list-remove.png" ) );
-	iconPen = new QIcon ( 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=20185&path=/trunk/Scribus/scribus/plugins/picbrowser/previewimage.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/picbrowser/previewimage.cpp (original)
+++ trunk/Scribus/scribus/plugins/picbrowser/previewimage.cpp Sun Jun 21 21:46:55 2015
@@ -20,7 +20,7 @@
 #include "picturebrowser.h"
 #include "collection.h"
 
-#include "util_icon.h"
+#include "iconmanager.h"
 #include "util.h"
 
 #include <QPainter>
@@ -64,7 +64,7 @@
 
 	previewIcon = QPixmap ( size, size );
 
-	QBrush b ( QColor ( 205,205,205 ), loadIcon ( "testfill.png" ) );
+	QBrush b ( QColor ( 205,205,205 ), IconManager::instance()->loadPixmap( "testfill.png" ) );
 
 	p.begin ( &previewIcon );
 
@@ -403,7 +403,7 @@
 
 	defaultIcon = QPixmap ( size, size );
 
-	QBrush b ( QColor ( 205,205,205 ), loadIcon ( "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=20185&path=/trunk/Scribus/scribus/plugins/saveastemplateplugin/satdialog.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/saveastemplateplugin/satdialog.cpp (original)
+++ trunk/Scribus/scribus/plugins/saveastemplateplugin/satdialog.cpp Sun Jun 21 21:46:55 2015
@@ -18,7 +18,7 @@
 #include "prefsfile.h"
 #include "scpaths.h"
 #include "scribuscore.h"
-#include "util_icon.h"
+#include "iconmanager.h"
 
 class CategoriesReader : public QXmlDefaultHandler
 {
@@ -41,7 +41,7 @@
 	setupUi(this);
 	setModal(true);
 	setWindowTitle( tr("Save as Template"));
-	setWindowIcon(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=20185&path=/trunk/Scribus/scribus/plugins/scriptplugin/pconsole.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/scriptplugin/pconsole.cpp (original)
+++ trunk/Scribus/scribus/plugins/scriptplugin/pconsole.cpp Sun Jun 21 21:46:55 2015
@@ -14,19 +14,20 @@
 #include "pconsole.h"
 
 #include <QFileDialog>
+
 #include "commonstrings.h"
+#include "iconmanager.h"
+#include "prefscontext.h"
+#include "prefsfile.h"
 #include "prefsmanager.h"
-#include "prefsfile.h"
-#include "prefscontext.h"
-
 #include "scribuscore.h"
-#include "util_icon.h"
+
 
 PythonConsole::PythonConsole( QWidget* parent)
 	: QMainWindow( parent )
 {
 	setupUi(this);
-	setWindowIcon(loadIcon("AppIcon.png"));
+	setWindowIcon(IconManager::instance()->loadIcon("AppIcon.png"));
 
 	changedLabel = new QLabel(this);
 	cursorTemplate = tr("Col: %1 Row: %2/%3");
@@ -34,11 +35,11 @@
 	statusBar()->addPermanentWidget(changedLabel);
 	statusBar()->addPermanentWidget(cursorLabel);
 
-	action_Open->setIcon(loadIcon("16/document-open.png"));
-	action_Save->setIcon(loadIcon("16/document-save.png"));
-	actionSave_As->setIcon(loadIcon("16/document-save-as.png"));
-	action_Exit->setIcon(loadIcon("exit.png"));
-	action_Run->setIcon(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=20185&path=/trunk/Scribus/scribus/plugins/scriptplugin/scriptplugin.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/scriptplugin/scriptplugin.cpp (original)
+++ trunk/Scribus/scribus/plugins/scriptplugin/scriptplugin.cpp Sun Jun 21 21:46:55 2015
@@ -38,15 +38,12 @@
 #include "cmdtext.h"
 #include "cmdutil.h"
 #include "cmdstyle.h"
-#include "ui/customfdialog.h"
 #include "guiapp.h"
-#include "ui/helpbrowser.h"
-#include "ui/scmwmenumanager.h"
+#include "iconmanager.h"
 #include "objimageexport.h"
 #include "objpdffile.h"
 #include "objprinter.h"
 #include "prefs_scripter.h"
-#include "ui/propertiespalette.h"
 #include "scconfig.h"
 #include "scpaths.h"
 #include "scribuscore.h"
@@ -55,8 +52,12 @@
 #include "scripterprefsgui.h"
 #include "scriptplugin.h"
 #include "svgimport.h"
+#include "ui/customfdialog.h"
+#include "ui/helpbrowser.h"
+#include "ui/propertiespalette.h"
+#include "ui/scmwmenumanager.h"
 #include "units.h"
-#include "util_icon.h"
+
 
 #include <QApplication>
 #include <QMessageBox>
@@ -205,7 +206,7 @@
 	Q_CHECK_PTR(panel);
 	connect(panel, SIGNAL(prefsChanged()), scripterCore, SLOT(updateSyntaxHighlighter()));
 	caption = tr("Scripter");
-	icon = loadIcon("python.png");
+	icon = IconManager::instance()->loadPixmap("python.png");
 	return true;
 }
 
@@ -216,7 +217,7 @@
 	Q_CHECK_PTR(panel);
 	connect(panel, SIGNAL(prefsChanged()), scripterCore, SLOT(updateSyntaxHighlighter()));
 	caption = tr("Scripter");
-	icon = loadIcon("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=20185&path=/trunk/Scribus/scribus/plugins/shapes/shapepalette.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/shapes/shapepalette.cpp (original)
+++ trunk/Scribus/scribus/plugins/shapes/shapepalette.cpp Sun Jun 21 21:46:55 2015
@@ -20,27 +20,29 @@
  *   (at your option) any later version.                                   *
  *                                                                         *
  ***************************************************************************/
+#include "iconmanager.h"
+#include "prefsfile.h"
+#include "prefsmanager.h"
+#include "scmimedata.h"
+#include "scpainter.h"
+#include "scribus.h"
+#include "scribusXml.h"
+#include "scribusdoc.h"
+#include "selection.h"
 #include "shapepalette.h"
+#include "ui/scmessagebox.h"
+#include "util.h"
+#include "util_math.h"
+
 #include <QApplication>
+#include <QByteArray>
 #include <QDomDocument>
 #include <QDomElement>
 #include <QDrag>
+#include <QFileDialog>
 #include <QMimeData>
 #include <QPainter>
-#include <QByteArray>
-#include <QFileDialog>
-#include "prefsfile.h"
-#include "prefsmanager.h"
-#include "scpainter.h"
-#include "scribusdoc.h"
-#include "scribus.h"
-#include "selection.h"
-#include "scmimedata.h"
-#include "scribusXml.h"
-#include "ui/scmessagebox.h"
-#include "util.h"
-#include "util_icon.h"
-#include "util_math.h"
+
 
 ShapeView::ShapeView(QWidget* parent) : QListWidget(parent)
 {
@@ -286,14 +288,14 @@
 	buttonLayout->setMargin( 0 );
 	importButton = new QToolButton(this);
 	importButton->setSizePolicy(QSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed));
-	importButton->setIcon(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(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=20185&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 Sun Jun 21 21:46:55 2015
@@ -24,21 +24,20 @@
 #include <QTextCodec>
 #include <QPixmap>
 
-#include "shortwords.h"
-
 #include "configuration.h"
+#include "iconmanager.h"
 #include "parse.h"
 #include "prefs_shortwords.h"
-#include "swdialog.h"
-#include "swprefsgui.h"
-#include "version.h"
-
 #include "scpage.h"
 #include "scpaths.h"
 #include "scribus.h"
 #include "scribusdoc.h"
 #include "scribusview.h"
-#include "util_icon.h"
+#include "shortwords.h"
+#include "swdialog.h"
+#include "swprefsgui.h"
+#include "version.h"
+
 
 int scribusshortwords_getPluginAPIVersion()
 {
@@ -164,7 +163,7 @@
 	panel = new SWPrefsGui(parent);
 	Q_CHECK_PTR(panel);
 	caption = tr("Short Words");
-	icon = loadIcon("shortwords.png");
+	icon = IconManager::instance()->loadPixmap("shortwords.png");
 	return true;
 }
 
@@ -173,6 +172,6 @@
 	panel = new Prefs_ShortWords(parent);
 	Q_CHECK_PTR(panel);
 	caption = tr("Short Words");
-	icon = loadIcon("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=20185&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 Sun Jun 21 21:46:55 2015
@@ -36,7 +36,7 @@
 #include "sccolorengine.h"
 #include "scpattern.h"
 #include "selection.h"
-#include "util_icon.h"
+#include "iconmanager.h"
 #include "util_math.h"
 
 NodeItem::NodeItem(QRectF geom, uint num, MeshDistortionDialog *parent) : QGraphicsEllipseItem(geom)
@@ -121,9 +121,9 @@
 {
 	setupUi(this);
 	setModal(true);
-	setWindowIcon(QIcon(loadIcon("AppIcon.png")));
-	buttonZoomOut->setIcon(QIcon(loadIcon("16/zoom-out.png")));
-	buttonZoomIn->setIcon(QIcon(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, 0, 0);
 	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=20185&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 Sun Jun 21 21:46:55 2015
@@ -27,7 +27,7 @@
 #include "lensdialog.h"
 #include <cmath>
 #include <QRadialGradient>
-#include "util_icon.h"
+#include "iconmanager.h"
 #include "selection.h"
 #include "sccolorengine.h"
 #include "scpattern.h"
@@ -247,8 +247,8 @@
 	setupUi(this);
 	buttonRemove->setEnabled(false);
 	setModal(true);
-	buttonZoomOut->setIcon(QIcon(loadIcon("16/zoom-out.png")));
-	buttonZoomI->setIcon(QIcon(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, 0, 0);
 	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=20185&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 Sun Jun 21 21:46:55 2015
@@ -31,7 +31,7 @@
 #include "selection.h"
 #include "ui/scmessagebox.h"
 #include "util.h"
-#include "util_icon.h"
+#include "iconmanager.h"
 #include <QPainterPathStroker>
 #include <QMessageBox>
 
@@ -73,8 +73,8 @@
 	m_actionInfo.text = tr("Cut Polygon");
 	m_actionInfo.helpText = tr("Cuts a Polygon with a Path.");
 	// Menu
-	m_actionInfo.icon1 = loadIcon("22/transform-crop-and-resize.png");
-	m_actionInfo.icon2 = loadIcon("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=20185&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 Sun Jun 21 21:46:55 2015
@@ -27,7 +27,7 @@
 #include "sccolorengine.h"
 #include "scribusdoc.h"
 #include "util.h"
-#include "util_icon.h"
+#include "iconmanager.h"
 
 #include <QPixmap>
 #include <QPainter>
@@ -38,17 +38,17 @@
 	m_doc = doc;
 	setupUi(this);
 	setModal(true);
-	setWindowIcon(QIcon(loadIcon("AppIcon.png")));
+	setWindowIcon(QIcon(IconManager::instance()->loadIcon("AppIcon.png")));
 	opCombine->setText( QString::null );
 	opSubtraction->setText( QString::null );
 	opIntersection->setText( QString::null );
 	opExclusion->setText( QString::null );
 	opParts->setText( QString::null );
-	opExclusion->setIcon(QIcon(loadIcon("pathexclusion.png")));
-	opIntersection->setIcon(QIcon(loadIcon("pathintersection.png")));
-	opParts->setIcon(QIcon(loadIcon("pathparts.png")));
-	opSubtraction->setIcon(QIcon(loadIcon("pathsubtraction.png")));
-	opCombine->setIcon(QIcon(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->addItem(CommonStrings::tr_NoneColor);
 	otherColorComboLine->insertItems(m_doc->PageColors, ColorCombo::fancyPixmaps);
 	otherColorComboFill->addItem(CommonStrings::tr_NoneColor);
@@ -151,7 +151,7 @@
 	QPainter p;
 	p.begin(&pm);
 	p.setRenderHint(QPainter::Antialiasing, true);
-	QBrush b(QColor(205,205,205), loadIcon("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), loadIcon("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/prefsstructs.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20185&path=/trunk/Scribus/scribus/prefsstructs.h
==============================================================================
--- trunk/Scribus/scribus/prefsstructs.h (original)
+++ trunk/Scribus/scribus/prefsstructs.h Sun Jun 21 21:46:55 2015
@@ -497,4 +497,14 @@
 	DocumentSectionMap docSectionMap;
 };
 
+struct ScIconSetData
+{
+	QString path;
+	QString baseName;
+	QString license;
+	QString author;
+	QMap<QString, QString> nameTranslations;
+};
+
+
 #endif

Modified: trunk/Scribus/scribus/scribus.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20185&path=/trunk/Scribus/scribus/scribus.cpp
==============================================================================
--- trunk/Scribus/scribus/scribus.cpp (original)
+++ trunk/Scribus/scribus/scribus.cpp Sun Jun 21 21:46:55 2015
@@ -111,6 +111,7 @@
 #include "fpointarray.h"
 #include "gtgettext.h"
 #include "hyphenator.h"
+#include "iconmanager.h"
 #include "langmgr.h"
 #include "loadsaveplugin.h"
 #include "marks.h"
@@ -259,9 +260,7 @@
 #include "util_file.h"
 #include "util_formats.h"
 #include "util_ghostscript.h"
-#include "util_icon.h"
 #include "util_math.h"
-
 
 
 #ifdef HAVE_OSG
@@ -304,7 +303,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 = loadIcon("noicon.xpm");
+	noIcon = IconManager::instance()->loadPixmap("noicon.xpm");
 #endif
 }
 
@@ -350,7 +349,7 @@
 	setWindowTitle( tr("Scribus " VERSION));
 	setAttribute(Qt::WA_KeyCompression, false);
 	setAttribute(Qt::WA_InputMethodEnabled, true);
-	setWindowIcon(loadIcon("AppIcon.png"));
+	setWindowIcon(IconManager::instance()->loadIcon("AppIcon.png"));
 	setObjectName("MainWindow");
 	scrActionGroups.clear();
 	scrActions.clear();
@@ -1248,9 +1247,9 @@
 	zoomInToolbarButton->setDefault( false );
 	zoomInToolbarButton->setAutoDefault( false );
 
-	zoomDefaultToolbarButton->setIcon(QIcon(loadIcon("16/zoom-original.png")));
-	zoomOutToolbarButton->setIcon(QIcon(loadIcon("16/zoom-out.png")));
-	zoomInToolbarButton->setIcon(QIcon(loadIcon("16/zoom-in.png")));
+	zoomDefaultToolbarButton->setIcon(QIcon(IconManager::instance()->loadIcon("16/zoom-original.png")));
+	zoomOutToolbarButton->setIcon(QIcon(IconManager::instance()->loadIcon("16/zoom-out.png")));
+	zoomInToolbarButton->setIcon(QIcon(IconManager::instance()->loadIcon("16/zoom-in.png")));
 
 
 	zoomLayout->addWidget( zoomSpinBox );
@@ -1279,7 +1278,7 @@
 	QByteArray stylesheet;
 	if (loadRawText(ScPaths::instance().libDir() + "scribus.css", stylesheet))
 	{
-		QString downArrow(pathForIcon("16/go-down.png"));
+		QString downArrow(IconManager::instance()->pathForIcon("16/go-down.png"));
 		QByteArray da;
 		da.append(downArrow);
 		stylesheet.replace("___downArrow___", da);
@@ -1627,7 +1626,7 @@
 	{
 		if ((doc->appMode == modeMagnifier) && (kk == Qt::Key_Shift))
 		{
-			view->setCursor(QCursor(loadIcon("LupeZm.xpm")));
+			view->setCursor(IconManager::instance()->loadCursor("LupeZm.xpm"));
 			return;
 		}
 	}
@@ -1876,7 +1875,7 @@
 	if (HaveDoc)
 	{
 		if (doc->appMode == modeMagnifier)
-			view->setCursor(QCursor(loadIcon("LupeZ.xpm")));
+			view->setCursor(IconManager::instance()->loadCursor("LupeZ.xpm"));
 	}
 	if (k->isAutoRepeat() || !_arrowKeyDown)
 		return;
@@ -3093,7 +3092,7 @@
 		md->setUrls(urls);
 		QDrag* dr = new QDrag(this);
 		dr->setMimeData(md);
-		const QPixmap& dragCursor = loadIcon("DragPix.xpm");
+		const QPixmap& dragCursor = IconManager::instance()->loadPixmap("DragPix.xpm");
 		dr->setPixmap(dragCursor);
 		dr->exec();
 	}
@@ -7401,7 +7400,7 @@
 	slotSelect();
 	appModeHelper->setSymbolEditMode(false, doc);
 	scrActions["fileClose"]->setToolTip( tr("Close"));
-	scrActions["fileClose"]->setIcon(loadIcon("22/close.png"));
+	scrActions["fileClose"]->setIcon(IconManager::instance()->loadIcon("22/close.png"));
 	scrMenuMgr->setMenuEnabled("FileOpenRecent", true);
 	scrMenuMgr->setMenuEnabled("FileExport", true);
 
@@ -7471,7 +7470,7 @@
 	slotSelect();
 	appModeHelper->setInlineEditMode(false, doc);
 	scrActions["fileClose"]->setToolTip( tr("Close"));
-	scrActions["fileClose"]->setIcon(loadIcon("22/close.png"));
+	scrActions["fileClose"]->setIcon(IconManager::instance()->loadIcon("22/close.png"));
 	scrMenuMgr->setMenuEnabled("FileOpenRecent", true);
 	scrMenuMgr->setMenuEnabled("FileExport", true);
 	pagePalette->enablePalette(true);
@@ -7551,7 +7550,7 @@
 	slotSelect();
 	appModeHelper->setMasterPageEditMode(false, doc);
 	scrActions["fileClose"]->setToolTip( tr("Close"));
-	scrActions["fileClose"]->setIcon(loadIcon("22/close.png"));
+	scrActions["fileClose"]->setIcon(IconManager::instance()->loadIcon("22/close.png"));
 	scrMenuMgr->setMenuEnabled("FileOpenRecent", true);
 	uint pageCount=doc->DocPages.count();
 	for (uint c=0; c<pageCount; ++c)

Modified: trunk/Scribus/scribus/scribusapp.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20185&path=/trunk/Scribus/scribus/scribusapp.cpp
==============================================================================
--- trunk/Scribus/scribus/scribusapp.cpp (original)
+++ trunk/Scribus/scribus/scribusapp.cpp Sun Jun 21 21:46:55 2015
@@ -39,6 +39,7 @@
 
 #include "commonstrings.h"
 #include "downloadmanager/scdlmgr.h"
+#include "iconmanager.h"
 #include "langmgr.h"
 #include "localemgr.h"
 #include "prefsfile.h"
@@ -117,6 +118,7 @@
 	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=20185&path=/trunk/Scribus/scribus/scribuscore.cpp
==============================================================================
--- trunk/Scribus/scribus/scribuscore.cpp (original)
+++ trunk/Scribus/scribus/scribuscore.cpp Sun Jun 21 21:46:55 2015
@@ -31,6 +31,7 @@
 #include "colormgmt/sccolormgmtenginefactory.h"
 #include "commonstrings.h"
 #include "filewatcher.h"
+#include "iconmanager.h"
 #include "localemgr.h"
 #include "pluginmanager.h"
 #include "prefsmanager.h"
@@ -142,6 +143,9 @@
 								 const QString newGuiLanguage, const QString prefsUserFile)
 {
 	CommonStrings::languageChange();
+	iconManager = IconManager::instance();
+	iconManager->setup();
+
 	// FIXME: Splash needs the prefs loaded by initDefaults() to know if it must force the image to grayscale
 	initSplash(showSplash);
 	LocaleManager::instance();
@@ -194,7 +198,7 @@
 	m_SplashScreen = NULL;
 	if (!showSplash)
 		return;
-	QPixmap pix = loadIcon("scribus_splash.png", true);
+	QPixmap pix = IconManager::instance()->loadPixmap("scribus_splash.png", true);
 	m_SplashScreen = new ScSplashScreen(pix, Qt::WindowStaysOnTopHint);
 	if (m_SplashScreen != NULL)
 		m_SplashScreen->show();

Modified: trunk/Scribus/scribus/scribuscore.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20185&path=/trunk/Scribus/scribus/scribuscore.h
==============================================================================
--- trunk/Scribus/scribus/scribuscore.h (original)
+++ trunk/Scribus/scribus/scribuscore.h Sun Jun 21 21:46:55 2015
@@ -31,6 +31,7 @@
 
 class QWidget;
 class FileWatcher;
+class IconManager;
 class PluginManager;
 class ScSplashScreen;
 class ScribusMainWindow;
@@ -67,6 +68,7 @@
 	int initScribusCore(bool showSplash, bool showFontInfo, bool showProfileInfo, const QString newGuiLanguage, const QString prefsUserFile);
 	bool initialized() const {return m_ScribusInitialized;};
 	const QString& getGuiLanguage() const;
+
 	void initSplash(bool showSplash);
 	bool initFonts(bool showFontInfo);
 	void showSplash(bool);
@@ -130,6 +132,7 @@
 	int m_currScMW;
 	
 	ScSplashScreen *m_SplashScreen;
+	IconManager *iconManager;
 	UndoManager *undoManager;
 	PrefsManager *prefsManager;
 	bool m_ScribusInitialized;

Modified: trunk/Scribus/scribus/scribusview.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20185&path=/trunk/Scribus/scribus/scribusview.cpp
==============================================================================
--- trunk/Scribus/scribus/scribusview.cpp (original)
+++ trunk/Scribus/scribus/scribusview.cpp Sun Jun 21 21:46:55 2015
@@ -66,9 +66,9 @@
 #include <QDir>
 #include <QSizeGrip>
 
-#include "appmodes.h"
 #include "actionmanager.h"
 #include "appmodehelper.h"
+#include "appmodes.h"
 #include "canvas.h"
 #include "canvasgesture.h"
 #include "canvasmode.h"
@@ -78,6 +78,7 @@
 #include "fileloader.h"
 #include "filewatcher.h"
 #include "hyphenator.h"
+#include "iconmanager.h"
 #include "loadsaveplugin.h"
 #include "pageitem.h"
 #include "pageitem_group.h"
@@ -126,8 +127,8 @@
 #include "util.h"
 #include "util_color.h"
 #include "util_formats.h"
-#include "util_icon.h"
 #include "util_math.h"
+
 
 
 
@@ -228,7 +229,7 @@
 	clockLabel = new ClockWidget(this, Doc);
 	clockLabel->setGeometry(m_vhRulerHW + 1, height() - m_vhRulerHW - 61, 60, 60);
 	clockLabel->setVisible(false);
-	endEditButton = new QPushButton(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()));
@@ -510,6 +511,7 @@
 
 void ScribusView::setCursorBasedOnAppMode(int appMode)
 {
+	IconManager* im=IconManager::instance();
 	int docSelectionCount = Doc->m_Selection->count();
 	switch (appMode)
 	{
@@ -518,41 +520,41 @@
 		case modeDrawSpiral:
 			if (docSelectionCount!=0)
 				Deselect(true);
-			setCursor(QCursor(loadIcon("DrawFrame.xpm")));
+			setCursor(im->loadCursor("DrawFrame.xpm"));
 			break;
 		case modeDrawImage:
 			if (docSelectionCount!=0)
 				Deselect(true);
-			setCursor(QCursor(loadIcon("DrawImageFrame.xpm")));
+			setCursor(im->loadCursor("DrawImageFrame.xpm"));
 			break;
 		case modeDrawLatex:
 			if (docSelectionCount!=0)
 				Deselect(true);
-			setCursor(QCursor(loadIcon("DrawLatexFrame.xpm")));
+			setCursor(im->loadCursor("DrawLatexFrame.xpm"));
 			break;
 		case modeDrawText:
 			if (docSelectionCount!=0)
 				Deselect(true);
-			setCursor(QCursor(loadIcon("DrawTextFrame.xpm")));
+			setCursor(im->loadCursor("DrawTextFrame.xpm"));
 			break;
 		case modeDrawTable2:
 			if (docSelectionCount!=0)
 				Deselect(true);
-			setCursor(QCursor(loadIcon("DrawTable.xpm")));
+			setCursor(im->loadCursor("DrawTable.xpm"));
 			break;
 		case modeDrawRegularPolygon:
 			if (docSelectionCount!=0)
 				Deselect(true);
-			setCursor(QCursor(loadIcon("DrawPolylineFrame.xpm")));
+			setCursor(im->loadCursor("DrawPolylineFrame.xpm"));
 			break;
 		case modeMagnifier:
 			if (docSelectionCount!=0)
 				Deselect(true);
 			Magnify = true;
-			setCursor(QCursor(loadIcon("LupeZ.xpm")));
+			setCursor(im->loadCursor("LupeZ.xpm"));
 			break;
 		case modePanning:
-			setCursor(QCursor(loadIcon("HandC.xpm")));
+			setCursor(im->loadCursor("HandC.xpm"));
 			break;
 		case modeDrawLine:
 		case modeDrawBezierLine:
@@ -560,10 +562,10 @@
 			break;
 		case modeDrawCalligraphicLine:
 		case modeDrawFreehandLine:
-			setCursor(QCursor(loadIcon("DrawFreeLine.png"), 0, 32));
+			setCursor(QCursor(im->loadPixmap("DrawFreeLine.png"), 0, 32));
 			break;
 		case modeEyeDropper:
-			setCursor(QCursor(loadIcon("colorpickercursor.png"), 0, 32));
+			setCursor(QCursor(im->loadPixmap("colorpickercursor.png"), 0, 32));
 			break;
 		case modeInsertPDFButton:
 		case modeInsertPDFRadioButton:
@@ -1687,7 +1689,7 @@
 	if (mpo.contains(tx) || mpo.contains(tx2))
 	{
 		if (Doc->appMode == modeRotation)
-			setCursor(QCursor(loadIcon("Rotieren2.png")));
+			setCursor(IconManager::instance()->loadCursor("Rotieren2.png"));
 		else
 		{
 			double rr = fabs(currItem->rotation());
@@ -1722,7 +1724,7 @@
 	if (mpo.contains(tx) || mpo.contains(tx2))
 	{
 		if (Doc->appMode == modeRotation)
-			setCursor(QCursor(loadIcon("Rotieren2.png")));
+			setCursor(IconManager::instance()->loadCursor("Rotieren2.png"));
 		else if (!currItem->sizeHLocked() && ! currItem->sizeVLocked())
 		{
 			double rr = fabs(currItem->rotation());

Modified: trunk/Scribus/scribus/scribuswin.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20185&path=/trunk/Scribus/scribus/scribuswin.cpp
==============================================================================
--- trunk/Scribus/scribus/scribuswin.cpp (original)
+++ trunk/Scribus/scribus/scribuswin.cpp Sun Jun 21 21:46:55 2015
@@ -27,11 +27,12 @@
 #include <QDir>
 #include <QMessageBox>
 
+#include "commonstrings.h"
+#include "iconmanager.h"
 #include "scribus.h"
 #include "scribusdoc.h"
 #include "scribusview.h"
-#include "commonstrings.h"
-#include "util_icon.h"
+
 
 ScribusWin::ScribusWin(QWidget* parent, ScribusDoc* doc) :
 	QMainWindow(parent),
@@ -40,7 +41,7 @@
 	m_View(0),
 	m_winIndex(0)
 {
-	setWindowIcon(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=20185&path=/trunk/Scribus/scribus/ui/about.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/about.cpp (original)
+++ trunk/Scribus/scribus/ui/about.cpp Sun Jun 21 21:46:55 2015
@@ -37,7 +37,7 @@
 	#include "svnversion.h"
 #endif
 #include "util_ghostscript.h"
-#include "util_icon.h"
+#include "iconmanager.h"
 #include "upgradechecker.h"
 #include "langmgr.h"
 
@@ -96,7 +96,7 @@
 	m_mode = diaMode;
 	m_firstShow = true;
 	setWindowTitle( tr("About Scribus %1").arg(VERSION) );
-	setWindowIcon(loadIcon("AppIcon.png", true));
+	setWindowIcon(IconManager::instance()->loadIcon("AppIcon.png", true));
 	setModal(true);
 	aboutLayout = new QVBoxLayout( this );
 	aboutLayout->setSpacing( 6 );
@@ -108,7 +108,7 @@
 	tabLayout1->setSpacing( 6 );
 	tabLayout1->setMargin( 15 );
 	pixmapLabel1 = new QLabel( tab );
-	pixmapLabel1->setPixmap(loadIcon("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=20185&path=/trunk/Scribus/scribus/ui/adjustcmsdialog.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/adjustcmsdialog.cpp (original)
+++ trunk/Scribus/scribus/ui/adjustcmsdialog.cpp Sun Jun 21 21:46:55 2015
@@ -9,12 +9,12 @@
 #include "commonstrings.h"
 #include "scribuscore.h"
 #include "scribusdoc.h"
-#include "util_icon.h"
+#include "iconmanager.h"
 
 AdjustCmsDialog::AdjustCmsDialog( QWidget* parent, ScribusDoc* doc ) : QDialog( parent )
 {
 	setWindowTitle( tr("CMS Settings") );
-	setWindowIcon(loadIcon("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=20185&path=/trunk/Scribus/scribus/ui/aligndistribute.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/aligndistribute.cpp (original)
+++ trunk/Scribus/scribus/ui/aligndistribute.cpp Sun Jun 21 21:46:55 2015
@@ -36,16 +36,14 @@
 #include <QVariant>
 
 #include "commonstrings.h"
-
-
+#include "iconmanager.h"
+#include "scpage.h"
 #include "scribusdoc.h"
+#include "scribusstructs.h"
 #include "selection.h"
+#include "ui/scrspinbox.h"
 #include "undomanager.h"
-#include "scpage.h"
-#include "scribusstructs.h"
 #include "units.h"
-#include "util_icon.h"
-#include "ui/scrspinbox.h"
 
 //TODO Distribute with 
 
@@ -181,38 +179,38 @@
 void AlignDistributePalette::init()
 {
 	undoManager = UndoManager::instance();
-
-	alignLeftOutToolButton->setIcon(QIcon(loadIcon("22/align-horizontal-left-out.png")));
-	alignLeftInToolButton->setIcon(QIcon(loadIcon("22/align-horizontal-left.png")));
-	alignCenterHorToolButton->setIcon(QIcon(loadIcon("22/align-horizontal-center.png")));
-	alignRightInToolButton->setIcon(QIcon(loadIcon("22/align-horizontal-right.png")));
-	alignRightOutToolButton->setIcon(QIcon(loadIcon("22/align-horizontal-right-out.png")));
-
-	alignTopOutToolButton->setIcon(QIcon(loadIcon("22/align-vertical-top-out.png")));
-	alignTopInToolButton->setIcon(QIcon(loadIcon("22/align-vertical-top.png")));
-	alignCenterVerToolButton->setIcon(QIcon(loadIcon("22/align-vertical-center.png")));
-	alignBottomInToolButton->setIcon(QIcon(loadIcon("22/align-vertical-bottom.png")));
-	alignBottomOutToolButton->setIcon(QIcon(loadIcon("22/align-vertical-bottom-out.png")));
-
-	distributeLeftToolButton->setIcon(QIcon(loadIcon("22/distribute-horizontal-left.png")));
-	distributeCenterHToolButton->setIcon(QIcon(loadIcon("22/distribute-horizontal-center.png")));
-	distributeRightToolButton->setIcon(QIcon(loadIcon("22/distribute-horizontal-right.png")));
-	distributeDistHToolButton->setIcon(QIcon(loadIcon("22/distribute-horizontal-equal.png")));
-
-	distributeBottomToolButton->setIcon(QIcon(loadIcon("22/distribute-vertical-bottom.png")));
-	distributeCenterVToolButton->setIcon(QIcon(loadIcon("22/distribute-vertical-center.png")));
-	distributeTopToolButton->setIcon(QIcon(loadIcon("22/distribute-vertical-top.png")));
-	distributeDistVToolButton->setIcon(QIcon(loadIcon("22/distribute-vertical-equal.png")));
-
-	distributeAcrossPageToolButton->setIcon(QIcon(loadIcon("22/distribute-horizontal-page.png")));
-	distributeDownPageToolButton->setIcon(QIcon(loadIcon("22/distribute-vertical-page.png")));
-	distributeAcrossMarginsToolButton->setIcon(QIcon(loadIcon("22/distribute-horizontal-margin.png")));
-	distributeDownMarginsToolButton->setIcon(QIcon(loadIcon("22/distribute-vertical-margin.png")));
-	distributeDistValueHToolButton->setIcon(QIcon(loadIcon("22/distribute-horizontal-x.png")));
-	distributeDistValueVToolButton->setIcon(QIcon(loadIcon("22/distribute-vertical-y.png")));
-
-	swapLeftToolButton->setIcon(QIcon(loadIcon("22/swap-left.png")));
-	swapRightToolButton->setIcon(QIcon(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"));
 
 	connect(alignLeftOutToolButton, SIGNAL(clicked()), this, SLOT(alignLeftOut()));
 	connect(alignRightOutToolButton, SIGNAL(clicked()), this, SLOT(alignRightOut()));

Modified: trunk/Scribus/scribus/ui/alignselect.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20185&path=/trunk/Scribus/scribus/ui/alignselect.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/alignselect.cpp (original)
+++ trunk/Scribus/scribus/ui/alignselect.cpp Sun Jun 21 21:46:55 2015
@@ -9,10 +9,11 @@
 #include <QEvent>
 #include <QPixmap>
 #include <QToolTip>
-#include "util_icon.h"
+#include "iconmanager.h"
 
 AlignSelect::AlignSelect(QWidget* parent) : QWidget(parent)
 {
+	IconManager* im=IconManager::instance();
 	buttonGroup = new QButtonGroup(this);
 
 	GroupAlignLayout = new QHBoxLayout( this );
@@ -21,7 +22,7 @@
 
 	TextL = new QToolButton( this );
 	TextL->setMaximumSize( QSize( 22, 22 ) );
-	TextL->setIcon(QIcon(loadIcon("16/format-justify-left.png")));
+	TextL->setIcon(im->loadIcon("16/format-justify-left.png"));
 	TextL->setCheckable( true );
 	TextL->setChecked( true );
 	GroupAlignLayout->addWidget( TextL );
@@ -29,28 +30,28 @@
 
 	TextC = new QToolButton( this );
 	TextC->setMaximumSize( QSize( 22, 22 ) );
-	TextC->setIcon(QIcon(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(QIcon(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(QIcon(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(QIcon(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);

Modified: trunk/Scribus/scribus/ui/annot.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20185&path=/trunk/Scribus/scribus/ui/annot.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/annot.cpp (original)
+++ trunk/Scribus/scribus/ui/annot.cpp Sun Jun 21 21:46:55 2015
@@ -36,6 +36,7 @@
 #include "colorlistbox.h"
 #include "commonstrings.h"
 #include "editor.h"
+#include "iconmanager.h"
 #include "navigator.h"
 #include "pageitem.h"
 #include "prefscontext.h"
@@ -49,9 +50,8 @@
 #include "selfield.h"
 #include "ui/customfdialog.h"
 #include "ui/propertiespalette_utils.h"
+#include "util.h"
 #include "util_formats.h"
-#include "util_icon.h"
-#include "util.h"
 
 ScAnnot::ScAnnot(QWidget* parent, PageItem *it, int Seite, int b, int h, ColorList Farben, ScribusView* vie)
 		: QDialog( parent )
@@ -59,7 +59,7 @@
 	ScribusDoc* doc = Farben.document();
 	setModal(true);
 	setWindowTitle( tr( "Field Properties" ) );
-	setWindowIcon(QIcon(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=20185&path=/trunk/Scribus/scribus/ui/applytemplatedialog.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/applytemplatedialog.cpp (original)
+++ trunk/Scribus/scribus/ui/applytemplatedialog.cpp Sun Jun 21 21:46:55 2015
@@ -30,7 +30,7 @@
 #include "commonstrings.h"
 #include "scpage.h"
 #include "scribusdoc.h"
-#include "util_icon.h"
+#include "iconmanager.h"
 
 enum {
     CurrentPage,
@@ -50,7 +50,7 @@
 {
 	setModal(true);
 	setWindowTitle( tr( "Possible Hyphenation" ));
-	setWindowIcon(QIcon(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=20185&path=/trunk/Scribus/scribus/ui/autoformbuttongroup.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/autoformbuttongroup.cpp (original)
+++ trunk/Scribus/scribus/ui/autoformbuttongroup.cpp Sun Jun 21 21:46:55 2015
@@ -13,7 +13,7 @@
 #include "autoformbuttongroup.h"
 #include "fpointarray.h"
 #include "scpainter.h"
-#include "util_icon.h"
+#include "iconmanager.h"
 
 AutoformButtonGroup::AutoformButtonGroup( QWidget* parent ) : QMenu( parent )
 {
@@ -681,44 +681,45 @@
 		if (nr<18)
 		{
 			QString strSize=QString("%1").arg(pixmapSize);
+			IconManager* im=IconManager::instance();
 			switch(nr)
 			{
 				case 0:
-					return loadIcon(strSize+"/draw-rectangle.png");
+					return im->loadPixmap(strSize+"/draw-rectangle.png");
 				case 1:
-					return loadIcon(strSize+"/draw-ellipse.png");
+					return im->loadPixmap(strSize+"/draw-ellipse.png");
 				case 2:
-					return loadIcon(strSize+"/draw-triangle.png");
+					return im->loadPixmap(strSize+"/draw-triangle.png");
 				case 3:
-					return loadIcon(strSize+"/draw-cross.png");
+					return im->loadPixmap(strSize+"/draw-cross.png");
 				case 4:
-					return loadIcon(strSize+"/draw-arrow-back.png");
+					return im->loadPixmap(strSize+"/draw-arrow-back.png");
 				case 5:
-					return loadIcon(strSize+"/draw-arrow-forward.png");
+					return im->loadPixmap(strSize+"/draw-arrow-forward.png");
 				case 6:
-					return loadIcon(strSize+"/draw-arrow-up.png");
+					return im->loadPixmap(strSize+"/draw-arrow-up.png");
 				case 7:
-					return loadIcon(strSize+"/draw-arrow-down.png");
+					return im->loadPixmap(strSize+"/draw-arrow-down.png");
 				case 8:
-					return loadIcon(strSize+"/draw-halfcircle1.png");
+					return im->loadPixmap(strSize+"/draw-halfcircle1.png");
 				case 9:
-					return loadIcon(strSize+"/draw-halfcircle2.png");
+					return im->loadPixmap(strSize+"/draw-halfcircle2.png");
 				case 10:
-					return loadIcon(strSize+"/draw-halfcircle3.png");
+					return im->loadPixmap(strSize+"/draw-halfcircle3.png");
 				case 11:
-					return loadIcon(strSize+"/draw-halfcircle4.png");
+					return im->loadPixmap(strSize+"/draw-halfcircle4.png");
 				case 12:
-					return loadIcon(strSize+"/draw-triangle1.png");
+					return im->loadPixmap(strSize+"/draw-triangle1.png");
 				case 13:
-					return loadIcon(strSize+"/draw-triangle2.png");
+					return im->loadPixmap(strSize+"/draw-triangle2.png");
 				case 14:
-					return loadIcon(strSize+"/draw-triangle3.png");
+					return im->loadPixmap(strSize+"/draw-triangle3.png");
 				case 15:
-					return loadIcon(strSize+"/draw-triangle4.png");
+					return im->loadPixmap(strSize+"/draw-triangle4.png");
 				case 16:
-					return loadIcon(strSize+"/draw-square-inverted-corners.png");
+					return im->loadPixmap(strSize+"/draw-square-inverted-corners.png");
 				case 17:
-					return loadIcon(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=20185&path=/trunk/Scribus/scribus/ui/buttonicon.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/buttonicon.cpp (original)
+++ trunk/Scribus/scribus/ui/buttonicon.cpp Sun Jun 21 21:46:55 2015
@@ -20,14 +20,14 @@
 #include "scfonts.h"
 #include "scribusstructs.h"
 #include "pageitem.h"
-#include "util_icon.h"
+#include "iconmanager.h"
 
 ButtonIcon::ButtonIcon(QWidget* parent, PageItem* ite) : QDialog( parent )
 {
 	Item = ite;
 	setModal(true);
 	setWindowTitle( tr( "Icon Placement" ) );
-	setWindowIcon(loadIcon("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=20185&path=/trunk/Scribus/scribus/ui/charselect.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/charselect.cpp (original)
+++ trunk/Scribus/scribus/ui/charselect.cpp Sun Jun 21 21:46:55 2015
@@ -20,7 +20,7 @@
 #include "scribusview.h"
 #include "ui/scmessagebox.h"
 #include "util.h"
-#include "util_icon.h"
+#include "iconmanager.h"
 
 
 
@@ -30,11 +30,11 @@
 
 	paletteFileMask = tr("Scribus Char Palette (*.ucp);;All Files (*)");
 
-	hideButton->setIcon(loadIcon("22/insert-table.png"));
-	unicodeButton->setIcon(loadIcon("find.png"));
-	uniLoadButton->setIcon(loadIcon("22/document-open.png"));
-	uniSaveButton->setIcon(loadIcon("22/document-save.png"));
-	uniClearButton->setIcon(loadIcon("22/document-new.png"));
+	hideButton->setIcon(IconManager::instance()->loadIcon("22/insert-table.png"));
+	unicodeButton->setIcon(IconManager::instance()->loadIcon("find.png"));
+	uniLoadButton->setIcon(IconManager::instance()->loadIcon("22/document-open.png"));
+	uniSaveButton->setIcon(IconManager::instance()->loadIcon("22/document-save.png"));
+	uniClearButton->setIcon(IconManager::instance()->loadIcon("22/document-new.png"));
 
 	m_userTableModel = new CharTableModel(this, 6, m_doc, PrefsManager::instance()->appPrefs.itemToolPrefs.textFont);
 	loadUserContent(ScPaths::getApplicationDataDir() + "charpalette.ucp");

Modified: trunk/Scribus/scribus/ui/checkDocument.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20185&path=/trunk/Scribus/scribus/ui/checkDocument.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/checkDocument.cpp (original)
+++ trunk/Scribus/scribus/ui/checkDocument.cpp Sun Jun 21 21:46:55 2015
@@ -25,7 +25,7 @@
 #include "scpage.h"
 #include "scribuscore.h"
 #include "scribusdoc.h"
-#include "util_icon.h"
+#include "iconmanager.h"
 #include "util.h"
 
 
@@ -46,9 +46,9 @@
 	showPagesWithoutErrors=PrefsManager::instance()->appPrefs.verifierPrefs.showPagesWithoutErrors;
 	showNonPrintingLayerErrors=PrefsManager::instance()->appPrefs.verifierPrefs.showNonPrintingLayerErrors;
 
-	graveError = loadIcon("22/dialog-error.png");
-	onlyWarning = loadIcon("22/dialog-warning.png");
-	noErrors = loadIcon("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=20185&path=/trunk/Scribus/scribus/ui/cmykfw.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/cmykfw.cpp (original)
+++ trunk/Scribus/scribus/ui/cmykfw.cpp Sun Jun 21 21:46:55 2015
@@ -47,7 +47,7 @@
 #include "util.h"
 #include "util_color.h"
 #include "util_formats.h"
-#include "util_icon.h"
+#include "iconmanager.h"
 
 
 CMYKChoose::CMYKChoose( QWidget* parent, ScribusDoc* doc, ScColor orig, QString name, ColorList *Colors, bool newCol  )
@@ -61,7 +61,7 @@
 	isHLC = false;
 	EColors = Colors;
 	CurrSwatch.clear();
-	alertIcon = loadIcon("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) )
@@ -74,7 +74,7 @@
 
 	resize( 498, 306 );
 	setWindowTitle( tr( "Edit Color" ) );
-	setWindowIcon(QIcon(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=20185&path=/trunk/Scribus/scribus/ui/colorchart.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/colorchart.cpp (original)
+++ trunk/Scribus/scribus/ui/colorchart.cpp Sun Jun 21 21:46:55 2015
@@ -24,7 +24,7 @@
 #include "colorchart.h"
 #include <QPainter>
 #include "util_color.h"
-#include "util_icon.h"
+#include "iconmanager.h"
 #include "sccolorengine.h"
 #include "scribuscore.h"
 #include "scribusdoc.h"
@@ -164,7 +164,7 @@
 		if (doSoftProofing && doGamutCheck)
 		{
 			QPainter p;
-			QBrush b(QColor(205,205,205), loadIcon("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=20185&path=/trunk/Scribus/scribus/ui/colorlistbox.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/colorlistbox.cpp (original)
+++ trunk/Scribus/scribus/ui/colorlistbox.cpp Sun Jun 21 21:46:55 2015
@@ -20,7 +20,7 @@
 #include "scconfig.h"
 #include "scribusdoc.h"
 #include "util_color.h"
-#include "util_icon.h"
+#include "iconmanager.h"
 
 
 
@@ -125,12 +125,12 @@
 
 	if ( !iconsInitialized )
 	{
-		alertIcon = loadIcon("alert.png", true);
-		cmykIcon = loadIcon("cmyk.png", true);
-		rgbIcon = loadIcon("rgb.png", true);
-		labIcon = loadIcon("lab.png", true);
-		spotIcon = loadIcon("spot.png", true);
-		regIcon = loadIcon("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/cpalette.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20185&path=/trunk/Scribus/scribus/ui/cpalette.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/cpalette.cpp (original)
+++ trunk/Scribus/scribus/ui/cpalette.cpp Sun Jun 21 21:46:55 2015
@@ -46,23 +46,23 @@
 
 #include "colorlistbox.h"
 #include "commonstrings.h"
-#include "sccombobox.h"
-#include "scribusdoc.h"
-#include "scrspinbox.h"
 #include "gradienteditor.h"
+#include "iconmanager.h"
 #include "insertTable.h"
 #include "pageitem.h"
 #include "sccolorengine.h"
+#include "sccombobox.h"
 #include "sclistwidgetdelegate.h"
 #include "scpage.h"
 #include "scpainter.h"
 #include "scpattern.h"
 #include "scribus.h"
+#include "scribusdoc.h"
 #include "scribusview.h"
+#include "scrspinbox.h"
 #include "selection.h"
 #include "undomanager.h"
 #include "units.h"
-#include "util_icon.h"
 #include "util.h"
 #include "util_math.h"
 
@@ -701,7 +701,7 @@
 		VGradient gr = gradientList->value(patK[a]);
 		QImage pixm(48, 12, QImage::Format_ARGB32_Premultiplied);
 		QPainter pb;
-		QBrush b(QColor(205,205,205), loadIcon("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=20185&path=/trunk/Scribus/scribus/ui/cupsoptions.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/cupsoptions.cpp (original)
+++ trunk/Scribus/scribus/ui/cupsoptions.cpp Sun Jun 21 21:46:55 2015
@@ -44,14 +44,14 @@
 #include <cups/cups.h>
 #include <cups/ppd.h>
 #endif
-#include "util_icon.h"
+#include "iconmanager.h"
 
 CupsOptions::CupsOptions(QWidget* parent, QString Geraet) : QDialog( parent )
 {
 	FlagsOpt.clear();
 	setModal(true);
 	setWindowTitle( tr( "Printer Options" ) );
-	setWindowIcon(QIcon(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=20185&path=/trunk/Scribus/scribus/ui/curvewidget.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/curvewidget.cpp (original)
+++ trunk/Scribus/scribus/ui/curvewidget.cpp Sun Jun 21 21:46:55 2015
@@ -23,14 +23,15 @@
 
 
 #include "commonstrings.h"
-#include "ui/customfdialog.h"
+#include "iconmanager.h"
 #include "prefsfile.h"
 #include "prefsmanager.h"
 #include "scclocale.h"
+#include "ui/customfdialog.h"
 #include "ui/scmessagebox.h"
 #include "util.h"
 #include "util_color.h"
-#include "util_icon.h"
+
 
 
 KCurve::KCurve(QWidget *parent) : QWidget(parent)
@@ -325,19 +326,19 @@
 
 	invertButton = new QPushButton( this );
 	invertButton->setSizePolicy(QSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed));
-	invertButton->setIcon( 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( 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(loadIcon("curvebezier.png"), QIcon::Normal, QIcon::Off);
-	ic.addPixmap(loadIcon("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);
@@ -348,13 +349,13 @@
 	layout1->addItem( spacer1 );
 
 	loadButton = new QPushButton( this );
-	loadButton->setIcon( 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( 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=20185&path=/trunk/Scribus/scribus/ui/customfdialog.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/customfdialog.cpp (original)
+++ trunk/Scribus/scribus/ui/customfdialog.cpp Sun Jun 21 21:46:55 2015
@@ -40,23 +40,24 @@
 
 #include "customfdialog.h"
 
-#include "fileloader.h"
-#include "loadsaveplugin.h"
 #include "../plugins/formatidlist.h"
-#include "prefsmanager.h"
-#include "scfilewidget.h"
 #include "cmsettings.h"
 #include "commonstrings.h"
+#include "fileloader.h"
+#include "iconmanager.h"
+#include "loadsaveplugin.h"
+#include "prefsmanager.h"
 #include "sccombobox.h"
+#include "scfilewidget.h"
 #include "scimage.h"
+#include "scpreview.h"
 #include "scribusstructs.h"
 #include "scslainforeader.h"
-#include "scpreview.h"
 #include "units.h"
 #include "util.h"
 #include "util_color.h"
 #include "util_formats.h"
-#include "util_icon.h"
+
 
 
 
@@ -69,14 +70,15 @@
 	size_t array = sizeof(tmp) / sizeof(*tmp);
 	for (uint a = 0; a < array; ++a)
 		fmts.append(tmp[a]);
-	imagepm = QIcon(loadIcon("16/image-x-generic.png"));
-	pspm = QIcon(loadIcon("postscript.png"));
-	txtpm = QIcon(loadIcon("txt.png"));
-	docpm = QIcon(loadIcon("doc.png"));
-	pdfpm = QIcon(loadIcon("pdf.png"));
-	oosxdpm = QIcon(loadIcon("ooo_draw.png"));
-	oosxwpm = QIcon(loadIcon("ooo_writer.png"));
-	vectorpm = QIcon(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
@@ -178,7 +180,7 @@
 			QString tmp2 = "";
 			QImage im2 = im.scaled(w - 5, h - 44, Qt::KeepAspectRatio, Qt::SmoothTransformation);
 			QPainter p;
-			QBrush b(QColor(205,205,205), loadIcon("testfill.png"));
+			QBrush b(QColor(205,205,205), IconManager::instance()->loadPixmap("testfill.png"));
 			// Qt4 FIXME imho should be better
 			pm = *pixmap();
 			p.begin(&pm);
@@ -218,7 +220,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), loadIcon("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);
@@ -246,7 +248,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), loadIcon("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);
@@ -295,7 +297,7 @@
 {
 	setModal(true);
 	setWindowTitle(caption);
-	setWindowIcon(QIcon(loadIcon("AppIcon.png")));
+	setWindowIcon(IconManager::instance()->loadIcon("AppIcon.png"));
 	vboxLayout = new QVBoxLayout(this);
 	vboxLayout->setSpacing(5);
 	vboxLayout->setMargin(10);

Modified: trunk/Scribus/scribus/ui/dasheditor.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20185&path=/trunk/Scribus/scribus/ui/dasheditor.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/dasheditor.cpp (original)
+++ trunk/Scribus/scribus/ui/dasheditor.cpp Sun Jun 21 21:46:55 2015
@@ -35,7 +35,7 @@
 
 #include "scpainter.h"
 #include "fpoint.h"
-#include "util_icon.h"
+#include "iconmanager.h"
 
 DashPreview::DashPreview(QWidget *pa) : QFrame(pa)
 {
@@ -200,7 +200,7 @@
 	QRect fpo;
 	if ((!Mpressed) && (m->y() < height()) && (m->y() > 16) && (m->x() > 9) && (m->x() < width()-9) && (DashValues.count() < 10))
 	{
-		setCursor(QCursor(loadIcon("AddPoint.png"), 1, 1));
+		setCursor(QCursor(IconManager::instance()->loadPixmap("AddPoint.png"), 1, 1));
 		for (int yg = 0; yg < StopM.count(); ++yg)
 		{
 			fpo = QRect(static_cast<int>(StopM[yg])+6, 16, 8, 13);
@@ -243,7 +243,7 @@
 		emit currStep(StopM[ActStop] / 10.0 - startX);
 	}
 	if ((Mpressed) && (outside || m->y() > 30) && (ActStop >= 0) && (StopM.count() > 2))
-		qApp->changeOverrideCursor(QCursor(loadIcon("DelPoint.png"), 1, 1));
+		qApp->changeOverrideCursor(QCursor(IconManager::instance()->loadPixmap("DelPoint.png"), 1, 1));
 }
 
 void DashPreview::leaveEvent(QEvent*)
@@ -251,7 +251,7 @@
 	if (Mpressed)
 	{
 		if ((ActStop >= 0) && (StopM.count() > 2))
-			qApp->changeOverrideCursor(QCursor(loadIcon("DelPoint.png"), 1, 1));
+			qApp->changeOverrideCursor(QCursor(IconManager::instance()->loadPixmap("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=20185&path=/trunk/Scribus/scribus/ui/dcolor.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/dcolor.cpp (original)
+++ trunk/Scribus/scribus/ui/dcolor.cpp Sun Jun 21 21:46:55 2015
@@ -13,20 +13,20 @@
 #include <QSpacerItem>
 #include <QPushButton>
 
+#include "colorcombo.h"
 #include "commonstrings.h"
-#include "colorcombo.h"
 #include "dcolor.h"
+#include "iconmanager.h"
 #include "prefsmanager.h"
 #include "scpage.h"
 #include "scribusdoc.h"
-#include "util_icon.h"
 
 DelColor::DelColor( QWidget* parent, ColorList colorList, QString colorName, bool haveDoc) : QDialog( parent )
 {
 	setModal(true);
 	cList = colorList;
 	setWindowTitle( tr( "Delete Color" ) );
-	setWindowIcon(QIcon(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=20185&path=/trunk/Scribus/scribus/ui/delpages.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/delpages.cpp (original)
+++ trunk/Scribus/scribus/ui/delpages.cpp Sun Jun 21 21:46:55 2015
@@ -8,7 +8,7 @@
 #include <QPushButton>
 
 #include "delpages.h"
-#include "util_icon.h"
+#include "iconmanager.h"
 #include "commonstrings.h"
 #include "ui/scrspinbox.h"
 
@@ -16,7 +16,7 @@
 {
 	setWindowTitle( tr( "Delete Pages" ) );
 	setModal(true);
-	setWindowIcon(loadIcon("AppIcon.png"));
+	setWindowIcon(IconManager::instance()->loadIcon("AppIcon.png"));
 	dialogLayout = new QVBoxLayout( this );
 	dialogLayout->setSpacing( 5 );
 	dialogLayout->setMargin( 10 );

Modified: trunk/Scribus/scribus/ui/editor.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20185&path=/trunk/Scribus/scribus/ui/editor.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/editor.cpp (original)
+++ trunk/Scribus/scribus/ui/editor.cpp Sun Jun 21 21:46:55 2015
@@ -26,21 +26,22 @@
 	#include <QVBoxLayout>
 #endif
 
-#include "util_icon.h"
+#include "iconmanager.h"
 
 Editor::Editor( QWidget* parent, QString daten, ScribusView* vie) : QDialog( parent )
 {
 	setModal(true);
-	setWindowTitle( tr( "Editor" ) );
-	setWindowIcon(loadIcon("AppIcon.png"));
+	setWindowTitle(tr("Editor"));
+	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(QIcon(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(QIcon(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()));
@@ -48,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(QIcon(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(QIcon(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(QIcon(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(QIcon(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(QIcon(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(QIcon(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=20185&path=/trunk/Scribus/scribus/ui/effectsdialog.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/effectsdialog.cpp (original)
+++ trunk/Scribus/scribus/ui/effectsdialog.cpp Sun Jun 21 21:46:55 2015
@@ -27,23 +27,24 @@
 #include "cmsettings.h"
 #include "colorcombo.h"
 #include "curvewidget.h"
+#include "iconmanager.h"
+#include "scclocale.h"
 #include "sccombobox.h"
-#include "scclocale.h"
 #include "scpage.h"
 #include "scribusdoc.h"
 #include "scrspinbox.h"
 #include "sctextstream.h"
 #include "shadebutton.h"
+#include "util.h"
 #include "util_color.h"
-#include "util_icon.h"
-#include "util.h"
+
 
 
 EffectsDialog::EffectsDialog( QWidget* parent, PageItem* item, ScribusDoc* docc ) : QDialog( parent )
 {
 	setModal(true);
 	setWindowTitle( tr( "Image Effects" ) );
-	setWindowIcon(QIcon(loadIcon ( "AppIcon.png" )));
+	setWindowIcon(IconManager::instance()->loadIcon("AppIcon.png"));
 	m_item = item;
 	effectsList = m_item->effectsInUse;
 	m_doc = docc;
@@ -254,7 +255,7 @@
 	CurveD1Button = new QToolButton( WStackPage_8 );
 	CurveD1Button->setText( "" );
 	CurveD1Button->setMaximumSize( QSize( 22, 22 ) );
-	CurveD1Button->setIcon(loadIcon("curve.png"));
+	CurveD1Button->setIcon(IconManager::instance()->loadIcon("curve.png"));
 	CurveD1Button->setMenu(CurveD1Pop);
 	CurveD1Button->setPopupMode(QToolButton::InstantPopup);
 	WStackPage8Layout->addWidget( CurveD1Button, 1, 2 );
@@ -275,7 +276,7 @@
 	CurveD2Button = new QToolButton( WStackPage_8 );
 	CurveD2Button->setText( "" );
 	CurveD2Button->setMaximumSize( QSize( 22, 22 ) );
-	CurveD2Button->setIcon(loadIcon("curve.png"));
+	CurveD2Button->setIcon(IconManager::instance()->loadIcon("curve.png"));
 	CurveD2Button->setMenu(CurveD2Pop);
 	CurveD2Button->setPopupMode(QToolButton::InstantPopup);
 	WStackPage8Layout->addWidget( CurveD2Button, 3, 2 );
@@ -304,7 +305,7 @@
 	CurveT1Button = new QToolButton( WStackPage_9 );
 	CurveT1Button->setText( "" );
 	CurveT1Button->setMaximumSize( QSize( 22, 22 ) );
-	CurveT1Button->setIcon(loadIcon("curve.png"));
+	CurveT1Button->setIcon(IconManager::instance()->loadIcon("curve.png"));
 	CurveT1Button->setMenu(CurveT1Pop);
 	CurveT1Button->setPopupMode(QToolButton::InstantPopup);
 	WStackPage9Layout->addWidget( CurveT1Button, 1, 2 );
@@ -324,7 +325,7 @@
 	CurveT2Button = new QToolButton( WStackPage_9 );
 	CurveT2Button->setText( "" );
 	CurveT2Button->setMaximumSize( QSize( 22, 22 ) );
-	CurveT2Button->setIcon(loadIcon("curve.png"));
+	CurveT2Button->setIcon(IconManager::instance()->loadIcon("curve.png"));
 	CurveT2Button->setMenu(CurveT2Pop);
 	CurveT2Button->setPopupMode(QToolButton::InstantPopup);
 	WStackPage9Layout->addWidget( CurveT2Button, 3, 2 );
@@ -344,7 +345,7 @@
 	CurveT3Button = new QToolButton( WStackPage_9 );
 	CurveT3Button->setText( "" );
 	CurveT3Button->setMaximumSize( QSize( 22, 22 ) );
-	CurveT3Button->setIcon(loadIcon("curve.png"));
+	CurveT3Button->setIcon(IconManager::instance()->loadIcon("curve.png"));
 	CurveT3Button->setMenu(CurveT3Pop);
 	CurveT3Button->setPopupMode(QToolButton::InstantPopup);
 	WStackPage9Layout->addWidget( CurveT3Button, 5, 2 );
@@ -370,7 +371,7 @@
 	CurveQ1Button = new QToolButton( WStackPage_10 );
 	CurveQ1Button->setText( "" );
 	CurveQ1Button->setMaximumSize( QSize( 22, 22 ) );
-	CurveQ1Button->setIcon(loadIcon("curve.png"));
+	CurveQ1Button->setIcon(IconManager::instance()->loadIcon("curve.png"));
 	CurveQ1Button->setMenu(CurveQ1Pop);
 	CurveQ1Button->setPopupMode(QToolButton::InstantPopup);
 	WStackPage10Layout->addWidget( CurveQ1Button, 1, 2 );
@@ -390,7 +391,7 @@
 	CurveQ2Button = new QToolButton( WStackPage_10 );
 	CurveQ2Button->setText( "" );
 	CurveQ2Button->setMaximumSize( QSize( 22, 22 ) );
-	CurveQ2Button->setIcon(loadIcon("curve.png"));
+	CurveQ2Button->setIcon(IconManager::instance()->loadIcon("curve.png"));
 	CurveQ2Button->setMenu(CurveQ2Pop);
 	CurveQ2Button->setPopupMode(QToolButton::InstantPopup);
 	WStackPage10Layout->addWidget( CurveQ2Button, 3, 2 );
@@ -410,7 +411,7 @@
 	CurveQc3Button = new QToolButton( WStackPage_10 );
 	CurveQc3Button->setText( "" );
 	CurveQc3Button->setMaximumSize( QSize( 22, 22 ) );
-	CurveQc3Button->setIcon(loadIcon("curve.png"));
+	CurveQc3Button->setIcon(IconManager::instance()->loadIcon("curve.png"));
 	CurveQc3Button->setMenu(CurveQc3Pop);
 	CurveQc3Button->setPopupMode(QToolButton::InstantPopup);
 	WStackPage10Layout->addWidget( CurveQc3Button, 5, 2 );
@@ -430,7 +431,7 @@
 	CurveQ4Button = new QToolButton( WStackPage_10 );
 	CurveQ4Button->setText( "" );
 	CurveQ4Button->setMaximumSize( QSize( 22, 22 ) );
-	CurveQ4Button->setIcon(loadIcon("curve.png"));
+	CurveQ4Button->setIcon(IconManager::instance()->loadIcon("curve.png"));
 	CurveQ4Button->setMenu(CurveQ4Pop);
 	CurveQ4Button->setPopupMode(QToolButton::InstantPopup);
 	WStackPage10Layout->addWidget( CurveQ4Button, 7, 2 );
@@ -598,12 +599,12 @@
 	layout7->addItem( spacer4 );
 	effectUp = new QPushButton( this );
 	effectUp->setText( "" );
-	effectUp->setIcon(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(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 );
@@ -638,7 +639,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), loadIcon("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());
@@ -747,7 +748,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), loadIcon("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=20185&path=/trunk/Scribus/scribus/ui/extimageprops.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/extimageprops.cpp (original)
+++ trunk/Scribus/scribus/ui/extimageprops.cpp Sun Jun 21 21:46:55 2015
@@ -28,7 +28,7 @@
 #include "scpainter.h"
 #include "scribusdoc.h"
 #include "scribusview.h"
-#include "util_icon.h"
+#include "iconmanager.h"
 #include "util_math.h"
 #include "util.h"
 #include "ui/scrspinbox.h"
@@ -38,7 +38,7 @@
 {
 	setModal(true);
 	setWindowTitle( tr( "Extended Image Properties" ) );
-	setWindowIcon(QIcon(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(QIcon(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=20185&path=/trunk/Scribus/scribus/ui/fontcombo.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/fontcombo.cpp (original)
+++ trunk/Scribus/scribus/ui/fontcombo.cpp Sun Jun 21 21:46:55 2015
@@ -30,20 +30,20 @@
 #include <QStringList>
 
 #include "fontcombo.h"
+#include "iconmanager.h"
 #include "prefsmanager.h"
 #include "sccombobox.h"
 #include "scpage.h"
 #include "scribusdoc.h"
-#include "util_icon.h"
 #include "util.h"
 
 FontCombo::FontCombo(QWidget* pa) : QComboBox(pa)
 {
 	prefsManager = PrefsManager::instance();
-	ttfFont = loadIcon("font_truetype16.png");
-	otfFont = loadIcon("font_otf16.png");
-	psFont = loadIcon("font_type1_16.png");
-	substFont = loadIcon("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(false);
 	QFont f(font());
 	f.setPointSize(f.pointSize()-1);
@@ -103,10 +103,10 @@
 {
 	currDoc = NULL;
 	prefsManager = PrefsManager::instance();
-	ttfFont = loadIcon("font_truetype16.png");
-	otfFont = loadIcon("font_otf16.png");
-	psFont = loadIcon("font_type1_16.png");
-	substFont = loadIcon("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=20185&path=/trunk/Scribus/scribus/ui/fontreplacedialog.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/fontreplacedialog.cpp (original)
+++ trunk/Scribus/scribus/ui/fontreplacedialog.cpp Sun Jun 21 21:46:55 2015
@@ -18,17 +18,17 @@
 #include <QToolTip>
 #include <QCloseEvent>
 
+#include "commonstrings.h"
 #include "fontcombo.h"
-#include "commonstrings.h"
-#include "util_icon.h"
+#include "iconmanager.h"
+#include "scribusstructs.h"
 #include "util.h"
-#include "scribusstructs.h"
 
 FontReplaceDialog::FontReplaceDialog( QWidget* parent, QMap<QString, QString> *RList) : QDialog( parent )
 {
 	setModal(true);
 	setWindowTitle( tr( "Font Substitution" ) );
-	setWindowIcon(QIcon(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=20185&path=/trunk/Scribus/scribus/ui/gradientpreview.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/gradientpreview.cpp (original)
+++ trunk/Scribus/scribus/ui/gradientpreview.cpp Sun Jun 21 21:46:55 2015
@@ -21,8 +21,6 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "gradientpreview.h"
-
 #include <QApplication>
 #include <QCursor>
 #include <QEvent>
@@ -34,10 +32,10 @@
 #include <QPolygon>
 #include <QToolTip>
 
-
+#include "fpoint.h"
+#include "gradientpreview.h"
+#include "iconmanager.h"
 #include "scpainter.h"
-#include "fpoint.h"
-#include "util_icon.h"
 
 
 GradientPreview::GradientPreview(QWidget *pa) : QFrame(pa)
@@ -83,7 +81,7 @@
 	}
 	QImage pixm(width()-20, 37, QImage::Format_ARGB32_Premultiplied);
 	QPainter pb;
-	QBrush b(QColor(205,205,205), loadIcon("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();
@@ -245,7 +243,7 @@
 		qApp->changeOverrideCursor(QCursor(Qt::ArrowCursor));
 		if ((!Mpressed) && (m->y() < height()) && (m->y() > 43) && (m->x() > 9) && (m->x() < width()-9))
 		{
-			setCursor(QCursor(loadIcon("AddPoint.png"), 1, 1));
+			setCursor(QCursor(IconManager::instance()->loadPixmap("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);
@@ -280,7 +278,7 @@
 				repaint();
 			}
 			if ((Mpressed) && (outside || !insideRect.contains(m->pos())) && (ActStop > 0) && (ActStop != static_cast<int>(StopM.count()-1)))
-				qApp->changeOverrideCursor(QCursor(loadIcon("DelPoint.png"), 1, 1));
+				qApp->changeOverrideCursor(QCursor(IconManager::instance()->loadPixmap("DelPoint.png"), 1, 1));
 		}
 	}
 }
@@ -292,7 +290,7 @@
 		if (Mpressed)
 		{
 			if ((ActStop > 0) && (ActStop != static_cast<int>(StopM.count()-1)))
-				qApp->changeOverrideCursor(QCursor(loadIcon("DelPoint.png"), 1, 1));
+				qApp->changeOverrideCursor(QCursor(IconManager::instance()->loadPixmap("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=20185&path=/trunk/Scribus/scribus/ui/gradientvectordialog.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/gradientvectordialog.cpp (original)
+++ trunk/Scribus/scribus/ui/gradientvectordialog.cpp Sun Jun 21 21:46:55 2015
@@ -23,7 +23,7 @@
 
 #include "gradientvectordialog.h"
 #include "units.h"
-#include "util_icon.h"
+#include "iconmanager.h"
 
 GradientVectorDialog::GradientVectorDialog(QWidget* parent) : ScrPaletteBase( parent, "GradientVectorPalette", false, 0 )
 {
@@ -82,21 +82,22 @@
 	connect(resetAllPControlPoints, SIGNAL(clicked()), this, SIGNAL(resetAllControl()));
 	connect(snapToGrid, SIGNAL(clicked()), this, SLOT(handleSnapToGridBox()));
 	QSize iconSize = QSize(22, 22);
-	editPoints->setIcon(QIcon(loadIcon("MoveNode.png")));
+	IconManager* im=IconManager::instance();
+	editPoints->setIcon(im->loadIcon("MoveNode.png"));
 	editPoints->setIconSize(iconSize);
-	editControlPoints->setIcon(QIcon(loadIcon("MoveKontrol.png")));
+	editControlPoints->setIcon(im->loadIcon("MoveKontrol.png"));
 	editControlPoints->setIconSize(iconSize);
-	resetControlPoint->setIcon(QIcon(loadIcon("Reset1Node.png")));
+	resetControlPoint->setIcon(im->loadIcon("Reset1Node.png"));
 	resetControlPoint->setIconSize(iconSize);
-	resetAllControlPoints->setIcon(QIcon(loadIcon("ResetNode.png")));
+	resetAllControlPoints->setIcon(im->loadIcon("ResetNode.png"));
 	resetAllControlPoints->setIconSize(iconSize);
-	editPPoint->setIcon(QIcon(loadIcon("MoveNode.png")));
+	editPPoint->setIcon(im->loadIcon("MoveNode.png"));
 	editPPoint->setIconSize(iconSize);
-	editPControlPoints->setIcon(QIcon(loadIcon("MoveKontrol.png")));
+	editPControlPoints->setIcon(im->loadIcon("MoveKontrol.png"));
 	editPControlPoints->setIconSize(iconSize);
-	resetPControlPoint->setIcon(QIcon(loadIcon("Reset1Node.png")));
+	resetPControlPoint->setIcon(im->loadIcon("Reset1Node.png"));
 	resetPControlPoint->setIconSize(iconSize);
-	resetAllPControlPoints->setIcon(QIcon(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=20185&path=/trunk/Scribus/scribus/ui/gtdialogs.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/gtdialogs.cpp (original)
+++ trunk/Scribus/scribus/ui/gtdialogs.cpp Sun Jun 21 21:46:55 2015
@@ -24,31 +24,29 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.             *
  ***************************************************************************/
 
+#include "commonstrings.h"
 #include "gtdialogs.h"
-#include "prefsmanager.h"
+#include "iconmanager.h"
 #include "prefscontext.h"
 #include "prefsfile.h"
+#include "prefsmanager.h"
 #include "sccombobox.h"
+#include "ui/gtfiledialog.h"
+#include <QHBoxLayout>
 #include <QLabel>
-//Added by qt3to4:
-#include <QHBoxLayout>
 #include <QPixmap>
+#include <QPushButton>
+#include <QToolTip>
 #include <QVBoxLayout>
-#include <QToolTip>
-#include <QPushButton>
-#include "commonstrings.h"
-#include "util_icon.h"
-#include "ui/gtfiledialog.h"
 
 extern QString DocDir;
 
-
 /********* Class gtImporterDialog*******************************************************************/
 
 gtImporterDialog::gtImporterDialog(const QStringList& importers, int currentSelection)
 {
 	setWindowTitle( tr("Choose the importer to use"));
-	setWindowIcon(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=20185&path=/trunk/Scribus/scribus/ui/helpbrowser.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/helpbrowser.cpp (original)
+++ trunk/Scribus/scribus/ui/helpbrowser.cpp Sun Jun 21 21:46:55 2015
@@ -58,7 +58,7 @@
 #include "prefsmanager.h"
 #include "scribuscore.h"
 #include "util_debug.h"
-#include "util_icon.h"
+#include "iconmanager.h"
 
 /*! \brief XML parsef for documantation history.
 This is small helper class which reads saved bookmarks configuration
@@ -229,7 +229,7 @@
 
 void HelpBrowser::setupLocalUI()
 {
-	setWindowIcon(loadIcon("AppIcon.png"));
+	setWindowIcon(IconManager::instance()->loadIcon("AppIcon.png"));
 	//Add Menus
 	fileMenu=menuBar()->addMenu("");
 	editMenu=menuBar()->addMenu("");
@@ -237,10 +237,10 @@
 	histMenu=new QMenu(this);
 
 	//Add Menu items
-	filePrint=fileMenu->addAction(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(loadIcon("exit.png"), "", this, SLOT(close()), Qt::CTRL+Qt::Key_W);
-	editFind=editMenu->addAction(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);
@@ -248,9 +248,9 @@
 	bookDelAll=bookMenu->addAction( "", this, SLOT(deleteAllBookmarkButton_clicked()));
 
 	//Add Toolbar items
-	goHome=toolBar->addAction(loadIcon("16/go-home.png"), "", textBrowser, SLOT(home()));
-	goBack=toolBar->addAction(loadIcon("16/go-previous.png"), "", textBrowser, SLOT(back()));
-	goFwd=toolBar->addAction(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(back()));
+	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=20185&path=/trunk/Scribus/scribus/ui/hruler.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/hruler.cpp (original)
+++ trunk/Scribus/scribus/ui/hruler.cpp Sun Jun 21 21:46:55 2015
@@ -43,7 +43,7 @@
 #include "selection.h"
 #include "units.h"
 
-#include "util_icon.h"
+#include "iconmanager.h"
 
 
 #ifdef Q_OS_MAC
@@ -332,7 +332,7 @@
 void Hruler::enterEvent(QEvent *e)
 {
 	if (textEditMode)
-		qApp->changeOverrideCursor(QCursor(loadIcon("tab.png"), 3));
+		qApp->changeOverrideCursor(QCursor(IconManager::instance()->loadPixmap("tab.png"), 3));
 }
 
 void Hruler::leaveEvent(QEvent *m)
@@ -446,7 +446,7 @@
 		}
 		if ((!Mpressed) && (m->y() < height()) && (m->y() > 0) && (m->x() > ColStart - 2*m_doc->guidesPrefs().grabRadius) && (m->x() < ColEnd + 2*m_doc->guidesPrefs().grabRadius))
 		{
-			setCursor(QCursor(loadIcon("tab.png"), 3));
+			setCursor(QCursor(IconManager::instance()->loadPixmap("tab.png"), 3));
 			switch(findRulerHandle(m->pos(), m_doc->guidesPrefs().grabRadius))
 			{
 				case rc_leftFrameDist: 
@@ -475,7 +475,7 @@
 		}
 		if ((Mpressed) && (RulerCode == rc_tab) && ((m->y() > height()) || (m->y() < 0)))
 		{
-			setCursor(QCursor(loadIcon("DelPoint.png"), 1, 1));
+			setCursor(QCursor(IconManager::instance()->loadPixmap("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=20185&path=/trunk/Scribus/scribus/ui/hyask.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/hyask.cpp (original)
+++ trunk/Scribus/scribus/ui/hyask.cpp Sun Jun 21 21:46:55 2015
@@ -14,7 +14,7 @@
 #include <QCheckBox>
 #include <QLabel>
 
-#include "util_icon.h"
+#include "iconmanager.h"
 
 WortEdit::WortEdit ( QWidget* parent ) : QLineEdit ( parent )
 {}
@@ -46,7 +46,7 @@
 {
 	setModal(true);
 	setWindowTitle( tr( "Possible Hyphenation" ));
-	setWindowIcon(QIcon(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=20185&path=/trunk/Scribus/scribus/ui/imageinfodialog.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/imageinfodialog.cpp (original)
+++ trunk/Scribus/scribus/ui/imageinfodialog.cpp Sun Jun 21 21:46:55 2015
@@ -15,13 +15,13 @@
 #include <QGroupBox>
 #include <QPushButton>
 #include "commonstrings.h"
-#include "util_icon.h"
+#include "iconmanager.h"
 
 ImageInfoDialog::ImageInfoDialog( QWidget* parent, ImageInfoRecord *info  ) : QDialog( parent )
 {
 	setModal(true);
 	setWindowTitle( tr( "Image Info" ) );
-	setWindowIcon(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=20185&path=/trunk/Scribus/scribus/ui/inlinepalette.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/inlinepalette.cpp (original)
+++ trunk/Scribus/scribus/ui/inlinepalette.cpp Sun Jun 21 21:46:55 2015
@@ -27,13 +27,13 @@
 #include <QMimeData>
 
 #include "appmodes.h"
+#include "iconmanager.h"
 #include "pageitem.h"
 #include "pageitem_table.h"
 #include "pageitem_textframe.h"
+#include "scribus.h"
 #include "scribusdoc.h"
-#include "scribus.h"
 #include "selection.h"
-#include "util_icon.h"
 
 InlineView::InlineView(QWidget* parent) : QListWidget(parent)
 {
@@ -263,7 +263,7 @@
 		pm2.fill(palette().color(QPalette::Base));
 		QPainter p;
 		p.begin(&pm2);
-		QBrush b(QColor(205,205,205), loadIcon("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=20185&path=/trunk/Scribus/scribus/ui/insertTable.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/insertTable.cpp (original)
+++ trunk/Scribus/scribus/ui/insertTable.cpp Sun Jun 21 21:46:55 2015
@@ -7,13 +7,13 @@
 #include "insertTable.h"
 
 #include "commonstrings.h"
-#include "util_icon.h"
+#include "iconmanager.h"
 
 InsertTable::InsertTable( QWidget* parent, int maxRow, int maxCol ) : QDialog( parent )
 
 {
 	setWindowTitle( tr( "Insert Table" ) );
-	setWindowIcon(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=20185&path=/trunk/Scribus/scribus/ui/insertaframe.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/insertaframe.cpp (original)
+++ trunk/Scribus/scribus/ui/insertaframe.cpp Sun Jun 21 21:46:55 2015
@@ -11,21 +11,6 @@
 // Copyright: See COPYING file that comes with this distribution
 //
 //
-
-#include "ui/insertaframe.h"
-
-#include "ui/createrange.h"
-#include "ui/customfdialog.h"
-#include "ui/scrspinbox.h"
-#include "pageitem.h"
-#include "prefsfile.h"
-#include "prefsmanager.h"
-#include "scribusdoc.h"
-#include "units.h"
-#include "util.h"
-#include "util_formats.h"
-#include "util_icon.h"
-#include "scpaths.h"
 
 #include <QCheckBox>
 #include <QGroupBox>
@@ -38,13 +23,29 @@
 #include <QTextEdit>
 #include <QStackedWidget>
 
+
+#include "iconmanager.h"
+#include "pageitem.h"
+#include "prefsfile.h"
+#include "prefsmanager.h"
+#include "scpaths.h"
+#include "scribusdoc.h"
+#include "ui/createrange.h"
+#include "ui/customfdialog.h"
+#include "ui/insertaframe.h"
+#include "ui/scrspinbox.h"
+#include "units.h"
+#include "util.h"
+#include "util_formats.h"
+
+
 InsertAFrame::InsertAFrame(QWidget* parent, ScribusDoc *doc) :
 	QDialog(parent),
 	m_Doc(doc)
 {
 	setupUi(this);
 	
-	placementPagesRangeButton->setIcon(QIcon(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=20185&path=/trunk/Scribus/scribus/ui/inspage.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/inspage.cpp (original)
+++ trunk/Scribus/scribus/ui/inspage.cpp Sun Jun 21 21:46:55 2015
@@ -15,12 +15,12 @@
 #include <QPushButton>
 
 #include "commonstrings.h"
+#include "iconmanager.h"
+#include "pagesize.h"
 #include "scpage.h"
 #include "scribusdoc.h"
 #include "scrspinbox.h"
-#include "pagesize.h"
 #include "units.h"
-#include "util_icon.h"
 #include "util.h"
 
 InsPage::InsPage( QWidget* parent, ScribusDoc* currentDoc, int currentPage, int maxPages)
@@ -29,7 +29,7 @@
 	masterPageCombos.clear();
 	setModal(true);
 	setWindowTitle( tr( "Insert Page" ) );
-	setWindowIcon(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=20185&path=/trunk/Scribus/scribus/ui/javadocs.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/javadocs.cpp (original)
+++ trunk/Scribus/scribus/ui/javadocs.cpp Sun Jun 21 21:46:55 2015
@@ -22,14 +22,14 @@
 #include "scpage.h"
 #include "scribusdoc.h"
 #include "ui/scmessagebox.h"
-#include "util_icon.h"
+#include "iconmanager.h"
 
 
 JavaDocs::JavaDocs(QWidget* parent, ScribusDoc *doc, ScribusView* vie) : QDialog( parent )
 {
 	setModal(true);
 	setWindowTitle( tr( "Edit JavaScripts" ) );
-	setWindowIcon(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=20185&path=/trunk/Scribus/scribus/ui/layers.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/layers.cpp (original)
+++ trunk/Scribus/scribus/ui/layers.cpp Sun Jun 21 21:46:55 2015
@@ -31,12 +31,13 @@
 #include <QToolTip>
 #include <QVBoxLayout>
 
+#include "iconmanager.h"
 #include "sccombobox.h"
-#include "ui/scrspinbox.h"
 #include "scribus.h"
 #include "scribusdoc.h"
+#include "ui/scrspinbox.h"
 #include "undomanager.h"
-#include "util_icon.h"
+
 
 LayerPalette::LayerPalette(QWidget* parent) : ScDockPalette( parent, "Layers", 0 ), m_Doc(0)
 {
@@ -67,14 +68,15 @@
 	layout1->addWidget( opacitySpinBox );
 	LayerPaletteLayout->addLayout( layout1 );
 
+	IconManager* im = IconManager::instance();
 	Table = new QTableWidget(0, 8, this );
 	Table->setHorizontalHeaderItem(0, new QTableWidgetItem(""));
-	Table->setHorizontalHeaderItem(1, new QTableWidgetItem(QIcon(loadIcon("16/show-object.png")), ""));
-	Table->setHorizontalHeaderItem(2, new QTableWidgetItem(QIcon(loadIcon("16/document-print.png")), ""));
-	Table->setHorizontalHeaderItem(3, new QTableWidgetItem(QIcon(loadIcon("16/lock.png")), ""));
-	Table->setHorizontalHeaderItem(4, new QTableWidgetItem(QIcon(loadIcon("16/layer-flow-around.png")), ""));
-	Table->setHorizontalHeaderItem(5, new QTableWidgetItem(QIcon(loadIcon("layer-outline.png")), ""));
-	Table->setHorizontalHeaderItem(6, new QTableWidgetItem(QIcon(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();
@@ -109,35 +111,35 @@
 	newLayerButton->setMinimumSize( QSize( 50, 24 ) );
 	newLayerButton->setMaximumSize( QSize( 50, 24 ) );
 	newLayerButton->setText( "" );
-	newLayerButton->setIcon(QIcon(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(QIcon(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(QIcon(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(QIcon(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(QIcon(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=20185&path=/trunk/Scribus/scribus/ui/linkbutton.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/linkbutton.cpp (original)
+++ trunk/Scribus/scribus/ui/linkbutton.cpp Sun Jun 21 21:46:55 2015
@@ -22,7 +22,7 @@
  ***************************************************************************/
 
 #include "linkbutton.h"
-#include "util_icon.h"
+#include "iconmanager.h"
 #include <QIcon>
 #include <QPixmap>
 
@@ -31,9 +31,9 @@
 {
 	setBackgroundRole(QPalette::Window);
 	QIcon a=QIcon();
-	QPixmap closedPixmap(loadIcon("chain-closed.png"));
+	QPixmap closedPixmap(IconManager::instance()->loadPixmap("chain-closed.png"));
 	a.addPixmap(closedPixmap, QIcon::Normal, QIcon::On);
-	a.addPixmap(loadIcon("chain-open.png"), QIcon::Normal, QIcon::Off);
+	a.addPixmap(IconManager::instance()->loadPixmap("chain-open.png"), 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=20185&path=/trunk/Scribus/scribus/ui/loremipsum.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/loremipsum.cpp (original)
+++ trunk/Scribus/scribus/ui/loremipsum.cpp Sun Jun 21 21:46:55 2015
@@ -35,19 +35,15 @@
 #include "appmodes.h"
 #include "commonstrings.h"
 #include "hyphenator.h"
+#include "iconmanager.h"
 #include "langmgr.h"
 #include "pageitem.h"
 #include "pageitem_table.h"
-//#include "pageitem_textframe.h"
 #include "prefsmanager.h"
 #include "scpaths.h"
-//
 #include "scribusdoc.h"
-//
 #include "selection.h"
 #include "undomanager.h"
-#include "util_icon.h"
-
 
 QString getLoremLocation(QString fname)
 {
@@ -141,7 +137,7 @@
 	m_Doc=doc;
 	setModal(true);
 	setWindowTitle( tr( "Lorem Ipsum" ) );
-	setWindowIcon(QIcon(loadIcon ( "AppIcon.png" )));
+	setWindowIcon(IconManager::instance()->loadIcon("AppIcon.png"));
 	LoremManagerLayout = new QGridLayout(this) ;
 	LoremManagerLayout->setMargin(10);
 	LoremManagerLayout->setSpacing(5);

Modified: trunk/Scribus/scribus/ui/margindialog.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20185&path=/trunk/Scribus/scribus/ui/margindialog.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/margindialog.cpp (original)
+++ trunk/Scribus/scribus/ui/margindialog.cpp Sun Jun 21 21:46:55 2015
@@ -15,6 +15,7 @@
 #include <QCheckBox>
 
 #include "commonstrings.h"
+#include "iconmanager.h"
 #include "margindialog.h"
 #include "marginwidget.h"
 #include "pagesize.h"
@@ -23,13 +24,12 @@
 #include "scribusdoc.h"
 #include "scrspinbox.h"
 #include "units.h"
-#include "util_icon.h"
 
 MarginDialog::MarginDialog( QWidget* parent, ScribusDoc* doc ) : QDialog( parent)
 {
 	setModal(true);
 	setWindowTitle( tr( "Manage Page Properties" ) );
-	setWindowIcon(QIcon(loadIcon ( "AppIcon.png" )));
+	setWindowIcon(IconManager::instance()->loadIcon("AppIcon.png"));
 	unitRatio = doc->unitRatio();
 	dialogLayout = new QVBoxLayout(this);
 	dialogLayout->setMargin(10);

Modified: trunk/Scribus/scribus/ui/mergedoc.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20185&path=/trunk/Scribus/scribus/ui/mergedoc.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/mergedoc.cpp (original)
+++ trunk/Scribus/scribus/ui/mergedoc.cpp Sun Jun 21 21:46:55 2015
@@ -5,17 +5,16 @@
 for which a new license (GPL+exception) is in place.
 */
 
-#include "scconfig.h"
+#include "commonstrings.h"
+#include "fileloader.h"
+#include "iconmanager.h"
 #include "mergedoc.h"
-
-#include "fileloader.h"
-#include "commonstrings.h"
 #include "prefsfile.h"
 #include "prefsmanager.h"
 #include "sccombobox.h"
+#include "scconfig.h"
 #include "scpaths.h"
 #include "ui/customfdialog.h"
-#include "util_icon.h"
 
 #include <QApplication>
 #include <QCheckBox>
@@ -37,7 +36,7 @@
 	masterPages = importMasterPages;
 	setModal(true);
 	setWindowTitle((masterPages) ? tr("Import Master Page") : tr( "Import Page(s)" ));
-	setWindowIcon(QIcon(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=20185&path=/trunk/Scribus/scribus/ui/missing.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/missing.cpp (original)
+++ trunk/Scribus/scribus/ui/missing.cpp Sun Jun 21 21:46:55 2015
@@ -15,11 +15,11 @@
 
 #include "commonstrings.h"
 #include "fontcombo.h"
+#include "iconmanager.h"
 #include "prefsmanager.h"
 #include "scpage.h"
 #include "scribusdoc.h"
 #include "util.h"
-#include "util_icon.h"
 
 static const char* const image100_data[] =
     {
@@ -307,7 +307,7 @@
 	QPixmap image0( ( const char** ) image100_data );
 	setModal(true);
 	setWindowTitle( tr("Missing Font"));
-	setWindowIcon(QIcon(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=20185&path=/trunk/Scribus/scribus/ui/movepage.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/movepage.cpp (original)
+++ trunk/Scribus/scribus/ui/movepage.cpp Sun Jun 21 21:46:55 2015
@@ -12,7 +12,7 @@
 #include <QPushButton>
 
 #include "commonstrings.h"
-#include "util_icon.h"
+#include "iconmanager.h"
 #include "ui/scrspinbox.h"
 
 /*
@@ -26,7 +26,7 @@
 {
 	move = moving;	
 	setWindowTitle (move ? tr("Move Pages") : tr("Copy Page"));
-	setWindowIcon(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=20185&path=/trunk/Scribus/scribus/ui/newfile.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/newfile.cpp (original)
+++ trunk/Scribus/scribus/ui/newfile.cpp Sun Jun 21 21:46:55 2015
@@ -43,7 +43,7 @@
 #include "filedialogeventcatcher.h"
 #include "scrspinbox.h"
 #include "units.h"
-#include "util_icon.h"
+#include "iconmanager.h"
 
 PageLayoutsWidget::PageLayoutsWidget(QWidget* parent) : QListWidget(parent)
 {
@@ -100,7 +100,7 @@
 	m_unitSuffix = unitGetSuffixFromIndex(m_unitIndex);
 	m_orientation = prefsManager->appPrefs.docSetupPrefs.pageOrientation;
 	setWindowTitle( tr( "New Document" ) );
-	setWindowIcon(QIcon(loadIcon("AppIcon.png")));
+	setWindowIcon(IconManager::instance()->loadIcon("AppIcon.png"));
 	TabbedNewDocLayout = new QVBoxLayout( this );
 	TabbedNewDocLayout->setMargin(10);
 	TabbedNewDocLayout->setSpacing(5);
@@ -195,22 +195,22 @@
 		QString psname=CommonStrings::translatePageSetString(prefsManager->appPrefs.pageSets[pg].Name);
 		if (pg == 0)
 		{
-			ic = new QListWidgetItem( QIcon(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( QIcon(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( QIcon(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( QIcon(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=20185&path=/trunk/Scribus/scribus/ui/newtemp.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/newtemp.cpp (original)
+++ trunk/Scribus/scribus/ui/newtemp.cpp Sun Jun 21 21:46:55 2015
@@ -16,17 +16,17 @@
 #include <QPushButton>
 
 #include "commonstrings.h"
+#include "iconmanager.h"
 #include "pagestructs.h"
 #include "scpage.h"
 #include "scribusdoc.h"
-#include "util_icon.h"
 
 NewTm::NewTm( QWidget* parent, QString text, QString titel, ScribusDoc *doc, const QString& answerText)
 		: QDialog( parent )
 {
 	setModal(true);
 	setWindowTitle(titel);
-	setWindowIcon(QIcon(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=20185&path=/trunk/Scribus/scribus/ui/nftdialog.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/nftdialog.cpp (original)
+++ trunk/Scribus/scribus/ui/nftdialog.cpp Sun Jun 21 21:46:55 2015
@@ -12,14 +12,14 @@
 
 #include "scconfig.h"
 #include "scribusapi.h"
-#include "util_icon.h"
+#include "iconmanager.h"
 
 
 nftdialog::nftdialog(QWidget* parent, QString lang) : QDialog(parent)
 {
 	setupUi(this);
 	setModal(true);
-	setWindowIcon(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=20185&path=/trunk/Scribus/scribus/ui/nftwidget.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/nftwidget.cpp (original)
+++ trunk/Scribus/scribus/ui/nftwidget.cpp Sun Jun 21 21:46:55 2015
@@ -14,7 +14,7 @@
 #include "nftwidget.h"
 #include "scconfig.h"
 #include "scribusapi.h"
-#include "util_icon.h"
+#include "iconmanager.h"
 
 
 nftwidget::nftwidget(QWidget* parent) : QWidget(parent)
@@ -32,9 +32,9 @@
 	tnailGrid->addAction(removeAction);
 	tnailGrid->addAction(openAction);
 	setupAbout();
-	toolBox->setItemIcon(0, loadIcon("16/information.png"));
-	toolBox->setItemIcon(1, loadIcon("16/image-x-generic.png"));
-	toolBox->setItemIcon(2, 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=20185&path=/trunk/Scribus/scribus/ui/nodeeditpalette.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/nodeeditpalette.cpp (original)
+++ trunk/Scribus/scribus/ui/nodeeditpalette.cpp Sun Jun 21 21:46:55 2015
@@ -16,10 +16,11 @@
 #include "undomanager.h"
 #include "undostate.h"
 #include "units.h"
-#include "util_icon.h"
+#include "iconmanager.h"
 
 NodePalette::NodePalette( QWidget* parent) : ScrPaletteBase( parent, "nodePalette", false, 0)
 {
+	IconManager* im = IconManager::instance();
 	QSize iconSize = QSize(22, 22);
 	m_doc=0;
 	unitRatio=1.0;
@@ -31,7 +32,7 @@
 	gridLayout->setMargin(0);
 	MoveNode = new QToolButton(this);
 	MoveNode->setText( "" );
-	MoveNode->setIcon(QIcon(loadIcon("MoveNode.png")));
+	MoveNode->setIcon(im->loadIcon("MoveNode.png"));
 	MoveNode->setIconSize(iconSize);
 	MoveNode->setContentsMargins(0, 0, 0, 0);
 	MoveNode->setCheckable(true);
@@ -40,7 +41,7 @@
 	gridLayout->addWidget(MoveNode, 0, 0, 1, 1);
 
 	AddNode = new QToolButton(this);
-	AddNode->setIcon(QIcon(loadIcon("AddNode.png")));
+	AddNode->setIcon(im->loadIcon("AddNode.png"));
 	AddNode->setIconSize(iconSize);
 	AddNode->setContentsMargins(0, 0, 0, 0);
 	AddNode->setEnabled(true);
@@ -49,7 +50,7 @@
 	gridLayout->addWidget(AddNode, 0, 1, 1, 1);
 
 	DeleteNode = new QToolButton(this);
-	DeleteNode->setIcon(QIcon(loadIcon("DeleteNode.png")));
+	DeleteNode->setIcon(im->loadIcon("DeleteNode.png"));
 	DeleteNode->setIconSize(iconSize);
 	DeleteNode->setContentsMargins(0, 0, 0, 0);
 	DeleteNode->setEnabled(true);
@@ -58,7 +59,7 @@
 	gridLayout->addWidget(DeleteNode, 0, 2, 1, 1);
 
 	ResNode = new QToolButton(this);
-	ResNode->setIcon(QIcon(loadIcon("ResetNode.png")));
+	ResNode->setIcon(im->loadIcon("ResetNode.png"));
 	ResNode->setIconSize(iconSize);
 	ResNode->setContentsMargins(0, 0, 0, 0);
 	ResNode->setEnabled(true);
@@ -66,7 +67,7 @@
 	gridLayout->addWidget(ResNode, 0, 3, 1, 1);
 
 	MoveControl = new QToolButton(this);
-	MoveControl->setIcon(QIcon(loadIcon("MoveKontrol.png")));
+	MoveControl->setIcon(im->loadIcon("MoveKontrol.png"));
 	MoveControl->setIconSize(iconSize);
 	MoveControl->setContentsMargins(0, 0, 0, 0);
 	MoveControl->setCheckable(true);
@@ -74,7 +75,7 @@
 	gridLayout->addWidget(MoveControl, 1, 0, 1, 1);
 
 	AsymMove = new QToolButton(this);
-	AsymMove->setIcon(QIcon(loadIcon("MoveAsym.png")));
+	AsymMove->setIcon(im->loadIcon("MoveAsym.png"));
 	AsymMove->setIconSize(iconSize);
 	AsymMove->setContentsMargins(0, 0, 0, 0);
 	AsymMove->setEnabled(false);
@@ -83,7 +84,7 @@
 	gridLayout->addWidget(AsymMove, 1, 1, 1, 1);
 
 	SymMove = new QToolButton(this);
-	SymMove->setIcon(QIcon(loadIcon("MoveSym.png")));
+	SymMove->setIcon(im->loadIcon("MoveSym.png"));
 	SymMove->setIconSize(iconSize);
 	SymMove->setContentsMargins(0, 0, 0, 0);
 	SymMove->setEnabled(false);
@@ -92,7 +93,7 @@
 	gridLayout->addWidget(SymMove, 1, 2, 1, 1);
 
 	Res1Node = new QToolButton(this);
-	Res1Node->setIcon(QIcon(loadIcon("Reset1Node.png")));
+	Res1Node->setIcon(im->loadIcon("Reset1Node.png"));
 	Res1Node->setIconSize(iconSize);
 	Res1Node->setContentsMargins(0, 0, 0, 0);
 	Res1Node->setEnabled(false);
@@ -102,7 +103,7 @@
 	PolySplit = new QToolButton(this);
 	PolySplit->setEnabled(false);
 	PolySplit->setCheckable(true);
-	PolySplit->setIcon(QIcon(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)));
@@ -110,28 +111,28 @@
 
 	BezierClose = new QToolButton(this);
 	BezierClose->setEnabled(false);
-	BezierClose->setIcon(QIcon(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(QIcon(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(QIcon(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(QIcon(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)));
@@ -139,7 +140,7 @@
 	gridLayout->addWidget(PolyShearL, 3, 0, 1, 1);
 
 	PolyShearR = new QToolButton(this);
-	PolyShearR->setIcon(QIcon(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)));
@@ -147,7 +148,7 @@
 	gridLayout->addWidget(PolyShearR, 3, 1, 1, 1);
 
 	PolyShearU = new QToolButton(this);
-	PolyShearU->setIcon(QIcon(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)));
@@ -155,7 +156,7 @@
 	gridLayout->addWidget(PolyShearU, 3, 2, 1, 1);
 
 	PolyShearD = new QToolButton(this);
-	PolyShearD->setIcon(QIcon(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)));
@@ -168,14 +169,14 @@
 	gridLayout1->setMargin(0);
 
 	RotateCCW = new QToolButton(this);
-	RotateCCW->setIcon(QIcon(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(QIcon(loadIcon("rotate_cw.png")));
+	RotateCW->setIcon(im->loadIcon("rotate_cw.png"));
 	RotateCW->setIconSize(iconSize);
 	RotateCW->setContentsMargins(0, 0, 0, 0);
 	RotateCW->setAutoRepeat(true);
@@ -189,14 +190,14 @@
 	gridLayout1->addWidget(RotVal, 0, 2, 1, 1);
 
 	Expand = new QToolButton(this);
-	Expand->setIcon(QIcon(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(QIcon(loadIcon("crop.png")));
+	Shrink->setIcon(im->loadIcon("crop.png"));
 	Shrink->setIconSize(iconSize);
 	Shrink->setContentsMargins(0, 0, 0, 0);
 	Shrink->setAutoRepeat(true);
@@ -209,14 +210,14 @@
 	gridLayout1->addWidget(scalePercentage, 1, 2, 1, 1);
 
 	Enlarge = new QToolButton(this);
-	Enlarge->setIcon(QIcon(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(QIcon(loadIcon("crop.png")));
+	Reduce->setIcon(im->loadIcon("crop.png"));
 	Reduce->setIconSize(iconSize);
 	Reduce->setContentsMargins(0, 0, 0, 0);
 	Reduce->setAutoRepeat(true);
@@ -286,7 +287,7 @@
 	resetDefaultButton->setEnabled(true);
 	gridLayout2->addWidget(resetDefaultButton, 8, 0, 1, 2);
 
-	editEditButton = new QPushButton(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, 9, 0, 1, 1);

Modified: trunk/Scribus/scribus/ui/oneclick.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20185&path=/trunk/Scribus/scribus/ui/oneclick.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/oneclick.cpp (original)
+++ trunk/Scribus/scribus/ui/oneclick.cpp Sun Jun 21 21:46:55 2015
@@ -15,20 +15,21 @@
 #include <QGroupBox>
 #include <QToolTip>
 #include <QSpacerItem>
-#include "util_icon.h"
 
+#include "commonstrings.h"
+#include "iconmanager.h"
+#include "linkbutton.h"
+#include "scrspinbox.h"
 #include "ui/basepointwidget.h"
-#include "scrspinbox.h"
-#include "linkbutton.h"
 #include "units.h"
-#include "commonstrings.h"
+
 
 OneClick::OneClick( QWidget* parent, QString titel, int unitIndex, double defW, double defH, bool remember, int origin, int mode ) : QDialog( parent )
 {
 	double m_unitRatio = unitGetRatioFromIndex(unitIndex);
 	QString m_suffix = unitGetSuffixFromIndex(unitIndex);
 	setWindowTitle( titel );
-	setWindowIcon(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=20185&path=/trunk/Scribus/scribus/ui/outlinepalette.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/outlinepalette.cpp (original)
+++ trunk/Scribus/scribus/ui/outlinepalette.cpp Sun Jun 21 21:46:55 2015
@@ -28,6 +28,7 @@
 #include "canvasmode.h"
 #include "commonstrings.h"
 #include "contextmenu.h"
+#include "iconmanager.h"
 #include "layers.h"
 #include "outlinepalette.h"
 #include "propertiespalette.h"
@@ -41,8 +42,6 @@
 #include "util.h"
 #include "util_color.h"
 #include "util_formats.h"
-#include "util_icon.h"
-
 
 
 OutlineTreeItem::OutlineTreeItem(OutlineTreeItem* parent, OutlineTreeItem* after) : QTreeWidgetItem(parent, after)
@@ -306,7 +305,7 @@
 					PageItem *pgItem = item->PageItemObject;
 					QPainter p;
 					QImage pm = QImage(80, 80, QImage::Format_ARGB32_Premultiplied);
-					QBrush b(QColor(205,205,205), loadIcon("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);
@@ -451,23 +450,24 @@
 	setWidget( containerWidget );
 
 	unsetDoc();
-	imageIcon = loadIcon("22/insert-image.png");
-	latexIcon = loadIcon("22/insert-latex.png");
-	lineIcon = loadIcon("Stift.xpm");
-	textIcon = loadIcon("22/insert-text-frame.png");
-	polylineIcon = loadIcon("22/draw-path.png");
-	polygonIcon = loadIcon("22/draw-polygon.png");
-	tableIcon = loadIcon("22/insert-table.png");
-	groupIcon = loadIcon("u_group.png");
-	buttonIcon = loadIcon("22/insert-button.png");
-	radiobuttonIcon = loadIcon("22/radiobutton.png");
-	textFieldIcon = loadIcon("22/text-field.png");
-	checkBoxIcon = loadIcon("22/checkbox.png");
-	comboBoxIcon = loadIcon("22/combobox.png");
-	listBoxIcon = loadIcon("22/list-box.png");
-	annotTextIcon = loadIcon("22/pdf-annotations.png");
-	annotLinkIcon = loadIcon("goto.png");
-	annot3DIcon = loadIcon("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.xpm");
+	textIcon = im->loadPixmap("22/insert-text-frame.png");
+	polylineIcon = im->loadPixmap("22/draw-path.png");
+	polygonIcon = im->loadPixmap("22/draw-polygon.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  = NULL;
 	freeObjects   = NULL;

Modified: trunk/Scribus/scribus/ui/pagelayout.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20185&path=/trunk/Scribus/scribus/ui/pagelayout.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/pagelayout.cpp (original)
+++ trunk/Scribus/scribus/ui/pagelayout.cpp Sun Jun 21 21:46:55 2015
@@ -14,7 +14,7 @@
 
 #include "sccombobox.h"
 #include "commonstrings.h"
-#include "util_icon.h"
+#include "iconmanager.h"
 
 PageListWidget::PageListWidget(QWidget* parent) : QListWidget(parent)
 {
@@ -129,15 +129,15 @@
 	{
 		QString psname=CommonStrings::translatePageSetString(pageSets[pg].Name);
 		if (pg == 0)
-			layoutsCombo->addItem(loadIcon("16/page-simple.png"), psname);
+			layoutsCombo->addItem(IconManager::instance()->loadIcon("16/page-simple.png"), psname);
 		else if (pg == 1)
-			layoutsCombo->addItem(loadIcon("16/page-doublesided.png"), psname);
+			layoutsCombo->addItem(IconManager::instance()->loadIcon("16/page-doublesided.png"), psname);
 		else if (pg == 2)
-			layoutsCombo->addItem(loadIcon("16/page-3fold.png"), psname);
+			layoutsCombo->addItem(IconManager::instance()->loadIcon("16/page-3fold.png"), psname);
 		else if (pg == 3)
-			layoutsCombo->addItem(loadIcon("16/page-4fold.png"), psname);
+			layoutsCombo->addItem(IconManager::instance()->loadIcon("16/page-4fold.png"), psname);
 		else
-			layoutsCombo->addItem(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( QIcon(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( QIcon(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( QIcon(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( QIcon(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( QIcon(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(loadIcon("16/page-simple.png"), psname);
+				layoutsCombo->addItem(IconManager::instance()->loadIcon("16/page-simple.png"), psname);
 			else if (pg == 1)
-				layoutsCombo->addItem(loadIcon("16/page-doublesided.png"), psname);
+				layoutsCombo->addItem(IconManager::instance()->loadIcon("16/page-doublesided.png"), psname);
 			else if (pg == 2)
-				layoutsCombo->addItem(loadIcon("16/page-3fold.png"), psname);
+				layoutsCombo->addItem(IconManager::instance()->loadIcon("16/page-3fold.png"), psname);
 			else if (pg == 3)
-				layoutsCombo->addItem(loadIcon("16/page-4fold.png"), psname);
+				layoutsCombo->addItem(IconManager::instance()->loadIcon("16/page-4fold.png"), psname);
 			else
-				layoutsCombo->addItem(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=20185&path=/trunk/Scribus/scribus/ui/pagepalette_masterpages.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/pagepalette_masterpages.cpp (original)
+++ trunk/Scribus/scribus/ui/pagepalette_masterpages.cpp Sun Jun 21 21:46:55 2015
@@ -22,18 +22,19 @@
 #include "appmodes.h"
 #include "canvasmode.h"
 #include "commonstrings.h"
+#include "iconmanager.h"
 #include "mergedoc.h"
 #include "newtemp.h"
 #include "pagestructs.h"
 #include "prefsmanager.h"
 #include "scpage.h"
 #include "scribus.h"
+#include "scribusXml.h"
 #include "scribusdoc.h"
 #include "scribusview.h"
-#include "scribusXml.h"
 #include "selection.h"
-#include "util_icon.h"
 #include "util_os.h"
+
 
 PagePalette_MasterPages::PagePalette_MasterPages( QWidget* parent, ScribusView *pCurrentView, QString masterPageName) : QWidget(parent)
 {
@@ -42,10 +43,10 @@
 
 	setupUi(this);
 
-	importButton->setIcon(QIcon(loadIcon("16/document-open.png")));
-	newButton->setIcon(QIcon(loadIcon("16/document-new.png")));
-	duplicateButton->setIcon(QIcon(loadIcon("16/edit-copy.png")));
-	deleteButton->setIcon(QIcon(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=20185&path=/trunk/Scribus/scribus/ui/pagepalette_pages.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/pagepalette_pages.cpp (original)
+++ trunk/Scribus/scribus/ui/pagepalette_pages.cpp Sun Jun 21 21:46:55 2015
@@ -20,16 +20,15 @@
 #include <QPainter>
 
 #include "commonstrings.h"
+#include "iconmanager.h"
 #include "pagelayout.h"
 #include "pagepalette_pages.h"
 #include "pagepalette_widgets.h"
 #include "sccombobox.h"
 #include "scpage.h"
-
 #include "scribuscore.h"
 #include "scribusdoc.h"
 #include "scribusview.h"
-#include "util_icon.h"
 
 PagePalette_Pages::PagePalette_Pages(QWidget* parent) : QWidget(parent)
 {
@@ -61,7 +60,7 @@
 	trash->setMinimumSize(QSize(32,32));
 	trash->setMaximumSize(QSize(32,32));
 
-	pix = loadIcon("32/page-simple.png");
+	pix = IconManager::instance()->loadPixmap("32/page-simple.png");
 
 	currView = 0;
 	Rebuild();

Modified: trunk/Scribus/scribus/ui/pagepalette_widgets.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20185&path=/trunk/Scribus/scribus/ui/pagepalette_widgets.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/pagepalette_widgets.cpp (original)
+++ trunk/Scribus/scribus/ui/pagepalette_widgets.cpp Sun Jun 21 21:46:55 2015
@@ -19,14 +19,13 @@
 #include <QPainter>
 
 #include "commonstrings.h"
+#include "iconmanager.h"
 #include "pagelayout.h"
 #include "pagepalette_widgets.h"
 #include "sccombobox.h"
 #include "scpage.h"
 #include "ui/scmessagebox.h"
 
-
-#include "util_icon.h"
 
 /* IconItems Code */
 SeItem::SeItem(QString text, uint nr, const QPixmap& Pix) : QTableWidgetItem(QIcon(Pix), "", 1002)
@@ -99,7 +98,7 @@
 		mimeData->setText("1" + pageName);
 		QDrag *dr = new QDrag(this);
 		dr->setMimeData(mimeData);
-		const QPixmap& pm = loadIcon("doc.png");
+		const QPixmap& pm = IconManager::instance()->loadPixmap("doc.png");
 		dr->setPixmap(pm);
 	//	dr->setDragCursor(pm, Qt::CopyAction);
 	//	dr->setDragCursor(pm, Qt::MoveAction);
@@ -207,7 +206,7 @@
 					mimeData->setText("2 "+tmp.setNum(p)+" "+str);
 					QDrag *dr = new QDrag(this);
 					dr->setMimeData(mimeData);
-					const QPixmap& pm = loadIcon("doc.png");
+					const QPixmap& pm = IconManager::instance()->loadPixmap("doc.png");
 					dr->setPixmap(pm);
 				//	dr->setDragCursor(pm, Qt::CopyAction);
 				//	dr->setDragCursor(pm, Qt::MoveAction);
@@ -508,8 +507,8 @@
 /* Der Muelleimer */
 TrashBin::TrashBin(QWidget * parent) : QLabel(parent)
 {
-	Normal = loadIcon("trashcan.png");
-	Offen = loadIcon("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/pageselector.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20185&path=/trunk/Scribus/scribus/ui/pageselector.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/pageselector.cpp (original)
+++ trunk/Scribus/scribus/ui/pageselector.cpp Sun Jun 21 21:46:55 2015
@@ -20,7 +20,7 @@
 #include <QValidator>
 
 #include "scpaths.h"
-#include "util_icon.h"
+#include "iconmanager.h"
 #include "util.h"
 
 PageSelector::PageSelector( QWidget* parent, int maxPg ) : QWidget( parent, 0 )
@@ -47,10 +47,10 @@
 	forwardButton->setAutoDefault( false );
 	lastButton->setAutoDefault( false );
 
-	startButton->setIcon(QIcon(loadIcon("16/go-first.png")));
-	backButton->setIcon(QIcon(loadIcon("16/go-previous.png")));
-	forwardButton->setIcon(QIcon(loadIcon("16/go-next.png")));
-	lastButton->setIcon(QIcon(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(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/paintmanager.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20185&path=/trunk/Scribus/scribus/ui/paintmanager.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/paintmanager.cpp (original)
+++ trunk/Scribus/scribus/ui/paintmanager.cpp Sun Jun 21 21:46:55 2015
@@ -34,34 +34,36 @@
 #include <QImageReader>
 #include <QDir>
 #include <QFileDialog>
+
 #include "cmykfw.h"
 #include "colorlistbox.h"
 #include "commonstrings.h"
-#include "ui/customfdialog.h"
 #include "dcolor.h"
 #include "fileloader.h"
 #include "gradientaddedit.h"
+#include "iconmanager.h"
 #include "loadsaveplugin.h"
 #include "plugins/formatidlist.h"
 #include "prefsfile.h"
 #include "prefsmanager.h"
 #include "query.h"
+#include "scclocale.h"
 #include "sccolor.h"
 #include "sccolorengine.h"
 #include "scconfig.h"
 #include "sclimits.h"
 #include "sclistboxpixmap.h"
-#include "scclocale.h"
 #include "scpainter.h"
 #include "scpaths.h"
 #include "scribus.h"
+#include "scribusXml.h"
 #include "sctextstream.h"
-#include "scribusXml.h"
+#include "ui/customfdialog.h"
 #include "undomanager.h"
 #include "util.h"
 #include "util_color.h"
 #include "util_formats.h"
-#include "util_icon.h"
+
 
 PaintManagerDialog::PaintManagerDialog(QWidget* parent, QHash<QString, VGradient> *docGradients, ColorList doco, QString docColSet, QHash<QString, ScPattern> *docPatterns, ScribusDoc *doc, ScribusMainWindow *scMW) : QDialog(parent)
 {
@@ -73,7 +75,7 @@
 	m_doc = doc;
 	m_colorList = doco;
 	mainWin = scMW;
-	setWindowIcon(QIcon(loadIcon ( "AppIcon.png" )));
+	setWindowIcon(IconManager::instance()->loadIcon("AppIcon.png"));
 	dataTree->setContextMenuPolicy(Qt::CustomContextMenu);
 	dataTree->setIconSize(QSize(60, 48));
 	colorItems = new QTreeWidgetItem(dataTree);
@@ -222,7 +224,7 @@
 		VGradient gr = dialogGradients.value(patK[a]);
 		QImage pixm(48, 12, QImage::Format_ARGB32);
 		QPainter pb;
-		QBrush b(QColor(205,205,205), loadIcon("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/patternpropsdialog.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20185&path=/trunk/Scribus/scribus/ui/patternpropsdialog.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/patternpropsdialog.cpp (original)
+++ trunk/Scribus/scribus/ui/patternpropsdialog.cpp Sun Jun 21 21:46:55 2015
@@ -22,7 +22,7 @@
  ***************************************************************************/
 
 #include "patternpropsdialog.h"
-#include "util_icon.h"
+#include "iconmanager.h"
 #include "util_math.h"
 
 PatternPropsDialog::PatternPropsDialog(QWidget* parent, int unitIndex, bool isStroke) : QDialog( parent )
@@ -120,11 +120,11 @@
 	QSpacerItem* spacer = new QSpacerItem( 0, 0, QSizePolicy::Expanding, QSizePolicy::Minimum );
 	groupFlipLayout->addItem( spacer );
 	FlipH = new QToolButton( this );
-	FlipH->setIcon(QIcon(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(QIcon(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=20185&path=/trunk/Scribus/scribus/ui/pdfexportdialog.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/pdfexportdialog.cpp (original)
+++ trunk/Scribus/scribus/ui/pdfexportdialog.cpp Sun Jun 21 21:46:55 2015
@@ -33,6 +33,7 @@
 #include <QVBoxLayout>
 
 #include "commonstrings.h"
+#include "iconmanager.h"
 #include "pdfoptions.h"
 #include "prefsfile.h"
 #include "prefsmanager.h"
@@ -40,11 +41,11 @@
 #include "scribusdoc.h"
 #include "scribusview.h"
 #include "ui/customfdialog.h"
-#include "ui/scmessagebox.h" 
+#include "ui/scmessagebox.h"
 #include "ui/scrspinbox.h"
 #include "units.h"
 #include "util.h"
-#include "util_icon.h"
+
 
 PDFExportDialog::PDFExportDialog( QWidget* parent, const QString & docFileName,
 								  const QMap<QString, int > & DocFonts,
@@ -61,7 +62,7 @@
 {
 	setModal(true);
 	setWindowTitle( tr( "Save as PDF" ) );
-	setWindowIcon(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=20185&path=/trunk/Scribus/scribus/ui/picsearch.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/picsearch.cpp (original)
+++ trunk/Scribus/scribus/ui/picsearch.cpp Sun Jun 21 21:46:55 2015
@@ -10,13 +10,14 @@
 
 #include "cmsettings.h"
 #include "commonstrings.h"
+#include "iconmanager.h"
 #include "scimage.h"
 #include "scpaths.h"
 #include "scribusstructs.h"
 #include "util.h"
 #include "util_color.h"
 #include "util_formats.h"
-#include "util_icon.h"
+
 
 
 PicSearch::PicSearch(QWidget* parent, const QString & fileName, const QStringList & avalableFiles) : QDialog(parent), currentImage(QString())
@@ -101,7 +102,7 @@
 		else
 			im2 = im.qImage(); // no need to copy
 		QPainter p;
-		QBrush b(QColor(205,205,205), loadIcon("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=20185&path=/trunk/Scribus/scribus/ui/picstatus.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/picstatus.cpp (original)
+++ trunk/Scribus/scribus/ui/picstatus.cpp Sun Jun 21 21:46:55 2015
@@ -39,6 +39,7 @@
 #include "effectsdialog.h"
 #include "extimageprops.h"
 #include "filesearch.h"
+#include "iconmanager.h"
 #include "pageitem.h"
 #include "picsearch.h"
 #include "picsearchoptions.h"
@@ -47,7 +48,7 @@
 #include "units.h"
 #include "util_color.h"
 #include "util_formats.h"
-#include "util_icon.h"
+
 
 
 PicItem::PicItem(QListWidget* parent, QString text, QPixmap pix, PageItem* pgItem)
@@ -64,7 +65,7 @@
 	imageViewArea->setContextMenuPolicy(Qt::CustomContextMenu);
 	m_Doc = docu;
 	currItem = NULL;
-	setWindowIcon(QIcon(loadIcon ( "AppIcon.png" )));
+	setWindowIcon(IconManager::instance()->loadIcon("AppIcon.png"));
 	fillTable();
 	workTab->setCurrentIndex(0);
 	connect(closeButton, SIGNAL(clicked()), this, SLOT(accept()));
@@ -84,7 +85,7 @@
 {
 	QPainter p;
 	QPixmap pm(128, 128);
-	QBrush b(QColor(205,205,205), loadIcon("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=20185&path=/trunk/Scribus/scribus/ui/polyprops.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/polyprops.cpp (original)
+++ trunk/Scribus/scribus/ui/polyprops.cpp Sun Jun 21 21:46:55 2015
@@ -12,12 +12,12 @@
 #include <QPushButton>
 #include "ui/polygonwidget.h"
 #include "commonstrings.h"
-#include "util_icon.h"
+#include "iconmanager.h"
 
 PolyVectorDialog::PolyVectorDialog(QWidget* parent, int polyC, double polyF, bool polyS, double polyR, double polyCurvature, double polyInnerRot, double polyOuterCurvature) : ScrPaletteBase( parent, "PolyVectorDialog", false, 0 )
 {
 	setWindowTitle( tr( "Polygon Properties" ) );
-	setWindowIcon(QIcon(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(QIcon(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=20185&path=/trunk/Scribus/scribus/ui/preferencesdialog.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/preferencesdialog.cpp (original)
+++ trunk/Scribus/scribus/ui/preferencesdialog.cpp Sun Jun 21 21:46:55 2015
@@ -11,17 +11,15 @@
 #include <QListWidget>
 #include <QVBoxLayout>
 
-#include "ui/preferencesdialog.h"
-
 #include "commonstrings.h"
+#include "iconmanager.h"
 #include "pluginmanager.h"
 #include "prefsmanager.h"
 #include "scplugin.h"
-
 #include "scribuscore.h"
 #include "scribusdoc.h"
+#include "ui/preferencesdialog.h"
 #include "units.h"
-#include "util_icon.h"
 
 PreferencesDialog::PreferencesDialog(QWidget* parent, ApplicationPrefs& prefsData, ScribusDoc* doc)
 	: QDialog(parent),
@@ -56,6 +54,7 @@
 	setupUi(this);
 	setObjectName(QString::fromLocal8Bit("PreferencesDialog"));
 	setupListWidget();
+	IconManager* im = IconManager::instance();
 	while (prefsStackWidget->currentWidget()!=0)
 		prefsStackWidget->removeWidget(prefsStackWidget->currentWidget());
 
@@ -105,47 +104,47 @@
 	// Add Stack Widgets if required
 	if (!doc)
 	{
-		addItem( tr("User Interface"), loadIcon("scribus16.png"), prefs_UserInterface);
-		addItem( tr("Paths"), loadIcon("16/folder.png"), prefs_Paths);
-		addItem( tr("Keyboard Shortcuts"), loadIcon("16/preferences-desktop-keyboard-shortcuts.png"), prefs_KeyboardShortcuts);
-	}
-	addItem( tr("Document Setup"), loadIcon("scribusdoc16.png"), prefs_DocumentSetup);
-	if (!doc)
-		addItem( tr("Page Sizes"), loadIcon("16/page-simple.png"), prefs_PageSizes);
-	addItem( tr("Guides"), loadIcon("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"), loadIcon("documentinfo.png"), prefs_DocumentInformation);
+		addItem( tr("Document Information"), im->loadPixmap("documentinfo.png"), prefs_DocumentInformation);
 	if (doc)
-		addItem( tr("Sections"), loadIcon("tabtocindex_16.png"), prefs_DocumentSections);
-
-	addItem( tr("Item Tools"), loadIcon("tools_16.png"), prefs_ItemTools);
-	addItem( tr("Fonts"), loadIcon("16/preferences-desktop-font.png"), prefs_Fonts);
-	addItem( tr("Typography"), loadIcon("16/draw-text.png"), prefs_Typography);
-	addItem( tr("Hyphenator"), loadIcon("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"), loadIcon("signature_16.png"), prefs_Spelling);
-
-
-
-	addItem( tr("Color Management"), loadIcon("blend_16.png"), prefs_ColorManagement);
-	if (!doc)
-		addItem( tr("Image Cache"), loadIcon("16/image-x-generic.png"), prefs_ImageCache);
-	addItem( tr("Display"), loadIcon("16/video-display.png"), prefs_Display);
-	addItem( tr("Operator Tools"), loadIcon("tools_16.png"), prefs_OperatorTools);
-	if (!doc)
-		addItem( tr("External Tools"), loadIcon("gear_16.png"), prefs_ExternalTools);
-	if (!doc)
-		addItem( tr("Scrapbook"), loadIcon("scrap_16.png"), prefs_Scrapbook);
-	addItem( tr("Preflight Verifier"), loadIcon("16/preflight-verifier.png"), prefs_PreflightVerifier);
-	addItem( tr("Printer"), loadIcon("16/printer.png"), prefs_Printer);
-	addItem( tr("PDF Export"), loadIcon("acroread16.png"), prefs_PDFExport);
-	if (!doc)
-		addItem( tr("Miscellaneous"), loadIcon("misc_16.png"), prefs_Miscellaneous);
-	addItem( tr("Document Item Attributes"), loadIcon("docattributes_16.png"), prefs_DocumentItemAttributes);
-	addItem( tr("Tables of Contents"), loadIcon("tabtocindex_16.png"), prefs_TableOfContents);
-
-	if (!doc)
-		addItem( tr("Plugins"), loadIcon("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=20185&path=/trunk/Scribus/scribus/ui/prefs_display.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/prefs_display.cpp (original)
+++ trunk/Scribus/scribus/ui/prefs_display.cpp Sun Jun 21 21:46:55 2015
@@ -11,19 +11,19 @@
 #include <QDesktopWidget>
 #include <QPainter>
 
+#include "iconmanager.h"
 #include "prefs_display.h"
 #include "prefsstructs.h"
 #include "scribuscore.h"
 #include "scribusdoc.h"
 #include "units.h"
-#include "util_icon.h"
 
 Prefs_Display::Prefs_Display(QWidget* parent, ScribusDoc* doc) : Prefs_Pane(parent), m_doc(doc)
 {
 	setupUi(this);
 	languageChange();
 
-	buttonRestoreDPI->setIcon(QIcon(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=20185&path=/trunk/Scribus/scribus/ui/prefs_guides.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/prefs_guides.cpp (original)
+++ trunk/Scribus/scribus/ui/prefs_guides.cpp Sun Jun 21 21:46:55 2015
@@ -8,21 +8,21 @@
 #include <QColorDialog>
 
 #include "commonstrings.h"
-#include "ui/prefs_guides.h"
+#include "iconmanager.h"
 #include "prefsstructs.h"
 #include "scribusdoc.h"
 #include "scrspinbox.h"
+#include "ui/prefs_guides.h"
 #include "units.h"
-#include "util_icon.h"
 
 Prefs_Guides::Prefs_Guides(QWidget* parent, ScribusDoc* doc)
 	: Prefs_Pane(parent)
 {
 	setupUi(this);
 	languageChange();
-	buttonUp->setIcon(loadIcon("16/go-up.png"));
+	buttonUp->setIcon(IconManager::instance()->loadIcon("16/go-up.png"));
 	buttonUp->setEnabled(false);
-	buttonDown->setIcon(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=20185&path=/trunk/Scribus/scribus/ui/prefs_hyphenator.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/prefs_hyphenator.cpp (original)
+++ trunk/Scribus/scribus/ui/prefs_hyphenator.cpp Sun Jun 21 21:46:55 2015
@@ -14,8 +14,9 @@
 #include <QTextStream>
 
 #include "downloadmanager/scdlmgr.h"
+#include "iconmanager.h"
+#include "langmgr.h"
 #include "prefs_hyphenator.h"
-#include "langmgr.h"
 #include "prefsstructs.h"
 #include "scpaths.h"
 #include "scribusapp.h"
@@ -23,7 +24,6 @@
 #include "third_party/zip/scribus_zip.h"
 #include "util.h"
 #include "util_file.h"
-#include "util_icon.h"
 
 extern ScribusQApp* ScQApp;
 
@@ -37,13 +37,13 @@
 	languageList.sort();
 	hyphLanguageComboBox->addItems( languageList );
 
-	exceptionAddButton->setIcon(QIcon(loadIcon("16/list-add.png")));
+	exceptionAddButton->setIcon(IconManager::instance()->loadIcon("16/list-add.png"));
 	exceptionEditButton->setEnabled(false);
-	exceptionRemoveButton->setIcon(QIcon(loadIcon("16/list-remove.png")));
+	exceptionRemoveButton->setIcon(IconManager::instance()->loadIcon("16/list-remove.png"));
 	exceptionRemoveButton->setEnabled(false);
-	ignoreAddButton->setIcon(QIcon(loadIcon("16/list-add.png")));
+	ignoreAddButton->setIcon(IconManager::instance()->loadIcon("16/list-add.png"));
 	ignoreEditButton->setEnabled(false);
-	ignoreRemoveButton->setIcon(QIcon(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=20185&path=/trunk/Scribus/scribus/ui/prefs_keyboardshortcuts.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/prefs_keyboardshortcuts.cpp (original)
+++ trunk/Scribus/scribus/ui/prefs_keyboardshortcuts.cpp Sun Jun 21 21:46:55 2015
@@ -10,20 +10,21 @@
 #include <QInputDialog>
 #include <QMessageBox>
 
-#include "ui/prefs_keyboardshortcuts.h"
 #include "actionmanager.h"
 #include "commonstrings.h"
+#include "iconmanager.h"
 #include "pluginmanager.h"
+#include "prefscontext.h"
+#include "prefsfile.h"
 #include "prefsmanager.h"
 #include "prefsstructs.h"
-#include "prefsfile.h"
-#include "prefscontext.h"
 #include "scpaths.h"
 #include "scplugin.h"
 #include "scraction.h"
+#include "ui/prefs_keyboardshortcuts.h"
 #include "ui/scmessagebox.h"
 #include "util.h"
-#include "util_icon.h"
+
 
 Prefs_KeyboardShortcuts::Prefs_KeyboardShortcuts(QWidget* parent, ScribusDoc* doc)
 	: Prefs_Pane(parent)
@@ -69,7 +70,7 @@
 	keyDisplay->setMinimumWidth(fontMetrics().width("CTRL+ALT+SHIFT+W"));
 	keyDisplay->setText("");
 
-	clearSearchButton->setIcon(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 *)));

Modified: trunk/Scribus/scribus/ui/prefs_pagesizes.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20185&path=/trunk/Scribus/scribus/ui/prefs_pagesizes.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/prefs_pagesizes.cpp (original)
+++ trunk/Scribus/scribus/ui/prefs_pagesizes.cpp Sun Jun 21 21:46:55 2015
@@ -7,20 +7,22 @@
 
 #include <QListWidget>
 #include <QStringList>
-#include "ui/prefs_pagesizes.h"
+
+#include "iconmanager.h"
 #include "pagesize.h"
 #include "prefsmanager.h"
 #include "prefsstructs.h"
 #include "scribusdoc.h"
-#include "util_icon.h"
+#include "ui/prefs_pagesizes.h"
+
 
 Prefs_PageSizes::Prefs_PageSizes(QWidget* parent, ScribusDoc* doc)
 	: Prefs_Pane(parent)
 {
 	setupUi(this);
 	languageChange();
-	toActiveButton->setIcon(QIcon(loadIcon("22/go-next.png")));
-	fromActiveButton->setIcon(QIcon(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=20185&path=/trunk/Scribus/scribus/ui/prefs_pdfexport.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/prefs_pdfexport.cpp (original)
+++ trunk/Scribus/scribus/ui/prefs_pdfexport.cpp Sun Jun 21 21:46:55 2015
@@ -8,17 +8,16 @@
 #include <QStandardItem>
 #include <QAbstractItemView>
 
-#include "ui/prefs_pdfexport.h"
-#include "ui/createrange.h"
+#include "iconmanager.h"
 #include "prefsstructs.h"
-
 #include "scribuscore.h"
 #include "scribusdoc.h"
 #include "scribusview.h"
+#include "ui/createrange.h"
+#include "ui/prefs_pdfexport.h"
 #include "ui/scrspinbox.h"
 #include "units.h"
 #include "util.h"
-#include "util_icon.h"
 
 Prefs_PDFExport::Prefs_PDFExport(QWidget* parent, ScribusDoc* doc)
 	: Prefs_Pane(parent),
@@ -27,8 +26,8 @@
 	exportingPDF(false)
 {
 	setupUi(this);
-	pageMirrorHorizontalToolButton->setIcon(QIcon(loadIcon("16/flip-object-horizontal.png")));
-	pageMirrorVerticalToolButton->setIcon(QIcon(loadIcon("16/flip-object-vertical.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 +155,13 @@
 
 	const ScFace face = AllFonts.value(fontName);
 	if (face.isReplacement())
-		item = new QListWidgetItem( QIcon(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( QIcon(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( QIcon(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( QIcon(loadIcon("font_otf16.png")), fontName, fontList );
+		item = new QListWidgetItem( IconManager::instance()->loadIcon("font_otf16.png"), fontName, fontList );
 
 	return item;
 }

Modified: trunk/Scribus/scribus/ui/preview.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20185&path=/trunk/Scribus/scribus/ui/preview.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/preview.cpp (original)
+++ trunk/Scribus/scribus/ui/preview.cpp Sun Jun 21 21:46:55 2015
@@ -48,24 +48,23 @@
 #include <cstdlib>
 #include <algorithm>
 
-#include "pslib.h"
 #include "checkDocument.h"
 #include "cmsettings.h"
+#include "iconmanager.h"
+#include "prefscontext.h"
 #include "prefsfile.h"
-#include "prefscontext.h"
 #include "prefsmanager.h"
 #include "prefstable.h"
+#include "pslib.h"
+#include "sccolor.h"
+#include "sccolorengine.h"
+#include "scpaths.h"
+#include "scribuscore.h"
+#include "scribusdoc.h"
+#include "ui/pageselector.h"
 #include "util.h"
-#include "util_icon.h"
-#include "sccolor.h"
-
-#include "scribusdoc.h"
-#include "scpaths.h"
-#include "ui/pageselector.h"
+#include "util_ghostscript.h"
 #include "util_printer.h"
-#include "util_ghostscript.h"
-#include "sccolorengine.h"
-#include "scribuscore.h"
 
 #if defined(_WIN32)
 #include "scprintengine_gdi.h"
@@ -76,7 +75,7 @@
 PPreview::PPreview( QWidget* parent, ScribusView *vin, ScribusDoc *docu, QString printer, PrintEngine engine ) : QDialog( parent )
 {
 	setModal(true);
-	setWindowIcon(QIcon(loadIcon ( "AppIcon.png" )));
+	setWindowIcon(IconManager::instance()->loadIcon("AppIcon.png"));
 	Q_ASSERT(!docu->masterPageMode());
 	prefsManager=PrefsManager::instance();
 	QString tmp;
@@ -150,7 +149,7 @@
 
 		Table = new QTableWidget(spots.count()+4, 2, devTitle );
 		inkMax = (spots.count()+4) * 255;
-		Table->setHorizontalHeaderItem(0, new QTableWidgetItem(QIcon(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);
@@ -1297,7 +1296,7 @@
 	{
 		Bild = QPixmap(image.width(), image.height());
 		QPainter p;
-		QBrush b(QColor(205,205,205), loadIcon("testfill.png"));
+		QBrush b(QColor(205,205,205), IconManager::instance()->loadPixmap("testfill.png"));
 		p.begin(&Bild);
 		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=20185&path=/trunk/Scribus/scribus/ui/printdialog.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/printdialog.cpp (original)
+++ trunk/Scribus/scribus/ui/printdialog.cpp Sun Jun 21 21:46:55 2015
@@ -28,7 +28,7 @@
 	#include <cups/cups.h>
 #endif
 #include "util_printer.h"
-#include "util_icon.h"
+#include "iconmanager.h"
 #include "util.h"
 #include "units.h"
 #include "usertaskstructs.h"
@@ -48,8 +48,8 @@
 	prefs = PrefsManager::instance()->prefsFile->getContext("print_options");
 	DevMode = printOptions.devMode;
 	PrinterOpts = "";
-	setWindowIcon(QIcon(loadIcon("AppIcon.png")));
- 	pageNrButton->setIcon(QIcon(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=20185&path=/trunk/Scribus/scribus/ui/propertiespalette_group.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/propertiespalette_group.cpp (original)
+++ trunk/Scribus/scribus/ui/propertiespalette_group.cpp Sun Jun 21 21:46:55 2015
@@ -46,11 +46,12 @@
 #include <cmath>
 
 
+
 #include "appmodes.h"
 #include "commonstrings.h"
+#include "iconmanager.h"
 #include "sccombobox.h"
 #include "scraction.h"
-
 #include "scribuscore.h"
 #include "scribusdoc.h"
 #include "scribusview.h"
@@ -64,8 +65,8 @@
 #include "undomanager.h"
 #include "units.h"
 #include "util.h"
-#include "util_icon.h"
 #include "util_math.h"
+
 
 
 PropertiesPalette_Group::PropertiesPalette_Group( QWidget* parent) : QWidget(parent)
@@ -82,11 +83,11 @@
 	setupUi(this);
 	setSizePolicy( QSizePolicy(QSizePolicy::Maximum, QSizePolicy::Maximum));
 
-	textFlowDisabled->setIcon(QIcon(loadIcon("flow-none.png")));
-	textFlowUsesFrameShape->setIcon(QIcon(loadIcon("flow-frame.png")));
-	textFlowUsesBoundingBox->setIcon(QIcon(loadIcon("flow-bounding.png")));
-	textFlowUsesContourLine->setIcon(QIcon(loadIcon("flow-contour.png")));
-	textFlowUsesImageClipping->setIcon(QIcon(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=20185&path=/trunk/Scribus/scribus/ui/propertiespalette_line.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/propertiespalette_line.cpp (original)
+++ trunk/Scribus/scribus/ui/propertiespalette_line.cpp Sun Jun 21 21:46:55 2015
@@ -11,24 +11,24 @@
 #define _USE_MATH_DEFINES
 #endif
 #include <cmath>
+
 #include "arrowchooser.h"
 #include "commonstrings.h"
 #include "dasheditor.h"
+#include "iconmanager.h"
 #include "pageitem.h"
 #include "pageitem_textframe.h"
 #include "sccolorengine.h"
 #include "sccombobox.h"
-
+#include "scraction.h"
 #include "scribuscore.h"
-#include "scraction.h"
-
 #include "selection.h"
+#include "ui/propertiespalette_utils.h"
+#include "undomanager.h"
 #include "units.h"
-#include "undomanager.h"
 #include "util.h"
-#include "util_icon.h"
 #include "util_math.h"
-#include "ui/propertiespalette_utils.h"
+
 
 //using namespace std;
 
@@ -674,16 +674,17 @@
 
 	int oldLJoinStyle=lineJoinStyle->currentIndex();
 	lineJoinStyle->clear();
-	lineJoinStyle->addItem(loadIcon("16/stroke-join-miter.png"), tr("Miter Join"));
-	lineJoinStyle->addItem(loadIcon("16/stroke-join-bevel.png"), tr("Bevel Join"));
-	lineJoinStyle->addItem(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);
 
 	int oldLEndStyle=lineEndStyle->currentIndex();
 	lineEndStyle->clear();
-	lineEndStyle->addItem(loadIcon("16/stroke-cap-butt.png"), tr("Flat Cap"));
-	lineEndStyle->addItem(loadIcon("16/stroke-cap-square.png"), tr("Square Cap"));
-	lineEndStyle->addItem(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=20185&path=/trunk/Scribus/scribus/ui/propertiespalette_shape.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/propertiespalette_shape.cpp (original)
+++ trunk/Scribus/scribus/ui/propertiespalette_shape.cpp Sun Jun 21 21:46:55 2015
@@ -15,6 +15,7 @@
 #include "appmodes.h"
 #include "autoform.h"
 #include "commonstrings.h"
+#include "iconmanager.h"
 #include "pageitem_arc.h"
 #include "pageitem_regularpolygon.h"
 #include "pageitem_textframe.h"
@@ -32,8 +33,8 @@
 #include "undomanager.h"
 #include "units.h"
 #include "util.h"
-#include "util_icon.h"
 #include "util_math.h"
+
 
 PropertiesPalette_Shape::PropertiesPalette_Shape( QWidget* parent) : QWidget(parent)
 {
@@ -51,11 +52,11 @@
 
 	roundRectLabel->setBuddy(roundRect);
 
-	textFlowDisabled->setIcon(QIcon(loadIcon("flow-none.png")));
-	textFlowUsesFrameShape->setIcon(QIcon(loadIcon("flow-frame.png")));
-	textFlowUsesBoundingBox->setIcon(QIcon(loadIcon("flow-bounding.png")));
-	textFlowUsesContourLine->setIcon(QIcon(loadIcon("flow-contour.png")));
-	textFlowUsesImageClipping->setIcon(QIcon(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=20185&path=/trunk/Scribus/scribus/ui/propertiespalette_table.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/propertiespalette_table.cpp (original)
+++ trunk/Scribus/scribus/ui/propertiespalette_table.cpp Sun Jun 21 21:46:55 2015
@@ -15,6 +15,7 @@
 #include "appmodes.h"
 #include "colorcombo.h"
 #include "commonstrings.h"
+#include "iconmanager.h"
 #include "pageitem_table.h"
 #include "propertiespalette_table.h"
 #include "sccolorengine.h"
@@ -24,7 +25,7 @@
 #include "tablesideselector.h"
 #include "util.h"
 #include "util_color.h"
-#include "util_icon.h"
+
 
 
 PropertiesPalette_Table::PropertiesPalette_Table(QWidget* parent) : QWidget(parent),
@@ -33,12 +34,12 @@
 	setupUi(this);
 	setSizePolicy( QSizePolicy(QSizePolicy::Maximum, QSizePolicy::Maximum));
 
-	addBorderLineButton->setIcon(QIcon(loadIcon("penciladd.png")));
-	removeBorderLineButton->setIcon(QIcon(loadIcon("pencilsub.png")));
+	addBorderLineButton->setIcon(IconManager::instance()->loadIcon("penciladd.png"));
+	removeBorderLineButton->setIcon(IconManager::instance()->loadIcon("pencilsub.png"));
 	labelTable->setBuddy(tableStyleCombo);
-	buttonClearTableStyle->setIcon(loadIcon("16/edit-clear.png"));
+	buttonClearTableStyle->setIcon(IconManager::instance()->loadIcon("16/edit-clear.png"));
 	labelCells->setBuddy(cellStyleCombo);
-	buttonClearCellStyle->setIcon(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=20185&path=/trunk/Scribus/scribus/ui/propertiespalette_text.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/propertiespalette_text.cpp (original)
+++ trunk/Scribus/scribus/ui/propertiespalette_text.cpp Sun Jun 21 21:46:55 2015
@@ -13,39 +13,37 @@
 #endif
 #include <cmath>
 
-
 #include "appmodes.h"
+#include "colorcombo.h"
+#include "colorlistbox.h"
 #include "commonstrings.h"
-#include "colorlistbox.h"
+#include "fontcombo.h"
+#include "iconmanager.h"
 #include "pageitem.h"
 #include "pageitem_table.h"
 #include "pageitem_textframe.h"
 #include "propertiespalette_utils.h"
 #include "propertywidget_advanced.h"
 #include "propertywidget_distance.h"
-#include "propertywidget_pareffect.h"
 #include "propertywidget_flop.h"
 #include "propertywidget_optmargins.h"
 #include "propertywidget_orphans.h"
+#include "propertywidget_pareffect.h"
 #include "propertywidget_pathtext.h"
 #include "propertywidget_textcolor.h"
 #include "sccombobox.h"
 #include "scfonts.h"
-
+#include "scraction.h"
 #include "scribuscore.h"
-#include "scraction.h"
-
 #include "selection.h"
 #include "spalette.h"
 #include "styleselect.h"
 #include "tabmanager.h"
+#include "undomanager.h"
 #include "units.h"
-#include "undomanager.h"
 #include "util.h"
-#include "util_icon.h"
 #include "util_math.h"
-#include "fontcombo.h"
-#include "colorcombo.h"
+
 
 //using namespace std;
 
@@ -62,13 +60,13 @@
 	setSizePolicy( QSizePolicy(QSizePolicy::Maximum, QSizePolicy::Maximum));
 
 	fontSize->setPrefix( "" );
-	fontSizeLabel->setPixmap(loadIcon("Zeichen.xpm"));
-	lineSpacingLabel->setPixmap(loadIcon("linespacing2.png"));
+	fontSizeLabel->setPixmap(IconManager::instance()->loadPixmap("Zeichen.xpm"));
+	lineSpacingLabel->setPixmap(IconManager::instance()->loadPixmap("linespacing2.png"));
 
 	paraStyleLabel->setBuddy(paraStyleCombo);
-	paraStyleClear->setIcon(loadIcon("16/edit-clear.png"));
+	paraStyleClear->setIcon(IconManager::instance()->loadPixmap("16/edit-clear.png"));
 	charStyleLabel->setBuddy(charStyleCombo);
-	charStyleClear->setIcon(loadIcon("16/edit-clear.png"));
+	charStyleClear->setIcon(IconManager::instance()->loadPixmap("16/edit-clear.png"));
 
 	colorWidgets = new PropertyWidget_TextColor(textTree);
 	colorWidgetsItem = textTree->addWidget( tr("Color && Effects"), colorWidgets);

Modified: trunk/Scribus/scribus/ui/propertiespalette_xyz.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20185&path=/trunk/Scribus/scribus/ui/propertiespalette_xyz.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/propertiespalette_xyz.cpp (original)
+++ trunk/Scribus/scribus/ui/propertiespalette_xyz.cpp Sun Jun 21 21:46:55 2015
@@ -38,7 +38,7 @@
 #include "units.h"
 #include "undomanager.h"
 #include "util.h"
-#include "util_icon.h"
+#include "iconmanager.h"
 #include "util_math.h"
 
 //using namespace std;
@@ -82,37 +82,37 @@
 
 	rotationSpin->setNewUnit(6);
 	rotationLabel->setBuddy(rotationSpin);
-
-	levelUp->setIcon(QIcon(loadIcon("16/go-up.png")));
-	levelDown->setIcon(QIcon(loadIcon("16/go-down.png")));
-	levelTop->setIcon(QIcon(loadIcon("16/go-top.png")));
-	levelBottom->setIcon(QIcon(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(QIcon(loadIcon("group.png")));
-	doUnGroup->setIcon(QIcon(loadIcon("ungroup.png")));
-
-	flipH->setIcon(QIcon(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(QIcon(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(loadIcon("16/lock.png"), QIcon::Normal, QIcon::On);
-	a.addPixmap(loadIcon("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(loadIcon("NoPrint.png"), QIcon::Normal, QIcon::On);
-	a2.addPixmap(loadIcon("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(loadIcon("framenoresize.png"), QIcon::Normal, QIcon::On);
-	a3.addPixmap(loadIcon("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=20185&path=/trunk/Scribus/scribus/ui/propertywidget_advanced.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/propertywidget_advanced.cpp (original)
+++ trunk/Scribus/scribus/ui/propertywidget_advanced.cpp Sun Jun 21 21:46:55 2015
@@ -8,12 +8,12 @@
 #include "propertywidget_advanced.h"
 
 #include "appmodes.h"
+#include "iconmanager.h"
 #include "pageitem_table.h"
 #include "scribus.h"
 #include "scribusdoc.h"
 #include "selection.h"
 #include "units.h"
-#include "util_icon.h"
 
 PropertyWidget_Advanced::PropertyWidget_Advanced(QWidget* parent) : QFrame(parent)
 {
@@ -28,14 +28,14 @@
 	layout()->setAlignment( Qt::AlignLeft );
 
 	textBase->setValue( 0 );
-	textBaseLabel->setPixmap(loadIcon("textbase.png"));
-	trackingLabel->setPixmap(loadIcon("textkern.png"));
+	textBaseLabel->setPixmap(IconManager::instance()->loadPixmap("textbase.png"));
+	trackingLabel->setPixmap(IconManager::instance()->loadPixmap("textkern.png"));
 
 	scaleH->setValues(10, 400, 2, 100 );
-	scaleHLabel->setPixmap(loadIcon("textscaleh.png"));
+	scaleHLabel->setPixmap(IconManager::instance()->loadPixmap("textscaleh.png"));
 
 	scaleV->setValues(10, 400, 2, 100 );
-	scaleVLabel->setPixmap(loadIcon("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=20185&path=/trunk/Scribus/scribus/ui/propertywidget_pareffect.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/propertywidget_pareffect.cpp (original)
+++ trunk/Scribus/scribus/ui/propertywidget_pareffect.cpp Sun Jun 21 21:46:55 2015
@@ -8,8 +8,9 @@
 #include "propertywidget_pareffect.h"
 
 
+#include "appmodehelper.h"
 #include "appmodes.h"
-#include "appmodehelper.h"
+#include "iconmanager.h"
 #include "pageitem.h"
 #include "pageitem_table.h"
 #include "scribus.h"
@@ -18,8 +19,6 @@
 #include "ui/sctreewidget.h"
 #include "units.h"
 #include "util.h"
-#include "util_icon.h"
-
 
 PropertyWidget_ParEffect::PropertyWidget_ParEffect(QWidget *parent) : QFrame(parent), m_enhanced(NULL), m_item(NULL), m_ScMW(NULL)
 {
@@ -36,7 +35,7 @@
 	fillBulletStrEditCombo();
 	fillNumFormatCombo();
 	enableParEffect(false);
-	bulletCharTableButton->setIcon(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=20185&path=/trunk/Scribus/scribus/ui/propertywidget_textcolor.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/propertywidget_textcolor.cpp (original)
+++ trunk/Scribus/scribus/ui/propertywidget_textcolor.cpp Sun Jun 21 21:46:55 2015
@@ -5,13 +5,13 @@
 for which a new license (GPL+exception) is in place.
 */
 
+
+#include "appmodes.h"
+#include "iconmanager.h"
+#include "pageitem_table.h"
 #include "propertywidget_textcolor.h"
-
-#include "appmodes.h"
-#include "pageitem_table.h"
 #include "scribus.h"
 #include "selection.h"
-#include "util_icon.h"
 
 PropertyWidget_TextColor::PropertyWidget_TextColor(QWidget* parent) : QFrame(parent)
 {
@@ -26,17 +26,17 @@
 	layout()->setAlignment( Qt::AlignLeft );
 
 	fillLayout->setAlignment( Qt::AlignLeft );
-	fillIcon->setPixmap(loadIcon("16/color-fill.png"));
+	fillIcon->setPixmap(IconManager::instance()->loadPixmap("16/color-fill.png"));
 	fillIcon->setScaledContents( false );
-	fillShadeLabel->setPixmap(loadIcon("shade.png"));
+	fillShadeLabel->setPixmap(IconManager::instance()->loadPixmap("shade.png"));
 
 	strokeLayout->setAlignment( Qt::AlignLeft );
-	strokeIcon->setPixmap(loadIcon("16/color-stroke.png"));
+	strokeIcon->setPixmap(IconManager::instance()->loadPixmap("16/color-stroke.png"));
 	strokeIcon->setScaledContents( false );
-	strokeShadeLabel->setPixmap(loadIcon("shade.png"));
+	strokeShadeLabel->setPixmap(IconManager::instance()->loadPixmap("shade.png"));
 
 	effectsLayout->setAlignment( Qt::AlignLeft );
-	revertButton->setIcon(loadIcon("Revers.png"));
+	revertButton->setIcon(IconManager::instance()->loadIcon("Revers.png"));
 	revertButton->setCheckable( true );
 
 	languageChange();

Modified: trunk/Scribus/scribus/ui/query.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20185&path=/trunk/Scribus/scribus/ui/query.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/query.cpp (original)
+++ trunk/Scribus/scribus/ui/query.cpp Sun Jun 21 21:46:55 2015
@@ -15,12 +15,12 @@
 #include <QRegExpValidator>
 #include "commonstrings.h"
 #include "ui/scmessagebox.h"
-#include "util_icon.h"
+#include "iconmanager.h"
 
 Query::Query( QWidget* parent,  const char* name, bool modal, QString text, QString titel ) : QDialog( parent )
 {
 	setWindowTitle( titel );
-	setWindowIcon(loadIcon("AppIcon.png"));
+	setWindowIcon(IconManager::instance()->loadIcon("AppIcon.png"));
 	setModal(modal);
 	queryLayout = new QVBoxLayout( this );
 	queryLayout->setMargin(5);

Modified: trunk/Scribus/scribus/ui/replacecolors.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20185&path=/trunk/Scribus/scribus/ui/replacecolors.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/replacecolors.cpp (original)
+++ trunk/Scribus/scribus/ui/replacecolors.cpp Sun Jun 21 21:46:55 2015
@@ -29,23 +29,23 @@
 #include "commonstrings.h"
 #include "sccolorengine.h"
 #include "util_color.h"
-#include "util_icon.h"
+#include "iconmanager.h"
 #include <QHeaderView>
 
 replaceColorsDialog::replaceColorsDialog(QWidget* parent, ColorList &colorList, ColorList &colorListUsed) : QDialog(parent)
 {
 	setupUi(this);
 	setModal(true);
-	setWindowIcon(QIcon(loadIcon ( "AppIcon.png" )));
+	setWindowIcon(IconManager::instance()->loadPixmap("AppIcon.png"));
 	EditColors = colorList;
 	UsedColors = colorListUsed;
 	selectedRow = -1;
 	replaceMap.clear();
-	alertIcon = loadIcon("alert.png", true);
-	cmykIcon = loadIcon("cmyk.png", true);
-	rgbIcon = loadIcon("rgb.png", true);
-	spotIcon = loadIcon("spot.png", true);
-	regIcon = loadIcon("register.png", true);
+	alertIcon = IconManager::instance()->loadPixmap("alert.png", true);
+	cmykIcon = IconManager::instance()->loadPixmap("cmyk.png", true);
+	rgbIcon = IconManager::instance()->loadPixmap("rgb.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=20185&path=/trunk/Scribus/scribus/ui/replaceonecolor.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/replaceonecolor.cpp (original)
+++ trunk/Scribus/scribus/ui/replaceonecolor.cpp Sun Jun 21 21:46:55 2015
@@ -25,14 +25,14 @@
 ***************************************************************************/
 
 #include "replaceonecolor.h"
-#include "util_icon.h"
+#include "iconmanager.h"
 #include "util.h"
 
 replaceColorDialog::replaceColorDialog(QWidget* parent, ColorList &availableColors, ColorList &usedColors) : QDialog(parent)
 {
 	setupUi(this);
 	setModal(true);
-	setWindowIcon(QIcon(loadIcon( "AppIcon.png" )));
+	setWindowIcon(IconManager::instance()->loadIcon("AppIcon.png" ));
 	originalColor->addItem(CommonStrings::tr_NoneColor);
 	originalColor->insertItems(usedColors, ColorCombo::fancyPixmaps);
 	replacementColor->addItem(CommonStrings::tr_NoneColor);

Modified: trunk/Scribus/scribus/ui/rulermover.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20185&path=/trunk/Scribus/scribus/ui/rulermover.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/rulermover.cpp (original)
+++ trunk/Scribus/scribus/ui/rulermover.cpp Sun Jun 21 21:46:55 2015
@@ -30,15 +30,16 @@
 #include <QPalette>
 #include <QWidget>
 
+
 #include "canvas.h"
 #include "canvasgesture_rulermove.h"
-#include "ui/guidemanager.h"
-#include "scribusview.h"
-#include "scribusdoc.h"
+#include "iconmanager.h"
 #include "scraction.h"
 #include "scribus.h"
+#include "scribusdoc.h"
+#include "scribusview.h"
+#include "ui/guidemanager.h"
 
-#include "util_icon.h"
 
 RulerMover::RulerMover(ScribusView *pa) : QWidget(pa)
 {
@@ -46,7 +47,7 @@
 	setAutoFillBackground(true);
 	QPalette palette;
 	palette.setBrush(QPalette::Window, QColor(240, 240, 240));
-	palette.setBrush(backgroundRole(), QBrush(loadIcon("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=20185&path=/trunk/Scribus/scribus/ui/scdockpalette.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/scdockpalette.cpp (original)
+++ trunk/Scribus/scribus/ui/scdockpalette.cpp Sun Jun 21 21:46:55 2015
@@ -31,13 +31,12 @@
 #include <QMainWindow>
 #include <QPoint>
 
+#include "iconmanager.h"
 #include "prefscontext.h"
 #include "prefsfile.h"
 #include "prefsmanager.h"
 #include "scdockpalette.h"
-
 #include "util.h"
-#include "util_icon.h"
 
 ScDockPalette::ScDockPalette( QWidget * parent, const QString& prefsContext, Qt::WindowFlags f)
 #if defined(Q_OS_MAC) || defined(Q_OS_WIN)
@@ -67,7 +66,7 @@
 	originalParent=parent;
 	tempParent=0;
 	setAllowedAreas(Qt::LeftDockWidgetArea | Qt::RightDockWidgetArea);
-	setWindowIcon(loadIcon("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=20185&path=/trunk/Scribus/scribus/ui/scinputdialog.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/scinputdialog.cpp (original)
+++ trunk/Scribus/scribus/ui/scinputdialog.cpp Sun Jun 21 21:46:55 2015
@@ -16,14 +16,14 @@
 
 #include "scrspinbox.h"
 #include "util.h"
-#include "util_icon.h"
+#include "iconmanager.h"
 
 ScInputDialog::ScInputDialog( QWidget* parent, const char* name, bool modal) : QDialog( parent )
 {
 	if ( !name )
 		setObjectName( "ScInputDialog" );
 	setModal(modal);
-	setWindowIcon(QIcon(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=20185&path=/trunk/Scribus/scribus/ui/scmenu.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/scmenu.cpp (original)
+++ trunk/Scribus/scribus/ui/scmenu.cpp Sun Jun 21 21:46:55 2015
@@ -27,7 +27,7 @@
 #include "scmenu.h"
 #include "scraction.h"
 #include "util_debug.h"
-#include "util_icon.h"
+#include "iconmanager.h"
 
 
 ScrPopupMenu::ScrPopupMenu ( QWidget * parent, const QString pMenuName, const QString pMenuText, const QString parentName, bool pCheckable ) : QObject(parent)
@@ -166,7 +166,7 @@
 			}
 		}
 		if (newMenuAction->icon().isNull() && ! menuListHasNoIcons)
-			newMenuAction->setIcon(loadIcon("noicon.xpm"));
+			newMenuAction->setIcon(IconManager::instance()->loadIcon("noicon.xpm"));
 #endif
 
 		menuItemList.append(newMenuAction);
@@ -201,7 +201,7 @@
 #ifdef Q_OS_MAC
 	if (newMenuAction && afterMenuAction)
 		if (newMenuAction->icon().isNull() && ! (afterMenuAction->icon().isNull()))
-			newMenuAction->setIcon(loadIcon("noicon.xpm"));
+			newMenuAction->setIcon(IconManager::instance()->loadIcon("noicon.xpm"));
 #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=20185&path=/trunk/Scribus/scribus/ui/scrapbookpalette.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/scrapbookpalette.cpp (original)
+++ trunk/Scribus/scribus/ui/scrapbookpalette.cpp Sun Jun 21 21:46:55 2015
@@ -7,51 +7,52 @@
 
 #include "scrapbookpalette.h"
 
+#include <QAction>
+#include <QApplication>
+#include <QByteArray>
+#include <QCursor>
+#include <QDataStream>
+#include <QDomDocument>
+#include <QDrag>
+#include <QDropEvent>
 #include <QEvent>
-#include <QDataStream>
-#include <QApplication>
+#include <QFile>
+#include <QFileDialog>
+#include <QFileInfo>
 #include <QHBoxLayout>
+#include <QKeyEvent>
+#include <QMenu>
+#include <QMessageBox>
+#include <QMimeData>
+#include <QPainter>
+#include <QPixmap>
+#include <QProgressDialog>
+#include <QSignalMapper>
+#include <QSpacerItem>
+#include <QToolBox>
+#include <QToolButton>
+#include <QToolTip>
+#include <QUrl>
 #include <QVBoxLayout>
-#include <QSpacerItem>
-#include <QKeyEvent>
-#include <QByteArray>
-#include <QPixmap>
-#include <QFileDialog>
-#include <QUrl>
-#include <QDropEvent>
-#include <QMenu>
-#include <QAction>
-#include <QSignalMapper>
-#include <QFile>
-#include <QFileInfo>
-#include <QDomDocument>
-#include <QToolButton>
-#include <QCursor>
-#include <QToolBox>
-#include <QMessageBox>
-#include <QToolTip>
-#include <QPainter>
-#include <QProgressDialog>
-#include <QDrag>
-#include <QMimeData>
-
+
+#include "cmsettings.h"
 #include "commonstrings.h"
-#include "cmsettings.h"
+#include "fileloader.h"
 #include "filewatcher.h"
+#include "iconmanager.h"
+#include "loadsaveplugin.h"
+#include "plugins/formatidlist.h"
 #include "prefsfile.h"
 #include "prefsmanager.h"
 #include "query.h"
+#include "scimage.h"
 #include "scpreview.h"
-#include "scimage.h"
 #include "scribuscore.h"
-#include "fileloader.h"
-#include "loadsaveplugin.h"
-#include "plugins/formatidlist.h"
 #include "util.h"
 #include "util_color.h"
 #include "util_file.h"
 #include "util_formats.h"
-#include "util_icon.h"
+
 //CB TODO bring in the prefsManager instance locally here too
 
 /* The Scrapbook View Class
@@ -536,7 +537,7 @@
 			}
 			if (dd[dc].compare(".ScribusThumbs", Qt::CaseInsensitive) == 0)
 				continue;
-			QPixmap pm = loadIcon("folder.png");
+			QPixmap pm = IconManager::instance()->loadPixmap("folder.png");
 			AddObj(dd[dc], "", pm, true);
 		}
 	}
@@ -710,23 +711,23 @@
 	buttonLayout->setMargin( 0 );
 	newButton = new QToolButton(this);
 	newButton->setSizePolicy(QSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed));
-	newButton->setIcon(loadIcon("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(loadIcon("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(loadIcon("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(loadIcon("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(loadIcon("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"));
@@ -800,7 +801,7 @@
 		if (activeBView->canWrite)
 			Frame3->addItem(activeBView, d.dirName());
 		else
-			Frame3->addItem(activeBView, QIcon(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();
@@ -938,7 +939,7 @@
 	if (activeBView->canWrite)
 		Frame3->addItem(activeBView, d.dirName());
 	else
-		Frame3->addItem(activeBView, QIcon(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();
@@ -1083,7 +1084,7 @@
 			if (fd.isWritable())
 				Frame3->addItem(activeBView, d.dirName());
 			else
-				Frame3->addItem(activeBView, QIcon(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);
@@ -1092,7 +1093,7 @@
 		activeBView->visibleName = d.dirName();
 		Frame3->setItemText(Frame3->indexOf(activeBView), d.dirName());
 		if (!activeBView->canWrite)
-			Frame3->setItemIcon(Frame3->indexOf(activeBView), QIcon(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");
@@ -1123,7 +1124,7 @@
 	activeBView->visibleName = d.dirName();
 	Frame3->setItemText(Frame3->indexOf(activeBView), d.dirName());
 	if (!activeBView->canWrite)
-		Frame3->setItemIcon(Frame3->indexOf(activeBView), QIcon(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=20185&path=/trunk/Scribus/scribus/ui/scrpalettebase.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/scrpalettebase.cpp (original)
+++ trunk/Scribus/scribus/ui/scrpalettebase.cpp Sun Jun 21 21:46:55 2015
@@ -30,13 +30,12 @@
 #include <QHideEvent>
 #include <QPoint>
 
+#include "iconmanager.h"
 #include "prefscontext.h"
 #include "prefsfile.h"
 #include "prefsmanager.h"
-
 #include "scrpalettebase.h"
 #include "util.h"
-#include "util_icon.h"
 
 ScrPaletteBase::ScrPaletteBase(  QWidget * parent, const QString& prefsContext, bool modal, Qt::WindowFlags f)
 	: QDialog ( parent, f | Qt::Tool | Qt::CustomizeWindowHint
@@ -63,7 +62,7 @@
 	}
 	originalParent=parent;
 	tempParent=0;
-	setWindowIcon(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=20185&path=/trunk/Scribus/scribus/ui/search.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/search.cpp (original)
+++ trunk/Scribus/scribus/ui/search.cpp Sun Jun 21 21:46:55 2015
@@ -24,6 +24,7 @@
 #include "colorlistbox.h"
 #include "commonstrings.h"
 #include "fontcombo.h"
+#include "iconmanager.h"
 #include "prefscontext.h"
 #include "prefsfile.h"
 #include "prefsmanager.h"
@@ -34,7 +35,6 @@
 #include "styleselect.h"
 #include "ui/storyeditor.h"
 #include "util.h"
-#include "util_icon.h"
 #include "util_text.h"
 
 SearchReplace::SearchReplace( QWidget* parent, ScribusDoc *doc, PageItem* ite, bool mode )
@@ -48,7 +48,7 @@
 
 	setModal(true);
 	setWindowTitle( tr( "Search/Replace" ) );
-	setWindowIcon(QIcon(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=20185&path=/trunk/Scribus/scribus/ui/selectobjects.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/selectobjects.cpp (original)
+++ trunk/Scribus/scribus/ui/selectobjects.cpp Sun Jun 21 21:46:55 2015
@@ -26,13 +26,13 @@
 
 #include "selectobjects.h"
 #include "commonstrings.h"
-#include "util_icon.h"
+#include "iconmanager.h"
 
 selectDialog::selectDialog(QWidget* parent, ColorList &availableColors, int unitIndex) : QDialog(parent)
 {
 	setupUi(this);
 	setModal(true);
-	setWindowIcon(QIcon(loadIcon ( "AppIcon.png" )));
+	setWindowIcon(IconManager::instance()->loadIcon("AppIcon.png"));
 	backgroundCombo->addItem(CommonStrings::tr_NoneColor);
 	backgroundCombo->insertItems(availableColors, ColorCombo::fancyPixmaps);
 	lineCombo->addItem(CommonStrings::tr_NoneColor);

Modified: trunk/Scribus/scribus/ui/selfield.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20185&path=/trunk/Scribus/scribus/ui/selfield.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/selfield.cpp (original)
+++ trunk/Scribus/scribus/ui/selfield.cpp Sun Jun 21 21:46:55 2015
@@ -20,13 +20,13 @@
 #include "pageitem.h"
 #include "scfonts.h"
 #include "scribusdoc.h"
-#include "util_icon.h"
+#include "iconmanager.h"
 
 SelectFields::SelectFields(QWidget* parent, QString Felder, QString Own, ScribusDoc *Doc, int Art) : QDialog(parent)
 {
 	setModal(true);
 	setWindowTitle( tr( "Select Fields" ) );
-	setWindowIcon(QIcon(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=20185&path=/trunk/Scribus/scribus/ui/smcellstylewidget.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/smcellstylewidget.cpp (original)
+++ trunk/Scribus/scribus/ui/smcellstylewidget.cpp Sun Jun 21 21:46:55 2015
@@ -8,15 +8,15 @@
 */
 
 #include "smcellstylewidget.h"
-#include "util_icon.h"
+#include "iconmanager.h"
 
 SMCellStyleWidget::SMCellStyleWidget(QWidget *parent) : QWidget()
 {
 	setupUi(this);
 
-	fillColorIcon->setPixmap(loadIcon("16/color-fill.png"));
+	fillColorIcon->setPixmap(IconManager::instance()->loadPixmap("16/color-fill.png"));
 	fillColor->addItem(CommonStrings::tr_NoneColor);
-	fillShadeLabel->setPixmap( loadIcon("shade.png") );
+	fillShadeLabel->setPixmap(IconManager::instance()->loadPixmap("shade.png") );
 	fillShade->setToolTip( tr("Fill Shade"));
 }
 

Modified: trunk/Scribus/scribus/ui/smcstylewidget.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20185&path=/trunk/Scribus/scribus/ui/smcstylewidget.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/smcstylewidget.cpp (original)
+++ trunk/Scribus/scribus/ui/smcstylewidget.cpp Sun Jun 21 21:46:55 2015
@@ -9,7 +9,7 @@
 
 #include "langmgr.h"
 #include "smcstylewidget.h"
-#include "util_icon.h"
+#include "iconmanager.h"
 #include "util.h"
 #include "units.h"
 
@@ -18,36 +18,17 @@
 {
 	setupUi(this);
 
-// 	fontSize_->setMinimum(1.0);
-// 	fontSize_->setMaximum(2048.0);
-	fontSizeLabel_->setPixmap(loadIcon("Zeichen.xpm"));
-
-	trackingLabel_->setPixmap( loadIcon("textkern.png") );
-// 	tracking_->setMinimum(-300.0);
-// 	tracking_->setMaximum(300.0);
-// 	tracking_->setSuffix( tr( " %" ) );
-	
-	widthSpaceLabel->setPixmap( loadIcon("spacewidth.png") );
-
-	baselineOffsetLabel_->setPixmap( loadIcon("textbase.png") );
-// 	baselineOffset_->setMinimum(-100.0);
-// 	baselineOffset_->setMaximum(100.0);
-// 	baselineOffset_->setSuffix( tr( " %" ) );
-
-	hscaleLabel_->setPixmap( loadIcon("textscaleh.png") );
-// 	fontHScale_->setMinimum(10.0);
-// 	fontHScale_->setMaximum(400.0);
-// 	fontHScale_->setSuffix( tr( " %" ) );
-
-	vscaleLabel_->setPixmap( loadIcon("textscalev.png") );
-// 	fontVScale_->setMinimum(10.0);
-// 	fontVScale_->setMaximum(400.0);
-// 	fontVScale_->setSuffix( tr( " %" ) );
-
-	FillIcon->setPixmap(loadIcon("16/color-fill.png"));
-	fillShadeLabel->setPixmap( loadIcon("shade.png") );
-	StrokeIcon->setPixmap(loadIcon("16/color-stroke.png"));
-	strokeShadeLabel->setPixmap( loadIcon("shade.png") );
+	IconManager* im = IconManager::instance();
+	fontSizeLabel_->setPixmap(im->loadPixmap("Zeichen.xpm"));
+	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"));
 
 	fillColor_->clear();
 	strokeColor_->clear();

Modified: trunk/Scribus/scribus/ui/smlinestylewidget.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20185&path=/trunk/Scribus/scribus/ui/smlinestylewidget.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/smlinestylewidget.cpp (original)
+++ trunk/Scribus/scribus/ui/smlinestylewidget.cpp Sun Jun 21 21:46:55 2015
@@ -14,26 +14,27 @@
 #include "sccolorengine.h"
 #include "scrspinbox.h"
 #include "util_color.h"
-#include "util_icon.h"
+#include "iconmanager.h"
 #include "util.h"
 
 
 SMLineStyleWidget::SMLineStyleWidget() : QWidget()
 {
 	setupUi(this);
-	addButton->setIcon(QIcon(loadIcon("penciladd.png")));
-	removeButton->setIcon(QIcon(loadIcon("pencilsub.png")));
+	IconManager* im  = IconManager::instance();
+	addButton->setIcon(im->loadIcon("penciladd.png"));
+	removeButton->setIcon(im->loadIcon("pencilsub.png"));
 
 	lineWidth->setMinimum(0.0);
 	lineWidth->setMaximum(300.0);
 
-	endCombo->addItem(loadIcon("ButtCap.png"), tr( "Flat Cap" ) );
-	endCombo->addItem(loadIcon("SquareCap.png"), tr( "Square Cap" ) );
-	endCombo->addItem(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" ) );
 
-	joinCombo->addItem(loadIcon("MiterJoin.png"), tr( "Miter Join" ) );
-	joinCombo->addItem(loadIcon("BevelJoin.png"), tr( "Bevel Join" ) );
-	joinCombo->addItem(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" ) );
 
 	languageChange();
 }

Modified: trunk/Scribus/scribus/ui/smpstylewidget.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20185&path=/trunk/Scribus/scribus/ui/smpstylewidget.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/smpstylewidget.cpp (original)
+++ trunk/Scribus/scribus/ui/smpstylewidget.cpp Sun Jun 21 21:46:55 2015
@@ -12,7 +12,7 @@
 #include "scribus.h"
 #include "units.h"
 #include "util.h"
-#include "util_icon.h"
+#include "iconmanager.h"
 #include "ui/charselectenhanced.h"
 
 static bool isEqual(double a, double b)
@@ -32,9 +32,9 @@
 	setupUi(this);
 	//Not used yet
 // 	optMarginCheckLeftProtruding->setVisible(false);
-	lineSpacingLabel->setPixmap(loadIcon("linespacing2.png"));
-	spaceAboveLabel->setPixmap( loadIcon("above.png") );
-	spaceBelowLabel->setPixmap( loadIcon("below.png") );
+	lineSpacingLabel->setPixmap(IconManager::instance()->loadPixmap("linespacing2.png"));
+	spaceAboveLabel->setPixmap(IconManager::instance()->loadPixmap("above.png") );
+	spaceBelowLabel->setPixmap(IconManager::instance()->loadPixmap("below.png") );
 
 	lineSpacingMode->addItem( tr("Fixed Linespacing"));
 	lineSpacingMode->addItem( tr("Automatic Linespacing"));
@@ -55,7 +55,7 @@
 	parEffectOffset->setSuffix(unitGetSuffixFromIndex(0));
 
 	fillBulletStrEditCombo();
-	bulletCharTableButton->setIcon(loadIcon("22/insert-table.png"));
+	bulletCharTableButton->setIcon(IconManager::instance()->loadPixmap("22/insert-table.png"));
 	fillNumFormatCombo();
 	numStartSpin->setMinimum(1);
 	numStartSpin->setMaximum(9999);

Modified: trunk/Scribus/scribus/ui/smtablestylewidget.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20185&path=/trunk/Scribus/scribus/ui/smtablestylewidget.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/smtablestylewidget.cpp (original)
+++ trunk/Scribus/scribus/ui/smtablestylewidget.cpp Sun Jun 21 21:46:55 2015
@@ -8,15 +8,15 @@
 */
 
 #include "smtablestylewidget.h"
-#include "util_icon.h"
+#include "iconmanager.h"
 
 SMTableStyleWidget::SMTableStyleWidget(QWidget *parent) : QWidget()
 {
 	setupUi(this);
 
-	fillColorIcon->setPixmap(loadIcon("16/color-fill.png"));
+	fillColorIcon->setPixmap(IconManager::instance()->loadPixmap("16/color-fill.png"));
 	fillColor->addItem(CommonStrings::tr_NoneColor);
-	fillShadeLabel->setPixmap( loadIcon("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=20185&path=/trunk/Scribus/scribus/ui/storyeditor.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/storyeditor.cpp (original)
+++ trunk/Scribus/scribus/ui/storyeditor.cpp Sun Jun 21 21:46:55 2015
@@ -57,6 +57,7 @@
 #include "colorlistbox.h"
 #include "commonstrings.h"
 #include "fontcombo.h"
+#include "iconmanager.h"
 #include "loremipsum.h"
 #include "menumanager.h"
 #include "pageitem.h"
@@ -85,7 +86,7 @@
 #include "units.h"
 #include "util.h"
 #include "util_debug.h"
-#include "util_icon.h"
+
 
 class StyledTextMimeData : public QMimeData
 {
@@ -1094,7 +1095,7 @@
 SToolBColorF::SToolBColorF(QMainWindow* parent, ScribusDoc *doc) : QToolBar( tr("Fill Color Settings"), parent)
 {
 	FillIcon = new QLabel(this);
-	FillIcon->setPixmap(loadIcon("16/color-fill.png"));
+	FillIcon->setPixmap(IconManager::instance()->loadPixmap("16/color-fill.png"));
 	FillIcon->setScaledContents( false );
 	fillIconAction=addWidget(FillIcon);
 	fillIconAction->setVisible(true);
@@ -1169,7 +1170,7 @@
 SToolBColorS::SToolBColorS(QMainWindow* parent, ScribusDoc *doc) : QToolBar( tr("Stroke Color Settings"), parent)
 {
 	StrokeIcon = new QLabel( "", this );
-	StrokeIcon->setPixmap(loadIcon("16/color-stroke.png"));
+	StrokeIcon->setPixmap(IconManager::instance()->loadPixmap("16/color-stroke.png"));
 	StrokeIcon->setScaledContents( false );
 	strokeIconAction=addWidget(StrokeIcon);
 	strokeIconAction->setVisible(true);
@@ -1241,7 +1242,7 @@
 	seStyleAction->setVisible(true);
 	trackingLabel = new QLabel( this );
 	trackingLabel->setText("");
-	trackingLabel->setPixmap(loadIcon("textkern.png"));
+	trackingLabel->setPixmap(IconManager::instance()->loadPixmap("textkern.png"));
 	trackingLabelAction=addWidget(trackingLabel);
 	trackingLabelAction->setVisible(true);
 	Extra = new ScrSpinBox( this, SC_PERCENT );
@@ -1424,7 +1425,7 @@
 	sizeAction=addWidget(Size);
 	sizeAction->setVisible(true);
 	ScaleTxt = new QLabel("", this);
-	ScaleTxt->setPixmap(loadIcon("textscaleh.png"));
+	ScaleTxt->setPixmap(IconManager::instance()->loadPixmap("textscaleh.png"));
 	scaleTxtAction=addWidget(ScaleTxt);
 	scaleTxtAction->setVisible(true);
 	ChScale = new ScrSpinBox( 10, 400,  this, SC_PERCENT );
@@ -1433,7 +1434,7 @@
 	chScaleAction=addWidget(ChScale);
 	chScaleAction->setVisible(true);
 	ScaleTxtV = new QLabel("", this);
-	ScaleTxtV->setPixmap(loadIcon("textscalev.png"));
+	ScaleTxtV->setPixmap(IconManager::instance()->loadPixmap("textscalev.png"));
 	scaleTxtVAction=addWidget(ScaleTxtV);
 	scaleTxtVAction->setVisible(true);
 	ChScaleV = new ScrSpinBox( 10, 400, this, SC_PERCENT );
@@ -1548,7 +1549,7 @@
 	m_spellActive=false;
 	prefsManager=PrefsManager::instance();
 #ifdef Q_OS_MAC
-	noIcon = loadIcon("noicon.xpm");
+	noIcon = IconManager::instance()->loadPixmap("noicon.xpm");
 #endif
 	buildGUI();
 	/*
@@ -1648,14 +1649,15 @@
 
 void StoryEditor::initActions()
 {
+	IconManager* im = IconManager::instance();
 	//File Menu
-	seActions.insert("fileNew", new ScrAction(loadIcon("16/document-new.png"), loadIcon("22/document-new.png"), "", Qt::CTRL+Qt::Key_N, this));
-	seActions.insert("fileRevert", new ScrAction(loadIcon("reload16.png"), loadIcon("reload.png"), "", QKeySequence(), this));
-	seActions.insert("fileSaveToFile", new ScrAction(loadIcon("16/document-save.png"), loadIcon("22/document-save.png"), "", QKeySequence(), this));
-	seActions.insert("fileLoadFromFile", new ScrAction(loadIcon("16/document-open.png"),  loadIcon("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(loadIcon("ok.png"), loadIcon("ok22.png"), "", Qt::CTRL+Qt::Key_W,  this));
-	seActions.insert("fileExit", new ScrAction(loadIcon("exit.png"), loadIcon("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()) );
@@ -1666,15 +1668,15 @@
 	connect( seActions["fileExit"], SIGNAL(triggered()), this, SLOT(Do_leave()) );
 
 	//Edit Menu
-	seActions.insert("editSelectAll", new ScrAction(loadIcon("16/edit-select-all.png"), QPixmap(), "", Qt::CTRL+Qt::Key_A, this));
-	seActions.insert("editCut", new ScrAction(loadIcon("16/edit-cut.png"), QPixmap(), "", Qt::CTRL+Qt::Key_X, this));
-	seActions.insert("editCopy", new ScrAction(loadIcon("16/edit-copy.png"), QPixmap(), "", Qt::CTRL+Qt::Key_C, this));
-	seActions.insert("editPaste", new ScrAction(loadIcon("16/edit-paste.png"), QPixmap(), "", Qt::CTRL+Qt::Key_V, this));
-	seActions.insert("editClear", new ScrAction(loadIcon("16/edit-delete.png"), QPixmap(), "", Qt::Key_Delete, this));
-	seActions.insert("editSearchReplace", new ScrAction(loadIcon("16/edit-find-replace.png"), QPixmap(), "", QKeySequence(), this));
+	seActions.insert("editSelectAll", new ScrAction(im->loadPixmap("16/edit-select-all.png"), QPixmap(), "", Qt::CTRL+Qt::Key_A, 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("editSearchReplace", new ScrAction(im->loadPixmap("16/edit-find-replace.png"), QPixmap(), "", QKeySequence(), this));
 	//seActions.insert("editEditStyle", new ScrAction("", QKeySequence(), this));
 	seActions.insert("editFontPreview", new ScrAction("", QKeySequence(), this));
-	seActions.insert("editUpdateFrame", new ScrAction(loadIcon("compfile16.png"),loadIcon("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["editSelectAll"], SIGNAL(triggered()), this, SLOT(Do_selectAll()) );
 	connect( seActions["editCut"], SIGNAL(triggered()), this, SLOT(Do_cut()) );
@@ -1836,7 +1838,7 @@
 	seActions["unicodeSoftHyphen"]->setEnabled(false);//CB TODO doesnt work in SE yet.
 	buildMenus();
 
-	setWindowIcon(loadIcon("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=20185&path=/trunk/Scribus/scribus/ui/styleselect.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/styleselect.cpp (original)
+++ trunk/Scribus/scribus/ui/styleselect.cpp Sun Jun 21 21:46:55 2015
@@ -8,8 +8,7 @@
 #include <QEvent>
 
 #include "styleselect.h"
-
-#include "util_icon.h"
+#include "iconmanager.h"
 
 
 StrikeValues::StrikeValues( QWidget* parent ) : QFrame( parent )
@@ -130,6 +129,7 @@
 
 StyleSelect::StyleSelect(QWidget* parent) : QWidget(parent)
 {
+	IconManager* im = IconManager::instance();
 	ssLayout = new QHBoxLayout(this);
 	ssLayout->setSpacing( 0 );
 	ssLayout->setMargin( 0 );
@@ -142,7 +142,7 @@
 	underlineButton = new QToolButton( this );
 	underlineButton->setText( "" );
 	underlineButton->setMaximumSize( QSize( 22, 22 ) );
-	underlineButton->setIcon(QIcon(loadIcon("Unter.xpm")));
+	underlineButton->setIcon(im->loadIcon("Unter.xpm"));
 	underlineButton->setCheckable( true );
 	underlineButton->setMenu(UnderlinePop);
 	underlineButton->setPopupMode(QToolButton::DelayedPopup);
@@ -150,7 +150,7 @@
 	underlineWordButton = new QToolButton( this );
 	underlineWordButton->setText( "" );
 	underlineWordButton->setMaximumSize( QSize( 22, 22 ) );
-	underlineWordButton->setIcon(QIcon(loadIcon("wordsOnly.png")));
+	underlineWordButton->setIcon(im->loadIcon("wordsOnly.png"));
 	underlineWordButton->setCheckable( true );
 	underlineWordButton->setMenu(UnderlinePop);
 	underlineWordButton->setPopupMode(QToolButton::DelayedPopup);
@@ -159,26 +159,26 @@
 	subscriptButton = new QToolButton( this );
 	subscriptButton->setText( "" );
 	subscriptButton->setMaximumSize( QSize( 22, 22 ) );
-	subscriptButton->setIcon(QIcon(loadIcon("Tief.xpm")));
+	subscriptButton->setIcon(im->loadIcon("Tief.xpm"));
 	subscriptButton->setCheckable( true );
 	ssLayout->addWidget( subscriptButton );
 	superscriptButton = new QToolButton( this );
 	superscriptButton->setText( "" );
 	superscriptButton->setMaximumSize( QSize( 22, 22 ) );
-	superscriptButton->setIcon(QIcon(loadIcon("Hoch.xpm")));
+	superscriptButton->setIcon(im->loadIcon("Hoch.xpm"));
 	superscriptButton->setCheckable( true );
 	ssLayout->addWidget( superscriptButton );
 
 	allcapsButton = new QToolButton( this );
 	allcapsButton->setMaximumSize( QSize( 22, 22 ) );
 	allcapsButton->setText("");
-	allcapsButton->setIcon(QIcon(loadIcon("AllCaps.png")));
+	allcapsButton->setIcon(im->loadIcon("AllCaps.png"));
 	allcapsButton->setCheckable( true );
 	ssLayout->addWidget( allcapsButton );
 	smallcapsButton = new QToolButton( this );
 	smallcapsButton->setMaximumSize( QSize( 22, 22 ) );
 	smallcapsButton->setText("");
-	smallcapsButton->setIcon(QIcon(loadIcon("Kapital.xpm")));
+	smallcapsButton->setIcon(im->loadIcon("Kapital.xpm"));
 	smallcapsButton->setCheckable( true );
 	ssLayout->addWidget( smallcapsButton );
 
@@ -190,7 +190,7 @@
 	strikeoutButton = new QToolButton( this );
 	strikeoutButton->setText( "" );
 	strikeoutButton->setMaximumSize( QSize( 22, 22 ) );
-	strikeoutButton->setIcon(QIcon(loadIcon("Strike.xpm")));
+	strikeoutButton->setIcon(im->loadIcon("Strike.xpm"));
 	strikeoutButton->setCheckable( true );
 	strikeoutButton->setMenu(StrikePop);
 	strikeoutButton->setPopupMode(QToolButton::DelayedPopup);
@@ -204,7 +204,7 @@
 	outlineButton = new QToolButton( this );
 	outlineButton->setText( "" );
 	outlineButton->setMaximumSize( QSize( 22, 22 ) );
-	outlineButton->setIcon(QIcon(loadIcon("outlined.png")));
+	outlineButton->setIcon(im->loadIcon("outlined.png"));
 	outlineButton->setCheckable( true );
 	outlineButton->setMenu(OutlinePop);
 	outlineButton->setPopupMode(QToolButton::DelayedPopup);
@@ -218,7 +218,7 @@
 	shadowButton = new QToolButton( this );
 	shadowButton->setText( "" );
 	shadowButton->setMaximumSize( QSize( 22, 22 ) );
-	shadowButton->setIcon(QIcon(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=20185&path=/trunk/Scribus/scribus/ui/tabmanager.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/tabmanager.cpp (original)
+++ trunk/Scribus/scribus/ui/tabmanager.cpp Sun Jun 21 21:46:55 2015
@@ -15,13 +15,13 @@
 #include "units.h"
 #include "scribusstructs.h"
 #include "commonstrings.h"
-#include "util_icon.h"
+#include "iconmanager.h"
 
 TabManager::TabManager( QWidget* parent, int dEin, QList<ParagraphStyle::TabRecord> inTab, double) : QDialog( parent )
 {
 	setModal(true);
 	setWindowTitle( tr( "Manage Tabulators" ) );
-	setWindowIcon(QIcon(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=20185&path=/trunk/Scribus/scribus/ui/tabpdfoptions.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/tabpdfoptions.cpp (original)
+++ trunk/Scribus/scribus/ui/tabpdfoptions.cpp Sun Jun 21 21:46:55 2015
@@ -43,7 +43,7 @@
 #include "units.h"
 #include "usertaskstructs.h"
 #include "ui/scrspinbox.h"
-#include "util_icon.h"
+#include "iconmanager.h"
 #include "scribuscore.h"
 #include "util.h"
 
@@ -64,10 +64,10 @@
 
 	// General tab
 	rangeGroupLayout->setAlignment( Qt::AlignTop );
- 	pageNrButton->setIcon(QIcon(loadIcon("ellipsis.png")));
-	MirrorH->setIcon(QIcon(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(QIcon(loadIcon("16/flip-object-vertical.png")));
+	MirrorV->setIcon(IconManager::instance()->loadIcon("16/flip-object-vertical.png"));
 	MirrorV->setCheckable( true );
 
 	fileOptionsLayout->setAlignment( Qt::AlignTop );
@@ -97,8 +97,8 @@
 	groupFontLayout->setAlignment( Qt::AlignTop );
 	EmbedList->setMaximumHeight(300);
 	SubsetList->setMaximumHeight(300);
-	ToSubset->setIcon(QIcon(loadIcon("22/go-next.png")));
-	FromSubset->setIcon(QIcon(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 );
@@ -1448,13 +1448,13 @@
 
 	const ScFace& face = AllFonts.value(fontName);
 	if (face.isReplacement())
-		item = new QListWidgetItem( QIcon(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( QIcon(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( QIcon(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( QIcon(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=20185&path=/trunk/Scribus/scribus/ui/tabruler.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/tabruler.cpp (original)
+++ trunk/Scribus/scribus/ui/tabruler.cpp Sun Jun 21 21:46:55 2015
@@ -5,27 +5,29 @@
 for which a new license (GPL+exception) is in place.
 */
 #include "tabruler.h"
-#include <QVariant>
+
+#include <QApplication>
+#include <QColor>
 #include <QComboBox>
+#include <QCursor>
+#include <QEvent>
 #include <QLabel>
+#include <QLayout>
+#include <QMouseEvent>
+#include <QPaintEvent>
+#include <QPainter>
+#include <QPixmap>
+#include <QPolygon>
 #include <QPushButton>
 #include <QToolButton>
-#include <QLayout>
 #include <QToolTip>
-#include <QPainter>
-#include <QCursor>
-#include <QColor>
-#include <QApplication>
-#include <QPolygon>
-#include <QPixmap>
-#include <QMouseEvent>
-#include <QEvent>
-#include <QPaintEvent>
+#include <QVariant>
+
 #include "commonstrings.h"
 #include "units.h"
 #include "scribusstructs.h"
 #include "scrspinbox.h"
-#include "util_icon.h"
+#include "iconmanager.h"
 #include "util.h"
 
 RulerT::RulerT(QWidget *pa, int ein, QList<ParagraphStyle::TabRecord> Tabs, bool ind, double wid) : QWidget(pa)
@@ -315,7 +317,7 @@
 	}
 	if ((!mousePressed) && (m->y() < height()) && (m->y() > 0) && (m->x() > 0) && (m->x() < width()))
 	{
-		setCursor(QCursor(loadIcon("tab.png"), 3));
+		setCursor(QCursor(IconManager::instance()->loadPixmap("tab.png"), 3));
 		if (haveInd)
 		{
 			fpo = QRect(static_cast<int>(firstLine+leftIndent-offset)-4, 0, 8, 12);
@@ -346,7 +348,7 @@
 	}
 	if ((mousePressed) && ((m->y() > height()) || (m->y() < 0) || (m->x() < 0) || (m->x() > width())))
 	{
-		qApp->changeOverrideCursor(QCursor(loadIcon("DelPoint.png"), 1, 1));
+		qApp->changeOverrideCursor(QCursor(IconManager::instance()->loadPixmap("DelPoint.png"), 1, 1));
 	}
 }
 
@@ -355,7 +357,7 @@
 	if (mousePressed)
 	{
 		if (rulerCode == 3)
-			qApp->changeOverrideCursor(QCursor(loadIcon("DelPoint.png"), 1, 1));
+			qApp->changeOverrideCursor(QCursor(IconManager::instance()->loadPixmap("DelPoint.png"), 1, 1));
 		else
 			qApp->changeOverrideCursor(QCursor(Qt::ArrowCursor));
 	}
@@ -555,20 +557,20 @@
 		firstLineData->setValue(0);
 		firstLineLabel = new QLabel(this);
 		firstLineLabel->setText("");
-		firstLineLabel->setPixmap(loadIcon("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(loadIcon("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(loadIcon("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=20185&path=/trunk/Scribus/scribus/ui/transformdialog.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/transformdialog.cpp (original)
+++ trunk/Scribus/scribus/ui/transformdialog.cpp Sun Jun 21 21:46:55 2015
@@ -29,7 +29,7 @@
 #include "commonstrings.h"
 #include "selection.h"
 #include "units.h"
-#include "util_icon.h"
+#include "iconmanager.h"
 
 #if defined(_MSC_VER) && !defined(_USE_MATH_DEFINES)
 #define _USE_MATH_DEFINES
@@ -46,7 +46,7 @@
 {
 	setupUi(this);
 	setModal(true);
-	setWindowIcon(QIcon(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(loadIcon("16/go-up.png"));
+	buttonUp->setIcon(IconManager::instance()->loadIcon("16/go-up.png"));
 	buttonDown->setText( "" );
-	buttonDown->setIcon(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=20185&path=/trunk/Scribus/scribus/ui/transparencypalette.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/transparencypalette.cpp (original)
+++ trunk/Scribus/scribus/ui/transparencypalette.cpp Sun Jun 21 21:46:55 2015
@@ -26,7 +26,7 @@
 #include "scpainter.h"
 #include "scpattern.h"
 #include "scribus.h"
-#include "util_icon.h"
+#include "iconmanager.h"
 #include "util.h"
 #include "util_math.h"
 
@@ -38,8 +38,8 @@
 	TGradDia = new GradientVectorDialog(this->parentWidget());
 	TGradDia->hide();
 	setupUi(this);
-	editLineSelector->setIcon(QIcon(loadIcon("16/color-stroke.png")));
-	editFillSelector->setIcon(QIcon(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), loadIcon("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=20185&path=/trunk/Scribus/scribus/undogui.cpp
==============================================================================
--- trunk/Scribus/scribus/undogui.cpp (original)
+++ trunk/Scribus/scribus/undogui.cpp Sun Jun 21 21:46:55 2015
@@ -30,12 +30,13 @@
 #include <QPushButton>
 #include <QVBoxLayout>
 
-#include "undogui.h"
+#include "iconmanager.h"
 #include "prefsmanager.h"
+#include "scraction.h"
 #include "scribuscore.h"
 #include "ui/scmwmenumanager.h"
-#include "scraction.h"
-#include "util_icon.h"
+#include "undogui.h"
+
 
 UndoGui::UndoGui(QWidget* parent, const char* name, Qt::WindowFlags f) : ScDockPalette(parent, name, f)
 {
@@ -251,9 +252,9 @@
 	QHBoxLayout* buttonLayout = new QHBoxLayout;
 	buttonLayout->setMargin(0);
 	buttonLayout->setSpacing(5);
-	undoButton = new QPushButton(loadIcon("16/edit-undo.png"), "", this);
+	undoButton = new QPushButton(IconManager::instance()->loadPixmap("16/edit-undo.png"), "", this);
 	buttonLayout->addWidget(undoButton);
-	redoButton = new QPushButton(loadIcon("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=20185&path=/trunk/Scribus/scribus/util_color.cpp
==============================================================================
--- trunk/Scribus/scribus/util_color.cpp (original)
+++ trunk/Scribus/scribus/util_color.cpp Sun Jun 21 21:46:55 2015
@@ -23,21 +23,23 @@
 
 #include <QDomDocument>
 #include <QPainter>
-#include "util_color.h"
-#include "scconfig.h"
-#include "scclocale.h"
-#include "scribusdoc.h"
-#include "scpixmapcache.h"
+
 #include "commonstrings.h"
-#include "sctextstream.h"
-#include "sccolorengine.h"
 #include "fileloader.h"
+#include "iconmanager.h"
 #include "loadsaveplugin.h"
 #include "plugins/formatidlist.h"
+#include "scclocale.h"
+#include "sccolorengine.h"
+#include "scconfig.h"
+#include "scpixmapcache.h"
+#include "scribusdoc.h"
+#include "sctextstream.h"
 #include "third_party/zip/scribus_zip.h"
 #include "util.h"
+#include "util_color.h"
 #include "util_formats.h"
-#include "util_icon.h"
+
 
 using namespace std;
 
@@ -247,12 +249,13 @@
 
 	if ( !iconsInitialized )
 	{
-		alertIcon = loadIcon("alert.png");
-		cmykIcon = loadIcon("cmyk.png");
-		rgbIcon = loadIcon("rgb.png");
-		labIcon = loadIcon("lab.png");
-		spotIcon = loadIcon("spot.png");
-		regIcon = loadIcon("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