Changeset a09f31733a in tspsg for src

Timestamp:

Jul 16, 2012, 1:05:35 AM (12 years ago)

Author:

Oleksii Serdiuk

Branches:

appveyor, imgbot, master, readme

Children:

95c1897bf1

Parents:

ff8d0488a0

Message:

Added all configurable colors to Settings Dialog.

Only display ATM. Editing and saving will follow soon...

Location:

src

Files:

• defaults.h (modified) (2 diffs)
• settingsdialog.cpp (modified) (9 diffs)
• settingsdialog.h (modified) (2 diffs)

src/defaults.h

@@ -107 +107 @@
 #   define DEF_FONT_SIZE 10
 #endif // Q_WS_S60
-//! Default text color
+//! Default solution text color
 #define DEF_TEXT_COLOR QPalette().color(QPalette::Text)
 //! Default selected candidate color
@@ -114 +114 @@
 #define DEF_ALTERNATE_COLOR "#A00000"
 //! Default table border color
-#define DEF_TABLE_COLOR "#EEEEEE"
+#define DEF_TABLE_COLOR QPalette().color(QPalette::AlternateBase)
+//! Default solution background color
+#define DEF_BACKGROUND_COLOR QPalette().color(QPalette::Base)
 
 #ifndef QT_NO_PRINTER

src/settingsdialog.cpp

@@ -31 +31 @@
  */
 SettingsDialog::SettingsDialog(QWidget *parent)
