fixed files structure

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

7 files changed, 26 insertions, 20 deletions

diff --git a/protocols/Skype/Skype.aps b/protocols/Skype/Skype.aps
deleted file mode 100644
index f7b328f63e..0000000000
--- a/protocols/Skype/Skype.aps
+++ /dev/null
diff --git a/protocols/Skype/Skype.rc b/protocols/Skype/Skype.rc
deleted file mode 100644
index e7d12a3a55..0000000000
--- a/protocols/Skype/Skype.rc
+++ /dev/null
diff --git a/protocols/Skype/Skype.vcxproj b/protocols/Skype/Skype.vcxproj
index 60c68ca29e..5fd7ff3d49 100644
--- a/protocols/Skype/Skype.vcxproj
+++ b/protocols/Skype/Skype.vcxproj
@@ -45,14 +45,12 @@
   </PropertyGroup>

   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

     <ClCompile>

-      <PrecompiledHeader>NotUsing</PrecompiledHeader>

       <WarningLevel>Level3</WarningLevel>

       <Optimization>Disabled</Optimization>

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

       <AdditionalIncludeDirectories>..\..\include;..\..\plugins\ExternalAPI;..\..\..\SkypeKit\SDK\interfaces\skype\cpp_embedded\src\api;..\..\..\SkypeKit\SDK\interfaces\skype\cpp_embedded\src\ipc;..\..\..\SkypeKit\SDK\interfaces\skype\cpp_embedded\src\types;..\..\..\SkypeKit\SDK\interfaces\skype\cpp_embedded\src\platform\threading;..\..\..\SkypeKit\SDK\interfaces\skype\cpp_embedded\src\platform\threading\win;..\..\..\SkypeKit\SDK\ipc\cpp;..\..\..\SkypeKit\SDK\ipc\cpp\VideoBuffers;..\..\..\SkypeKit\SDK\ipc\cpp\platform\se;..\..\..\SkypeKit\SDK\ipc\cpp\ssl\cyassl\include;..\..\..\SkypeKit\SDK\ipc\cpp\ssl\cyassl\include\openssl;..\..\..\SkypeKit\SDK\ipc\cpp\ssl\cyassl\ctaocrypt\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

       <StringPooling>false</StringPooling>

       <FunctionLevelLinking>true</FunctionLevelLinking>

-      <PrecompiledHeaderFile>skype.h</PrecompiledHeaderFile>

       <DisableSpecificWarnings>4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>

       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>

     </ClCompile>

@@ -64,6 +62,8 @@
       <AdditionalDependencies>Ws2_32.lib;Advapi32.lib;skypekit-cyassl_lib.lib;skypekit-cppwrapper_2_lib.lib;%(AdditionalDependencies)</AdditionalDependencies>

       <IgnoreAllDefaultLibraries>

       </IgnoreAllDefaultLibraries>

+      <RandomizedBaseAddress>false</RandomizedBaseAddress>

+      <AdditionalOptions>/PDBALTPATH:%_PDB% %(AdditionalOptions)</AdditionalOptions>

     </Link>

     <ResourceCompile>

       <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

@@ -73,13 +73,11 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

     <ClCompile>

       <WarningLevel>Level3</WarningLevel>

-      <PrecompiledHeader>Use</PrecompiledHeader>

       <Optimization>Full</Optimization>

       <FunctionLevelLinking>true</FunctionLevelLinking>

       <IntrinsicFunctions>true</IntrinsicFunctions>

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

-      <AdditionalIncludeDirectories>..\..\include;..\..\plugins\ExternalAPI;..\..\SkypeKit\SDK\interfaces\skype\cpp_embedded\src\api;..\..\SkypeKit\SDK\interfaces\skype\cpp_embedded\src\ipc;..\..\..\SkypeKit\SDK\interfaces\skype\cpp_embedded\src\types;..\..\SkypeKit\SDK\interfaces\skype\cpp_embedded\src\platform\threading;..\..\SkypeKit\SDK\interfaces\skype\cpp_embedded\src\platform\threading\win;..\..\SkypeKit\SDK\ipc\cpp;..\..\SkypeKit\SDK\ipc\cpp\VideoBuffers;..\..\SkypeKit\SDK\ipc\cpp\platform\se;..\..\SkypeKit\SDK\ipc\cpp\ssl\cyassl\include;..\..\SkypeKit\SDK\ipc\cpp\ssl\cyassl\include\openssl;..\..\SkypeKit\SDK\ipc\cpp\ssl\cyassl\ctaocrypt\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

-      <PrecompiledHeaderFile>skype.h</PrecompiledHeaderFile>

+      <AdditionalIncludeDirectories>..\..\include;..\..\plugins\ExternalAPI;..\..\..\SkypeKit\SDK\interfaces\skype\cpp_embedded\src\api;..\..\..\SkypeKit\SDK\interfaces\skype\cpp_embedded\src\ipc;..\..\..\SkypeKit\SDK\interfaces\skype\cpp_embedded\src\types;..\..\..\SkypeKit\SDK\interfaces\skype\cpp_embedded\src\platform\threading;..\..\..\SkypeKit\SDK\interfaces\skype\cpp_embedded\src\platform\threading\win;..\..\..\SkypeKit\SDK\ipc\cpp;..\..\..\SkypeKit\SDK\ipc\cpp\VideoBuffers;..\..\..\SkypeKit\SDK\ipc\cpp\platform\se;..\..\..\SkypeKit\SDK\ipc\cpp\ssl\cyassl\include;..\..\..\SkypeKit\SDK\ipc\cpp\ssl\cyassl\include\openssl;..\..\..\SkypeKit\SDK\ipc\cpp\ssl\cyassl\ctaocrypt\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

       <DisableSpecificWarnings>4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>

     </ClCompile>

     <Link>

