Menu
▾
▴
[Dcplusplus-commit] SF.net SVN: dcplusplus: [604] dcplusplus/trunk
|
From: <arn...@us...> - 2006-05-20 16:17:29
|
Revision: 604 Author: arnetheduck Date: 2006-05-20 09:17:09 -0700 (Sat, 20 May 2006) ViewCVS: http://svn.sourceforge.net/dcplusplus/?rev=604&view=rev Log Message: ----------- Bugfixes, patches Modified Paths: -------------- dcplusplus/trunk/Example.xml dcplusplus/trunk/changelog.txt dcplusplus/trunk/client/AdcHub.cpp dcplusplus/trunk/client/ClientManager.h dcplusplus/trunk/client/NmdcHub.cpp dcplusplus/trunk/client/SettingsManager.cpp dcplusplus/trunk/client/SettingsManager.h dcplusplus/trunk/client/StringDefs.cpp dcplusplus/trunk/client/StringDefs.h dcplusplus/trunk/windows/HubFrame.cpp dcplusplus/trunk/windows/MainFrm.cpp dcplusplus/trunk/windows/QueueFrame.cpp dcplusplus/trunk/windows/QueueFrame.h dcplusplus/trunk/windows/WindowsPage.cpp Modified: dcplusplus/trunk/Example.xml =================================================================== --- dcplusplus/trunk/Example.xml 2006-05-15 21:53:14 UTC (rev 603) +++ dcplusplus/trunk/Example.xml 2006-05-20 16:17:09 UTC (rev 604) @@ -462,6 +462,7 @@ <String Name="SettingsPopupOffline">Open private messages from offline users in their own window</String> <String Name="SettingsPopupPms">Open private messages in their own window</String> <String Name="SettingsPorts">Ports</String> + <String Name="SettingsPromptPassword">Popup box to input password for hubs</String> <String Name="SettingsPublicHubList">Public Hubs list</String> <String Name="SettingsPublicHubListHttpProxy">HTTP Proxy (for hublist only)</String> <String Name="SettingsPublicHubListUrl">Public Hubs list URL</String> Modified: dcplusplus/trunk/changelog.txt =================================================================== --- dcplusplus/trunk/changelog.txt 2006-05-15 21:53:14 UTC (rev 603) +++ dcplusplus/trunk/changelog.txt 2006-05-20 16:17:09 UTC (rev 604) @@ -14,6 +14,9 @@ * Another fix for opencow * Fixed user command parameters not being remembered * Fixed ADC op commands +* [bug 464] Added option for masked password prompt (thanks ullner) +* [bug 922] Updated help links (thanks xan) +* Fixed op count -- 0.689 2006-04-01 -- * Fixed displaying of available bytes when user list is off Modified: dcplusplus/trunk/client/AdcHub.cpp =================================================================== --- dcplusplus/trunk/client/AdcHub.cpp 2006-05-15 21:53:14 UTC (rev 603) +++ dcplusplus/trunk/client/AdcHub.cpp 2006-05-20 16:17:09 UTC (rev 604) @@ -140,6 +140,7 @@ if(u->getUser() == ClientManager::getInstance()->getMe()) { state = STATE_NORMAL; setMyIdentity(u->getIdentity()); + updateCounts(false); } fire(ClientListener::UserUpdated(), this, *u); } Modified: dcplusplus/trunk/client/ClientManager.h =================================================================== --- dcplusplus/trunk/client/ClientManager.h 2006-05-15 21:53:14 UTC (rev 603) +++ dcplusplus/trunk/client/ClientManager.h 2006-05-20 16:17:09 UTC (rev 604) @@ -93,15 +93,6 @@ Client::List& getClients() { return clients; } - void removeClientListener(ClientListener* listener) { - Lock l(cs); - Client::Iter endIt = clients.end(); - for(Client::Iter it = clients.begin(); it != endIt; ++it) { - Client* client = *it; - client->removeListener(listener); - } - } - string getCachedIp() const { Lock l(cs); return cachedIp; } CID getMyCID(); Modified: dcplusplus/trunk/client/NmdcHub.cpp =================================================================== --- dcplusplus/trunk/client/NmdcHub.cpp 2006-05-15 21:53:14 UTC (rev 603) +++ dcplusplus/trunk/client/NmdcHub.cpp 2006-05-20 16:17:09 UTC (rev 604) @@ -603,7 +603,9 @@ continue; OnlineUser& ou = getUser(*it); ou.getIdentity().setOp(true); - v.push_back(&getUser(*it)); + if(*it == getMyNick()) + getMyIdentity().setOp(true); + v.push_back(&ou); } fire(ClientListener::UsersUpdated(), this, v); Modified: dcplusplus/trunk/client/SettingsManager.cpp =================================================================== --- dcplusplus/trunk/client/SettingsManager.cpp 2006-05-15 21:53:14 UTC (rev 603) +++ dcplusplus/trunk/client/SettingsManager.cpp 2006-05-20 16:17:09 UTC (rev 604) @@ -73,7 +73,7 @@ "NoIpOverride", "SearchOnlyFreeSlots", "LastSearchType", "BoldFinishedDownloads", "BoldFinishedUploads", "BoldQueue", "BoldHub", "BoldPm", "BoldSearch", "SocketInBuffer", "SocketOutBuffer", "OnlyDlTthFiles", "OpenWaitingUsers", "BoldWaitingUsers", "OpenSystemLog", "BoldSystemLog", "AutoRefreshTime", - "UseSsl", "AutoSearchLimit", "AltSortOrder", "AutoKickNoFavs", + "UseSsl", "AutoSearchLimit", "AltSortOrder", "AutoKickNoFavs", "PromptPassword", "SENTRY", // Int64 "TotalUpload", "TotalDownload", @@ -256,6 +256,7 @@ setDefault(AUTO_SEARCH_LIMIT, 5); setDefault(ALT_SORT_ORDER, false); setDefault(AUTO_KICK_NO_FAVS, false); + setDefault(PROMPT_PASSWORD, false); #ifdef _WIN32 setDefault(MAIN_WINDOW_STATE, SW_SHOWNORMAL); Modified: dcplusplus/trunk/client/SettingsManager.h =================================================================== --- dcplusplus/trunk/client/SettingsManager.h 2006-05-15 21:53:14 UTC (rev 603) +++ dcplusplus/trunk/client/SettingsManager.h 2006-05-20 16:17:09 UTC (rev 604) @@ -89,7 +89,7 @@ NO_IP_OVERRIDE, SEARCH_ONLY_FREE_SLOTS, LAST_SEARCH_TYPE, BOLD_FINISHED_DOWNLOADS, BOLD_FINISHED_UPLOADS, BOLD_QUEUE, BOLD_HUB, BOLD_PM, BOLD_SEARCH, SOCKET_IN_BUFFER, SOCKET_OUT_BUFFER, ONLY_DL_TTH_FILES, OPEN_WAITING_USERS, BOLD_WAITING_USERS, OPEN_SYSTEM_LOG, BOLD_SYSTEM_LOG, AUTO_REFRESH_TIME, - USE_SSL, AUTO_SEARCH_LIMIT, ALT_SORT_ORDER, AUTO_KICK_NO_FAVS, + USE_SSL, AUTO_SEARCH_LIMIT, ALT_SORT_ORDER, AUTO_KICK_NO_FAVS, PROMPT_PASSWORD, INT_LAST }; enum Int64Setting { INT64_FIRST = INT_LAST + 1, Modified: dcplusplus/trunk/client/StringDefs.cpp =================================================================== --- dcplusplus/trunk/client/StringDefs.cpp 2006-05-15 21:53:14 UTC (rev 603) +++ dcplusplus/trunk/client/StringDefs.cpp 2006-05-20 16:17:09 UTC (rev 604) @@ -463,6 +463,7 @@ "Open private messages from offline users in their own window", "Open private messages in their own window", "Ports", +"Popup box to input password for hubs", "Public Hubs list", "HTTP Proxy (for hublist only)", "Public Hubs list URL", @@ -1067,6 +1068,7 @@ "SettingsPopupOffline", "SettingsPopupPms", "SettingsPorts", +"SettingsPromptPassword", "SettingsPublicHubList", "SettingsPublicHubListHttpProxy", "SettingsPublicHubListUrl", Modified: dcplusplus/trunk/client/StringDefs.h =================================================================== --- dcplusplus/trunk/client/StringDefs.h 2006-05-15 21:53:14 UTC (rev 603) +++ dcplusplus/trunk/client/StringDefs.h 2006-05-20 16:17:09 UTC (rev 604) @@ -466,6 +466,7 @@ SETTINGS_POPUP_OFFLINE, // "Open private messages from offline users in their own window" SETTINGS_POPUP_PMS, // "Open private messages in their own window" SETTINGS_PORTS, // "Ports" + SETTINGS_PROMPT_PASSWORD, // "Popup box to input password for hubs" SETTINGS_PUBLIC_HUB_LIST, // "Public Hubs list" SETTINGS_PUBLIC_HUB_LIST_HTTP_PROXY, // "HTTP Proxy (for hublist only)" SETTINGS_PUBLIC_HUB_LIST_URL, // "Public Hubs list URL" Modified: dcplusplus/trunk/windows/HubFrame.cpp =================================================================== --- dcplusplus/trunk/windows/HubFrame.cpp 2006-05-15 21:53:14 UTC (rev 603) +++ dcplusplus/trunk/windows/HubFrame.cpp 2006-05-20 16:17:09 UTC (rev 604) @@ -482,10 +482,24 @@ client->password(client->getPassword()); addClientLine(TSTRING(STORED_PASSWORD_SENT)); } else { - ctrlMessage.SetWindowText(_T("/password ")); - ctrlMessage.SetFocus(); - ctrlMessage.SetSel(10, 10); - waitingForPW = true; + if(!BOOLSETTING(PROMPT_PASSWORD)) { + ctrlMessage.SetWindowText(_T("/password ")); + ctrlMessage.SetFocus(); + ctrlMessage.SetSel(10, 10); + waitingForPW = true; + } else { + LineDlg linePwd; + linePwd.title = CTSTRING(ENTER_PASSWORD); + linePwd.description = CTSTRING(ENTER_PASSWORD); + linePwd.password = true; + if(linePwd.DoModal(m_hWnd) == IDOK) { + client->setPassword(Text::fromT(linePwd.line)); + client->password(Text::fromT(linePwd.line)); + waitingForPW = false; + } else { + client->disconnect(true); + } + } } } else if(task->speaker == PRIVATE_MESSAGE) { PMTask& pm = *static_cast<PMTask*>(task); Modified: dcplusplus/trunk/windows/MainFrm.cpp =================================================================== --- dcplusplus/trunk/windows/MainFrm.cpp 2006-05-15 21:53:14 UTC (rev 603) +++ dcplusplus/trunk/windows/MainFrm.cpp 2006-05-20 16:17:09 UTC (rev 604) @@ -57,15 +57,15 @@ { memset(statusSizes, 0, sizeof(statusSizes)); - links.homepage = _T("http://dcplusplus.sourceforge.net/"); + links.homepage = _T("http://dcpp.net/"); links.downloads = links.homepage + _T("download/"); links.geoipfile = _T("http://www.maxmind.com/download/geoip/database/GeoIPCountryCSV.zip"); links.translations = _T("http://sourceforge.net/tracker/?atid=460289&group_id=40287"); - links.faq = links.homepage + _T("faq/faq.php?list=all&prog=1&lang=en"); + links.faq = links.homepage + _T("faq/"); links.help = links.homepage + _T("forum/"); links.discuss = links.homepage + _T("forum/"); - links.features = links.homepage + _T("bugs/"); - links.bugs = links.homepage + _T("bugs/"); + links.features = links.homepage + _T("bugzilla/"); + links.bugs = links.homepage + _T("bugzilla/"); } MainFrame::~MainFrame() { Modified: dcplusplus/trunk/windows/QueueFrame.cpp =================================================================== --- dcplusplus/trunk/windows/QueueFrame.cpp 2006-05-15 21:53:14 UTC (rev 603) +++ dcplusplus/trunk/windows/QueueFrame.cpp 2006-05-20 16:17:09 UTC (rev 604) @@ -1241,6 +1241,15 @@ updateStatus(); } +void QueueFrame::clearTree(HTREEITEM item) { + HTREEITEM next = ctrlDirs.GetChildItem(item); + while(next != NULL) { + clearTree(next); + next = ctrlDirs.GetNextSiblingItem(next); + } + delete (tstring*)ctrlDirs.GetItemData(item); +} + // Put it here to avoid a copy for each recursion... static TCHAR tmpBuf[1024]; void QueueFrame::moveNode(HTREEITEM item, HTREEITEM parent) { Modified: dcplusplus/trunk/windows/QueueFrame.h =================================================================== --- dcplusplus/trunk/windows/QueueFrame.h 2006-05-15 21:53:14 UTC (rev 603) +++ dcplusplus/trunk/windows/QueueFrame.h 2006-05-20 16:17:09 UTC (rev 604) @@ -389,14 +389,7 @@ void moveNode(HTREEITEM item, HTREEITEM parent); - void clearTree(HTREEITEM item) { - HTREEITEM next = ctrlDirs.GetChildItem(item); - while(next != NULL) { - clearTree(next); - next = ctrlDirs.GetNextSiblingItem(next); - } - delete (tstring*)ctrlDirs.GetItemData(item); - } + void clearTree(HTREEITEM item); void removeSelected() { if(!BOOLSETTING(CONFIRM_ITEM_REMOVAL) || MessageBox(CTSTRING(REALLY_REMOVE), _T(APPNAME) _T(" ") _T(VERSIONSTRING), MB_YESNO | MB_ICONQUESTION | MB_DEFBUTTON2) == IDYES) Modified: dcplusplus/trunk/windows/WindowsPage.cpp =================================================================== --- dcplusplus/trunk/windows/WindowsPage.cpp 2006-05-15 21:53:14 UTC (rev 603) +++ dcplusplus/trunk/windows/WindowsPage.cpp 2006-05-20 16:17:09 UTC (rev 604) @@ -58,6 +58,7 @@ { SettingsManager::JOIN_OPEN_NEW_WINDOW, ResourceManager::SETTINGS_OPEN_NEW_WINDOW }, { SettingsManager::IGNORE_OFFLINE, ResourceManager::SETTINGS_IGNORE_OFFLINE }, { SettingsManager::TOGGLE_ACTIVE_WINDOW, ResourceManager::SETTINGS_TOGGLE_ACTIVE_WINDOW }, + { SettingsManager::PROMPT_PASSWORD, ResourceManager::SETTINGS_PROMPT_PASSWORD }, { 0, ResourceManager::SETTINGS_AUTO_AWAY } }; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
