summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorGeorge Hazan <george.hazan@gmail.com>2025-05-09 16:46:02 +0300
committerGeorge Hazan <george.hazan@gmail.com>2025-05-09 16:46:02 +0300
commit8553c260ff9939c9d78bbaf2634bb26a20342a3a (patch)
tree450d54a10aa2f30a5aaee873da557324e418c074 /include
parent41403799d2c11dd86142f03f7b562c6e02ff8d00 (diff)
end of clist common settings zoo in m_clist.h
Diffstat (limited to 'include')
-rw-r--r--include/m_clist.h29
-rw-r--r--include/m_clistint.h47
2 files changed, 38 insertions, 38 deletions
diff --git a/include/m_clist.h b/include/m_clist.h
index d2aac83840..9a2f489787 100644
--- a/include/m_clist.h
+++ b/include/m_clist.h
@@ -512,33 +512,4 @@ EXTERN_C MIR_APP_DLL(wchar_t*) Clist_GetContactDisplayName(MCONTACT hContact, in
EXTERN_C MIR_APP_DLL(int) Clist_TrayNotifyA(const char *szProto, const char *szInfoTitle, const char *szInfo, uint32_t dwInfoFlags, UINT uTimeout);
EXTERN_C MIR_APP_DLL(int) Clist_TrayNotifyW(const char *szProto, const wchar_t *wszInfoTitle, const wchar_t *wszInfo, uint32_t dwInfoFlags, UINT uTimeout);
-/////////////////////////////////////////////////////////////////////////////////////////
-
-#define SETTING_TOOLWINDOW_DEFAULT 1
-#define SETTING_SHOWMAINMENU_DEFAULT 1
-#define SETTING_SHOWCAPTION_DEFAULT 1
-#define SETTING_CLIENTDRAG_DEFAULT 1
-#define SETTING_ONTOP_DEFAULT 1
-#define SETTING_MIN2TRAY_DEFAULT 1
-#define SETTING_SORTBYSTATUS_DEFAULT 0
-#define SETTING_SORTBYPROTO_DEFAULT 0
-#define SETTING_TRANSPARENT_DEFAULT 0
-#define SETTING_ALPHA_DEFAULT 200
-#define SETTING_AUTOALPHA_DEFAULT 150
-#define SETTING_AUTOHIDE_DEFAULT 0
-#define SETTING_HIDETIME_DEFAULT 30
-#define SETTING_CYCLETIME_DEFAULT 4
-#define SETTING_TRAYICON_DEFAULT SETTING_TRAYICON_SINGLE
-#define SETTING_ALWAYSMULTI_DEFAULT 0
-
-#define SETTING_TRAYICON_SINGLE 0
-#define SETTING_TRAYICON_CYCLE 1
-#define SETTING_TRAYICON_MULTI 2
-
-#define SETTING_STATE_HIDDEN 0
-#define SETTING_STATE_MINIMIZED 1
-#define SETTING_STATE_NORMAL 2
-
-#define SETTING_BRINGTOFRONT_DEFAULT 0
-
#endif // M_CLIST_H__
diff --git a/include/m_clistint.h b/include/m_clistint.h
index 886ca00211..be90203efa 100644
--- a/include/m_clistint.h
+++ b/include/m_clistint.h
@@ -34,6 +34,14 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#include <m_clc.h>
#include <m_gui.h>
+#define SETTING_TRAYICON_SINGLE 0
+#define SETTING_TRAYICON_CYCLE 1
+#define SETTING_TRAYICON_MULTI 2
+
+#define SETTING_STATE_HIDDEN 0
+#define SETTING_STATE_MINIMIZED 1
+#define SETTING_STATE_NORMAL 2
+
#define HCONTACT_ISGROUP 0x80000000
#define HCONTACT_ISINFO 0xFFFF0000
#define IsHContactGroup(h) (((UINT_PTR)(h)^HCONTACT_ISGROUP)<(HCONTACT_ISGROUP^HCONTACT_ISINFO))
@@ -71,8 +79,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#define TIMERID_TRAYHOVER 16
#define TIMERID_TRAYHOVER_2 17
-#define GROUP_ALLOCATE_STEP 8
-
struct ClcContact;
struct ClcData;
struct ClcCacheEntry;
@@ -447,14 +453,37 @@ extern MIR_APP_EXPORT CLIST_INTERFACE g_clistApi;
namespace Clist
{
+ // CLUI
+ extern MIR_APP_EXPORT CMOption<bool>
+ bShowCaption,
+ bShowMainMenu,
+ bClientAreaDrag;
+
+ // CList
extern MIR_APP_EXPORT CMOption<bool>
- HideOffline,
- UseGroups,
- FilterSearch,
- HideEmptyGroups,
- ConfirmDelete,
- Tray1Click,
- TrayAlwaysStatus;
+ bOnTop,
+ bAutoHide,
+ bToolWindow,
+ bHideOffline,
+ bBringToFront,
+ bUseGroups,
+ bFilterSearch,
+ bHideEmptyGroups,
+ bMinimizeToTray,
+ bAlwaysMulti,
+ bConfirmDelete,
+ bTransparent,
+ bTray1Click,
+ bTrayAlwaysStatus;
+
+ extern MIR_APP_EXPORT CMOption<uint8_t>
+ iTrayIcon,
+ iAlpha,
+ iAutoAlpha;
+
+ extern MIR_APP_EXPORT CMOption<uint16_t>
+ iHideTime,
+ iCycleTime;
extern MIR_APP_EXPORT CMOption<uint32_t>
IconFlashTime,