@@ -89,7 +87,9 @@
       <OptimizeReferences>true</OptimizeReferences>

       <RandomizedBaseAddress>false</RandomizedBaseAddress>

       <AdditionalOptions>/PDBALTPATH:%_PDB%</AdditionalOptions>

-      <AdditionalDependencies>$(SolutionDir)..\..\SkypeKit\SDK\interfaces\skype\cpp_embedded\build\skypekit-cyassl_lib.lib;$(SolutionDir)..\..\SkypeKit\SDK\interfaces\skype\cpp_embedded\build\skypekit-cppwrapper_2_lib.lib;%(AdditionalDependencies)</AdditionalDependencies>

+      <AdditionalDependencies>Ws2_32.lib;Advapi32.lib;skypekit-cyassl_lib.lib;skypekit-cppwrapper_2_lib.lib;%(AdditionalDependencies)</AdditionalDependencies>

+      <AdditionalLibraryDirectories>$(SolutionDir)\lib;$(SolutionDir)..\..\SkypeKit\SDK\interfaces\skype\cpp_embedded\build</AdditionalLibraryDirectories>

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

     </Link>

     <ResourceCompile>

       <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

@@ -103,20 +103,14 @@
     <ClInclude Include="src\resource.h" />

   </ItemGroup>

   <ItemGroup>

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

-    <ClCompile Include="src\skype.cpp">

-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>

-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>

-    </ClCompile>

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

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

     <ClCompile Include="src\skype_proto.cpp" />

   </ItemGroup>

   <ItemGroup>

     <ResourceCompile Include="res\Version.rc" />

     <ResourceCompile Include="res\Resource.rc" />

   </ItemGroup>

-  <ItemGroup>

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

-  </ItemGroup>

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

   <ImportGroup Label="ExtensionTargets">

   </ImportGroup>

diff --git a/protocols/Skype/Skype.vcxproj.filters b/protocols/Skype/Skype.vcxproj.filters
index 138978ca58..c23255e856 100644
--- a/protocols/Skype/Skype.vcxproj.filters
+++ b/protocols/Skype/Skype.vcxproj.filters
@@ -7,7 +7,7 @@
     <ClCompile Include="src\skype_proto.cpp">

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="skype_dialogs.cpp">

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

       <Filter>Source Files</Filter>

     </ClCompile>

   </ItemGroup>

@@ -29,9 +29,6 @@
     <ResourceCompile Include="res\Resource.rc">

       <Filter>Resource Filess</Filter>

     </ResourceCompile>

-    <ResourceCompile Include="Skype.rc">

-      <Filter>Resource Filess</Filter>

-    </ResourceCompile>

     <ResourceCompile Include="res\Version.rc">

       <Filter>Resource Filess</Filter>

     </ResourceCompile>

diff --git a/protocols/Skype/res/Resource.rc b/protocols/Skype/res/Resource.rc
index a2f8782770..0c49fc03d2 100644
--- a/protocols/Skype/res/Resource.rc
+++ b/protocols/Skype/res/Resource.rc
@@ -33,6 +33,15 @@ IDI_ICON                ICON                    "Main.ico"
 // Dialog

 //

 

+IDD_SKYPEACCOUNT DIALOGEX 0, 0, 199, 92

+STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_SYSMENU

+FONT 8, "MS Shell Dlg", 400, 0, 0x1

+BEGIN

+    LTEXT           "Skype name:",IDC_STATIC,7,7,53,12

+    EDITTEXT        IDC_SN,61,7,131,12,ES_AUTOHSCROLL

+    LTEXT           "Password:",IDC_STATIC,7,23,53,12

+    EDITTEXT        IDC_PW,61,23,131,12,ES_PASSWORD | ES_AUTOHSCROLL

+END

 

 

 #ifdef APSTUDIO_INVOKED

@@ -69,7 +78,13 @@ END
 #ifdef APSTUDIO_INVOKED

 GUIDELINES DESIGNINFO

 BEGIN

-

+    IDD_SKYPEACCOUNT, DIALOG

+    BEGIN

+        LEFTMARGIN, 7

+        RIGHTMARGIN, 192

+        TOPMARGIN, 7

+        BOTTOMMARGIN, 85

+    END

 END

 #endif    // APSTUDIO_INVOKED

 

diff --git a/protocols/Skype/src/resource.h b/protocols/Skype/src/resource.h
index 2c0229ac79..15fc20a911 100644
--- a/protocols/Skype/src/resource.h
+++ b/protocols/Skype/src/resource.h
diff --git a/protocols/Skype/skype_dialogs.cpp b/protocols/Skype/src/skype_dialogs.cpp
index dc8daf2b1b..806843cd86 100644
--- a/protocols/Skype/skype_dialogs.cpp
+++ b/protocols/Skype/src/skype_dialogs.cpp
@@ -1,4 +1,4 @@
-#include "src\skype_proto.h"

+#include "skype_proto.h"

 

 INT_PTR CALLBACK CSkypeProto::SkypeAccountProc(HWND hwnd, UINT message, WPARAM wparam, LPARAM lparam)

 {