Merge branch 'uncool/dvbsi++'

Conflicts:
	src/driver/Makefile.am
	src/driver/streamts.cpp
	src/gui/audioplayer.cpp
	src/gui/epgview.cpp
	src/gui/infoviewer_bb.cpp
	src/gui/widget/textbox.h

src/system/configure_network.cpp

@@ -6,7 +6,7 @@
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
+ * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -217,11 +217,11 @@ void CNetworkConfig::commitConfig(void)
 
 void CNetworkConfig::startNetwork(void)
 {
-	const char _ifup[]  = "/sbin/ifup";
+	std::string cmd = "/sbin/ifup " + ifname;
 #ifdef DEBUG
-	printf("CNetworkConfig::startNetwork: %s %s\n",_ifup, ifname.c_str());
+	printf("CNetworkConfig::startNetwork: %s\n", cmd.c_str());
 #endif
-	my_system(_ifup, ifname.c_str());
+	my_system("/bin/sh", "-c", cmd.c_str());
 
 	if (!inet_static) {
 		init_vars();
@@ -231,11 +231,11 @@ void CNetworkConfig::startNetwork(void)
 
 void CNetworkConfig::stopNetwork(void)
 {
-	const char _ifdown[] = "/sbin/ifdown";
+	std::string cmd = "/sbin/ifdown " + ifname;
 #ifdef DEBUG
-	printf("CNetworkConfig::stopNetwork: %s %s\n",_ifdown, ifname.c_str());
+	printf("CNetworkConfig::stopNetwork: %s\n", cmd.c_str());
 #endif
-	my_system(_ifdown, ifname.c_str());
+	my_system("/bin/sh", "-c", cmd.c_str());
 
 }
 

src/system/locals.h

@@ -238,6 +238,7 @@ typedef enum
 	LOCALE_CHANNELLIST_FOOT_NEXT,
 	LOCALE_CHANNELLIST_FOOT_OFF,
 	LOCALE_CHANNELLIST_FOOT_SORT_ALPHA,
+	LOCALE_CHANNELLIST_FOOT_SORT_CHNUM,
 	LOCALE_CHANNELLIST_FOOT_SORT_FREQ,
 	LOCALE_CHANNELLIST_FOOT_SORT_SAT,
 	LOCALE_CHANNELLIST_HEAD,
@@ -463,6 +464,7 @@ typedef enum
 	LOCALE_FILESYSTEM_IS_UTF8_OPTION_ISO8859_1,
 	LOCALE_FILESYSTEM_IS_UTF8_OPTION_UTF8,
 	LOCALE_FLASHUPDATE_ACTIONREADFLASH,
+	LOCALE_FLASHUPDATE_APPLY_SETTINGS,
 	LOCALE_FLASHUPDATE_CANTOPENFILE,
 	LOCALE_FLASHUPDATE_CANTOPENMTD,
 	LOCALE_FLASHUPDATE_CHECKUPDATE_INTERNET,
@@ -775,6 +777,7 @@ typedef enum
 	LOCALE_MENU_HINT_EPG_MAX_EVENTS,
 	LOCALE_MENU_HINT_EPG_OLD_EVENTS,
 	LOCALE_MENU_HINT_EPG_SAVE,
+	LOCALE_MENU_HINT_EPG_SAVE_STANDBY,
 	LOCALE_MENU_HINT_EVENT_TEXTCOLOR,
 	LOCALE_MENU_HINT_EVENTLIST_FONTS,
 	LOCALE_MENU_HINT_EXTENDED,
@@ -1126,6 +1129,7 @@ typedef enum
 	LOCALE_MISCSETTINGS_EPG_OLD_EVENTS_HINT1,
 	LOCALE_MISCSETTINGS_EPG_OLD_EVENTS_HINT2,
 	LOCALE_MISCSETTINGS_EPG_SAVE,
+	LOCALE_MISCSETTINGS_EPG_SAVE_STANDBY,
 	LOCALE_MISCSETTINGS_GENERAL,
 	LOCALE_MISCSETTINGS_HEAD,
 	LOCALE_MISCSETTINGS_INFOBAR,
@@ -1345,6 +1349,8 @@ typedef enum
 	LOCALE_NETWORKMENU_ERROR_NO_ADDRESS,
 	LOCALE_NETWORKMENU_GATEWAY,
 	LOCALE_NETWORKMENU_HOSTNAME,
+	LOCALE_NETWORKMENU_HOSTNAME_HINT1,
+	LOCALE_NETWORKMENU_HOSTNAME_HINT2,
 	LOCALE_NETWORKMENU_INACTIVE_NETWORK,
 	LOCALE_NETWORKMENU_IPADDRESS,
 	LOCALE_NETWORKMENU_MOUNT,

src/system/locals_intern.h

@@ -238,6 +238,7 @@ const char * locale_real_names[] =
 	"channellist.foot_next",
 	"channellist.foot_off",
 	"channellist.foot_sort_alpha",
+	"channellist.foot_sort_chnum",
 	"channellist.foot_sort_freq",
 	"channellist.foot_sort_sat",
 	"channellist.head",
@@ -463,6 +464,7 @@ const char * locale_real_names[] =
 	"filesystem.is.utf8.option.iso8859.1",
 	"filesystem.is.utf8.option.utf8",
 	"flashupdate.actionreadflash",
+	"flashupdate.apply_settings",
 	"flashupdate.cantopenfile",
 	"flashupdate.cantopenmtd",
 	"flashupdate.checkupdate_internet",
@@ -775,6 +777,7 @@ const char * locale_real_names[] =
 	"menu.hint_epg_max_events",
 	"menu.hint_epg_old_events",
 	"menu.hint_epg_save",
+	"menu.hint_epg_save_standby",
 	"menu.hint_event_textcolor",
 	"menu.hint_eventlist_fonts",
 	"menu.hint_extended",
@@ -1126,6 +1129,7 @@ const char * locale_real_names[] =
 	"miscsettings.epg_old_events_hint1",
 	"miscsettings.epg_old_events_hint2",
 	"miscsettings.epg_save",
+	"miscsettings.epg_save_standby",
 	"miscsettings.general",
 	"miscsettings.head",
 	"miscsettings.infobar",
@@ -1345,6 +1349,8 @@ const char * locale_real_names[] =
 	"networkmenu.error_no_address",
 	"networkmenu.gateway",
 	"networkmenu.hostname",
+	"networkmenu.hostname_hint1",
+	"networkmenu.hostname_hint2",
 	"networkmenu.inactive_network",
 	"networkmenu.ipaddress",
 	"networkmenu.mount",

src/system/settings.cpp

@@ -35,6 +35,8 @@ const struct personalize_settings_t personalize_settings[SNeutrinoSettings::P_SE
 	
 	//user menu
 	{"personalize_bluebutton"		, CPersonalizeGui::PERSONALIZE_ACTIVE_MODE_ENABLED}, // features
+	{"personalize_yellowbutton"		, CPersonalizeGui::PERSONALIZE_ACTIVE_MODE_ENABLED}, // features
+	{"personalize_greenbutton"		, CPersonalizeGui::PERSONALIZE_ACTIVE_MODE_ENABLED}, // features
 	{"personalize_redbutton"		, CPersonalizeGui::PERSONALIZE_ACTIVE_MODE_ENABLED}, // epg/info
 	
 	//main menu

src/system/settings.h

@@ -128,6 +128,7 @@ struct SNeutrinoSettings
 
 	// EPG
 	int epg_save;
+	int epg_save_standby;
 	std::string epg_cache;
 	std::string epg_old_events;
 	std::string epg_max_events;
@@ -147,9 +148,11 @@ struct SNeutrinoSettings
 		
 		//user menu
 		P_MAIN_BLUE_BUTTON,
- 		P_MAIN_RED_BUTTON,
- 		
- 		//main menu
+		P_MAIN_YELLOW_BUTTON,
+		P_MAIN_GREEN_BUTTON,
+		P_MAIN_RED_BUTTON,
+		
+		//main menu
 		P_MAIN_TV_MODE,
 		P_MAIN_TV_RADIO_MODE, //togglemode
 		P_MAIN_RADIO_MODE,