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

GUI: add option to choose between chip menus and

Browse source 
chip manager in File menu
This commit is contained in:
tildearrow 2023-08-28 17:00:39 -05:00
parent decd2fde0f
commit 044859f6d1
3 changed files with 71 additions and 55 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/gui/gui.cpp
View file

@ -4169,6 +4169,11 @@ bool FurnaceGUI::loop() {
ImGui::EndMenu(); ImGui::EndMenu();
} }
ImGui::Separator(); ImGui::Separator();
if (!settings.classicChipOptions) {
if (ImGui::MenuItem("manage chips")) {
nextWindow=GUI_WINDOW_SYS_MANAGER;
}
} else {
if (ImGui::BeginMenu("add chip...")) { if (ImGui::BeginMenu("add chip...")) {
exitDisabledTimer=1; exitDisabledTimer=1;
DivSystem picked=systemPicker(); DivSystem picked=systemPicker();
@ -4234,6 +4239,7 @@ bool FurnaceGUI::loop() {
} }
ImGui::EndMenu(); ImGui::EndMenu();
} }
}
ImGui::BeginDisabled(exitDisabledTimer); ImGui::BeginDisabled(exitDisabledTimer);
ImGui::Separator(); ImGui::Separator();
if (ImGui::MenuItem("restore backup",BIND_FOR(GUI_ACTION_OPEN_BACKUP))) { if (ImGui::MenuItem("restore backup",BIND_FOR(GUI_ACTION_OPEN_BACKUP))) {

2
src/gui/gui.h
View file

@ -1569,6 +1569,7 @@ class FurnaceGUI {
int capitalMenuBar; int capitalMenuBar;
int centerPopup; int centerPopup;
int insIconsStyle; int insIconsStyle;
int classicChipOptions;
unsigned int maxUndoSteps; unsigned int maxUndoSteps;
String mainFontPath; String mainFontPath;
String headFontPath; String headFontPath;
@ -1742,6 +1743,7 @@ class FurnaceGUI {
capitalMenuBar(0), capitalMenuBar(0),
centerPopup(1), centerPopup(1),
insIconsStyle(1), insIconsStyle(1),
classicChipOptions(0),
maxUndoSteps(100), maxUndoSteps(100),
mainFontPath(""), mainFontPath(""),
headFontPath(""), headFontPath(""),

8
src/gui/settings.cpp
View file

@ -2199,6 +2199,11 @@ void FurnaceGUI::drawSettings() {
settings.capitalMenuBar=capitalMenuBarB; settings.capitalMenuBar=capitalMenuBarB;
} }
bool classicChipOptionsB=settings.classicChipOptions;
if (ImGui::Checkbox("Display add/configure/change/remove chip menus in File menu",&classicChipOptionsB)) {
settings.classicChipOptions=classicChipOptionsB;
}
// 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.
@ -3191,6 +3196,7 @@ void FurnaceGUI::syncSettings() {
settings.capitalMenuBar=e->getConfInt("capitalMenuBar",0); settings.capitalMenuBar=e->getConfInt("capitalMenuBar",0);
settings.centerPopup=e->getConfInt("centerPopup",1); settings.centerPopup=e->getConfInt("centerPopup",1);
settings.insIconsStyle=e->getConfInt("insIconsStyle",1); settings.insIconsStyle=e->getConfInt("insIconsStyle",1);
settings.classicChipOptions=e->getConfInt("classicChipOptions",0);
clampSetting(settings.mainFontSize,2,96); clampSetting(settings.mainFontSize,2,96);
clampSetting(settings.headFontSize,2,96); clampSetting(settings.headFontSize,2,96);
@ -3337,6 +3343,7 @@ void FurnaceGUI::syncSettings() {
clampSetting(settings.capitalMenuBar,0,1); clampSetting(settings.capitalMenuBar,0,1);
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);
if (settings.exportLoops<0.0) settings.exportLoops=0.0; if (settings.exportLoops<0.0) settings.exportLoops=0.0;
if (settings.exportFadeOut<0.0) settings.exportFadeOut=0.0; if (settings.exportFadeOut<0.0) settings.exportFadeOut=0.0;
@ -3590,6 +3597,7 @@ void FurnaceGUI::commitSettings() {
e->setConf("capitalMenuBar",settings.capitalMenuBar); e->setConf("capitalMenuBar",settings.capitalMenuBar);
e->setConf("centerPopup",settings.centerPopup); e->setConf("centerPopup",settings.centerPopup);
e->setConf("insIconsStyle",settings.insIconsStyle); e->setConf("insIconsStyle",settings.insIconsStyle);
e->setConf("classicChipOptions",settings.classicChipOptions);
// colors // colors
for (int i=0; i<GUI_COLOR_MAX; i++) { for (int i=0; i<GUI_COLOR_MAX; i++) {