Merge branch 'dvbsi++' of coolstreamtech.de:cst-public-gui-neutrino into dvbsi++

Origin commit data
------------------
Commit: 34f4050edb
Author: vanhofen <vanhofen@gmx.de>
Date: 2012-08-12 (Sun, 12 Aug 2012)

data/locale/Makefile.am

@@ -26,6 +26,7 @@ locals: sort-locals locals.h locals_intern.h install-locals
 sort-locals: $(top_srcdir)/data/locale/deutsch.locale $(top_srcdir)/data/locale/english.locale
 	cat $(top_srcdir)/data/locale/deutsch.locale | LC_ALL=C sort | uniq > deutsch.locale
 	cat $(top_srcdir)/data/locale/english.locale | LC_ALL=C sort | uniq > english.locale
+	cp -f deutsch.locale english.locale $(top_srcdir)/data/locale
 
 ordercheck: $(top_srcdir)/data/locale/deutsch.locale
 	cut -d' ' -f1 $(top_srcdir)/data/locale/deutsch.locale | LC_ALL=C sort | uniq > /tmp/log

data/locale/deutsch.locale

@@ -436,7 +436,8 @@ filesystem.is.utf8.option.utf8 UTF-8
 flashupdate.actionreadflash lese Flash
 flashupdate.cantopenfile kann Datei nicht öffnen
 flashupdate.cantopenmtd kann das MTD-Device nicht öffnen
-flashupdate.checkupdate Nach Updates suchen
+flashupdate.checkupdate_internet Online nach Updates suchen
+flashupdate.checkupdate_local Lokales Update
 flashupdate.currentversion_sep Installierte Version
 flashupdate.currentversiondate Datum
 flashupdate.currentversiontime Uhrzeit
@@ -1023,6 +1024,11 @@ menu.hint_shutdown_rcdelay Aktiviert den Deep-Standby, wenn der Powerknopf\nlän
 menu.hint_shutdown_real Aktivieren des Soft-Standby-Modus, wenn diese Option\ndeaktiviert ist, geht die Box in den Deep-Standby
 menu.hint_sleeptimer Zeitschaltuhr auf Ihrer Box aktivieren.\nDie Box geht dann in den Standby-Modus
 menu.hint_soft_restart Neustarten von Neutrino-HD ohne zu Rebooten
+menu.hint_softupdate_check Im Internet oder lokal nach verfügbaren Updates suchen
+menu.hint_softupdate_expert Einzelne Partitionen aus dem Flash lesen / in den Flash schreiben
+menu.hint_softupdate_expert_read Einzelne Partitionen (U-Boot, Splash, Kernel, SystemFS) aus dem Flash lesen
+menu.hint_softupdate_expert_write Einzelne Partitionen (Splash, Kernel, SystemFS) in den Flash schreiben
+menu.hint_softupdate_settings Den Updatemodus, das lokale Verzeichnis und die Konfigurationsdatei festlegen
 menu.hint_start_tostandby Aktiviert den Standby-Modus nach dem starten der Box
 menu.hint_streaminfo Aktuelle Sender-Informationen: PIDs, SNR-Verhältnis\nBitrate grafisch
 menu.hint_subchannel_pos Hier können Sie die Anzeigeposition der Untertitel auswählen

data/locale/english.locale

@@ -436,7 +436,8 @@ filesystem.is.utf8.option.utf8 UTF-8
 flashupdate.actionreadflash reading
 flashupdate.cantopenfile can't open file
 flashupdate.cantopenmtd can't open mtd-device
-flashupdate.checkupdate Check for updates
+flashupdate.checkupdate_internet Check for online updates
+flashupdate.checkupdate_local Local update
 flashupdate.currentversion_sep Current version
 flashupdate.currentversiondate Date
 flashupdate.currentversiontime Time
@@ -1023,6 +1024,11 @@ menu.hint_shutdown_rcdelay Enable deep-standby, if power button\npressed more th
 menu.hint_shutdown_real Enable soft-standby mode\nIf disabled, power button put box to deep-standby
 menu.hint_sleeptimer Set timer to put your box\nin sleep mode
 menu.hint_soft_restart Restart Neutrino-HD without reboot
+menu.hint_softupdate_check In the Internet or local check for available updates
+menu.hint_softupdate_expert Separate partitions from the flash read / write to the flash
+menu.hint_softupdate_expert_read Separate partitions (U-Boot, Splash, Kernel, SystemFS) from the flash read
+menu.hint_softupdate_expert_write Separate partitions (Splash, Kernel, SystemFS) write to the flash
+menu.hint_softupdate_settings Update mode, the local directory and the configuration file to set
 menu.hint_start_tostandby Enter standby mode after boot
 menu.hint_streaminfo Current channel info: pids, signal and noise ratio\nBitrate graphs
 menu.hint_subchannel_pos Select subchannels menu position

