Changeset c8ed26ddf1 in tspsg for src

Timestamp:

Jul 17, 2012, 8:11:11 PM (12 years ago)

Author:

Oleksii Serdiuk

Branches:

appveyor, imgbot, master, readme

Children:

50b614b0ea

Parents:

7e8e1b444d

git-author:

Oleksii Serdiuk <contacts@…> (07/17/12 20:11:11)

git-committer:

Oleksii Serdiuk <contacts@…> (07/17/12 20:24:34)

Message:

Implemented color selection from Settings Dialog.

Changing background color appeared to be much harder than expected, so
this feature was removed for now. It is possible to change background
color of the solution output area. However, this background change
doesn't affect printing and export - there background color always stays
white. Will investigate possible workarounds later...

Closes ticket:13 - All colors should be configurable through Settings Dialog

Location:

src

Files:

• defaults.h (modified) (1 diff)
• mainwindow.cpp (modified) (3 diffs)
• settingsdialog.cpp (modified) (5 diffs)
• settingsdialog.h (modified) (2 diffs)

src/defaults.h

@@ -115 +115 @@
 //! Default table border color
 #define DEF_TABLE_COLOR QPalette().color(QPalette::AlternateBase)
-//! Default solution background color
-#define DEF_BACKGROUND_COLOR QPalette().color(QPalette::Base)
+////! Default solution background color
+//#define DEF_BACKGROUND_COLOR QPalette().color(QPalette::Base)
 
 #ifndef QT_NO_PRINTER

src/mainwindow.cpp

@@ -303 +303 @@
 
         html.replace(QRegExp("font-family:([^;]*);"), "font-family:\\1, 'DejaVu Sans Mono', 'Courier New', Courier, monospace;");
+        html.replace(QRegExp("<style ([^>]*)>"), QString("<style \\1>\n"
+                                                         "body { color: %1 }\n"
+                                                         "td { border-style: solid; border-width: 1px; border-color: %2; }")
+                     .arg(settings->value("Output/Colors/Font", DEF_TEXT_COLOR).toString(),
+                          settings->value("Output/Colors/TableBorder", DEF_TABLE_COLOR).toString()));
 
         if (!graph.isNull()) {
@@ -1002 +1007 @@
         pic.end();
 
-QImage i(graph.width() + 2, graph.height() + 2, QImage::Format_RGB32);
-        i.fill(0xFFFFFF);
+        QImage i(graph.width() + 2, graph.height() + 2, QImage::Format_ARGB32);
+        i.fill(QColor(255, 255, 255, 0));
         pic.begin(&i);
         pic.drawPicture(1, 1, graph);
@@ -1319 +1324 @@
 
     settings->endGroup();
-
-    solutionText->setTextColor(color);
 }
 

src/settingsdialog.cpp

@@ -52 +52 @@
     buttonAlternateColor->setIcon(GET_ICON("format-text-color"));
     buttonBorderColor->setIcon(GET_ICON("format-stroke-color"));
-    buttonBgColor->setIcon(GET_ICON("format-fill-color"));
+//    buttonBgColor->setIcon(GET_ICON("format-fill-color"));
     buttonFont->setIcon(GET_ICON("preferences-desktop-font"));
     buttonHelp->setIcon(GET_ICON("help-hint"));
@@ -217 +217 @@
     connect(buttonFont, SIGNAL(clicked()), SLOT(buttonFontClicked()));
     connect(buttonTextColor, SIGNAL(clicked()), SLOT(buttonTextColorClicked()));
+    connect(buttonSelectedColor, SIGNAL(clicked()), SLOT(buttonSelectedColorClicked()));
+    connect(buttonAlternateColor, SIGNAL(clicked()), SLOT(buttonAlternateColorClicked()));
+    connect(buttonBorderColor, SIGNAL(clicked()), SLOT(buttonBorderColorClicked()));
+//    connect(buttonBgColor, SIGNAL(clicked()), SLOT(buttonBgColorClicked()));
     setWindowFlags(windowFlags() ^ Qt::WindowContextHelpButtonHint);
 #if !defined(QT_NO_STATUSTIP) && !defined(HANDHELD)
