mirror of
https://github.com/cemu-project/Cemu.git
synced 2025-07-02 13:01:18 +12:00
Compare commits
2 commits
13ccf9a160
...
6c392d5a22
Author | SHA1 | Date | |
---|---|---|---|
|
6c392d5a22 | ||
|
9fb3c76b76 |
3 changed files with 5 additions and 9 deletions
|
@ -182,14 +182,14 @@ void DownloadGraphicPacksWindow::UpdateThread()
|
||||||
if (checkGraphicPackDownloadedVersion(assetName, hasVersionFile))
|
if (checkGraphicPackDownloadedVersion(assetName, hasVersionFile))
|
||||||
{
|
{
|
||||||
// already up to date
|
// already up to date
|
||||||
wxMessageBox(_("No updates available."), _("Graphic packs"), wxOK | wxCENTRE, this->GetParent());
|
wxMessageBox(_("No updates available."), _("Graphic packs"), wxOK | wxCENTRE, this);
|
||||||
m_threadState = ThreadFinished;
|
m_threadState = ThreadFinished;
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
if (hasVersionFile)
|
if (hasVersionFile)
|
||||||
{
|
{
|
||||||
// if a version file already exists (and graphic packs are installed) ask the user if he really wants to update
|
// if a version file already exists (and graphic packs are installed) ask the user if he really wants to update
|
||||||
if (wxMessageBox(_("Updated graphic packs are available. Do you want to download and install them?"), _("Graphic packs"), wxYES_NO, this->GetParent()) != wxYES)
|
if (wxMessageBox(_("Updated graphic packs are available. Do you want to download and install them?"), _("Graphic packs"), wxYES_NO, this) != wxYES)
|
||||||
{
|
{
|
||||||
// cancel update
|
// cancel update
|
||||||
m_threadState = ThreadFinished;
|
m_threadState = ThreadFinished;
|
||||||
|
@ -336,7 +336,7 @@ int DownloadGraphicPacksWindow::ShowModal()
|
||||||
{
|
{
|
||||||
if(CafeSystem::IsTitleRunning())
|
if(CafeSystem::IsTitleRunning())
|
||||||
{
|
{
|
||||||
wxMessageBox(_("Graphic packs cannot be updated while a game is running."), _("Graphic packs"), 5, this->GetParent());
|
wxMessageBox(_("Graphic packs cannot be updated while a game is running."), _("Graphic packs"), 5, this);
|
||||||
return wxID_CANCEL;
|
return wxID_CANCEL;
|
||||||
}
|
}
|
||||||
m_thread = std::thread(&DownloadGraphicPacksWindow::UpdateThread, this);
|
m_thread = std::thread(&DownloadGraphicPacksWindow::UpdateThread, this);
|
||||||
|
|
|
@ -5,6 +5,7 @@
|
||||||
#include <wx/statbox.h>
|
#include <wx/statbox.h>
|
||||||
#include <wx/msgdlg.h>
|
#include <wx/msgdlg.h>
|
||||||
#include <wx/radiobox.h>
|
#include <wx/radiobox.h>
|
||||||
|
#include <wx/button.h>
|
||||||
|
|
||||||
#include "config/ActiveSettings.h"
|
#include "config/ActiveSettings.h"
|
||||||
#include "gui/CemuApp.h"
|
#include "gui/CemuApp.h"
|
||||||
|
|
|
@ -174,12 +174,7 @@ void InputPanel::load_controller(const EmulatedControllerPtr& controller)
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
auto button_name = controller->get_mapping_name(mapping);
|
auto button_name = controller->get_mapping_name(mapping);
|
||||||
#if BOOST_OS_WINDOWS
|
text->ChangeValue(button_name);
|
||||||
text->SetLabelText(button_name);
|
|
||||||
#else
|
|
||||||
// SetLabelText doesn't seem to work here for some reason on wxGTK
|
|
||||||
text->ChangeValue(button_name);
|
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue