Merge remote-tracking branch 'origin/7.3-dev' into 7.3-dev-sigc3

configure.ac

@@ -492,7 +492,6 @@ lib/python/Plugins/SystemPlugins/SatelliteEquipmentControl/Makefile
 lib/python/Plugins/SystemPlugins/SatelliteEquipmentControl/meta/Makefile
 lib/python/Plugins/SystemPlugins/Satfinder/Makefile
 lib/python/Plugins/SystemPlugins/Satfinder/meta/Makefile
-lib/python/Plugins/SystemPlugins/SoftcamStartup/Makefile
 lib/python/Plugins/SystemPlugins/SoftwareManager/Makefile
 lib/python/Plugins/SystemPlugins/SoftwareManager/meta/Makefile
 lib/python/Plugins/SystemPlugins/SwapManager/Makefile

data/keymap.xml

@@ -41,9 +41,7 @@
 	</map>
 
 	<map context="NavigationActions">
-		<!--
 		<key id="KEY_REWIND" mapto="top" flags="m" />
-		-->
 		<key id="KEY_CHANNELUP" mapto="pageUp" flags="mr" />
 		<key id="KEY_UP" mapto="up" flags="mr" />
 		<key id="KEY_REWIND" mapto="first" flags="m" />
@@ -52,9 +50,7 @@
 		<key id="KEY_FASTFORWARD" mapto="last" flags="m" />
 		<key id="KEY_DOWN" mapto="down" flags="mr" />
 		<key id="KEY_CHANNELDOWN" mapto="pageDown" flags="mr" />
-		<!--
 		<key id="KEY_FASTFORWARD" mapto="bottom" flags="m" />
-		-->
 		<!-- Keyboard specific buttons -->
 		<key id="KEY_HOME" mapto="top" flags="m" />
 		<key id="KEY_PAGEUP" mapto="pageUp" flags="mr" />

data/setup.xml

@@ -15,10 +15,13 @@
 		<!-- this is just a placeholder, the Videomode plugin implements this submenu -->
 	</setup>
 	<setup level="0" key="usage" title="Customize">
+		<item level="1" text="Sort order for menu entries" description="This option allows you to hide and sort menu entries. When selecting user you can change order and hide menu items via the blue button. With the user defined hidden the blue button is not shown in the menus">config.usage.menu_sort_mode</item>
+		<item level="1" text="Sort order for setup entries" description="This option allows you to alphabetically sort setup menu entries.">config.usage.sort_settings</item>
+		<item level="1" text="Show setup default values" description="In Setup screens choose whether to show the default value of the selected item in the description field.">config.usage.setupShowDefault</item>
 		<item level="0" text="Setup mode" description="Configure which access level to use for the configuration menu. Expert level gives access to all items.">config.usage.setup_level</item>
-		<item level="0" text="Sort order for menu entries" description="This option allows you to hide and sort menu entries. When selecting user you can change order and hide menu items via the blue button. With the user defined hidden the blue button is not shown in the menus">config.usage.menu_sort_mode</item>
 		<item level="1" text="Show screen path" description="This option allows you to show the full screen path leading to the current screen.">config.usage.showScreenPath</item>
 		<item level="1" text="Show menu or plugin numbers" description="This option allows you to show menu and/or plugin number quick links.">config.usage.menu_show_numbers</item>
+		<item level="2" text="Show softcam setup in extensions menu" description="This option allows you to add the softcam setup in the extensions menu." requires="HasSoftcamInstalled">config.misc.softcam_setup.extension_menu</item>
 		<item level="1" text="Zap mode" requires="ZapMode" description="Configure the way in which the receiver changes channels.">config.misc.zapmode</item>
 		<item level="2" text="Channel zap delay mode" description="Setup delay mode to zap to channels.">config.usage.numzaptimeoutmode</item>
 		<item level="2" text="Channel zap delay first button" description="User defined delay when you press the first button to zap to the channel.">config.usage.numzaptimeout1</item>
@@ -118,6 +121,8 @@
 		<item level="2" text="Show VCR scart on main menu" description="When enabled, the VCR scart option will be shown on the main menu" requires="ScartSwitch">config.usage.show_vcr_scart</item>
 		<item level="1" text="Show bootvideo on boot" requires="Bootvideo">config.usage.show_bootvideo</item>
 		<item level="2" text="Show True/False as graphical switch" description="Enable to display all true/false, yes/no, on/off and enable/disable set up options as a graphical switch.">config.usage.boolean_graphic</item>
+		<item level="2" text="Show simple second infobar" conditional="findSkinScreen('SecondInfoBarSimple')" description="When enabled a simplified version from the second infobar is shown. This can also be toggled instantly by holding the OK buttin when the second infobar is visible. The infobar will shortly disappear and then shown in the other mode.">config.usage.show_simple_second_infobar</item>
+		<item level="2" text="Show additional information on infobar" conditional="findSkinScreen('InfoBarAdds')" description="When enabled extra information is shown on the infobar. This can also be toggled instantly by holding the OK button when the inforbar is not visible.">config.usage.show_infobar_adds</item>
 	</setup>
 	<setup level="2" key="epgsettings" title="EPG settings">
 		<item level="2" text="Enable EIT EPG" description="Use EIT EPG information when it is available.">config.epg.eit</item>

doc/MENU

@@ -1,13 +1,13 @@
-Adding a menu image that identifies the current menu screen based on menuID
-===========================================================================
+Adding a menu image that identifies the current menu screen based on menu KEY
+=============================================================================
 
-In skin.xml add the list of images to the "menus" section based on menuID.
+In skin.xml add the list of images to the "menus" section based on menu KEY.
 
 	Syntax:
 
 		<menus>
 			<menu key="default" image="path/myNameForDefault.png" />
-			<menu key="<menuID>" image="path/myNameFor<menuID>.png" />
+			<menu key="<menu KEY>" image="path/myNameFor<menu KEY>.png" />
 		</menus>
 
 	This element is optional but if defined allows a skin designer to associate