VersionInfo, W7UI, WhoUsesMyFiles, YAPP, ZeroNotification: changed folder structure

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

11 files changed, 24 insertions, 33 deletions

diff --git a/plugins/WhoUsesMyFiles/res/wumf.readme.txt b/plugins/WhoUsesMyFiles/docs/wumf.readme.txt
index f07d9c2275..f07d9c2275 100644
--- a/plugins/WhoUsesMyFiles/res/wumf.readme.txt
+++ b/plugins/WhoUsesMyFiles/docs/wumf.readme.txt
diff --git a/plugins/WhoUsesMyFiles/res/drive.bmp b/plugins/WhoUsesMyFiles/res/drive.bmp
deleted file mode 100644
index 767aef2997..0000000000
--- a/plugins/WhoUsesMyFiles/res/drive.bmp
+++ /dev/null
diff --git a/plugins/WhoUsesMyFiles/resource.rc b/plugins/WhoUsesMyFiles/res/resource.rc
index 1bf8f41511..a0333d96ef 100644
--- a/plugins/WhoUsesMyFiles/resource.rc
+++ b/plugins/WhoUsesMyFiles/res/resource.rc
@@ -1,6 +1,6 @@
 //Microsoft Developer Studio generated resource script.

 //

-#include "resource.h"

+#include "..\src\resource.h"

 

 #define APSTUDIO_READONLY_SYMBOLS

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

@@ -59,12 +59,6 @@ END
 #endif    // APSTUDIO_INVOKED

 

 

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

-//

-// Bitmap

-//

-

-IDB_DRIVE               BITMAP  DISCARDABLE     "res\\drive.bmp"

 #endif    // Russian resources

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

 

@@ -146,7 +140,7 @@ END
 //

 

 #ifdef APSTUDIO_INVOKED

-GUIDELINES DESIGNINFO DISCARDABLE 

+GUIDELINES DESIGNINFO 

 BEGIN

     IDD_OPTIONS, DIALOG

     BEGIN

@@ -162,18 +156,18 @@ END
 // TEXTINCLUDE

 //

 

-1 TEXTINCLUDE DISCARDABLE 

+1 TEXTINCLUDE 

 BEGIN

-    "resource.h\0"

+    "..\\src\\resource.h\0"

 END

 

-2 TEXTINCLUDE DISCARDABLE 

+2 TEXTINCLUDE 

 BEGIN

     "#include ""afxres.h""\r\n"

     "\0"

 END

 

-3 TEXTINCLUDE DISCARDABLE 

+3 TEXTINCLUDE 

 BEGIN

     "\r\n"

     "\0"

@@ -189,9 +183,9 @@ END
 

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

 // remains consistent on all systems.

-IDI_POPUP               ICON    DISCARDABLE     "res\\popup.ico"

-IDI_NOPOPUP             ICON    DISCARDABLE     "res\\popup_no.ico"

-IDI_DRIVE               ICON    DISCARDABLE     "res\\drive.ico"

+IDI_POPUP               ICON     "popup.ico"

+IDI_NOPOPUP             ICON     "popup_no.ico"

+IDI_DRIVE               ICON     "drive.ico"

 #endif    // English (U.S.) resources

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

 

diff --git a/plugins/WhoUsesMyFiles/list.c b/plugins/WhoUsesMyFiles/src/list.c
index 1e52e12e4d..1e52e12e4d 100644
--- a/plugins/WhoUsesMyFiles/list.c
+++ b/plugins/WhoUsesMyFiles/src/list.c
diff --git a/plugins/WhoUsesMyFiles/resizer.c b/plugins/WhoUsesMyFiles/src/resizer.c
index e45d10a453..e45d10a453 100644
--- a/plugins/WhoUsesMyFiles/resizer.c
+++ b/plugins/WhoUsesMyFiles/src/resizer.c
diff --git a/plugins/WhoUsesMyFiles/resource.h b/plugins/WhoUsesMyFiles/src/resource.h
index 3fb3c7e09e..6e4cd69615 100644
--- a/plugins/WhoUsesMyFiles/resource.h
+++ b/plugins/WhoUsesMyFiles/src/resource.h
@@ -7,7 +7,6 @@
 #define IDI_NOPOPUP                     103

 #define IDI_DRIVE                       106

 #define IDD_CONNLIST                    107

-#define IDB_DRIVE                       108

 #define IDC_COLOR_SET                   1000

 #define IDC_COLOR_WIN                   1001

 #define IDC_COLOR_DEF                   1002

