linuxdcpp-team team mailing list archive

Thread
Date

[Branch ~dcplusplus-team/dcplusplus/trunk] Rev 2515: MSVC compile fix and new icons

To: LinuxDC++ Team <linuxdcpp-team@xxxxxxxxxxxxxxxxxxx>
From: noreply@xxxxxxxxxxxxx
Date: Tue, 26 Apr 2011 13:07:18 -0000
Reply-to: noreply@xxxxxxxxxxxxx
Sender: bounces@xxxxxxxxxxxxx

------------------------------------------------------------
revno: 2515
committer: bdcdevel <bdcdevel@xxxxxxxxx>
branch nick: dcplusplus
timestamp: Tue 2011-04-26 08:04:15 -0500
message:
  MSVC compile fix and new icons
removed:
  res/ConnRed.ico
added:
  res/BandwidthLimiter.ico
modified:
  dcpp/FastAlloc.h
  res/Notifications.ico
  win32/DCPlusPlus.rc
  win32/SettingsDialog.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

=== modified file 'dcpp/FastAlloc.h'
--- dcpp/FastAlloc.h	2011-01-02 17:12:02 +0000
+++ dcpp/FastAlloc.h	2011-04-26 13:04:15 +0000
@@ -20,6 +20,7 @@
 #define FAST_ALLOC_H
 
 #include "CriticalSection.h"
+#include "debug.h"
 
 namespace dcpp {
 

=== added file 'res/BandwidthLimiter.ico'
Binary files res/BandwidthLimiter.ico	1970-01-01 00:00:00 +0000 and res/BandwidthLimiter.ico	2011-04-26 13:04:15 +0000 differ
=== removed file 'res/ConnRed.ico'
Binary files res/ConnRed.ico	2011-04-19 20:04:13 +0000 and res/ConnRed.ico	1970-01-01 00:00:00 +0000 differ
=== modified file 'res/Notifications.ico'
Binary files res/Notifications.ico	2011-04-19 20:04:13 +0000 and res/Notifications.ico	2011-04-26 13:04:15 +0000 differ
=== modified file 'win32/DCPlusPlus.rc'
--- win32/DCPlusPlus.rc	2011-04-23 10:33:55 +0000
+++ win32/DCPlusPlus.rc	2011-04-26 13:04:15 +0000
@@ -101,7 +101,7 @@
 IDI_ADVANCED            ICON                    "res/Advanced.ico"
 IDI_CLOCK               ICON                    "res/Clock.ico"
 IDI_COLORS              ICON                    "res/Colors.ico"
-IDI_CONN_BLUE           ICON                    "res/ConnBlue.ico"
+IDI_BW_LIMITER          ICON                    "res/BandwidthLimiter.ico"
 IDI_CONN_GREY           ICON                    "res/ConnGrey.ico"
 IDI_CONN_RED            ICON                    "res/ConnRed.ico"
 IDI_EXPERT              ICON                    "res/Expert.ico"

=== modified file 'win32/SettingsDialog.cpp'
--- win32/SettingsDialog.cpp	2011-04-23 10:33:55 +0000
+++ win32/SettingsDialog.cpp	2011-04-26 13:04:15 +0000
@@ -152,7 +152,7 @@
 		{
 			HTREEITEM item = addPage(T_("Connectivity"), new ConnectivityPage(container), IDI_CONN_RED, TVI_ROOT);
 			addPage(T_("Manual configuration"), new ConnectivityManualPage(container), IDI_CONN_GREY, item);
-			addPage(T_("Bandwidth limiting"), new BandwidthLimitPage(container), IDI_CONN_BLUE, item);
+			addPage(T_("Bandwidth limiting"), new BandwidthLimitPage(container), IDI_BW_LIMITER, item);
 			addPage(T_("Proxy"), new ProxyPage(container), IDI_PROXY, item);
 		}
 

=== modified file 'win32/resource.h'
--- win32/resource.h	2011-04-23 10:33:55 +0000
+++ win32/resource.h	2011-04-26 13:04:15 +0000
@@ -67,7 +67,7 @@
 #define IDI_ADVANCED 160
 #define IDI_CLOCK 161
 #define IDI_COLORS 162
-#define IDI_CONN_BLUE 163
+#define IDI_BW_LIMITER 163
 #define IDI_CONN_GREY 164
 #define IDI_CONN_RED 165
 #define IDI_EXPERT 166