Commit e809c95a authored by twanvl's avatar twanvl

Disabled "check updates" button on welcome window; also fixed transparency of check updates image

parent a77fc522
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
// ----------------------------------------------------------------------------- : WelcomeWindow // ----------------------------------------------------------------------------- : WelcomeWindow
WelcomeWindow::WelcomeWindow() WelcomeWindow::WelcomeWindow()
: Frame(nullptr, wxID_ANY, _TITLE_("magic set editor"), wxDefaultPosition, wxSize(480,380), wxDEFAULT_DIALOG_STYLE | wxTAB_TRAVERSAL | wxCLIP_CHILDREN ) : Frame(nullptr, wxID_ANY, _TITLE_("magic set editor"), wxDefaultPosition, wxSize(520,380), wxDEFAULT_DIALOG_STYLE | wxTAB_TRAVERSAL | wxCLIP_CHILDREN )
, logo (load_resource_image(_("about"))) , logo (load_resource_image(_("about")))
, logo2(load_resource_image(_("two_beta"))) , logo2(load_resource_image(_("two_beta")))
{ {
...@@ -35,11 +35,15 @@ WelcomeWindow::WelcomeWindow() ...@@ -35,11 +35,15 @@ WelcomeWindow::WelcomeWindow()
#ifdef USE_HOVERBUTTON #ifdef USE_HOVERBUTTON
wxControl* new_set = new HoverButtonExt(this, ID_FILE_NEW, load_resource_image(_("welcome_new")), _BUTTON_("new set"), _HELP_("new set")); wxControl* new_set = new HoverButtonExt(this, ID_FILE_NEW, load_resource_image(_("welcome_new")), _BUTTON_("new set"), _HELP_("new set"));
wxControl* open_set = new HoverButtonExt(this, ID_FILE_OPEN, load_resource_image(_("welcome_open")), _BUTTON_("open set"), _HELP_("open set")); wxControl* open_set = new HoverButtonExt(this, ID_FILE_OPEN, load_resource_image(_("welcome_open")), _BUTTON_("open set"), _HELP_("open set"));
#if !USE_OLD_STYLE_UPDATE_CHECKER
wxControl* updates = new HoverButtonExt(this, ID_FILE_CHECK_UPDATES, load_resource_image(_("welcome_updates")), _BUTTON_("check updates"), _HELP_("check updates")); wxControl* updates = new HoverButtonExt(this, ID_FILE_CHECK_UPDATES, load_resource_image(_("welcome_updates")), _BUTTON_("check updates"), _HELP_("check updates"));
#endif
#else #else
wxControl* new_set = new wxButton(this, ID_FILE_NEW, _BUTTON_("new set")); wxControl* new_set = new wxButton(this, ID_FILE_NEW, _BUTTON_("new set"));
wxControl* open_set = new wxButton(this, ID_FILE_OPEN, _BUTTON_("open set")); wxControl* open_set = new wxButton(this, ID_FILE_OPEN, _BUTTON_("open set"));
#if !USE_OLD_STYLE_UPDATE_CHECKER
wxControl* updates = new wxButton(this, ID_FILE_CHECK_UPDATES, _BUTTON_("check updates")); wxControl* updates = new wxButton(this, ID_FILE_CHECK_UPDATES, _BUTTON_("check updates"));
#endif
#endif #endif
wxControl* open_last = nullptr; wxControl* open_last = nullptr;
if (!settings.recent_sets.empty()) { if (!settings.recent_sets.empty()) {
...@@ -58,7 +62,9 @@ WelcomeWindow::WelcomeWindow() ...@@ -58,7 +62,9 @@ WelcomeWindow::WelcomeWindow()
s2->AddSpacer(100); s2->AddSpacer(100);
s2->Add(new_set, 0, wxALL, 2); s2->Add(new_set, 0, wxALL, 2);
s2->Add(open_set, 0, wxALL, 2); s2->Add(open_set, 0, wxALL, 2);
#if !USE_OLD_STYLE_UPDATE_CHECKER
s2->Add(updates, 0, wxALL, 2); s2->Add(updates, 0, wxALL, 2);
#endif
if (open_last) s2->Add(open_last, 0, wxALL, 2); if (open_last) s2->Add(open_last, 0, wxALL, 2);
s2->AddStretchSpacer(); s2->AddStretchSpacer();
s1->Add(s2); s1->Add(s2);
...@@ -108,6 +114,7 @@ void WelcomeWindow::onOpenLast(wxCommandEvent&) { ...@@ -108,6 +114,7 @@ void WelcomeWindow::onOpenLast(wxCommandEvent&) {
} }
void WelcomeWindow::onCheckUpdates(wxCommandEvent&) { void WelcomeWindow::onCheckUpdates(wxCommandEvent&) {
Show(false); // hide, so the PackagesWindow will not use this window as its parent
(new PackagesWindow(nullptr))->Show(); (new PackagesWindow(nullptr))->Show();
Close(); Close();
} }
......
src/resource/common/welcome_updates.png

1009 Bytes | W: | H:

src/resource/common/welcome_updates.png

1.69 KB | W: | H:

src/resource/common/welcome_updates.png
src/resource/common/welcome_updates.png
src/resource/common/welcome_updates.png
src/resource/common/welcome_updates.png
  • 2-up
  • Swipe
  • Onion skin
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment