From 97f80dd9e5737bb65cdd2b745c864e9c3b7ab433 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Sat, 16 Jan 2021 16:39:56 +0300 Subject: glory, glory, halleluya: perversive manual call of OnChange() event inside OnInitDialog isn't needed anymore --- plugins/Clist_nicer/src/clcopts.cpp | 4 ---- plugins/Clist_nicer/src/clistopts.cpp | 8 -------- plugins/IEHistory/src/dlgHandlers.cpp | 1 - plugins/PluginUpdater/src/Options.cpp | 3 --- plugins/Scriver/src/msgoptions.cpp | 22 +--------------------- plugins/SeenPlugin/src/options.cpp | 1 - plugins/StatusManager/src/ss_options.cpp | 8 -------- plugins/TabSRMM/src/msgoptions.cpp | 1 - 8 files changed, 1 insertion(+), 47 deletions(-) (limited to 'plugins') diff --git a/plugins/Clist_nicer/src/clcopts.cpp b/plugins/Clist_nicer/src/clcopts.cpp index ded6e52933..fc3d14ecfc 100644 --- a/plugins/Clist_nicer/src/clcopts.cpp +++ b/plugins/Clist_nicer/src/clcopts.cpp @@ -277,11 +277,7 @@ public: SendDlgItemMessage(m_hwnd, IDC_AVATARSIZESPIN, UDM_SETRANGE, 0, MAKELONG(100, 16)); SendDlgItemMessage(m_hwnd, IDC_AVATARSIZESPIN, UDM_SETPOS, 0, cfg::dat.avatarSize); - onChange_AvatarsBorder(0); - onChange_AvatarsRounded(0); - chkLocalTime.SetState(cfg::dat.bShowLocalTime); - onChange_LocalTime(0); if (cfg::dat.dwFlags & CLUI_FRAME_AVATARSLEFT) SendDlgItemMessage(m_hwnd, IDC_ALIGNMENT, CB_SETCURSEL, 1, 0); diff --git a/plugins/Clist_nicer/src/clistopts.cpp b/plugins/Clist_nicer/src/clistopts.cpp index cc6bc3e3ee..6f8e11e4ac 100644 --- a/plugins/Clist_nicer/src/clistopts.cpp +++ b/plugins/Clist_nicer/src/clistopts.cpp @@ -61,7 +61,6 @@ public: chkCycle.SetState(g_plugin.getByte("TrayIcon", SETTING_TRAYICON_DEFAULT) == SETTING_TRAYICON_CYCLE); chkMulti.SetState(g_plugin.getByte("TrayIcon", SETTING_TRAYICON_DEFAULT) == SETTING_TRAYICON_MULTI); chkDontCycle.SetState(g_plugin.getByte("TrayIcon", SETTING_TRAYICON_DEFAULT) == SETTING_TRAYICON_SINGLE); - onChange_Cycle(0); SendDlgItemMessage(m_hwnd, IDC_CYCLETIMESPIN, UDM_SETRANGE, 0, MAKELONG(120, 1)); SendDlgItemMessage(m_hwnd, IDC_CYCLETIMESPIN, UDM_SETPOS, 0, MAKELONG(g_plugin.getWord("CycleTime", SETTING_CYCLETIME_DEFAULT), 0)); @@ -204,13 +203,11 @@ public: for (auto &it : checkBoxToStyleEx) CheckDlgButton(m_hwnd, it.id, (exStyle & it.flag) ^ (it.flag * it.not_t) ? BST_CHECKED : BST_UNCHECKED); - onChange_Smooth(0); CheckDlgButton(m_hwnd, IDC_FULLROWSELECT, (cfg::dat.dwFlags & CLUI_FULLROWSELECT) ? BST_CHECKED : BST_UNCHECKED); CheckDlgButton(m_hwnd, IDC_DBLCLKAVATARS, cfg::dat.bDblClkAvatars ? BST_CHECKED : BST_UNCHECKED); chkGreyOut.SetState(db_get_dw(0, "CLC", "GreyoutFlags", CLCDEFAULT_GREYOUTFLAGS)); - onChange_GreyOut(0); DWORD style = db_get_dw(0, "CLC", "FullGreyoutFlags", CLCDEFAULT_FULLGREYOUTFLAGS); TVINSERTSTRUCT tvis; @@ -314,7 +311,6 @@ public: CheckDlgButton(m_hwnd, IDC_ONDESKTOP, g_plugin.getByte("OnDesktop", 0) ? BST_CHECKED : BST_UNCHECKED); chkAutoSize.SetState(cfg::dat.autosize); - onChange_AutoSize(0); SendDlgItemMessage(m_hwnd, IDC_BORDERSTYLE, CB_INSERTSTRING, -1, (LPARAM)TranslateT("Title bar")); SendDlgItemMessage(m_hwnd, IDC_BORDERSTYLE, CB_INSERTSTRING, -1, (LPARAM)TranslateT("Tool Window")); @@ -344,7 +340,6 @@ public: SendDlgItemMessage(m_hwnd, IDC_HIDETIMESPIN, UDM_SETPOS, 0, MAKELONG(g_plugin.getWord("HideTime", SETTING_HIDETIME_DEFAULT), 0)); chkAutoHide.SetState(g_plugin.getByte("AutoHide", SETTING_AUTOHIDE_DEFAULT)); - onChange_AutoHide(0); ptrW tszTitle(g_plugin.getWStringA("TitleText")); if (tszTitle != NULL) @@ -355,7 +350,6 @@ public: CheckDlgButton(m_hwnd, IDC_FULLTRANSPARENT, cfg::dat.bFullTransparent ? BST_CHECKED : BST_UNCHECKED); chkTransparent.SetState(cfg::dat.isTransparent); - onChange_Transparent(0); SendDlgItemMessage(m_hwnd, IDC_TRANSACTIVE, TBM_SETRANGE, FALSE, MAKELONG(1, 255)); SendDlgItemMessage(m_hwnd, IDC_TRANSINACTIVE, TBM_SETRANGE, FALSE, MAKELONG(1, 255)); @@ -574,7 +568,6 @@ public: bool OnInitDialog() override { chkBitmap.SetState(db_get_b(0, "CLC", "UseBitmap", CLCDEFAULT_USEBITMAP)); - onChange_Bitmap(0); CheckDlgButton(m_hwnd, IDC_WINCOLOUR, db_get_b(0, "CLC", "UseWinColours", 0) ? BST_CHECKED : BST_UNCHECKED); CheckDlgButton(m_hwnd, IDC_SKINMODE, cfg::dat.bWallpaperMode ? BST_CHECKED : BST_UNCHECKED); @@ -682,7 +675,6 @@ public: bool OnInitDialog() override { chkShowSbar.SetState(db_get_b(0, "CLUI", "ShowSBar", 1)); - onChange_Show(0); BYTE showOpts = db_get_b(0, "CLUI", "SBarShow", 1); CheckDlgButton(m_hwnd, IDC_SHOWICON, showOpts & 1 ? BST_CHECKED : BST_UNCHECKED); diff --git a/plugins/IEHistory/src/dlgHandlers.cpp b/plugins/IEHistory/src/dlgHandlers.cpp index be1115708d..4fcab2bdf9 100644 --- a/plugins/IEHistory/src/dlgHandlers.cpp +++ b/plugins/IEHistory/src/dlgHandlers.cpp @@ -607,7 +607,6 @@ public: { chkLoadAll.SetState(g_plugin.iLoadCount == 0); chkLoadNumber.SetState(!chkLoadAll.GetState()); - onChange_All(0); return true; } diff --git a/plugins/PluginUpdater/src/Options.cpp b/plugins/PluginUpdater/src/Options.cpp index 24c379b0e5..08b6c86a9a 100644 --- a/plugins/PluginUpdater/src/Options.cpp +++ b/plugins/PluginUpdater/src/Options.cpp @@ -218,9 +218,6 @@ public: chkPlatform.Hide(); } #endif - - onChange_Startup(0); - onChange_Period(0); return true; } diff --git a/plugins/Scriver/src/msgoptions.cpp b/plugins/Scriver/src/msgoptions.cpp index b056b8bf27..6193b1a9d0 100644 --- a/plugins/Scriver/src/msgoptions.cpp +++ b/plugins/Scriver/src/msgoptions.cpp @@ -286,8 +286,6 @@ public: cmbSendMode.AddString(TranslateT("Ctrl+Enter")); cmbSendMode.AddString(TranslateT("Shift+Enter")); cmbSendMode.SetCurSel(g_dat.sendMode); - - onChange_AutoPopup(0); return true; } @@ -361,13 +359,7 @@ public: chkLimitChatTabs.OnChange = Callback(this, &CTabsOptionsDlg::onChange_LimitChatTabs); chkSeparateChats.OnChange = Callback(this, &CTabsOptionsDlg::onChange_SeparateChats); } - - bool OnInitDialog() override - { - onChange_UseTabs(0); - return true; - } - + void onChange_UseTabs(CCtrlCheck*) { int bChecked = chkUseTabs.GetState(); @@ -462,9 +454,6 @@ public: mir_snprintf(str, "%d%%", (int)(100 * SendDlgItemMessage(m_hwnd, IDC_ITRANSPARENCYVALUE, TBM_GETPOS, 0, 0) / 255)); SetDlgItemTextA(m_hwnd, IDC_ITRANSPARENCYPERC, str); - - onChange_Transparency(0); - onChange_ShowTitlebar(0); return true; } @@ -616,12 +605,6 @@ public: break; } - onChange_Time(0); - onChange_Times(0); - onChange_Dates(0); - onChange_GroupMsg(0); - onChange_IndentText(0); - PARAFORMAT2 pf2; memset(&pf2, 0, sizeof(pf2)); pf2.cbSize = sizeof(pf2); @@ -746,9 +729,6 @@ public: onResetClist(0); chkTypingBalloon.SetState(!g_plugin.bShowTypingClist); - - onChange_Notify(0); - onChange_Tray(0); return true; } diff --git a/plugins/SeenPlugin/src/options.cpp b/plugins/SeenPlugin/src/options.cpp index 670d4be195..4ba368a2df 100644 --- a/plugins/SeenPlugin/src/options.cpp +++ b/plugins/SeenPlugin/src/options.cpp @@ -119,7 +119,6 @@ public: SendDlgItemMessage(m_hwnd, i, CPM_SETCOLOUR, 0, back); SendDlgItemMessage(m_hwnd, i + 20, CPM_SETCOLOUR, 0, text); } - onChange_Popups(0); SetDlgItemText(m_hwnd, IDC_POPUPSTAMP, g_plugin.getMStringW("PopupStamp", DEFAULT_POPUPSTAMP)); SetDlgItemText(m_hwnd, IDC_POPUPSTAMPTEXT, g_plugin.getMStringW("PopupStampText", DEFAULT_POPUPSTAMPTEXT)); diff --git a/plugins/StatusManager/src/ss_options.cpp b/plugins/StatusManager/src/ss_options.cpp index d1e10551c0..999dc65032 100644 --- a/plugins/StatusManager/src/ss_options.cpp +++ b/plugins/StatusManager/src/ss_options.cpp @@ -264,7 +264,6 @@ class CSSMainOptDlg : public CSSOptionsBaseDlg chkSetDocked.Enable(db_get_b(0, MODULE_CLIST, SETTING_TOOLWINDOW, 1)); if (!chkSetDocked.Enabled()) chkSetDocked.SetState(false); - onChange_Docked(0); int val = SSPlugin.getByte(SETTING_WINSTATE, SETTING_STATE_NORMAL); SendDlgItemMessage(m_hwnd, IDC_WINSTATE, CB_RESETCONTENT, 0, 0); @@ -285,8 +284,6 @@ class CSSMainOptDlg : public CSSOptionsBaseDlg SendDlgItemMessage(m_hwnd, IDC_WINSTATE, CB_SETITEMDATA, item, SETTING_STATE_NORMAL); if (val == SETTING_STATE_NORMAL || (val == SETTING_STATE_MINIMIZED) && db_get_b(0, MODULE_CLIST, SETTING_TOOLWINDOW, 0)) SendDlgItemMessage(m_hwnd, IDC_WINSTATE, CB_SETCURSEL, item, 0); - - onChange_SetWinSize(0); } CCtrlButton btnShowCmdl; @@ -354,11 +351,6 @@ public: if (val == DOCKED_NONE) SendDlgItemMessage(m_hwnd, IDC_DOCKED, CB_SETCURSEL, (WPARAM)item, 0); - onChange_SetProfile(0); - onChange_ShowDialog(0); - onChange_SetWinState(0); - onChange_SetWinLocation(0); - ReinitProfiles(); timer.Start(100); return true; diff --git a/plugins/TabSRMM/src/msgoptions.cpp b/plugins/TabSRMM/src/msgoptions.cpp index 7b09df4edc..4cb9603898 100644 --- a/plugins/TabSRMM/src/msgoptions.cpp +++ b/plugins/TabSRMM/src/msgoptions.cpp @@ -1209,7 +1209,6 @@ public: chkLimit.SetState(M.GetByte("cuttitle", 0)); spnLimit.SetPosition(db_get_w(0, SRMSGMOD_T, "cut_at", 15)); - onChange_Cut(&chkLimit); cmbEscMode.AddString(TranslateT("Normal - close tab, if last tab is closed also close the window")); cmbEscMode.AddString(TranslateT("Minimize the window to the task bar")); -- cgit v1.2.3