MirandaG15: URL setting removed

4 files changed, 90 insertions, 98 deletions

diff --git a/plugins/MirandaG15/res/MirandaG15.rc b/plugins/MirandaG15/res/MirandaG15.rc
index 26ecd26849..c6de0b1e4c 100644
--- a/plugins/MirandaG15/res/MirandaG15.rc
+++ b/plugins/MirandaG15/res/MirandaG15.rc
@@ -121,7 +121,6 @@ BEGIN
     CONTROL         "Incoming messages",IDC_NOTIFY_MESSAGES,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,94,138,94,13

     CONTROL         "Contact signs off",IDC_NOTIFY_SIGNOFF,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,194,166,100,13

     CONTROL         "Contact changes status",IDC_NOTIFY_STATUS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,194,177,100,13

-    CONTROL         "Incoming URL",IDC_NOTIFY_URL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,194,132,100,13

     CONTROL         "Contact list events",IDC_NOTIFY_CONTACTS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,194,188,100,13

     CONTROL         "Incoming file transfers",IDC_NOTIFY_FILE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,194,144,100,13

     CONTROL         "Protocol disconnected",IDC_NOTIFY_PROTO_SIGNOFF,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,194,199,102,13

diff --git a/plugins/MirandaG15/src/CConfig.cpp b/plugins/MirandaG15/src/CConfig.cpp
index 8f2c452d84..3c630eb4e9 100644
--- a/plugins/MirandaG15/src/CConfig.cpp
+++ b/plugins/MirandaG15/src/CConfig.cpp
@@ -76,7 +76,6 @@ void CConfig::LoadSettings()
 	m_abBoolSettings[NOTIFY_SKIP_SIGNOFF] = db_get_dw(0, "MirandaG15", "NotifySkipSignOff", 0) != 0;

 	m_abBoolSettings[NOTIFY_SKIP_STATUS] = db_get_dw(0, "MirandaG15", "NotifySkipStatus", 1) != 0;

 	m_abBoolSettings[NOTIFY_NO_SKIP_REPLY] = db_get_dw(0, "MirandaG15", "NotifyNoSkipReply", 1) != 0;

-	m_abBoolSettings[NOTIFY_URL] = db_get_dw(0, "MirandaG15", "NotifyURL", 1) != 0;

 	m_abBoolSettings[NOTIFY_FILE] = db_get_dw(0, "MirandaG15", "NotifyFile", 1) != 0;

 	m_abBoolSettings[NOTIFY_CONTACTS] = db_get_dw(0, "MirandaG15", "NotifyContacts", 1) != 0;

 

@@ -174,7 +173,6 @@ void CConfig::SaveSettings()
 	db_set_dw(0, "MirandaG15", "NotifySkipSignOff", m_abBoolSettings[NOTIFY_SKIP_SIGNOFF]);

 	db_set_dw(0, "MirandaG15", "NotifySkipStatus", m_abBoolSettings[NOTIFY_SKIP_STATUS]);

 	db_set_dw(0, "MirandaG15", "NotifyNoSkipReply", m_abBoolSettings[NOTIFY_NO_SKIP_REPLY]);

-	db_set_dw(0, "MirandaG15", "NotifyURL", m_abBoolSettings[NOTIFY_URL]);

 	db_set_dw(0, "MirandaG15", "NotifyFile", m_abBoolSettings[NOTIFY_FILE]);

 	db_set_dw(0, "MirandaG15", "NotifyContacts", m_abBoolSettings[NOTIFY_CONTACTS]);

 

@@ -598,7 +596,6 @@ INT_PTR CALLBACK CConfig::NotificationsDlgProc(HWND hwndDlg, UINT uMsg, WPARAM w
 			CheckDlgButton(hwndDlg, IDC_NOTIFY_MESSAGES, m_abBoolSettings[NOTIFY_MESSAGES] ? BST_CHECKED : BST_UNCHECKED);

 			CheckDlgButton(hwndDlg, IDC_NOTIFY_FILE, m_abBoolSettings[NOTIFY_FILE] ? BST_CHECKED : BST_UNCHECKED);

 			CheckDlgButton(hwndDlg, IDC_NOTIFY_CONTACTS, m_abBoolSettings[NOTIFY_CONTACTS] ? BST_CHECKED : BST_UNCHECKED);

-			CheckDlgButton(hwndDlg, IDC_NOTIFY_URL, m_abBoolSettings[NOTIFY_URL] ? BST_CHECKED : BST_UNCHECKED);

 

 			CheckDlgButton(hwndDlg, IDC_NOTIFY_NO_SKIP_REPLY, m_abBoolSettings[NOTIFY_NO_SKIP_REPLY] ? BST_CHECKED : BST_UNCHECKED);

 			CheckDlgButton(hwndDlg, IDC_NOTIFY_SKIP_SIGNON, m_abBoolSettings[NOTIFY_SKIP_SIGNON] ? BST_CHECKED : BST_UNCHECKED);

@@ -671,7 +668,6 @@ INT_PTR CALLBACK CConfig::NotificationsDlgProc(HWND hwndDlg, UINT uMsg, WPARAM w
 					m_abBoolSettings[NOTIFY_SIGNON] = IsDlgButtonChecked(hwndDlg, IDC_NOTIFY_SIGNON) == BST_CHECKED ? true : false;

 					m_abBoolSettings[NOTIFY_SIGNOFF] = IsDlgButtonChecked(hwndDlg, IDC_NOTIFY_SIGNOFF) == BST_CHECKED ? true : false;

 					m_abBoolSettings[NOTIFY_STATUS] = IsDlgButtonChecked(hwndDlg, IDC_NOTIFY_STATUS) == BST_CHECKED ? true : false;

-					m_abBoolSettings[NOTIFY_URL] = IsDlgButtonChecked(hwndDlg, IDC_NOTIFY_URL) == BST_CHECKED ? true : false;

 					m_abBoolSettings[NOTIFY_FILE] = IsDlgButtonChecked(hwndDlg, IDC_NOTIFY_FILE) == BST_CHECKED ? true : false;

 					m_abBoolSettings[NOTIFY_CONTACTS] = IsDlgButtonChecked(hwndDlg, IDC_NOTIFY_CONTACTS) == BST_CHECKED ? true : false;

 

diff --git a/plugins/MirandaG15/src/CConfig.h b/plugins/MirandaG15/src/CConfig.h
index e35b68f772..ccc426dc22 100644
--- a/plugins/MirandaG15/src/CConfig.h
+++ b/plugins/MirandaG15/src/CConfig.h
@@ -2,103 +2,102 @@
 #define _CCONFIG_H_

 

 // Tabs

-#define TAB_OPTIONS 0

-#define TAB_NOTIFICATIONS 1

-#define TAB_CHAT 2

-#define TAB_CLIST 3

-

-// Fonts

-#define FONT_LOG 0

-#define FONT_SESSION 1

-#define FONT_CLIST 2

-#define FONT_TITLE 3

-#define FONT_NOTIFICATION 4

-

-#define FONT_SETTINGS 5

+#define TAB_OPTIONS                 0

+#define TAB_NOTIFICATIONS           1

+#define TAB_CHAT                    2

+#define TAB_CLIST                   3

+									     

+// Fonts							     

+#define FONT_LOG                    0

+#define FONT_SESSION                1

+#define FONT_CLIST                  2

+#define FONT_TITLE                  3					 

+#define FONT_NOTIFICATION           4

+									     

+#define FONT_SETTINGS               5

 

 // Bool settings

-#define CLIST_HIDEOFFLINE 0

-#define NOTIFY_MESSAGES 1

-#define NOTIFY_SIGNON 2

-#define NOTIFY_SIGNOFF 3

-#define NOTIFY_STATUS 4

-#define SESSION_LOADDB 5

-#define SHOW_LABELS 6

-#define SESSION_MARKREAD 7

-#define NOTIFY_CONTACTS 8

-#define NOTIFY_FILE 9

-#define NOTIFY_URL 10

-#define SESSION_SENDRETURN 11

-#define NOTIFY_PROTO_STATUS 12

-#define SESSION_SHOWTYPING 13

-#define SESSION_SENDTYPING 14

-#define SESSION_SCROLL_MAXIMIZED 15

-#define SESSION_REPLY_MAXIMIZED 16

-#define MAXIMIZED_TITLE 17

-#define MAXIMIZED_LABELS 18

-#define CLIST_USEGROUPS 19

-#define CLIST_USEIGNORE 20

-#define NOTIFY_PROTO_SIGNON 21

-#define NOTIFY_PROTO_SIGNOFF 22

-#define CLIST_SHOWPROTO 23

-#define SESSION_SYMBOLS 24

-#define CLIST_COUNTERS 24

-#define CLIST_DRAWLINES 25

-#define CLIST_POSITION 26

-#define CONTROL_BACKLIGHTS 28

-#define HOOK_VOLUMEWHEEL 29

-#define NOTIFY_SKIP_MESSAGES 30

-#define NOTIFY_SKIP_STATUS 31

-#define NOTIFY_SKIP_SIGNON 32

-#define NOTIFY_SKIP_SIGNOFF 33

-#define SESSION_TIMESTAMPS 34

-#define NOTIFY_TIMESTAMPS 35

-#define TIMESTAMP_SECONDS 36

-#define NOTIFY_IRC_MESSAGES 37

-#define NOTIFY_IRC_USERS 38

-#define NOTIFY_IRC_EMOTES 39

-#define NOTIFY_IRC_NOTICES 40

-#define NOTIFY_IRC_CHANNEL 41

-#define NOTIFY_IRC_STATUS 42

-#define CLIST_COLUMNS 43

-#define TRANSITIONS 44

-#define NOTIFY_NICKCUTOFF 45

-#define NOTIFY_SHOWPROTO 46

-#define NOTIFY_NO_SKIP_REPLY 47

-#define CLIST_SELECTION 48

-#define NOTIFY_CHANNELCUTOFF 49

-#define SCREENSAVER_LOCK 50

-#define SESSION_CLOSE 52

-#define SKIP_DRIVER_ERROR 53

-

-#define BOOL_SETTINGS 54

+#define CLIST_HIDEOFFLINE           0

+#define NOTIFY_MESSAGES             1

+#define NOTIFY_SIGNON               2

+#define NOTIFY_SIGNOFF              3

+#define NOTIFY_STATUS               4

+#define SESSION_LOADDB              5

+#define SHOW_LABELS                 6

+#define SESSION_MARKREAD            7

+#define NOTIFY_CONTACTS             8

+#define NOTIFY_FILE                 9

+#define SESSION_SENDRETURN         10

+#define NOTIFY_PROTO_STATUS        11

+#define SESSION_SHOWTYPING         12

+#define SESSION_SENDTYPING         13

+#define SESSION_SCROLL_MAXIMIZED   14

+#define SESSION_REPLY_MAXIMIZED    15

+#define MAXIMIZED_TITLE            16

+#define MAXIMIZED_LABELS           17

+#define CLIST_USEGROUPS            18

+#define CLIST_USEIGNORE            19

+#define NOTIFY_PROTO_SIGNON        20

+#define NOTIFY_PROTO_SIGNOFF       21

+#define CLIST_SHOWPROTO            22

+#define SESSION_SYMBOLS            23

+#define CLIST_COUNTERS             24

+#define CLIST_DRAWLINES            25

+#define CLIST_POSITION             26

+#define CONTROL_BACKLIGHTS         27

+#define HOOK_VOLUMEWHEEL           28

+#define NOTIFY_SKIP_MESSAGES       29

+#define NOTIFY_SKIP_STATUS         30

+#define NOTIFY_SKIP_SIGNON         31

+#define NOTIFY_SKIP_SIGNOFF        32

+#define SESSION_TIMESTAMPS         33

+#define NOTIFY_TIMESTAMPS          34		  

+#define TIMESTAMP_SECONDS          35

+#define NOTIFY_IRC_MESSAGES        36

+#define NOTIFY_IRC_USERS           37

+#define NOTIFY_IRC_EMOTES          38

+#define NOTIFY_IRC_NOTICES         39

+#define NOTIFY_IRC_CHANNEL         40

+#define NOTIFY_IRC_STATUS          41

+#define CLIST_COLUMNS              42

+#define TRANSITIONS                43

+#define NOTIFY_NICKCUTOFF          44

+#define NOTIFY_SHOWPROTO           45

+#define NOTIFY_NO_SKIP_REPLY       46

+#define CLIST_SELECTION            47

+#define NOTIFY_CHANNELCUTOFF       48

+#define SCREENSAVER_LOCK           49

+#define SESSION_CLOSE              50

+#define SKIP_DRIVER_ERROR          52

+

+#define BOOL_SETTINGS              53

 

 // Int Settings

-#define SESSION_LOGSIZE 0

-#define NOTIFY_LOGSIZE 1

-#define NOTIFY_DURATION 2

-#define NOTIFY_TITLE 3

-#define SESSION_AUTOSCROLL 4

-#define CLIST_GA 5

-#define NOTIFY_NICKCUTOFF_OFFSET 6

-#define DEVICE 7

+#define SESSION_LOGSIZE             0

+#define NOTIFY_LOGSIZE              1

+#define NOTIFY_DURATION             2

+#define NOTIFY_TITLE                3

+#define SESSION_AUTOSCROLL          4

+#define CLIST_GA                    5

+#define NOTIFY_NICKCUTOFF_OFFSET    6

+#define DEVICE                      7

 #define NOTIFY_CHANNELCUTOFF_OFFSET 8

-#define SESSION_CLOSETIMER 9

+#define SESSION_CLOSETIMER          9

 

-#define INT_SETTINGS 10

+#define INT_SETTINGS               10

 

 // Enums

-#define CLIST_GA_NONE 0

-#define CLIST_GA_EXPAND 1

-#define CLIST_GA_COLLAPSE 2

+#define CLIST_GA_NONE               0

+#define CLIST_GA_EXPAND             1

+#define CLIST_GA_COLLAPSE           2

 

-#define NOTIFY_TITLE_HIDE 0

-#define NOTIFY_TITLE_INFO 1

-#define NOTIFY_TITLE_NAME 2

+#define NOTIFY_TITLE_HIDE           0

+#define NOTIFY_TITLE_INFO           1

+#define NOTIFY_TITLE_NAME           2

 

-#define SESSION_AUTOSCROLL_NONE 0

-#define SESSION_AUTOSCROLL_FIRST 1

-#define SESSION_AUTOSCROLL_LAST 2

+#define SESSION_AUTOSCROLL_NONE     0

+#define SESSION_AUTOSCROLL_FIRST    1

+#define SESSION_AUTOSCROLL_LAST     2

 

 struct CProtoFilter

 {

@@ -118,7 +117,7 @@ public:
 

 	static void LoadSettings();

 	static void SaveSettings();

-	

+

 	// InitDialogHook Callback

 	static int InitOptionsDialog(WPARAM wParam, LPARAM lParam);

 	// OnConnectionChanged

@@ -140,12 +139,12 @@ public:
 private:

 	static int GetSampleField(int iFont);

 	static void ClearTree(HWND hTree);

-	static void FillTree(HWND hTree,bool bCList=false);

+	static void FillTree(HWND hTree, bool bCList = false);

 	static void FillDeviceBox(HWND hBox);

-	

+

 	static HWND hDeviceBox;

 	static vector<CProtoFilter*> m_ProtoList;

-	

+

 	static HANDLE m_hSampleFont[FONT_SETTINGS];

 	static TEXTMETRIC m_tmFontInfo[FONT_SETTINGS];

 	static LOGFONT m_logfont[FONT_SETTINGS];

@@ -160,7 +159,6 @@ private:
 	static int m_aiIntSettings[INT_SETTINGS];

 	static bool m_bInitializingDialog;

 	static HANDLE m_hOptionsInitHook;

-	

 };

 

 #endif
\ No newline at end of file
diff --git a/plugins/MirandaG15/src/resource.h b/plugins/MirandaG15/src/resource.h
index 5f8733be6e..7d7f70c07c 100644
--- a/plugins/MirandaG15/src/resource.h
+++ b/plugins/MirandaG15/src/resource.h
@@ -47,7 +47,6 @@
 #define IDC_NOTIFY_MESSAGES     4014

 #define IDC_NOTIFY_SIGNOFF      4016

 #define IDC_NOTIFY_STATUS       4017

-#define IDC_NOTIFY_URL          4023

 #define IDC_NOTIFY_CONTACTS     4018

 #define IDC_NOTIFY_FILE         4019

 #define IDC_NOTIFY_PROTO_SIGNOFF 4020