NewStory: fixed icons loading

33 files changed, 62 insertions, 175 deletions

diff --git a/plugins/NewStory/NewStory_icons/NewStory_icons.vcxproj b/plugins/NewStory/NewStory_icons/NewStory_icons.vcxproj
deleted file mode 100644
index 939d2553d1..0000000000
--- a/plugins/NewStory/NewStory_icons/NewStory_icons.vcxproj
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{755D03A8-2487-4613-B39B-2C57551A82EF}</ProjectGuid>
-    <ProjectName>NewStory_icons</ProjectName>
-  </PropertyGroup>
-  <ImportGroup Label="PropertySheets">
-    <Import Project="$(ProjectDir)..\..\..\build\vc.common\icons.props" />
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/plugins/NewStory/NewStory_icons/NewStory_icons.vcxproj.filters b/plugins/NewStory/NewStory_icons/NewStory_icons.vcxproj.filters
deleted file mode 100644
index 28f81e7f1b..0000000000
--- a/plugins/NewStory/NewStory_icons/NewStory_icons.vcxproj.filters
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(ProjectDir)..\..\..\build\vc.common\common.filters" />
-</Project>
\ No newline at end of file
diff --git a/plugins/NewStory/NewStory_icons/res/resource.rc b/plugins/NewStory/NewStory_icons/res/resource.rc
deleted file mode 100644
index 28031af17c..0000000000
--- a/plugins/NewStory/NewStory_icons/res/resource.rc
+++ /dev/null
@@ -1,97 +0,0 @@
-//Microsoft Developer Studio generated resource script.
-//
-#include "..\src\resource.h"
-
-#define APSTUDIO_READONLY_SYMBOLS
-/////////////////////////////////////////////////////////////////////////////
-//
-// Generated from the TEXTINCLUDE 2 resource.
-//
-#include "afxres.h"
-
-/////////////////////////////////////////////////////////////////////////////
-#undef APSTUDIO_READONLY_SYMBOLS
-
-/////////////////////////////////////////////////////////////////////////////
-// Unknown language: 0x22, 0x1 resources
-
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_UKR)
-#ifdef _WIN32
-LANGUAGE 0x22, 0x1
-#pragma code_page(1251)
-#endif //_WIN32
-
-#ifdef APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
-//
-// TEXTINCLUDE
-//
-
-1 TEXTINCLUDE DISCARDABLE 
-BEGIN
-    "..\\src\\resource.h\0"
-END
-
-2 TEXTINCLUDE DISCARDABLE 
-BEGIN
-    "#include ""afxres.h""\r\n"
-    "\0"
-END
-
-3 TEXTINCLUDE DISCARDABLE 
-BEGIN
-    "\r\n"
-    "\0"
-END
-
-#endif    // APSTUDIO_INVOKED
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Icon
-//
-
-// Icon with lowest ID value placed first to ensure application icon
-// remains consistent on all systems.
-1                       ICON    DISCARDABLE     "01 newstory.ico"
-2                       ICON    DISCARDABLE     "02 userinfo.ico"
-3                       ICON    DISCARDABLE     "03 usermenu.ico"
-4                       ICON    DISCARDABLE     "04 search.ico"
-5                       ICON    DISCARDABLE     "05 options.ico"
-6                       ICON    DISCARDABLE     "06 filter.ico"
-7                       ICON    DISCARDABLE     "07 export.ico"
-8                       ICON    DISCARDABLE     "09 copy.ico"
-9                       ICON    DISCARDABLE     "10 sendmsg.ico"
-10                      ICON    DISCARDABLE     "11 close.ico"
-11                      ICON    DISCARDABLE     "12 msgin.ico"
-12                      ICON    DISCARDABLE     "13 msgout.ico"
-13                      ICON    DISCARDABLE     "14 signin.ico"
-14                      ICON    DISCARDABLE     "16 file.ico"
-15                      ICON    DISCARDABLE     "17 url.ico"
-16                      ICON    DISCARDABLE     "18 unknown.ico"
-17                      ICON    DISCARDABLE     "19 findprev.ico"
-18                      ICON    DISCARDABLE     "20 findnext.ico"
-19                      ICON    DISCARDABLE     "nopassword.ico"
-20                      ICON    DISCARDABLE     "password.ico"
-21                      ICON    DISCARDABLE     "Calendar.ico"
-23                      ICON    DISCARDABLE     "reset.ico"
-24                      ICON    DISCARDABLE     "reload.ico"
-25                      ICON    DISCARDABLE     "vars.ico"
-22                      ICON    DISCARDABLE     "folder.ico"
-26                      ICON    DISCARDABLE     "save pass.ico"
-#endif    // Unknown language: 0x22, 0x1 resources
-/////////////////////////////////////////////////////////////////////////////
-
-
-
-#ifndef APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
-//
-// Generated from the TEXTINCLUDE 3 resource.
-//
-
-
-/////////////////////////////////////////////////////////////////////////////
-#endif    // not APSTUDIO_INVOKED
-
diff --git a/plugins/NewStory/NewStory_icons/src/resource.h b/plugins/NewStory/NewStory_icons/src/resource.h
deleted file mode 100644
index 8c42483c87..0000000000
--- a/plugins/NewStory/NewStory_icons/src/resource.h
+++ /dev/null
@@ -1,15 +0,0 @@
-//{{NO_DEPENDENCIES}}
-// Microsoft Developer Studio generated include file.
-// Used by resource.rc
-//
-
-// Next default values for new objects
-// 
-#ifdef APSTUDIO_INVOKED
-#ifndef APSTUDIO_READONLY_SYMBOLS
-#define _APS_NEXT_RESOURCE_VALUE        129
-#define _APS_NEXT_COMMAND_VALUE         40001
-#define _APS_NEXT_CONTROL_VALUE         1000
-#define _APS_NEXT_SYMED_VALUE           101
-#endif
-#endif
diff --git a/plugins/NewStory/NewStory_icons/res/01 newstory.ico b/plugins/NewStory/res/01 newstory.ico
index c11f93bebc..c11f93bebc 100644
--- a/plugins/NewStory/NewStory_icons/res/01 newstory.ico
+++ b/plugins/NewStory/res/01 newstory.ico
diff --git a/plugins/NewStory/NewStory_icons/res/02 userinfo.ico b/plugins/NewStory/res/02 userinfo.ico
index 12580fa153..12580fa153 100644
--- a/plugins/NewStory/NewStory_icons/res/02 userinfo.ico
+++ b/plugins/NewStory/res/02 userinfo.ico
diff --git a/plugins/NewStory/NewStory_icons/res/03 usermenu.ico b/plugins/NewStory/res/03 usermenu.ico
index 9b6021ea5d..9b6021ea5d 100644
--- a/plugins/NewStory/NewStory_icons/res/03 usermenu.ico
+++ b/plugins/NewStory/res/03 usermenu.ico
diff --git a/plugins/NewStory/NewStory_icons/res/04 search.ico b/plugins/NewStory/res/04 search.ico
index bbbe115543..bbbe115543 100644
--- a/plugins/NewStory/NewStory_icons/res/04 search.ico
+++ b/plugins/NewStory/res/04 search.ico
diff --git a/plugins/NewStory/NewStory_icons/res/05 options.ico b/plugins/NewStory/res/05 options.ico
index ab07d2a23b..ab07d2a23b 100644
--- a/plugins/NewStory/NewStory_icons/res/05 options.ico
+++ b/plugins/NewStory/res/05 options.ico
diff --git a/plugins/NewStory/NewStory_icons/res/06 filter.ico b/plugins/NewStory/res/06 filter.ico
index 12b80aca48..12b80aca48 100644
--- a/plugins/NewStory/NewStory_icons/res/06 filter.ico
+++ b/plugins/NewStory/res/06 filter.ico
diff --git a/plugins/NewStory/NewStory_icons/res/07 export.ico b/plugins/NewStory/res/07 export.ico
index 6d92c50cd5..6d92c50cd5 100644
--- a/plugins/NewStory/NewStory_icons/res/07 export.ico
+++ b/plugins/NewStory/res/07 export.ico
diff --git a/plugins/NewStory/NewStory_icons/res/09 copy.ico b/plugins/NewStory/res/09 copy.ico
index a363893ee1..a363893ee1 100644
--- a/plugins/NewStory/NewStory_icons/res/09 copy.ico
+++ b/plugins/NewStory/res/09 copy.ico
diff --git a/plugins/NewStory/NewStory_icons/res/10 sendmsg.ico b/plugins/NewStory/res/10 sendmsg.ico
index 9824e078c4..9824e078c4 100644
--- a/plugins/NewStory/NewStory_icons/res/10 sendmsg.ico
+++ b/plugins/NewStory/res/10 sendmsg.ico
diff --git a/plugins/NewStory/NewStory_icons/res/11 close.ico b/plugins/NewStory/res/11 close.ico
index a18dfd8b09..a18dfd8b09 100644
--- a/plugins/NewStory/NewStory_icons/res/11 close.ico
+++ b/plugins/NewStory/res/11 close.ico
diff --git a/plugins/NewStory/NewStory_icons/res/12 msgin.ico b/plugins/NewStory/res/12 msgin.ico
index 38af9f78f1..38af9f78f1 100644
--- a/plugins/NewStory/NewStory_icons/res/12 msgin.ico
+++ b/plugins/NewStory/res/12 msgin.ico
diff --git a/plugins/NewStory/NewStory_icons/res/13 msgout.ico b/plugins/NewStory/res/13 msgout.ico
index eb8366a4b5..eb8366a4b5 100644
--- a/plugins/NewStory/NewStory_icons/res/13 msgout.ico
+++ b/plugins/NewStory/res/13 msgout.ico
diff --git a/plugins/NewStory/NewStory_icons/res/14 signin.ico b/plugins/NewStory/res/14 signin.ico
index 359de2e178..359de2e178 100644
--- a/plugins/NewStory/NewStory_icons/res/14 signin.ico
+++ b/plugins/NewStory/res/14 signin.ico
diff --git a/plugins/NewStory/NewStory_icons/res/16 file.ico b/plugins/NewStory/res/16 file.ico
index ecb62a63b5..ecb62a63b5 100644
--- a/plugins/NewStory/NewStory_icons/res/16 file.ico
+++ b/plugins/NewStory/res/16 file.ico
diff --git a/plugins/NewStory/NewStory_icons/res/17 url.ico b/plugins/NewStory/res/17 url.ico
index 4da1ade23c..4da1ade23c 100644
--- a/plugins/NewStory/NewStory_icons/res/17 url.ico
+++ b/plugins/NewStory/res/17 url.ico
diff --git a/plugins/NewStory/NewStory_icons/res/18 unknown.ico b/plugins/NewStory/res/18 unknown.ico
index 6b0538ed7a..6b0538ed7a 100644
--- a/plugins/NewStory/NewStory_icons/res/18 unknown.ico
+++ b/plugins/NewStory/res/18 unknown.ico
diff --git a/plugins/NewStory/NewStory_icons/res/19 findprev.ico b/plugins/NewStory/res/19 findprev.ico
index 33ccdfc7a3..33ccdfc7a3 100644
--- a/plugins/NewStory/NewStory_icons/res/19 findprev.ico
+++ b/plugins/NewStory/res/19 findprev.ico
diff --git a/plugins/NewStory/NewStory_icons/res/20 findnext.ico b/plugins/NewStory/res/20 findnext.ico
index 86558d7130..86558d7130 100644
--- a/plugins/NewStory/NewStory_icons/res/20 findnext.ico
+++ b/plugins/NewStory/res/20 findnext.ico
diff --git a/plugins/NewStory/NewStory_icons/res/Calendar.ico b/plugins/NewStory/res/Calendar.ico
index ad60346097..ad60346097 100644
--- a/plugins/NewStory/NewStory_icons/res/Calendar.ico
+++ b/plugins/NewStory/res/Calendar.ico
diff --git a/plugins/NewStory/NewStory_icons/res/folder.ico b/plugins/NewStory/res/folder.ico
index b825868ea1..b825868ea1 100644
--- a/plugins/NewStory/NewStory_icons/res/folder.ico
+++ b/plugins/NewStory/res/folder.ico
diff --git a/plugins/NewStory/NewStory_icons/res/nopassword.ico b/plugins/NewStory/res/nopassword.ico
index 7512ea821c..7512ea821c 100644
--- a/plugins/NewStory/NewStory_icons/res/nopassword.ico
+++ b/plugins/NewStory/res/nopassword.ico
diff --git a/plugins/NewStory/NewStory_icons/res/password.ico b/plugins/NewStory/res/password.ico
index 50798a776f..50798a776f 100644
--- a/plugins/NewStory/NewStory_icons/res/password.ico
+++ b/plugins/NewStory/res/password.ico
diff --git a/plugins/NewStory/NewStory_icons/res/reload.ico b/plugins/NewStory/res/reload.ico
index 1c2a01b2ca..1c2a01b2ca 100644
--- a/plugins/NewStory/NewStory_icons/res/reload.ico
+++ b/plugins/NewStory/res/reload.ico
diff --git a/plugins/NewStory/NewStory_icons/res/reset.ico b/plugins/NewStory/res/reset.ico
index 20480bb6ec..20480bb6ec 100644
--- a/plugins/NewStory/NewStory_icons/res/reset.ico
+++ b/plugins/NewStory/res/reset.ico
diff --git a/plugins/NewStory/res/resource.rc b/plugins/NewStory/res/resource.rc
index 861b6ec10b..9d70a23ae8 100644
--- a/plugins/NewStory/res/resource.rc
+++ b/plugins/NewStory/res/resource.rc
@@ -21,6 +21,42 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
 
 /////////////////////////////////////////////////////////////////////////////
 //
