diff --git a/src/debugger/DebuggerParser.cxx b/src/debugger/DebuggerParser.cxx index 488fb68f6..3c8bdac5b 100644 --- a/src/debugger/DebuggerParser.cxx +++ b/src/debugger/DebuggerParser.cxx @@ -1144,8 +1144,7 @@ void DebuggerParser::executeDump() else { ostringstream file; - file << debugger.myOSystem.userDir() - << debugger.myOSystem.console().properties().get(PropType::Cart_Name) << "_dbg_"; + file << debugger.myOSystem.userDir() << cartName() << "_dbg_"; if(execDepth > 0) { file << execPrefix; @@ -1910,8 +1909,7 @@ void DebuggerParser::executeSaveses() { ostringstream filename; auto timeinfo = BSPF::localTime(); - filename << debugger.myOSystem.userDir() - << std::put_time(&timeinfo, "session_%F_%H-%M-%S.txt"); + filename << std::put_time(&timeinfo, "session_%F_%H-%M-%S.txt"); if(argCount && argStrings[0] == "?") { @@ -1920,7 +1918,12 @@ void DebuggerParser::executeSaveses() } else { - FilesystemNode file(filename.str()); + ostringstream path; + if(argCount) + path << argStrings[0]; + else + path << debugger.myOSystem.userDir() << filename.str(); + FilesystemNode file(path.str()); if(debugger.prompt().saveBuffer(file)) commandResult << "saved " + file.getShortPath() + " OK"; diff --git a/src/debugger/gui/DebuggerDialog.cxx b/src/debugger/gui/DebuggerDialog.cxx index 24b2ed4bf..4403009b8 100644 --- a/src/debugger/gui/DebuggerDialog.cxx +++ b/src/debugger/gui/DebuggerDialog.cxx @@ -434,12 +434,12 @@ void DebuggerDialog::showBrowser(BrowserType type, const string& defaultName) { case BrowserType::svAccess: cmd = kSvAccessCmd; - title = "access counters"; + title = "Access Counters"; break; case BrowserType::svDis: cmd = kSvDisCmd; - title = "disassembly"; + title = "Disassembly"; break; case BrowserType::svRom: @@ -449,12 +449,12 @@ void DebuggerDialog::showBrowser(BrowserType type, const string& defaultName) case BrowserType::svScript: cmd = kSvScriptCmd; - title = "workbench"; + title = "Workbench"; break; case BrowserType::svSession: cmd = kSvSessionCmd; - title = "session"; + title = "Session"; break; default: diff --git a/src/gui/GameInfoDialog.cxx b/src/gui/GameInfoDialog.cxx index 7710e9fa1..9a0cb3fe7 100644 --- a/src/gui/GameInfoDialog.cxx +++ b/src/gui/GameInfoDialog.cxx @@ -1395,7 +1395,7 @@ void GameInfoDialog::handleCommand(CommandSender* sender, int cmd, case kExportPressed: // This dialog is resizable under certain conditions, so we need // to re-create it as necessary - createBrowser("Export properties as"); + createBrowser("Export Properties as"); myBrowser->show(instance().userDir().getPath() + myGameFile.getNameWithExt(".pro"), BrowserDialog::FileSave, kExportChosen); diff --git a/src/gui/RomAuditDialog.cxx b/src/gui/RomAuditDialog.cxx index 60b627f8d..de7f3f5cd 100644 --- a/src/gui/RomAuditDialog.cxx +++ b/src/gui/RomAuditDialog.cxx @@ -198,7 +198,7 @@ void RomAuditDialog::handleCommand(CommandSender* sender, int cmd, break; case kChooseAuditDirCmd: - createBrowser("Select ROM directory to audit"); + createBrowser("Select ROM Directory to Audit"); myBrowser->show(myRomPath->getText(), BrowserDialog::Directories, kAuditDirChosenCmd); break; diff --git a/src/gui/SnapshotDialog.cxx b/src/gui/SnapshotDialog.cxx index 69ad94936..28067213c 100644 --- a/src/gui/SnapshotDialog.cxx +++ b/src/gui/SnapshotDialog.cxx @@ -156,7 +156,7 @@ void SnapshotDialog::handleCommand(CommandSender* sender, int cmd, case kChooseSnapSaveDirCmd: // This dialog is resizable under certain conditions, so we need // to re-create it as necessary - createBrowser("Select snapshot save directory"); + createBrowser("Select Snapshot Save Directory"); myBrowser->show(mySnapSavePath->getText(), BrowserDialog::Directories, kSnapSaveDirChosenCmd); break; diff --git a/src/gui/UIDialog.cxx b/src/gui/UIDialog.cxx index b5b8fb72c..65c7d927b 100644 --- a/src/gui/UIDialog.cxx +++ b/src/gui/UIDialog.cxx @@ -586,7 +586,7 @@ void UIDialog::handleCommand(CommandSender* sender, int cmd, int data, int id) case kChooseRomDirCmd: // This dialog is resizable under certain conditions, so we need // to re-create it as necessary - createBrowser("Select ROM directory"); + createBrowser("Select ROM Directory"); myBrowser->show(myRomPath->getText(), BrowserDialog::Directories, LauncherDialog::kRomDirChosenCmd); break; @@ -602,7 +602,7 @@ void UIDialog::handleCommand(CommandSender* sender, int cmd, int data, int id) case kChooseSnapLoadDirCmd: // This dialog is resizable under certain conditions, so we need // to re-create it as necessary - createBrowser("Select snapshot load directory"); + createBrowser("Select ROM Info Viewer Image Directory"); myBrowser->show(mySnapLoadPath->getText(), BrowserDialog::Directories, kSnapLoadDirChosenCmd); break;