openboe/oboe
2
0
Fork 0
Code Issues 146 Pull Requests 4 Actions Packages Projects Releases Wiki Activity

edit/reload buttons in graphic editor

Browse Source
This commit is contained in:
Nat Quayle Nelson
2025-06-23 13:25:41 -05:00
parent 965bfb2c55
commit f4bc3755f8
2 changed files with 47 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
rsrc/dialogs/graphic-sheets.xml
View File

@@ -1,5 +1,4 @@
<?xml version='1.0' encoding='UTF-8' standalone='no'?>
<!-- NOTE: This file should be updated to use relative positioning the next time it changes. -->
<?xml-stylesheet href="dialog.xsl" type="text/xsl"?>
<dialog defbtn='okay' escbtn='cancel'>
<pict type='dlog' num='16' top='6' left='6'/>
@@ -8,10 +7,12 @@
<text name='num' top='36' left='242' width='40' height='16'/>
<pict name='sheet' framed='true' scaled='true' type='full' num='0' top='54' left='12' width='280' height='360'/>
<button name='copy' type='regular' def-key='ctrl c' top='54' left='304'>Copy</button>
<button name='paste' type='regular' def-key='ctrl v' top='80' left='304'>Paste</button>
<button name='open' type='regular' def-key='ctrl o' top='106' left='304'>Import</button>
<button name='save' type='regular' def-key='ctrl s' top='132' left='304'>Export</button>
<button name='del' type='regular' def-key='ctrl x' top='158' left='304'>Delete</button>
<button name='paste' type='regular' def-key='ctrl v' relative='pos-in pos-in' rel-anchor='prev' top='26' left='0'>Paste</button>
<button name='edit' type='regular' relative='pos-in pos-in' rel-anchor='prev' top='26' left='0'>Edit</button>
<button name='reload' type='regular' relative='pos-in pos-in' rel-anchor='prev' top='26' left='0'>Reload</button>
<button name='open' type='regular' def-key='ctrl o' relative='pos-in pos-in' rel-anchor='prev' top='26' left='0'>Import</button>
<button name='save' type='regular' def-key='ctrl s' relative='pos-in pos-in' rel-anchor='prev' top='26' left='0'>Export</button>
<button name='del' type='regular' def-key='ctrl x' relative='pos-in pos-in' rel-anchor='prev' top='26' left='0'>Delete</button>
<button name='left' type='left' def-key='left' top='426' left='20'/>
<button name='right' type='right' def-key='right' top='426' left='85'/>
<button name='new' type='regular' def-key='ctrl n' top='426' left='162'>New</button>

48
src/scenedit/scen.core.cpp
View File

@@ -7,6 +7,8 @@
#include <unordered_map>
#include <boost/lexical_cast.hpp>
#include <boost/filesystem.hpp>
#include <boost/process/child.hpp>
#include <boost/process/io.hpp>
#include "scen.global.hpp"
#include "scenario/scenario.hpp"
#include "scenario/town.hpp"
@@ -3822,9 +3824,23 @@ void edit_custom_sheets() {
set_dlg_custom_sheet(me, all_pics[cur]);
return true;
});
pic_dlg["open"].attachClickHandler([&sheets,&cur,&all_pics,&pic_dir,&deferred_actions](cDialog& me, std::string, eKeyMod) -> bool {
fs::path fpath = nav_get_rsrc({"png", "bmp", "jpg", "jpeg", "gif", "psd"});
if(fpath.empty()) return true;
pic_dlg["edit"].attachClickHandler([&sheets,&cur,&all_pics,&pic_dir](cDialog&, std::string, eKeyMod) -> bool {
fs::path image_editor = get_string_pref("ImageEditor");
if(image_editor.empty()){
showWarning("Choose an external image editor in the preferences window first.");
return true;
}
std::string resName = "sheet" + std::to_string(all_pics[cur]);
fs::path toPath = pic_dir/(resName + ".png");
std::vector<std::string> args = {toPath.string()};
bp::child ch(image_editor, args, bp::std_out > stdout);
ch.detach();
return true;
});
auto replace_from_file = [&pic_dlg,&sheets,&cur,&all_pics,&pic_dir,&deferred_actions](std::string action_name, fs::path fpath) -> bool {
sf::Image img;
if(!img.loadFromFile(fpath.string().c_str())) {
beep();
@@ -3835,19 +3851,37 @@ void edit_custom_sheets() {
fs::path toPath = pic_dir/(resName + ".png");
sf::Image image_for_undo;
// TODO for reload, old image and new image will be the same! This could possibly be addressed by loading the image when edit is clicked?
// But there is no guarantee Edit is clicked first--the designer could externally edit the full-sheet image whenever they want.
// Also comparing image blobs for equality is probably expensive, but we should have a check to prevent adding undo actions if the same file was imported
// or reload is clicked when the file isn't changed.
image_for_undo.loadFromFile(toPath.string());
deferred_actions.push_back(action_ptr(new aReplaceGraphicsSheet("Import Graphics Sheet", all_pics[cur], image_for_undo, img)));
deferred_actions.push_back(action_ptr(new aReplaceGraphicsSheet(action_name, all_pics[cur], image_for_undo, img)));
img.saveToFile(toPath.string().c_str());
ResMgr::graphics.free(resName);
set_dlg_custom_sheet(me, all_pics[cur]);
set_dlg_custom_sheet(pic_dlg, all_pics[cur]);
return true;
}
deferred_actions.push_back(action_ptr(new aReplaceGraphicsSheet("Import Graphics Sheet", all_pics[cur], sheets[cur], img)));
deferred_actions.push_back(action_ptr(new aReplaceGraphicsSheet(action_name, all_pics[cur], sheets[cur], img)));
sheets[cur] = img;
spec_scen_g.replace_sheet(cur, img);
set_dlg_custom_sheet(me, all_pics[cur]);
set_dlg_custom_sheet(pic_dlg, all_pics[cur]);
return true;
};
pic_dlg["reload"].attachClickHandler([replace_from_file, &all_pics, &cur, &pic_dir](cDialog&, std::string, eKeyMod) -> bool {
std::string resName = "sheet" + std::to_string(all_pics[cur]);
fs::path sheetPath = pic_dir/(resName + ".png");
replace_from_file("Reload Graphics Sheet", sheetPath);
return true;
});
pic_dlg["open"].attachClickHandler([replace_from_file](cDialog& me, std::string, eKeyMod) -> bool {
fs::path fpath = nav_get_rsrc({"png", "bmp", "jpg", "jpeg", "gif", "psd"});
if(fpath.empty()) return true;
replace_from_file("Import Graphics Sheet", fpath);
return true;
});
pic_dlg["save"].attachClickHandler([&sheets,&cur,&all_pics,&pic_dir](cDialog&, std::string, eKeyMod) -> bool {