[Commits] [Tuxbox-GIT] Tuxbox-GIT: apps branch master updated. CVS-Final-32-g5fcb3f4
Tuxbox Sources
Brought to you by:
dbt1
Menu
▾
▴
[Commits] [Tuxbox-GIT] Tuxbox-GIT: apps branch master updated. CVS-Final-32-g5fcb3f4
|
From: Carsten S. <tux...@ne...> - 2013-01-19 22:06:45
|
Project "Tuxbox-GIT: apps":
The branch, master has been updated
via 5fcb3f4083cf817993fab269bbcabcdb30237b99 (commit)
via 9cb312af26ce2cf6b5490a08f5782ef19ef8a8bf (commit)
from f120ec1ab0469b0dc3944adf7c5950c0bbef0832 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 5fcb3f4083cf817993fab269bbcabcdb30237b99
Author: Christian Schuett <Gau...@ho...>
Date: Sat Jan 19 20:25:50 2013 +0100
Neutrino: use ShowLocalizedMessage() if possible
use ShowLocalizedMessage() instead of ShowMsgUTF(), if possible,
to reduce size of neutrino binary
Signed-off-by: Christian Schuett <Gau...@ho...>
diff --git a/tuxbox/neutrino/src/gui/network_setup.cpp b/tuxbox/neutrino/src/gui/network_setup.cpp
index a8605a6..2e5dde3 100644
--- a/tuxbox/neutrino/src/gui/network_setup.cpp
+++ b/tuxbox/neutrino/src/gui/network_setup.cpp
@@ -390,12 +390,12 @@ int CNetworkSetup::saveChangesDialog()
return 1;
// Save the settings after changes, if user wants to!
- int result = ShowMsgUTF(LOCALE_MAINSETTINGS_NETWORK, g_Locale->getText(LOCALE_NETWORKMENU_APPLY_SETTINGS_NOW), CMessageBox::mbrYes,
- CMessageBox::mbYes |
- CMessageBox::mbNo |
- CMessageBox::mbBack,
- NEUTRINO_ICON_QUESTION,
- width);
+ int result = ShowLocalizedMessage(LOCALE_MAINSETTINGS_NETWORK,
+ LOCALE_NETWORKMENU_APPLY_SETTINGS_NOW,
+ CMessageBox::mbrYes,
+ CMessageBox::mbYes | CMessageBox::mbNo | CMessageBox::mbBack,
+ NEUTRINO_ICON_QUESTION,
+ width);
switch(result)
{
@@ -423,11 +423,12 @@ void CNetworkSetup::restoreNetworkSettings(bool show_message)
if (show_message)
{
- result = ShowMsgUTF(LOCALE_MAINSETTINGS_NETWORK, g_Locale->getText(LOCALE_NETWORKMENU_RESET_SETTINGS_NOW), CMessageBox::mbrNo,
- CMessageBox::mbYes |
- CMessageBox::mbNo ,
- NEUTRINO_ICON_QUESTION,
- width);
+ result = ShowLocalizedMessage(LOCALE_MAINSETTINGS_NETWORK,
+ LOCALE_NETWORKMENU_RESET_SETTINGS_NOW,
+ CMessageBox::mbrNo,
+ CMessageBox::mbYes | CMessageBox::mbNo,
+ NEUTRINO_ICON_QUESTION,
+ width);
}
if (result == CMessageBox::mbrYes)
diff --git a/tuxbox/neutrino/src/gui/personalize.cpp b/tuxbox/neutrino/src/gui/personalize.cpp
index f4de8dc..24a98d2 100644
--- a/tuxbox/neutrino/src/gui/personalize.cpp
+++ b/tuxbox/neutrino/src/gui/personalize.cpp
@@ -390,7 +390,11 @@ void CPersonalizeGui::SaveAndExit()
// Save the settings and left menu, if user wants to!
if (haveChangedSettings())
{
- if (ShowMsgUTF(LOCALE_PERSONALIZE_HEAD, g_Locale->getText(LOCALE_PERSONALIZE_APPLY_SETTINGS), CMessageBox::mbrYes, CMessageBox::mbYes | CMessageBox::mbNo, NEUTRINO_ICON_PROTECTING) == CMessageBox::mbrYes)
+ if (ShowLocalizedMessage(LOCALE_PERSONALIZE_HEAD,
+ LOCALE_PERSONALIZE_APPLY_SETTINGS,
+ CMessageBox::mbrYes,
+ CMessageBox::mbYes | CMessageBox::mbNo,
+ NEUTRINO_ICON_PROTECTING) == CMessageBox::mbrYes)
{
CHintBox hintBox(LOCALE_MESSAGEBOX_INFO, g_Locale->getText(LOCALE_MAINSETTINGS_SAVESETTINGSNOW_HINT)); // UTF-8
hintBox.paint();
@@ -407,7 +411,11 @@ void CPersonalizeGui::SaveAndExit()
}
else
{
- if (ShowMsgUTF(LOCALE_PERSONALIZE_HEAD, g_Locale->getText(LOCALE_MESSAGEBOX_DISCARD), CMessageBox::mbrNo, CMessageBox::mbYes | CMessageBox::mbNo, NEUTRINO_ICON_PROTECTING) == CMessageBox::mbrYes)
+ if (ShowLocalizedMessage(LOCALE_PERSONALIZE_HEAD,
+ LOCALE_MESSAGEBOX_DISCARD,
+ CMessageBox::mbrNo,
+ CMessageBox::mbYes | CMessageBox::mbNo,
+ NEUTRINO_ICON_PROTECTING) == CMessageBox::mbrYes)
restoreSettings();
}
}
commit 9cb312af26ce2cf6b5490a08f5782ef19ef8a8bf
Author: Christian Schuett <Gau...@ho...>
Date: Sat Jan 19 20:20:19 2013 +0100
Neutrino: use ShowLocalizedHint() if possible
use ShowLocalizedHint() instead of ShowHintUTF(), if possible,
to reduce size of neutrino binary
Signed-off-by: Christian Schuett <Gau...@ho...>
diff --git a/tuxbox/neutrino/src/gui/epgview.cpp b/tuxbox/neutrino/src/gui/epgview.cpp
index 2ce0600..9c1e4a0 100644
--- a/tuxbox/neutrino/src/gui/epgview.cpp
+++ b/tuxbox/neutrino/src/gui/epgview.cpp
@@ -440,7 +440,7 @@ int CEpgData::show(const t_channel_id channel_id, unsigned long long a_id, time_
if (epgData.title.empty()) /* no epg info found */
{
- ShowHintUTF(LOCALE_MESSAGEBOX_INFO, g_Locale->getText(LOCALE_EPGVIEWER_NOTFOUND)); // UTF-8
+ ShowLocalizedHint(LOCALE_MESSAGEBOX_INFO, LOCALE_EPGVIEWER_NOTFOUND);
return res;
}
diff --git a/tuxbox/neutrino/src/gui/esound.cpp b/tuxbox/neutrino/src/gui/esound.cpp
index bcb77cf..7932e1c 100644
--- a/tuxbox/neutrino/src/gui/esound.cpp
+++ b/tuxbox/neutrino/src/gui/esound.cpp
@@ -285,7 +285,7 @@ int CEsoundGui::show()
bool loop = true;
- ShowHintUTF( LOCALE_MESSAGEBOX_INFO, g_Locale->getText(LOCALE_ESOUND_INFO) );
+ ShowLocalizedHint(LOCALE_MESSAGEBOX_INFO, LOCALE_ESOUND_INFO);
while(loop)
{
if(CNeutrinoApp::getInstance()->getMode() != NeutrinoMessages::mode_audio)
diff --git a/tuxbox/neutrino/src/gui/infoviewer.cpp b/tuxbox/neutrino/src/gui/infoviewer.cpp
index 97a7972..fa752f1 100644
--- a/tuxbox/neutrino/src/gui/infoviewer.cpp
+++ b/tuxbox/neutrino/src/gui/infoviewer.cpp
@@ -1252,7 +1252,7 @@ void CInfoViewer::showInfoIcons()
void CInfoViewer::showFailure()
{
- ShowHintUTF(LOCALE_MESSAGEBOX_ERROR, g_Locale->getText(LOCALE_INFOVIEWER_NOTAVAILABLE), 430); // UTF-8
+ ShowLocalizedHint(LOCALE_MESSAGEBOX_ERROR, LOCALE_INFOVIEWER_NOTAVAILABLE, 430);
}
void CInfoViewer::showMotorMoving(int duration)
diff --git a/tuxbox/neutrino/src/gui/network_setup.cpp b/tuxbox/neutrino/src/gui/network_setup.cpp
index 39228bb..a8605a6 100644
--- a/tuxbox/neutrino/src/gui/network_setup.cpp
+++ b/tuxbox/neutrino/src/gui/network_setup.cpp
@@ -320,10 +320,12 @@ bool CNetworkSetup::checkForIP()
if (!network_dhcp && network_address.empty()) //no ip definied
{
- ShowMsgUTF(LOCALE_MAINSETTINGS_NETWORK, g_Locale->getText(LOCALE_NETWORKMENU_ERROR_NO_ADDRESS), CMessageBox::mbrBack,
- CMessageBox::mbBack,
- NEUTRINO_ICON_ERROR,
- width);
+ ShowMsgUTF(LOCALE_MAINSETTINGS_NETWORK,
+ g_Locale->getText(LOCALE_NETWORKMENU_ERROR_NO_ADDRESS),
+ CMessageBox::mbrBack,
+ CMessageBox::mbBack,
+ NEUTRINO_ICON_ERROR,
+ width);
ret = false;
}
@@ -353,8 +355,11 @@ void CNetworkSetup::saveNetworkSettings(bool show_message)
networkConfig->commitConfig();
if (show_message)
- ShowHintUTF(LOCALE_MESSAGEBOX_INFO, g_Locale->getText(LOCALE_NETWORKMENU_SETUPSAVED), width , g_settings.timing[SNeutrinoSettings::TIMING_INFOBAR], NEUTRINO_ICON_INFO); // UTF-8
-
+ ShowLocalizedHint(LOCALE_MESSAGEBOX_INFO,
+ LOCALE_NETWORKMENU_SETUPSAVED,
+ width,
+ g_settings.timing[SNeutrinoSettings::TIMING_INFOBAR],
+ NEUTRINO_ICON_INFO);
}
//saves settings and apply, reboot not required
diff --git a/tuxbox/neutrino/src/gui/timerlist.cpp b/tuxbox/neutrino/src/gui/timerlist.cpp
index 15fdcbc..3d24384 100644
--- a/tuxbox/neutrino/src/gui/timerlist.cpp
+++ b/tuxbox/neutrino/src/gui/timerlist.cpp
@@ -462,7 +462,7 @@ int CTimerList::show()
// if (timerlist.empty())
// {
//evtl. anzeige dass keine kanalliste....
- /* ShowHintUTF(LOCALE_MESSAGEBOX_INFO, g_Locale->getText(LOCALE_TIMERLIST_EMPTY));
+ /* ShowLocalizedHint(LOCALE_MESSAGEBOX_INFO, LOCALE_TIMERLIST_EMPTY);
return -1;*/
// }
paint();
diff --git a/tuxbox/neutrino/src/gui/update.cpp b/tuxbox/neutrino/src/gui/update.cpp
index e17764a..e76755e 100644
--- a/tuxbox/neutrino/src/gui/update.cpp
+++ b/tuxbox/neutrino/src/gui/update.cpp
@@ -227,7 +227,7 @@ bool CFlashUpdate::selectHttpImage(void)
if (urls.empty())
{
- ShowHintUTF(LOCALE_MESSAGEBOX_ERROR, g_Locale->getText(LOCALE_FLASHUPDATE_GETINFOFILEERROR)); // UTF-8
+ ShowLocalizedHint(LOCALE_MESSAGEBOX_ERROR, LOCALE_FLASHUPDATE_GETINFOFILEERROR);
return false;
}
@@ -357,7 +357,7 @@ bool CFlashUpdate::checkVersion4Update()
{
hide();
printf("[update] flash-file not found: %s\n", filename.c_str());
- ShowHintUTF(LOCALE_MESSAGEBOX_ERROR, g_Locale->getText(LOCALE_FLASHUPDATE_CANTOPENFILE)); // UTF-8
+ ShowLocalizedHint(LOCALE_MESSAGEBOX_ERROR, LOCALE_FLASHUPDATE_CANTOPENFILE);
return false;
}
hide();
@@ -367,7 +367,7 @@ bool CFlashUpdate::checkVersion4Update()
if (!ft.GetVersionInfo(*versionInfo, filename))
{
delete versionInfo;
- ShowHintUTF(LOCALE_MESSAGEBOX_ERROR, g_Locale->getText(LOCALE_FLASHUPDATE_CANTOPENFILE)); // UTF-8
+ ShowLocalizedHint(LOCALE_MESSAGEBOX_ERROR, LOCALE_FLASHUPDATE_CANTOPENFILE);
return false;
}
@@ -379,12 +379,16 @@ bool CFlashUpdate::checkVersion4Update()
if (strcmp(RELEASE_CYCLE, versionInfo->getReleaseCycle()))
{
delete versionInfo;
- ShowHintUTF(LOCALE_MESSAGEBOX_ERROR, g_Locale->getText(LOCALE_FLASHUPDATE_WRONGBASE)); // UTF-8
+ ShowLocalizedHint(LOCALE_MESSAGEBOX_ERROR, LOCALE_FLASHUPDATE_WRONGBASE);
return false;
}
if ((strcmp("Release", versionInfo->getType()) != 0) &&
- (ShowLocalizedMessage(LOCALE_MESSAGEBOX_INFO, LOCALE_FLASHUPDATE_EXPERIMENTALIMAGE, CMessageBox::mbrYes, CMessageBox::mbYes | CMessageBox::mbNo, NEUTRINO_ICON_UPDATE) != CMessageBox::mbrYes))
+ (ShowLocalizedMessage(LOCALE_MESSAGEBOX_INFO,
+ LOCALE_FLASHUPDATE_EXPERIMENTALIMAGE,
+ CMessageBox::mbrYes,
+ CMessageBox::mbYes | CMessageBox::mbNo,
+ NEUTRINO_ICON_UPDATE) != CMessageBox::mbrYes))
{
delete versionInfo;
return false;
@@ -392,7 +396,11 @@ bool CFlashUpdate::checkVersion4Update()
delete versionInfo;
- return (ShowMsgUTF(LOCALE_MESSAGEBOX_INFO, msg, CMessageBox::mbrYes, CMessageBox::mbYes | CMessageBox::mbNo, NEUTRINO_ICON_UPDATE) == CMessageBox::mbrYes); // UTF-8
+ return (ShowMsgUTF(LOCALE_MESSAGEBOX_INFO,
+ msg,
+ CMessageBox::mbrYes,
+ CMessageBox::mbYes | CMessageBox::mbNo,
+ NEUTRINO_ICON_UPDATE) == CMessageBox::mbrYes); // UTF-8
}
int CFlashUpdate::exec(CMenuTarget* parent, const std::string &)
@@ -424,7 +432,7 @@ int CFlashUpdate::exec(CMenuTarget* parent, const std::string &)
if(!getUpdateImage(newVersion))
{
hide();
- ShowHintUTF(LOCALE_MESSAGEBOX_ERROR, g_Locale->getText(LOCALE_FLASHUPDATE_GETUPDATEFILEERROR)); // UTF-8
+ ShowLocalizedHint(LOCALE_MESSAGEBOX_ERROR, LOCALE_FLASHUPDATE_GETUPDATEFILEERROR);
return menu_return::RETURN_REPAINT;
}
filename = std::string(gTmpPath UPDATE_LOCAL_FILENAME);
@@ -446,7 +454,7 @@ int CFlashUpdate::exec(CMenuTarget* parent, const std::string &)
if(!ft.MD5Check(filename, filemd5))
{
hide();
- ShowHintUTF(LOCALE_MESSAGEBOX_ERROR, g_Locale->getText(LOCALE_FLASHUPDATE_MD5SUMERROR)); // UTF-8
+ ShowLocalizedHint(LOCALE_MESSAGEBOX_ERROR, LOCALE_FLASHUPDATE_MD5SUMERROR);
return menu_return::RETURN_REPAINT;
}
}
@@ -487,7 +495,7 @@ int CFlashUpdate::exec(CMenuTarget* parent, const std::string &)
// Otherwise reject
printf("NO update due to erroneous file size %d %d\n", filesize, CMTDInfo::getInstance()->getMTDSize(mtd_of_update_image));
hide();
- ShowHintUTF(LOCALE_MESSAGEBOX_ERROR, g_Locale->getText(LOCALE_FLASHUPDATE_MD5SUMERROR)); // UTF-8
+ ShowLocalizedHint(LOCALE_MESSAGEBOX_ERROR, LOCALE_FLASHUPDATE_MD5SUMERROR);
return menu_return::RETURN_REPAINT;
}
@@ -535,7 +543,7 @@ int CFlashUpdate::exec(CMenuTarget* parent, const std::string &)
CFSMounter::umount();
#endif
- ShowHintUTF(LOCALE_MESSAGEBOX_INFO, g_Locale->getText(LOCALE_FLASHUPDATE_FLASHREADYREBOOT)); // UTF-8
+ ShowLocalizedHint(LOCALE_MESSAGEBOX_INFO, LOCALE_FLASHUPDATE_FLASHREADYREBOOT);
ft.reboot();
sleep(20000);
@@ -615,7 +623,11 @@ void CFlashExpert::writemtd(const std::string & filename, int mtdNumber)
imagefile, mtdtarget);
}
- if (ShowMsgUTF(LOCALE_MESSAGEBOX_INFO, message, CMessageBox::mbrNo, CMessageBox::mbYes | CMessageBox::mbNo, NEUTRINO_ICON_UPDATE) != CMessageBox::mbrYes) // UTF-8
+ if (ShowMsgUTF(LOCALE_MESSAGEBOX_INFO,
+ message,
+ CMessageBox::mbrNo,
+ CMessageBox::mbYes | CMessageBox::mbNo,
+ NEUTRINO_ICON_UPDATE) != CMessageBox::mbrYes) // UTF-8
return;
#ifdef LCD_UPDATE
@@ -670,7 +682,9 @@ void CFlashExpert::writemtd(const std::string & filename, int mtdNumber)
showStatusMessageUTF(g_Locale->getText(LOCALE_FLASHUPDATE_READY)); // UTF-8
sleep(1);
hide();
- ShowHintUTF(LOCALE_MESSAGEBOX_INFO, g_Locale->getText(LOCALE_FLASHUPDATE_FLASHREADYREBOOT), 450, -1, NULL); // UTF-8
+ ShowLocalizedHint(LOCALE_MESSAGEBOX_INFO,
+ LOCALE_FLASHUPDATE_FLASHREADYREBOOT,
+ 450, -1, NULL);
ft.reboot();
}
}
diff --git a/tuxbox/neutrino/src/neutrino.cpp b/tuxbox/neutrino/src/neutrino.cpp
index 218702f..cd50364 100644
--- a/tuxbox/neutrino/src/neutrino.cpp
+++ b/tuxbox/neutrino/src/neutrino.cpp
@@ -2261,14 +2261,14 @@ int CNeutrinoApp::run(int argc, char **argv)
if(loadSettingsErg==1)
{
dprintf(DEBUG_INFO, "config file missing\n");
- ShowHintUTF(LOCALE_MESSAGEBOX_INFO, g_Locale->getText(LOCALE_SETTINGS_NOCONFFILE));
+ ShowLocalizedHint(LOCALE_MESSAGEBOX_INFO, LOCALE_SETTINGS_NOCONFFILE);
configfile.setModifiedFlag(true);
saveSetup();
}
else if(loadSettingsErg==2)
{
dprintf(DEBUG_INFO, "parts of configfile missing\n");
- ShowHintUTF(LOCALE_MESSAGEBOX_INFO, g_Locale->getText(LOCALE_SETTINGS_MISSINGOPTIONSCONFFILE));
+ ShowLocalizedHint(LOCALE_MESSAGEBOX_INFO, LOCALE_SETTINGS_MISSINGOPTIONSCONFFILE);
configfile.setModifiedFlag(true);
saveSetup();
}
@@ -2469,7 +2469,7 @@ void CNeutrinoApp::RealRun(CMenuWidget &menu)
if (g_settings.personalize_redbutton == 0)
{
// EventList Menu - Personalization Check
- ShowHintUTF(LOCALE_MESSAGEBOX_INFO, g_Locale->getText(LOCALE_PERSONALIZE_MENUDISABLEDHINT));
+ ShowLocalizedHint(LOCALE_MESSAGEBOX_INFO, LOCALE_PERSONALIZE_MENUDISABLEDHINT);
} else {
showUserMenu(SNeutrinoSettings::BUTTON_RED); //USERMENU
}
@@ -2484,7 +2484,7 @@ void CNeutrinoApp::RealRun(CMenuWidget &menu)
else if (g_settings.personalize_bluebutton == 0)
{
// Features Menu - Personalization Check
- ShowHintUTF(LOCALE_MESSAGEBOX_INFO, g_Locale->getText(LOCALE_PERSONALIZE_MENUDISABLEDHINT));
+ ShowLocalizedHint(LOCALE_MESSAGEBOX_INFO, LOCALE_PERSONALIZE_MENUDISABLEDHINT);
}
else
showUserMenu(SNeutrinoSettings::BUTTON_BLUE);
-----------------------------------------------------------------------
Summary of changes:
tuxbox/neutrino/src/gui/epgview.cpp | 2 +-
tuxbox/neutrino/src/gui/esound.cpp | 2 +-
tuxbox/neutrino/src/gui/infoviewer.cpp | 2 +-
tuxbox/neutrino/src/gui/network_setup.cpp | 40 ++++++++++++++++------------
tuxbox/neutrino/src/gui/personalize.cpp | 12 +++++++-
tuxbox/neutrino/src/gui/timerlist.cpp | 2 +-
tuxbox/neutrino/src/gui/update.cpp | 38 ++++++++++++++++++--------
tuxbox/neutrino/src/neutrino.cpp | 8 +++---
8 files changed, 67 insertions(+), 39 deletions(-)
--
Tuxbox-GIT: apps
|
