diff --git a/LuaMenu/configs/gameConfig/zk/defaultSettings/MenuLoadscreens/loadscreen.png b/LuaMenu/configs/gameConfig/zk/defaultSettings/MenuLoadscreens/loadscreen.png index 5e81f297e..ac47a4c26 100644 Binary files a/LuaMenu/configs/gameConfig/zk/defaultSettings/MenuLoadscreens/loadscreen.png and b/LuaMenu/configs/gameConfig/zk/defaultSettings/MenuLoadscreens/loadscreen.png differ diff --git a/LuaMenu/configs/gameConfig/zk/helpSubmenuConfig.lua b/LuaMenu/configs/gameConfig/zk/helpSubmenuConfig.lua index db7caf4d6..aee915c89 100644 --- a/LuaMenu/configs/gameConfig/zk/helpSubmenuConfig.lua +++ b/LuaMenu/configs/gameConfig/zk/helpSubmenuConfig.lua @@ -21,7 +21,7 @@ local function CreateLine(lineText, linkText, onClick) height = WG.BUTTON_HEIGHT, width = 110, caption = linkText, - classname = "action_button", + classname = "small_action_button", objectOverrideFont = WG.Chobby.Configuration:GetButtonFont(2), OnClick = { onClick @@ -208,11 +208,10 @@ local communityControl = Control:New { Button:New { right = 11, y = WG.TOP_BUTTON_Y, - width = 80, + width = WG.BUTTON_HEIGHT, height = WG.BUTTON_HEIGHT, - objectOverrideFont = WG.Chobby.Configuration:GetButtonFont(3), - caption = i18n("close"), - classname = "negative_button", + caption = "", + classname = "close_button", OnClick = { function() obj:Hide() @@ -275,11 +274,10 @@ local bugControl = Control:New { Button:New { right = 11, y = WG.TOP_BUTTON_Y, - width = 80, + width = WG.BUTTON_HEIGHT, height = WG.BUTTON_HEIGHT, - objectOverrideFont = Configuration:GetButtonFont(3), - caption = i18n("close"), - classname = "negative_button", + caption = "", + classname = "close_button", OnClick = { function() obj:Hide() diff --git a/LuaMenu/configs/gameConfig/zk/settingsMenu.lua b/LuaMenu/configs/gameConfig/zk/settingsMenu.lua index d3fd2dc5d..3ee1d07f6 100644 --- a/LuaMenu/configs/gameConfig/zk/settingsMenu.lua +++ b/LuaMenu/configs/gameConfig/zk/settingsMenu.lua @@ -257,7 +257,7 @@ local settingsConfig = { humanName = "Graphics Driver Selected: ", isLabelSetting = true, desc = Platform.gpuVendor, - size = 2, + size = 6, }, { name = "AntiAliasing", diff --git a/LuaMenu/configs/gameConfig/zk/skinning/background-2.kra b/LuaMenu/configs/gameConfig/zk/skinning/background-2.kra new file mode 100644 index 000000000..b180a9a6b Binary files /dev/null and b/LuaMenu/configs/gameConfig/zk/skinning/background-2.kra differ diff --git a/LuaMenu/configs/gameConfig/zk/skinning/background-autumn.jpg b/LuaMenu/configs/gameConfig/zk/skinning/background-autumn.jpg new file mode 100644 index 000000000..46f07dde6 Binary files /dev/null and b/LuaMenu/configs/gameConfig/zk/skinning/background-autumn.jpg differ diff --git a/LuaMenu/configs/gameConfig/zk/skinning/background.jpg b/LuaMenu/configs/gameConfig/zk/skinning/background.jpg index 81609b125..d35d725b9 100644 Binary files a/LuaMenu/configs/gameConfig/zk/skinning/background.jpg and b/LuaMenu/configs/gameConfig/zk/skinning/background.jpg differ diff --git a/LuaMenu/configs/gameConfig/zk/skinning/background.kra b/LuaMenu/configs/gameConfig/zk/skinning/background.kra new file mode 100644 index 000000000..d0a3bcb39 Binary files /dev/null and b/LuaMenu/configs/gameConfig/zk/skinning/background.kra differ diff --git a/LuaMenu/configs/gameConfig/zk/skinning/background_old.jpg b/LuaMenu/configs/gameConfig/zk/skinning/background_old.jpg new file mode 100644 index 000000000..81609b125 Binary files /dev/null and b/LuaMenu/configs/gameConfig/zk/skinning/background_old.jpg differ diff --git a/LuaMenu/configs/gameConfig/zk/skinning/headingLarge.kra b/LuaMenu/configs/gameConfig/zk/skinning/headingLarge.kra new file mode 100644 index 000000000..bf8ae1af8 Binary files /dev/null and b/LuaMenu/configs/gameConfig/zk/skinning/headingLarge.kra differ diff --git a/LuaMenu/configs/gameConfig/zk/skinning/headingLarge.png b/LuaMenu/configs/gameConfig/zk/skinning/headingLarge.png index dbed346bb..f935eac6c 100644 Binary files a/LuaMenu/configs/gameConfig/zk/skinning/headingLarge.png and b/LuaMenu/configs/gameConfig/zk/skinning/headingLarge.png differ diff --git a/LuaMenu/configs/gameConfig/zk/skinning/headingLarge_old.png b/LuaMenu/configs/gameConfig/zk/skinning/headingLarge_old.png new file mode 100644 index 000000000..dbed346bb Binary files /dev/null and b/LuaMenu/configs/gameConfig/zk/skinning/headingLarge_old.png differ diff --git a/LuaMenu/images/away.png b/LuaMenu/images/away.png index 516736afe..306302966 100644 Binary files a/LuaMenu/images/away.png and b/LuaMenu/images/away.png differ diff --git a/LuaMenu/images/away.psd b/LuaMenu/images/away.psd deleted file mode 100644 index ebe7eef2e..000000000 Binary files a/LuaMenu/images/away.psd and /dev/null differ diff --git a/LuaMenu/images/away.svg b/LuaMenu/images/away.svg new file mode 100644 index 000000000..f344fda24 --- /dev/null +++ b/LuaMenu/images/away.svg @@ -0,0 +1,87 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/LuaMenu/images/away_final.kra b/LuaMenu/images/away_final.kra new file mode 100644 index 000000000..0d02d7aaa Binary files /dev/null and b/LuaMenu/images/away_final.kra differ diff --git a/LuaMenu/images/battle.png b/LuaMenu/images/battle.png index 2ad3bb81a..73d1fa8fd 100644 Binary files a/LuaMenu/images/battle.png and b/LuaMenu/images/battle.png differ diff --git a/LuaMenu/images/battle.psd b/LuaMenu/images/battle.psd deleted file mode 100644 index 082fa6ea6..000000000 Binary files a/LuaMenu/images/battle.psd and /dev/null differ diff --git a/LuaMenu/images/battle.svg b/LuaMenu/images/battle.svg new file mode 100644 index 000000000..168ebaf3f --- /dev/null +++ b/LuaMenu/images/battle.svg @@ -0,0 +1,83 @@ + + + + + + + + + + + + + + + + + + diff --git a/LuaMenu/images/battle_final.kra b/LuaMenu/images/battle_final.kra new file mode 100644 index 000000000..3eca58958 Binary files /dev/null and b/LuaMenu/images/battle_final.kra differ diff --git a/LuaMenu/images/bullet.png b/LuaMenu/images/bullet.png index 54ffde34e..f50a6d563 100644 Binary files a/LuaMenu/images/bullet.png and b/LuaMenu/images/bullet.png differ diff --git a/LuaMenu/images/bullet.svg b/LuaMenu/images/bullet.svg new file mode 100644 index 000000000..18d3b7970 --- /dev/null +++ b/LuaMenu/images/bullet.svg @@ -0,0 +1,53 @@ + + + + + + + + + + diff --git a/LuaMenu/images/bullet_final.kra b/LuaMenu/images/bullet_final.kra new file mode 100644 index 000000000..0d81ec20b Binary files /dev/null and b/LuaMenu/images/bullet_final.kra differ diff --git a/LuaMenu/images/clock.png b/LuaMenu/images/clock.png index db1facf44..e857295d3 100644 Binary files a/LuaMenu/images/clock.png and b/LuaMenu/images/clock.png differ diff --git a/LuaMenu/images/clock.svg b/LuaMenu/images/clock.svg new file mode 100644 index 000000000..332e8c5e0 --- /dev/null +++ b/LuaMenu/images/clock.svg @@ -0,0 +1,74 @@ + + + + + + + + + + + + + + + + diff --git a/LuaMenu/images/clock_final.kra b/LuaMenu/images/clock_final.kra new file mode 100644 index 000000000..25027badf Binary files /dev/null and b/LuaMenu/images/clock_final.kra differ diff --git a/LuaMenu/images/connecting.png b/LuaMenu/images/connecting.png index 7a1afe37d..e0f5672bc 100644 Binary files a/LuaMenu/images/connecting.png and b/LuaMenu/images/connecting.png differ diff --git a/LuaMenu/images/connecting.svg b/LuaMenu/images/connecting.svg new file mode 100644 index 000000000..33fea402e --- /dev/null +++ b/LuaMenu/images/connecting.svg @@ -0,0 +1,76 @@ + + + + + + + + + + + + + + + + diff --git a/LuaMenu/images/connecting_final.kra b/LuaMenu/images/connecting_final.kra new file mode 100644 index 000000000..a9a8244ab Binary files /dev/null and b/LuaMenu/images/connecting_final.kra differ diff --git a/LuaMenu/images/download.png b/LuaMenu/images/download.png index 16cdd462c..c98c7112a 100644 Binary files a/LuaMenu/images/download.png and b/LuaMenu/images/download.png differ diff --git a/LuaMenu/images/download.svg b/LuaMenu/images/download.svg new file mode 100644 index 000000000..4e47cb23b --- /dev/null +++ b/LuaMenu/images/download.svg @@ -0,0 +1,75 @@ + + + + + + + + + + + + + + + + diff --git a/LuaMenu/images/download_final.kra b/LuaMenu/images/download_final.kra new file mode 100644 index 000000000..fbd47cbec Binary files /dev/null and b/LuaMenu/images/download_final.kra differ diff --git a/LuaMenu/images/ingame.png b/LuaMenu/images/ingame.png index 8e67dd669..1f30016f5 100644 Binary files a/LuaMenu/images/ingame.png and b/LuaMenu/images/ingame.png differ diff --git a/LuaMenu/images/ingame.svg b/LuaMenu/images/ingame.svg new file mode 100644 index 000000000..7111b8cee --- /dev/null +++ b/LuaMenu/images/ingame.svg @@ -0,0 +1,83 @@ + + + + + + + + + + + + + + + + + + diff --git a/LuaMenu/images/ingame_final.kra b/LuaMenu/images/ingame_final.kra new file mode 100644 index 000000000..c2fb50a5e Binary files /dev/null and b/LuaMenu/images/ingame_final.kra differ diff --git a/LuaMenu/images/license.txt b/LuaMenu/images/license.txt new file mode 100644 index 000000000..2cbc6896a --- /dev/null +++ b/LuaMenu/images/license.txt @@ -0,0 +1,20 @@ +The following icons along with their respective Krita (.kra) and SVG (.svg) sources were authored by cabinboy (CC-BY-SA): + +away.png +battle.png +bullet.png +clock.png +connecting.png +download.png +ingame.png +link.png +nicecircle.png +offline.png +online.png +partyInvite.png +playing.png +ready.png +runningBattle.png +spectating.png +top-background.png +unready.png diff --git a/LuaMenu/images/link.png b/LuaMenu/images/link.png index 5fd6fa605..dac083539 100644 Binary files a/LuaMenu/images/link.png and b/LuaMenu/images/link.png differ diff --git a/LuaMenu/images/link.svg b/LuaMenu/images/link.svg new file mode 100644 index 000000000..dc717dd0f --- /dev/null +++ b/LuaMenu/images/link.svg @@ -0,0 +1,81 @@ + + + + + + + + + + + + + + + + + + diff --git a/LuaMenu/images/link_final.kra b/LuaMenu/images/link_final.kra new file mode 100644 index 000000000..4a8307b65 Binary files /dev/null and b/LuaMenu/images/link_final.kra differ diff --git a/LuaMenu/images/lock.png b/LuaMenu/images/lock.png deleted file mode 100644 index 9eed45d5b..000000000 Binary files a/LuaMenu/images/lock.png and /dev/null differ diff --git a/LuaMenu/images/nicecircle.kra b/LuaMenu/images/nicecircle.kra new file mode 100644 index 000000000..d382ab4ad Binary files /dev/null and b/LuaMenu/images/nicecircle.kra differ diff --git a/LuaMenu/images/nicecircle.png b/LuaMenu/images/nicecircle.png index 244e4b105..673af83e6 100644 Binary files a/LuaMenu/images/nicecircle.png and b/LuaMenu/images/nicecircle.png differ diff --git a/LuaMenu/images/offline.png b/LuaMenu/images/offline.png index 213142d08..b2f8532ba 100644 Binary files a/LuaMenu/images/offline.png and b/LuaMenu/images/offline.png differ diff --git a/LuaMenu/images/offline.svg b/LuaMenu/images/offline.svg new file mode 100644 index 000000000..370f971c3 --- /dev/null +++ b/LuaMenu/images/offline.svg @@ -0,0 +1,76 @@ + + + + + + + + + + + + + + + + diff --git a/LuaMenu/images/offline_final.kra b/LuaMenu/images/offline_final.kra new file mode 100644 index 000000000..c51c92bf3 Binary files /dev/null and b/LuaMenu/images/offline_final.kra differ diff --git a/LuaMenu/images/online.png b/LuaMenu/images/online.png index 652fd5120..ab30c7d57 100644 Binary files a/LuaMenu/images/online.png and b/LuaMenu/images/online.png differ diff --git a/LuaMenu/images/online.svg b/LuaMenu/images/online.svg new file mode 100644 index 000000000..f43bf4003 --- /dev/null +++ b/LuaMenu/images/online.svg @@ -0,0 +1,76 @@ + + + + + + + + + + + + + + + + diff --git a/LuaMenu/images/online_final.kra b/LuaMenu/images/online_final.kra new file mode 100644 index 000000000..52eb0a411 Binary files /dev/null and b/LuaMenu/images/online_final.kra differ diff --git a/LuaMenu/images/partyInvite.png b/LuaMenu/images/partyInvite.png index eca0cdc05..c69b74059 100644 Binary files a/LuaMenu/images/partyInvite.png and b/LuaMenu/images/partyInvite.png differ diff --git a/LuaMenu/images/partyInvite.svg b/LuaMenu/images/partyInvite.svg new file mode 100644 index 000000000..102fc7f04 --- /dev/null +++ b/LuaMenu/images/partyInvite.svg @@ -0,0 +1,75 @@ + + + + + + + + + + + + + + + + diff --git a/LuaMenu/images/partyInvite2.png b/LuaMenu/images/partyInvite2.png deleted file mode 100644 index 876a2ef55..000000000 Binary files a/LuaMenu/images/partyInvite2.png and /dev/null differ diff --git a/LuaMenu/images/partyInvite3.png b/LuaMenu/images/partyInvite3.png deleted file mode 100644 index 04564d832..000000000 Binary files a/LuaMenu/images/partyInvite3.png and /dev/null differ diff --git a/LuaMenu/images/partyInvite4.png b/LuaMenu/images/partyInvite4.png deleted file mode 100644 index b20b4d214..000000000 Binary files a/LuaMenu/images/partyInvite4.png and /dev/null differ diff --git a/LuaMenu/images/partyInvite5.png b/LuaMenu/images/partyInvite5.png deleted file mode 100644 index 68342f379..000000000 Binary files a/LuaMenu/images/partyInvite5.png and /dev/null differ diff --git a/LuaMenu/images/partyInvite_final.kra b/LuaMenu/images/partyInvite_final.kra new file mode 100644 index 000000000..e78a18fc7 Binary files /dev/null and b/LuaMenu/images/partyInvite_final.kra differ diff --git a/LuaMenu/images/playing-state.svg b/LuaMenu/images/playing-state.svg deleted file mode 100644 index 89f07e4e2..000000000 --- a/LuaMenu/images/playing-state.svg +++ /dev/null @@ -1,92 +0,0 @@ - - - - - - - - - - image/svg+xml - - - - - - - - - - - diff --git a/LuaMenu/images/playing.png b/LuaMenu/images/playing.png index 652fd5120..17a8ee3a4 100644 Binary files a/LuaMenu/images/playing.png and b/LuaMenu/images/playing.png differ diff --git a/LuaMenu/images/playing.svg b/LuaMenu/images/playing.svg new file mode 100644 index 000000000..cc4af9eba --- /dev/null +++ b/LuaMenu/images/playing.svg @@ -0,0 +1,76 @@ + + + + + + + + + + + + + + + + diff --git a/LuaMenu/images/playing_final.kra b/LuaMenu/images/playing_final.kra new file mode 100644 index 000000000..ab88e3796 Binary files /dev/null and b/LuaMenu/images/playing_final.kra differ diff --git a/LuaMenu/images/ranks/friend.png b/LuaMenu/images/ranks/friend.png index 3f41d128a..9b0ba86a0 100644 Binary files a/LuaMenu/images/ranks/friend.png and b/LuaMenu/images/ranks/friend.png differ diff --git a/LuaMenu/images/ranks/friend.svg b/LuaMenu/images/ranks/friend.svg new file mode 100644 index 000000000..69e838a5c --- /dev/null +++ b/LuaMenu/images/ranks/friend.svg @@ -0,0 +1,82 @@ + + + + + + + + + + + + + + + + + + + diff --git a/LuaMenu/images/ranks/friend_final.kra b/LuaMenu/images/ranks/friend_final.kra new file mode 100644 index 000000000..81febf585 Binary files /dev/null and b/LuaMenu/images/ranks/friend_final.kra differ diff --git a/LuaMenu/images/ranks/license.txt b/LuaMenu/images/ranks/license.txt new file mode 100644 index 000000000..c7625264f --- /dev/null +++ b/LuaMenu/images/ranks/license.txt @@ -0,0 +1,7 @@ +The following icons along with their respective Krita (.kra) and SVG (.svg) sources were authored by cabinboy (CC-BY-SA): + +friend.png +noChat.png +robot.png + +player.png is a vectorization of armcommander.dds included in the main Zero-K repository. diff --git a/LuaMenu/images/ranks/noChat.kra b/LuaMenu/images/ranks/noChat.kra new file mode 100644 index 000000000..ae0b8c245 Binary files /dev/null and b/LuaMenu/images/ranks/noChat.kra differ diff --git a/LuaMenu/images/ranks/noChat.png b/LuaMenu/images/ranks/noChat.png index 65a784939..391d1aea5 100644 Binary files a/LuaMenu/images/ranks/noChat.png and b/LuaMenu/images/ranks/noChat.png differ diff --git a/LuaMenu/images/ranks/noChat_base.svg b/LuaMenu/images/ranks/noChat_base.svg new file mode 100644 index 000000000..093b314dd --- /dev/null +++ b/LuaMenu/images/ranks/noChat_base.svg @@ -0,0 +1,72 @@ + + + + + + + + + + + + + + + + diff --git a/LuaMenu/images/ranks/player.png b/LuaMenu/images/ranks/player.png index 2f3e4017f..ec7f77044 100644 Binary files a/LuaMenu/images/ranks/player.png and b/LuaMenu/images/ranks/player.png differ diff --git a/LuaMenu/images/ranks/player.psd b/LuaMenu/images/ranks/player.psd deleted file mode 100644 index ad225408e..000000000 Binary files a/LuaMenu/images/ranks/player.psd and /dev/null differ diff --git a/LuaMenu/images/ranks/player.svg b/LuaMenu/images/ranks/player.svg new file mode 100644 index 000000000..816616b35 --- /dev/null +++ b/LuaMenu/images/ranks/player.svg @@ -0,0 +1,68 @@ + + + + diff --git a/LuaMenu/images/ranks/player_bitmap.svg b/LuaMenu/images/ranks/player_bitmap.svg new file mode 100644 index 000000000..09dfd3c77 --- /dev/null +++ b/LuaMenu/images/ranks/player_bitmap.svg @@ -0,0 +1,48 @@ + + + + diff --git a/LuaMenu/images/ranks/player_final.kra b/LuaMenu/images/ranks/player_final.kra new file mode 100644 index 000000000..55f1d390a Binary files /dev/null and b/LuaMenu/images/ranks/player_final.kra differ diff --git a/LuaMenu/images/ranks/robot.png b/LuaMenu/images/ranks/robot.png index 1a22f401f..38ef40677 100644 Binary files a/LuaMenu/images/ranks/robot.png and b/LuaMenu/images/ranks/robot.png differ diff --git a/LuaMenu/images/ranks/robot.psd b/LuaMenu/images/ranks/robot.psd deleted file mode 100644 index 4beb75f8c..000000000 Binary files a/LuaMenu/images/ranks/robot.psd and /dev/null differ diff --git a/LuaMenu/images/ranks/robot.svg b/LuaMenu/images/ranks/robot.svg new file mode 100644 index 000000000..7f9a0697d --- /dev/null +++ b/LuaMenu/images/ranks/robot.svg @@ -0,0 +1,74 @@ + + + + + + + + + + + + + + + + diff --git a/LuaMenu/images/ranks/robot_final.kra b/LuaMenu/images/ranks/robot_final.kra new file mode 100644 index 000000000..afd4bef4f Binary files /dev/null and b/LuaMenu/images/ranks/robot_final.kra differ diff --git a/LuaMenu/images/ready.png b/LuaMenu/images/ready.png index 89ef7da4b..a8981e5f4 100644 Binary files a/LuaMenu/images/ready.png and b/LuaMenu/images/ready.png differ diff --git a/LuaMenu/images/ready.psd b/LuaMenu/images/ready.psd deleted file mode 100644 index aaa2d42c2..000000000 Binary files a/LuaMenu/images/ready.psd and /dev/null differ diff --git a/LuaMenu/images/ready.svg b/LuaMenu/images/ready.svg new file mode 100644 index 000000000..4be17ef40 --- /dev/null +++ b/LuaMenu/images/ready.svg @@ -0,0 +1,75 @@ + + + + + + + + + + + + + + + + diff --git a/LuaMenu/images/ready_final.kra b/LuaMenu/images/ready_final.kra new file mode 100644 index 000000000..78416ade4 Binary files /dev/null and b/LuaMenu/images/ready_final.kra differ diff --git a/LuaMenu/images/runningBattle.png b/LuaMenu/images/runningBattle.png index 49d54509a..d2b3a2d48 100644 Binary files a/LuaMenu/images/runningBattle.png and b/LuaMenu/images/runningBattle.png differ diff --git a/LuaMenu/images/runningBattle.svg b/LuaMenu/images/runningBattle.svg new file mode 100644 index 000000000..082464f70 --- /dev/null +++ b/LuaMenu/images/runningBattle.svg @@ -0,0 +1,83 @@ + + + + + + + + + + + + + + + + + + diff --git a/LuaMenu/images/runningBattle_final.kra b/LuaMenu/images/runningBattle_final.kra new file mode 100644 index 000000000..e9f3fe8a9 Binary files /dev/null and b/LuaMenu/images/runningBattle_final.kra differ diff --git a/LuaMenu/images/spectating.png b/LuaMenu/images/spectating.png index 712dbd667..979bd9362 100644 Binary files a/LuaMenu/images/spectating.png and b/LuaMenu/images/spectating.png differ diff --git a/LuaMenu/images/spectating.svg b/LuaMenu/images/spectating.svg new file mode 100644 index 000000000..50fe0a7f2 --- /dev/null +++ b/LuaMenu/images/spectating.svg @@ -0,0 +1,76 @@ + + + + + + + + + + + + + + + + diff --git a/LuaMenu/images/spectating_final.kra b/LuaMenu/images/spectating_final.kra new file mode 100644 index 000000000..77366c3a5 Binary files /dev/null and b/LuaMenu/images/spectating_final.kra differ diff --git a/LuaMenu/images/top-background.kra b/LuaMenu/images/top-background.kra new file mode 100644 index 000000000..335fa1c02 Binary files /dev/null and b/LuaMenu/images/top-background.kra differ diff --git a/LuaMenu/images/top-background.png b/LuaMenu/images/top-background.png index 1d98ece24..300688e0e 100644 Binary files a/LuaMenu/images/top-background.png and b/LuaMenu/images/top-background.png differ diff --git a/LuaMenu/images/unready.png b/LuaMenu/images/unready.png index dea42c256..e9354ef51 100644 Binary files a/LuaMenu/images/unready.png and b/LuaMenu/images/unready.png differ diff --git a/LuaMenu/images/unready.svg b/LuaMenu/images/unready.svg new file mode 100644 index 000000000..f19162276 --- /dev/null +++ b/LuaMenu/images/unready.svg @@ -0,0 +1,75 @@ + + + + + + + + + + + + + + + + diff --git a/LuaMenu/images/unready_final.kra b/LuaMenu/images/unready_final.kra new file mode 100644 index 000000000..9b2cbc625 Binary files /dev/null and b/LuaMenu/images/unready_final.kra differ diff --git a/LuaMenu/widgets/api_chili.lua b/LuaMenu/widgets/api_chili.lua index 51f4c4b94..129930b2a 100644 --- a/LuaMenu/widgets/api_chili.lua +++ b/LuaMenu/widgets/api_chili.lua @@ -112,7 +112,16 @@ function widget:DrawScreen() local vsx,vsy = gl.GetViewSizes() gl.Color(1,1,1,loadFade) gl.Texture(loadTex) - gl.TexRect(0,0,vsx,vsy) + + -- assume loadscreen is 16:9 + if (16.0 * vsy < 9.0 * vsx) then + local pad = (1.0 - (16 * vsy) / (9.0 * vsx) ) * 0.5 + gl.TexRect(0,0,vsx,vsy,0, 1.0 - pad, 1.0, pad) + else + local pad = (1.0 - (9.0 * vsx) / (16 * vsy) ) * 0.5 + gl.TexRect(0,0,vsx,vsy,pad, 1.0, 1.0-pad, 0) + end + gl.Color(1,1,1,1) if not hideInterface then diff --git a/LuaMenu/widgets/api_user_handler.lua b/LuaMenu/widgets/api_user_handler.lua index e227dffea..e544972db 100644 --- a/LuaMenu/widgets/api_user_handler.lua +++ b/LuaMenu/widgets/api_user_handler.lua @@ -531,7 +531,7 @@ local function GetUserControls(userName, opts) x = 0, y = 0, right = 0, - height = height, + height = height + 3, -- + 3 or else the font shadow is cut off for tall strings backgroundColor = backgroundColor, borderColor = borderColor, padding = {0, 0, 0, 0}, @@ -687,7 +687,7 @@ local function GetUserControls(userName, opts) userControls.imCountry = Image:New { name = "imCountry", x = offset + 2, - y = offsetY + 4, + y = offsetY + 6, width = 16, height = 11, parent = userControls.mainControl, @@ -749,10 +749,12 @@ local function GetUserControls(userName, opts) if nameColor then userControls.tbName.font = Configuration:GetFont(2, colorIndex, {color = nameColor}) userControls.tbName:Invalidate() + userControls.tbName.font.shadow = true end if truncatedName then userControls.tbName:SetText(truncatedName) userControls.nameTruncated = true + userControls.tbName.font.shadow = true end userControls.nameActualLength = userControls.tbName.font:GetTextWidth(userControls.tbName.text) offset = offset + userControls.nameActualLength diff --git a/LuaMenu/widgets/chili/skins/Evolved/combobox_wnd.png b/LuaMenu/widgets/chili/skins/Evolved/combobox_wnd.png index a8ea8913c..947b837be 100644 Binary files a/LuaMenu/widgets/chili/skins/Evolved/combobox_wnd.png and b/LuaMenu/widgets/chili/skins/Evolved/combobox_wnd.png differ diff --git a/LuaMenu/widgets/chili/skins/Evolved/delete.svg b/LuaMenu/widgets/chili/skins/Evolved/delete.svg new file mode 100644 index 000000000..6c94bb726 --- /dev/null +++ b/LuaMenu/widgets/chili/skins/Evolved/delete.svg @@ -0,0 +1,84 @@ + + + + + + + + + + + + + + + + + + diff --git a/LuaMenu/widgets/chili/skins/Evolved/delete_bk.png b/LuaMenu/widgets/chili/skins/Evolved/delete_bk.png new file mode 100644 index 000000000..f557d8b28 Binary files /dev/null and b/LuaMenu/widgets/chili/skins/Evolved/delete_bk.png differ diff --git a/LuaMenu/widgets/chili/skins/Evolved/delete_fg.png b/LuaMenu/widgets/chili/skins/Evolved/delete_fg.png new file mode 100644 index 000000000..5eaffeb6e Binary files /dev/null and b/LuaMenu/widgets/chili/skins/Evolved/delete_fg.png differ diff --git a/LuaMenu/widgets/chili/skins/Evolved/delete_final.kra b/LuaMenu/widgets/chili/skins/Evolved/delete_final.kra new file mode 100644 index 000000000..90edca39b Binary files /dev/null and b/LuaMenu/widgets/chili/skins/Evolved/delete_final.kra differ diff --git a/LuaMenu/widgets/chili/skins/Evolved/editbox_border.png b/LuaMenu/widgets/chili/skins/Evolved/editbox_border.png index b72700a8c..26809939b 100644 Binary files a/LuaMenu/widgets/chili/skins/Evolved/editbox_border.png and b/LuaMenu/widgets/chili/skins/Evolved/editbox_border.png differ diff --git a/LuaMenu/widgets/chili/skins/Evolved/fonts/Geist-Regular.ttf b/LuaMenu/widgets/chili/skins/Evolved/fonts/Geist-Regular.ttf new file mode 100644 index 000000000..6fdfffa78 Binary files /dev/null and b/LuaMenu/widgets/chili/skins/Evolved/fonts/Geist-Regular.ttf differ diff --git a/LuaMenu/widgets/chili/skins/Evolved/fonts/OFL.txt b/LuaMenu/widgets/chili/skins/Evolved/fonts/OFL.txt new file mode 100644 index 000000000..61f6f4b78 --- /dev/null +++ b/LuaMenu/widgets/chili/skins/Evolved/fonts/OFL.txt @@ -0,0 +1,93 @@ +Copyright 2024 The Geist Project Authors (https://github.com/vercel/geist-font.git) + +This Font Software is licensed under the SIL Open Font License, Version 1.1. +This license is copied below, and is also available with a FAQ at: +https://openfontlicense.org + + +----------------------------------------------------------- +SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007 +----------------------------------------------------------- + +PREAMBLE +The goals of the Open Font License (OFL) are to stimulate worldwide +development of collaborative font projects, to support the font creation +efforts of academic and linguistic communities, and to provide a free and +open framework in which fonts may be shared and improved in partnership +with others. + +The OFL allows the licensed fonts to be used, studied, modified and +redistributed freely as long as they are not sold by themselves. The +fonts, including any derivative works, can be bundled, embedded, +redistributed and/or sold with any software provided that any reserved +names are not used by derivative works. The fonts and derivatives, +however, cannot be released under any other type of license. The +requirement for fonts to remain under this license does not apply +to any document created using the fonts or their derivatives. + +DEFINITIONS +"Font Software" refers to the set of files released by the Copyright +Holder(s) under this license and clearly marked as such. This may +include source files, build scripts and documentation. + +"Reserved Font Name" refers to any names specified as such after the +copyright statement(s). + +"Original Version" refers to the collection of Font Software components as +distributed by the Copyright Holder(s). + +"Modified Version" refers to any derivative made by adding to, deleting, +or substituting -- in part or in whole -- any of the components of the +Original Version, by changing formats or by porting the Font Software to a +new environment. + +"Author" refers to any designer, engineer, programmer, technical +writer or other person who contributed to the Font Software. + +PERMISSION & CONDITIONS +Permission is hereby granted, free of charge, to any person obtaining +a copy of the Font Software, to use, study, copy, merge, embed, modify, +redistribute, and sell modified and unmodified copies of the Font +Software, subject to the following conditions: + +1) Neither the Font Software nor any of its individual components, +in Original or Modified Versions, may be sold by itself. + +2) Original or Modified Versions of the Font Software may be bundled, +redistributed and/or sold with any software, provided that each copy +contains the above copyright notice and this license. These can be +included either as stand-alone text files, human-readable headers or +in the appropriate machine-readable metadata fields within text or +binary files as long as those fields can be easily viewed by the user. + +3) No Modified Version of the Font Software may use the Reserved Font +Name(s) unless explicit written permission is granted by the corresponding +Copyright Holder. This restriction only applies to the primary font name as +presented to the users. + +4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font +Software shall not be used to promote, endorse or advertise any +Modified Version, except to acknowledge the contribution(s) of the +Copyright Holder(s) and the Author(s) or with their explicit written +permission. + +5) The Font Software, modified or unmodified, in part or in whole, +must be distributed entirely under this license, and must not be +distributed under any other license. The requirement for fonts to +remain under this license does not apply to any document created +using the Font Software. + +TERMINATION +This license becomes null and void if any of the above conditions are +not met. + +DISCLAIMER +THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT +OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE +COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL +DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM +OTHER DEALINGS IN THE FONT SOFTWARE. \ No newline at end of file diff --git a/LuaMenu/widgets/chili/skins/Evolved/fonts/README b/LuaMenu/widgets/chili/skins/Evolved/fonts/README deleted file mode 100644 index 15603deac..000000000 --- a/LuaMenu/widgets/chili/skins/Evolved/fonts/README +++ /dev/null @@ -1,7 +0,0 @@ - -The included font "Nimbus Sans L" with the filename "n019003l.pfb", -located next to this README, is retrieved from the Gentoo portage -(media-fonts/urw-fonts) including their modifications. -It is licensed under GPL with an addition as discribed in README.gentoo. - -Thanks to URW for releasing the font(s) under it. diff --git a/LuaMenu/widgets/chili/skins/Evolved/fonts/README.gentoo b/LuaMenu/widgets/chili/skins/Evolved/fonts/README.gentoo deleted file mode 100644 index e05577db9..000000000 --- a/LuaMenu/widgets/chili/skins/Evolved/fonts/README.gentoo +++ /dev/null @@ -1,51 +0,0 @@ -Cyrillized free URW fonts. - -These fonts were made from the free URW fonts distributed with ghostcript. -There are NO changes in the latin part of them (I hope). -Cyrillic glyphs were added by copying suitable latin ones -and painting oulines of unique cyrillic glyphs in same style as the others. -For all modification pfaedit was used. -The license for result is (of course) same as for original fonts, -i.e. GPL with an exception that you can put these fonts in your own non-GPLed -documents. (Looks like LGPL from my point of view =). - -The "sources" of these fonts in the native pfaedit format are available -at ftp://ftp.gnome.ru/fonts/sources - -The great font editor pfaedit is available at http://pfaedit.sf.net. -That page also includes some links to fonts created by -George Williams -- the author of pfaedit. - -Acknowledgements: -I would like to thank George Williams, the pfaedit's author and developer. -He is the most bug-reporter/feature-requester friendly developer -I ever saw in my not so short life. At some moment in the future -I must write a book about him: "George Williams and my best experience -in bug-reporting." George also greatly helped me bug-hunting these fonts, -explained to me some very important things about fonts and font design, -quickly adopted pfaedit to my needs (or pointed me to The Right Place in -documentation where I found better way of doing things). - -I would like to thank Alexey Novodvorsky (aka AEN), who -pointed me to pfaedit and George Williams' fonts, explained -The Task to me. He is also one of the main participators in the -development of Sysiphus -- free repository of free software. -I didn't loose my time for compiling/installing and supporting -my linux box coz I used the result of Sysiphus developers' works. - -I would like to thank Sergey Vlasov, who tested these fonts and reported -about bugs. Also he help me to make some bug-reports to George about -pfaedit bugs. - -I would like Dmitry 40in, who did big QA for some font outlines, drawn some glyphs, -and explain some The Truths for me. - -I would like to thank Vlad Harchev (aka hvv), who -proofread this text for me. - -Also I have to thank RMS for GPL and URW for releasing the fonts -under it. - -Thank you very much! -Valek Filippov frob@df.ru -(C)opyLeft 2001 \ No newline at end of file diff --git a/LuaMenu/widgets/chili/skins/Evolved/fonts/README.gentoo.tweaks b/LuaMenu/widgets/chili/skins/Evolved/fonts/README.gentoo.tweaks deleted file mode 100644 index 9fa761ac8..000000000 --- a/LuaMenu/widgets/chili/skins/Evolved/fonts/README.gentoo.tweaks +++ /dev/null @@ -1,38 +0,0 @@ -Nimbus Sans L Regular, Nimbus Mono L Regular, Nimbus Mono L Oblique -all come from a more recent version of the cyrillic URW fonts. - -The hints on Nimbus Sans Regular have been modified in the -following ways: - -25 June 2002 - - - Added ghost hint to the top of 4 to keep it from being - taller than the other digits. - - Reduced the width of the left stem hint for H to 83 - (probably no real differences) - - Changed the StemSnapV values from [78 85 94] to [78 83 92] - (and fixed up StdVW accordingly) - This corresponds to the values in the font (which are 83/93 - for lower case and upper case stems) better and makes - the width-88 stems on M and N snap to to upper case - widths not lower-case widths. - -29 June 2002 - - - Removed odd vertical stem hints (width of horizontal - stems) from f, F, t, E, yen sign, fi ligature, - fl ligature, AE ligature, R, Lstroke, OE ligature, - lstroke, E" variants, t, variants, Eth, Dstoke, etc. - - Fixed hints on 1 to be two ghost hints instead of one - hint the height of the font - - fix bottom stem of u to have integer coordinates - - fixed hints on | - - fixed hints on inverted exclamation mark - -The hints on Nimbus Mono L Oblique have been modified in the -following ways: - - - Removed vertical stem hints from horizontal serifs on - roman characters. - -Owen Taylor diff --git a/LuaMenu/widgets/chili/skins/Evolved/fonts/n019003l.pfb b/LuaMenu/widgets/chili/skins/Evolved/fonts/n019003l.pfb deleted file mode 100644 index c2a9e8610..000000000 Binary files a/LuaMenu/widgets/chili/skins/Evolved/fonts/n019003l.pfb and /dev/null differ diff --git a/LuaMenu/widgets/chili/skins/Evolved/glassBk.png b/LuaMenu/widgets/chili/skins/Evolved/glassBk.png deleted file mode 100644 index 085ceb481..000000000 Binary files a/LuaMenu/widgets/chili/skins/Evolved/glassBk.png and /dev/null differ diff --git a/LuaMenu/widgets/chili/skins/Evolved/glassFG.png b/LuaMenu/widgets/chili/skins/Evolved/glassFG.png deleted file mode 100644 index 3fd25571a..000000000 Binary files a/LuaMenu/widgets/chili/skins/Evolved/glassFG.png and /dev/null differ diff --git a/LuaMenu/widgets/chili/skins/Evolved/glow.kra b/LuaMenu/widgets/chili/skins/Evolved/glow.kra new file mode 100644 index 000000000..c663cd9ee Binary files /dev/null and b/LuaMenu/widgets/chili/skins/Evolved/glow.kra differ diff --git a/LuaMenu/widgets/chili/skins/Evolved/glow.png b/LuaMenu/widgets/chili/skins/Evolved/glow.png new file mode 100644 index 000000000..6f767e137 Binary files /dev/null and b/LuaMenu/widgets/chili/skins/Evolved/glow.png differ diff --git a/LuaMenu/widgets/chili/skins/Evolved/panel2.png b/LuaMenu/widgets/chili/skins/Evolved/panel2.png index 1e3eeb70e..c262238d9 100644 Binary files a/LuaMenu/widgets/chili/skins/Evolved/panel2.png and b/LuaMenu/widgets/chili/skins/Evolved/panel2.png differ diff --git a/LuaMenu/widgets/chili/skins/Evolved/panel2_bg.png b/LuaMenu/widgets/chili/skins/Evolved/panel2_bg.png index fbc92dd9c..33aa5229b 100644 Binary files a/LuaMenu/widgets/chili/skins/Evolved/panel2_bg.png and b/LuaMenu/widgets/chili/skins/Evolved/panel2_bg.png differ diff --git a/LuaMenu/widgets/chili/skins/Evolved/panel2_border.png b/LuaMenu/widgets/chili/skins/Evolved/panel2_border.png index abbaa2b00..26809939b 100644 Binary files a/LuaMenu/widgets/chili/skins/Evolved/panel2_border.png and b/LuaMenu/widgets/chili/skins/Evolved/panel2_border.png differ diff --git a/LuaMenu/widgets/chili/skins/Evolved/panel2_border_v2.kra b/LuaMenu/widgets/chili/skins/Evolved/panel2_border_v2.kra new file mode 100644 index 000000000..71515f0bc Binary files /dev/null and b/LuaMenu/widgets/chili/skins/Evolved/panel2_border_v2.kra differ diff --git a/LuaMenu/widgets/chili/skins/Evolved/panel2_border_v2.png b/LuaMenu/widgets/chili/skins/Evolved/panel2_border_v2.png new file mode 100644 index 000000000..332d38752 Binary files /dev/null and b/LuaMenu/widgets/chili/skins/Evolved/panel2_border_v2.png differ diff --git a/LuaMenu/widgets/chili/skins/Evolved/skin.lua b/LuaMenu/widgets/chili/skins/Evolved/skin.lua index 45d8a2a42..0b588cd0e 100644 --- a/LuaMenu/widgets/chili/skins/Evolved/skin.lua +++ b/LuaMenu/widgets/chili/skins/Evolved/skin.lua @@ -17,7 +17,7 @@ skin.general = { borderColor = {1.0, 1.0, 1.0, 1.0}, font = { - font = SKINDIR .. "fonts/n019003l.pfb", + font = SKINDIR .. "fonts/Geist-Regular.ttf", color = {1,1,1,1}, outlineColor = {0.05,0.05,0.05,0.9}, outline = false, @@ -34,14 +34,40 @@ skin.icons = { } skin.button = { - TileImageBK = ":cl:tech_button_small_square_bk.png", - TileImageFG = ":cl:tech_button_small_square_fg.png", - tiles = {20, 14, 20, 14}, --// tile widths: left,top,right,bottom + TileImageBK = ":cl:tech_button_small_square_bk_default_v5.png", + TileImageFG = ":cl:tech_button_small_square_fg_default_v5.png", + tiles = {5, 5, 5, 5}, --// tile widths: left,top,right,bottom padding = {10, 10, 10, 10}, + + backgroundColor = {1,1,1, 1}, + focusColor = {1, 1, 1, 1}, + borderColor = {1, 1, 1, 0}, - backgroundColor = {0.04, 0.3, 0.55, 0.84}, - focusColor = {0.94, 0.50, 0.23, 0.72}, - borderColor = {1,1,1,0}, + DrawControl = DrawButton, +} + +skin.glow = { + TileImageBK = ":cl:empty.png", + TileImageFG = ":cl:glow.png", + tiles = {5, 5, 5, 5}, --// tile widths: left,top,right,bottom + padding = {10, 10, 10, 10}, + + backgroundColor = {1,1,1, 1}, + focusColor = {1, 1, 1, 1}, + borderColor = {0.17, 0.16, 0.20, 0.0}, + + DrawControl = DrawButton, +} + +skin.empty = { + TileImageBK = ":cl:empty.png", + TileImageFG = ":cl:empty.png", + tiles = {5, 5, 5, 5}, --// tile widths: left,top,right,bottom + padding = {10, 10, 10, 10}, + + backgroundColor = {1,1,1, 1}, + focusColor = {1, 1, 1, 1}, + borderColor = {0.17, 0.16, 0.20, 0.0}, DrawControl = DrawButton, } @@ -73,14 +99,14 @@ skin.button_large = { } skin.button_highlight = { - TileImageBK = ":cl:tech_button_bright_small_bk.png", - TileImageFG = ":cl:tech_button_bright_small_fg.png", - tiles = {20, 14, 20, 14}, --// tile widths: left,top,right,bottom + TileImageBK = ":cl:tech_button_bright_small_blue_bk_v2.png", + TileImageFG = ":cl:tech_button_bright_small_blue_fg_v2.png", + tiles = {3, 3, 3, 3}, --// tile widths: left,top,right,bottom padding = {10, 10, 10, 10}, - backgroundColor = {0.2, 0.25, 0.35, 0.7}, - focusColor = {0.3, 0.375, 0.525, 0.5}, - borderColor = {1,1,1,0}, + backgroundColor = {1, 1, 1, .5}, + focusColor = {1, 1, 1, 1}, + borderColor = {1,1,1,.3}, DrawControl = DrawButton, } @@ -113,53 +139,162 @@ skin.button_planet = { } skin.action_button = { - TileImageBK = ":cl:tech_button_bright_small_bk.png", - TileImageFG = ":cl:tech_button_bright_small_fg.png", - tiles = {20, 14, 20, 14}, --// tile widths: left,top,right,bottom + TileImageBK = ":cl:tech_button_bright_small_orange_bk_v2.png", + TileImageFG = ":cl:tech_button_bright_small_orange_fg_v2.png", + tiles = {3, 3, 3, 3}, --// tile widths: left,top,right,bottom + padding = {10, 10, 10, 10}, + + backgroundColor = {1,1,1, 1}, + focusColor = {1,1,1, 1.0}, + borderColor = {247/255, 114/255, 42/255, 0.0}, + + + DrawControl = DrawButton, +} + +skin.small_action_button = { + TileImageBK = ":cl:tech_button_flair_orange_bk.png", + TileImageFG = ":cl:tech_button_flair_orange_fg.png", + tiles = {4, 4, 4, 4}, --// tile widths: left,top,right,bottom + padding = {10, 10, 10, 10}, + + backgroundColor = {1,1,1, 1}, + focusColor = {1,1,1, 1.0}, + borderColor = {247/255, 114/255, 42/255, 0.0}, + + + DrawControl = DrawButton, +} + +skin.simple_action_button = { + TileImageBK = ":cl:tech_button_bright_small_orange_simple.png", + TileImageFG = ":cl:tech_button_bright_small_orange_simple.png", + tiles = {4, 4, 4, 4}, --// tile widths: left,top,right,bottom padding = {10, 10, 10, 10}, + + backgroundColor = {1,1,1, 1}, + focusColor = {1,1,1, 1.0}, + borderColor = {247/255, 114/255, 42/255, 0.0}, + + + DrawControl = DrawButton, +} - backgroundColor = {0.98, 0.48, 0.26, 0.65}, - focusColor = {0.98, 0.48, 0.26, 0.9}, - borderColor = {0.98, 0.48, 0.26, 0.15}, + +skin.delete_button = { + TileImageBK = ":cl:delete_bk.png", + TileImageFG = ":cl:delete_fg.png", + tiles = {4, 4, 4, 4}, --// tile widths: left,top,right,bottom + padding = {10, 10, 10, 10}, + + backgroundColor = {1,1,1, 1}, + focusColor = {1,1,1, 1.0}, + borderColor = {247/255, 114/255, 42/255, 0.0}, + DrawControl = DrawButton, } skin.option_button = { - TileImageBK = ":cl:tech_button_bright_small_bk.png", - TileImageFG = ":cl:tech_button_bright_small_fg.png", - tiles = {20, 14, 20, 14}, --// tile widths: left,top,right,bottom + TileImageBK = ":cl:tech_button_bright_small_blue_bk_v2.png", + TileImageFG = ":cl:tech_button_bright_small_blue_fg_v2.png", + tiles = {3, 3, 3, 3}, --// tile widths: left,top,right,bottom + padding = {10, 10, 10, 10}, + + backgroundColor = {1,1,1, 1.0}, + focusColor = {1,1,1, 1.0}, + borderColor = {0.15, 0.46, 0.72, 0.0}, + + DrawControl = DrawButton, +} + +skin.link_button = { + TileImageBK = ":cl:tech_button_small_square_bk_default_v5.png", + TileImageFG = ":cl:tech_button_small_square_fg_default_v5.png", + tiles = {5, 5, 5, 5}, --// tile widths: left,top,right,bottom padding = {10, 10, 10, 10}, - backgroundColor = {0.21, 0.53, 0.60, 0.65}, - focusColor = {0.21, 0.53, 0.60, 0.9}, - borderColor = {0.21, 0.53, 0.60, 0.15}, + backgroundColor = {1, 1, 1, 1}, + focusColor = {1, 1, 1, 1.0}, + borderColor = {0.15, 0.46, 0.72, 0.0}, DrawControl = DrawButton, } skin.negative_button = { - TileImageBK = ":cl:tech_button_bright_small_bk.png", - TileImageFG = ":cl:tech_button_bright_small_fg.png", - tiles = {20, 14, 20, 14}, --// tile widths: left,top,right,bottom + TileImageBK = ":cl:tech_button_bright_small_blue_bk_v2.png", + TileImageFG = ":cl:tech_button_bright_small_blue_fg_v2.png", + tiles = {3, 3, 3, 3}, --// tile widths: left,top,right,bottom padding = {10, 10, 10, 10}, - backgroundColor = {0.85, 0.05, 0.25, 0.65}, - focusColor = {0.85, 0.05, 0.25, 0.9}, - borderColor = {0.85, 0.05, 0.25, 0.15}, + backgroundColor = {1,1,1, 1}, + focusColor = {1,1,1, 1}, + borderColor = {0.85, 0.05, 0.20, 0.0}, DrawControl = DrawButton, } -skin.positive_button = { - TileImageBK = ":cl:tech_button_bright_small_bk.png", - TileImageFG = ":cl:tech_button_bright_small_fg.png", - tiles = {20, 14, 20, 14}, --// tile widths: left,top,right,bottom +skin.close_button = { + TileImageBK = ":cl:x.png", + TileImageFG = ":cl:x.png", + tiles = {3, 3, 3, 3}, --// tile widths: left,top,right,bottom + padding = {10, 10, 10, 10}, + + backgroundColor = {1,1,1, .75}, + focusColor = {1,1,1, 1}, + borderColor = {0.85, 0.05, 0.20, 0.0}, + + DrawControl = DrawButton, +} + +skin.close_button_alt = { + TileImageBK = ":cl:x_2.png", + TileImageFG = ":cl:x_2.png", + tiles = {3, 3, 3, 3}, --// tile widths: left,top,right,bottom + padding = {10, 10, 10, 10}, + + backgroundColor = {1,1,1, .75}, + focusColor = {1,1,1, 1}, + borderColor = {0.85, 0.05, 0.20, 0.0}, + + DrawControl = DrawButton, +} + +skin.yes_button = { + TileImageBK = ":cl:tech_button_yes_bk.png", + TileImageFG = ":cl:tech_button_yes_fg.png", + tiles = {3, 3, 3, 3}, --// tile widths: left,top,right,bottom + padding = {10, 10, 10, 10}, + + backgroundColor = {1,1,1,1}, + focusColor = {1,1,1,1}, + borderColor = {1, 1, 1, 0.0}, + + DrawControl = DrawButton, +} + +skin.no_button = { + TileImageBK = ":cl:tech_button_no_bk.png", + TileImageFG = ":cl:tech_button_no_fg.png", + tiles = {3, 3, 3, 3}, --// tile widths: left,top,right,bottom + padding = {10, 10, 10, 10}, + + backgroundColor = {1,1,1,1}, + focusColor = {1,1,1,1}, + borderColor = {1, 1, 1, 0.0}, + + DrawControl = DrawButton, +} + +skin.battle_default_button = { --Blue + TileImageBK = ":cl:tech_button_bk.png", + TileImageFG = ":cl:tech_button_bright_small_fg2.png", + tiles = {20, 20, 20, 20}, --// tile widths: left,top,right,bottom padding = {10, 10, 10, 10}, - backgroundColor = {0.05, 0.85, 0.25, 0.65}, - focusColor = {0.05, 0.85, 0.25, 0.9}, - borderColor = {0.05, 0.85, 0.25, 0.15}, + backgroundColor = {0.10, 0.10, 0.1, 0.65}, + focusColor = {1.0, 1.0, 1.0, 0.1}, -- color when focused + borderColor = {0.1, 0.1, 0.1, 0.05}, DrawControl = DrawButton, } @@ -220,7 +355,7 @@ skin.editbox = { hintFont = table.merge({color = {1,1,1,0.7}}, skin.general.font), backgroundColor = {0.1, 0.1, 0.1, 0}, - cursorColor = {1.0, 0.7, 0.1, 0.8}, + cursorColor = {0.94, 0.50, 0.23, 1}, focusColor = {1, 1, 1, 1}, borderColor = {1, 1, 1, 0.6}, @@ -239,7 +374,7 @@ skin.textbox = { TileImageBK = ":cl:panel2_bg.png", bkgndtiles = {14,14,14,14}, - TileImageFG = ":cl:panel2_border.png", + TileImageFG = ":cl:panel2_border_v2.png", tiles = {2, 2, 2, 2}, borderColor = {0.0, 0.0, 0.0, 0.0}, @@ -266,17 +401,6 @@ skin.imagelistview = { DrawItemBackground = DrawItemBkGnd, } ---[[ -skin.imagelistviewitem = { - imageFG = ":cl:glassFG.png", - imageBK = ":cl:glassBK.png", - tiles = {17,15,17,20}, - - padding = {12, 12, 12, 12}, - - DrawSelectionItemBkGnd = DrawSelectionItemBkGnd, -} ---]] skin.panel = { TileImageBK = ":cl:tech_button.png", @@ -306,39 +430,49 @@ skin.overlay_panel = { DrawControl = DrawPanel, } +skin.queue_popup = { -- similar to skin.button, but as a panel + TileImageBK = ":cl:tech_overlaywindow_large_dark.png", + TileImageFG = ":cl:empty.png", + tiles = {4, 4, 4, 4}, + + backgroundColor = {1, 1, 1, 1}, + + DrawControl = DrawPanel, +} skin.progressbar = { - TileImageFG = ":cl:tech_progressbar_full.png", + TileImageFG = ":cl:tech_progressbar_full_new.png", TileImageBK = ":cl:tech_progressbar_empty.png", - tiles = {10, 10, 10, 10}, + tiles = {4, 3, 4, 3}, --// tile widths: left,top,right,bottom font = { shadow = true, }, backgroundColor = {0,0,0,0.5}, + color = {1, 1, 1, 1}, DrawControl = DrawProgressbar, } skin.scrollpanel = { - BorderTileImage = ":cl:panel2_border.png", + BorderTileImage = ":cl:panel2_border_v2.png", bordertiles = {2, 2, 2, 2}, BackgroundTileImage = ":cl:panel2_bg.png", bkgndtiles = {14,14,14,14}, - TileImage = ":cl:tech_scrollbar.png", - tiles = {7,7,7,7}, - KnobTileImage = ":cl:tech_scrollbar_knob.png", - KnobTiles = {6,8,6,8}, + TileImage = ":cl:tech_scrollbar_new.png", + tiles = {6,6,6,6}, + KnobTileImage = ":cl:tech_scrollbar_knob_new.png", + KnobTiles = {6,6,6,6}, - HTileImage = ":cl:tech_scrollbar.png", - htiles = {7,7,7,7}, - HKnobTileImage = ":cl:tech_scrollbar_knob.png", - HKnobTiles = {6,8,6,8}, - - KnobColorSelected = {1,0.7,0.1,0.8}, + HTileImage = ":cl:tech_scrollbar_new.png", + htiles = {6,6,6,6}, + HKnobTileImage = ":cl:tech_scrollbar_knob_new.png", + HKnobTiles = {6,6,6,6}, + + KnobColorSelected = {.6, .8, .95, 1}, padding = {5, 5, 5, 0}, @@ -425,9 +559,9 @@ skin.window = { } skin.main_window = { - TileImage = ":c:tech_mainwindow_darker.png", - tiles = {176, 64, 176, 64}, --// tile widths: left,top,right,bottom - padding = {13, 13, 13, 13}, + TileImage = ":c:tech_mainwindow_darker_final_textureless.png", + tiles = {8, 8, 8, 8}, --// tile widths: left,top,right,bottom + padding = {13, 15, 12, 11}, hitpadding = {4, 4, 4, 4}, captionColor = {1, 1, 1, 0.45}, @@ -449,9 +583,9 @@ skin.main_window = { } skin.main_window_large = { - TileImage = ":c:tech_mainwindow_darker.png", - tiles = {176, 64, 176, 64}, --// tile widths: left,top,right,bottom - padding = {5, 4, 5, 2}, + TileImage = ":c:tech_mainwindow_darker_final.png", + tiles = {8, 8, 8, 8}, --// tile widths: left,top,right,bottom + padding = {2, 4, 1, 0}, hitpadding = {4, 4, 4, 4}, captionColor = {1, 1, 1, 0.45}, @@ -474,8 +608,9 @@ skin.main_window_large = { skin.main_window_small = { - TileImage = ":c:tech_mainwindow_small_darker.png", - tiles = {76, 40, 76, 40}, --// tile widths: left,top,right,bottom + -- TileImage = ":c:tech_mainwindow_small_darker2.png", + TileImage = ":c:tech_overlaywindow_large_dark.png", + tiles = {8, 8, 8, 8}, --// tile widths: left,top,right,bottom padding = {13, 13, 13, 13}, hitpadding = {4, 4, 4, 4}, @@ -497,33 +632,9 @@ skin.main_window_small = { DrawResizeGrip = DrawResizeGrip, } -skin.tech_mainwindow_very_small = { - TileImage = ":c:tech_mainwindow_very_small.png", - tiles = {40, 30, 38, 38}, --// tile widths: left,top,right,bottom - padding = {10, 6, 10, 6}, - hitpadding = {4, 4, 4, 4}, - - captionColor = {1, 1, 1, 0.45}, - backgroundColor = {0.1, 0.1, 0.1, 0.7}, - - boxes = { - resize = {-23, -19, -12, -8}, - drag = {0, 0, "100%", 10}, - }, - - NCHitTest = NCHitTestWithPadding, - NCMouseDown = WindowNCMouseDown, - NCMouseDownPostChildren = WindowNCMouseDownPostChildren, - noClickThrough = true, - - DrawControl = DrawWindow, - DrawDragGrip = function() end, - DrawResizeGrip = DrawResizeGrip, -} - skin.overlay_window = { TileImage = ":c:tech_overlaywindow.png", - tiles = {2, 2, 2, 2}, --// tile widths: left,top,right,bottom + tiles = {4, 4, 4, 4}, --// tile widths: left,top,right,bottom padding = {13, 13, 13, 13}, hitpadding = {4, 4, 4, 4}, @@ -550,7 +661,7 @@ skin.line = { tiles = {0, 0, 0, 0}, TileImageV = ":cl:tech_line_vert.png", tilesV = {0, 0, 0, 0}, - borderColor = {50/255, 125/255, 141/255, 1}, + borderColor = {162/255, 162/255, 162/255, 1}, DrawControl = DrawLine, } @@ -568,20 +679,47 @@ skin.tabbar = { } skin.tabbaritem = { - -- yes these are reverted, but also a lie (see images), only one is used - TileImageFG = ":cl:tech_tabbaritem_bk.png", + TileImageFG = ":cl:tech_tabbaritem_fg.png", TileImageBK = ":cl:tech_tabbaritem_bk.png", - tiles = {12, 12, 12, 12}, --// tile widths: left,top,right,bottom - padding = {1, 1, 1, 2}, + tiles = {4, 4, 4, 4}, --// tile widths: left,top,right,bottom + padding = {1, 1, 1, -2}, -- since it's color multiplication, it's easier to control white color (1, 1, 1) than black color (0, 0, 0) to get desired results - backgroundColor = {0.3, 0.3, 0.3, 0.5}, - -- actually kill this anyway + backgroundColor = {1, 1, 1, 1}, + borderColor = {0, 0, 0, 0}, - focusColor = {0.46, 0.54, 0.68, 1.0}, + focusColor = {.6, .7, .89, 1}, DrawControl = DrawTabBarItem, } +skin.tabbar_square_button_positive = { + TileImageFG = ":cl:tech_tabbaritem_square_fg.png", + TileImageBK = ":cl:tech_tabbaritem_square_bk.png", + tiles = {3, 3, 3, 3}, --// tile widths: left,top,right,bottom + padding = {0, 0, 0, 0}, + backgroundColor = {0.46, 0.45, 0.53, 1}, + borderColor = {0, 0, 0, 0}, + focusColor = {0.85, 0.84, 0.95, 1}, + + DrawControl = DrawButton, +} + +skin.tabbar_square_button_negative = { + TileImageFG = ":cl:x_2.png", + TileImageBK = ":cl:x_2.png", + tiles = {3, 3, 3, 3}, --// tile widths: left,top,right,bottom + padding = {0, 0, 0, 0}, + + -- backgroundColor = {0.46, 0.45, 0.53, 0.90}, + -- borderColor = {0, 0, 0, 0}, + -- focusColor = {0.85, 0.84, 0.95, 1}, + + backgroundColor = {1, 1, 1, .75}, + borderColor = {0, 0, 0, 0}, + focusColor = {1, 1, 1, 1}, + + DrawControl = DrawButton, +} skin.control = skin.general diff --git a/LuaMenu/widgets/chili/skins/Evolved/tech_button_bk.png b/LuaMenu/widgets/chili/skins/Evolved/tech_button_bk.png index 9fd740620..9baf815cf 100644 Binary files a/LuaMenu/widgets/chili/skins/Evolved/tech_button_bk.png and b/LuaMenu/widgets/chili/skins/Evolved/tech_button_bk.png differ diff --git a/LuaMenu/widgets/chili/skins/Evolved/tech_button_bk_lopsided.png b/LuaMenu/widgets/chili/skins/Evolved/tech_button_bk_lopsided.png deleted file mode 100644 index a3bf6caab..000000000 Binary files a/LuaMenu/widgets/chili/skins/Evolved/tech_button_bk_lopsided.png and /dev/null differ diff --git a/LuaMenu/widgets/chili/skins/Evolved/tech_button_bright_bk.png b/LuaMenu/widgets/chili/skins/Evolved/tech_button_bright_bk.png deleted file mode 100644 index f77dca816..000000000 Binary files a/LuaMenu/widgets/chili/skins/Evolved/tech_button_bright_bk.png and /dev/null differ diff --git a/LuaMenu/widgets/chili/skins/Evolved/tech_button_bright_fg.png b/LuaMenu/widgets/chili/skins/Evolved/tech_button_bright_fg.png deleted file mode 100644 index a6f0a114b..000000000 Binary files a/LuaMenu/widgets/chili/skins/Evolved/tech_button_bright_fg.png and /dev/null differ diff --git a/LuaMenu/widgets/chili/skins/Evolved/tech_button_bright_small_bk.png b/LuaMenu/widgets/chili/skins/Evolved/tech_button_bright_small_bk.png deleted file mode 100644 index 2531047a2..000000000 Binary files a/LuaMenu/widgets/chili/skins/Evolved/tech_button_bright_small_bk.png and /dev/null differ diff --git a/LuaMenu/widgets/chili/skins/Evolved/tech_button_bright_small_blue_bk_v2.png b/LuaMenu/widgets/chili/skins/Evolved/tech_button_bright_small_blue_bk_v2.png new file mode 100644 index 000000000..079b9301b Binary files /dev/null and b/LuaMenu/widgets/chili/skins/Evolved/tech_button_bright_small_blue_bk_v2.png differ diff --git a/LuaMenu/widgets/chili/skins/Evolved/tech_button_bright_small_blue_fg_v2.png b/LuaMenu/widgets/chili/skins/Evolved/tech_button_bright_small_blue_fg_v2.png new file mode 100644 index 000000000..ca418294e Binary files /dev/null and b/LuaMenu/widgets/chili/skins/Evolved/tech_button_bright_small_blue_fg_v2.png differ diff --git a/LuaMenu/widgets/chili/skins/Evolved/tech_button_bright_small_fg.png b/LuaMenu/widgets/chili/skins/Evolved/tech_button_bright_small_fg.png deleted file mode 100644 index 59b2677d8..000000000 Binary files a/LuaMenu/widgets/chili/skins/Evolved/tech_button_bright_small_fg.png and /dev/null differ diff --git a/LuaMenu/widgets/chili/skins/Evolved/tech_button_bright_small_fg2.png b/LuaMenu/widgets/chili/skins/Evolved/tech_button_bright_small_fg2.png new file mode 100644 index 000000000..6147eb663 Binary files /dev/null and b/LuaMenu/widgets/chili/skins/Evolved/tech_button_bright_small_fg2.png differ diff --git a/LuaMenu/widgets/chili/skins/Evolved/tech_button_bright_small_orange_bk_v2.png b/LuaMenu/widgets/chili/skins/Evolved/tech_button_bright_small_orange_bk_v2.png new file mode 100644 index 000000000..0bedc417b Binary files /dev/null and b/LuaMenu/widgets/chili/skins/Evolved/tech_button_bright_small_orange_bk_v2.png differ diff --git a/LuaMenu/widgets/chili/skins/Evolved/tech_button_bright_small_orange_fg.png b/LuaMenu/widgets/chili/skins/Evolved/tech_button_bright_small_orange_fg.png new file mode 100644 index 000000000..689ea910d Binary files /dev/null and b/LuaMenu/widgets/chili/skins/Evolved/tech_button_bright_small_orange_fg.png differ diff --git a/LuaMenu/widgets/chili/skins/Evolved/tech_button_bright_small_orange_fg_v2.png b/LuaMenu/widgets/chili/skins/Evolved/tech_button_bright_small_orange_fg_v2.png new file mode 100644 index 000000000..06530e9af Binary files /dev/null and b/LuaMenu/widgets/chili/skins/Evolved/tech_button_bright_small_orange_fg_v2.png differ diff --git a/LuaMenu/widgets/chili/skins/Evolved/tech_button_bright_small_orange_simple.png b/LuaMenu/widgets/chili/skins/Evolved/tech_button_bright_small_orange_simple.png new file mode 100644 index 000000000..127a078f4 Binary files /dev/null and b/LuaMenu/widgets/chili/skins/Evolved/tech_button_bright_small_orange_simple.png differ diff --git a/LuaMenu/widgets/chili/skins/Evolved/tech_button_bright_small_v2.kra b/LuaMenu/widgets/chili/skins/Evolved/tech_button_bright_small_v2.kra new file mode 100644 index 000000000..2c84aef79 Binary files /dev/null and b/LuaMenu/widgets/chili/skins/Evolved/tech_button_bright_small_v2.kra differ diff --git a/LuaMenu/widgets/chili/skins/Evolved/tech_button_bright_small_v3.kra b/LuaMenu/widgets/chili/skins/Evolved/tech_button_bright_small_v3.kra new file mode 100644 index 000000000..bc5c035b4 Binary files /dev/null and b/LuaMenu/widgets/chili/skins/Evolved/tech_button_bright_small_v3.kra differ diff --git a/LuaMenu/widgets/chili/skins/Evolved/tech_button_flair.kra b/LuaMenu/widgets/chili/skins/Evolved/tech_button_flair.kra new file mode 100644 index 000000000..c71014b6a Binary files /dev/null and b/LuaMenu/widgets/chili/skins/Evolved/tech_button_flair.kra differ diff --git a/LuaMenu/widgets/chili/skins/Evolved/tech_button_flair_bk.png b/LuaMenu/widgets/chili/skins/Evolved/tech_button_flair_bk.png new file mode 100644 index 000000000..415b7192c Binary files /dev/null and b/LuaMenu/widgets/chili/skins/Evolved/tech_button_flair_bk.png differ diff --git a/LuaMenu/widgets/chili/skins/Evolved/tech_button_flair_fg.png b/LuaMenu/widgets/chili/skins/Evolved/tech_button_flair_fg.png new file mode 100644 index 000000000..0beb16250 Binary files /dev/null and b/LuaMenu/widgets/chili/skins/Evolved/tech_button_flair_fg.png differ diff --git a/LuaMenu/widgets/chili/skins/Evolved/tech_button_flair_orange.kra b/LuaMenu/widgets/chili/skins/Evolved/tech_button_flair_orange.kra new file mode 100644 index 000000000..067f90f3d Binary files /dev/null and b/LuaMenu/widgets/chili/skins/Evolved/tech_button_flair_orange.kra differ diff --git a/LuaMenu/widgets/chili/skins/Evolved/tech_button_flair_orange_bk.png b/LuaMenu/widgets/chili/skins/Evolved/tech_button_flair_orange_bk.png new file mode 100644 index 000000000..9c346db3c Binary files /dev/null and b/LuaMenu/widgets/chili/skins/Evolved/tech_button_flair_orange_bk.png differ diff --git a/LuaMenu/widgets/chili/skins/Evolved/tech_button_flair_orange_fg.png b/LuaMenu/widgets/chili/skins/Evolved/tech_button_flair_orange_fg.png new file mode 100644 index 000000000..d376c47bc Binary files /dev/null and b/LuaMenu/widgets/chili/skins/Evolved/tech_button_flair_orange_fg.png differ diff --git a/LuaMenu/widgets/chili/skins/Evolved/tech_button_no.kra b/LuaMenu/widgets/chili/skins/Evolved/tech_button_no.kra new file mode 100644 index 000000000..aa7cf30d1 Binary files /dev/null and b/LuaMenu/widgets/chili/skins/Evolved/tech_button_no.kra differ diff --git a/LuaMenu/widgets/chili/skins/Evolved/tech_button_no_bk.png b/LuaMenu/widgets/chili/skins/Evolved/tech_button_no_bk.png new file mode 100644 index 000000000..56bb03236 Binary files /dev/null and b/LuaMenu/widgets/chili/skins/Evolved/tech_button_no_bk.png differ diff --git a/LuaMenu/widgets/chili/skins/Evolved/tech_button_no_fg.png b/LuaMenu/widgets/chili/skins/Evolved/tech_button_no_fg.png new file mode 100644 index 000000000..4f9344744 Binary files /dev/null and b/LuaMenu/widgets/chili/skins/Evolved/tech_button_no_fg.png differ diff --git a/LuaMenu/widgets/chili/skins/Evolved/tech_button_small_square.kra b/LuaMenu/widgets/chili/skins/Evolved/tech_button_small_square.kra new file mode 100644 index 000000000..db31dee52 Binary files /dev/null and b/LuaMenu/widgets/chili/skins/Evolved/tech_button_small_square.kra differ diff --git a/LuaMenu/widgets/chili/skins/Evolved/tech_button_small_square_bk.png b/LuaMenu/widgets/chili/skins/Evolved/tech_button_small_square_bk.png index 0c17ec53d..52d482f85 100644 Binary files a/LuaMenu/widgets/chili/skins/Evolved/tech_button_small_square_bk.png and b/LuaMenu/widgets/chili/skins/Evolved/tech_button_small_square_bk.png differ diff --git a/LuaMenu/widgets/chili/skins/Evolved/tech_button_small_square_bk_default.png b/LuaMenu/widgets/chili/skins/Evolved/tech_button_small_square_bk_default.png new file mode 100644 index 000000000..7b894e391 Binary files /dev/null and b/LuaMenu/widgets/chili/skins/Evolved/tech_button_small_square_bk_default.png differ diff --git a/LuaMenu/widgets/chili/skins/Evolved/tech_button_small_square_bk_default_v2.png b/LuaMenu/widgets/chili/skins/Evolved/tech_button_small_square_bk_default_v2.png new file mode 100644 index 000000000..c7403fe32 Binary files /dev/null and b/LuaMenu/widgets/chili/skins/Evolved/tech_button_small_square_bk_default_v2.png differ diff --git a/LuaMenu/widgets/chili/skins/Evolved/tech_button_small_square_bk_default_v5.png b/LuaMenu/widgets/chili/skins/Evolved/tech_button_small_square_bk_default_v5.png new file mode 100644 index 000000000..b986db2b5 Binary files /dev/null and b/LuaMenu/widgets/chili/skins/Evolved/tech_button_small_square_bk_default_v5.png differ diff --git a/LuaMenu/widgets/chili/skins/Evolved/tech_button_small_square_default.kra b/LuaMenu/widgets/chili/skins/Evolved/tech_button_small_square_default.kra new file mode 100644 index 000000000..d4e9d66b4 Binary files /dev/null and b/LuaMenu/widgets/chili/skins/Evolved/tech_button_small_square_default.kra differ diff --git a/LuaMenu/widgets/chili/skins/Evolved/tech_button_small_square_default_v2.kra b/LuaMenu/widgets/chili/skins/Evolved/tech_button_small_square_default_v2.kra new file mode 100644 index 000000000..83df98c35 Binary files /dev/null and b/LuaMenu/widgets/chili/skins/Evolved/tech_button_small_square_default_v2.kra differ diff --git a/LuaMenu/widgets/chili/skins/Evolved/tech_button_small_square_default_v4.kra b/LuaMenu/widgets/chili/skins/Evolved/tech_button_small_square_default_v4.kra new file mode 100644 index 000000000..e136b0cdf Binary files /dev/null and b/LuaMenu/widgets/chili/skins/Evolved/tech_button_small_square_default_v4.kra differ diff --git a/LuaMenu/widgets/chili/skins/Evolved/tech_button_small_square_fg.png b/LuaMenu/widgets/chili/skins/Evolved/tech_button_small_square_fg.png index 47d405701..0aa1e79fc 100644 Binary files a/LuaMenu/widgets/chili/skins/Evolved/tech_button_small_square_fg.png and b/LuaMenu/widgets/chili/skins/Evolved/tech_button_small_square_fg.png differ diff --git a/LuaMenu/widgets/chili/skins/Evolved/tech_button_small_square_fg_default.png b/LuaMenu/widgets/chili/skins/Evolved/tech_button_small_square_fg_default.png new file mode 100644 index 000000000..e0248bd5f Binary files /dev/null and b/LuaMenu/widgets/chili/skins/Evolved/tech_button_small_square_fg_default.png differ diff --git a/LuaMenu/widgets/chili/skins/Evolved/tech_button_small_square_fg_default_v2.png b/LuaMenu/widgets/chili/skins/Evolved/tech_button_small_square_fg_default_v2.png new file mode 100644 index 000000000..7b7f01fda Binary files /dev/null and b/LuaMenu/widgets/chili/skins/Evolved/tech_button_small_square_fg_default_v2.png differ diff --git a/LuaMenu/widgets/chili/skins/Evolved/tech_button_small_square_fg_default_v4.png b/LuaMenu/widgets/chili/skins/Evolved/tech_button_small_square_fg_default_v4.png new file mode 100644 index 000000000..1b3dd07ca Binary files /dev/null and b/LuaMenu/widgets/chili/skins/Evolved/tech_button_small_square_fg_default_v4.png differ diff --git a/LuaMenu/widgets/chili/skins/Evolved/tech_button_small_square_fg_default_v5.png b/LuaMenu/widgets/chili/skins/Evolved/tech_button_small_square_fg_default_v5.png new file mode 100644 index 000000000..55f852abe Binary files /dev/null and b/LuaMenu/widgets/chili/skins/Evolved/tech_button_small_square_fg_default_v5.png differ diff --git a/LuaMenu/widgets/chili/skins/Evolved/tech_button_yes.kra b/LuaMenu/widgets/chili/skins/Evolved/tech_button_yes.kra new file mode 100644 index 000000000..6ae67730f Binary files /dev/null and b/LuaMenu/widgets/chili/skins/Evolved/tech_button_yes.kra differ diff --git a/LuaMenu/widgets/chili/skins/Evolved/tech_button_yes_bk.png b/LuaMenu/widgets/chili/skins/Evolved/tech_button_yes_bk.png new file mode 100644 index 000000000..ca58680ca Binary files /dev/null and b/LuaMenu/widgets/chili/skins/Evolved/tech_button_yes_bk.png differ diff --git a/LuaMenu/widgets/chili/skins/Evolved/tech_button_yes_fg.png b/LuaMenu/widgets/chili/skins/Evolved/tech_button_yes_fg.png new file mode 100644 index 000000000..b9acdbb85 Binary files /dev/null and b/LuaMenu/widgets/chili/skins/Evolved/tech_button_yes_fg.png differ diff --git a/LuaMenu/widgets/chili/skins/Evolved/tech_checkbox-exp.kra b/LuaMenu/widgets/chili/skins/Evolved/tech_checkbox-exp.kra new file mode 100644 index 000000000..d4525a400 Binary files /dev/null and b/LuaMenu/widgets/chili/skins/Evolved/tech_checkbox-exp.kra differ diff --git a/LuaMenu/widgets/chili/skins/Evolved/tech_checkbox_unchecked-exp.png b/LuaMenu/widgets/chili/skins/Evolved/tech_checkbox_unchecked-exp.png new file mode 100644 index 000000000..70251661d Binary files /dev/null and b/LuaMenu/widgets/chili/skins/Evolved/tech_checkbox_unchecked-exp.png differ diff --git a/LuaMenu/widgets/chili/skins/Evolved/tech_line_vert.png b/LuaMenu/widgets/chili/skins/Evolved/tech_line_vert.png index 6d835251e..b2bd76c86 100644 Binary files a/LuaMenu/widgets/chili/skins/Evolved/tech_line_vert.png and b/LuaMenu/widgets/chili/skins/Evolved/tech_line_vert.png differ diff --git a/LuaMenu/widgets/chili/skins/Evolved/tech_mainwindow_dark.png b/LuaMenu/widgets/chili/skins/Evolved/tech_mainwindow_dark.png deleted file mode 100644 index 7c8fe441f..000000000 Binary files a/LuaMenu/widgets/chili/skins/Evolved/tech_mainwindow_dark.png and /dev/null differ diff --git a/LuaMenu/widgets/chili/skins/Evolved/tech_mainwindow_darker.png b/LuaMenu/widgets/chili/skins/Evolved/tech_mainwindow_darker.png deleted file mode 100644 index 07088e866..000000000 Binary files a/LuaMenu/widgets/chili/skins/Evolved/tech_mainwindow_darker.png and /dev/null differ diff --git a/LuaMenu/widgets/chili/skins/Evolved/tech_mainwindow_darker_final.kra b/LuaMenu/widgets/chili/skins/Evolved/tech_mainwindow_darker_final.kra new file mode 100644 index 000000000..2f4e250b6 Binary files /dev/null and b/LuaMenu/widgets/chili/skins/Evolved/tech_mainwindow_darker_final.kra differ diff --git a/LuaMenu/widgets/chili/skins/Evolved/tech_mainwindow_darker_final.png b/LuaMenu/widgets/chili/skins/Evolved/tech_mainwindow_darker_final.png new file mode 100644 index 000000000..e52710dfc Binary files /dev/null and b/LuaMenu/widgets/chili/skins/Evolved/tech_mainwindow_darker_final.png differ diff --git a/LuaMenu/widgets/chili/skins/Evolved/tech_mainwindow_darker_final_rm.png b/LuaMenu/widgets/chili/skins/Evolved/tech_mainwindow_darker_final_rm.png new file mode 100644 index 000000000..ea4a436d4 Binary files /dev/null and b/LuaMenu/widgets/chili/skins/Evolved/tech_mainwindow_darker_final_rm.png differ diff --git a/LuaMenu/widgets/chili/skins/Evolved/tech_mainwindow_darker_final_textureless.png b/LuaMenu/widgets/chili/skins/Evolved/tech_mainwindow_darker_final_textureless.png new file mode 100644 index 000000000..35b2904f0 Binary files /dev/null and b/LuaMenu/widgets/chili/skins/Evolved/tech_mainwindow_darker_final_textureless.png differ diff --git a/LuaMenu/widgets/chili/skins/Evolved/tech_mainwindow_darker_final_textureless_small.png b/LuaMenu/widgets/chili/skins/Evolved/tech_mainwindow_darker_final_textureless_small.png new file mode 100644 index 000000000..60e0759e0 Binary files /dev/null and b/LuaMenu/widgets/chili/skins/Evolved/tech_mainwindow_darker_final_textureless_small.png differ diff --git a/LuaMenu/widgets/chili/skins/Evolved/tech_mainwindow_small.png b/LuaMenu/widgets/chili/skins/Evolved/tech_mainwindow_small.png deleted file mode 100644 index 7ba4e5ffc..000000000 Binary files a/LuaMenu/widgets/chili/skins/Evolved/tech_mainwindow_small.png and /dev/null differ diff --git a/LuaMenu/widgets/chili/skins/Evolved/tech_mainwindow_small_darker.png b/LuaMenu/widgets/chili/skins/Evolved/tech_mainwindow_small_darker.png deleted file mode 100644 index 346f90689..000000000 Binary files a/LuaMenu/widgets/chili/skins/Evolved/tech_mainwindow_small_darker.png and /dev/null differ diff --git a/LuaMenu/widgets/chili/skins/Evolved/tech_mainwindow_small_darker2.kra b/LuaMenu/widgets/chili/skins/Evolved/tech_mainwindow_small_darker2.kra new file mode 100644 index 000000000..dafd0f1a1 Binary files /dev/null and b/LuaMenu/widgets/chili/skins/Evolved/tech_mainwindow_small_darker2.kra differ diff --git a/LuaMenu/widgets/chili/skins/Evolved/tech_mainwindow_small_darker2.png b/LuaMenu/widgets/chili/skins/Evolved/tech_mainwindow_small_darker2.png new file mode 100644 index 000000000..a1f851034 Binary files /dev/null and b/LuaMenu/widgets/chili/skins/Evolved/tech_mainwindow_small_darker2.png differ diff --git a/LuaMenu/widgets/chili/skins/Evolved/tech_mainwindow_very_small.png b/LuaMenu/widgets/chili/skins/Evolved/tech_mainwindow_very_small.png deleted file mode 100644 index b1900a61b..000000000 Binary files a/LuaMenu/widgets/chili/skins/Evolved/tech_mainwindow_very_small.png and /dev/null differ diff --git a/LuaMenu/widgets/chili/skins/Evolved/tech_overlaywindow.kra b/LuaMenu/widgets/chili/skins/Evolved/tech_overlaywindow.kra new file mode 100644 index 000000000..f5335a1fe Binary files /dev/null and b/LuaMenu/widgets/chili/skins/Evolved/tech_overlaywindow.kra differ diff --git a/LuaMenu/widgets/chili/skins/Evolved/tech_overlaywindow.png b/LuaMenu/widgets/chili/skins/Evolved/tech_overlaywindow.png index a8ea8913c..2f8b502b0 100644 Binary files a/LuaMenu/widgets/chili/skins/Evolved/tech_overlaywindow.png and b/LuaMenu/widgets/chili/skins/Evolved/tech_overlaywindow.png differ diff --git a/LuaMenu/widgets/chili/skins/Evolved/tech_overlaywindow_large_dark.kra b/LuaMenu/widgets/chili/skins/Evolved/tech_overlaywindow_large_dark.kra new file mode 100644 index 000000000..52a3d2252 Binary files /dev/null and b/LuaMenu/widgets/chili/skins/Evolved/tech_overlaywindow_large_dark.kra differ diff --git a/LuaMenu/widgets/chili/skins/Evolved/tech_overlaywindow_large_dark.png b/LuaMenu/widgets/chili/skins/Evolved/tech_overlaywindow_large_dark.png new file mode 100644 index 000000000..399f29530 Binary files /dev/null and b/LuaMenu/widgets/chili/skins/Evolved/tech_overlaywindow_large_dark.png differ diff --git a/LuaMenu/widgets/chili/skins/Evolved/tech_progressbar.psp b/LuaMenu/widgets/chili/skins/Evolved/tech_progressbar.psp deleted file mode 100644 index baf72ecc1..000000000 Binary files a/LuaMenu/widgets/chili/skins/Evolved/tech_progressbar.psp and /dev/null differ diff --git a/LuaMenu/widgets/chili/skins/Evolved/tech_progressbar_empty.png b/LuaMenu/widgets/chili/skins/Evolved/tech_progressbar_empty.png index 444d9baf2..6a30238ea 100644 Binary files a/LuaMenu/widgets/chili/skins/Evolved/tech_progressbar_empty.png and b/LuaMenu/widgets/chili/skins/Evolved/tech_progressbar_empty.png differ diff --git a/LuaMenu/widgets/chili/skins/Evolved/tech_progressbar_full.kra b/LuaMenu/widgets/chili/skins/Evolved/tech_progressbar_full.kra new file mode 100644 index 000000000..e300d3360 Binary files /dev/null and b/LuaMenu/widgets/chili/skins/Evolved/tech_progressbar_full.kra differ diff --git a/LuaMenu/widgets/chili/skins/Evolved/tech_progressbar_full.png b/LuaMenu/widgets/chili/skins/Evolved/tech_progressbar_full.png index 017a5137b..33a5dcdc2 100644 Binary files a/LuaMenu/widgets/chili/skins/Evolved/tech_progressbar_full.png and b/LuaMenu/widgets/chili/skins/Evolved/tech_progressbar_full.png differ diff --git a/LuaMenu/widgets/chili/skins/Evolved/tech_progressbar_full_new.png b/LuaMenu/widgets/chili/skins/Evolved/tech_progressbar_full_new.png new file mode 100644 index 000000000..7de4628c3 Binary files /dev/null and b/LuaMenu/widgets/chili/skins/Evolved/tech_progressbar_full_new.png differ diff --git a/LuaMenu/widgets/chili/skins/Evolved/tech_scrollbar.kra b/LuaMenu/widgets/chili/skins/Evolved/tech_scrollbar.kra new file mode 100644 index 000000000..215b62108 Binary files /dev/null and b/LuaMenu/widgets/chili/skins/Evolved/tech_scrollbar.kra differ diff --git a/LuaMenu/widgets/chili/skins/Evolved/tech_scrollbar.png b/LuaMenu/widgets/chili/skins/Evolved/tech_scrollbar.png index 89820d1c9..6b3238bb1 100644 Binary files a/LuaMenu/widgets/chili/skins/Evolved/tech_scrollbar.png and b/LuaMenu/widgets/chili/skins/Evolved/tech_scrollbar.png differ diff --git a/LuaMenu/widgets/chili/skins/Evolved/tech_scrollbar_knob.kra b/LuaMenu/widgets/chili/skins/Evolved/tech_scrollbar_knob.kra new file mode 100644 index 000000000..af4b5b84d Binary files /dev/null and b/LuaMenu/widgets/chili/skins/Evolved/tech_scrollbar_knob.kra differ diff --git a/LuaMenu/widgets/chili/skins/Evolved/tech_scrollbar_knob.png b/LuaMenu/widgets/chili/skins/Evolved/tech_scrollbar_knob.png index c73b19f2d..763beea47 100644 Binary files a/LuaMenu/widgets/chili/skins/Evolved/tech_scrollbar_knob.png and b/LuaMenu/widgets/chili/skins/Evolved/tech_scrollbar_knob.png differ diff --git a/LuaMenu/widgets/chili/skins/Evolved/tech_scrollbar_knob_new.png b/LuaMenu/widgets/chili/skins/Evolved/tech_scrollbar_knob_new.png new file mode 100644 index 000000000..02c8625d0 Binary files /dev/null and b/LuaMenu/widgets/chili/skins/Evolved/tech_scrollbar_knob_new.png differ diff --git a/LuaMenu/widgets/chili/skins/Evolved/tech_scrollbar_new.png b/LuaMenu/widgets/chili/skins/Evolved/tech_scrollbar_new.png new file mode 100644 index 000000000..ae4e5e05a Binary files /dev/null and b/LuaMenu/widgets/chili/skins/Evolved/tech_scrollbar_new.png differ diff --git a/LuaMenu/widgets/chili/skins/Evolved/tech_tabbaritem.kra b/LuaMenu/widgets/chili/skins/Evolved/tech_tabbaritem.kra new file mode 100644 index 000000000..f337f1ba3 Binary files /dev/null and b/LuaMenu/widgets/chili/skins/Evolved/tech_tabbaritem.kra differ diff --git a/LuaMenu/widgets/chili/skins/Evolved/tech_tabbaritem_bk.png b/LuaMenu/widgets/chili/skins/Evolved/tech_tabbaritem_bk.png index 51b8819ba..93f8984e6 100644 Binary files a/LuaMenu/widgets/chili/skins/Evolved/tech_tabbaritem_bk.png and b/LuaMenu/widgets/chili/skins/Evolved/tech_tabbaritem_bk.png differ diff --git a/LuaMenu/widgets/chili/skins/Evolved/tech_tabbaritem_fg.png b/LuaMenu/widgets/chili/skins/Evolved/tech_tabbaritem_fg.png index 776e9eab8..edeea6ccb 100644 Binary files a/LuaMenu/widgets/chili/skins/Evolved/tech_tabbaritem_fg.png and b/LuaMenu/widgets/chili/skins/Evolved/tech_tabbaritem_fg.png differ diff --git a/LuaMenu/widgets/chili/skins/Evolved/tech_tabbaritem_square.kra b/LuaMenu/widgets/chili/skins/Evolved/tech_tabbaritem_square.kra new file mode 100644 index 000000000..9b8a4d01c Binary files /dev/null and b/LuaMenu/widgets/chili/skins/Evolved/tech_tabbaritem_square.kra differ diff --git a/LuaMenu/widgets/chili/skins/Evolved/tech_tabbaritem_square_bk.png b/LuaMenu/widgets/chili/skins/Evolved/tech_tabbaritem_square_bk.png new file mode 100644 index 000000000..2e620c84e Binary files /dev/null and b/LuaMenu/widgets/chili/skins/Evolved/tech_tabbaritem_square_bk.png differ diff --git a/LuaMenu/widgets/chili/skins/Evolved/tech_tabbaritem_square_fg.png b/LuaMenu/widgets/chili/skins/Evolved/tech_tabbaritem_square_fg.png new file mode 100644 index 000000000..62eb9e9d8 Binary files /dev/null and b/LuaMenu/widgets/chili/skins/Evolved/tech_tabbaritem_square_fg.png differ diff --git a/LuaMenu/widgets/chili/skins/Evolved/tech_tabbaritem_square_negative_bk.png b/LuaMenu/widgets/chili/skins/Evolved/tech_tabbaritem_square_negative_bk.png new file mode 100644 index 000000000..20e5db47f Binary files /dev/null and b/LuaMenu/widgets/chili/skins/Evolved/tech_tabbaritem_square_negative_bk.png differ diff --git a/LuaMenu/widgets/chili/skins/Evolved/tech_tabbaritem_square_negative_fg.png b/LuaMenu/widgets/chili/skins/Evolved/tech_tabbaritem_square_negative_fg.png new file mode 100644 index 000000000..23b569610 Binary files /dev/null and b/LuaMenu/widgets/chili/skins/Evolved/tech_tabbaritem_square_negative_fg.png differ diff --git a/LuaMenu/widgets/chili/skins/Evolved/tech_window.psp b/LuaMenu/widgets/chili/skins/Evolved/tech_window.psp deleted file mode 100644 index af5a05263..000000000 Binary files a/LuaMenu/widgets/chili/skins/Evolved/tech_window.psp and /dev/null differ diff --git a/LuaMenu/widgets/chili/skins/Evolved/trackbar.kra b/LuaMenu/widgets/chili/skins/Evolved/trackbar.kra new file mode 100644 index 000000000..4a41cd7b8 Binary files /dev/null and b/LuaMenu/widgets/chili/skins/Evolved/trackbar.kra differ diff --git a/LuaMenu/widgets/chili/skins/Evolved/trackbar.png b/LuaMenu/widgets/chili/skins/Evolved/trackbar.png index 447619f10..e7bfe75d6 100644 Binary files a/LuaMenu/widgets/chili/skins/Evolved/trackbar.png and b/LuaMenu/widgets/chili/skins/Evolved/trackbar.png differ diff --git a/LuaMenu/widgets/chili/skins/Evolved/trackbar_step.png b/LuaMenu/widgets/chili/skins/Evolved/trackbar_step.png index bbd8b6ec2..66e2b4b8f 100644 Binary files a/LuaMenu/widgets/chili/skins/Evolved/trackbar_step.png and b/LuaMenu/widgets/chili/skins/Evolved/trackbar_step.png differ diff --git a/LuaMenu/widgets/chili/skins/Evolved/trackbar_thumb.png b/LuaMenu/widgets/chili/skins/Evolved/trackbar_thumb.png index 70937c061..54d919cf0 100644 Binary files a/LuaMenu/widgets/chili/skins/Evolved/trackbar_thumb.png and b/LuaMenu/widgets/chili/skins/Evolved/trackbar_thumb.png differ diff --git a/LuaMenu/widgets/chili/skins/Evolved/window_tooltip.png b/LuaMenu/widgets/chili/skins/Evolved/window_tooltip.png deleted file mode 100644 index 7d8b1b4f5..000000000 Binary files a/LuaMenu/widgets/chili/skins/Evolved/window_tooltip.png and /dev/null differ diff --git a/LuaMenu/widgets/chili/skins/Evolved/window_tooltip.psp b/LuaMenu/widgets/chili/skins/Evolved/window_tooltip.psp deleted file mode 100644 index 2426bcb68..000000000 Binary files a/LuaMenu/widgets/chili/skins/Evolved/window_tooltip.psp and /dev/null differ diff --git a/LuaMenu/widgets/chili/skins/Evolved/x.kra b/LuaMenu/widgets/chili/skins/Evolved/x.kra new file mode 100644 index 000000000..beec24ad0 Binary files /dev/null and b/LuaMenu/widgets/chili/skins/Evolved/x.kra differ diff --git a/LuaMenu/widgets/chili/skins/Evolved/x.png b/LuaMenu/widgets/chili/skins/Evolved/x.png new file mode 100644 index 000000000..96082c16d Binary files /dev/null and b/LuaMenu/widgets/chili/skins/Evolved/x.png differ diff --git a/LuaMenu/widgets/chili/skins/Evolved/x_2.png b/LuaMenu/widgets/chili/skins/Evolved/x_2.png new file mode 100644 index 000000000..d03e58fdb Binary files /dev/null and b/LuaMenu/widgets/chili/skins/Evolved/x_2.png differ diff --git a/LuaMenu/widgets/chobby/components/battle/battle_list_window.lua b/LuaMenu/widgets/chobby/components/battle/battle_list_window.lua index 99e967f46..d757aeb2c 100644 --- a/LuaMenu/widgets/chobby/components/battle/battle_list_window.lua +++ b/LuaMenu/widgets/chobby/components/battle/battle_list_window.lua @@ -7,11 +7,11 @@ local IMG_READY = LUA_DIRNAME .. "images/ready.png" local IMG_UNREADY = LUA_DIRNAME .. "images/unready.png" function BattleListWindow:init(parent) - self:super("init", parent, "Play or watch a game", true, nil, nil, nil, 34) + self:super("init", parent, "Play or Watch Games", true, nil, nil, nil, 34) if not Configuration.gameConfig.disableBattleListHostButton then self.btnNewBattle = Button:New { - x = 260, + right = 59, y = WG.TOP_BUTTON_Y, width = 150, height = WG.BUTTON_HEIGHT, @@ -61,7 +61,7 @@ function BattleListWindow:init(parent) right = 5, bottom = 11, height = 20, - objectOverrideFont = Configuration:GetFont(2), + objectOverrideFont = Configuration:GetFont(6), -- same as 2, but without font shadow caption = "Filter out:", parent = self.window } @@ -75,7 +75,7 @@ function BattleListWindow:init(parent) boxsize = 20, caption = " Passworded", checked = Configuration.battleFilterPassworded3 or false, - objectOverrideFont = Configuration:GetFont(2), + objectOverrideFont = Configuration:GetFont(6), OnChange = { function (obj, newState) Configuration:SetConfigValue("battleFilterPassworded3", newState) @@ -93,7 +93,7 @@ function BattleListWindow:init(parent) boxsize = 20, caption = " Non-friend", checked = Configuration.battleFilterNonFriend or false, - objectOverrideFont = Configuration:GetFont(2), + objectOverrideFont = Configuration:GetFont(6), OnChange = { function (obj, newState) Configuration:SetConfigValue("battleFilterNonFriend", newState) @@ -111,7 +111,7 @@ function BattleListWindow:init(parent) boxsize = 20, caption = " Running", checked = Configuration.battleFilterRunning or false, - objectOverrideFont = Configuration:GetFont(2), + objectOverrideFont = Configuration:GetFont(6), OnChange = { function (obj, newState) Configuration:SetConfigValue("battleFilterRunning", newState) @@ -181,6 +181,7 @@ function BattleListWindow:init(parent) return end self:OnUpdateBattleInfo(battleID) + self:UpdateButtonColor(battleID) SoftUpdate() end lobby:AddListener("OnUpdateBattleInfo", self.onUpdateBattleInfo) @@ -235,6 +236,11 @@ function BattleListWindow:Update() for _, battle in pairs(battles) do self:AddBattle(battle.battleID, battle) end + + for _, battle in pairs(battles) do + self:UpdateButtonColor(battle.battleID) + end + self:UpdateFilters() self:UpdateInfoPanel() end @@ -274,7 +280,7 @@ end function BattleListWindow:MakeWatchBattle(battleID, battle) local height = self.itemHeight - 20 local parentButton = Button:New { - classname = "button_rounded", + classname = "battle_default_button", name = "battleButton", x = 0, right = 0, @@ -468,7 +474,7 @@ end function BattleListWindow:MakeJoinBattle(battleID, battle) local height = self.itemHeight - 20 local parentButton = Button:New { - classname = "button_rounded", + classname = "battle_default_button", name = "battleButton", x = 0, right = 0, @@ -633,6 +639,7 @@ function BattleListWindow:AddBattle(battleID, battle) end self:AddRow({button}, battle.battleID) + self:UpdateButtonColor(battleID) -- necessary for some reason, despite BAR not needing this end function BattleListWindow:ItemInFilter(id) @@ -689,6 +696,45 @@ function BattleListWindow:CompareItems(id1, id2) end end +function BattleListWindow:UpdateButtonColor(battleID) + + local items = self:GetRowItems(battleID) + if not items then + return + end + local battle = lobby:GetBattle(battleID) + if battle == nil then return end + + local oldbuttonstyle = items.battleButton.backgroundColor + local battlebuttonstyle = {0.10, 0.30, 0.60, 0.60} --blue + if battle.passworded then + battlebuttonstyle = {0.65, 0.10, 0.20, 0.35} --red + elseif battle.isMatchMaker then + battlebuttonstyle = {0.40, 0.35, 0.55, 0.60} --violet + elseif lobby:GetBattlePlayerCount(battleID) < 1 then + battlebuttonstyle = {0.10, 0.30, 0.60, 0.60} --blue + elseif battle.isRunning then + battlebuttonstyle = {0.60, 0.45, 0.2, 0.65} --yellow + else + battlebuttonstyle = {0.30, 0.60, 0.40, 0.65} --green + end + local colorChanged = false + for i, c in ipairs(oldbuttonstyle) do + if c ~= battlebuttonstyle[i] then + colorChanged = true + break + end + end + --Spring.Echo("BattleListWindow:UpdateButtonColor",battleID,battlebuttonstyle, items.battleButton.backgroundColor,battle.isRunning ,battle.passworded, lobby:GetBattlePlayerCount(battleID)) + + if colorChanged then + --Spring.Echo("BattleListWindow:UpdateButtonColor",battleID,battlebuttonstyle, items.battleButton.backgroundColor,battle.isRunning ,battle.passworded, lobby:GetBattlePlayerCount(battleID)) + items.battleButton.backgroundColor = battlebuttonstyle + items.battleButton.focusColor = battlebuttonstyle + items.battleButton:Invalidate() + end +end + function BattleListWindow:RecalculateOrder(id) if lobby.commandBuffer then return @@ -774,6 +820,7 @@ function BattleListWindow:JoinedBattle(battleID) local playerCount = lobby:GetBattlePlayerCount(battleID) playersOnMapCaption:SetCaption(playerCount .. ((playerCount == 1 and " player on " ) or " players on ") .. battle.mapName:gsub("_", " ")) end + self:UpdateButtonColor(battleID) self:RecalculateOrder(battleID) end @@ -797,6 +844,7 @@ function BattleListWindow:LeftBattle(battleID) local playerCount = lobby:GetBattlePlayerCount(battleID) playersOnMapCaption:SetCaption(playerCount .. ((playerCount == 1 and " player on " ) or " players on ") .. battle.mapName:gsub("_", " ")) end + self:UpdateButtonColor(battleID) self:RecalculateOrder(battleID) end @@ -875,6 +923,7 @@ function BattleListWindow:OnUpdateBattleInfo(battleID) local playerCount = lobby:GetBattlePlayerCount(battleID) playersOnMapCaption:SetCaption(playerCount .. ((playerCount == 1 and " player on " ) or " players on ") .. battle.mapName:gsub("_", " ")) end + self:UpdateButtonColor(battleID) self:RecalculateOrder(battleID) end @@ -897,6 +946,7 @@ function BattleListWindow:OnBattleIngameUpdate(battleID, isRunning) runningImage.file = BATTLE_NOT_RUNNING end runningImage:Invalidate() + self:UpdateButtonColor(battleID) self:RecalculateOrder(battleID) end diff --git a/LuaMenu/widgets/chobby/components/battle/battle_watch_list_window.lua b/LuaMenu/widgets/chobby/components/battle/battle_watch_list_window.lua index 76a2392c2..3b5cce0e0 100644 --- a/LuaMenu/widgets/chobby/components/battle/battle_watch_list_window.lua +++ b/LuaMenu/widgets/chobby/components/battle/battle_watch_list_window.lua @@ -95,6 +95,10 @@ function BattleWatchListWindow:Update() for _, battle in pairs(battles) do self:AddBattle(battle.battleID, battle) end + + for _, battle in pairs(battles) do + self:UpdateButtonColor(battle.battleID) + end end function BattleWatchListWindow:AddBattle(battleID) @@ -262,6 +266,7 @@ function BattleWatchListWindow:JoinedBattle(battleID) local playersOnMapCaption = items.battleButton:GetChildByName("playersOnMapCaption") local playerCount = lobby:GetBattlePlayerCount(battleID) playersOnMapCaption:SetCaption(playerCount .. ((playerCount == 1 and " player on " ) or " players on ") .. battle.mapName:gsub("_", " ")) + self:UpdateButtonColor(battleID) self:RecalculateOrder(battleID) end @@ -274,6 +279,7 @@ function BattleWatchListWindow:LeftBattle(battleID) local playersOnMapCaption = items.battleButton:GetChildByName("playersOnMapCaption") local playerCount = lobby:GetBattlePlayerCount(battleID) playersOnMapCaption:SetCaption(playerCount .. ((playerCount == 1 and " player on " ) or " players on ") .. battle.mapName:gsub("_", " ")) + self:UpdateButtonColor(battleID) self:RecalculateOrder(battleID) end @@ -305,7 +311,7 @@ function BattleWatchListWindow:OnUpdateBattleInfo(battleID) local playersOnMapCaption = items.battleButton:GetChildByName("playersOnMapCaption") local playerCount = lobby:GetBattlePlayerCount(battleID) playersOnMapCaption:SetCaption(playerCount .. ((playerCount == 1 and " player on " ) or " players on ") .. battle.mapName:gsub("_", " ")) - + self:UpdateButtonColor(battleID) self:RecalculateOrder(battleID) end diff --git a/LuaMenu/widgets/chobby/components/chat_windows.lua b/LuaMenu/widgets/chobby/components/chat_windows.lua index f6750678d..a37d89b04 100644 --- a/LuaMenu/widgets/chobby/components/chat_windows.lua +++ b/LuaMenu/widgets/chobby/components/chat_windows.lua @@ -59,8 +59,8 @@ function ChatWindows:init() end lobby:AddListener("OnUserCount", self.onUserCount) - local CHAT_EX_MENTION = "\255\255\0\0" - local CHAT_MENTION ="\255\255\0\0" + local CHAT_EX_MENTION = "\255\120\250\110" + local CHAT_MENTION ="\255\120\250\110" -- channel chat lobby:AddListener("OnSaid", @@ -168,6 +168,7 @@ function ChatWindows:init() right = 7, y = 0, bottom = 9, + minTabWidth = 120, padding = {0, 0, 0, 0}, tabs = { [1] = (Configuration.debugMode and { name = "debug", caption = i18n("debug"), children = { @@ -247,10 +248,11 @@ function ChatWindows:init() self.joinButton = Button:New { x = 2000, y = 5, - width = 30, - height = 30, + width = 32, + height = 32, parent = self.tabScrollPanel, - caption = "+", + caption = "", + classname = "tabbar_square_button_positive", OnClick = { function() if self.joinWindow == nil then @@ -428,7 +430,8 @@ function ChatWindows:ProcessChat(chanName, userName, message, msgDate, notifyCol end local nameColor if source == lobby.SOURCE_DISCORD then - channelConsole:AddMessage(message, userName, msgDate, chatColour, thirdPerson, "\255\40\210\220", "Discord user.", true) + -- channelConsole:AddMessage(message, userName, msgDate, chatColour, thirdPerson, "\255\96\125\248", "Discord user.", true) + channelConsole:AddMessage(message, userName, msgDate, chatColour, thirdPerson, "\255\110\137\251", "Discord user.", true) else channelConsole:AddMessage(message, userName, msgDate, chatColour, thirdPerson, nameColor) end @@ -512,9 +515,7 @@ function ChatWindows:SetTabActivation(tabName, activationLevel, outlineColor) end else ctrl.font = Configuration:GetFont(1, "chat_badge_white", { - outline = false, - outlineColor = {0,0,0,1}, - color = {1,1,1,1}, + shadow = true, }) end ctrl.activationLevel = activationLevel @@ -674,7 +675,7 @@ function ChatWindows:UpdateChannels(channelsArray) width = 100, y = 0, height = 20, - caption = "#", + caption = "# ", } ) self.serverPanel:AddChild( @@ -734,8 +735,8 @@ function ChatWindows:UpdateChannels(channelsArray) end function ChatWindows:UpdateJoinPosition() - self.joinButton:SetPos(#self.tabPanel.tabBar.children * 70 + 10) - self.tabBarFudgeHolder:SetPos(nil, nil, #self.tabPanel.tabBar.children * 70 + 5) + self.joinButton:SetPos(#self.tabPanel.tabBar.children * 120 + 10) + self.tabBarFudgeHolder:SetPos(nil, nil, #self.tabPanel.tabBar.children * 120 + 5) end function ChatWindows:GetChannelConsole(chanName) @@ -764,7 +765,7 @@ function ChatWindows:GetChannelConsole(chanName) local userListPanel = UserListPanel(function() return lobby:GetChannel(chanName) end, 22, true, false, chanName or "_missing") self.userListPanels[chanName] = userListPanel - local caption = "#" .. chanName + local caption = "# " .. chanName local tooltip = nil local origCaption = caption local fontSize = 1 @@ -774,8 +775,9 @@ function ChatWindows:GetChannelConsole(chanName) end local closeChannelButton = Button:New { - width = 24, height = 24, y = 5, right = Configuration.userListWidth + 18, - caption = "x", + width = 32, height = 32, y = 5, right = Configuration.userListWidth + 20, + classname = "tabbar_square_button_negative", + caption = "", OnClick = { function() self.channelConsoles[chanName] = nil diff --git a/LuaMenu/widgets/chobby/components/configuration.lua b/LuaMenu/widgets/chobby/components/configuration.lua index ded148e98..155509021 100644 --- a/LuaMenu/widgets/chobby/components/configuration.lua +++ b/LuaMenu/widgets/chobby/components/configuration.lua @@ -87,14 +87,14 @@ function Configuration:init() self.ignoreLevel = false - self.errorColor = "\255\255\0\0" - self.warningColor = "\255\255\255\0" + self.errorColor = "\255\255\40\40" + self.warningColor = "\255\255\255\60" self.normalColor = "\255\255\255\255" - self.successColor = "\255\0\255\0" + self.successColor = "\255\40\255\40" self.partialColor = "\255\190\210\50" - self.selectedColor = "\255\99\184\255" + self.selectedColor = "\255\255\255\255" self.highlightedColor = "\255\125\255\0" - self.meColor = "\255\0\190\190" + self.meColor = "\255\60\190\240" self.moderatorColor = {0.68, 0.78, 1, 1} self.founderColor = {0.7, 1, 0.65, 1} @@ -102,7 +102,8 @@ function Configuration:init() self.userNameColor = {1, 1, 1, 1} self.buttonFocusColor = {0.54,0.72,1,0.3} - self.buttonSelectedColor = {0.54,0.72,1,0.95}--{1.0, 1.0, 1.0, 1.0} + --self.buttonSelectedColor = {59/255, 109/255, 179/255, 1} --{1.0, 1.0, 1.0, 1.0} + self.buttonSelectedColor = {44/255, 82/255, 134/255, 1} --{1.0, 1.0, 1.0, 1.0} self.loadLocalWidgets = false self.displayBots = false @@ -235,7 +236,7 @@ function Configuration:init() self.menuMusicVolume = 0.5 self.menuNotificationVolume = 0.8 self.menuBackgroundBrightness = 1 - self.gameOverlayOpacity = 0.5 + self.gameOverlayOpacity = 0.3 self.coopConnectDelay = 5 self.showMatchMakerBattles = false self.hideInterface = false @@ -264,14 +265,19 @@ function Configuration:init() self.chatFontSize = 18 - self.fontName = "LuaMenu/widgets/chili/skins/Evolved/fonts/n019003l.pfb" + self.fontName = "LuaMenu/widgets/chili/skins/Evolved/fonts/Geist-Regular.ttf" self.fontRaw = { - [0] = {size = 10, shadow = false}, - [1] = {size = 14, shadow = false}, - [2] = {size = 18, shadow = false}, - [3] = {size = 22, shadow = false}, - [4] = {size = 32, shadow = false}, - [5] = {size = 48, shadow = false}, + [0] = {size = 11, shadow = true}, + [1] = {size = 14, shadow = true}, + [2] = {size = 18, shadow = true}, + [3] = {size = 22, shadow = true}, + [4] = {size = 30, shadow = true}, + [5] = {size = 48, shadow = true}, + + [6] = {size = 18, shadow = false}, + [7] = {size = 22, shadow = false}, + + [8] = {size = 14, shadow = false}, } self.fontSpecial = {} @@ -280,10 +286,9 @@ function Configuration:init() self.font[i] = WG.Chili.Font:New { size = self.fontRaw[i].size, font = self.fontName, - color = {1,1,1,1}, - outlineColor = {0.05,0.05,0.05,0.9}, - outline = false, - shadow = false, + outlineColor = self.fontRaw[i].outlineColor or {0.05,0.05,0.05,0.7}, + outline = self.fontRaw[i].outline, + shadow = self.fontRaw[i].shadow, } end @@ -797,7 +802,12 @@ end function Configuration:GetButtonFont(sizeScale, specialName, specialData, rawSize) specialName = (specialName or "") .. "_button_" .. sizeScale specialData = specialData or {} - specialData.outline = true + -- specialData.outline = true + -- specialData.outline = false + -- specialData.outlineColor = {1,1,1,.025} + -- specialData.outlineWidth = 10 + -- specialData.outlineHeight = 10 + specialData.shadow = true specialData.outlineWidth = 2 specialData.outlineHeight = 3 return self:GetFont(sizeScale, specialName, specialData, rawSize) @@ -929,9 +939,11 @@ end function Configuration:GetHeadingImage(fullscreenMode, title) local subheadings = self.gameConfig.subheadings if fullscreenMode then - return (subheadings and subheadings.large and subheadings.large[title]) or self.gameConfig.headingLarge + -- return (subheadings and subheadings.large and subheadings.large[title]) or self.gameConfig.headingLarge + return self.gameConfig.headingLarge else - return (subheadings and subheadings.small and subheadings.small[title]) or self.gameConfig.headingSmall + -- return (subheadings and subheadings.small and subheadings.small[title]) or self.gameConfig.headingSmall + return self.gameConfig.headingSmall end end diff --git a/LuaMenu/widgets/chobby/components/console.lua b/LuaMenu/widgets/chobby/components/console.lua index 03fb2364c..11f1a4ad8 100644 --- a/LuaMenu/widgets/chobby/components/console.lua +++ b/LuaMenu/widgets/chobby/components/console.lua @@ -36,7 +36,9 @@ function Console:init(channelName, sendMessageListener, noHistoryLoad, onResizeF lineSpacing = 2, bottom = 0, text = "", - objectOverrideFont = Configuration:GetFont(Configuration.chatFontSize, "console_" .. Configuration.chatFontSize, false, true), + objectOverrideFont = Configuration:GetFont(Configuration.chatFontSize, "console_" .. Configuration.chatFontSize, { + shadow = true, + }, true), parent = self.spHistory, selectable = true, subTooltips = true, diff --git a/LuaMenu/widgets/chobby/components/interface_root.lua b/LuaMenu/widgets/chobby/components/interface_root.lua index 67d79f7d6..55c108227 100644 --- a/LuaMenu/widgets/chobby/components/interface_root.lua +++ b/LuaMenu/widgets/chobby/components/interface_root.lua @@ -12,8 +12,8 @@ function GetInterfaceRoot(optionsParent, mainWindowParent, fontFunction) local userStatusPanelWidth = 250 local battleStatusWidth = 480 - local panelButtonsWidth = 560 --578 - local panelButtonsHeight = 42 + local panelButtonsWidth = 564 --578 + local panelButtonsHeight = 48 local panelButtonsRightPad = 4 local chatTabHolderHeight = 41 @@ -46,7 +46,7 @@ function GetInterfaceRoot(optionsParent, mainWindowParent, fontFunction) local statusButtonWidth = 290 local statusButtonWidthSmall = 290 - local topBarHeight = 86 + local topBarHeight = 60 -- Switch to single panel mode when below the minimum screen width local minScreenWidth = 1360 @@ -196,7 +196,7 @@ function GetInterfaceRoot(optionsParent, mainWindowParent, fontFunction) local status_panelButtons = Control:New { bottom = 0, right = 0, - width = panelButtonsWidth, + width = panelButtonsWidth + 10, height = panelButtonsHeight, name = "status_panelButtons", parent = holder_status, @@ -279,7 +279,7 @@ function GetInterfaceRoot(optionsParent, mainWindowParent, fontFunction) } local buttonsHolder_buttons = Control:New { x = "0%", - y = buttonsDoubleOffsetRel, + y = 0, width = "100%", height = "100%", name = "buttonsHolder_buttons", @@ -404,7 +404,7 @@ function GetInterfaceRoot(optionsParent, mainWindowParent, fontFunction) -- Background holder is put here to be at the back ----------------------------------- local backgroundHolder = Background(nil, nil, nil, "menuBackgroundBrightness") - local ingameBackgroundHolder = Background(IMAGE_TOP_BACKGROUND, {0, 0, 0, 0.82}, nil, "gameOverlayOpacity") + local ingameBackgroundHolder = Background(IMAGE_TOP_BACKGROUND, {0, 0, 0, 0.3}, nil, "gameOverlayOpacity") ingameBackgroundHolder:Disable() ------------------------------------------------------------------- @@ -587,7 +587,7 @@ function GetInterfaceRoot(optionsParent, mainWindowParent, fontFunction) status_panelButtons:AddChild(panelButtons_buttons) panelButtons_buttons:SetPosRelative("0%","0%", "100%","100%") - buttonsHolder_buttons:SetPosRelative("0%", buttonsDoubleOffsetRel, "100%","100%") + buttonsHolder_buttons:SetPosRelative("0%", "0%", "100%","100%") -- Make Main Window take up more space status_panelButtons:Show() @@ -725,7 +725,7 @@ function GetInterfaceRoot(optionsParent, mainWindowParent, fontFunction) submenuWindow_mainContent._relativeBounds.bottom = bottomPad submenuWindow_mainContent:UpdateClientArea() - status_panelButtons._relativeBounds.right = panelButtonsRightPad -- rightPad + status_panelButtons._relativeBounds.right = rightPad rightPanel_window:UpdateClientArea() buttons_exit._relativeBounds.bottom = (bottomPad > 0 and bottomPad) or 4 @@ -887,6 +887,7 @@ function GetInterfaceRoot(optionsParent, mainWindowParent, fontFunction) right = 3, width = 108, height = 38, + classname = "action_button", name = "switchToMenuButton", caption = "Menu", objectOverrideFont = WG.Chobby.Configuration:GetFont(3), @@ -905,7 +906,8 @@ function GetInterfaceRoot(optionsParent, mainWindowParent, fontFunction) x = "50.12%", right = "30%", y = 3, - bottom = 11, + bottom = 5, + classname = "option_button", name = "switchToGameButton", caption = "Return to Battle", objectOverrideFont = WG.Chobby.Configuration:GetFont(4), @@ -924,7 +926,8 @@ function GetInterfaceRoot(optionsParent, mainWindowParent, fontFunction) x = "30%", right = "50.12%", y = 3, - bottom = 11, + bottom = 5, + classname = "action_button", name = "leaveGameButton", caption = "Leave Battle", objectOverrideFont = WG.Chobby.Configuration:GetFont(4), @@ -935,7 +938,7 @@ function GetInterfaceRoot(optionsParent, mainWindowParent, fontFunction) OnClick = { function () - ConfirmationPopup(LeaveGameFunction, "Are you sure you want to leave the game?", nil, 315, 200) + ConfirmationPopup(LeaveGameFunction, "Are you sure you want to leave the match?", nil, 315, 200) end } } diff --git a/LuaMenu/widgets/chobby/components/list_window.lua b/LuaMenu/widgets/chobby/components/list_window.lua index 4818f7982..b7eccadb8 100644 --- a/LuaMenu/widgets/chobby/components/list_window.lua +++ b/LuaMenu/widgets/chobby/components/list_window.lua @@ -45,11 +45,10 @@ function ListWindow:init(parent, title, noWindow, windowClassname, noClose, cust self.btnClose = Button:New { right = 11, y = WG.TOP_BUTTON_Y, - width = 80, + width = WG.BUTTON_HEIGHT, height = WG.BUTTON_HEIGHT, - caption = i18n("close"), - objectOverrideFont = Configuration:GetButtonFont(3), - classname = "negative_button", + caption = "", + classname = "close_button", OnClick = { function() self.CancelFunc() diff --git a/LuaMenu/widgets/chobby/components/tab_panel_handler.lua b/LuaMenu/widgets/chobby/components/tab_panel_handler.lua index 82469b768..638a2feb0 100644 --- a/LuaMenu/widgets/chobby/components/tab_panel_handler.lua +++ b/LuaMenu/widgets/chobby/components/tab_panel_handler.lua @@ -23,19 +23,19 @@ function GetTabPanelHandler(name, conf) local BUTTON_SIDE_SPACING = 1 local yellowFontParams = { - outline = true, - outlineColor = {0.8,1,0,1}, + --outline = true, + --outlineColor = {0.8,1,0,1}, color = {0.8,1,0,1}, } local whiteFontParams = { - outline = true, - outlineColor = {1,1,1,1}, + --outline = true, + --outlineColor = {1,1,1,1}, color = {1,1,1,1}, } local redFontParams = { - outline = true, - outlineColor = {1,0,0,1}, - color = {1,0,0,1}, + --outline = true, + --outlineColor = {1,.16,.16,1}, + color = {1,.16,.16,1}, } ------------------------------------------------------------------- diff --git a/LuaMenu/widgets/chobby/i18n/chililobby.lua b/LuaMenu/widgets/chobby/i18n/chililobby.lua index a38e5f6b3..d5aab0eaf 100644 --- a/LuaMenu/widgets/chobby/i18n/chililobby.lua +++ b/LuaMenu/widgets/chobby/i18n/chililobby.lua @@ -90,7 +90,7 @@ return { help = "Help", about = "About", links = "Links", - load_saved_game = "Load saved game", + load_saved_game = "Load Saved Games", time_ingame = "Time ingame", missions = "Missions", tutorials = "Tutorials", diff --git a/LuaMenu/widgets/chobby/images/left.png b/LuaMenu/widgets/chobby/images/left.png index 7e26c3dc9..34f2ae145 100644 Binary files a/LuaMenu/widgets/chobby/images/left.png and b/LuaMenu/widgets/chobby/images/left.png differ diff --git a/LuaMenu/widgets/chobby/images/left.psd b/LuaMenu/widgets/chobby/images/left.psd deleted file mode 100644 index 11dc55d82..000000000 Binary files a/LuaMenu/widgets/chobby/images/left.psd and /dev/null differ diff --git a/LuaMenu/widgets/chobby/images/left.svg b/LuaMenu/widgets/chobby/images/left.svg new file mode 100644 index 000000000..7a0a85149 --- /dev/null +++ b/LuaMenu/widgets/chobby/images/left.svg @@ -0,0 +1,75 @@ + + + + + + + + + + + + + + + + diff --git a/LuaMenu/widgets/chobby/images/left_final.kra b/LuaMenu/widgets/chobby/images/left_final.kra new file mode 100644 index 000000000..4852fa941 Binary files /dev/null and b/LuaMenu/widgets/chobby/images/left_final.kra differ diff --git a/LuaMenu/widgets/chobby/images/licence_ok b/LuaMenu/widgets/chobby/images/licence_ok index b6198adaf..7858c20ea 100644 --- a/LuaMenu/widgets/chobby/images/licence_ok +++ b/LuaMenu/widgets/chobby/images/licence_ok @@ -24,4 +24,9 @@ Licence: creativecommons.org/licenses/by/3.0/QD download.png -default_background.png (self made) \ No newline at end of file +default_background.png (self made) + +The following icons along with their respective Krita (.kra) and SVG (.svg) sources were authored by cabinboy (CC-BY-SA): + +lock.png +left.png diff --git a/LuaMenu/widgets/chobby/images/lock.png b/LuaMenu/widgets/chobby/images/lock.png index 4892b0235..30999a174 100644 Binary files a/LuaMenu/widgets/chobby/images/lock.png and b/LuaMenu/widgets/chobby/images/lock.png differ diff --git a/LuaMenu/widgets/chobby/images/lock.svg b/LuaMenu/widgets/chobby/images/lock.svg new file mode 100644 index 000000000..996530175 --- /dev/null +++ b/LuaMenu/widgets/chobby/images/lock.svg @@ -0,0 +1,99 @@ + + + + + + + + + + + + + + + + + + + diff --git a/LuaMenu/widgets/chobby/images/lock_final.kra b/LuaMenu/widgets/chobby/images/lock_final.kra new file mode 100644 index 000000000..a1ccc05b5 Binary files /dev/null and b/LuaMenu/widgets/chobby/images/lock_final.kra differ diff --git a/LuaMenu/widgets/chobby/utilities/buttons.lua b/LuaMenu/widgets/chobby/utilities/buttons.lua index 8de217a51..d98bf2e07 100644 --- a/LuaMenu/widgets/chobby/utilities/buttons.lua +++ b/LuaMenu/widgets/chobby/utilities/buttons.lua @@ -1,11 +1,14 @@ ButtonUtilities = ButtonUtilities or {} -local COLOR_CLASS = { - positive_button = true, - negative_button = true, +local VOTE_CLASS = { option_button = true, - action_button = true, + yes_button = true, + no_button = true, +} + +local STATE_CLASS = { + button_highlight = true, } function ButtonUtilities.SetButtonSelected(button) @@ -17,6 +20,7 @@ function ButtonUtilities.SetButtonSelected(button) if not button.highlighted then button.oldCaption = button.oldCaption or button.caption button.oldBackgroundColor = button.oldBackgroundColor or button.backgroundColor + button.oldBorderColor = button.oldBorderColor or button.borderColor button.oldFont = button.oldFont or button.font end @@ -25,18 +29,23 @@ function ButtonUtilities.SetButtonSelected(button) button:SetCaption(Configuration:GetSelectedColor() .. button.oldCaption .. "\b") button.font = Configuration:GetFont(button.oldFont.size, "button_highlight", { - outlineWidth = 6, - outlineHeight = 6, - outline = true, - outlineColor = {0,0,0,0.8}, + --outlineWidth = 10, + --outlineHeight = 10, + --outline = true, + --outlineColor = {0,0,0,0.8}, + --outlineColor = {1,1,1,.03}, autoOutlineColor = false, }, true) - if COLOR_CLASS[button.classname] then - local col = button.backgroundColor - button.backgroundColor = {(1 + col[1])*0.5, (1 + col[2])*0.5, (1 + col[3])*0.5, (1 + col[4])*0.5} + local selected_color = Configuration:GetButtonSelectedColor() + if VOTE_CLASS[button.classname] then + button.borderColor = button.focusColor + elseif STATE_CLASS[button.classname] then + -- button.borderColor = {selected_color[1] * (4/3), selected_color[2] * (4/3), selected_color[3] * (4/3), selected_color[4]} + button.borderColor = {1,1,1,.80} else - button.backgroundColor = Configuration:GetButtonSelectedColor() + -- button.borderColor = selected_color + button.borderColor = {1,1,1,.60} end button:Invalidate() end @@ -49,7 +58,7 @@ function ButtonUtilities.SetButtonHighlighted(button) local Configuration = WG.Chobby.Configuration if not button.selected then button.oldCaption = button.oldCaption or button.caption - button.oldBackgroundColor = button.oldBackgroundColor or button.backgroundColor + button.oldBorderColor = button.oldBorderColor or button.borderColor button.oldFont = button.oldFont or button.font end @@ -75,7 +84,7 @@ function ButtonUtilities.SetButtonDeselected(button) end button.oldCaption = button.oldCaption or button.caption - button.oldBackgroundColor = button.oldBackgroundColor or button.backgroundColor + button.oldBorderColor = button.oldBorderColor or button.borderColor button.oldFont = button.oldFont or button.font button.selected = false @@ -83,7 +92,7 @@ function ButtonUtilities.SetButtonDeselected(button) button:SetCaption(button.oldCaption) button.font = button.oldFont - button.backgroundColor = button.oldBackgroundColor + button.borderColor = button.oldBorderColor button:Invalidate() end diff --git a/LuaMenu/widgets/dbg_img_preload.lua b/LuaMenu/widgets/dbg_img_preload.lua index 79fcd17ea..16678fdb5 100644 --- a/LuaMenu/widgets/dbg_img_preload.lua +++ b/LuaMenu/widgets/dbg_img_preload.lua @@ -9,8 +9,8 @@ function widget:GetInfo() date = "@2009", license = "GPLv2", layer = 1000, - enabled = true, -- loaded by default? - alwaysStart = true, + enabled = false, -- loaded by default? + alwaysStart = false, } end @@ -42,6 +42,8 @@ function widget:Update() MaybeAddFile(LUA_DIRNAME .. "images/heic1403aDowngrade.jpg") AddDir("LuaMenu/widgets/chili/skins/evolved") AddDir("LuaMenu/images") + AddDir("LuaMenu/images/flags") + AddDir("LuaMenu/images/ranks") AddDir("LuaMenu/images/planets") AddDir("LuaMenu/images/starbackgrounds") AddDir("LuaMenu/configs/gameConfig/zk/unitpics") diff --git a/LuaMenu/widgets/gui_battle_room_window.lua b/LuaMenu/widgets/gui_battle_room_window.lua index 43819324a..7a0461bab 100644 --- a/LuaMenu/widgets/gui_battle_room_window.lua +++ b/LuaMenu/widgets/gui_battle_room_window.lua @@ -94,17 +94,18 @@ local function SetupInfoButtonsPanel(leftInfo, rightInfo, battle, battleID, myUs local minimapBottomClearance = 141 local currentMapName - local mapLinkWidth = 150 + local mapLinkWidth = 160 local btnMapLink = Button:New { - x = 3, + x = 0, y = 0, - right = 3, - height = 36, - classname = "button_square", + right = 0, + height = 46, + classname = "glow", caption = "", - padding = {0, 0, 0, 0}, + padding = {5, 5, 5, 5}, parent = rightInfo, + tooltip = "View additional map details on the website.", OnClick = { function () if currentMapName and config.gameConfig.link_particularMapPage ~= nil then @@ -135,8 +136,8 @@ local function SetupInfoButtonsPanel(leftInfo, rightInfo, battle, battleID, myUs local imMapLink = Image:New { x = 0, y = 1, - width = 18, - height = 18, + width = 32, + height = 32, keepAspect = true, file = IMG_LINK, parent = btnMapLink, @@ -160,7 +161,7 @@ local function SetupInfoButtonsPanel(leftInfo, rightInfo, battle, battleID, myUs tbMapInfo:SetText("") end local length = tbMapName.font:GetTextWidth(mapName) - imMapLink:SetPos(length + 5) + imMapLink:SetPos(mapLinkWidth - 35) end SetMapName(battle.mapName, mapLinkWidth) @@ -181,10 +182,11 @@ local function SetupInfoButtonsPanel(leftInfo, rightInfo, battle, battleID, myUs y = 0, right = 0, bottom = 0, - classname = "button_square", caption = "", + classname = "glow", parent = minimapPanel, - padding = {2,2,2,2}, + padding = {4,4,4,4}, + tooltip = "Select a new map.", OnClick = { function() WG.MapListPanel.Show(battleLobby, battle.mapName) @@ -1197,7 +1199,6 @@ local function SetupVotePanel(votePanel, battle, battleID) y = 0, right = 0, bottom = 0, - classname = "button_square", caption = "", parent = minimapPanel, padding = {1,1,1,1}, @@ -1245,7 +1246,7 @@ local function SetupVotePanel(votePanel, battle, battleID) bottom = 0, width = height, noFont = true, - classname = "positive_button", + classname = "yes_button", OnClick = { function (obj) ButtonUtilities.SetButtonSelected(obj) @@ -1258,16 +1259,16 @@ local function SetupVotePanel(votePanel, battle, battleID) end }, padding = {10,10,10,10}, - children = { - Image:New { - x = 0, - y = 0, - right = 0, - bottom = 0, - autosize = true, - file = IMG_READY, - } - }, +-- children = { +-- Image:New { +-- x = 0, +-- y = 0, +-- right = 0, +-- bottom = 0, +-- autosize = true, +-- file = IMG_READY, +-- } +-- }, parent = activePanel, } offset = offset + height @@ -1278,7 +1279,7 @@ local function SetupVotePanel(votePanel, battle, battleID) bottom = 0, width = height, noFont = true, - classname = "negative_button", + classname = "no_button", OnClick = { function (obj) ButtonUtilities.SetButtonSelected(obj) @@ -1291,15 +1292,15 @@ local function SetupVotePanel(votePanel, battle, battleID) end }, padding = {10,10,10,10}, - children = { - Image:New { - x = 0, - y = 0, - right = 0, - bottom = 0, - file = IMG_UNREADY, - } - }, +-- children = { +-- Image:New { +-- x = 0, +-- y = 0, +-- right = 0, +-- bottom = 0, +-- file = IMG_UNREADY, +-- } +-- }, parent = activePanel, } offset = offset + height @@ -1813,7 +1814,7 @@ local function InitializeControls(battleID, oldLobby, topPoportion, setupData) right = "33%", bottom = 0, height = BOTTOM_SPACING, - padding = {EXTERNAL_PAD_HOR, INTERNAL_PAD, 1, INTERNAL_PAD}, + padding = {EXTERNAL_PAD_HOR - 1, INTERNAL_PAD, 2, INTERNAL_PAD}, parent = topPanel, } @@ -1833,7 +1834,7 @@ local function InitializeControls(battleID, oldLobby, topPoportion, setupData) y = 0, right = 0, bottom = 0, - padding = {1, EXTERNAL_PAD_VERT, EXTERNAL_PAD_HOR, INTERNAL_PAD}, + padding = {1, EXTERNAL_PAD_VERT, EXTERNAL_PAD_HOR - 1, INTERNAL_PAD}, parent = topPanel, } @@ -1842,11 +1843,11 @@ local function InitializeControls(battleID, oldLobby, topPoportion, setupData) local btnQuitBattle = Button:New { right = 11, y = WG.TOP_BUTTON_Y, - width = 80, + width = (isSingleplayer and WG.BUTTON_HEIGHT) or 80, height = WG.BUTTON_HEIGHT, objectOverrideFont = Configuration:GetButtonFont(3), - caption = (isSingleplayer and i18n("close")) or i18n("leave"), - classname = "negative_button", + caption = (isSingleplayer and "") or i18n("leave"), + classname = (isSingleplayer and "close_button") or "action_button", OnClick = { function() battleLobby:LeaveBattle() @@ -1856,7 +1857,7 @@ local function InitializeControls(battleID, oldLobby, topPoportion, setupData) } local btnInviteFriends = Button:New { - right = 98, + right = (isSingleplayer and 59) or 98, y = WG.TOP_BUTTON_Y, width = 180, height = WG.BUTTON_HEIGHT, @@ -1981,7 +1982,7 @@ local function InitializeControls(battleID, oldLobby, topPoportion, setupData) parent = bottomPanel, } - local CHAT_MENTION = "\255\255\0\0" + local CHAT_MENTION = "\255\120\250\110" local CHAT_ME = Configuration.meColor -- External Functions diff --git a/LuaMenu/widgets/gui_battle_status_panel.lua b/LuaMenu/widgets/gui_battle_status_panel.lua index bc12f954a..7854f3ac9 100644 --- a/LuaMenu/widgets/gui_battle_status_panel.lua +++ b/LuaMenu/widgets/gui_battle_status_panel.lua @@ -97,7 +97,7 @@ local function GetBattleInfoHolder(parent, battleID) y = 2, width = 73, height = 73, - padding = {1,1,1,1}, + padding = {3,3,3,3}, parent = mainControl, } @@ -139,9 +139,9 @@ local function GetBattleInfoHolder(parent, battleID) lblTitle:SetPos(36, 1, 150) lblPlayerStatus.font = Configuration:GetFont(1) - lblPlayerStatus:SetPos(58, 18) + lblPlayerStatus:SetPos(58, 19) - imPlayerStatus:SetPos(43, 18, 12, 12) + imPlayerStatus:SetPos(43, 17, 12, 12) lblPlayers.font = Configuration:GetFont(1) lblPlayers:SetPos(165, 18) @@ -154,16 +154,16 @@ local function GetBattleInfoHolder(parent, battleID) lblTitle:SetPos(76, 2, 225) lblPlayerStatus.font = Configuration:GetFont(2) - lblPlayerStatus:SetPos(103, 26) + lblPlayerStatus:SetPos(103, 27) - imPlayerStatus:SetPos(82, 26, 18, 18) + imPlayerStatus:SetPos(82, 25, 18, 18) lblPlayers.font = Configuration:GetFont(2) lblPlayers:SetPos(80, 48) playersPrefix = PLAYER_PREFIX_BIG end - local text = StringUtilities.GetTruncatedStringWithDotDot(battle.title, lblTitle.font, smallMode and 160 or 130) + local text = StringUtilities.GetTruncatedStringWithDotDot(battle.title, lblTitle.font, smallMode and 160 or 200) lblTitle:SetCaption(text) lblPlayers:SetCaption(playersPrefix .. lobby:GetBattlePlayerCount(battleID) .. "/" .. battle.maxPlayers) @@ -253,11 +253,12 @@ local function InitializeControls(parentControl) local statusWindowHandler = WG.Chobby.interfaceRoot.GetBattleStatusWindowHandler() local infoHolder = Panel:New { - x = 68, + x = 3, right = 4, - y = 4, + y = 3, bottom = 4, parent = parentControl, + classname = "empty", resizable = false, draggable = false, padding = {0, 0, 0, 0}, @@ -375,7 +376,7 @@ function BattleStatusPanel.GetControl(fontSizeScale) bottom = 0, padding = {0,0,0,0}, objectOverrideFont = WG.Chobby.Configuration:GetFont(fontSizeScale), - caption = "Battle ", + caption = "", OnParent = { function(obj) if obj:IsEmpty() then diff --git a/LuaMenu/widgets/gui_benchmark_handler.lua b/LuaMenu/widgets/gui_benchmark_handler.lua index ec9addf95..8dfcaa007 100644 --- a/LuaMenu/widgets/gui_benchmark_handler.lua +++ b/LuaMenu/widgets/gui_benchmark_handler.lua @@ -169,11 +169,10 @@ local function InitializeControls(parentControl) Button:New { right = 11, y = WG.TOP_BUTTON_Y, - width = 80, + width = WG.BUTTON_HEIGHT, height = WG.BUTTON_HEIGHT, - objectOverrideFont = Configuration:GetButtonFont(3), - caption = i18n("close"), - classname = "negative_button", + caption = "", + classname = "close_button", OnClick = { function() parentControl:Hide() @@ -194,7 +193,7 @@ local function InitializeControls(parentControl) height = 50, caption = benchmarkData[i].humanName, objectOverrideFont = Configuration:GetButtonFont(3), - classname = "action_button", + classname = "small_action_button", OnClick = { function() benchmarkData = VFS.Include("benchmarks/config.lua") diff --git a/LuaMenu/widgets/gui_campaign_codex_handler.lua b/LuaMenu/widgets/gui_campaign_codex_handler.lua index 341e6666c..6143cca1c 100644 --- a/LuaMenu/widgets/gui_campaign_codex_handler.lua +++ b/LuaMenu/widgets/gui_campaign_codex_handler.lua @@ -204,11 +204,10 @@ local function InitializeControls(parentControl) local btnClose = Button:New { right = 11, y = WG.TOP_BUTTON_Y, - width = 80, + width = WG.BUTTON_HEIGHT, height = WG.BUTTON_HEIGHT, - caption = i18n("close"), - objectOverrideFont = Configuration:GetButtonFont(3), - classname = "negative_button", + caption = "", + classname = "close_button", OnClick = { function() parentControl:Hide() diff --git a/LuaMenu/widgets/gui_campaign_commander_loadout.lua b/LuaMenu/widgets/gui_campaign_commander_loadout.lua index cef97f55c..6cdd95d24 100644 --- a/LuaMenu/widgets/gui_campaign_commander_loadout.lua +++ b/LuaMenu/widgets/gui_campaign_commander_loadout.lua @@ -521,11 +521,10 @@ local function InitializeControls(parentControl) local btnClose = Button:New { right = 11, y = WG.TOP_BUTTON_Y, - width = 80, + width = WG.BUTTON_HEIGHT, height = WG.BUTTON_HEIGHT, - caption = i18n("close"), - objectOverrideFont = Configuration:GetButtonFont(3), - classname = "negative_button", + caption = "", + classname = "close_button", OnClick = { function() parentControl:Hide() diff --git a/LuaMenu/widgets/gui_campaign_handler.lua b/LuaMenu/widgets/gui_campaign_handler.lua index ae3cb80e1..4454e4b03 100644 --- a/LuaMenu/widgets/gui_campaign_handler.lua +++ b/LuaMenu/widgets/gui_campaign_handler.lua @@ -18,10 +18,10 @@ local DEBUG_SHOW_INGAME_BRIEF = false local GALAXY_IMAGE = LUA_DIRNAME .. "images/heic1403aDowngrade.jpg" local IMAGE_BOUNDS = { - x = 810/4000, - y = 710/2602, - width = 2400/4000, - height = 1500/2602, + x = 0.2025, + y = 0.2725, + width = 0.6, + height = 0.56, } local TRANSFORM_BOUNDS = { @@ -42,12 +42,14 @@ local difficultyNameMap = { local edgeDrawList = 0 local planetConfig, planetAdjacency, planetEdgeList -local ACTIVE_COLOR = {0,1,0,0.75} -local INACTIVE_COLOR = {0.2, 0.2, 0.2, 0.75} +local ACTIVE_COLOR = {104/255, 107/255, 190/255, 1} +local BORDER_COLOR = {1, 0.2, 0.2, 1} +local INACTIVE_COLOR = {47/255, 39/255, 48/255, 0.6} local HIDDEN_COLOR = {0.2, 0.2, 0.2, 0} +local OUTLINE_COLOR = {0, 0, 0, 0.90} local PLANET_START_COLOR = {1, 1, 1, 1} -local PLANET_NO_START_COLOR = {0.5, 0.5, 0.5, 1} +local PLANET_NO_START_COLOR = {0.40, 0.40, 0.55, 1} local TARGET_IMAGE = LUA_DIRNAME .. "images/nicecircle.png" local IMG_LINK = LUA_DIRNAME .. "images/link.png" @@ -89,7 +91,22 @@ local function DrawEdgeLines() local planetData = planetList[pid] local hidden = not (planetData and planetData.GetVisible()) -- Note that planets not in the whitelist have planetData = nil local x, y = planetHandler.GetZoomTransform(planetConfig[pid].mapDisplay.x, planetConfig[pid].mapDisplay.y) - gl.Color((hidden and HIDDEN_COLOR) or (planetData.GetCaptured() and ACTIVE_COLOR) or INACTIVE_COLOR) + gl.Color((hidden and HIDDEN_COLOR) or (planetData.GetCaptured() and ACTIVE_COLOR) or (planetData.GetCapturedOrStarable_Unsafe() and BORDER_COLOR) or INACTIVE_COLOR) + gl.Vertex(x, y) + end + end + end +end + +local function DrawEdgeLineOutline() + for i = 1, #planetEdgeList do + if IsEdgeVisible(planetEdgeList[i][1], planetEdgeList[i][2]) then + for p = 1, 2 do + local pid = planetEdgeList[i][p] + local planetData = planetList[pid] + local hidden = not (planetData and planetData.GetVisible()) -- Note that planets not in the whitelist have planetData = nil + local x, y = planetHandler.GetZoomTransform(planetConfig[pid].mapDisplay.x, planetConfig[pid].mapDisplay.y) + gl.Color((hidden and HIDDEN_COLOR) or OUTLINE_COLOR) gl.Vertex(x, y) end end @@ -100,9 +117,15 @@ local function CreateEdgeList() gl.BeginEnd(GL.LINES, DrawEdgeLines) end +local function CreateEdgeListOutline() + gl.BeginEnd(GL.LINES, DrawEdgeLineOutline) +end + local function UpdateEdgeList() gl.DeleteList(edgeDrawList) + gl.DeleteList(edgeDrawListOutline) edgeDrawList = gl.CreateList(CreateEdgeList) + edgeDrawListOutline = gl.CreateList(CreateEdgeListOutline) planetHandler.SendEdgesToBack() end @@ -182,12 +205,12 @@ local function MakeFeedbackButton(parentControl, link, x, y, right, bottom) local feedbackButton = Button:New { x = x, y = y, - right = right, + right = right - 35, bottom = bottom, width = 116, height = WG.BUTTON_HEIGHT, padding = {0, 0, 0, 0}, - caption = "Feedback ", + caption = "Feedback", classname = "option_button", objectOverrideFont = WG.Chobby.Configuration:GetButtonFont(2), tooltip = "Post feedback on the forum", @@ -199,15 +222,15 @@ local function MakeFeedbackButton(parentControl, link, x, y, right, bottom) parent = parentControl, } - local imMapLink = Image:New { - right = 6, - y = 13, - width = 16, - height = 16, - keepAspect = true, - file = IMG_LINK, - parent = feedbackButton, - } +-- local imMapLink = Image:New { +-- right = 6, +-- y = 13, +-- width = 16, +-- height = 16, +-- keepAspect = true, +-- file = IMG_LINK, +-- parent = feedbackButton, +-- } end -------------------------------------------------------------------------------- @@ -955,7 +978,7 @@ local function SelectPlanet(popupOverlay, planetHandler, planetID, planetData, s bottom = 32, resizable = false, draggable = false, - padding = {12, 7, 12, 7}, + padding = {5, 5, 5, 5}, } local planetName = string.upper(planetData.name) @@ -1015,8 +1038,8 @@ local function SelectPlanet(popupOverlay, planetHandler, planetID, planetData, s local buttonHolder = Control:New{ x = "50%", y = "4%", - right = "3%", - bottom = "4%", + right = "2%", + bottom = "3%", padding = {0,0,0,0}, parent = starmapInfoPanel, } @@ -1054,7 +1077,7 @@ local function SelectPlanet(popupOverlay, planetHandler, planetID, planetData, s height = 38, padding = {0, 0, 0, 0}, objectOverrideFont = Configuration:GetButtonFont(2), - caption = i18n("invite_friends") .. " ", + caption = i18n("invite_friends"), classname = "option_button", OnClick = { function() @@ -1063,15 +1086,15 @@ local function SelectPlanet(popupOverlay, planetHandler, planetID, planetData, s }, parent = buttonHolder, } - local imPartyLink = Image:New { - right = 6, - y = 4, - width = 24, - height = 24, - keepAspect = true, - file = PARTY_LINK, - parent = btnInviteFriends, - } +-- local imPartyLink = Image:New { +-- right = 6, +-- y = 4, +-- width = 24, +-- height = 24, +-- keepAspect = true, +-- file = PARTY_LINK, +-- parent = btnInviteFriends, +-- } end if planetData.tutorialSkip then @@ -1186,10 +1209,10 @@ local function SelectPlanet(popupOverlay, planetHandler, planetID, planetData, s Button:New{ y = 0, right = 0, - width = 80, + width = WG.BUTTON_HEIGHT, height = WG.BUTTON_HEIGHT, - classname = "negative_button", - caption = i18n("close"), + classname = "close_button_alt", + caption = "", objectOverrideFont = Configuration:GetButtonFont(3), OnClick = { CloseFunc @@ -1877,12 +1900,37 @@ local function InitializePlanetHandler(parent, newLiveTestingMode, newPlanetWhit gl.PushMatrix() gl.Translate(x, y, 0) gl.Scale(w, h, 1) - gl.LineWidth(3 * scale) + gl.LineWidth(4 * scale) gl.CallList(edgeDrawList) gl.PopMatrix() end, parent = window, } + + local graphOutline = Chili.Control:New{ + x = 0, + y = 0, + height = "100%", + width = "100%", + padding = {0,0,0,0}, + drawcontrolv2 = true, + DrawControl = function (obj) + local x = obj.x + local y = obj.y + local w = obj.width + local h = obj.height + + local _,_,scale = planetHandler.GetZoomTransformValues() + + gl.PushMatrix() + gl.Translate(x, y, 0) + gl.Scale(w, h, 1) + gl.LineWidth(6 * scale) + gl.CallList(edgeDrawListOutline) + gl.PopMatrix() + end, + parent = window, + } local function PlanetCaptured(listener, planetID) if (not PLANET_WHITELIST) or PLANET_WHITELIST[planetID] then @@ -1988,6 +2036,9 @@ local function InitializePlanetHandler(parent, newLiveTestingMode, newPlanetWhit if graph then graph:SendToBack() end + if graphOutline then + graphOutline:SendToBack() + end end function externalFunctions.GetParent() diff --git a/LuaMenu/widgets/gui_campaign_options.lua b/LuaMenu/widgets/gui_campaign_options.lua index 85c7b8e1d..79c2b1506 100644 --- a/LuaMenu/widgets/gui_campaign_options.lua +++ b/LuaMenu/widgets/gui_campaign_options.lua @@ -570,11 +570,10 @@ local function InitializeControls(window) local btnClose = Button:New { right = 11, y = WG.TOP_BUTTON_Y, - width = 80, + width = WG.BUTTON_HEIGHT, height = WG.BUTTON_HEIGHT, - caption = i18n("close"), - objectOverrideFont = WG.Chobby.Configuration:GetButtonFont(3), - classname = "negative_button", + caption = "", + classname = "close_button", OnClick = { function() window:Hide() @@ -584,7 +583,7 @@ local function InitializeControls(window) } local tabs = { - MakeTab("Save/Load", {WG.CampaignSaveWindow.GetControl()}), + MakeTab("Saves", {WG.CampaignSaveWindow.GetControl()}), --MakeStandardTab("Difficulty", InitializeDifficultyWindow), MakeStandardTab("Stats", InitializeStatsWindow), MakeStandardTab("Records", InitializeScoresWindow), diff --git a/LuaMenu/widgets/gui_campaign_saveload.lua b/LuaMenu/widgets/gui_campaign_saveload.lua index ea1c67da0..5a4699467 100644 --- a/LuaMenu/widgets/gui_campaign_saveload.lua +++ b/LuaMenu/widgets/gui_campaign_saveload.lua @@ -241,11 +241,11 @@ local function AddSaveEntryButton(saveFile, saveList) -- load button local loadButton = Button:New { x = 3, - y = 3, - bottom = 3, - width = 65, + y = 9, + bottom = 9, + width = 100, caption = i18n("load"), - classname = "action_button", + classname = "small_action_button", objectOverrideFont = WG.Chobby.Configuration:GetButtonFont(2), OnClick = { function() @@ -255,9 +255,30 @@ local function AddSaveEntryButton(saveFile, saveList) parent = container, } end + if current then + -- load button + local loadButton = Image:New { + x = 3, + y = 9, + bottom = 9, + width = 100, + classname = "simple_action_button", + objectOverrideFont = WG.Chobby.Configuration:GetButtonFont(2), + parent = container, + } + local lblCurrent = Label:New { + x = 9, + y = 9, + bottom = 9, + width = 100, + objectOverrideFont = WG.Chobby.Configuration:GetButtonFont(2), + caption = "Current", + parent = loadButton, + } + end -- save name - local x = 95 + local x = 130 local saveName = TextBox:New { name = "saveName", @@ -267,7 +288,7 @@ local function AddSaveEntryButton(saveFile, saveList) height = 20, valign = 'center', objectOverrideFont = Configuration:GetFont(3), - text = saveFile.commanderName .. (current and " \255\0\255\255(current)\008" or ""), + text = saveFile.commanderName, parent = container, } @@ -332,11 +353,11 @@ local function AddSaveEntryButton(saveFile, saveList) local deleteButton = Button:New { parent = container, right = 3, - width = 65, - y = 4, - bottom = 4, - caption = i18n("delete"), - classname = "action_button", + width = 51, + y = 12, + bottom = 12, + caption = "", + classname = "delete_button", objectOverrideFont = WG.Chobby.Configuration:GetButtonFont(2), OnClick = { function(self) @@ -375,7 +396,7 @@ local function InitializeControls(parent, saveMode) local listHolder = Control:New { x = 12, right = 6, - y = 60, + y = 66, bottom = 15, parent = parent, resizable = false, @@ -384,7 +405,7 @@ local function InitializeControls(parent, saveMode) } local headings = { - {name = "Name", x = 85, right = 215}, + {name = "Name", x = 110, right = 215}, {name = "Date", right = 100, width = 110}, } @@ -394,8 +415,8 @@ local function InitializeControls(parent, saveMode) local saveButton = Button:New { x = 5, y = 5, - width = 160, - height = 38, + width = 170, + height = 44, caption = i18n("new_campaign"), objectOverrideFont = Configuration:GetButtonFont(3), classname = "option_button", diff --git a/LuaMenu/widgets/gui_campaign_technology_panel.lua b/LuaMenu/widgets/gui_campaign_technology_panel.lua index 75b9af934..c7a3baa6d 100644 --- a/LuaMenu/widgets/gui_campaign_technology_panel.lua +++ b/LuaMenu/widgets/gui_campaign_technology_panel.lua @@ -253,11 +253,10 @@ local function InitializeControls(parentControl) local btnClose = Button:New { right = 11, y = WG.TOP_BUTTON_Y, - width = 80, + width = WG.BUTTON_HEIGHT, height = WG.BUTTON_HEIGHT, - caption = i18n("close"), - objectOverrideFont = Configuration:GetButtonFont(3), - classname = "negative_button", + caption = "", + classname = "close_button", OnClick = { function() parentControl:Hide() diff --git a/LuaMenu/widgets/gui_community_window.lua b/LuaMenu/widgets/gui_community_window.lua index de4d0fefc..985af8c83 100644 --- a/LuaMenu/widgets/gui_community_window.lua +++ b/LuaMenu/widgets/gui_community_window.lua @@ -98,7 +98,7 @@ local function AddLinkButton(scroll, name, tooltip, link, x, right, y, bottom) bottom = bottom, caption = name, tooltip = tooltip, - classname = "option_button", + classname = "link_button", align = "left", alignPadding = 0.12, objectOverrideFont = WG.Chobby.Configuration:GetButtonFont(3), @@ -385,25 +385,25 @@ local headingFormats = { buttonSize = 28, height = 24, linkSize = 16, - spacing = 2, + spacing = 4, buttonPos = 2, - inButton = 4, + inButton = 8, paragraphSpacing = 0, topHeadingOffset = 30, imageSize = 120, - buttonBot = 6, + buttonBot = 12, -- clickable area size }, [4] = { buttonSize = 40, height = 34, linkSize = 28, - spacing = 16, + spacing = 24, buttonPos = 5, - inButton = 7, + inButton = 14, paragraphSpacing = 30, topHeadingOffset = 50, imageSize = 120, - buttonBot = 10, + buttonBot = 20, }, } @@ -425,15 +425,15 @@ local function GetNewsEntry(parentHolder, index, headingSize, timeAsTooltip, sho local externalFunctions = {} function externalFunctions.AddEntry(entryData, parentPosition) - local textPos = 6 + local textPos = 12 local headingPos = 2 local offset = 0 if showBulletHeading then if not controls.bullet then controls.bullet = Image:New{ - x = 2, - y = offset + 5, + x = 5, + y = offset + 0 + headFormat.inButton, width = 16, height = 16, file = IMG_BULLET, @@ -451,10 +451,11 @@ local function GetNewsEntry(parentHolder, index, headingSize, timeAsTooltip, sho y = offset + 5, right = 2, height = headFormat.buttonSize, - classname = "button_square", caption = "", padding = {0, 0, 0, 0}, + backgroundColor = {0, 0, 0, 0}, parent = holder, + classname = "glow", OnClick = { function () WG.BrowserHandler.OpenUrl(linkString) @@ -467,7 +468,7 @@ local function GetNewsEntry(parentHolder, index, headingSize, timeAsTooltip, sho if not controls.heading then controls.heading = TextBox:New{ - x = 4, + x = 8, y = headFormat.inButton, right = 4, height = headFormat.height, @@ -487,8 +488,8 @@ local function GetNewsEntry(parentHolder, index, headingSize, timeAsTooltip, sho controls.linkImage = Image:New { x = 0, y = 5, - width = headFormat.linkSize, - height = headFormat.linkSize, + width = headFormat.linkSize + 10, + height = headFormat.linkSize + 10, keepAspect = true, file = IMG_LINK, parent = controls.linkButton, @@ -496,7 +497,9 @@ local function GetNewsEntry(parentHolder, index, headingSize, timeAsTooltip, sho end local length = controls.heading.font:GetTextWidth(entryData.heading) - controls.linkImage:SetPos(length + 8) + controls.linkImage:SetPos(6) + + controls.heading:SetPos(54) end if controls.freeHeading then @@ -536,7 +539,7 @@ local function GetNewsEntry(parentHolder, index, headingSize, timeAsTooltip, sho y = offset + 6, width = headFormat.imageSize, height = headFormat.imageSize, - keepAspect = true, + keepAspect = false, checkFileExists = not WG.Chobby.Configuration:ImageFileExists(imagePath), imageLoadTime = 5, keepCheckingForImage = true, @@ -604,7 +607,7 @@ local function GetNewsEntry(parentHolder, index, headingSize, timeAsTooltip, sho local offset = 0 if controls.bullet then - controls.bullet:SetPos(nil, offset + 5) + controls.bullet:SetPos(nil, offset + 0 + headFormat.inButton) end local headingSize @@ -780,10 +783,10 @@ local function InitializeControls(window) --LeaveIntentionallyBlank(rightLower, "(reserved)") -- Populate link panel - AddLinkButton(leftCenter, "Website", "Visit the Zero-K website.", "https://zero-k.info/", 0, 0, "75.5%", 0) - AddLinkButton(leftCenter, "Forum", "Browse or post on the forums.", "https://zero-k.info/Forum", 0, 0, "25.5%", "50.5%") - AddLinkButton(leftCenter, "Manual", "Read the manual and unit guide.", "https://zero-k.info/mediawiki/index.php?title=Manual", 0, 0, "50.5%", "25.5%") - AddLinkButton(leftCenter, "Discord", "Chat on the Zero-K Discord server.", "https://discord.gg/aab63Vt", 0, 0, 0, "75.5%") + AddLinkButton(leftCenter, "Website", "Visit the Zero-K website.", "https://zero-k.info/", 0, 0, "74.5%", 0) + AddLinkButton(leftCenter, "Forum", "Browse or post on the forums.", "https://zero-k.info/Forum", 0, 0, "24.5%", "49.5%") + AddLinkButton(leftCenter, "Manual", "Read the manual and unit guide.", "https://zero-k.info/mediawiki/index.php?title=Manual", 0, 0, "49.5%", "24.5%") + AddLinkButton(leftCenter, "Discord", "Chat on the Zero-K Discord server.", "https://discord.gg/aab63Vt", 0, 0, 0, "74.5%") -- News Handler diff --git a/LuaMenu/widgets/gui_download_window.lua b/LuaMenu/widgets/gui_download_window.lua index c86a1eb09..b23a674d2 100644 --- a/LuaMenu/widgets/gui_download_window.lua +++ b/LuaMenu/widgets/gui_download_window.lua @@ -32,9 +32,9 @@ local NAME_MAP = { active = "", connecting = "Connecting...", pending = "Queued", - cancel = "\255\255\255\0Cancelled", - fail = "\255\255\0\0Failed", - success = "\255\0\255\0Complete", + cancel = "\255\255\255\60Cancelled", + fail = "\255\255\40\40Failed", + success = "\255\40\255\40Complete", } local BUTTON_MAP = { diff --git a/LuaMenu/widgets/gui_friend_window.lua b/LuaMenu/widgets/gui_friend_window.lua index ca5ea3bf9..6c68bc545 100644 --- a/LuaMenu/widgets/gui_friend_window.lua +++ b/LuaMenu/widgets/gui_friend_window.lua @@ -60,7 +60,7 @@ local function AddLinkButton(scroll, name, tooltip, link, requireLogin, x, right bottom = bottom, caption = name, tooltip = tooltip, - classname = "option_button", + classname = "link_button", objectOverrideFont = WG.Chobby.Configuration:GetButtonFont(3), align = "left", alignPadding = 0.085, @@ -178,7 +178,7 @@ local function GetProfileHandler() parent = holder, } local nameHolder = Control:New{ - x = "36%", + x = "38%", y = 0, right = 0, height = 28, @@ -229,7 +229,7 @@ local function GetProfileHandler() x = "24%", y = yPos, right = "24%", - height = 26, + height = 32, value = 0, max = 1, caption = "Level " .. 2, @@ -342,15 +342,15 @@ local function InitializeControls(window) -- Populate link panel AddLinkButton(lowerLeft, "Edit Commander", "Edit custom commanders for use in games on the Zero-K server.", - "https://zero-k.info/My/Commanders", true, 0, 0, 0, "80.5%") + "https://zero-k.info/My/Commanders", true, 0, 0, 0, "79.5%") AddLinkButton(lowerLeft, "Ladder Ratings", "View detailed ladder statistics and charts.", - "https://zero-k.info/Charts/Ratings?RatingCategory=1&UserId=_USER_ID_", true, 0, 0, "20.5%", "60.5%") + "https://zero-k.info/Charts/Ratings?RatingCategory=1&UserId=_USER_ID_", true, 0, 0, "19.5%", "59.5%") AddLinkButton(lowerLeft, "Replay List", "View and comment on your recent games on the Zero-K server.", - "https://zero-k.info/Battles?Title=&Map=&PlayersFrom=&PlayersTo=&Age=0&Mission=0&Bots=0&Rank=8&Victory=0&UserId=_USER_ID_", true, 0, 0, "40.5%", "40.5%") + "https://zero-k.info/Battles?Title=&Map=&PlayersFrom=&PlayersTo=&Age=0&Mission=0&Bots=0&Rank=8&Victory=0&UserId=_USER_ID_", true, 0, 0, "39.5%", "39.5%") AddLinkButton(lowerLeft, "Recent Posts", "View your recently posted in forum threads.", - "https://zero-k.info/Forum?CategoryID=&Search=&OnlyUnread=false&User=_USER_NAME_&grorder=&grdesc=False&grpage=1", true, 0, 0, "60.5%", "20.5%") + "https://zero-k.info/Forum?CategoryID=&Search=&OnlyUnread=false&User=_USER_NAME_&grorder=&grdesc=False&grpage=1", true, 0, 0, "59.5%", "19.5%") AddLinkButton(lowerLeft, "Contact Admins", "Send a non-report message to the moderation team. If instead you want to report a player, click on their name and select 'Report' from the dropdown menu.", - "https://zero-k.info/Users/ReportToAdmin/_USER_ID_", true, 0, 0, "80.5%", 0) + "https://zero-k.info/Users/ReportToAdmin/_USER_ID_", true, 0, 0, "79.5%", 0) end -------------------------------------------------------------------------------- diff --git a/LuaMenu/widgets/gui_loadgame.lua b/LuaMenu/widgets/gui_loadgame.lua index 0d20bbdd7..24f5bf21f 100644 --- a/LuaMenu/widgets/gui_loadgame.lua +++ b/LuaMenu/widgets/gui_loadgame.lua @@ -246,11 +246,11 @@ local function AddSaveEntryButton(saveFile, saveList) -- load button local actionButton = Button:New { x = 3, - y = 3, - height = WG.BUTTON_HEIGHT, - width = 60, + y = 9, + bottom = 9, + width = 100, caption = i18n("load"), - classname = "action_button", + classname = "small_action_button", objectOverrideFont = WG.Chobby.Configuration:GetButtonFont(2), OnClick = { function() @@ -265,12 +265,12 @@ local function AddSaveEntryButton(saveFile, saveList) } -- save name - local x = 72 + local x = 130 local saveName = TextBox:New { name = "saveName", x = x, - y = 12, - width = 155, + y = 32, + right = 0, height = 20, valign = 'center', objectOverrideFont = Configuration:GetFont(2), @@ -283,11 +283,11 @@ local function AddSaveEntryButton(saveFile, saveList) local gameName = TextBox:New { name = "gameName", x = x, - y = 12, + y = 25, width = 90, height = 20, valign = 'center', - objectOverrideFont = Configuration:GetFont(1), + objectOverrideFont = Configuration:GetFont(2), text = saveFile.gameName .. "\n" .. saveFile.gameVersion, parent = container, } @@ -297,25 +297,25 @@ local function AddSaveEntryButton(saveFile, saveList) local saveDate = TextBox:New { name = "saveDate", x = x, - y = 12, + y = 25, width = 90, height = 20, valign = 'center', - objectOverrideFont = Configuration:GetFont(1), + objectOverrideFont = Configuration:GetFont(2), text = WriteDate(saveFile.date), parent = container, } -- save details - x = x + 90 + x = x + 120 local details = TextBox:New { name = "saveDetails", x = x, - y = 12, + y = 25, right = 68, height = 20, valign = 'center', - objectOverrideFont = Configuration:GetFont(1), + objectOverrideFont = Configuration:GetFont(2), text = GetSaveDescText(saveFile), parent = container, } @@ -323,12 +323,12 @@ local function AddSaveEntryButton(saveFile, saveList) -- delete button local deleteButton = Button:New { parent = container, - y = 4, - right = 0, - width = 60, - height = WG.BUTTON_HEIGHT, - caption = i18n("delete"), - classname = "action_button", + right = 3, + width = 53, + y = 12, + bottom = 12, + caption = "", + classname = "delete_button", objectOverrideFont = WG.Chobby.Configuration:GetButtonFont(2), OnClick = { function(self) WG.Chobby.ConfirmationPopup(function(self) DeleteSave(saveFile.filename, saveList) end, i18n("delete_confirm"), nil, 360, 200) @@ -383,9 +383,9 @@ local function InitializeControls(parent) } local headings = { - {name = "Name", x = 74, width = 150}, - {name = "Game", x = 74 + 155, width = 90}, - {name = "Date", x = 74 + 155 + 90, width = 90}, + {name = "Name", x = 130, width = 150}, + {name = "Game", x = 130 + 155, width = 90}, + {name = "Date", x = 130 + 155 + 90, width = 120}, } local saveList = WG.Chobby.SortableList(listHolder, headings, 80, 3, false) diff --git a/LuaMenu/widgets/gui_mission_handler.lua b/LuaMenu/widgets/gui_mission_handler.lua index 0f1a704ec..dc5e9461c 100644 --- a/LuaMenu/widgets/gui_mission_handler.lua +++ b/LuaMenu/widgets/gui_mission_handler.lua @@ -99,7 +99,7 @@ local function CreateMissionEntry(missionData) width = 65, height = 34, caption = i18n("play"), - classname = "action_button", + classname = "small_action_button", objectOverrideFont = WG.Chobby.Configuration:GetButtonFont(2), OnClick = { function() @@ -205,17 +205,16 @@ local function InitializeControls(parentControl) height = 30, parent = parentControl, objectOverrideFont = Configuration:GetFont(3), - caption = "Learn advanced techniques in these tutorials", + caption = "Game Tutorials", } local btnLeaveScreen = Button:New { right = 11, y = WG.TOP_BUTTON_Y, - width = 80, + width = WG.BUTTON_HEIGHT, height = WG.BUTTON_HEIGHT, - objectOverrideFont = WG.Chobby.Configuration:GetButtonFont(3), - caption = i18n("close"), - classname = "negative_button", + caption = "", + classname = "close_button", OnClick = { function() parentControl:Hide() diff --git a/LuaMenu/widgets/gui_modoptions_panel.lua b/LuaMenu/widgets/gui_modoptions_panel.lua index 8378730a7..bb8873c44 100644 --- a/LuaMenu/widgets/gui_modoptions_panel.lua +++ b/LuaMenu/widgets/gui_modoptions_panel.lua @@ -644,7 +644,7 @@ local function InitializeModoptionsDisplay() right = 1, y = 1, autoresize = true, - objectOverrideFont = WG.Chobby.Configuration:GetFont(1), + objectOverrideFont = WG.Chobby.Configuration:GetFont(8), text = "", parent = mainScrollPanel, } @@ -655,7 +655,7 @@ local function InitializeModoptionsDisplay() modoptions = modoptions or {} for key, value in pairs(modoptions) do if modoptionDefaults[key] == nil or modoptionDefaults[key] ~= value then - text = text .. "\255\120\120\120" .. tostring(key) .. " = \255\255\255\255" .. tostring(value) .. "\n" + text = text .. "\255\160\160\160" .. tostring(key) .. " = \255\255\255\255" .. tostring(value) .. "\n" empty = false end end diff --git a/LuaMenu/widgets/gui_planetwars_list_window.lua b/LuaMenu/widgets/gui_planetwars_list_window.lua index 3d8fd872f..5c0b1ba7e 100644 --- a/LuaMenu/widgets/gui_planetwars_list_window.lua +++ b/LuaMenu/widgets/gui_planetwars_list_window.lua @@ -21,7 +21,7 @@ local planetwarsSoon = false local planetwarsEnabled = false local planetwarsLevelRequired = false -local IMG_LINK = LUA_DIRNAME .. "images/link.png" +--local IMG_LINK = LUA_DIRNAME .. "images/link.png" local panelInterface local PLANET_NAME_LENGTH = 210 @@ -222,15 +222,15 @@ local function GetLinkButton(holder, x, y, width, text, link) objectOverrideFont = config:GetFont(3), parent = btnLink, } - local imgLink = Image:New { - x = 0, - y = 4, - width = 18, - height = 18, - keepAspect = true, - file = IMG_LINK, - parent = btnLink, - } +-- local imgLink = Image:New { +-- x = 0, +-- y = 4, +-- width = 18, +-- height = 18, +-- keepAspect = true, +-- file = IMG_LINK, +-- parent = btnLink, +-- } local externalFunctions = {} @@ -1025,11 +1025,10 @@ local function InitializeControls(window) local btnClose = Button:New { right = 11, y = WG.TOP_BUTTON_Y, - width = 80, + width = WG.BUTTON_HEIGHT, height = WG.BUTTON_HEIGHT, - caption = i18n("close"), - objectOverrideFont = Configuration:GetButtonFont(3), - classname = "negative_button", + caption = "", + classname = "close_button", OnClick = { function() window:Hide() diff --git a/LuaMenu/widgets/gui_queue_list_window.lua b/LuaMenu/widgets/gui_queue_list_window.lua index 6668158f9..93385888d 100644 --- a/LuaMenu/widgets/gui_queue_list_window.lua +++ b/LuaMenu/widgets/gui_queue_list_window.lua @@ -604,11 +604,10 @@ local function InitializeControls(window) local btnClose = Button:New { right = 11, y = WG.TOP_BUTTON_Y, - width = 80, + width = WG.BUTTON_HEIGHT, height = WG.BUTTON_HEIGHT, - caption = i18n("close"), - objectOverrideFont = Configuration:GetButtonFont(3), - classname = "negative_button", + caption = "", + classname = "close_button", OnClick = { function() window:Hide() @@ -618,7 +617,7 @@ local function InitializeControls(window) } local btnInviteFriends = Button:New { - right = 98, + right = 59, y = WG.TOP_BUTTON_Y, width = 180, height = WG.BUTTON_HEIGHT, @@ -636,7 +635,7 @@ local function InitializeControls(window) if Configuration.gameConfig.link_matchmakerMapBans then Button:New { - right = 285, + right = 246, y = WG.TOP_BUTTON_Y, width = 180, height = WG.BUTTON_HEIGHT, @@ -670,7 +669,7 @@ local function InitializeControls(window) right = 5, y = offset, height = 200, - objectOverrideFont = Configuration:GetFont(3), + objectOverrideFont = Configuration:GetFont(2), text = "Matching options:", parent = window } @@ -694,7 +693,7 @@ local function InitializeControls(window) caption = optData.humanName, checked = checked, tooltip = optData.tooltip, - objectOverrideFont = Configuration:GetFont(3), + objectOverrideFont = Configuration:GetFont(2), OnChange = { function (obj, newState) Configuration:SetConfigValue(optData.confKey, newState) diff --git a/LuaMenu/widgets/gui_queue_status_panel.lua b/LuaMenu/widgets/gui_queue_status_panel.lua index 2d0954fdb..840490804 100644 --- a/LuaMenu/widgets/gui_queue_status_panel.lua +++ b/LuaMenu/widgets/gui_queue_status_panel.lua @@ -124,7 +124,7 @@ local function InitializeQueueStatusHandler(name, ControlType, parent, pos) y = (pos and pos.y) or ((not pos) and 0), right = (pos and pos.right) or ((not pos) and 0), bottom = (pos and pos.bottom) or ((not pos) and 0), - classname = "overlay_panel", + classname = "button", width = pos and pos.width, height = pos and pos.height, padding = {0,0,0,0}, @@ -143,7 +143,7 @@ local function InitializeQueueStatusHandler(name, ControlType, parent, pos) padding = {0,0,0,0}, caption = "Cancel", objectOverrideFont = WG.Chobby.Configuration:GetButtonFont(3), - classname = "negative_button", + classname = "action_button", OnClick = { function() lobby:LeaveMatchMakingAll() @@ -163,8 +163,8 @@ local function InitializeQueueStatusHandler(name, ControlType, parent, pos) local timeString = "" local queueStatusText = TextBox:New { - x = 8, - y = 12, + x = 12, + y = 16, right = rightBound, bottom = bottomBound, objectOverrideFont = WG.Chobby.Configuration:GetFont(2), @@ -285,7 +285,7 @@ local function InitializeInstantQueueHandler() y = 0, right = 0, bottom = 0, - classname = "overlay_panel", + classname = "button", padding = {0,0,0,0}, caption = "", resizable = false, @@ -319,7 +319,7 @@ local function InitializeInstantQueueHandler() y = 18, right = rightBound, bottom = bottomBound, - objectOverrideFont = WG.Chobby.Configuration:GetFont(3), + objectOverrideFont = WG.Chobby.Configuration:GetFont(2), text = "", parent = queuePanel } @@ -335,12 +335,12 @@ local function InitializeInstantQueueHandler() queueStatusText._relativeBounds.bottom = bottomBound queueStatusText:UpdateClientArea() if ySize < 60 then - queueStatusText:SetPos(xSize/4 - 52, 2) + queueStatusText:SetPos(math.floor(xSize/4) - 52, 2) queueStatusText.font = WG.Chobby.Configuration:GetFont(2) queueStatusText:Invalidate() bigMode = false else - queueStatusText:SetPos(xSize/4 - 62, 18) + queueStatusText:SetPos(math.floor(xSize/4) - 62, 18) queueStatusText.font = WG.Chobby.Configuration:GetFont(3) queueStatusText:Invalidate() bigMode = true @@ -530,7 +530,7 @@ local function CreateReadyCheckWindow(DestroyFunc, secondsRemaining, minWinChanc caption = i18n("reject"), objectOverrideFont = Configuration:GetButtonFont(3), parent = readyCheckWindow, - classname = "negative_button", + classname = "option_button", OnClick = { function() CancelFunc() diff --git a/LuaMenu/widgets/gui_replay_handler.lua b/LuaMenu/widgets/gui_replay_handler.lua index ba00aed7b..fb85aecdb 100644 --- a/LuaMenu/widgets/gui_replay_handler.lua +++ b/LuaMenu/widgets/gui_replay_handler.lua @@ -54,7 +54,7 @@ local function CreateReplayEntry(replayPath, engineName, gameName, mapName) bottom = 3, width = 65, caption = i18n("start"), - classname = "action_button", + classname = "small_action_button", objectOverrideFont = Configuration:GetButtonFont(2), OnClick = { function() @@ -235,7 +235,7 @@ local function InitializeControls(parentControl) ------------------------- Button:New { - x = 100, + right = 126, y = WG.TOP_BUTTON_Y, width = 110, height = WG.BUTTON_HEIGHT, @@ -251,7 +251,7 @@ local function InitializeControls(parentControl) } moreButton = Button:New { - x = 340, + right = 8, y = WG.TOP_BUTTON_Y, width = 110, height = WG.BUTTON_HEIGHT, @@ -285,9 +285,9 @@ local function InitializeControls(parentControl) if WG.BrowserHandler and Configuration.gameConfig.link_replays ~= nil then Button:New { - x = 220, + right = 244, y = WG.TOP_BUTTON_Y, - width = 110, + width = 120, height = WG.BUTTON_HEIGHT, caption = i18n("download"), objectOverrideFont = Configuration:GetButtonFont(3), diff --git a/LuaMenu/widgets/gui_settings_window.lua b/LuaMenu/widgets/gui_settings_window.lua index fb40d8e61..842828e7d 100644 --- a/LuaMenu/widgets/gui_settings_window.lua +++ b/LuaMenu/widgets/gui_settings_window.lua @@ -336,7 +336,7 @@ local function GetValueEntryBox(parent, name, position, currentValue) align = "right", height = 35, caption = name .. ":", - objectOverrideFont = Configuration:GetFont(3), + objectOverrideFont = Configuration:GetFont(7), parent = parent, } @@ -358,7 +358,7 @@ local function GetValueEntryBox(parent, name, position, currentValue) y = position, height = 35, text = tostring(currentValue), - objectOverrideFont = Configuration:GetFont(3), + objectOverrideFont = Configuration:GetFont(7), objectOverrideHintFont = Configuration:GetHintFont(3), useIME = false, parent = parent, @@ -400,7 +400,7 @@ local function ShowWindowGeoConfig(name, modeNum, modeName, retreatPadding) right = 15, y = 15, height = 35, - objectOverrideFont = Configuration:GetFont(3), + objectOverrideFont = Configuration:GetFont(7), caption = i18n("set_window_position"), parent = manualWindow, } @@ -512,7 +512,7 @@ local function ShowManualFullscreenEntryWindow(name) right = 15, y = 15, height = 35, - objectOverrideFont = Configuration:GetFont(3), + objectOverrideFont = Configuration:GetFont(7), caption = i18n("set_resolution"), parent = manualWindow, } @@ -620,7 +620,7 @@ local function AddCheckboxSetting(offset, caption, key, default, clickFunc, tool caption = caption, checked = checked, tooltip = tooltip, - objectOverrideFont = Configuration:GetFont(2), + objectOverrideFont = Configuration:GetFont(6), OnChange = {function (obj, newState) Configuration:SetConfigValue(key, newState) if clickFunc then @@ -643,7 +643,7 @@ local function AddNumberSetting(offset, caption, desc, key, default, minVal, max valign = "top", align = "left", caption = caption, - objectOverrideFont = Configuration:GetFont(2), + objectOverrideFont = Configuration:GetFont(6), tooltip = desc, } @@ -669,7 +669,7 @@ local function AddNumberSetting(offset, caption, desc, key, default, minVal, max width = COMBO_WIDTH, height = 30, text = ToPercent(default*100), - objectOverrideFont = Configuration:GetFont(2), + objectOverrideFont = Configuration:GetFont(6), objectOverrideHintFont = Configuration:GetHintFont(2), useIME = false, OnFocusUpdate = { @@ -719,7 +719,7 @@ local function GetLobbyTabControls() height = 40, valign = "top", align = "left", - objectOverrideFont = Configuration:GetFont(2), + objectOverrideFont = Configuration:GetFont(6), caption = "Language", } children[#children + 1] = ComboBox:New { @@ -728,7 +728,7 @@ local function GetLobbyTabControls() width = COMBO_WIDTH, height = 30, items = langNames, - objectOverrideFont = Configuration:GetFont(2), + objectOverrideFont = Configuration:GetFont(6), selected = selectedLang, OnSelect = { function (obj) @@ -749,7 +749,7 @@ local function GetLobbyTabControls() height = 40, valign = "top", align = "left", - objectOverrideFont = Configuration:GetFont(2), + objectOverrideFont = Configuration:GetFont(6), caption = "Split Panel Mode", } children[#children + 1] = ComboBox:New { @@ -758,7 +758,7 @@ local function GetLobbyTabControls() width = COMBO_WIDTH, height = 30, items = {"Autodetect", "Always Two", "Always One"}, - objectOverrideFont = Configuration:GetFont(2), + objectOverrideFont = Configuration:GetFont(6), selected = Configuration.panel_layout or 1, OnSelect = { function (obj) @@ -781,7 +781,7 @@ local function GetLobbyTabControls() height = 40, valign = "top", align = "left", - objectOverrideFont = Configuration:GetFont(2), + objectOverrideFont = Configuration:GetFont(6), caption = "Chat Font Size", } children[#children + 1] = Trackbar:New { @@ -811,7 +811,7 @@ local function GetLobbyTabControls() height = 40, valign = "top", align = "left", - objectOverrideFont = Configuration:GetFont(2), + objectOverrideFont = Configuration:GetFont(6), caption = "Menu Music Volume", } children[#children + 1] = Trackbar:New { @@ -841,7 +841,7 @@ local function GetLobbyTabControls() height = 40, valign = "top", align = "left", - objectOverrideFont = Configuration:GetFont(2), + objectOverrideFont = Configuration:GetFont(6), caption = "Notification Volume", } children[#children + 1] = Trackbar:New { @@ -871,7 +871,7 @@ local function GetLobbyTabControls() height = 40, valign = "top", align = "left", - objectOverrideFont = Configuration:GetFont(2), + objectOverrideFont = Configuration:GetFont(6), caption = "Background Brightness", } children[#children + 1] = Trackbar:New { @@ -901,7 +901,7 @@ local function GetLobbyTabControls() height = 40, valign = "top", align = "left", - objectOverrideFont = Configuration:GetFont(2), + objectOverrideFont = Configuration:GetFont(6), caption = "Game Overlay Opacity", } children[#children + 1] = Trackbar:New { @@ -909,7 +909,7 @@ local function GetLobbyTabControls() y = offset, width = COMBO_WIDTH, height = 30, - value = Configuration.gameOverlayOpacity or 0.5, + value = Configuration.gameOverlayOpacity or 0.3, min = 0, max = 1, step = 0.02, @@ -931,7 +931,7 @@ local function GetLobbyTabControls() height = 40, valign = "top", align = "left", - objectOverrideFont = Configuration:GetFont(2), + objectOverrideFont = Configuration:GetFont(6), caption = "Coop Connection Delay", tooltip = "Hosts with poor internet may require their clients to add a delay in order to connect.", } @@ -964,7 +964,7 @@ local function GetLobbyTabControls() boxsize = 20, caption = i18n("autoLogin"), checked = Configuration.autoLogin or false, - objectOverrideFont = Configuration:GetFont(2), + objectOverrideFont = Configuration:GetFont(6), OnChange = {function (obj, newState) freezeSettings = true Configuration:SetConfigValue("autoLogin", newState) @@ -1006,7 +1006,7 @@ local function GetLobbyTabControls() height = 40, valign = "top", align = "left", - objectOverrideFont = Configuration:GetFont(2), + objectOverrideFont = Configuration:GetFont(6), caption = "Clear Channel History", } children[#children + 1] = Button:New { @@ -1014,6 +1014,7 @@ local function GetLobbyTabControls() y = offset, width = COMBO_WIDTH, height = 30, + classname = "negative_button", caption = "Apply", tooltip = "Clears chat history displayed in the lobby, does not affect the chat history files saved to your computer.", objectOverrideFont = Configuration:GetFont(2), @@ -1033,7 +1034,7 @@ local function GetLobbyTabControls() height = 40, valign = "top", align = "left", - objectOverrideFont = Configuration:GetFont(2), + objectOverrideFont = Configuration:GetFont(6), caption = "Delete Path Cache", } children[#children + 1] = Button:New { @@ -1041,6 +1042,7 @@ local function GetLobbyTabControls() y = offset, width = COMBO_WIDTH, height = 30, + classname = "negative_button", caption = "Apply", tooltip = "Deletes path cache. May solve desync.", objectOverrideFont = Configuration:GetFont(2), @@ -1084,7 +1086,7 @@ local function GetVoidTabControls() height = 40, valign = "top", align = "left", - objectOverrideFont = Configuration:GetFont(3), + objectOverrideFont = Configuration:GetFont(7), text = "Warning: These settings are experimental and not officially supported, proceed at your own risk.", } offset = offset + 65 @@ -1120,7 +1122,7 @@ local function GetVoidTabControls() height = 40, valign = "top", align = "left", - objectOverrideFont = Configuration:GetFont(2), + objectOverrideFont = Configuration:GetFont(6), caption = "Disable Lobby", } children[#children + 1] = Button:New { @@ -1128,6 +1130,7 @@ local function GetVoidTabControls() y = offset, width = COMBO_WIDTH, height = 30, + classname = "negative_button", caption = "Disable", tooltip = "Disables the entire lobby and menu.", objectOverrideFont = Configuration:GetFont(2), @@ -1146,7 +1149,7 @@ local function GetVoidTabControls() height = 40, valign = "top", align = "left", - objectOverrideFont = Configuration:GetFont(2), + objectOverrideFont = Configuration:GetFont(6), caption = "Server Address (zero-k.info or test.zero-k.info for testing)", } children[#children + 1] = EditBox:New { @@ -1155,7 +1158,7 @@ local function GetVoidTabControls() width = COMBO_WIDTH, height = 30, text = Configuration.serverAddress, - objectOverrideFont = Configuration:GetFont(2), + objectOverrideFont = Configuration:GetFont(6), objectOverrideHintFont = Configuration:GetHintFont(2), useIME = false, OnFocusUpdate = { @@ -1178,7 +1181,7 @@ local function GetVoidTabControls() height = 40, valign = "top", align = "left", - objectOverrideFont = Configuration:GetFont(2), + objectOverrideFont = Configuration:GetFont(6), caption = "Server Port (8200 or 8202 for testing)", } children[#children + 1] = EditBox:New { @@ -1187,7 +1190,7 @@ local function GetVoidTabControls() width = COMBO_WIDTH, height = 30, text = tostring(Configuration.serverPort), - objectOverrideFont = Configuration:GetFont(2), + objectOverrideFont = Configuration:GetFont(6), objectOverrideHintFont = Configuration:GetHintFont(2), useIME = false, OnFocusUpdate = { @@ -1218,7 +1221,7 @@ local function GetVoidTabControls() valign = "top", align = "left", parent = window, - objectOverrideFont = Configuration:GetFont(2), + objectOverrideFont = Configuration:GetFont(6), caption = "Singleplayer", } @@ -1239,7 +1242,7 @@ local function GetVoidTabControls() height = 30, parent = window, items = Configuration.gameConfigHumanNames, - objectOverrideFont = Configuration:GetFont(2), + objectOverrideFont = Configuration:GetFont(6), selected = singleplayerSelected, OnSelect = { function (obj) @@ -1260,7 +1263,7 @@ local function GetVoidTabControls() valign = "top", align = "left", parent = window, - objectOverrideFont = Configuration:GetFont(2), + objectOverrideFont = Configuration:GetFont(6), caption = "Campaign", } @@ -1281,7 +1284,7 @@ local function GetVoidTabControls() height = 30, parent = window, items = Configuration.campaignConfigHumanNames, - objectOverrideFont = Configuration:GetFont(2), + objectOverrideFont = Configuration:GetFont(6), selected = campaignSelected, OnSelect = { function (obj) @@ -1318,7 +1321,7 @@ local function MakeRestartWarning(offset) valign = "top", align = "left", parent = window, - objectOverrideFont = Configuration:GetFont(2), + objectOverrideFont = Configuration:GetFont(6), caption = "Warning: Most changes do not affect battles in progress.", } @@ -1337,7 +1340,7 @@ local function MakePresetsControl(settingPresets, offset) valign = "top", align = "left", parent = window, - objectOverrideFont = Configuration:GetFont(2), + objectOverrideFont = Configuration:GetFont(6), caption = "Preset:", } @@ -1352,7 +1355,7 @@ local function MakePresetsControl(settingPresets, offset) width = 75, height = 30, caption = caption, - objectOverrideFont = Configuration:GetFont(2), + objectOverrideFont = Configuration:GetFont(6), customSettings = not settings, OnClick = { function (obj) @@ -1444,7 +1447,7 @@ local function ProcessScreenSizeOption(data, offset) valign = "top", align = "left", caption = data.humanName, - objectOverrideFont = Configuration:GetFont(2), + objectOverrideFont = Configuration:GetFont(6), tooltip = data.desc, } @@ -1464,7 +1467,7 @@ local function ProcessScreenSizeOption(data, offset) width = COMBO_WIDTH, height = 30, items = items, - objectOverrideFont = Configuration:GetFont(2), + objectOverrideFont = Configuration:GetFont(6), selected = selectedOption, OnSelect = { function (obj) @@ -1519,7 +1522,7 @@ local function ProcessSettingsOption(data, offset, defaults, customSettingsSwitc valign = "top", align = "left", caption = data.humanName, - objectOverrideFont = Configuration:GetFont(2), + objectOverrideFont = Configuration:GetFont(6), tooltip = data.desc, } @@ -1544,7 +1547,7 @@ local function ProcessSettingsOption(data, offset, defaults, customSettingsSwitc width = COMBO_WIDTH, height = 30, items = items, - objectOverrideFont = Configuration:GetFont(2), + objectOverrideFont = Configuration:GetFont(6), selected = defaultItem, OnSelect = { function (obj, num) @@ -1578,7 +1581,7 @@ local function ProcessSettingsNumber(data, offset, defaults, customSettingsSwitc valign = "top", align = "left", caption = data.humanName, - objectOverrideFont = Configuration:GetFont(2), + objectOverrideFont = Configuration:GetFont(6), tooltip = data.desc, } @@ -1609,7 +1612,7 @@ local function ProcessSettingsNumber(data, offset, defaults, customSettingsSwitc width = COMBO_WIDTH, height = 30, text = FormatFunc(Configuration.settingsMenuValues[data.name] or defaults[data.name]), - objectOverrideFont = Configuration:GetFont(2), + objectOverrideFont = Configuration:GetFont(6), objectOverrideHintFont = Configuration:GetHintFont(2), useIME = false, OnFocusUpdate = { @@ -1740,7 +1743,7 @@ local function InitializeControls(window) y = 45, bottom = 1, padding = {0, 0, 0, 0}, - minTabWidth = 120, + minTabWidth = 140, tabs = tabs, parent = window, OnTabChange = { @@ -1785,6 +1788,7 @@ function SettingsWindow.GetControl() y = "0%", width = "100%", height = "100%", + padding = {2, 2, 2, 7}, OnParent = { function(obj) if obj:IsEmpty() then diff --git a/campaign/sample/planetUtilities.lua b/campaign/sample/planetUtilities.lua index 9db23bae3..a7b38174f 100644 --- a/campaign/sample/planetUtilities.lua +++ b/campaign/sample/planetUtilities.lua @@ -205,7 +205,7 @@ planetUtilities.ICON_OVERLAY = { GUARD = LUA_DIRNAME .. "images/guard.png", REPAIR = LUA_DIRNAME .. "images/repair.png", CLOCK = LUA_DIRNAME .. "images/clock.png", - ALL = LUA_DIRNAME .. "images/battle.png", + ALL = LUA_DIRNAME .. "images/ingame.png", } planetUtilities.DIFFICULTY = { diff --git a/libs/chiliui/chili/controls/editbox.lua b/libs/chiliui/chili/controls/editbox.lua index 29a178744..631f4b6c5 100644 --- a/libs/chiliui/chili/controls/editbox.lua +++ b/libs/chiliui/chili/controls/editbox.lua @@ -33,7 +33,7 @@ EditBox = Control:Inherit{ padding = {3, 3, 3, 3}, cursorColor = {0, 0, 1, 0.7}, - selectionColor = {0, 1, 1, 0.3}, + selectionColor = {59/255, 109/255, 179/255, 0.35}, -- to match buttonSelectedColor from configuration.lua align = "left", valign = "linecenter", diff --git a/libs/chiliui/chili/controls/image.lua b/libs/chiliui/chili/controls/image.lua index dd800c43b..423d28661 100644 --- a/libs/chiliui/chili/controls/image.lua +++ b/libs/chiliui/chili/controls/image.lua @@ -220,4 +220,4 @@ function Image:MouseClick(...) return Control.MouseClick(self, ...) or self:IsActive() and self end ---// ============================================================================= \ No newline at end of file +--// ============================================================================= diff --git a/libs/chiliui/chili/headers/skinutils.lua b/libs/chiliui/chili/headers/skinutils.lua index 9db82841f..05df94367 100644 --- a/libs/chiliui/chili/headers/skinutils.lua +++ b/libs/chiliui/chili/headers/skinutils.lua @@ -528,7 +528,9 @@ function DrawButton(obj) local bgcolor = obj.backgroundColor if not obj.supressButtonReaction then if (obj.state.pressed) then - bgcolor = obj.pressBackgroundColor or mulColor(bgcolor, 0.4) + -- bgcolor = obj.pressBackgroundColor or mulColor(bgcolor, 0.7) + -- bgcolor = {bgcolor[1] * 0.13, bgcolor[2] * 0.29, bgcolor[3] * 0.42, bgcolor[4] * 0.5} + bgcolor = {bgcolor[1], bgcolor[2], bgcolor[3], bgcolor[4] * 0.80} elseif (obj.state.hovered) --[[ or (obj.state.focused)]] then bgcolor = obj.focusColor --bgcolor = mixColors(bgcolor, obj.focusColor, 0.5) @@ -549,7 +551,9 @@ function DrawButton(obj) fgcolor = mixColors(fgcolor, obj.disabledColor, 0.8) elseif not obj.supressButtonReaction then if (obj.state.pressed) then - fgcolor = obj.pressForegroundColor or mulColor(fgcolor, 0.4) + -- fgcolor = obj.pressForegroundColor or mulColor(fgcolor, 0.7) + -- fgcolor = {fgcolor[1] * 0.13, fgcolor[2] * 0.29, fgcolor[3] * 0.42, fgcolor[4] * 0.5} + fgcolor = {fgcolor[1], fgcolor[2], fgcolor[3], fgcolor[4] * 0.80} elseif (obj.state.hovered) --[[ or (obj.state.focused)]] then fgcolor = obj.focusColor end @@ -945,8 +949,8 @@ function DrawScrollPanel(obj) local pos = obj.scrollPosY / contHeight local visible = clientHeight / contHeight - local gripy = math.floor(y + h * pos) + 0.5 - local griph = math.floor(h * visible) + local gripy = math.floor(y + h * pos) + local griph = math.floor(h * visible) + 1 gl.BeginEnd(GL.TRIANGLE_STRIP, _DrawTiledTexture, x, gripy, obj.scrollbarSize, griph, skLeft, skTop, skRight, skBottom, tw, th, 0) --gl.Texture(0, false) @@ -987,8 +991,8 @@ function DrawScrollPanel(obj) local pos = obj.scrollPosX / contWidth local visible = clientWidth / contWidth - local gripx = math.floor(x + w * pos) + 0.5 - local gripw = math.floor(w * visible) + local gripx = math.floor(x + w * pos) + local gripw = math.floor(w * visible) + 1 gl.BeginEnd(GL.TRIANGLE_STRIP, _DrawTiledTexture, gripx, y, gripw, obj.scrollbarSize, skLeft, skTop, skRight, skBottom, tw, th, 0) --gl.Texture(0, false) end @@ -1328,7 +1332,7 @@ function DrawTabBarItem(obj) --gl.Texture(0, false) if (obj.state.pressed) then - gl.Color(0.6, 0.6, 0.6, 1) --FIXME + gl.Color(0.61, 0.6, 0.7, 1) --FIXME elseif (obj.state.selected) then gl.Color(obj.focusColor) else