NEN - URL support removed

4 files changed, 0 insertions, 46 deletions

diff --git a/plugins/NewEventNotify/res/resource.rc b/plugins/NewEventNotify/res/resource.rc
index 80f95577cd..68fa73ed46 100644
--- a/plugins/NewEventNotify/res/resource.rc
+++ b/plugins/NewEventNotify/res/resource.rc
@@ -40,13 +40,11 @@ BEGIN
                     BS_AUTOCHECKBOX | WS_TABSTOP,10,31,190,10

     GROUPBOX        "Popup options",IDC_STATIC,6,45,199,75

     LTEXT           "Message",IDC_STATIC,11,65,44,13

-    LTEXT           "URL",IDC_STATIC,11,78,44,13

     LTEXT           "File",IDC_STATIC,11,91,44,13

     LTEXT           "Others",IDC_STATIC,12,104,44,13

     LTEXT           "Text",IDC_STATIC,56,54,23,8

     CONTROL         "",IDC_COLTEXT_MESSAGE,"ColourPicker",WS_TABSTOP,56,65,

                     24,13

-    CONTROL         "",IDC_COLTEXT_URL,"ColourPicker",WS_TABSTOP,56,77,24,13

     CONTROL         "",IDC_COLTEXT_FILE,"ColourPicker",WS_TABSTOP,56,89,24,

                     13

     CONTROL         "",IDC_COLTEXT_OTHERS,"ColourPicker",WS_TABSTOP,56,101,

@@ -54,15 +52,12 @@ BEGIN
     LTEXT           "Background",IDC_STATIC,86,54,44,8

     CONTROL         "",IDC_COLBACK_MESSAGE,"ColourPicker",WS_TABSTOP,86,65,

                     24,13

-    CONTROL         "",IDC_COLBACK_URL,"ColourPicker",WS_TABSTOP,86,77,24,13

     CONTROL         "",IDC_COLBACK_FILE,"ColourPicker",WS_TABSTOP,86,89,24,

                     13

     CONTROL         "",IDC_COLBACK_OTHERS,"ColourPicker",WS_TABSTOP,86,101,

                     24,13

     CONTROL         "",IDC_CHKDEFAULTCOL_MESSAGE,"Button",BS_AUTOCHECKBOX | 

                     WS_TABSTOP,133,65,11,10

-    CONTROL         "",IDC_CHKDEFAULTCOL_URL,"Button",BS_AUTOCHECKBOX | 

-                    WS_TABSTOP,133,78,11,10

     CONTROL         "",IDC_CHKDEFAULTCOL_FILE,"Button",BS_AUTOCHECKBOX | 

                     WS_TABSTOP,133,91,11,10

     CONTROL         "",IDC_CHKDEFAULTCOL_OTHERS,"Button",BS_AUTOCHECKBOX | 

@@ -70,14 +65,11 @@ BEGIN
     CTEXT           "Timeout",IDC_STATIC,144,52,56,10

     EDITTEXT        IDC_DELAY_MESSAGE,155,62,26,13,ES_AUTOHSCROLL | 

                     ES_NUMBER

-    EDITTEXT        IDC_DELAY_URL,155,75,26,13,ES_AUTOHSCROLL | ES_NUMBER

     EDITTEXT        IDC_DELAY_FILE,155,88,26,13,ES_AUTOHSCROLL | ES_NUMBER

     EDITTEXT        IDC_DELAY_OTHERS,155,101,26,13,ES_AUTOHSCROLL | 

                     ES_NUMBER

     CONTROL         "",IDC_CHKINFINITE_MESSAGE,"Button",BS_AUTOCHECKBOX | 

                     WS_TABSTOP,185,65,11,10

-    CONTROL         "",IDC_CHKINFINITE_URL,"Button",BS_AUTOCHECKBOX | 

-                    WS_TABSTOP,185,78,11,10

     CONTROL         "",IDC_CHKINFINITE_FILE,"Button",BS_AUTOCHECKBOX | 

                     WS_TABSTOP,185,91,11,10

     CONTROL         "",IDC_CHKINFINITE_OTHERS,"Button",BS_AUTOCHECKBOX | 

@@ -85,8 +77,6 @@ BEGIN
     GROUPBOX        "Notify me of...",IDC_STATIC,208,2,100,56

     CONTROL         "Message",IDC_CHKNOTIFY_MESSAGE,"Button",BS_AUTOCHECKBOX | 

                     WS_TABSTOP,212,11,90,10

-    CONTROL         "URL",IDC_CHKNOTIFY_URL,"Button",BS_AUTOCHECKBOX | 

-                    WS_TABSTOP,212,22,90,10

     CONTROL         "File",IDC_CHKNOTIFY_FILE,"Button",BS_AUTOCHECKBOX | 

                     WS_TABSTOP,212,33,90,10

     CONTROL         "Others",IDC_CHKNOTIFY_OTHER,"Button",BS_AUTOCHECKBOX | 

diff --git a/plugins/NewEventNotify/src/options.cpp b/plugins/NewEventNotify/src/options.cpp
index 144e7aea7f..6ee731879b 100644
--- a/plugins/NewEventNotify/src/options.cpp
+++ b/plugins/NewEventNotify/src/options.cpp
@@ -32,13 +32,10 @@ void CMPlugin::OptionsRead(void)
 	bPreview = getByte(OPT_PREVIEW, TRUE);

 	bMenuitem = getByte(OPT_MENUITEM, FALSE);

 	bDefaultColorMsg = getByte(OPT_COLDEFAULT_MESSAGE, FALSE);

-	bDefaultColorUrl = getByte(OPT_COLDEFAULT_URL, FALSE);

 	bDefaultColorFile = getByte(OPT_COLDEFAULT_FILE, FALSE);

 	bDefaultColorOthers = getByte(OPT_COLDEFAULT_OTHERS, FALSE);

 	colBackMsg = getDword(OPT_COLBACK_MESSAGE, DEFAULT_COLBACK);

 	colTextMsg = getDword(OPT_COLTEXT_MESSAGE, DEFAULT_COLTEXT);

-	colBackUrl = getDword(OPT_COLBACK_URL, DEFAULT_COLBACK);

-	colTextUrl = getDword(OPT_COLTEXT_URL, DEFAULT_COLTEXT);

 	colBackFile = getDword(OPT_COLBACK_FILE, DEFAULT_COLBACK);

 	colTextFile = getDword(OPT_COLTEXT_FILE, DEFAULT_COLTEXT);

 	colBackOthers = getDword(OPT_COLBACK_OTHERS, DEFAULT_COLBACK);

@@ -51,7 +48,6 @@ void CMPlugin::OptionsRead(void)
 	bMsgReplyWindow = getByte(OPT_MSGREPLYWINDOW, FALSE);

 	bMergePopup = getByte(OPT_MERGEPOPUP, TRUE);

 	iDelayMsg = getDword(OPT_DELAY_MESSAGE, DEFAULT_DELAY);

-	iDelayUrl = getDword(OPT_DELAY_URL, DEFAULT_DELAY);

 	iDelayFile = getDword(OPT_DELAY_FILE, DEFAULT_DELAY);

 	iDelayOthers = getDword(OPT_DELAY_OTHERS, DEFAULT_DELAY);

 	iDelayDefault = DBGetContactSettingRangedWord(NULL, "Popup", "Seconds", SETTING_LIFETIME_DEFAULT, SETTING_LIFETIME_MIN, SETTING_LIFETIME_MAX);

@@ -71,13 +67,10 @@ void CMPlugin::OptionsWrite(void)
 	setByte(OPT_PREVIEW, bPreview);

 	setByte(OPT_MENUITEM, bMenuitem);

 	setByte(OPT_COLDEFAULT_MESSAGE, bDefaultColorMsg);

-	setByte(OPT_COLDEFAULT_URL, bDefaultColorUrl);

 	setByte(OPT_COLDEFAULT_FILE, bDefaultColorFile);

 	setByte(OPT_COLDEFAULT_OTHERS, bDefaultColorOthers);

 	setDword(OPT_COLBACK_MESSAGE, colBackMsg);

 	setDword(OPT_COLTEXT_MESSAGE, colTextMsg);

-	setDword(OPT_COLBACK_URL, colBackUrl);

-	setDword(OPT_COLTEXT_URL, colTextUrl);

 	setDword(OPT_COLBACK_FILE, colBackFile);

 	setDword(OPT_COLTEXT_FILE, colTextFile);

 	setDword(OPT_COLBACK_OTHERS, colBackOthers);

@@ -90,7 +83,6 @@ void CMPlugin::OptionsWrite(void)
 	setByte(OPT_MSGREPLYWINDOW, bMsgReplyWindow);

 	setByte(OPT_MERGEPOPUP, bMergePopup);

 	setDword(OPT_DELAY_MESSAGE, iDelayMsg);

-	setDword(OPT_DELAY_URL, iDelayUrl);

 	setDword(OPT_DELAY_FILE, iDelayFile);

 	setDword(OPT_DELAY_OTHERS, iDelayOthers);

 	setByte(OPT_SHOW_DATE, bShowDate);

@@ -118,8 +110,6 @@ static void UpdateOptionsDlgItemsState(HWND hWnd)
 	//disable color picker when using default colors

 	EnableDlgItem(hWnd, IDC_COLBACK_MESSAGE, !g_plugin.bDefaultColorMsg);

 	EnableDlgItem(hWnd, IDC_COLTEXT_MESSAGE, !g_plugin.bDefaultColorMsg);

-	EnableDlgItem(hWnd, IDC_COLBACK_URL, !g_plugin.bDefaultColorUrl);

-	EnableDlgItem(hWnd, IDC_COLTEXT_URL, !g_plugin.bDefaultColorUrl);

 	EnableDlgItem(hWnd, IDC_COLBACK_FILE, !g_plugin.bDefaultColorFile);

 	EnableDlgItem(hWnd, IDC_COLTEXT_FILE, !g_plugin.bDefaultColorFile);

 	EnableDlgItem(hWnd, IDC_COLBACK_OTHERS, !g_plugin.bDefaultColorOthers);

@@ -135,7 +125,6 @@ static void UpdateOptionsDlgItemsState(HWND hWnd)
 	EnableDlgItem(hWnd, IDC_RDOLD, g_plugin.bMergePopup && g_plugin.iNumberMsg);

 	//disable delay textbox when infinite is checked

 	EnableDlgItem(hWnd, IDC_DELAY_MESSAGE, g_plugin.iDelayMsg != -1);

-	EnableDlgItem(hWnd, IDC_DELAY_URL, g_plugin.iDelayUrl != -1);

 	EnableDlgItem(hWnd, IDC_DELAY_FILE, g_plugin.iDelayFile != -1);

 	EnableDlgItem(hWnd, IDC_DELAY_OTHERS, g_plugin.iDelayOthers != -1);

 }

