From 06f2f5057821cc53da1182af894a539a4f743fd5 Mon Sep 17 00:00:00 2001 From: Keith Marshall Date: Sat, 21 Sep 2013 20:44:51 +0100 Subject: [PATCH] Reorder controls within "Apply Changes" dialogue. --- ChangeLog | 8 ++++++++ src/guimain.rc | 12 ++++++------ 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index fb4733f..c8f1d38 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,13 @@ 2013-09-21 Keith Marshall + Reorder controls within "Apply Changes" dialogue. + + * src/guimain.rc (IDD_APPLY_APPROVE): Move definition of the "Okay to + proceed?" GROUPBOX, and its contained PUSHBUTTONs, to the top; we want + it to get the default focus. + +2013-09-21 Keith Marshall + Reimplement wsh.lua in C/C++; (cf. MinGW-Bug #2057). * src/pkgexec.cpp (LUA_INLINE): New function attribute definition. diff --git a/src/guimain.rc b/src/guimain.rc index 8a708a9..cb79703 100644 --- a/src/guimain.rc +++ b/src/guimain.rc @@ -246,12 +246,6 @@ CAPTION "Schedule of Pending Actions" STYLE DS_MODALFRAME | DS_SETFONT | WS_POPUP | WS_CAPTION | WS_DLGFRAME FONT 10, "Verdana" BEGIN - GROUPBOX "", IDD_APPLY_REMOVES_SUMMARY, 6, 40, 294, 47 - EDITTEXT IDD_APPLY_REMOVES_PACKAGES, 7, 50, 292, 36, WS_VSCROLL | ES_VT100 - GROUPBOX "", IDD_APPLY_UPGRADES_SUMMARY, 6, 89, 294, 47 - EDITTEXT IDD_APPLY_UPGRADES_PACKAGES, 7, 99, 292, 36, WS_VSCROLL | ES_VT100 - GROUPBOX "", IDD_APPLY_INSTALLS_SUMMARY, 6, 138, 294, 47 - EDITTEXT IDD_APPLY_INSTALLS_PACKAGES, 7, 148, 292, 36, WS_VSCROLL | ES_VT100 GROUPBOX "Okay to proceed?", IDD_PROGRESS_TXT, 6, 5, 294, 33 LTEXT "The package changes itemised below will\n" \ "be implemented when you choose ""Apply""", IDD_PROGRESS_MSG, \ @@ -259,6 +253,12 @@ BEGIN DEFPUSHBUTTON "Apply", ID_APPLY, 166, 17, 40, 12, WS_GROUP | WS_TABSTOP PUSHBUTTON "Defer", ID_DEFER, 210, 17, 40, 12, WS_TABSTOP PUSHBUTTON "Discard", ID_DISCARD, 254, 17, 40, 12, WS_TABSTOP + GROUPBOX "", IDD_APPLY_REMOVES_SUMMARY, 6, 40, 294, 47 + EDITTEXT IDD_APPLY_REMOVES_PACKAGES, 7, 50, 292, 36, WS_VSCROLL | ES_VT100 + GROUPBOX "", IDD_APPLY_UPGRADES_SUMMARY, 6, 89, 294, 47 + EDITTEXT IDD_APPLY_UPGRADES_PACKAGES, 7, 99, 292, 36, WS_VSCROLL | ES_VT100 + GROUPBOX "", IDD_APPLY_INSTALLS_SUMMARY, 6, 138, 294, 47 + EDITTEXT IDD_APPLY_INSTALLS_PACKAGES, 7, 148, 292, 36, WS_VSCROLL | ES_VT100 END /* Template for a GUI styled package download monitoring dialogue box. -- 2.11.0