← Back to branch summary

~widelands-dev/widelands/trunk

~widelands-dev/widelands/trunk

Viewing all changes in revision 8320.1.23.

Committer: GunChleoc
Date: 2017-06-12 11:07:47 UTC
mto: This revision was merged to the branch mainline in revision 8704.
Revision ID: fios@foramnagaidhlig.net-20170612110747-2eri1uy1znx63wvu

Background images and colors are now defined in data/templates/default. Added StyleManager class to load and access them.

files added:
data/templates

data/templates/default

data/templates/default/fsmenu

data/templates/default/init.lua

data/templates/default/wui

data/templates/default/wui/button.png

src/graphic/panel_styles.cc

src/graphic/panel_styles.h

src/graphic/style_manager.cc

src/graphic/style_manager.h

files renamed:
data/images/ui_fsmenu/background.png => data/templates/default/fsmenu/background.png

data/images/ui_fsmenu/bottom.png => data/templates/default/fsmenu/bottom.png

data/images/ui_fsmenu/bottom_left.png => data/templates/default/fsmenu/bottom_left.png

data/images/ui_fsmenu/bottom_right.png => data/templates/default/fsmenu/bottom_right.png

data/images/ui_fsmenu/button.png => data/templates/default/fsmenu/button.png

data/images/ui_fsmenu/center.png => data/templates/default/fsmenu/center.png

data/images/ui_fsmenu/left.png => data/templates/default/fsmenu/left.png

data/images/ui_fsmenu/right.png => data/templates/default/fsmenu/right.png

data/images/ui_fsmenu/top.png => data/templates/default/fsmenu/top.png

data/images/ui_fsmenu/top_left.png => data/templates/default/fsmenu/top_left.png

data/images/ui_fsmenu/top_right.png => data/templates/default/fsmenu/top_right.png

data/images/wui/background.png => data/templates/default/wui/background.png

data/images/wui/bottom.png => data/templates/default/wui/bottom.png

data/images/wui/left.png => data/templates/default/wui/left.png

data/images/wui/right.png => data/templates/default/wui/right.png

data/images/wui/top.png => data/templates/default/wui/top.png

files modified:
src/editor/tools/info_tool.cc

src/editor/ui_menus/categorized_item_selection_menu.h

src/editor/ui_menus/main_menu.cc

src/editor/ui_menus/main_menu_load_or_save_map.cc

src/editor/ui_menus/main_menu_map_options.cc

src/editor/ui_menus/main_menu_new_map.cc

src/editor/ui_menus/main_menu_random_map.cc

src/editor/ui_menus/main_menu_save_map.cc

src/editor/ui_menus/main_menu_save_map_make_directory.cc

src/editor/ui_menus/player_menu.cc

src/editor/ui_menus/tool_change_height_options_menu.cc

src/editor/ui_menus/tool_change_resources_options_menu.cc

src/editor/ui_menus/tool_noise_height_options_menu.cc

src/editor/ui_menus/toolsize_menu.cc

src/graphic/CMakeLists.txt

src/graphic/graphic.cc

src/graphic/graphic.h

src/ui_basic/CMakeLists.txt

src/ui_basic/box.cc

src/ui_basic/button.cc

src/ui_basic/button.h

src/ui_basic/dropdown.cc

src/ui_basic/dropdown.h

src/ui_basic/editbox.cc

src/ui_basic/editbox.h

src/ui_basic/fileview_panel.cc

src/ui_basic/fileview_panel.h

src/ui_basic/fullscreen_window.cc

src/ui_basic/icongrid.cc

src/ui_basic/listselect.cc

src/ui_basic/listselect.h

src/ui_basic/messagebox.cc

src/ui_basic/multilineeditbox.cc

src/ui_basic/multilineeditbox.h

src/ui_basic/multilinetextarea.cc

src/ui_basic/multilinetextarea.h

src/ui_basic/panel.h

src/ui_basic/scrollbar.cc

src/ui_basic/scrollbar.h

src/ui_basic/slider.cc

src/ui_basic/slider.h

src/ui_basic/spinbox.cc

src/ui_basic/spinbox.h

src/ui_basic/table.cc

src/ui_basic/table.h

src/ui_basic/tabpanel.cc

src/ui_basic/tabpanel.h

src/ui_basic/window.cc

src/ui_fsmenu/about.cc

src/ui_fsmenu/campaign_select.cc

src/ui_fsmenu/helpwindow.cc

src/ui_fsmenu/internet_lobby.cc

src/ui_fsmenu/launch_game.cc

src/ui_fsmenu/launch_mpg.cc

src/ui_fsmenu/launch_spg.cc

src/ui_fsmenu/load_map_or_game.cc

src/ui_fsmenu/loadgame.cc

src/ui_fsmenu/main.cc

src/ui_fsmenu/mapselect.cc

src/ui_fsmenu/multiplayer.cc

src/ui_fsmenu/netsetup_lan.cc

src/ui_fsmenu/options.cc

src/ui_fsmenu/singleplayer.cc

src/wui/actionconfirm.cc

src/wui/attack_box.cc

src/wui/building_statistics_menu.cc

src/wui/buildingwindow.cc

src/wui/economy_options_window.cc

src/wui/encyclopedia_window.cc

src/wui/fieldaction.cc

src/wui/game_chat_menu.cc

src/wui/game_debug_ui.cc

src/wui/game_main_menu_save_game.cc

src/wui/game_message_menu.cc

src/wui/game_objectives_menu.cc

src/wui/game_options_menu.cc

src/wui/game_options_sound_menu.cc

src/wui/game_statistics_menu.cc

src/wui/game_summary.cc

src/wui/gamechatpanel.cc

src/wui/gamechatpanel.h

src/wui/general_statistics_menu.cc

src/wui/helpwindow.cc

src/wui/inputqueuedisplay.cc

src/wui/interactive_base.cc

src/wui/login_box.cc

src/wui/mapdetails.cc

src/wui/mapdetails.h

src/wui/maptable.cc

src/wui/maptable.h

src/wui/minimap.cc

src/wui/multiplayersetupgroup.cc

src/wui/playerdescrgroup.cc

src/wui/plot_area.h

src/wui/productionsitewindow.cc

src/wui/shipwindow.cc

src/wui/soldiercapacitycontrol.cc

src/wui/stock_menu.cc

src/wui/story_message_box.cc

src/wui/ware_statistics_menu.cc

src/wui/warehousewindow.cc

src/wui/watchwindow.cc

Show diffs side-by-side

added added

removed removed

data/templates/

data/templates/default/

data/templates/default/fsmenu/

data/templates/default/init.lua

data/templates/default/wui/

data/templates/default/wui/button.png

src/editor/tools/info_tool.cc

src/editor/ui_menus/categorized_item_selection_menu.h

src/editor/ui_menus/main_menu.cc

src/editor/ui_menus/main_menu_load_or_save_map.cc

src/editor/ui_menus/main_menu_map_options.cc

src/editor/ui_menus/main_menu_new_map.cc

src/editor/ui_menus/main_menu_random_map.cc

src/editor/ui_menus/main_menu_save_map.cc

src/editor/ui_menus/main_menu_save_map_make_directory.cc

src/editor/ui_menus/player_menu.cc

src/editor/ui_menus/tool_change_height_options_menu.cc

src/editor/ui_menus/tool_change_resources_options_menu.cc

src/editor/ui_menus/tool_noise_height_options_menu.cc

src/editor/ui_menus/toolsize_menu.cc

src/graphic/CMakeLists.txt

src/graphic/graphic.cc

src/graphic/graphic.h

src/graphic/panel_styles.cc

src/graphic/panel_styles.h

src/graphic/style_manager.cc

src/graphic/style_manager.h

src/ui_basic/CMakeLists.txt

src/ui_basic/box.cc

src/ui_basic/button.cc

src/ui_basic/button.h

src/ui_basic/editbox.cc

src/ui_basic/editbox.h

src/ui_basic/fileview_panel.cc

src/ui_basic/fileview_panel.h

src/ui_basic/fullscreen_window.cc

src/ui_basic/icongrid.cc

src/ui_basic/listselect.cc

src/ui_basic/listselect.h

src/ui_basic/messagebox.cc

src/ui_basic/multilineeditbox.cc

src/ui_basic/multilineeditbox.h

src/ui_basic/multilinetextarea.cc

src/ui_basic/multilinetextarea.h

src/ui_basic/panel.h

src/ui_basic/scrollbar.cc

src/ui_basic/scrollbar.h

src/ui_basic/slider.cc

src/ui_basic/slider.h

src/ui_basic/spinbox.cc

src/ui_basic/spinbox.h

src/ui_basic/table.cc

src/ui_basic/table.h

src/ui_basic/tabpanel.cc

src/ui_basic/tabpanel.h

src/ui_basic/window.cc

src/ui_fsmenu/about.cc

src/ui_fsmenu/campaign_select.cc

src/ui_fsmenu/helpwindow.cc

src/ui_fsmenu/internet_lobby.cc

src/ui_fsmenu/launch_game.cc

src/ui_fsmenu/launch_mpg.cc

src/ui_fsmenu/launch_spg.cc

src/ui_fsmenu/load_map_or_game.cc

src/ui_fsmenu/loadgame.cc

src/ui_fsmenu/main.cc

src/ui_fsmenu/mapselect.cc

src/ui_fsmenu/multiplayer.cc

src/ui_fsmenu/netsetup_lan.cc

src/ui_fsmenu/options.cc

src/ui_fsmenu/singleplayer.cc

src/wui/actionconfirm.cc

src/wui/attack_box.cc

src/wui/building_statistics_menu.cc

src/wui/buildingwindow.cc

src/wui/economy_options_window.cc

src/wui/encyclopedia_window.cc

src/wui/fieldaction.cc

src/wui/game_chat_menu.cc

src/wui/game_debug_ui.cc

src/wui/game_main_menu_save_game.cc

src/wui/game_message_menu.cc

src/wui/game_objectives_menu.cc

src/wui/game_options_menu.cc

src/wui/game_options_sound_menu.cc

src/wui/game_statistics_menu.cc

src/wui/game_summary.cc

src/wui/gamechatpanel.cc

src/wui/gamechatpanel.h

src/wui/general_statistics_menu.cc

src/wui/helpwindow.cc

src/wui/inputqueuedisplay.cc

src/wui/interactive_base.cc

src/wui/login_box.cc

src/wui/mapdetails.cc

src/wui/mapdetails.h

src/wui/maptable.cc

src/wui/maptable.h

src/wui/minimap.cc

src/wui/multiplayersetupgroup.cc

src/wui/playerdescrgroup.cc

src/wui/plot_area.h

src/wui/productionsitewindow.cc

src/wui/shipwindow.cc

src/wui/soldiercapacitycontrol.cc

src/wui/stock_menu.cc

src/wui/story_message_box.cc

src/wui/ware_statistics_menu.cc

src/wui/warehousewindow.cc

src/wui/watchwindow.cc

Older »