Merge lp://staging/~widelands-dev/widelands/map-filter-dropdowns into lp://staging/widelands
Proposed by
GunChleoc
| Status: | Work in progress | ||||
|---|---|---|---|---|---|
| Proposed branch: | lp://staging/~widelands-dev/widelands/map-filter-dropdowns | ||||
| Merge into: | lp://staging/widelands | ||||
| Diff against target: |
961 lines (+284/-101) 44 files modified
data/maps/Archipelago_Sea.wmf/elemental (+1/-1) data/maps/Calvisson.wmf/elemental (+1/-1) data/maps/Checkmate.wmf/elemental (+1/-1) data/maps/Crater.wmf/elemental (+1/-1) data/maps/Crossing_the_Horizon_v2.wmf/elemental (+1/-1) data/maps/Desert_Tournament.wmf/elemental (+1/-1) data/maps/Dolomites_v2.wmf/elemental (+1/-1) data/maps/Elven_Forests.wmf/elemental (+1/-1) data/maps/Fellowships_v2.wmf/elemental (+1/-1) data/maps/Four_Castles.wmf/elemental (+1/-1) data/maps/Four_Mountains.wmf/elemental (+1/-1) data/maps/Full_Moon_v2.wmf/elemental (+1/-1) data/maps/Glacier_Lake_v2.wmf/elemental (+1/-1) data/maps/Golden_Peninsula.wmf/elemental (+1/-1) data/maps/Ice_wars.wmf/elemental (+1/-1) data/maps/Lake_of_Tranquility.wmf/elemental (+1/-1) data/maps/Last_Bastion_v2.wmf/elemental (+1/-1) data/maps/Last_Survivors.wmf/elemental (+1/-1) data/maps/MP_Scenarios/Island_Hopping.wmf/elemental (+1/-1) data/maps/MP_Scenarios/Smugglers.wmf/elemental (+1/-1) data/maps/Rendez-Vous.wmf/elemental (+1/-1) data/maps/Sun_of_Fire.wmf/elemental (+1/-1) data/maps/Swamp_Monks.wmf/elemental (+1/-1) data/maps/The_Far_North.wmf/elemental (+1/-1) data/maps/The_Green_Plateau.wmf/elemental (+1/-1) data/maps/The_Nile_v2.wmf/elemental (+1/-1) data/maps/The_Oasis_Triangle.wmf/elemental (+1/-1) data/maps/The_Pass_Through_the_Mountains.wmf/elemental (+1/-1) data/maps/The_Thaw.wmf/elemental (+1/-1) data/maps/Three_Warriors.wmf/elemental (+1/-1) data/maps/Together_We're_Strong.wmf/elemental (+1/-1) data/maps/Trident_of_Fire.wmf/elemental (+1/-1) data/maps/Twin_Lagoons_v2.wmf/elemental (+1/-1) data/maps/Two_Frontiers.wmf/elemental (+1/-1) data/maps/Volcanic_Winter.wmf/elemental (+1/-1) data/maps/Wideworld.wmf/elemental (+1/-1) src/editor/ui_menus/main_menu_map_options.cc (+21/-3) src/editor/ui_menus/main_menu_map_options.h (+5/-1) src/ui_basic/button.cc (+16/-6) src/ui_basic/dropdown.cc (+18/-3) src/ui_basic/dropdown.h (+5/-0) src/ui_fsmenu/mapselect.cc (+168/-51) src/ui_fsmenu/mapselect.h (+11/-1) src/wui/map_tags.cc (+4/-0) |
||||
| To merge this branch: | bzr merge lp://staging/~widelands-dev/widelands/map-filter-dropdowns | ||||
| Related bugs: |
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Widelands Developers | Pending | ||
|
Review via email:
|
|||
Commit message
Redesign filters in Mapselect
- Add autofit text width capabilities to buttons and dropdowns
- Replace broken "Show all maps" checkbox with button
- Replace team-related checkboxes with dropdown
- New map tag "balanced" to complement "unbalanced", because the
"balanced" state is the one that should be marked explicitly
To post a comment you must log in.
Revision history for this message
| GunChleoc (gunchleoc) wrote | # |
Revision history for this message
| GunChleoc (gunchleoc) wrote | # |
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
With the upcoming ferry branch, we will run out of screen space for map tags. So, I have grouped them into dropdown menus.