more fixes for the options dialog

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

4 files changed, 77 insertions, 82 deletions

diff --git a/plugins/NotesAndReminders/res/resource.rc b/plugins/NotesAndReminders/res/resource.rc
index 4cf8708442..8435a2bb20 100644
--- a/plugins/NotesAndReminders/res/resource.rc
+++ b/plugins/NotesAndReminders/res/resource.rc
@@ -135,7 +135,7 @@ BEGIN
     LTEXT           "Open links with this program instead:",IDC_STATIC,5,228,125,8

     EDITTEXT        IDC_EDIT_ALTBROWSER,138,225,140,14,ES_AUTOHSCROLL

     PUSHBUTTON      "...",IDC_BTN_BROWSEBROWSER,280,225,15,15

-    PUSHBUTTON      "Reset to defaults",1007,32,140,94,14

+    PUSHBUTTON      "Reset to defaults",IDC_BUTTON_RESET,32,140,94,14

     CTEXT           "(Using MCI allows different sounds to be played simultaneously, may not be needed or desired when a custom sound plugin is installed.)",IDC_STATIC,172,111,119,43

 END

 

@@ -323,6 +323,18 @@ BEGIN
         VERTGUIDE, 291

         VERTGUIDE, 296

     END

+

+    IDD_ADDREMINDER, DIALOG

+    BEGIN

+    END

+

+    IDD_NOTIFYREMINDER, DIALOG

+    BEGIN

+    END

+

+    IDD_LISTREMINDERS, DIALOG

+    BEGIN

+    END

 END

 #endif    // APSTUDIO_INVOKED

 