src/gui/scan_setup.cpp

@@ -958,6 +958,7 @@ void CScanSetup::addScanMenuCable(CMenuWidget *menu)
 	//----------------------------------------------------------------------
 	CMenuOptionStringChooser * select = new CMenuOptionStringChooser(satprov_locale, scansettings.satNameNoDiseqc, true, this, CRCInput::RC_red, NEUTRINO_ICON_BUTTON_RED, true);
 	fillCableSelect(select);
+	select->setHint("", LOCALE_MENU_HINT_SCAN_CABLE);
 	menu->addItem(select);
 
 	mf = new CMenuForwarder(LOCALE_SATSETUP_CABLE_NID, true, nid->getValue(), nid);

src/gui/update_menue.cpp

@@ -51,11 +51,13 @@ CSoftwareUpdate::CSoftwareUpdate()
 {
 	width = w_max (40, 10);
 	fe = new CFlashExpert();
+	update_item = NULL;
 }
 
 CSoftwareUpdate::~CSoftwareUpdate()
 {
 	delete fe;
+	delete update_item;
 }
 
 int CSoftwareUpdate::exec(CMenuTarget* parent, const std::string &/*actionKey*/)
@@ -73,25 +75,33 @@ int CSoftwareUpdate::exec(CMenuTarget* parent, const std::string &/*actionKey*/)
 int CSoftwareUpdate::showSoftwareUpdate()
 /* shows the menue and options for software update */
 {
+	CMenuForwarder * mf;
 	CMenuWidget softUpdate(LOCALE_MAINMENU_SERVICE, NEUTRINO_ICON_UPDATE, width, MN_WIDGET_ID_SOFTWAREUPDATE);
 	
 	softUpdate.addIntroItems(LOCALE_SERVICEMENU_UPDATE);
 	
 	//flashing
 	CFlashUpdate flash;
-	softUpdate.addItem(new CMenuForwarder(LOCALE_FLASHUPDATE_CHECKUPDATE, true, NULL, &flash, NULL, CRCInput::RC_red, NEUTRINO_ICON_BUTTON_RED));
+	neutrino_locale_t up_text = (g_settings.softupdate_mode == 0) ? LOCALE_FLASHUPDATE_CHECKUPDATE_LOCAL : LOCALE_FLASHUPDATE_CHECKUPDATE_INTERNET;
-	
+	update_item = new CMenuForwarder(up_text, true, NULL, &flash, NULL, CRCInput::RC_red, NEUTRINO_ICON_BUTTON_RED);
+	update_item->setHint("", LOCALE_MENU_HINT_SOFTUPDATE_CHECK);
+	softUpdate.addItem(update_item);
+
+	//settings
+	CUpdateSettings update_settings(update_item);
+	mf = new CMenuForwarder(LOCALE_FLASHUPDATE_SETTINGS, true, NULL, &update_settings, NULL, CRCInput::RC_green, NEUTRINO_ICON_BUTTON_GREEN);
+	mf->setHint("", LOCALE_MENU_HINT_SOFTUPDATE_SETTINGS);
+	softUpdate.addItem(mf);
+
+	softUpdate.addItem(GenericMenuSeparatorLine);
+
 	//expert-functions
 	CMenuWidget mtdexpert(LOCALE_FLASHUPDATE_EXPERTFUNCTIONS, NEUTRINO_ICON_UPDATE, width, MN_WIDGET_ID_MTDEXPERT);
 	showSoftwareUpdateExpert(&mtdexpert); 
-	softUpdate.addItem(new CMenuForwarder(LOCALE_FLASHUPDATE_EXPERTFUNCTIONS, true, NULL, &mtdexpert, NULL, CRCInput::RC_green, NEUTRINO_ICON_BUTTON_GREEN));
+	mf = new CMenuForwarder(LOCALE_FLASHUPDATE_EXPERTFUNCTIONS, true, NULL, &mtdexpert, NULL, CRCInput::RC_yellow, NEUTRINO_ICON_BUTTON_YELLOW);
-	
+	mf->setHint("", LOCALE_MENU_HINT_SOFTUPDATE_EXPERT);
-	softUpdate.addItem(GenericMenuSeparatorLine);
+	softUpdate.addItem(mf);
-	
+
-	//settings
-	CUpdateSettings update_settings;
-	softUpdate.addItem(new CMenuForwarder(LOCALE_FLASHUPDATE_SETTINGS, true, NULL, &update_settings, NULL, CRCInput::RC_yellow, NEUTRINO_ICON_BUTTON_YELLOW ));
-	
 	int res = softUpdate.exec (NULL, "");
 	return res;
 }
