Skip to content

Commit be1bcf6

Browse files
committed
fix(ui): remove default "add user" event from add button, turn it into a pure dropdown button
Refs #1155
1 parent 419acd7 commit be1bcf6

File tree

3 files changed

+20
-18
lines changed

3 files changed

+20
-18
lines changed

source/const.inc

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,8 @@ const
4646
ICONINDEX_FUNCTION = 13;
4747
ICONINDEX_EVENT = 80;
4848
ICONINDEX_KEYWORD = 25;
49+
ICONINDEX_USER = 43;
50+
ICONINDEX_ROLE = 95;
4951

5052
// Size of byte units
5153
{Kibibyte} SIZE_KB = Int64(1024);

source/usermanager.dfm

Lines changed: 11 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -100,9 +100,9 @@ object UserManagerForm: TUserManagerForm
100100
end
101101
object listUsers: TVirtualStringTree
102102
Left = 0
103-
Top = 72
103+
Top = 64
104104
Width = 177
105-
Height = 244
105+
Height = 252
106106
Align = alClient
107107
Header.AutoSizeIndex = 0
108108
Header.Height = 18
@@ -143,10 +143,9 @@ object UserManagerForm: TUserManagerForm
143143
Left = 0
144144
Top = 20
145145
Width = 177
146-
Height = 30
146+
Height = 22
147147
AutoSize = True
148-
ButtonHeight = 30
149-
ButtonWidth = 69
148+
ButtonWidth = 63
150149
Caption = 'ToolBar1'
151150
Images = MainForm.VirtualImageListMain
152151
List = True
@@ -160,19 +159,18 @@ object UserManagerForm: TUserManagerForm
160159
DropdownMenu = menuAdd
161160
ImageIndex = 45
162161
ImageName = 'icons8-add'
163-
Style = tbsDropDown
164-
OnClick = btnAddUserClick
162+
Style = tbsWholeDropDown
165163
end
166164
object btnCloneUser: TToolButton
167-
Left = 84
165+
Left = 72
168166
Top = 0
169167
Caption = 'Clone'
170168
ImageIndex = 3
171169
ImageName = 'icons8-copy-100'
172-
OnClick = btnAddUserClick
170+
OnClick = menuItemUserClick
173171
end
174172
object btnDeleteUser: TToolButton
175-
Left = 153
173+
Left = 135
176174
Top = 0
177175
Caption = 'Delete'
178176
ImageIndex = 46
@@ -182,7 +180,7 @@ object UserManagerForm: TUserManagerForm
182180
end
183181
object editFilterUsers: TButtonedEdit
184182
Left = 0
185-
Top = 50
183+
Top = 42
186184
Width = 177
187185
Height = 22
188186
Align = alTop
@@ -561,8 +559,6 @@ object UserManagerForm: TUserManagerForm
561559
OnInitNode = treePrivsInitNode
562560
Touch.InteractiveGestures = [igPan, igPressAndTap]
563561
Touch.InteractiveGestureOptions = [igoPanSingleFingerHorizontal, igoPanSingleFingerVertical, igoPanInertia, igoPanGutter, igoParentPassthrough]
564-
ExplicitTop = 64
565-
ExplicitHeight = 78
566562
Columns = <>
567563
end
568564
object tlbObjects: TToolBar
@@ -703,12 +699,13 @@ object UserManagerForm: TUserManagerForm
703699
end
704700
end
705701
object menuAdd: TPopupMenu
702+
Images = MainForm.VirtualImageListMain
706703
OnPopup = menuAddPopup
707704
Left = 80
708705
Top = 280
709706
object menuItemUser: TMenuItem
710707
Caption = 'User'
711-
OnClick = btnAddUserClick
708+
OnClick = menuItemUserClick
712709
end
713710
object menuItemRole: TMenuItem
714711
Caption = 'Role'

source/usermanager.pas

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ TUserManagerForm = class(TExtForm)
136136
comboDefaultRole: TComboBox;
137137
procedure FormCreate(Sender: TObject);
138138
procedure FormShow(Sender: TObject);
139-
procedure btnAddUserClick(Sender: TObject);
139+
procedure menuItemUserClick(Sender: TObject);
140140
procedure btnDeleteUserClick(Sender: TObject);
141141
procedure listUsersFocusChanged(Sender: TBaseVirtualTree; Node: PVirtualNode;
142142
Column: TColumnIndex);
@@ -256,6 +256,9 @@ procedure TUserManagerForm.FormCreate(Sender: TObject);
256256
FixVT(listUsers);
257257
FixVT(treePrivs);
258258
FHasIsRole := False;
259+
FHasDefaultRole := False;
260+
menuItemUser.ImageIndex := ICONINDEX_USER;
261+
menuItemRole.ImageIndex := ICONINDEX_ROLE;
259262
end;
260263

261264

@@ -919,9 +922,9 @@ procedure TUserManagerForm.listUsersGetImageIndex(Sender: TBaseVirtualTree; Node
919922
case Kind of
920923
ikNormal, ikSelected: begin
921924
if User.IsUser then
922-
ImageIndex := 43
925+
ImageIndex := ICONINDEX_USER
923926
else
924-
ImageIndex := 95;
927+
ImageIndex := ICONINDEX_ROLE;
925928
end;
926929
ikOverlay: begin
927930
if User.Password = '' then
@@ -1166,7 +1169,7 @@ procedure TUserManagerForm.treePrivsPaintText(Sender: TBaseVirtualTree; const Ta
11661169
end;
11671170

11681171

1169-
procedure TUserManagerForm.btnAddUserClick(Sender: TObject);
1172+
procedure TUserManagerForm.menuItemUserClick(Sender: TObject);
11701173
var
11711174
P: TPrivObj;
11721175
User: TUser;

0 commit comments

Comments
 (0)