@@ -149,14 +138,11 @@ static INT_PTR CALLBACK OptionsDlgProc(HWND hWnd, UINT message, WPARAM wParam, L
 		bWmNotify = TRUE;

 		SendDlgItemMessage(hWnd, IDC_COLBACK_MESSAGE, CPM_SETCOLOUR, 0, g_plugin.colBackMsg);

 		SendDlgItemMessage(hWnd, IDC_COLTEXT_MESSAGE, CPM_SETCOLOUR, 0, g_plugin.colTextMsg);

-		SendDlgItemMessage(hWnd, IDC_COLBACK_URL, CPM_SETCOLOUR, 0, g_plugin.colBackUrl);

-		SendDlgItemMessage(hWnd, IDC_COLTEXT_URL, CPM_SETCOLOUR, 0, g_plugin.colTextUrl);

 		SendDlgItemMessage(hWnd, IDC_COLBACK_FILE, CPM_SETCOLOUR, 0, g_plugin.colBackFile);

 		SendDlgItemMessage(hWnd, IDC_COLTEXT_FILE, CPM_SETCOLOUR, 0, g_plugin.colTextFile);

 		SendDlgItemMessage(hWnd, IDC_COLBACK_OTHERS, CPM_SETCOLOUR, 0, g_plugin.colBackOthers);

 		SendDlgItemMessage(hWnd, IDC_COLTEXT_OTHERS, CPM_SETCOLOUR, 0, g_plugin.colTextOthers);

 		SetCheckBoxState(hWnd, IDC_CHKDEFAULTCOL_MESSAGE, g_plugin.bDefaultColorMsg);

-		SetCheckBoxState(hWnd, IDC_CHKDEFAULTCOL_URL, g_plugin.bDefaultColorUrl);

 		SetCheckBoxState(hWnd, IDC_CHKDEFAULTCOL_FILE, g_plugin.bDefaultColorFile);

 		SetCheckBoxState(hWnd, IDC_CHKDEFAULTCOL_OTHERS, g_plugin.bDefaultColorOthers);

 		SetCheckBoxState(hWnd, IDC_CHKMENUITEM, g_plugin.bMenuitem);

@@ -164,7 +150,6 @@ static INT_PTR CALLBACK OptionsDlgProc(HWND hWnd, UINT message, WPARAM wParam, L
 		SetCheckBoxState(hWnd, IDC_CHKPREVIEW, g_plugin.bPreview);

 		SetCheckBoxState(hWnd, IDC_CHKMERGEPOPUP, g_plugin.bMergePopup);

 		SetCheckBoxState(hWnd, IDC_CHKNOTIFY_MESSAGE, g_plugin.maskNotify & MASK_MESSAGE);

-		SetCheckBoxState(hWnd, IDC_CHKNOTIFY_URL, g_plugin.maskNotify & MASK_URL);

 		SetCheckBoxState(hWnd, IDC_CHKNOTIFY_FILE, g_plugin.maskNotify & MASK_FILE);

 		SetCheckBoxState(hWnd, IDC_CHKNOTIFY_OTHER, g_plugin.maskNotify & MASK_OTHER);

 		SetCheckBoxState(hWnd, IDC_CHKACTL_DISMISS, g_plugin.maskActL & MASK_DISMISS);

@@ -187,11 +172,9 @@ static INT_PTR CALLBACK OptionsDlgProc(HWND hWnd, UINT message, WPARAM wParam, L
 		SetCheckBoxState(hWnd, IDC_SUPRESSRSS, g_plugin.bNoRSS);

 		SetCheckBoxState(hWnd, IDC_READCHECK, g_plugin.bReadCheck);

 		SetCheckBoxState(hWnd, IDC_CHKINFINITE_MESSAGE, g_plugin.iDelayMsg == -1);

-		SetCheckBoxState(hWnd, IDC_CHKINFINITE_URL, g_plugin.iDelayUrl == -1);

 		SetCheckBoxState(hWnd, IDC_CHKINFINITE_FILE, g_plugin.iDelayFile == -1);

 		SetCheckBoxState(hWnd, IDC_CHKINFINITE_OTHERS, g_plugin.iDelayOthers == -1);

 		SetDlgItemInt(hWnd, IDC_DELAY_MESSAGE, g_plugin.iDelayMsg != -1 ? g_plugin.iDelayMsg : 0, TRUE);

-		SetDlgItemInt(hWnd, IDC_DELAY_URL, g_plugin.iDelayUrl != -1 ? g_plugin.iDelayUrl : 0, TRUE);

 		SetDlgItemInt(hWnd, IDC_DELAY_FILE, g_plugin.iDelayFile != -1 ? g_plugin.iDelayFile : 0, TRUE);

 		SetDlgItemInt(hWnd, IDC_DELAY_OTHERS, g_plugin.iDelayOthers != -1 ? g_plugin.iDelayOthers : 0, TRUE);

 		SetDlgItemInt(hWnd, IDC_NUMBERMSG, g_plugin.iNumberMsg, FALSE);

@@ -209,7 +192,6 @@ static INT_PTR CALLBACK OptionsDlgProc(HWND hWnd, UINT message, WPARAM wParam, L
 			default:

 				//update options

 				g_plugin.maskNotify = (IsDlgButtonChecked(hWnd, IDC_CHKNOTIFY_MESSAGE) ? MASK_MESSAGE : 0) |

-					(IsDlgButtonChecked(hWnd, IDC_CHKNOTIFY_URL) ? MASK_URL : 0) |

 					(IsDlgButtonChecked(hWnd, IDC_CHKNOTIFY_FILE) ? MASK_FILE : 0) |

 					(IsDlgButtonChecked(hWnd, IDC_CHKNOTIFY_OTHER) ? MASK_OTHER : 0);

 				g_plugin.maskActL = (IsDlgButtonChecked(hWnd, IDC_CHKACTL_DISMISS) ? MASK_DISMISS : 0) |

@@ -222,14 +204,12 @@ static INT_PTR CALLBACK OptionsDlgProc(HWND hWnd, UINT message, WPARAM wParam, L
 					(IsDlgButtonChecked(hWnd, IDC_CHKACTTE_OPEN) ? MASK_OPEN : 0) |

 					(IsDlgButtonChecked(hWnd, IDC_CHKACTTE_REMOVE) ? MASK_REMOVE : 0);

 				g_plugin.bDefaultColorMsg = IsDlgButtonChecked(hWnd, IDC_CHKDEFAULTCOL_MESSAGE);

-				g_plugin.bDefaultColorUrl = IsDlgButtonChecked(hWnd, IDC_CHKDEFAULTCOL_URL);

 				g_plugin.bDefaultColorFile = IsDlgButtonChecked(hWnd, IDC_CHKDEFAULTCOL_FILE);

 				g_plugin.bDefaultColorOthers = IsDlgButtonChecked(hWnd, IDC_CHKDEFAULTCOL_OTHERS);

 				g_plugin.bMenuitem = IsDlgButtonChecked(hWnd, IDC_CHKMENUITEM);

 				g_plugin.bDisable = IsDlgButtonChecked(hWnd, IDC_CHKDISABLE);

 				g_plugin.bPreview = IsDlgButtonChecked(hWnd, IDC_CHKPREVIEW);

 				g_plugin.iDelayMsg = IsDlgButtonChecked(hWnd, IDC_CHKINFINITE_MESSAGE) ? -1 : (DWORD)GetDlgItemInt(hWnd, IDC_DELAY_MESSAGE, nullptr, FALSE);

-				g_plugin.iDelayUrl = IsDlgButtonChecked(hWnd, IDC_CHKINFINITE_URL) ? -1 : (DWORD)GetDlgItemInt(hWnd, IDC_DELAY_URL, nullptr, FALSE);

 				g_plugin.iDelayFile = IsDlgButtonChecked(hWnd, IDC_CHKINFINITE_FILE) ? -1 : (DWORD)GetDlgItemInt(hWnd, IDC_DELAY_FILE, nullptr, FALSE);

 				g_plugin.iDelayOthers = IsDlgButtonChecked(hWnd, IDC_CHKINFINITE_OTHERS) ? -1 : (DWORD)GetDlgItemInt(hWnd, IDC_DELAY_OTHERS, nullptr, FALSE);

 				g_plugin.bMergePopup = IsDlgButtonChecked(hWnd, IDC_CHKMERGEPOPUP);

@@ -249,8 +229,6 @@ static INT_PTR CALLBACK OptionsDlgProc(HWND hWnd, UINT message, WPARAM wParam, L
 				if (HIWORD(wParam) == CPN_COLOURCHANGED) {

 					g_plugin.colBackMsg = SendDlgItemMessage(hWnd, IDC_COLBACK_MESSAGE, CPM_GETCOLOUR, 0, 0);

 					g_plugin.colTextMsg = SendDlgItemMessage(hWnd, IDC_COLTEXT_MESSAGE, CPM_GETCOLOUR, 0, 0);

-					g_plugin.colBackUrl = SendDlgItemMessage(hWnd, IDC_COLBACK_URL, CPM_GETCOLOUR, 0, 0);

-					g_plugin.colTextUrl = SendDlgItemMessage(hWnd, IDC_COLTEXT_URL, CPM_GETCOLOUR, 0, 0);

 					g_plugin.colBackFile = SendDlgItemMessage(hWnd, IDC_COLBACK_FILE, CPM_GETCOLOUR, 0, 0);

 					g_plugin.colTextFile = SendDlgItemMessage(hWnd, IDC_COLTEXT_FILE, CPM_GETCOLOUR, 0, 0);

 					g_plugin.colBackOthers = SendDlgItemMessage(hWnd, IDC_COLBACK_OTHERS, CPM_GETCOLOUR, 0, 0);

diff --git a/plugins/NewEventNotify/src/resource.h b/plugins/NewEventNotify/src/resource.h
index f0bd14a536..679a27ed70 100644
--- a/plugins/NewEventNotify/src/resource.h
+++ b/plugins/NewEventNotify/src/resource.h
@@ -8,7 +8,6 @@
 #define IDI_DISABLED                    107

 #define IDC_PREVIEW                     1000

 #define IDC_CHKNOTIFY_MESSAGE           1001

-#define IDC_CHKNOTIFY_URL               1002

 #define IDC_CHKNOTIFY_FILE              1003

 #define IDC_CHKNOTIFY_OTHER             1004

 #define IDC_CHKMENUITEM                 1005

@@ -27,9 +26,6 @@
 #define IDC_CHKDEFAULTCOL_MESSAGE       1017

 #define IDC_COLBACK_MESSAGE             1018

 #define IDC_COLTEXT_MESSAGE             1019

-#define IDC_CHKDEFAULTCOL_URL           1020

-#define IDC_COLBACK_URL                 1021

-#define IDC_COLTEXT_URL                 1022

 #define IDC_CHKDEFAULTCOL_FILE          1023

 #define IDC_COLBACK_FILE                1024

 #define IDC_COLTEXT_FILE                1025

@@ -40,7 +36,6 @@
 #define IDC_CHKINFINITE_MESSAGE         1029

 #define IDC_CHKMERGEPOPUP               1030

 #define IDC_DELAY_MESSAGE               1031

-#define IDC_DELAY_URL                   1032

 #define IDC_DELAY_FILE                  1033

 #define IDC_DELAY_OTHERS                1034

 #define IDC_NUMBERMSG                   1035

@@ -50,7 +45,6 @@
 #define IDC_RDNEW                       1039

 #define IDC_RDOLD                       1040

 #define IDC_LBNUMBERMSG                 1041

-#define IDC_CHKINFINITE_URL             1042

 #define IDC_CHKINFINITE_FILE            1043

 #define IDC_CHKINFINITE_OTHERS          1044

 #define IDC_CHKMERGEPOPUP2              1045

diff --git a/plugins/NewEventNotify/src/stdafx.h b/plugins/NewEventNotify/src/stdafx.h
index 249bbb3607..74b02b059e 100644
--- a/plugins/NewEventNotify/src/stdafx.h
+++ b/plugins/NewEventNotify/src/stdafx.h
@@ -94,9 +94,6 @@
 #define OPT_COLDEFAULT_MESSAGE "DefaultColorMsg"

 #define OPT_COLBACK_MESSAGE "ColorBackMsg"

 #define OPT_COLTEXT_MESSAGE "ColorTextMsg"

-#define OPT_COLDEFAULT_URL "DefaultColorUrl"

-#define OPT_COLBACK_URL "ColorBackUrl"

-#define OPT_COLTEXT_URL "ColorTextUrl"

 #define OPT_COLDEFAULT_FILE "DefaultColorFile"

 #define OPT_COLBACK_FILE "ColorBackFile"

 #define OPT_COLTEXT_FILE "ColorTextFile"

@@ -111,7 +108,6 @@
 #define OPT_MSGREPLYWINDOW "ReplyWindow"

 #define OPT_MERGEPOPUP "MergePopup"

 #define OPT_DELAY_MESSAGE "DelayMessage"

-#define OPT_DELAY_URL "DelayUrl"

 #define OPT_DELAY_FILE "DelayFile"

 #define OPT_DELAY_OTHERS "DelayOthers"

 #define OPT_SHOW_DATE "ShowDate"

@@ -161,13 +157,10 @@ struct CMPlugin : public PLUGIN<CMPlugin>
 	BOOL bPreview;

 	BOOL bMenuitem;

 	BOOL bDefaultColorMsg;

-	BOOL bDefaultColorUrl;

 	BOOL bDefaultColorFile;

 	BOOL bDefaultColorOthers;

 	COLORREF colBackMsg;

 	COLORREF colTextMsg;

-	COLORREF colBackUrl;

-	COLORREF colTextUrl;

 	COLORREF colBackFile;

 	COLORREF colTextFile;

 	COLORREF colBackOthers;

@@ -179,7 +172,6 @@ struct CMPlugin : public PLUGIN<CMPlugin>
 	BOOL bMsgWindowCheck;

 	BOOL bMsgReplyWindow;

 	int iDelayMsg;

-	int iDelayUrl;

 	int iDelayFile;

 	int iDelayOthers;

 	int iDelayDefault;