Simplify icon management

Introduce SmGlobals::iconFor to retrieve the configured item.

10 files changed, 28 insertions, 50 deletions

diff --git a/archivecontroller.cpp b/archivecontroller.cpp
index bda54c2..d75f52f 100644
--- a/archivecontroller.cpp
+++ b/archivecontroller.cpp
@@ -171,11 +171,8 @@ void ArchiveController::addActionForTree(QAction *a){
 }
 
 void ArchiveController::readConfig(){
-    QSettings s;
-    QString actorS = s.value("ui/actoricon", "Dildo").toString();
-    mActorIcon = QIcon(SmGlobals::instance()->icons().value(actorS));
-    QString genreS = s.value("ui/genreicon", "Dildo").toString();
-    mGenreIcon = QIcon(SmGlobals::instance()->icons().value(genreS));
+    mActorIcon = SmGlobals::instance()->iconFor("actor");
+    mGenreIcon = SmGlobals::instance()->iconFor("genre");
 }
 
 void ArchiveController::treeSelectionChanged(const QItemSelection &selected, const QItemSelection &deselected){
diff --git a/archivemodel.cpp b/archivemodel.cpp
index 4ca9f1c..3a72ab6 100644
--- a/archivemodel.cpp
+++ b/archivemodel.cpp
@@ -520,14 +520,10 @@ void ArchiveModel::refresh(){
 }
 
 void ArchiveModel::readConfig(){
-    QSettings s;
-    QString seriesS = s.value("ui/seriesicon", "Dildo").toString();
-    mNodeIcons.insert(SeriesNode, QIcon(SmGlobals::instance()->icons().value(seriesS)));
-    mNodeIcons.insert(SeriesPartNode, QIcon(SmGlobals::instance()->icons().value(seriesS)));
-    QString actorS = s.value("ui/actoricon", "Dildo").toString();
-    mNodeIcons.insert(ActorNode, QIcon(SmGlobals::instance()->icons().value(actorS)));
-    QString genreS = s.value("ui/genreicon", "Dildo").toString();
-    mNodeIcons.insert(GenreNode, QIcon(SmGlobals::instance()->icons().value(genreS)));
+    mNodeIcons.insert(SeriesNode, SmGlobals::instance()->iconFor("series"));
+    mNodeIcons.insert(SeriesPartNode, SmGlobals::instance()->iconFor("series"));
+    mNodeIcons.insert(ActorNode, SmGlobals::instance()->iconFor("actor"));
+    mNodeIcons.insert(GenreNode, SmGlobals::instance()->iconFor("genre"));
 }
 
 void ArchiveModel::setWindowTitle(){
@@ -870,9 +866,7 @@ void ArchiveFilesModel::refresh(){
 }
 
 void ArchiveFilesModel::readConfig(){
-    QSettings s;
-    QString fileS = s.value("ui/fileicon", "Dildo").toString();
-    setDecorationIcon(QIcon(SmGlobals::instance()->icons().value(fileS)));
+    setDecorationIcon(SmGlobals::instance()->iconFor("file"));
 }
 
 /*
diff --git a/archiveview.cpp b/archiveview.cpp
index 18effbd..7684d47 100644
--- a/archiveview.cpp
+++ b/archiveview.cpp
@@ -291,6 +291,7 @@ void ArchiveTree::editActors(){
     QModelIndex idx = currentIndex();
     int pId = idx.data(ArchiveModel::SeriesPartIdRole).toInt();
     QStringList curActors = mModel->actors(QSet<int>() << pId);
+    e.widget()->setDecorationItem(SmGlobals::instance()->iconFor("actor"));
     e.widget()->setCurrentItems(curActors);
     int res = e.exec();
     if(res == QDialog::Accepted){
@@ -308,6 +309,7 @@ void ArchiveTree::editGenres(){
     QModelIndex idx = currentIndex();
     int pId = idx.data(ArchiveModel::SeriesPartIdRole).toInt();
     QStringList curGenres = mModel->genres(QSet<int>() << pId);
+    e.widget()->setDecorationItem(SmGlobals::instance()->iconFor("genre"));
     e.widget()->setCurrentItems(curGenres);
     int res = e.exec();
     if(res == QDialog::Accepted){
@@ -454,7 +456,7 @@ void MappingEditorWidget::fillCompleter(const QStringList &completions){
 void MappingEditorWidget::setCurrentItems(const QStringList &items){
     foreach(QString i, items){
         QStandardItem *item = new QStandardItem(i);
-        item->setIcon(QIcon(":/huge_bra.png"));
+        item->setIcon(mDecorationIcon);
         mModel->appendRow(item);
     }
 }
diff --git a/mappingtablewidget.cpp b/mappingtablewidget.cpp
index 593fd75..afc9c57 100644
--- a/mappingtablewidget.cpp
+++ b/mappingtablewidget.cpp
@@ -126,9 +126,7 @@ void MappingTableWidget::removeItem(){
 }
 
 MappingTableItemModel::MappingTableItemModel(QObject *parent) : QStringListModel(parent){
-	QSettings s;
-    QString iconName = s.value("ui/foldericon").toString();
-	mDecorationIcon = QIcon(SmGlobals::instance()->icons().value(iconName));
+    mDecorationIcon = SmGlobals::instance()->iconFor("folder");
 }
 
 QVariant MappingTableItemModel::data(const QModelIndex &index, int role) const{
diff --git a/newmoviewizard.cpp b/newmoviewizard.cpp
index a5df22a..11d87c4 100644
--- a/newmoviewizard.cpp
+++ b/newmoviewizard.cpp
@@ -417,15 +417,12 @@ MovieMappingPage::MovieMappingPage(const QString &table, QWidget *parent) : QWiz
 
 void MovieMappingPage::initializePage(){
     ArchiveController *c = SmGlobals::instance()->archiveController();
-    QSettings s;
     if(mTable.toLower() == "actors"){
         mWidget->fillCompleter(c->archiveTreeModel()->allActors());
-        QString actorS = s.value("ui/actoricon", "Dildo").toString();
-        mWidget->setDecorationItem(QIcon(SmGlobals::instance()->icons().value(actorS)));
+        mWidget->setDecorationItem(SmGlobals::instance()->iconFor("actor"));
     }else if(mTable.toLower() == "genres"){
         mWidget->fillCompleter(c->archiveTreeModel()->allGenres());
-        QString genreS = s.value("ui/genreicon", "Dildo").toString();
-        mWidget->setDecorationItem(QIcon(SmGlobals::instance()->icons().value(genreS)));
+        mWidget->setDecorationItem(SmGlobals::instance()->iconFor("genre"));
     }
     mWidget->clear();
 }
diff --git a/shemoviconprovider.cpp b/shemoviconprovider.cpp
index c46fa13..6ec8688 100644
--- a/shemoviconprovider.cpp
+++ b/shemoviconprovider.cpp
@@ -13,25 +13,12 @@
 #include "helper.h"
 #include "smglobals.h"
 
-SheMovIconProvider::SheMovIconProvider() {};
+SheMovIconProvider::SheMovIconProvider() {}
 
 QIcon SheMovIconProvider::icon(const QFileInfo &info) const {
 	if(info.isDir()){
-		QSettings s;
-		QString fi(s.value("ui/foldericon").toString());
-		const QHash<QString, QString> icons = SmGlobals::instance()->icons();
-		return QIcon(icons.value(fi));
+        return SmGlobals::instance()->iconFor("folder");
 	}
-	QString type = Helper::mimeType(info.absoluteFilePath());
-	if(type.toLower().startsWith("video")){
-		return QIcon(":/movie.svg");
-	}
-	if(type.toLower().startsWith("image")){
-		return QIcon(":/picture.svg");
-	}
-	if(type.toLower().contains("application/x-rar")){
-		return QIcon(":/archive.svg");
-	}
-	return QFileIconProvider::icon(info);
+    return SmGlobals::instance()->iconFor("other");
 }
 
diff --git a/smdirmodel.cpp b/smdirmodel.cpp
index 23e76fa..480b6e1 100644
--- a/smdirmodel.cpp
+++ b/smdirmodel.cpp
@@ -156,12 +156,9 @@ void SmDirModel::dirEvent(const QList<QVariant> &data, int e){
 }
 
 void SmDirModel::readSettings(){
-    const QHash<QString, QString> icons = SmGlobals::instance()->icons();
+    mIcons.insert("folder", SmGlobals::instance()->iconFor("folder"));
+    mIcons.insert("file", SmGlobals::instance()->iconFor("file"));
     QSettings s;
-    QString iconName = s.value("ui/foldericon").toString();
-    mIcons.insert("folder", QIcon(icons.value(iconName)));
-    iconName = s.value("ui/fileicon").toString();
-    mIcons.insert("file", QIcon(icons.value(iconName)));
     bool autorefresh = s.value("ui/autorefresh", false).toBool();
     if(autorefresh){
         mRefreshTimer->stop();
diff --git a/smglobals.cpp b/smglobals.cpp
index 16c1e50..7fb928f 100644
--- a/smglobals.cpp
+++ b/smglobals.cpp
@@ -143,6 +143,14 @@ QSize SmGlobals::cursorSize() {
 	return mCursorSize;
 }
 
+QIcon SmGlobals::iconFor(const QString &type){
+    QString settingsS = QString("ui/%1icon").arg(type);
+    QSettings s;
+    QString iconS = s.value(settingsS, "Dildo").toString();
+    QIcon retval = QIcon(mIcons.value(iconS));
+    return retval;
+}
+
 SmGlobals::SmGlobals() : mPictureViewer(0), mFrameCache(0), mArchiveController(0){
 	mIcons.insert("Dildo", ":/dildo.png");
 	mIcons.insert("Dick to left", ":/back_dick.png");
diff --git a/smglobals.h b/smglobals.h
index 825640d..5580f47 100644
--- a/smglobals.h
+++ b/smglobals.h
@@ -35,6 +35,7 @@ class SmGlobals : public QObject {
         void setArchiveController(ArchiveController *c) { mArchiveController = c; }
         ArchiveController *archiveController() { return mArchiveController; }
 		QSize cursorSize();
+        QIcon iconFor(const QString &type);
         const QSize minPVSize() const { return QSize(640, 480); }
 		const QHash<QString, QString> & icons() const { return mIcons; }
 		qint64 dvdSize() const { return mDvdSize; }
diff --git a/smtreemodel.cpp b/smtreemodel.cpp
index 6abc999..d797f36 100644
--- a/smtreemodel.cpp
+++ b/smtreemodel.cpp
@@ -19,10 +19,7 @@ SmTreeModel::SmTreeModel(const QStringList &headers, QObject *parent) : QAbstrac
 		mHeaderData.insert(mHeaders.at(i), i);
 	}
 	mRootItem = new SmTreeItem(headers.count());
-	QSettings s;
-	QString iconName = s.value("ui/foldericon", "Dildo").toString();
-	const QHash<QString, QString> icons = SmGlobals::instance()->icons();
-	mDecorationIcon = QIcon(icons.value(iconName));
+    mDecorationIcon = SmGlobals::instance()->iconFor("folder");
 }
 
 SmTreeModel::~SmTreeModel(){