mirror of
https://github.com/tuxbox-neutrino/neutrino.git
synced 2025-08-28 16:01:20 +02:00
*neutrino: revert svn 1411 and removed imageinfo from sofupdate
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@1412 e54a6e83-5905-42d5-8d5c-058d10e6a962
This commit is contained in:
@@ -39,11 +39,10 @@
|
||||
#include <neutrino.h>
|
||||
#include "software_update.h"
|
||||
|
||||
#include "gui/imageinfo.h"
|
||||
#include <gui/filebrowser.h>
|
||||
#include <driver/screen_max.h>
|
||||
#include "gui/filebrowser.h"
|
||||
#include <gui/widget/icons.h>
|
||||
#include <driver/screen_max.h>
|
||||
#include <driver/screen_max.h>
|
||||
#include <system/debug.h>
|
||||
#include <system/flashtool.h>
|
||||
|
||||
@@ -113,7 +112,6 @@ void CSoftwareUpdate::showSoftwareUpdate()
|
||||
|
||||
softUpdate->addItem(GenericMenuSeparatorLine);
|
||||
softUpdate->addItem(new CMenuForwarder(LOCALE_FLASHUPDATE_CHECKUPDATE, true, NULL, new CFlashUpdate(), "", CRCInput::RC_yellow, NEUTRINO_ICON_BUTTON_YELLOW ));
|
||||
softUpdate->addItem(new CMenuForwarder(LOCALE_SERVICEMENU_IMAGEINFO, true, NULL, new CImageInfo(), NULL, CRCInput::RC_blue, NEUTRINO_ICON_BUTTON_BLUE));
|
||||
|
||||
softUpdate->exec (NULL, "");
|
||||
softUpdate->hide ();
|
||||
|
@@ -131,7 +131,7 @@ void CNeutrinoApp::InitMainMenu(CMenuWidget &mainMenu, CMenuWidget &mainSettings
|
||||
|
||||
mainMenu.addItem( new CMenuSeparator(CMenuSeparator::LINE) );
|
||||
// start of infomenu
|
||||
//if (g_settings.show_infomenu == 0)
|
||||
if (g_settings.show_infomenu == 0)
|
||||
mainMenu.addItem(new CMenuForwarder(LOCALE_MESSAGEBOX_INFO, true, NULL, new CInfoMenu(), NULL, CRCInput::RC_help, NEUTRINO_ICON_BUTTON_HELP_SMALL ));
|
||||
|
||||
// end of infomenu
|
||||
@@ -262,8 +262,8 @@ void CNeutrinoApp::InitServiceSettings(CMenuWidget &service)
|
||||
service.addItem(new CMenuForwarder(LOCALE_SERVICEMENU_GETPLUGINS, true, NULL, this, "reloadplugins"));
|
||||
|
||||
// // start infomenu in service
|
||||
// if (g_settings.show_infomenu == 1)
|
||||
// service.addItem(new CMenuForwarder(LOCALE_MESSAGEBOX_INFO, true, NULL, new CInfoMenu(), NULL, CRCInput::RC_help, NEUTRINO_ICON_BUTTON_HELP_SMALL ));
|
||||
if (g_settings.show_infomenu == 1)
|
||||
service.addItem(new CMenuForwarder(LOCALE_MESSAGEBOX_INFO, true, NULL, new CInfoMenu(), NULL, CRCInput::RC_help, NEUTRINO_ICON_BUTTON_HELP_SMALL ));
|
||||
|
||||
// end of infomenu in service
|
||||
//softupdate
|
||||
|
Reference in New Issue
Block a user