diff options
Diffstat (limited to 'plugins')
-rw-r--r-- | plugins/Clist_nicer/src/extBackg.cpp | 54 | ||||
-rw-r--r-- | plugins/Cln_skinedit/src/main.cpp | 8 | ||||
-rw-r--r-- | plugins/ExternalAPI/m_cln_skinedit.h | 198 | ||||
-rw-r--r-- | plugins/TabSRMM/src/resource.h | 1 |
4 files changed, 130 insertions, 131 deletions
diff --git a/plugins/Clist_nicer/src/extBackg.cpp b/plugins/Clist_nicer/src/extBackg.cpp index b16188fcdb..b11476f9fb 100644 --- a/plugins/Clist_nicer/src/extBackg.cpp +++ b/plugins/Clist_nicer/src/extBackg.cpp @@ -1513,45 +1513,45 @@ static void ApplyCLUISkin() static INT_PTR CALLBACK DlgProcSkinOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam)
{
switch (msg) {
- case WM_INITDIALOG: {
- DBVARIANT dbv;
- TranslateDialogDefault(hwndDlg);
-
- CheckDlgButton(hwndDlg, IDC_EQUALSELECTION, (db_get_b(0, "CLCExt", "EXBK_EqualSelection", 1) == 1) ? BST_CHECKED : BST_UNCHECKED);
- CheckDlgButton(hwndDlg, IDC_SELBLEND, db_get_b(0, "CLCExt", "EXBK_SelBlend", 1) ? BST_CHECKED : BST_UNCHECKED);
- CheckDlgButton(hwndDlg, IDC_SETALLBUTTONSKINNED, db_get_b(0, "CLCExt", "bskinned", 0) ? BST_CHECKED : BST_UNCHECKED);
+ case WM_INITDIALOG:
+ TranslateDialogDefault(hwndDlg);
- SendDlgItemMessage(hwndDlg, IDC_CORNERSPIN, UDM_SETRANGE, 0, MAKELONG(10, 0));
- SendDlgItemMessage(hwndDlg, IDC_CORNERSPIN, UDM_SETPOS, 0, cfg::dat.cornerRadius);
+ CheckDlgButton(hwndDlg, IDC_EQUALSELECTION, (db_get_b(0, "CLCExt", "EXBK_EqualSelection", 1) == 1) ? BST_CHECKED : BST_UNCHECKED);
+ CheckDlgButton(hwndDlg, IDC_SELBLEND, db_get_b(0, "CLCExt", "EXBK_SelBlend", 1) ? BST_CHECKED : BST_UNCHECKED);
+ CheckDlgButton(hwndDlg, IDC_SETALLBUTTONSKINNED, db_get_b(0, "CLCExt", "bskinned", 0) ? BST_CHECKED : BST_UNCHECKED);
- SendDlgItemMessage(hwndDlg, IDC_GRPPADDINGSPIN, UDM_SETRANGE, 0, MAKELONG(20, 0));
- SendDlgItemMessage(hwndDlg, IDC_GRPPADDINGSPIN, UDM_SETPOS, 0, cfg::dat.group_padding);
+ SendDlgItemMessage(hwndDlg, IDC_CORNERSPIN, UDM_SETRANGE, 0, MAKELONG(10, 0));
+ SendDlgItemMessage(hwndDlg, IDC_CORNERSPIN, UDM_SETPOS, 0, cfg::dat.cornerRadius);
- SendDlgItemMessage(hwndDlg, IDC_LASTITEMPADDINGSPIN, UDM_SETRANGE, 0, MAKELONG(40, 0));
- SendDlgItemMessage(hwndDlg, IDC_LASTITEMPADDINGSPIN, UDM_SETPOS, 0, cfg::dat.titleBarHeight);
+ SendDlgItemMessage(hwndDlg, IDC_GRPPADDINGSPIN, UDM_SETRANGE, 0, MAKELONG(20, 0));
+ SendDlgItemMessage(hwndDlg, IDC_GRPPADDINGSPIN, UDM_SETPOS, 0, cfg::dat.group_padding);
- CheckDlgButton(hwndDlg, IDC_APPLYINDENTBG, cfg::dat.bApplyIndentToBg ? BST_CHECKED : BST_UNCHECKED);
- CheckDlgButton(hwndDlg, IDC_USEPERPROTO, cfg::dat.bUsePerProto ? BST_CHECKED : BST_UNCHECKED);
- CheckDlgButton(hwndDlg, IDC_OVERRIDEPERSTATUSCOLOR, cfg::dat.bOverridePerStatusColors ? BST_CHECKED : BST_UNCHECKED);
- CheckDlgButton(hwndDlg, IDC_FASTGRADIENT, cfg::dat.bWantFastGradients ? BST_CHECKED : BST_UNCHECKED);
- CheckDlgButton(hwndDlg, IDC_IGNORESELFORGROUPS, db_get_b(0, "CLC", "IgnoreSelforGroups", 0) ? BST_CHECKED : BST_UNCHECKED);
+ SendDlgItemMessage(hwndDlg, IDC_LASTITEMPADDINGSPIN, UDM_SETRANGE, 0, MAKELONG(40, 0));
+ SendDlgItemMessage(hwndDlg, IDC_LASTITEMPADDINGSPIN, UDM_SETPOS, 0, cfg::dat.titleBarHeight);
- if (!db_get_s(0, "CLC", "ContactSkins", &dbv)) {
- SetDlgItemTextA(hwndDlg, IDC_SKINFILE, dbv.pszVal);
+ CheckDlgButton(hwndDlg, IDC_APPLYINDENTBG, cfg::dat.bApplyIndentToBg ? BST_CHECKED : BST_UNCHECKED);
+ CheckDlgButton(hwndDlg, IDC_USEPERPROTO, cfg::dat.bUsePerProto ? BST_CHECKED : BST_UNCHECKED);
+ CheckDlgButton(hwndDlg, IDC_OVERRIDEPERSTATUSCOLOR, cfg::dat.bOverridePerStatusColors ? BST_CHECKED : BST_UNCHECKED);
+ CheckDlgButton(hwndDlg, IDC_FASTGRADIENT, cfg::dat.bWantFastGradients ? BST_CHECKED : BST_UNCHECKED);
+ CheckDlgButton(hwndDlg, IDC_IGNORESELFORGROUPS, db_get_b(0, "CLC", "IgnoreSelforGroups", 0) ? BST_CHECKED : BST_UNCHECKED);
+ {
+ DBVARIANT dbv;
+ if (!db_get_ws(0, "CLC", "ContactSkins", &dbv)) {
+ SetDlgItemTextW(hwndDlg, IDC_SKINFILE, dbv.pwszVal);
db_free(&dbv);
Utils::enableDlgControl(hwndDlg, IDC_RELOAD, TRUE);
}
- else
- Utils::enableDlgControl(hwndDlg, IDC_RELOAD, FALSE);
+ else Utils::enableDlgControl(hwndDlg, IDC_RELOAD, FALSE);
+
CheckDlgButton(hwndDlg, IDC_USESKIN, db_get_b(0, "CLUI", "useskin", 0) ? BST_CHECKED : BST_UNCHECKED);
if (!db_get_ws(0, "CLC", "AdvancedSkin", &dbv)) {
SetDlgItemText(hwndDlg, IDC_SKINFILENAME, dbv.pwszVal);
db_free(&dbv);
}
- else
- SetDlgItemText(hwndDlg, IDC_SKINFILENAME, L"");
- return TRUE;
+ else SetDlgItemText(hwndDlg, IDC_SKINFILENAME, L"");
}
+ return TRUE;
+
case WM_COMMAND:
switch (LOWORD(wParam)) {
case IDC_USESKIN:
@@ -1679,8 +1679,8 @@ static INT_PTR CALLBACK OptionsDlgProc(HWND hwnd, UINT msg, WPARAM wParam, LPARA SKINDESCRIPTION sd = { 0 };
sd.cbSize = sizeof(sd);
sd.StatusItems = arStatusItems.getArray();
- sd.hWndParent = hwnd;
- sd.hWndTab = GetDlgItem(hwnd, IDC_OPTIONSTAB);
+ sd.hwndParent = hwnd;
+ sd.hwndTab = GetDlgItem(hwnd, IDC_OPTIONSTAB);
sd.pfnSaveCompleteStruct = SaveCompleteStructToDB;
sd.lastItem = ID_STATUS_OFFLINE + arStatusItems.getCount();
sd.firstItem = ID_STATUS_OFFLINE;
diff --git a/plugins/Cln_skinedit/src/main.cpp b/plugins/Cln_skinedit/src/main.cpp index 6f7c76632c..259168e81e 100644 --- a/plugins/Cln_skinedit/src/main.cpp +++ b/plugins/Cln_skinedit/src/main.cpp @@ -879,14 +879,14 @@ static INT_PTR SkinEdit_Invoke(WPARAM, LPARAM lParam) if (psd->cbSize != sizeof(SKINDESCRIPTION))
return 0;
- iTabs = TabCtrl_GetItemCount(psd->hWndTab);
- GetClientRect(psd->hWndParent, &rcClient);
+ iTabs = TabCtrl_GetItemCount(psd->hwndTab);
+ GetClientRect(psd->hwndParent, &rcClient);
tci.mask = TCIF_PARAM | TCIF_TEXT;
- tci.lParam = (LPARAM)CreateDialogParam(g_plugin.getInst(), MAKEINTRESOURCE(IDD_SKINITEMEDIT), psd->hWndParent, SkinEdit_ExtBkDlgProc, (LPARAM)psd);
+ tci.lParam = (LPARAM)CreateDialogParam(g_plugin.getInst(), MAKEINTRESOURCE(IDD_SKINITEMEDIT), psd->hwndParent, SkinEdit_ExtBkDlgProc, (LPARAM)psd);
tci.pszText = TranslateT("Skin items");
- TabCtrl_InsertItem(psd->hWndTab, iTabs++, &tci);
+ TabCtrl_InsertItem(psd->hwndTab, iTabs++, &tci);
MoveWindow((HWND)tci.lParam, 5, 25, rcClient.right - 9, rcClient.bottom - 60, 1);
psd->hwndSkinEdit = (HWND)tci.lParam;
return (INT_PTR)psd->hwndSkinEdit;
diff --git a/plugins/ExternalAPI/m_cln_skinedit.h b/plugins/ExternalAPI/m_cln_skinedit.h index 0255c98080..53f03180dd 100644 --- a/plugins/ExternalAPI/m_cln_skinedit.h +++ b/plugins/ExternalAPI/m_cln_skinedit.h @@ -11,105 +11,105 @@ * data structs
*/
-typedef struct _tagImageItem {
- char szName[40];
- HBITMAP hbm;
- BYTE bLeft, bRight, bTop, bBottom; // sizing margins
- BYTE alpha;
- DWORD dwFlags;
- HDC hdc;
- HBITMAP hbmOld;
- LONG inner_height, inner_width;
- LONG width, height;
- BLENDFUNCTION bf;
- BYTE bStretch;
- HBRUSH fillBrush;
- LONG glyphMetrics[4];
- struct _tagImageItem *nextItem;
-} ImageItem;
-
-typedef struct _tagButtonItem {
- char szName[40];
- HWND hWnd;
- LONG xOff, yOff;
- LONG width, height;
- ImageItem *imgNormal, *imgPressed, *imgHover;
- LONG normalGlyphMetrics[4];
- LONG hoverGlyphMetrics[4];
- LONG pressedGlyphMetrics[4];
- DWORD dwFlags, dwStockFlags;
- DWORD uId;
- TCHAR szTip[256];
- char szService[256];
- char szModule[256], szSetting[256];
- BYTE bValuePush[256], bValueRelease[256];
- DWORD type;
- void (*pfnAction)(struct _tagButtonItem *item, HWND hwndDlg, struct MessageWindowData *dat, HWND hwndItem);
- void (*pfnCallback)(struct _tagButtonItem *item, HWND hwndDlg, struct MessageWindowData *dat, HWND hwndItem);
- TCHAR tszLabel[40];
- struct _tagButtonItem *nextItem;
-} ButtonItem;
-
-typedef struct {
- char szName[40];
- char szDBname[40];
- int statusID;
-
- BYTE GRADIENT;
- BYTE CORNER;
-
- DWORD COLOR;
- DWORD COLOR2;
-
- BYTE COLOR2_TRANSPARENT;
-
- DWORD TEXTCOLOR;
-
- int ALPHA;
-
- int MARGIN_LEFT;
- int MARGIN_TOP;
- int MARGIN_RIGHT;
- int MARGIN_BOTTOM;
- BYTE IGNORED;
- DWORD BORDERSTYLE;
- ImageItem *imageItem;
-} StatusItems_t;
-
-typedef struct {
- BOOL bGRADIENT;
- BOOL bCORNER;
- BOOL bCOLOR;
- BOOL bCOLOR2;
- BOOL bCOLOR2_TRANSPARENT;
- BOOL bTEXTCOLOR;
- BOOL bALPHA;
- BOOL bMARGIN_LEFT;
- BOOL bMARGIN_TOP;
- BOOL bMARGIN_RIGHT;
- BOOL bMARGIN_BOTTOM;
- BOOL bIGNORED;
- BOOL bBORDERSTYLE;
-} ChangedSItems_t;
-
-typedef struct _tagSkinDescription {
- DWORD cbSize;
- StatusItems_t **StatusItems;
- int lastItem;
- int firstItem;
- char szModule[100];
- HWND hWndParent, hWndTab;
- HWND hwndCLUI;
- HWND hwndSkinEdit; /* out param */
- HWND hwndImageEdit; /* out param */
- HMENU hMenuItems;
- void (*pfnSaveCompleteStruct)(void);
- void (CALLBACK *pfnClcOptionsChanged )(void);
- void* (*pfnMalloc)(unsigned int);
- void (*pfnFree)(void);
- void* (*pfnRealloc)(void *, unsigned int);
- void* reserved[20];
-} SKINDESCRIPTION;
+struct ImageItem
+{
+ char szName[40];
+ HBITMAP hbm;
+ BYTE bLeft, bRight, bTop, bBottom; // sizing margins
+ BYTE alpha;
+ DWORD dwFlags;
+ HDC hdc;
+ HBITMAP hbmOld;
+ LONG inner_height, inner_width;
+ LONG width, height;
+ BLENDFUNCTION bf;
+ BYTE bStretch;
+ HBRUSH fillBrush;
+ LONG glyphMetrics[4];
+ ImageItem *nextItem;
+};
+
+struct ButtonItem
+{
+ char szName[40];
+ HWND hWnd;
+ LONG xOff, yOff;
+ LONG width, height;
+ ImageItem *imgNormal, *imgPressed, *imgHover;
+ LONG normalGlyphMetrics[4];
+ LONG hoverGlyphMetrics[4];
+ LONG pressedGlyphMetrics[4];
+ DWORD dwFlags, dwStockFlags;
+ DWORD uId;
+ TCHAR szTip[256];
+ char szService[256];
+ char szModule[256], szSetting[256];
+ BYTE bValuePush[256], bValueRelease[256];
+ DWORD type;
+ void (*pfnAction)(struct _tagButtonItem *item, HWND hwndDlg, struct MessageWindowData *dat, HWND hwndItem);
+ void (*pfnCallback)(struct _tagButtonItem *item, HWND hwndDlg, struct MessageWindowData *dat, HWND hwndItem);
+ TCHAR tszLabel[40];
+ ButtonItem *nextItem;
+};
+
+struct StatusItems_t
+{
+ char szName[40];
+ char szDBname[40];
+ int statusID;
+
+ BYTE GRADIENT;
+ BYTE CORNER;
+
+ DWORD COLOR;
+ DWORD COLOR2;
+
+ BYTE COLOR2_TRANSPARENT;
+
+ DWORD TEXTCOLOR;
+
+ int ALPHA;
+
+ int MARGIN_LEFT;
+ int MARGIN_TOP;
+ int MARGIN_RIGHT;
+ int MARGIN_BOTTOM;
+ BYTE IGNORED;
+ DWORD BORDERSTYLE;
+ ImageItem *imageItem;
+};
+
+struct ChangedSItems_t
+{
+ BOOL bGRADIENT;
+ BOOL bCORNER;
+ BOOL bCOLOR;
+ BOOL bCOLOR2;
+ BOOL bCOLOR2_TRANSPARENT;
+ BOOL bTEXTCOLOR;
+ BOOL bALPHA;
+ BOOL bMARGIN_LEFT;
+ BOOL bMARGIN_TOP;
+ BOOL bMARGIN_RIGHT;
+ BOOL bMARGIN_BOTTOM;
+ BOOL bIGNORED;
+ BOOL bBORDERSTYLE;
+};
+
+struct SKINDESCRIPTION
+{
+ DWORD cbSize;
+ StatusItems_t **StatusItems;
+ int lastItem;
+ int firstItem;
+ char szModule[100];
+ HWND hwndCLUI, hwndParent, hwndTab;
+ HWND hwndSkinEdit; /* out param */
+ HWND hwndImageEdit; /* out param */
+ HMENU hMenuItems;
+ void (*pfnSaveCompleteStruct)(void);
+ void (CALLBACK *pfnClcOptionsChanged)(void);
+};
// defines
diff --git a/plugins/TabSRMM/src/resource.h b/plugins/TabSRMM/src/resource.h index 89ca2d18d0..205ea0816a 100644 --- a/plugins/TabSRMM/src/resource.h +++ b/plugins/TabSRMM/src/resource.h @@ -62,7 +62,6 @@ #define IDD_OPTIONS3 407
#define IDD_OPTIONS4 408
#define IDC_EXCEPTION_DETAILS 1000
-#define IDC_UNLOAD 1000
#define IDC_READNEXT 1000
#define IDC_MINIMIZE 1000
#define IDC_COPY_EXCEPTION 1001
|