From 048b9e053a99a228b6040463db58fe0b492879ff Mon Sep 17 00:00:00 2001 From: George Hazan Date: Mon, 12 Nov 2018 23:09:05 +0300 Subject: LinkList -> g_plugin --- plugins/HistoryLinkListPlus/src/linklist_dlg.cpp | 32 ++++----- plugins/HistoryLinkListPlus/src/linklist_fct.cpp | 84 ++++++++++++------------ plugins/HistoryLinkListPlus/src/stdafx.h | 42 ++++++------ 3 files changed, 79 insertions(+), 79 deletions(-) diff --git a/plugins/HistoryLinkListPlus/src/linklist_dlg.cpp b/plugins/HistoryLinkListPlus/src/linklist_dlg.cpp index df254cd766..daf5213a87 100644 --- a/plugins/HistoryLinkListPlus/src/linklist_dlg.cpp +++ b/plugins/HistoryLinkListPlus/src/linklist_dlg.cpp @@ -45,18 +45,18 @@ INT_PTR CALLBACK MainDlgProc(HWND hDlg, UINT msg, WPARAM wParam, LPARAM lParam) TranslateDialogDefault(hDlg); TranslateMenu(listMenu); - hContact = ((db_get_b(0, LINKLIST_MODULE, LINKLIST_SAVESPECIAL, 0) == 0) ? NULL : DlgParam->hContact); - if (db_get_b(hContact, LINKLIST_MODULE, LINKLIST_FIRST, 0) == 0) { + hContact = ((g_plugin.getByte(LINKLIST_SAVESPECIAL) == 0) ? NULL : DlgParam->hContact); + if (g_plugin.getByte(hContact, LINKLIST_FIRST, 0) == 0) { // First use of this plugin! Set default size! - db_set_dw(hContact, LINKLIST_MODULE, "LinklistWidth", 400); - db_set_dw(hContact, LINKLIST_MODULE, "LinklistHeight", 450); - db_set_dw(hContact, LINKLIST_MODULE, "LinklistX", 0); - db_set_dw(hContact, LINKLIST_MODULE, "LinklistY", 0); + g_plugin.setDword(hContact, "LinklistWidth", 400); + g_plugin.setDword(hContact, "LinklistHeight", 450); + g_plugin.setDword(hContact, "LinklistX", 0); + g_plugin.setDword(hContact, "LinklistY", 0); - db_set_b(hContact, LINKLIST_MODULE, LINKLIST_FIRST, 1); + g_plugin.setByte(hContact, LINKLIST_FIRST, 1); } - DlgParam->splitterPosNew = (int)db_get_dw(hContact, LINKLIST_MODULE, LINKLIST_SPLITPOS, -1); + DlgParam->splitterPosNew = g_plugin.getDword(hContact, LINKLIST_SPLITPOS, -1); GetWindowRect(GetDlgItem(hDlg, IDC_MAIN), &rc); DlgParam->minSize.cx = rc.right - rc.left; @@ -101,7 +101,7 @@ INT_PTR CALLBACK MainDlgProc(HWND hDlg, UINT msg, WPARAM wParam, LPARAM lParam) LPTSTR link; ENLINK *pENLink = (ENLINK*)lParam; - BYTE mouseEvent = db_get_b(0, LINKLIST_MODULE, LINKLIST_MOUSE_EVENT, 0xFF); + BYTE mouseEvent = g_plugin.getByte(LINKLIST_MOUSE_EVENT, 0xFF); switch (pENLink->msg) { case WM_MOUSEMOVE: @@ -120,7 +120,7 @@ INT_PTR CALLBACK MainDlgProc(HWND hDlg, UINT msg, WPARAM wParam, LPARAM lParam) if (wcsstr(link, L"mailto:") != nullptr) ShellExecute(HWND_TOP, nullptr, link, nullptr, nullptr, SW_SHOWNORMAL); else { - bool openNewWindow = db_get_b(0, LINKLIST_MODULE, LINKLIST_OPEN_WINDOW, 0xFF) != 0xFF; + bool openNewWindow = g_plugin.getByte(LINKLIST_OPEN_WINDOW, 0xFF) != 0xFF; Utils_OpenUrlW(link, openNewWindow); } mir_free(link); @@ -132,7 +132,7 @@ INT_PTR CALLBACK MainDlgProc(HWND hDlg, UINT msg, WPARAM wParam, LPARAM lParam) hSubMenu = GetSubMenu(hPopup, 0); // Disable Menuoption if "mouse over" events are active - mouseEvent = db_get_b(0, LINKLIST_MODULE, LINKLIST_MOUSE_EVENT, 0xFF); + mouseEvent = g_plugin.getByte(LINKLIST_MOUSE_EVENT, 0xFF); if (mouseEvent == 0x01) EnableMenuItem(hSubMenu, IDM_SHOWMESSAGE, MF_BYCOMMAND | MF_DISABLED | MF_GRAYED); TranslateMenu(hSubMenu); @@ -341,9 +341,9 @@ INT_PTR CALLBACK MainDlgProc(HWND hDlg, UINT msg, WPARAM wParam, LPARAM lParam) case WM_DESTROY: if (DlgParam != nullptr) { - hContact = ((db_get_b(0, LINKLIST_MODULE, LINKLIST_SAVESPECIAL, 0) == 0) ? NULL : DlgParam->hContact); + hContact = ((g_plugin.getByte(LINKLIST_SAVESPECIAL, 0) == 0) ? NULL : DlgParam->hContact); Utils_SaveWindowPosition(hDlg, hContact, LINKLIST_MODULE, "Linklist"); - db_set_dw(0, LINKLIST_MODULE, LINKLIST_SPLITPOS, DlgParam->splitterPosNew); + g_plugin.setDword(LINKLIST_SPLITPOS, DlgParam->splitterPosNew); RemoveList(DlgParam->listStart); mir_free(DlgParam); } @@ -426,7 +426,7 @@ INT_PTR CALLBACK OptionsDlgProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM l switch (message) { case WM_INITDIALOG: TranslateDialogDefault(hDlg); - useDefault = db_get_b(0, LINKLIST_MODULE, LINKLIST_USE_DEF, 0xFF); + useDefault = g_plugin.getByte(LINKLIST_USE_DEF, 0xFF); if (useDefault == 0x01) { int mCol = GetMirandaColour(&colourSet); if (mCol == 0) { @@ -707,9 +707,9 @@ INT_PTR CALLBACK OptionsDlgProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM l if (((LPNMHDR)lParam)->code == PSN_APPLY) { // Write Settings to Database if (IsDlgButtonChecked(hDlg, IDC_CHECK1) == BST_CHECKED) - db_set_b(0, LINKLIST_MODULE, LINKLIST_USE_DEF, 0x01); + g_plugin.setByte(LINKLIST_USE_DEF, 0x01); else { - db_set_b(0, LINKLIST_MODULE, LINKLIST_USE_DEF, 0x00); + g_plugin.setByte(LINKLIST_USE_DEF, 0x00); colourSet.incoming = SendDlgItemMessage(hDlg, IDC_INCOMING, CPM_GETCOLOUR, 0, 0); colourSet.outgoing = SendDlgItemMessage(hDlg, IDC_OUTGOING, CPM_GETCOLOUR, 0, 0); colourSet.background = SendDlgItemMessage(hDlg, IDC_BACKGROUND, CPM_GETCOLOUR, 0, 0); diff --git a/plugins/HistoryLinkListPlus/src/linklist_fct.cpp b/plugins/HistoryLinkListPlus/src/linklist_fct.cpp index 56cafca663..75b00ae4e8 100644 --- a/plugins/HistoryLinkListPlus/src/linklist_fct.cpp +++ b/plugins/HistoryLinkListPlus/src/linklist_fct.cpp @@ -811,77 +811,77 @@ void GetListInfo(BYTE params, LISTELEMENT *listStart, LPCTSTR searchString, size void GetListOptions(LISTOPTIONS *options) { - options->openNewWindow = db_get_b(0, LINKLIST_MODULE, LINKLIST_OPEN_WINDOW, 0xFF); + options->openNewWindow = g_plugin.getByte(LINKLIST_OPEN_WINDOW, 0xFF); if (options->openNewWindow == 0xFF) { // No DB entry for this Plugin - db_set_b(0, LINKLIST_MODULE, LINKLIST_OPEN_WINDOW, 0x00); + g_plugin.setByte(LINKLIST_OPEN_WINDOW, 0x00); options->openNewWindow = 0x00; } - options->updateWindow = db_get_b(0, LINKLIST_MODULE, LINKLIST_UPDATE_WINDOW, 0xFF); + options->updateWindow = g_plugin.getByte(LINKLIST_UPDATE_WINDOW, 0xFF); if (options->updateWindow == 0xFF) { // No DB entry for this Plugin - db_set_b(0, LINKLIST_MODULE, LINKLIST_UPDATE_WINDOW, 0x00); + g_plugin.setByte(LINKLIST_UPDATE_WINDOW, 0x00); options->updateWindow = 0x00; } - options->mouseEvent = db_get_b(0, LINKLIST_MODULE, LINKLIST_MOUSE_EVENT, 0xFF); + options->mouseEvent = g_plugin.getByte(LINKLIST_MOUSE_EVENT, 0xFF); if (options->mouseEvent == 0xFF) { // No DB entry for this Plugin - db_set_b(0, LINKLIST_MODULE, LINKLIST_MOUSE_EVENT, 0x00); + g_plugin.setByte(LINKLIST_MOUSE_EVENT, 0x00); options->mouseEvent = 0x00; } - options->saveSpecial = db_get_b(0, LINKLIST_MODULE, LINKLIST_SAVESPECIAL, 0xFF); + options->saveSpecial = g_plugin.getByte(LINKLIST_SAVESPECIAL, 0xFF); if (options->saveSpecial == 0xFF) { // No DB entry for this Plugin - db_set_b(0, LINKLIST_MODULE, LINKLIST_SAVESPECIAL, 0x00); + g_plugin.setByte(LINKLIST_SAVESPECIAL, 0x00); options->saveSpecial = 0x00; } - options->showDate = db_get_b(0, LINKLIST_MODULE, LINKLIST_SHOW_DATE, 0xFF); + options->showDate = g_plugin.getByte(LINKLIST_SHOW_DATE, 0xFF); if (options->showDate == 0xFF) { // No DB entry for this Plugin - db_set_b(0, LINKLIST_MODULE, LINKLIST_SHOW_DATE, 0x01); + g_plugin.setByte(LINKLIST_SHOW_DATE, 0x01); options->showDate = 0x01; } - options->showLine = db_get_b(0, LINKLIST_MODULE, LINKLIST_SHOW_LINE, 0xFF); + options->showLine = g_plugin.getByte(LINKLIST_SHOW_LINE, 0xFF); if (options->showLine == 0xFF) { // No DB entry for this Plugin - db_set_b(0, LINKLIST_MODULE, LINKLIST_SHOW_LINE, 0x01); + g_plugin.setByte(LINKLIST_SHOW_LINE, 0x01); options->showLine = 0x01; } - options->showTime = db_get_b(0, LINKLIST_MODULE, LINKLIST_SHOW_TIME, 0xFF); + options->showTime = g_plugin.getByte(LINKLIST_SHOW_TIME, 0xFF); if (options->showTime == 0xFF) { // No DB entry for this Plugin - db_set_b(0, LINKLIST_MODULE, LINKLIST_SHOW_TIME, 0x01); + g_plugin.setByte(LINKLIST_SHOW_TIME, 0x01); options->showTime = 0x01; } - options->showDirection = db_get_b(0, LINKLIST_MODULE, LINKLIST_SHOW_DIRECTION, 0xFF); + options->showDirection = g_plugin.getByte(LINKLIST_SHOW_DIRECTION, 0xFF); if (options->showDirection == 0xFF) { // No DB entry for this Plugin - db_set_b(0, LINKLIST_MODULE, LINKLIST_SHOW_DIRECTION, 0x01); + g_plugin.setByte(LINKLIST_SHOW_DIRECTION, 0x01); options->showDirection = 0x01; } - options->showType = db_get_b(0, LINKLIST_MODULE, LINKLIST_SHOW_TYPE, 0xFF); + options->showType = g_plugin.getByte(LINKLIST_SHOW_TYPE, 0xFF); if (options->showType == 0xFF) { // No DB entry for this Plugin - db_set_b(0, LINKLIST_MODULE, LINKLIST_SHOW_TYPE, 0x01); + g_plugin.setByte(LINKLIST_SHOW_TYPE, 0x01); options->showType = 0x01; } @@ -890,15 +890,15 @@ void GetListOptions(LISTOPTIONS *options) void SetListOptions(LISTOPTIONS *options) { - db_set_b(0, LINKLIST_MODULE, LINKLIST_OPEN_WINDOW, options->openNewWindow); - db_set_b(0, LINKLIST_MODULE, LINKLIST_UPDATE_WINDOW, options->updateWindow); - db_set_b(0, LINKLIST_MODULE, LINKLIST_MOUSE_EVENT, options->mouseEvent); - db_set_b(0, LINKLIST_MODULE, LINKLIST_SAVESPECIAL, options->saveSpecial); - db_set_b(0, LINKLIST_MODULE, LINKLIST_SHOW_DATE, options->showDate); - db_set_b(0, LINKLIST_MODULE, LINKLIST_SHOW_LINE, options->showLine); - db_set_b(0, LINKLIST_MODULE, LINKLIST_SHOW_TIME, options->showTime); - db_set_b(0, LINKLIST_MODULE, LINKLIST_SHOW_DIRECTION, options->showDirection); - db_set_b(0, LINKLIST_MODULE, LINKLIST_SHOW_TYPE, options->showType); + g_plugin.setByte(LINKLIST_OPEN_WINDOW, options->openNewWindow); + g_plugin.setByte(LINKLIST_UPDATE_WINDOW, options->updateWindow); + g_plugin.setByte(LINKLIST_MOUSE_EVENT, options->mouseEvent); + g_plugin.setByte(LINKLIST_SAVESPECIAL, options->saveSpecial); + g_plugin.setByte(LINKLIST_SHOW_DATE, options->showDate); + g_plugin.setByte(LINKLIST_SHOW_LINE, options->showLine); + g_plugin.setByte(LINKLIST_SHOW_TIME, options->showTime); + g_plugin.setByte(LINKLIST_SHOW_DIRECTION, options->showDirection); + g_plugin.setByte(LINKLIST_SHOW_TYPE, options->showType); } /* @@ -946,11 +946,11 @@ void GetColour(MYCOLOURSET *colourSet) DWORD colour; BYTE useDefault; - useDefault = db_get_b(0, LINKLIST_MODULE, LINKLIST_USE_DEF, 0xFF); + useDefault = g_plugin.getByte(LINKLIST_USE_DEF, 0xFF); if (useDefault == 0xFF) { // No DB entry for this Plugin - db_set_b(0, LINKLIST_MODULE, LINKLIST_USE_DEF, 0x01); + g_plugin.setByte(LINKLIST_USE_DEF, 0x01); useDefault = 0x01; } @@ -969,7 +969,7 @@ void GetColour(MYCOLOURSET *colourSet) colourSet->incoming = colour; else { - db_set_b(0, LINKLIST_MODULE, LINKLIST_USE_DEF, 0x00); + g_plugin.setByte(LINKLIST_USE_DEF, 0x00); useDefault = 0x00; } } @@ -986,7 +986,7 @@ void GetColour(MYCOLOURSET *colourSet) colourSet->outgoing = colour; else { - db_set_b(0, LINKLIST_MODULE, LINKLIST_USE_DEF, 0x00); + g_plugin.setByte(LINKLIST_USE_DEF, 0x00); useDefault = 0x00; } } @@ -1003,7 +1003,7 @@ void GetColour(MYCOLOURSET *colourSet) colourSet->background = colour; else { - db_set_b(0, LINKLIST_MODULE, LINKLIST_USE_DEF, 0x00); + g_plugin.setByte(LINKLIST_USE_DEF, 0x00); useDefault = 0x00; } } @@ -1053,7 +1053,7 @@ void GetDBColour(MYCOLOURSET *colourSet) colourSet->incoming = colour; else { - db_set_dw(0, LINKLIST_MODULE, LINKLIST_IN_COL, IN_COL_DEF); + g_plugin.setDword(LINKLIST_IN_COL, IN_COL_DEF); colourSet->incoming = IN_COL_DEF; } @@ -1062,7 +1062,7 @@ void GetDBColour(MYCOLOURSET *colourSet) colourSet->outgoing = colour; else { - db_set_dw(0, LINKLIST_MODULE, LINKLIST_OUT_COL, OUT_COL_DEF); + g_plugin.setDword(LINKLIST_OUT_COL, OUT_COL_DEF); colourSet->outgoing = OUT_COL_DEF; } @@ -1071,7 +1071,7 @@ void GetDBColour(MYCOLOURSET *colourSet) colourSet->background = colour; else { - db_set_dw(0, LINKLIST_MODULE, LINKLIST_BG_COL, BG_COL_DEF); + g_plugin.setDword(LINKLIST_BG_COL, BG_COL_DEF); colourSet->background = BG_COL_DEF; } @@ -1080,7 +1080,7 @@ void GetDBColour(MYCOLOURSET *colourSet) colourSet->text = colour; else { - db_set_dw(0, LINKLIST_MODULE, LINKLIST_TXT_COL, TXT_COL_DEF); + g_plugin.setDword(LINKLIST_TXT_COL, TXT_COL_DEF); colourSet->text = TXT_COL_DEF; } } @@ -1141,21 +1141,21 @@ Write user defined colours to the database */ void SetDBColour(MYCOLOURSET *colourSet) { - db_set_dw(0, LINKLIST_MODULE, LINKLIST_IN_COL, colourSet->incoming); - db_set_dw(0, LINKLIST_MODULE, LINKLIST_OUT_COL, colourSet->outgoing); - db_set_dw(0, LINKLIST_MODULE, LINKLIST_BG_COL, colourSet->background); - db_set_dw(0, LINKLIST_MODULE, LINKLIST_TXT_COL, colourSet->text); + g_plugin.setDword(LINKLIST_IN_COL, colourSet->incoming); + g_plugin.setDword(LINKLIST_OUT_COL, colourSet->outgoing); + g_plugin.setDword(LINKLIST_BG_COL, colourSet->background); + g_plugin.setDword(LINKLIST_TXT_COL, colourSet->text); } BYTE GetUpdateSetting(void) { BYTE updateWindow; - updateWindow = db_get_b(0, LINKLIST_MODULE, LINKLIST_UPDATE_WINDOW, 0xFF); + updateWindow = g_plugin.getByte(LINKLIST_UPDATE_WINDOW, 0xFF); if (updateWindow == 0xFF) { // No DB entry for this Plugin - db_set_b(0, LINKLIST_MODULE, LINKLIST_UPDATE_WINDOW, 0x00); + g_plugin.setByte(LINKLIST_UPDATE_WINDOW, 0x00); return 0; } if (updateWindow == 0x00) diff --git a/plugins/HistoryLinkListPlus/src/stdafx.h b/plugins/HistoryLinkListPlus/src/stdafx.h index 728a5b3160..c14165320a 100644 --- a/plugins/HistoryLinkListPlus/src/stdafx.h +++ b/plugins/HistoryLinkListPlus/src/stdafx.h @@ -105,27 +105,27 @@ typedef struct { #include "linklist_fct.h" -#define LINKLIST_MODULE "HistoryLinklist" -#define LINKLIST_IN_COL "InColour" -#define LINKLIST_OUT_COL "OutColour" -#define LINKLIST_BG_COL "BGColour" -#define LINKLIST_TXT_COL "TxtColour" -#define LINKLIST_USE_DEF "UseMirandaDefault" -#define LINKLIST_OPEN_WINDOW "OpenNewWindow" -#define LINKLIST_UPDATE_WINDOW "UpdateWindow" -#define LINKLIST_MOUSE_EVENT "MessageView" -#define LINKLIST_LEFT "WindowLeft" -#define LINKLIST_RIGHT "WindowRight" -#define LINKLIST_BOTTOM "WindowBottom" -#define LINKLIST_TOP "WindowTop" -#define LINKLIST_SPLITPOS "SplitterPos" -#define LINKLIST_SAVESPECIAL "SavePosSpecial" -#define LINKLIST_FIRST "FirstStartup" -#define LINKLIST_SHOW_DATE "ShowDate" -#define LINKLIST_SHOW_LINE "ShowLine" -#define LINKLIST_SHOW_TIME "ShowTime" -#define LINKLIST_SHOW_DIRECTION "ShowMessageDirection" -#define LINKLIST_SHOW_TYPE "ShowMessageType" +#define LINKLIST_MODULE "HistoryLinklist" +#define LINKLIST_IN_COL "InColour" +#define LINKLIST_OUT_COL "OutColour" +#define LINKLIST_BG_COL "BGColour" +#define LINKLIST_TXT_COL "TxtColour" +#define LINKLIST_USE_DEF "UseMirandaDefault" +#define LINKLIST_OPEN_WINDOW "OpenNewWindow" +#define LINKLIST_UPDATE_WINDOW "UpdateWindow" +#define LINKLIST_MOUSE_EVENT "MessageView" +#define LINKLIST_LEFT "WindowLeft" +#define LINKLIST_RIGHT "WindowRight" +#define LINKLIST_BOTTOM "WindowBottom" +#define LINKLIST_TOP "WindowTop" +#define LINKLIST_SPLITPOS "SplitterPos" +#define LINKLIST_SAVESPECIAL "SavePosSpecial" +#define LINKLIST_FIRST "FirstStartup" +#define LINKLIST_SHOW_DATE "ShowDate" +#define LINKLIST_SHOW_LINE "ShowLine" +#define LINKLIST_SHOW_TIME "ShowTime" +#define LINKLIST_SHOW_DIRECTION "ShowMessageDirection" +#define LINKLIST_SHOW_TYPE "ShowMessageType" struct CMPlugin : public PLUGIN { -- cgit v1.2.3