[Commits] [wesnoth/wesnoth] c35387: Generalize Quit to Desktop hotkey so it works in-g...

Fri Sep 11 06:56:22 UTC 2015

  Branch: refs/heads/sdl2
  Home:   https://github.com/wesnoth/wesnoth
  Commit: c35387982cfa5428e1abfa5848f07d50cce032ce
      https://github.com/wesnoth/wesnoth/commit/c35387982cfa5428e1abfa5848f07d50cce032ce
  Author: Celtic Minstrel <celtic.minstrel.ca at some.place>
  Date:   2015-09-07 (Mon, 07 Sep 2015)

  Changed paths:
    M data/core/hotkeys.cfg
    M data/themes/editor.cfg
    M src/editor/controller/editor_controller.cpp
    M src/gui/dialogs/title_screen.cpp
    M src/hotkey/command_executor.cpp
    M src/hotkey/hotkey_command.cpp
    M src/hotkey/hotkey_command.hpp
    M src/hotkey_handler.cpp

  Log Message:
  -----------
  Generalize Quit to Desktop hotkey so it works in-game and at titlescreen

  Commit: 59f6b7e720b746cfb53d0870514482cfff3590b3
      https://github.com/wesnoth/wesnoth/commit/59f6b7e720b746cfb53d0870514482cfff3590b3
  Author: Celtic Minstrel <celtic.minstrel.ca at some.place>
  Date:   2015-09-07 (Mon, 07 Sep 2015)

  Changed paths:
    M src/controller_base.cpp
    M src/hotkey/command_executor.cpp
    M src/hotkey/hotkey_command.cpp

  Log Message:
  -----------
  Move special-case handling of Escape key used to quit game

It's now handled in the controller base rather than the hotkey executor.
This means that the Escape key works to close the map editor.

This means that the Escape key can also be used to exit the editor. It also means the Escape key is rebindable.

  Commit: c85c05765247ba59afdd05101692c3d619fceb23
      https://github.com/wesnoth/wesnoth/commit/c85c05765247ba59afdd05101692c3d619fceb23
  Author: Celtic Minstrel <celtic.minstrel.ca at some.place>
  Date:   2015-09-07 (Mon, 07 Sep 2015)

  Changed paths:
    M src/controller_base.hpp

  Log Message:
  -----------
  Fix a doxy-comment erroneously claiming a function is non-virtual

  Commit: 24a54e1108c70cc493a660acdc74d65054e6dd9e
      https://github.com/wesnoth/wesnoth/commit/24a54e1108c70cc493a660acdc74d65054e6dd9e
  Author: Celtic Minstrel <celtic.minstrel.ca at some.place>
  Date:   2015-09-08 (Tue, 08 Sep 2015)

  Changed paths:
    M data/core/hotkeys.cfg
    M src/hotkey/hotkey_item.cpp

  Log Message:
  -----------
  Show the non-rebindable shortcuts in preferences.

They can't be changed, but it will at least let people know that the key works for that command.
Currently they're just hard-coded. A more general solution would be possible, if there's
any chance that more non-rebindable hotkeys are needed.

This also removes Cmd+Shift+Q as a shortcut for Quit to Desktop on OSX.

  Commit: 40ea98568a977670e9c48ce4721ffc3d54c0b2cd
      https://github.com/wesnoth/wesnoth/commit/40ea98568a977670e9c48ce4721ffc3d54c0b2cd
  Author: Celtic Minstrel <celtic.minstrel.ca at some.place>
  Date:   2015-09-08 (Tue, 08 Sep 2015)

  Changed paths:
    M data/themes/classic.cfg
    M data/themes/default.cfg
    M data/themes/unit_box.cfg
    M data/themes/widescreen.cfg

  Log Message:
  -----------
  Add "Quit to Desktop" to the themes.

