Fullscreen Menu overhaul
Affects | Status | Importance | Assigned to | Milestone | |
---|---|---|---|---|---|
widelands |
Won't Fix
|
Medium
|
GunChleoc |
Bug Description
Since we are still short for text space in the fullscreen menus, I have started doing an overhaul. I am aiming to make the layout more uniform while I'm at it, and to use variables and relative positioning to make it more easy to change stuff in the future.
The first step was to have a look at the menus where a map or savegame is selected. The biggest change is to rearrange the OK/Back buttons, because they were eating up a lot of screen space. I have also cleaned up the checkboxes in the map selection for a new game. Note that they still don't line up in a vertical grid; this is on purpose to make more room for translations.
I am attaching 3 screenshots so you can see where I'm heading and veto anything you think needs fixing without having to compile. I'd rather not change anything for these unless I have to though.
Related branches
- SirVer: Approve
- TiborB: Approve
-
Diff: 7107 lines (+2206/-3249)96 files modifiedcampaigns/atl01.wmf/elemental (+1/-1)
campaigns/cconfig (+12/-9)
campaigns/dummy.wmf/elemental (+2/-1)
campaigns/emp01.wmf/elemental (+1/-1)
campaigns/emp02.wmf/elemental (+1/-1)
campaigns/t01.wmf/elemental (+1/-1)
campaigns/t02.wmf/elemental (+1/-1)
campaigns/t03.wmf/elemental (+2/-2)
campaigns/tutorial01.wmf/elemental (+1/-1)
maps/Atoll.wmf/elemental (+5/-1)
maps/Calvisson.wmf/elemental (+20/-1)
maps/Crossing the horizon.wmf/elemental (+0/-2)
maps/Desert Tournament.wmf/elemental (+5/-1)
maps/Elven Forests.wmf/elemental (+10/-1)
maps/Four Castles.wmf/elemental (+5/-1)
maps/Four Mountains.wmf/elemental (+10/-1)
maps/Long, long way.wmf/elemental (+25/-1)
maps/MP Scenarios/Smugglers.wmf/elemental (+7/-2)
maps/Plateau.wmf/elemental (+4/-1)
maps/Rendez-Vous.wmf/elemental (+0/-1)
maps/Swamp Monks.wmf/elemental (+5/-1)
maps/The Nile.wmf/elemental (+30/-1)
maps/Trident of Fire.wmf/elemental (+20/-0)
po/mp_scenario_together_we_re_strong.wmf/ar.po (+0/-43)
po/mp_scenario_together_we_re_strong.wmf/ca.po (+0/-43)
po/mp_scenario_together_we_re_strong.wmf/cs.po (+0/-45)
po/mp_scenario_together_we_re_strong.wmf/de.po (+0/-45)
po/mp_scenario_together_we_re_strong.wmf/en_GB.po (+0/-44)
po/mp_scenario_together_we_re_strong.wmf/eo.po (+0/-43)
po/mp_scenario_together_we_re_strong.wmf/es.po (+0/-44)
po/mp_scenario_together_we_re_strong.wmf/eu.po (+0/-45)
po/mp_scenario_together_we_re_strong.wmf/fi.po (+0/-43)
po/mp_scenario_together_we_re_strong.wmf/fr.po (+0/-45)
po/mp_scenario_together_we_re_strong.wmf/gd.po (+0/-47)
po/mp_scenario_together_we_re_strong.wmf/hr.po (+0/-44)
po/mp_scenario_together_we_re_strong.wmf/hu.po (+0/-43)
po/mp_scenario_together_we_re_strong.wmf/it.po (+0/-44)
po/mp_scenario_together_we_re_strong.wmf/ja.po (+0/-43)
po/mp_scenario_together_we_re_strong.wmf/la.po (+0/-44)
po/mp_scenario_together_we_re_strong.wmf/lt.po (+0/-43)
po/mp_scenario_together_we_re_strong.wmf/mp_scenario_together_we_re_strong.wmf.pot (+0/-46)
po/mp_scenario_together_we_re_strong.wmf/nb.po (+0/-44)
po/mp_scenario_together_we_re_strong.wmf/nl.po (+0/-45)
po/mp_scenario_together_we_re_strong.wmf/oc.po (+0/-45)
po/mp_scenario_together_we_re_strong.wmf/pl.po (+0/-44)
po/mp_scenario_together_we_re_strong.wmf/pt.po (+0/-74)
po/mp_scenario_together_we_re_strong.wmf/pt_BR.po (+0/-45)
po/mp_scenario_together_we_re_strong.wmf/ru.po (+0/-44)
po/mp_scenario_together_we_re_strong.wmf/sk.po (+0/-43)
po/mp_scenario_together_we_re_strong.wmf/sv.po (+0/-45)
po/mp_scenario_together_we_re_strong.wmf/tr.po (+0/-44)
po/mp_scenario_together_we_re_strong.wmf/zh_TW.po (+0/-43)
src/ai/defaultai.cc (+2/-3)
src/base/i18n.cc (+11/-4)
src/base/i18n.h (+1/-1)
src/base/time_string.cc (+59/-32)
src/base/time_string.h (+1/-4)
src/editor/tools/editor_info_tool.cc (+2/-2)
src/editor/ui_menus/editor_main_menu_load_map.cc (+3/-2)
src/editor/ui_menus/editor_main_menu_map_options.cc (+4/-4)
src/editor/ui_menus/editor_main_menu_save_map.cc (+2/-2)
src/game_io/game_preload_packet.cc (+2/-14)
src/game_io/game_preload_packet.h (+2/-10)
src/logic/game.cc (+1/-0)
src/logic/map.cc (+36/-35)
src/logic/map.h (+28/-20)
src/map_io/map_elemental_packet.cc (+44/-1)
src/map_io/map_loader.h (+1/-1)
src/map_io/s2map.cc (+3/-3)
src/map_io/s2map.h (+1/-1)
src/network/nethost.cc (+12/-14)
src/scripting/lua_game.cc (+6/-6)
src/ui_basic/multilinetextarea.cc (+5/-0)
src/ui_basic/multilinetextarea.h (+1/-0)
src/ui_basic/table.cc (+1/-1)
src/ui_basic/table.h (+1/-1)
src/ui_fsmenu/CMakeLists.txt (+4/-4)
src/ui_fsmenu/campaign_select.cc (+305/-263)
src/ui_fsmenu/campaign_select.h (+71/-44)
src/ui_fsmenu/editor_mapselect.cc (+0/-264)
src/ui_fsmenu/editor_mapselect.h (+0/-62)
src/ui_fsmenu/launch_mpg.cc (+32/-16)
src/ui_fsmenu/launch_mpg.h (+9/-1)
src/ui_fsmenu/launch_spg.cc (+1/-1)
src/ui_fsmenu/load_map_or_game.cc (+98/-0)
src/ui_fsmenu/load_map_or_game.h (+120/-0)
src/ui_fsmenu/loadgame.cc (+424/-286)
src/ui_fsmenu/loadgame.h (+63/-41)
src/ui_fsmenu/loadreplay.cc (+0/-340)
src/ui_fsmenu/loadreplay.h (+0/-69)
src/ui_fsmenu/mapselect.cc (+416/-305)
src/ui_fsmenu/mapselect.h (+58/-39)
src/ui_fsmenu/suggested_teams_box.cc (+136/-0)
src/ui_fsmenu/suggested_teams_box.h (+60/-0)
src/wlapplication.cc (+10/-8)
src/wui/buildingwindow.cc (+2/-2)
- Notabilis: Approve (commit diff and short test)
- GunChleoc: Needs Resubmitting
- kaputtnik (community): Approve (testing)
-
Diff: 3630 lines (+1441/-1069)52 files modifiedsrc/CMakeLists.txt (+1/-0)
src/ai/defaultai_warfare.cc (+1/-2)
src/editor/CMakeLists.txt (+1/-0)
src/editor/ui_menus/main_menu_load_or_save_map.h (+2/-1)
src/editor/ui_menus/main_menu_save_map.cc (+4/-3)
src/game_io/game_preload_packet.cc (+3/-1)
src/logic/CMakeLists.txt (+9/-2)
src/logic/ai_dna_handler.cc (+6/-6)
src/logic/ai_dna_handler.h (+0/-9)
src/logic/campaign_visibility.cc (+9/-9)
src/logic/cmd_calculate_statistics.cc (+0/-1)
src/logic/filesystem_constants.h (+40/-8)
src/logic/game.cc (+5/-7)
src/logic/game.h (+3/-2)
src/logic/map.cc (+4/-3)
src/logic/map.h (+0/-6)
src/logic/replay.cc (+5/-4)
src/logic/replay.h (+0/-3)
src/logic/save_handler.cc (+9/-9)
src/logic/save_handler.h (+0/-4)
src/logic/widelands.cc (+20/-0)
src/map_io/CMakeLists.txt (+1/-0)
src/map_io/widelands_map_loader.h (+2/-1)
src/network/CMakeLists.txt (+1/-0)
src/network/gameclient.cc (+2/-1)
src/network/gamehost.cc (+2/-1)
src/ui_basic/box.cc (+6/-0)
src/ui_basic/box.h (+2/-0)
src/ui_basic/icon.cc (+13/-11)
src/ui_basic/icon.h (+4/-0)
src/ui_basic/messagebox.cc (+8/-4)
src/ui_basic/multilinetextarea.cc (+8/-6)
src/ui_basic/multilinetextarea.h (+1/-0)
src/ui_basic/table.cc (+21/-18)
src/ui_basic/table.h (+2/-0)
src/ui_fsmenu/CMakeLists.txt (+2/-5)
src/ui_fsmenu/load_map_or_game.h (+1/-1)
src/ui_fsmenu/loadgame.cc (+75/-612)
src/ui_fsmenu/loadgame.h (+21/-77)
src/ui_fsmenu/mapselect.cc (+2/-1)
src/ui_fsmenu/options.cc (+4/-1)
src/wlapplication.cc (+16/-24)
src/wui/CMakeLists.txt (+12/-0)
src/wui/game_main_menu_save_game.cc (+119/-207)
src/wui/game_main_menu_save_game.h (+30/-12)
src/wui/gamedetails.cc (+247/-0)
src/wui/gamedetails.h (+110/-0)
src/wui/general_statistics_menu.cc (+1/-2)
src/wui/load_or_save_game.cc (+503/-0)
src/wui/load_or_save_game.h (+97/-0)
src/wui/mapdetails.cc (+2/-0)
src/wui/ware_statistics_menu.cc (+4/-5)
- Toni Förster: Approve
- Klaus Halfmann: Approve (review compile, testplay)
-
Diff: 2711 lines (+1143/-949)39 files modifieddata/campaigns/atl01.wmf/scripting/mission_thread.lua (+1/-2)
data/campaigns/bar01.wmf/scripting/mission_thread.lua (+1/-2)
data/campaigns/bar02.wmf/scripting/mission_thread.lua (+1/-2)
data/campaigns/campaigns.lua (+127/-141)
data/campaigns/dummy.wmf/elemental (+1/-0)
data/campaigns/emp01.wmf/scripting/mission_thread.lua (+1/-1)
data/campaigns/emp02.wmf/scripting/mission_thread.lua (+1/-2)
data/campaigns/emp03.wmf/scripting/mission_thread.lua (+1/-1)
data/campaigns/emp04.wmf/scripting/mission_thread.lua (+1/-3)
data/campaigns/tutorials.lua (+12/-28)
src/base/i18n.cc (+9/-0)
src/base/i18n.h (+11/-2)
src/graphic/text_layout.cc (+1/-0)
src/graphic/text_layout.h (+2/-0)
src/logic/CMakeLists.txt (+0/-11)
src/logic/filesystem_constants.h (+2/-1)
src/scripting/CMakeLists.txt (+0/-1)
src/scripting/lua_game.cc (+10/-30)
src/scripting/lua_game.h (+1/-2)
src/ui_basic/table.cc (+3/-3)
src/ui_basic/table.h (+2/-8)
src/ui_fsmenu/CMakeLists.txt (+12/-1)
src/ui_fsmenu/campaign_select.cc (+44/-397)
src/ui_fsmenu/campaign_select.h (+10/-90)
src/ui_fsmenu/campaigndetails.cc (+82/-0)
src/ui_fsmenu/campaigndetails.h (+41/-0)
src/ui_fsmenu/campaigns.cc (+198/-158)
src/ui_fsmenu/campaigns.h (+59/-13)
src/ui_fsmenu/scenario_select.cc (+230/-0)
src/ui_fsmenu/scenario_select.h (+65/-0)
src/ui_fsmenu/scenariodetails.cc (+74/-0)
src/ui_fsmenu/scenariodetails.h (+41/-0)
src/wlapplication.cc (+12/-9)
src/wui/CMakeLists.txt (+2/-1)
src/wui/load_or_save_game.cc (+4/-6)
src/wui/mapauthordata.h (+72/-0)
src/wui/mapdata.cc (+7/-7)
src/wui/mapdata.h (+1/-27)
src/wui/mapdetails.h (+1/-0)
Changed in widelands: | |
status: | New → In Progress |
Changed in widelands: | |
milestone: | build19-rc1 → none |
Changed in widelands: | |
milestone: | none → build20-rc1 |
Changed in widelands: | |
milestone: | build20-rc1 → build21-rc1 |
Screenshot for load saved game