From: <ibr...@us...> - 2014-03-09 00:20:22
|
Revision: 5105 http://sourceforge.net/p/tora/code/5105 Author: ibre5041 Date: 2014-03-09 00:20:16 +0000 (Sun, 09 Mar 2014) Log Message: ----------- Modified Paths: -------------- trunk/tora/src/core/main.cpp trunk/tora/src/tools/tooutput.cpp trunk/tora/src/tools/tooutput.h trunk/tora/src/tools/tooutputsettingui.ui Modified: trunk/tora/src/core/main.cpp =================================================================== --- trunk/tora/src/core/main.cpp 2014-03-08 23:23:20 UTC (rev 5104) +++ trunk/tora/src/core/main.cpp 2014-03-09 00:20:16 UTC (rev 5105) @@ -94,6 +94,7 @@ /*! Try to transfer some config options from Tora 2.x */ { + // Transfer connections QSettings oldSettings (TOORGNAME, "TOra"); QSettings newSettings (TOORGNAME, TOAPPNAME); oldSettings.beginGroup("connections"); @@ -104,7 +105,14 @@ } oldSettings.endGroup(); newSettings.endGroup(); - + newSettings.sync(); + oldSettings.remove("connections"); + oldSettings.remove("helpdialog"); + oldSettings.remove("memoEditor"); + oldSettings.remove("toDescribe"); + oldSettings.remove("toWorksheet"); + oldSettings.remove("toWaitEvents"); + oldSettings.remove("toMessage"); } #pragma message WARN( "TODO/FIXME: hicolor theme is broken for Docklet icons. But we need to resolve X11 themes one day" ) Modified: trunk/tora/src/tools/tooutput.cpp =================================================================== --- trunk/tora/src/tools/tooutput.cpp 2014-03-08 23:23:20 UTC (rev 5104) +++ trunk/tora/src/tools/tooutput.cpp 2014-03-09 00:20:16 UTC (rev 5105) @@ -55,7 +55,7 @@ { switch(option) { - case PollingIntervalInt: return QVariant(QString("10 seconds")); + case PollingInterval: return QVariant(QString("10 seconds")); case SourceTypeInt: return QVariant((int)0); case LogUser: return QVariant(QString("ULOG")); default: @@ -83,8 +83,8 @@ Utils::toRefreshCreate(this, "toRefreshCreate", - toConfigurationNewSingle::Instance().option(Output::PollingIntervalInt).toString(), - PollingIntervalInt); + toConfigurationNewSingle::Instance().option(Output::PollingInterval).toString(), + PollingInterval); toSettingTab::loadSettings(this); } @@ -195,7 +195,7 @@ Refresh = Utils::toRefreshCreate(Toolbar, "Refresh", - toConfigurationNewSingle::Instance().option(ToConfiguration::Output::PollingIntervalInt).toString()); + toConfigurationNewSingle::Instance().option(ToConfiguration::Output::PollingInterval).toString()); Toolbar->addWidget(Refresh); connect(Refresh, SIGNAL(activated(const QString &)), @@ -216,7 +216,7 @@ try { connect(timer(), SIGNAL(timeout(void)), this, SLOT(refresh(void))); - Utils::toRefreshParse(timer(), toConfigurationNewSingle::Instance().option(ToConfiguration::Output::PollingIntervalInt).toString()); + Utils::toRefreshParse(timer(), toConfigurationNewSingle::Instance().option(ToConfiguration::Output::PollingInterval).toString()); } TOCATCH; Modified: trunk/tora/src/tools/tooutput.h =================================================================== --- trunk/tora/src/tools/tooutput.h 2014-03-08 23:23:20 UTC (rev 5104) +++ trunk/tora/src/tools/tooutput.h 2014-03-09 00:20:16 UTC (rev 5105) @@ -59,8 +59,8 @@ public: Output() : ConfigContext("Output", ENUM_REF(Output,OptionTypeEnum)) {}; enum OptionTypeEnum { - PollingIntervalInt = 12000 // #define CONF_POLLING - , SourceTypeInt // #define CONF_LOG_TYPE + PollingInterval = 12000 // #define CONF_POLLING + , SourceTypeInt // #define CONF_LOG_TYPE , LogUser // #define CONF_LOG_USER }; QVariant defaultValue(int option) const; Modified: trunk/tora/src/tools/tooutputsettingui.ui =================================================================== --- trunk/tora/src/tools/tooutputsettingui.ui 2014-03-08 23:23:20 UTC (rev 5104) +++ trunk/tora/src/tools/tooutputsettingui.ui 2014-03-09 00:20:16 UTC (rev 5105) @@ -62,7 +62,7 @@ </widget> </item> <item row="1" column="0"> - <widget class="QComboBox" name="PollingIntervalInt"/> + <widget class="QComboBox" name="PollingInterval"/> </item> <item row="0" column="0"> <widget class="QLabel" name="label"> @@ -73,7 +73,7 @@ <string>&Polling timeout</string> </property> <property name="buddy"> - <cstring>PollingIntervalInt</cstring> + <cstring>PollingInterval</cstring> </property> </widget> </item> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |