gui/zapit_setup: add initial channel list mode options

data/locale/deutsch.locale

@@ -240,6 +240,7 @@ channellist.nonefound Es wurden keine Kanäle gefunden!\nFühren Sie bitte eine
 channellist.numeric_adjust Numeric zap adjust
 channellist.provs Anbieter
 channellist.recording_not_possible Aufnahme nicht möglich!
+channellist.remember Zuletzt verwendete
 channellist.reset_all Entferne Markierung "Neu" für alle Kanäle
 channellist.reset_flags Entferne Kanal-Markierung "Neu"
 channellist.sats Satelliten
@@ -818,6 +819,8 @@ menu.hint_channellist_epg_align Legen Sie fest, wie der Text für das EPG in der
 menu.hint_channellist_extended Bei aktivierter Funktion wird vor dem Sendernamen ein Balken eingeblendet, der den Sendungsfortschritt anzeigt
 menu.hint_channellist_fonts Ändern Sie die Schriftgrößen in der Kanalliste
 menu.hint_channellist_foot Definiert, welche Informationen im unteren Sendungsfenster angezeigt werden sollen
+menu.hint_channellist_mode Wählen Sie die Start-Kanalliste im TV-Modus
+menu.hint_channellist_mode_radio Wählen Sie die Start-Kanalliste im Radio-Modus
 menu.hint_channellist_setup Wählen Sie die Anzeigeoptionen für die Kanalliste
 menu.hint_channellist_show_channellogo Zeigt Senderlogos in der Kanalliste.
 menu.hint_channels Kanalliste öffnen
@@ -2060,8 +2063,10 @@ zapit.scantype.all Alle Services
 zapit.scantype.radio Nur Radio
 zapit.scantype.tv Nur TV
 zapit.scantype.tvradio Nur TV & Radio
+zapitsetup.channelmode Start-Kanalliste für TV
+zapitsetup.channelmode_radio Start-Kanalliste für Radio
 zapitsetup.head Startkanal-Verwaltung
-zapitsetup.info Start Kanal
+zapitsetup.info Startkanal
 zapitsetup.last_radio Radio Kanal
 zapitsetup.last_tv TV Kanal
 zapitsetup.last_use Kanal beim Runterfahren speichern

data/locale/english.locale

