X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/abc3df95272df099485bfe081dcb8acead013eab..36f427fcb34bb0dafa3d395dbc6bfc060494c874:/data/menu.xml?ds=sidebyside

diff --git a/data/menu.xml b/data/menu.xml
index e06199d1..a7fdada0 100644
--- a/data/menu.xml
+++ b/data/menu.xml
@@ -15,13 +15,15 @@
 -->
 		<!--<item text="Standby debug">quitMainloop()</item>
 		<item text="Networksetup">self.openSetup("network")</item>-->
-		<item text="CI"><screen module="Ci" screen="CiSelection" /></item>
-		<item text="Satelliteconfig"><screen module="Satconfig" screen="NimSelection" /></item>
-		<item text="Scanconfiguration"><screen module="ScanSetup" screen="ScanSetup" /></item>
-		<item text="Timerentry"><screen module="TimerEntry" screen="TimerEntry" /></item>
+		<!--<item text="CI"><screen module="Ci" screen="CiSelection" /></item>-->
 		<item text="Radio"><code>print "radio mode"</code></item>
 		<item text="Timer"><screen module="TimerEdit" screen="TimerEditList" /></item>
-		<item text="Information"><screen module="About" /></item>
+
+		<menu text="Information">
+			<item text="Service"><screen module="ServiceInfo" screen="ServiceInfo"/></item>
+			<item text="About..."><screen module="About" /></item>
+		</menu>
+
 		<item text="Games / Plugins"><screen module="PluginBrowser" /></item>
 		<menu text="Setup">
 			<menu text="Service Organising">
@@ -30,10 +32,10 @@
 				<item text="Edit Bouquets"></item>
 			</menu>
 			<menu text="Service Searching">
-				<item text="Satelliteconfig"><screen module="Satconfig" /></item>
-				<!--<item text="Satelliteconfig">self.openSetup("satconfig")</item>-->
-				<item text="Automatic Scan"><screen module="ServiceScan" /></item>
-				<item text="Manual Scan"><screen module="ServiceScan" /></item>
+				<item text="Satelliteconfig"><screen module="Satconfig" screen="NimSelection" /></item>
+				<item text="Automatic Scan"><screen module="ScanSetup" screen="ScanSimple" /></item>
+				<!--<item text="Automatic Scan"><screen module="ServiceScan" /></item>-->
+				<item text="Manual Scan"><screen module="ScanSetup" /></item>
 				<item text="Rotor Control"></item>
 				<item text="Edit Transponder"></item>
 				<!--<item text="Satfinder"></item>-->
@@ -44,12 +46,12 @@
 				<item text="UHF Modulator"><setup id="RFmod" /></item>
 				<item text="Harddisk"><screen module="HarddiskSetup" screen="HarddiskSelection"/></item>
 				<item text="Remote Control"><setup id="rc" /></item>
-				<item text="Keyboard"><setup id="keyboard" /></item>
+				<!--<item text="Keyboard"><setup id="keyboard" /></item>-->
 				<item text="OSD"><setup id="osd" /></item>
 				<item text="LCD"><setup id="lcd" /></item>
-				<item text="Networksetup"><screen module="NetworkSetup" screen="NetworkSetup" /></item>
+				<item text="Network"><screen module="NetworkSetup" screen="NetworkSetup" /></item>
 			</menu>
-			<item text="Common Interface"></item>
+			<item text="Common Interface"><screen module="Ci" screen="CiSelection" /></item>
 			<item text="Parental Control"><setup id="parental" /></item>
 			<item text="Expert"><setup id="expert" /></item>
 		</menu>