Folders: changed folder structure

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

28 files changed, 79 insertions, 218 deletions

diff --git a/plugins/Folders/folders-translation.txt b/plugins/Folders/docs/folders-translation.txt
index 7cfa5d4437..7cfa5d4437 100644
--- a/plugins/Folders/folders-translation.txt
+++ b/plugins/Folders/docs/folders-translation.txt
diff --git a/plugins/Folders/docs/rtf convert.bat b/plugins/Folders/docs/rtf convert.bat
deleted file mode 100644
index 6a301622ab..0000000000
--- a/plugins/Folders/docs/rtf convert.bat
+++ /dev/null
@@ -1 +0,0 @@
-"rtf converter.exe" "variables help.doc" ".\folders\variablesHelp.inc"
\ No newline at end of file
diff --git a/plugins/Folders/docs/rtf converter.exe b/plugins/Folders/docs/rtf converter.exe
deleted file mode 100644
index f932bbca43..0000000000
--- a/plugins/Folders/docs/rtf converter.exe
+++ /dev/null
diff --git a/plugins/Folders/docs/rtf converter/rtf converter.cpp b/plugins/Folders/docs/rtf converter/rtf converter.cpp
deleted file mode 100644
index 8d51c0d79a..0000000000
--- a/plugins/Folders/docs/rtf converter/rtf converter.cpp
+++ /dev/null
@@ -1,103 +0,0 @@
-#define _CRT_SECURE_NO_DEPRECATE

-

-#include <stdio.h>

-#include <stdlib.h>

-#include <string.h>

-

-#define MAX_PATH 260

-#define DEFAULT_OUTPUT "output.inc"

-

-void PrintUsage(char *programPath)

-{

-	printf("Usage\n");

-	printf("%s input.doc [output.inc]\n", programPath);

-	printf("\nConverts a rtf text found in input.doc to a string that contains the rtf text and stores it in output.inc");

-}

-

-void Add(char *result, char *what)

-{

-	strcat(result, what);

-}

-

-void Add(char *result, char chr)

-{

-	int len = strlen(result);

-	result[len++] = chr;

-	result[len] = '\0';

-}

-

-void Convert(char *input, char *output)

-{

-	int len = strlen(input);

-	int i;

-	output[0] = '\0';

-	Add(output, '\"');

-	for (i = 0; i < len; i++)

-		{

-			switch (input[i])

-				{

-					case '\"':

-						Add(output, "\"\"");

-						break;

-					case '\\':

-						Add(output, "\\\\");

-						break;

-					case '\n':

-						Add(output, "\\n");

-						break;

-					default:

-						Add(output, input[i]);

-				}

-		}

-	Add(output, "\"\n");

-}

-

-void DoConversion(char *inFile, char *outFile)

-{

-	FILE *fin = fopen(inFile, "rt");

-	FILE *fout = fopen(outFile, "wt");

-	char buffer[2048];

-	char out[4096];

-	if ((fin) && (fout))

-		{

-			while (!feof(fin))

-				{

-					fgets(buffer, sizeof(buffer), fin);

-					if (strlen(buffer) > 0)

-						{

-							Convert(buffer, out);

-							fputs(out, fout);

-						}

-				}

-		}

-	if (fin)

-		{

-			fclose(fin);

-		}

-	if (fout)

-		{

-			fclose(fout);

-		}

-}

-

-int main(int argc, char *argv[])

-{

-	char input[MAX_PATH];

-	char output[MAX_PATH];

-	if ((argc < 2) || (argc > 3))

-		{

-			PrintUsage(argv[0]);

-			return 0;

-		}

-	strcpy(input, argv[1]);

-	if (argc == 3)

-		{

-			strcpy(output, argv[2]);

-		}

-		else{

-			strcpy(output, DEFAULT_OUTPUT);

-		}

-	DoConversion(input, output);

-	return 0;

-}

-

