[wesnoth-commits] [wesnoth/wesnoth] b24f75: fs: Avoid an unused variable warning

[Iris Morelle]

  Branch: refs/heads/master
  Home:   https://github.com/wesnoth/wesnoth
  Commit: b24f755c28fd3d2a575f399caf8c18759d26e158
      https://github.com/wesnoth/wesnoth/commit/b24f755c28fd3d2a575f399caf8c18759d26e158
  Author: Iris Morelle <shadowm at wesnoth.org>
  Date:   2019-11-05 (Tue, 05 Nov 2019)

  Changed paths:
    M src/filesystem.cpp

  Log Message:
  -----------
  fs: Avoid an unused variable warning

This is very configuration-specific and only seems to happen on Windows
at the moment, which is kind of intentional from what when I discussed
the code with josteph.


  Commit: e15a611a9c66379e5cfbe01b687e61d7416fb51b
      https://github.com/wesnoth/wesnoth/commit/e15a611a9c66379e5cfbe01b687e61d7416fb51b
  Author: Iris Morelle <shadowm at wesnoth.org>
  Date:   2019-11-05 (Tue, 05 Nov 2019)

  Changed paths:
    M src/filesystem.cpp

  Log Message:
  -----------
  fs: Consider platform differences when enumerating alternate save paths

The original code by octalot only works correctly on X11 when using the
recommended fdo layout. Windows and macOS need their own logic to build
candidate paths.

The code is still very optimistic about this whole thing -- see the
comment. Ideally we need to refactor the system to determine user data
path defaults so we can do it as many times as necessary even if we've
already determined our current user data path, but that seems like a lot
of work for a worst-case scenario that's not gonna crop up very often.

Also, I have no idea if the macOS alternative works, or what will happen
on iOS for that matter. It should at least compile.


  Commit: 666c4d27cef06913af721125929fdd4ef210d90f
      https://github.com/wesnoth/wesnoth/commit/666c4d27cef06913af721125929fdd4ef210d90f
  Author: Iris Morelle <shadowm at wesnoth.org>
  Date:   2019-11-05 (Tue, 05 Nov 2019)

  Changed paths:
    M data/gui/window/game_load.cfg
    M src/filesystem.cpp
    M src/gui/dialogs/game_load.cpp

  Log Message:
  -----------
  gui2/game_load: Improve display of old versions selection

 * Return paths from fs API in the native format, not the generic
   format. The generic format looks wholly out of place on Windows.

 * Move the versions selector to the row with the dialog caption and
   Search box as per d53ca602b8df5cc302cd1d5d502654823dc67415.

 * Relabel options to make the purpose of the combobox clearer even
   without the tooltip.

 * Fix markup not being taken into account for the combobox option
   labels, and protect against potential markup characters in paths
   (shouldn't happen on Windows but it can happen on POSIX platforms).


Compare: https://github.com/wesnoth/wesnoth/compare/cd407be639a3...666c4d27cef0