GTalkExt: contact list contact restored

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

1 files changed, 72 insertions, 27 deletions

diff --git a/protocols/GTalkExt/res/settings.rc b/protocols/GTalkExt/res/settings.rc
index da441af224..5c1866f211 100644
--- a/protocols/GTalkExt/res/settings.rc
+++ b/protocols/GTalkExt/res/settings.rc
@@ -1,44 +1,89 @@
-#include "..\src\resources.h"

+// Microsoft Visual C++ generated resource script.

+//

+#include "resource.h"

 #include "winres.h"

 

-IDD_MAILSETTINGS DIALOGEX 0, 0, 304, 196

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

+// 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_MAILSETTINGS DIALOGEX 0, 0, 304, 204

 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD

 EXSTYLE WS_EX_CONTROLPARENT

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

 BEGIN

     CONTROL         "Popup notifications (needs popup plugin)",IDC_POPUPSENABLED,

-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,7,271,14

+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,8,271,14

     CONTROL         "Notify in fullscreen mode too",IDC_POPUPSINFULLSCREEN,

                     "Button",BS_AUTOCHECKBOX | WS_TABSTOP,21,22,267,14

     LTEXT           "Use this if your popup plugin does not correctly detect fullscreen mode. It will take away your keyboard focus",IDC_POPUPSINFULLSCREENLABEL,34,38,234,27,NOT WS_GROUP

-    CONTROL         "Add message snip to notification",IDC_ADDSNIP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,69,282,15

+    CONTROL         "Notify in contact list",IDC_PSEUDOCONTACTENABLED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,60,271,14

+    CONTROL         "Clear pseudocontact history before adding new events",IDC_CLEARPSEUDOCONTACTLOG,

+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,21,74,254,15

+    CONTROL         "Mark history event read when popup closed",IDC_MARKEVENTREAD,

+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,88,284,15

+    CONTROL         "Add message snip to notification",IDC_ADDSNIP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,102,282,15

     CONTROL         "Try to login before open mailbox",IDC_AUTHONMAILBOX,

-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,87,279,15

-    LTEXT           "This works only if password is saved in the database. Has no effect on links in pseudocontact message log",IDC_AUTHONMAILBOXLABEL,19,101,269,26,NOT WS_GROUP

-    LTEXT           "Choose GMail view you use in web interface",IDC_MAILBOXVIEWLABEL,7,128,280,9,NOT WS_GROUP

-    CONTROL         "I don't know",IDC_UNKNOWNVIEW,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,18,141,153,8

-    CONTROL         "Standard view",IDC_STANDARDVIEW,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,18,152,157,8

-    CONTROL         "Basic HTML",IDC_HTMLVIEW,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,18,163,158,8

+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,116,279,15

+    LTEXT           "This works only if password is saved in the database. Has no effect on links in pseudocontact message log",IDC_AUTHONMAILBOXLABEL,19,130,269,26,NOT WS_GROUP

+    LTEXT           "Choose GMail view you use in web interface",IDC_MAILBOXVIEWLABEL,7,154,280,9,NOT WS_GROUP

+    CONTROL         "I don't know",IDC_UNKNOWNVIEW,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,18,167,153,8

+    CONTROL         "Standard view",IDC_STANDARDVIEW,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,18,178,157,8

+    CONTROL         "Basic HTML",IDC_HTMLVIEW,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,18,189,158,8

 END

 

 IDD_POPUPSETTINGS DIALOGEX 0, 0, 304, 65

 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD

 EXSTYLE WS_EX_CONTROLPARENT

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

-{

-	GROUPBOX "", IDC_GROUP, 0, 0, 304, 65

-	CONTROL "Background color", IDC_BACKCOLORLABEL, STATIC, SS_LEFT, 10, 10, 60, 15

-	CONTROL "", IDC_BACKCOLORPICKER, "ColourPicker", WS_TABSTOP, 70, 10, 39, 10

-	CONTROL "Text color", IDC_TEXTCOLORLABEL, STATIC, SS_LEFT, 10, 25, 50, 15

-	CONTROL "", IDC_TEXTCOLORPICKER, "ColourPicker", WS_TABSTOP, 70, 25, 39, 10

-	CONTROL "Timeout", IDC_TIMEOUTLABEL, STATIC, SS_LEFT, 10, 40, 50, 13

-	CONTROL "", IDC_TIMEOUTEDIT, EDIT, WS_TABSTOP | WS_BORDER, 70, 40, 39, 10

-	CONTROL "If both colors set to the same value, default colors will be used", IDC_DEFCOLORSLABEL, STATIC, SS_LEFT, 120, 10, 120, 25

-	CONTROL "0 means default timeout,\n-1 means no timeout", IDC_DEFTIMEOUTLABEL, STATIC, SS_LEFT, 120, 40, 120, 20

-	CONTROL "Test", IDC_TESTBUTTON, BUTTON, WS_TABSTOP, 245, 17, 50, 25

-}

-

-LANGUAGE LANG_ENGLISH,SUBLANG_ENGLISH_US

-

-IDI_POPUP ICON "PopupIcon.ico"

-IDI_PSEUDOAVA PNG "pseudoava.png"
\ No newline at end of file
+BEGIN

+    GROUPBOX        "",IDC_GROUP,0,0,304,65

+    LTEXT           "Background color",IDC_BACKCOLORLABEL,10,10,60,15,NOT WS_GROUP

+    CONTROL         "",IDC_BACKCOLORPICKER,"ColourPicker",WS_TABSTOP,70,10,39,10

+    LTEXT           "Text color",IDC_TEXTCOLORLABEL,10,25,50,15,NOT WS_GROUP

+    CONTROL         "",IDC_TEXTCOLORPICKER,"ColourPicker",WS_TABSTOP,70,25,39,10

+    LTEXT           "Timeout",IDC_TIMEOUTLABEL,10,40,50,13,NOT WS_GROUP

+    EDITTEXT        IDC_TIMEOUTEDIT,70,40,39,10

+    LTEXT           "If both colors set to the same value, default colors will be used",IDC_DEFCOLORSLABEL,120,10,120,25,NOT WS_GROUP

+    LTEXT           "0 means default timeout,\n-1 means no timeout",IDC_DEFTIMEOUTLABEL,120,40,120,20,NOT WS_GROUP

+    PUSHBUTTON      "Test",IDC_TESTBUTTON,245,17,50,25

+END

+

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

+//

+// Icon

+//

+

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

+// remains consistent on all systems.

+IDI_POPUP               ICON                    "PopupIcon.ico"

+

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

+//

+// PNG

+//

+

+IDI_PSEUDOAVA           PNG                     "pseudoava.png"

+#endif    // English (United States) resources

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

+

+

+

+#ifndef APSTUDIO_INVOKED

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

+//

+// Generated from the TEXTINCLUDE 3 resource.

+//

+

+

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

+#endif    // not APSTUDIO_INVOKED

+