diff options
author | slotwin <slotwin@users.noreply.github.com> | 2014-05-18 15:03:08 +0000 |
---|---|---|
committer | slotwin <slotwin@users.noreply.github.com> | 2014-05-18 15:03:08 +0000 |
commit | e9dc26230e678495a034f3a6dd268debd597907e (patch) | |
tree | e06809b669f7dd061683a60d648133ba57d78d26 /plugins/Clist_blind | |
parent | eb198e2580782a3d2c56b1b474f369343a7d00f1 (diff) |
Clist_blind: options - don't highlight Apply button if nothing has changed
proper capitalization
git-svn-id: http://svn.miranda-ng.org/main/trunk@9232 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'plugins/Clist_blind')
-rw-r--r-- | plugins/Clist_blind/res/resource.rc | 30 | ||||
-rw-r--r-- | plugins/Clist_blind/src/clcopts.cpp | 3 | ||||
-rw-r--r-- | plugins/Clist_blind/src/clistopts.cpp | 2 | ||||
-rw-r--r-- | plugins/Clist_blind/src/cluiopts.cpp | 4 |
4 files changed, 21 insertions, 18 deletions
diff --git a/plugins/Clist_blind/res/resource.rc b/plugins/Clist_blind/res/resource.rc index c1760953b0..528327712c 100644 --- a/plugins/Clist_blind/res/resource.rc +++ b/plugins/Clist_blind/res/resource.rc @@ -85,10 +85,10 @@ BEGIN LTEXT "seconds, when statuses differ",IDC_STATIC,140,161,165,8,NOT WS_GROUP
CONTROL "Show multiple icons",IDC_MULTITRAY,"Button",BS_AUTORADIOBUTTON,10,177,98,10
CONTROL "Only when statuses differ",IDC_ALWAYSMULTI,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,108,177,198,10
- GROUPBOX "Contact List",IDC_STCLISTGROUP,2,2,135,126
+ GROUPBOX "Contact list",IDC_STCLISTGROUP,2,2,135,126
GROUPBOX "System tray icon",IDC_STATIC,143,57,169,70
GROUPBOX "System tray icon when using multiple protocols",IDC_STATIC,2,131,310,66
- GROUPBOX "Contact List Sorting",IDC_STATIC,143,2,169,54,WS_GROUP
+ GROUPBOX "Contact list sorting",IDC_STATIC,143,2,169,54,WS_GROUP
CONTROL "Spin5",IDC_BLINKSPIN,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_ARROWKEYS | UDS_NOTHOUSANDS | UDS_HOTTRACK,173,97,11,21
END
@@ -140,7 +140,7 @@ EXSTYLE WS_EX_CONTROLPARENT FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
GROUPBOX "Items",IDC_STATIC,2,2,310,88
- LTEXT "'Hide Offline' means to hide:",IDC_STATIC,191,10,112,8
+ LTEXT "'Hide offline' means to hide:",IDC_STATIC,191,10,112,8
CONTROL "Tree1",IDC_HIDEOFFLINEOPTS,"SysTreeView32",TVS_DISABLEDRAGDROP | TVS_NOTOOLTIPS | TVS_NONEVENHEIGHT | WS_BORDER | WS_TABSTOP,191,20,112,63
GROUPBOX "Groups",IDC_STATIC,2,93,310,67
CONTROL "Show counts of number of contacts in a group",IDC_SHOWGROUPCOUNTS,
@@ -166,7 +166,7 @@ STYLE DS_SETFONT | DS_FIXEDSYS | DS_CENTER | WS_CHILD EXSTYLE WS_EX_CONTROLPARENT
FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
- GROUPBOX "Status Bar",IDC_STATIC,4,4,170,204
+ GROUPBOX "Status bar",IDC_STATIC,4,4,170,204
CONTROL "Show status bar",IDC_SHOWSBAR,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,17,152,10
CONTROL "Show icons",IDC_SHOWICON,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,22,33,142,10
CONTROL "Show protocol names",IDC_SHOWPROTO,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,22,48,142,10
@@ -333,8 +333,8 @@ BEGIN MENUITEM "&DND\tCtrl+5", ID_STATUS_DND
MENUITEM "&Free for chat\tCtrl+6", ID_STATUS_FREECHAT
MENUITEM "&Invisible\tCtrl+7", ID_STATUS_INVISIBLE
- MENUITEM "On the &Phone\tCtrl+8", ID_STATUS_ONTHEPHONE
- MENUITEM "Out to &Lunch\tCtrl+9", ID_STATUS_OUTTOLUNCH
+ MENUITEM "On the &phone\tCtrl+8", ID_STATUS_ONTHEPHONE
+ MENUITEM "Out to &lunch\tCtrl+9", ID_STATUS_OUTTOLUNCH
END
END
@@ -348,22 +348,22 @@ BEGIN END
POPUP "Nowhere"
BEGIN
- MENUITEM "&New Group", POPUP_NEWGROUP
+ MENUITEM "&New group", POPUP_NEWGROUP
MENUITEM SEPARATOR
- MENUITEM "&Hide Offline Users", POPUP_HIDEOFFLINE
- MENUITEM "Hide &Offline Users out here", POPUP_HIDEOFFLINEROOT
- MENUITEM "Hide &Empty Groups", POPUP_HIDEEMPTYGROUPS
- MENUITEM "Disable &Groups", POPUP_DISABLEGROUPS
+ MENUITEM "&Hide offline users", POPUP_HIDEOFFLINE
+ MENUITEM "Hide &offline users out here", POPUP_HIDEOFFLINEROOT
+ MENUITEM "Hide &empty groups", POPUP_HIDEEMPTYGROUPS
+ MENUITEM "Disable &groups", POPUP_DISABLEGROUPS
MENUITEM SEPARATOR
MENUITEM "Hide Miranda", POPUP_HIDEMIRANDA
END
POPUP "Group"
BEGIN
- MENUITEM "&New Subgroup", POPUP_NEWSUBGROUP
- MENUITEM "&Hide Offline Users in here", POPUP_GROUPHIDEOFFLINE
+ MENUITEM "&New subgroup", POPUP_NEWSUBGROUP
+ MENUITEM "&Hide offline users in here", POPUP_GROUPHIDEOFFLINE
MENUITEM SEPARATOR
- MENUITEM "&Rename Group", POPUP_RENAMEGROUP
- MENUITEM "&Delete Group", POPUP_DELETEGROUP
+ MENUITEM "&Rename group", POPUP_RENAMEGROUP
+ MENUITEM "&Delete group", POPUP_DELETEGROUP
END
END
diff --git a/plugins/Clist_blind/src/clcopts.cpp b/plugins/Clist_blind/src/clcopts.cpp index b478de119e..97f6f4ee6b 100644 --- a/plugins/Clist_blind/src/clcopts.cpp +++ b/plugins/Clist_blind/src/clcopts.cpp @@ -182,6 +182,9 @@ static INT_PTR CALLBACK DlgProcClcMainOpts(HWND hwndDlg, UINT msg, WPARAM wParam if ((LOWORD(wParam) == IDC_LEFTMARGIN || LOWORD(wParam) == IDC_SMOOTHTIME || LOWORD(wParam) == IDC_GROUPINDENT)
&& (HIWORD(wParam) != EN_CHANGE || (HWND) lParam != GetFocus()))
return 0;
+ if ((LOWORD(wParam) == IDC_T_CONTACT || LOWORD(wParam) == IDC_T_GROUP || LOWORD(wParam) == IDC_T_DIVIDER || LOWORD(wParam) == IDC_T_INFO)
+ && (HIWORD(wParam) != EN_CHANGE || (HWND) lParam != GetFocus()))
+ return 0;
SendMessage(GetParent(hwndDlg), PSM_CHANGED, 0, 0);
break;
case WM_NOTIFY:
diff --git a/plugins/Clist_blind/src/clistopts.cpp b/plugins/Clist_blind/src/clistopts.cpp index 2f4c3417dd..aa50de4fe8 100644 --- a/plugins/Clist_blind/src/clistopts.cpp +++ b/plugins/Clist_blind/src/clistopts.cpp @@ -120,7 +120,7 @@ static INT_PTR CALLBACK DlgProcGenOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LP item = SendDlgItemMessage(hwndDlg, IDC_PRIMARYSTATUS, CB_ADDSTRING, 0, (LPARAM) TranslateT("Global"));
SendDlgItemMessage(hwndDlg, IDC_PRIMARYSTATUS, CB_SETITEMDATA, item, (LPARAM) 0);
for (int i = 0; i < count; i++) {
- if (!IsAccountEnabled(accs[i]) || CallProtoService( accs[i]->szModuleName, PS_GETCAPS, PFLAGNUM_2, 0) == 0)
+ if (!IsAccountEnabled(accs[i]) || CallProtoService( accs[i]->szModuleName, PS_GETCAPS, PFLAGNUM_2, 0) == 0)
continue;
CallProtoService(accs[i]->szModuleName, PS_GETNAME, SIZEOF(szName), (LPARAM) szName);
item = SendDlgItemMessageA(hwndDlg, IDC_PRIMARYSTATUS, CB_ADDSTRING, 0, (LPARAM) szName);
diff --git a/plugins/Clist_blind/src/cluiopts.cpp b/plugins/Clist_blind/src/cluiopts.cpp index 5f0adad26b..190398eb23 100644 --- a/plugins/Clist_blind/src/cluiopts.cpp +++ b/plugins/Clist_blind/src/cluiopts.cpp @@ -307,7 +307,7 @@ static UINT expertOnlyControls[] = int CluiOptInit(WPARAM wParam, LPARAM lParam)
{
- OPTIONSDIALOGPAGE odp = {sizeof(odp) };
+ OPTIONSDIALOGPAGE odp = { sizeof(odp) };
odp.hInstance = g_hInst;
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_CLUI);
odp.pszTitle = LPGEN("Window");
@@ -317,7 +317,7 @@ int CluiOptInit(WPARAM wParam, LPARAM lParam) Options_AddPage(wParam, &odp);
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_SBAR);
- odp.pszTitle = LPGEN("Status Bar");
+ odp.pszTitle = LPGEN("Status bar");
odp.pfnDlgProc = DlgProcSBarOpts;
odp.flags = ODPF_BOLDGROUPS;
Options_AddPage(wParam, &odp);
|