diff --git a/plugins/NotesAndReminders/src/notes.cpp b/plugins/NotesAndReminders/src/notes.cpp
index 389bd0e904..c65a5092ee 100644
--- a/plugins/NotesAndReminders/src/notes.cpp
+++ b/plugins/NotesAndReminders/src/notes.cpp
@@ -978,11 +978,10 @@ __inline void JustSaveNotes(void)
 

 static int FindMenuItem(HMENU h, LPTSTR lpszName)

 {

-	int n;

 	UINT i;

 	TCHAR s[128];

 

-	n = GetMenuItemCount(h);

+	int n = GetMenuItemCount(h);

 

 	if (n <= 0)

 	{

@@ -1007,10 +1006,10 @@ static int FindMenuItem(HMENU h, LPTSTR lpszName)
 static BOOL DoContextMenu(HWND AhWnd,WPARAM wParam,LPARAM lParam)

 {

 	int n, i;

-	STICKYNOTE *SN = (STICKYNOTE*)GetProp(AhWnd,"ctrldata");

+	STICKYNOTE *SN = (STICKYNOTE*)GetProp(AhWnd,_T("ctrldata"));

 

 	HMENU hMenuLoad, FhMenu, hSub;

-	hMenuLoad = LoadMenu(hinstance,"MNU_NOTEPOPUP");

+	hMenuLoad = LoadMenu(hinstance,_T("MNU_NOTEPOPUP"));

 	FhMenu = GetSubMenu(hMenuLoad,0);

 

 	if (SN->OnTop)

@@ -1051,7 +1050,7 @@ static BOOL DoContextMenu(HWND AhWnd,WPARAM wParam,LPARAM lParam)
 static void MeasureColorPresetMenuItem(HWND hdlg, LPMEASUREITEMSTRUCT lpMeasureItem, struct ColorPreset *clrPresets)

 {

 	HDC hdc = GetDC(hdlg);

-	LPTSTR lpsz = TranslateT(clrPresets->szName);

+	LPTSTR lpsz = TranslateTS(clrPresets->szName);

 	SIZE sz;

 	GetTextExtentPoint32(hdc, lpsz, _tcslen(lpsz), &sz);

 	ReleaseDC(hdlg, hdc);

@@ -1197,11 +1196,10 @@ INT_PTR CALLBACK StickyNoteWndProc(HWND hdlg,UINT message,WPARAM wParam,LPARAM l
 

 	case WM_SIZE:

 		{

-			HWND H;

 			RECT SZ;

 

 			GetClientRect(hdlg,&SZ);

-			H = GetDlgItem(hdlg,1);

+			HWND H = GetDlgItem(hdlg,1);

 			MoveWindow(H, 0, 0, SZ.right,SZ.bottom, TRUE);

 

 			KillTimer(hdlg, 1025);

@@ -1212,7 +1210,7 @@ INT_PTR CALLBACK StickyNoteWndProc(HWND hdlg,UINT message,WPARAM wParam,LPARAM l
     case WM_TIMER:

 		if (wParam == 1025)

 		{

-			STICKYNOTE *SN = (STICKYNOTE*)GetProp(hdlg,"ctrldata");

+			STICKYNOTE *SN = (STICKYNOTE*)GetProp(hdlg,_T("ctrldata"));

 

 			KillTimer(hdlg, 1025);

 			JustSaveNotesEx(SN);

@@ -1226,14 +1224,14 @@ INT_PTR CALLBACK StickyNoteWndProc(HWND hdlg,UINT message,WPARAM wParam,LPARAM l
 		}

     case WM_CREATE:

 		{

-			STICKYNOTE *SN = (STICKYNOTE*)GetProp(hdlg,"ctrldata");

+			STICKYNOTE *SN = (STICKYNOTE*)GetProp(hdlg,_T("ctrldata"));

 

 			CREATESTRUCT *CS = (CREATESTRUCT *)lParam;

 			HWND H;

 			DWORD mystyle;

 

 			SN = (STICKYNOTE*)CS->lpCreateParams;

-			SetProp(hdlg,"ctrldata",(HANDLE)SN);

+			SetProp(hdlg,_T("ctrldata"),(HANDLE)SN);

 			BringWindowToTop(hdlg);

 			mystyle = WS_CHILD | WS_VISIBLE | ES_LEFT | ES_MULTILINE | ES_AUTOVSCROLL | ES_WANTRETURN;

 			if (g_ShowScrollbar) mystyle |= WS_VSCROLL;

@@ -1377,11 +1375,11 @@ INT_PTR CALLBACK StickyNoteWndProc(HWND hdlg,UINT message,WPARAM wParam,LPARAM l
 				Buff = (char*)malloc(PEnLnk->chrg.cpMax - PEnLnk->chrg.cpMin + 1);

 				SendDlgItemMessage(hdlg,1,EM_GETSELTEXT,0,(LPARAM)Buff);

 				if ((GetAsyncKeyState(VK_CONTROL) >> 15) != 0)

-					ShellExecute(hdlg,"open","iexplore",Buff,"",SW_SHOWNORMAL);

+					ShellExecute(hdlg,_T("open"),_T("iexplore"),Buff,_T(""),SW_SHOWNORMAL);

 				else if (g_lpszAltBrowser && *g_lpszAltBrowser)

-					ShellExecute(hdlg,"open",g_lpszAltBrowser,Buff,"",SW_SHOWNORMAL);

+					ShellExecute(hdlg,_T("open"),g_lpszAltBrowser,Buff,_T(""),SW_SHOWNORMAL);

 				else

-					ShellExecute(hdlg,"open",Buff,"","",SW_SHOWNORMAL);

+					ShellExecute(hdlg,_T("open"),Buff,_T(""),_T(""),SW_SHOWNORMAL);

 				SAFE_FREE((void**)&Buff);

 				return TRUE;

 			}

@@ -1473,7 +1471,7 @@ INT_PTR CALLBACK StickyNoteWndProc(HWND hdlg,UINT message,WPARAM wParam,LPARAM l
 		break;

 	case WM_COMMAND:

 		{

-			STICKYNOTE *SN = (STICKYNOTE*)GetProp(hdlg,"ctrldata");

+			STICKYNOTE *SN = (STICKYNOTE*)GetProp(hdlg,_T("ctrldata"));

 

 			HWND H;

 			UINT id;

@@ -1709,7 +1707,7 @@ INT_PTR CALLBACK StickyNoteWndProc(HWND hdlg,UINT message,WPARAM wParam,LPARAM l
 		}

 	case WM_NCDESTROY:

 		{

-			RemoveProp(hdlg, "ctrldata");

+			RemoveProp(hdlg, _T("ctrldata"));

 		}

 		break;

     case WM_CONTEXTMENU:

@@ -1914,7 +1912,7 @@ INT_PTR CALLBACK DlgProcViewNotes(HWND Dialog,UINT Message,WPARAM wParam,LPARAM
 {

     LV_COLUMN lvCol;

     NMLISTVIEW *NM;

-    char *S;

+    TCHAR *S;

     int I;

 

 	switch (Message)

@@ -1973,35 +1971,35 @@ INT_PTR CALLBACK DlgProcViewNotes(HWND Dialog,UINT Message,WPARAM wParam,LPARAM
 

 			TranslateDialogDefault(Dialog);

 

-			SetDlgItemText(Dialog,IDC_REMINDERDATA,"");

+			SetDlgItemText(Dialog,IDC_REMINDERDATA,_T(""));

 

 			H = GetDlgItem(Dialog,IDC_LISTREMINDERS);

 			lvCol.mask = LVCF_TEXT | LVCF_WIDTH;

 

-			S = Translate("Note text");

+			S = TranslateT("Note text");

 			lvCol.pszText = S;

-			lvCol.cchTextMax = strlen(S);

+			lvCol.cchTextMax = _tcslen(S);

 			lvCol.cx = g_notesListColGeom[3];

 			ListView_InsertColumn(H,0,&lvCol);

 			lvCol.mask = LVCF_TEXT | LVCF_WIDTH;

 

-			S = Translate("T");

+			S = TranslateT("T");

 			lvCol.pszText = S;

-			lvCol.cchTextMax = strlen(S);

+			lvCol.cchTextMax = _tcslen(S);

 			lvCol.cx = g_notesListColGeom[2];

 			ListView_InsertColumn(H,0,&lvCol);

 			lvCol.mask = LVCF_TEXT | LVCF_WIDTH;

 

-			S = Translate("V");

+			S = TranslateT("V");

 			lvCol.pszText = S;

 			lvCol.cchTextMax = strlen(S);

 			lvCol.cx = g_notesListColGeom[1];

 			ListView_InsertColumn(H,0,&lvCol);

 			lvCol.mask = LVCF_TEXT | LVCF_WIDTH;

 

-			S = Translate("Date/Title");

+			S = TranslateT("Date/Title");

 			lvCol.pszText = S;

-			lvCol.cchTextMax = strlen(S);

+			lvCol.cchTextMax = _tcslen(S);

 			lvCol.cx = g_notesListColGeom[0];

 			ListView_InsertColumn(H,0,&lvCol);

 

diff --git a/plugins/NotesAndReminders/src/options.cpp b/plugins/NotesAndReminders/src/options.cpp
index d85f1870d7..bb9739293a 100644
--- a/plugins/NotesAndReminders/src/options.cpp
+++ b/plugins/NotesAndReminders/src/options.cpp
@@ -1,28 +1,11 @@
 #include "globals.h"

 

-#ifndef OFN_DONTADDTORECENT

-#define OFN_DONTADDTORECENT          0x02000000

-#endif

 

 

 // min allowed alpha (don't want 0 because it's a waste of resources as well as might confuse user)

 #define MIN_ALPHA 30

 

 

-#define IDC_RESET 1007

-#define IDC_SHOWNOTES 1010

-#define IDC_ADDCONTACTMENU 1011

-#define IDC_NOTEWIDTH 1012

-#define IDC_NOTEHEIGHT 1013

-#define IDC_TRANSTRACK 1014

-#define IDC_REMINDEMAIL 1017

-#define IDC_SHOWSCROLLBAR 1018

-#define IDC_SHOWBUTTONS 1019

-#define IDC_ADDREMINDERCLOSES 1020

-#define IDC_USEMCI 1023

-#define PSM_CHANGED (WM_USER + 104)

-

-

 extern HANDLE hkFontChange;

 extern HANDLE hkColorChange;

 

@@ -371,16 +354,17 @@ INT_PTR CALLBACK DlgProcOptions(HWND hdlg,UINT message,WPARAM wParam,LPARAM lPar
 	case WM_INITDIALOG: 

 		{

 			TranslateDialogDefault(hdlg);

-			SendDlgItemMessage(hdlg,IDC_TRANSTRACK,TBM_SETRANGE,TRUE,MAKELONG(0,255-MIN_ALPHA));

-			SendDlgItemMessage(hdlg,IDC_TRANSTRACK,TBM_SETPOS,TRUE,255-g_Transparency);

-			SendDlgItemMessage(hdlg,IDC_SHOWNOTES,BM_SETCHECK,(WPARAM)!g_ShowNotesAtStart,0);

-			SendDlgItemMessage(hdlg,IDC_SHOWBUTTONS,BM_SETCHECK,(WPARAM)g_ShowNoteButtons,0);

-			SendDlgItemMessage(hdlg,IDC_SHOWSCROLLBAR,BM_SETCHECK,(WPARAM)g_ShowScrollbar,0); // 4.2

-			SendDlgItemMessage(hdlg,IDC_ADDCONTACTMENU,BM_SETCHECK,(WPARAM)g_AddContListMI,0);

-			SetDlgItemInt(hdlg,IDC_NOTEWIDTH,g_NoteWidth,FALSE);

-			SetDlgItemInt(hdlg,IDC_NOTEHEIGHT,g_NoteHeight,FALSE);

-			SendDlgItemMessage(hdlg,IDC_ADDREMINDERCLOSES,BM_SETCHECK,(WPARAM)g_CloseAfterAddReminder,0);

-			SendDlgItemMessage(hdlg,IDC_USEMCI,BM_SETCHECK,(WPARAM)!g_UseDefaultPlaySound,0);

+			SendDlgItemMessage(hdlg,IDC_SLIDER_TRANSPARENCY,TBM_SETRANGE,TRUE,MAKELONG(0,255-MIN_ALPHA));

+			SendDlgItemMessage(hdlg,IDC_SLIDER_TRANSPARENCY,TBM_SETPOS,TRUE,255-g_Transparency);

+			

+			CheckDlgButton(hdlg,IDC_CHECK_HIDENOTES,!g_ShowNotesAtStart);

+			CheckDlgButton(hdlg,IDC_CHECK_MENUS,g_AddContListMI);

+			CheckDlgButton(hdlg,IDC_CHECK_BUTTONS,g_ShowNoteButtons);

+			CheckDlgButton(hdlg,IDC_CHECK_SCROLLBARS,g_ShowScrollbar);

+			CheckDlgButton(hdlg,IDC_CHECK_CLOSE,g_CloseAfterAddReminder);

+			CheckDlgButton(hdlg,IDC_CHECK_MSI,!g_UseDefaultPlaySound);

+			SetDlgItemInt(hdlg,IDC_EDIT_WIDTH,g_NoteWidth,FALSE);

+			SetDlgItemInt(hdlg,IDC_EDIT_HEIGHT,g_NoteHeight,FALSE);

 

 			SendDlgItemMessage(hdlg,IDC_COMBODATE,CB_RESETCONTENT,0,0);

 			SendDlgItemMessage(hdlg,IDC_COMBOTIME,CB_RESETCONTENT,0,0);

@@ -395,14 +379,14 @@ INT_PTR CALLBACK DlgProcOptions(HWND hdlg,UINT message,WPARAM wParam,LPARAM lPar
 			SendDlgItemMessage(hdlg,IDC_COMBOTIME,CB_SETCURSEL,(WPARAM)(g_NoteTitleTime ? g_NoteTitleTime-1 : SendDlgItemMessage(hdlg,IDC_COMBOTIME,CB_GETCOUNT,0,0)-1),0);

 

 			if (g_RemindSMS) 

-				SetDlgItemText(hdlg,IDC_REMINDEMAIL,g_RemindSMS);

+				SetDlgItemText(hdlg,IDC_EDIT_EMAILSMS,g_RemindSMS);

 			else 

-				SetDlgItemText(hdlg,IDC_REMINDEMAIL,"");

+				SetDlgItemText(hdlg,IDC_EDIT_EMAILSMS,"");

 

 			SetDlgItemText(hdlg,IDC_EDIT_ALTBROWSER,g_lpszAltBrowser ? g_lpszAltBrowser : _T(""));

       if (!MySetLayeredWindowAttributes)

       { // layered UI not available

-        EnableWindow(GetDlgItem(hdlg,IDC_TRANSTRACK), FALSE);

+        EnableWindow(GetDlgItem(hdlg,IDC_SLIDER_TRANSPARENCY), FALSE);

       }

 			return TRUE;

 		}

@@ -414,32 +398,32 @@ INT_PTR CALLBACK DlgProcOptions(HWND hdlg,UINT message,WPARAM wParam,LPARAM lPar
 	case WM_NOTIFY:

 		if (((LPNMHDR)lParam)->code == PSN_APPLY)

 		{

-			g_ShowNotesAtStart = !(BOOL)SendDlgItemMessage(hdlg,IDC_SHOWNOTES,BM_GETCHECK,0,0);

-			g_ShowNoteButtons = (BOOL)SendDlgItemMessage(hdlg,IDC_SHOWBUTTONS,BM_GETCHECK,0,0);

-			g_ShowScrollbar = (BOOL)SendDlgItemMessage(hdlg,IDC_SHOWSCROLLBAR,BM_GETCHECK,0,0); // 4.2

-			g_AddContListMI = (BOOL)SendDlgItemMessage(hdlg,IDC_ADDCONTACTMENU,BM_GETCHECK,0,0);

-			g_NoteWidth = GetDlgItemInt(hdlg,IDC_NOTEWIDTH,&LB,FALSE);

-			g_NoteHeight = GetDlgItemInt(hdlg,IDC_NOTEHEIGHT,&LB,FALSE);

-			g_Transparency = 255-SendDlgItemMessage(hdlg,IDC_TRANSTRACK,TBM_GETPOS,0,0);

-			g_CloseAfterAddReminder = (BOOL)SendDlgItemMessage(hdlg,IDC_ADDREMINDERCLOSES,BM_GETCHECK,0,0);

-			g_UseDefaultPlaySound = !(BOOL)SendDlgItemMessage(hdlg,IDC_USEMCI,BM_GETCHECK,0,0);

+			g_ShowNotesAtStart = !(BOOL)IsDlgButtonChecked(hdlg,IDC_CHECK_HIDENOTES);

+			g_ShowNoteButtons = (BOOL)IsDlgButtonChecked(hdlg,IDC_CHECK_BUTTONS);

+			g_ShowScrollbar = (BOOL)IsDlgButtonChecked(hdlg,IDC_CHECK_SCROLLBARS);

+			g_AddContListMI = (BOOL)IsDlgButtonChecked(hdlg,IDC_CHECK_MENUS);

+			g_NoteWidth = GetDlgItemInt(hdlg,IDC_EDIT_WIDTH,&LB,FALSE);

+			g_NoteHeight = GetDlgItemInt(hdlg,IDC_EDIT_HEIGHT,&LB,FALSE);

+			g_Transparency = 255-SendDlgItemMessage(hdlg,IDC_SLIDER_TRANSPARENCY,TBM_GETPOS,0,0);

+			g_CloseAfterAddReminder = (BOOL)IsDlgButtonChecked(hdlg,IDC_CHECK_CLOSE);

+			g_UseDefaultPlaySound = !(BOOL)IsDlgButtonChecked(hdlg,IDC_CHECK_MSI);

 			g_NoteTitleDate = (SendDlgItemMessage(hdlg,IDC_COMBODATE,CB_GETCURSEL,0,0) + 1) % SendDlgItemMessage(hdlg,IDC_COMBODATE,CB_GETCOUNT,0,0);

 			g_NoteTitleTime = (SendDlgItemMessage(hdlg,IDC_COMBOTIME,CB_GETCURSEL,0,0) + 1) % SendDlgItemMessage(hdlg,IDC_COMBOTIME,CB_GETCOUNT,0,0);

 			if (g_NoteWidth < 179)

 			{

 				g_NoteWidth = 179;

-				SetDlgItemInt(hdlg,IDC_NOTEWIDTH,g_NoteWidth,FALSE);

+				SetDlgItemInt(hdlg,IDC_EDIT_WIDTH,g_NoteWidth,FALSE);

 			}

 			if (g_NoteHeight < 35) 

 			{

 				g_NoteHeight = 35;

-				SetDlgItemInt(hdlg,IDC_NOTEHEIGHT,g_NoteHeight,FALSE);

+				SetDlgItemInt(hdlg,IDC_EDIT_HEIGHT,g_NoteHeight,FALSE);

 			}

-			SzT = (WORD)SendDlgItemMessage(hdlg,IDC_REMINDEMAIL,WM_GETTEXTLENGTH,0,0);

+			SzT = (WORD)SendDlgItemMessage(hdlg,IDC_EDIT_EMAILSMS,WM_GETTEXTLENGTH,0,0);

 			if (SzT != 0) 

 			{

 				g_RemindSMS = (char*)realloc(g_RemindSMS,SzT+1);

-				SendDlgItemMessage(hdlg,IDC_REMINDEMAIL,WM_GETTEXT,SzT+1,(LPARAM)g_RemindSMS);

+				SendDlgItemMessage(hdlg,IDC_EDIT_EMAILSMS ,WM_GETTEXT,SzT+1,(LPARAM)g_RemindSMS);

 			}

 			P = g_RemindSMS;

 			WriteSettingBlob(0,MODULENAME,"RemindEmail",SzT,P);

@@ -469,7 +453,7 @@ INT_PTR CALLBACK DlgProcOptions(HWND hdlg,UINT message,WPARAM wParam,LPARAM lPar
 

 			WriteSettingInt(0,MODULENAME,"ShowNotesAtStart",g_ShowNotesAtStart);

 			WriteSettingInt(0,MODULENAME,"ShowNoteButtons",g_ShowNoteButtons);

-			WriteSettingInt(0,MODULENAME,"ShowScrollbar",g_ShowScrollbar); // 4.2

+			WriteSettingInt(0,MODULENAME,"ShowScrollbar",g_ShowScrollbar);

 			WriteSettingInt(0,MODULENAME,"AddContactMenuItems",g_AddContListMI);

 			WriteSettingInt(0,MODULENAME,"NoteWidth",g_NoteWidth);

 			WriteSettingInt(0,MODULENAME,"NoteHeight",g_NoteHeight);

@@ -519,10 +503,10 @@ INT_PTR CALLBACK DlgProcOptions(HWND hdlg,UINT message,WPARAM wParam,LPARAM lPar
 				}

 			}

 			break;

-		case IDC_RESET:

+		case IDC_BUTTON_RESET:

 			{

 				SAFE_FREE((void**)&g_RemindSMS);

-				SetDlgItemText(hdlg,IDC_REMINDEMAIL,_T(""));

+				SetDlgItemText(hdlg,IDC_EDIT_EMAILSMS,_T(""));

 				if (g_lpszAltBrowser)

 				{

 					mir_free(g_lpszAltBrowser);

@@ -531,26 +515,26 @@ INT_PTR CALLBACK DlgProcOptions(HWND hdlg,UINT message,WPARAM wParam,LPARAM lPar
 				SetDlgItemText(hdlg,IDC_EDIT_ALTBROWSER,_T(""));

 				g_ShowNotesAtStart = TRUE;

 				g_AddContListMI = TRUE;

-				g_ShowScrollbar = TRUE; // 4.2

+				g_ShowScrollbar = TRUE;

 				g_ShowNoteButtons = TRUE;

 				g_NoteTitleDate = 1;

 				g_NoteTitleTime = 1;

 				g_CloseAfterAddReminder = TRUE;

 				g_UseDefaultPlaySound = FALSE;

-				SendDlgItemMessage(hdlg,IDC_SHOWNOTES,BM_SETCHECK,!g_ShowNotesAtStart,0);

-				SendDlgItemMessage(hdlg,IDC_ADDCONTACTMENU,BM_SETCHECK,g_AddContListMI,0);

-				SendDlgItemMessage(hdlg,IDC_SHOWSCROLLBAR,BM_SETCHECK,g_ShowScrollbar,0);

-				SendDlgItemMessage(hdlg,IDC_SHOWBUTTONS,BM_SETCHECK,(WPARAM)g_ShowNoteButtons,0);

-				SendDlgItemMessage(hdlg,IDC_ADDREMINDERCLOSES,BM_SETCHECK,g_CloseAfterAddReminder,0);

-				SendDlgItemMessage(hdlg,IDC_USEMCI,BM_SETCHECK,!g_UseDefaultPlaySound,0);

+				CheckDlgButton(hdlg,IDC_CHECK_HIDENOTES,!g_ShowNotesAtStart);

+				CheckDlgButton(hdlg,IDC_CHECK_MENUS,g_AddContListMI);

+				CheckDlgButton(hdlg,IDC_CHECK_SCROLLBARS,g_ShowScrollbar);

+				CheckDlgButton(hdlg,IDC_CHECK_BUTTONS,g_ShowNoteButtons);

+				CheckDlgButton(hdlg,IDC_CHECK_CLOSE,g_CloseAfterAddReminder);

+				CheckDlgButton(hdlg,IDC_CHECK_MSI,!g_UseDefaultPlaySound);

 				SendDlgItemMessage(hdlg,IDC_COMBODATE,CB_SETCURSEL,(WPARAM)(g_NoteTitleDate-1),0);

 				SendDlgItemMessage(hdlg,IDC_COMBOTIME,CB_SETCURSEL,(WPARAM)(g_NoteTitleTime-1),0);

-				g_NoteWidth = 179; // 4.2

+				g_NoteWidth = 179;

 				g_NoteHeight = 35;

-				SetDlgItemInt(hdlg,IDC_NOTEWIDTH,g_NoteWidth,FALSE);

-				SetDlgItemInt(hdlg,IDC_NOTEHEIGHT,g_NoteHeight,FALSE);

+				SetDlgItemInt(hdlg,IDC_EDIT_WIDTH,g_NoteWidth,FALSE);

+				SetDlgItemInt(hdlg,IDC_EDIT_HEIGHT,g_NoteHeight,FALSE);

 				g_Transparency = 255;

-				SendDlgItemMessage(hdlg,IDC_TRANSTRACK,TBM_SETPOS,TRUE,0);

+				SendDlgItemMessage(hdlg,IDC_SLIDER_TRANSPARENCY,TBM_SETPOS,TRUE,0);

 				SendMessage(GetParent(hdlg), PSM_CHANGED, 0, 0); // JK optim

 				return TRUE;					

 			}

diff --git a/plugins/NotesAndReminders/src/resource.h b/plugins/NotesAndReminders/src/resource.h
index e899809bc4..d560498092 100644
--- a/plugins/NotesAndReminders/src/resource.h
+++ b/plugins/NotesAndReminders/src/resource.h
@@ -20,6 +20,7 @@
 #define IDI_BRINGFRONT                  121

 #define IDI_PLAYSOUND                   122

 #define IDI_VIEWNOTES                   123

+#define IDC_BUTTON_RESET                1007

 #define IDC_CHECK_HIDENOTES             1010

 #define IDC_CHECK_MENUS                 1011

 #define IDC_EDIT_WIDTH                  1012