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

move netfs-mounts from ni-menu to network-setup

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: 6c20bc42f8
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-12 (Tue, 12 Sep 2017)

Origin message was:
------------------
- move netfs-mounts from ni-menu to network-setup

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2017-09-12 22:30:35 +02:00
parent 4ceece2a82
commit 552bb58dbd
6 changed files with 23 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
data/locale/deutsch.locale
View File

@@ -2091,12 +2091,14 @@ mpkey.stop Stopp
mpkey.subtitle Untertitel
mpkey.time Zeitanzeige
netfs.active_onoff Eintrag aktiv
netfs.automount_edit auto.net bearbeiten
netfs.automount_head NetFS Einstellungen
netfs.automount_intro Einträge für auto.net
netfs.automount_intro_mounts NetFS-Mounts bearbeiten
netfs.automount_write Einstellungen speichern und auto.net schreiben
netfs.automount_write_info auto.net wurde geschrieben
netfs.dump Dump
netfs.fstab_edit fstab bearbeiten
netfs.fstab_domount NetFS-Verzeichnisse anhängen (mount)
netfs.fstab_domount_info '/etc/init.d/fstab start_netfs' wird ausgeführt
netfs.fstab_doumount NetFS-Verzeichnisse aushängen (umount)

2
data/locale/english.locale
View File

@@ -2090,12 +2090,14 @@ mpkey.stop Stop
mpkey.subtitle Subtitles
mpkey.time Show time
netfs.active_onoff Entry active
netfs.automount_edit Edit auto.net
netfs.automount_head NetFS settings
netfs.automount_intro /etc/auto.net entries
netfs.automount_intro_mounts edit NetFS mounts
netfs.automount_write save settings and write auto.net
netfs.automount_write_info auto.net written
netfs.dump dump
netfs.fstab_edit Edit fstab
netfs.fstab_domount mount NetFS directory
netfs.fstab_domount_info Running '/etc/init.d/fstab start_netfs'
netfs.fstab_doumount unmount NetFS directory

15
src/gui/network_setup.cpp
View File

@@ -46,6 +46,7 @@
#include <gui/widget/msgbox.h>
#include <gui/network_service.h>
#include <gui/netfs_setup.h>
#include <sys/socket.h>
#include <netinet/in.h>
@@ -442,6 +443,20 @@ void CNetworkSetup::showNetworkNFSMounts(CMenuWidget *menu_nfs)
mf = new CMenuDForwarder(LOCALE_NFS_UMOUNT, true, NULL, new CNFSUmountGui(), NULL, CRCInput::RC_green);
mf->setHint("", LOCALE_MENU_HINT_NET_NFS_UMOUNT);
menu_nfs->addItem(mf);
menu_nfs->addItem(GenericMenuSeparatorLine);
CNETFSMountGui *netfsMountGui = new CNETFSMountGui();
const char *used_fstab = netfsMountGui->fstabPath.c_str();
const char *used_autonet = netfsMountGui->autoPath.c_str();
CMenuForwarder *fstab = new CMenuForwarder(LOCALE_NETFS_FSTAB_EDIT, true, used_fstab, netfsMountGui, "menu fstab", CRCInput::RC_yellow);
fstab->setHint(NEUTRINO_ICON_HINT_IMAGELOGO, LOCALE_MENU_HINT_NETFS_MENU_MAIN_FSTAB);
menu_nfs->addItem(fstab);
CMenuForwarder *automount = new CMenuForwarder(LOCALE_NETFS_AUTOMOUNT_EDIT, true, used_autonet, netfsMountGui, "menu automount", CRCInput::RC_blue);
automount->setHint(NEUTRINO_ICON_HINT_IMAGELOGO, LOCALE_MENU_HINT_NETFS_MENU_MAIN_AUTOMOUNT);
menu_nfs->addItem(automount);
}
#endif

11
src/gui/ni_menu.cpp
View File

@@ -36,7 +36,6 @@
#include <mymenu.h>
#include <neutrino_menue.h>
#include <gui/netfs_setup.h>
#include <gui/widget/hintbox.h>
#include <gui/widget/icons.h>
@@ -84,19 +83,9 @@ bool CNIMenu::changeNotify(const neutrino_locale_t OptionName, void * /*data*/)
int CNIMenu::show()
{
int shortcut = 1;
std::ostringstream buf;
CMenuWidget* ni_menu = new CMenuWidget(LOCALE_NIMENU_HEAD, NEUTRINO_ICON_SETTINGS, width, MN_WIDGET_ID_NI_MENU);
ni_menu->addIntroItems();
// NetFS Setup
CNETFSSetup netfs_setup;
mf = new CMenuForwarder(LOCALE_NETFS_MENU_MAIN_HEAD, true, NULL, &netfs_setup, NULL, CRCInput::convertDigitToKey(shortcut++));
mf->setHint(NEUTRINO_ICON_HINT_IMAGELOGO, LOCALE_MENU_HINT_NETFS_MENU_MAIN_HEAD);
ni_menu->addItem(mf);
int res = ni_menu->exec(NULL, "");
ni_menu->hide();

2
src/system/locals.h
View File

@@ -2117,12 +2117,14 @@ typedef enum
LOCALE_MPKEY_SUBTITLE,
LOCALE_MPKEY_TIME,
LOCALE_NETFS_ACTIVE_ONOFF,
LOCALE_NETFS_AUTOMOUNT_EDIT,
LOCALE_NETFS_AUTOMOUNT_HEAD,
LOCALE_NETFS_AUTOMOUNT_INTRO,
LOCALE_NETFS_AUTOMOUNT_INTRO_MOUNTS,
LOCALE_NETFS_AUTOMOUNT_WRITE,
LOCALE_NETFS_AUTOMOUNT_WRITE_INFO,
LOCALE_NETFS_DUMP,
LOCALE_NETFS_FSTAB_EDIT,
LOCALE_NETFS_FSTAB_DOMOUNT,
LOCALE_NETFS_FSTAB_DOMOUNT_INFO,
LOCALE_NETFS_FSTAB_DOUMOUNT,

2
src/system/locals_intern.h
View File

@@ -2117,12 +2117,14 @@ const char * locale_real_names[] =
"mpkey.subtitle",
"mpkey.time",
"netfs.active_onoff",
"netfs.automount_edit",
"netfs.automount_head",
"netfs.automount_intro",
"netfs.automount_intro_mounts",
"netfs.automount_write",
"netfs.automount_write_info",
"netfs.dump",
"netfs.fstab_edit",
"netfs.fstab_domount",
"netfs.fstab_domount_info",
"netfs.fstab_doumount",