[Commits] [wesnoth/wesnoth] 6fd4e3: add lobby sounds options dialog, launching from pr...

Wed Oct 15 04:56:02 UTC 2014

  Branch: refs/heads/master
  Home:   https://github.com/wesnoth/wesnoth
  Commit: 6fd4e3c64e9e4c640ff05951d9870db1fcd04b51
      https://github.com/wesnoth/wesnoth/commit/6fd4e3c64e9e4c640ff05951d9870db1fcd04b51
  Author: Chris Beck <render787 at gmail.com>
  Date:   2014-10-11 (Sat, 11 Oct 2014)

  Changed paths:
    A data/gui/default/window/lobby_sounds_options.cfg
    M src/CMakeLists.txt
    M src/SConscript
    M src/game_preferences_display.cpp
    A src/gui/dialogs/lobby_sounds_options.cpp
    A src/gui/dialogs/lobby_sounds_options.hpp
    M src/preferences_display.hpp
    M src/tests/gui/test_gui2.cpp

  Log Message:
  -----------
  add lobby sounds options dialog, launching from pref->multiplayer

This just adds the gui definition, and a button to bring it up,
with no callbacks or backend.

  Commit: c81306fae3713bb5ee809bb91a30c58d4a8acb69
      https://github.com/wesnoth/wesnoth/commit/c81306fae3713bb5ee809bb91a30c58d4a8acb69
  Author: Chris Beck <render787 at gmail.com>
  Date:   2014-10-11 (Sat, 11 Oct 2014)

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

  Log Message:
  -----------
  add callbacks for lobby_sounds_options dialog, linking to prefs

  Commit: 05448fe34b0835bf4e0cf5b1d0d051cb4517004f
      https://github.com/wesnoth/wesnoth/commit/05448fe34b0835bf4e0cf5b1d0d051cb4517004f
  Author: Chris Beck <render787 at gmail.com>
  Date:   2014-10-11 (Sat, 11 Oct 2014)

  Changed paths:
    M src/CMakeLists.txt
    M src/SConscript
    M src/gui/dialogs/lobby_sounds_options.cpp
    A src/mp_ui_sounds.cpp
    A src/mp_ui_sounds.hpp

  Log Message:
  -----------
  add mp_ui_sounds namespace to handle prefs, sound, notifications

This takes these details out of mp_ui, and the experimental mp
lobby.

  Commit: bb08fae9f69719ee74a30af3bb5a4c1179c7009e
      https://github.com/wesnoth/wesnoth/commit/bb08fae9f69719ee74a30af3bb5a4c1179c7009e
  Author: Chris Beck <render787 at gmail.com>
  Date:   2014-10-11 (Sat, 11 Oct 2014)

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

  Log Message:
  -----------
  fixup use of vgettext

xgettext will extract arguments to vgettext, so the line I removed
here was in fact unnecessary, and would have resulted in double
translation.

  Commit: a2ed0df9731d97ff650c08304acd2c4ddd618a11
      https://github.com/wesnoth/wesnoth/commit/a2ed0df9731d97ff650c08304acd2c4ddd618a11
  Author: Chris Beck <render787 at gmail.com>
  Date:   2014-10-11 (Sat, 11 Oct 2014)

  Changed paths:
    M data/gui/default/window/lobby_sounds_options.cfg
    M src/mp_ui_sounds.cpp
    M src/mp_ui_sounds.hpp

  Log Message:
  -----------
  add friend_message preferences and handler

  Commit: 3a5eec03a4fca580797a7a1d5ae00f6ec032a43b
      https://github.com/wesnoth/wesnoth/commit/3a5eec03a4fca580797a7a1d5ae00f6ec032a43b
  Author: Chris Beck <render787 at gmail.com>
  Date:   2014-10-11 (Sat, 11 Oct 2014)

  Changed paths:
    M src/display_chat_manager.cpp
    M src/gui/dialogs/lobby_main.cpp
    M src/mp_ui_sounds.cpp
    M src/mp_ui_sounds.hpp
    M src/multiplayer_connect.cpp
    M src/multiplayer_ui.cpp
    M src/multiplayer_wait.cpp

  Log Message:
  -----------
  make all lobbies, mp ui screens, and chat handlers use the new code

