[Commits] [wesnoth/wesnoth] 21183f: gui2/tpreferences: Early WIP

Sun Aug 7 09:58:55 UTC 2016

  Branch: refs/heads/Branch_prefs_dialog_refactor
  Home:   https://github.com/wesnoth/wesnoth
  Commit: 21183f19f353fe42ad4fd3a0e332df323e47e3c6
      https://github.com/wesnoth/wesnoth/commit/21183f19f353fe42ad4fd3a0e332df323e47e3c6
  Author: Ignacio R. Morelle <shadowm at wesnoth.org>
  Date:   2016-01-17 (Sun, 17 Jan 2016)

  Changed paths:
    A data/gui/default/window/preferences.cfg
    M src/SConscript
    M src/game_preferences_display.cpp
    A src/gui/dialogs/preferences_dialog.cpp
    A src/gui/dialogs/preferences_dialog.hpp

  Log Message:
  -----------
  gui2/tpreferences: Early WIP

  Commit: fa54cec01df9d92877de91ef8cc95533bfd7e6f0
      https://github.com/wesnoth/wesnoth/commit/fa54cec01df9d92877de91ef8cc95533bfd7e6f0
  Author: Ignacio R. Morelle <shadowm at wesnoth.org>
  Date:   2016-01-17 (Sun, 17 Jan 2016)

  Changed paths:
    M data/gui/default/window/preferences.cfg
    A data/gui/default/window/preferences/01_general.cfg
    A data/gui/default/window/preferences/02_display.cfg
    A data/gui/default/window/preferences/03_sound.cfg
    A data/gui/default/window/preferences/04_multiplayer.cfg
    A data/gui/default/window/preferences/05_advanced.cfg
    A data/gui/default/window/preferences/_final.cfg
    A data/gui/default/window/preferences/_initial.cfg
    M src/gui/dialogs/preferences_dialog.cpp

  Log Message:
  -----------
  gui2/tpreferences: More WIP with some initial layouts

  Commit: 0f94b10157838a741069a4a048f307d1e600cda5
      https://github.com/wesnoth/wesnoth/commit/0f94b10157838a741069a4a048f307d1e600cda5
  Author: Charles Dang <exodia339 at gmail.com>
  Date:   2016-01-17 (Sun, 17 Jan 2016)

  Changed paths:
    M projectfiles/CodeBlocks/wesnoth.cbp
    M src/CMakeLists.txt
    M src/SConscript

  Log Message:
  -----------
  Add prefs files to build lists

  Commit: 2bf86d4e205eb641d03b6fee5cfeed87a7f9ef6d
      https://github.com/wesnoth/wesnoth/commit/2bf86d4e205eb641d03b6fee5cfeed87a7f9ef6d
  Author: Charles Dang <exodia339 at gmail.com>
  Date:   2016-01-17 (Sun, 17 Jan 2016)

  Changed paths:
    M data/gui/default/window/preferences/01_general.cfg

  Log Message:
  -----------
  tpreferences: removed Paths button

