From c72e3f9fe11a3d6b72a04af599b04fde82091dd5 Mon Sep 17 00:00:00 2001 From: Tobias Weimer Date: Thu, 18 Sep 2014 19:32:43 +0000 Subject: PluginUpdater: - Show a notification when the update URL isn't available - small redesign of new components window - minor memory leaks fixecd git-svn-id: http://svn.miranda-ng.org/main/trunk@10509 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/PluginUpdater/res/Resource.rc | 72 +++++++++++++++-------------------- 1 file changed, 31 insertions(+), 41 deletions(-) (limited to 'plugins/PluginUpdater/res') diff --git a/plugins/PluginUpdater/res/Resource.rc b/plugins/PluginUpdater/res/Resource.rc index b682acbc93..2048ecaf87 100644 --- a/plugins/PluginUpdater/res/Resource.rc +++ b/plugins/PluginUpdater/res/Resource.rc @@ -52,12 +52,6 @@ BEGIN PUSHBUTTON "Select &none",IDC_SELNONE,175,218,60,14,NOT WS_TABSTOP END -IDD_POPUPDUMMI DIALOGEX 65526, 65526, 1, 1 -STYLE DS_ABSALIGN | DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_SYSMENU -FONT 8, "MS Shell Dlg", 400, 0, 0x1 -BEGIN -END - IDD_OPT_UPDATENOTIFY DIALOGEX 0, 0, 273, 219 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD EXSTYLE WS_EX_CONTROLPARENT @@ -84,45 +78,41 @@ BEGIN CTEXT "Some component(s) was updated.\nYou need to restart your Miranda to apply installed updates.",IDC_NEEDRESTARTLABEL,11,193,247,15,NOT WS_VISIBLE END -IDD_POPUP DIALOGEX 0, 0, 316, 187 +IDD_POPUP DIALOGEX 0, 0, 316, 174 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD EXSTYLE WS_EX_CONTROLPARENT FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN -GROUPBOX "Notifications", IDC_NOTIFY, 1, 0, 172, 63 -CONTROL "Restart", IDC_MSG_BOXES, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 19, 79, 10 -CONTROL "Errors", IDC_ERRORS, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 32, 79, 10 -CONTROL "Info messages", IDC_INFO_MESSAGES, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 45, 79, 10 -CTEXT "Back", IDC_STATIC, 90, 8, 24, 8 -CTEXT "Text", IDC_STATIC, 116, 8, 24, 8 -CONTROL "", IDC_MSG_BOXES_BG, "ColourPicker", WS_TABSTOP, 90, 17, 24, 12 -CONTROL "", IDC_MSG_BOXES_TX, "ColourPicker", WS_TABSTOP, 116, 17, 24, 12 -CONTROL "", IDC_MSG_BOXES_MSG, "Button", BS_AUTOCHECKBOX | WS_DISABLED | WS_TABSTOP, 153, 19, 8, 10 -CONTROL "", IDC_ERR_BG, "ColourPicker", WS_TABSTOP, 90, 31, 24, 12 -CONTROL "", IDC_ERR_TX, "ColourPicker", WS_TABSTOP, 116, 31, 24, 12 -CONTROL "", IDC_ERRORS_MSG, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 153, 32, 8, 10 -CONTROL "", IDC_INFO_MESSAGES_BG, "ColourPicker", WS_TABSTOP, 90, 44, 24, 12 -CONTROL "", IDC_INFO_MESSAGES_TX, "ColourPicker", WS_TABSTOP, 116, 44, 24, 12 -CONTROL "", IDC_INFO_MESSAGES_MSG, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 153, 45, 8, 10 -GROUPBOX "Colors", IDC_COLORS, 178, 0, 133, 63, WS_GROUP -CONTROL "Use cus&tom colors", IDC_USEOWNCOLORS, "Button", BS_AUTORADIOBUTTON | BS_MULTILINE | BS_NOTIFY, 186, 15, 122, 13 -CONTROL "Use &Windows colors", IDC_USEWINCOLORS, "Button", BS_AUTORADIOBUTTON | BS_MULTILINE | BS_NOTIFY, 186, 37, 121, 13 -CONTROL "Use Pop&up colors", IDC_USEPOPUPCOLORS, "Button", BS_AUTORADIOBUTTON | BS_MULTILINE | BS_NOTIFY, 186, 26, 102, 13 -PUSHBUTTON "Preview", IDC_PREVIEW, 107, 153, 102, 12 -GROUPBOX "Click action", IDC_STATIC, 1, 110, 310, 37, WS_GROUP -LTEXT "On left click", IDC_STATIC, 8, 122, 145, 8 -COMBOBOX IDC_LC, 6, 130, 147, 30, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP -LTEXT "On right click", IDC_STATIC, 161, 120, 145, 8 -COMBOBOX IDC_RC, 159, 130, 147, 30, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP -GROUPBOX "Timeout", IDC_STATIC, 1, 64, 310, 45 -EDITTEXT IDC_TIMEOUT_VALUE, 7, 76, 32, 12, ES_RIGHT | ES_AUTOHSCROLL | ES_NUMBER -CONTROL "", IDC_TIMEOUT_VALUE_SPIN, "msctls_updown32", UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS, 28, 76, 11, 12 -CTEXT "0 = Default", IDC_STATIC_DEFAULT, 74, 78, 99, 8 -CTEXT "-1 = Infinite", IDC_STATIC_INFINITE, 186, 78, 117, 8 -LTEXT "Sec", IDC_STATIC_SEC, 43, 78, 17, 8 -LTEXT "For ""Restart"" popup setting is always infinity", IDC_STATIC, 7, 94, 297, 8 -CTEXT "Boxes", IDC_STATIC, 146, 8, 23, 8 -CTEXT "Popups", IDC_STATIC, 7, 9, 79, 8 + GROUPBOX "Notifications",IDC_NOTIFY,1,0,172,63 + CONTROL "Restart",IDC_MSG_BOXES,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,19,79,10 + CONTROL "Errors",IDC_ERRORS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,32,79,10 + CONTROL "Info messages",IDC_INFO_MESSAGES,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,45,79,10 + CTEXT "Back",IDC_STATIC,90,8,24,8 + CTEXT "Text",IDC_STATIC,116,8,24,8 + CONTROL "",IDC_MSG_BOXES_BG,"ColourPicker",WS_TABSTOP,90,17,24,12 + CONTROL "",IDC_MSG_BOXES_TX,"ColourPicker",WS_TABSTOP,116,17,24,12 + CONTROL "",IDC_ERR_BG,"ColourPicker",WS_TABSTOP,90,31,24,12 + CONTROL "",IDC_ERR_TX,"ColourPicker",WS_TABSTOP,116,31,24,12 + CONTROL "",IDC_INFO_MESSAGES_BG,"ColourPicker",WS_TABSTOP,90,44,24,12 + CONTROL "",IDC_INFO_MESSAGES_TX,"ColourPicker",WS_TABSTOP,116,44,24,12 + GROUPBOX "Colors",IDC_COLORS,178,0,133,63,WS_GROUP + CONTROL "Use cus&tom colors",IDC_USEOWNCOLORS,"Button",BS_AUTORADIOBUTTON | BS_MULTILINE | BS_NOTIFY,186,15,122,13 + CONTROL "Use &Windows colors",IDC_USEWINCOLORS,"Button",BS_AUTORADIOBUTTON | BS_MULTILINE | BS_NOTIFY,186,37,121,13 + CONTROL "Use Pop&up colors",IDC_USEPOPUPCOLORS,"Button",BS_AUTORADIOBUTTON | BS_MULTILINE | BS_NOTIFY,186,26,102,13 + PUSHBUTTON "Preview",IDC_PREVIEW,107,153,102,12 + GROUPBOX "Click action",IDC_STATIC,1,110,310,37,WS_GROUP + LTEXT "On left click",IDC_STATIC,8,122,145,8 + COMBOBOX IDC_LC,6,130,147,30,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "On right click",IDC_STATIC,161,120,145,8 + COMBOBOX IDC_RC,159,130,147,30,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + GROUPBOX "Timeout",IDC_STATIC,1,64,310,45 + EDITTEXT IDC_TIMEOUT_VALUE,7,76,32,12,ES_RIGHT | ES_AUTOHSCROLL | ES_NUMBER + CONTROL "",IDC_TIMEOUT_VALUE_SPIN,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS,28,76,11,12 + CTEXT "0 = Default",IDC_STATIC_DEFAULT,74,78,99,8 + CTEXT "-1 = Infinite",IDC_STATIC_INFINITE,186,78,117,8 + LTEXT "Sec",IDC_STATIC_SEC,43,78,17,8 + LTEXT "For ""Restart"" popup setting is always infinity",IDC_STATIC,7,94,297,8 + CTEXT "Popups",IDC_STATIC,7,9,79,8 END IDD_LIST DIALOGEX 0, 0, 240, 236 -- cgit v1.2.3