1 files changed, 26 insertions, 13 deletions

diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index 98d8efd..fd7d9ee 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -32,12 +32,12 @@
 #include <QDockWidget>
 #include <QUndoView>
 #include <QStackedWidget>
+#include "utils/iconloader/qticonloader.h"
 #include "diagramitem.h"
 #include "diagramobject.h"
 #include "diagramitemfactory.h"
 #include "diagramitemproperties.h"
 #include "commands.h"
-#include "utils/iconprovider.h"
 #include "mainwindow.h"
 
 
@@ -168,32 +168,45 @@ MainWindow::setupUi()
 	setCentralWidget(m_view);
 }
 
+QIcon
+MainWindow::loadIcon(const QString &name)
+{
+	QIcon icon = QtIconLoader::icon(name);
+	if (icon.isNull()) {
+		QString path = ":/icons/16x16/" + name + ".png";
+		if (QFile::exists(path)) {
+			icon.addFile(path, QSize(16, 16));
+		}
+	}
+	return icon;
+}
+
 void
 MainWindow::setupActions()
 {
 	m_actionNew = new QAction(this);
 	m_actionNew->setText(tr("&New"));
 	
-	m_actionNew->setIcon(IconProvider::findIcon(16, "document-new.png"));
+	m_actionNew->setIcon(loadIcon("document-new"));
 	m_actionNew->setShortcut(QKeySequence(tr("Ctrl+N")));
 	connect(m_actionNew, SIGNAL(triggered(bool)), SLOT(newModel()));
 
 	m_actionOpen = new QAction(this);
 	m_actionOpen->setText(tr("&Open..."));
-	m_actionOpen->setIcon(IconProvider::findIcon(16, "document-open.png"));
+	m_actionOpen->setIcon(loadIcon("document-open"));
 	m_actionOpen->setShortcut(QKeySequence(tr("Ctrl+O")));
 	connect(m_actionOpen, SIGNAL(triggered(bool)), SLOT(open()));
 
 	m_actionSave = new QAction(this);
 	m_actionSave->setText(tr("&Save"));
-	m_actionSave->setIcon(IconProvider::findIcon(16, "document-save.png"));
+	m_actionSave->setIcon(loadIcon("document-save"));
 	m_actionSave->setShortcut(QKeySequence(tr("Ctrl+S")));
 	//m_actionSave->setDisabled(true);
 	connect(m_actionSave, SIGNAL(triggered(bool)), SLOT(save()));
 
 	m_actionSaveAs = new QAction(this);
 	m_actionSaveAs->setText(tr("Save &As..."));
-	m_actionSaveAs->setIcon(IconProvider::findIcon(16, "document-save-as.png"));
+	m_actionSaveAs->setIcon(loadIcon("document-save-as"));
 	//m_actionSaveAs->setDisabled(true);
 	connect(m_actionSaveAs, SIGNAL(triggered(bool)), SLOT(saveAs()));
 
@@ -228,10 +241,10 @@ MainWindow::setupActions()
 
 	m_actionUndo = new QAction(tr("&Undo"), this);
 	m_actionUndo->setShortcut(QKeySequence(tr("Ctrl+Z")));
-	m_actionUndo->setIcon(IconProvider::findIcon(16, "edit-undo.png"));
+	m_actionUndo->setIcon(loadIcon("edit-undo"));
 	m_actionRedo = new QAction(tr("Re&do"), this);
 	m_actionRedo->setShortcut(QKeySequence(tr("Ctrl+Shift+Z")));
-	m_actionRedo->setIcon(IconProvider::findIcon(16, "edit-redo.png"));
+	m_actionRedo->setIcon(loadIcon("edit-redo"));
 
 	connect(m_actionSwitchMode[0], SIGNAL(triggered(bool)), SLOT(switchModeSelect()));
 	connect(m_actionSwitchMode[1], SIGNAL(triggered(bool)), SLOT(switchModeAddTable()));
@@ -239,25 +252,25 @@ MainWindow::setupActions()
 
 	m_actionCut = new QAction(this);
 	m_actionCut->setText(tr("Cu&t"));
-	m_actionCut->setIcon(IconProvider::findIcon(16, "edit-cut.png"));
+	m_actionCut->setIcon(loadIcon("edit-cut"));
 	m_actionCut->setShortcut(QKeySequence(tr("Ctrl+X")));
 	connect(m_actionCut, SIGNAL(triggered(bool)), SLOT(cut()));
 
 	m_actionCopy = new QAction(this);
 	m_actionCopy->setText(tr("&Copy"));
-	m_actionCopy->setIcon(IconProvider::findIcon(16, "edit-copy.png"));
+	m_actionCopy->setIcon(loadIcon("edit-copy"));
 	m_actionCopy->setShortcut(QKeySequence(tr("Ctrl+C")));
 	connect(m_actionCopy, SIGNAL(triggered(bool)), SLOT(copy()));
 
 	m_actionPaste = new QAction(this);
 	m_actionPaste->setText(tr("&Paste"));
-	m_actionPaste->setIcon(IconProvider::findIcon(16, "edit-paste.png"));
+	m_actionPaste->setIcon(loadIcon("edit-paste"));
 	m_actionPaste->setShortcut(QKeySequence(tr("Ctrl+V")));
 	connect(m_actionPaste, SIGNAL(triggered(bool)), SLOT(paste()));
 
 	m_actionDelete = new QAction(this);
 	m_actionDelete->setText(tr("&Delete"));
-	m_actionDelete->setIcon(IconProvider::findIcon(16, "edit-delete.png"));
+	m_actionDelete->setIcon(loadIcon("edit-delete"));
 	m_actionDelete->setShortcut(QKeySequence(tr("Del")));
 	connect(m_actionDelete, SIGNAL(triggered(bool)), SLOT(deleteSelectedItems()));
 
@@ -267,13 +280,13 @@ MainWindow::setupActions()
 
 	m_actionClose = new QAction(this);
 	m_actionClose->setText(tr("&Close"));
-	m_actionClose->setIcon(IconProvider::findIcon(16, "window-close.png"));
+	m_actionClose->setIcon(loadIcon("window-close"));
 	m_actionClose->setShortcut(QKeySequence(tr("Ctrl+W")));
 	connect(m_actionClose, SIGNAL(triggered(bool)), SLOT(close()));
 
 	m_actionQuit = new QAction(this);
 	m_actionQuit->setText(tr("&Quit"));
-	m_actionQuit->setIcon(IconProvider::findIcon(16, "application-exit.png"));
+	m_actionQuit->setIcon(loadIcon("application-exit"));
 	m_actionQuit->setShortcut(QKeySequence(tr("Ctrl+Q")));
 	connect(m_actionQuit, SIGNAL(triggered(bool)), SLOT(closeAll()));