Omegle:

- Show in status bar when Stranger is typing
- Added option to chose language of Stranger
- Use version.h file
- Updated copyright year
- Small fixes.
- Version bump.

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

2 files changed, 100 insertions, 123 deletions

diff --git a/protocols/Omegle/res/omegle.rc b/protocols/Omegle/res/omegle.rc
index 61481f7302..d1226cf03d 100644
--- a/protocols/Omegle/res/omegle.rc
+++ b/protocols/Omegle/res/omegle.rc
@@ -19,6 +19,41 @@
 LANGUAGE LANG_CZECH, SUBLANG_DEFAULT

 #pragma code_page(1250)

 

+#ifdef APSTUDIO_INVOKED

+/////////////////////////////////////////////////////////////////////////////

+//

+// TEXTINCLUDE

+//

+

+1 TEXTINCLUDE 

+BEGIN

+    "..\\src\\resource.h\0"

+END

+

+2 TEXTINCLUDE 

+BEGIN

+    "#include ""afxres.h""\r\n"

+    "#include ""..\\src\\constants.h""\0"

+END

+

+3 TEXTINCLUDE 

+BEGIN

+    "\r\0"

+END

+

+#endif    // APSTUDIO_INVOKED

+

+

+/////////////////////////////////////////////////////////////////////////////

+//

+// Icon

+//

+

+// Icon with lowest ID value placed first to ensure application icon

+// remains consistent on all systems.

+IDI_OMEGLE              ICON                    "omegle.ico"

+

+

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

 //

 // Dialog

@@ -29,10 +64,12 @@ STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD
 EXSTYLE WS_EX_CONTROLPARENT

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

 BEGIN

-    COMBOBOX        IDC_SERVER,84,7,130,30,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP

-    LTEXT           "Server:",IDC_STATIC,24,9,60,8

-    LTEXT           "Visible name:",IDC_STATIC,24,25,60,8

-    EDITTEXT        IDC_NAME,84,22,130,14,ES_AUTOHSCROLL

+    LTEXT           "Server:",IDC_STATIC,24,9,56,8,0,WS_EX_RIGHT

+    COMBOBOX        IDC_SERVER,84,7,74,30,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP

+    LTEXT           "Language:",IDC_STATIC,162,9,56,8,0,WS_EX_RIGHT

+	COMBOBOX        IDC_LANGUAGE,222,7,74,30,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP

+    LTEXT           "Visible name:",IDC_STATIC,24,25,56,8,0,WS_EX_RIGHT

+    EDITTEXT        IDC_NAME,84,22,74,14,ES_AUTOHSCROLL

     CONTROL         "Meet strangers with common interests (separated by commas):",IDC_MEET_COMMON,

                     "Button",BS_AUTOCHECKBOX | WS_TABSTOP,24,39,272,10

     EDITTEXT        IDC_INTERESTS,24,49,272,20,ES_MULTILINE | ES_AUTOVSCROLL | WS_VSCROLL

@@ -47,56 +84,16 @@ BEGIN
                     "Button",BS_AUTOCHECKBOX | WS_TABSTOP,24,167,272,10

     CONTROL         "Automatically connect to stranger when protocol is turned online",IDC_AUTO_CONNECT,

                     "Button",BS_AUTOCHECKBOX | WS_TABSTOP,24,180,272,10

-	CONTROL         "Automatically connect to another stranger when current disconnects",IDC_DONTSTOP,

+    CONTROL         "Automatically connect to another stranger when current disconnects",IDC_DONTSTOP,

                     "Button",BS_AUTOCHECKBOX | WS_TABSTOP,24,192,272,10

-	CONTROL         "Don't clear chat before connecting to new stranger",IDC_NOCLEAR,

-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,24,204,272,10    

+    CONTROL         "Don't clear chat before connecting to new stranger",IDC_NOCLEAR,

+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,24,204,272,10

     CONTROL         "Load count of users on actual server after connection",IDC_SERVER_INFO,

                     "Button",BS_AUTOCHECKBOX | WS_TABSTOP,24,216,272,10

     CONTROL         "Enable logging for debugging purposes",IDC_LOGGING,

                     "Button",BS_AUTOCHECKBOX | WS_TABSTOP,24,228,272,10

-    

 END

 

-

-/////////////////////////////////////////////////////////////////////////////

-//

-// DESIGNINFO

-//

-

-#ifdef APSTUDIO_INVOKED

-GUIDELINES DESIGNINFO

-BEGIN

-    IDD_OPTIONS, DIALOG

-    BEGIN

-        LEFTMARGIN, 7

-        RIGHTMARGIN, 309

-        VERTGUIDE, 24

-        VERTGUIDE, 84

-        VERTGUIDE, 214

-        VERTGUIDE, 296

-        TOPMARGIN, 7

-        BOTTOMMARGIN, 241

-    END

-END

-#endif    // APSTUDIO_INVOKED

-

-#endif    // Czech (Czech Republic) resources

-/////////////////////////////////////////////////////////////////////////////

-

-

-/////////////////////////////////////////////////////////////////////////////

-// English (United States) resources

-

-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)

-LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US

-#pragma code_page(1252)

-

-/////////////////////////////////////////////////////////////////////////////

-//

-// Dialog

-//

-

 IDD_OmegleACCOUNT DIALOGEX 0, 0, 186, 134

 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD

 EXSTYLE WS_EX_CONTROLPARENT

@@ -104,12 +101,14 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN

     COMBOBOX        IDC_SERVER,60,0,125,30,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP

     LTEXT           "Server:",IDC_STATIC,0,2,60,8

