diff options
Diffstat (limited to 'plugins/TopToolBar')
| -rw-r--r-- | plugins/TopToolBar/TopToolBar.vcxproj | 114 | ||||
| -rw-r--r-- | plugins/TopToolBar/TopToolBar.vcxproj.filters | 62 | ||||
| -rw-r--r-- | plugins/TopToolBar/docs/toptoolbar-translation.txt (renamed from plugins/TopToolBar/toptoolbar-translation.txt) | 0 | ||||
| -rw-r--r-- | plugins/TopToolBar/docs/ttb-readme.txt (renamed from plugins/TopToolBar/ttb-readme.txt) | 0 | ||||
| -rw-r--r-- | plugins/TopToolBar/res/Find_Add Contacts_UP.ico (renamed from plugins/TopToolBar/icos/Find_Add Contacts_UP.ico) | bin | 2038 -> 2038 bytes | |||
| -rw-r--r-- | plugins/TopToolBar/res/Groups On_Off_DN.ico (renamed from plugins/TopToolBar/icos/Groups On_Off_DN.ico) | bin | 2038 -> 2038 bytes | |||
| -rw-r--r-- | plugins/TopToolBar/res/Groups On_Off_UP.ico (renamed from plugins/TopToolBar/icos/Groups On_Off_UP.ico) | bin | 2038 -> 2038 bytes | |||
| -rw-r--r-- | plugins/TopToolBar/res/Minimize Button_UP.ico (renamed from plugins/TopToolBar/icos/Minimize Button_UP.ico) | bin | 2038 -> 2038 bytes | |||
| -rw-r--r-- | plugins/TopToolBar/res/Run.ico (renamed from plugins/TopToolBar/icos/Run.ico) | bin | 1406 -> 1406 bytes | |||
| -rw-r--r-- | plugins/TopToolBar/res/Show Main Menu_UP.ico (renamed from plugins/TopToolBar/icos/Show Main Menu_UP.ico) | bin | 2038 -> 2038 bytes | |||
| -rw-r--r-- | plugins/TopToolBar/res/Show Options Page_UP.ico (renamed from plugins/TopToolBar/icos/Show Options Page_UP.ico) | bin | 2038 -> 2038 bytes | |||
| -rw-r--r-- | plugins/TopToolBar/res/Show only Online Users_DN.ico (renamed from plugins/TopToolBar/icos/Show only Online Users_DN.ico) | bin | 2038 -> 2038 bytes | |||
| -rw-r--r-- | plugins/TopToolBar/res/Show only Online Users_UP.ico (renamed from plugins/TopToolBar/icos/Show only Online Users_UP.ico) | bin | 2038 -> 2038 bytes | |||
| -rw-r--r-- | plugins/TopToolBar/res/Sounds Enable_Disable_DN.ico (renamed from plugins/TopToolBar/icos/Sounds Enable_Disable_DN.ico) | bin | 2038 -> 2038 bytes | |||
| -rw-r--r-- | plugins/TopToolBar/res/Sounds Enable_Disable_UP.ico (renamed from plugins/TopToolBar/icos/Sounds Enable_Disable_UP.ico) | bin | 2038 -> 2038 bytes | |||
| -rw-r--r-- | plugins/TopToolBar/res/main.rc (renamed from plugins/TopToolBar/main.rc) | 28 | ||||
| -rw-r--r-- | plugins/TopToolBar/res/sep.bmp (renamed from plugins/TopToolBar/bmp/sep.bmp) | bin | 1194 -> 1194 bytes | |||
| -rw-r--r-- | plugins/TopToolBar/res/version.rc (renamed from plugins/TopToolBar/version.rc) | 3 | ||||
| -rw-r--r-- | plugins/TopToolBar/src/BkgrCfg.h (renamed from plugins/TopToolBar/BkgrCfg.h) | 0 | ||||
| -rw-r--r-- | plugins/TopToolBar/src/InternalButtons.cpp (renamed from plugins/TopToolBar/InternalButtons.cpp) | 0 | ||||
| -rw-r--r-- | plugins/TopToolBar/src/common.h (renamed from plugins/TopToolBar/common.h) | 0 | ||||
| -rw-r--r-- | plugins/TopToolBar/src/main.cpp (renamed from plugins/TopToolBar/main.cpp) | 0 | ||||
| -rw-r--r-- | plugins/TopToolBar/src/resource.h (renamed from plugins/TopToolBar/resource.h) | 0 | ||||
| -rw-r--r-- | plugins/TopToolBar/src/toolbar.cpp (renamed from plugins/TopToolBar/toolbar.cpp) | 0 | ||||
| -rw-r--r-- | plugins/TopToolBar/src/toolbarwnd.cpp (renamed from plugins/TopToolBar/toolbarwnd.cpp) | 0 | ||||
| -rw-r--r-- | plugins/TopToolBar/src/topbutton.cpp (renamed from plugins/TopToolBar/topbutton.cpp) | 0 | ||||
| -rw-r--r-- | plugins/TopToolBar/src/ttbopt.cpp (renamed from plugins/TopToolBar/ttbopt.cpp) | 0 | ||||
| -rw-r--r-- | plugins/TopToolBar/src/version.h (renamed from plugins/TopToolBar/version.h) | 0 |
28 files changed, 45 insertions, 162 deletions
diff --git a/plugins/TopToolBar/TopToolBar.vcxproj b/plugins/TopToolBar/TopToolBar.vcxproj index 312bf92d2c..72061381ba 100644 --- a/plugins/TopToolBar/TopToolBar.vcxproj +++ b/plugins/TopToolBar/TopToolBar.vcxproj @@ -76,22 +76,13 @@ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
- <Midl>
- <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MkTypLibCompatible>true</MkTypLibCompatible>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <TargetEnvironment>Win32</TargetEnvironment>
- <TypeLibraryName>.\Debug/TopToolBar.tlb</TypeLibraryName>
- <HeaderFileName>
- </HeaderFileName>
- </Midl>
<ClCompile>
<Optimization>Disabled</Optimization>
- <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;TOPTOOLBAR_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
- <SuppressStartupBanner>true</SuppressStartupBanner>
<DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+ <WarningLevel>Level3</WarningLevel>
<AdditionalIncludeDirectories>..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
<PrecompiledHeader>Use</PrecompiledHeader>
@@ -99,37 +90,22 @@ </ClCompile>
<ResourceCompile>
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <Culture>0x0419</Culture>
<AdditionalIncludeDirectories>..\..\include\msapi</AdditionalIncludeDirectories>
</ResourceCompile>
<Link>
<AdditionalDependencies>comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <SuppressStartupBanner>true</SuppressStartupBanner>
<GenerateDebugInformation>true</GenerateDebugInformation>
<BaseAddress>0x1b200000</BaseAddress>
<ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary>
- <TargetMachine>MachineX86</TargetMachine>
<AdditionalLibraryDirectories>$(SolutionDir)\lib</AdditionalLibraryDirectories>
</Link>
- <Bscmake>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- </Bscmake>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
- <Midl>
- <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MkTypLibCompatible>true</MkTypLibCompatible>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <TypeLibraryName>.\Debug/TopToolBar.tlb</TypeLibraryName>
- <HeaderFileName>
- </HeaderFileName>
- </Midl>
<ClCompile>
<Optimization>Disabled</Optimization>
- <PreprocessorDefinitions>WIN64;_DEBUG;_WINDOWS;_USRDLL;TOPTOOLBAR_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>WIN64;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+ <WarningLevel>Level3</WarningLevel>
<AdditionalIncludeDirectories>..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
<PrecompiledHeader>Use</PrecompiledHeader>
@@ -137,39 +113,24 @@ </ClCompile>
<ResourceCompile>
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <Culture>0x0419</Culture>
<AdditionalIncludeDirectories>..\..\include\msapi</AdditionalIncludeDirectories>
</ResourceCompile>
<Link>
<AdditionalDependencies>comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <SuppressStartupBanner>true</SuppressStartupBanner>
<GenerateDebugInformation>true</GenerateDebugInformation>
<BaseAddress>0x1b200000</BaseAddress>
<ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary>
<AdditionalLibraryDirectories>$(SolutionDir)\lib</AdditionalLibraryDirectories>
</Link>
- <Bscmake>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- </Bscmake>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <Midl>
- <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MkTypLibCompatible>true</MkTypLibCompatible>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <TargetEnvironment>Win32</TargetEnvironment>
- <TypeLibraryName>.\Release/TopToolBar.tlb</TypeLibraryName>
- <HeaderFileName>
- </HeaderFileName>
- </Midl>
<ClCompile>
<Optimization>Full</Optimization>
<InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
- <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;TOPTOOLBAR_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
<FunctionLevelLinking>true</FunctionLevelLinking>
<WarningLevel>Level3</WarningLevel>
- <SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalIncludeDirectories>..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
<PrecompiledHeader>Use</PrecompiledHeader>
@@ -177,41 +138,26 @@ </ClCompile>
<ResourceCompile>
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <Culture>0x0409</Culture>
<AdditionalIncludeDirectories>..\..\include\msapi</AdditionalIncludeDirectories>
</ResourceCompile>
<Link>
<AdditionalDependencies>comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <SuppressStartupBanner>true</SuppressStartupBanner>
<BaseAddress>0x1b200000</BaseAddress>
<ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary>
- <TargetMachine>MachineX86</TargetMachine>
<GenerateDebugInformation>true</GenerateDebugInformation>
<OptimizeReferences>true</OptimizeReferences>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<AdditionalLibraryDirectories>$(SolutionDir)\lib</AdditionalLibraryDirectories>
</Link>
- <Bscmake>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- </Bscmake>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
- <Midl>
- <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MkTypLibCompatible>true</MkTypLibCompatible>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <TypeLibraryName>.\Release/TopToolBar.tlb</TypeLibraryName>
- <HeaderFileName>
- </HeaderFileName>
- </Midl>
<ClCompile>
<Optimization>Full</Optimization>
<InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
- <PreprocessorDefinitions>WIN64;NDEBUG;_WINDOWS;_USRDLL;TOPTOOLBAR_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>WIN64;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
<FunctionLevelLinking>true</FunctionLevelLinking>
<WarningLevel>Level3</WarningLevel>
- <SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalIncludeDirectories>..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
<PrecompiledHeader>Use</PrecompiledHeader>
@@ -219,12 +165,10 @@ </ClCompile>
<ResourceCompile>
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <Culture>0x0409</Culture>
<AdditionalIncludeDirectories>..\..\include\msapi</AdditionalIncludeDirectories>
</ResourceCompile>
<Link>
<AdditionalDependencies>comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <SuppressStartupBanner>true</SuppressStartupBanner>
<BaseAddress>0x1b200000</BaseAddress>
<ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary>
<GenerateDebugInformation>true</GenerateDebugInformation>
@@ -232,48 +176,26 @@ <EnableCOMDATFolding>true</EnableCOMDATFolding>
<AdditionalLibraryDirectories>$(SolutionDir)\lib</AdditionalLibraryDirectories>
</Link>
- <Bscmake>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- </Bscmake>
</ItemDefinitionGroup>
<ItemGroup>
- <ClInclude Include="..\ExternalAPI\m_toptoolbar.h" />
- <ClInclude Include="BkgrCfg.h" />
- <ClInclude Include="common.h" />
- <ClInclude Include="resource.h" />
- </ItemGroup>
- <ItemGroup>
- <None Include="bmp\sep.bmp" />
- <None Include="icos\Find_Add Contacts_UP.ico" />
- <None Include="icos\Groups On_Off_DN.ico" />
- <None Include="icos\Groups On_Off_UP.ico" />
- <None Include="icos\Minimize Button_UP.ico" />
- <None Include="icos\Run.ico" />
- <None Include="icos\Show Main Menu_UP.ico" />
- <None Include="icos\Show only Online Users_DN.ico" />
- <None Include="icos\Show only Online Users_UP.ico" />
- <None Include="icos\Show Options Page_UP.ico" />
- <None Include="icos\Sounds Enable_Disable_DN.ico" />
- <None Include="icos\Sounds Enable_Disable_UP.ico" />
+ <ClInclude Include="src\BkgrCfg.h" />
+ <ClInclude Include="src\common.h" />
+ <ClInclude Include="src\resource.h" />
+ <ClInclude Include="src\version.h" />
</ItemGroup>
<ItemGroup>
- <ResourceCompile Include="main.rc">
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- </ResourceCompile>
- <ResourceCompile Include="version.rc" />
+ <ResourceCompile Include="res\main.rc" />
+ <ResourceCompile Include="res\version.rc" />
</ItemGroup>
<ItemGroup>
- <ClCompile Include="InternalButtons.cpp" />
- <ClCompile Include="main.cpp">
+ <ClCompile Include="src\InternalButtons.cpp" />
+ <ClCompile Include="src\main.cpp">
<PrecompiledHeader>Create</PrecompiledHeader>
</ClCompile>
- <ClCompile Include="toolbar.cpp" />
- <ClCompile Include="toolbarwnd.cpp" />
- <ClCompile Include="topbutton.cpp" />
- <ClCompile Include="ttbopt.cpp" />
+ <ClCompile Include="src\toolbar.cpp" />
+ <ClCompile Include="src\toolbarwnd.cpp" />
+ <ClCompile Include="src\topbutton.cpp" />
+ <ClCompile Include="src\ttbopt.cpp" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
diff --git a/plugins/TopToolBar/TopToolBar.vcxproj.filters b/plugins/TopToolBar/TopToolBar.vcxproj.filters index 500784079b..bd1465a04d 100644 --- a/plugins/TopToolBar/TopToolBar.vcxproj.filters +++ b/plugins/TopToolBar/TopToolBar.vcxproj.filters @@ -15,82 +15,44 @@ </Filter>
</ItemGroup>
<ItemGroup>
- <ClInclude Include="BkgrCfg.h">
+ <ClInclude Include="src\BkgrCfg.h">
<Filter>Header Files</Filter>
</ClInclude>
- <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="..\ExternalAPI\m_toptoolbar.h">
+ <ClInclude Include="src\version.h">
<Filter>Header Files</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
- <None Include="icos\Find_Add Contacts_UP.ico">
- <Filter>Resource Files</Filter>
- </None>
- <None Include="icos\Groups On_Off_DN.ico">
- <Filter>Resource Files</Filter>
- </None>
- <None Include="icos\Groups On_Off_UP.ico">
- <Filter>Resource Files</Filter>
- </None>
- <None Include="icos\Minimize Button_UP.ico">
- <Filter>Resource Files</Filter>
- </None>
- <None Include="icos\Run.ico">
- <Filter>Resource Files</Filter>
- </None>
- <None Include="icos\Show Main Menu_UP.ico">
- <Filter>Resource Files</Filter>
- </None>
- <None Include="icos\Show only Online Users_DN.ico">
- <Filter>Resource Files</Filter>
- </None>
- <None Include="icos\Show only Online Users_UP.ico">
- <Filter>Resource Files</Filter>
- </None>
- <None Include="icos\Show Options Page_UP.ico">
- <Filter>Resource Files</Filter>
- </None>
- <None Include="icos\Sounds Enable_Disable_DN.ico">
- <Filter>Resource Files</Filter>
- </None>
- <None Include="icos\Sounds Enable_Disable_UP.ico">
- <Filter>Resource Files</Filter>
- </None>
- <None Include="bmp\sep.bmp">
- <Filter>Resource Files</Filter>
- </None>
- </ItemGroup>
- <ItemGroup>
- <ResourceCompile Include="main.rc">
+ <ResourceCompile Include="res\main.rc">
<Filter>Resource Files</Filter>
</ResourceCompile>
- <ResourceCompile Include="version.rc">
+ <ResourceCompile Include="res\version.rc">
<Filter>Resource Files</Filter>
</ResourceCompile>
</ItemGroup>
<ItemGroup>
- <ClCompile Include="InternalButtons.cpp">
+ <ClCompile Include="src\InternalButtons.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="ttbopt.cpp">
+ <ClCompile Include="src\ttbopt.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="main.cpp">
+ <ClCompile Include="src\main.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="toolbar.cpp">
+ <ClCompile Include="src\toolbar.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="topbutton.cpp">
+ <ClCompile Include="src\topbutton.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="toolbarwnd.cpp">
+ <ClCompile Include="src\toolbarwnd.cpp">
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup>
diff --git a/plugins/TopToolBar/toptoolbar-translation.txt b/plugins/TopToolBar/docs/toptoolbar-translation.txt index fcc295b539..fcc295b539 100644 --- a/plugins/TopToolBar/toptoolbar-translation.txt +++ b/plugins/TopToolBar/docs/toptoolbar-translation.txt diff --git a/plugins/TopToolBar/ttb-readme.txt b/plugins/TopToolBar/docs/ttb-readme.txt index 9c127d5c71..9c127d5c71 100644 --- a/plugins/TopToolBar/ttb-readme.txt +++ b/plugins/TopToolBar/docs/ttb-readme.txt diff --git a/plugins/TopToolBar/icos/Find_Add Contacts_UP.ico b/plugins/TopToolBar/res/Find_Add Contacts_UP.ico Binary files differindex 452f2efc98..452f2efc98 100644 --- a/plugins/TopToolBar/icos/Find_Add Contacts_UP.ico +++ b/plugins/TopToolBar/res/Find_Add Contacts_UP.ico diff --git a/plugins/TopToolBar/icos/Groups On_Off_DN.ico b/plugins/TopToolBar/res/Groups On_Off_DN.ico Binary files differindex 99b7dddd38..99b7dddd38 100644 --- a/plugins/TopToolBar/icos/Groups On_Off_DN.ico +++ b/plugins/TopToolBar/res/Groups On_Off_DN.ico diff --git a/plugins/TopToolBar/icos/Groups On_Off_UP.ico b/plugins/TopToolBar/res/Groups On_Off_UP.ico Binary files differindex fffe8e32c4..fffe8e32c4 100644 --- a/plugins/TopToolBar/icos/Groups On_Off_UP.ico +++ b/plugins/TopToolBar/res/Groups On_Off_UP.ico diff --git a/plugins/TopToolBar/icos/Minimize Button_UP.ico b/plugins/TopToolBar/res/Minimize Button_UP.ico Binary files differindex dd9a8451d7..dd9a8451d7 100644 --- a/plugins/TopToolBar/icos/Minimize Button_UP.ico +++ b/plugins/TopToolBar/res/Minimize Button_UP.ico diff --git a/plugins/TopToolBar/icos/Run.ico b/plugins/TopToolBar/res/Run.ico Binary files differindex 7a87fadc82..7a87fadc82 100644 --- a/plugins/TopToolBar/icos/Run.ico +++ b/plugins/TopToolBar/res/Run.ico diff --git a/plugins/TopToolBar/icos/Show Main Menu_UP.ico b/plugins/TopToolBar/res/Show Main Menu_UP.ico Binary files differindex 8602e4cf3e..8602e4cf3e 100644 --- a/plugins/TopToolBar/icos/Show Main Menu_UP.ico +++ b/plugins/TopToolBar/res/Show Main Menu_UP.ico diff --git a/plugins/TopToolBar/icos/Show Options Page_UP.ico b/plugins/TopToolBar/res/Show Options Page_UP.ico Binary files differindex d6945d94f5..d6945d94f5 100644 --- a/plugins/TopToolBar/icos/Show Options Page_UP.ico +++ b/plugins/TopToolBar/res/Show Options Page_UP.ico diff --git a/plugins/TopToolBar/icos/Show only Online Users_DN.ico b/plugins/TopToolBar/res/Show only Online Users_DN.ico Binary files differindex 87ef1abbb5..87ef1abbb5 100644 --- a/plugins/TopToolBar/icos/Show only Online Users_DN.ico +++ b/plugins/TopToolBar/res/Show only Online Users_DN.ico diff --git a/plugins/TopToolBar/icos/Show only Online Users_UP.ico b/plugins/TopToolBar/res/Show only Online Users_UP.ico Binary files differindex e35e015123..e35e015123 100644 --- a/plugins/TopToolBar/icos/Show only Online Users_UP.ico +++ b/plugins/TopToolBar/res/Show only Online Users_UP.ico diff --git a/plugins/TopToolBar/icos/Sounds Enable_Disable_DN.ico b/plugins/TopToolBar/res/Sounds Enable_Disable_DN.ico Binary files differindex a52dd8a8fe..a52dd8a8fe 100644 --- a/plugins/TopToolBar/icos/Sounds Enable_Disable_DN.ico +++ b/plugins/TopToolBar/res/Sounds Enable_Disable_DN.ico diff --git a/plugins/TopToolBar/icos/Sounds Enable_Disable_UP.ico b/plugins/TopToolBar/res/Sounds Enable_Disable_UP.ico Binary files differindex 31342f4ef5..31342f4ef5 100644 --- a/plugins/TopToolBar/icos/Sounds Enable_Disable_UP.ico +++ b/plugins/TopToolBar/res/Sounds Enable_Disable_UP.ico diff --git a/plugins/TopToolBar/main.rc b/plugins/TopToolBar/res/main.rc index f6efd9369b..025246ebfc 100644 --- a/plugins/TopToolBar/main.rc +++ b/plugins/TopToolBar/res/main.rc @@ -1,6 +1,6 @@ // Microsoft Visual C++ generated resource script.
//
-#include "resource.h"
+#include "..\src\resource.h"
#define APSTUDIO_READONLY_SYMBOLS
/////////////////////////////////////////////////////////////////////////////
@@ -85,7 +85,7 @@ END // Bitmap
//
-IDB_SEP BITMAP "bmp\\sep.bmp"
+IDB_SEP BITMAP "sep.bmp"
#ifdef APSTUDIO_INVOKED
/////////////////////////////////////////////////////////////////////////////
@@ -95,7 +95,7 @@ IDB_SEP BITMAP "bmp\\sep.bmp" 1 TEXTINCLUDE
BEGIN
- "resource.h\0"
+ "..\\src\\resource.h\0"
END
2 TEXTINCLUDE
@@ -120,17 +120,17 @@ END // Icon with lowest ID value placed first to ensure application icon
// remains consistent on all systems.
-IDI_SHOWONLINEUP ICON "icos\\Show only Online Users_UP.ico"
-IDI_RUN ICON "icos\\run.ico"
-IDI_SHOWONLINEDN ICON "icos\\Show only Online Users_DN.ico"
-IDI_GROUPSUP ICON "icos\\Groups On_Off_UP.ico"
-IDI_GROUPSDN ICON "icos\\Groups On_Off_DN.ico"
-IDI_SOUNDDN ICON "icos\\Sounds Enable_Disable_DN.ico"
-IDI_SOUNDUP ICON "icos\\Sounds Enable_Disable_UP.ico"
-IDI_OPTIONSUP ICON "icos\\Show Options Page_UP.ico"
-IDI_MINIMIZEUP ICON "icos\\Minimize Button_UP.ico"
-IDI_FINDADDUP ICON "icos\\Find_Add Contacts_UP.ico"
-IDI_MIRANDAUP ICON "icos\\Show Main Menu_UP.ico"
+IDI_SHOWONLINEUP ICON "Show only Online Users_UP.ico"
+IDI_RUN ICON "run.ico"
+IDI_SHOWONLINEDN ICON "Show only Online Users_DN.ico"
+IDI_GROUPSUP ICON "Groups On_Off_UP.ico"
+IDI_GROUPSDN ICON "Groups On_Off_DN.ico"
+IDI_SOUNDDN ICON "Sounds Enable_Disable_DN.ico"
+IDI_SOUNDUP ICON "Sounds Enable_Disable_UP.ico"
+IDI_OPTIONSUP ICON "Show Options Page_UP.ico"
+IDI_MINIMIZEUP ICON "Minimize Button_UP.ico"
+IDI_FINDADDUP ICON "Find_Add Contacts_UP.ico"
+IDI_MIRANDAUP ICON "Show Main Menu_UP.ico"
#endif // Neutral resources
/////////////////////////////////////////////////////////////////////////////
diff --git a/plugins/TopToolBar/bmp/sep.bmp b/plugins/TopToolBar/res/sep.bmp Binary files differindex 1665285275..1665285275 100644 --- a/plugins/TopToolBar/bmp/sep.bmp +++ b/plugins/TopToolBar/res/sep.bmp diff --git a/plugins/TopToolBar/version.rc b/plugins/TopToolBar/res/version.rc index 9981077b9f..2c82256ade 100644 --- a/plugins/TopToolBar/version.rc +++ b/plugins/TopToolBar/res/version.rc @@ -4,7 +4,7 @@ #error this file is not editable by Microsoft Visual C++
#endif //APSTUDIO_INVOKED
-#include "resource.h"
+#include "..\src\version.h"
#define APSTUDIO_READONLY_SYMBOLS
/////////////////////////////////////////////////////////////////////////////
@@ -12,7 +12,6 @@ // Generated from the TEXTINCLUDE 2 resource.
//
#include <winres.h>
-#include <version.h>
/////////////////////////////////////////////////////////////////////////////
#undef APSTUDIO_READONLY_SYMBOLS
diff --git a/plugins/TopToolBar/BkgrCfg.h b/plugins/TopToolBar/src/BkgrCfg.h index 4533267fcb..4533267fcb 100644 --- a/plugins/TopToolBar/BkgrCfg.h +++ b/plugins/TopToolBar/src/BkgrCfg.h diff --git a/plugins/TopToolBar/InternalButtons.cpp b/plugins/TopToolBar/src/InternalButtons.cpp index 7fcdc1cef8..7fcdc1cef8 100644 --- a/plugins/TopToolBar/InternalButtons.cpp +++ b/plugins/TopToolBar/src/InternalButtons.cpp diff --git a/plugins/TopToolBar/common.h b/plugins/TopToolBar/src/common.h index 0840111f2f..0840111f2f 100644 --- a/plugins/TopToolBar/common.h +++ b/plugins/TopToolBar/src/common.h diff --git a/plugins/TopToolBar/main.cpp b/plugins/TopToolBar/src/main.cpp index 601de36408..601de36408 100644 --- a/plugins/TopToolBar/main.cpp +++ b/plugins/TopToolBar/src/main.cpp diff --git a/plugins/TopToolBar/resource.h b/plugins/TopToolBar/src/resource.h index 498762de51..498762de51 100644 --- a/plugins/TopToolBar/resource.h +++ b/plugins/TopToolBar/src/resource.h diff --git a/plugins/TopToolBar/toolbar.cpp b/plugins/TopToolBar/src/toolbar.cpp index 156b83dbb7..156b83dbb7 100644 --- a/plugins/TopToolBar/toolbar.cpp +++ b/plugins/TopToolBar/src/toolbar.cpp diff --git a/plugins/TopToolBar/toolbarwnd.cpp b/plugins/TopToolBar/src/toolbarwnd.cpp index e3f19f693b..e3f19f693b 100644 --- a/plugins/TopToolBar/toolbarwnd.cpp +++ b/plugins/TopToolBar/src/toolbarwnd.cpp diff --git a/plugins/TopToolBar/topbutton.cpp b/plugins/TopToolBar/src/topbutton.cpp index 8e2f8a1cfd..8e2f8a1cfd 100644 --- a/plugins/TopToolBar/topbutton.cpp +++ b/plugins/TopToolBar/src/topbutton.cpp diff --git a/plugins/TopToolBar/ttbopt.cpp b/plugins/TopToolBar/src/ttbopt.cpp index db7d78dcb5..db7d78dcb5 100644 --- a/plugins/TopToolBar/ttbopt.cpp +++ b/plugins/TopToolBar/src/ttbopt.cpp diff --git a/plugins/TopToolBar/version.h b/plugins/TopToolBar/src/version.h index 9a489eebee..9a489eebee 100644 --- a/plugins/TopToolBar/version.h +++ b/plugins/TopToolBar/src/version.h |
