goodbye extraicons.rc

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

4 files changed, 36 insertions, 137 deletions

diff --git a/src/miranda32_10.vcxproj b/src/miranda32_10.vcxproj
index 9b7927f0fc..f41df23309 100644
--- a/src/miranda32_10.vcxproj
+++ b/src/miranda32_10.vcxproj
@@ -609,7 +609,6 @@
     </ClCompile>

   </ItemGroup>

   <ItemGroup>

-    <ResourceCompile Include="modules\extraicons\res\extraicons.rc" />

     <ResourceCompile Include="resource.rc" />

     <ResourceCompile Include="version.rc" />

   </ItemGroup>

diff --git a/src/miranda32_10.vcxproj.filters b/src/miranda32_10.vcxproj.filters
index 05c463641e..1045da293a 100644
--- a/src/miranda32_10.vcxproj.filters
+++ b/src/miranda32_10.vcxproj.filters
@@ -646,8 +646,5 @@
     <ResourceCompile Include="version.rc">

       <Filter>Resources</Filter>

     </ResourceCompile>

-    <ResourceCompile Include="modules\extraicons\res\extraicons.rc">

-      <Filter>Resources</Filter>

-    </ResourceCompile>

   </ItemGroup>

 </Project>
\ No newline at end of file
diff --git a/src/modules/extraicons/res/extraicons.rc b/src/modules/extraicons/res/extraicons.rc
deleted file mode 100644
index e2856d5e6a..0000000000
--- a/src/modules/extraicons/res/extraicons.rc
+++ /dev/null
@@ -1,133 +0,0 @@
-//Microsoft Developer Studio generated resource script.

-//

-#define APSTUDIO_READONLY_SYMBOLS

-/////////////////////////////////////////////////////////////////////////////

-//

-// Generated from the TEXTINCLUDE 2 resource.

-//

-#include "..\..\..\resource.h"

-#include "winres.h"

-

-/////////////////////////////////////////////////////////////////////////////

-#undef APSTUDIO_READONLY_SYMBOLS

-

-/////////////////////////////////////////////////////////////////////////////

-// Neutral resources

-

-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_NEU)

-#ifdef _WIN32

-LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL

-#pragma code_page(1252)

-#endif //_WIN32

-

-/////////////////////////////////////////////////////////////////////////////

-//

-// Dialog

-//

-

-IDD_EI_OPTIONS DIALOGEX 0, 0, 276, 229

-STYLE DS_FIXEDSYS | WS_CHILD | WS_VISIBLE

-EXSTYLE WS_EX_CONTROLPARENT

-FONT 8, "MS Shell Dlg"

-BEGIN

-    LTEXT           "Select the extra icons to be shown in the contact list:",

-                    IDC_STATIC,1,9,274,13

-    CONTROL         "",IDC_EXTRAORDER,"SysTreeView32",TVS_NOTOOLTIPS |

-                    TVS_CHECKBOXES | TVS_FULLROWSELECT | WS_BORDER |

-                    WS_TABSTOP,1,24,274,160

-    LTEXT           "* only the first %d icons will be shown",

-                    IDC_MAX_ICONS_L,1,190,274,13,NOT WS_VISIBLE

-    LTEXT           "You can group/ungroup icons by selecting then (CTRL+left click) and using the popup menu (right click)",

-                    IDC_STATIC,1,208,274,20

-END

-

-

-/////////////////////////////////////////////////////////////////////////////

-//

-// DESIGNINFO

-//

-

-#ifdef APSTUDIO_INVOKED

-GUIDELINES DESIGNINFO DISCARDABLE

-BEGIN

-    IDD_OPTIONS, DIALOG

-    BEGIN

-        LEFTMARGIN, 1

-        RIGHTMARGIN, 275

-        TOPMARGIN, 1

-        BOTTOMMARGIN, 228

-    END

-END

-#endif    // APSTUDIO_INVOKED

-

-

-/////////////////////////////////////////////////////////////////////////////

-//

-// Menu

-//

-

