Merge commit 'origin/bug_69_configurable_inputdevice_delay'

10 files changed, 11 insertions, 1 deletions

diff --git a/data/menu.xml b/data/menu.xml
index b437fbc7..6507bfe3 100755
--- a/data/menu.xml
+++ b/data/menu.xml
@@ -62,8 +62,9 @@
 				</menu>
 				<!--<item text="Remote Control"><setup id="rc" /></item>-->
 				<!--<item text="OSD"><setup id="osd" /></item>-->
-				<item requires="Display"><setup level="1" id="lcd" /></item>
 				<item level="0" text="Network" entryID="network_setup"><screen module="NetworkSetup" screen="NetworkAdapterSelection" /></item>
+				<item level="1" text="Input devices" entryID="input_device_setup"><screen module="InputDeviceSetup" screen="InputDeviceSelection" /></item>
+				<item requires="Display"><setup level="1" id="lcd" /></item>
 				<item text="Keyboard"><setup id="keyboard" /></item>
 				<!--<menu level="1" text="Network..." entryID="network_setup">
 					<id val="network" />
diff --git a/data/skin_default/icons/Makefile.am b/data/skin_default/icons/Makefile.am
index 088556a6..c6cb269e 100755
--- a/data/skin_default/icons/Makefile.am
+++ b/data/skin_default/icons/Makefile.am
@@ -27,7 +27,15 @@ dist_install_DATA = \
 	icon_view.png \
 	input_error.png \
 	input_info.png \
+	input_keyboard-configured.png \
+	input_keyboard.png \
+	input_mouse-configured.png \
+	input_mouse.png \
 	input_question.png \
+	input_rcnew-configured.png \
+	input_rcnew.png \
+	input_rcold-configured.png \
+	input_rcold.png \
 	lock_error.png \
 	lock_off.png \
 	lock_on.png \
@@ -54,3 +62,4 @@ dist_install_DATA = \
 	scan-s.png \
 	scan-t.png \
 	selectioncross.png
+
diff --git a/data/skin_default/icons/input_keyboard-configured.png b/data/skin_default/icons/input_keyboard-configured.png
new file mode 100644
index 00000000..c6623a5c
--- /dev/null
+++ b/data/skin_default/icons/input_keyboard-configured.png
diff --git a/data/skin_default/icons/input_keyboard.png b/data/skin_default/icons/input_keyboard.png
new file mode 100644
index 00000000..a922c896
--- /dev/null
+++ b/data/skin_default/icons/input_keyboard.png
diff --git a/data/skin_default/icons/input_mouse-configured.png b/data/skin_default/icons/input_mouse-configured.png
new file mode 100644
index 00000000..3db9447c
--- /dev/null
+++ b/data/skin_default/icons/input_mouse-configured.png
diff --git a/data/skin_default/icons/input_mouse.png b/data/skin_default/icons/input_mouse.png
new file mode 100644
index 00000000..f70c84e2
--- /dev/null
+++ b/data/skin_default/icons/input_mouse.png
diff --git a/data/skin_default/icons/input_rcnew-configured.png b/data/skin_default/icons/input_rcnew-configured.png
new file mode 100644
index 00000000..6b16d393
--- /dev/null
+++ b/data/skin_default/icons/input_rcnew-configured.png
diff --git a/data/skin_default/icons/input_rcnew.png b/data/skin_default/icons/input_rcnew.png
new file mode 100644
index 00000000..19cdeea5
--- /dev/null
+++ b/data/skin_default/icons/input_rcnew.png
diff --git a/data/skin_default/icons/input_rcold-configured.png b/data/skin_default/icons/input_rcold-configured.png
new file mode 100644
index 00000000..8d626851
--- /dev/null
+++ b/data/skin_default/icons/input_rcold-configured.png
diff --git a/data/skin_default/icons/input_rcold.png b/data/skin_default/icons/input_rcold.png
new file mode 100644
index 00000000..ef8680b5
--- /dev/null
+++ b/data/skin_default/icons/input_rcold.png