The Paths dialog has been succeeded by the About dialog

  Commit: e8409c919c9036a1f666df8f120ceb56bad4d2e7
      https://github.com/wesnoth/wesnoth/commit/e8409c919c9036a1f666df8f120ceb56bad4d2e7
  Author: Charles Dang <exodia339 at gmail.com>
  Date:   2016-01-17 (Sun, 17 Jan 2016)

  Changed paths:
    M src/game_preferences_display.cpp
    M src/gui/dialogs/preferences_dialog.cpp
    M src/gui/dialogs/preferences_dialog.hpp

  Log Message:
  -----------
  Progress on implementing GUI2 preferences dialog

  Commit: 36effcebd4f588441a895e43a6786a5046ba087e
      https://github.com/wesnoth/wesnoth/commit/36effcebd4f588441a895e43a6786a5046ba087e
  Author: Charles Dang <exodia339 at gmail.com>
  Date:   2016-01-17 (Sun, 17 Jan 2016)

  Changed paths:
    M src/gui/dialogs/preferences_dialog.cpp
    M src/gui/dialogs/preferences_dialog.hpp

  Log Message:
  -----------
  tpreferences: unify sound panel callbacks

  Commit: a513d27c8d9af285296760c119b62aad59ecf99c
      https://github.com/wesnoth/wesnoth/commit/a513d27c8d9af285296760c119b62aad59ecf99c
  Author: Charles Dang <exodia339 at gmail.com>
  Date:   2016-01-17 (Sun, 17 Jan 2016)

  Changed paths:
    M src/gui/dialogs/preferences_dialog.cpp
    M src/gui/dialogs/preferences_dialog.hpp

  Log Message:
  -----------
  tpreferences: added callbacks for sound panel sliders

  Commit: e09c2e526f53a3f3248d68df8e6e323e8fd09336
      https://github.com/wesnoth/wesnoth/commit/e09c2e526f53a3f3248d68df8e6e323e8fd09336
  Author: Charles Dang <exodia339 at gmail.com>
  Date:   2016-01-17 (Sun, 17 Jan 2016)

  Changed paths:
    M src/gui/dialogs/preferences_dialog.cpp
    M src/gui/dialogs/preferences_dialog.hpp

  Log Message:
  -----------
  tpreferences: make most of Display panel functional

  Commit: b59de327e57e3ac8c26f3d3eb26f4f9bb198d078
      https://github.com/wesnoth/wesnoth/commit/b59de327e57e3ac8c26f3d3eb26f4f9bb198d078
  Author: Charles Dang <exodia339 at gmail.com>
  Date:   2016-01-17 (Sun, 17 Jan 2016)

  Changed paths:
    M src/gui/dialogs/preferences_dialog.cpp
    M src/gui/dialogs/preferences_dialog.hpp

  Log Message:
  -----------
  tpreferences: generalize slider/button functions

  Commit: b57529db09fa4a95a19bc3b8c96df40169bf7eca
      https://github.com/wesnoth/wesnoth/commit/b57529db09fa4a95a19bc3b8c96df40169bf7eca
  Author: Charles Dang <exodia339 at gmail.com>
  Date:   2016-01-17 (Sun, 17 Jan 2016)

  Changed paths:
    M src/game_preferences_display.cpp
    M src/gui/dialogs/preferences_dialog.cpp
    M src/gui/dialogs/preferences_dialog.hpp

  Log Message:
  -----------
  tpreferences: remove dependency on display

  Commit: b0d2e1b8ed00f219437e7a62cd5e2846b8f62416
      https://github.com/wesnoth/wesnoth/commit/b0d2e1b8ed00f219437e7a62cd5e2846b8f62416
  Author: Charles Dang <exodia339 at gmail.com>
  Date:   2016-01-17 (Sun, 17 Jan 2016)

  Changed paths:
    M src/gui/dialogs/preferences_dialog.cpp
    M src/gui/dialogs/preferences_dialog.hpp

  Log Message:
  -----------
  tpreferences: discard bool retval in setters