This commit replaces all appearance of `game_config::sounds::...`
where ... is an mp ui specific sound, with an appropriate call to
the mp_ui_sounds code. This makes sure that the preferences are
checked appropriately and notifications are distributed in all cases
appropriate.

This also obsoletes the "lobby sounds" advanced preference, it
doesn't do anything anymore. Its removal is pending.

  Commit: ac6e648fc19a5ae76aa6769cfec4d8e3672b1cfc
      https://github.com/wesnoth/wesnoth/commit/ac6e648fc19a5ae76aa6769cfec4d8e3672b1cfc
  Author: Chris Beck <render787 at gmail.com>
  Date:   2014-10-11 (Sat, 11 Oct 2014)

  Changed paths:
    M data/gui/default/window/lobby_sounds_options.cfg
    M src/gui/dialogs/lobby_sounds_options.cpp

  Log Message:
  -----------
  add "revert to defaults" button to lobby sounds pref manager

  Commit: 17d6b5e574b1b93a724f3444e0494bdadce2cdf7
      https://github.com/wesnoth/wesnoth/commit/17d6b5e574b1b93a724f3444e0494bdadce2cdf7
  Author: Chris Beck <render787 at gmail.com>
  Date:   2014-10-11 (Sat, 11 Oct 2014)

  Changed paths:
    M src/game_config.cpp
    M src/game_config.hpp
    M src/mp_ui_sounds.cpp

  Log Message:
  -----------
  read sounds from the game_config.cfg, rename sounds to match ui ids

I'm renaming the sounds to match the ui ids, because currently the
lobby sounds options dialog gives for each event, the name of the
corresponding sound entry in game_config.cfg, and I want the code
to look up those ids to be as simple as possible.

  Commit: 6bc34b03efb06025cad1b8975ddd039e0c3cc6a3
      https://github.com/wesnoth/wesnoth/commit/6bc34b03efb06025cad1b8975ddd039e0c3cc6a3
  Author: Chris Beck <render787 at gmail.com>
  Date:   2014-10-11 (Sat, 11 Oct 2014)

  Changed paths:
    M data/advanced_preferences.cfg
    M src/gui/dialogs/lobby_main.cpp
    M src/lobby_preferences.cpp
    M src/lobby_preferences.hpp

  Log Message:
  -----------
  remove "lobby sounds" advanced preference

It is defunct now, having been replaced by the lobby sounds options
dialogs.

  Commit: 788eb1b240c37920798b9cbd35282fb1636dd79f
      https://github.com/wesnoth/wesnoth/commit/788eb1b240c37920798b9cbd35282fb1636dd79f
  Author: Chris Beck <render787 at gmail.com>
  Date:   2014-10-11 (Sat, 11 Oct 2014)

  Changed paths:
    M data/gui/default/window/lobby_sounds_options.cfg
    M src/gui/dialogs/lobby_sounds_options.cpp
    M src/mp_ui_sounds.cpp

  Log Message:
  -----------
  fix a bug caused by exchanging "ready_for_start" <-> "ready_to_start"

  Commit: 634ff7a2bb6c41a99052cfc7ab71658242963e24
      https://github.com/wesnoth/wesnoth/commit/634ff7a2bb6c41a99052cfc7ab71658242963e24
  Author: Chris Beck <render787 at gmail.com>
  Date:   2014-10-12 (Sun, 12 Oct 2014)

  Changed paths:
    M data/game_config.cfg

  Log Message:
  -----------
  add the sound entries to the data/game_config.cfg file

These are the same as the default values in the C++, so this is
not a substantive change. But if a user is trying to figure out
how to reconfigure their sounds, the presence of these entries
might help them.

  Commit: c7c6cb4de78e032492c7e35cef2f856d77a538d4
      https://github.com/wesnoth/wesnoth/commit/c7c6cb4de78e032492c7e35cef2f856d77a538d4
  Author: Chris Beck <render787 at gmail.com>
  Date:   2014-10-12 (Sun, 12 Oct 2014)

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

  Log Message:
  -----------
  fixup lobby_sounds_option dialog: remove tooltips for sounds