-    LTEXT           "Visible name:",IDC_STATIC,0,17,60,8

-    EDITTEXT        IDC_NAME,60,15,125,14,ES_AUTOHSCROLL

+    LTEXT           "Visible name:",IDC_STATIC,0,32,60,8

+    EDITTEXT        IDC_NAME,60,30,125,14,ES_AUTOHSCROLL

     CONTROL         "Meet strangers with common interests",IDC_MEET_COMMON,

-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,0,36,185,10

-    EDITTEXT        IDC_INTERESTS,0,60,185,32,ES_MULTILINE | ES_AUTOVSCROLL | WS_VSCROLL

-    LTEXT           "Your interests (separated by commas):",IDC_STATIC,0,50,185,8

+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,0,52,185,10

+    EDITTEXT        IDC_INTERESTS,0,76,185,32,ES_MULTILINE | ES_AUTOVSCROLL | WS_VSCROLL

+    LTEXT           "Your interests (separated by commas):",IDC_STATIC,0,66,185,8

+    COMBOBOX        IDC_LANGUAGE,60,15,125,30,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP

+    LTEXT           "Language:",IDC_STATIC,0,17,60,8

 END

 

 

@@ -126,82 +125,22 @@ BEGIN
         VERTGUIDE, 60

         VERTGUIDE, 185

     END

-END

-#endif    // APSTUDIO_INVOKED

-

-

-#ifdef APSTUDIO_INVOKED

-/////////////////////////////////////////////////////////////////////////////

-//

-// TEXTINCLUDE

-//

-

-1 TEXTINCLUDE 

-BEGIN

-    "..\\src\\resource.h\0"

-END

-

-2 TEXTINCLUDE 

-BEGIN

-    "#include ""afxres.h""\r\n"

-    "#include ""..\\src\\constants.h""\0"

-END

-

-3 TEXTINCLUDE 

-BEGIN

-    "\r\0"

-END

-

-#endif    // APSTUDIO_INVOKED

-

-

-/////////////////////////////////////////////////////////////////////////////

-//

-// Icon

-//

-

-// Icon with lowest ID value placed first to ensure application icon

-// remains consistent on all systems.

-IDI_OMEGLE              ICON                    "omegle.ico"

 

-/////////////////////////////////////////////////////////////////////////////

-//

-// Version

-//

-

-VS_VERSION_INFO VERSIONINFO

- FILEVERSION 0,1,0,1

- PRODUCTVERSION 0,1,0,1

- FILEFLAGSMASK 0x17L

-#ifdef _DEBUG

- FILEFLAGS 0x1L

-#else

- FILEFLAGS 0x0L

-#endif

- FILEOS 0x4L

- FILETYPE 0x2L

- FILESUBTYPE 0x0L

-BEGIN

-    BLOCK "StringFileInfo"

-    BEGIN

-        BLOCK "040904b0"

-        BEGIN

-            VALUE "FileDescription", "Omegle protocol plugin for Miranda NG"

-            VALUE "FileVersion", "0.1.1.0"

-            VALUE "InternalName", "Omegle"

-            VALUE "LegalCopyright", "Copyright © 2011-12 Robert Pösel"

-            VALUE "OriginalFilename", "omegle.dll"

-            VALUE "ProductName", "Omegle Protocol"

-            VALUE "ProductVersion", "0.1.1.0"

-        END

-    END

-    BLOCK "VarFileInfo"

+    IDD_OPTIONS, DIALOG

     BEGIN

-        VALUE "Translation", 0x409, 1200

+        LEFTMARGIN, 7

+        RIGHTMARGIN, 309

+        VERTGUIDE, 24

+        VERTGUIDE, 84

+        VERTGUIDE, 214

+        VERTGUIDE, 296

+        TOPMARGIN, 7

+        BOTTOMMARGIN, 241

     END

 END

+#endif    // APSTUDIO_INVOKED

 

-#endif    // English (United States) resources

+#endif    // Czech (Czech Republic) resources

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

 

 

diff --git a/protocols/Omegle/res/version.rc b/protocols/Omegle/res/version.rc
new file mode 100644
index 0000000000..5bfbab4754
--- /dev/null
+++ b/protocols/Omegle/res/version.rc
@@ -0,0 +1,38 @@
+// Microsoft Visual C++ generated resource script.

+//

+#ifdef APSTUDIO_INVOKED

+#error this file is not editable by Microsoft Visual C++

+#endif //APSTUDIO_INVOKED

+

+#include "afxres.h"

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

+

+VS_VERSION_INFO VERSIONINFO

+ FILEVERSION __FILEVERSION_STRING

+ PRODUCTVERSION __FILEVERSION_STRING

+ FILEFLAGSMASK 0x17L

+#ifdef _DEBUG

+ FILEFLAGS 0x1L

+#else

+ FILEFLAGS 0x0L

+#endif

+ FILEOS 0x4L

+ FILETYPE 0x0L

+ FILESUBTYPE 0x0L

+BEGIN

+    BLOCK "StringFileInfo"

+    BEGIN

+        BLOCK "000004b0"

+        BEGIN

+            VALUE "FileDescription", __DESCRIPTION

+            VALUE "InternalName", __PLUGIN_NAME

+            VALUE "LegalCopyright", __COPYRIGHT

+            VALUE "OriginalFilename", __FILENAME

+            VALUE "ProductName", __PLUGIN_NAME

+        END

+    END

+    BLOCK "VarFileInfo"

+    BEGIN

+        VALUE "Translation", 0x0, 1200

+    END

+END