plugin don't use icon

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

5 files changed, 14 insertions, 28 deletions

diff --git a/plugins/AVS/avs_12.vcxproj b/plugins/AVS/avs_12.vcxproj
index 4a9f4c409e..c4be768f8b 100644
--- a/plugins/AVS/avs_12.vcxproj
+++ b/plugins/AVS/avs_12.vcxproj
@@ -228,6 +228,7 @@
     <ClInclude Include="src\commonheaders.h" />

     <ClInclude Include="src\image_utils.h" />

     <ClInclude Include="src\poll.h" />

+    <ClInclude Include="src\resource.h" />

     <ClInclude Include="src\version.h" />

   </ItemGroup>

   <ItemGroup>

diff --git a/plugins/AVS/avs_12.vcxproj.filters b/plugins/AVS/avs_12.vcxproj.filters
index 85b6e3a49a..1ca784fa69 100644
--- a/plugins/AVS/avs_12.vcxproj.filters
+++ b/plugins/AVS/avs_12.vcxproj.filters
@@ -62,6 +62,9 @@
     <ClInclude Include="..\..\include\m_avatars.h">

       <Filter>Header Files</Filter>

     </ClInclude>

+    <ClInclude Include="src\resource.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

   </ItemGroup>

   <ItemGroup>

     <ResourceCompile Include="res\avs.rc">

diff --git a/plugins/AVS/res/avatar.ico b/plugins/AVS/res/avatar.ico
deleted file mode 100644
index effd773ac4..0000000000
--- a/plugins/AVS/res/avatar.ico
+++ /dev/null
diff --git a/plugins/AVS/res/avs.rc b/plugins/AVS/res/avs.rc
index 26dee0ee88..11d9631c5e 100644
--- a/plugins/AVS/res/avs.rc
+++ b/plugins/AVS/res/avs.rc
@@ -192,14 +192,6 @@ END
 #endif    // APSTUDIO_INVOKED

 

 

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

-//

-// Icon

-//

-

-// Icon with lowest ID value placed first to ensure application icon

-// remains consistent on all systems.

-IDI_AVATAR              ICON                    "avatar.ico"

 #endif    // Neutral resources

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

 

@@ -250,4 +242,3 @@ END
 

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

 #endif    // not APSTUDIO_INVOKED

-

diff --git a/plugins/AVS/src/resource.h b/plugins/AVS/src/resource.h
index 2d8ba9add0..a58c6eb0d0 100644
--- a/plugins/AVS/src/resource.h
+++ b/plugins/AVS/src/resource.h
@@ -3,58 +3,49 @@
 // Used by avs.rc

 //

 #define ID_USE_DEFAULTS                 3

-#define IDD_OPTIONS                     101

 #define IDD_OPTIONS_PICTS               101

 #define IDD_OPENSUBCLASS                102

 #define IDD_AVATAROPTIONS               103

-#define IDI_AVATAR                      104

+#define IDD_OPTIONS_OWN                 104

 #define IDD_SET_OWN_SUBCLASS            105

-#define IDD_DIALOG1                     106

 #define IDD_USER_AVATAR                 106

 #define IDD_PROTO_AVATARS               107

-#define IDD_OPTIONS_AVATARS             109

-#define IDD_OPTIONS_OWN                 110

+#define IDD_OPTIONS_AVATARS             108

 #define IDC_PROTOCOLS                   1001

-#define IDC_CLIST                       1002

+#define IDC_SHOWWARNINGS                1002

 #define IDC_SETPROTOPIC                 1003

 #define IDC_PROTOPIC                    1004

 #define IDC_REMOVEPROTOPIC              1005

 #define IDC_PROTOAVATARNAME             1006

-#define IDC_CHECK1                      1007

 #define IDC_PROTECTAVATAR               1007

-#define IDC_SHOWWARNINGS                1007

-#define IDC_PER_PROTO                   1007

 #define IDC_CHANGE                      1008

-#define IDC_MAKE_TRANSPARENT_BKG        1008

-#define IDC_GROW                        1008

 #define IDC_RESET                       1009

-#define IDC_MAKE_GRAYSCALE              1009

 #define IDC_AVATARNAME                  1010

-#define IDC_MAKE_GRAYSCALE2             1010

-#define IDC_SET_MAKE_SQUARE             1010

 #define IDC_HIDEAVATAR                  1011

 #define IDC_DELETE                      1012

 #define IDC_MAKETRANSPBKG               1013

-#define IDC_GUESS_LEVEL                 1014

 #define IDC_BKG_NUM_POINTS              1014

-#define IDC_COMBO1                      1015

 #define IDC_BKG_NUM_POINTS_SPIN         1015

 #define IDC_BKG_COLOR_DIFFERENCE        1016

-#define IDC_SIZELIMITSPIN3              1017

 #define IDC_BKG_COLOR_DIFFERENCE_SPIN   1017

 #define IDC_BKG_NUM_POINTS_L            1018

 #define IDC_BKG_COLOR_DIFFERENCE_L      1019

 #define IDC_MAKE_TRANSP_PROPORTIONAL    1020

 #define IDC_MAKE_MY_AVATARS_TRANSP      1021

+#define IDC_PER_PROTO                   1022

 #define IDC_MAKE_SQUARE                 1023

+#define IDC_MAKE_TRANSPARENT_BKG        1024

+#define IDC_GROW                        1025

+#define IDC_MAKE_GRAYSCALE              1026

+#define IDC_SET_MAKE_SQUARE             1027

 

 // Next default values for new objects

 // 

 #ifdef APSTUDIO_INVOKED

 #ifndef APSTUDIO_READONLY_SYMBOLS

-#define _APS_NEXT_RESOURCE_VALUE        108

+#define _APS_NEXT_RESOURCE_VALUE        109

 #define _APS_NEXT_COMMAND_VALUE         40001

-#define _APS_NEXT_CONTROL_VALUE         1024

+#define _APS_NEXT_CONTROL_VALUE         1028

 #define _APS_NEXT_SYMED_VALUE           101

 #endif

 #endif