[commit] r1434 - trunk/GME/MgaUtil

[GMESRC Repository Notifications]

Author: ksmyth
Date: Tue Jul 26 10:40:24 2011
New Revision: 1434

Log:
Clean up Components dialog

Modified:
   trunk/GME/MgaUtil/CompDlg.cpp
   trunk/GME/MgaUtil/MgaUtil.rc

Modified: trunk/GME/MgaUtil/CompDlg.cpp
==============================================================================
--- trunk/GME/MgaUtil/CompDlg.cpp	Mon Jul 25 17:58:20 2011	(r1433)
+++ trunk/GME/MgaUtil/CompDlg.cpp	Tue Jul 26 10:40:24 2011	(r1434)
@@ -666,15 +666,11 @@
 	if (defer) {
 		MoveControl(IDC_REMOVE,					0, deltaHeight, 0, 0, defer, &dwp);
 		MoveControl(IDC_INSTALL,				0, deltaHeight, 0, 0, defer, &dwp);
-		MoveControl(IDC_ACTIVEDISP,				0, deltaHeight, 0, 0, defer, &dwp);
-		MoveControl(IDC_ACTIVE_INACTIVE,		0, deltaHeight, 0, 0, defer, &dwp);
-		MoveControl(IDC_ALLCOMPS,				0, deltaHeight, 0, 0, defer, &dwp);
-                MoveControl(IDC_ENABLE_DISABLE,                 0, deltaHeight, 0, 0, defer, &dwp);
+        MoveControl(IDC_ENABLE_DISABLE,                 0, deltaHeight, 0, 0, defer, &dwp);
 		MoveControl(IDC_RADIOSYS,				0, deltaHeight, 0, 0, defer, &dwp);
 		MoveControl(IDC_RADIOUSER,				0, deltaHeight, 0, 0, defer, &dwp);
 		MoveControl(IDC_RADIOBOTH,				0, deltaHeight, 0, 0, defer, &dwp);
 		MoveControl(IDC_REGISTERSTATIC,			0, deltaHeight, 0, 0, defer, &dwp);
-		MoveControl(IDC_SHOWCOMPONENTSSTATIC,	0, deltaHeight, 0, 0, defer, &dwp);
 		MoveControl(IDOK,						0, deltaHeight, 0, 0, defer, &dwp);
 	}
 

Modified: trunk/GME/MgaUtil/MgaUtil.rc
==============================================================================
--- trunk/GME/MgaUtil/MgaUtil.rc	Mon Jul 25 17:58:20 2011	(r1433)
+++ trunk/GME/MgaUtil/MgaUtil.rc	Tue Jul 26 10:40:24 2011	(r1434)
@@ -101,25 +101,24 @@
     LTEXT           "Font Smooth mode:",IDC_STATIC,15,413,70,10
 END
 
-IDD_COMPDLG DIALOGEX 0, 0, 482, 238
+IDD_COMPDLG DIALOGEX 0, 0, 483, 230
 STYLE DS_SETFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME
 CAPTION "Components"
 FONT 8, "MS Sans Serif", 0, 0, 0x0
 BEGIN
-    DEFPUSHBUTTON   "Close",IDOK,7,204,55,15
-    PUSHBUTTON      "Enable",IDC_ENABLE_DISABLE,73,204,55,15,WS_DISABLED
-    PUSHBUTTON      "Install New...",IDC_INSTALL,7,180,55,15
-    PUSHBUTTON      "Remove",IDC_REMOVE,73,180,55,15,WS_DISABLED
-    LTEXT           "Please select the component you want to work with",IDC_STATIC,5,5,255,25
-    CONTROL         "List2",IDC_LIST,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | LVS_SHAREIMAGELISTS | LVS_NOLABELWRAP | LVS_AUTOARRANGE | WS_BORDER | WS_TABSTOP,7,35,468,135
-    LTEXT           "Register:",IDC_REGISTERSTATIC,141,180,69,8
-    CONTROL         "Systemwide",IDC_RADIOSYS,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,141,190,53,10
-    CONTROL         "For user only",IDC_RADIOUSER,"Button",BS_AUTORADIOBUTTON,141,200,56,10
-    CONTROL         "Both",IDC_RADIOBOTH,"Button",BS_AUTORADIOBUTTON,141,210,31,10
-    LTEXT           "Show components:",IDC_SHOWCOMPONENTSSTATIC,214,180,62,8
-    CONTROL         "Active",IDC_ACTIVEDISP,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,214,190,36,10
-    CONTROL         "Active&&Inactive",IDC_ACTIVE_INACTIVE,"Button",BS_AUTORADIOBUTTON,214,200,65,10
-    CONTROL         "All",IDC_ALLCOMPS,"Button",BS_AUTORADIOBUTTON,214,210,25,10
+    DEFPUSHBUTTON   "Close",IDOK,7,200,55,15
+    PUSHBUTTON      "Enable",IDC_ENABLE_DISABLE,67,200,55,15,WS_DISABLED
+    PUSHBUTTON      "Install New...",IDC_INSTALL,7,181,55,15
+    PUSHBUTTON      "Remove",IDC_REMOVE,67,181,55,15,WS_DISABLED
+    CONTROL         "List2",IDC_LIST,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | LVS_SHAREIMAGELISTS | LVS_NOLABELWRAP | LVS_AUTOARRANGE | WS_BORDER | WS_TABSTOP,7,19,469,157
+    LTEXT           "Register:",IDC_REGISTERSTATIC,127,181,69,8
+    CONTROL         "Systemwide",IDC_RADIOSYS,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,127,191,53,10
+    CONTROL         "For user only",IDC_RADIOUSER,"Button",BS_AUTORADIOBUTTON,127,201,56,10
+    CONTROL         "Both",IDC_RADIOBOTH,"Button",BS_AUTORADIOBUTTON,127,211,31,10
+    LTEXT           "Show components:",IDC_SHOWCOMPONENTSSTATIC,7,6,62,8
+    CONTROL         "Active",IDC_ACTIVEDISP,"Button",BS_AUTORADIOBUTTON | BS_PUSHLIKE |  WS_GROUP | WS_TABSTOP,70,3,48,14
+    CONTROL         "Active && Inactive",IDC_ACTIVE_INACTIVE,"Button",BS_AUTORADIOBUTTON | BS_PUSHLIKE,117,3,69,14
+    CONTROL         "All",IDC_ALLCOMPS,"Button",BS_AUTORADIOBUTTON | BS_PUSHLIKE,186,3,29,14
 END
 
 IDD_PROPERTIES_DIALOG DIALOG 0, 0, 157, 258
@@ -618,9 +617,9 @@
     IDD_COMPDLG, DIALOG
     BEGIN
         LEFTMARGIN, 7
-        RIGHTMARGIN, 475
+        RIGHTMARGIN, 476
         TOPMARGIN, 7
-        BOTTOMMARGIN, 231
+        BOTTOMMARGIN, 232
     END
 
     IDD_PROPERTIES_DIALOG, DIALOG