+// Icon
+//
+
+// Icon with lowest ID value placed first to ensure application icon
+// remains consistent on all systems.
+ICO_NEWSTORY                       ICON         "01 newstory.ico"
+ICO_USERINFO                       ICON         "02 userinfo.ico"
+ICO_USERMENU                       ICON         "03 usermenu.ico"
+ICO_SEARCH                       ICON         "04 search.ico"
+ICO_OPTIONS                       ICON         "05 options.ico"
+ICO_FILTER                       ICON         "06 filter.ico"
+ICO_EXPORT                       ICON         "07 export.ico"
+ICO_COPY                       ICON         "09 copy.ico"
+ICO_SENDMSG                       ICON         "10 sendmsg.ico"
+ICO_CLOSE                      ICON         "11 close.ico"
+ICO_MSGIN                      ICON         "12 msgin.ico"
+ICO_MSGOUT                      ICON         "13 msgout.ico"
+ICO_SIGNIN                      ICON         "14 signin.ico"
+ICO_FILE                      ICON         "16 file.ico"
+ICO_URL                      ICON         "17 url.ico"
+ICO_UNKNOWN                      ICON         "18 unknown.ico"
+ICO_FINDPREV                      ICON         "19 findprev.ico"
+ICO_FINDNEXT                      ICON         "20 findnext.ico"
+ICO_NOPASSWORD                      ICON         "nopassword.ico"
+ICO_PASSWORD                      ICON         "password.ico"
+ICO_CALENDAR                      ICON         "Calendar.ico"
+ICO_RESET                      ICON         "reset.ico"
+ICO_PREVIEW                      ICON         "reload.ico"
+ICO_VARHELP                      ICON         "vars.ico"
+ICO_TPLGROUP                      ICON         "folder.ico"
+ICO_SAVEPASS                      ICON         "save pass.ico"
+/////////////////////////////////////////////////////////////////////////////
+
+
+/////////////////////////////////////////////////////////////////////////////
+//
 // Dialog
 //
 
