GUI: prepare for chip manager window
This commit is contained in:
parent
3787d2ae87
commit
94cf589e92
|
@ -552,6 +552,7 @@ src/gui/stats.cpp
|
||||||
src/gui/subSongs.cpp
|
src/gui/subSongs.cpp
|
||||||
src/gui/sysConf.cpp
|
src/gui/sysConf.cpp
|
||||||
src/gui/sysEx.cpp
|
src/gui/sysEx.cpp
|
||||||
|
src/gui/sysManager.cpp
|
||||||
src/gui/util.cpp
|
src/gui/util.cpp
|
||||||
src/gui/waveEdit.cpp
|
src/gui/waveEdit.cpp
|
||||||
src/gui/volMeter.cpp
|
src/gui/volMeter.cpp
|
||||||
|
|
|
@ -241,6 +241,9 @@ void FurnaceGUI::doAction(int what) {
|
||||||
case GUI_ACTION_WINDOW_PAT_MANAGER:
|
case GUI_ACTION_WINDOW_PAT_MANAGER:
|
||||||
nextWindow=GUI_WINDOW_PAT_MANAGER;
|
nextWindow=GUI_WINDOW_PAT_MANAGER;
|
||||||
break;
|
break;
|
||||||
|
case GUI_ACTION_WINDOW_SYS_MANAGER:
|
||||||
|
nextWindow=GUI_WINDOW_SYS_MANAGER;
|
||||||
|
break;
|
||||||
case GUI_ACTION_WINDOW_REGISTER_VIEW:
|
case GUI_ACTION_WINDOW_REGISTER_VIEW:
|
||||||
nextWindow=GUI_WINDOW_REGISTER_VIEW;
|
nextWindow=GUI_WINDOW_REGISTER_VIEW;
|
||||||
break;
|
break;
|
||||||
|
@ -328,6 +331,9 @@ void FurnaceGUI::doAction(int what) {
|
||||||
case GUI_WINDOW_PAT_MANAGER:
|
case GUI_WINDOW_PAT_MANAGER:
|
||||||
patManagerOpen=false;
|
patManagerOpen=false;
|
||||||
break;
|
break;
|
||||||
|
case GUI_WINDOW_SYS_MANAGER:
|
||||||
|
sysManagerOpen=false;
|
||||||
|
break;
|
||||||
case GUI_WINDOW_REGISTER_VIEW:
|
case GUI_WINDOW_REGISTER_VIEW:
|
||||||
regViewOpen=false;
|
regViewOpen=false;
|
||||||
break;
|
break;
|
||||||
|
|
|
@ -3108,6 +3108,7 @@ bool FurnaceGUI::loop() {
|
||||||
if (ImGui::MenuItem("mixer",BIND_FOR(GUI_ACTION_WINDOW_MIXER),mixerOpen)) mixerOpen=!mixerOpen;
|
if (ImGui::MenuItem("mixer",BIND_FOR(GUI_ACTION_WINDOW_MIXER),mixerOpen)) mixerOpen=!mixerOpen;
|
||||||
if (ImGui::MenuItem("channels",BIND_FOR(GUI_ACTION_WINDOW_CHANNELS),channelsOpen)) channelsOpen=!channelsOpen;
|
if (ImGui::MenuItem("channels",BIND_FOR(GUI_ACTION_WINDOW_CHANNELS),channelsOpen)) channelsOpen=!channelsOpen;
|
||||||
if (ImGui::MenuItem("pattern manager",BIND_FOR(GUI_ACTION_WINDOW_PAT_MANAGER),patManagerOpen)) patManagerOpen=!patManagerOpen;
|
if (ImGui::MenuItem("pattern manager",BIND_FOR(GUI_ACTION_WINDOW_PAT_MANAGER),patManagerOpen)) patManagerOpen=!patManagerOpen;
|
||||||
|
if (ImGui::MenuItem("chip manager",BIND_FOR(GUI_ACTION_WINDOW_SYS_MANAGER),sysManagerOpen)) sysManagerOpen=!sysManagerOpen;
|
||||||
if (ImGui::MenuItem("compatibility flags",BIND_FOR(GUI_ACTION_WINDOW_COMPAT_FLAGS),compatFlagsOpen)) compatFlagsOpen=!compatFlagsOpen;
|
if (ImGui::MenuItem("compatibility flags",BIND_FOR(GUI_ACTION_WINDOW_COMPAT_FLAGS),compatFlagsOpen)) compatFlagsOpen=!compatFlagsOpen;
|
||||||
if (ImGui::MenuItem("song comments",BIND_FOR(GUI_ACTION_WINDOW_NOTES),notesOpen)) notesOpen=!notesOpen;
|
if (ImGui::MenuItem("song comments",BIND_FOR(GUI_ACTION_WINDOW_NOTES),notesOpen)) notesOpen=!notesOpen;
|
||||||
ImGui::Separator();
|
ImGui::Separator();
|
||||||
|
@ -3243,6 +3244,7 @@ bool FurnaceGUI::loop() {
|
||||||
drawNotes();
|
drawNotes();
|
||||||
drawChannels();
|
drawChannels();
|
||||||
drawPatManager();
|
drawPatManager();
|
||||||
|
drawSysManager();
|
||||||
drawRegView();
|
drawRegView();
|
||||||
drawLog();
|
drawLog();
|
||||||
drawEffectList();
|
drawEffectList();
|
||||||
|
@ -4364,6 +4366,7 @@ bool FurnaceGUI::init() {
|
||||||
notesOpen=e->getConfBool("notesOpen",false);
|
notesOpen=e->getConfBool("notesOpen",false);
|
||||||
channelsOpen=e->getConfBool("channelsOpen",false);
|
channelsOpen=e->getConfBool("channelsOpen",false);
|
||||||
patManagerOpen=e->getConfBool("patManagerOpen",false);
|
patManagerOpen=e->getConfBool("patManagerOpen",false);
|
||||||
|
sysManagerOpen=e->getConfBool("sysManagerOpen",false);
|
||||||
regViewOpen=e->getConfBool("regViewOpen",false);
|
regViewOpen=e->getConfBool("regViewOpen",false);
|
||||||
logOpen=e->getConfBool("logOpen",false);
|
logOpen=e->getConfBool("logOpen",false);
|
||||||
effectListOpen=e->getConfBool("effectListOpen",false);
|
effectListOpen=e->getConfBool("effectListOpen",false);
|
||||||
|
@ -4607,6 +4610,7 @@ bool FurnaceGUI::finish() {
|
||||||
e->setConf("notesOpen",notesOpen);
|
e->setConf("notesOpen",notesOpen);
|
||||||
e->setConf("channelsOpen",channelsOpen);
|
e->setConf("channelsOpen",channelsOpen);
|
||||||
e->setConf("patManagerOpen",patManagerOpen);
|
e->setConf("patManagerOpen",patManagerOpen);
|
||||||
|
e->setConf("sysManagerOpen",sysManagerOpen);
|
||||||
e->setConf("regViewOpen",regViewOpen);
|
e->setConf("regViewOpen",regViewOpen);
|
||||||
e->setConf("logOpen",logOpen);
|
e->setConf("logOpen",logOpen);
|
||||||
e->setConf("effectListOpen",effectListOpen);
|
e->setConf("effectListOpen",effectListOpen);
|
||||||
|
@ -4787,6 +4791,7 @@ FurnaceGUI::FurnaceGUI():
|
||||||
findOpen(false),
|
findOpen(false),
|
||||||
spoilerOpen(false),
|
spoilerOpen(false),
|
||||||
patManagerOpen(false),
|
patManagerOpen(false),
|
||||||
|
sysManagerOpen(false),
|
||||||
selecting(false),
|
selecting(false),
|
||||||
selectingFull(false),
|
selectingFull(false),
|
||||||
dragging(false),
|
dragging(false),
|
||||||
|
|
|
@ -250,6 +250,7 @@ enum FurnaceGUIWindows {
|
||||||
GUI_WINDOW_NOTES,
|
GUI_WINDOW_NOTES,
|
||||||
GUI_WINDOW_CHANNELS,
|
GUI_WINDOW_CHANNELS,
|
||||||
GUI_WINDOW_PAT_MANAGER,
|
GUI_WINDOW_PAT_MANAGER,
|
||||||
|
GUI_WINDOW_SYS_MANAGER,
|
||||||
GUI_WINDOW_REGISTER_VIEW,
|
GUI_WINDOW_REGISTER_VIEW,
|
||||||
GUI_WINDOW_LOG,
|
GUI_WINDOW_LOG,
|
||||||
GUI_WINDOW_EFFECT_LIST,
|
GUI_WINDOW_EFFECT_LIST,
|
||||||
|
@ -370,6 +371,7 @@ enum FurnaceGUIActions {
|
||||||
GUI_ACTION_WINDOW_NOTES,
|
GUI_ACTION_WINDOW_NOTES,
|
||||||
GUI_ACTION_WINDOW_CHANNELS,
|
GUI_ACTION_WINDOW_CHANNELS,
|
||||||
GUI_ACTION_WINDOW_PAT_MANAGER,
|
GUI_ACTION_WINDOW_PAT_MANAGER,
|
||||||
|
GUI_ACTION_WINDOW_SYS_MANAGER,
|
||||||
GUI_ACTION_WINDOW_REGISTER_VIEW,
|
GUI_ACTION_WINDOW_REGISTER_VIEW,
|
||||||
GUI_ACTION_WINDOW_LOG,
|
GUI_ACTION_WINDOW_LOG,
|
||||||
GUI_ACTION_WINDOW_EFFECT_LIST,
|
GUI_ACTION_WINDOW_EFFECT_LIST,
|
||||||
|
@ -1278,7 +1280,7 @@ class FurnaceGUI {
|
||||||
bool waveListOpen, waveEditOpen, sampleListOpen, sampleEditOpen, aboutOpen, settingsOpen;
|
bool waveListOpen, waveEditOpen, sampleListOpen, sampleEditOpen, aboutOpen, settingsOpen;
|
||||||
bool mixerOpen, debugOpen, inspectorOpen, oscOpen, volMeterOpen, statsOpen, compatFlagsOpen;
|
bool mixerOpen, debugOpen, inspectorOpen, oscOpen, volMeterOpen, statsOpen, compatFlagsOpen;
|
||||||
bool pianoOpen, notesOpen, channelsOpen, regViewOpen, logOpen, effectListOpen, chanOscOpen;
|
bool pianoOpen, notesOpen, channelsOpen, regViewOpen, logOpen, effectListOpen, chanOscOpen;
|
||||||
bool subSongsOpen, findOpen, spoilerOpen, patManagerOpen;
|
bool subSongsOpen, findOpen, spoilerOpen, patManagerOpen, sysManagerOpen;
|
||||||
|
|
||||||
SelectionPoint selStart, selEnd, cursor, cursorDrag, dragStart, dragEnd;
|
SelectionPoint selStart, selEnd, cursor, cursorDrag, dragStart, dragEnd;
|
||||||
bool selecting, selectingFull, dragging, curNibble, orderNibble, followOrders, followPattern, changeAllOrders, mobileUI;
|
bool selecting, selectingFull, dragging, curNibble, orderNibble, followOrders, followPattern, changeAllOrders, mobileUI;
|
||||||
|
@ -1588,6 +1590,7 @@ class FurnaceGUI {
|
||||||
void drawNotes();
|
void drawNotes();
|
||||||
void drawChannels();
|
void drawChannels();
|
||||||
void drawPatManager();
|
void drawPatManager();
|
||||||
|
void drawSysManager();
|
||||||
void drawRegView();
|
void drawRegView();
|
||||||
void drawAbout();
|
void drawAbout();
|
||||||
void drawSettings();
|
void drawSettings();
|
||||||
|
|
|
@ -488,6 +488,7 @@ const FurnaceGUIActionDef guiActions[GUI_ACTION_MAX]={
|
||||||
D("WINDOW_NOTES", "Song Comments", 0),
|
D("WINDOW_NOTES", "Song Comments", 0),
|
||||||
D("WINDOW_CHANNELS", "Channels", 0),
|
D("WINDOW_CHANNELS", "Channels", 0),
|
||||||
D("WINDOW_PAT_MANAGER", "Pattern Manager", 0),
|
D("WINDOW_PAT_MANAGER", "Pattern Manager", 0),
|
||||||
|
D("WINDOW_SYS_MANAGER", "Chip Manager", 0),
|
||||||
D("WINDOW_REGISTER_VIEW", "Register View", 0),
|
D("WINDOW_REGISTER_VIEW", "Register View", 0),
|
||||||
D("WINDOW_LOG", "Log Viewer", 0),
|
D("WINDOW_LOG", "Log Viewer", 0),
|
||||||
D("EFFECT_LIST", "Effect List", 0),
|
D("EFFECT_LIST", "Effect List", 0),
|
||||||
|
|
|
@ -0,0 +1,37 @@
|
||||||
|
/**
|
||||||
|
* Furnace Tracker - multi-system chiptune tracker
|
||||||
|
* Copyright (C) 2021-2022 tildearrow and contributors
|
||||||
|
*
|
||||||
|
* This program is free software; you can redistribute it and/or modify
|
||||||
|
* it under the terms of the GNU General Public License as published by
|
||||||
|
* the Free Software Foundation; either version 2 of the License, or
|
||||||
|
* (at your option) any later version.
|
||||||
|
*
|
||||||
|
* This program is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
* GNU General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU General Public License along
|
||||||
|
* with this program; if not, write to the Free Software Foundation, Inc.,
|
||||||
|
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||||
|
*/
|
||||||
|
|
||||||
|
#include "gui.h"
|
||||||
|
#include "misc/cpp/imgui_stdlib.h"
|
||||||
|
#include "IconsFontAwesome4.h"
|
||||||
|
#include <imgui.h>
|
||||||
|
|
||||||
|
void FurnaceGUI::drawSysManager() {
|
||||||
|
if (nextWindow==GUI_WINDOW_SYS_MANAGER) {
|
||||||
|
sysManagerOpen=true;
|
||||||
|
ImGui::SetNextWindowFocus();
|
||||||
|
nextWindow=GUI_WINDOW_NOTHING;
|
||||||
|
}
|
||||||
|
if (!sysManagerOpen) return;
|
||||||
|
if (ImGui::Begin("Chip Manager",&sysManagerOpen,globalWinFlags)) {
|
||||||
|
ImGui::Text("Stuff here...");
|
||||||
|
}
|
||||||
|
if (ImGui::IsWindowFocused(ImGuiFocusedFlags_ChildWindows)) curWindow=GUI_WINDOW_SYS_MANAGER;
|
||||||
|
ImGui::End();
|
||||||
|
}
|
Loading…
Reference in New Issue