@@ -240,6 +240,7 @@ channellist.nonefound No channels were found!\nPlease execute a scan\n(MENU-key
 channellist.numeric_adjust Numeric zap adjust
 channellist.provs Providers
 channellist.recording_not_possible Recording not possible!
+channellist.remember Last used
 channellist.reset_all Reset 'new' flag for all channels
 channellist.reset_flags Reset 'new' channel flag
 channellist.sats Satellites
@@ -818,6 +819,8 @@ menu.hint_channellist_epg_align EPG event align
 menu.hint_channellist_extended Show current event progress bar
 menu.hint_channellist_fonts Change channel list font sizes
 menu.hint_channellist_foot Show additional information\nin bottom box
+menu.hint_channellist_mode Use the selected channel list mode on startup if last mode is TV
+menu.hint_channellist_mode_radio Use the selected channel list mode on startup if last mode is Radio
 menu.hint_channellist_setup Configure channel list GUI options
 menu.hint_channellist_show_channellogo Show channellogos in channel list
 menu.hint_channels Open channel list
@@ -2060,6 +2063,8 @@ zapit.scantype.all all services
 zapit.scantype.radio only radio
 zapit.scantype.tv only tv
 zapit.scantype.tvradio tv & radio
+zapitsetup.channelmode Initial TV channel list
+zapitsetup.channelmode_radio Initial Radio channel list
 zapitsetup.head Start Channel Settings
 zapitsetup.info Start Channel
 zapitsetup.last_radio Radio Channel

src/gui/zapit_setup.cpp

@@ -75,6 +75,20 @@ int CZapitSetup::showMenu()
 	CMenuForwarder 	*zapit2 = new CMenuForwarder(LOCALE_ZAPITSETUP_LAST_RADIO , !g_settings.uselastchannel, g_settings.StartChannelRadio, &select, "radio", CRCInput::RC_yellow, NEUTRINO_ICON_BUTTON_YELLOW );
 	zapit2->setHint("", LOCALE_MENU_HINT_LAST_RADIO);
 
+	#define CHANNEL_LIST_MODE_OPTION_COUNT 5
+	const CMenuOptionChooser::keyval CHANNEL_LIST_MODE_OPTIONS[CHANNEL_LIST_MODE_OPTION_COUNT] = {
+		  { -1,			LOCALE_CHANNELLIST_REMEMBER	}
+		, { LIST_MODE_FAV,	LOCALE_CHANNELLIST_FAVS		}
+		, { LIST_MODE_PROV,	LOCALE_BOUQUETLIST_HEAD		}
+		, { LIST_MODE_SAT,	LOCALE_CHANNELLIST_SATS		}
+		, { LIST_MODE_ALL,	LOCALE_CHANNELLIST_HEAD		}
+	};
+
+	CMenuOptionChooser *channel_mode = new CMenuOptionChooser(LOCALE_ZAPITSETUP_CHANNELMODE, &g_settings.channel_mode_initial, CHANNEL_LIST_MODE_OPTIONS, CHANNEL_LIST_MODE_OPTION_COUNT, true, NULL, CRCInput::RC_1, NULL, true);
+	channel_mode->setHint("", LOCALE_MENU_HINT_CHANNELLIST_MODE);
+	CMenuOptionChooser *channel_mode_radio = new CMenuOptionChooser(LOCALE_ZAPITSETUP_CHANNELMODE_RADIO, &g_settings.channel_mode_initial_radio, CHANNEL_LIST_MODE_OPTIONS, CHANNEL_LIST_MODE_OPTION_COUNT, true, NULL, CRCInput::RC_2, NULL, true);
+	channel_mode_radio->setHint("", LOCALE_MENU_HINT_CHANNELLIST_MODE_RADIO);
+
 	miscZapitNotifier->addItem(zapit1);
 	miscZapitNotifier->addItem(zapit2);
 
@@ -82,6 +96,9 @@ int CZapitSetup::showMenu()
 	zapit->addItem(GenericMenuSeparatorLine);
 	zapit->addItem(zapit1);
 	zapit->addItem(zapit2);
+	zapit->addItem(GenericMenuSeparatorLine);
+	zapit->addItem(channel_mode);
+	zapit->addItem(channel_mode_radio);
 
 	int res = zapit->exec(NULL, "");
 	delete miscZapitNotifier;

src/neutrino.cpp

@@ -332,6 +332,12 @@ int CNeutrinoApp::loadSetup(const char * fname)
 	g_settings.current_volume_step = configfile.getInt32("current_volume_step", 2);
 	g_settings.channel_mode = configfile.getInt32("channel_mode", LIST_MODE_PROV);
 	g_settings.channel_mode_radio = configfile.getInt32("channel_mode_radio", LIST_MODE_PROV);
+	g_settings.channel_mode_initial = configfile.getInt32("channel_mode_initial", -1);
+	g_settings.channel_mode_initial_radio = configfile.getInt32("channel_mode_initial_radio", -1);
+	if (g_settings.channel_mode_initial > -1)
+		g_settings.channel_mode = g_settings.channel_mode_initial;
+	if (g_settings.channel_mode_initial_radio > -1)
+		g_settings.channel_mode_radio = g_settings.channel_mode_initial_radio;
 
 	g_settings.fan_speed = configfile.getInt32( "fan_speed", 1);
 	if(g_settings.fan_speed < 1) g_settings.fan_speed = 1;
@@ -862,6 +868,8 @@ void CNeutrinoApp::saveSetup(const char * fname)
 	configfile.setInt32( "current_volume_step", g_settings.current_volume_step );
 	configfile.setInt32( "channel_mode", g_settings.channel_mode );
 	configfile.setInt32( "channel_mode_radio", g_settings.channel_mode_radio );
+	configfile.setInt32( "channel_mode_initial", g_settings.channel_mode_initial );
+	configfile.setInt32( "channel_mode_initial_radio", g_settings.channel_mode_initial_radio );
 
 	configfile.setInt32( "fan_speed", g_settings.fan_speed);
 

src/system/locals.h

@@ -267,6 +267,7 @@ typedef enum
 	LOCALE_CHANNELLIST_NUMERIC_ADJUST,
 	LOCALE_CHANNELLIST_PROVS,
 	LOCALE_CHANNELLIST_RECORDING_NOT_POSSIBLE,
+	LOCALE_CHANNELLIST_REMEMBER,
 	LOCALE_CHANNELLIST_RESET_ALL,
 	LOCALE_CHANNELLIST_RESET_FLAGS,
 	LOCALE_CHANNELLIST_SATS,
@@ -845,6 +846,8 @@ typedef enum
 	LOCALE_MENU_HINT_CHANNELLIST_EXTENDED,
 	LOCALE_MENU_HINT_CHANNELLIST_FONTS,
 	LOCALE_MENU_HINT_CHANNELLIST_FOOT,
+	LOCALE_MENU_HINT_CHANNELLIST_MODE,
+	LOCALE_MENU_HINT_CHANNELLIST_MODE_RADIO,
 	LOCALE_MENU_HINT_CHANNELLIST_SETUP,
 	LOCALE_MENU_HINT_CHANNELLIST_SHOW_CHANNELLOGO,
 	LOCALE_MENU_HINT_CHANNELS,
@@ -2087,6 +2090,8 @@ typedef enum
 	LOCALE_ZAPIT_SCANTYPE_RADIO,
 	LOCALE_ZAPIT_SCANTYPE_TV,
 	LOCALE_ZAPIT_SCANTYPE_TVRADIO,
+	LOCALE_ZAPITSETUP_CHANNELMODE,
+	LOCALE_ZAPITSETUP_CHANNELMODE_RADIO,
 	LOCALE_ZAPITSETUP_HEAD,
 	LOCALE_ZAPITSETUP_INFO,
 	LOCALE_ZAPITSETUP_LAST_RADIO,

src/system/locals_intern.h

@@ -267,6 +267,7 @@ const char * locale_real_names[] =
 	"channellist.numeric_adjust",
 	"channellist.provs",
 	"channellist.recording_not_possible",
+	"channellist.remember",
 	"channellist.reset_all",
 	"channellist.reset_flags",
 	"channellist.sats",
@@ -845,6 +846,8 @@ const char * locale_real_names[] =
 	"menu.hint_channellist_extended",
 	"menu.hint_channellist_fonts",
 	"menu.hint_channellist_foot",
+	"menu.hint_channellist_mode",
+	"menu.hint_channellist_mode_radio",
 	"menu.hint_channellist_setup",
 	"menu.hint_channellist_show_channellogo",
 	"menu.hint_channels",
@@ -2087,6 +2090,8 @@ const char * locale_real_names[] =
 	"zapit.scantype.radio",
 	"zapit.scantype.tv",
 	"zapit.scantype.tvradio",
+	"zapitsetup.channelmode",
+	"zapitsetup.channelmode_radio",
 	"zapitsetup.head",
 	"zapitsetup.info",
 	"zapitsetup.last_radio",

src/system/settings.h

@@ -64,6 +64,8 @@ struct SNeutrinoSettings
 	int current_volume_step;
 	int channel_mode;
 	int channel_mode_radio;
+	int channel_mode_initial;
+	int channel_mode_initial_radio;
 
 	//misc
 	int shutdown_real;