It's still omitted from Pandora theme. Should it be?

  Commit: 7c4523d4d4099274917db98264f1a6305a9303a9
      https://github.com/wesnoth/wesnoth/commit/7c4523d4d4099274917db98264f1a6305a9303a9
  Author: Celtic Minstrel <celtic.minstrel.ca at some.place>
  Date:   2015-09-09 (Wed, 09 Sep 2015)

  Changed paths:
    M src/wesnoth.cpp

  Log Message:
  -----------
  Never show confirmation on SIGTERM

  Commit: d8a85e314443c398e04b9f9015412545acae8035
      https://github.com/wesnoth/wesnoth/commit/d8a85e314443c398e04b9f9015412545acae8035
  Author: Celtic Minstrel <celtic.minstrel.ca at some.place>
  Date:   2015-09-09 (Wed, 09 Sep 2015)

  Changed paths:
    M src/events.cpp
    M src/hotkey/hotkey_item.cpp

  Log Message:
  -----------
  Give Alt+F4 similar special treatment to Cmd+Q

  Commit: befb1a8acedb2e35ba58737eb88af8d2dc9bdbad
      https://github.com/wesnoth/wesnoth/commit/befb1a8acedb2e35ba58737eb88af8d2dc9bdbad
  Author: Celtic Minstrel <celtic.minstrel.ca at some.place>
  Date:   2015-09-09 (Wed, 09 Sep 2015)

  Changed paths:
    M src/wesnoth.cpp

  Log Message:
  -----------
  Let's explicitly include that just to be safe

  Commit: 8c39e05f891c5eb5bafbdf9563477562d937717b
      https://github.com/wesnoth/wesnoth/commit/8c39e05f891c5eb5bafbdf9563477562d937717b
  Author: Celtic Minstrel <celtic.minstrel.ca at some.place>
  Date:   2015-09-09 (Wed, 09 Sep 2015)

  Changed paths:
    M src/wesnoth.cpp

  Log Message:
  -----------
  Terminate immediately on SIGINT too

  Commit: 9ffec1e33eed03f2d0d0984e0a4d07a468474a9e
      https://github.com/wesnoth/wesnoth/commit/9ffec1e33eed03f2d0d0984e0a4d07a468474a9e
  Author: Celtic Minstrel <celtic.minstrel.ca at some.place>
  Date:   2015-09-09 (Wed, 09 Sep 2015)

  Changed paths:
    M projectfiles/Xcode/Wesnoth.xcodeproj/project.pbxproj

  Log Message:
  -----------
  Update XCode project to build against SDL2 instead of SDL1.2

  Commit: 9204d0af455986cffd485697ac860e3e2ee64dc6
      https://github.com/wesnoth/wesnoth/commit/9204d0af455986cffd485697ac860e3e2ee64dc6
  Author: Andreas Löf <andreas at alternating.net>
  Date:   2015-09-09 (Wed, 09 Sep 2015)

  Changed paths:
    M projectfiles/Xcode/Mac Sources/SDLMain.m
    M src/wesnoth.cpp

  Log Message:
  -----------
  Remove SDL_main from OSX entry point under SDL2

SDL_main is not used any longer in SDL2. These changes instead call
direcly into the wesnoth main function after setting up the OSX
environment.

  Commit: b0ecf09ee946ea64dda13ed6ccead5a447eae04a
      https://github.com/wesnoth/wesnoth/commit/b0ecf09ee946ea64dda13ed6ccead5a447eae04a
  Author: Celtic Minstrel <celtic.minstrel.ca at some.place>
  Date:   2015-09-09 (Wed, 09 Sep 2015)

  Changed paths:
    M projectfiles/Xcode/Mac Sources/SDLMain.m
    M projectfiles/Xcode/Mac Sources/server_main.m
    M projectfiles/Xcode/Wesnoth.xcodeproj/project.pbxproj
    M src/events.cpp
    M src/events.hpp
    M src/server/server.cpp
    M src/wesnoth.cpp

  Log Message:
  -----------
  Finish changes for XCode SDL2 compilation to work

  Commit: 22cff55dc8751e97bbd0044b52b2e62412716c91
      https://github.com/wesnoth/wesnoth/commit/22cff55dc8751e97bbd0044b52b2e62412716c91
  Author: Andreas Löf <andreas at alternating.net>
  Date:   2015-09-11 (Fri, 11 Sep 2015)

  Changed paths:
    M data/core/hotkeys.cfg
    M data/themes/classic.cfg
    M data/themes/default.cfg
    M data/themes/editor.cfg
    M data/themes/unit_box.cfg
    M data/themes/widescreen.cfg
    M projectfiles/Xcode/Mac Sources/SDLMain.m
    M projectfiles/Xcode/Mac Sources/server_main.m
    M projectfiles/Xcode/Wesnoth.xcodeproj/project.pbxproj
    M src/controller_base.cpp
    M src/controller_base.hpp
    M src/editor/controller/editor_controller.cpp
    M src/events.cpp
    M src/events.hpp
    M src/gui/dialogs/title_screen.cpp
    M src/hotkey/command_executor.cpp
    M src/hotkey/hotkey_command.cpp
    M src/hotkey/hotkey_command.hpp
    M src/hotkey/hotkey_item.cpp
    M src/hotkey_handler.cpp
    M src/server/server.cpp
    M src/wesnoth.cpp

  Log Message:
  -----------
  Merge pull request #475 into sdl2 from CelticMinstrel:quit-confirm2

Compare: https://github.com/wesnoth/wesnoth/compare/0bb02fb54869...22cff55dc875