From a31f039d018615efe3cb56f71aa4b894e9e9dd54 Mon Sep 17 00:00:00 2001 From: twanvl Date: Sat, 31 May 2008 12:58:31 +0000 Subject: [PATCH] Disabled "check updates" button on welcome window; also fixed transparency of check updates image git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@903 0fc631ac-6414-0410-93d0-97cfa31319b6 --- src/gui/welcome_window.cpp | 9 ++++++++- src/resource/common/welcome_updates.png | Bin 1009 -> 1735 bytes 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/src/gui/welcome_window.cpp b/src/gui/welcome_window.cpp index 95684837..43644630 100644 --- a/src/gui/welcome_window.cpp +++ b/src/gui/welcome_window.cpp @@ -25,7 +25,7 @@ // ----------------------------------------------------------------------------- : 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"))) , logo2(load_resource_image(_("two_beta"))) { @@ -35,11 +35,15 @@ WelcomeWindow::WelcomeWindow() #ifdef USE_HOVERBUTTON 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")); + #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")); + #endif #else wxControl* new_set = new wxButton(this, ID_FILE_NEW, _BUTTON_("new 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")); + #endif #endif wxControl* open_last = nullptr; if (!settings.recent_sets.empty()) { @@ -58,7 +62,9 @@ WelcomeWindow::WelcomeWindow() s2->AddSpacer(100); s2->Add(new_set, 0, wxALL, 2); s2->Add(open_set, 0, wxALL, 2); + #if !USE_OLD_STYLE_UPDATE_CHECKER s2->Add(updates, 0, wxALL, 2); + #endif if (open_last) s2->Add(open_last, 0, wxALL, 2); s2->AddStretchSpacer(); s1->Add(s2); @@ -108,6 +114,7 @@ void WelcomeWindow::onOpenLast(wxCommandEvent&) { } void WelcomeWindow::onCheckUpdates(wxCommandEvent&) { + Show(false); // hide, so the PackagesWindow will not use this window as its parent (new PackagesWindow(nullptr))->Show(); Close(); } diff --git a/src/resource/common/welcome_updates.png b/src/resource/common/welcome_updates.png index ae5e70561f9e824774a298c28d3025030c8ce1a4..43a9489b1ea43131d03e196cb85b63e3a6124634 100644 GIT binary patch literal 1735 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