mirror of
https://github.com/tuxbox-neutrino/neutrino.git
synced 2025-08-29 08:21:12 +02:00
CMsgBox: rework msgbox classes with Window class implementation
Replacing messagebox, hintbox_ext and some derivated parts with basic class hintbox and derivated class CMsgBox. This should unify window handling and avoids maintain of multiple classes with quasi same purpose and adds more functionality. TODO: fix and optimize details
This commit is contained in:
@@ -45,7 +45,7 @@
|
||||
#include <gui/color.h>
|
||||
#include <gui/movieplayer.h>
|
||||
#include <gui/components/cc.h>
|
||||
#include <gui/widget/messagebox.h>
|
||||
#include <gui/widget/msgbox.h>
|
||||
#include <gui/widget/hintbox.h>
|
||||
#include <gui/infoclock.h>
|
||||
#include <gui/upnpbrowser.h>
|
||||
@@ -254,13 +254,13 @@ bool CUpnpBrowserGui::discoverDevices()
|
||||
catch (std::runtime_error error)
|
||||
{
|
||||
delete scanBox;
|
||||
ShowMsg(LOCALE_MESSAGEBOX_INFO, error.what(), CMessageBox::mbrBack, CMessageBox::mbBack, NEUTRINO_ICON_INFO);
|
||||
DisplayErrorMessage(error.what());
|
||||
return false;
|
||||
}
|
||||
delete scanBox;
|
||||
if (m_devices.empty())
|
||||
{
|
||||
ShowMsg(LOCALE_MESSAGEBOX_INFO, LOCALE_UPNPBROWSER_NOSERVERS, CMessageBox::mbrBack, CMessageBox::mbBack, NEUTRINO_ICON_INFO);
|
||||
DisplayInfoMessage(g_Locale->getText(LOCALE_UPNPBROWSER_NOSERVERS));
|
||||
return false;
|
||||
}
|
||||
return true;
|
||||
@@ -288,7 +288,7 @@ bool CUpnpBrowserGui::getResults(std::string id, unsigned int start, unsigned in
|
||||
}
|
||||
catch (std::runtime_error error)
|
||||
{
|
||||
ShowMsg(LOCALE_MESSAGEBOX_INFO, error.what(), CMessageBox::mbrBack, CMessageBox::mbBack, NEUTRINO_ICON_INFO);
|
||||
DisplayErrorMessage(error.what());
|
||||
return false;
|
||||
}
|
||||
return true;
|
||||
|
Reference in New Issue
Block a user