@@ -99,8 +109,13 @@ int CSoftwareUpdate::showSoftwareUpdate()
 /* shows experts-functions to read/write to the mtd */
 void CSoftwareUpdate::showSoftwareUpdateExpert(CMenuWidget *w_mtd_expert)
 {
+	CMenuForwarder * mf;
 	w_mtd_expert->addIntroItems();
 		
-	w_mtd_expert->addItem(new CMenuForwarder(LOCALE_FLASHUPDATE_READFLASHMTD , true, NULL, fe, "readflashmtd" , CRCInput::RC_red  , NEUTRINO_ICON_BUTTON_RED));
+	mf = new CMenuForwarder(LOCALE_FLASHUPDATE_READFLASHMTD , true, NULL, fe, "readflashmtd" , CRCInput::RC_red  , NEUTRINO_ICON_BUTTON_RED);
-	w_mtd_expert->addItem(new CMenuForwarder(LOCALE_FLASHUPDATE_WRITEFLASHMTD, true, NULL, fe, "writeflashmtd", CRCInput::RC_green, NEUTRINO_ICON_BUTTON_GREEN));
+	mf->setHint("", LOCALE_MENU_HINT_SOFTUPDATE_EXPERT_READ);
+	w_mtd_expert->addItem(mf);
+	mf = new CMenuForwarder(LOCALE_FLASHUPDATE_WRITEFLASHMTD, true, NULL, fe, "writeflashmtd", CRCInput::RC_green, NEUTRINO_ICON_BUTTON_GREEN);
+	mf->setHint("", LOCALE_MENU_HINT_SOFTUPDATE_EXPERT_WRITE);
+	w_mtd_expert->addItem(mf);
 }

src/gui/update_menue.h

@@ -40,6 +40,7 @@ class CSoftwareUpdate : public CMenuTarget
 {
 	private:
 		int width;
+		CMenuForwarder * update_item;
 		int showSoftwareUpdate();
 		void showSoftwareUpdateExpert(CMenuWidget *w_mtd_expert);
 		

src/gui/update_settings.cpp

@@ -43,9 +43,10 @@
 #include <system/debug.h>
 
 
-CUpdateSettings::CUpdateSettings()
+CUpdateSettings::CUpdateSettings(CMenuForwarder * update_item)
 {
 	width = w_max (40, 10);
+	updateItem = update_item;
 #ifdef USE_SMS_INPUT
 	input_url_file = new CStringInputSMS(LOCALE_FLASHUPDATE_URL_FILE, g_settings.softupdate_url_file, 30, NONEXISTANT_LOCALE, NONEXISTANT_LOCALE, "abcdefghijklmnopqrstuvwxyz0123456789!""$%&/()=?-. ");
 #endif
@@ -113,7 +114,7 @@ int CUpdateSettings::initMenu()
 #endif
 	CMenuForwarder * fw_update_dir 	= new CMenuForwarder(LOCALE_EXTRA_UPDATE_DIR, !g_settings.softupdate_mode, g_settings.update_dir , this, "update_dir", CRCInput::RC_red, NEUTRINO_ICON_BUTTON_RED);
 	
-	CUrlConfigSetupNotifier url_setup_notifier(fw_url, fw_update_dir);
+	CUrlConfigSetupNotifier url_setup_notifier(fw_url, fw_update_dir, updateItem);
 	
 	CMenuOptionChooser *oj_mode 	= new CMenuOptionChooser(LOCALE_FLASHUPDATE_UPDATEMODE, &g_settings.softupdate_mode, FLASHUPDATE_UPDATEMODE_OPTIONS, FLASHUPDATE_UPDATEMODE_OPTION_COUNT, true, &url_setup_notifier);
 	
@@ -128,10 +129,11 @@ int CUpdateSettings::initMenu()
 }
 
 
-CUrlConfigSetupNotifier::CUrlConfigSetupNotifier( CMenuItem* i1, CMenuItem* i2)
+CUrlConfigSetupNotifier::CUrlConfigSetupNotifier( CMenuItem* i1, CMenuItem* i2, CMenuForwarder * f1)
 {
 	toDisable[0] = i1;
 	toDisable[1] = i2;
+	updateItem   = f1;
 }
 
 bool CUrlConfigSetupNotifier::changeNotify(const neutrino_locale_t, void *)
@@ -139,9 +141,11 @@ bool CUrlConfigSetupNotifier::changeNotify(const neutrino_locale_t, void *)
 	if (g_settings.softupdate_mode){
 		toDisable[0]->setActive(true);
 		toDisable[1]->setActive(false);
+		updateItem->setTextLocale(LOCALE_FLASHUPDATE_CHECKUPDATE_INTERNET);
 	}else{
 		toDisable[0]->setActive(false);
 		toDisable[1]->setActive(true);
+		updateItem->setTextLocale(LOCALE_FLASHUPDATE_CHECKUPDATE_LOCAL);
 	}
 	return false;
 }