This info is maybe more confusing than helpful for some users, and
since it's now very clearly described by the [sounds] entries in
game_config.cfg, I think most interested people will figure it out.

  Commit: 56530d2bf19b5d4914404b134113e0cea5601870
      https://github.com/wesnoth/wesnoth/commit/56530d2bf19b5d4914404b134113e0cea5601870
  Author: Chris Beck <render787 at gmail.com>
  Date:   2014-10-12 (Sun, 12 Oct 2014)

  Changed paths:
    M data/gui/default/window/lobby_sounds_options.cfg
    M src/gui/dialogs/lobby_sounds_options.cpp
    M src/mp_ui_sounds.cpp

  Log Message:
  -----------
  grey out the notifications opts when they weren't compiled in

In this case, we deactivate all of the notification checkboxes,
and set all relevant preferences and checkboxes to false. We also
put a tooltip on the header for this column, saying "This build of
wesnoth doesn't support desktop notifications, contact your
package manager."

  Commit: 2f78d72d56994c6b369d79746859c5c83e050d18
      https://github.com/wesnoth/wesnoth/commit/2f78d72d56994c6b369d79746859c5c83e050d18
  Author: Chris Beck <render787 at gmail.com>
  Date:   2014-10-12 (Sun, 12 Oct 2014)

  Changed paths:
    M data/gui/default/window/lobby_sounds_options.cfg
    M src/gui/dialogs/lobby_sounds_options.cpp
    M src/mp_ui_sounds.cpp

  Log Message:
  -----------
  fix bug where preferences seemed not to be saved

The problem was that widget ids were being used in place of
preference ids, which are very similar but not exactly the same.
This commit fixes the bug, but goes further and changes all the
widget ids to match the preference ids, reducing the chance of
confusion in the future.

  Commit: 5a053a13bc09104c0477ea336d7dd59ec5df5791
      https://github.com/wesnoth/wesnoth/commit/5a053a13bc09104c0477ea336d7dd59ec5df5791
  Author: Chris Beck <render787 at gmail.com>
  Date:   2014-10-12 (Sun, 12 Oct 2014)

  Changed paths:
    M src/CMakeLists.txt
    M src/SConscript
    M src/display_chat_manager.cpp
    M src/gui/dialogs/lobby_main.cpp
    M src/gui/dialogs/lobby_sounds_options.cpp
    A src/mp_ui_alerts.cpp
    A src/mp_ui_alerts.hpp
    R src/mp_ui_sounds.cpp
    R src/mp_ui_sounds.hpp
    M src/multiplayer_connect.cpp
    M src/multiplayer_ui.cpp
    M src/multiplayer_wait.cpp

  Log Message:
  -----------
  rename mp_ui_sounds -> mp_ui_alerts

  Commit: 20bb831e5c38cf0783e6a53ab89aeced4cd0d9e0
      https://github.com/wesnoth/wesnoth/commit/20bb831e5c38cf0783e6a53ab89aeced4cd0d9e0
  Author: Chris Beck <render787 at gmail.com>
  Date:   2014-10-12 (Sun, 12 Oct 2014)

  Changed paths:
    M src/game_preferences_display.cpp
    M src/preferences_display.hpp

  Log Message:
  -----------
  rename "lobby sounds" button to "alerts"

