From: <ibr...@us...> - 2014-02-21 00:05:09
|
Revision: 5082 http://sourceforge.net/p/tora/code/5082 Author: ibre5041 Date: 2014-02-21 00:05:01 +0000 (Fri, 21 Feb 2014) Log Message: ----------- Modified Paths: -------------- trunk/tora/src/CMakeLists.txt trunk/tora/src/connection/tooracleextract.cpp trunk/tora/src/connection/tooraclefind.cpp trunk/tora/src/connection/tooraclesetting.cpp trunk/tora/src/connection/tooraclesettingui.ui trunk/tora/src/connection/tooracletraits.cpp trunk/tora/src/connection/toqmysqlsettingui.ui trunk/tora/src/connection/toteradatatraits.cpp trunk/tora/src/core/main.cpp trunk/tora/src/core/toconfiguration.cpp trunk/tora/src/core/toconfiguration.h trunk/tora/src/core/toglobalsetting.cpp trunk/tora/src/core/toglobalsettingui.ui trunk/tora/src/core/tolistviewformattersql.cpp trunk/tora/src/core/tomainwindow.cpp trunk/tora/src/core/tomainwindow.h trunk/tora/src/core/toresultcode.cpp trunk/tora/src/core/tosyntaxsetup.cpp trunk/tora/src/core/tosyntaxsetupui.ui trunk/tora/src/core/totool.cpp trunk/tora/src/core/totool.h trunk/tora/src/editor/toscintilla.cpp trunk/tora/src/editor/tosqltext.cpp trunk/tora/src/parsing/tolexeroracle.cpp trunk/tora/src/templates/tosqledit.cpp trunk/tora/src/tests/test2.cpp trunk/tora/src/tests/test3.cpp trunk/tora/src/tests/test5.cpp trunk/tora/src/tests/tocustomlexer.cpp trunk/tora/src/tools/toworksheet.cpp trunk/tora/src/tools/toworksheet.h Modified: trunk/tora/src/CMakeLists.txt =================================================================== --- trunk/tora/src/CMakeLists.txt 2014-02-20 17:54:05 UTC (rev 5081) +++ trunk/tora/src/CMakeLists.txt 2014-02-21 00:05:01 UTC (rev 5082) @@ -861,7 +861,11 @@ core/moc_toglobalevent.cxx core/moc_tomainwindow.cxx core/moc_topushbutton.cxx + core/toconfenum.cpp + core/moc_toconfenum.cxx core/toconfiguration.cpp + core/toconfiguration_new.cpp + core/moc_toconfiguration_new.cxx core/toconfigurationpriv.cpp core/toglobalevent.cpp core/tomainwindow.cpp @@ -927,7 +931,8 @@ core/moc_tobrowserbasewidget.cxx core/moc_tocache.cxx core/moc_tocodemodel.cxx - core/moc_toconfiguration.cxx + core/moc_toconfiguration.cxx + core/moc_toconfiguration_new.cxx core/moc_toconfigurationpriv.cxx core/moc_toconnection.cxx core/moc_toconnectionregistry.cxx @@ -972,6 +977,7 @@ core/tocache.cpp core/tocodemodel.cpp core/toconfiguration.cpp + core/toconfiguration_new.cpp core/toconfigurationpriv.cpp core/toconnection.cpp core/toconnectionoptions.cpp Modified: trunk/tora/src/connection/tooracleextract.cpp =================================================================== --- trunk/tora/src/connection/tooracleextract.cpp 2014-02-20 17:54:05 UTC (rev 5081) +++ trunk/tora/src/connection/tooracleextract.cpp 2014-02-21 00:05:01 UTC (rev 5082) @@ -33,9 +33,11 @@ * END_COMMON_COPYRIGHT_HEADER */ #include "connection/tooracleextract.h" +#include "connection/tooraclesetting.h" #include "core/toconnectiontraits.h" #include "core/utils.h" #include "core/toconfiguration.h" +#include "core/toconfiguration_new.h" #include "core/toquery.h" #include "core/toextract.h" #include "core/tosql.h" @@ -758,6 +760,7 @@ const QString &owner, const QString &name) const { + using namespace ToConfiguration; QString monitoring = Utils::toShift(result); QString table = Utils::toShift(result); QString degree = Utils::toShift(result); @@ -781,7 +784,7 @@ ret += QString(" USING TABLESPACE %2\n").arg(QUOTE(tablespace)); } ret += ")\n"; - if (!toConfigurationSingle::Instance().extractorSkipOrgMonInformation()) + if (!toConfigurationNewSingle::Instance().option(Oracle::SkipOrgMon).toBool()) { if (CONNECTION.version() >= "0800" && ext.getStorage() && ! organization.isEmpty() ) { @@ -2324,6 +2327,8 @@ QString toOracleExtract::segmentAttributes(toExtract &ext, toQList &result) const { + using namespace ToConfiguration; + QString ret; if (ext.getStorage()) { @@ -2374,7 +2379,7 @@ QString blocks = *i; i++; - if (!toConfigurationSingle::Instance().extractorSkipStorageExceptTablespaces()) + if (!toConfigurationNewSingle::Instance().option(Oracle::SkipStorageExceptTablespace).toBool()) { if (ext.getResize()) ext.initialNext(blocks, initial, next); @@ -7295,10 +7300,10 @@ toConnectionSubLoan conn(ext.connection()); /* TODO - * DBMS_METADATA.SET_TRANSFORM_PARAM(DBMS_METADATA.SESSION_TRANSFORM,\x92PRETTY\x92,false); - * DBMS_METADATA.SET_TRANSFORM_PARAM(DBMS_METADATA.SESSION_TRANSFORM,\x92SQLTERMINATOR\x92,true); - * DBMS_METADATA.SET_TRANSFORM_PARAM (DBMS_METADATA.SESSION_TRANSFORM, \x91STORAGE\x92,false); - * DBMS_METADATA.SET_TRANSFORM_PARAM (DBMS_METADATA.SESSION_TRANSFORM, \x91SEGMENT_ATTRIBUTES\x92,false); + * DBMS_METADATA.SET_TRANSFORM_PARAM(DBMS_METADATA.SESSION_TRANSFORM,�PRETTY�,false); + * DBMS_METADATA.SET_TRANSFORM_PARAM(DBMS_METADATA.SESSION_TRANSFORM,�SQLTERMINATOR�,true); + * DBMS_METADATA.SET_TRANSFORM_PARAM (DBMS_METADATA.SESSION_TRANSFORM, �STORAGE�,false); + * DBMS_METADATA.SET_TRANSFORM_PARAM (DBMS_METADATA.SESSION_TRANSFORM, �SEGMENT_ATTRIBUTES�,false); */ toQuery query1(conn, SQLDbmsMetadataSetTransform, toQueryParams()); query1.eof(); @@ -7668,9 +7673,10 @@ const QString &owner, const QString &name) const { + using namespace ToConfiguration; clearFlags(ext); - if (toConfigurationSingle::Instance().extractorUseDbmsMetadata()) + if (toConfigurationNewSingle::Instance().option(Oracle::UseDbmsMetadata).toBool()) { stream << createMetadata(ext, owner, name, type); return; Modified: trunk/tora/src/connection/tooraclefind.cpp =================================================================== --- trunk/tora/src/connection/tooraclefind.cpp 2014-02-20 17:54:05 UTC (rev 5081) +++ trunk/tora/src/connection/tooraclefind.cpp 2014-02-21 00:05:01 UTC (rev 5082) @@ -37,6 +37,8 @@ #include "core/utils.h" #include "core/tooracleconst.h" #include "core/toconfiguration.h" +#include "core/toconfiguration_new.h" +#include "core/toglobalsetting.h" #include "core/toconf.h" #include <QtCore/QDir> @@ -168,13 +170,15 @@ QList<toConnectionProviderFinder::ConnectionProvirerParams> toOracleInstantFinder::find() { + using namespace ToConfiguration; + QList<ConnectionProvirerParams> retval; QSet<QString> possibleOracleHomes; ConnectionProvirerParams ohome; do { - QString cHome = toConfigurationSingle::Instance().oracleHome(); + QString cHome = toConfigurationNewSingle::Instance().option(Global::OracleHomeDirectory).toString(); if( cHome.isEmpty()) continue; QDir dHome(cHome); @@ -439,13 +443,15 @@ QList<toConnectionProviderFinder::ConnectionProvirerParams> toOracleFinder::find() { + using namespace ToConfiguration; + QList<ConnectionProvirerParams> retval; QSet<QString> possibleOracleHomes; ConnectionProvirerParams ohome; do { - QString cHome = toConfigurationSingle::Instance().oracleHome(); + QString cHome = toConfigurationNewSingle::Instance().option(Global::OracleHomeDirectory).toString(); if( cHome.isEmpty()) continue; QDir dHome(cHome); Modified: trunk/tora/src/connection/tooraclesetting.cpp =================================================================== --- trunk/tora/src/connection/tooraclesetting.cpp 2014-02-20 17:54:05 UTC (rev 5081) +++ trunk/tora/src/connection/tooraclesetting.cpp 2014-02-21 00:05:01 UTC (rev 5082) @@ -34,6 +34,8 @@ #include "connection/tooraclesetting.h" #include "core/toconfiguration.h" +#include "core/toconfiguration_new.h" + #include "core/tologger.h" #include "core/utils.h" #include "core/toconnection.h" @@ -78,7 +80,7 @@ //OpenCursors->setValue(toConfigurationSingle::Instance().openCursors()); KeepPlans->setChecked(toConfigurationSingle::Instance().keepPlans()); VsqlPlans->setChecked(toConfigurationSingle::Instance().vsqlPlans()); - SharedPlan->setChecked(toConfigurationSingle::Instance().sharedPlan()); + //SharedPlan->setChecked(toConfigurationSingle::Instance().sharedPlan()); int len = toConfigurationSingle::Instance().maxLong(); if (len >= 0) { @@ -87,15 +89,15 @@ Unlimited->setChecked(false); } // extractor group options - cbUseDbmsMetadata->setChecked(toConfigurationSingle::Instance().extractorUseDbmsMetadata()); - cbIncludeStorage->setChecked(toConfigurationSingle::Instance().extractorIncludeSotrage()); - cbSkipOrgMon->setChecked(toConfigurationSingle::Instance().extractorSkipOrgMonInformation()); - cbSkiptStorExTablespace->setChecked(toConfigurationSingle::Instance().extractorSkipStorageExceptTablespaces()); - cbIncludeParallel->setChecked(toConfigurationSingle::Instance().extractorIncludeParallel()); - cbIncludePartition->setChecked(toConfigurationSingle::Instance().extractorIncludePartition()); - cbIncludeCode->setChecked(toConfigurationSingle::Instance().extractorIncludeCode()); - cbIncludeHeader->setChecked(toConfigurationSingle::Instance().extractorIncludeHeader()); - cbIncludePrompt->setChecked(toConfigurationSingle::Instance().extractorIncludePrompt()); + //cbUseDbmsMetadata->setChecked(toConfigurationSingle::Instance().extractorUseDbmsMetadata()); + //cbIncludeStorage->setChecked(toConfigurationSingle::Instance().extractorIncludeSotrage()); + //cbSkipOrgMon->setChecked(toConfigurationSingle::Instance().extractorSkipOrgMonInformation()); + //cbSkiptStorExTablespace->setChecked(toConfigurationSingle::Instance().extractorSkipStorageExceptTablespaces()); + //cbIncludeParallel->setChecked(toConfigurationSingle::Instance().extractorIncludeParallel()); + //cbIncludePartition->setChecked(toConfigurationSingle::Instance().extractorIncludePartition()); + //cbIncludeCode->setChecked(toConfigurationSingle::Instance().extractorIncludeCode()); + //cbIncludeHeader->setChecked(toConfigurationSingle::Instance().extractorIncludeHeader()); + //cbIncludePrompt->setChecked(toConfigurationSingle::Instance().extractorIncludePrompt()); connect(cbUseDbmsMetadata, SIGNAL(toggled(bool)), this, SLOT(dbmsMetadataClicked(bool))); dbmsMetadataClicked(cbUseDbmsMetadata->isChecked()); try @@ -108,6 +110,7 @@ { TLOG(1, toDecorator, __HERE__) << " Ignored exception." << std::endl; } + toSettingTab::processChildWidgets(this); } Modified: trunk/tora/src/connection/tooraclesettingui.ui =================================================================== --- trunk/tora/src/connection/tooraclesettingui.ui 2014-02-20 17:54:05 UTC (rev 5081) +++ trunk/tora/src/connection/tooraclesettingui.ui 2014-02-21 00:05:01 UTC (rev 5082) @@ -22,9 +22,6 @@ </property> <item row="4" column="1"> <widget class="QPushButton" name="CreatePlanTable"> - <property name="enabled"> - <bool>false</bool> - </property> <property name="sizePolicy"> <sizepolicy hsizetype="Preferred" vsizetype="Fixed"> <horstretch>0</horstretch> @@ -118,11 +115,7 @@ <widget class="QLineEdit" name="ExplainPlan"/> </item> <item row="2" column="1"> - <widget class="QLineEdit" name="MaxLong"> - <property name="enabled"> - <bool>false</bool> - </property> - </widget> + <widget class="QLineEdit" name="MaxLong"/> </item> <item row="2" column="0"> <widget class="QLabel" name="TextLabel6_3_2"> Modified: trunk/tora/src/connection/tooracletraits.cpp =================================================================== --- trunk/tora/src/connection/tooracletraits.cpp 2014-02-20 17:54:05 UTC (rev 5081) +++ trunk/tora/src/connection/tooracletraits.cpp 2014-02-21 00:05:01 UTC (rev 5082) @@ -35,7 +35,9 @@ #include "connection/tooracletraits.h" #include "core/utils.h" #include "core/toconfiguration.h" +#include "core/toconfiguration_new.h" #include "core/toconnection.h" +#include "editor/toworksheettext.h" /** Return a string representation to address an object. * @@ -55,6 +57,8 @@ */ QString toOracleTraits::quote(QString const &name) const { + using namespace ToConfiguration; + bool mustBeQuoted = false; // Do not quote already quoted string @@ -85,7 +89,7 @@ if (mustBeQuoted) return QString::fromLatin1("\"") + name + QString::fromLatin1("\""); - if (toConfigurationSingle::Instance().objectNamesUpper()) + if (toConfigurationNewSingle::Instance().option(Editor::ObjectNamesUpperBool).toBool()) return name.toUpper(); else return name.toLower(); Modified: trunk/tora/src/connection/toqmysqlsettingui.ui =================================================================== --- trunk/tora/src/connection/toqmysqlsettingui.ui 2014-02-20 17:54:05 UTC (rev 5081) +++ trunk/tora/src/connection/toqmysqlsettingui.ui 2014-02-21 00:05:01 UTC (rev 5082) @@ -22,9 +22,6 @@ </property> <item row="0" column="0" colspan="2"> <widget class="QCheckBox" name="BreakConnections"> - <property name="enabled"> - <bool>false</bool> - </property> <property name="text"> <string>Posibility to break MySQL queries (Can require more connections)</string> </property> Modified: trunk/tora/src/connection/toteradatatraits.cpp =================================================================== --- trunk/tora/src/connection/toteradatatraits.cpp 2014-02-20 17:54:05 UTC (rev 5081) +++ trunk/tora/src/connection/toteradatatraits.cpp 2014-02-21 00:05:01 UTC (rev 5082) @@ -35,6 +35,8 @@ #include "connection/toteradatatraits.h" #include "core/utils.h" #include "core/toconfiguration.h" +#include "core/toconfiguration_new.h" +#include "editor/toworksheettext.h" /** Return a string representation to address an object. * @@ -54,6 +56,8 @@ */ QString toTeradataTraits::quote(QString const &name) const { + using namespace ToConfiguration; + bool mustBeQuoted = false; // Identifiers starting with digit should be quoted if (name.at(0).isDigit()) @@ -79,7 +83,7 @@ if (mustBeQuoted) return QString::fromLatin1("\"") + name + QString::fromLatin1("\""); - if (toConfigurationSingle::Instance().objectNamesUpper()) + if (toConfigurationNewSingle::Instance().option(Editor::ObjectNamesUpperBool).toBool()) return name.toUpper(); else return name.toLower(); Modified: trunk/tora/src/core/main.cpp =================================================================== --- trunk/tora/src/core/main.cpp 2014-02-20 17:54:05 UTC (rev 5081) +++ trunk/tora/src/core/main.cpp 2014-02-21 00:05:01 UTC (rev 5082) @@ -33,6 +33,7 @@ * END_COMMON_COPYRIGHT_HEADER */ #include "core/toconfiguration.h" +#include "core/toconfiguration_new.h" #include "core/tosplash.h" #include "core/toconnectionprovider.h" #include "core/tooracleconst.h" @@ -45,6 +46,7 @@ #include "core/tomain.h" #include "core/utils.h" #include "core/tologger.h" +#include "core/toglobalsetting.h" #ifndef Q_OS_WIN32 #include <unistd.h> @@ -95,7 +97,7 @@ try { - QString style(toConfigurationSingle::Instance().style()); + QString style(toConfigurationNewSingle::Instance().option(ToConfiguration::Global::Style).toString()); if (!style.isEmpty()) QApplication::setStyle(QStyleFactory::create(style)); @@ -106,11 +108,11 @@ // qApp->setDefaultCodec(QTextCodec::codecForName(getenv("LANG"))); QTranslator torats(0); - QString qmDir = toConfigurationSingle::Instance().sharePath(); + QString qmDir = toConfigurationNewSingle::Instance().sharePath(); torats.load(qmDir + QString("tora_") + toConfigurationSingle::Instance().translation(), "."); qApp->installTranslator(&torats); - if (toConfigurationSingle::Instance().toadBindings()) + if (toConfigurationNewSingle::Instance().option(ToConfiguration::Global::ToadBindingsBool).toBool()) { QTranslator toadbindings(0); // qt4 - hot candidate for a builtin resource @@ -209,7 +211,7 @@ // Loop over all providers found and try to load desired Oracle client // 1st try to load requested Oracle client(if set) then load thick(TNS) Oracle client - QDir oHome = toConfigurationSingle::Instance().oracleHome(); + QDir oHome = toConfigurationNewSingle::Instance().option(ToConfiguration::Global::OracleHomeDirectory).toString(); Q_FOREACH(toConnectionProviderFinder::ConnectionProvirerParams const& params, allProviders) { QString providerName = params.value("PROVIDER").toString(); @@ -268,12 +270,12 @@ } // end splash #ifdef TORA_EXPERIMENTAL - DotGraph::setLayoutCommandPath(toConfigurationSingle::Instance().graphvizHome()); + DotGraph::setLayoutCommandPath(toConfigurationNewSingle::Instance().option(ToConfiguration::Global::GraphvizHomeDirectory).toString()); #endif try { - toSQL::loadSQL(toConfigurationSingle::Instance().customSQL()); + toSQL::loadSQL(toConfigurationNewSingle::Instance().option(ToConfiguration::Global::CustomSQL).toString()); } catch (QString const& e) { TLOG(1, toDecorator, __HERE__) << " Ignored exception:" << e << std::endl; Modified: trunk/tora/src/core/toconfiguration.cpp =================================================================== --- trunk/tora/src/core/toconfiguration.cpp 2014-02-20 17:54:05 UTC (rev 5081) +++ trunk/tora/src/core/toconfiguration.cpp 2014-02-21 00:05:01 UTC (rev 5082) @@ -68,33 +68,33 @@ QCoreApplication::setApplicationName(TOAPPNAME); } -QString toConfiguration::customSQL() -{ - Q_D(toConfiguration); - return d->m_customSQL; -} +//QString toConfiguration::customSQL() +//{ +// Q_D(toConfiguration); +// return d->m_customSQL; +//} void toConfiguration::setCustomSQL(const QString & v) { Q_D(toConfiguration); d->m_customSQL = v; } -QString toConfiguration::helpDirectory() -{ - Q_D(toConfiguration); - return d->m_helpDirectory; -} +//QString toConfiguration::helpDirectory() +//{ +// Q_D(toConfiguration); +// return d->m_helpDirectory; +//} void toConfiguration::setHelpDirectory(const QString & v) { Q_D(toConfiguration); d->m_helpDirectory = v; } -QString toConfiguration::defaultSession() -{ - Q_D(toConfiguration); - return d->m_defaultSession; -} +//QString toConfiguration::defaultSession() +//{ +// Q_D(toConfiguration); +// return d->m_defaultSession; +//} void toConfiguration::setDefaultSession(const QString & v) { Q_D(toConfiguration); @@ -179,11 +179,11 @@ d->m_planTable = v; } -QString toConfiguration::textFontName() -{ - Q_D(toConfiguration); - return d->m_textFontName; -} +//QString toConfiguration::textFontName() +//{ +// Q_D(toConfiguration); +// return d->m_textFontName; +//} void toConfiguration::setTextFontName(const QString & v) { Q_D(toConfiguration); @@ -212,11 +212,11 @@ d->m_listFontName = v; } -QString toConfiguration::oracleHome() -{ - Q_D(toConfiguration); - return d->m_oracleHome; -} +//QString toConfiguration::oracleHome() +//{ +// Q_D(toConfiguration); +// return d->m_oracleHome; +//} void toConfiguration::setOracleHome(QString const &v) { @@ -224,6 +224,11 @@ d->m_oracleHome = v; } + + + + + QString toConfiguration::dateFormat() { Q_D(toConfiguration); @@ -268,33 +273,33 @@ d->m_syntaxHighlighting = v; } -int toConfiguration::editorType() -{ - Q_D(toConfiguration); - return d->m_editorType; -} +//int toConfiguration::editorType() +//{ +// Q_D(toConfiguration); +// return d->m_editorType; +//} void toConfiguration::setEditorType(int v) { Q_D(toConfiguration); d->m_editorType = v; } -bool toConfiguration::keywordUpper() -{ - Q_D(toConfiguration); - return d->m_keywordUpper; -} +//bool toConfiguration::keywordUpper() +//{ +// Q_D(toConfiguration); +// return d->m_keywordUpper; +//} void toConfiguration::setKeywordUpper(bool v) { Q_D(toConfiguration); d->m_keywordUpper = v; } -bool toConfiguration::objectNamesUpper() -{ - Q_D(toConfiguration); - return d->m_objectNamesUpper; -} +//bool toConfiguration::objectNamesUpper() +//{ +// Q_D(toConfiguration); +// return d->m_objectNamesUpper; +//} void toConfiguration::setObjectNamesUpper(bool v) { Q_D(toConfiguration); @@ -520,22 +525,22 @@ d->m_objectCache = v; } -bool toConfiguration::firewallMode() -{ - Q_D(toConfiguration); - return d->m_firewallMode; -} +//bool toConfiguration::firewallMode() +//{ +// Q_D(toConfiguration); +// return d->m_firewallMode; +//} void toConfiguration::setFirewallMode(bool v) { Q_D(toConfiguration); d->m_firewallMode = v; } -int toConfiguration::connTestInterval() -{ - Q_D(toConfiguration); - return d->m_connTestInterval; -} +//int toConfiguration::connTestInterval() +//{ +// Q_D(toConfiguration); +// return d->m_connTestInterval; +//} void toConfiguration::setConnTestInterval(int v) { Q_D(toConfiguration); @@ -586,11 +591,11 @@ d->m_sharedPlan = v; } -bool toConfiguration::restoreSession() -{ - Q_D(toConfiguration); - return d->m_restoreSession; -} +//bool toConfiguration::restoreSession() +//{ +// Q_D(toConfiguration); +// return d->m_restoreSession; +//} void toConfiguration::setRestoreSession(bool v) { Q_D(toConfiguration); @@ -709,11 +714,11 @@ return d->m_cacheTimeout; } -int toConfiguration::tabStop() -{ - Q_D(toConfiguration); - return d->m_tabStop; -} +//int toConfiguration::tabStop() +//{ +// Q_D(toConfiguration); +// return d->m_tabStop; +//} void toConfiguration::setTabStop(int v) { Q_D(toConfiguration); @@ -731,22 +736,22 @@ d->m_useSpacesForIndent = v; } -bool toConfiguration::editDragDrop() -{ - Q_D(toConfiguration); - return d->m_editDragDrop; -} +//bool toConfiguration::editDragDrop() +//{ +// Q_D(toConfiguration); +// return d->m_editDragDrop; +//} void toConfiguration::setEditDragDrop(bool v) { Q_D(toConfiguration); d->m_editDragDrop = v; } -bool toConfiguration::toadBindings() -{ - Q_D(toConfiguration); - return d->m_toadBindings; -} +//bool toConfiguration::toadBindings() +//{ +// Q_D(toConfiguration); +// return d->m_toadBindings; +//} void toConfiguration::setToadBindings(bool v) { Q_D(toConfiguration); @@ -764,11 +769,11 @@ d->m_displayGridlines = v; } -QString toConfiguration::style() -{ - Q_D(toConfiguration); - return d->m_style; -} +//QString toConfiguration::style() +//{ +// Q_D(toConfiguration); +// return d->m_style; +//} void toConfiguration::setStyle(const QString & v) { Q_D(toConfiguration); @@ -787,11 +792,11 @@ } // toqsqlconnection -QString toConfiguration::mysqlHome() -{ - Q_D(toConfiguration); - return d->m_mysqlHome; -} +//QString toConfiguration::mysqlHome() +//{ +// Q_D(toConfiguration); +// return d->m_mysqlHome; +//} void toConfiguration::setMysqlHome(QString const &v) { @@ -799,11 +804,11 @@ d->m_mysqlHome = v; } -QString toConfiguration::pgsqlHome() -{ - Q_D(toConfiguration); - return d->m_pgsqlHome; -} +//QString toConfiguration::pgsqlHome() +//{ +// Q_D(toConfiguration); +// return d->m_pgsqlHome; +//} void toConfiguration::setPgsqlHome(QString const &v) { @@ -1265,11 +1270,11 @@ } // toworksheet -bool toConfiguration::wsAutoSave() -{ - Q_D(toConfiguration); - return d->m_wsAutoSave; -} +//bool toConfiguration::wsAutoSave() +//{ +// Q_D(toConfiguration); +// return d->m_wsAutoSave; +//} void toConfiguration::setWsAutoSave(bool v) { Q_D(toConfiguration); @@ -1549,99 +1554,99 @@ d->m_forcelineend = v; } -bool toConfiguration::extractorUseDbmsMetadata() -{ - Q_D(toConfiguration); - return d->m_extractorUseDbmsMetadata; -} +//bool toConfiguration::extractorUseDbmsMetadata() +//{ +// Q_D(toConfiguration); +// return d->m_extractorUseDbmsMetadata; +//} void toConfiguration::setExtractorUseDbmsMetadata(bool v) { Q_D(toConfiguration); d->m_extractorUseDbmsMetadata = v; } -bool toConfiguration::extractorIncludeSotrage() -{ - Q_D(toConfiguration); - return d->m_extractorIncludeSotrage; -} +//bool toConfiguration::extractorIncludeSotrage() +//{ +// Q_D(toConfiguration); +// return d->m_extractorIncludeSotrage; +//} void toConfiguration::setExtractorIncludeSotrage(bool v) { Q_D(toConfiguration); d->m_extractorIncludeSotrage = v; } -bool toConfiguration::extractorSkipOrgMonInformation() -{ - Q_D(toConfiguration); - return d->m_extractorSkipOrgMonInformation; -} +//bool toConfiguration::extractorSkipOrgMonInformation() +//{ +// Q_D(toConfiguration); +// return d->m_extractorSkipOrgMonInformation; +//} void toConfiguration::setExtractorSkipOrgMonInformation(bool v) { Q_D(toConfiguration); d->m_extractorSkipOrgMonInformation = v; } -bool toConfiguration::extractorSkipStorageExceptTablespaces() -{ - Q_D(toConfiguration); - return d->m_extractorSkipStorageExceptTablespaces; -} +//bool toConfiguration::extractorSkipStorageExceptTablespaces() +//{ +// Q_D(toConfiguration); +// return d->m_extractorSkipStorageExceptTablespaces; +//} void toConfiguration::setExtractorSkipStorageExceptTablespaces(bool v) { Q_D(toConfiguration); d->m_extractorSkipStorageExceptTablespaces = v; } -bool toConfiguration::extractorIncludeParallel() -{ - Q_D(toConfiguration); - return d->m_extractorIncludeParallel; -} +//bool toConfiguration::extractorIncludeParallel() +//{ +// Q_D(toConfiguration); +// return d->m_extractorIncludeParallel; +//} void toConfiguration::setExtractorIncludeParallel(bool v) { Q_D(toConfiguration); d->m_extractorIncludeParallel = v; } -bool toConfiguration::extractorIncludePartition() -{ - Q_D(toConfiguration); - return d->m_extractorIncludePartition; -} +//bool toConfiguration::extractorIncludePartition() +//{ +// Q_D(toConfiguration); +// return d->m_extractorIncludePartition; +//} void toConfiguration::setExtractorIncludePartition(bool v) { Q_D(toConfiguration); d->m_extractorIncludePartition = v; } -bool toConfiguration::extractorIncludeCode() -{ - Q_D(toConfiguration); - return d->m_extractorIncludeCode; -} +//bool toConfiguration::extractorIncludeCode() +//{ +// Q_D(toConfiguration); +// return d->m_extractorIncludeCode; +//} void toConfiguration::setExtractorIncludeCode(bool v) { Q_D(toConfiguration); d->m_extractorIncludeCode = v; } -bool toConfiguration::extractorIncludeHeader() -{ - Q_D(toConfiguration); - return d->m_extractorIncludeHeader; -} +//bool toConfiguration::extractorIncludeHeader() +//{ +// Q_D(toConfiguration); +// return d->m_extractorIncludeHeader; +//} void toConfiguration::setExtractorIncludeHeader(bool v) { Q_D(toConfiguration); d->m_extractorIncludeHeader = v; } -bool toConfiguration::extractorIncludePrompt() -{ - Q_D(toConfiguration); - return d->m_extractorIncludePrompt; -} +//bool toConfiguration::extractorIncludePrompt() +//{ +// Q_D(toConfiguration); +// return d->m_extractorIncludePrompt; +//} void toConfiguration::setExtractorIncludePrompt(bool v) { Q_D(toConfiguration); Modified: trunk/tora/src/core/toconfiguration.h =================================================================== --- trunk/tora/src/core/toconfiguration.h 2014-02-20 17:54:05 UTC (rev 5081) +++ trunk/tora/src/core/toconfiguration.h 2014-02-21 00:05:01 UTC (rev 5082) @@ -31,6 +31,7 @@ */ Q_ENUMS(ObjectCacheEnum) + /* // Global Settings // Paths Q_PROPERTY(QString CustomSQL READ customSQL WRITE setCustomSQL) @@ -96,6 +97,7 @@ Q_PROPERTY(QString IndicateEmptyColor READ indicateEmptyColor WRITE setIndicateEmptyColor) Q_PROPERTY(int NumberFormat READ numberFormat WRITE setNumberFormat) Q_PROPERTY(int NumberDecimals READ numberDecimals WRITE setNumberDecimals) + */ public: toConfiguration(QObject *parent = 0); ~toConfiguration(); @@ -150,7 +152,7 @@ int maxColDisp(); void setMaxColDisp(int v); - QString textFontName(); + //QString textFontName(); void setTextFontName(const QString & v); QString codeFontName(); @@ -165,13 +167,13 @@ int syntaxHighlighting(); void setSyntaxHighlighting(int v); - int editorType(); + //int editorType(); void setEditorType(int v); - bool keywordUpper(); + //bool keywordUpper(); void setKeywordUpper(bool v); - bool objectNamesUpper(); + //bool objectNamesUpper(); void setObjectNamesUpper(bool v); QString cacheDir(); @@ -180,7 +182,7 @@ bool cacheDisk(); void setCacheDisk(bool v); - QString customSQL(); + //QString customSQL(); void setCustomSQL(const QString & v); int statusMessage(); @@ -192,7 +194,7 @@ QString sizeUnit(); void setSizeUnit(const QString & v); - QString helpDirectory(); + //QString helpDirectory(); void setHelpDirectory(const QString & v); int historySize(); @@ -243,19 +245,19 @@ ObjectCacheEnum objectCache(); void setObjectCache(ObjectCacheEnum v); - bool firewallMode(); + //bool firewallMode(); void setFirewallMode(bool v); - int connTestInterval(); + //int connTestInterval(); void setConnTestInterval(int v); int initialEditorContent(); void setInitialEditorContent(int v); - bool restoreSession(); + //bool restoreSession(); void setRestoreSession(bool v); - QString defaultSession(); + //QString defaultSession(); void setDefaultSession(const QString & v); int defaultFormat(); @@ -281,8 +283,8 @@ QString translation(); void setTranslation(const QString & v); - int keepAlive(); - void setKeepAlive(int v); + //int keepAlive(); + //void setKeepAlive(int v); int numberFormat(); void setNumberFormat(int v); @@ -292,26 +294,26 @@ int cacheTimeout(); - int tabStop(); + //int tabStop(); void setTabStop(int v); bool useSpacesForIndent(); void setUseSpacesForIndent(bool v); - bool editDragDrop(); + //bool editDragDrop(); void setEditDragDrop(bool v); - bool toadBindings(); + //bool toadBindings(); void setToadBindings(bool v); bool displayGridlines(); void setDisplayGridlines(bool v); - QString style(); + //QString style(); void setStyle(const QString & v); // tooracleconnection - QString oracleHome(); + //QString oracleHome(); void setOracleHome(QString const&); QString dateFormat(); @@ -336,10 +338,10 @@ void setSharedPlan(bool v); // toqsqlconnection - QString mysqlHome(); + //QString mysqlHome(); void setMysqlHome(QString const&); - QString pgsqlHome(); + //QString pgsqlHome(); void setPgsqlHome(QString const&); QString graphvizHome(); @@ -487,7 +489,7 @@ void setTuningCharts(bool v); // toworksheet - bool wsAutoSave(); + //bool wsAutoSave(); void setWsAutoSave(bool v); bool wsCheckSave(); @@ -555,31 +557,31 @@ // Extractor. Controls the method used to produce database object extracts // as well as extraction settings (which information should be extracted). - bool extractorUseDbmsMetadata(); + //bool extractorUseDbmsMetadata(); void setExtractorUseDbmsMetadata(bool v); - bool extractorIncludeSotrage(); + //bool extractorIncludeSotrage(); void setExtractorIncludeSotrage(bool v); - bool extractorSkipOrgMonInformation(); + //bool extractorSkipOrgMonInformation(); void setExtractorSkipOrgMonInformation(bool v); - bool extractorSkipStorageExceptTablespaces(); + //bool extractorSkipStorageExceptTablespaces(); void setExtractorSkipStorageExceptTablespaces(bool v); - bool extractorIncludeParallel(); + //bool extractorIncludeParallel(); void setExtractorIncludeParallel(bool v); - bool extractorIncludePartition(); + //bool extractorIncludePartition(); void setExtractorIncludePartition(bool v); - bool extractorIncludeCode(); + //bool extractorIncludeCode(); void setExtractorIncludeCode(bool v); - bool extractorIncludeHeader(); + //bool extractorIncludeHeader(); void setExtractorIncludeHeader(bool v); - bool extractorIncludePrompt(); + //bool extractorIncludePrompt(); void setExtractorIncludePrompt(bool v); // Aplication location paths Modified: trunk/tora/src/core/toglobalsetting.cpp =================================================================== --- trunk/tora/src/core/toglobalsetting.cpp 2014-02-20 17:54:05 UTC (rev 5081) +++ trunk/tora/src/core/toglobalsetting.cpp 2014-02-21 00:05:01 UTC (rev 5082) @@ -175,9 +175,9 @@ TabbedTools->setVisible(false); #endif - CustomSQL->setText(toConfigurationSingle::Instance().customSQL()); - HelpDirectory->setText(toConfigurationSingle::Instance().helpDirectory()); - DefaultSession->setText(toConfigurationSingle::Instance().defaultSession()); + //CustomSQL->setText(toConfigurationSingle::Instance().customSQL()); + //HelpDirectory->setText(toConfigurationSingle::Instance().helpDirectory()); + //DefaultSession->setText(toConfigurationSingle::Instance().defaultSession()); CacheDirectory->setText(toCache::cacheDir().absolutePath()); #ifdef Q_OS_WIN MysqlHomeDirectory->setEnabled(true); @@ -187,16 +187,16 @@ GraphvizHomeDirectory->setEnabled(true); GraphvizHomeBrowse->setEnabled(true); #endif - OracleHomeDirectory->setText(toConfigurationSingle::Instance().oracleHome()); - MysqlHomeDirectory->setText(toConfigurationSingle::Instance().mysqlHome()); - PgsqlHomeDirectory->setText(toConfigurationSingle::Instance().pgsqlHome()); - GraphvizHomeDirectory->setText(toConfigurationSingle::Instance().graphvizHome()); + //OracleHomeDirectory->setText(toConfigurationSingle::Instance().oracleHome()); + //MysqlHomeDirectory->setText(toConfigurationSingle::Instance().mysqlHome()); + //PgsqlHomeDirectory->setText(toConfigurationSingle::Instance().pgsqlHome()); + //GraphvizHomeDirectory->setText(toConfigurationSingle::Instance().graphvizHome()); ChangeConnectionBool->setChecked(toConfigurationSingle::Instance().changeConnection()); SavePasswordBool->setChecked(toConfigurationSingle::Instance().savePassword()); IncludeDbCaptionBool->setChecked(toConfigurationSingle::Instance().includeDbCaption()); - RestoreSessionBool->setChecked(toConfigurationSingle::Instance().restoreSession()); - ToadBindingsBool->setChecked(toConfigurationSingle::Instance().toadBindings()); + //RestoreSessionBool->setChecked(toConfigurationSingle::Instance().restoreSession()); + //ToadBindingsBool->setChecked(toConfigurationSingle::Instance().toadBindings()); CacheDiskBool->setChecked(toConfigurationSingle::Instance().cacheDisk()); DisplayGridlinesBool->setChecked(toConfigurationSingle::Instance().displayGridlines()); MultiLineResultsBool->setChecked(toConfigurationSingle::Instance().multiLineResults()); @@ -247,54 +247,7 @@ // Translation Translation->setText(toConfigurationSingle::Instance().translation()); - { - static QRegExp any(".*"); - QList<QWidget*> lst = findChildren<QWidget*>(any); - Q_FOREACH(QWidget *w, lst) - { - qDebug() << w->objectName(); - if (w->objectName() == "qt_spinbox_lineedit") // internal widget inside QSpinBox - continue; - if (QComboBox *combo = qobject_cast<QComboBox*>(w)) - { - try - { - QVariant v = toConfigurationNewSingle::Instance().option(combo->objectName()); - } catch (...) { - qDebug() << w->objectName() << '*'; - combo->setDisabled(true); - } - } else if (QSpinBox *spin = qobject_cast<QSpinBox*>(w)) - { - try - { - QVariant v = toConfigurationNewSingle::Instance().option(spin->objectName()); - } catch (...) { - qDebug() << w->objectName() << '#'; - spin->setDisabled(true); - } - } else if (QLineEdit *edit = qobject_cast<QLineEdit*>(w)) - { - try - { - QVariant v = toConfigurationNewSingle::Instance().option(edit->objectName()); - } catch (...) { - qDebug() << w->objectName() << '&'; - edit->setDisabled(true); - } - } else if (QCheckBox *checkbox = qobject_cast<QCheckBox*>(w)) - { - try - { - QVariant v = toConfigurationNewSingle::Instance().option(checkbox->objectName()); - } catch (...) { - qDebug() << w->objectName() << '%'; - checkbox->setDisabled(true); - } - } - - } - } + toSettingTab::processChildWidgets(this); } void toGlobalSetting::sqlBrowse(void) @@ -512,8 +465,8 @@ // BkgndConnect->setChecked(toConfigurationSingle::Instance().bkgndConnect()); CachedConnections->setValue(toConfigurationSingle::Instance().cachedConnections()); IndicateEmpty->setChecked(toConfigurationSingle::Instance().indicateEmpty()); - FirewallMode->setChecked(toConfigurationSingle::Instance().firewallMode()); - ConnTestInterval->setValue(toConfigurationSingle::Instance().connTestInterval()); + //FirewallMode->setChecked(toConfigurationSingle::Instance().firewallMode()); + //ConnTestInterval->setValue(toConfigurationSingle::Instance().connTestInterval()); QColor nullColor; nullColor.setNamedColor(toConfigurationSingle::Instance().indicateEmptyColor()); Modified: trunk/tora/src/core/toglobalsettingui.ui =================================================================== --- trunk/tora/src/core/toglobalsettingui.ui 2014-02-20 17:54:05 UTC (rev 5081) +++ trunk/tora/src/core/toglobalsettingui.ui 2014-02-21 00:05:01 UTC (rev 5082) @@ -166,17 +166,10 @@ </widget> </item> <item row="5" column="1"> - <widget class="QLineEdit" name="MysqlHomeDirectory"> - <property name="enabled"> - <bool>false</bool> - </property> - </widget> + <widget class="QLineEdit" name="MysqlHomeDirectory"/> </item> <item row="5" column="2"> <widget class="QPushButton" name="MySQLHomeBrowse"> - <property name="enabled"> - <bool>false</bool> - </property> <property name="text"> <string>Browse</string> </property> @@ -201,17 +194,10 @@ </widget> </item> <item row="6" column="1"> - <widget class="QLineEdit" name="PgsqlHomeDirectory"> - <property name="enabled"> - <bool>false</bool> - </property> - </widget> + <widget class="QLineEdit" name="PgsqlHomeDirectory"/> </item> <item row="6" column="2"> <widget class="QPushButton" name="PgSQLHomeBrowse"> - <property name="enabled"> - <bool>false</bool> - </property> <property name="text"> <string>Browse</string> </property> @@ -235,17 +221,10 @@ </widget> </item> <item row="7" column="1"> - <widget class="QLineEdit" name="GraphvizHomeDirectory"> - <property name="enabled"> - <bool>false</bool> - </property> - </widget> + <widget class="QLineEdit" name="GraphvizHomeDirectory"/> </item> <item row="7" column="2"> <widget class="QPushButton" name="GraphvizHomeBrowse"> - <property name="enabled"> - <bool>false</bool> - </property> <property name="text"> <string>Browse</string> </property> @@ -402,9 +381,6 @@ </item> <item row="3" column="0"> <widget class="QCheckBox" name="RestoreSessionBool"> - <property name="enabled"> - <bool>false</bool> - </property> <property name="text"> <string>Restore session on startup</string> </property> @@ -412,9 +388,6 @@ </item> <item row="4" column="0"> <widget class="QCheckBox" name="ToadBindingsBool"> - <property name="enabled"> - <bool>false</bool> - </property> <property name="toolTip"> <string>Use TOAD keybindings instead of classic TOra.</string> </property> Modified: trunk/tora/src/core/tolistviewformattersql.cpp =================================================================== --- trunk/tora/src/core/tolistviewformattersql.cpp 2014-02-20 17:54:05 UTC (rev 5081) +++ trunk/tora/src/core/tolistviewformattersql.cpp 2014-02-21 00:05:01 UTC (rev 5082) @@ -38,10 +38,12 @@ #include "core/tolistviewformattersql.h" #include "core/toconfiguration.h" +#include "core/toconfiguration_new.h" #include "core/tolistviewformatterfactory.h" #include "core/tolistviewformatteridentifier.h" #include "core/toresultmodel.h" #include "core/utils.h" +#include "editor/toworksheettext.h" namespace { @@ -64,6 +66,8 @@ //const toResultModel *model); const QAbstractItemModel * model) { + using namespace ToConfiguration; + int columns = model->columnCount(); int rows = model->rowCount(); @@ -75,7 +79,7 @@ QString columnNames; QString output; - if (toConfigurationSingle::Instance().keywordUpper()) + if (toConfigurationNewSingle::Instance().option(Editor::KeywordUpperBool).toBool()) sql = "INSERT INTO %1%2 VALUES (%3);"; else sql = "insert into %1%2 values (%3);"; Modified: trunk/tora/src/core/tomainwindow.cpp =================================================================== --- trunk/tora/src/core/tomainwindow.cpp 2014-02-20 17:54:05 UTC (rev 5081) +++ trunk/tora/src/core/tomainwindow.cpp 2014-02-21 00:05:01 UTC (rev 5082) @@ -33,10 +33,37 @@ * END_COMMON_COPYRIGHT_HEADER */ #include "core/tomainwindow.h" +#include "ts_log/ts_log_utils.h" #include <QtGui/QApplication> #include <QtGui/QAction> +namespace ToConfiguration +{ +QVariant Main::defaultValue(int option) const +{ + switch(option) + { + case LastVersion: return QVariant(QString("")); // TORAVERSION + case FirstInstall: return QVariant(QString("")); // QDateTime::currentDateTime().toString() + case RecentFiles: return QVariant(QStringList()); + case RecentMax: return QVariant((int)25); + case LastDir: return QVariant(QString("")); + case Encoding: return QVariant(QString("Default")); + case DefaultTool: return QVariant(QString("")); + case CacheTimeout: return QVariant((int)7); + case StatusSave: return QVariant((int)10); + case DontReread: return QVariant((bool)true); + case EditDragDrop: return QVariant((bool)false); + case CSVSeparator: return QVariant(QString(";")); + case CSVDelimiter: return QVariant(QString("\"")); + default: + Q_ASSERT_X( false, qPrintable(__QHERE__), qPrintable(QString("Context Editor un-registered enum value: %1").arg(option))); + return QVariant(); + } +} +} + toMainWindow* toMainWindow::lookup() { static toMainWindow *main = NULL; Modified: trunk/tora/src/core/tomainwindow.h =================================================================== --- trunk/tora/src/core/tomainwindow.h 2014-02-20 17:54:05 UTC (rev 5081) +++ trunk/tora/src/core/tomainwindow.h 2014-02-21 00:05:01 UTC (rev 5082) @@ -67,22 +67,7 @@ , CSVSeparator // #define CONF_CSV_SEPARATOR , CSVDelimiter // #define CONF_CSV_DELIMITER }; - virtual QVariant defaultValue(int option) const - { - LastVersion = 1000 // #define CONF_LAST_VERSION - , FirstInstall // #define CONF_FIRST_INSTALL - , RecentFiles // #define CONF_RECENT_FILES - , RecentMax // #define CONF_RECENT_MAX - , LastDir // #define CONF_LAST_DIR - , Encoding // #define CONF_ENCODING - , DefaultTool // #define CONF_DEFAULT_TOOL - , CacheTimeout // #define CONF_CACHE_TIMEOUT - , StatusSave // #define CONF_STATUS_SAVE (Message history size) - , DontReread // #define CONF_DONT_REREAD - , EditDragDrop // #define CONF_EDIT_DRAG_DROP (toScintilla) - , CSVSeparator // #define CONF_CSV_SEPARATOR - , CSVDelimiter // #define CONF_CSV_DELIMITER - } + virtual QVariant defaultValue(int option) const; }; }; Modified: trunk/tora/src/core/toresultcode.cpp =================================================================== --- trunk/tora/src/core/toresultcode.cpp 2014-02-20 17:54:05 UTC (rev 5081) +++ trunk/tora/src/core/toresultcode.cpp 2014-02-21 00:05:01 UTC (rev 5082) @@ -36,6 +36,8 @@ #include "core/utils.h" #include "core/toextract.h" #include "core/toconfiguration.h" +#include "core/toconfiguration_new.h" +#include "connection/tooraclesetting.h" #include "editor/todebugtext.h" toResultCode::toResultCode(bool prompt, QWidget *parent, const char *name) @@ -65,6 +67,7 @@ void toResultCode::query(const QString &sql, toQueryParams const& param) { + using namespace ToConfiguration; if (!setSqlAndParams(sql, param)) return ; @@ -113,7 +116,7 @@ { if ((type == QString::fromLatin1("TABLE") || type == QString::fromLatin1("TABLE PARTITION")) && - !toConfigurationSingle::Instance().extractorUseDbmsMetadata()) + !toConfigurationNewSingle::Instance().option(Oracle::UseDbmsMetadata).toBool()) { objects.insert(objects.end(), QString::fromLatin1("TABLE FAMILY:") + owner + QString::fromLatin1(".") + name); objects.insert(objects.end(), QString::fromLatin1("TABLE REFERENCES:") + owner + QString::fromLatin1(".") + name); @@ -130,11 +133,11 @@ objects.insert(objects.end(), type + QString::fromLatin1(":") + owner + QString::fromLatin1(".") + name); toExtract extract(conn, NULL); - extract.setCode(toConfigurationSingle::Instance().extractorIncludeCode()); - extract.setHeading(m_heading && toConfigurationSingle::Instance().extractorIncludeHeader()); + extract.setCode(toConfigurationNewSingle::Instance().option(Oracle::IncludeCode).toBool()); + extract.setHeading(m_heading && toConfigurationNewSingle::Instance().option(Oracle::IncludeHeader).toBool()); extract.setPrompt(Prompt); extract.setReplace(true); // generate create OR REPLACE statements - extract.setParallel(toConfigurationSingle::Instance().extractorIncludeParallel()); + extract.setParallel(toConfigurationNewSingle::Instance().option(Oracle::IncludeParallel).toBool()); editor()->setText(extract.create(objects)); } TOCATCH Modified: trunk/tora/src/core/tosyntaxsetup.cpp =================================================================== --- trunk/tora/src/core/tosyntaxsetup.cpp 2014-02-20 17:54:05 UTC (rev 5081) +++ trunk/tora/src/core/tosyntaxsetup.cpp 2014-02-21 00:05:01 UTC (rev 5082) @@ -56,6 +56,7 @@ , Current(NULL) , Styles(toConfigurationSingle::Instance().styles()) { + using namespace ToConfiguration; if (name) setObjectName(name); @@ -64,9 +65,9 @@ Analyzer = new toSyntaxAnalyzerNL(Example->editor()); SyntaxHighlighting->setCurrentIndex(toConfigurationSingle::Instance().syntaxHighlighting()); - EditorType->setCurrentIndex(toConfigurationSingle::Instance().editorType()); - KeywordUpper->setChecked(toConfigurationSingle::Instance().keywordUpper()); - ObjectNamesUpper->setChecked(toConfigurationSingle::Instance().objectNamesUpper()); + //EditorType->setCurrentIndex(toConfigurationSingle::Instance().editorType()); + //KeywordUpper->setChecked(toConfigurationSingle::Instance().keywordUpper()); + //ObjectNamesUpper->setChecked(toConfigurationSingle::Instance().objectNamesUpper()); CompletionSort->setChecked(toConfigurationSingle::Instance().completionSort()); UseMaxTextWidthMarkBool->setChecked(toConfigurationSingle::Instance().useMaxTextWidthMark()); @@ -76,18 +77,18 @@ connect(EditorShortcutsEdit, SIGNAL(clicked()), this, SLOT(openEditorShortcutsDialog())); - AutoIndentBool->setChecked(toConfigurationSingle::Instance().autoIndent()); + //AutoIndentBool->setChecked(toConfigurationSingle::Instance().autoIndent()); Extensions->setText(toConfigurationSingle::Instance().extensions()); - TabStopInt->setValue(toConfigurationSingle::Instance().tabStop()); - UseSpacesForIndentBool->setChecked(toConfigurationSingle::Instance().useSpacesForIndent()); + //TabStopInt->setValue(toConfigurationSingle::Instance().tabStop()); + //UseSpacesForIndentBool->setChecked(toConfigurationSingle::Instance().useSpacesForIndent()); { - QFont font(Utils::toStringToFont(toConfigurationSingle::Instance().codeFontName())); + QFont font(Utils::toStringToFont(toConfigurationNewSingle::Instance().option(Editor::ConfCodeFont).toString())); checkFixedWidth(font); CodeExample->setFont(font); } - TextExample->setFont(Utils::toStringToFont(toConfigurationSingle::Instance().textFontName())); + TextExample->setFont(Utils::toStringToFont(toConfigurationNewSingle::Instance().option(Editor::ConfTextFont).toString())); { QString str(toConfigurationSingle::Instance().listFontName()); @@ -130,50 +131,7 @@ Errors[2] = tr("Unknown variable"); Example->setErrors(Errors); - { - static QRegExp any(".*"); - QList<QWidget*> lst = findChildren<QWidget*>(any); - Q_FOREACH(QWidget *w, lst) - { - qDebug() << w->objectName(); - if (w->objectName() == "qt_spinbox_lineedit") // internal widget inside QSpinBox - continue; - if (QComboBox *combo = qobject_cast<QComboBox*>(w)) - { - try - { - QVariant v = toConfigurationNewSingle::Instance().option(combo->objectName()); - } catch (...) { - combo->setDisabled(true); - } - } else if (QSpinBox *spin = qobject_cast<QSpinBox*>(w)) - { - try - { - QVariant v = toConfigurationNewSingle::Instance().option(spin->objectName()); - } catch (...) { - spin->setDisabled(true); - } - } else if (QLineEdit *edit = qobject_cast<QLineEdit*>(w)) - { - try - { - QVariant v = toConfigurationNewSingle::Instance().option(edit->objectName()); - } catch (...) { - edit->setDisabled(true); - } - } else if (QCheckBox *checkbox = qobject_cast<QCheckBox*>(w)) - { - try - { - QVariant v = toConfigurationNewSingle::Instance().option(checkbox->objectName()); - } catch (...) { - checkbox->setDisabled(true); - } - } - - } - } + toSettingTab::processChildWidgets(this); } void toSyntaxSetup::checkFixedWidth(const QFont &fnt) Modified: trunk/tora/src/core/tosyntaxsetupui.ui =================================================================== --- trunk/tora/src/core/tosyntaxsetupui.ui 2014-02-20 17:54:05 UTC (rev 5081) +++ trunk/tora/src/core/tosyntaxsetupui.ui 2014-02-21 00:05:01 UTC (rev 5082) @@ -115,9 +115,6 @@ </item> <item> <widget class="QCheckBox" name="CodeCompletionBool"> - <property name="enabled"> - <bool>false</bool> - </property> <property name="toolTip"> <string>Activate code completion in SQL editors. Not recommended on slow connections.</string> </property> @@ -128,9 +125,6 @@ </item> <item> <widget class="QCheckBox" name="KeywordUpper"> - <property name="enabled"> - <bool>false</bool> - </property> <property name="toolTip"> <string>Convert all keywords to uppercase when displayingsyntaxhighlighted text. Only available for monospaced fonts.</string> </property> @@ -141,9 +135,6 @@ </item> <item> <widget class="QCheckBox" name="ObjectNamesUpper"> - <property name="enabled"> - <bool>false</bool> - </property> <property name="toolTip"> <string>Table, view, column names etc. are extracted in upper-case</string> </property> @@ -157,9 +148,6 @@ </item> <item> <widget class="QCheckBox" name="CompletionSort"> - <property name="enabled"> - <bool>false</bool> - </property> <property name="toolTip"> <string>Sort the available completion rows alphabetically or in the order the are.</string> </property> @@ -191,9 +179,6 @@ </item> <item> <widget class="QCheckBox" name="AutoIndentBool"> - <property name="enabled"> - <bool>false</bool> - </property> <property name="toolTip"> <string>Indent a new line in an editor to the same column as the previous line</string> </property> @@ -204,9 +189,6 @@ </item> <item> <widget class="QCheckBox" name="UseSpacesForIndentBool"> - <property name="enabled"> - <bool>false</bool> - </property> <property name="toolTip"> <string>If set the editor will insert spaces rather than tabs</string> </property> Modified: trunk/tora/src/core/totool.cpp =================================================================== --- trunk/tora/src/core/totool.cpp 2014-02-20 17:54:05 UTC (rev 5081) +++ trunk/tora/src/core/totool.cpp 2014-02-21 00:05:01 UTC (rev 5082) @@ -39,6 +39,7 @@ #include "core/totool.h" #include "core/utils.h" #include "core/tologger.h" +#include "core/toconfiguration_new.h" #include "core/toconnection.h" #include "core/toconnectionregistry.h" #include "core/toworkspace.h" @@ -71,6 +72,68 @@ return Priority; } +void toSettingTab::processChildWidgets(QWidget *widget) +{ + static QRegExp any(".*"); + QList<QWidget*> lst = widget->findChildren<QWidget*>(any); + Q_FOREACH(QWidget *w, lst) + { + qDebug() << w->objectName(); + if (w->objectName() == "qt_spinbox_lineedit") // internal widget inside QSpinBox + continue; + if (QComboBox *combo = qobject_cast<QComboBox*>(w)) + { + try + { + QVariant v = toConfigurationNewSingle::Instance().option(combo->objectName()); + } catch (...) { + qDebug() << w->objectName() << '*'; + combo->setDisabled(true); + } + } else if (QSpinBox *spin = qobject_cast<QSpinBox*>(w)) + { + try + { + QVariant v = toConfigurationNewSingle::Instance().option(spin->objectName()); + if (v.type() == QVariant::Int) + { + spin->setValue(v.toInt()); + } else { + spin->setDisabled(true); + } + } catch (...) { + qDebug() << w->objectName() << '#'; + spin->setDisabled(true); + } + } else if (QLineEdit *edit = qobject_cast<QLineEdit*>(w)) + { + try + { + QVariant v = toConfigurationNewSingle::Instance().option(edit->objectName()); + } catch (...) { + qDebug() << w->objectName() << '&'; + edit->setDisabled(true); + } + } else if (QCheckBox *checkbox = qobject_cast<QCheckBox*>(w)) + { + try + { + QVariant v = toConfigurationNewSingle::Instance().option(checkbox->objectName()); + if (v.type() == QVariant::Bool) + { + checkbox->setChecked(v.toBool()); + } else { + checkbox->setDisabled(true); + } + } catch (...) { + qDebug() << w->objectName() << '%'; + checkbox->setDisabled(true); + } + } + + } +} + toConnectionWidget::toConnectionWidget(toConnection &conn, QWidget *widget) : Connection(&conn), Widget(widget) { Modified: trunk/tora/src/core/totool.h =================================================================== --- trunk/tora/src/core/totool.h 2014-02-20 17:54:05 UTC (rev 5081) +++ trunk/tora/src/core/totool.h 2014-02-21 00:05:01 UTC (rev 5082) @@ -270,6 +270,8 @@ * entry using the @ref toTool::setConfig function. */ virtual void saveSetting(void) = 0; + + virtual void processChildWidgets(QWidget*); }; /** This class is used to hold connections for @ref toResult classes. Modified: trunk/tora/src/editor/toscintilla.cpp =================================================================== --- trunk/tora/src/editor/toscintilla.cpp 2014-02-20 17:54:05 UTC (rev 5081) +++ trunk/tora/src/editor/toscintilla.cpp 2014-02-21 00:05:01 UTC (rev 5082) @@ -34,10 +34,13 @@ #include "editor/toscintilla.h" #include "editor/tostyle.h" +#include "editor/toworksheettext.h" #include "core/toconf.h" #include "core/toconfiguration.h" +#include "core/toconfiguration_new.h" #include "core/toglobalevent.h" #include "core/tologger.h" +#include "core/tomainwindow.h" #include <QtGui/QClipboard> #include <QtGui/QPrintDialog> @@ -71,13 +74,14 @@ , m_flags() , m_searchIndicator(9) // see QsciScintilla docs { + using namespace ToConfiguration; if (name) setObjectName(name); setHorizontalScrollBarPolicy(Qt::ScrollBarAsNeeded); setVerticalScrollBarPolicy(Qt::ScrollBarAsNeeded); - super::setFont(Utils::toStringToFont(toConfigurationSingle::Instance().textFontName())); + super::setFont(Utils::toStringToFont(toConfigurationNewSingle::Instance().option(Editor::ConfTextFont).toString())); super::setMarginLineNumbers(0, true); super::setCallTipsStyle(CallTipsNone); @@ -103,8 +107,8 @@ connect(this, SIGNAL(linesChanged()), this, SLOT(slotLinesChanged())); // sets default tab width - super::setTabWidth(toConfigurationSingle::Instance().tabStop()); - super::setIndentationsUseTabs(!toConfigurationSingle::Instance().useSpacesForIndent()); + super::setTabWidth(toConfigurationNewSingle::Instance().option(Editor::TabStopInt).toInt()); + super::setIndentationsUseTabs(!toConfigurationNewSingle::Instance().option(Editor::UseSpacesForIndentBool).toBool()); super::setUtf8(true); setAcceptDrops(true); // QWidget::setAcceptDrops @@ -304,7 +308,7 @@ break; } - if (toConfigurationSingle::Instance().autoIndent()) + if (toConfigurationNewSingle::Instance().option(ToConfiguration::Editor::AutoIndentBool).toBool()) { int curline, curcol; getCursorPosition (&curline, &curcol); @@ -361,7 +365,7 @@ DragStart = QPoint(); if(e->button() == Qt::LeftButton && geometry().contains(e->pos())) { - if(!toConfigurationSingle::Instance().editDragDrop()) + if(!toConfigurationNewSingle::Instance().option(ToConfiguration::Main::EditDragDrop).toBool()) { // would normally be a drag request. clear selection. if(QsciScintilla::hasSelectedText()) Modified: trunk/tora/src/editor/tosqltext.cpp =================================================================== --- trunk/tora/src/editor/tosqltext.cpp 2014-02-20 17:54:05 UTC (rev 5081) +++ trunk/tora/src/editor/tosqltext.cpp 2014-02-21 00:05:01 UTC (rev 5082) @@ -38,6 +38,8 @@ #include "core/tologger.h" #include "core/utils.h" #include "core/toconfiguration.h" +#include "core/toconfiguration_new.h" +#include "editor/toworksheettext.h" #include <QtGui/QListWidget> #include <QtGui/QVBoxLayout> @@ -57,13 +59,13 @@ , m_parserThread(new QThread(this)) , m_haveFocus(true) { - + using namespace ToConfiguration; #if defined(Q_OS_WIN) mono = QFont("Courier New", 10); #elif defined(Q_OS_MAC) mono = QFont("Courier", 12); #else - mono = QFont(Utils::toStringToFont(toConfigurationSingle::Instance().codeFontName())); + mono = QFont(Utils::toStringToFont(toConfigurationNewSingle::Instance().option(Editor::ConfCodeFont).toString())); #endif // Setup QsciScintilla stuff @@ -158,6 +160,8 @@ void toSqlText::setHighlighter(HighlighterTypeEnum h) { + using namespace ToConfiguration; + // TODO handle bgthread working here QsciLexer *lexer = super::lexer(); highlighterType = h; @@ -225,7 +229,8 @@ QColor(toSqlText::lightMagenta), mono); } - setFont(Utils::toStringToFont(toConfigurationSingle::Instance().codeFontName())); + + setFont(Utils::toStringToFont(toConfigurationNewSingle::Instance().option(Editor::ConfCodeFont).toString())); //update(); gets called by setFont } Modified: trunk/tora/src/parsing/tolexeroracle.cpp =================================================================== --- trunk/tora/src/parsing/tolexeroracle.cpp 2014-02-20 17:54:05 UTC (rev 5081) +++ trunk/tora/src/parsing/tolexeroracle.cpp 2014-02-21 00:05:01 UTC (rev 5082) @@ -36,6 +36,8 @@ #include "parsing/tolexeroracleapis.h" #include "core/utils.h" #include "core/toconfiguration.h"... [truncated message content] |