- GTalkExt - cosmetics (patch from person)

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

2 files changed, 19 insertions, 16 deletions

diff --git a/langpacks/russian/Plugins/GTalkExt.txt b/langpacks/russian/Plugins/GTalkExt.txt
index cf322935c5..293683d437 100644
--- a/langpacks/russian/Plugins/GTalkExt.txt
+++ b/langpacks/russian/Plugins/GTalkExt.txt
@@ -27,7 +27,7 @@
 Очищать историю псевдоконтакта перед добавлением новых событий

 [Notify in fullscreen mode too]

 Также уведомлять и в полноэкранном режиме

-[NOTE\n\nThis will work only if this Jabber account is actually GTalk]

+[NOTE!\nThis will work only if this Jabber account is actually GTalk]

 Хозяйке на заметку\nЭто будет работать, только если этот Jabber-аккаунт это на самом деле GTalk

 [Use this if your popup plugin does not correctly detect fullscreen mode. It will take away your keyboard focus]

 Используйте это если ваш плагин всплывающих окон неверно определяет полноэкранный режим. Оно отберет у вас фокус ввода

diff --git a/protocols/GTalkExt/res/settings.rc b/protocols/GTalkExt/res/settings.rc
index 94d7e356d2..cab755540a 100644
--- a/protocols/GTalkExt/res/settings.rc
+++ b/protocols/GTalkExt/res/settings.rc
@@ -1,24 +1,27 @@
 #include "..\src\resources.h"

 #include "winres.h"

 

-IDD_MAILSETTINGS DIALOGEX 0, 0, 304, 228

+IDD_MAILSETTINGS DIALOGEX 0, 0, 304, 206

 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD

 EXSTYLE WS_EX_CONTROLPARENT

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

-{

-	CONTROL "", IDC_WARNBAR, STATIC, SS_LEFT, 30, 9, 3, 26

-	CONTROL "NOTE\n\nThis will work only if this Jabber account is actually GTalk", IDC_NOTE, STATIC, SS_LEFT, 40, 9, 230, 26

-	CONTROL "Popup notifications (needs popup plugin)", IDC_POPUPSENABLED, BUTTON, BS_AUTOCHECKBOX | WS_TABSTOP, 3, 36, 271, 14

-	CONTROL "Notify in fullscreen mode too", IDC_POPUPSINFULLSCREEN, BUTTON, BS_AUTOCHECKBOX | WS_TABSTOP, 17, 51, 254, 15

-	CONTROL "Use this if your popup plugin does not correctly detect fullscreen mode. It will take away your keyboard focus", IDC_POPUPSINFULLSCREENLABEL, STATIC, SS_LEFT, 30, 65, 270, 22

-	CONTROL "Add message snip to notification", IDC_ADDSNIP, BUTTON, BS_AUTOCHECKBOX | WS_TABSTOP, 3, 146, 300, 15

-	CONTROL "Try to login before open mailbox", IDC_AUTHONMAILBOX, BUTTON, BS_AUTOCHECKBOX | WS_TABSTOP, 3, 164, 300, 15

-	CONTROL "This works only if password is saved in the database. Has no effect on links in pseudocontact message log", IDC_AUTHONMAILBOXLABEL, STATIC, SS_LEFT, 15, 178, 280, 26

-	CONTROL "Choose GMail view you use in web interface", IDC_MAILBOXVIEWLABEL, STATIC, SS_LEFT, 3, 200, 280, 15

-	CONTROL "I don't know", IDC_UNKNOWNVIEW, BUTTON, BS_AUTORADIOBUTTON | WS_TABSTOP, 17, 212, 50, 8

-	CONTROL "Standard view", IDC_STANDARDVIEW, BUTTON, BS_AUTORADIOBUTTON | WS_TABSTOP, 80, 212, 60, 8

-	CONTROL "Basic HTML", IDC_HTMLVIEW, BUTTON, BS_AUTORADIOBUTTON | WS_TABSTOP, 150, 212, 60, 8

-}

+BEGIN

+    LTEXT           "",IDC_WARNBAR,30,9,8,26,NOT WS_GROUP

+    CTEXT           "NOTE!\nThis will work only if this Jabber account is actually GTalk",IDC_NOTE,13,9,277,26,NOT WS_GROUP

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

+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,3,36,271,14

+    CONTROL         "Notify in fullscreen mode too",IDC_POPUPSINFULLSCREEN,

+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,17,51,277,14

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

+    CONTROL         "Add message snip to notification",IDC_ADDSNIP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,3,98,300,15

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

+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,3,116,300,15

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

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

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

+    CONTROL         "Standard view",IDC_STANDARDVIEW,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,14,181,157,8

+    CONTROL         "Basic HTML",IDC_HTMLVIEW,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,14,192,158,8

+END

 

 IDD_POPUPSETTINGS DIALOGEX 0, 0, 304, 65

 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD