summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--plugins/Clist_nicer/res/resource.rc27
-rw-r--r--plugins/Clist_nicer/skineditor/src/main.cpp25
-rw-r--r--plugins/Clist_nicer/src/Include/resource.h2
-rw-r--r--plugins/Clist_nicer/src/clcopts.cpp9
4 files changed, 33 insertions, 30 deletions
diff --git a/plugins/Clist_nicer/res/resource.rc b/plugins/Clist_nicer/res/resource.rc
index a52008760c..1285a6406c 100644
--- a/plugins/Clist_nicer/res/resource.rc
+++ b/plugins/Clist_nicer/res/resource.rc
@@ -269,21 +269,21 @@ BEGIN
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,19,155,201,10
END
-IDD_OPT_ICONS DIALOGEX 0, 0, 305, 205
+IDD_OPT_ICONS DIALOGEX 0, 0, 305, 110
STYLE DS_SETFONT | DS_FIXEDSYS | DS_CONTROL | WS_CHILD
FONT 8, "MS Shell Dlg", 0, 0, 0x0
BEGIN
- GROUPBOX "Icons",IDC_STATIC,1,0,224,99
- CONTROL "Show status icons",IDC_SHOWSTATUSICONS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,8,10,106,10
- CONTROL "Centered when possible",IDC_STATUSICONSCENTERED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,122,10,100,11
+ GROUPBOX "Icons",IDC_STATIC,5,3,293,99
+ CONTROL "Show status icons",IDC_SHOWSTATUSICONS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,14,277,10
+ CONTROL "Centered when possible",IDC_STATUSICONSCENTERED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,20,27,268,11
CONTROL "When possible, draw status icons in avatar space",IDC_SELECTIVEICONS,
- "Button",BS_AUTOCHECKBOX | WS_TABSTOP,8,22,214,10
+ "Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,40,277,10
CONTROL "Use metacontact protocol icons instead of subcontacts",IDC_SHOWMETA,
- "Button",BS_AUTOCHECKBOX | WS_TABSTOP,8,34,214,10
- CONTROL "Use Overlay icons on avatars",IDC_OVERLAYICONS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,8,46,214,10
- CONTROL "Dim idle contacts",IDC_IDLE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,8,58,214,10
+ "Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,52,277,10
+ CONTROL "Use Overlay icons on avatars",IDC_OVERLAYICONS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,64,277,10
+ CONTROL "Dim idle contacts",IDC_IDLE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,76,277,10
CONTROL "Replace status icons with xStatus",IDC_XSTATUSASSTATUS,
- "Button",BS_AUTOCHECKBOX | WS_TABSTOP,8,70,214,10
+ "Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,88,277,10
END
IDD_OPT_CLUI DIALOGEX 0, 0, 305, 226
@@ -718,6 +718,15 @@ BEGIN
BEGIN
END
+ IDD_OPT_ICONS, DIALOG
+ BEGIN
+ VERTGUIDE, 5
+ VERTGUIDE, 11
+ VERTGUIDE, 20
+ VERTGUIDE, 288
+ VERTGUIDE, 298
+ END
+
IDD_OPT_CLUI, DIALOG
BEGIN
HORZGUIDE, 127
diff --git a/plugins/Clist_nicer/skineditor/src/main.cpp b/plugins/Clist_nicer/skineditor/src/main.cpp
index 16bc2564eb..6f95e8d4e5 100644
--- a/plugins/Clist_nicer/skineditor/src/main.cpp
+++ b/plugins/Clist_nicer/skineditor/src/main.cpp
@@ -635,7 +635,7 @@ static void FillItemList(HWND hwndDlg)
}
}
-static BOOL CALLBACK SkinEdit_ExtBkDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam)
+static INT_PTR CALLBACK SkinEdit_ExtBkDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam)
{
SKINDESCRIPTION *psd = (SKINDESCRIPTION *)GetWindowLongPtr(hwndDlg, GWLP_USERDATA);
@@ -829,8 +829,8 @@ static BOOL CALLBACK SkinEdit_ExtBkDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam
// save struct to DB
if(psd->pfnSaveCompleteStruct)
psd->pfnSaveCompleteStruct();
- DBWriteContactSettingDword(NULL, "CLCExt", "3dbright", SendDlgItemMessage(hwndDlg, IDC_3DLIGHTCOLOR, CPM_GETCOLOUR, 0, 0));
- DBWriteContactSettingDword(NULL, "CLCExt", "3ddark", SendDlgItemMessage(hwndDlg, IDC_3DDARKCOLOR, CPM_GETCOLOUR, 0, 0));
+ db_set_dw(NULL, "CLCExt", "3dbright", SendDlgItemMessage(hwndDlg, IDC_3DLIGHTCOLOR, CPM_GETCOLOUR, 0, 0));
+ db_set_dw(NULL, "CLCExt", "3ddark", SendDlgItemMessage(hwndDlg, IDC_3DDARKCOLOR, CPM_GETCOLOUR, 0, 0));
if(psd->pfnClcOptionsChanged)
psd->pfnClcOptionsChanged();
@@ -889,7 +889,7 @@ static INT_PTR SkinEdit_Invoke(WPARAM wParam, LPARAM lParam)
GetClientRect(psd->hWndParent, &rcClient);
tci.mask = TCIF_PARAM|TCIF_TEXT;
- tci.lParam = (LPARAM)CreateDialogParam(g_hInst, MAKEINTRESOURCE(IDD_SKINITEMEDIT), psd->hWndParent, (DLGPROC)SkinEdit_ExtBkDlgProc, (LPARAM)psd);
+ tci.lParam = (LPARAM)CreateDialogParam(g_hInst, MAKEINTRESOURCE(IDD_SKINITEMEDIT), psd->hWndParent, SkinEdit_ExtBkDlgProc, (LPARAM)psd);
tci.pszText = TranslateT("Skin items");
TabCtrl_InsertItem(psd->hWndTab, iTabs++, &tci);
@@ -897,7 +897,7 @@ static INT_PTR SkinEdit_Invoke(WPARAM wParam, LPARAM lParam)
psd->hwndSkinEdit = (HWND)tci.lParam;
/*
- tci.lParam = (LPARAM)CreateDialogParam(g_hInst, MAKEINTRESOURCE(IDD_IMAGEITEMEDIT), psd->hWndParent, (DLGPROC)SkinEdit_ImageItemEditProc, (LPARAM)psd);
+ tci.lParam = (LPARAM)CreateDialogParam(g_hInst, MAKEINTRESOURCE(IDD_IMAGEITEMEDIT), psd->hWndParent, SkinEdit_ImageItemEditProc, (LPARAM)psd);
tci.pszText = TranslateT("Image items");
TabCtrl_InsertItem(psd->hWndTab, iTabs++, &tci);
MoveWindow((HWND)tci.lParam, 5, 25, rcClient.right - 9, rcClient.bottom - 60, 1);
@@ -911,8 +911,8 @@ static HANDLE hSvc_invoke = 0, hSvc_fillby = 0;
static int LoadModule()
{
- hSvc_invoke = CreateServiceFunction(MS_CLNSE_INVOKE, (MIRANDASERVICE)SkinEdit_Invoke);
- hSvc_fillby = CreateServiceFunction(MS_CLNSE_FILLBYCURRENTSEL, (MIRANDASERVICE)SkinEdit_FillByCurrentSel);
+ hSvc_invoke = CreateServiceFunction(MS_CLNSE_INVOKE, SkinEdit_Invoke);
+ hSvc_fillby = CreateServiceFunction(MS_CLNSE_FILLBYCURRENTSEL, SkinEdit_FillByCurrentSel);
return 0;
}
@@ -921,17 +921,6 @@ extern "C" __declspec(dllexport) PLUGININFOEX * MirandaPluginInfoEx(DWORD mirand
return &pluginInfo;
}
-/*
- * define our own MUUID, since this is a special plugin...
- */
-
-extern "C" extern "C" __declspec(dllexport) const MUUID MirandaInterfaces[] =
-{
- MIID_TESTPLUGIN,
- { 0x70ff4eef, 0xcb7b, 0x4d88, { 0x85, 0x60, 0x7d, 0xe3, 0xa6, 0x68, 0x5c, 0xe3 }},
- MIID_LAST
-};
-
static int ModulesLoaded(WPARAM wParam, LPARAM lParam)
{
return 0;
diff --git a/plugins/Clist_nicer/src/Include/resource.h b/plugins/Clist_nicer/src/Include/resource.h
index a863aa28bb..9f4871c62d 100644
--- a/plugins/Clist_nicer/src/Include/resource.h
+++ b/plugins/Clist_nicer/src/Include/resource.h
@@ -1,6 +1,6 @@
//{{NO_DEPENDENCIES}}
// Microsoft Visual C++ generated include file.
-// Used by .\plugins\clist_nicer\res\resource.rc
+// Used by C:\Users\xx\Documents\Visual Studio 2010\Projects\miranda-ng\plugins\Clist_nicer\res\resource.rc
//
#define IDD_OPT_VIEWMODES 1
#define IDD_OPT_FLOATING 3
diff --git a/plugins/Clist_nicer/src/clcopts.cpp b/plugins/Clist_nicer/src/clcopts.cpp
index 056c468d14..600b0b8a5e 100644
--- a/plugins/Clist_nicer/src/clcopts.cpp
+++ b/plugins/Clist_nicer/src/clcopts.cpp
@@ -487,7 +487,7 @@ static INT_PTR CALLBACK DlgProcIcons(HWND hwndDlg, UINT msg, WPARAM wParam, LPAR
switch (msg) {
case WM_INITDIALOG:
TranslateDialogDefault(hwndDlg);
- CheckDlgButton(hwndDlg, IDC_XSTATUSASSTATUS, cfg::dat.dwFlags & CLUI_FRAME_USEXSTATUSASSTATUS ? 1 : 0);
+ CheckDlgButton(hwndDlg, IDC_XSTATUSASSTATUS, (cfg::dat.dwFlags & CLUI_FRAME_USEXSTATUSASSTATUS) ? BST_CHECKED : BST_UNCHECKED);
CheckDlgButton(hwndDlg, IDC_SHOWSTATUSICONS, (cfg::dat.dwFlags & CLUI_FRAME_STATUSICONS) ? BST_CHECKED : BST_UNCHECKED);
CheckDlgButton(hwndDlg, IDC_SHOWMETA, (cfg::dat.dwFlags & CLUI_USEMETAICONS) ? BST_CHECKED : BST_UNCHECKED);
@@ -495,7 +495,7 @@ static INT_PTR CALLBACK DlgProcIcons(HWND hwndDlg, UINT msg, WPARAM wParam, LPAR
CheckDlgButton(hwndDlg, IDC_OVERLAYICONS, (cfg::dat.dwFlags & CLUI_FRAME_OVERLAYICONS) ? BST_CHECKED : BST_UNCHECKED);
CheckDlgButton(hwndDlg, IDC_SELECTIVEICONS, (cfg::dat.dwFlags & CLUI_FRAME_SELECTIVEICONS) ? BST_CHECKED : BST_UNCHECKED);
- CheckDlgButton(hwndDlg, IDC_STATUSICONSCENTERED, cfg::dat.bCenterStatusIcons ? 1 : 0);
+ CheckDlgButton(hwndDlg, IDC_STATUSICONSCENTERED, cfg::dat.bCenterStatusIcons ? BST_CHECKED : BST_UNCHECKED);
CheckDlgButton(hwndDlg, IDC_IDLE, cfg::getByte("CLC", "ShowIdle", CLCDEFAULT_SHOWIDLE) ? BST_CHECKED : BST_UNCHECKED);
return TRUE;
@@ -584,6 +584,11 @@ int ClcOptInit(WPARAM wParam, LPARAM lParam)
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_DSPADVANCED);
Options_AddPage(wParam, &odp);
+ odp.pszTab = LPGEN("Icons");
+ odp.pfnDlgProc = DlgProcIcons;
+ odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_ICONS);
+ Options_AddPage(wParam, &odp);
+
////////////////////////////////////////////////////////////////////////////
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_FLOATING);
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-15 03:27:40 +0000