diff options
Diffstat (limited to 'plugins/NewXstatusNotify')
-rw-r--r-- | plugins/NewXstatusNotify/NewXstatusNotify_10.vcxproj | 53 | ||||
-rw-r--r-- | plugins/NewXstatusNotify/NewXstatusNotify_10.vcxproj.filters | 67 | ||||
-rw-r--r-- | plugins/NewXstatusNotify/docs/newxstatusnotify-translation.txt (renamed from plugins/NewXstatusNotify/newxstatusnotify-translation.txt) | 0 | ||||
-rw-r--r-- | plugins/NewXstatusNotify/res/resource.rc (renamed from plugins/NewXstatusNotify/resource.rc) | 26 | ||||
-rw-r--r-- | plugins/NewXstatusNotify/res/version.rc (renamed from plugins/NewXstatusNotify/version.rc) | 2 | ||||
-rw-r--r-- | plugins/NewXstatusNotify/src/common.h (renamed from plugins/NewXstatusNotify/common.h) | 0 | ||||
-rw-r--r-- | plugins/NewXstatusNotify/src/indsnd.cpp (renamed from plugins/NewXstatusNotify/indsnd.cpp) | 0 | ||||
-rw-r--r-- | plugins/NewXstatusNotify/src/indsnd.h (renamed from plugins/NewXstatusNotify/indsnd.h) | 0 | ||||
-rw-r--r-- | plugins/NewXstatusNotify/src/main.cpp (renamed from plugins/NewXstatusNotify/main.cpp) | 0 | ||||
-rw-r--r-- | plugins/NewXstatusNotify/src/options.cpp (renamed from plugins/NewXstatusNotify/options.cpp) | 0 | ||||
-rw-r--r-- | plugins/NewXstatusNotify/src/options.h (renamed from plugins/NewXstatusNotify/options.h) | 0 | ||||
-rw-r--r-- | plugins/NewXstatusNotify/src/popup.cpp (renamed from plugins/NewXstatusNotify/popup.cpp) | 0 | ||||
-rw-r--r-- | plugins/NewXstatusNotify/src/popup.h (renamed from plugins/NewXstatusNotify/popup.h) | 0 | ||||
-rw-r--r-- | plugins/NewXstatusNotify/src/resource.h (renamed from plugins/NewXstatusNotify/resource.h) | 0 | ||||
-rw-r--r-- | plugins/NewXstatusNotify/src/utils.cpp (renamed from plugins/NewXstatusNotify/utils.cpp) | 0 | ||||
-rw-r--r-- | plugins/NewXstatusNotify/src/utils.h (renamed from plugins/NewXstatusNotify/utils.h) | 0 | ||||
-rw-r--r-- | plugins/NewXstatusNotify/src/version.h (renamed from plugins/NewXstatusNotify/version.h) | 0 | ||||
-rw-r--r-- | plugins/NewXstatusNotify/src/xstatus.cpp (renamed from plugins/NewXstatusNotify/xstatus.cpp) | 0 | ||||
-rw-r--r-- | plugins/NewXstatusNotify/src/xstatus.h (renamed from plugins/NewXstatusNotify/xstatus.h) | 0 |
19 files changed, 50 insertions, 98 deletions
diff --git a/plugins/NewXstatusNotify/NewXstatusNotify_10.vcxproj b/plugins/NewXstatusNotify/NewXstatusNotify_10.vcxproj index 56637709d6..4e1c79385e 100644 --- a/plugins/NewXstatusNotify/NewXstatusNotify_10.vcxproj +++ b/plugins/NewXstatusNotify/NewXstatusNotify_10.vcxproj @@ -80,7 +80,7 @@ <StringPooling>true</StringPooling>
<FunctionLevelLinking>true</FunctionLevelLinking>
<WarningLevel>Level3</WarningLevel>
- <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;NewStatusNotify_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
<ResourceCompile>
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -107,7 +107,7 @@ <AdditionalIncludeDirectories>..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<FunctionLevelLinking>true</FunctionLevelLinking>
<WarningLevel>Level3</WarningLevel>
- <PreprocessorDefinitions>WIN64;NDEBUG;_WINDOWS;_USRDLL;NewStatusNotify_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>WIN64;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
</ClCompile>
<ResourceCompile>
@@ -129,7 +129,7 @@ <ClCompile>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;NewStatusNotify_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -153,7 +153,7 @@ <ClCompile>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN64;_DEBUG;_WINDOWS;_USRDLL;NewStatusNotify_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>WIN64;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -173,39 +173,26 @@ </Link>
</ItemDefinitionGroup>
<ItemGroup>
- <ClCompile Include="indsnd.cpp" />
- <ClCompile Include="main.cpp" />
- <ClCompile Include="options.cpp" />
- <ClCompile Include="popup.cpp" />
- <ClCompile Include="utils.cpp" />
- <ClCompile Include="xstatus.cpp" />
+ <ClCompile Include="src\indsnd.cpp" />
+ <ClCompile Include="src\main.cpp" />
+ <ClCompile Include="src\options.cpp" />
+ <ClCompile Include="src\popup.cpp" />
+ <ClCompile Include="src\utils.cpp" />
+ <ClCompile Include="src\xstatus.cpp" />
</ItemGroup>
<ItemGroup>
- <ClInclude Include="common.h" />
- <ClInclude Include="indsnd.h" />
- <ClInclude Include="options.h" />
- <ClInclude Include="popup.h" />
- <ClInclude Include="resource.h" />
- <ClInclude Include="utils.h" />
- <ClInclude Include="version.h" />
- <ClInclude Include="xstatus.h" />
+ <ClInclude Include="src\common.h" />
+ <ClInclude Include="src\indsnd.h" />
+ <ClInclude Include="src\options.h" />
+ <ClInclude Include="src\popup.h" />
+ <ClInclude Include="src\resource.h" />
+ <ClInclude Include="src\utils.h" />
+ <ClInclude Include="src\version.h" />
+ <ClInclude Include="src\xstatus.h" />
</ItemGroup>
<ItemGroup>
- <None Include="res\disable_all.ico" />
- <None Include="res\enable_all.ico" />
- <None Include="res\logging.ico" />
- <None Include="res\main_off.ico" />
- <None Include="res\main_on.ico" />
- <None Include="res\popup.ico" />
- <None Include="res\reset.ico" />
- <None Include="res\sound.ico" />
- <None Include="res\status_message.ico" />
- <None Include="res\variables.ico" />
- <None Include="res\xstatus.ico" />
- </ItemGroup>
- <ItemGroup>
- <ResourceCompile Include="resource.rc" />
- <ResourceCompile Include="version.rc" />
+ <ResourceCompile Include="res\resource.rc" />
+ <ResourceCompile Include="res\version.rc" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
diff --git a/plugins/NewXstatusNotify/NewXstatusNotify_10.vcxproj.filters b/plugins/NewXstatusNotify/NewXstatusNotify_10.vcxproj.filters index a7bb1af21f..ad47ca9e61 100644 --- a/plugins/NewXstatusNotify/NewXstatusNotify_10.vcxproj.filters +++ b/plugins/NewXstatusNotify/NewXstatusNotify_10.vcxproj.filters @@ -15,91 +15,56 @@ </Filter>
</ItemGroup>
<ItemGroup>
- <ClCompile Include="main.cpp">
+ <ClCompile Include="src\main.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="options.cpp">
+ <ClCompile Include="src\options.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="popup.cpp">
+ <ClCompile Include="src\popup.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="utils.cpp">
+ <ClCompile Include="src\utils.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="indsnd.cpp">
+ <ClCompile Include="src\indsnd.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="xstatus.cpp">
+ <ClCompile Include="src\xstatus.cpp">
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
- <ClInclude Include="common.h">
+ <ClInclude Include="src\common.h">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="resource.h">
+ <ClInclude Include="src\resource.h">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="version.h">
+ <ClInclude Include="src\version.h">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="popup.h">
+ <ClInclude Include="src\popup.h">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="options.h">
+ <ClInclude Include="src\options.h">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="utils.h">
+ <ClInclude Include="src\utils.h">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="indsnd.h">
+ <ClInclude Include="src\indsnd.h">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="xstatus.h">
+ <ClInclude Include="src\xstatus.h">
<Filter>Header Files</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
- <None Include="res\disable_all.ico">
- <Filter>Resource Files</Filter>
- </None>
- <None Include="res\enable_all.ico">
- <Filter>Resource Files</Filter>
- </None>
- <None Include="res\logging.ico">
- <Filter>Resource Files</Filter>
- </None>
- <None Include="res\main_off.ico">
- <Filter>Resource Files</Filter>
- </None>
- <None Include="res\main_on.ico">
- <Filter>Resource Files</Filter>
- </None>
- <None Include="res\popup.ico">
- <Filter>Resource Files</Filter>
- </None>
- <None Include="res\sound.ico">
- <Filter>Resource Files</Filter>
- </None>
- <None Include="res\xstatus.ico">
- <Filter>Resource Files</Filter>
- </None>
- <None Include="res\reset.ico">
- <Filter>Resource Files</Filter>
- </None>
- <None Include="res\variables.ico">
- <Filter>Resource Files</Filter>
- </None>
- <None Include="res\status_message.ico">
- <Filter>Resource Files</Filter>
- </None>
- </ItemGroup>
- <ItemGroup>
- <ResourceCompile Include="resource.rc">
+ <ResourceCompile Include="res\resource.rc">
<Filter>Resource Files</Filter>
</ResourceCompile>
- <ResourceCompile Include="version.rc">
+ <ResourceCompile Include="res\version.rc">
<Filter>Resource Files</Filter>
</ResourceCompile>
</ItemGroup>
diff --git a/plugins/NewXstatusNotify/newxstatusnotify-translation.txt b/plugins/NewXstatusNotify/docs/newxstatusnotify-translation.txt index 69a7ad760a..69a7ad760a 100644 --- a/plugins/NewXstatusNotify/newxstatusnotify-translation.txt +++ b/plugins/NewXstatusNotify/docs/newxstatusnotify-translation.txt diff --git a/plugins/NewXstatusNotify/resource.rc b/plugins/NewXstatusNotify/res/resource.rc index fcdf8fc2d3..198de5063d 100644 --- a/plugins/NewXstatusNotify/resource.rc +++ b/plugins/NewXstatusNotify/res/resource.rc @@ -1,6 +1,6 @@ // Microsoft Visual C++ generated resource script.
//
-#include "resource.h"
+#include "..\src\resource.h"
#define APSTUDIO_READONLY_SYMBOLS
/////////////////////////////////////////////////////////////////////////////
@@ -347,17 +347,17 @@ END // Icon with lowest ID value placed first to ensure application icon
// remains consistent on all systems.
-IDI_RESET ICON "res\\reset.ico"
-IDI_POPUP ICON "res\\popup.ico"
-IDI_LOGGING ICON "res\\logging.ico"
-IDI_SOUND ICON "res\\sound.ico"
-IDI_NOTIFICATION_OFF ICON "res\\main_off.ico"
-IDI_NOTIFICATION_ON ICON "res\\main_on.ico"
-IDI_XSTATUS ICON "res\\xstatus.ico"
-IDI_DISABLEALL ICON "res\\disable_all.ico"
-IDI_ENABLEALL ICON "res\\enable_all.ico"
-IDI_VARIABLES ICON "res\\variables.ico"
-IDI_STATUS_MESSAGE ICON "res\\status_message.ico"
+IDI_RESET ICON "reset.ico"
+IDI_POPUP ICON "popup.ico"
+IDI_LOGGING ICON "logging.ico"
+IDI_SOUND ICON "sound.ico"
+IDI_NOTIFICATION_OFF ICON "main_off.ico"
+IDI_NOTIFICATION_ON ICON "main_on.ico"
+IDI_XSTATUS ICON "xstatus.ico"
+IDI_DISABLEALL ICON "disable_all.ico"
+IDI_ENABLEALL ICON "enable_all.ico"
+IDI_VARIABLES ICON "variables.ico"
+IDI_STATUS_MESSAGE ICON "status_message.ico"
#endif // Нейтральный resources
/////////////////////////////////////////////////////////////////////////////
@@ -377,7 +377,7 @@ LANGUAGE LANG_GERMAN, SUBLANG_GERMAN 1 TEXTINCLUDE
BEGIN
- "resource.h\0"
+ "..\\src\\resource.h\0"
END
2 TEXTINCLUDE
diff --git a/plugins/NewXstatusNotify/version.rc b/plugins/NewXstatusNotify/res/version.rc index 43d8d36e89..dfd163b5b2 100644 --- a/plugins/NewXstatusNotify/version.rc +++ b/plugins/NewXstatusNotify/res/version.rc @@ -3,7 +3,7 @@ #endif //APSTUDIO_INVOKED
#include <windows.h>
-#include "version.h"
+#include "..\src\version.h"
VS_VERSION_INFO VERSIONINFO
FILEVERSION __FILEVERSION_STRING
diff --git a/plugins/NewXstatusNotify/common.h b/plugins/NewXstatusNotify/src/common.h index 3cc765af4d..3cc765af4d 100644 --- a/plugins/NewXstatusNotify/common.h +++ b/plugins/NewXstatusNotify/src/common.h diff --git a/plugins/NewXstatusNotify/indsnd.cpp b/plugins/NewXstatusNotify/src/indsnd.cpp index 27a8b9a02a..27a8b9a02a 100644 --- a/plugins/NewXstatusNotify/indsnd.cpp +++ b/plugins/NewXstatusNotify/src/indsnd.cpp diff --git a/plugins/NewXstatusNotify/indsnd.h b/plugins/NewXstatusNotify/src/indsnd.h index c4dde34ea1..c4dde34ea1 100644 --- a/plugins/NewXstatusNotify/indsnd.h +++ b/plugins/NewXstatusNotify/src/indsnd.h diff --git a/plugins/NewXstatusNotify/main.cpp b/plugins/NewXstatusNotify/src/main.cpp index 82370f15f5..82370f15f5 100644 --- a/plugins/NewXstatusNotify/main.cpp +++ b/plugins/NewXstatusNotify/src/main.cpp diff --git a/plugins/NewXstatusNotify/options.cpp b/plugins/NewXstatusNotify/src/options.cpp index 808092d498..808092d498 100644 --- a/plugins/NewXstatusNotify/options.cpp +++ b/plugins/NewXstatusNotify/src/options.cpp diff --git a/plugins/NewXstatusNotify/options.h b/plugins/NewXstatusNotify/src/options.h index 59c1bfff4f..59c1bfff4f 100644 --- a/plugins/NewXstatusNotify/options.h +++ b/plugins/NewXstatusNotify/src/options.h diff --git a/plugins/NewXstatusNotify/popup.cpp b/plugins/NewXstatusNotify/src/popup.cpp index c8e7d32e32..c8e7d32e32 100644 --- a/plugins/NewXstatusNotify/popup.cpp +++ b/plugins/NewXstatusNotify/src/popup.cpp diff --git a/plugins/NewXstatusNotify/popup.h b/plugins/NewXstatusNotify/src/popup.h index e6e56f6c5b..e6e56f6c5b 100644 --- a/plugins/NewXstatusNotify/popup.h +++ b/plugins/NewXstatusNotify/src/popup.h diff --git a/plugins/NewXstatusNotify/resource.h b/plugins/NewXstatusNotify/src/resource.h index b68a263716..b68a263716 100644 --- a/plugins/NewXstatusNotify/resource.h +++ b/plugins/NewXstatusNotify/src/resource.h diff --git a/plugins/NewXstatusNotify/utils.cpp b/plugins/NewXstatusNotify/src/utils.cpp index bfa8184ddf..bfa8184ddf 100644 --- a/plugins/NewXstatusNotify/utils.cpp +++ b/plugins/NewXstatusNotify/src/utils.cpp diff --git a/plugins/NewXstatusNotify/utils.h b/plugins/NewXstatusNotify/src/utils.h index 0ff5c93e23..0ff5c93e23 100644 --- a/plugins/NewXstatusNotify/utils.h +++ b/plugins/NewXstatusNotify/src/utils.h diff --git a/plugins/NewXstatusNotify/version.h b/plugins/NewXstatusNotify/src/version.h index 10ac34a753..10ac34a753 100644 --- a/plugins/NewXstatusNotify/version.h +++ b/plugins/NewXstatusNotify/src/version.h diff --git a/plugins/NewXstatusNotify/xstatus.cpp b/plugins/NewXstatusNotify/src/xstatus.cpp index 4356af37fb..4356af37fb 100644 --- a/plugins/NewXstatusNotify/xstatus.cpp +++ b/plugins/NewXstatusNotify/src/xstatus.cpp diff --git a/plugins/NewXstatusNotify/xstatus.h b/plugins/NewXstatusNotify/src/xstatus.h index d5a76acb52..d5a76acb52 100644 --- a/plugins/NewXstatusNotify/xstatus.h +++ b/plugins/NewXstatusNotify/src/xstatus.h |