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

i won't call it classic

Browse source
This commit is contained in:
tildearrow 2023-12-21 20:08:15 -05:00
parent df3e3e8aec
commit 5697330c04
3 changed files with 20 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/gui/gui.cpp
View file

@ -4101,7 +4101,7 @@ bool FurnaceGUI::loop() {
openFileDialog(GUI_FILE_SAVE_DMF_LEGACY); openFileDialog(GUI_FILE_SAVE_DMF_LEGACY);
} }
ImGui::Separator(); ImGui::Separator();
if (settings.classicExportOptions) { if (settings.exportOptionsLayout) {
if (ImGui::BeginMenu("export audio...")) { if (ImGui::BeginMenu("export audio...")) {
drawExportAudio(); drawExportAudio();
ImGui::EndMenu(); ImGui::EndMenu();

4
src/gui/gui.h
View file

@ -1689,7 +1689,7 @@ class FurnaceGUI {
int centerPopup; int centerPopup;
int insIconsStyle; int insIconsStyle;
int classicChipOptions; int classicChipOptions;
int classicExportOptions; int exportOptionsLayout;
int wasapiEx; int wasapiEx;
int chanOscThreads; int chanOscThreads;
int renderPoolThreads; int renderPoolThreads;
@ -1886,7 +1886,7 @@ class FurnaceGUI {
centerPopup(1), centerPopup(1),
insIconsStyle(1), insIconsStyle(1),
classicChipOptions(0), classicChipOptions(0),
classicExportOptions(0), // poll? exportOptionsLayout(1),
wasapiEx(0), wasapiEx(0),
chanOscThreads(0), chanOscThreads(0),
renderPoolThreads(0), renderPoolThreads(0),

26
src/gui/settings.cpp
View file

@ -2660,6 +2660,20 @@ void FurnaceGUI::drawSettings() {
} }
ImGui::Unindent(); ImGui::Unindent();
ImGui::Text("Export options layout:");
if (ImGui::RadioButton("Sub-menus in File menu##eol0",settings.exportOptionsLayout==0)) {
settings.exportOptionsLayout=0;
settingsChanged=true;
}
if (ImGui::RadioButton("Modal window with tabs##eol1",settings.exportOptionsLayout==1)) {
settings.exportOptionsLayout=1;
settingsChanged=true;
}
if (ImGui::RadioButton("Modal windows with options in File menu##eol2",settings.exportOptionsLayout==2)) {
settings.exportOptionsLayout=2;
settingsChanged=true;
}
bool capitalMenuBarB=settings.capitalMenuBar; bool capitalMenuBarB=settings.capitalMenuBar;
if (ImGui::Checkbox("Capitalize menu bar",&capitalMenuBarB)) { if (ImGui::Checkbox("Capitalize menu bar",&capitalMenuBarB)) {
settings.capitalMenuBar=capitalMenuBarB; settings.capitalMenuBar=capitalMenuBarB;
@ -2672,12 +2686,6 @@ void FurnaceGUI::drawSettings() {
settingsChanged=true; settingsChanged=true;
} }
bool classicExportOptionsB=settings.classicExportOptions;
if (ImGui::Checkbox("Display separate export options in File menu",&classicExportOptionsB)) {
settings.classicExportOptions=classicExportOptionsB;
settingsChanged=true;
}
// SUBSECTION ORDERS // SUBSECTION ORDERS
CONFIG_SUBSECTION("Orders"); CONFIG_SUBSECTION("Orders");
// sorry. temporarily disabled until ImGui has a way to add separators in tables arbitrarily. // sorry. temporarily disabled until ImGui has a way to add separators in tables arbitrarily.
@ -3873,7 +3881,7 @@ void FurnaceGUI::readConfig(DivConfig& conf, FurnaceGUISettingGroups groups) {
settings.centerPopup=conf.getInt("centerPopup",1); settings.centerPopup=conf.getInt("centerPopup",1);
settings.insIconsStyle=conf.getInt("insIconsStyle",1); settings.insIconsStyle=conf.getInt("insIconsStyle",1);
settings.classicChipOptions=conf.getInt("classicChipOptions",0); settings.classicChipOptions=conf.getInt("classicChipOptions",0);
settings.classicExportOptions=conf.getInt("classicExportOptions",0); settings.exportOptionsLayout=conf.getInt("exportOptionsLayout",1);
settings.wasapiEx=conf.getInt("wasapiEx",0); settings.wasapiEx=conf.getInt("wasapiEx",0);
settings.chanOscThreads=conf.getInt("chanOscThreads",0); settings.chanOscThreads=conf.getInt("chanOscThreads",0);
settings.renderPoolThreads=conf.getInt("renderPoolThreads",0); settings.renderPoolThreads=conf.getInt("renderPoolThreads",0);
@ -4042,7 +4050,7 @@ void FurnaceGUI::readConfig(DivConfig& conf, FurnaceGUISettingGroups groups) {
clampSetting(settings.centerPopup,0,1); clampSetting(settings.centerPopup,0,1);
clampSetting(settings.insIconsStyle,0,2); clampSetting(settings.insIconsStyle,0,2);
clampSetting(settings.classicChipOptions,0,1); clampSetting(settings.classicChipOptions,0,1);
clampSetting(settings.classicExportOptions,0,1); clampSetting(settings.exportOptionsLayout,0,2);
clampSetting(settings.wasapiEx,0,1); clampSetting(settings.wasapiEx,0,1);
clampSetting(settings.chanOscThreads,0,256); clampSetting(settings.chanOscThreads,0,256);
clampSetting(settings.renderPoolThreads,0,DIV_MAX_CHIPS); clampSetting(settings.renderPoolThreads,0,DIV_MAX_CHIPS);
@ -4292,7 +4300,7 @@ void FurnaceGUI::writeConfig(DivConfig& conf, FurnaceGUISettingGroups groups) {
conf.set("centerPopup",settings.centerPopup); conf.set("centerPopup",settings.centerPopup);
conf.set("insIconsStyle",settings.insIconsStyle); conf.set("insIconsStyle",settings.insIconsStyle);
conf.set("classicChipOptions",settings.classicChipOptions); conf.set("classicChipOptions",settings.classicChipOptions);
conf.set("classicExportOptions",settings.classicExportOptions); conf.set("exportOptionsLayout",settings.exportOptionsLayout);
conf.set("wasapiEx",settings.wasapiEx); conf.set("wasapiEx",settings.wasapiEx);
conf.set("chanOscThreads",settings.chanOscThreads); conf.set("chanOscThreads",settings.chanOscThreads);
conf.set("renderPoolThreads",settings.renderPoolThreads); conf.set("renderPoolThreads",settings.renderPoolThreads);