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

gui/nfs.cpp: RC_spkr clears selected mount entry, based on patch (c) martii <m4rtii@gmx.de>

Browse Source
This commit is contained in:
[CST] Focus
2013-07-17 11:30:51 +04:00
parent cc115a3615
commit 77f3f86d30
2 changed files with 31 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/gui/nfs.cpp
View File

@@ -103,6 +103,30 @@ int CNFSMountGui::exec( CMenuTarget* parent, const std::string & actionKey )
} }
returnval = menu(); returnval = menu();
} }
else if(actionKey == "rc_spkr")
{
int i = mountMenuWPtr->getSelected() - menu_offset;
if (i > -1 && i < NETWORK_NFS_NR_OF_ENTRIES) {
g_settings.network_nfs_ip[i] = "";
g_settings.network_nfs_dir[i][0] = 0;
g_settings.network_nfs_local_dir[i][0] = 0;
g_settings.network_nfs_automount[i] = 0;
g_settings.network_nfs_type[i] = 0;
g_settings.network_nfs_username[i][0] = 0;
g_settings.network_nfs_password[i][0] = 0;
strcpy(g_settings.network_nfs_mount_options1[i], "ro,soft,udp");
strcpy(g_settings.network_nfs_mount_options2[i], "nolock,rsize=8192,wsize=8192");
strcpy(g_settings.network_nfs_mac[i], "11:22:33:44:55:66");
sprintf(m_entry[i],
nfs_entry_printf_string[(g_settings.network_nfs_type[i] == (int) CFSMounter::NFS) ? 0 : ((g_settings.network_nfs_type[i] == (int) CFSMounter::CIFS) ? 1 : 2)],
g_settings.network_nfs_ip[i].c_str(),
FILESYSTEM_ENCODING_TO_UTF8(g_settings.network_nfs_dir[i]),
FILESYSTEM_ENCODING_TO_UTF8(g_settings.network_nfs_local_dir[i]),
g_Locale->getText(g_settings.network_nfs_automount[i] ? LOCALE_MESSAGEBOX_YES : LOCALE_MESSAGEBOX_NO));
sprintf(ISO_8859_1_entry[i],ZapitTools::UTF8_to_Latin1(m_entry[i]).c_str());
mountMenuEntry[i]->setOption(ISO_8859_1_entry[i]);
}
}
else if(actionKey.substr(0,10)=="mountentry") else if(actionKey.substr(0,10)=="mountentry")
{ {
parent->hide(); parent->hide();
@@ -148,7 +172,9 @@ int CNFSMountGui::exec( CMenuTarget* parent, const std::string & actionKey )
int CNFSMountGui::menu() int CNFSMountGui::menu()
{ {
CMenuWidget mountMenuW(LOCALE_NFS_MOUNT, NEUTRINO_ICON_NETWORK, width); CMenuWidget mountMenuW(LOCALE_NFS_MOUNT, NEUTRINO_ICON_NETWORK, width);
mountMenuWPtr = &mountMenuW;
mountMenuW.addIntroItems(); mountMenuW.addIntroItems();
mountMenuW.addKey(CRCInput::RC_spkr, this, "rc_spkr");
char s2[12]; char s2[12];
for(int i=0 ; i < NETWORK_NFS_NR_OF_ENTRIES ; i++) for(int i=0 ; i < NETWORK_NFS_NR_OF_ENTRIES ; i++)
@@ -156,6 +182,8 @@ int CNFSMountGui::menu()
sprintf(s2,"mountentry%d",i); sprintf(s2,"mountentry%d",i);
sprintf(ISO_8859_1_entry[i],ZapitTools::UTF8_to_Latin1(m_entry[i]).c_str()); sprintf(ISO_8859_1_entry[i],ZapitTools::UTF8_to_Latin1(m_entry[i]).c_str());
mountMenuEntry[i] = new CMenuForwarderNonLocalized("", true, ISO_8859_1_entry[i], this, s2); mountMenuEntry[i] = new CMenuForwarderNonLocalized("", true, ISO_8859_1_entry[i], this, s2);
if (!i)
menu_offset = mountMenuW.getItemsCount();
if (CFSMounter::isMounted(g_settings.network_nfs_local_dir[i])) if (CFSMounter::isMounted(g_settings.network_nfs_local_dir[i]))
{ {

3
src/gui/nfs.h
View File

@@ -48,6 +48,9 @@ class CNFSMountGui : public CMenuTarget
char m_entry[NETWORK_NFS_NR_OF_ENTRIES][200]; char m_entry[NETWORK_NFS_NR_OF_ENTRIES][200];
char ISO_8859_1_entry[NETWORK_NFS_NR_OF_ENTRIES][200]; char ISO_8859_1_entry[NETWORK_NFS_NR_OF_ENTRIES][200];
CMenuWidget *mountMenuWPtr;
int menu_offset;
CMenuForwarderNonLocalized* mountMenuEntry[NETWORK_NFS_NR_OF_ENTRIES]; CMenuForwarderNonLocalized* mountMenuEntry[NETWORK_NFS_NR_OF_ENTRIES];
CFSMounter::FS_Support m_nfs_sup; CFSMounter::FS_Support m_nfs_sup;