Skip to content

Commit

Permalink
Remove support for legacy menu markup
Browse files Browse the repository at this point in the history
  • Loading branch information
@CelticMinstrel
CelticMinstrel committed Sep 15, 2019
1 parent 7bee8ee commit 01d6751
Show file tree
Hide file tree
Showing 16 changed files with 1,229 additions and 297 deletions.
1 change: 1 addition & 0 deletions changelog.md
View file
Expand Up @@ -21,6 +21,7 @@
* This tag is supported both in `[unit]` and in `[unit_type]`. If used in `[unit]`, it will override the type's notes.
* Standard special notes should now be added with `{NOTE_*}` instead of `{SPECIAL_NOTES_*}`.
* In `[effect]apply_to=profile`, `[add_special_note]` and `[remove_special_note]` are supported.
* Support for the deprecated "&image.png=text" syntax has been removed in all contexts - use the DescriptionWML attributes instead.
### Miscellaneous and bug fixes
* Fixed :droid's arguments not all being optional (Issue#4308)
* Chat is now enable in single-player and hotseat multiplayer. (Issue#1111)
Expand Down
2 changes: 0 additions & 2 deletions projectfiles/CodeBlocks-SCons/wesnoth.cbp
View file
Expand Up @@ -445,8 +445,6 @@
<Unit filename="../../src/gui/auxiliary/iterator/walker_tree_node.hpp" />
<Unit filename="../../src/gui/auxiliary/iterator/walker_widget.cpp" />
<Unit filename="../../src/gui/auxiliary/iterator/walker_widget.hpp" />
<Unit filename="../../src/gui/auxiliary/old_markup.cpp" />
<Unit filename="../../src/gui/auxiliary/old_markup.hpp" />
<Unit filename="../../src/gui/auxiliary/tips.cpp" />
<Unit filename="../../src/gui/auxiliary/tips.hpp" />
<Unit filename="../../src/gui/auxiliary/typed_formula.hpp" />
Expand Down
1,222 changes: 1,222 additions & 0 deletions projectfiles/CodeBlocks/tests.cbp
View file

Large diffs are not rendered by default.

2 changes: 0 additions & 2 deletions projectfiles/CodeBlocks/wesnoth.cbp
View file
Expand Up @@ -494,8 +494,6 @@
<Unit filename="../../src/gui/auxiliary/iterator/walker_tree_node.hpp" />
<Unit filename="../../src/gui/auxiliary/iterator/walker_widget.cpp" />
<Unit filename="../../src/gui/auxiliary/iterator/walker_widget.hpp" />
<Unit filename="../../src/gui/auxiliary/old_markup.cpp" />
<Unit filename="../../src/gui/auxiliary/old_markup.hpp" />
<Unit filename="../../src/gui/auxiliary/tips.cpp" />
<Unit filename="../../src/gui/auxiliary/tips.hpp" />
<Unit filename="../../src/gui/auxiliary/typed_formula.hpp" />
Expand Down
8 changes: 0 additions & 8 deletions projectfiles/VC14/wesnoth.vcxproj
View file
Expand Up @@ -1351,13 +1351,6 @@
<ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Test_Debug|Win32'">$(IntDir)Gui\Auxiliary\Iterator\</ObjectFileName>
<ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Test_Release|Win32'">$(IntDir)Gui\Auxiliary\Iterator\</ObjectFileName>
</ClCompile>
<ClCompile Include="..\..\src\gui\auxiliary\old_markup.cpp">
<ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(IntDir)Gui\Auxiliary\</ObjectFileName>
<ObjectFileName Condition="'$(Configuration)|$(Platform)'=='ReleaseDEBUG|Win32'">$(IntDir)Gui\Auxiliary\</ObjectFileName>
<ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(IntDir)Gui\Auxiliary\</ObjectFileName>
<ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Test_Debug|Win32'">$(IntDir)Gui\Auxiliary\</ObjectFileName>
<ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Test_Release|Win32'">$(IntDir)Gui\Auxiliary\</ObjectFileName>
</ClCompile>
<ClCompile Include="..\..\src\gui\auxiliary\tips.cpp">
<ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(IntDir)Gui\Auxiliary\</ObjectFileName>
<ObjectFileName Condition="'$(Configuration)|$(Platform)'=='ReleaseDEBUG|Win32'">$(IntDir)Gui\Auxiliary\</ObjectFileName>
Expand Down Expand Up @@ -3724,7 +3717,6 @@
<ClInclude Include="..\..\src\gui\auxiliary\iterator\walker_grid.hpp" />
<ClInclude Include="..\..\src\gui\auxiliary\iterator\walker_tree_node.hpp" />
<ClInclude Include="..\..\src\gui\auxiliary\iterator\walker_widget.hpp" />
<ClInclude Include="..\..\src\gui\auxiliary\old_markup.hpp" />
<ClInclude Include="..\..\src\gui\auxiliary\tips.hpp" />
<ClInclude Include="..\..\src\gui\auxiliary\typed_formula.hpp" />
<ClInclude Include="..\..\src\gui\core\canvas.hpp" />
Expand Down
6 changes: 0 additions & 6 deletions projectfiles/VC14/wesnoth.vcxproj.filters
View file
Expand Up @@ -782,9 +782,6 @@
<ClCompile Include="..\..\src\gui\dialogs\multiplayer\synced_choice_wait.cpp">
<Filter>Gui\Dialogs\Multiplayer</Filter>
</ClCompile>
<ClCompile Include="..\..\src\gui\auxiliary\old_markup.cpp">
<Filter>Gui\Auxiliary</Filter>
</ClCompile>
<ClCompile Include="..\..\src\gui\auxiliary\tips.cpp">
<Filter>Gui\Auxiliary</Filter>
</ClCompile>
Expand Down Expand Up @@ -2225,9 +2222,6 @@
<ClInclude Include="..\..\src\gui\auxiliary\find_widget.hpp">
<Filter>Gui\Auxiliary</Filter>
</ClInclude>
<ClInclude Include="..\..\src\gui\auxiliary\old_markup.hpp">
<Filter>Gui\Auxiliary</Filter>
</ClInclude>
<ClInclude Include="..\..\src\gui\auxiliary\tips.hpp">
<Filter>Gui\Auxiliary</Filter>
</ClInclude>
Expand Down
8 changes: 0 additions & 8 deletions projectfiles/VC16/wesnoth.vcxproj
View file
Expand Up @@ -1358,13 +1358,6 @@
<ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Test_Debug|x64'">$(IntDir)Gui\Auxiliary\Iterator\</ObjectFileName>
<ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Test_Release|x64'">$(IntDir)Gui\Auxiliary\Iterator\</ObjectFileName>
</ClCompile>
<ClCompile Include="..\..\src\gui\auxiliary\old_markup.cpp">
<ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(IntDir)Gui\Auxiliary\</ObjectFileName>
<ObjectFileName Condition="'$(Configuration)|$(Platform)'=='ReleaseDEBUG|x64'">$(IntDir)Gui\Auxiliary\</ObjectFileName>
<ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(IntDir)Gui\Auxiliary\</ObjectFileName>
<ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Test_Debug|x64'">$(IntDir)Gui\Auxiliary\</ObjectFileName>
<ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Test_Release|x64'">$(IntDir)Gui\Auxiliary\</ObjectFileName>
</ClCompile>
<ClCompile Include="..\..\src\gui\auxiliary\tips.cpp">
<ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(IntDir)Gui\Auxiliary\</ObjectFileName>
<ObjectFileName Condition="'$(Configuration)|$(Platform)'=='ReleaseDEBUG|x64'">$(IntDir)Gui\Auxiliary\</ObjectFileName>
Expand Down Expand Up @@ -3751,7 +3744,6 @@
<ClInclude Include="..\..\src\gui\auxiliary\iterator\walker_grid.hpp" />
<ClInclude Include="..\..\src\gui\auxiliary\iterator\walker_tree_node.hpp" />
<ClInclude Include="..\..\src\gui\auxiliary\iterator\walker_widget.hpp" />
<ClInclude Include="..\..\src\gui\auxiliary\old_markup.hpp" />
<ClInclude Include="..\..\src\gui\auxiliary\tips.hpp" />
<ClInclude Include="..\..\src\gui\auxiliary\typed_formula.hpp" />
<ClInclude Include="..\..\src\gui\core\canvas.hpp" />
Expand Down
6 changes: 0 additions & 6 deletions projectfiles/VC16/wesnoth.vcxproj.filters
View file
Expand Up @@ -785,9 +785,6 @@
<ClCompile Include="..\..\src\gui\dialogs\multiplayer\synced_choice_wait.cpp">
<Filter>Gui\Dialogs\Multiplayer</Filter>
</ClCompile>
<ClCompile Include="..\..\src\gui\auxiliary\old_markup.cpp">
<Filter>Gui\Auxiliary</Filter>
</ClCompile>
<ClCompile Include="..\..\src\gui\auxiliary\tips.cpp">
<Filter>Gui\Auxiliary</Filter>
</ClCompile>
Expand Down Expand Up @@ -2231,9 +2228,6 @@
<ClInclude Include="..\..\src\gui\auxiliary\find_widget.hpp">
<Filter>Gui\Auxiliary</Filter>
</ClInclude>
<ClInclude Include="..\..\src\gui\auxiliary\old_markup.hpp">
<Filter>Gui\Auxiliary</Filter>
</ClInclude>
<ClInclude Include="..\..\src\gui\auxiliary\tips.hpp">
<Filter>Gui\Auxiliary</Filter>
</ClInclude>
Expand Down
8 changes: 0 additions & 8 deletions projectfiles/Xcode/The Battle for Wesnoth.xcodeproj/project.pbxproj
View file
Expand Up @@ -344,8 +344,6 @@
46F92E402174F6A400602C1C /* generate_map.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 46F92CF32174F6A300602C1C /* generate_map.cpp */; };
46F92E412174F6A400602C1C /* chat_log.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 46F92CF92174F6A300602C1C /* chat_log.cpp */; };
46F92E422174F6A400602C1C /* chat_log.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 46F92CF92174F6A300602C1C /* chat_log.cpp */; };
46F92E432174F6A400602C1C /* old_markup.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 46F92CFB2174F6A300602C1C /* old_markup.cpp */; };
46F92E442174F6A400602C1C /* old_markup.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 46F92CFB2174F6A300602C1C /* old_markup.cpp */; };
46F92E452174F6A400602C1C /* tips.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 46F92CFC2174F6A300602C1C /* tips.cpp */; };
46F92E462174F6A400602C1C /* tips.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 46F92CFC2174F6A300602C1C /* tips.cpp */; };
46F92E472174F6A400602C1C /* walker_tree_node.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 46F92D012174F6A300602C1C /* walker_tree_node.cpp */; };
Expand Down Expand Up @@ -1760,10 +1758,8 @@
46F92CF72174F6A300602C1C /* core_selection.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = core_selection.hpp; sourceTree = "<group>"; };
46F92CF82174F6A300602C1C /* help_browser.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = help_browser.hpp; sourceTree = "<group>"; };
46F92CF92174F6A300602C1C /* chat_log.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = chat_log.cpp; sourceTree = "<group>"; };
46F92CFB2174F6A300602C1C /* old_markup.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = old_markup.cpp; sourceTree = "<group>"; };
46F92CFC2174F6A300602C1C /* tips.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = tips.cpp; sourceTree = "<group>"; };
46F92CFD2174F6A300602C1C /* field.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = field.hpp; sourceTree = "<group>"; };
46F92CFE2174F6A300602C1C /* old_markup.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = old_markup.hpp; sourceTree = "<group>"; };
46F92CFF2174F6A300602C1C /* typed_formula.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = typed_formula.hpp; sourceTree = "<group>"; };
46F92D012174F6A300602C1C /* walker_tree_node.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = walker_tree_node.cpp; sourceTree = "<group>"; };
46F92D022174F6A300602C1C /* walker_widget.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = walker_widget.hpp; sourceTree = "<group>"; };
Expand Down Expand Up @@ -3626,10 +3622,8 @@
46F92CFA2174F6A300602C1C /* auxiliary */ = {
isa = PBXGroup;
children = (
46F92CFB2174F6A300602C1C /* old_markup.cpp */,
46F92CFC2174F6A300602C1C /* tips.cpp */,
46F92CFD2174F6A300602C1C /* field.hpp */,
46F92CFE2174F6A300602C1C /* old_markup.hpp */,
46F92CFF2174F6A300602C1C /* typed_formula.hpp */,
46F92D002174F6A300602C1C /* iterator */,
46F92D0D2174F6A300602C1C /* find_widget.hpp */,
Expand Down Expand Up @@ -5297,7 +5291,6 @@
B5599B230EC62181008DD061 /* mouse_handler_base.cpp in Sources */,
46F92E2B2174F6A400602C1C /* synced_choice_wait.cpp in Sources */,
B52EE91A12135AC300CFBDAB /* move.cpp in Sources */,
46F92E432174F6A400602C1C /* old_markup.cpp in Sources */,
620A387115E9364F00A4F513 /* move.cpp in Sources */,
46F92E132174F6A400602C1C /* player_list_helper.cpp in Sources */,
F468E6AD16DF872200A31A5A /* movetype.cpp in Sources */,
Expand Down Expand Up @@ -5794,7 +5787,6 @@
91E356BD1CACC8A100774252 /* engine_cpp.cpp in Sources */,
46F92DB62174F6A300602C1C /* message.cpp in Sources */,
91E356BE1CACC8A100774252 /* recruitment.cpp in Sources */,
46F92E442174F6A400602C1C /* old_markup.cpp in Sources */,
46F92E562174F6A400602C1C /* vertical_scrollbar.cpp in Sources */,
91E356BF1CACC8A100774252 /* ca_move_to_targets.cpp in Sources */,
91E356C01CACC8A100774252 /* stage_rca.cpp in Sources */,
Expand Down
1 change: 0 additions & 1 deletion source_lists/wesnoth
View file
Expand Up @@ -145,7 +145,6 @@ gui/auxiliary/iterator/iterator.cpp
gui/auxiliary/iterator/walker_grid.cpp
gui/auxiliary/iterator/walker_tree_node.cpp
gui/auxiliary/iterator/walker_widget.cpp
gui/auxiliary/old_markup.cpp
gui/auxiliary/tips.cpp
gui/core/canvas.cpp
gui/core/event/dispatcher.cpp
Expand Down
18 changes: 1 addition & 17 deletions src/game_events/menu_item.cpp
View file
Expand Up @@ -31,7 +31,6 @@
#include "synced_context.hpp"
#include "terrain/filter.hpp"
#include "deprecation.hpp"
#include "gui/auxiliary/old_markup.hpp"

static lg::log_domain log_engine("engine");
#define ERR_NG LOG_STREAM(err, log_engine)
Expand Down Expand Up @@ -85,13 +84,6 @@ wml_menu_item::wml_menu_item(const std::string& id, const config& cfg)
if(cfg.has_attribute("needs_select")) {
deprecated_message("needs_select", DEP_LEVEL::INDEFINITE, {1, 15, 0});
}
gui2::legacy_menu_item parsed(cfg["description"].str(), "Multiple columns in [set_menu_item] are no longer supported; the image is specified by image=.");
if(parsed.contained_markup()) {
description_ = parsed.label();
if(!parsed.description().empty()) {
description_ += " " + parsed.description();
}
}
}

// Constructor for items defined in an event.
Expand Down Expand Up @@ -277,15 +269,7 @@ void wml_menu_item::update(const vconfig& vcfg)
}

if(vcfg.has_attribute("description")) {
gui2::legacy_menu_item parsed(vcfg["description"].str(), "Multiple columns in [set_menu_item] are no longer supported; the image is specified by image=.");
if(parsed.contained_markup()) {
description_ = parsed.label();
if(!parsed.description().empty()) {
description_ += " " + parsed.description();
}
} else {
description_ = vcfg["description"].t_str();
}
description_ = vcfg["description"].t_str();
hotkey_updated = true;
}

Expand Down
74 changes: 0 additions & 74 deletions src/gui/auxiliary/old_markup.cpp
View file

This file was deleted.

103 changes: 0 additions & 103 deletions src/gui/auxiliary/old_markup.hpp
View file

This file was deleted.

0 comments on commit 01d6751

Please sign in to comment.