Also in the preferences code, change it to "mp_alerts"

  Commit: b937d2d1bdd91345e231c4d846bf4116182d76e4
      https://github.com/wesnoth/wesnoth/commit/b937d2d1bdd91345e231c4d846bf4116182d76e4
  Author: Chris Beck <render787 at gmail.com>
  Date:   2014-10-12 (Sun, 12 Oct 2014)

  Changed paths:
    R data/gui/default/window/lobby_sounds_options.cfg
    A data/gui/default/window/mp_alerts_options.cfg
    M src/CMakeLists.txt
    M src/SConscript
    M src/game_preferences_display.cpp
    R src/gui/dialogs/lobby_sounds_options.cpp
    R src/gui/dialogs/lobby_sounds_options.hpp
    A src/gui/dialogs/mp_alerts_options.cpp
    A src/gui/dialogs/mp_alerts_options.hpp
    M src/mp_ui_alerts.hpp
    M src/tests/gui/test_gui2.cpp

  Log Message:
  -----------
  rename "lobby_sounds_options" -> "mp_alerts_options"

  Commit: 3be095026d0e0c0bc2f209e14aea9c66312f723a
      https://github.com/wesnoth/wesnoth/commit/3be095026d0e0c0bc2f209e14aea9c66312f723a
  Author: Chris Beck <render787 at gmail.com>
  Date:   2014-10-12 (Sun, 12 Oct 2014)

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

  Log Message:
  -----------
  change title "Lobby Sounds" -> "Multiplayer Alerts", fix tooltips

Tooltips are not supposed to end in '.'

  Commit: 3c562f6d28e4f5de56eabc28fb5e94dbcd79192a
      https://github.com/wesnoth/wesnoth/commit/3c562f6d28e4f5de56eabc28fb5e94dbcd79192a
  Author: Chris Beck <render787 at gmail.com>
  Date:   2014-10-14 (Tue, 14 Oct 2014)

  Changed paths:
    M src/display_chat_manager.cpp
    M src/gui/dialogs/lobby_main.cpp
    M src/gui/dialogs/lobby_main.hpp
    M src/mp_ui_alerts.cpp
    M src/mp_ui_alerts.hpp
    M src/multiplayer_ui.cpp

  Log Message:
  -----------
  for chats, put the msg in desktop notification, not vague nonsense

  Commit: 5986604148924db36bd24f0cc1a37e730b05d698
      https://github.com/wesnoth/wesnoth/commit/5986604148924db36bd24f0cc1a37e730b05d698
  Author: Chris Beck <render787 at gmail.com>
  Date:   2014-10-14 (Tue, 14 Oct 2014)

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

  Log Message:
  -----------
  cleanup some stuff -- allow old use of do_notify in tlobby_main

  Commit: a819a51feb7f37d06aeefadd5f8cdf0f63357d71
      https://github.com/wesnoth/wesnoth/commit/a819a51feb7f37d06aeefadd5f8cdf0f63357d71
  Author: Chris Beck <render787 at gmail.com>
  Date:   2014-10-14 (Tue, 14 Oct 2014)

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

  Log Message:
  -----------
  fix a copyright statement

I forget now which file of Shadowm's a used as a template.

  Commit: 13bf36ea72bf3830b9b55d8e996be3ed2d5f357a
      https://github.com/wesnoth/wesnoth/commit/13bf36ea72bf3830b9b55d8e996be3ed2d5f357a
  Author: Chris Beck <beck.ct at gmail.com>
  Date:   2014-10-15 (Wed, 15 Oct 2014)

  Changed paths:
    M data/advanced_preferences.cfg
    M data/game_config.cfg
    A data/gui/default/window/mp_alerts_options.cfg
    M src/CMakeLists.txt
    M src/SConscript
    M src/display_chat_manager.cpp
    M src/game_config.cpp
    M src/game_config.hpp
    M src/game_preferences_display.cpp
    M src/gui/dialogs/lobby_main.cpp
    M src/gui/dialogs/lobby_main.hpp
    A src/gui/dialogs/mp_alerts_options.cpp
    A src/gui/dialogs/mp_alerts_options.hpp
    M src/lobby_preferences.cpp
    M src/lobby_preferences.hpp
    A src/mp_ui_alerts.cpp
    A src/mp_ui_alerts.hpp
    M src/multiplayer_connect.cpp
    M src/multiplayer_ui.cpp
    M src/multiplayer_wait.cpp
    M src/preferences_display.hpp
    M src/tests/gui/test_gui2.cpp

  Log Message:
  -----------
  Merge pull request #297 from cbeck88/mp_ui_sounds_options

Mp ui sounds options

Compare: https://github.com/wesnoth/wesnoth/compare/741e9f436d26...13bf36ea72bf