Might make use of it later.

  Commit: 7bce476016437af16d1fda4dde7285fb7c863985
      https://github.com/wesnoth/wesnoth/commit/7bce476016437af16d1fda4dde7285fb7c863985
  Author: Charles Dang <exodia339 at gmail.com>
  Date:   2016-01-17 (Sun, 17 Jan 2016)

  Changed paths:
    M data/gui/default/window/preferences/01_general.cfg

  Log Message:
  -----------
  tpreferences: split composite slider label text and values

  Commit: d95fd0ffac4b501cea3381dc4fde2ecf36639cb0
      https://github.com/wesnoth/wesnoth/commit/d95fd0ffac4b501cea3381dc4fde2ecf36639cb0
  Author: Charles Dang <exodia339 at gmail.com>
  Date:   2016-01-17 (Sun, 17 Jan 2016)

  Changed paths:
    M src/gui/dialogs/preferences_dialog.cpp
    M src/gui/dialogs/preferences_dialog.hpp

  Log Message:
  -----------
  tpreferences: implement most of General panel

  Commit: e264cdbccb7e05125e9f2629a8851d5177745721
      https://github.com/wesnoth/wesnoth/commit/e264cdbccb7e05125e9f2629a8851d5177745721
  Author: Charles Dang <exodia339 at gmail.com>
  Date:   2016-01-17 (Sun, 17 Jan 2016)

  Changed paths:
    M src/gui/dialogs/preferences_dialog.cpp
    M src/gui/dialogs/preferences_dialog.hpp

  Log Message:
  -----------
  tpreferences: removed some test code

  Commit: 6b3ac77a4ff72f59e78e31f6cc58012c1aacfea3
      https://github.com/wesnoth/wesnoth/commit/6b3ac77a4ff72f59e78e31f6cc58012c1aacfea3
  Author: Charles Dang <exodia339 at gmail.com>
  Date:   2016-01-17 (Sun, 17 Jan 2016)

  Changed paths:
    M src/gui/dialogs/preferences_dialog.cpp

  Log Message:
  -----------
  tpreferences: implement most of Multiplayer tab

  Commit: 1e22417756d34baf41bb276671312bdd38fbc18c
      https://github.com/wesnoth/wesnoth/commit/1e22417756d34baf41bb276671312bdd38fbc18c
  Author: Charles Dang <exodia339 at gmail.com>
  Date:   2016-01-17 (Sun, 17 Jan 2016)

  Changed paths:
    M src/gui/dialogs/preferences_dialog.cpp

  Log Message:
  -----------
  tpreferences: made use of lexical_cast

  Commit: 44980ba9e33c47e5f8e43970b362ffc0a310e31f
      https://github.com/wesnoth/wesnoth/commit/44980ba9e33c47e5f8e43970b362ffc0a310e31f
  Author: Charles Dang <exodia339 at gmail.com>
  Date:   2016-01-17 (Sun, 17 Jan 2016)

  Changed paths:
    M src/preferences_display.cpp

  Log Message:
  -----------
  Comment out a problem line

  Commit: 712d06f0f6f8dcc74aa434e3bb04dccabb98c912
      https://github.com/wesnoth/wesnoth/commit/712d06f0f6f8dcc74aa434e3bb04dccabb98c912
  Author: Charles Dang <exodia339 at gmail.com>
  Date:   2016-01-17 (Sun, 17 Jan 2016)

  Changed paths:
    M src/gui/dialogs/preferences_dialog.cpp
    M src/gui/dialogs/preferences_dialog.hpp

  Log Message:
  -----------
  tpreferences: implement button callbacks with functionality immediately available

