[Tora-cvs] SF.net SVN: tora:[3041] trunk/tora/src

[<su...@us...>]

Revision: 3041
          http://tora.svn.sourceforge.net/tora/?rev=3041&view=rev
Author:   subik
Date:     2008-10-01 13:33:23 +0000 (Wed, 01 Oct 2008)

Log Message:
-----------
fixed {null} highlighting settings and its change in table model

Modified Paths:
--------------
    trunk/tora/src/main.cpp
    trunk/tora/src/toglobalsetting.cpp
    trunk/tora/src/toresultmodel.cpp
    trunk/tora/src/utils.cpp

Modified: trunk/tora/src/main.cpp
===================================================================
--- trunk/tora/src/main.cpp	2008-10-01 02:30:40 UTC (rev 3040)
+++ trunk/tora/src/main.cpp	2008-10-01 13:33:23 UTC (rev 3041)
@@ -93,7 +93,7 @@
 #endif
 }
 
-void toUpdateIndicateEmpty(void);
+// void toUpdateIndicateEmpty(void);
 
 int main(int argc, char **argv)
 {
@@ -272,7 +272,7 @@
         toMarkedText::setDefaultTabWidth(toConfigurationSingle::Instance().tabStop());
         toMarkedText::setDefaultTabSpaces(toConfigurationSingle::Instance().tabSpaces());
 
-        toUpdateIndicateEmpty();
+//         toUpdateIndicateEmpty();
 
         new toMain;
 

Modified: trunk/tora/src/toglobalsetting.cpp
===================================================================
--- trunk/tora/src/toglobalsetting.cpp	2008-10-01 02:30:40 UTC (rev 3040)
+++ trunk/tora/src/toglobalsetting.cpp	2008-10-01 13:33:23 UTC (rev 3041)
@@ -298,9 +298,12 @@
 //     AutoLong->setChecked(val);
 //     MoveAfter->setValue(val);
 //     KeepAlive->setChecked(toConfigurationSingle::Instance().keepAlive());
+
+    connect(IndicateEmpty, SIGNAL(clicked(bool)),
+             IndicateEmptyColor, SLOT(setEnabled(bool)));
 }
 
-void toUpdateIndicateEmpty(void);
+// void toUpdateIndicateEmpty(void);
 
 void toDatabaseSetting::saveSetting(void)
 {
@@ -340,7 +343,7 @@
     toConfigurationSingle::Instance().setNumberDecimals(Decimals->value());
     toQValue::setNumberFormat(NumberFormat->currentIndex(), Decimals->value());
 
-    toUpdateIndicateEmpty();
+//     toUpdateIndicateEmpty();
 }
 
 toToolSetting::toToolSetting(QWidget *parent, const char *name, Qt::WFlags fl)

Modified: trunk/tora/src/toresultmodel.cpp
===================================================================
--- trunk/tora/src/toresultmodel.cpp	2008-10-01 02:30:40 UTC (rev 3040)
+++ trunk/tora/src/toresultmodel.cpp	2008-10-01 13:33:23 UTC (rev 3041)
@@ -499,8 +499,8 @@
         return data.toQVariant();
     if (role == Qt::BackgroundRole)
     {
-        if (data.isNull())
-            return QVariant(QColor("#f2ffbc"));
+        if (data.isNull() && toConfigurationSingle::Instance().indicateEmpty())
+            return QVariant(QColor(toConfigurationSingle::Instance().indicateEmptyColor()));
         return QVariant();
     }
     if (role == Qt::TextAlignmentRole)

Modified: trunk/tora/src/utils.cpp
===================================================================
--- trunk/tora/src/utils.cpp	2008-10-01 02:30:40 UTC (rev 3040)
+++ trunk/tora/src/utils.cpp	2008-10-01 13:33:23 UTC (rev 3041)
@@ -1052,17 +1052,17 @@
     return false;
 }
 
-static bool IndicateEmpty = false;
+// static bool IndicateEmpty = false;
+// 
+// void toUpdateIndicateEmpty(void)
+// {
+//     IndicateEmpty = toConfigurationSingle::Instance().indicateEmpty();
+// }
 
-void toUpdateIndicateEmpty(void)
-{
-    IndicateEmpty = toConfigurationSingle::Instance().indicateEmpty();
-}
 
-
 toQValue toNull(const toQValue &str)
 {
-    if (IndicateEmpty)
+    if (!toConfigurationSingle::Instance().indicateEmpty())
     {
         if (str.isNull())
             return str;
@@ -1076,7 +1076,7 @@
 
 toQValue toUnnull(const toQValue &str)
 {
-    if (IndicateEmpty)
+    if (!toConfigurationSingle::Instance().indicateEmpty())
     {
         if (QString(str) == QString::fromLatin1("''"))
             return QString::fromLatin1("");


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.