diff --git a/[admin]/admin/client/gui/admin_main.lua b/[admin]/admin/client/gui/admin_main.lua index 5e435fa54..8af2f397a 100644 --- a/[admin]/admin/client/gui/admin_main.lua +++ b/[admin]/admin/client/gui/admin_main.lua @@ -341,20 +341,20 @@ y=y+B aTab1.VehicleHealth = guiCreateLabel ( 0.26, y, 0.25, 0.04, "Vehicle Heal guiCreateLabel ( 0.08, 0.15, 0.40, 0.04, "This might be useful to copy player data", true, aTab6.Tab ) aTab6.AdminChatOutput = guiCreateCheckBox ( 0.05, 0.20, 0.47, 0.04, "Output admin messages to chat box", false, true, aTab6.Tab ) guiCreateHeader ( 0.03, 0.30, 0.47, 0.04, "Appearance:", true, aTab6.Tab ) - guiCreateHeader ( 0.63, 0.05, 0.10, 0.05, "Account:", true, aTab6.Tab ) - aTab6.AutoLogin = guiCreateCheckBox ( 0.65, 0.10, 0.47, 0.04, "Auto-login by serial", false, true, aTab6.Tab ) - guiSetVisible ( aTab6.AutoLogin, false ) -- Not used - guiCreateHeader ( 0.63, 0.15, 0.25, 0.05, "Change Password:", true, aTab6.Tab ) - guiCreateLabel ( 0.65, 0.20, 0.15, 0.05, "Old password:", true, aTab6.Tab ) - guiCreateLabel ( 0.65, 0.25, 0.15, 0.05, "New password:", true, aTab6.Tab ) - guiCreateLabel ( 0.65, 0.30, 0.15, 0.05, "Confirm:", true, aTab6.Tab ) - aTab6.PasswordOld = guiCreateEdit ( 0.80, 0.20, 0.15, 0.045, "", true, aTab6.Tab ) - aTab6.PasswordNew = guiCreateEdit ( 0.80, 0.25, 0.15, 0.045, "", true, aTab6.Tab ) - aTab6.PasswordConfirm = guiCreateEdit ( 0.80, 0.30, 0.15, 0.045, "", true, aTab6.Tab ) + -- guiCreateHeader ( 0.63, 0.05, 0.10, 0.05, "Account:", true, aTab6.Tab ) + -- aTab6.AutoLogin = guiCreateCheckBox ( 0.65, 0.10, 0.47, 0.04, "Auto-login by serial", false, true, aTab6.Tab ) + -- guiSetVisible ( aTab6.AutoLogin, false ) -- Not used + guiCreateHeader ( 0.63, 0.05, 0.25, 0.05, "Change Password:", true, aTab6.Tab ) + guiCreateLabel ( 0.65, 0.10, 0.15, 0.05, "Old password:", true, aTab6.Tab ) + guiCreateLabel ( 0.65, 0.15, 0.15, 0.05, "New password:", true, aTab6.Tab ) + guiCreateLabel ( 0.65, 0.20, 0.15, 0.05, "Confirm:", true, aTab6.Tab ) + aTab6.PasswordOld = guiCreateEdit ( 0.80, 0.10, 0.15, 0.045, "", true, aTab6.Tab ) + aTab6.PasswordNew = guiCreateEdit ( 0.80, 0.15, 0.15, 0.045, "", true, aTab6.Tab ) + aTab6.PasswordConfirm = guiCreateEdit ( 0.80, 0.20, 0.15, 0.045, "", true, aTab6.Tab ) guiEditSetMasked ( aTab6.PasswordOld, true ) guiEditSetMasked ( aTab6.PasswordNew, true ) guiEditSetMasked ( aTab6.PasswordConfirm, true ) - aTab6.PasswordChange = guiCreateButton ( 0.85, 0.35, 0.10, 0.04, "Accept", true, aTab6.Tab ) + aTab6.PasswordChange = guiCreateButton ( 0.85, 0.25, 0.10, 0.04, "Accept", true, aTab6.Tab ) guiCreateHeader ( 0.03, 0.65, 0.20, 0.055, "Performance:", true, aTab6.Tab ) guiCreateStaticImage ( 0.03, 0.69, 0.94, 0.0025, "client\\images\\dot.png", true, aTab6.Tab ) guiCreateLabel ( 0.05, 0.71, 0.20, 0.055, "Performance priority:", true, aTab6.Tab ) @@ -1177,8 +1177,8 @@ function aClientClick ( button ) end elseif ( source == aTab6.PerformanceAdvanced ) then aPerformance() - elseif ( source == aTab6.AutoLogin ) then - triggerServerEvent ( "aAdmin", localPlayer, "autologin", guiCheckBoxGetSelected ( aTab6.AutoLogin ) ) + -- elseif ( source == aTab6.AutoLogin ) then + -- triggerServerEvent ( "aAdmin", localPlayer, "autologin", guiCheckBoxGetSelected ( aTab6.AutoLogin ) ) --elseif ( source == aTab6.PasswordOld ) then --elseif ( source == aTab6.PasswordNew ) then diff --git a/[admin]/admin2/client/main/admin_options.lua b/[admin]/admin2/client/main/admin_options.lua index 1a59ce9bc..befd8e384 100644 --- a/[admin]/admin2/client/main/admin_options.lua +++ b/[admin]/admin2/client/main/admin_options.lua @@ -19,20 +19,20 @@ function aOptionsTab.Create(tab) guiCreateCheckBox(0.05, 0.15, 0.47, 0.04, "Play sound on incoming admin chat message", aGetSetting("adminChatSound"), true, aOptionsTab.Tab) --guiCreateHeader(0.03, 0.30, 0.47, 0.04, "Appearance:", true, aOptionsTab.Tab) - guiCreateHeader(0.63, 0.05, 0.10, 0.05, "Account:", true, aOptionsTab.Tab) - aOptionsTab.AutoLogin = - guiCreateCheckBox(0.65, 0.10, 0.47, 0.04, "Auto-login by serial", false, true, aOptionsTab.Tab) - guiCreateHeader(0.63, 0.15, 0.25, 0.05, "Change Password:", true, aOptionsTab.Tab) - guiCreateLabel(0.65, 0.20, 0.15, 0.05, "Old password:", true, aOptionsTab.Tab) - guiCreateLabel(0.65, 0.25, 0.15, 0.05, "New password:", true, aOptionsTab.Tab) - guiCreateLabel(0.65, 0.30, 0.15, 0.05, "Confirm:", true, aOptionsTab.Tab) - aOptionsTab.PasswordOld = guiCreateEdit(0.80, 0.20, 0.15, 0.045, "", true, aOptionsTab.Tab) - aOptionsTab.PasswordNew = guiCreateEdit(0.80, 0.25, 0.15, 0.045, "", true, aOptionsTab.Tab) - aOptionsTab.PasswordConfirm = guiCreateEdit(0.80, 0.30, 0.15, 0.045, "", true, aOptionsTab.Tab) + -- guiCreateHeader(0.63, 0.05, 0.10, 0.05, "Account:", true, aOptionsTab.Tab) + -- aOptionsTab.AutoLogin = + -- guiCreateCheckBox(0.65, 0.10, 0.47, 0.04, "Auto-login by serial", false, true, aOptionsTab.Tab) + guiCreateHeader(0.63, 0.05, 0.25, 0.05, "Change Password:", true, aOptionsTab.Tab) + guiCreateLabel(0.65, 0.10, 0.15, 0.05, "Old password:", true, aOptionsTab.Tab) + guiCreateLabel(0.65, 0.15, 0.15, 0.05, "New password:", true, aOptionsTab.Tab) + guiCreateLabel(0.65, 0.20, 0.15, 0.05, "Confirm:", true, aOptionsTab.Tab) + aOptionsTab.PasswordOld = guiCreateEdit(0.80, 0.10, 0.15, 0.045, "", true, aOptionsTab.Tab) + aOptionsTab.PasswordNew = guiCreateEdit(0.80, 0.15, 0.15, 0.045, "", true, aOptionsTab.Tab) + aOptionsTab.PasswordConfirm = guiCreateEdit(0.80, 0.20, 0.15, 0.045, "", true, aOptionsTab.Tab) guiEditSetMasked(aOptionsTab.PasswordOld, true) guiEditSetMasked(aOptionsTab.PasswordNew, true) guiEditSetMasked(aOptionsTab.PasswordConfirm, true) - aOptionsTab.PasswordChange = guiCreateButton(0.85, 0.35, 0.10, 0.04, "Accept", true, aOptionsTab.Tab) + aOptionsTab.PasswordChange = guiCreateButton(0.85, 0.25, 0.10, 0.04, "Accept", true, aOptionsTab.Tab) guiCreateHeader(0.03, 0.65, 0.20, 0.055, "Performance:", true, aOptionsTab.Tab) guiCreateStaticImage(0.03, 0.69, 0.94, 0.0025, "client\\images\\dot.png", true, aOptionsTab.Tab) guiCreateLabel(0.05, 0.71, 0.20, 0.055, "Performance priority:", true, aOptionsTab.Tab) @@ -83,8 +83,8 @@ function aOptionsTab.onClientClick(button) end elseif (source == aOptionsTab.PerformanceAdvanced) then aPerformance() - elseif (source == aOptionsTab.AutoLogin) then - triggerServerEvent("aAdmin", localPlayer, "autologin", guiCheckBoxGetSelected(aOptionsTab.AutoLogin)) + -- elseif (source == aOptionsTab.AutoLogin) then + -- triggerServerEvent("aAdmin", localPlayer, "autologin", guiCheckBoxGetSelected(aOptionsTab.AutoLogin)) elseif (source == aOptionsTab.PasswordOld) then guiSetInputEnabled(true) elseif (source == aOptionsTab.PasswordNew) then diff --git a/[admin]/admin2/conf/autologin.xml b/[admin]/admin2/conf/autologin.xml deleted file mode 100644 index 97c60f8e7..000000000 --- a/[admin]/admin2/conf/autologin.xml +++ /dev/null @@ -1,3 +0,0 @@ - - -