A few buttons remain unimplemented since they require a new implementation

  Commit: da84de5fac179c3568851066f678e1e071efc6d2
      https://github.com/wesnoth/wesnoth/commit/da84de5fac179c3568851066f678e1e071efc6d2
  Author: Charles Dang <exodia339 at gmail.com>
  Date:   2016-01-17 (Sun, 17 Jan 2016)

  Changed paths:
    M src/gui/dialogs/preferences_dialog.cpp
    M src/gui/dialogs/preferences_dialog.hpp

  Log Message:
  -----------
  tpreferences: cleaned up function naming

  Commit: 90b432f5efdb99793c0c42545e154bd17bed0511
      https://github.com/wesnoth/wesnoth/commit/90b432f5efdb99793c0c42545e154bd17bed0511
  Author: Charles Dang <exodia339 at gmail.com>
  Date:   2016-01-17 (Sun, 17 Jan 2016)

  Changed paths:
    M src/gui/dialogs/preferences_dialog.cpp
    M src/gui/dialogs/preferences_dialog.hpp

  Log Message:
  -----------
  tpreferences: added hacky specialized functionality for lobby join radio group

  Commit: b2275fdec5a4311700ee13517666f245eecfc953
      https://github.com/wesnoth/wesnoth/commit/b2275fdec5a4311700ee13517666f245eecfc953
  Author: Charles Dang <exodia339 at gmail.com>
  Date:   2016-01-17 (Sun, 17 Jan 2016)

  Changed paths:
    M data/gui/default/window/preferences/01_general.cfg
    M src/gui/dialogs/preferences_dialog.cpp
    M src/gui/dialogs/preferences_dialog.hpp

  Log Message:
  -----------
  tpreferences: implemented Accelerated Speed handling

  Commit: 6634d6b7919fba6bd336bdd94181da73a5bd971d
      https://github.com/wesnoth/wesnoth/commit/6634d6b7919fba6bd336bdd94181da73a5bd971d
  Author: Charles Dang <exodia339 at gmail.com>
  Date:   2016-01-17 (Sun, 17 Jan 2016)

  Changed paths:
    M src/gui/dialogs/preferences_dialog.cpp

  Log Message:
  -----------
  tpreferences: fixed an incorrectly set up entry

  Commit: c4d7c23b3857e5d937be87b69c9a0e987b67a27d
      https://github.com/wesnoth/wesnoth/commit/c4d7c23b3857e5d937be87b69c9a0e987b67a27d
  Author: Charles Dang <exodia339 at gmail.com>
  Date:   2016-01-17 (Sun, 17 Jan 2016)

  Changed paths:
    M data/gui/default/window/preferences/01_general.cfg
    M src/gui/dialogs/preferences_dialog.cpp

  Log Message:
  -----------
  tpreferences: used scroll type for custom slider value labels

  Commit: 240cc8245642119eae93cf16c71469c0dbc51d2c
      https://github.com/wesnoth/wesnoth/commit/240cc8245642119eae93cf16c71469c0dbc51d2c
  Author: Charles Dang <exodia339 at gmail.com>
  Date:   2016-01-17 (Sun, 17 Jan 2016)

  Changed paths:
    M src/game_preferences_display.cpp
    M src/gui/dialogs/preferences_dialog.cpp
    M src/gui/dialogs/preferences_dialog.hpp

  Log Message:
  -----------
  tpreferences: removed CVideo argument

  Commit: 27a42204970bbbb4100a07f281690fff64379032
      https://github.com/wesnoth/wesnoth/commit/27a42204970bbbb4100a07f281690fff64379032
  Author: Charles Dang <exodia339 at gmail.com>
  Date:   2016-01-17 (Sun, 17 Jan 2016)

  Changed paths:
    M data/gui/default/window/preferences/01_general.cfg
    M data/gui/default/window/preferences/02_display.cfg
    M data/gui/default/window/preferences/04_multiplayer.cfg

  Log Message:
  -----------
  tpreferences: added tooltips for buttons missing them

  Commit: a54ad0a67899fbaf6598042b8b98a824ff04f32c
      https://github.com/wesnoth/wesnoth/commit/a54ad0a67899fbaf6598042b8b98a824ff04f32c
  Author: Charles Dang <exodia339 at gmail.com>
  Date:   2016-01-17 (Sun, 17 Jan 2016)

  Changed paths:
    M src/gui/dialogs/simple_item_selector.cpp

  Log Message:
  -----------
  tsimple_item_selector: allowed markup by default

  Commit: e8008f4f2e788b0ce60b79fe377651556c5f7f5b
      https://github.com/wesnoth/wesnoth/commit/e8008f4f2e788b0ce60b79fe377651556c5f7f5b
  Author: Charles Dang <exodia339 at gmail.com>
  Date:   2016-01-17 (Sun, 17 Jan 2016)

  Changed paths:
    M src/preferences_display.cpp

  Log Message:
  -----------
  Added some formatting to res chooser dialog

