diff options
| -rw-r--r-- | configurationdialog.cpp | 17 | ||||
| -rw-r--r-- | configurationdialog.h | 2 | ||||
| -rw-r--r-- | filestreemodel.cpp | 4 | ||||
| -rw-r--r-- | filestreemodel.h | 1 |
4 files changed, 22 insertions, 2 deletions
diff --git a/configurationdialog.cpp b/configurationdialog.cpp index 96c1d1b..2818bee 100644 --- a/configurationdialog.cpp +++ b/configurationdialog.cpp @@ -255,14 +255,24 @@ ConfigurationDialog::ConfigurationDialog(QWidget *parent, Qt::WindowFlags f) : Q colorGrid->addWidget(mLocalColorButton, 5, 2); colorMapper->setMapping(mLocalColorButton, mLocalColor); connect(mLocalColorButton, SIGNAL(clicked()), colorMapper, SLOT(map())); + QLabel *colorl7 = new QLabel(tr("Archived Files")); + mArchivedColor = new QLabel; + mArchivedColor->setFrameStyle(QFrame::Sunken | QFrame::Panel); + mArchivedColor->setScaledContents(true); + mArchivedColorButton = new QPushButton(tr("Choose...")); + colorGrid->addWidget(colorl7, 6, 0); + colorGrid->addWidget(mArchivedColor, 6, 1); + colorGrid->addWidget(mArchivedColorButton, 6, 2); + colorMapper->setMapping(mArchivedColorButton, mArchivedColor); + connect(mArchivedColorButton, SIGNAL(clicked()), colorMapper, SLOT(map())); connect(colorMapper, SIGNAL(mapped(QWidget*)), this, SLOT(chooseColor(QWidget*))); mAlternateColors = new QCheckBox(tr("Use alternating row colors")); mAlternateColors->setTristate(false); connect(mAlternateColors, SIGNAL(stateChanged(int)), this, SLOT(alternateColorsChanged(int))); - colorGrid->addWidget(mAlternateColors, 6, 1, 1, 2, Qt::AlignLeft); + colorGrid->addWidget(mAlternateColors, 7, 1, 1, 2, Qt::AlignLeft); QVBoxLayout *colorStretchLayout = new QVBoxLayout; colorStretchLayout->addStretch(); - colorGrid->addLayout(colorStretchLayout, 7, 1, 3, Qt::AlignLeft); + colorGrid->addLayout(colorStretchLayout, 8, 1, 3, Qt::AlignLeft); colorsWidget->setLayout(colorGrid); mTab->addTab(colorsWidget, tr("Colors")); @@ -337,6 +347,8 @@ void ConfigurationDialog::readSettings(){ mColors.insert(mFontColor, font.value<QColor>()); QVariant local = s.value("ui/localcolor", Qt::darkBlue); mColors.insert(mLocalColor, local.value<QColor>()); + QVariant archived = s.value("ui/archivedcolor", Qt::black); + mColors.insert(mArchivedColor, archived.value<QColor>()); QHash<QWidget*, QColor>::const_iterator it; for(it = mColors.constBegin(); it != mColors.constEnd(); ++it){ setColor(it.key()); @@ -394,6 +406,7 @@ void ConfigurationDialog::writeSettings(){ s.setValue("ui/alternatecolor", mColors.value(mAlternateBaseColor)); s.setValue("ui/fontcolor", mColors.value(mFontColor)); s.setValue("ui/localcolor", mColors.value(mLocalColor)); + s.setValue("ui/archivedcolor", mColors.value(mArchivedColor)); s.setValue("ui/allowalternate", mAlternateColors->isChecked()); } diff --git a/configurationdialog.h b/configurationdialog.h index 90a2b22..092fec8 100644 --- a/configurationdialog.h +++ b/configurationdialog.h @@ -70,12 +70,14 @@ class ConfigurationDialog : public QDialog { QLabel *mAlternateBaseColor; QLabel *mFontColor; QLabel *mLocalColor; + QLabel *mArchivedColor; QPushButton *mSeenButton; QPushButton *mClipboardButton; QPushButton *mBaseButton; QPushButton *mAlternateBaseButton; QPushButton *mFontColorButton; QPushButton *mLocalColorButton; + QPushButton *mArchivedColorButton; QCheckBox *mAlternateColors; QHash<QWidget*, QColor> mColors; QStandardItemModel *mIconModel; diff --git a/filestreemodel.cpp b/filestreemodel.cpp index 2e7ad83..f4d045f 100644 --- a/filestreemodel.cpp +++ b/filestreemodel.cpp @@ -203,6 +203,8 @@ QVariant FilesTreeModel::data(const QModelIndex &index, int role) const{ if(index.column() == FileName){ if(item->data(DvdNo) == -1){ return mLocalColor; + }else if(item->data(DvdNo).toInt() > 0){ + return mArchivedColor; } } } @@ -527,6 +529,8 @@ void FilesTreeModel::readSettings(){ QSettings s; QVariant local = s.value("ui/localcolor", Qt::darkBlue); mLocalColor = local.value<QColor>(); + QVariant archived = s.value("ui/archivedcolor", Qt::black); + mArchivedColor = archived.value<QColor>(); } void FilesTreeModel::populate(QSqlQuery &filesQuery){ diff --git a/filestreemodel.h b/filestreemodel.h index c31b282..af8dfbb 100644 --- a/filestreemodel.h +++ b/filestreemodel.h @@ -86,6 +86,7 @@ class FilesTreeModel : public SmTreeModel { int mMode; const int mMagic; QColor mLocalColor; + QColor mArchivedColor; }; #endif // FILESTREEMODEL_H |