Changeset 176 in tspsg-svn

Timestamp:

May 31, 2011, 2:01:38 PM (14 years ago)

Author:

laleppa

Message:

Added a border to tables in the solution output. Looks more readable
with long numbers, now. The border color can be controlled through
Output/Colors/TableBorder? setting in tspsg.ini. It is in #RRGGBB format.

Location:

trunk/src

Files:

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

trunk/src/defaults.h

@@ -110 +110 @@
 #define DEF_TEXT_COLOR QPalette().color(QPalette::Text)
 //! Default selected candidate color
-#define DEF_SELECTED_COLOR QColor(0x008000)
+#define DEF_SELECTED_COLOR "#008000"
 //! Default alternate candidate color
-#define DEF_ALTERNATE_COLOR QColor(0xA00000)
+#define DEF_ALTERNATE_COLOR "#A00000"
+//! Default table border color
+#define DEF_TABLE_COLOR "#EEEEEE"
 
 #ifndef QT_NO_PRINTER

trunk/src/mainwindow.cpp

@@ -1283 +1283 @@
     fmt_lastparagraph.setLeftMargin(10);
 
+    settings->beginGroup("Output/Colors");
+
     fmt_table.setTopMargin(5);
     fmt_table.setRightMargin(10);
     fmt_table.setBottomMargin(0);
     fmt_table.setLeftMargin(10);
-    fmt_table.setBorder(0);
-    fmt_table.setBorderStyle(QTextFrameFormat::BorderStyle_None);
-    fmt_table.setCellSpacing(5);
+    fmt_table.setBorder(1);
+    fmt_table.setBorderBrush(QBrush(QColor(settings->value("TableBorder", DEF_TABLE_COLOR).toString())));
+    fmt_table.setBorderStyle(QTextFrameFormat::BorderStyle_Solid);
+    fmt_table.setCellSpacing(0);
+    fmt_table.setCellPadding(2);
 
     fmt_cell.setAlignment(Qt::AlignHCenter);
 
-    settings->beginGroup("Output/Colors");
-
-QColor color = qvariant_cast<QColor>(settings->value("Text", DEF_TEXT_COLOR));
+QColor color = QColor(settings->value("Text", DEF_TEXT_COLOR).toString());
 QColor hilight;
     if (color.value() < 192)
@@ -1305 +1307 @@
     fmt_default.setForeground(QBrush(color));
 
-    fmt_selected.setForeground(QBrush(qvariant_cast<QColor>(settings->value("Selected", DEF_SELECTED_COLOR))));
+    fmt_selected.setForeground(QBrush(QColor(settings->value("Selected", DEF_SELECTED_COLOR).toString())));
     fmt_selected.setFontWeight(QFont::Bold);
 
-    fmt_alternate.setForeground(QBrush(qvariant_cast<QColor>(settings->value("Alternate", DEF_ALTERNATE_COLOR))));
+    fmt_alternate.setForeground(QBrush(QColor(settings->value("Alternate", DEF_ALTERNATE_COLOR).toString())));
     fmt_alternate.setFontWeight(QFont::Bold);
     fmt_altlist.setForeground(QBrush(hilight));

trunk/src/settingsdialog.cpp

@@ -288 +288 @@
 
     font = qvariant_cast<QFont>(settings->value("Font", QFont(DEF_FONT_FACE, DEF_FONT_SIZE)));
-    color = qvariant_cast<QColor>(settings->value("Colors/Text", DEF_TEXT_COLOR));
+    color = QColor(settings->value("Colors/Text", DEF_TEXT_COLOR).toString());
     settings->endGroup();
 
@@ -395 +395 @@
         settings->setValue("Font", font);
     if (_newColor)
-        settings->setValue("Colors/Text", color);
+        settings->setValue("Colors/Text", color.name());
     settings->endGroup();
     QDialog::accept();