From f1653a584862800b23353c88e3ffd4b98cbe3a57 Mon Sep 17 00:00:00 2001
From: Tobias Weimer <wishmaster51@googlemail.com>
Date: Sat, 24 Nov 2012 16:15:56 +0000
Subject: Fixed Apply button

git-svn-id: http://svn.miranda-ng.org/main/trunk@2464 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
 plugins/NotesAndReminders/src/options.cpp | 41 ++++++++++++++++++++-----------
 plugins/NotesAndReminders/src/resource.h  | 13 ++++++++--
 2 files changed, 38 insertions(+), 16 deletions(-)

(limited to 'plugins/NotesAndReminders/src')

diff --git a/plugins/NotesAndReminders/src/options.cpp b/plugins/NotesAndReminders/src/options.cpp
index 026d7e37a4..d85f1870d7 100644
--- a/plugins/NotesAndReminders/src/options.cpp
+++ b/plugins/NotesAndReminders/src/options.cpp
@@ -247,8 +247,6 @@ static int FS_ColorChanged(WPARAM wParam, LPARAM lParam)
 
 void RegisterFontServiceFonts()
 {
-	HDC hDC;
-	int nFontScale;
 	FontIDT fontid = {0};
 	ColourIDT colorid = {0};
 	char szTemp[100];
@@ -261,8 +259,8 @@ void RegisterFontServiceFonts()
 	strncpy(fontid.dbSettingsGroup, MODULENAME, SIZEOF(fontid.dbSettingsGroup));
 	fontid.flags = FIDF_ALLOWREREGISTER | FIDF_DEFAULTVALID | FIDF_SAVEPOINTSIZE;
 
-	hDC = GetDC(NULL);
-	nFontScale = GetDeviceCaps(hDC, LOGPIXELSY);
+	HDC hDC = GetDC(NULL);
+	int nFontScale = GetDeviceCaps(hDC, LOGPIXELSY);
 	ReleaseDC(NULL, hDC);
 
 	for (i = 0; i < SIZEOF(fontOptionsList); i++)
@@ -323,19 +321,15 @@ void LoadNRFont(int i, LOGFONT *lf, COLORREF *colour)
 
 static void TrimString(TCHAR *s)
 {
-	TCHAR *start;
-	TCHAR *end;
-	UINT n;
-
 	if (!s || !*s)
 	{
 		return;
 	}
 
-	start = s;
-	n = _tcslen(s) - 1;
+	TCHAR *start = s;
+	UINT n = _tcslen(s) - 1;
 
-	end = s + n;
+	TCHAR *end = s + n;
 
 	if (!_istspace(*start) && !_istspace(*end))
 	{
@@ -521,6 +515,7 @@ INT_PTR CALLBACK DlgProcOptions(HWND hdlg,UINT message,WPARAM wParam,LPARAM lPar
 				if ( GetOpenFileName(&ofn) )
 				{
 					SetDlgItemText(hdlg,IDC_EDIT_ALTBROWSER,s);
+					SendMessage(GetParent(hdlg), PSM_CHANGED, 0, 0);
 				}
 			}
 			break;
@@ -559,9 +554,27 @@ INT_PTR CALLBACK DlgProcOptions(HWND hdlg,UINT message,WPARAM wParam,LPARAM lPar
 				SendMessage(GetParent(hdlg), PSM_CHANGED, 0, 0); // JK optim
 				return TRUE;					
 			}
-		default:
-			SendMessage(GetParent(hdlg), PSM_CHANGED, 0, 0);
-			return TRUE;
+		case IDC_EDIT_ALTBROWSER:
+		case IDC_EDIT_EMAILSMS:
+		case IDC_EDIT_WIDTH:
+		case IDC_EDIT_HEIGHT:
+			if (HIWORD(wParam) == EN_CHANGE && (HWND)lParam == GetFocus())
+				SendMessage(GetParent(hdlg), PSM_CHANGED, 0, 0);
+			break;
+		case IDC_COMBODATE:
+		case IDC_COMBOTIME:
+			if (HIWORD(wParam) == CBN_SELCHANGE)
+				SendMessage(GetParent(hdlg), PSM_CHANGED, 0, 0);
+			break;
+		case IDC_CHECK_SCROLLBARS:
+		case IDC_CHECK_BUTTONS:
+		case IDC_CHECK_HIDENOTES:
+		case IDC_CHECK_MENUS:
+		case IDC_CHECK_CLOSE:
+		case IDC_CHECK_MSI:
+			if (HIWORD(wParam) == BN_CLICKED)
+				SendMessage(GetParent(hdlg), PSM_CHANGED, 0, 0);
+			break;
 		}
 	}
 	return FALSE;
diff --git a/plugins/NotesAndReminders/src/resource.h b/plugins/NotesAndReminders/src/resource.h
index 0ddf8b4031..e899809bc4 100644
--- a/plugins/NotesAndReminders/src/resource.h
+++ b/plugins/NotesAndReminders/src/resource.h
@@ -1,6 +1,6 @@
 //{{NO_DEPENDENCIES}}
 // Microsoft Visual C++ generated include file.
-// Used by resource.rc
+// Used by C:\Users\xx\Documents\Visual Studio 2010\Projects\myranda\plugins\NotesAndReminders\res\resource.rc
 //
 #define IDD_STNOTEOPTIONS               101
 #define IDD_ADDREMINDER                 102
@@ -20,10 +20,19 @@
 #define IDI_BRINGFRONT                  121
 #define IDI_PLAYSOUND                   122
 #define IDI_VIEWNOTES                   123
-
+#define IDC_CHECK_HIDENOTES             1010
+#define IDC_CHECK_MENUS                 1011
+#define IDC_EDIT_WIDTH                  1012
+#define IDC_EDIT_HEIGHT                 1013
+#define IDC_SLIDER_TRANSPARENCY         1014
+#define IDC_EDIT_EMAILSMS               1017
+#define IDC_CHECK_SCROLLBARS            1018
+#define IDC_CHECK_BUTTONS               1019
+#define IDC_CHECK_CLOSE                 1020
 #define IDC_COMBODATE                   1021
 #define IDC_COMBOTIME                   1022
 #define IDC_COMBOREMINDERTIME           1023
+#define IDC_CHECK_MSI                   1023
 #define IDC_REFTIME                     1024
 #define IDC_STATIC_DATE                 1025
 #define IDC_STATIC_TIME                 1026
-- 
cgit v1.2.3