From dc40af5b8c6c224cfce69e3934d943cf48a56522 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Fri, 29 May 2020 14:05:22 +0300 Subject: PluginUpdater: - fixes #2409 (restart Miranda automatically after update); - plugin options moved to CMOption<>; - code cleaning --- plugins/PluginUpdater/res/Resource.rc | 65 +++++++++++------------------------ 1 file changed, 20 insertions(+), 45 deletions(-) (limited to 'plugins/PluginUpdater/res') diff --git a/plugins/PluginUpdater/res/Resource.rc b/plugins/PluginUpdater/res/Resource.rc index 03c99f4c0b..7f58df1125 100644 --- a/plugins/PluginUpdater/res/Resource.rc +++ b/plugins/PluginUpdater/res/Resource.rc @@ -61,31 +61,29 @@ STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD EXSTYLE WS_EX_CONTROLPARENT FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN - GROUPBOX "Hotkey",IDC_STATIC,2,0,284,26 - CONTROL "Go to Options -> Customize -> Hotkeys to change the hotkey",IDC_LINK_HOTKEY, - "Hyperlink",WS_TABSTOP,29,11,249,10 - GROUPBOX "Update options",IDC_STATIC,1,29,285,73 - CONTROL "On startup",IDC_UPDATEONSTARTUP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,44,73,10 - CONTROL "(but only once a day)",IDC_ONLYONCEADAY,"Button",BS_AUTOCHECKBOX | WS_DISABLED | WS_TABSTOP,92,44,186,10 - CONTROL "Every",IDC_UPDATEONPERIOD,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,58,52,10 - EDITTEXT IDC_PERIOD,65,56,28,14,ES_AUTOHSCROLL | ES_NUMBER | WS_DISABLED - CONTROL "",IDC_PERIODSPIN,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_DISABLED,92,56,10,15 - COMBOBOX IDC_PERIODMEASURE,114,56,58,30,CBS_DROPDOWNLIST | CBS_SORT | WS_DISABLED | WS_VSCROLL | WS_TABSTOP - CONTROL "Silent mode",IDC_SILENTMODE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,72,267,10 + GROUPBOX "Update options",IDC_STATIC,1,3,285,89 + CONTROL "On startup",IDC_UPDATEONSTARTUP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,18,73,10 + CONTROL "(but only once a day)",IDC_ONLYONCEADAY,"Button",BS_AUTOCHECKBOX | WS_DISABLED | WS_TABSTOP,92,18,186,10 + CONTROL "Every",IDC_UPDATEONPERIOD,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,32,52,10 + EDITTEXT IDC_PERIOD,65,30,28,14,ES_AUTOHSCROLL | ES_NUMBER | WS_DISABLED + CONTROL "",IDC_PERIODSPIN,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_DISABLED,92,30,10,14 + COMBOBOX IDC_PERIODMEASURE,114,30,58,30,CBS_DROPDOWNLIST | CBS_SORT | WS_DISABLED | WS_VSCROLL | WS_TABSTOP + CONTROL "Silent mode",IDC_SILENTMODE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,46,267,10 + CONTROL "Restart Miranda automatically",IDC_AUTORESTART,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,60,267,10 CONTROL "Backup database before update (requires Db_autobackups plugin)",IDC_BACKUP, - "Button",BS_AUTOCHECKBOX | WS_DISABLED | WS_TABSTOP,11,86,272,10 - GROUPBOX "Files source",IDC_STATIC,2,104,285,132 - CONTROL "Stable version",IDC_STABLE,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,12,117,267,10 + "Button",BS_AUTOCHECKBOX | WS_DISABLED | WS_TABSTOP,11,74,272,10 + GROUPBOX "Files source",IDC_STATIC,2,94,285,132 + CONTROL "Stable version",IDC_STABLE,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,12,107,267,10 CONTROL "Stable version with debug symbols",IDC_STABLE_SYMBOLS, - "Button",BS_AUTORADIOBUTTON | WS_TABSTOP,12,131,267,10 - CONTROL "Development version (less stable)",IDC_TRUNK,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,12,145,267,10 + "Button",BS_AUTORADIOBUTTON | WS_TABSTOP,12,121,267,10 + CONTROL "Development version (less stable)",IDC_TRUNK,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,12,135,267,10 CONTROL "Development version with debug symbols",IDC_TRUNK_SYMBOLS, - "Button",BS_AUTORADIOBUTTON | WS_TABSTOP,12,159,267,10 - CONTROL "Custom version",IDC_CUSTOM,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,12,173,267,10 - EDITTEXT IDC_CUSTOMURL,12,185,267,16,ES_AUTOHSCROLL | WS_DISABLED - CONTROL "Change platform to 32-bit",IDC_CHANGE_PLATFORM,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,206,267,10 - CTEXT "Some component(s) was updated.\nYou need to restart your Miranda to apply installed updates.",IDC_NEEDRESTARTLABEL,11,239,267,15,NOT WS_VISIBLE - CONTROL "Use HTTPS",IDC_USE_HTTPS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,219,267,10 + "Button",BS_AUTORADIOBUTTON | WS_TABSTOP,12,149,267,10 + CONTROL "Custom version",IDC_CUSTOM,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,12,163,267,10 + EDITTEXT IDC_CUSTOMURL,12,175,267,16,ES_AUTOHSCROLL | WS_DISABLED + CONTROL "Change platform to 32-bit",IDC_CHANGE_PLATFORM,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,196,267,10 + CONTROL "Use HTTPS",IDC_USE_HTTPS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,209,267,10 + CTEXT "Some component(s) was updated.\nYou need to restart your Miranda to apply installed updates.",IDC_NEEDRESTARTLABEL,11,229,267,15,NOT WS_VISIBLE END IDD_POPUP DIALOGEX 0, 0, 316, 174 @@ -182,34 +180,11 @@ BEGIN BEGIN LEFTMARGIN, 1 RIGHTMARGIN, 294 - VERTGUIDE, 2 - VERTGUIDE, 11 - VERTGUIDE, 278 - VERTGUIDE, 286 BOTTOMMARGIN, 254 END - IDD_POPUP, DIALOG - BEGIN - VERTGUIDE, 1 - VERTGUIDE, 7 - VERTGUIDE, 86 - VERTGUIDE, 90 - VERTGUIDE, 114 - VERTGUIDE, 116 - VERTGUIDE, 140 - VERTGUIDE, 153 - VERTGUIDE, 169 - VERTGUIDE, 173 - VERTGUIDE, 178 - VERTGUIDE, 186 - VERTGUIDE, 311 - END - IDD_MISSINGPLUGINS, DIALOG BEGIN - VERTGUIDE, 6 - VERTGUIDE, 235 BOTTOMMARGIN, 245 END END -- cgit v1.2.3