replacement for SKIN_OTHER_MAINMENU: the triple bar icon

git-svn-id: http://svn.miranda-ng.org/main/trunk@3250 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c

5 files changed, 85 insertions, 5 deletions

diff --git a/src/mir_core/mir_core_11.vcxproj.filters b/src/mir_core/mir_core_11.vcxproj.filters
new file mode 100644
index 0000000000..9e472906fb
--- /dev/null
+++ b/src/mir_core/mir_core_11.vcxproj.filters
@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="utf-8"?>

+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

+  <ItemGroup>

+    <Filter Include="Source Files">

+      <UniqueIdentifier>{bf74d1c9-acd8-4fba-837d-734f024521c9}</UniqueIdentifier>

+      <Extensions>cpp;c;cxx;rc;def;r;odl;idl;hpj;bat</Extensions>

+    </Filter>

+    <Filter Include="Header Files">

+      <UniqueIdentifier>{a578a180-0eb9-4c3e-b4ae-0eaefa01d207}</UniqueIdentifier>

+    </Filter>

+  </ItemGroup>

+  <ItemGroup>

+    <ClCompile Include="commonheaders.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="memory.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="miranda.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="modules.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="lists.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="langpack.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="utf.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="utils.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="path.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="md5.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="sha1.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="db.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="threads.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="cmdline.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="stdafx.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="icons.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+  </ItemGroup>

+  <ItemGroup>

+    <ClInclude Include="commonheaders.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="..\..\include\m_core.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="miranda.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="..\..\include\m_system.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="..\..\include\m_database.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+  </ItemGroup>

+</Project>
\ No newline at end of file
diff --git a/src/modules/skin/skinicons.cpp b/src/modules/skin/skinicons.cpp
index 141dab3e58..ee0c54d004 100644
--- a/src/modules/skin/skinicons.cpp
+++ b/src/modules/skin/skinicons.cpp
@@ -72,7 +72,7 @@ static struct StandardIconDescription mainIcons[] =
 	{ SKINICON_OTHER_ACCMGR,          LPGEN("Accounts"),            -IDI_ACCMGR         }, 

 	{ SKINICON_OTHER_SHOWHIDE,        LPGEN("ShowHide"),            -IDI_SHOWHIDE       }, 

 	{ SKINICON_OTHER_EXIT,            LPGEN("Exit"),                -IDI_EXIT           }, 

-	{ SKINICON_OTHER_MAINMENU,        LPGEN("Main Menu"),           -IDI_MIRANDA        }, 

+	{ SKINICON_OTHER_MAINMENU,        LPGEN("Main Menu"),           -IDI_MAINMENU       }, 

 	{ SKINICON_OTHER_STATUS,          LPGEN("Status"),              -IDI_ONLINE         }, 

 	{ SKINICON_CHAT_JOIN,             LPGEN("Join chat"),           -IDI_JOINCHAT       }, 

 	{ SKINICON_CHAT_LEAVE,            LPGEN("Leave chat"),          -IDI_LEAVECHAT      }, 

diff --git a/src/res/icon_mainmenu.ico b/src/res/icon_mainmenu.ico
new file mode 100644
index 0000000000..3171770be4
--- /dev/null
+++ b/src/res/icon_mainmenu.ico
diff --git a/src/resource.h b/src/resource.h
index 6587f8cb77..f73866e320 100644
--- a/src/resource.h
+++ b/src/resource.h
@@ -63,6 +63,7 @@
 #define IDI_SENDEMAIL                   193

 #define IDD_FILERECV                    194

 #define IDD_PROFILEMANAGER              197

+#define IDI_MAINMENU                    198

 #define IDR_CLISTMENU                   199

 #define IDI_BLANK                       200

 #define IDD_FINDADD                     201

diff --git a/src/resource.rc b/src/resource.rc
index 70efdbe114..b04deaf640 100644
--- a/src/resource.rc
+++ b/src/resource.rc
@@ -981,12 +981,12 @@ END
 // TEXTINCLUDE

 //

 

-1 TEXTINCLUDE 

+1 TEXTINCLUDE

 BEGIN

     "resource.h\0"

 END

 

-2 TEXTINCLUDE 

+2 TEXTINCLUDE

 BEGIN

     "#include <windows.h>\r\n"

     "#include <winres.h>\r\n"

@@ -994,7 +994,7 @@ BEGIN
     "\0"

 END

 

-3 TEXTINCLUDE 

+3 TEXTINCLUDE

 BEGIN

     "\r\n"

     "\0"

@@ -1036,6 +1036,7 @@ IDI_FINDUSER            ICON                    "res/icon_find_user.ico"
 IDI_SEARCHALL           ICON                    "res/icon_search_all.ico"

 IDI_OPTIONS             ICON                    "res/icon_options.ico"

 IDI_ACCMGR              ICON                    "res/icon_accmgr.ico"

+IDI_MAINMENU            ICON                    "res/icon_mainmenu.ico"

 IDI_HELP                ICON                    "res/icon_help.ico"

 IDI_RECVMSG             ICON                    "res/icon_message.ico"

 IDI_FILE                ICON                    "res/icon_file.ico"

@@ -1189,4 +1190,3 @@ IDB_SORTCOLDOWN         BITMAP                  "res/arrow_sort_column_down.bmp"
 

 /////////////////////////////////////////////////////////////////////////////

 #endif    // not APSTUDIO_INVOKED

-