Commit: 06f2f5057821cc53da1182af894a539a4f743fd5 - mingw-get (git)

The MinGW.org Installation Manager Tool

Commit MetaInfo

• Révision: 06f2f5057821cc53da1182af894a539a4f743fd5 (tree)
• l'heure: 2013-09-22 04:44:51
• Auteur: Keith Marshall <keithmarshall@user...>
• Commiter: Keith Marshall

Message de Log

Reorder controls within "Apply Changes" dialogue.

Change Summary

• modified: ChangeLog
• modified: src/guimain.rc

Modification

--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
 2013-09-21  Keith Marshall  <[e-mail]>
 
+	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.
+
[phone]  Keith Marshall  <[e-mail]>
+
 	Reimplement wsh.lua in C/C++; (cf. MinGW-Bug #2057).
 
 	* src/pkgexec.cpp (LUA_INLINE): New function attribute definition.

--- 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.