summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGeorge Hazan <george.hazan@gmail.com>2013-01-26 20:02:29 +0000
committerGeorge Hazan <george.hazan@gmail.com>2013-01-26 20:02:29 +0000
commiteecb95c8e17f3397f64820f36f2a1d2351fe92e0 (patch)
tree6a1734739dcc35e483cf90ee7e5b59c50c4b6203
parent4efb047571ea60522a630290459a2ca3d488753e (diff)
special icon for frames: SKINICON_OTHER_FRAME
git-svn-id: http://svn.miranda-ng.org/main/trunk@3296 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
-rw-r--r--include/m_skin.h87
-rw-r--r--src/modules/skin/skinicons.cpp1
-rw-r--r--src/res/icon_frame.icobin0 -> 1150 bytes
-rw-r--r--src/resource.h1
-rw-r--r--src/resource.rc1
5 files changed, 47 insertions, 43 deletions
diff --git a/include/m_skin.h b/include/m_skin.h
index 00babc8822..4363478fab 100644
--- a/include/m_skin.h
+++ b/include/m_skin.h
@@ -46,49 +46,50 @@ __forceinline HICON LoadSkinnedIconBig(int id) {return (HICON)CallService(MS_SKI
#define SKINICON_OTHER_MIRANDA 200
#define SKINICON_OTHER_EXIT 201
#define SKINICON_OTHER_SHOWHIDE 202
-#define SKINICON_OTHER_GROUPOPEN 203 //v0.1.1.0+
-#define SKINICON_OTHER_USERONLINE 204 //v0.1.0.1+
-#define SKINICON_OTHER_GROUPSHUT 205 //v0.1.1.0+
-#define SKINICON_OTHER_CONNECTING 206 //v0.1.0.1+
-#define SKINICON_OTHER_ADDCONTACT 207 //v0.7.0.2+
-#define SKINICON_OTHER_USERDETAILS 208 //v0.7.0.2+
-#define SKINICON_OTHER_HISTORY 209 //v0.7.0.2+
-#define SKINICON_OTHER_DOWNARROW 210 //v0.7.0.2+
-#define SKINICON_OTHER_FINDUSER 211 //v0.7.0.2+
-#define SKINICON_OTHER_OPTIONS 212 //v0.7.0.2+
-#define SKINICON_OTHER_SENDEMAIL 213 //v0.7.0.2+
-#define SKINICON_OTHER_DELETE 214 //v0.7.0.2+
-#define SKINICON_OTHER_RENAME 215 //v0.7.0.2+
-#define SKINICON_OTHER_SMS 216 //v0.7.0.2+
-#define SKINICON_OTHER_SEARCHALL 217 //v0.7.0.2+
-#define SKINICON_OTHER_TICK 218 //v0.7.0.2+
-#define SKINICON_OTHER_NOTICK 219 //v0.7.0.2+
-#define SKINICON_OTHER_HELP 220 //v0.7.0.2+
-#define SKINICON_OTHER_MIRANDAWEB 221 //v0.7.0.2+
-#define SKINICON_OTHER_TYPING 222 //v0.7.0.2+
-#define SKINICON_OTHER_SMALLDOT 223 //v0.7.0.2+
-#define SKINICON_OTHER_FILLEDBLOB 224 //v0.7.0.2+
-#define SKINICON_OTHER_EMPTYBLOB 225 //v0.7.0.2+
-#define SKINICON_OTHER_UNICODE 226 //v0.7.0.19+
-#define SKINICON_OTHER_ANSI 227 //v0.7.0.19+
-#define SKINICON_OTHER_LOADED 228 //v0.7.0.19+
-#define SKINICON_OTHER_NOTLOADED 229 //v0.7.0.19+
-#define SKINICON_OTHER_UNDO 230 //v0.8.0.4+
-#define SKINICON_OTHER_WINDOW 231 //v0.8.0.4+
-#define SKINICON_OTHER_WINDOWS 232 //v0.8.0.4+
-#define SKINICON_OTHER_ACCMGR 233 //v0.8.0.4+
-#define SKINICON_OTHER_MAINMENU 234 //v0.8.0.12+
-#define SKINICON_OTHER_STATUS 235 //v0.8.0.12+
-#define SKINICON_CHAT_JOIN 236 //v0.8.0.27+
-#define SKINICON_CHAT_LEAVE 237 //v0.8.0.27+
-#define SKINICON_OTHER_STATUS_LOCKED 238 //v0.8.0.28+
-#define SKINICON_OTHER_GROUP 239 //v0.8.0.29+
-#define SKINICON_OTHER_ON 240 //v0.9.0.9+
-#define SKINICON_OTHER_OFF 241 //v0.9.0.9+
-#define SKINICON_OTHER_LOADEDGRAY 242 //v0.10.3.1+
-#define SKINICON_OTHER_NOTLOADEDGRAY 243 //v0.10.3.1+
-#define SKINICON_OTHER_VISIBLE_ALL 244 //v0.93.4+
-#define SKINICON_OTHER_INVISIBLE_ALL 245 //v0.93.4+
+#define SKINICON_OTHER_GROUPOPEN 203 // v.0.1.1.0+
+#define SKINICON_OTHER_USERONLINE 204 // v.0.1.0.1+
+#define SKINICON_OTHER_GROUPSHUT 205 // v.0.1.1.0+
+#define SKINICON_OTHER_CONNECTING 206 // v.0.1.0.1+
+#define SKINICON_OTHER_ADDCONTACT 207 // v.0.7.0.2+
+#define SKINICON_OTHER_USERDETAILS 208 // v.0.7.0.2+
+#define SKINICON_OTHER_HISTORY 209 // v.0.7.0.2+
+#define SKINICON_OTHER_DOWNARROW 210 // v.0.7.0.2+
+#define SKINICON_OTHER_FINDUSER 211 // v.0.7.0.2+
+#define SKINICON_OTHER_OPTIONS 212 // v.0.7.0.2+
+#define SKINICON_OTHER_SENDEMAIL 213 // v.0.7.0.2+
+#define SKINICON_OTHER_DELETE 214 // v.0.7.0.2+
+#define SKINICON_OTHER_RENAME 215 // v.0.7.0.2+
+#define SKINICON_OTHER_SMS 216 // v.0.7.0.2+
+#define SKINICON_OTHER_SEARCHALL 217 // v.0.7.0.2+
+#define SKINICON_OTHER_TICK 218 // v.0.7.0.2+
+#define SKINICON_OTHER_NOTICK 219 // v.0.7.0.2+
+#define SKINICON_OTHER_HELP 220 // v.0.7.0.2+
+#define SKINICON_OTHER_MIRANDAWEB 221 // v.0.7.0.2+
+#define SKINICON_OTHER_TYPING 222 // v.0.7.0.2+
+#define SKINICON_OTHER_SMALLDOT 223 // v.0.7.0.2+
+#define SKINICON_OTHER_FILLEDBLOB 224 // v.0.7.0.2+
+#define SKINICON_OTHER_EMPTYBLOB 225 // v.0.7.0.2+
+#define SKINICON_OTHER_UNICODE 226 // v.0.7.0.19+
+#define SKINICON_OTHER_ANSI 227 // v.0.7.0.19+
+#define SKINICON_OTHER_LOADED 228 // v.0.7.0.19+
+#define SKINICON_OTHER_NOTLOADED 229 // v.0.7.0.19+
+#define SKINICON_OTHER_UNDO 230 // v.0.8.0.4+
+#define SKINICON_OTHER_WINDOW 231 // v.0.8.0.4+
+#define SKINICON_OTHER_WINDOWS 232 // v.0.8.0.4+
+#define SKINICON_OTHER_ACCMGR 233 // v.0.8.0.4+
+#define SKINICON_OTHER_MAINMENU 234 // v.0.8.0.12+
+#define SKINICON_OTHER_STATUS 235 // v.0.8.0.12+
+#define SKINICON_CHAT_JOIN 236 // v.0.8.0.27+
+#define SKINICON_CHAT_LEAVE 237 // v.0.8.0.27+
+#define SKINICON_OTHER_STATUS_LOCKED 238 // v.0.8.0.28+
+#define SKINICON_OTHER_GROUP 239 // v.0.8.0.29+
+#define SKINICON_OTHER_ON 240 // v.0.9.0.9+
+#define SKINICON_OTHER_OFF 241 // v.0.9.0.9+
+#define SKINICON_OTHER_LOADEDGRAY 242 // v.0.10.3.1+
+#define SKINICON_OTHER_NOTLOADEDGRAY 243 // v.0.10.3.1+
+#define SKINICON_OTHER_VISIBLE_ALL 244 // v.0.93.4+
+#define SKINICON_OTHER_INVISIBLE_ALL 245 // v.0.93.4+
+#define SKINICON_OTHER_FRAME 246 // v.0.94.1+
//menu icons are owned by the module that uses them so are not and should not
//be skinnable. Except exit and show/hide
diff --git a/src/modules/skin/skinicons.cpp b/src/modules/skin/skinicons.cpp
index ee0c54d004..de309707aa 100644
--- a/src/modules/skin/skinicons.cpp
+++ b/src/modules/skin/skinicons.cpp
@@ -81,6 +81,7 @@ static struct StandardIconDescription mainIcons[] =
{ SKINICON_OTHER_OFF, LPGEN("Off"), -IDI_OFF },
{ SKINICON_OTHER_LOADEDGRAY, LPGEN("Running core plugin"), -IDI_LOADED_GRAY },
{ SKINICON_OTHER_NOTLOADEDGRAY, LPGEN("Non-loadable plugin"), -IDI_NOTLOADED_GRAY },
+ { SKINICON_OTHER_FRAME, LPGEN("Frames"), -IDI_FRAME },
{ SKINICON_OTHER_VISIBLE_ALL, LPGEN("Always visible"), -IDI_ALWAYSVIS, 0, "Contact List" },
{ SKINICON_OTHER_INVISIBLE_ALL, LPGEN("Always invisible"), -IDI_NEVERVIS, 0, "Contact List" },
{ SKINICON_OTHER_STATUS_LOCKED, LPGEN("Locked status"), -IDI_STATUS_LOCKED, 0, "Status Icons" },
diff --git a/src/res/icon_frame.ico b/src/res/icon_frame.ico
new file mode 100644
index 0000000000..342d3dd641
--- /dev/null
+++ b/src/res/icon_frame.ico
Binary files differ
diff --git a/src/resource.h b/src/resource.h
index f73866e320..edb82a3860 100644
--- a/src/resource.h
+++ b/src/resource.h
@@ -39,6 +39,7 @@
#define IDD_MODERNOPT_STATUS 141
#define IDD_MODERNOPT_IDLE 142
#define IDD_MODERNOPT_IGNORE 143
+#define IDI_FRAME 144
#define IDI_DND 158
#define IDI_OCCUPIED 159
#define IDI_USERDETAILS 160
diff --git a/src/resource.rc b/src/resource.rc
index b04deaf640..fe1fd72d83 100644
--- a/src/resource.rc
+++ b/src/resource.rc
@@ -1056,6 +1056,7 @@ IDI_LOADED ICON "res/icon_loaded.ico"
IDI_LOADED_GRAY ICON "res/icon_loaded_gray.ico"
IDI_NOTLOADED ICON "res/icon_notloaded.ico"
IDI_NOTLOADED_GRAY ICON "res/icon_notloaded_gray.ico"
+IDI_FRAME ICON "res/icon_frame.ico"
IDI_BLANK ICON "res/_blank.ico"
IDI_UNDO ICON "res/icon_undo.ico"
IDI_WINDOW ICON "res/icon_window.ico"