summaryrefslogtreecommitdiffstats
path: root/configurationdialog.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'configurationdialog.cpp')
-rw-r--r--configurationdialog.cpp14
1 files changed, 11 insertions, 3 deletions
diff --git a/configurationdialog.cpp b/configurationdialog.cpp
index 7008e76..96c1d1b 100644
--- a/configurationdialog.cpp
+++ b/configurationdialog.cpp
@@ -33,9 +33,12 @@
#include <QPalette>
#include <QImage>
#include <QPainter>
+#include <QStandardItemModel>
+#include <QStandardItem>
#include "configurationdialog.h"
#include "programconfigurator.h"
+#include "smglobals.h"
ConfigurationDialog::ConfigurationDialog(QWidget *parent, Qt::WindowFlags f) : QDialog(parent, f){
//setup
@@ -109,8 +112,13 @@ ConfigurationDialog::ConfigurationDialog(QWidget *parent, Qt::WindowFlags f) : Q
QGroupBox *iconBox = new QGroupBox(tr("Icon for folders"));
QHBoxLayout *iconLayout = new QHBoxLayout;
mIconForFolder = new QComboBox;
- QStringList icons = QStringList() << tr("Dildo") << tr("Normal");
- mIconForFolder->addItems(icons);
+ mIconModel = new QStandardItemModel;
+ const QHash<QString, QString> icons = SmGlobals::instance()->icons();
+ for(QHash<QString, QString>::const_iterator it = icons.constBegin(); it != icons.constEnd(); ++it){
+ QStandardItem *item = new QStandardItem(QIcon(it.value()), it.key());
+ mIconModel->appendRow(item);
+ }
+ mIconForFolder->setModel(mIconModel);
iconLayout->addWidget(mIconForFolder);
iconBox->setLayout(iconLayout);
@@ -289,7 +297,7 @@ void ConfigurationDialog::readSettings(){
QSettings s;
//read misc
- QString icon = s.value("ui/foldericon", "Normal").toString();
+ QString icon = s.value("ui/foldericon", "Dildo").toString();
int pos = mIconForFolder->findText(icon);
if(pos != -1){
mIconForFolder->setCurrentIndex(pos);