diff --git a/plugins/Folders/docs/variables help.doc b/plugins/Folders/docs/variables help.doc
deleted file mode 100644
index 5b9ba27a62..0000000000
--- a/plugins/Folders/docs/variables help.doc
+++ /dev/null
diff --git a/plugins/Folders/folders.vcxproj b/plugins/Folders/folders.vcxproj
index 0e7149fc3c..0a8b05e3cc 100644
--- a/plugins/Folders/folders.vcxproj
+++ b/plugins/Folders/folders.vcxproj
@@ -73,7 +73,7 @@
     <ClCompile>

       <Optimization>Disabled</Optimization>

       <AdditionalIncludeDirectories>..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

-      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;FOLDERS_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;FOLDERS_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <MinimalRebuild>true</MinimalRebuild>

       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>

@@ -97,7 +97,7 @@
     <ClCompile>

       <Optimization>Disabled</Optimization>

       <AdditionalIncludeDirectories>..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

-      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;WIN64;_DEBUG;_WINDOWS;_USRDLL;FOLDERS_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <PreprocessorDefinitions>WIN64;_DEBUG;_WINDOWS;_USRDLL;FOLDERS_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <MinimalRebuild>true</MinimalRebuild>

       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>

@@ -121,7 +121,7 @@
       <Optimization>Full</Optimization>

       <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>

       <AdditionalIncludeDirectories>..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

-      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;FOLDERS_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;FOLDERS_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <WarningLevel>Level3</WarningLevel>

       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>

     </ClCompile>

@@ -145,7 +145,7 @@
       <Optimization>Full</Optimization>

       <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>

       <AdditionalIncludeDirectories>..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

-      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;WIN64;NDEBUG;_WINDOWS;_USRDLL;FOLDERS_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <PreprocessorDefinitions>WIN64;NDEBUG;_WINDOWS;_USRDLL;FOLDERS_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <WarningLevel>Level3</WarningLevel>

       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>

     </ClCompile>

@@ -165,33 +165,32 @@
     </ResourceCompile>

   </ItemDefinitionGroup>

   <ItemGroup>

-    <ClCompile Include="dlg_handlers.cpp" />

-    <ClCompile Include="events.cpp" />

-    <ClCompile Include="folderItem.cpp" />

-    <ClCompile Include="folders.cpp" />

-    <ClCompile Include="foldersList.cpp" />

-    <ClCompile Include="hooked_events.cpp" />

-    <ClCompile Include="services.cpp" />

-    <ClCompile Include="utils.cpp" />

+    <ClCompile Include="src\dlg_handlers.cpp" />

+    <ClCompile Include="src\events.cpp" />

+    <ClCompile Include="src\folderItem.cpp" />

+    <ClCompile Include="src\folders.cpp" />

+    <ClCompile Include="src\foldersList.cpp" />

+    <ClCompile Include="src\hooked_events.cpp" />

+    <ClCompile Include="src\services.cpp" />

+    <ClCompile Include="src\utils.cpp" />

   </ItemGroup>

   <ItemGroup>

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

   </ItemGroup>

   <ItemGroup>

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

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

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

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

   </ItemGroup>

   <ItemGroup>

-    <None Include="variablesHelp.inc" />

     <None Include="docs\folders_readme.txt" />

   </ItemGroup>

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

diff --git a/plugins/Folders/folders.vcxproj.filters b/plugins/Folders/folders.vcxproj.filters
index 28e243e133..230eedb0fa 100644
--- a/plugins/Folders/folders.vcxproj.filters
+++ b/plugins/Folders/folders.vcxproj.filters
@@ -15,75 +15,72 @@
     </Filter>

   </ItemGroup>

   <ItemGroup>

-    <ClCompile Include="dlg_handlers.cpp">

+    <ClCompile Include="src\dlg_handlers.cpp">

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="events.cpp">

+    <ClCompile Include="src\events.cpp">

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="folderItem.cpp">

+    <ClCompile Include="src\folderItem.cpp">

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="folders.cpp">

