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

settings_manager_teams: small reworks; unify locales

Browse Source 
* cleanup from unused code
* remove RC_help hotkey from menu (this hotkey breaks global hint-switch)
* fix text alignment in help-box


Origin commit data
------------------
Branch: ni/coolstream
Commit: 8eb3a61829
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-09 (Sat, 09 Sep 2017)

Origin message was:
------------------
- settings_manager_teams: small reworks; unify locales

* cleanup from unused code
* remove RC_help hotkey from menu (this hotkey breaks global hint-switch)
* fix text alignment in help-box


------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2017-09-09 11:03:52 +02:00
parent ab5d217f63
commit 2e5f07ec99
5 changed files with 13 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/gui/settings_manager_teams.cpp
View File

@@ -4,7 +4,7 @@
Copyright (C) 2011 'defans'
Homepage: http://www.bluepeercrew.us/
Copyright (C) 2011 'vanhofen'
Copyright (C) 2017 'vanhofen'
Homepage: http://www.neutrino-images.de/
License: GPL
@@ -37,7 +37,6 @@
#include "gui/widget/hintbox.h"
#include "gui/widget/msgbox.h"
#include "gui/widget/stringinput.h"
#include <driver/screen_max.h>
#include <system/setting_helpers.h>
@@ -51,8 +50,7 @@
#define SYSCALLBACKUP "tar -cz -f"
#define SYSCALLRESTORE "cd /; tar -xz -f"
#define OBJECT_COUNT 6
const char * object[OBJECT_COUNT] =
const char * object[] =
{
CONFIGDIR "/cables.xml",
CONFIGDIR "/satellites.xml",
@@ -61,8 +59,7 @@ const char * object[OBJECT_COUNT] =
"/etc/network/interfaces",
"/etc/wpa_supplicant.conf"
};
//int CSettingsManagerTeams::selected = -1; // remember location in old style
const int OBJECT_COUNT = sizeof(object) / sizeof(object[0]);
CSettingsManagerTeams::CSettingsManagerTeams()
{
@@ -105,14 +102,12 @@ int CSettingsManagerTeams::showMenu()
//printf("[neutrino] CSettingsManagerTeams call %s...\n", __FUNCTION__);
CMenuWidget * teamset = new CMenuWidget(LOCALE_SETTINGS_TEAMS, NEUTRINO_ICON_SETTINGS, width, MN_WIDGET_ID_TEAMS_SETTINGS);
// CMenuWidget * teamset = new CMenuWidget(LOCALE_SETTINGS_TEAMS, NEUTRINO_ICON_SETTINGS, width);
// teamset->setSelected(selected);
teamset->addIntroItems();
CMenuForwarder * mf;
mf = new CMenuForwarder(LOCALE_SETTINGS_TEAMS_HELP, true, NULL, this, "help", CRCInput::RC_help, NEUTRINO_ICON_BUTTON_HELP_SMALL); //ToDo?
mf = new CMenuForwarder(LOCALE_SETTINGS_TEAMS_HELP, true, NULL, this, "help");
mf->setHint("", LOCALE_CROSSTEAM_HINT_SETTINGS_TEAMS_HELP);
teamset->addItem(mf);
@@ -128,7 +123,6 @@ int CSettingsManagerTeams::showMenu()
int res = teamset->exec(NULL, "");
teamset->hide();
// selected = teamset->getSelected();
delete teamset;
return res;
@@ -136,7 +130,8 @@ int CSettingsManagerTeams::showMenu()
void CSettingsManagerTeams::showHelp()
{
ShowMsg(LOCALE_SETTINGS_TEAMS_HELP, g_Locale->getText(LOCALE_SETTINGS_TEAMS_HELP_TEXT), CMsgBox::mbrBack, CMsgBox::mbBack, NEUTRINO_ICON_INFO); // UTF-8
ShowMsg(LOCALE_SETTINGS_TEAMS_HELP, LOCALE_SETTINGS_TEAMS_HELP_TEXT, CMsgBox::mbrBack, CMsgBox::mbBack, NEUTRINO_ICON_INFO,
MSGBOX_MIN_WIDTH, NO_TIMEOUT, false, (CMsgBox::AUTO_WIDTH | CMsgBox::AUTO_HIGH));
return;
}
@@ -204,10 +199,6 @@ void CSettingsManagerTeams::doRestore()
void CSettingsManagerTeams::doReboot()
{
FILE *f = fopen("/tmp/.reboot", "w");
fclose(f);
// we need a public ExitRun() in src/neutrino.h
CNeutrinoApp::getInstance()->ExitRun(true);
unlink("/tmp/.reboot");
CNeutrinoApp::getInstance()->exec(NULL, "reboot");
return;
}