From d52086262ab48105b6ac0290a235699750d5f04a Mon Sep 17 00:00:00 2001 From: Dart Raiden Date: Thu, 2 Jan 2014 16:48:40 +0000 Subject: Separate writing of "infobar", "titlebar", "statusbar", etc. git-svn-id: http://svn.miranda-ng.org/main/trunk@7458 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/Scriver/res/resource.rc | 4 ++-- plugins/Scriver/src/input.cpp | 16 ++++++++-------- plugins/Scriver/src/msgoptions.cpp | 6 +++--- 3 files changed, 13 insertions(+), 13 deletions(-) (limited to 'plugins/Scriver') diff --git a/plugins/Scriver/res/resource.rc b/plugins/Scriver/res/resource.rc index ce5af4cd93..18dc369000 100644 --- a/plugins/Scriver/res/resource.rc +++ b/plugins/Scriver/res/resource.rc @@ -92,13 +92,13 @@ EXSTYLE WS_EX_CONTROLPARENT FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN GROUPBOX "Layout",IDC_STATIC,0,0,304,138 - CONTROL "Show titlebar",IDC_SHOWTITLEBAR,"Button", + CONTROL "Show title bar",IDC_SHOWTITLEBAR,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,8,12,180,10 CONTROL "Show status bar",IDC_SHOWSTATUSBAR,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,8,23,180,10 CONTROL "Show toolbar",IDC_SHOWTOOLBAR,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,8,34,180,10 - CONTROL "Show infobar",IDC_SHOWINFOBAR,"Button", + CONTROL "Show info bar",IDC_SHOWINFOBAR,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,8,45,180,10 CONTROL "Show avatars", IDC_AVATARSUPPORT,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,8,56,180,10 diff --git a/plugins/Scriver/src/input.cpp b/plugins/Scriver/src/input.cpp index 20042befcd..994fc37e71 100644 --- a/plugins/Scriver/src/input.cpp +++ b/plugins/Scriver/src/input.cpp @@ -315,31 +315,31 @@ void RegisterKeyBindings() { } desc.pszName = "Scriver/Wnd/Toggle Statusbar"; - desc.pszDescription = LPGEN("Window: Toggle Statusbar"); + desc.pszDescription = LPGEN("Window: Toggle status bar"); desc.lParam = KB_SWITCHSTATUSBAR; desc.DefHotKey = HOTKEYCODE(HOTKEYF_CONTROL|HOTKEYF_SHIFT, 'S'); Hotkey_Register(&desc); desc.pszName = "Scriver/Wnd/Toggle Titlebar"; - desc.pszDescription = LPGEN("Window: Toggle Titlebar"); + desc.pszDescription = LPGEN("Window: Toggle title bar"); desc.lParam = KB_SWITCHTITLEBAR; desc.DefHotKey = HOTKEYCODE(HOTKEYF_CONTROL|HOTKEYF_SHIFT, 'M'); Hotkey_Register(&desc); desc.pszName = "Scriver/Wnd/Toggle Toolbar"; - desc.pszDescription = LPGEN("Window: Toggle Toolbar"); + desc.pszDescription = LPGEN("Window: Toggle toolbar"); desc.lParam = KB_SWITCHTOOLBAR; desc.DefHotKey = HOTKEYCODE(HOTKEYF_CONTROL|HOTKEYF_SHIFT, 'T'); Hotkey_Register(&desc); desc.pszName = "Scriver/Wnd/Toggle Infobar"; - desc.pszDescription = LPGEN("Window: Toggle Infobar"); + desc.pszDescription = LPGEN("Window: Toggle info bar"); desc.lParam = KB_SWITCHINFOBAR; desc.DefHotKey = HOTKEYCODE(HOTKEYF_CONTROL|HOTKEYF_SHIFT, 'N'); Hotkey_Register(&desc); desc.pszName = "Scriver/Wnd/Clear Log"; - desc.pszDescription = LPGEN("Window: Clear Log"); + desc.pszDescription = LPGEN("Window: Clear log"); desc.lParam = KB_CLEAR_LOG; desc.DefHotKey = HOTKEYCODE(HOTKEYF_CONTROL, 'L'); Hotkey_Register(&desc); @@ -351,7 +351,7 @@ void RegisterKeyBindings() { Hotkey_Register(&desc); desc.pszName = "Scriver/Wnd/Close Tab"; - desc.pszDescription = LPGEN("Window: Close Tab"); + desc.pszDescription = LPGEN("Window: Close tab"); desc.lParam = KB_CLOSE; desc.DefHotKey = HOTKEYCODE(HOTKEYF_CONTROL, VK_F4); Hotkey_Register(&desc); @@ -365,13 +365,13 @@ void RegisterKeyBindings() { Hotkey_Register(&desc); desc.pszName = "Scriver/Action/Send All"; - desc.pszDescription = LPGEN("Action: Send to All"); + desc.pszDescription = LPGEN("Action: Send to all"); desc.lParam = KB_SEND_ALL; desc.DefHotKey = HOTKEYCODE(HOTKEYF_CONTROL | HOTKEYF_SHIFT, VK_RETURN); Hotkey_Register(&desc); desc.pszName = "Scriver/Action/PasteSend"; - desc.pszDescription = LPGEN("Action: Paste & Send"); + desc.pszDescription = LPGEN("Action: Paste and send"); desc.lParam = KB_PASTESEND; desc.DefHotKey = HOTKEYCODE(HOTKEYF_CONTROL | HOTKEYF_SHIFT, VK_INSERT); Hotkey_Register(&desc); diff --git a/plugins/Scriver/src/msgoptions.cpp b/plugins/Scriver/src/msgoptions.cpp index b5413480ce..28be26a9dd 100644 --- a/plugins/Scriver/src/msgoptions.cpp +++ b/plugins/Scriver/src/msgoptions.cpp @@ -71,8 +71,8 @@ static const FontOptionsList fontOptionsList[] = { { LPGENT("Notices"), RGB(90, 90, 160), _T("Arial"), 0, -12, LPGENT("Incoming background")}, { LPGENT("Outgoing URL"), RGB(0, 0, 255), _T("Arial"), 0, -12, LPGENT("Outgoing background")}, { LPGENT("Incoming URL"), RGB(0, 0, 255), _T("Arial"), 0, -12, LPGENT("Incoming background")}, - { LPGENT("Infobar contact name"), RGB(0, 0, 0), _T("Arial"), FONTF_BOLD, -19, LPGENT("Infobar background")}, - { LPGENT("Infobar status message"), RGB(50, 50, 50), _T("Arial"), FONTF_ITALIC, -11, LPGENT("Infobar background")} + { LPGENT("Info bar contact name"), RGB(0, 0, 0), _T("Arial"), FONTF_BOLD, -19, LPGENT("Info bar background")}, + { LPGENT("Info bar status message"), RGB(50, 50, 50), _T("Arial"), FONTF_ITALIC, -11, LPGENT("Info bar background")} }; int fontOptionsListSize = SIZEOF(fontOptionsList); @@ -114,7 +114,7 @@ static const colourOptionsList[] = { { LPGENT("Input area background"), SRMSGSET_INPUTBKGCOLOUR, 0, COLOR_WINDOW}, { LPGENT("Incoming background"), SRMSGSET_INCOMINGBKGCOLOUR, 0, COLOR_WINDOW}, { LPGENT("Outgoing background"), SRMSGSET_OUTGOINGBKGCOLOUR, 0, COLOR_WINDOW}, - { LPGENT("Infobar background"), SRMSGSET_INFOBARBKGCOLOUR, 0, COLOR_3DLIGHT}, + { LPGENT("Info bar background"), SRMSGSET_INFOBARBKGCOLOUR, 0, COLOR_3DLIGHT}, }; -- cgit v1.2.3