diff --git a/plugins/NewStory/NewStory_icons/res/save pass.ico b/plugins/NewStory/res/save pass.ico
index 9df7ce86e1..9df7ce86e1 100644
--- a/plugins/NewStory/NewStory_icons/res/save pass.ico
+++ b/plugins/NewStory/res/save pass.ico
diff --git a/plugins/NewStory/NewStory_icons/res/vars.ico b/plugins/NewStory/res/vars.ico
index 2cfb932fc7..2cfb932fc7 100644
--- a/plugins/NewStory/NewStory_icons/res/vars.ico
+++ b/plugins/NewStory/res/vars.ico
diff --git a/plugins/NewStory/src/icons.h b/plugins/NewStory/src/icons.h
index de29414d19..0d74e6c977 100644
--- a/plugins/NewStory/src/icons.h
+++ b/plugins/NewStory/src/icons.h
@@ -1,34 +1,3 @@
-enum
-{
-	ICO_NEWSTORY,	// 0
-	ICO_USERINFO,	// 1
-	ICO_USERMENU,	// 2
-	ICO_SEARCH,		// 3
-	ICO_OPTIONS,	// 4
-	ICO_FILTER,		// 5
-	ICO_EXPORT,		// 6
-	ICO_COPY,		// 7
-	ICO_SENDMSG,	// 8
-	ICO_CLOSE,		// 9
-	ICO_MSGIN,		// 10
-	ICO_MSGOUT,		// 11
-	ICO_SIGNIN,		// 12
-	ICO_FILE,		// 13
-	ICO_URL,		// 14
-	ICO_UNKNOWN,	// 15
-	ICO_FINDPREV,	// 16
-	ICO_FINDNEXT,	// 17
-	ICO_NOPASSWORD,	// 18
-	ICO_PASSWORD,	// 19
-	ICO_CALENDAR,	// 20
-	ICO_TPLGROUP,	// 21
-	ICO_RESET,		// 22
-	ICO_PREVIEW,	// 23
-	ICO_VARHELP,	// 24
-	ICO_SAVEPASS,	// 25
-	ICO_COUNT		// 26
-};
-
 //extern IconItem icons[];
 //extern int iconCount;
 
diff --git a/plugins/NewStory/src/resource.h b/plugins/NewStory/src/resource.h
index 0aa0f83820..1016ca7a5f 100644
--- a/plugins/NewStory/src/resource.h
+++ b/plugins/NewStory/src/resource.h
@@ -20,6 +20,32 @@
 #define IDD_OPT_GENERAL                 124
 #define IDI_FOLDER                      125
 #define IDD_OPT_PASSWORDS               126
+#define ICO_NEWSTORY                    127
+#define ICO_USERINFO                    128
+#define ICO_USERMENU                    129
+#define ICO_SEARCH                      130
+#define ICO_OPTIONS                     131
+#define ICO_FILTER                      132
+#define ICO_EXPORT                      133
+#define ICO_COPY                        134
+#define ICO_SENDMSG                     135
+#define ICO_CLOSE                       136
+#define ICO_MSGIN                       137
+#define ICO_MSGOUT                      138
+#define ICO_SIGNIN                      139
+#define ICO_FILE                        140
+#define ICO_URL                         141
+#define ICO_UNKNOWN                     142
+#define ICO_FINDPREV                    143
+#define ICO_FINDNEXT                    144
+#define ICO_NOPASSWORD                  145
+#define ICO_PASSWORD                    146
+#define ICO_CALENDAR                    147
+#define ICO_TPLGROUP                    148
+#define ICO_RESET                       149
+#define ICO_PREVIEW                     150
+#define ICO_VARHELP                     151
+#define ICO_SAVEPASS                    152
 #define IDC_CUSTOM1                     1000
 #define IDC_GPREVIEW                    1000
 #define IDC_LIST                        1000