-    : QDialog(parent), _newFont(false), _newColor(false), _translucency(0)
+    : QDialog(parent), _fontChanged(false), _colorChanged(false), _translucency(0)
 {
     setupUi(this);
@@ -48 +48 @@
     buttonBox->button(QDialogButtonBox::Cancel)->setCursor(QCursor(Qt::PointingHandCursor));
 
-    buttonColor->setIcon(GET_ICON("format-text-color"));
+    buttonTextColor->setIcon(GET_ICON("format-text-color"));
+    buttonSelectedColor->setIcon(GET_ICON("format-text-color"));
+    buttonAlternateColor->setIcon(GET_ICON("format-text-color"));
+    buttonBorderColor->setIcon(GET_ICON("format-stroke-color"));
+    buttonBgColor->setIcon(GET_ICON("format-fill-color"));
     buttonFont->setIcon(GET_ICON("preferences-desktop-font"));
     buttonHelp->setIcon(GET_ICON("help-hint"));
@@ -212 +216 @@
     connect(spinRandMin, SIGNAL(valueChanged(int)), SLOT(spinRandMinValueChanged(int)));
     connect(buttonFont, SIGNAL(clicked()), SLOT(buttonFontClicked()));
-    connect(buttonColor, SIGNAL(clicked()), SLOT(buttonColorClicked()));
+    connect(buttonTextColor, SIGNAL(clicked()), SLOT(buttonTextColorClicked()));
     setWindowFlags(windowFlags() ^ Qt::WindowContextHelpButtonHint);
 #if !defined(QT_NO_STATUSTIP) && !defined(HANDHELD)
@@ -288 +292 @@
 
     font = qvariant_cast<QFont>(settings->value("Font", QFont(DEF_FONT_FACE, DEF_FONT_SIZE)));
-    color = QColor(settings->value("Colors/Text", DEF_TEXT_COLOR).toString());
+    textColor = QColor(settings->value("Colors/Text", DEF_TEXT_COLOR).toString());
+    selColor = QColor(settings->value("Colors/Selected", DEF_SELECTED_COLOR).toString());
+    altColor = QColor(settings->value("Colors/Alternate", DEF_ALTERNATE_COLOR).toString());
+    borderColor = QColor(settings->value("Colors/Border", DEF_TABLE_COLOR).toString());
+    bgColor = QColor(settings->value("Colors/Background", DEF_BACKGROUND_COLOR).toString());
     settings->endGroup();
+
+    QFont f = font;
+    f.setPointSize(labelFontExample->font().pointSize());
+    labelFontExample->setFont(f);
+    labelFontExample->setText(font.family());
+
+    p = boxTextColor->palette();
+    p.setColor(QPalette::Window, textColor);
+    boxTextColor->setPalette(p);
+
+    p = boxSelectedColor->palette();
+    p.setColor(QPalette::Window, selColor);
+    boxSelectedColor->setPalette(p);
+
+    p = boxAlternateColor->palette();
+    p.setColor(QPalette::Window, altColor);
+    boxAlternateColor->setPalette(p);
+
+    p = boxBorderColor->palette();
+    p.setColor(QPalette::Window, borderColor);
+    boxBorderColor->setPalette(p);
+
+    p = boxBgColor->palette();
+    p.setColor(QPalette::Window, bgColor);
+    boxBgColor->setPalette(p);
 
 #ifdef HANDHELD
@@ -304 +337 @@
 bool SettingsDialog::colorChanged() const
 {
-    return _newColor;
+    return _colorChanged;
 }
 
@@ -313 +346 @@
 bool SettingsDialog::fontChanged() const
 {
-    return _newFont;
+    return _fontChanged;
 }
 
@@ -333 +366 @@
     if (QApplication::keyboardModifiers() & Qt::ShiftModifier) {
         if (QMessageBox::question(this, tr("Settings Reset"), tr("Do you really want to <b>reset all application settings to their defaults</b>?"), QMessageBox::RestoreDefaults | QMessageBox::Cancel) == QMessageBox::RestoreDefaults) {
-            _newFont = (font != QFont(DEF_FONT_FACE, DEF_FONT_SIZE));
-            _newColor = (color != DEF_TEXT_COLOR);
+            _fontChanged = (font != QFont(DEF_FONT_FACE, DEF_FONT_SIZE));
+            _colorChanged = (textColor != DEF_TEXT_COLOR);
             settings->remove("");
             settings->setValue("SettingsReset", true);
@@ -392 +425 @@
         settings->setValue("ShowMatrixLimit", spinCitiesLimit->value());
     settings->setValue("ScrollToEnd", cbScrollToEnd->isChecked());
-    if (_newFont)
+    if (_fontChanged)
         settings->setValue("Font", font);
-    if (_newColor)
-        settings->setValue("Colors/Text", color.name());
+    if (_colorChanged)
+        settings->setValue("Colors/Text", textColor.name());
     settings->endGroup();
     QDialog::accept();
 }
 
-void SettingsDialog::buttonColorClicked()
-{
-QColor color = QColorDialog::getColor(this->color,this);
-    if (color.isValid() && (this->color != color)) {
-        this->color = color;
-        _newColor = true;
+void SettingsDialog::buttonTextColorClicked()
+{
+QColor color = QColorDialog::getColor(this->textColor,this);
+    if (color.isValid() && (this->textColor != color)) {
+        this->textColor = color;
+        _colorChanged = true;
     }
 }
@@ -412 +445 @@
 {
 bool ok;
-QFont font = QFontDialog::getFont(&ok,this->font,this);
+QFont font = QFontDialog::getFont(&ok, this->font, this);
     if (ok && (this->font != font)) {
         this->font = font;
-        _newFont = true;
+        QFont f = font;
+        f.setPointSize(labelFontExample->font().pointSize());
+        labelFontExample->setFont(f);
+        labelFontExample->setText(font.family());
+        _fontChanged = true;
     }
 }

src/settingsdialog.h

@@ -47 +47 @@
 
 private:
-    bool _newFont;
-    bool _newColor;
+    bool _fontChanged;
+    bool _colorChanged;
     qint8 _translucency;
 
-    QColor color;
+    QColor textColor, selColor, altColor, borderColor, bgColor;
     QFont font;
 
@@ -79 +79 @@
 private slots:
     void accept();
-    void buttonColorClicked();
+    void buttonTextColorClicked();
     void buttonFontClicked();
 #ifdef Q_WS_WINCE_WM