enhancement: advanced data browser colors preferences

src/PreferencesDialog.cpp

@@ -18,8 +18,12 @@ PreferencesDialog::PreferencesDialog(QWidget* parent)
     ui->setupUi(this);
     ui->treeSyntaxHighlighting->setColumnHidden(0, true);
 
-    ui->frameNullBgColour->installEventFilter(this);
-    ui->frameNullFgColour->installEventFilter(this);
+    ui->fr_bin_bg->installEventFilter(this);
+    ui->fr_bin_fg->installEventFilter(this);
+    ui->fr_reg_bg->installEventFilter(this);
+    ui->fr_reg_fg->installEventFilter(this);
+    ui->fr_null_bg->installEventFilter(this);
+    ui->fr_null_fg->installEventFilter(this);
 
 #ifndef CHECKNEWVERSION
     ui->labelUpdates->setVisible(false);
@@ -58,15 +62,12 @@ void PreferencesDialog::loadSettings()
     ui->foreignKeysCheckBox->setChecked(getSettingsValue("db", "foreignkeys").toBool());
     ui->spinPrefetchSize->setValue(getSettingsValue("db", "prefetchsize").toInt());
 
-    QPalette palette = ui->frameNullBgColour->palette();
-    palette.setColor(ui->frameNullBgColour->backgroundRole(),
-                     QColor(getSettingsValue("databrowser", "null_bg_colour").toString()));
-    ui->frameNullBgColour->setPalette(palette);
-
-    palette = ui->frameNullFgColour->palette();
-    palette.setColor(ui->frameNullFgColour->backgroundRole(),
-                     QColor(getSettingsValue("databrowser", "null_fg_colour").toString()));
-    ui->frameNullFgColour->setPalette(palette);
+    loadColorSetting(ui->fr_null_fg, "null_fg");
+    loadColorSetting(ui->fr_null_bg, "null_bg");
+    loadColorSetting(ui->fr_reg_fg, "reg_fg");
+    loadColorSetting(ui->fr_reg_bg, "reg_bg");
+    loadColorSetting(ui->fr_bin_fg, "bin_fg");
+    loadColorSetting(ui->fr_bin_bg, "bin_bg");
 
     ui->txtNull->setText(getSettingsValue("databrowser", "null_text").toString());
 
@@ -106,10 +107,12 @@ void PreferencesDialog::saveSettings()
 
     setSettingsValue("checkversion", "enabled", ui->checkUpdates->isChecked());
 
-    setSettingsValue("databrowser", "null_bg_colour",
-                     ui->frameNullBgColour->palette().color(ui->frameNullBgColour->backgroundRole()));
-    setSettingsValue("databrowser", "null_fg_colour",
-                     ui->frameNullFgColour->palette().color(ui->frameNullFgColour->backgroundRole()));
+    saveColorSetting(ui->fr_null_fg, "null_fg");
+    saveColorSetting(ui->fr_null_bg, "null_bg");
+    saveColorSetting(ui->fr_reg_fg, "reg_fg");
+    saveColorSetting(ui->fr_reg_bg, "reg_bg");
+    saveColorSetting(ui->fr_bin_fg, "bin_fg");
+    saveColorSetting(ui->fr_bin_bg, "bin_bg");
     setSettingsValue("databrowser", "null_text", ui->txtNull->text());
 
     for(int i=0; i < ui->treeSyntaxHighlighting->topLevelItemCount(); ++i)
@@ -241,6 +244,14 @@ QVariant PreferencesDialog::getSettingsDefaultValue(const QString& group, const
             return QColor(Qt::lightGray).name();
         if (name == "null_bg_colour")
             return QColor(Qt::white).name();
+        if (name == "reg_fg_colour")
+            return QColor(Qt::black).name();
+        if (name == "reg_bg_colour")
+            return QColor(Qt::white).name();
+        if (name == "bin_fg_colour")
+            return QColor(Qt::lightGray).name();
+        if (name == "bin_bg_colour")
+            return QColor(Qt::white).name();
     }
 
     // syntaxhighlighter?