Also cleaned up function

  Commit: 88d802f5bfcf782996fa3c7a3dc73f8a54b3eb7a
      https://github.com/wesnoth/wesnoth/commit/88d802f5bfcf782996fa3c7a3dc73f8a54b3eb7a
  Author: Charles Dang <exodia339 at gmail.com>
  Date:   2016-01-17 (Sun, 17 Jan 2016)

  Changed paths:
    M src/game_preferences_display.cpp

  Log Message:
  -----------
  Reduced wednothd filechooser case title length

  Commit: 8450afa57ebeba01dac2ae7ad9201f54b73a1492
      https://github.com/wesnoth/wesnoth/commit/8450afa57ebeba01dac2ae7ad9201f54b73a1492
  Author: Charles Dang <exodia339 at gmail.com>
  Date:   2016-01-17 (Sun, 17 Jan 2016)

  Changed paths:
    M src/gui/dialogs/helper.hpp

  Log Message:
  -----------
  Added additional dialog callback helper function by iceiceice

  Commit: 5fbc4d3b7c9d807a4133f6ef642f7cf2e473bf47
      https://github.com/wesnoth/wesnoth/commit/5fbc4d3b7c9d807a4133f6ef642f7cf2e473bf47
  Author: Charles Dang <exodia339 at gmail.com>
  Date:   2016-01-17 (Sun, 17 Jan 2016)

  Changed paths:
    M data/advanced_preferences.cfg
    M src/display.cpp
    M src/display.hpp

  Log Message:
  -----------
  Removed the option to turn off Local ToD lighting. It is now always on.

  Commit: e653974d7123fc7e2ad2e2d9a0a8e3cc43225290
      https://github.com/wesnoth/wesnoth/commit/e653974d7123fc7e2ad2e2d9a0a8e3cc43225290
  Author: Charles Dang <exodia339 at gmail.com>
  Date:   2016-01-17 (Sun, 17 Jan 2016)

  Changed paths:
    M data/advanced_preferences.cfg
    M src/game_preferences.cpp
    M src/game_preferences.hpp
    M src/reports.cpp

  Log Message:
  -----------
  Remove Reverse Time Graphics option

  Commit: d0154d6fa406da0f7cca73f65948be6b750f1d2b
      https://github.com/wesnoth/wesnoth/commit/d0154d6fa406da0f7cca73f65948be6b750f1d2b
  Author: Charles Dang <exodia339 at gmail.com>
  Date:   2016-01-17 (Sun, 17 Jan 2016)

  Changed paths:
    M data/advanced_preferences.cfg
    R data/gui/default/widget/progress_bar_title_screen.cfg
    M data/gui/default/window/title_screen.cfg
    M src/game_preferences.cpp
    M src/game_preferences.hpp
    M src/gui/dialogs/title_screen.cpp
    M src/gui/dialogs/title_screen.hpp

  Log Message:
  -----------
  Removed Titlescreen Animation option and related code

  Commit: 818b070d2fa9403bbde1f69da2b8ce520b3e3376
      https://github.com/wesnoth/wesnoth/commit/818b070d2fa9403bbde1f69da2b8ce520b3e3376
  Author: Charles Dang <exodia339 at gmail.com>
  Date:   2016-01-18 (Mon, 18 Jan 2016)

  Changed paths:
    M data/gui/default/widget/label_default.cfg
    M data/gui/default/widget/scroll_label_default.cfg

  Log Message:
  -----------
  Added definition for small-size scroll label

  Commit: 811d7f8449a2726048848c99ae99572737f12390
      https://github.com/wesnoth/wesnoth/commit/811d7f8449a2726048848c99ae99572737f12390
  Author: Charles Dang <exodia339 at gmail.com>
  Date:   2016-01-18 (Mon, 18 Jan 2016)

  Changed paths:
    M data/gui/default/window/preferences.cfg
    M data/gui/default/window/preferences/01_general.cfg
    M data/gui/default/window/preferences/02_display.cfg
    M data/gui/default/window/preferences/03_sound.cfg
    M data/gui/default/window/preferences/04_multiplayer.cfg
    M src/gui/dialogs/preferences_dialog.cpp
    M src/gui/dialogs/preferences_dialog.hpp

  Log Message:
  -----------
  Cleaned up window layout and implement tabs for MP page (not functional yet)

  Commit: b095c56a84c97fac152eda4903867eef6472d1e2
      https://github.com/wesnoth/wesnoth/commit/b095c56a84c97fac152eda4903867eef6472d1e2
  Author: Charles Dang <exodia339 at gmail.com>
  Date:   2016-01-19 (Tue, 19 Jan 2016)

  Changed paths:
    M src/preferences.cpp
    M src/preferences.hpp

  Log Message:
  -----------
  Added another prefs getter method that takes a string default

  Commit: f9169d90d7cba31a5e7d91f90f81c98c2c7c3177
      https://github.com/wesnoth/wesnoth/commit/f9169d90d7cba31a5e7d91f90f81c98c2c7c3177
  Author: Charles Dang <exodia339 at gmail.com>
  Date:   2016-01-19 (Tue, 19 Jan 2016)

  Changed paths:
    M data/gui/default/window/preferences/05_advanced.cfg
    M src/game_preferences_display.cpp
    M src/gui/dialogs/preferences_dialog.cpp
    M src/gui/dialogs/preferences_dialog.hpp

  Log Message:
  -----------
  tpreferences: imported advanced prefs into class and added preliminary display

  Commit: 326d2e50333dc0faa1743ccb985cb70459215e14
      https://github.com/wesnoth/wesnoth/commit/326d2e50333dc0faa1743ccb985cb70459215e14
  Author: gfgtdf <f492343 at rmqkr.net>
  Date:   2016-01-19 (Tue, 19 Jan 2016)

  Changed paths:
    M src/unit_filter.cpp

  Log Message:
  -----------
  use parse() instead of string_to_enum().

