Editor enhancements #8903
Merged
Editor enhancements #8903
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
selecting file by browse button sets relative path instead of absolute path
also add tooltip to preview button and update copyright notice (missing from wesnoth#8066)
github-actions
bot
added
UI
soliton-
reviewed
May 22, 2024
I'm not sure how you got this wrong, but it's Map, not Game. |
|
What do you mean by "prefix"? It converts an absolute path to something
like "misc/some-image.png" (the same as what is supported by image widget's
label)
…On Wed 22 May, 2024, 7:11 PM Celtic Minstrel, ***@***.***> wrote:
***@***.**** commented on this pull request.
------------------------------
In src/gui/dialogs/editor/custom_tod.cpp
<#8903 (comment)>:
> + std::string rel_path = "";
+ std::string core_asset_dir = filesystem::get_dir(game_config::path + "/data/core/" + asset_type);
+ std::string addon_asset_dir;
+
+ bool is_in_core_dir = (abs_path.find(core_asset_dir) != std::string::npos);
+ bool is_in_addon_dir = false;
+
+ if (!addon_id_.empty()) {
+ addon_asset_dir = filesystem::get_current_editor_dir(addon_id_) + "/" + asset_type;
+ is_in_addon_dir = (abs_path.find(addon_asset_dir) != std::string::npos);
+ }
+
+ if (is_in_core_dir) {
+ rel_path = abs_path.erase(0, core_asset_dir.size()+1);
+ } else if (is_in_addon_dir) {
+ rel_path = abs_path.erase(0, addon_asset_dir.size()+1);
…doesn't this need to add a prefix to the path as well?
—
Reply to this email directly, view it on GitHub
<#8903 (review)>,
or unsubscribe
<https://github.com/notifications/unsubscribe-auth/ACAT3AEX3DAEJ2W7VNCOPKDZDSN7XAVCNFSM6AAAAABIC2EFUWVHI2DSMVQWIX3LMV43YUDVNRWFEZLROVSXG5CSMV3GSZLXHMZDANZRGI2TIOJVGU>
.
You are receiving this because you authored the thread.Message ID:
***@***.***>
|
|
Hmm, I think I'm getting confused between asset paths and WML paths actually. Never mind. |
babaissarkar
added
the
Enhancement
github-actions
bot
added
the
Graphics
Also contains small fixes to scroll_text, multiline_text and tab_container For the first two, cursor is now set at the start instead of at the end of text after a set_label call. This makes it easier to read the text. Adds a couple of new getters in tab_container to get the currently selected tab, and to access any of the grids of the tabs.
…ich does nothing Unit List moved to Units menu to reduce clutter on the File menu Although players may be used to it being on File, Units is now a more logical place for it. Status Table disabled for now since it does nothing. Can be reenabled once the functionality is implemented. (The GUI1 version used to work, but since GUI1 version have been removed, no GUI2 replacement has been added.)
…/wesnoth into editor_enhancements
…e contexts thanks to Vultraz for the idea
Vultraz
requested changes
Jun 28, 2024
Vultraz
approved these changes
Jun 29, 2024
|
TODO, WIP:
|
current context index was not being reset when contexts were saved
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Contains various enhancements mostly to the Time Schedule Editor that I couldn't manage to add in #8066. It also contains a few other things in the Map Editor itself. There are also changes to the Unit Type Editor that are related to the new features in the Schedule Editor. The File Dialog has also been redesigned.
Map Editor
Load MaptoLoad Map/Scenario(since it can load both),Edit ScenariotoEdit Scenario Settings,Save Mapto justSave.editor/scenarios. (Resolves editor: Save into addon when saving a scenario #8910)Save Scenario Asonly for Scenariossettings.pngicon forPreferencesmenu itemMap Mode:
Scenario Mode:
Time Schedule Editor
tod_new_schedule(missed in Add functionality to Time Schedule Editor #8066)Unit Type Editor
The last four entries above :
Add-on menu
The open add-on folder option shows a GUI2 file dialog at the add-on's folder which can be used to open any file. If it is a loadable map/scenario it will be opened in the editor, otherwise the OS's default application for that file will be opened.
File Dialog
Open Externalbutton that opens selected file/folder in the platform's default application (independently of what pressingOpenwould do). This could be used to quickly open a folder or preview the file before actually selecting it.