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

- ENABLE_GUI_MOUNT: globalize

Browse Source
This commit is contained in:
svenhoefer
2013-05-27 23:56:54 +02:00
parent b335a50ef3
commit ad20474050
4 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/global.h
View File

@@ -100,4 +100,6 @@ NEUTRINO_CPP CLocaleManager *g_Locale;
NEUTRINO_CPP CVideoSettings *g_videoSettings; NEUTRINO_CPP CVideoSettings *g_videoSettings;
NEUTRINO_CPP CRadioText *g_Radiotext; NEUTRINO_CPP CRadioText *g_Radiotext;
// #define ENABLE_GUI_MOUNT
#endif /* __neutrino_global_h__ */ #endif /* __neutrino_global_h__ */

1
src/gui/audioplayer.cpp
View File

@@ -53,7 +53,6 @@
#include <gui/color.h> #include <gui/color.h>
#include <gui/infoviewer.h> #include <gui/infoviewer.h>
#define ENABLE_GUI_MOUNT
#ifdef ENABLE_GUI_MOUNT #ifdef ENABLE_GUI_MOUNT
#include <gui/nfs.h> #include <gui/nfs.h>
#endif #endif

4
src/gui/network_setup.cpp
View File

@@ -337,12 +337,14 @@ int CNetworkSetup::showNetworkSetup()
showNetworkNTPSetup(&ntp); showNetworkNTPSetup(&ntp);
#ifdef ENABLE_GUI_MOUNT
//nfs mount submenu //nfs mount submenu
CMenuWidget networkmounts(LOCALE_MAINSETTINGS_NETWORK, NEUTRINO_ICON_SETTINGS, width, MN_WIDGET_ID_NETWORKSETUP_MOUNTS); CMenuWidget networkmounts(LOCALE_MAINSETTINGS_NETWORK, NEUTRINO_ICON_SETTINGS, width, MN_WIDGET_ID_NETWORKSETUP_MOUNTS);
mf = new CMenuForwarder(LOCALE_NETWORKMENU_MOUNT, true, NULL, &networkmounts, NULL, CRCInput::RC_blue, NEUTRINO_ICON_BUTTON_BLUE); mf = new CMenuForwarder(LOCALE_NETWORKMENU_MOUNT, true, NULL, &networkmounts, NULL, CRCInput::RC_blue, NEUTRINO_ICON_BUTTON_BLUE);
mf->setHint("", LOCALE_MENU_HINT_NET_MOUNT); mf->setHint("", LOCALE_MENU_HINT_NET_MOUNT);
networkSettings->addItem(mf); networkSettings->addItem(mf);
showNetworkNFSMounts(&networkmounts); showNetworkNFSMounts(&networkmounts);
#endif
//proxyserver submenu //proxyserver submenu
CProxySetup proxy(LOCALE_MAINSETTINGS_NETWORK); CProxySetup proxy(LOCALE_MAINSETTINGS_NETWORK);
@@ -393,6 +395,7 @@ void CNetworkSetup::showNetworkNTPSetup(CMenuWidget *menu_ntp)
menu_ntp->addItem( ntp3); menu_ntp->addItem( ntp3);
} }
#ifdef ENABLE_GUI_MOUNT
void CNetworkSetup::showNetworkNFSMounts(CMenuWidget *menu_nfs) void CNetworkSetup::showNetworkNFSMounts(CMenuWidget *menu_nfs)
{ {
menu_nfs->addIntroItems(LOCALE_NETWORKMENU_MOUNT); menu_nfs->addIntroItems(LOCALE_NETWORKMENU_MOUNT);
@@ -403,6 +406,7 @@ void CNetworkSetup::showNetworkNFSMounts(CMenuWidget *menu_nfs)
mf->setHint("", LOCALE_MENU_HINT_NET_NFS_UMOUNT); mf->setHint("", LOCALE_MENU_HINT_NET_NFS_UMOUNT);
menu_nfs->addItem(mf); menu_nfs->addItem(mf);
} }
#endif
typedef struct n_isettings_t typedef struct n_isettings_t
{ {

5
src/gui/pictureviewer.cpp
View File

@@ -45,7 +45,10 @@
#include <driver/rcinput.h> #include <driver/rcinput.h>
#include <gui/audiomute.h> #include <gui/audiomute.h>
#ifdef ENABLE_GUI_MOUNT
#include <gui/nfs.h> #include <gui/nfs.h>
#endif
#include <gui/components/cc_frm.h> #include <gui/components/cc_frm.h>
#include <gui/widget/buttons.h> #include <gui/widget/buttons.h>
@@ -561,6 +564,7 @@ int CPictureViewerGui::show()
if (!playlist.empty()) if (!playlist.empty())
view(selected, true); view(selected, true);
} }
#ifdef ENABLE_GUI_MOUNT
else if (msg==CRCInput::RC_setup) else if (msg==CRCInput::RC_setup)
{ {
if (m_state==MENU) if (m_state==MENU)
@@ -571,6 +575,7 @@ int CPictureViewerGui::show()
CVFD::getInstance()->setMode(CVFD::MODE_MENU_UTF8, g_Locale->getText(LOCALE_PICTUREVIEWER_HEAD)); CVFD::getInstance()->setMode(CVFD::MODE_MENU_UTF8, g_Locale->getText(LOCALE_PICTUREVIEWER_HEAD));
} }
} }
#endif
else if (((msg==CRCInput::RC_plus) || (msg==CRCInput::RC_minus)) && decodeTflag) else if (((msg==CRCInput::RC_plus) || (msg==CRCInput::RC_minus)) && decodeTflag)
{ {
// FIXME: do not accept volume-keys while decoding // FIXME: do not accept volume-keys while decoding