this is faster if the string doesnt match because it doesnt throw an
execption in that case.

  Commit: 0f794321c40ba8763029b95cbc4d6d7f3b599d25
      https://github.com/wesnoth/wesnoth/commit/0f794321c40ba8763029b95cbc4d6d7f3b599d25
  Author: gfgtdf <f492343 at rmqkr.net>
  Date:   2016-01-19 (Tue, 19 Jan 2016)

  Changed paths:
    M src/make_enum.hpp

  Log Message:
  -----------
  add a comment

  Commit: ae5608d22770c45375141b61eb6d89d319bd9dcf
      https://github.com/wesnoth/wesnoth/commit/ae5608d22770c45375141b61eb6d89d319bd9dcf
  Author: gfgtdf <f492343 at rmqkr.net>
  Date:   2016-01-19 (Tue, 19 Jan 2016)

  Changed paths:
    M src/gui/auxiliary/event/distributor.cpp
    M src/gui/widgets/grid.hpp
    M src/gui/widgets/image.hpp
    M src/gui/widgets/label.hpp
    M src/gui/widgets/widget.hpp

  Log Message:
  -----------
  attempt to fix 'moseover' state not beeing selected..

when the mouse is inisde a child widget of a toggle_panel.

This currely only fixes it for label, image and grid childs. Maybe we
want can_mouse_focus to be false by default?

  Commit: 64faa776a98ccffe0d2579d67078676a4ada9102
      https://github.com/wesnoth/wesnoth/commit/64faa776a98ccffe0d2579d67078676a4ada9102
  Author: gfgtdf <f492343 at rmqkr.net>
  Date:   2016-01-19 (Tue, 19 Jan 2016)

  Changed paths:
    A data/gui/default/widget/button_drobbox.cfg
    A data/gui/default/window/drop_down_list.cfg
    M src/CMakeLists.txt
    M src/SConscript
    A src/gui/auxiliary/widget_definition/combobox.cpp
    A src/gui/auxiliary/widget_definition/combobox.hpp
    A src/gui/auxiliary/window_builder/combobox.cpp
    A src/gui/auxiliary/window_builder/combobox.hpp
    A src/gui/dialogs/drop_down_list.cpp
    A src/gui/dialogs/drop_down_list.hpp
    A src/gui/widgets/combobox.cpp
    A src/gui/widgets/combobox.hpp

  Log Message:
  -----------
  comboboxes for gui2

This adds a new combobox widget to gui2. Like the gui1 combobox widget
this is more or less only a button that promts a list dialog below the
button when you click on it.

  Commit: c880d82e51c2b340cf0d9d8934cc1dadfbe80b7e
      https://github.com/wesnoth/wesnoth/commit/c880d82e51c2b340cf0d9d8934cc1dadfbe80b7e
  Author: gfgtdf <f492343 at rmqkr.net>
  Date:   2016-01-19 (Tue, 19 Jan 2016)

  Changed paths:
    M data/gui/default/window/drop_down_list.cfg

  Log Message:
  -----------
  make dropdown list width at least the width of the combobox

This also makes the text in the list left-aligned.

patch by vultraz

  Commit: 3284e5b32a95420662ec9b8fc5a890fdd59b09fb
      https://github.com/wesnoth/wesnoth/commit/3284e5b32a95420662ec9b8fc5a890fdd59b09fb
  Author: gfgtdf <f492343 at rmqkr.net>
  Date:   2016-01-19 (Tue, 19 Jan 2016)

  Changed paths:
    M src/scripting/lua_gui2.cpp

  Log Message:
  -----------
  lua gui get/set_dialog_value take numbers for tselectable_