diff --git a/plugins/WhoUsesMyFiles/wumf.c b/plugins/WhoUsesMyFiles/src/wumf.c
index 03aa576d38..03aa576d38 100644
--- a/plugins/WhoUsesMyFiles/wumf.c
+++ b/plugins/WhoUsesMyFiles/src/wumf.c
diff --git a/plugins/WhoUsesMyFiles/wumf.h b/plugins/WhoUsesMyFiles/src/wumf.h
index 5535ae0c5f..5535ae0c5f 100644
--- a/plugins/WhoUsesMyFiles/wumf.h
+++ b/plugins/WhoUsesMyFiles/src/wumf.h
diff --git a/plugins/WhoUsesMyFiles/wumfplug.c b/plugins/WhoUsesMyFiles/src/wumfplug.c
index 0af8d6e817..2493de584b 100644
--- a/plugins/WhoUsesMyFiles/wumfplug.c
+++ b/plugins/WhoUsesMyFiles/src/wumfplug.c
@@ -552,7 +552,7 @@ int InitTopToolbar(WPARAM wparam,LPARAM lparam)
 {

 	TTBButton ttb = { 0 };

 	ttb.cbSize = sizeof(ttb);

-	ttb.hIconUp = LoadIcon(hInst, MAKEINTRESOURCE(IDB_DRIVE));

+	ttb.hIconUp = LoadIcon(hInst, MAKEINTRESOURCE(IDI_DRIVE));

 	ttb.pszService = MS_WUMF_CONNECTIONSSHOW;

 	ttb.dwFlags = TTBBF_VISIBLE|TTBBF_SHOWTOOLTIP;

 	ttb.name = ttb.pszTooltipUp = LPGEN("Show connections list");

diff --git a/plugins/WhoUsesMyFiles/wumf.vcxproj b/plugins/WhoUsesMyFiles/wumf.vcxproj
index c6044637fa..d798b606b5 100644
--- a/plugins/WhoUsesMyFiles/wumf.vcxproj
+++ b/plugins/WhoUsesMyFiles/wumf.vcxproj
@@ -155,8 +155,6 @@
       <SubSystem>Windows</SubSystem>

       <OptimizeReferences>true</OptimizeReferences>

       <EnableCOMDATFolding>true</EnableCOMDATFolding>

-      <EntryPointSymbol>

-      </EntryPointSymbol>

       <ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary>

       <RandomizedBaseAddress>false</RandomizedBaseAddress>

       <AdditionalLibraryDirectories>$(SolutionDir)\lib</AdditionalLibraryDirectories>

@@ -167,17 +165,17 @@
     </ResourceCompile>

   </ItemDefinitionGroup>

   <ItemGroup>

-    <ClInclude Include="resource.h" />

-    <ClInclude Include="wumf.h" />

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

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

   </ItemGroup>

   <ItemGroup>

-    <ResourceCompile Include="resource.rc" />

+    <ResourceCompile Include="res\resource.rc" />

   </ItemGroup>

   <ItemGroup>

-    <ClCompile Include="list.c" />

-    <ClCompile Include="resizer.c" />

-    <ClCompile Include="wumf.c" />

-    <ClCompile Include="wumfplug.c" />

+    <ClCompile Include="src\list.c" />

+    <ClCompile Include="src\resizer.c" />

+    <ClCompile Include="src\wumf.c" />

+    <ClCompile Include="src\wumfplug.c" />

   </ItemGroup>

   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

   <ImportGroup Label="ExtensionTargets">

diff --git a/plugins/WhoUsesMyFiles/wumf.vcxproj.filters b/plugins/WhoUsesMyFiles/wumf.vcxproj.filters
index 923fdf838f..0715f41ff1 100644
--- a/plugins/WhoUsesMyFiles/wumf.vcxproj.filters
+++ b/plugins/WhoUsesMyFiles/wumf.vcxproj.filters
@@ -15,29 +15,29 @@
     </Filter>

   </ItemGroup>

   <ItemGroup>

-    <ClInclude Include="resource.h">

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

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="wumf.h">

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

       <Filter>Header Files</Filter>

     </ClInclude>

   </ItemGroup>

   <ItemGroup>

-    <ResourceCompile Include="resource.rc">

+    <ResourceCompile Include="res\resource.rc">

       <Filter>Resource Files</Filter>

     </ResourceCompile>

   </ItemGroup>

   <ItemGroup>

-    <ClCompile Include="list.c">

+    <ClCompile Include="src\list.c">

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="resizer.c">

+    <ClCompile Include="src\resizer.c">

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="wumf.c">

+    <ClCompile Include="src\wumf.c">

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="wumfplug.c">

+    <ClCompile Include="src\wumfplug.c">

       <Filter>Source Files</Filter>

     </ClCompile>

   </ItemGroup>