From 75815d4ab9a4b54cea03a97277f4d0892f2bdb6b Mon Sep 17 00:00:00 2001 From: Tobias Weimer Date: Sat, 12 Oct 2013 16:08:57 +0000 Subject: minor accessibility and translation fixes (fixes #433) git-svn-id: http://svn.miranda-ng.org/main/trunk@6457 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/wbOSD/res/wbOSD.rc | 121 +++++++++++++++--------------------------- plugins/wbOSD/src/options.cpp | 10 ++-- plugins/wbOSD/src/resource.h | 2 +- 3 files changed, 50 insertions(+), 83 deletions(-) (limited to 'plugins/wbOSD') diff --git a/plugins/wbOSD/res/wbOSD.rc b/plugins/wbOSD/res/wbOSD.rc index b199db9e38..54f243169e 100644 --- a/plugins/wbOSD/res/wbOSD.rc +++ b/plugins/wbOSD/res/wbOSD.rc @@ -13,13 +13,11 @@ #undef APSTUDIO_READONLY_SYMBOLS ///////////////////////////////////////////////////////////////////////////// -// English (U.S.) resources +// English (United States) resources #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) -#ifdef _WIN32 LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US #pragma code_page(1252) -#endif //_WIN32 ///////////////////////////////////////////////////////////////////////////// // @@ -27,91 +25,60 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US // IDD_DIALOG1 DIALOGEX 0, 0, 316, 250 -STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION -CAPTION "Dialog" +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_VISIBLE +EXSTYLE WS_EX_CONTROLPARENT FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN - CONTROL "Radio1",IDC_RADIO1,"Button",BS_AUTORADIOBUTTON | - WS_GROUP,21,22,8,8 - CONTROL "Radio1",IDC_RADIO2,"Button",BS_AUTORADIOBUTTON,39,22,8, - 8 - CONTROL "Radio1",IDC_RADIO3,"Button",BS_AUTORADIOBUTTON,59,22,8, - 8 - CONTROL "Radio1",IDC_RADIO4,"Button",BS_AUTORADIOBUTTON,21,33,8, - 8 - CONTROL "Radio1",IDC_RADIO5,"Button",BS_AUTORADIOBUTTON,39,33,8, - 8 - CONTROL "Radio1",IDC_RADIO6,"Button",BS_AUTORADIOBUTTON,59,33,8, - 8 - CONTROL "Radio1",IDC_RADIO7,"Button",BS_AUTORADIOBUTTON,21,45,8, - 8 - CONTROL "Radio1",IDC_RADIO8,"Button",BS_AUTORADIOBUTTON,39,45,8, - 8 - CONTROL "Radio1",IDC_RADIO9,"Button",BS_AUTORADIOBUTTON,59,45,8, - 8 - PUSHBUTTON "Select font",IDC_BUTTON1,80,17,68,14 - PUSHBUTTON "Text color",IDC_BUTTON2,175,91,68,14 - PUSHBUTTON "Background color",IDC_BUTTON4,11,182,67,14 - CONTROL "Transparent",IDC_CHECK3,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP,11,199,72,10 - CONTROL "Radio1",IDC_RADIO10,"Button",BS_AUTORADIOBUTTON | - WS_GROUP,21,99,8,8 - CONTROL "Radio1",IDC_RADIO11,"Button",BS_AUTORADIOBUTTON,39,99,8, - 8 - CONTROL "Radio1",IDC_RADIO12,"Button",BS_AUTORADIOBUTTON,59,99,8, - 8 - CONTROL "Radio1",IDC_RADIO13,"Button",BS_AUTORADIOBUTTON,21,110, - 8,8 - CONTROL "Radio1",IDC_RADIO14,"Button",BS_AUTORADIOBUTTON,39,110, - 8,8 - CONTROL "Radio1",IDC_RADIO15,"Button",BS_AUTORADIOBUTTON,59,110, - 8,8 - CONTROL "Radio1",IDC_RADIO16,"Button",BS_AUTORADIOBUTTON,21,121, - 8,8 - CONTROL "Radio1",IDC_RADIO17,"Button",BS_AUTORADIOBUTTON,39,121, - 8,8 - CONTROL "Radio1",IDC_RADIO18,"Button",BS_AUTORADIOBUTTON,59,121, - 8,8 - PUSHBUTTON "Shadow color",IDC_BUTTON3,80,92,67,14 - CONTROL "Alternative shadow",IDC_CHECK1,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP,13,135,133,10 - EDITTEXT IDC_EDIT1,79,148,27,14,ES_AUTOHSCROLL | ES_NUMBER - GROUPBOX "Shadow align",IDC_STATIC,13,89,62,43 GROUPBOX "General",IDC_STATIC,6,0,150,66 - GROUPBOX "Shadow",IDC_STATIC,5,70,151,99 GROUPBOX "Align",IDC_STATIC,13,13,61,43 - LTEXT "Shadow distance:",IDC_STATIC,10,151,64,8, - SS_PATHELLIPSIS,WS_EX_RIGHT + CONTROL "Radio1",IDC_RADIO1,"Button",BS_AUTORADIOBUTTON | WS_GROUP,21,22,8,8 + CONTROL "Radio1",IDC_RADIO2,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,39,22,8,8 + CONTROL "Radio1",IDC_RADIO3,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,59,22,8,8 + CONTROL "Radio1",IDC_RADIO4,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,21,33,8,8 + CONTROL "Radio1",IDC_RADIO5,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,39,33,8,8 + CONTROL "Radio1",IDC_RADIO6,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,59,33,8,8 + CONTROL "Radio1",IDC_RADIO7,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,21,45,8,8 + CONTROL "Radio1",IDC_RADIO8,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,39,45,8,8 + CONTROL "Radio1",IDC_RADIO9,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,59,45,8,8 + PUSHBUTTON "Select font",IDC_BUTTON1,80,25,68,14 + GROUPBOX "Shadow",IDC_STATIC,5,70,151,99 + CONTROL "Show drop shadow",IDC_CHECK4,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,13,80,85,10 + GROUPBOX "Shadow align",IDC_STATIC,13,89,62,43 + CONTROL "Radio1",IDC_RADIO10,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,21,99,8,8 + CONTROL "Radio1",IDC_RADIO11,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,39,99,8,8 + CONTROL "Radio1",IDC_RADIO12,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,59,99,8,8 + CONTROL "Radio1",IDC_RADIO13,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,21,110,8,8 + CONTROL "Radio1",IDC_RADIO14,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,39,110,8,8 + CONTROL "Radio1",IDC_RADIO15,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,59,110,8,8 + CONTROL "Radio1",IDC_RADIO16,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,21,121,8,8 + CONTROL "Radio1",IDC_RADIO17,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,39,121,8,8 + CONTROL "Radio1",IDC_RADIO18,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,59,121,8,8 + PUSHBUTTON "Shadow color",IDC_BUTTON3,80,102,67,14 + CONTROL "Alternative shadow",IDC_CHECK1,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,13,135,133,10 + LTEXT "Shadow distance:",IDC_STATIC,10,151,64,8,SS_PATHELLIPSIS,WS_EX_RIGHT + EDITTEXT IDC_EDIT1,79,148,27,14,ES_AUTOHSCROLL | ES_NUMBER GROUPBOX "Other",IDC_STATIC,5,171,152,75 + PUSHBUTTON "Background color",IDC_BUTTON4,11,182,67,14 + CONTROL "Transparent",IDC_CHECK3,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,199,72,10 LTEXT "Alpha:",IDC_STATIC,92,183,60,8,SS_PATHELLIPSIS - GROUPBOX "Announce",IDC_STATIC,162,0,150,246 + CONTROL "",IDC_SLIDER1,"msctls_trackbar32",TBS_BOTH | TBS_NOTICKS | WS_TABSTOP,87,193,45,15 + LTEXT "Static",IDC_ALPHATXT,136,195,17,8 LTEXT "Timeout (ms):",IDC_STATIC,86,213,67,8,SS_PATHELLIPSIS EDITTEXT IDC_EDIT5,91,224,27,14,ES_AUTOHSCROLL | ES_NUMBER - CONTROL "",IDC_TREE1,"SysTreeView32",TVS_DISABLEDRAGDROP | - TVS_NOTOOLTIPS | WS_BORDER | WS_TABSTOP | 0x4000,170,22, - 138,55 - CONTROL "Show",IDC_CHECK4,"Button",BS_AUTOCHECKBOX | WS_TABSTOP, - 13,80,85,10 - CONTROL "Show events",IDC_CHECK5,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP,167,110,139,10 - CONTROL "Status changes",IDC_CHECK6,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP,167,10,136,10 PUSHBUTTON "Show testing OSD",IDC_BUTTON5,11,224,67,14 - CONTROL "Show my status changes",IDC_CHECK7,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,175,80,133,10 - CONTROL "Show message window after click",IDC_CHECK2,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,167,156,138,10 - CONTROL "",IDC_SLIDER1,"msctls_trackbar32",TBS_BOTH | - TBS_NOTICKS | WS_TABSTOP,87,193,45,15 - LTEXT "Static",IDC_ALPHATXT,136,195,17,8 + GROUPBOX "Announce",IDC_STATIC,162,0,150,246 + CONTROL "Status changes",IDC_CHECK6,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,167,10,136,10 + CONTROL "",IDC_TREE1,"SysTreeView32",TVS_DISABLEDRAGDROP | TVS_NOTOOLTIPS | TVS_NONEVENHEIGHT | WS_BORDER | WS_HSCROLL | WS_TABSTOP,170,22,138,55 + CONTROL "Show my status changes",IDC_CHECK7,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,175,80,133,10 + PUSHBUTTON "Text color",IDC_BUTTON2,175,91,68,14 + CONTROL "Show events",IDC_CHECK5,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,167,110,139,10 PUSHBUTTON "Text color",IDC_BUTTON6,175,121,68,14 - EDITTEXT IDC_EDIT2,214,137,81,14,ES_AUTOHSCROLL LTEXT "Format:",IDC_STATIC,177,140,35,8 + EDITTEXT IDC_EDIT2,214,137,81,14,ES_AUTOHSCROLL PUSHBUTTON "?",IDC_BUTTON7,298,137,10,14 - CONTROL "",IDC_TREE2,"SysTreeView32",TVS_DISABLEDRAGDROP | - TVS_NOTOOLTIPS | WS_BORDER | WS_TABSTOP | 0x4000,170,182, - 138,59 + CONTROL "Show message window after click",IDC_CHECK2,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,167,156,138,10 LTEXT "Show when my status is:",IDC_STATIC,168,171,139,8 + CONTROL "",IDC_TREE2,"SysTreeView32",TVS_DISABLEDRAGDROP | TVS_NOTOOLTIPS | TVS_NONEVENHEIGHT | WS_BORDER | WS_HSCROLL | WS_TABSTOP,170,182,138,59 END @@ -121,7 +88,7 @@ END // #ifdef APSTUDIO_INVOKED -GUIDELINES DESIGNINFO +GUIDELINES DESIGNINFO BEGIN IDD_DIALOG1, DIALOG BEGIN @@ -159,7 +126,7 @@ END #endif // APSTUDIO_INVOKED -#endif // English (U.S.) resources +#endif // English (United States) resources ///////////////////////////////////////////////////////////////////////////// diff --git a/plugins/wbOSD/src/options.cpp b/plugins/wbOSD/src/options.cpp index 4a9769c0e9..01dc173b0d 100644 --- a/plugins/wbOSD/src/options.cpp +++ b/plugins/wbOSD/src/options.cpp @@ -17,7 +17,7 @@ void FillCheckBoxTree(HWND hwndTree,DWORD style) { logmsg("FillCheckBoxTree"); - TVINSERTSTRUCT tvis; + TVINSERTSTRUCT tvis = {0}; tvis.hParent = NULL; tvis.hInsertAfter = TVI_LAST; tvis.item.mask = TVIF_PARAM|TVIF_TEXT|TVIF_STATE; @@ -36,7 +36,7 @@ DWORD MakeCheckBoxTreeFlags(HWND hwndTree) logmsg("MakeCheckBoxTreeFlags"); - TVITEM tvi; + TVITEM tvi = {0}; tvi.mask=TVIF_HANDLE|TVIF_PARAM|TVIF_STATE; tvi.hItem=TreeView_GetRoot(hwndTree); while(tvi.hItem) { @@ -51,7 +51,7 @@ int selectColor(HWND hwnd, COLORREF *clr) { logmsg("SelectColor"); - CHOOSECOLOR cc; + CHOOSECOLOR cc = {0}; cc.lStructSize = sizeof(cc); cc.hwndOwner = hwnd; cc.hInstance = (HWND)hI; @@ -289,10 +289,10 @@ INT_PTR CALLBACK OptDlgProc(HWND hDlg,UINT msg,WPARAM wparam,LPARAM lparam) ps=(plgsettings*)GetWindowLongPtr(hDlg, GWLP_USERDATA); switch (LOWORD(wparam)) { case IDC_BUTTON7: - MessageBox(hDlg, _T("Variables:\n %n : Nick\n %m : Message\n %l : New line"), _T("Help"), MB_ICONINFORMATION|MB_OK); + MessageBox(hDlg, TranslateT("Variables:\n %n : Nick\n %m : Message\n %l : New line"), TranslateT("Help"), MB_ICONINFORMATION|MB_OK); return 0; case IDC_BUTTON5: - SendMessage(hwnd, WM_USER+1, (WPARAM)_T("miranda is gr8 and this is a long message ;-)"), 0); + SendMessage(hwnd, WM_USER+1, (WPARAM)TranslateT("Miranda NG is great and this is a long message."), 0); break; case IDC_BUTTON1: selectFont(hDlg, &(ps->lf)); diff --git a/plugins/wbOSD/src/resource.h b/plugins/wbOSD/src/resource.h index 64e57a5dfa..e82a87a47b 100644 --- a/plugins/wbOSD/src/resource.h +++ b/plugins/wbOSD/src/resource.h @@ -1,6 +1,6 @@ //{{NO_DEPENDENCIES}} // Microsoft Visual C++ generated include file. -// Used by wbOSD.rc +// Used by ..\res\wbOSD.rc // #define IDD_DIALOG1 101 #define IDC_BUTTON1 1001 -- cgit v1.2.3