neutrino: sync keybind and usermenu code with neutrino-mp, code (C) martii

Origin commit data
------------------
Commit: 420af7a4dc
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-09-05 (Fri, 05 Sep 2014)

src/gui/keybind_setup.h

@@ -44,25 +44,27 @@ class CKeybindSetup : public CMenuTarget, public CChangeObserver
 	public:	
 		enum keynames 
 		{
-			KEY_TV_RADIO_MODE,
-			KEY_POWER_OFF,
-			KEY_PAGE_UP,
-			KEY_PAGE_DOWN,
-			KEY_LIST_START,
-			KEY_LIST_END,
-			KEY_CANCEL_ACTION,
-			KEY_SORT,
-			KEY_ADD_RECORD,
-			KEY_ADD_REMIND,
-			KEY_BOUQUET_UP,
-			KEY_BOUQUET_DOWN,
-			KEY_CURRENT_TRANSPONDER,
-			KEY_CHANNEL_UP,
-			KEY_CHANNEL_DOWN,
-			KEY_SUBCHANNEL_UP,
-			KEY_SUBCHANNEL_DOWN,
-			KEY_ZAP_HISTORY,
-			KEY_LASTCHANNEL,
+			NKEY_TV_RADIO_MODE,
+			NKEY_POWER_OFF,
+			NKEY_PAGE_UP,
+			NKEY_PAGE_DOWN,
+			NKEY_VOLUME_UP,
+			NKEY_VOLUME_DOWN,
+			NKEY_LIST_START,
+			NKEY_LIST_END,
+			NKEY_CANCEL_ACTION,
+			NKEY_SORT,
+			NKEY_ADD_RECORD,
+			NKEY_ADD_REMIND,
+			NKEY_BOUQUET_UP,
+			NKEY_BOUQUET_DOWN,
+			NKEY_CURRENT_TRANSPONDER,
+			NKEY_CHANNEL_UP,
+			NKEY_CHANNEL_DOWN,
+			NKEY_SUBCHANNEL_UP,
+			NKEY_SUBCHANNEL_DOWN,
+			NKEY_ZAP_HISTORY,
+			NKEY_LASTCHANNEL,
 			MPKEY_REWIND,
 			MPKEY_FORWARD,
 			MPKEY_PAUSE,
@@ -72,17 +74,24 @@ class CKeybindSetup : public CMenuTarget, public CChangeObserver
 			MPKEY_SUBTITLE,
 			MPKEY_TIME,
 			MPKEY_BOOKMARK,
-			KEY_TIMESHIFT,
+			MPKEY_GOTO,
+			//MPKEY_NEXT3DMODE,
+			MPKEY_NEXT_REPEAT_MODE,
+			//MPKEY_VTXT,
+			NKEY_TIMESHIFT,
 			MPKEY_PLUGIN,
-			KEY_PLUGIN,
-			KEY_UNLOCK,
-			KEY_SCREENSHOT,
-			KEY_PIP_CLOSE,
-			KEY_PIP_SETUP,
-			KEY_PIP_SWAP,
-			KEY_FORMAT_MODE,
-			KEY_PIC_MODE,
-			KEY_PIC_SIZE,
+			NKEY_UNLOCK,
+			NKEY_HELP,
+			NKEY_NEXT43MODE,
+			NKEY_SWITCHFORMAT,
+			NKEY_SCREENSHOT,
+			NKEY_PIP_CLOSE,
+			NKEY_PIP_SETUP,
+			NKEY_PIP_SWAP,
+			NKEY_FORMAT_MODE,
+			NKEY_PIC_MODE,
+			NKEY_PIC_SIZE,
+			NKEY_RECORD,
 			
 			KEYBINDS_COUNT
 		};