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

drop ni-menu

Browse Source 
Origin commit data
------------------
Commit: 7379101512
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-12 (Tue, 12 Sep 2017)

Origin message was:
------------------
- drop ni-menu
This commit is contained in:
vanhofen
2017-09-12 22:30:35 +02:00
parent 2de02e1b3f
commit 8ba3308c23
11 changed files with 0 additions and 168 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
data/locale/deutsch.locale
View File

@@ -1448,7 +1448,6 @@ menu.hint_network IP-Adresse, Gateway, DNS, Zeit-Sync, Netzwerk-Freigaben, Diens
menu.hint_new_zap_mode Aktiviert Quickzap in der Kanalliste. Nach Betätigen der Mute-Taste wird mit den Hoch/Runter-Tasten direkt umgeschalten
menu.hint_next Weiter zum nächsten Menü.\nDie Taste 'Menü' schließt alle Menüs
menu.hint_next_brief Weiter zum nächsten Menü
menu.hint_nimenu Konfiguration von Softcams, Plugins, Tools usw.
menu.hint_numeric_adjust Bei numerischer Programmwahl die Kanalliste am neu gewählten Programm ausrichten
menu.hint_opkg Software-Pakete installieren oder vorhandene aktualisieren
menu.hint_opkg_feed_addresses_edit Bearbeiten von Feed-Adressen
@@ -2172,8 +2171,6 @@ nfs.umounterror Umount-Fehler
nfs.username Benutzername
nfsmenu.head NFS/CIFS/FTPFS Einstellungen
ni NI \o/
nimenu.head NI-Einstellungen
nimenu.head_special Extra-Einstellungen
nvod.percentage (%d%% vorbei)
nvod.starting (Beginn in %d min)
nvodselector.directormode Bildregie-Modus

3
data/locale/english.locale
View File

@@ -1447,7 +1447,6 @@ menu.hint_network IP address, gateway, DNS, Time sync\nNetwork shares and servic
menu.hint_new_zap_mode Allow channel switch while browsing\n(toggle mode with 'mute' in channel list)
menu.hint_next Continue to next menu\nPress menu key to close all menus
menu.hint_next_brief Continue to next menu
menu.hint_nimenu Configuration of softcams, plugins, tools etc.
menu.hint_numeric_adjust Adjust channel list mode on numeric zap
menu.hint_opkg Install or update software packages
menu.hint_opkg_feed_addresses_edit Edit feed addresses
@@ -2171,8 +2170,6 @@ nfs.umounterror error umounting volume
nfs.username username
nfsmenu.head NFS/CIFS/FTPFS settings
ni NI \o/
nimenu.head NI-Settings
nimenu.head_special Special settings
nvod.percentage (%d%% over)
nvod.starting (starting in %d min)
nvodselector.directormode Director mode

1
src/gui/Makefile.am
View File

@@ -77,7 +77,6 @@ libneutrino_gui_a_SOURCES = \
network_service.cpp \
network_setup.cpp \
nfs.cpp \
ni_menu.cpp \
opkg_manager.cpp \
osd_helpers.cpp \
osd_progressbar_setup.cpp \

95
src/gui/ni_menu.cpp
View File

@@ -1,95 +0,0 @@
/*
ni_menu
(C) 2009-2016 NG-Team
(C) 2016 NI-Team
License: GPL
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
#include <iostream>
#include <fstream>
#include <sstream>
#include <signal.h>
#include <unistd.h>
#include <global.h>
#include <neutrino.h>
#include <mymenu.h>
#include <neutrino_menue.h>
#include <gui/widget/hintbox.h>
#include <gui/widget/icons.h>
#include <gui/ni_menu.h>
#include <system/helpers.h>
#include <system/setting_helpers.h>
#include <driver/screen_max.h>
CNIMenu::CNIMenu()
{
width = 40;
}
CNIMenu::~CNIMenu()
{
}
int CNIMenu::exec(CMenuTarget* parent, const std::string &actionkey)
{
printf("CNIMenu::exec: actionkey %s\n", actionkey.c_str());
int res = menu_return::RETURN_REPAINT;
if (parent)
parent->hide();
res = show();
return res;
}
#if 0
bool CNIMenu::changeNotify(const neutrino_locale_t OptionName, void * /*data*/)
{
#if 0
int val = 0;
if (data)
val = (*(int *)data);
#endif
return false;
}
#endif
int CNIMenu::show()
{
CMenuWidget* ni_menu = new CMenuWidget(LOCALE_NIMENU_HEAD, NEUTRINO_ICON_SETTINGS, width, MN_WIDGET_ID_NI_MENU);
ni_menu->addIntroItems();
int res = ni_menu->exec(NULL, "");
ni_menu->hide();
delete ni_menu;
return res;
}

48
src/gui/ni_menu.h
View File