+    <ClCompile Include="src\folders.cpp">

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="foldersList.cpp">

+    <ClCompile Include="src\foldersList.cpp">

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="hooked_events.cpp">

+    <ClCompile Include="src\hooked_events.cpp">

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="services.cpp">

+    <ClCompile Include="src\services.cpp">

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="utils.cpp">

+    <ClCompile Include="src\utils.cpp">

       <Filter>Source Files</Filter>

     </ClCompile>

   </ItemGroup>

   <ItemGroup>

-    <ClInclude Include="commonheaders.h">

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

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="dlg_handlers.h">

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

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="events.h">

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

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="folderItem.h">

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

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="foldersList.h">

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

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="hooked_events.h">

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

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="resource.h">

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

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="services.h">

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

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="utils.h">

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

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="version.h">

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

       <Filter>Header Files</Filter>

     </ClInclude>

   </ItemGroup>

   <ItemGroup>

-    <ResourceCompile Include="folders.rc">

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

       <Filter>Resource Files</Filter>

     </ResourceCompile>

-    <ResourceCompile Include="version.rc">

+    <ResourceCompile Include="res'version.rc">

       <Filter>Resource Files</Filter>

     </ResourceCompile>

   </ItemGroup>

   <ItemGroup>

-    <None Include="variablesHelp.inc">

-      <Filter>Resource Files</Filter>

-    </None>

     <None Include="docs\folders_readme.txt" />

   </ItemGroup>

 </Project>
\ No newline at end of file
diff --git a/plugins/Folders/folders.rc b/plugins/Folders/res/folders.rc
index b87bcd9447..1a5fb1cf43 100644
--- a/plugins/Folders/folders.rc
+++ b/plugins/Folders/res/folders.rc
@@ -1,6 +1,6 @@
 // Microsoft Visual C++ generated resource script.

 //

-#include "resource.h"

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

 

 #define APSTUDIO_READONLY_SYMBOLS

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

@@ -74,7 +74,7 @@ CAPTION "Custom folders variables help"
 FONT 8, "MS Shell Dlg", 400, 0, 0x1

 BEGIN

     DEFPUSHBUTTON   "Close",IDCLOSE,392,216,50,14

-    CONTROL         "",IDC_HELP_RICHEDIT,"RichEdit20A",ES_MULTILINE | ES_AUTOHSCROLL | ES_READONLY | WS_BORDER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP,7,7,435,203

+    CONTROL         "",IDC_HELP_RICHEDIT,"RichEdit20W",ES_MULTILINE | ES_AUTOHSCROLL | ES_READONLY | WS_BORDER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP,7,7,435,203

 END

 

 

diff --git a/plugins/Folders/version.rc b/plugins/Folders/res/version.rc
index cd65db2ee3..1f804dd096 100644
--- a/plugins/Folders/version.rc
+++ b/plugins/Folders/res/version.rc
@@ -4,8 +4,7 @@
 #error this file is not editable by Microsoft Visual C++

 #endif //APSTUDIO_INVOKED

 

-#include "resource.h"

-#include "version.h"

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

 

 #define APSTUDIO_READONLY_SYMBOLS

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

diff --git a/plugins/Folders/commonheaders.h b/plugins/Folders/src/commonheaders.h
index f5bd57522b..52ab262421 100644
--- a/plugins/Folders/commonheaders.h
+++ b/plugins/Folders/src/commonheaders.h
@@ -18,6 +18,8 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.

 */

 

+#define _CRT_SECURE_NO_WARNINGS

+

 #ifndef M_FOLDERS_COMMONHEADERS_H

 #define M_FOLDERS_COMMONHEADERS_H

 

diff --git a/plugins/Folders/dlg_handlers.cpp b/plugins/Folders/src/dlg_handlers.cpp
index 74d3715835..cb11566363 100644
--- a/plugins/Folders/dlg_handlers.cpp
+++ b/plugins/Folders/src/dlg_handlers.cpp
@@ -205,35 +205,6 @@ void RefreshPreview(HWND hWnd)
 }

 

 