@@ -339,7 +350,9 @@ void PreferencesDialog::showColourDialog(QTreeWidgetItem* item, int column)
 bool PreferencesDialog::eventFilter(QObject *obj, QEvent *event)
 {
     // Use mouse click and enter press on the frames to pop up a colour dialog
-    if (obj == ui->frameNullBgColour || obj == ui->frameNullFgColour)
+    if (obj == ui->fr_bin_bg  || obj == ui->fr_bin_fg ||
+        obj == ui->fr_reg_bg  || obj == ui->fr_reg_fg ||
+        obj == ui->fr_null_bg || obj == ui->fr_null_fg)
     {
         if (event->type() == QEvent::KeyPress)
         {
@@ -455,3 +468,17 @@ void PreferencesDialog::fillLanguageBox()
     ui->languageComboBox->insertItem(0, chosenIcon, chosenLanguage, chosenLocale);
     ui->languageComboBox->setCurrentIndex(0);
 }
+
+void PreferencesDialog::loadColorSetting(QFrame *frame, const QString & settingName)
+{
+    QPalette palette = frame->palette();
+    palette.setColor(frame->backgroundRole(),
+        QColor(getSettingsValue("databrowser", settingName + "_colour").toString()));
+    frame->setPalette(palette);
+}
+
+void PreferencesDialog::saveColorSetting(QFrame *frame, const QString & settingName)
+{
+    setSettingsValue("databrowser", settingName + "_colour",
+        frame->palette().color(frame->backgroundRole()));
+}

src/PreferencesDialog.h

@@ -6,6 +6,7 @@
 #include <QHash>
 
 class QTreeWidgetItem;
+class QFrame;
 
 namespace Ui {
 class PreferencesDialog;
@@ -42,6 +43,8 @@ private:
     static QHash<QString, QVariant> m_hCache;
 
     void fillLanguageBox();
+    void loadColorSetting(QFrame *frame, const QString &name);
+    void saveColorSetting(QFrame *frame, const QString &name);
 
 protected:
     bool eventFilter(QObject *obj, QEvent *event);

src/PreferencesDialog.ui

@@ -251,8 +251,8 @@
       <attribute name="title">
        <string>Data &amp;Browser</string>
       </attribute>
-      <layout class="QHBoxLayout" name="horizontalLayout_3">
-       <item>
+      <layout class="QGridLayout" name="gridLayout_2">
+       <item row="0" column="0">
         <spacer name="horizontalSpacer">
          <property name="orientation">
           <enum>Qt::Horizontal</enum>
@@ -265,7 +265,20 @@
          </property>
         </spacer>
        </item>
-       <item>
+       <item row="0" column="3">
+        <spacer name="horizontalSpacer_3">
+         <property name="orientation">
+          <enum>Qt::Horizontal</enum>
+         </property>
+         <property name="sizeHint" stdset="0">
+          <size>
+           <width>40</width>
+           <height>20</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
+       <item row="0" column="1" rowspan="2" colspan="2">
         <layout class="QVBoxLayout" name="verticalLayout_5">
          <item>
           <widget class="QGroupBox" name="groupBox">
@@ -299,28 +312,6 @@ QGroupBox::title {
             <property name="rightMargin">
              <number>50</number>
             </property>
-            <item row="1" column="1">
-             <widget class="QFrame" name="frameNullFgColour">
-              <property name="minimumSize">
-               <size>
-                <width>70</width>
-                <height>20</height>
-               </size>
-              </property>
-              <property name="focusPolicy">
-               <enum>Qt::StrongFocus</enum>
-              </property>
-              <property name="autoFillBackground">
-               <bool>true</bool>
-              </property>
-              <property name="frameShape">
-               <enum>QFrame::Box</enum>
-              </property>
-              <property name="frameShadow">
-               <enum>QFrame::Plain</enum>
-              </property>
-             </widget>
-            </item>
             <item row="0" column="1">
              <widget class="QLineEdit" name="txtNull">
               <property name="text">
@@ -334,41 +325,6 @@ QGroupBox::title {
               </property>
              </widget>
             </item>
-            <item row="2" column="1">
-             <widget class="QFrame" name="frameNullBgColour">
-              <property name="minimumSize">
-               <size>
-                <width>70</width>
-                <height>20</height>
-               </size>
-              </property>
-              <property name="focusPolicy">
-               <enum>Qt::StrongFocus</enum>
-              </property>
-              <property name="autoFillBackground">
-               <bool>true</bool>
-              </property>
-              <property name="frameShape">
-               <enum>QFrame::Box</enum>
-              </property>
-              <property name="frameShadow">
-               <enum>QFrame::Plain</enum>
-              </property>
-             </widget>
-            </item>
-            <item row="1" column="0">
-             <widget class="QLabel" name="label_10">
-              <property name="text">
-               <string>Text &amp;colour</string>
-              </property>
-              <property name="alignment">
-               <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-              </property>
-              <property name="buddy">
-               <cstring>frameNullFgColour</cstring>
-              </property>
-             </widget>
-            </item>
             <item row="0" column="0">
              <widget class="QLabel" name="label_12">
               <property name="text">
@@ -382,46 +338,199 @@ QGroupBox::title {
               </property>
              </widget>
             </item>
+           </layout>
+          </widget>
+         </item>
+         <item>
+          <widget class="QGroupBox" name="groupBox_2">
+           <property name="autoFillBackground">
+            <bool>false</bool>
+           </property>
+           <property name="styleSheet">
+            <string notr="true">QGroupBox {
+    border: 1px solid gray;
+    border-radius: 4px;
+    margin-top: 1ex;
+}
+
+QGroupBox::title {
+    subcontrol-origin: margin;
+    subcontrol-position: top left;
+    left: 10px;
+    padding: 0 3px 0 3px;
+}</string>
+           </property>
+           <property name="title">
+            <string>Fields colors</string>
+           </property>
+           <layout class="QGridLayout" name="gridLayout_3">
             <item row="2" column="0">
-             <widget class="QLabel" name="label_11">
+             <widget class="QLabel" name="lb_null">
               <property name="text">
-               <string>Bac&amp;kground colour</string>
+               <string>NULL</string>
               </property>
               <property name="alignment">
-               <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+               <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
               </property>
-              <property name="buddy">
-               <cstring>frameNullBgColour</cstring>
+             </widget>
+            </item>
+            <item row="4" column="0">
+             <widget class="QLabel" name="lb_regular">
+              <property name="text">
+               <string>Regular</string>
+              </property>
+              <property name="alignment">
+               <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
+              </property>
+             </widget>
+            </item>
+            <item row="0" column="0">
+             <widget class="QLabel" name="label_16">
+              <property name="text">
+               <string/>
+              </property>
+             </widget>
+            </item>
+            <item row="4" column="1">
+             <widget class="QFrame" name="fr_reg_fg">
+              <property name="focusPolicy">
+               <enum>Qt::StrongFocus</enum>
+              </property>
+              <property name="autoFillBackground">
+               <bool>true</bool>
+              </property>
+              <property name="frameShape">
+               <enum>QFrame::StyledPanel</enum>
+              </property>
+              <property name="frameShadow">
+               <enum>QFrame::Raised</enum>
+              </property>
+             </widget>
+            </item>
+            <item row="0" column="1">
+             <widget class="QLabel" name="lb_text">
+              <property name="text">
+               <string>Text</string>
+              </property>
+              <property name="alignment">
+               <set>Qt::AlignCenter</set>
+              </property>
+             </widget>
+            </item>
+            <item row="3" column="0">
+             <widget class="QLabel" name="lb_binary">
+              <property name="text">
+               <string>Binary</string>
+              </property>
+              <property name="alignment">
+               <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
+              </property>
+             </widget>
+            </item>
+            <item row="2" column="1">
+             <widget class="QFrame" name="fr_null_fg">
+              <property name="focusPolicy">
+               <enum>Qt::StrongFocus</enum>
+              </property>
+              <property name="autoFillBackground">
+               <bool>true</bool>
+              </property>
+              <property name="frameShape">
+               <enum>QFrame::StyledPanel</enum>
+              </property>
+              <property name="frameShadow">
+               <enum>QFrame::Raised</enum>
+              </property>
+             </widget>
+            </item>
+            <item row="0" column="2">
+             <widget class="QLabel" name="lb_background">
+              <property name="text">
+               <string>Background</string>
+              </property>
+              <property name="alignment">
+               <set>Qt::AlignCenter</set>
+              </property>
+             </widget>
+            </item>
+            <item row="3" column="1">
+             <widget class="QFrame" name="fr_bin_fg">
+              <property name="focusPolicy">
+               <enum>Qt::StrongFocus</enum>
+              </property>
+              <property name="autoFillBackground">
+               <bool>true</bool>
+              </property>
+              <property name="frameShape">
+               <enum>QFrame::StyledPanel</enum>
+              </property>
+              <property name="frameShadow">
+               <enum>QFrame::Raised</enum>
+              </property>
+             </widget>
+            </item>
+            <item row="2" column="2">
+             <widget class="QFrame" name="fr_null_bg">
+              <property name="focusPolicy">
+               <enum>Qt::StrongFocus</enum>
+              </property>
+              <property name="autoFillBackground">
+               <bool>true</bool>
+              </property>
+              <property name="frameShape">
+               <enum>QFrame::StyledPanel</enum>
+              </property>
+              <property name="frameShadow">
+               <enum>QFrame::Raised</enum>
+              </property>
+             </widget>
+            </item>
+            <item row="3" column="2">
+             <widget class="QFrame" name="fr_bin_bg">
+              <property name="focusPolicy">
+               <enum>Qt::StrongFocus</enum>
+              </property>
+              <property name="autoFillBackground">
+               <bool>true</bool>
+              </property>
+              <property name="frameShape">
+               <enum>QFrame::StyledPanel</enum>
+              </property>
+              <property name="frameShadow">
+               <enum>QFrame::Raised</enum>
+              </property>
+             </widget>
+            </item>
+            <item row="4" column="2">
+             <widget class="QFrame" name="fr_reg_bg">
+              <property name="focusPolicy">
+               <enum>Qt::StrongFocus</enum>
+              </property>
+              <property name="autoFillBackground">
+               <bool>true</bool>
+              </property>
+              <property name="frameShape">
+               <enum>QFrame::StyledPanel</enum>
+              </property>
+              <property name="frameShadow">
+               <enum>QFrame::Raised</enum>
               </property>
              </widget>
             </item>
            </layout>
           </widget>
          </item>
-         <item>
-          <spacer name="verticalSpacer_2">
-           <property name="orientation">
-            <enum>Qt::Vertical</enum>
-           </property>
-           <property name="sizeHint" stdset="0">
-            <size>
-             <width>20</width>
-             <height>40</height>
-            </size>
-           </property>
-          </spacer>
-         </item>
         </layout>
        </item>
-       <item>
-        <spacer name="horizontalSpacer_3">
+       <item row="2" column="1">
+        <spacer name="verticalSpacer_2">
          <property name="orientation">
-          <enum>Qt::Horizontal</enum>
+          <enum>Qt::Vertical</enum>
          </property>
          <property name="sizeHint" stdset="0">
           <size>
-           <width>40</width>
-           <height>20</height>
+           <width>20</width>
+           <height>274</height>
           </size>
          </property>
         </spacer>
@@ -777,7 +886,6 @@ QGroupBox::title {
   </layout>
  </widget>
  <tabstops>
-  <tabstop>tabWidget</tabstop>
   <tabstop>comboDefaultLocation</tabstop>
   <tabstop>locationEdit</tabstop>
   <tabstop>setLocationButton</tabstop>
@@ -788,8 +896,12 @@ QGroupBox::title {
   <tabstop>checkHideSchemaLinebreaks</tabstop>
   <tabstop>spinPrefetchSize</tabstop>
   <tabstop>txtNull</tabstop>
-  <tabstop>frameNullFgColour</tabstop>
-  <tabstop>frameNullBgColour</tabstop>
+  <tabstop>fr_null_fg</tabstop>
+  <tabstop>fr_null_bg</tabstop>
+  <tabstop>fr_bin_fg</tabstop>
+  <tabstop>fr_bin_bg</tabstop>
+  <tabstop>fr_reg_fg</tabstop>
+  <tabstop>fr_reg_bg</tabstop>
   <tabstop>treeSyntaxHighlighting</tabstop>
   <tabstop>comboEditorFont</tabstop>
   <tabstop>spinEditorFontSize</tabstop>

src/sqlitetablemodel.cpp

@@ -259,12 +259,14 @@ QVariant SqliteTableModel::data(const QModelIndex &index, int role) const
         if(m_data.at(index.row()).at(index.column()).isNull())
             return QColor(PreferencesDialog::getSettingsValue("databrowser", "null_fg_colour").toString());
         else if (isBinary(index))
-            return QColor(Qt::gray);
-        return QVariant();
+            return QColor(PreferencesDialog::getSettingsValue("databrowser", "bin_fg_colour").toString());
+        return QColor(PreferencesDialog::getSettingsValue("databrowser", "reg_fg_colour").toString());
     } else if (role == Qt::BackgroundRole) {
         if(m_data.at(index.row()).at(index.column()).isNull())
             return QColor(PreferencesDialog::getSettingsValue("databrowser", "null_bg_colour").toString());
-        return QVariant();
+        else if (isBinary(index))
+            return QColor(PreferencesDialog::getSettingsValue("databrowser", "bin_bg_colour").toString());
+        return QColor(PreferencesDialog::getSettingsValue("databrowser", "reg_bg_colour").toString());
     } else if(role == Qt::ToolTipRole) {
         sqlb::ForeignKeyClause fk = getForeignKeyClause(index.column()-1);
         if(fk.isSet())