From: <nn...@us...> - 2007-02-22 16:26:10
|
Revision: 2116 http://svn.sourceforge.net/tora/?rev=2116&view=rev Author: nneul Date: 2007-02-22 08:26:09 -0800 (Thu, 22 Feb 2007) Log Message: ----------- Accept patch #1665065 from Petr - hilighting of null values Modified Paths: -------------- trunk/tora/src/toconf.h trunk/tora/src/todatabasesettingui.ui trunk/tora/src/toglobalsetting.cpp trunk/tora/src/toglobalsetting.h trunk/tora/src/toresultview.cpp Property Changed: ---------------- trunk/tora/src/ Property changes on: trunk/tora/src ___________________________________________________________________ Name: svn:ignore - .deps .libs Makefile Makefile.in *.moc qtlegacy toaboutui.cpp toaboutui.h tobrowserconstraintui.cpp tobrowserconstraintui.h tobrowserfilterui.cpp tobrowserfilterui.h tobrowserindexui.cpp tobrowserindexui.h tobrowsertableui.cpp tobrowsertableui.h tochartalarmui.cpp tochartalarmui.h tochartsetupui.cpp tochartsetupui.h todatabasesettingui.cpp todatabasesettingui.h todebugchangeui.cpp todebugchangeui.h todebugwatch.cpp todebugwatch.h toeditextensiongotoui.cpp toeditextensiongotoui.h toeditextensionsetupui.cpp toeditextensionsetupui.h toglobalsettingui.cpp toglobalsettingui.h tohelpaddfileui.cpp tohelpaddfileui.h tohelpsetupui.cpp tohelpsetupui.h tolinechartsetupui.cpp tolinechartsetupui.h tomessageui.cpp tomessageui.h tonewconnectionui.cpp tonewconnectionui.h tooraclesettingui.cpp tooraclesettingui.h topreferencesui.cpp topreferencesui.h tora tora_fr.qm tora_it.qm tora_se.qm tora_toad.h tora_toad.qm toresultcontentfilterui.cpp toresultcontentfilterui.h toresultlistformatui.cpp toresultlistformatui.h torollbackdialogui.cpp torollbackdialogui.h toscriptui.cpp toscriptui.h tosearchreplaceui.cpp tosearchreplaceui.h tosecurityquotaui.cpp tosecurityquotaui.h tosecurityroleui.cpp tosecurityroleui.h tosecurityuserui.cpp tosecurityuserui.h tostoragedatafileui.cpp tostoragedatafileui.h tostoragedefinitionui.cpp tostoragedefinitionui.h tostoragedialogui.cpp tostoragedialogui.h tostorageprefsui.cpp tostorageprefsui.h tostoragetablespaceui.cpp tostoragetablespaceui.h tosyntaxsetupui.cpp tosyntaxsetupui.h totemplateaddfileui.cpp totemplateaddfileui.h totemplateeditui.cpp totemplateeditui.h totemplatesetupui.cpp totemplatesetupui.h totoolsettingui.cpp totoolsettingui.h totuningoverviewui.cpp totuningoverviewui.h totuningsettingui.cpp totuningsettingui.h toworksheetsetupui.cpp toworksheetsetupui.h utils.moc + .deps .libs Makefile Makefile.in *.moc *.orig qtlegacy toaboutui.cpp toaboutui.h tobrowserconstraintui.cpp tobrowserconstraintui.h tobrowserfilterui.cpp tobrowserfilterui.h tobrowserindexui.cpp tobrowserindexui.h tobrowsertableui.cpp tobrowsertableui.h tochartalarmui.cpp tochartalarmui.h tochartsetupui.cpp tochartsetupui.h todatabasesettingui.cpp todatabasesettingui.h todebugchangeui.cpp todebugchangeui.h todebugwatch.cpp todebugwatch.h toeditextensiongotoui.cpp toeditextensiongotoui.h toeditextensionsetupui.cpp toeditextensionsetupui.h toglobalsettingui.cpp toglobalsettingui.h tohelpaddfileui.cpp tohelpaddfileui.h tohelpsetupui.cpp tohelpsetupui.h tolinechartsetupui.cpp tolinechartsetupui.h tomessageui.cpp tomessageui.h tonewconnectionui.cpp tonewconnectionui.h tooraclesettingui.cpp tooraclesettingui.h topreferencesui.cpp topreferencesui.h tora tora_fr.qm tora_it.qm tora_se.qm tora_toad.h tora_toad.qm toresultcontentfilterui.cpp toresultcontentfilterui.h toresultlistformatui.cpp toresultlistformatui.h torollbackdialogui.cpp torollbackdialogui.h toscriptui.cpp toscriptui.h tosearchreplaceui.cpp tosearchreplaceui.h tosecurityquotaui.cpp tosecurityquotaui.h tosecurityroleui.cpp tosecurityroleui.h tosecurityuserui.cpp tosecurityuserui.h tostoragedatafileui.cpp tostoragedatafileui.h tostoragedefinitionui.cpp tostoragedefinitionui.h tostoragedialogui.cpp tostoragedialogui.h tostorageprefsui.cpp tostorageprefsui.h tostoragetablespaceui.cpp tostoragetablespaceui.h tosyntaxsetupui.cpp tosyntaxsetupui.h totemplateaddfileui.cpp totemplateaddfileui.h totemplateeditui.cpp totemplateeditui.h totemplatesetupui.cpp totemplatesetupui.h totoolsettingui.cpp totoolsettingui.h totuningoverviewui.cpp totuningoverviewui.h totuningsettingui.cpp totuningsettingui.h toworksheetsetupui.cpp toworksheetsetupui.h utils.moc Modified: trunk/tora/src/toconf.h =================================================================== --- trunk/tora/src/toconf.h 2007-02-17 22:00:52 UTC (rev 2115) +++ trunk/tora/src/toconf.h 2007-02-22 16:26:09 UTC (rev 2116) @@ -127,6 +127,7 @@ #define DEFAULT_CSV_DELIMITER "\"" #define CONF_AUTO_INDENT_RO "AutoIndent" #define CONF_INDICATE_EMPTY "IndicateEmpty" +#define CONF_INDICATE_EMPTY_COLOR "IndicateEmptyColor" #define CONF_EXTENSIONS "Extensions" #define CONF_RECENT_FILES "RecentFiles" #define CONF_RECENT_MAX "RecentMax" Modified: trunk/tora/src/todatabasesettingui.ui =================================================================== --- trunk/tora/src/todatabasesettingui.ui 2007-02-17 22:00:52 UTC (rev 2115) +++ trunk/tora/src/todatabasesettingui.ui 2007-02-22 16:26:09 UTC (rev 2116) @@ -1,4 +1,4 @@ -<!DOCTYPE UI><UI version="3.1" stdsetdef="1"> +<!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>toDatabaseSettingUI</class> <widget class="QWidget"> <property name="name"> @@ -8,8 +8,8 @@ <rect> <x>0</x> <y>0</y> - <width>547</width> - <height>501</height> + <width>792</width> + <height>515</height> </rect> </property> <property name="caption"> @@ -34,6 +34,9 @@ <property name="text"> <string>&Autocommit changes</string> </property> + <property name="accel"> + <string>Alt+A</string> + </property> <property name="toolTip" stdset="0"> <string>Specify if changes should be automatically commited.</string> </property> @@ -126,6 +129,9 @@ <property name="text"> <string>&All</string> </property> + <property name="accel"> + <string>Alt+A</string> + </property> </widget> <widget class="QLabel" row="0" column="0"> <property name="name"> @@ -303,19 +309,8 @@ <string>The way numbers should be presented.</string> </property> </widget> - <widget class="QLabel" row="1" column="4"> + <widget class="QSpinBox" row="1" column="3"> <property name="name"> - <cstring>TextLabel3</cstring> - </property> - <property name="text"> - <string>Decimals</string> - </property> - <property name="toolTip" stdset="0"> - <string>Number of decimals for fixed decimal format.</string> - </property> - </widget> - <widget class="QSpinBox" row="1" column="5"> - <property name="name"> <cstring>Decimals</cstring> </property> <property name="enabled"> @@ -328,6 +323,14 @@ <number>2</number> </property> </widget> + <widget class="QCheckBox" row="0" column="0" rowspan="1" colspan="2"> + <property name="name"> + <cstring>IndicateEmpty</cstring> + </property> + <property name="text"> + <string>Indicate empty values as '' instead of NULL as {null}.</string> + </property> + </widget> <widget class="QComboBox" row="1" column="1"> <item> <property name="text"> @@ -348,14 +351,25 @@ <cstring>NumberFormat</cstring> </property> </widget> - <widget class="QCheckBox" row="0" column="0" rowspan="1" colspan="6"> + <widget class="QPushButton" row="0" column="2" rowspan="1" colspan="2"> <property name="name"> - <cstring>IndicateEmpty</cstring> + <cstring>IndicateEmptyColor</cstring> </property> <property name="text"> - <string>Indicate empty values as '' instead of NULL as {null}.</string> + <string>NULL background color</string> </property> </widget> + <widget class="QLabel" row="1" column="2"> + <property name="name"> + <cstring>TextLabel3</cstring> + </property> + <property name="text"> + <string>Decimals</string> + </property> + <property name="toolTip" stdset="0"> + <string>Number of decimals for fixed decimal format.</string> + </property> + </widget> </grid> </widget> </grid> @@ -385,6 +399,12 @@ <receiver>toDatabaseSettingUI</receiver> <slot>numberFormatChange()</slot> </connection> + <connection> + <sender>IndicateEmptyColor</sender> + <signal>clicked()</signal> + <receiver>toDatabaseSettingUI</receiver> + <slot>IndicateEmptyColor_clicked()</slot> + </connection> </connections> <tabstops> <tabstop>AutoCommit</tabstop> @@ -403,8 +423,13 @@ <tabstop>MoveAfter</tabstop> <tabstop>KeepAlive</tabstop> </tabstops> +<includes> + <include location="local" impldecl="in implementation">todatabasesettingui.ui.h</include> +</includes> <slots> <slot>numberFormatChange()</slot> + <slot>IndicateEmpty_toggled( bool )</slot> + <slot>IndicateEmptyColor_clicked()</slot> </slots> <layoutdefaults spacing="6" margin="11"/> </UI> Modified: trunk/tora/src/toglobalsetting.cpp =================================================================== --- trunk/tora/src/toglobalsetting.cpp 2007-02-17 22:00:52 UTC (rev 2115) +++ trunk/tora/src/toglobalsetting.cpp 2007-02-22 16:26:09 UTC (rev 2116) @@ -66,6 +66,7 @@ #include <qvalidator.h> #include <qvariant.h> #include <qwhatsthis.h> +#include <qcolordialog.h> #include "todatabasesettingui.moc" #include "toglobalsettingui.moc" @@ -268,6 +269,13 @@ Decimals->setEnabled(NumberFormat->currentItem() == 2); } +void toDatabaseSetting::IndicateEmptyColor_clicked() +{ + QColor c = QColorDialog::getColor(IndicateEmptyColor->paletteBackgroundColor(), this, "IndicateEmptyColorDialog"); + if (c.isValid()) + IndicateEmptyColor->setPaletteBackgroundColor(c); +} + toDatabaseSetting::toDatabaseSetting(QWidget *parent, const char *name, WFlags fl) : toDatabaseSettingUI(parent, name, fl), toSettingTab("database.html") { @@ -302,6 +310,11 @@ ObjectCache->setCurrentItem(toConfigurationSingle::Instance().globalConfig(CONF_OBJECT_CACHE, DEFAULT_OBJECT_CACHE).toInt()); BkgndConnect->setChecked(!toConfigurationSingle::Instance().globalConfig(CONF_BKGND_CONNECT, "").isEmpty()); IndicateEmpty->setChecked(!toConfigurationSingle::Instance().globalConfig(CONF_INDICATE_EMPTY, "").isEmpty()); + + QColor nullColor; + nullColor.setNamedColor(toConfigurationSingle::Instance().globalConfig(CONF_INDICATE_EMPTY_COLOR, "#f2ffbc")); + IndicateEmptyColor->setPaletteBackgroundColor(nullColor); + int val = toConfigurationSingle::Instance().globalConfig(CONF_AUTO_LONG, "0").toInt(); AutoLong->setChecked(val); MoveAfter->setValue(val); @@ -341,6 +354,7 @@ toConfigurationSingle::Instance().globalSetConfig(CONF_AUTO_LONG, AutoLong->isChecked() ? MoveAfter->cleanText() : QString::fromLatin1("0")); toConfigurationSingle::Instance().globalSetConfig(CONF_INDICATE_EMPTY, IndicateEmpty->isChecked() ? "Yes" : ""); + toConfigurationSingle::Instance().globalSetConfig(CONF_INDICATE_EMPTY_COLOR, IndicateEmptyColor->paletteBackgroundColor().name()); toConfigurationSingle::Instance().globalSetConfig(CONF_KEEP_ALIVE, KeepAlive->isChecked() ? DEFAULT_KEEP_ALIVE : ""); toConfigurationSingle::Instance().globalSetConfig(CONF_NUMBER_FORMAT, QString::number(NumberFormat->currentItem())); Modified: trunk/tora/src/toglobalsetting.h =================================================================== --- trunk/tora/src/toglobalsetting.h 2007-02-17 22:00:52 UTC (rev 2115) +++ trunk/tora/src/toglobalsetting.h 2007-02-22 16:26:09 UTC (rev 2116) @@ -65,6 +65,7 @@ virtual void saveSetting(void); virtual void numberFormatChange(); + virtual void IndicateEmptyColor_clicked(); }; class toToolSetting : public toToolSettingUI, public toSettingTab Modified: trunk/tora/src/toresultview.cpp =================================================================== --- trunk/tora/src/toresultview.cpp 2007-02-17 22:00:52 UTC (rev 2115) +++ trunk/tora/src/toresultview.cpp 2007-02-22 16:26:09 UTC (rev 2116) @@ -192,7 +192,17 @@ void toResultViewItem::paintCell(QPainter * p, const QColorGroup & cg, int column, int width, int align) { - QListViewItem::paintCell(p, cg, column, width, align); + // null related background handling + QColorGroup colNull(cg); + if ((toConfigurationSingle::Instance().globalConfig(CONF_INDICATE_EMPTY, "").isEmpty() && text(column) == "{null}") + || text(column).isNull()) + { + QColor nullColor; + nullColor.setNamedColor(toConfigurationSingle::Instance().globalConfig(CONF_INDICATE_EMPTY_COLOR, "#f2ffbc")); + colNull.setColor(QColorGroup::Base, nullColor); + } + + QListViewItem::paintCell(p, colNull, column, width, align); toResultView *view = dynamic_cast<toResultView *>(listView()); if (view && (itemBelow() == NULL || itemBelow()->itemBelow() == NULL)) view->addItem(); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |