mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-29 08:21:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

Disable infoclock when user menu activ

Browse Source
This commit is contained in:
M. Liebmann
2014-01-12 10:42:59 +01:00
parent 341b75ccd9
commit 4c797ec3ec
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/gui/user_menue.cpp
View File

@@ -55,6 +55,7 @@
#include "dboxinfo.h" #include "dboxinfo.h"
#include "cam_menu.h" #include "cam_menu.h"
#include "pluginlist.h" #include "pluginlist.h"
#include "infoclock.h"
#include <global.h> #include <global.h>
#include <neutrino.h> #include <neutrino.h>
@@ -69,6 +70,7 @@
extern CRemoteControl * g_RemoteControl; /* neutrino.cpp */ extern CRemoteControl * g_RemoteControl; /* neutrino.cpp */
// extern CPlugins * g_PluginList; // extern CPlugins * g_PluginList;
extern CCAMMenuHandler * g_CamHandler; extern CCAMMenuHandler * g_CamHandler;
extern CInfoClock * InfoClock;
// //
#include <system/debug.h> #include <system/debug.h>
@@ -85,6 +87,8 @@ CUserMenu::~CUserMenu()
// USERMENU // USERMENU
bool CUserMenu::showUserMenu(int button) bool CUserMenu::showUserMenu(int button)
{ {
InfoClock->enableInfoClock(false);
// set width // set width
width = w_max (40, 10); width = w_max (40, 10);
@@ -427,6 +431,9 @@ bool CUserMenu::showUserMenu(int button)
if (games) delete games; if (games) delete games;
if (scripts) delete scripts; if (scripts) delete scripts;
if (menu) delete menu; if (menu) delete menu;
InfoClock->enableInfoClock(true);
return 0; return 0;
} }

2
src/neutrino.cpp
View File

@@ -2243,11 +2243,9 @@ void CNeutrinoApp::RealRun(CMenuWidget &mainMenu)
// eventlist // eventlist
if (g_settings.personalize[SNeutrinoSettings::P_MAIN_RED_BUTTON] == CPersonalizeGui::PERSONALIZE_ACTIVE_MODE_ENABLED)// EventList Menu - Personalization Check if (g_settings.personalize[SNeutrinoSettings::P_MAIN_RED_BUTTON] == CPersonalizeGui::PERSONALIZE_ACTIVE_MODE_ENABLED)// EventList Menu - Personalization Check
{ {
InfoClock->enableInfoClock(false);
StopSubtitles(); StopSubtitles();
usermenu.showUserMenu(SNeutrinoSettings::BUTTON_RED); usermenu.showUserMenu(SNeutrinoSettings::BUTTON_RED);
StartSubtitles(); StartSubtitles();
InfoClock->enableInfoClock(true);
} }
else else
ShowHintUTF(LOCALE_MESSAGEBOX_INFO, g_Locale->getText(LOCALE_PERSONALIZE_MENUDISABLEDHINT),450, 10); ShowHintUTF(LOCALE_MESSAGEBOX_INFO, g_Locale->getText(LOCALE_PERSONALIZE_MENUDISABLEDHINT),450, 10);