Various Improvements

.vscode/settings.json

@@ -0,0 +1,6 @@
+{
+    "files.associations": {
+        "*.lua": "glua"
+    },
+    "Lua.diagnostics.enable": false
+}

lua/ev_framework.lua

@@ -19,11 +19,26 @@ evolve.admins = 1
 evolve.colors.blue = Color( 98, 176, 255, 255 )
 evolve.colors.red = Color( 255, 62, 62, 255 )
 evolve.colors.white = color_white
-evolve.category = {}
-evolve.category.administration = 1
-evolve.category.actions = 2
-evolve.category.punishment = 3
-evolve.category.teleportation = 4
+
+evolve.category = {
+	administration = {
+		id=1,
+		label="Administration"
+	},
+	actions = {
+		id=2,
+		label="Actions"
+	},
+	punishment = {
+		id=3,
+		label="Punishment"
+	},
+	teleportation = {
+		id=4,
+		label="Teleportation"
+	}
+}
+
 evolve.stagedPlugins = {}
 evolve.plugins = {}
 evolve.version = 179
@@ -254,7 +269,10 @@ function evolve:RegisterPlugin( plugin )
 	if ( string.Left( pluginFile, string.find( pluginFile, "_" ) - 1 ) != "cl" or CLIENT ) then
 		table.insert( evolve.stagedPlugins, plugin )
 		plugin.File = pluginFile
-		if ( plugin.Privileges and SERVER ) then table.Add( evolve.privileges, plugin.Privileges ) table.sort( evolve.privileges ) end
+		if ( plugin.Privileges and SERVER ) then 
+			table.Add( evolve.privileges, plugin.Privileges ) 
+			table.sort( evolve.privileges ) 
+		end
 	else
 		table.insert( evolve.plugins, { Title = plugin.Title, File = pluginFile } )
 	end

lua/ev_menu/cl_menu.lua

