forked from mia/Aegisub
Untested patch: Remove all traces of the update checker from non-Windows builds, since it causes more problems than it solves on those.
Originally committed to SVN as r2277.
This commit is contained in:
parent
c54cf755ac
commit
c3c29518d4
|
@ -111,7 +111,9 @@ DialogOptions::DialogOptions(wxWindow *parent)
|
||||||
|
|
||||||
AddCheckBox(generalPage,genSizer4,_("Show Splash Screen"),_T("Show splash"));
|
AddCheckBox(generalPage,genSizer4,_("Show Splash Screen"),_T("Show splash"));
|
||||||
AddCheckBox(generalPage,genSizer4,_("Show Tip of the Day"),_T("Tips enabled"));
|
AddCheckBox(generalPage,genSizer4,_("Show Tip of the Day"),_T("Tips enabled"));
|
||||||
|
#ifdef __WXMSW__
|
||||||
AddCheckBox(generalPage,genSizer4,_("Auto Check for Updates"),_T("Auto check for updates"));
|
AddCheckBox(generalPage,genSizer4,_("Auto Check for Updates"),_T("Auto check for updates"));
|
||||||
|
#endif
|
||||||
AddCheckBox(generalPage,genSizer4,_("Save config.dat locally"),_T("Local config"));
|
AddCheckBox(generalPage,genSizer4,_("Save config.dat locally"),_T("Local config"));
|
||||||
genSizer4->AddGrowableCol(0,1);
|
genSizer4->AddGrowableCol(0,1);
|
||||||
|
|
||||||
|
|
|
@ -172,6 +172,8 @@ FrameMain::FrameMain (wxArrayString args)
|
||||||
LoadList(args);
|
LoadList(args);
|
||||||
|
|
||||||
// Version checker
|
// Version checker
|
||||||
|
// Fails on non-Windows platforms with a crash
|
||||||
|
#ifdef __WXMSW__
|
||||||
int option = Options.AsInt(_T("Auto check for updates"));
|
int option = Options.AsInt(_T("Auto check for updates"));
|
||||||
if (option == -1) {
|
if (option == -1) {
|
||||||
int result = wxMessageBox(_("Do you want Aegisub to check for updates whenever it starts? You can still do it manually via the Help menu."),_("Check for updates?"),wxYES_NO);
|
int result = wxMessageBox(_("Do you want Aegisub to check for updates whenever it starts? You can still do it manually via the Help menu."),_("Check for updates?"),wxYES_NO);
|
||||||
|
@ -184,6 +186,7 @@ FrameMain::FrameMain (wxArrayString args)
|
||||||
DialogVersionCheck *checker = new DialogVersionCheck (this,true);
|
DialogVersionCheck *checker = new DialogVersionCheck (this,true);
|
||||||
(void)checker;
|
(void)checker;
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
//ShowFullScreen(true,wxFULLSCREEN_NOBORDER | wxFULLSCREEN_NOCAPTION);
|
//ShowFullScreen(true,wxFULLSCREEN_NOBORDER | wxFULLSCREEN_NOCAPTION);
|
||||||
}
|
}
|
||||||
|
@ -504,8 +507,12 @@ void FrameMain::InitMenu() {
|
||||||
AppendBitmapMenuItem(helpMenu,Menu_Help_Forums, _("&Forums..."), _("Visit Aegisub's forums"),wxBITMAP(forums_button));
|
AppendBitmapMenuItem(helpMenu,Menu_Help_Forums, _("&Forums..."), _("Visit Aegisub's forums"),wxBITMAP(forums_button));
|
||||||
AppendBitmapMenuItem(helpMenu,Menu_Help_BugTracker, _("&Bug Tracker..."), _("Visit Aegisub's bug tracker to report bugs and request new features"),wxBITMAP(bugtracker_button));
|
AppendBitmapMenuItem(helpMenu,Menu_Help_BugTracker, _("&Bug Tracker..."), _("Visit Aegisub's bug tracker to report bugs and request new features"),wxBITMAP(bugtracker_button));
|
||||||
AppendBitmapMenuItem (helpMenu,Menu_Help_IRCChannel, _("&IRC Channel..."), _("Visit Aegisub's official IRC channel"), wxBITMAP(irc_button));
|
AppendBitmapMenuItem (helpMenu,Menu_Help_IRCChannel, _("&IRC Channel..."), _("Visit Aegisub's official IRC channel"), wxBITMAP(irc_button));
|
||||||
|
#ifndef __WXMAC__
|
||||||
helpMenu->AppendSeparator();
|
helpMenu->AppendSeparator();
|
||||||
|
#endif
|
||||||
|
#ifdef __WXMSW__
|
||||||
AppendBitmapMenuItem(helpMenu,Menu_Help_Check_Updates, _("&Check for Updates..."), _("Check to see if there is a new version of Aegisub available"),wxBITMAP(blank_button));
|
AppendBitmapMenuItem(helpMenu,Menu_Help_Check_Updates, _("&Check for Updates..."), _("Check to see if there is a new version of Aegisub available"),wxBITMAP(blank_button));
|
||||||
|
#endif
|
||||||
AppendBitmapMenuItem(helpMenu,Menu_Help_About, _("&About..."), _("About Aegisub"),wxBITMAP(about_button));
|
AppendBitmapMenuItem(helpMenu,Menu_Help_About, _("&About..."), _("About Aegisub"),wxBITMAP(about_button));
|
||||||
MenuBar->Append(helpMenu, _("&Help"));
|
MenuBar->Append(helpMenu, _("&Help"));
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue