From 45751518e585d351cfec427cc3244768d84844d6 Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
Date: Mon, 21 Jul 2014 19:02:11 +0000
Subject: "Hide offline subcontacts" option removed, subs now inherit the
display mode of the usual contacts
git-svn-id: http://svn.miranda-ng.org/main/trunk@9908 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
plugins/Clist_modern/res/resource.rc | 28 +++++++++++------------
plugins/Clist_modern/src/hdr/modern_defsettings.h | 1 -
plugins/Clist_modern/src/modern_clcitems.cpp | 3 +--
plugins/Clist_modern/src/modern_clcopts.cpp | 3 ---
plugins/Clist_modern/src/resource.h | 1 -
plugins/Clist_modern/src/version.h | 4 ++--
6 files changed, 16 insertions(+), 24 deletions(-)
diff --git a/plugins/Clist_modern/res/resource.rc b/plugins/Clist_modern/res/resource.rc
index 24ad5e7295..941a4c7618 100644
--- a/plugins/Clist_modern/res/resource.rc
+++ b/plugins/Clist_modern/res/resource.rc
@@ -460,27 +460,25 @@ STYLE DS_SETFONT | DS_FIXEDSYS | DS_CONTROL | WS_CHILD | WS_VISIBLE
EXSTYLE WS_EX_CONTROLPARENT
FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
+ GROUPBOX "Additional stuff", IDC_FRAME_META2, 2, 12, 218, 65
CONTROL "Ignore empty extra icons places (arrange to right).",IDC_METASUBEXTRA_IGN,
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,25,201,10
- CONTROL "Use 'Meta' protocol icons for metacontacts",IDC_META,
+ CONTROL "Allow internal requesting of status message text",IDC_DISCOVER_AWAYMSG,
+ "Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,38,201,10
+ CONTROL "Remove status message if contact became offline", IDC_REMOVE_OFFLINE_AWAYMSG,
+ "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 11, 50, 201, 10
+ CONTROL "Use improved search method in contact list", IDC_FILTER_SEARCH,
+ "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 11, 62, 201, 10
+ GROUPBOX "Metacontacts stuff",IDC_FRAME_META,2,81,218,88
+ CONTROL "Use 'Meta' protocol icons for metacontacts",IDC_META,
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,95,201,10
- CONTROL "Expand metacontacts",IDC_METAEXPAND,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,107,201,16
+ CONTROL "Expand metacontacts", IDC_METAEXPAND, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 11, 107, 201, 16
CONTROL "Avoid double click expand",IDC_METADBLCLK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,16,124,196,10
CONTROL "Hide all extra icons for subcontacts",IDC_METASUBEXTRA,
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,16,137,196,10
- CONTROL "Hide offline subcontacts",IDC_METASUB_HIDEOFFLINE,
- "Button",BS_AUTOCHECKBOX | WS_TABSTOP,16,151,196,10
- GROUPBOX "Metacontacts stuff",IDC_FRAME_META,2,81,218,101
- GROUPBOX "Additional stuff",IDC_FRAME_META2,2,12,218,65
- CONTROL "Allow internal requesting of status message text",IDC_DISCOVER_AWAYMSG,
- "Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,38,201,10
- EDITTEXT IDC_SUBINDENT,154,163,35,12,ES_NUMBER
- CONTROL "",IDC_SUBINDENTSPIN,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_ARROWKEYS | UDS_NOTHOUSANDS | UDS_HOTTRACK,190,162,11,12
- LTEXT "Subcontacts indent:",IDC_SUBIDENTCAPT,26,164,126,10
- CONTROL "Remove status message if contact became offline",IDC_REMOVE_OFFLINE_AWAYMSG,
- "Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,50,201,10
- CONTROL "Use improved search method in contact list",IDC_FILTER_SEARCH,
- "Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,62,201,10
+ LTEXT "Subcontacts indent:", IDC_SUBIDENTCAPT, 26, 151, 126, 10
+ EDITTEXT IDC_SUBINDENT,154,150,35,12,ES_NUMBER
+ CONTROL "",IDC_SUBINDENTSPIN,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_ARROWKEYS | UDS_NOTHOUSANDS | UDS_HOTTRACK,190,149,11,12
END
IDD_OPT_ITEM_CONTACT_TIME DIALOGEX 0, 0, 243, 52
diff --git a/plugins/Clist_modern/src/hdr/modern_defsettings.h b/plugins/Clist_modern/src/hdr/modern_defsettings.h
index a8d2ae6a08..59a08439bc 100644
--- a/plugins/Clist_modern/src/hdr/modern_defsettings.h
+++ b/plugins/Clist_modern/src/hdr/modern_defsettings.h
@@ -126,7 +126,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#define SETTING_METAIGNOREEMPTYEXTRA_DEFAULT 1 //"CLC","MetaIgnoreEmptyExtra"
#define SETTING_METAHIDEEXTRA_DEFAULT 0 //"CLC","MetaHideExtra"
#define SETTING_METAEXPANDING_DEFAULT 1 //"CLC","MetaExpanding"
-#define SETTING_METAHIDEOFFLINESUB_DEFAULT 1 //"CLC","MetaHideOfflineSub"
#define SETTING_USEMETAICON_DEFAULT 1 //"CLC","Meta"
#define SETTING_DRAWOVERLAYEDSTATUS_DEFAULT 3 //todo replace by contstants
diff --git a/plugins/Clist_modern/src/modern_clcitems.cpp b/plugins/Clist_modern/src/modern_clcitems.cpp
index a4ed57af90..0c64572590 100644
--- a/plugins/Clist_modern/src/modern_clcitems.cpp
+++ b/plugins/Clist_modern/src/modern_clcitems.cpp
@@ -46,13 +46,12 @@ void AddSubcontacts(ClcData *dat, ClcContact *cont, BOOL showOfflineHereGroup)
cont->SubAllocated = subcount;
int i = 0;
int bHideOffline = db_get_b(NULL, "CList", "HideOffline", SETTING_HIDEOFFLINE_DEFAULT);
- int bMetaHideOfflineSub = db_get_b(NULL, "CLC", "MetaHideOfflineSub", SETTING_METAHIDEOFFLINESUB_DEFAULT);
for (int j = 0; j < subcount; j++) {
MCONTACT hsub = db_mc_getSub(cont->hContact, j);
cacheEntry = pcli->pfnGetCacheEntry(hsub);
WORD wStatus = pdnce___GetStatus(cacheEntry);
- if (showOfflineHereGroup || (!(bMetaHideOfflineSub && bHideOffline) || wStatus != ID_STATUS_OFFLINE)) {
+ if (showOfflineHereGroup || !bHideOffline || wStatus != ID_STATUS_OFFLINE) {
ClcContact& p = cont->subcontacts[i];
p.hContact = cacheEntry->hContact;
diff --git a/plugins/Clist_modern/src/modern_clcopts.cpp b/plugins/Clist_modern/src/modern_clcopts.cpp
index db189050d3..f09e5b17de 100644
--- a/plugins/Clist_modern/src/modern_clcopts.cpp
+++ b/plugins/Clist_modern/src/modern_clcopts.cpp
@@ -320,7 +320,6 @@ static void CheckButtons(HWND hwndDlg)
BYTE t = IsDlgButtonChecked(hwndDlg, IDC_METAEXPAND);
EnableWindow(GetDlgItem(hwndDlg, IDC_METADBLCLK), t);
EnableWindow(GetDlgItem(hwndDlg, IDC_METASUBEXTRA), t);
- EnableWindow(GetDlgItem(hwndDlg, IDC_METASUB_HIDEOFFLINE), t);
EnableWindow(GetDlgItem(hwndDlg, IDC_SUBINDENTSPIN), t);
EnableWindow(GetDlgItem(hwndDlg, IDC_SUBINDENT), t);
}
@@ -334,7 +333,6 @@ static INT_PTR CALLBACK DlgProcClistAdditionalOpts(HWND hwndDlg, UINT msg, WPARA
CheckDlgButton(hwndDlg, IDC_METADBLCLK, db_get_b(NULL, "CLC", "MetaDoubleClick", SETTING_METAAVOIDDBLCLICK_DEFAULT) ? BST_CHECKED : BST_UNCHECKED); /// by FYR
CheckDlgButton(hwndDlg, IDC_METASUBEXTRA, db_get_b(NULL, "CLC", "MetaHideExtra", SETTING_METAHIDEEXTRA_DEFAULT) ? BST_CHECKED : BST_UNCHECKED); /// by FYR
CheckDlgButton(hwndDlg, IDC_METASUBEXTRA_IGN, db_get_b(NULL, "CLC", "MetaIgnoreEmptyExtra", SETTING_METAAVOIDDBLCLICK_DEFAULT) ? BST_CHECKED : BST_UNCHECKED); /// by FYR
- CheckDlgButton(hwndDlg, IDC_METASUB_HIDEOFFLINE, db_get_b(NULL, "CLC", "MetaHideOfflineSub", SETTING_METAHIDEOFFLINESUB_DEFAULT) ? BST_CHECKED : BST_UNCHECKED); /// by FYR
CheckDlgButton(hwndDlg, IDC_METAEXPAND, db_get_b(NULL, "CLC", "MetaExpanding", SETTING_METAEXPANDING_DEFAULT) ? BST_CHECKED : BST_UNCHECKED); /// by FYR
CheckDlgButton(hwndDlg, IDC_DISCOVER_AWAYMSG, db_get_b(NULL, "ModernData", "InternalAwayMsgDiscovery", SETTING_INTERNALAWAYMSGREQUEST_DEFAULT) ? BST_CHECKED : BST_UNCHECKED); /// by FYR
CheckDlgButton(hwndDlg, IDC_REMOVE_OFFLINE_AWAYMSG, db_get_b(NULL, "ModernData", "RemoveAwayMessageForOffline", SETTING_REMOVEAWAYMSGFOROFFLINE_DEFAULT) ? BST_CHECKED : BST_UNCHECKED); /// by FYR
@@ -364,7 +362,6 @@ static INT_PTR CALLBACK DlgProcClistAdditionalOpts(HWND hwndDlg, UINT msg, WPARA
db_set_b(NULL, "CLC", "MetaDoubleClick", (BYTE)IsDlgButtonChecked(hwndDlg, IDC_METADBLCLK));
db_set_b(NULL, "CLC", "MetaHideExtra", (BYTE)IsDlgButtonChecked(hwndDlg, IDC_METASUBEXTRA));
db_set_b(NULL, "CLC", "MetaIgnoreEmptyExtra", (BYTE)IsDlgButtonChecked(hwndDlg, IDC_METASUBEXTRA_IGN));
- db_set_b(NULL, "CLC", "MetaHideOfflineSub", (BYTE)IsDlgButtonChecked(hwndDlg, IDC_METASUB_HIDEOFFLINE));
db_set_b(NULL, "CLC", "MetaExpanding", (BYTE)IsDlgButtonChecked(hwndDlg, IDC_METAEXPAND));
db_set_b(NULL, "ModernData", "InternalAwayMsgDiscovery", (BYTE)IsDlgButtonChecked(hwndDlg, IDC_DISCOVER_AWAYMSG));
db_set_b(NULL, "ModernData", "RemoveAwayMessageForOffline", (BYTE)IsDlgButtonChecked(hwndDlg, IDC_REMOVE_OFFLINE_AWAYMSG));
diff --git a/plugins/Clist_modern/src/resource.h b/plugins/Clist_modern/src/resource.h
index 964f70d113..a44dbec3d6 100644
--- a/plugins/Clist_modern/src/resource.h
+++ b/plugins/Clist_modern/src/resource.h
@@ -257,7 +257,6 @@
#define IDC_AEROGLASS 1613
#define IDC_METASUBEXTRA 1614
#define IDC_METASUBEXTRA_IGN 1615
-#define IDC_METASUB_HIDEOFFLINE 1616
#define IDC_MIN_ROW_HEIGHT 1616
#define IDC_MIN_ROW_HEIGHT_SPIN 1617
#define IDC_TXT_TITLE1 1617
diff --git a/plugins/Clist_modern/src/version.h b/plugins/Clist_modern/src/version.h
index 4b2f4379d6..0d765474a4 100644
--- a/plugins/Clist_modern/src/version.h
+++ b/plugins/Clist_modern/src/version.h
@@ -1,7 +1,7 @@
#define __MAJOR_VERSION 0
#define __MINOR_VERSION 9
-#define __RELEASE_NUM 0
-#define __BUILD_NUM 13
+#define __RELEASE_NUM 1
+#define __BUILD_NUM 1
#include <stdver.h>
--
cgit v1.2.3