From b4a00b8a817ff0a185eac7788e6f1b3e944f901b Mon Sep 17 00:00:00 2001 From: tildearrow Date: Sun, 23 Jun 2024 04:36:21 -0500 Subject: [PATCH] post-merge changes --- src/engine/engine.h | 2 +- src/gui/exportOptions.cpp | 22 +++++++++++----------- src/gui/gui.cpp | 10 +++------- src/gui/gui.h | 2 +- 4 files changed, 16 insertions(+), 20 deletions(-) diff --git a/src/engine/engine.h b/src/engine/engine.h index 47c80569d..c16a6f204 100644 --- a/src/engine/engine.h +++ b/src/engine/engine.h @@ -52,7 +52,7 @@ class DivWorkPool; #define EXTERN_BUSY_BEGIN_SOFT e->softLocked=true; e->isBusy.lock(); #define EXTERN_BUSY_END e->isBusy.unlock(); e->softLocked=false; -//#define DIV_UNSTABLE +#define DIV_UNSTABLE #define DIV_VERSION "dev213" #define DIV_ENGINE_VERSION 213 diff --git a/src/gui/exportOptions.cpp b/src/gui/exportOptions.cpp index 02d0ef045..1c9882b28 100644 --- a/src/gui/exportOptions.cpp +++ b/src/gui/exportOptions.cpp @@ -252,18 +252,18 @@ void FurnaceGUI::drawExportZSM(bool onWindow) { void FurnaceGUI::drawExportTiuna(bool onWindow) { exitDisabledTimer=1; - ImGui::Text("this is NOT ROM export! (for now)\nfor use with TIunA driver, outputs asm source."); - ImGui::InputText("base song label name", &asmBaseLabel); //TODO validate label - if (ImGui::InputInt("max size in first bank",&tiunaFirstBankSize,1,100)) { + ImGui::Text(_("for use with TIunA driver. outputs asm source.")); + ImGui::InputText(_("base song label name"),&asmBaseLabel); // TODO: validate label + if (ImGui::InputInt(_("max size in first bank"),&tiunaFirstBankSize,1,100)) { if (tiunaFirstBankSize<0) tiunaFirstBankSize=0; if (tiunaFirstBankSize>4096) tiunaFirstBankSize=4096; } - if (ImGui::InputInt("max size in other banks",&tiunaOtherBankSize,1,100)) { + if (ImGui::InputInt(_("max size in other banks"),&tiunaOtherBankSize,1,100)) { if (tiunaOtherBankSize<16) tiunaOtherBankSize=16; if (tiunaOtherBankSize>4096) tiunaOtherBankSize=4096; } - ImGui::Text("chips to export:"); + ImGui::Text(_("chips to export:")); int selected=0; for (int i=0; isong.systemLen; i++) { DivSystem sys=e->song.system[i]; @@ -273,9 +273,9 @@ void FurnaceGUI::drawExportTiuna(bool onWindow) { ImGui::EndDisabled(); if (ImGui::IsItemHovered(ImGuiHoveredFlags_AllowWhenDisabled)) { if (!isTIA) { - ImGui::SetTooltip("this chip is not supported by the file format!"); + ImGui::SetTooltip(_("this chip is not supported by the file format!")); } else if (selected>=1) { - ImGui::SetTooltip("only one Atari TIA is supported!"); + ImGui::SetTooltip(_("only one Atari TIA is supported!")); } } if (isTIA && willExport[i]) selected++; @@ -283,18 +283,18 @@ void FurnaceGUI::drawExportTiuna(bool onWindow) { if (selected>0) { if (onWindow) { ImGui::Separator(); - if (ImGui::Button("Cancel",ImVec2(200.0f*dpiScale,0))) ImGui::CloseCurrentPopup(); + if (ImGui::Button(_("Cancel"),ImVec2(200.0f*dpiScale,0))) ImGui::CloseCurrentPopup(); ImGui::SameLine(); } - if (ImGui::Button("Export",ImVec2(200.0f*dpiScale,0))) { + if (ImGui::Button(_("Export"),ImVec2(200.0f*dpiScale,0))) { openFileDialog(GUI_FILE_EXPORT_TIUNA); ImGui::CloseCurrentPopup(); } } else { - ImGui::Text("nothing to export"); + ImGui::Text(_("nothing to export")); if (onWindow) { ImGui::Separator(); - if (ImGui::Button("Cancel",ImVec2(400.0f*dpiScale,0))) ImGui::CloseCurrentPopup(); + if (ImGui::Button(_("Cancel"),ImVec2(400.0f*dpiScale,0))) ImGui::CloseCurrentPopup(); } } } diff --git a/src/gui/gui.cpp b/src/gui/gui.cpp index 574e6e368..f5b8c0390 100644 --- a/src/gui/gui.cpp +++ b/src/gui/gui.cpp @@ -1927,11 +1927,11 @@ void FurnaceGUI::openFileDialog(FurnaceGUIFileDialogs type) { ); break; case GUI_FILE_EXPORT_TIUNA: - if (!dirExists(workingDirTiunaExport)) workingDirTiunaExport=getHomeDir(); + if (!dirExists(workingDirROMExport)) workingDirROMExport=getHomeDir(); hasOpened=fileDialog->openSave( "Export TIunA", {"assembly files", "*.asm"}, - workingDirTiunaExport, + workingDirROMExport, dpiScale ); break; @@ -4903,10 +4903,8 @@ bool FurnaceGUI::loop() { case GUI_FILE_EXPORT_ZSM: workingDirZSMExport=fileDialog->getPath()+DIR_SEPARATOR_STR; break; - case GUI_FILE_EXPORT_TIUNA: - workingDirTiunaExport=fileDialog->getPath()+DIR_SEPARATOR_STR; - break; case GUI_FILE_EXPORT_ROM: + case GUI_FILE_EXPORT_TIUNA: case GUI_FILE_EXPORT_TEXT: case GUI_FILE_EXPORT_CMDSTREAM: workingDirROMExport=fileDialog->getPath()+DIR_SEPARATOR_STR; @@ -7304,7 +7302,6 @@ void FurnaceGUI::syncState() { workingDirAudioExport=e->getConfString("lastDirAudioExport",workingDir); workingDirVGMExport=e->getConfString("lastDirVGMExport",workingDir); workingDirZSMExport=e->getConfString("lastDirZSMExport",workingDir); - workingDirTiunaExport=e->getConfString("lastDirTiunaExport",workingDir); workingDirROMExport=e->getConfString("lastDirROMExport",workingDir); workingDirFont=e->getConfString("lastDirFont",workingDir); workingDirColors=e->getConfString("lastDirColors",workingDir); @@ -7464,7 +7461,6 @@ void FurnaceGUI::commitState(DivConfig& conf) { conf.set("lastDirAudioExport",workingDirAudioExport); conf.set("lastDirVGMExport",workingDirVGMExport); conf.set("lastDirZSMExport",workingDirZSMExport); - conf.set("lastDirTiunaExport",workingDirTiunaExport); conf.set("lastDirROMExport",workingDirROMExport); conf.set("lastDirFont",workingDirFont); conf.set("lastDirColors",workingDirColors); diff --git a/src/gui/gui.h b/src/gui/gui.h index 905d511d9..6abff33a2 100644 --- a/src/gui/gui.h +++ b/src/gui/gui.h @@ -1583,7 +1583,7 @@ class FurnaceGUI { String workingDir, fileName, clipboard, warnString, errorString, lastError, curFileName, nextFile, sysSearchQuery, newSongQuery, paletteQuery; String workingDirSong, workingDirIns, workingDirWave, workingDirSample, workingDirAudioExport; - String workingDirVGMExport, workingDirZSMExport, workingDirTiunaExport, workingDirROMExport; + String workingDirVGMExport, workingDirZSMExport, workingDirROMExport; String workingDirFont, workingDirColors, workingDirKeybinds; String workingDirLayout, workingDirROM, workingDirTest; String workingDirConfig;