Author: ekohl Date: Mon May 20 15:44:43 2013 New Revision: 59051
URL: http://svn.reactos.org/svn/reactos?rev=59051&view=rev Log: [USRMGR] Improve GUI interface. Patch by Lee Schreoder. CORE-7078 #resolve #comment Committed in revision 59051.
Modified: trunk/reactos/dll/cpl/usrmgr/groups.c trunk/reactos/dll/cpl/usrmgr/lang/de-DE.rc trunk/reactos/dll/cpl/usrmgr/lang/en-US.rc trunk/reactos/dll/cpl/usrmgr/lang/es-ES.rc trunk/reactos/dll/cpl/usrmgr/lang/fr-FR.rc trunk/reactos/dll/cpl/usrmgr/lang/he-IL.rc trunk/reactos/dll/cpl/usrmgr/lang/pl-PL.rc trunk/reactos/dll/cpl/usrmgr/lang/ro-RO.rc trunk/reactos/dll/cpl/usrmgr/lang/ru-RU.rc trunk/reactos/dll/cpl/usrmgr/lang/uk-UA.rc trunk/reactos/dll/cpl/usrmgr/resource.h trunk/reactos/dll/cpl/usrmgr/users.c
Modified: trunk/reactos/dll/cpl/usrmgr/groups.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/usrmgr/groups.c?rev... ============================================================================== --- trunk/reactos/dll/cpl/usrmgr/groups.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/usrmgr/groups.c [iso-8859-1] Mon May 20 15:44:43 2013 @@ -477,6 +477,7 @@ switch (LOWORD(wParam)) { case IDM_GROUP_NEW: + case IDC_GROUPS_ADD: GroupNew(hwndDlg); break;
@@ -485,10 +486,12 @@ break;
case IDM_GROUP_DELETE: + case IDC_GROUPS_REMOVE: GroupDelete(hwndDlg); break;
case IDM_GROUP_PROPERTIES: + case IDC_GROUPS_PROPERTIES: if (GroupProperties(hwndDlg) == IDOK) UpdateGroupProperties(hwndDlg); break;
Modified: trunk/reactos/dll/cpl/usrmgr/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/usrmgr/lang/de-DE.r... ============================================================================== --- trunk/reactos/dll/cpl/usrmgr/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/usrmgr/lang/de-DE.rc [iso-8859-1] Mon May 20 15:44:43 2013 @@ -14,6 +14,11 @@ BEGIN CONTROL "", IDC_USERS_LIST, "SysListView32", LVS_REPORT | LVS_EDITLABELS | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | WS_BORDER | WS_TABSTOP, 7, 7, 238, 85, WS_EX_CLIENTEDGE + PUSHBUTTON "A&dd...", IDC_USERS_ADD, 87, 98, 50, 14 + PUSHBUTTON "&Remove", IDC_USERS_REMOVE, 141, 98, 50, 14 + PUSHBUTTON "Pr&operties", IDC_USERS_PROPERTIES, 195, 98, 50, 14 + AUTOCHECKBOX "Require user name and password on system startup.", IDC_USERS_STARTUP_REQUIRE, 10, 118, 200, 14, WS_DISABLED + PUSHBUTTON "Reset Administrator Password", IDC_USERS_ADMIN_RESET, 142, 200, 103, 14, WS_DISABLED, 100, 16 END
@@ -24,6 +29,9 @@ BEGIN CONTROL "", IDC_GROUPS_LIST, "SysListView32", LVS_REPORT | LVS_EDITLABELS | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | WS_BORDER | WS_TABSTOP, 7, 7, 238, 85, WS_EX_CLIENTEDGE + PUSHBUTTON "A&dd...", IDC_GROUPS_ADD, 87, 98, 50, 14 + PUSHBUTTON "&Remove", IDC_GROUPS_REMOVE, 141, 98, 50, 14 + PUSHBUTTON "Pr&operties", IDC_GROUPS_PROPERTIES, 195, 98, 50, 14 END
Modified: trunk/reactos/dll/cpl/usrmgr/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/usrmgr/lang/en-US.r... ============================================================================== --- trunk/reactos/dll/cpl/usrmgr/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/usrmgr/lang/en-US.rc [iso-8859-1] Mon May 20 15:44:43 2013 @@ -14,6 +14,11 @@ BEGIN CONTROL "", IDC_USERS_LIST, "SysListView32", LVS_REPORT | LVS_EDITLABELS | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | WS_BORDER | WS_TABSTOP, 7, 7, 238, 85, WS_EX_CLIENTEDGE + PUSHBUTTON "A&dd...", IDC_USERS_ADD, 87, 98, 50, 14 + PUSHBUTTON "&Remove", IDC_USERS_REMOVE, 141, 98, 50, 14 + PUSHBUTTON "Pr&operties", IDC_USERS_PROPERTIES, 195, 98, 50, 14 + AUTOCHECKBOX "Require user name and password on system startup.", IDC_USERS_STARTUP_REQUIRE, 10, 118, 200, 14, WS_DISABLED + PUSHBUTTON "Reset Administrator Password", IDC_USERS_ADMIN_RESET, 142, 200, 103, 14, WS_DISABLED END
@@ -24,6 +29,9 @@ BEGIN CONTROL "", IDC_GROUPS_LIST, "SysListView32", LVS_REPORT | LVS_EDITLABELS | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | WS_BORDER | WS_TABSTOP, 7, 7, 238, 85, WS_EX_CLIENTEDGE + PUSHBUTTON "A&dd...", IDC_GROUPS_ADD, 87, 98, 50, 14 + PUSHBUTTON "&Remove", IDC_GROUPS_REMOVE, 141, 98, 50, 14 + PUSHBUTTON "Pr&operties", IDC_GROUPS_PROPERTIES, 195, 98, 50, 14 END
Modified: trunk/reactos/dll/cpl/usrmgr/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/usrmgr/lang/es-ES.r... ============================================================================== --- trunk/reactos/dll/cpl/usrmgr/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/usrmgr/lang/es-ES.rc [iso-8859-1] Mon May 20 15:44:43 2013 @@ -10,6 +10,11 @@ BEGIN CONTROL "", IDC_USERS_LIST, "SysListView32", LVS_REPORT | LVS_EDITLABELS | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | WS_BORDER | WS_TABSTOP, 7, 7, 238, 85, WS_EX_CLIENTEDGE + PUSHBUTTON "A&dd..", IDC_USERS_ADD, 87, 98, 50, 14 + PUSHBUTTON "&Remove", IDC_USERS_REMOVE, 141, 98, 50, 14 + PUSHBUTTON "Pr&operties", IDC_USERS_PROPERTIES, 195, 98, 50, 14 + AUTOCHECKBOX "Require user name and password on system startup.", IDC_USERS_STARTUP_REQUIRE, 10, 118, 200, 14, WS_DISABLED + PUSHBUTTON "Reset Administrator Password", IDC_USERS_ADMIN_RESET, 142, 200, 103, 14, WS_DISABLED END
@@ -20,6 +25,9 @@ BEGIN CONTROL "", IDC_GROUPS_LIST, "SysListView32", LVS_REPORT | LVS_EDITLABELS | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | WS_BORDER | WS_TABSTOP, 7, 7, 238, 85, WS_EX_CLIENTEDGE + PUSHBUTTON "A&dd...", IDC_GROUPS_ADD, 87, 98, 50, 14 + PUSHBUTTON "&Remove", IDC_GROUPS_REMOVE, 141, 98, 50, 14 + PUSHBUTTON "Pr&operties", IDC_GROUPS_PROPERTIES, 195, 98, 50, 14 END
Modified: trunk/reactos/dll/cpl/usrmgr/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/usrmgr/lang/fr-FR.r... ============================================================================== --- trunk/reactos/dll/cpl/usrmgr/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/usrmgr/lang/fr-FR.rc [iso-8859-1] Mon May 20 15:44:43 2013 @@ -10,6 +10,11 @@ BEGIN CONTROL "", IDC_USERS_LIST, "SysListView32", LVS_REPORT | LVS_EDITLABELS | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | WS_BORDER | WS_TABSTOP, 7, 7, 238, 85, WS_EX_CLIENTEDGE + PUSHBUTTON "A&dd...", IDC_USERS_ADD, 87, 98, 50, 14 + PUSHBUTTON "&Remove", IDC_USERS_REMOVE, 141, 98, 50, 14 + PUSHBUTTON "Pr&operties", IDC_USERS_PROPERTIES, 195, 98, 50, 14 + AUTOCHECKBOX "Require user name and password on system startup.", IDC_USERS_STARTUP_REQUIRE, 10, 118, 200, 14, WS_DISABLED + PUSHBUTTON "Reset Administrator Password", IDC_USERS_ADMIN_RESET, 142, 200, 103, 14, WS_DISABLED END
@@ -20,6 +25,9 @@ BEGIN CONTROL "", IDC_GROUPS_LIST, "SysListView32", LVS_REPORT | LVS_EDITLABELS | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | WS_BORDER | WS_TABSTOP, 7, 7, 238, 85, WS_EX_CLIENTEDGE + PUSHBUTTON "A&dd...", IDC_GROUPS_ADD, 87, 98, 50, 14 + PUSHBUTTON "&Remove", IDC_GROUPS_REMOVE, 141, 98, 50, 14 + PUSHBUTTON "Pr&operties", IDC_GROUPS_PROPERTIES, 195, 98, 50, 14 END
Modified: trunk/reactos/dll/cpl/usrmgr/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/usrmgr/lang/he-IL.r... ============================================================================== --- trunk/reactos/dll/cpl/usrmgr/lang/he-IL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/usrmgr/lang/he-IL.rc [iso-8859-1] Mon May 20 15:44:43 2013 @@ -14,6 +14,11 @@ BEGIN CONTROL "", IDC_USERS_LIST, "SysListView32", LVS_REPORT | LVS_EDITLABELS | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | WS_BORDER | WS_TABSTOP, 7, 7, 238, 85, WS_EX_CLIENTEDGE + PUSHBUTTON "A&dd...", IDC_USERS_ADD, 87, 98, 50, 14 + PUSHBUTTON "&Remove", IDC_USERS_REMOVE, 141, 98, 50, 14 + PUSHBUTTON "Pr&operties", IDC_USERS_PROPERTIES, 195, 98, 50, 14 + AUTOCHECKBOX "Require user name and password on system startup.", IDC_USERS_STARTUP_REQUIRE, 10, 118, 200, 14, WS_DISABLED + PUSHBUTTON "Reset Administrator Password", IDC_USERS_ADMIN_RESET, 142, 200, 103, 14, WS_DISABLED END
@@ -24,6 +29,9 @@ BEGIN CONTROL "", IDC_GROUPS_LIST, "SysListView32", LVS_REPORT | LVS_EDITLABELS | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | WS_BORDER | WS_TABSTOP, 7, 7, 238, 85, WS_EX_CLIENTEDGE + PUSHBUTTON "A&dd...", IDC_GROUPS_ADD, 87, 98, 50, 14 + PUSHBUTTON "&Remove", IDC_GROUPS_REMOVE, 141, 98, 50, 14 + PUSHBUTTON "Pr&operties", IDC_GROUPS_PROPERTIES, 195, 98, 50, 14 END
Modified: trunk/reactos/dll/cpl/usrmgr/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/usrmgr/lang/pl-PL.r... ============================================================================== --- trunk/reactos/dll/cpl/usrmgr/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/usrmgr/lang/pl-PL.rc [iso-8859-1] Mon May 20 15:44:43 2013 @@ -18,6 +18,11 @@ BEGIN CONTROL "", IDC_USERS_LIST, "SysListView32", LVS_REPORT | LVS_EDITLABELS | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | WS_BORDER | WS_TABSTOP, 7, 7, 238, 85, WS_EX_CLIENTEDGE + PUSHBUTTON "A&dd...", IDC_USERS_ADD, 87, 98, 50, 14 + PUSHBUTTON "&Remove", IDC_USERS_REMOVE, 141, 98, 50, 14 + PUSHBUTTON "Pr&operties", IDC_USERS_PROPERTIES, 195, 98, 50, 14 + AUTOCHECKBOX "Require user name and password on system startup.", IDC_USERS_STARTUP_REQUIRE, 10, 118, 200, 14, WS_DISABLED + PUSHBUTTON "Reset Administrator Password", IDC_USERS_ADMIN_RESET, 142, 200, 103, 14, WS_DISABLED END
@@ -28,6 +33,9 @@ BEGIN CONTROL "", IDC_GROUPS_LIST, "SysListView32", LVS_REPORT | LVS_EDITLABELS | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | WS_BORDER | WS_TABSTOP, 7, 7, 238, 85, WS_EX_CLIENTEDGE + PUSHBUTTON "A&dd...", IDC_GROUPS_ADD, 87, 98, 50, 14 + PUSHBUTTON "&Remove", IDC_GROUPS_REMOVE, 141, 98, 50, 14 + PUSHBUTTON "Pr&operties", IDC_GROUPS_PROPERTIES, 195, 98, 50, 14 END
Modified: trunk/reactos/dll/cpl/usrmgr/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/usrmgr/lang/ro-RO.r... ============================================================================== --- trunk/reactos/dll/cpl/usrmgr/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/usrmgr/lang/ro-RO.rc [iso-8859-1] Mon May 20 15:44:43 2013 @@ -10,6 +10,11 @@ BEGIN CONTROL "", IDC_USERS_LIST, "SysListView32", LVS_REPORT | LVS_EDITLABELS | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | WS_BORDER | WS_TABSTOP, 7, 7, 238, 85, WS_EX_CLIENTEDGE + PUSHBUTTON "A&dd...", IDC_USERS_ADD, 87, 98, 50, 14 + PUSHBUTTON "&Remove", IDC_USERS_REMOVE, 141, 98, 50, 14 + PUSHBUTTON "Pr&operties", IDC_USERS_PROPERTIES, 195, 98, 50, 14 + AUTOCHECKBOX "Require user name and password on system startup.", IDC_USERS_STARTUP_REQUIRE, 10, 118, 200, 14, WS_DISABLED + PUSHBUTTON "Reset Administrator Password", IDC_USERS_ADMIN_RESET, 142, 200, 103, 14, WS_DISABLED END
@@ -20,6 +25,9 @@ BEGIN CONTROL "", IDC_GROUPS_LIST, "SysListView32", LVS_REPORT | LVS_EDITLABELS | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | WS_BORDER | WS_TABSTOP, 7, 7, 238, 85, WS_EX_CLIENTEDGE + PUSHBUTTON "A&dd...", IDC_GROUPS_ADD, 87, 98, 50, 14 + PUSHBUTTON "&Remove", IDC_GROUPS_REMOVE, 141, 98, 50, 14 + PUSHBUTTON "Pr&operties", IDC_GROUPS_PROPERTIES, 195, 98, 50, 14 END
Modified: trunk/reactos/dll/cpl/usrmgr/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/usrmgr/lang/ru-RU.r... ============================================================================== --- trunk/reactos/dll/cpl/usrmgr/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/usrmgr/lang/ru-RU.rc [iso-8859-1] Mon May 20 15:44:43 2013 @@ -14,6 +14,11 @@ BEGIN CONTROL "", IDC_USERS_LIST, "SysListView32", LVS_REPORT | LVS_EDITLABELS | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | WS_BORDER | WS_TABSTOP, 7, 7, 238, 85, WS_EX_CLIENTEDGE + PUSHBUTTON "A&dd...", IDC_USERS_ADD, 87, 98, 50, 14 + PUSHBUTTON "&Remove", IDC_USERS_REMOVE, 141, 98, 50, 14 + PUSHBUTTON "Pr&operties", IDC_USERS_PROPERTIES, 195, 98, 50, 14 + AUTOCHECKBOX "Require user name and password on system startup.", IDC_USERS_STARTUP_REQUIRE, 10, 118, 200, 14, WS_DISABLED + PUSHBUTTON "Reset Administrator Password", IDC_USERS_ADMIN_RESET, 142, 200, 103, 14, WS_DISABLED END
@@ -24,6 +29,9 @@ BEGIN CONTROL "", IDC_GROUPS_LIST, "SysListView32", LVS_REPORT | LVS_EDITLABELS | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | WS_BORDER | WS_TABSTOP, 7, 7, 238, 85, WS_EX_CLIENTEDGE + PUSHBUTTON "A&dd...", IDC_GROUPS_ADD, 87, 98, 50, 14 + PUSHBUTTON "&Remove", IDC_GROUPS_REMOVE, 141, 98, 50, 14 + PUSHBUTTON "Pr&operties", IDC_GROUPS_PROPERTIES, 195, 98, 50, 14 END
Modified: trunk/reactos/dll/cpl/usrmgr/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/usrmgr/lang/uk-UA.r... ============================================================================== --- trunk/reactos/dll/cpl/usrmgr/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/usrmgr/lang/uk-UA.rc [iso-8859-1] Mon May 20 15:44:43 2013 @@ -14,6 +14,11 @@ BEGIN CONTROL "", IDC_USERS_LIST, "SysListView32", LVS_REPORT | LVS_EDITLABELS | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | WS_BORDER | WS_TABSTOP, 7, 7, 238, 85, WS_EX_CLIENTEDGE + PUSHBUTTON "A&dd...", IDC_USERS_ADD, 87, 98, 50, 14 + PUSHBUTTON "&Remove", IDC_USERS_REMOVE, 141, 98, 50, 14 + PUSHBUTTON "Pr&operties", IDC_USERS_PROPERTIES, 195, 98, 50, 14 + AUTOCHECKBOX "Require user name and password on system startup.", IDC_USERS_STARTUP_REQUIRE, 10, 118, 200, 14, WS_DISABLED + PUSHBUTTON "Reset Administrator Password", IDC_USERS_ADMIN_RESET, 142, 200, 103, 14, WS_DISABLED END
@@ -24,6 +29,9 @@ BEGIN CONTROL "", IDC_GROUPS_LIST, "SysListView32", LVS_REPORT | LVS_EDITLABELS | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | WS_BORDER | WS_TABSTOP, 7, 7, 238, 85, WS_EX_CLIENTEDGE + PUSHBUTTON "A&dd...", IDC_GROUPS_ADD, 87, 98, 50, 14 + PUSHBUTTON "&Remove", IDC_GROUPS_REMOVE, 141, 98, 50, 14 + PUSHBUTTON "Pr&operties", IDC_GROUPS_PROPERTIES, 195, 98, 50, 14 END
Modified: trunk/reactos/dll/cpl/usrmgr/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/usrmgr/resource.h?r... ============================================================================== --- trunk/reactos/dll/cpl/usrmgr/resource.h [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/usrmgr/resource.h [iso-8859-1] Mon May 20 15:44:43 2013 @@ -41,6 +41,16 @@ #define IDC_USER_GENERAL_NEVER_EXPIRES 316 #define IDC_USER_GENERAL_DISABLED 317 #define IDC_USER_GENERAL_LOCKED 318 + +#define IDC_USERS_ADD 319 +#define IDC_USERS_REMOVE 320 +#define IDC_USERS_PROPERTIES 321 +#define IDC_USERS_STARTUP_REQUIRE 322 +#define IDC_USERS_ADMIN_RESET 323 + +#define IDC_GROUPS_ADD 324 +#define IDC_GROUPS_REMOVE 325 +#define IDC_GROUPS_PROPERTIES 326
#define IDD_GROUP_GENERAL 340 #define IDC_GROUP_GENERAL_NAME 341
Modified: trunk/reactos/dll/cpl/usrmgr/users.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/usrmgr/users.c?rev=... ============================================================================== --- trunk/reactos/dll/cpl/usrmgr/users.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/usrmgr/users.c [iso-8859-1] Mon May 20 15:44:43 2013 @@ -675,14 +675,17 @@ break;
case IDM_USER_NEW: + case IDC_USERS_ADD: UserNew(hwndDlg); break;
case IDM_USER_DELETE: + case IDC_USERS_REMOVE: UserDelete(hwndDlg); break;
case IDM_USER_PROPERTIES: + case IDC_USERS_PROPERTIES: if (UserProperties(hwndDlg)) { UpdateUserProperties(hwndDlg);