diff options
| -rw-r--r-- | protocols/Skype/Skype.vcxproj | 3 | ||||
| -rw-r--r-- | protocols/Skype/Skype.vcxproj.filters | 3 | ||||
| -rw-r--r-- | protocols/Skype/res/Resource.rc | 84 | ||||
| -rw-r--r-- | protocols/Skype/src/resource.h | 2 |
4 files changed, 46 insertions, 46 deletions
diff --git a/protocols/Skype/Skype.vcxproj b/protocols/Skype/Skype.vcxproj index 40d07abbb5..823d6c449e 100644 --- a/protocols/Skype/Skype.vcxproj +++ b/protocols/Skype/Skype.vcxproj @@ -123,9 +123,6 @@ <ResourceCompile Include="res\Version.rc" />
<ResourceCompile Include="res\Resource.rc" />
</ItemGroup>
- <ItemGroup>
- <None Include="res\Main.ico" />
- </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 4fbcd04a14..e44c53eb09 100644 --- a/protocols/Skype/Skype.vcxproj.filters +++ b/protocols/Skype/Skype.vcxproj.filters @@ -80,7 +80,4 @@ <Filter>Resource Filess</Filter>
</ResourceCompile>
</ItemGroup>
- <ItemGroup>
- <None Include="res\Main.ico" />
- </ItemGroup>
</Project>
\ No newline at end of file diff --git a/protocols/Skype/res/Resource.rc b/protocols/Skype/res/Resource.rc index 995f8cec76..c2a5433c89 100644 --- a/protocols/Skype/res/Resource.rc +++ b/protocols/Skype/res/Resource.rc @@ -68,16 +68,6 @@ LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT /////////////////////////////////////////////////////////////////////////////
//
-// Icon
-//
-
-// Icon with lowest ID value placed first to ensure application icon
-// remains consistent on all systems.
-IDI_ICON ICON "Main.ico"
-IDR_RUNTIME EXE "..\\..\\..\\..\\SkypeKit\\SDK\\bin\\windows-x86\\windows-x86-skypekit.exe"
-
-/////////////////////////////////////////////////////////////////////////////
-//
// Dialog
//
@@ -87,9 +77,9 @@ EXSTYLE WS_EX_CONTROLPARENT FONT 8, "MS Shell Dlg", 400, 0, 0x1
BEGIN
LTEXT "Skype login:",IDC_STATIC,7,7,53,12
- EDITTEXT IDC_SL,61,7,131,12,ES_AUTOHSCROLL
+ EDITTEXT IDC_SL,61,7,124,12,ES_AUTOHSCROLL
LTEXT "Password:",IDC_STATIC,7,23,53,12
- EDITTEXT IDC_PW,61,23,131,12,ES_PASSWORD | ES_AUTOHSCROLL
+ EDITTEXT IDC_PW,61,23,124,12,ES_PASSWORD | ES_AUTOHSCROLL
END
IDD_OPTIONS DIALOGEX 0, 0, 305, 238
@@ -105,32 +95,6 @@ BEGIN END
-#ifdef APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
-//
-// TEXTINCLUDE
-//
-
-1 TEXTINCLUDE
-BEGIN
- "..\\src\\resource.h\0"
-END
-
-2 TEXTINCLUDE
-BEGIN
- "#include ""afxres.h""\r\n"
- "\0"
-END
-
-3 TEXTINCLUDE
-BEGIN
- "\r\n"
- "\0"
-END
-
-#endif // APSTUDIO_INVOKED
-
-
/////////////////////////////////////////////////////////////////////////////
//
// DESIGNINFO
@@ -162,7 +126,49 @@ BEGIN END
#endif // APSTUDIO_INVOKED
-#endif // Russian (Russia) resources
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Icon
+//
+
+// Icon with lowest ID value placed first to ensure application icon
+// remains consistent on all systems.
+IDI_ICON ICON "Main.ico"
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// EXE
+//
+
+IDR_RUNTIME EXE "..\\..\\..\\..\\SkypeKit\\SDK\\bin\\windows-x86\\windows-x86-skypekit.exe"
+
+#ifdef APSTUDIO_INVOKED
+/////////////////////////////////////////////////////////////////////////////
+//
+// TEXTINCLUDE
+//
+
+1 TEXTINCLUDE
+BEGIN
+ "..\\src\\resource.h\0"
+END
+
+2 TEXTINCLUDE
+BEGIN
+ "#include ""afxres.h""\r\n"
+ "\0"
+END
+
+3 TEXTINCLUDE
+BEGIN
+ "\r\n"
+ "\0"
+END
+
+#endif // APSTUDIO_INVOKED
+
+#endif // Русский (Россия) resources
/////////////////////////////////////////////////////////////////////////////
diff --git a/protocols/Skype/src/resource.h b/protocols/Skype/src/resource.h index 99d4d7670d..3581f001a1 100644 --- a/protocols/Skype/src/resource.h +++ b/protocols/Skype/src/resource.h @@ -1,6 +1,6 @@ //{{NO_DEPENDENCIES}}
// Microsoft Visual C++ generated include file.
-// Used by e:\Projects\C++\MirandaNG\protocols\Skype\res\Resource.rc
+// Used by protocols\Skype\res\Resource.rc
//
#define IDD_SKYPEACCOUNT 9
#define IDD_OPTIONS 10
|