-void LoadHelp(HWND hWnd)

-{

-	SETTEXTEX tmp = {0};

-	tmp.flags = ST_SELECTION;

-	tmp.codepage = CallService(MS_LANGPACK_GETCODEPAGE, 0, 0);

-	char *text =

-#include "variablesHelp.inc"

-;

-

-	char buffer[2048];

-	char line[2048];

-	int len;

-

-	char *p;

-	while ((p = strchr(text, '\n')))

-	{

-		len = p - text + 1;

-		memcpy(line, text, len);

-		line[len] = 0;

-

-		mir_snprintf(buffer, sizeof(buffer), "{\\rtf1\\ansi\\deff0\\pard\\li%u\\fi-%u\\ri%u\\tx%u\\fs19 %s\\par}", 60*15, 60*15, 5*15, 60*15, Translate(line));

-		text = p + 1;

-

-		SendDlgItemMessageW(hWnd, IDC_HELP_RICHEDIT, EM_SETTEXTEX, (WPARAM) &tmp, (LPARAM) buffer);

-	}

-

-

-}

-

 /************************************** DIALOG HANDLERS *************************************/

 #include "commctrl.h"

 

@@ -380,8 +351,35 @@ INT_PTR CALLBACK DlgProcVariables(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lPa
 		{

 			case WM_INITDIALOG:

 				{

+					SetDlgItemText(hWnd, IDC_HELP_RICHEDIT, _T("\

+Don't forget to click on Apply to save the changes. If you don't then the changes won\'t\r\n\

+be saved to the database, they will only be valid for this session.\r\n\r\n\

+Variable string\t\tWhat it expands to:\r\n\

+%miranda_path%\tExpands to your miranda path (e.g: c:\program files\miranda im).\r\n\

+%profile_path%\t\tExpands to your profile path - the value found in mirandaboot.ini,\r\n\

+\t\t\tProfileDir section (usually inside miranda's folder).\r\n\

+%current_profile%\tExpands to your current profile name without the extenstion.\r\n\

+\t\t\t(e.g.default if your your profile is default.dat).\r\n\r\n\r\n\

+Environment variables\r\n\

+The plugin can also expand environment variables; the variables are specified like in any other\r\n\

+program that can use environment variables, i.e. %<env variable>%.\r\n\

+Note: Environment variables are expanded before any Miranda variables. So if you have, for\r\n\

+example, %profile_path% defined as a system variable then it will be expanded to that value\r\n\

+instead of expanding to Miranda\’s profile path.\r\n\r\n\

+Examples:\r\n\

+If the value for the ProfileDir inside mirandaboot.ini, ProfileDir section is \'.\profiles\', current\r\n\

+profile is \'default.dat\' and miranda\'s path is \'c:\program files\miranda im\' then:\r\n\

+%miranda_path%\t\t\twill expand to \'c:\program files\miranda im\'\r\n\

+%profile_path%\t\t\twill expand to \'c:\program files\miranda im\profiles\'\r\n\

+%current_profile%\t\t\twill expand to \'default\'\r\n\

+%temp%\t\t\t\twill expand to the temp folder of the current user.\r\n\

+%profile_path%\%current_profile%\twill expand to \'c:\program files\miranda im\profiles\default\'\r\n\

+%miranda_path%\plugins\config\twill expand to \'c:\program files\miranda im\plugins\config\'\r\n\

+\'   %miranda_path%\\\\\\\\     \'\t\twill expand to \'c:\program files\miranda im\'\r\n\

+notice that the spaces at the beginning and the end of the string are trimmed, as well as the last \\\

+"));

+

 					TranslateDialogDefault(hWnd);

-					LoadHelp(hWnd);

 

 					break;

 				}

diff --git a/plugins/Folders/dlg_handlers.h b/plugins/Folders/src/dlg_handlers.h
index 4f3a4f15ca..4f3a4f15ca 100644
--- a/plugins/Folders/dlg_handlers.h
+++ b/plugins/Folders/src/dlg_handlers.h
diff --git a/plugins/Folders/events.cpp b/plugins/Folders/src/events.cpp
index 359ac81bf4..359ac81bf4 100644
--- a/plugins/Folders/events.cpp
+++ b/plugins/Folders/src/events.cpp
diff --git a/plugins/Folders/events.h b/plugins/Folders/src/events.h
index 8f73ee7cfe..8f73ee7cfe 100644
--- a/plugins/Folders/events.h
+++ b/plugins/Folders/src/events.h
diff --git a/plugins/Folders/folderItem.cpp b/plugins/Folders/src/folderItem.cpp
index cf58e5feac..cf58e5feac 100644
--- a/plugins/Folders/folderItem.cpp
+++ b/plugins/Folders/src/folderItem.cpp
diff --git a/plugins/Folders/folderItem.h b/plugins/Folders/src/folderItem.h
index b60891c2ff..ab2c1bbd38 100644
--- a/plugins/Folders/folderItem.h
+++ b/plugins/Folders/src/folderItem.h
@@ -18,6 +18,8 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.

 */

 

+#define _CRT_SECURE_NO_WARNINGS

+

 #ifndef M_FOLDERS_FOLDER_ITEM_H

 #define M_FOLDERS_FOLDER_ITEM_H

 

diff --git a/plugins/Folders/folders.cpp b/plugins/Folders/src/folders.cpp
index 721c43ee5f..721c43ee5f 100644
--- a/plugins/Folders/folders.cpp
+++ b/plugins/Folders/src/folders.cpp
diff --git a/plugins/Folders/foldersList.cpp b/plugins/Folders/src/foldersList.cpp
index b13620fe71..b13620fe71 100644
--- a/plugins/Folders/foldersList.cpp
+++ b/plugins/Folders/src/foldersList.cpp
diff --git a/plugins/Folders/foldersList.h b/plugins/Folders/src/foldersList.h
index 854249b3a3..854249b3a3 100644
--- a/plugins/Folders/foldersList.h
+++ b/plugins/Folders/src/foldersList.h
diff --git a/plugins/Folders/hooked_events.cpp b/plugins/Folders/src/hooked_events.cpp
index 77042f2879..77042f2879 100644
--- a/plugins/Folders/hooked_events.cpp
+++ b/plugins/Folders/src/hooked_events.cpp
diff --git a/plugins/Folders/hooked_events.h b/plugins/Folders/src/hooked_events.h
index 7a2d427e18..7a2d427e18 100644
--- a/plugins/Folders/hooked_events.h
+++ b/plugins/Folders/src/hooked_events.h
diff --git a/plugins/Folders/resource.h b/plugins/Folders/src/resource.h
index e8ff0247cf..e8ff0247cf 100644
--- a/plugins/Folders/resource.h
+++ b/plugins/Folders/src/resource.h
diff --git a/plugins/Folders/services.cpp b/plugins/Folders/src/services.cpp
index f811bf2246..f811bf2246 100644
--- a/plugins/Folders/services.cpp
+++ b/plugins/Folders/src/services.cpp
diff --git a/plugins/Folders/services.h b/plugins/Folders/src/services.h
index 3a2ee1aa9f..3a2ee1aa9f 100644
--- a/plugins/Folders/services.h
+++ b/plugins/Folders/src/services.h
diff --git a/plugins/Folders/utils.cpp b/plugins/Folders/src/utils.cpp
index 64623b63f1..64623b63f1 100644
--- a/plugins/Folders/utils.cpp
+++ b/plugins/Folders/src/utils.cpp
diff --git a/plugins/Folders/utils.h b/plugins/Folders/src/utils.h
index 066c822900..066c822900 100644
--- a/plugins/Folders/utils.h
+++ b/plugins/Folders/src/utils.h
diff --git a/plugins/Folders/version.h b/plugins/Folders/src/version.h
index 5aff03dd5a..5aff03dd5a 100644
--- a/plugins/Folders/version.h
+++ b/plugins/Folders/src/version.h
diff --git a/plugins/Folders/variablesHelp.inc b/plugins/Folders/variablesHelp.inc
deleted file mode 100644
index bdc79692e6..0000000000
--- a/plugins/Folders/variablesHelp.inc
+++ /dev/null
@@ -1,32 +0,0 @@
-"{\\rtf1\\ansi\\ansicpg1252\\deff0\\deflang1033\\deflangfe1033{\\fonttbl{\\f0\\fswiss\\fprq2\\fcharset0 Arial;}}\n"

-"{\\*\\generator Msftedit 5.41.21.2500;}\\viewkind4\\uc1\\pard\\nowidctlpar\\ri-1686\\f0\\fs20 Don't forget to click on \\i Apply\\i0  to save the changes. If you don't then the changes won't\n"

-"be saved to the database, they will only be valid for this session.\\par"

-"\\pard\\nowidctlpar\\ul\\b\\par\n"

-"Variable string\\ulnone\\b0\\tab\\tab\\ul\\b What it expands to:\\ulnone\\b0\\par\n"

-"%miranda_userdata%\\tab Expands to the private profile data directory.\\par"

-"%miranda_path%\\tab Expands to your miranda path (e.g: c:\\\\program files\\\\miranda im).\\par"

-"%profile_path%\\tab\\tab Expands to your profile path - the value found in mirandaboot.ini,\\par"

-"\\tab\\tab\\tab\\ul ProfileDir\\ulnone  section (usually inside miranda's folder).\\par"

-"\\pard\\nowidctlpar\\ri-696 %current_profile%\\tab Expands to your current profile name without the extenstion.\\par"

-"\\tab\\tab\\tab (e.g.\\b default\\b0  if your your profile is \\i default.dat\\i0 ).\\par"

-"\\par\n"

-"\\ul\\b Environment variables\\par\n"

-"\\ulnone\\b0 The plugin can also expand environment variables; the variables are specified like in any other\n"

-"program that can use environment variables, i.e. %<env variable>%.\n\n"

-"\\b Note\\b0 : Environment variables are expanded before any Miranda variables. So if you have, for\n"

-"example, %profile_path% defined as a system variable then it will be expanded to that value\\n"

-"instead of expanding to Miranda\\rquote s profile path.\\par\n"

-"\\ul\\b Examples:\\par\n"

-"\\ulnone\\b0 If the value for the ProfileDir inside \\i mirandaboot.ini\\i0 , \\ul ProfileDir\\ulnone  section is '.\\\\profiles', current\n"

-"profile is 'default.dat' and miranda's path is 'c:\\\\program files\\\\miranda im' then:\\par\n"

-"\\b %miranda_path%\\b0  \\tab\\tab\\tab will expand to 'c:\\\\program files\\\\miranda im'\\par"

-"\\b %profile_path%\\b0  \\tab\\tab\\tab will expand to 'c:\\\\program files\\\\miranda im\\\\profiles'\\par"

-"\\b %current_profile%\\b0\\tab\\tab\\tab will expand to 'default'\\par"

-"\\b %temp%\\b0\\tab\\tab\\tab\\tab will expand to the temp folder of the current user.\\par"

-"\\b %profile_path%\\\\%current_profile%\\tab\\b0 will expand to 'c:\\\\program files\\\\miranda im\\\\profiles\\\\default'\\par"

-"\\b %miranda_path%\\\\plugins\\\\config\\b0\\tab will expand to 'c:\\\\program files\\\\miranda im\\\\plugins\\\\config'\\par"

-"\\b '   %miranda_path%\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\     '\\b0\\tab will expand to 'c:\\\\program files\\\\miranda im'\\par\n"

-"notice that the spaces at the beginning and the end of the string are trimmed, as well as the last \\\\\\par\n"

-"}\n"

-"\n"

-"\n"