Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 13 additions & 13 deletions [admin]/admin/client/gui/admin_main.lua
Original file line number Diff line number Diff line change
Expand Up @@ -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 )
Expand Down Expand Up @@ -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
Expand Down
26 changes: 13 additions & 13 deletions [admin]/admin2/client/main/admin_options.lua
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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
Expand Down
3 changes: 0 additions & 3 deletions [admin]/admin2/conf/autologin.xml

This file was deleted.