@@ -1,48 +0,0 @@
/*
ni_menu
(C) 2009-2016 NG-Team
(C) 2016 NI-Team
License: GPL
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
#ifndef __ni_menu__
#define __ni_menu__
#include <gui/widget/menue.h>
class CNIMenu : public CMenuTarget, CChangeObserver
{
private:
CMenuOptionChooser *mc;
CMenuForwarder * mf;
int width;
int show();
public:
CNIMenu();
~CNIMenu();
int exec(CMenuTarget* parent, const std::string &actionkey);
#if 0
virtual bool changeNotify(const neutrino_locale_t OptionName, void * /*data*/);
#endif
};
#endif

9
src/neutrino_menue.cpp
View File

@@ -83,8 +83,6 @@
#include "driver/record.h"
#include "driver/display.h"
#include "gui/ni_menu.h" //NI
extern CPlugins * g_Plugins;
extern CRemoteControl * g_RemoteControl;
extern CCAMMenuHandler * g_CamHandler;
@@ -220,13 +218,6 @@ void CNeutrinoApp::InitMenuMain()
personalize.addItem(MENU_MAIN, mf, &g_settings.personalize[SNeutrinoSettings::P_MAIN_LUA]);
}
//NI-Menu section***********************************************************************************************
personalize.addSeparator(MENU_MAIN);
CMenuForwarder *ni_menu = new CMenuForwarder(LOCALE_NIMENU_HEAD, true, NULL, new CNIMenu(), NULL, CRCInput::RC_0, NEUTRINO_ICON_BUTTON_0);
ni_menu->setHint(NEUTRINO_ICON_HINT_IMAGELOGO, LOCALE_MENU_HINT_NIMENU);
personalize.addItem(MENU_MAIN, ni_menu, &g_settings.personalize[SNeutrinoSettings::P_MAIN_NI_MENU], false, CPersonalizeGui::PERSONALIZE_SHOW_AS_ACCESS_OPTION);
//separator
personalize.addSeparator(MENU_MAIN);

1
src/neutrino_menue.h
View File

@@ -164,7 +164,6 @@ enum MN_WIDGET_ID
MN_WIDGET_ID_USERMENU_BLUE,
//NI
MN_WIDGET_ID_NI_MENU,
MN_WIDGET_ID_NETFS_MAIN,
MN_WIDGET_ID_NETFS_AUTOMOUNT,
MN_WIDGET_ID_NETFS_FSTAB,

3
src/system/locals.h
View File

@@ -1474,7 +1474,6 @@ typedef enum
LOCALE_MENU_HINT_NEW_ZAP_MODE,
LOCALE_MENU_HINT_NEXT,
LOCALE_MENU_HINT_NEXT_BRIEF,
LOCALE_MENU_HINT_NIMENU,
LOCALE_MENU_HINT_NUMERIC_ADJUST,
LOCALE_MENU_HINT_OPKG,
LOCALE_MENU_HINT_OPKG_FEED_ADDRESSES_EDIT,
@@ -2198,8 +2197,6 @@ typedef enum
LOCALE_NFS_USERNAME,
LOCALE_NFSMENU_HEAD,
LOCALE_NI,
LOCALE_NIMENU_HEAD,
LOCALE_NIMENU_HEAD_SPECIAL,
LOCALE_NVOD_PERCENTAGE,
LOCALE_NVOD_STARTING,
LOCALE_NVODSELECTOR_DIRECTORMODE,

3
src/system/locals_intern.h
View File

@@ -1474,7 +1474,6 @@ const char * locale_real_names[] =
"menu.hint_new_zap_mode",
"menu.hint_next",
"menu.hint_next_brief",
"menu.hint_nimenu",
"menu.hint_numeric_adjust",
"menu.hint_opkg",
"menu.hint_opkg_feed_addresses_edit",
@@ -2198,8 +2197,6 @@ const char * locale_real_names[] =
"nfs.username",
"nfsmenu.head",
"ni",
"nimenu.head",
"nimenu.head_special",
"nvod.percentage",
"nvod.starting",
"nvodselector.directormode",

1
src/system/settings.cpp
View File

@@ -50,7 +50,6 @@ const struct personalize_settings_t personalize_settings[SNeutrinoSettings::P_SE
{"personalize_tools" , CPersonalizeGui::PERSONALIZE_MODE_NOTVISIBLE},
{"personalize_scripts" , CPersonalizeGui::PERSONALIZE_MODE_NOTVISIBLE},
{"personalize_lua" , CPersonalizeGui::PERSONALIZE_MODE_NOTVISIBLE},
{"personalize_ni_menu" , CPersonalizeGui::PERSONALIZE_PROTECT_MODE_NOT_PROTECTED}, //NI
{"personalize_settings" , CPersonalizeGui::PERSONALIZE_PROTECT_MODE_NOT_PROTECTED},
{"personalize_service" , CPersonalizeGui::PERSONALIZE_PROTECT_MODE_NOT_PROTECTED},
{"personalize_sleeptimer" , CPersonalizeGui::PERSONALIZE_MODE_VISIBLE},

1
src/system/settings.h
View File

@@ -348,7 +348,6 @@ struct SNeutrinoSettings
P_MAIN_TOOLS,
P_MAIN_SCRIPTS,
P_MAIN_LUA,
P_MAIN_NI_MENU, //NI
P_MAIN_SETTINGS,
P_MAIN_SERVICE,
P_MAIN_SLEEPTIMER,