linuxdcpp-team team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 2909
committer: iceman50 <bdcdevel@xxxxxxxxx>
branch nick: dcplusplus
timestamp: Sat 2012-04-28 13:02:09 -0500
message:
  Add limiter icons to MainFrame and the limiter context menu
added:
  res/DLimit.ico
  res/ULimit.ico
modified:
  win32/DCPlusPlus.rc
  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/DLimit.ico'
Binary files res/DLimit.ico	1970-01-01 00:00:00 +0000 and res/DLimit.ico	2012-04-28 18:02:09 +0000 differ
=== added file 'res/ULimit.ico'
Binary files res/ULimit.ico	1970-01-01 00:00:00 +0000 and res/ULimit.ico	2012-04-28 18:02:09 +0000 differ
=== modified file 'win32/DCPlusPlus.rc'
--- win32/DCPlusPlus.rc	2012-04-12 15:46:28 +0000
+++ win32/DCPlusPlus.rc	2012-04-28 18:02:09 +0000
@@ -91,7 +91,8 @@
 IDI_WINDOWS             ICON                    "res/Windows.ico"
 IDI_BALLOON             ICON                    "res/Balloon.ico"
 IDI_SOUND               ICON                    "res/Sound.ico"
-
+IDI_ULIMIT				ICON					"res/ULimit.ico"
+IDI_DLIMIT				ICON					"res/DLimit.ico"
 /////////////////////////////////////////////////////////////////////////////
 //
 // Version

=== modified file 'win32/MainWindow.cpp'
--- win32/MainWindow.cpp	2012-04-15 21:10:05 +0000
+++ win32/MainWindow.cpp	2012-04-28 18:02:09 +0000
@@ -498,6 +498,8 @@
 		status->setIcon(STATUS_DOWN_DIFF, icon_DL);
 		status->setIcon(STATUS_UP_DIFF, icon_UL);
 	}
+	status->setIcon(STATUS_DOWN_LIMIT, WinUtil::statusIcon(IDI_DLIMIT));
+	status->setIcon(STATUS_UP_LIMIT, WinUtil::statusIcon(IDI_ULIMIT));
 
 	{
 		auto f = [this] { handleLimiterMenu(false); };
@@ -718,7 +720,8 @@
 
 void MainWindow::fillLimiterMenu(Menu* menu, bool upload) {
 	const auto title = upload ? T_("Upload limit") : T_("Download limit");
-	menu->setTitle(title);
+	const auto menuIcon = WinUtil::menuIcon(upload ? IDI_ULIMIT : IDI_DLIMIT);
+	menu->setTitle(title, menuIcon);
 
 	const auto setting = ThrottleManager::getCurSetting(
 		upload ? SettingsManager::MAX_UPLOAD_SPEED_MAIN : SettingsManager::MAX_DOWNLOAD_SPEED_MAIN);

=== modified file 'win32/resource.h'
--- win32/resource.h	2012-03-11 18:29:17 +0000
+++ win32/resource.h	2012-04-28 18:02:09 +0000
@@ -79,7 +79,8 @@
 #define IDI_WINDOWS 172
 #define IDI_BALLOON 173
 #define IDI_SOUND 174
-
+#define IDI_ULIMIT 175
+#define IDI_DLIMIT 176
 // Stuff that uses multiple id's
 
 #define ID_SHELLCONTEXTMENU_MIN				3000