From 29dfc6f06c188fee6ba03ea937f6435875d313bc Mon Sep 17 00:00:00 2001 From: George Hazan Date: Tue, 12 Apr 2022 20:30:29 +0300 Subject: Plugin Updater: we don't need "Use HTTPS" anymore --- plugins/PluginUpdater/res/Resource.rc | 11 +++++--- plugins/PluginUpdater/src/Options.cpp | 40 ++++++++++------------------- plugins/PluginUpdater/src/PluginUpdater.cpp | 1 - plugins/PluginUpdater/src/resource.h | 2 +- plugins/PluginUpdater/src/stdafx.h | 10 ++++---- plugins/PluginUpdater/src/version.h | 4 +-- 6 files changed, 29 insertions(+), 39 deletions(-) (limited to 'plugins') diff --git a/plugins/PluginUpdater/res/Resource.rc b/plugins/PluginUpdater/res/Resource.rc index eabaa72a67..c6c5afb69b 100644 --- a/plugins/PluginUpdater/res/Resource.rc +++ b/plugins/PluginUpdater/res/Resource.rc @@ -56,7 +56,7 @@ BEGIN PUSHBUTTON "Select &none",IDC_SELNONE,175,218,60,14,NOT WS_TABSTOP END -IDD_OPT_UPDATENOTIFY DIALOGEX 0, 0, 301, 259 +IDD_OPT_UPDATENOTIFY DIALOGEX 0, 0, 301, 248 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD EXSTYLE WS_EX_CONTROLPARENT FONT 8, "MS Shell Dlg", 0, 0, 0x1 @@ -75,7 +75,7 @@ BEGIN LTEXT "Number of backups to keep:",IDC_STATIC,12,84,184,8 EDITTEXT IDC_NUMBER_BACKUPS,204,82,40,14,ES_AUTOHSCROLL CONTROL "",IDC_BACKUPS_SPIN,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS,243,82,11,14 - GROUPBOX "Files source",IDC_STATIC,2,103,285,132 + GROUPBOX "Files source",IDC_STATIC,2,103,285,121 CONTROL "Stable version",IDC_STABLE,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,12,116,267,10 CONTROL "Stable version with debug symbols",IDC_STABLE_SYMBOLS, "Button",BS_AUTORADIOBUTTON | WS_TABSTOP,12,130,267,10 @@ -85,8 +85,7 @@ BEGIN CONTROL "Custom version",IDC_CUSTOM,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,12,172,267,10 EDITTEXT IDC_CUSTOMURL,12,187,267,16,ES_AUTOHSCROLL | WS_DISABLED CONTROL "Change platform to 32-bit",IDC_CHANGE_PLATFORM,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,208,267,10 - CONTROL "Use HTTPS",IDC_USE_HTTPS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,221,267,10 - CTEXT "Some component(s) was updated.\nYou need to restart your Miranda to apply installed updates.",IDC_NEEDRESTARTLABEL,11,238,267,15,NOT WS_VISIBLE + CTEXT "Some component(s) was updated.\nYou need to restart your Miranda to apply installed updates.",IDC_NEEDRESTARTLABEL,11,227,267,15,NOT WS_VISIBLE END IDD_POPUP DIALOGEX 0, 0, 316, 174 @@ -185,6 +184,10 @@ BEGIN RIGHTMARGIN, 294 END + IDD_POPUP, DIALOG + BEGIN + END + IDD_MISSINGPLUGINS, DIALOG BEGIN BOTTOMMARGIN, 245 diff --git a/plugins/PluginUpdater/src/Options.cpp b/plugins/PluginUpdater/src/Options.cpp index 2525598fe5..da0291c4be 100644 --- a/plugins/PluginUpdater/src/Options.cpp +++ b/plugins/PluginUpdater/src/Options.cpp @@ -46,21 +46,20 @@ static int GetUpdateMode() wchar_t* GetDefaultUrl() { int bits = g_plugin.bChangePlatform ? DEFAULT_OPP_BITS : DEFAULT_BITS; - const wchar_t *pwszProto = g_plugin.bUseHttps ? L"https" : L"http"; wchar_t url[MAX_PATH]; switch (GetUpdateMode()) { case UPDATE_MODE_STABLE: - mir_snwprintf(url, DEFAULT_UPDATE_URL, pwszProto, bits); + mir_snwprintf(url, DEFAULT_UPDATE_URL, bits); return mir_wstrdup(url); case UPDATE_MODE_STABLE_SYMBOLS: - mir_snwprintf(url, DEFAULT_UPDATE_URL_STABLE_SYMBOLS, pwszProto, bits); + mir_snwprintf(url, DEFAULT_UPDATE_URL_STABLE_SYMBOLS, bits); return mir_wstrdup(url); case UPDATE_MODE_TRUNK: - mir_snwprintf(url, DEFAULT_UPDATE_URL_TRUNK, pwszProto, bits); + mir_snwprintf(url, DEFAULT_UPDATE_URL_TRUNK, bits); return mir_wstrdup(url); case UPDATE_MODE_TRUNK_SYMBOLS: - mir_snwprintf(url, DEFAULT_UPDATE_URL_TRUNK_SYMBOLS, pwszProto, bits); + mir_snwprintf(url, DEFAULT_UPDATE_URL_TRUNK_SYMBOLS, bits); return mir_wstrdup(url); default: return g_plugin.getWStringA(DB_SETTING_UPDATE_URL); @@ -72,15 +71,10 @@ wchar_t* GetDefaultUrl() class COptionsDlg : public CDlgBase { - CCtrlSpin spinBackups; + CCtrlSpin spinBackups, spinPeriod; CCtrlCombo cmbPeriod; CCtrlCheck chkPeriod, chkStable, chkStableSym, chkTrunk, chkTrunkSym, chkCustom; - CCtrlCheck chkHttps, chkPlatform, chkStartup, chkAutoRestart, chkOnlyOnce, chkBackup, chkSilent; - - const wchar_t* GetHttps() - { - return chkHttps.GetState() ? L"https" : L"http"; - } + CCtrlCheck chkPlatform, chkStartup, chkAutoRestart, chkOnlyOnce, chkBackup, chkSilent; int GetBits() { @@ -91,19 +85,19 @@ class COptionsDlg : public CDlgBase { wchar_t defurl[MAX_PATH]; if (chkStable.GetState()) { - mir_snwprintf(defurl, DEFAULT_UPDATE_URL, GetHttps(), GetBits()); + mir_snwprintf(defurl, DEFAULT_UPDATE_URL, GetBits()); SetDlgItemText(m_hwnd, IDC_CUSTOMURL, defurl); } else if (chkStableSym.GetState()) { - mir_snwprintf(defurl, DEFAULT_UPDATE_URL_STABLE_SYMBOLS, GetHttps(), GetBits()); + mir_snwprintf(defurl, DEFAULT_UPDATE_URL_STABLE_SYMBOLS, GetBits()); SetDlgItemText(m_hwnd, IDC_CUSTOMURL, defurl); } else if (chkTrunk.GetState()) { - mir_snwprintf(defurl, DEFAULT_UPDATE_URL_TRUNK, GetHttps(), GetBits()); + mir_snwprintf(defurl, DEFAULT_UPDATE_URL_TRUNK, GetBits()); SetDlgItemText(m_hwnd, IDC_CUSTOMURL, defurl); } else if (chkTrunkSym.GetState()) { - mir_snwprintf(defurl, DEFAULT_UPDATE_URL_TRUNK_SYMBOLS, GetHttps(), GetBits()); + mir_snwprintf(defurl, DEFAULT_UPDATE_URL_TRUNK_SYMBOLS, GetBits()); SetDlgItemText(m_hwnd, IDC_CUSTOMURL, defurl); } } @@ -112,7 +106,6 @@ public: COptionsDlg() : CDlgBase(g_plugin, IDD_OPT_UPDATENOTIFY), cmbPeriod(this, IDC_PERIODMEASURE), - chkHttps(this, IDC_USE_HTTPS), chkBackup(this, IDC_BACKUP), chkSilent(this, IDC_SILENTMODE), chkPeriod(this, IDC_UPDATEONPERIOD), @@ -127,9 +120,9 @@ public: chkStableSym(this, IDC_STABLE_SYMBOLS), chkCustom(this, IDC_CUSTOM), + spinPeriod(this, IDC_PERIODSPIN, 99, 1), spinBackups(this, IDC_BACKUPS_SPIN, 10, 1) { - CreateLink(chkHttps, g_plugin.bUseHttps); CreateLink(chkBackup, g_plugin.bBackup); CreateLink(chkPeriod, g_plugin.bUpdateOnPeriod); CreateLink(chkSilent, g_plugin.bSilentMode); @@ -138,7 +131,7 @@ public: CreateLink(chkAutoRestart, g_plugin.bAutoRestart); CreateLink(spinBackups, g_plugin.iNumberBackups); - chkPlatform.OnChange = chkHttps.OnChange = Callback(this, &COptionsDlg::onChange_Url); + chkPlatform.OnChange = Callback(this, &COptionsDlg::onChange_Url); chkPeriod.OnChange = Callback(this, &COptionsDlg::onChange_Period); chkStartup.OnChange = Callback(this, &COptionsDlg::onChange_Startup); @@ -156,8 +149,7 @@ public: if (g_plugin.getByte(DB_SETTING_NEED_RESTART, 0)) ShowWindow(GetDlgItem(m_hwnd, IDC_NEEDRESTARTLABEL), SW_SHOW); - SendDlgItemMessage(m_hwnd, IDC_PERIODSPIN, UDM_SETRANGE, 0, MAKELONG(99, 1)); - SendDlgItemMessage(m_hwnd, IDC_PERIODSPIN, UDM_SETPOS, 0, (LPARAM)g_plugin.iPeriod); + spinPeriod.SetPosition(g_plugin.iPeriod); if (ServiceExists(MS_AB_BACKUP)) { chkBackup.Enable(); @@ -175,7 +167,6 @@ public: g_plugin.setByte(DB_SETTING_UPDATE_MODE, UPDATE_MODE_TRUNK); chkStable.SetText(LPGENW("Stable version (incompatible with current development version)")); } - TranslateDialogDefault(m_hwnd); cmbPeriod.AddString(TranslateT("hours"), 0); cmbPeriod.AddString(TranslateT("days"), 1); @@ -224,10 +215,7 @@ public: bool OnApply() override { g_plugin.iPeriodMeasure = cmbPeriod.GetCurData(); - - wchar_t buffer[3] = { 0 }; - Edit_GetText(GetDlgItem(m_hwnd, IDC_PERIOD), buffer, _countof(buffer)); - g_plugin.iPeriod = _wtoi(buffer); + g_plugin.iPeriod = spinPeriod.GetPosition(); g_plugin.InitTimer(0); diff --git a/plugins/PluginUpdater/src/PluginUpdater.cpp b/plugins/PluginUpdater/src/PluginUpdater.cpp index 95afed2a1d..ff19aff47c 100644 --- a/plugins/PluginUpdater/src/PluginUpdater.cpp +++ b/plugins/PluginUpdater/src/PluginUpdater.cpp @@ -49,7 +49,6 @@ CMPlugin::CMPlugin() : // common settings bBackup(MODULENAME, "Backup", false), - bUseHttps(MODULENAME, "UseHttps", true), bSilentMode(MODULENAME, "SilentMode", false), bAutoRestart(MODULENAME, "AutoRestart", false), bOnlyOnceADay(MODULENAME, "OnlyOnceADay", true), diff --git a/plugins/PluginUpdater/src/resource.h b/plugins/PluginUpdater/src/resource.h index a31fb28440..38c82a5170 100644 --- a/plugins/PluginUpdater/src/resource.h +++ b/plugins/PluginUpdater/src/resource.h @@ -1,6 +1,6 @@ //{{NO_DEPENDENCIES}} // Microsoft Visual C++ generated include file. -// Used by w:\miranda-ng\plugins\PluginUpdater\res\Resource.rc +// Used by C:\Users\georg\DiskW\miranda-ng\plugins\PluginUpdater\res\Resource.rc // #define IDD_UPDATE 101 #define IDD_OPT_UPDATENOTIFY 102 diff --git a/plugins/PluginUpdater/src/stdafx.h b/plugins/PluginUpdater/src/stdafx.h index b28a96ed02..7c8e2dd1f9 100644 --- a/plugins/PluginUpdater/src/stdafx.h +++ b/plugins/PluginUpdater/src/stdafx.h @@ -96,10 +96,10 @@ struct FILEINFO typedef OBJLIST FILELIST; -#define DEFAULT_UPDATE_URL L"%s://miranda-ng.org/distr/stable/x%d" -#define DEFAULT_UPDATE_URL_TRUNK L"%s://miranda-ng.org/distr/x%d" -#define DEFAULT_UPDATE_URL_TRUNK_SYMBOLS L"%s://miranda-ng.org/distr/pdb_x%d" -#define DEFAULT_UPDATE_URL_STABLE_SYMBOLS L"%s://miranda-ng.org/distr/stable/pdb_x%d" +#define DEFAULT_UPDATE_URL L"https://miranda-ng.org/distr/stable/x%d" +#define DEFAULT_UPDATE_URL_TRUNK L"https://miranda-ng.org/distr/x%d" +#define DEFAULT_UPDATE_URL_TRUNK_SYMBOLS L"https://miranda-ng.org/distr/pdb_x%d" +#define DEFAULT_UPDATE_URL_STABLE_SYMBOLS L"https://miranda-ng.org/distr/stable/pdb_x%d" #define FILENAME_X64 L"miranda64.exe" #define FILENAME_X32 L"miranda32.exe" @@ -180,7 +180,7 @@ struct CMPlugin : public PLUGIN bool bForceRedownload = false, bSilent; // not a db options // common options - CMOption bUpdateOnStartup, bUpdateOnPeriod, bOnlyOnceADay, bSilentMode, bBackup, bChangePlatform, bUseHttps, bAutoRestart; + CMOption bUpdateOnStartup, bUpdateOnPeriod, bOnlyOnceADay, bSilentMode, bBackup, bChangePlatform, bAutoRestart; CMOption iPeriod, iPeriodMeasure, iNumberBackups; CMOption dwLastUpdate; diff --git a/plugins/PluginUpdater/src/version.h b/plugins/PluginUpdater/src/version.h index 63e9828cbd..4b4e1339cd 100644 --- a/plugins/PluginUpdater/src/version.h +++ b/plugins/PluginUpdater/src/version.h @@ -1,7 +1,7 @@ #define __MAJOR_VERSION 0 #define __MINOR_VERSION 2 -#define __RELEASE_NUM 0 -#define __BUILD_NUM 12 +#define __RELEASE_NUM 1 +#define __BUILD_NUM 1 #include -- cgit v1.2.3