otomatalabs/furnace
7
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

GUI: remove ability to save legacy .fui

Browse source
This commit is contained in:
tildearrow 2023-07-27 01:35:28 -05:00
parent b186576e14
commit c2f83a3aef
6 changed files with 0 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/gui/dataList.cpp
View file

@ -330,9 +330,6 @@ void FurnaceGUI::insListItem(int i, int dir, int asset) {
if (ImGui::MenuItem("save")) { if (ImGui::MenuItem("save")) {
doAction(GUI_ACTION_INS_LIST_SAVE); doAction(GUI_ACTION_INS_LIST_SAVE);
} }
if (ImGui::MenuItem("save (legacy .fui)")) {
doAction(GUI_ACTION_INS_LIST_SAVE_OLD);
}
if (ImGui::MenuItem("save (.dmp)")) { if (ImGui::MenuItem("save (.dmp)")) {
doAction(GUI_ACTION_INS_LIST_SAVE_DMP); doAction(GUI_ACTION_INS_LIST_SAVE_DMP);
} }

3
src/gui/doAction.cpp
View file

@ -642,9 +642,6 @@ void FurnaceGUI::doAction(int what) {
case GUI_ACTION_INS_LIST_SAVE: case GUI_ACTION_INS_LIST_SAVE:
if (curIns>=0 && curIns<(int)e->song.ins.size()) openFileDialog(GUI_FILE_INS_SAVE); if (curIns>=0 && curIns<(int)e->song.ins.size()) openFileDialog(GUI_FILE_INS_SAVE);
break; break;
case GUI_ACTION_INS_LIST_SAVE_OLD:
if (curIns>=0 && curIns<(int)e->song.ins.size()) openFileDialog(GUI_FILE_INS_SAVE_OLD);
break;
case GUI_ACTION_INS_LIST_SAVE_DMP: case GUI_ACTION_INS_LIST_SAVE_DMP:
if (curIns>=0 && curIns<(int)e->song.ins.size()) openFileDialog(GUI_FILE_INS_SAVE_DMP); if (curIns>=0 && curIns<(int)e->song.ins.size()) openFileDialog(GUI_FILE_INS_SAVE_DMP);
break; break;

19
src/gui/gui.cpp
View file

@ -1653,16 +1653,6 @@ void FurnaceGUI::openFileDialog(FurnaceGUIFileDialogs type) {
dpiScale dpiScale
); );
break; break;
case GUI_FILE_INS_SAVE_OLD:
if (!dirExists(workingDirIns)) workingDirIns=getHomeDir();
hasOpened=fileDialog->openSave(
"Save Instrument",
{"Furnace instrument", "*.fui"},
"Furnace instrument{.fui}",
workingDirIns,
dpiScale
);
break;
case GUI_FILE_INS_SAVE_DMP: case GUI_FILE_INS_SAVE_DMP:
if (!dirExists(workingDirIns)) workingDirIns=getHomeDir(); if (!dirExists(workingDirIns)) workingDirIns=getHomeDir();
hasOpened=fileDialog->openSave( hasOpened=fileDialog->openSave(
@ -4592,7 +4582,6 @@ bool FurnaceGUI::loop() {
case GUI_FILE_INS_OPEN: case GUI_FILE_INS_OPEN:
case GUI_FILE_INS_OPEN_REPLACE: case GUI_FILE_INS_OPEN_REPLACE:
case GUI_FILE_INS_SAVE: case GUI_FILE_INS_SAVE:
case GUI_FILE_INS_SAVE_OLD:
case GUI_FILE_INS_SAVE_DMP: case GUI_FILE_INS_SAVE_DMP:
workingDirIns=fileDialog->getPath()+DIR_SEPARATOR_STR; workingDirIns=fileDialog->getPath()+DIR_SEPARATOR_STR;
break; break;
@ -4695,9 +4684,6 @@ bool FurnaceGUI::loop() {
if (curFileDialog==GUI_FILE_INS_SAVE) { if (curFileDialog==GUI_FILE_INS_SAVE) {
checkExtension(".fui"); checkExtension(".fui");
} }
if (curFileDialog==GUI_FILE_INS_SAVE_OLD) {
checkExtension(".fui");
}
if (curFileDialog==GUI_FILE_INS_SAVE_DMP) { if (curFileDialog==GUI_FILE_INS_SAVE_DMP) {
checkExtension(".dmp"); checkExtension(".dmp");
} }
@ -4791,11 +4777,6 @@ bool FurnaceGUI::loop() {
e->song.ins[curIns]->save(copyOfName.c_str(),false,&e->song); e->song.ins[curIns]->save(copyOfName.c_str(),false,&e->song);
} }
break; break;
case GUI_FILE_INS_SAVE_OLD:
if (curIns>=0 && curIns<(int)e->song.ins.size()) {
e->song.ins[curIns]->save(copyOfName.c_str(),true);
}
break;
case GUI_FILE_INS_SAVE_DMP: case GUI_FILE_INS_SAVE_DMP:
if (curIns>=0 && curIns<(int)e->song.ins.size()) { if (curIns>=0 && curIns<(int)e->song.ins.size()) {
if (!e->song.ins[curIns]->saveDMP(copyOfName.c_str())) { if (!e->song.ins[curIns]->saveDMP(copyOfName.c_str())) {

2
src/gui/gui.h
View file

@ -402,7 +402,6 @@ enum FurnaceGUIFileDialogs {
GUI_FILE_INS_OPEN, GUI_FILE_INS_OPEN,
GUI_FILE_INS_OPEN_REPLACE, GUI_FILE_INS_OPEN_REPLACE,
GUI_FILE_INS_SAVE, GUI_FILE_INS_SAVE,
GUI_FILE_INS_SAVE_OLD,
GUI_FILE_INS_SAVE_DMP, GUI_FILE_INS_SAVE_DMP,
GUI_FILE_WAVE_OPEN, GUI_FILE_WAVE_OPEN,
GUI_FILE_WAVE_OPEN_REPLACE, GUI_FILE_WAVE_OPEN_REPLACE,
@ -607,7 +606,6 @@ enum FurnaceGUIActions {
GUI_ACTION_INS_LIST_OPEN, GUI_ACTION_INS_LIST_OPEN,
GUI_ACTION_INS_LIST_OPEN_REPLACE, GUI_ACTION_INS_LIST_OPEN_REPLACE,
GUI_ACTION_INS_LIST_SAVE, GUI_ACTION_INS_LIST_SAVE,
GUI_ACTION_INS_LIST_SAVE_OLD,
GUI_ACTION_INS_LIST_SAVE_DMP, GUI_ACTION_INS_LIST_SAVE_DMP,
GUI_ACTION_INS_LIST_MOVE_UP, GUI_ACTION_INS_LIST_MOVE_UP,
GUI_ACTION_INS_LIST_MOVE_DOWN, GUI_ACTION_INS_LIST_MOVE_DOWN,

1
src/gui/guiConst.cpp
View file

@ -641,7 +641,6 @@ const FurnaceGUIActionDef guiActions[GUI_ACTION_MAX]={
D("INS_LIST_OPEN", "Open", 0), D("INS_LIST_OPEN", "Open", 0),
D("INS_LIST_OPEN_REPLACE", "Open (replace current)", 0), D("INS_LIST_OPEN_REPLACE", "Open (replace current)", 0),
D("INS_LIST_SAVE", "Save", 0), D("INS_LIST_SAVE", "Save", 0),
D("INS_LIST_SAVE_OLD", "Save (legacy .fui)", 0),
D("INS_LIST_SAVE_DMP", "Save (.dmp)", 0), D("INS_LIST_SAVE_DMP", "Save (.dmp)", 0),
D("INS_LIST_MOVE_UP", "Move up", FURKMOD_SHIFT|SDLK_UP), D("INS_LIST_MOVE_UP", "Move up", FURKMOD_SHIFT|SDLK_UP),
D("INS_LIST_MOVE_DOWN", "Move down", FURKMOD_SHIFT|SDLK_DOWN), D("INS_LIST_MOVE_DOWN", "Move down", FURKMOD_SHIFT|SDLK_DOWN),

3
src/gui/insEdit.cpp
View file

@ -2288,9 +2288,6 @@ void FurnaceGUI::drawInsEdit() {
ImGui::SetTooltip("Save"); ImGui::SetTooltip("Save");
} }
if (ImGui::BeginPopupContextItem("InsSaveFormats",ImGuiMouseButton_Right)) { if (ImGui::BeginPopupContextItem("InsSaveFormats",ImGuiMouseButton_Right)) {
if (ImGui::MenuItem("save in legacy format...")) {
doAction(GUI_ACTION_INS_LIST_SAVE_OLD);
}
if (ImGui::MenuItem("save as .dmp...")) { if (ImGui::MenuItem("save as .dmp...")) {
doAction(GUI_ACTION_INS_LIST_SAVE_DMP); doAction(GUI_ACTION_INS_LIST_SAVE_DMP);
} }