Skip to content

Re-Add nosplash cmdline option #7

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
AtricoSoftware wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Re-Add nosplash cmdline option #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 11 additions & 3 deletions sgdm3/src/gui/MyBusyInfo.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,12 @@ void MyBusyInfo::Increment(void)
{
wxASSERT_MSG( (!m_pBusyInfo), _T("Coding Error") );
wxASSERT_MSG( (!m_pDisabler), _T("Coding Error") );
m_pBusyInfo = new wxBusyInfo("Please wait...");

gui_app * pApp = static_cast<gui_app *>(wxTheApp);
if (!pApp->getCmdLineArgs().bNoSplash)
{
m_pBusyInfo = new wxBusyInfo("Please wait...");
}
m_pDisabler = new wxWindowDisabler(true);
}
else
Expand All @@ -73,8 +78,11 @@ void MyBusyInfo::Decrement(void)

delete m_pDisabler;
m_pDisabler = NULL;
delete m_pBusyInfo;
m_pBusyInfo = NULL;
if (m_pBusyInfo)
{
delete m_pBusyInfo;
m_pBusyInfo = NULL;
}
}
else
{
Expand Down
1 change: 1 addition & 0 deletions sgdm3/src/gui/cl_args.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ cl_args::cl_args(void)
bTitle[2] = false;
bResult = false;
bCaption = false;
bNoSplash = false;

nrParams = 0;

Expand Down
1 change: 1 addition & 0 deletions sgdm3/src/gui/cl_args.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ class cl_args
bool bTitle[3]; // --title[123]
bool bResult; // --result
bool bCaption; // --caption
bool bNoSplash; // --nosplash

int nrParams; // how many pathnames they gave

Expand Down
2 changes: 2 additions & 0 deletions sgdm3/src/gui/gui_app.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,8 @@ class gui_app : public wxApp

wxString formatArgvForSupportMessage(void);

const cl_args & getCmdLineArgs(void) const { return m_cl_args; }

private:
bool _OnInit_cl_args(void);
void _cleanup(void);
Expand Down
9 changes: 6 additions & 3 deletions sgdm3/src/gui/gui_app__cl_args.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,8 +116,8 @@ void gui_app::OnInitCmdLine(wxCmdLineParser & parser)
{ wxCMD_LINE_SWITCH, _("MERGE"), NULL, NULL, wxCMD_LINE_VAL_NONE },
{ wxCMD_LINE_SWITCH, _("m"), _("merge"), _("Run 'Merge to Center Panel' after loading files."), wxCMD_LINE_VAL_NONE },
{ wxCMD_LINE_SWITCH, _("M"), _("MERGE"), _("Run 'Merge to Center Panel' after loading files."), wxCMD_LINE_VAL_NONE },
{ wxCMD_LINE_SWITCH, _("nosplash"),_("nosplash"), _("No splash screen [DEPRECATED]."), wxCMD_LINE_VAL_NONE },
{ wxCMD_LINE_SWITCH, _("NOSPLASH"),_("NOSPLASH"), _("No splash screen [DEPRECATED]."), wxCMD_LINE_VAL_NONE },
{ wxCMD_LINE_SWITCH, _("nosplash"),_("nosplash"), _("No splash screen."), wxCMD_LINE_VAL_NONE },
{ wxCMD_LINE_SWITCH, _("NOSPLASH"),_("NOSPLASH"), _("No splash screen."), wxCMD_LINE_VAL_NONE },
{ wxCMD_LINE_OPTION, _("result"), NULL, NULL, wxCMD_LINE_VAL_STRING, wxCMD_LINE_NEEDS_SEPARATOR },
{ wxCMD_LINE_OPTION, _("RESULT"), NULL, NULL, wxCMD_LINE_VAL_STRING, wxCMD_LINE_NEEDS_SEPARATOR },
{ wxCMD_LINE_OPTION, _("r"), _("result"), _("Alternate pathname for saving 3-way merge result."), wxCMD_LINE_VAL_STRING, wxCMD_LINE_NEEDS_SEPARATOR },
Expand Down Expand Up @@ -199,6 +199,9 @@ bool gui_app::OnCmdLineParsed(wxCmdLineParser & parser)
m_cl_args.bCaption = ( parser.Found(_T("c"),&m_cl_args.caption) || parser.Found(_T("caption"),&m_cl_args.caption)
|| parser.Found(_T("C"),&m_cl_args.caption) || parser.Found(_T("CAPTION"),&m_cl_args.caption) );

m_cl_args.bNoSplash = ( parser.Found(_T("nosplash"))
|| parser.Found(_T("NOSPLASH")) );

m_cl_args.bDumpDiffs = ( parser.Found(_T("d"),&m_cl_args.diffOutput) || parser.Found(_T("diff"),&m_cl_args.diffOutput)
|| parser.Found(_T("D"),&m_cl_args.diffOutput) || parser.Found(_T("DIFF"),&m_cl_args.diffOutput) );
m_cl_args.bDumpUnified = ( parser.Found(_T("u")) || parser.Found(_T("unified"))
Expand Down Expand Up @@ -543,10 +546,10 @@ wxString gui_app::_makeUsageString(void) const
strUsage += _(" /t1=STRING, /title1=STRING, --title1=STRING\n");
strUsage += _(" /t2=STRING, /title2=STRING, --title2=STRING\n");
strUsage += _(" /t3=STRING, /title3=STRING, --title3=STRING\n");
strUsage += _(" /nosplash, --nosplash\n");

// strUsage += _(" /ro1, --ro1\n");
// strUsage += _(" /ro3, --ro3\n");
// strUsage += _(" /nosplash, --nosplash\n");

strUsage += _("\n");
strUsage += _("Batch Options:\n");
Expand Down