This adds lua support for tristate buttons and comboboxes.

  Commit: 225506650da8a191ab02e04f9bcc192bb82194b1
      https://github.com/wesnoth/wesnoth/commit/225506650da8a191ab02e04f9bcc192bb82194b1
  Author: gfgtdf <f492343 at rmqkr.net>
  Date:   2016-01-19 (Tue, 19 Jan 2016)

  Changed paths:
    M data/gui/default/window/title_screen.cfg

  Log Message:
  -----------
  testing combobox widget on titltescreen

  Commit: eb4b8eab73921bf5c4eff0ca19a2c29dbcc878ed
      https://github.com/wesnoth/wesnoth/commit/eb4b8eab73921bf5c4eff0ca19a2c29dbcc878ed
  Author: gfgtdf <f492343 at rmqkr.net>
  Date:   2016-01-19 (Tue, 19 Jan 2016)

  Changed paths:
    M src/gui/widgets/combobox.hpp

  Log Message:
  -----------
  fixup

  Commit: 8471d1c79a61a14eda1891f2a140900f5fab1f02
      https://github.com/wesnoth/wesnoth/commit/8471d1c79a61a14eda1891f2a140900f5fab1f02
  Author: gfgtdf <f492343 at rmqkr.net>
  Date:   2016-01-19 (Tue, 19 Jan 2016)

  Changed paths:
    M src/gui/widgets/combobox.cpp
    M src/gui/widgets/combobox.hpp

  Log Message:
  -----------
  fixup

  Commit: af8fac0780aea6c6d74d4a7216cb1b5f21b37b36
      https://github.com/wesnoth/wesnoth/commit/af8fac0780aea6c6d74d4a7216cb1b5f21b37b36
  Author: Charles Dang <exodia339 at gmail.com>
  Date:   2016-01-20 (Wed, 20 Jan 2016)

  Changed paths:
    M data/campaigns/Sceptre_of_Fire/_main.cfg
    A data/gui/default/widget/button_drobbox.cfg
    A data/gui/default/window/drop_down_list.cfg
    M data/gui/default/window/title_screen.cfg
    M src/CMakeLists.txt
    M src/SConscript
    M src/filesystem_boost.cpp
    M src/gui/auxiliary/event/distributor.cpp
    A src/gui/auxiliary/widget_definition/combobox.cpp
    A src/gui/auxiliary/widget_definition/combobox.hpp
    A src/gui/auxiliary/window_builder/combobox.cpp
    A src/gui/auxiliary/window_builder/combobox.hpp
    A src/gui/dialogs/drop_down_list.cpp
    A src/gui/dialogs/drop_down_list.hpp
    A src/gui/widgets/combobox.cpp
    A src/gui/widgets/combobox.hpp
    M src/gui/widgets/grid.hpp
    M src/gui/widgets/image.hpp
    M src/gui/widgets/label.hpp
    M src/gui/widgets/widget.hpp
    M src/make_enum.hpp
    M src/scripting/lua_gui2.cpp
    M src/unit_filter.cpp

  Log Message:
  -----------
  Merge branch 'gui2_combobox' of git://github.com/gfgtdf/wesnoth-old into Branch_prefs_dialog_refactor

  Commit: 4dd204b8828cf81c9520b6cc9015d67fc3d6d2f5
      https://github.com/wesnoth/wesnoth/commit/4dd204b8828cf81c9520b6cc9015d67fc3d6d2f5
  Author: gfgtdf <f492343 at rmqkr.net>
  Date:   2016-01-19 (Tue, 19 Jan 2016)

  Changed paths:
    M src/gui/dialogs/drop_down_list.cpp

  Log Message:
  -----------
  fixup 3

  Commit: b3b503733cec72ebef04b40a526dfcf69c400a86
      https://github.com/wesnoth/wesnoth/commit/b3b503733cec72ebef04b40a526dfcf69c400a86
  Author: Charles Dang <exodia339 at gmail.com>
  Date:   2016-01-20 (Wed, 20 Jan 2016)

  Changed paths:
    M src/gui/dialogs/drop_down_list.cpp

  Log Message:
  -----------
  Merge branch 'gui2_combobox' of git://github.com/gfgtdf/wesnoth-old into Branch_prefs_dialog_refactor

Compare: https://github.com/wesnoth/wesnoth/compare/21183f19f353^...b3b503733cec