Skip to content

Commit dc02545

Browse files
ArranTunaArranTuna
authored
Merge pull request #672 from omar-o22/Remove-useless-button
admin/admin2: Remove useless checkbox
2 parents cef8ddf + 189bc0e commit dc02545

File tree

3 files changed

+26
-29
lines changed

3 files changed

+26
-29
lines changed

‎[admin]/admin/client/gui/admin_main.lua‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -353,20 +353,20 @@ y=y+B aTab1.VehicleHealth = guiCreateLabel ( 0.26, y, 0.25, 0.04, "Vehicle Heal
353353
guiCreateLabel ( 0.08, 0.15, 0.40, 0.04, "This might be useful to copy player data", true, aTab6.Tab )
354354
aTab6.AdminChatOutput = guiCreateCheckBox ( 0.05, 0.20, 0.47, 0.04, "Output admin messages to chat box", false, true, aTab6.Tab )
355355
guiCreateHeader ( 0.03, 0.30, 0.47, 0.04, "Appearance:", true, aTab6.Tab )
356-
guiCreateHeader ( 0.63, 0.05, 0.10, 0.05, "Account:", true, aTab6.Tab )
357-
aTab6.AutoLogin = guiCreateCheckBox ( 0.65, 0.10, 0.47, 0.04, "Auto-login by serial", false, true, aTab6.Tab )
358-
guiSetVisible ( aTab6.AutoLogin, false ) -- Not used
359-
guiCreateHeader ( 0.63, 0.15, 0.25, 0.05, "Change Password:", true, aTab6.Tab )
360-
guiCreateLabel ( 0.65, 0.20, 0.15, 0.05, "Old password:", true, aTab6.Tab )
361-
guiCreateLabel ( 0.65, 0.25, 0.15, 0.05, "New password:", true, aTab6.Tab )
362-
guiCreateLabel ( 0.65, 0.30, 0.15, 0.05, "Confirm:", true, aTab6.Tab )
363-
aTab6.PasswordOld = guiCreateEdit ( 0.80, 0.20, 0.15, 0.045, "", true, aTab6.Tab )
364-
aTab6.PasswordNew = guiCreateEdit ( 0.80, 0.25, 0.15, 0.045, "", true, aTab6.Tab )
365-
aTab6.PasswordConfirm = guiCreateEdit ( 0.80, 0.30, 0.15, 0.045, "", true, aTab6.Tab )
356+
-- guiCreateHeader ( 0.63, 0.05, 0.10, 0.05, "Account:", true, aTab6.Tab )
357+
-- aTab6.AutoLogin = guiCreateCheckBox ( 0.65, 0.10, 0.47, 0.04, "Auto-login by serial", false, true, aTab6.Tab )
358+
-- guiSetVisible ( aTab6.AutoLogin, false ) -- Not used
359+
guiCreateHeader ( 0.63, 0.05, 0.25, 0.05, "Change Password:", true, aTab6.Tab )
360+
guiCreateLabel ( 0.65, 0.10, 0.15, 0.05, "Old password:", true, aTab6.Tab )
361+
guiCreateLabel ( 0.65, 0.15, 0.15, 0.05, "New password:", true, aTab6.Tab )
362+
guiCreateLabel ( 0.65, 0.20, 0.15, 0.05, "Confirm:", true, aTab6.Tab )
363+
aTab6.PasswordOld = guiCreateEdit ( 0.80, 0.10, 0.15, 0.045, "", true, aTab6.Tab )
364+
aTab6.PasswordNew = guiCreateEdit ( 0.80, 0.15, 0.15, 0.045, "", true, aTab6.Tab )
365+
aTab6.PasswordConfirm = guiCreateEdit ( 0.80, 0.20, 0.15, 0.045, "", true, aTab6.Tab )
366366
guiEditSetMasked ( aTab6.PasswordOld, true )
367367
guiEditSetMasked ( aTab6.PasswordNew, true )
368368
guiEditSetMasked ( aTab6.PasswordConfirm, true )
369-
aTab6.PasswordChange = guiCreateButton ( 0.85, 0.35, 0.10, 0.04, "Accept", true, aTab6.Tab )
369+
aTab6.PasswordChange = guiCreateButton ( 0.85, 0.25, 0.10, 0.04, "Accept", true, aTab6.Tab )
370370
guiCreateHeader ( 0.03, 0.65, 0.20, 0.055, "Performance:", true, aTab6.Tab )
371371
guiCreateStaticImage ( 0.03, 0.69, 0.94, 0.0025, "client\\images\\dot.png", true, aTab6.Tab )
372372
guiCreateLabel ( 0.05, 0.71, 0.20, 0.055, "Performance priority:", true, aTab6.Tab )
@@ -1189,8 +1189,8 @@ function aClientClick ( button )
11891189
end
11901190
elseif ( source == aTab6.PerformanceAdvanced ) then
11911191
aPerformance()
1192-
elseif ( source == aTab6.AutoLogin ) then
1193-
triggerServerEvent ( "aAdmin", localPlayer, "autologin", guiCheckBoxGetSelected ( aTab6.AutoLogin ) )
1192+
-- elseif ( source == aTab6.AutoLogin ) then
1193+
-- triggerServerEvent ( "aAdmin", localPlayer, "autologin", guiCheckBoxGetSelected ( aTab6.AutoLogin ) )
11941194
--elseif ( source == aTab6.PasswordOld ) then
11951195

11961196
--elseif ( source == aTab6.PasswordNew ) then

‎[admin]/admin2/client/main/admin_options.lua‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -19,20 +19,20 @@ function aOptionsTab.Create(tab)
1919
guiCreateCheckBox(0.05, 0.15, 0.47, 0.04, "Play sound on incoming admin chat message", aGetSetting("adminChatSound"), true, aOptionsTab.Tab)
2020

2121
--guiCreateHeader(0.03, 0.30, 0.47, 0.04, "Appearance:", true, aOptionsTab.Tab)
22-
guiCreateHeader(0.63, 0.05, 0.10, 0.05, "Account:", true, aOptionsTab.Tab)
23-
aOptionsTab.AutoLogin =
24-
guiCreateCheckBox(0.65, 0.10, 0.47, 0.04, "Auto-login by serial", false, true, aOptionsTab.Tab)
25-
guiCreateHeader(0.63, 0.15, 0.25, 0.05, "Change Password:", true, aOptionsTab.Tab)
26-
guiCreateLabel(0.65, 0.20, 0.15, 0.05, "Old password:", true, aOptionsTab.Tab)
27-
guiCreateLabel(0.65, 0.25, 0.15, 0.05, "New password:", true, aOptionsTab.Tab)
28-
guiCreateLabel(0.65, 0.30, 0.15, 0.05, "Confirm:", true, aOptionsTab.Tab)
29-
aOptionsTab.PasswordOld = guiCreateEdit(0.80, 0.20, 0.15, 0.045, "", true, aOptionsTab.Tab)
30-
aOptionsTab.PasswordNew = guiCreateEdit(0.80, 0.25, 0.15, 0.045, "", true, aOptionsTab.Tab)
31-
aOptionsTab.PasswordConfirm = guiCreateEdit(0.80, 0.30, 0.15, 0.045, "", true, aOptionsTab.Tab)
22+
-- guiCreateHeader(0.63, 0.05, 0.10, 0.05, "Account:", true, aOptionsTab.Tab)
23+
-- aOptionsTab.AutoLogin =
24+
-- guiCreateCheckBox(0.65, 0.10, 0.47, 0.04, "Auto-login by serial", false, true, aOptionsTab.Tab)
25+
guiCreateHeader(0.63, 0.05, 0.25, 0.05, "Change Password:", true, aOptionsTab.Tab)
26+
guiCreateLabel(0.65, 0.10, 0.15, 0.05, "Old password:", true, aOptionsTab.Tab)
27+
guiCreateLabel(0.65, 0.15, 0.15, 0.05, "New password:", true, aOptionsTab.Tab)
28+
guiCreateLabel(0.65, 0.20, 0.15, 0.05, "Confirm:", true, aOptionsTab.Tab)
29+
aOptionsTab.PasswordOld = guiCreateEdit(0.80, 0.10, 0.15, 0.045, "", true, aOptionsTab.Tab)
30+
aOptionsTab.PasswordNew = guiCreateEdit(0.80, 0.15, 0.15, 0.045, "", true, aOptionsTab.Tab)
31+
aOptionsTab.PasswordConfirm = guiCreateEdit(0.80, 0.20, 0.15, 0.045, "", true, aOptionsTab.Tab)
3232
guiEditSetMasked(aOptionsTab.PasswordOld, true)
3333
guiEditSetMasked(aOptionsTab.PasswordNew, true)
3434
guiEditSetMasked(aOptionsTab.PasswordConfirm, true)
35-
aOptionsTab.PasswordChange = guiCreateButton(0.85, 0.35, 0.10, 0.04, "Accept", true, aOptionsTab.Tab)
35+
aOptionsTab.PasswordChange = guiCreateButton(0.85, 0.25, 0.10, 0.04, "Accept", true, aOptionsTab.Tab)
3636
guiCreateHeader(0.03, 0.65, 0.20, 0.055, "Performance:", true, aOptionsTab.Tab)
3737
guiCreateStaticImage(0.03, 0.69, 0.94, 0.0025, "client\\images\\dot.png", true, aOptionsTab.Tab)
3838
guiCreateLabel(0.05, 0.71, 0.20, 0.055, "Performance priority:", true, aOptionsTab.Tab)
@@ -83,8 +83,8 @@ function aOptionsTab.onClientClick(button)
8383
end
8484
elseif (source == aOptionsTab.PerformanceAdvanced) then
8585
aPerformance()
86-
elseif (source == aOptionsTab.AutoLogin) then
87-
triggerServerEvent("aAdmin", localPlayer, "autologin", guiCheckBoxGetSelected(aOptionsTab.AutoLogin))
86+
-- elseif (source == aOptionsTab.AutoLogin) then
87+
-- triggerServerEvent("aAdmin", localPlayer, "autologin", guiCheckBoxGetSelected(aOptionsTab.AutoLogin))
8888
elseif (source == aOptionsTab.PasswordOld) then
8989
guiSetInputEnabled(true)
9090
elseif (source == aOptionsTab.PasswordNew) then

‎[admin]/admin2/conf/autologin.xml‎

Lines changed: 0 additions & 3 deletions
This file was deleted.

0 commit comments

Comments
 (0)