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

When saving, make sure to remember previous save path and name

Browse Source
This commit is contained in:
Celtic Minstrel
2014-12-11 01:43:09 -05:00
parent 26e1d8fca2
commit bb88460467
3 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
osx/boe.actions.cpp
View File

@@ -2154,7 +2154,7 @@ void do_save(short mode)
return;
}
fs::path file = univ.file;
if(mode == 1) file = nav_put_party();
if(mode == 1) file = nav_put_party(file);
if(!file.empty()) {
univ.file = file;
save_party(univ.file);

4
osx/tools/winutil.h
View File

@@ -22,9 +22,9 @@ void setWindowFloating(sf::Window& win, bool floating);
void init_fileio();
fs::path nav_get_party();
fs::path nav_put_party();
fs::path nav_put_party(fs::path def = "");
fs::path nav_get_scenario();
fs::path nav_put_scenario();
fs::path nav_put_scenario(fs::path def = "");
void beep();

14
osx/tools/winutil.mac.mm
View File

@@ -196,7 +196,12 @@ fs::path nav_get_scenario() {
return "";
}
fs::path nav_put_scenario() {
fs::path nav_put_scenario(fs::path def) {
if(!def.empty()) {
// TODO: Hopefully requesting UTF-8 doesn't break anything...
[dlg_put_scen setNameFieldStringValue:[NSString stringWithUTF8String: def.filename().c_str()]];
[dlg_put_scen setDirectoryURL:[NSURL URLWithString:[NSString stringWithUTF8String: def.parent_path().c_str()]]];
}
bool gotFile = [dlg_put_scen runModal] != NSFileHandlingPanelCancelButton;
makeFrontWindow(mainPtr);
if(gotFile)
@@ -212,7 +217,12 @@ fs::path nav_get_party() {
return "";
}
fs::path nav_put_party() {
fs::path nav_put_party(fs::path def) {
if(!def.empty()) {
// TODO: Hopefully requesting UTF-8 doesn't break anything...
[dlg_put_game setNameFieldStringValue:[NSString stringWithUTF8String: def.filename().c_str()]];
[dlg_put_game setDirectoryURL:[NSURL URLWithString:[NSString stringWithUTF8String: def.parent_path().c_str()]]];
}
bool gotFile = [dlg_put_game runModal] != NSFileHandlingPanelCancelButton;
makeFrontWindow(mainPtr);
if(gotFile)