------------------------------------------------------------
revno: 2920
committer: iceman50 <bdcde...@gmail.com>
branch nick: dcplusplus
timestamp: Tue 2012-05-15 15:17:06 -0500
message:
Fix compile warnings in DebugFrame, give DebugFrame its own icon
added:
res/Debug.ico
modified:
win32/DCPlusPlus.rc
win32/DebugFrame.cpp
win32/MainWindow.cpp
win32/resource.h
--
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
=== added file 'res/Debug.ico'
Binary files res/Debug.ico 1970-01-01 00:00:00 +0000 and res/Debug.ico 2012-05-15 20:17:06 +0000 differ
=== modified file 'win32/DCPlusPlus.rc'
--- win32/DCPlusPlus.rc 2012-05-04 21:20:44 +0000
+++ win32/DCPlusPlus.rc 2012-05-15 20:17:06 +0000
@@ -93,6 +93,7 @@
IDI_SOUND ICON "res/Sound.ico"
IDI_ULIMIT ICON "res/ULimit.ico"
IDI_DLIMIT ICON "res/DLimit.ico"
+IDI_DEBUG ICON "res/Debug.ico"
/////////////////////////////////////////////////////////////////////////////
//
// Version
=== modified file 'win32/DebugFrame.cpp'
--- win32/DebugFrame.cpp 2012-05-10 19:12:47 +0000
+++ win32/DebugFrame.cpp 2012-05-15 20:17:06 +0000
@@ -40,14 +40,14 @@
const string& DebugFrame::getId() const { return id; }
DebugFrame::DebugFrame(TabViewPtr parent) :
-BaseType(parent, T_("Debug Messages"), IDH_DEBUG_FRAME, IDI_DCPP, false),
+BaseType(parent, T_("Debug Messages"), IDH_DEBUG_FRAME, IDI_DEBUG, false),
grid(0),
debug(0),
clientMsg(0),
+hubMsg(0),
+filterHub(0),
showClientMsg(true),
-hubMsg(0),
showHubMsg(true),
-filterHub(0),
filterByHub(false),
hubs(0)
{
@@ -113,8 +113,7 @@
auto lock = clientMgr->lock();
clientMgr->addListener(this);
auto& clients = clientMgr->getClients();
- for(auto it = clients.begin(); it != clients.end(); ++it) {
- Client* client = *it;
+ for(auto client: clients) {
if(!client->isConnected())
continue;
=== modified file 'win32/MainWindow.cpp'
--- win32/MainWindow.cpp 2012-05-10 08:01:35 +0000
+++ win32/MainWindow.cpp 2012-05-15 20:17:06 +0000
@@ -334,7 +334,7 @@
viewIndexes[SystemFrame::id] = viewMenu->appendItem(T_("System Log"),
[this] { SystemFrame::openWindow(getTabView()); });
viewIndexes[DebugFrame::id] = viewMenu->appendItem(T_("Debug Messages"),
- [this] { DebugFrame::openWindow(getTabView()); }, WinUtil::menuIcon(IDI_DCPP));
+ [this] { DebugFrame::openWindow(getTabView()); }, WinUtil::menuIcon(IDI_DEBUG));
viewIndexes[StatsFrame::id] = viewMenu->appendItem(T_("Network Statistics"),
[this] { StatsFrame::openWindow(getTabView()); }, WinUtil::menuIcon(IDI_NET_STATS));
viewMenu->appendItem(T_("Indexing progress"), [this] { handleHashProgress(); }, WinUtil::menuIcon(IDI_INDEXING));
=== modified file 'win32/resource.h'
--- win32/resource.h 2012-04-28 18:02:09 +0000
+++ win32/resource.h 2012-05-15 20:17:06 +0000
@@ -81,6 +81,7 @@
#define IDI_SOUND 174
#define IDI_ULIMIT 175
#define IDI_DLIMIT 176
+#define IDI_DEBUG 177
// Stuff that uses multiple id's
#define ID_SHELLCONTEXTMENU_MIN 3000
_______________________________________________
Mailing list: https://launchpad.net/~linuxdcpp-team
Post to : linuxdcpp-team@lists.launchpad.net
Unsubscribe : https://launchpad.net/~linuxdcpp-team
More help : https://help.launchpad.net/ListHelp