@@ -295 +299 @@
     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());
+    borderColor = QColor(settings->value("Colors/TableBorder", DEF_TABLE_COLOR).toString());
+//    bgColor = QColor(settings->value("Colors/Background", DEF_BACKGROUND_COLOR).toString());
     settings->endGroup();
 
@@ -304 +308 @@
     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);
+    setBgColor(boxTextColor, textColor);
+    setBgColor(boxSelectedColor, selColor);
+    setBgColor(boxAlternateColor, altColor);
+    setBgColor(boxBorderColor, borderColor);
+//    setBgColor(boxBgColor, bgColor);
 
 #ifdef HANDHELD
@@ -427 +417 @@
     if (_fontChanged)
         settings->setValue("Font", font);
-    if (_colorChanged)
-        settings->setValue("Colors/Text", textColor.name());
+    if (_colorChanged) {
+        settings->beginGroup("Colors");
+        if (textColor != DEF_TEXT_COLOR)
+            settings->setValue("Text", textColor.name());
+        else
+            settings->remove("Text");
+        if (selColor != QColor(DEF_SELECTED_COLOR))
+            settings->setValue("Selected", selColor.name());
+        else
+            settings->remove("Selected");
+        if (altColor != DEF_ALTERNATE_COLOR)
+            settings->setValue("Alternate",altColor.name());
+        else
+            settings->remove("Alternate");
+        if (borderColor != DEF_TABLE_COLOR)
+            settings->setValue("TableBorder", borderColor.name());
+        else
+            settings->remove("TableColor");
+//        if (bgColor != DEF_BACKGROUND_COLOR)
+//            settings->setValue("Background", bgColor.name());
+//        else
+//            settings->remove("Background");
+        settings->endGroup();
+    }
     settings->endGroup();
     QDialog::accept();
 }
 
+void SettingsDialog::pickColor(QColor &where)
+{
+    QColor color = QColorDialog::getColor(where, this);
+    if (color.isValid() && (where != color)) {
+        where = color;
+        _colorChanged = true;
+    }
+}
+
+void SettingsDialog::setBgColor(QWidget *widget, const QColor &color)
+{
+    QPalette p = widget->palette();
+    p.setColor(QPalette::Window, color);
+    widget->setPalette(p);
+}
+
 void SettingsDialog::buttonTextColorClicked()
 {
-QColor color = QColorDialog::getColor(this->textColor,this);
-    if (color.isValid() && (this->textColor != color)) {
-        this->textColor = color;
-        _colorChanged = true;
-    }
-}
+    pickColor(textColor);
+    setBgColor(boxTextColor, textColor);
+}
+
+void SettingsDialog::buttonSelectedColorClicked()
+{
+    pickColor(selColor);
+    setBgColor(boxSelectedColor, selColor);
+}
+
+void SettingsDialog::buttonAlternateColorClicked()
+{
+    pickColor(altColor);
+    setBgColor(boxAlternateColor, altColor);
+}
+
+void SettingsDialog::buttonBorderColorClicked()
+{
+    pickColor(borderColor);
+    setBgColor(boxBorderColor, borderColor);
+}
+
+//void SettingsDialog::buttonBgColorClicked()
+//{
+//    pickColor(bgColor);
+//    setBgColor(boxBgColor, bgColor);
+//}
 
 void SettingsDialog::buttonFontClicked()

src/settingsdialog.h

@@ -72 +72 @@
     QLabel *labelHint;
 
+    void pickColor(QColor &where);
+    void setBgColor(QWidget *widget, const QColor &color);
+
 #ifndef QT_NO_STATUSTIP
     bool event(QEvent *ev);
@@ -80 +83 @@
     void accept();
     void buttonTextColorClicked();
+    void buttonSelectedColorClicked();
+    void buttonAlternateColorClicked();
+    void buttonBorderColorClicked();
+//    void buttonBgColorClicked();
     void buttonFontClicked();
 #ifdef Q_WS_WINCE_WM