fix(ui): remove default "add user" event from add button, turn it into a pure dropdown button

Refs #1155

Author: ansgarbecker

source/const.inc

@@ -49,6 +49,8 @@ const
   ICONINDEX_EVENT = 80;
   ICONINDEX_KEYWORD = 25;
   ICONINDEX_FOLDER = 174;
+  ICONINDEX_USER = 43;
+  ICONINDEX_ROLE = 95;
 
   // Size of byte units
   {Kibibyte} SIZE_KB = Int64(1024);

source/usermanager.lfm

@@ -117,18 +117,17 @@ object UserManagerForm: TUserManagerForm
         Caption = 'Add'
         DropdownMenu = menuAdd
         ImageIndex = 45
-        Style = tbsDropDown
-        OnClick = btnAddUserClick
+        Style = tbsButtonDrop
       end
       object btnCloneUser: TToolButton
-        Left = 71
+        Left = 69
         Top = 0
         Caption = 'Clone'
         ImageIndex = 3
-        OnClick = btnAddUserClick
+        OnClick = menuItemUserClick
       end
       object btnDeleteUser: TToolButton
-        Left = 131
+        Left = 129
         Top = 0
         Caption = 'Delete'
         ImageIndex = 46
@@ -645,7 +644,7 @@ object UserManagerForm: TUserManagerForm
           OnGetPickList = ValueListEditorRolesGetPickList
           ColWidths = (
             64
-            309
+            292
           )
         end
       end
@@ -808,12 +807,13 @@ object UserManagerForm: TUserManagerForm
     end
   end
   object menuAdd: TPopupMenu
+    Images = MainForm.ImageListMain
     OnPopup = menuAddPopup
     Left = 80
     Top = 280
     object menuItemUser: TMenuItem
       Caption = 'User'
-      OnClick = btnAddUserClick
+      OnClick = menuItemUserClick
     end
     object menuItemRole: TMenuItem
       Caption = 'Role'

source/usermanager.pas

@@ -139,7 +139,7 @@   TUserManagerForm = class(TExtForm)
     procedure FormCreate(Sender: TObject);
     procedure FormDestroy(Sender: TObject);
     procedure FormShow(Sender: TObject);
-    procedure btnAddUserClick(Sender: TObject);
+    procedure menuItemUserClick(Sender: TObject);
     procedure btnDeleteUserClick(Sender: TObject);
     procedure listUsersFocusChanged(Sender: TBaseVirtualTree; Node: PVirtualNode;
       Column: TColumnIndex);
@@ -262,6 +262,8 @@ procedure TUserManagerForm.FormCreate(Sender: TObject);
   FixVT(treePrivs);
   FHasIsRole := False;
   FHasDefaultRole := False;
+  menuItemUser.ImageIndex := ICONINDEX_USER;
+  menuItemRole.ImageIndex := ICONINDEX_ROLE;
 end;
 
 procedure TUserManagerForm.FormDestroy(Sender: TObject);
@@ -947,9 +949,9 @@ procedure TUserManagerForm.listUsersGetImageIndex(Sender: TBaseVirtualTree; Node
   case Kind of
     ikNormal, ikSelected: begin
       if User.IsUser then
-        ImageIndex := 43
+        ImageIndex := ICONINDEX_USER
       else
-        ImageIndex := 95;
+        ImageIndex := ICONINDEX_ROLE;
     end;
     ikOverlay: begin
       if User.Password = '' then
@@ -1194,7 +1196,7 @@ procedure TUserManagerForm.treePrivsPaintText(Sender: TBaseVirtualTree; const Ta
 end;
 
 
-procedure TUserManagerForm.btnAddUserClick(Sender: TObject);
+procedure TUserManagerForm.menuItemUserClick(Sender: TObject);
 var
   P: TPrivObj;
   User: TUser;