linuxdcpp-team team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 2285
committer: poy <poy@xxxxxxxxxx>
branch nick: trunk
timestamp: Mon 2010-11-08 17:39:26 +0100
message:
  add net stats to the toolbar
modified:
  changelog.txt
  help/window_main.html
  win32/MainWindow.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 'changelog.txt'
--- changelog.txt	2010-11-01 21:55:40 +0000
+++ changelog.txt	2010-11-08 16:39:26 +0000
@@ -26,7 +26,8 @@
 * Fix menu separators on Win 7 (poy)
 * [L#588224] Display folders using the correct icon on Win 7 (poy)
 * Help updates (poy, emtee)
-* [L#571914] Fix crash when zero sized bloom filter requested (emtee)
+* [L#571914] Fix crash when a zero sized bloom filter is requested (emtee)
+* Don't close the net stats window when double-clicking on the status bar (poy)
 
 -- 0.770 2010-07-05 --
 * [L#550300] Catch more potential file corruptions (thanks bigmuscle)

=== modified file 'help/window_main.html'
--- help/window_main.html	2010-08-29 15:42:38 +0000
+++ help/window_main.html	2010-11-08 16:39:26 +0000
@@ -207,6 +207,7 @@
 <a href="window_search.html" title="Search"><img src="Search.ico" width="20" height="20" alt="Search"/></a>
 <a href="window_adlsearch.html" title="ADL Search"><img src="ADLSearch.ico" width="20" height="20" alt="ADL Search"/></a>
 <a href="window_search_spy.html" title="Search Spy"><img src="SearchSpy.ico" width="20" height="20" alt="Search Spy"/></a>
+<a href="window_network_stats.html" title="Network Statistics"><img src="NetStats.ico" width="20" height="20" alt="Network Statistics"/></a>
 <a href="#tb_openfl" title="Open file list..."><img src="OpenFileList.ico" width="20" height="20" alt="Open file list..."/></a>
 <a href="#tb_recent" title="Recent windows"><img src="Recents.ico" width="20" height="20" alt="Recent windows"/></a>
 <a href="#tb_settings" title="Settings"><img src="Settings.ico" width="20" height="20" alt="Settings"/></a>
@@ -261,7 +262,10 @@
     <dd cshelp="IDH_TOOLBAR_ADL_SEARCH">Open the <placeholder><a href="window_adlsearch.html">ADL Search</a></placeholder> window.</dd>
 
     <dt>Search Spy</dt>
-    <dd cshelp="IDH_TOOLBAR_SEARCH_SPY">Open the <placeholder><a href="window_search_spy.html">Search Spy</a></placeholder> window.</dd>
+	<dd cshelp="IDH_TOOLBAR_SEARCH_SPY">Open the <placeholder><a href="window_search_spy.html">Search Spy</a></placeholder> window.</dd>
+
+	<dt>Network Statistics</dt>
+	<dd cshelp="IDH_TOOLBAR_NET_STATS">Open the <placeholder><a href="window_network_stats.html">Network Statistics</a></placeholder> window.</dd>
 
     <dt id="tb_openfl">Open file list...</dt>
 	<dd cshelp="IDH_TOOLBAR_FILE_LIST">

=== modified file 'win32/MainWindow.cpp'
--- win32/MainWindow.cpp	2010-11-08 16:27:16 +0000
+++ win32/MainWindow.cpp	2010-11-08 16:39:26 +0000
@@ -368,6 +368,8 @@
 		[this] { ADLSearchFrame::openWindow(getTabView()); });
 	toolbar->addButton(SpyFrame::id, toolbarIcon(IDI_SPY), 0, T_("Search Spy"), IDH_TOOLBAR_SEARCH_SPY,
 		[this] { SpyFrame::openWindow(getTabView()); });
+	toolbar->addButton(StatsFrame::id, toolbarIcon(IDI_NET_STATS), 0, T_("Network Statistics"), IDH_TOOLBAR_NET_STATS,
+		[this] { StatsFrame::openWindow(getTabView()); });
 	toolbar->addButton("OpenFL", toolbarIcon(IDI_OPEN_FILE_LIST), 0, T_("Open file list..."), IDH_TOOLBAR_FILE_LIST,
 		std::bind(&MainWindow::handleOpenFileList, this));
 	toolbar->addButton("Recents", toolbarIcon(IDI_RECENTS), 0, T_("Recent windows"), IDH_TOOLBAR_RECENT,
@@ -400,6 +402,7 @@
 			SearchFrame::id + comma +
 			ADLSearchFrame::id + comma +
 			SpyFrame::id + comma +
+			StatsFrame::id + comma +
 			comma +
 			"OpenFL" + comma +
 			"Recents" + comma +