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

Message Timeouts: add possibilty to change timeout for static messages

Browse Source 
Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Branch: ni/coolstream
Commit: 9607957e07
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-01 (Thu, 01 Dec 2016)



------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2016-12-01 22:04:40 +01:00
committed by Thilo Graf
parent 8dbecf4980
commit 48cc63df9e
5 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/gui/widget/msgbox.cpp
View File

@@ -238,7 +238,7 @@ int CMsgBox::exec()
ccw_footer->getSelectedButtonObject()->setButtonAlias(mb_show_button); ccw_footer->getSelectedButtonObject()->setButtonAlias(mb_show_button);
int selected = ccw_footer->getSelectedButton(); int selected = ccw_footer->getSelectedButton();
if (timeout == NO_TIMEOUT) if (timeout == NO_TIMEOUT)
timeout = 0; timeout = MSGBOX_DEFAULT_TIMEOUT;
uint64_t timeoutEnd = CRCInput::calcTimeoutEnd(timeout); uint64_t timeoutEnd = CRCInput::calcTimeoutEnd(timeout);

1
src/gui/widget/msgbox.h
View File

@@ -38,6 +38,7 @@
#define MSGBOX_MIN_WIDTH HINTBOX_MIN_WIDTH #define MSGBOX_MIN_WIDTH HINTBOX_MIN_WIDTH
#define MSGBOX_MIN_HEIGHT HINTBOX_MIN_HEIGHT + 75 #define MSGBOX_MIN_HEIGHT HINTBOX_MIN_HEIGHT + 75
#define MSGBOX_DEFAULT_TIMEOUT g_settings.timing[SNeutrinoSettings::TIMING_STATIC_MESSAGES]
#define DEFAULT_MSGBOX_TEXT_MODE (CMsgBox::CENTER | CMsgBox::AUTO_WIDTH | CMsgBox::AUTO_HIGH) #define DEFAULT_MSGBOX_TEXT_MODE (CMsgBox::CENTER | CMsgBox::AUTO_WIDTH | CMsgBox::AUTO_HIGH)
//! Sub class of CHintBox. Shows a window as a messagebox //! Sub class of CHintBox. Shows a window as a messagebox

1
src/system/locals.h
View File

@@ -2434,6 +2434,7 @@ typedef enum
LOCALE_TIMING_MENU, LOCALE_TIMING_MENU,
LOCALE_TIMING_NUMERICZAP, LOCALE_TIMING_NUMERICZAP,
LOCALE_TIMING_POPUP_MESSAGES, LOCALE_TIMING_POPUP_MESSAGES,
LOCALE_TIMING_STATIC_MESSAGES,
LOCALE_TIMING_VOLUMEBAR, LOCALE_TIMING_VOLUMEBAR,
LOCALE_TMDB_API_KEY, LOCALE_TMDB_API_KEY,
LOCALE_TMDB_ENABLED, LOCALE_TMDB_ENABLED,

1
src/system/locals_intern.h
View File

@@ -2434,6 +2434,7 @@ const char * locale_real_names[] =
"timing.menu", "timing.menu",
"timing.numericzap", "timing.numericzap",
"timing.popup_messages", "timing.popup_messages",
"timing.static_messages",
"timing.volumebar", "timing.volumebar",
"tmdb.api_key", "tmdb.api_key",
"tmdb.enabled", "tmdb.enabled",

4
src/system/settings.h
View File

@@ -406,6 +406,7 @@ struct SNeutrinoSettings
TIMING_FILEBROWSER = 7, TIMING_FILEBROWSER = 7,
TIMING_NUMERICZAP = 8, TIMING_NUMERICZAP = 8,
TIMING_POPUP_MESSAGES = 9, TIMING_POPUP_MESSAGES = 9,
TIMING_STATIC_MESSAGES = 10,
TIMING_SETTING_COUNT TIMING_SETTING_COUNT
}; };
@@ -875,7 +876,8 @@ const time_settings_struct_t timing_setting[SNeutrinoSettings::TIMING_SETTING_CO
{ 3, LOCALE_TIMING_VOLUMEBAR }, { 3, LOCALE_TIMING_VOLUMEBAR },
{ 60, LOCALE_TIMING_FILEBROWSER }, { 60, LOCALE_TIMING_FILEBROWSER },
{ 3, LOCALE_TIMING_NUMERICZAP }, { 3, LOCALE_TIMING_NUMERICZAP },
{ 6, LOCALE_TIMING_POPUP_MESSAGES} { 6, LOCALE_TIMING_POPUP_MESSAGES},
{ 0, LOCALE_TIMING_STATIC_MESSAGES}
}; };
// lcdd // lcdd