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

*neutrino: remember selected items in flash update sub menues and fileselector

Browse Source 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@2019 e54a6e83-5905-42d5-8d5c-058d10e6a962
This commit is contained in:
thilo
2011-12-28 00:20:11 +00:00
parent 27a44fc37d
commit 5e6399b219
2 changed files with 18 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/gui/update.cpp
View File

@@ -37,6 +37,7 @@
#include <global.h> #include <global.h>
#include <neutrino.h> #include <neutrino.h>
#include <neutrino_menue.h>
#include <driver/encoding.h> #include <driver/encoding.h>
#include <driver/fontrenderer.h> #include <driver/fontrenderer.h>
@@ -158,7 +159,8 @@ bool CFlashUpdate::selectHttpImage(void)
snprintf(current, 200, "%s: %s %s %s %s %s", g_Locale->getText(LOCALE_FLASHUPDATE_CURRENTVERSION_SEP), curInfo.getReleaseCycle(), snprintf(current, 200, "%s: %s %s %s %s %s", g_Locale->getText(LOCALE_FLASHUPDATE_CURRENTVERSION_SEP), curInfo.getReleaseCycle(),
g_Locale->getText(LOCALE_FLASHUPDATE_CURRENTVERSIONDATE), curInfo.getDate(), g_Locale->getText(LOCALE_FLASHUPDATE_CURRENTVERSIONDATE), curInfo.getDate(),
g_Locale->getText(LOCALE_FLASHUPDATE_CURRENTVERSIONTIME), curInfo.getTime()); g_Locale->getText(LOCALE_FLASHUPDATE_CURRENTVERSIONTIME), curInfo.getTime());
CMenuWidget SelectionWidget(LOCALE_FLASHUPDATE_SELECTIMAGE, NEUTRINO_ICON_UPDATE, listWidth);
CMenuWidget SelectionWidget(LOCALE_FLASHUPDATE_SELECTIMAGE, NEUTRINO_ICON_UPDATE, listWidth, MN_WIDGET_ID_IMAGESELECTOR);
SelectionWidget.addItem(GenericMenuSeparator); SelectionWidget.addItem(GenericMenuSeparator);
SelectionWidget.addItem(GenericMenuBack); SelectionWidget.addItem(GenericMenuBack);
@@ -596,8 +598,14 @@ void CFlashExpert::writemtd(const std::string & filename, int mtdNumber)
void CFlashExpert::showMTDSelector(const std::string & actionkey) void CFlashExpert::showMTDSelector(const std::string & actionkey)
{ {
//mtd-selector erzeugen mn_widget_id_t widget_id = NO_WIDGET_ID;
CMenuWidget* mtdselector = new CMenuWidget(LOCALE_SERVICEMENU_UPDATE, NEUTRINO_ICON_UPDATE, width); if (actionkey == "readmtd")
widget_id = MN_WIDGET_ID_MTDREAD_SELECTOR;
else if (actionkey == "writemtd")
widget_id = MN_WIDGET_ID_MTDWRITE_SELECTOR;
//generate mtd-selector
CMenuWidget* mtdselector = new CMenuWidget(LOCALE_SERVICEMENU_UPDATE, NEUTRINO_ICON_UPDATE, width, widget_id);
mtdselector->addIntroItems(LOCALE_FLASHUPDATE_MTDSELECTOR, NONEXISTANT_LOCALE, CMenuWidget::BTN_TYPE_CANCEL); mtdselector->addIntroItems(LOCALE_FLASHUPDATE_MTDSELECTOR, NONEXISTANT_LOCALE, CMenuWidget::BTN_TYPE_CANCEL);
CMTDInfo* mtdInfo =CMTDInfo::getInstance(); CMTDInfo* mtdInfo =CMTDInfo::getInstance();
@@ -612,7 +620,7 @@ void CFlashExpert::showMTDSelector(const std::string & actionkey)
void CFlashExpert::showFileSelector(const std::string & actionkey) void CFlashExpert::showFileSelector(const std::string & actionkey)
{ {
CMenuWidget* fileselector = new CMenuWidget(LOCALE_SERVICEMENU_UPDATE, NEUTRINO_ICON_UPDATE, width); CMenuWidget* fileselector = new CMenuWidget(LOCALE_SERVICEMENU_UPDATE, NEUTRINO_ICON_UPDATE, width, MN_WIDGET_ID_FILESELECTOR);
fileselector->addIntroItems(LOCALE_FLASHUPDATE_FILESELECTOR, NONEXISTANT_LOCALE, CMenuWidget::BTN_TYPE_CANCEL); fileselector->addIntroItems(LOCALE_FLASHUPDATE_FILESELECTOR, NONEXISTANT_LOCALE, CMenuWidget::BTN_TYPE_CANCEL);
struct dirent **namelist; struct dirent **namelist;

6
src/neutrino_menue.h
View File

@@ -143,6 +143,12 @@ enum MN_WIDGET_ID
MN_WIDGET_ID_USERMENU_YELLOW, MN_WIDGET_ID_USERMENU_YELLOW,
MN_WIDGET_ID_USERMENU_BLUE, MN_WIDGET_ID_USERMENU_BLUE,
//update file selector
MN_WIDGET_ID_IMAGESELECTOR,
MN_WIDGET_ID_MTDREAD_SELECTOR,
MN_WIDGET_ID_MTDWRITE_SELECTOR,
MN_WIDGET_ID_FILESELECTOR,
MN_WIDGET_ID_MAX MN_WIDGET_ID_MAX
}; };