src/gui/update_settings.h

@@ -49,8 +49,9 @@ class CUrlConfigSetupNotifier : public CChangeObserver
 {
 	private:
 		CMenuItem* toDisable[2];
+		CMenuForwarder * updateItem;
 	public:
-		CUrlConfigSetupNotifier( CMenuItem*, CMenuItem*);
+		CUrlConfigSetupNotifier( CMenuItem*, CMenuItem*, CMenuForwarder *);
 		bool changeNotify(const neutrino_locale_t = NONEXISTANT_LOCALE, void *data = NULL);
 };
 
@@ -58,6 +59,7 @@ class CUpdateSettings : public CMenuTarget
 {
 	private:
 		int width;
+		CMenuForwarder * updateItem;
 		int initMenu();
 		
 		CFlashExpert *fe;
@@ -66,7 +68,7 @@ class CUpdateSettings : public CMenuTarget
 #endif
 	
 	public:	
-		CUpdateSettings();
+		CUpdateSettings(CMenuForwarder * update_item);
 		~CUpdateSettings();
 		int exec(CMenuTarget* parent, const std::string & actionKey);
 };

src/system/locals.h

@@ -463,7 +463,8 @@ typedef enum
 	LOCALE_FLASHUPDATE_ACTIONREADFLASH,
 	LOCALE_FLASHUPDATE_CANTOPENFILE,
 	LOCALE_FLASHUPDATE_CANTOPENMTD,
-	LOCALE_FLASHUPDATE_CHECKUPDATE,
+	LOCALE_FLASHUPDATE_CHECKUPDATE_INTERNET,
+	LOCALE_FLASHUPDATE_CHECKUPDATE_LOCAL,
 	LOCALE_FLASHUPDATE_CURRENTVERSION_SEP,
 	LOCALE_FLASHUPDATE_CURRENTVERSIONDATE,
 	LOCALE_FLASHUPDATE_CURRENTVERSIONTIME,
@@ -1050,6 +1051,11 @@ typedef enum
 	LOCALE_MENU_HINT_SHUTDOWN_REAL,
 	LOCALE_MENU_HINT_SLEEPTIMER,
 	LOCALE_MENU_HINT_SOFT_RESTART,
+	LOCALE_MENU_HINT_SOFTUPDATE_CHECK,
+	LOCALE_MENU_HINT_SOFTUPDATE_EXPERT,
+	LOCALE_MENU_HINT_SOFTUPDATE_EXPERT_READ,
+	LOCALE_MENU_HINT_SOFTUPDATE_EXPERT_WRITE,
+	LOCALE_MENU_HINT_SOFTUPDATE_SETTINGS,
 	LOCALE_MENU_HINT_START_TOSTANDBY,
 	LOCALE_MENU_HINT_STREAMINFO,
 	LOCALE_MENU_HINT_SUBCHANNEL_POS,

src/system/locals_intern.h

@@ -463,7 +463,8 @@ const char * locale_real_names[] =
 	"flashupdate.actionreadflash",
 	"flashupdate.cantopenfile",
 	"flashupdate.cantopenmtd",
-	"flashupdate.checkupdate",
+	"flashupdate.checkupdate_internet",
+	"flashupdate.checkupdate_local",
 	"flashupdate.currentversion_sep",
 	"flashupdate.currentversiondate",
 	"flashupdate.currentversiontime",
@@ -1050,6 +1051,11 @@ const char * locale_real_names[] =
 	"menu.hint_shutdown_real",
 	"menu.hint_sleeptimer",
 	"menu.hint_soft_restart",
+	"menu.hint_softupdate_check",
+	"menu.hint_softupdate_expert",
+	"menu.hint_softupdate_expert_read",
+	"menu.hint_softupdate_expert_write",
+	"menu.hint_softupdate_settings",
 	"menu.hint_start_tostandby",
 	"menu.hint_streaminfo",
 	"menu.hint_subchannel_pos",