mirror of
https://github.com/RetroDECK/ES-DE.git
synced 2024-11-27 00:25:38 +00:00
Changed "B" to "Back" in the metadata editor.
"Start" closes all windows.
This commit is contained in:
parent
0743828b77
commit
90cc0991a3
|
@ -54,7 +54,6 @@ void GuiGamelistOptions::openMetaDataEd()
|
||||||
mGamelist->onFileChanged(file, FILE_REMOVED); //tell the view
|
mGamelist->onFileChanged(file, FILE_REMOVED); //tell the view
|
||||||
delete file; //free it
|
delete file; //free it
|
||||||
}));
|
}));
|
||||||
delete this;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
bool GuiGamelistOptions::input(InputConfig* config, Input input)
|
bool GuiGamelistOptions::input(InputConfig* config, Input input)
|
||||||
|
|
|
@ -3,6 +3,7 @@
|
||||||
#include "../Log.h"
|
#include "../Log.h"
|
||||||
#include "../components/AsyncReqComponent.h"
|
#include "../components/AsyncReqComponent.h"
|
||||||
#include "../Settings.h"
|
#include "../Settings.h"
|
||||||
|
#include "../views/ViewController.h"
|
||||||
#include "GuiGameScraper.h"
|
#include "GuiGameScraper.h"
|
||||||
#include "GuiMsgBox.h"
|
#include "GuiMsgBox.h"
|
||||||
#include <boost/filesystem.hpp>
|
#include <boost/filesystem.hpp>
|
||||||
|
@ -195,7 +196,7 @@ void GuiMetaDataEd::fetchDone(const ScraperSearchResult& result)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void GuiMetaDataEd::close()
|
void GuiMetaDataEd::close(bool closeAllWindows)
|
||||||
{
|
{
|
||||||
// find out if the user made any changes
|
// find out if the user made any changes
|
||||||
bool dirty = false;
|
bool dirty = false;
|
||||||
|
@ -209,16 +210,29 @@ void GuiMetaDataEd::close()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
std::function<void()> closeFunc;
|
||||||
|
if(closeAllWindows)
|
||||||
|
{
|
||||||
|
closeFunc = [this] { delete this; };
|
||||||
|
}else{
|
||||||
|
Window* window = mWindow;
|
||||||
|
closeFunc = [window, this] {
|
||||||
|
while(window->peekGui() != window->getViewController())
|
||||||
|
delete window->peekGui();
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
if(dirty)
|
if(dirty)
|
||||||
{
|
{
|
||||||
// changes were made, ask if the user wants to save them
|
// changes were made, ask if the user wants to save them
|
||||||
mWindow->pushGui(new GuiMsgBox(mWindow,
|
mWindow->pushGui(new GuiMsgBox(mWindow,
|
||||||
"SAVE CHANGES?",
|
"SAVE CHANGES?",
|
||||||
"YES", [&] { save(); delete this; },
|
"YES", [this, closeFunc] { save(); closeFunc(); },
|
||||||
"NO", [&] { delete this; }
|
"NO", closeFunc
|
||||||
));
|
));
|
||||||
}else{
|
}else{
|
||||||
delete this;
|
closeFunc();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -227,9 +241,10 @@ bool GuiMetaDataEd::input(InputConfig* config, Input input)
|
||||||
if(GuiComponent::input(config, input))
|
if(GuiComponent::input(config, input))
|
||||||
return true;
|
return true;
|
||||||
|
|
||||||
if(input.value != 0 && (config->isMappedTo("b", input) || config->isMappedTo("start", input)))
|
const bool isStart = config->isMappedTo("start", input);
|
||||||
|
if(input.value != 0 && (config->isMappedTo("b", input) || isStart))
|
||||||
{
|
{
|
||||||
close();
|
close(isStart);
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -239,7 +254,7 @@ bool GuiMetaDataEd::input(InputConfig* config, Input input)
|
||||||
std::vector<HelpPrompt> GuiMetaDataEd::getHelpPrompts()
|
std::vector<HelpPrompt> GuiMetaDataEd::getHelpPrompts()
|
||||||
{
|
{
|
||||||
std::vector<HelpPrompt> prompts = mGrid.getHelpPrompts();
|
std::vector<HelpPrompt> prompts = mGrid.getHelpPrompts();
|
||||||
prompts.push_back(HelpPrompt("b", "close"));
|
prompts.push_back(HelpPrompt("b", "back"));
|
||||||
prompts.push_back(HelpPrompt("start", "close"));
|
prompts.push_back(HelpPrompt("start", "close"));
|
||||||
return prompts;
|
return prompts;
|
||||||
}
|
}
|
||||||
|
|
|
@ -21,7 +21,7 @@ private:
|
||||||
void save();
|
void save();
|
||||||
void fetch();
|
void fetch();
|
||||||
void fetchDone(const ScraperSearchResult& result);
|
void fetchDone(const ScraperSearchResult& result);
|
||||||
void close();
|
void close(bool closeAllWindows);
|
||||||
|
|
||||||
NinePatchComponent mBackground;
|
NinePatchComponent mBackground;
|
||||||
ComponentGrid mGrid;
|
ComponentGrid mGrid;
|
||||||
|
|
Loading…
Reference in a new issue