@@ -102,6 +102,7 @@ hook.Add( "EV_RankPrivilegeChange", "EV_MenuPrivUpdate", function( rank, privile
 	end
 end )
 
+local topPerc = 0.32
 function MENU:Show()
 	if ( !LocalPlayer():EV_HasPrivilege( "Menu" ) ) then return end
 	if ( !self.Panel ) then MENU:Initialize() end
@@ -114,10 +115,11 @@ function MENU:Show()
 	self.Panel:SetKeyboardInputEnabled( false )
 	self.Panel:SetMouseInputEnabled( true )
 
-	input.SetCursorPos( 50 + self.Panel:GetWide() / 2, ScrH() / 2 )
+
+	input.SetCursorPos( 50 + self.Panel:GetWide() / 2, ScrH() * topPerc )
 
 	timer.Create( "EV_MenuShow", 1/60, 0, function()
-		self.Panel:SetPos( self.Panel:GetPos() + ( 110 - self.Panel:GetPos() ) / 7, ScrH() / 2 - self.Panel:GetTall() / 2 )
+		self.Panel:SetPos( self.Panel:GetPos() + ( 110 - self.Panel:GetPos() ) / 7, (ScrH() * topPerc) - self.Panel:GetTall() / 2 )
 
 		if ( self.Panel:GetPos() > 50 ) then
 			timer.Destroy( "EV_MenuShow" )
@@ -133,7 +135,7 @@ function MENU:Hide()
 	self.Panel:SetMouseInputEnabled( false )
 
 	timer.Create( "EV_MenuShow", 1/60, 0, function()
-		self.Panel:SetPos( self.Panel:GetPos() - ( self.Panel:GetPos() + self.Panel:GetWide() + 10 ) / 5, ScrH() / 2 - self.Panel:GetTall() / 2 )
+		self.Panel:SetPos( self.Panel:GetPos() - ( self.Panel:GetPos() + self.Panel:GetWide() + 10 ) / 5, (ScrH() * topPerc) - self.Panel:GetTall() / 2 )
 
 		if ( self.Panel:GetPos() < -self.Panel:GetWide() ) then
 			self.Panel:SetVisible( false )

lua/ev_menu/tab_players.lua

@@ -4,91 +4,86 @@
 
 include( "tab_players_controls.lua" )
 
+
 local TAB = {}
 TAB.Title = "Players"
 TAB.Description = "Manage players on the server."
 TAB.Icon = "user"
 TAB.Author = "Overv"
 TAB.Privileges = { "Player menu" }
-TAB.Width = 260
+TAB.Width = 520
 
 function TAB:Initialize( pnl )
 	// Create the player list
 	self.PlayerList = vgui.Create( "EvolvePlayerList", pnl )
 	self.PlayerList:AddColumn("Connected Players")
 	self.PlayerList:SetPos( 0, 0 )
-	self.PlayerList:SetSize( self.Width - 6, pnl:GetParent():GetTall() - 58 )
+	self.PlayerList:SetSize( (self.Width/2) - 6, pnl:GetParent():GetTall() - 58 )
 
 	// Create the plugin buttons	
 	self.ButKick = vgui.Create( "EvolveButton", pnl )
 	self.ButKick:SetPos( 0, pnl:GetParent():GetTall() - 58 )
 	self.ButKick:SetSize( 56, 27 )
 	self.ButKick:SetButtonText( "Kick" )
+
 	self.ButKick.DoClick = function()
-		if ( self.ButPlugins:GetButtonText() == "Players" ) then
-			self.PluginList:Reset()
-		end
-
+		self.PluginList:Reset()
+
 		self.PluginList:OpenPluginMenu( evolve:FindPlugin( "Kick" ) )
 
-		self.PlayerList:MoveTo( -self.Width, 0, 0.1 )
-		self.PluginList:MoveTo( 0, 0, 0.1 )
-		self.ButPlugins:SetButtonText( "Players" )
+		self.PluginList:MoveTo( self.Width/2, 0, 0.1 )
+
+		self.ButCancel:SetEnabled( true )
+		self.ButCancel:AlphaTo(255, 0)
 	end
 
 	self.ButBan = vgui.Create( "EvolveButton", pnl )
 	self.ButBan:SetPos( self.ButKick:GetWide() + 5, pnl:GetParent():GetTall() - 58 )
 	self.ButBan:SetSize( 64, 27 )
 	self.ButBan:SetButtonText( "Ban" )
 	self.ButBan.DoClick = function()
-		if ( self.ButPlugins:GetButtonText() == "Players" ) then
-			self.PluginList:Reset()
-		end
-
+
 		self.PluginList:OpenPluginMenu( evolve:FindPlugin( "Ban" ) )
-
-		self.PlayerList:MoveTo( -self.Width, 0, 0.1 )
-		self.PluginList:MoveTo( 0, 0, 0.1 )
-		self.ButPlugins:SetButtonText( "Players" )
+		self.PluginList:MoveTo( self.Width/2, 0, 0.1 )
+
+		self.ButCancel:SetEnabled( true )
+		self.ButCancel:AlphaTo(255, 0)
 	end
 
-	self.ButPlugins = vgui.Create( "EvolveButton", pnl )
-	self.ButPlugins:SetPos( self.ButKick:GetWide() + self.ButPlugins:GetWide() + 10, pnl:GetParent():GetTall() - 58 )
-	self.ButPlugins:SetSize( self.Width - 10 - self.ButKick:GetWide() - self.ButPlugins:GetWide(), 27 )
-	self.ButPlugins:SetButtonText( "Plugins" )
-	self.ButPlugins:SetNotHighlightedColor( 50 )
-	self.ButPlugins:SetHighlightedColor( 90 )
-	self.ButPlugins.DoClick = function()
-		if ( self.ButPlugins:GetButtonText() == "Plugins" ) then
-			self.PlayerList:MoveTo( -self.Width, 0, 0.1 )
-			self.PluginList:MoveTo( 0, 0, 0.1 )
-			self.ButPlugins:SetButtonText( "Players" )
-		else
-			self.PlayerList:MoveTo( 0, 0, 0.1 )
-			self.PluginList:MoveTo( self.Width, 0, 0.1 )
-			self.PluginList:Reset()
-			self.ButPlugins:SetButtonText( "Plugins" )
-		end
+	self.ButCancel = vgui.Create( "EvolveButton", pnl )
+	self.ButCancel:SetSize( 64, 27 )
+	self.ButCancel:SetPos( self.Width/2 ,pnl:GetParent():GetTall() - 58 )
+
+	self.ButCancel:SetButtonText( "Cancel" )
+
+	self.ButCancel:SetEnabled( false )
+	self.ButCancel:AlphaTo(0, 0)
+
+	self.ButCancel:SetNotHighlightedColor( 50 )
+	self.ButCancel:SetHighlightedColor( 90 )
+	self.ButCancel.DoClick = function()
+		self.PluginList:MoveTo( self.Width/2, 0, 0.1 )
+		self.PluginList:Reset()
+		self.ButCancel:SetEnabled( false )
+		self.ButCancel:AlphaTo(0, 0)
 	end
 
 	// Create the plugin list
 	self.PluginList = vgui.Create( "EvolvePluginList", pnl )
-	self.PluginList:SetPos( self.Width, 0 )
-	self.PluginList:SetSize( self.Width, pnl:GetParent():GetTall() - 58 )
+	self.PluginList:SetPos( self.Width/2, 0 )
+	self.PluginList:SetSize( self.Width/2, pnl:GetParent():GetTall() - 58 )
 	self.PluginList:CreatePluginsPage()
 
 	self.PlayerList.Parent = self
 end
 
 function TAB:Update()
 	self.PlayerList:Populate()
-
-	if ( self.ButPlugins:GetButtonText() != "Plugins" ) then
-		self.PlayerList:SetPos( 0, 0 )
-		self.PluginList:SetPos( self.Width, 0 )
-		self.PluginList:Reset()
-		self.ButPlugins:SetButtonText( "Plugins" )
-	end
+	self.PluginList:SetPos( self.Width/2, 0 )
+	self.PluginList:Reset()
+
+	self.ButCancel:AlphaTo(0, 0)
+	self.ButCancel:SetEnabled( false )
 end
 
 function TAB:IsAllowed()

lua/ev_menu/tab_players_controls.lua

@@ -141,7 +141,9 @@ function PANEL:Populate()
 			if ( item.LastClick and os.clock() < item.LastClick + 0.3 and item.LastX == gui.MouseX() and item.LastY == gui.MouseY() ) then
 				self:MoveTo( -self.Parent.Width, 0, 0.1 )
 				self.Parent.PluginList:MoveTo( 0, 0, 0.1 )
-				self.Parent.ButPlugins:SetButtonText( "Players" )
+
+				self.Parent.ButCancel:SetEnabled( true )
+				self.Parent.ButCancel:AlphaTo(255, 0)
 			end
 
 			item.LastClick = os.clock()
@@ -174,6 +176,7 @@ function PANEL:Init()
         self:SetContentAlignment( 4 )
         self:SetTextInset( 5, 0 )
         self:SetTall( 15 )
+
         table.insert( ToolButtons, self )
 end
 
@@ -228,6 +231,18 @@ function PANEL:AddCheckBox( strConVar )
 	self:InvalidateLayout()
 end
 
+function PANEL:AddSubmenuIndicator()
+	if ( !self.SubmenuInd ) then
+		self.SubmenuInd = vgui.Create( "DLabel", self )
+	end
+
+	self.SubmenuInd:SetText(">")
+	self.SubmenuInd:SetTextColor( Color( 80, 80, 80) )
+	self.SubmenuInd:SetTall( 15 )
+	self.SubmenuInd:SetPos(240,0)
+	self:InvalidateLayout()
+end
+
 vgui.Register( "ToolMenuButton", PANEL, "DButton" )
 
 /*-------------------------------------------------------------------------------------------------------------------------
@@ -266,9 +281,10 @@ function PANEL:PopulateSubmenu( plugin, submenu, title )
 		button.OnSelect = function()
 			RunConsoleCommand( "ev", plugin.ChatCommand, unpack( self:GetParent().Tab.PlayerList:GetSelectedPlayers() ), value[2] )
 
-			self:GetParent().Tab.PlayerList:MoveTo( 0, 0, 0.2 )
-			self:GetParent().Tab.PluginList:MoveTo( self:GetParent():GetWide(), 0, 0.2 )
-			self:GetParent().Tab.ButPlugins:SetButtonText( "Plugins" )
+			self:GetParent().Tab.PluginList:MoveTo( self:GetParent():GetWide()/2, 0, 0.2 )
+
+			self:GetParent().Tab.ButCancel:SetEnabled( false )
+			self:GetParent().Tab.ButCancel:AlphaTo(0, 0)
 			self:Reset()
 		end
 
@@ -282,15 +298,19 @@ function PANEL:OpenPluginMenu( plugin )
 
 	if ( submenu ) then
 		self:PopulateSubmenu( plugin, submenu, submenutitle )
-
+
+		self:GetParent().Tab.ButCancel:SetEnabled( true )
+		self:GetParent().Tab.ButCancel:AlphaTo(255, 0)
+
 		self.PluginContainer:MoveTo( -self:GetWide(), 0, 0.2 )
 		self.Submenu[1]:MoveTo( 1, 1, 0.2 )
 	else
 		RunConsoleCommand( "ev", plugin.ChatCommand, unpack( self:GetParent().Tab.PlayerList:GetSelectedPlayers() ) )
 
-		self:GetParent().Tab.PlayerList:MoveTo( 0, 0, 0.2 )
-		self:GetParent().Tab.PluginList:MoveTo( self:GetParent():GetWide(), 0, 0.2 )
-		self:GetParent().Tab.ButPlugins:SetButtonText( "Plugins" )
+		self:GetParent().Tab.PluginList:MoveTo( self:GetParent():GetWide()/2, 0, 0.2 )
+
+		self:GetParent().Tab.ButCancel:SetEnabled( false )
+		self:GetParent().Tab.ButCancel:AlphaTo(0, 0)
 	end
 end
 
@@ -300,17 +320,25 @@ function PANEL:AddButton( plugin, cat, highlight )
 	local button = vgui.Create( "ToolMenuButton" )
 	button.title, button.category, button.submenu, button.submenutitle = plugin:Menu()
 
-	if ( button.category != cat ) then button:RemoveEx() return highlight end
+	if ( button.category.id != cat ) then button:RemoveEx() return highlight end
 
 	button.plugin = plugin
 	button.m_bAlt = highlight
+
+	if(button.submenu ~= nil)then
+		button:AddSubmenuIndicator()
+	end
+
 	button:SetText( button.title )
 
 	button.OnSelect = function()
 		self:OpenPluginMenu( plugin )
 	end
 
-	self.Categories[ button.category ].Container:AddItem( button )
+	if(self.Categories[ button.category.id ] ~= nil) then
+		self.Categories[ button.category.id ].Container:AddItem( button )
+	end
+
 	table.insert( self.Buttons, button )
 
 	return !highlight
@@ -341,40 +369,41 @@ function PANEL:CreatePluginsPage()
 	self.PluginContainer:SetPadding( 1 )
 	self.PluginContainer:SetSpacing( 1 )
 
-	local catNames = { "Administration", "Actions", "Punishment", "Teleportation" }
 	self.Categories = {}
-
-	for i = 1, 4 do
-		self.Categories[i] = vgui.Create( "DCollapsibleCategory", self.PluginContainer )
-		self.Categories[i]:SetTall( 22 )
-		self.Categories[i]:SetExpanded( 0 )
-		self.Categories[i]:SetLabel( catNames[i] )
-		self.Categories[i].Header.OnMousePressed = function()
-			for ii = 1, 4 do
-				if ( self.Categories[ii]:GetExpanded() ) then self.Categories[ii]:Toggle() end
+	for key,cat in pairs(evolve.category) do 
+		local categoryGui = vgui.Create( "DCollapsibleCategory", self.PluginContainer )
+		categoryGui:SetTall( 22 )
+		categoryGui:SetExpanded( 0 )
+		categoryGui:SetLabel( cat.label )
+		categoryGui.Header.OnMousePressed = function()
+			for _,cat in pairs(self.Categories) do
+				if ( cat:GetExpanded() ) then cat:Toggle() end
 			end
-			self.Categories[i]:SetExpanded( false )
-			self.Categories[i]:Toggle()
+			categoryGui:SetExpanded( false )
+			categoryGui:Toggle()
 		end
 
-		self.Categories[i].Container = vgui.Create( "DPanelList", self.Categories[i] )
-		self.Categories[i].Container:SetAutoSize( true )
-		self.Categories[i].Container:SetSpacing( 0 )
-		self.Categories[i].Container:EnableHorizontal( false )
-		self.Categories[i].Container:EnableVerticalScrollbar( true )
-		self.Categories[i]:SetContents( self.Categories[i].Container )
+		categoryGui.Container = vgui.Create( "DPanelList", categoryGui )
+		categoryGui.Container:SetAutoSize( true )
+		categoryGui.Container:SetSpacing( 0 )
+		categoryGui.Container:EnableHorizontal( false )
+		categoryGui.Container:EnableVerticalScrollbar( true )
+		categoryGui:SetContents( categoryGui.Container )
 
+		self.Categories[cat.id]=categoryGui
+		self.PluginContainer:AddItem( categoryGui )
+
 		local highlight = true
 		for _, v in pairs( evolve.plugins ) do
-			highlight = self:AddButton( v, i, highlight )
+			highlight = self:AddButton( v, cat.id, highlight )
 		end
-		
-		self.PluginContainer:AddItem( self.Categories[i] )
+
+
 	end
 
 	self:CreateSubmenu()
 
-	self.Categories[2].Header.OnMousePressed()
+	self.Categories[evolve.category.actions.id].Header.OnMousePressed()
 end
 
 derma.DefineControl( "EvolvePluginList", "Plugin list", PANEL, "DPanelList" )