linuxdcpp-team team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 2486
committer: poy <poy@xxxxxxxxxx>
branch nick: trunk
timestamp: Tue 2011-04-12 18:37:13 +0200
message:
  settings dialog fixes
modified:
  dcpp/SettingsManager.cpp
  dcpp/SettingsManager.h
  win32/SettingsDialog.cpp


--
lp:dcplusplus
https://code.launchpad.net/~dcplusplus-team/dcplusplus/trunk

Your team Dcplusplus-team is subscribed to branch lp:dcplusplus.
To unsubscribe from this branch go to https://code.launchpad.net/~dcplusplus-team/dcplusplus/trunk/+edit-subscription

=== modified file 'dcpp/SettingsManager.cpp'
--- dcpp/SettingsManager.cpp	2011-04-11 21:26:22 +0000
+++ dcpp/SettingsManager.cpp	2011-04-12 16:37:13 +0000
@@ -52,7 +52,7 @@
 	"LogFormatSystem", "LogFormatStatus", "DirectoryListingFrameOrder", "DirectoryListingFrameWidths",
 	"TLSPrivateKeyFile", "TLSCertificateFile", "TLSTrustedCertificatesPath",
 	"Language", "DownloadsOrder", "DownloadsWidth", "Toolbar", "LastSearchType",
-	"SoundMainChat", "SoundPM", "SoundPMWindow", "Mapper", "SettingsPage",
+	"SoundMainChat", "SoundPM", "SoundPMWindow", "Mapper",
 	"SENTRY",
 	// Ints
 	"IncomingConnections", "InPort", "Slots", "AutoFollow", "ClearSearch",
@@ -62,7 +62,7 @@
 	"LogDownloads", "LogFinishedDownloads", "LogUploads", "StatusInChat", "ShowJoins",
 	"UseSystemIcons", "PopupPMs", "MinUploadSpeed", "GetUserInfo", "UrlHandler", "MainWindowState",
 	"MainWindowSizeX", "MainWindowSizeY", "MainWindowPosX", "MainWindowPosY",
-	"SettingsWidth", "SettingsHeight",
+	"SettingsWidth", "SettingsHeight", "SettingsPage",
 	"SocksPort", "SocksResolve", "KeepLists", "AutoKick", "QueueFrameShowTree",
 	"CompressTransfers", "SFVCheck", "AutoAway",
 	"MaxCompression", "NoAwayMsgToBots", "SkipZeroByte", "AdlsBreakOnFirst",

=== modified file 'dcpp/SettingsManager.h'
--- dcpp/SettingsManager.h	2011-04-11 21:26:22 +0000
+++ dcpp/SettingsManager.h	2011-04-12 16:37:13 +0000
@@ -70,7 +70,7 @@
 		LOG_FILE_SYSTEM, LOG_FORMAT_SYSTEM, LOG_FORMAT_STATUS, DIRECTORYLISTINGFRAME_ORDER, DIRECTORYLISTINGFRAME_WIDTHS,
 		TLS_PRIVATE_KEY_FILE, TLS_CERTIFICATE_FILE, TLS_TRUSTED_CERTIFICATES_PATH,
 		LANGUAGE, DOWNLOADS_ORDER, DOWNLOADS_WIDTHS, TOOLBAR, LAST_SEARCH_TYPE,
-		SOUND_MAIN_CHAT, SOUND_PM, SOUND_PM_WINDOW, MAPPER, SETTINGS_PAGE,
+		SOUND_MAIN_CHAT, SOUND_PM, SOUND_PM_WINDOW, MAPPER,
 		STR_LAST };
 
 	enum IntSetting { INT_FIRST = STR_LAST + 1,
@@ -81,7 +81,7 @@
 		LOG_DOWNLOADS, LOG_FINISHED_DOWNLOADS, LOG_UPLOADS, STATUS_IN_CHAT, SHOW_JOINS,
 		USE_SYSTEM_ICONS, POPUP_PMS, MIN_UPLOAD_SPEED, GET_USER_INFO, URL_HANDLER, MAIN_WINDOW_STATE,
 		MAIN_WINDOW_SIZE_X, MAIN_WINDOW_SIZE_Y, MAIN_WINDOW_POS_X, MAIN_WINDOW_POS_Y,
-		SETTINGS_WIDTH, SETTINGS_HEIGHT,
+		SETTINGS_WIDTH, SETTINGS_HEIGHT, SETTINGS_PAGE,
 		SOCKS_PORT, SOCKS_RESOLVE, KEEP_LISTS, AUTO_KICK, QUEUEFRAME_SHOW_TREE,
 		COMPRESS_TRANSFERS, SFV_CHECK, AUTO_AWAY,
 		MAX_COMPRESSION, NO_AWAYMSG_TO_BOTS, SKIP_ZERO_BYTE, ADLS_BREAK_ON_FIRST,

=== modified file 'win32/SettingsDialog.cpp'
--- win32/SettingsDialog.cpp	2011-04-11 21:26:22 +0000
+++ win32/SettingsDialog.cpp	2011-04-12 16:37:13 +0000
@@ -70,7 +70,7 @@
 
 int SettingsDialog::run() {
 	auto sizeVal = [](SettingsManager::IntSetting setting) {
-		return std::max(SettingsManager::getInstance()->get(setting), 100) * dwt::util::dpiFactor();
+		return std::max(SettingsManager::getInstance()->get(setting), 200);
 	};
 	create(Seed(dwt::Point(sizeVal(SettingsManager::SETTINGS_WIDTH), sizeVal(SettingsManager::SETTINGS_HEIGHT)),
 		WS_SIZEBOX | DS_CONTEXTHELP));
@@ -121,12 +121,13 @@
 		}
 
 		auto container = cur->addChild(dwt::ScrolledContainer::Seed(WS_BORDER));
-		const auto setting = Text::toT(SETTING(SETTINGS_PAGE));
-		auto addPage = [this, container, &setting](const tstring& title, PropPage* page, HTREEITEM parent) -> HTREEITEM {
-			pages.push_back(page);
+
+		const size_t setting = SETTING(SETTINGS_PAGE);
+		auto addPage = [this, container, setting](const tstring& title, PropPage* page, HTREEITEM parent) -> HTREEITEM {
 			auto ret = tree->insert(title, parent, reinterpret_cast<LPARAM>(page), true);
-			if(title == setting)
+			if(pages.size() == setting)
 				callAsync([=] { tree->setSelected(ret); });
+			pages.push_back(page);
 			return ret;
 		};
 
@@ -248,7 +249,7 @@
 	SettingsManager::getInstance()->set(SettingsManager::SETTINGS_HEIGHT,
 		static_cast<int>(static_cast<float>(pt.y) / dwt::util::dpiFactor()));
 
-	SettingsManager::getInstance()->set(SettingsManager::SETTINGS_PAGE, Text::fromT(tree->getSelectedText()));
+	SettingsManager::getInstance()->set(SettingsManager::SETTINGS_PAGE, find(pages.begin(), pages.end(), currentPage) - pages.begin());
 
 	return true;
 }