mirror of https://github.com/AxioDL/metaforce.git
Update boo; Add initial GUI mode support
This commit is contained in:
parent
6e7cf97bdc
commit
0e4310903d
|
@ -30,6 +30,7 @@ struct ToolPassInfo
|
|||
unsigned verbosityLevel = 0;
|
||||
bool force = false;
|
||||
bool yes = false;
|
||||
bool gui = false;
|
||||
};
|
||||
|
||||
#define RED "\033[0;31m"
|
||||
|
@ -93,6 +94,7 @@ public:
|
|||
: m_info(info)
|
||||
{
|
||||
hecl::VerbosityLevel = info.verbosityLevel;
|
||||
hecl::GuiMode = info.gui;
|
||||
}
|
||||
virtual ~ToolBase() {}
|
||||
virtual hecl::SystemString toolName() const=0;
|
||||
|
@ -169,7 +171,7 @@ private:
|
|||
public:
|
||||
|
||||
HelpOutput(HelpFunc helpFunc)
|
||||
: m_sout(NULL), m_helpFunc(helpFunc), m_lineWidth(hecl::ConsoleWidth())
|
||||
: m_sout(NULL), m_helpFunc(helpFunc), m_lineWidth(hecl::GuiMode ? 120 : hecl::ConsoleWidth())
|
||||
{}
|
||||
|
||||
void go()
|
||||
|
@ -286,7 +288,7 @@ void ToolPrintProgress(const hecl::SystemChar* message, const hecl::SystemChar*
|
|||
else
|
||||
hecl::Printf(_S(" "));
|
||||
|
||||
int width = std::max(80, hecl::ConsoleWidth());
|
||||
int width = (hecl::GuiMode ? 120 : std::max(80, hecl::ConsoleWidth()));
|
||||
int half;
|
||||
if (blocks)
|
||||
half = width / 2 - 2;
|
||||
|
|
|
@ -213,6 +213,8 @@ int main(int argc, const char** argv)
|
|||
info.force = true;
|
||||
else if (*chit == _S('y'))
|
||||
info.yes = true;
|
||||
else if (*chit == _S('g'))
|
||||
info.gui = true;
|
||||
else
|
||||
info.flags.push_back(*chit);
|
||||
}
|
||||
|
|
|
@ -1 +1 @@
|
|||
Subproject commit f71131e4df6af467d5ed0ad0cd5edd869eba2095
|
||||
Subproject commit beb7f00b182f34e12607e70e9184c0d8dd7d1c1f
|
|
@ -47,6 +47,7 @@ struct DataSpecEntry;
|
|||
}
|
||||
|
||||
extern unsigned VerbosityLevel;
|
||||
extern bool GuiMode;
|
||||
extern logvisor::Module LogModule;
|
||||
|
||||
std::string WideToUTF8(std::wstring_view src);
|
||||
|
|
|
@ -23,6 +23,7 @@
|
|||
namespace hecl
|
||||
{
|
||||
unsigned VerbosityLevel = 0;
|
||||
bool GuiMode = false;
|
||||
logvisor::Module LogModule("hecl");
|
||||
static const std::string Illegals {"<>?\"|"};
|
||||
|
||||
|
|
Loading…
Reference in New Issue