summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGeorge Hazan <george.hazan@gmail.com>2012-11-01 18:55:48 +0000
committerGeorge Hazan <george.hazan@gmail.com>2012-11-01 18:55:48 +0000
commit4c0ff4c45e6df0a7039c3833d700a00ae4ac66b9 (patch)
tree0b25cc7917ffe329352a4160f4fa8c2b93b41f72
parente8e7ebc5e76e7612b9d07f7d2b1b066761738c79 (diff)
fix for the main icon
git-svn-id: http://svn.miranda-ng.org/main/trunk@2142 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
-rw-r--r--src/modules/extraicons/res/extraicons.rc13
-rw-r--r--src/resource.rc10
2 files changed, 8 insertions, 15 deletions
diff --git a/src/modules/extraicons/res/extraicons.rc b/src/modules/extraicons/res/extraicons.rc
index 08e1d4bd9c..e2856d5e6a 100644
--- a/src/modules/extraicons/res/extraicons.rc
+++ b/src/modules/extraicons/res/extraicons.rc
@@ -63,19 +63,6 @@ END
/////////////////////////////////////////////////////////////////////////////
//
-// Icon
-//
-
-// Icon with lowest ID value placed first to ensure application icon
-// remains consistent on all systems.
-IDI_ALWAYSVIS ICON "AlwaysVis.ico"
-IDI_NEVERVIS ICON "NeverVis.ico"
-IDI_CHAT ICON "Chatchannel.ico"
-IDI_MALE ICON "male.ico"
-IDI_FEMALE ICON "female.ico"
-
-/////////////////////////////////////////////////////////////////////////////
-//
// Menu
//
diff --git a/src/resource.rc b/src/resource.rc
index 162d1f7454..fa047ce980 100644
--- a/src/resource.rc
+++ b/src/resource.rc
@@ -1093,8 +1093,14 @@ IDI_STATUS_LOCKED ICON "res/status_locked.ico"
IDI_SHOWHIDE ICON "res/Icon_show_hide.ico"
IDI_EXIT ICON "res/Icon_exit.ico"
IDI_MOVETOGROUP ICON "res/contact_groups.ico"
-IDI_ON ICON "res\\On.ico"
-IDI_OFF ICON "res\\Off.ico"
+IDI_ON ICON "res/On.ico"
+IDI_OFF ICON "res/Off.ico"
+
+IDI_ALWAYSVIS ICON "modules/extraicons/res/AlwaysVis.ico"
+IDI_NEVERVIS ICON "modules/extraicons/res/NeverVis.ico"
+IDI_CHAT ICON "modules/extraicons/res/Chatchannel.ico"
+IDI_MALE ICON "modules/extraicons/res/male.ico"
+IDI_FEMALE ICON "modules/extraicons/res/female.ico"
/////////////////////////////////////////////////////////////////////////////
//