-IDR_OPT_POPUP MENU DISCARDABLE

-BEGIN

-    POPUP "Group"

-    BEGIN

-        MENUITEM "Group",                       ID_GROUP

-    END

-    POPUP "Ungroup"

-    BEGIN

-        MENUITEM "Ungroup",                     ID_UNGROUP

-    END

-END

-

-#endif    // Neutral resources

-/////////////////////////////////////////////////////////////////////////////

-

-

-/////////////////////////////////////////////////////////////////////////////

-// English (Canada) resources

-

-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENC)

-#ifdef _WIN32

-LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_CAN

-#pragma code_page(1252)

-#endif //_WIN32

-

-#ifdef APSTUDIO_INVOKED

-/////////////////////////////////////////////////////////////////////////////

-//

-// TEXTINCLUDE

-//

-

-1 TEXTINCLUDE DISCARDABLE

-BEGIN

-    "resource.h\0"

-END

-

-2 TEXTINCLUDE DISCARDABLE

-BEGIN

-    "#include ""..\\..\\..\\resource.h""\r\n"

-    "#include ""winresrc.h""\r\n"

-    "\0"

-END

-

-3 TEXTINCLUDE DISCARDABLE

-BEGIN

-    "\r\n"

-    "\0"

-END

-

-#endif    // APSTUDIO_INVOKED

-

-#endif    // English (Canada) resources

-/////////////////////////////////////////////////////////////////////////////

-

-

-

-#ifndef APSTUDIO_INVOKED

-/////////////////////////////////////////////////////////////////////////////

-//

-// Generated from the TEXTINCLUDE 3 resource.

-//

-

-

-/////////////////////////////////////////////////////////////////////////////

-#endif    // not APSTUDIO_INVOKED

diff --git a/src/resource.rc b/src/resource.rc
index 4ce272a3fc..5bb238ca7b 100644
--- a/src/resource.rc
+++ b/src/resource.rc
@@ -721,6 +721,22 @@ BEGIN
     PUSHBUTTON      "Cancel",IDCANCEL,168,78,45,14,WS_GROUP

 END

 

+IDD_EI_OPTIONS DIALOGEX 0, 0, 276, 229

+STYLE DS_FIXEDSYS | WS_CHILD | WS_VISIBLE

+EXSTYLE WS_EX_CONTROLPARENT

+FONT 8, "MS Shell Dlg"

+BEGIN

+    LTEXT           "Select the extra icons to be shown in the contact list:",

+                    IDC_STATIC,1,9,274,13

+    CONTROL         "",IDC_EXTRAORDER,"SysTreeView32",TVS_NOTOOLTIPS |

+                    TVS_CHECKBOXES | TVS_FULLROWSELECT | WS_BORDER |

+                    WS_TABSTOP,1,24,274,160

+    LTEXT           "* only the first %d icons will be shown",

+                    IDC_MAX_ICONS_L,1,190,274,13,NOT WS_VISIBLE

+    LTEXT           "You can group/ungroup icons by selecting then (CTRL+left click) and using the popup menu (right click)",

+                    IDC_STATIC,1,208,274,20

+END

+

 

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

 //

@@ -999,6 +1015,14 @@ BEGIN
     BEGIN

         HORZGUIDE, 18

     END

+

+    IDD_EI_OPTIONS, DIALOG

+    BEGIN

+        LEFTMARGIN, 1

+        RIGHTMARGIN, 275

+        TOPMARGIN, 1

+        BOTTOMMARGIN, 228

+    END

 END

 #endif    // APSTUDIO_INVOKED

 

@@ -1183,6 +1207,18 @@ BEGIN
     END

 END

 

+IDR_OPT_POPUP MENU

+BEGIN

+    POPUP "Group"

+    BEGIN

+        MENUITEM "Group",                       ID_GROUP

+    END

+    POPUP "Ungroup"

+    BEGIN

+        MENUITEM "Ungroup",                     ID_UNGROUP

+    END

+END

+

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

 //

 // Bitmap