admin2: fixed various sorting related gridlist issues (#416)

* admin2: fixed spectator player action buttons

admin2 : fixed spectator player action GUI buttons which were non-functional due to referring to global variable names from old admin.

* admin2: fixed sorting issues in several widget gridlists

fixed disappearing text and incorrectly displayed sections for aVehicle aWeapon and aSkin widget gridlists if the user used gridlist sorting; fixed incorrectly set aSetting used to remember 'sort by groups' for aVehicle; unified .Refresh function for aVehicle and aSkin to match aWeapon

* admin2: fixed sorting issues in players and resources gridlist

fixed disappearing text in players and resources tab gridlist if the user used gridlist sorting and search filter; unified player search to match the filter structure and method used in widgets; fixed selected player being unselected when using search filter

* admin2: admin_players.lua whitespace changes

changed tabs to 4 spaces to match coding style

* admin2: fixed sorting issues in interior and team widget

fixed disappearing text in interiors widget gridlist and incorrect team color and team data application in teams widget gridlist when gridlist is user-sorted in conjunction with search-filter

* admin2: fixed team widget not closing

fixed team widget not closing when assigning a team via double click

Author: Dark-Dragon

[admin]/admin2/client/main/admin_players.lua

@@ -113,7 +113,7 @@ function aPlayersTab.Create(tab)
     addEventHandler("onClientGUIClick", aPlayersTab.Context, aPlayersTab.onContextClick)
     addEventHandler("onClientGUIClick", aPlayersTab.InfoContext, aPlayersTab.onContextClick)
     addEventHandler("onClientGUIClick", aPlayersTab.Tab, aPlayersTab.onClientClick)
-    addEventHandler("onClientGUIChanged", aPlayersTab.PlayerListSearch, aPlayersTab.onPlayerListSearch)
+    addEventHandler("onClientGUIChanged", aPlayersTab.PlayerListSearch, aPlayersTab.onGUIChange)
     addEventHandler("onClientPlayerChangeNick", root, aPlayersTab.onClientPlayerChangeNick)
     addEventHandler("aClientPlayerJoin", root, aPlayersTab.onClientPlayerJoin)
     addEventHandler("onClientPlayerQuit", root, aPlayersTab.onClientPlayerQuit)
@@ -321,23 +321,9 @@ function aPlayersTab.onClientClick(button)
     end
 end
 
-function aPlayersTab.onPlayerListSearch()
-    guiGridListClear(aPlayersTab.PlayerList)
-    local text = guiGetText(source)
-    if (text == "") then
-        for id, player in ipairs(getElementsByType("player")) do
-            local row = guiGridListAddRow(aPlayersTab.PlayerList)
-            guiGridListSetItemText(aPlayersTab.PlayerList, row, 1, getPlayerName(player), false, false)
-            guiGridListSetItemData(aPlayersTab.PlayerList, row, 1, player)
-        end
-    else
-        for id, player in ipairs(getElementsByType("player")) do
-            if (string.find(string.upper(getPlayerName(player)), string.upper(text))) then
-                local row = guiGridListAddRow(aPlayersTab.PlayerList)
-                guiGridListSetItemText(aPlayersTab.PlayerList, row, 1, getPlayerName(player), false, false)
-                guiGridListSetItemData(aPlayersTab.PlayerList, row, 1, player)
-            end
-        end
+function aPlayersTab.onGUIChange()
+    if (source == aPlayersTab.PlayerListSearch) then
+        aPlayersTab.Refresh()
     end
 end
 
@@ -386,11 +372,11 @@ end
 function aPlayersTab.onClientPlayerJoin(ip, username, serial, unused, country, countryname)
     if ip == false and serial == false then
         -- Update country only
-		if aPlayers[source] then
-			aPlayers[source].country = country
-			aPlayers[source].countryname = countryname
-		end
-		return
+        if aPlayers[source] then
+            aPlayers[source].country = country
+            aPlayers[source].countryname = countryname
+        end
+        return
     end
     aPlayers[source] = {}
     aPlayers[source].name = getPlayerName(source)
@@ -551,21 +537,25 @@ end
 
 function aPlayersTab.Refresh()
     local selected = getSelectedPlayer()
-    local list = aPlayersTab.PlayerList
-    guiGridListClear(list)
     local strip = guiCheckBoxGetSelected(aPlayersTab.ColorCodes)
+    local filter = guiGetText(aPlayersTab.PlayerListSearch):lower()
+    local sortDirection = guiGetProperty(aPlayersTab.PlayerList, "SortDirection")
+    guiGridListClear(aPlayersTab.PlayerList)
+    guiSetProperty(aPlayersTab.PlayerList, "SortDirection", "None")
     for id, player in ipairs(getElementsByType("player")) do
-        local row = guiGridListAddRow(list)
         local name = getPlayerName(player)
-        if (strip) then
-            name = stripColorCodes(name)
-        end
-        guiGridListSetItemText(list, row, 1, name, false, false)
-        guiGridListSetItemData(list, row, 1, player)
-        if (player == selected) then
-            guiGridListSetSelectedItem(list, row, 1)
+        if name:find(filter) or name:lower():find(filter) then
+            if (strip) then
+                name = stripColorCodes(name)
+            end
+            local row = guiGridListAddRow(aPlayersTab.PlayerList, name)
+            guiGridListSetItemData(aPlayersTab.PlayerList, row, 1, player)
+            if (player == selected) then
+                guiGridListSetSelectedItem(aPlayersTab.PlayerList, row, 1)
+            end
         end
     end
+    guiSetProperty(aPlayersTab.PlayerList, "SortDirection", sortDirection)
 end
 
 function getSelectedPlayer()

[admin]/admin2/client/main/admin_resources.lua

@@ -275,9 +275,7 @@ function aResourcesTab.listResources(type)
     end
     for id, resource in ipairs(temp) do
         if (filter and resource.name:lower():find(filter:lower())) or (not filter) then
-            local row = guiGridListAddRow(resources)
-            guiGridListSetItemText(resources, row, 1, resource.name, false, false)
-            guiGridListSetItemText(resources, row, 2, resource.state, false, false)
+            guiGridListAddRow(resources, resource.name, resource.state)
         end
     end
 end

[admin]/admin2/client/widgets/admin_interior.lua

@@ -113,12 +113,15 @@ end
 
 function aInterior.Refresh()
     local filter = guiGetText(aInterior.Edit):lower()
+    local sortDirection = guiGetProperty(aInterior.List, "SortDirection")
     guiGridListClear(aInterior.List)
+    guiSetProperty(aInterior.List, "SortDirection", "None")
     for k, v in ipairs(aInterior.interiors) do
         if v.world:find(filter) or v.id:lower():find(filter) then
             local row = guiGridListAddRow(aInterior.List)
             guiGridListSetItemText(aInterior.List, row, 1, v.world, false, true)
             guiGridListSetItemText(aInterior.List, row, 2, v.id, false, false)
         end
     end
+    guiSetProperty(aInterior.List, "SortDirection", sortDirection)
 end

[admin]/admin2/client/widgets/admin_skin.lua

@@ -145,10 +145,13 @@ function aSkin.Load()
 end
 
 function aSkin.Refresh()
-    aSetSetting("skinsGroup", guiCheckBoxGetSelected(aSkin.Groups))
-    guiGridListClear(aSkin.List)
+    local groups = guiCheckBoxGetSelected(aSkin.Groups)
     local filter = guiGetText(aSkin.Edit):lower()
-    if (guiCheckBoxGetSelected(aSkin.Groups)) then
+    local sortDirection = guiGetProperty(aSkin.List, "SortDirection")
+    aSetSetting("skinsGroup", groups)
+    guiGridListClear(aSkin.List)
+    guiSetProperty(aSkin.List, "SortDirection", "None")
+    if (groups) then
         local skins = {}
         for name, group in pairs(aSkin.skins) do
             for _, skin in ipairs(group) do
@@ -164,9 +167,7 @@ function aSkin.Refresh()
             local row = guiGridListAddRow(aSkin.List)
             guiGridListSetItemText(aSkin.List, row, 2, name, true, false)
             for id, skin in ipairs(group) do
-                row = guiGridListAddRow(aSkin.List)
-                guiGridListSetItemText(aSkin.List, row, 1, skin.model, false, true)
-                guiGridListSetItemText(aSkin.List, row, 2, skin.name, false, false)
+                guiGridListAddRow(aSkin.List, skin.model, skin.name)
             end
         end
         guiGridListSetSortingEnabled(aSkin.List, false)
@@ -185,5 +186,6 @@ function aSkin.Refresh()
             end
         end
         guiGridListSetSortingEnabled(aSkin.List, true)
+        guiSetProperty(aSkin.List, "SortDirection", sortDirection)
     end
 end

[admin]/admin2/client/widgets/admin_team.lua

@@ -70,7 +70,7 @@ function aTeam.onDoubleClick(button)
             if (guiGridListGetSelectedItem(aTeam.List) ~= -1) then
                 local team = guiGridListGetItemText(aTeam.List, guiGridListGetSelectedItem(aTeam.List), 1)
                 triggerServerEvent("aPlayer", localPlayer, getSelectedPlayer(), "setteam", getTeamFromName(team))
-                aPlayerTeamClose(false)
+                aTeam.Close(false)
             end
         end
     end
@@ -147,13 +147,15 @@ end
 
 function aTeam.Refresh()
     if (aTeam.List) then
+        local sortDirection = guiGetProperty(aTeam.List, "SortDirection")
         guiGridListClear(aTeam.List)
+        guiSetProperty(aTeam.List, "SortDirection", "None")
         for id, team in ipairs(getElementsByType("team")) do
-            local row = guiGridListAddRow(aTeam.List)
+            local row = guiGridListAddRow(aTeam.List, getTeamName(team))
             local r, g, b = getTeamColor(team)
-            guiGridListSetItemText(aTeam.List, row, 1, getTeamName(team), false, false)
             guiGridListSetItemColor(aTeam.List, row, 1, r, g, b)
             guiGridListSetItemData(aTeam.List, row, 1, team)
         end
+        guiSetProperty(aTeam.List, "SortDirection", sortDirection)
     end
 end

[admin]/admin2/client/widgets/admin_vehicle.lua

@@ -27,7 +27,7 @@ function aVehicle.Show(player)
         guiCreateInnerImage("client\\images\\search.png", aVehicle.Edit)
 
         aVehicle.Groups = guiCreateCheckBox(0.03, 0.90, 0.70, 0.09, "Sort by groups", false, true, aVehicle.Form)
-        if (aGetSetting("weaponsGroup")) then
+        if (aGetSetting("vehiclesGroup")) then
             guiCheckBoxSetSelected(aVehicle.Groups, true)
         end
 
@@ -141,10 +141,13 @@ function aVehicle.Load()
 end
 
 function aVehicle.Refresh()
-    aSetSetting("weaponsGroup", guiCheckBoxGetSelected(aVehicle.Groups))
-    guiGridListClear(aVehicle.List)
+    local groups = guiCheckBoxGetSelected(aVehicle.Groups)
     local filter = guiGetText(aVehicle.Edit):lower()
-    if (guiCheckBoxGetSelected(aVehicle.Groups)) then
+    local sortDirection = guiGetProperty(aVehicle.List, "SortDirection")
+    aSetSetting("vehiclesGroup", groups)
+    guiGridListClear(aVehicle.List)
+    guiSetProperty(aVehicle.List, "SortDirection", "None")
+    if (groups) then
         local vehicles = {}
         for name, group in pairs(aVehicle.vehicles) do
             for _, vehicle in ipairs(group) do
@@ -160,9 +163,7 @@ function aVehicle.Refresh()
             local row = guiGridListAddRow(aVehicle.List)
             guiGridListSetItemText(aVehicle.List, row, 2, name, true, false)
             for id, vehicle in ipairs(group) do
-                row = guiGridListAddRow(aVehicle.List)
-                guiGridListSetItemText(aVehicle.List, row, 1, vehicle.id, false, true)
-                guiGridListSetItemText(aVehicle.List, row, 2, vehicle.name, false, false)
+                guiGridListAddRow(aVehicle.List, vehicle.id, vehicle.name)
             end
         end
         guiGridListSetSortingEnabled(aVehicle.List, false)
@@ -181,5 +182,6 @@ function aVehicle.Refresh()
             end
         end
         guiGridListSetSortingEnabled(aVehicle.List, true)
+        guiSetProperty(aVehicle.List, "SortDirection", sortDirection)
     end
 end

[admin]/admin2/client/widgets/admin_weapon.lua

@@ -154,8 +154,10 @@ end
 function aWeapon.Refresh()
     local groups = guiCheckBoxGetSelected(aWeapon.Groups)
     local filter = guiGetText(aWeapon.Edit):lower()
+    local sortDirection = guiGetProperty(aWeapon.List, "SortDirection")
     aSetSetting("weaponsGroup", groups)
     guiGridListClear(aWeapon.List)
+    guiSetProperty(aWeapon.List, "SortDirection", "None")
     if (groups) then
         local weapons = {}
         for name, group in pairs(aWeapon.weapons) do
@@ -172,9 +174,7 @@ function aWeapon.Refresh()
             local row = guiGridListAddRow(aWeapon.List)
             guiGridListSetItemText(aWeapon.List, row, 2, name, true, false)
             for id, weapon in ipairs(group) do
-                row = guiGridListAddRow(aWeapon.List)
-                guiGridListSetItemText(aWeapon.List, row, 1, weapon.id, false, true)
-                guiGridListSetItemText(aWeapon.List, row, 2, weapon.name, false, false)
+                guiGridListAddRow(aWeapon.List, weapon.id, weapon.name)
             end
         end
         guiGridListSetSortingEnabled(aWeapon.List, false)
@@ -193,5 +193,6 @@ function aWeapon.Refresh()
             end
         end
         guiGridListSetSortingEnabled(aWeapon.List, true)
+        guiSetProperty(aWeapon.List, "SortDirection", sortDirection)
     end
 end