From a507bb283782ee3adb1fc9ba0c6f094108ef558c Mon Sep 17 00:00:00 2001 From: Sebastian Leonhardt Date: Mon, 20 Jul 2015 01:50:26 +0200 Subject: YH8xx,YH9xx: Keymap improvement The main "innovation" in this patch are two "virtual buttons" for the record switch on YH92x targets. When the switch state changes, a single BUTTON_REC_SW_ON or .._OFF button event will be generated. Thus keymap code can react on switching, but not on the actual state of the switch. Wherever sensible, the following user scheme is applied: - use PLAY as confirm button - use REW button or Long REW to exit - use REC (YH820) or FFWD (YH92X) as modifier key for button combos Change-Id: Ic8d1db9cc6869daed8dda98990dfdf7f6fd5d5a1 --- apps/lang/english.lang | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) (limited to 'apps/lang/english.lang') diff --git a/apps/lang/english.lang b/apps/lang/english.lang index e8fc5fce25..8d2b579f3b 100644 --- a/apps/lang/english.lang +++ b/apps/lang/english.lang @@ -332,7 +332,7 @@ *: "PLAY = Yes" cowond2*: "MENU, or top-right = Yes" iriverh100,iriverh120,iriverh300: "NAVI = Yes" - samsungyh*,ipod*,iaudiox5,iaudiom5,gigabeat*,sansae200*,sansac200*,iriverh10,iriverh10_5gb,mrobe100,sansaclip*,sansafuze*,sansaconnect: "SELECT = Yes" + ipod*,iaudiox5,iaudiom5,gigabeat*,sansae200*,sansac200*,iriverh10,iriverh10_5gb,mrobe100,sansaclip*,sansafuze*,sansaconnect: "SELECT = Yes" mrobe500: "PLAY, POWER, or top-right = Yes" archosplayer: "(PLAY/STOP)" vibe500: "OK = Yes" @@ -342,7 +342,7 @@ *: "PLAY = Yes" cowond2*: "MENU, or top-right = Yes" iriverh100,iriverh120,iriverh300: "NAVI = Yes" - samsungyh*,ipod*,iaudiox5,iaudiom5,gigabeat*,sansae200*,sansac200*,iriverh10,iriverh10_5gb,mrobe100,sansaclip*,sansafuze*,sansaconnect: "SELECT = Yes" + ipod*,iaudiox5,iaudiom5,gigabeat*,sansae200*,sansac200*,iriverh10,iriverh10_5gb,mrobe100,sansaclip*,sansafuze*,sansaconnect: "SELECT = Yes" mrobe500: "PLAY, POWER, or top-right = Yes" archosplayer: "(PLAY/STOP)" vibe500: "OK = Yes" @@ -2317,7 +2317,7 @@ *: "Building database... %d found (OFF to return)" iriverh100,iriverh120,iriverh300: "Building database... %d found (STOP to return)" ipod*: "Building database... %d found (PREV to return)" - iaudiox5,iaudiom5,gigabeat*,mrobe100: "Building database... %d found (LEFT to return)" + iaudiox5,iaudiom5,gigabeat*,mrobe100,samsungyh*: "Building database... %d found (LEFT to return)" iriverh10,iriverh10_5gb,sansae200*,sansac200*,sansafuze*,vibe500: "Building database... %d found (PREV to return)" gogearsa9200: "Building database... %d found (REW to return)" archosplayer: "Building DB %d found" @@ -2326,7 +2326,7 @@ *: "Building database... %d found (OFF to return)" iriverh100,iriverh120,iriverh300: "Building database... %d found (STOP to return)" ipod*: "Building database... %d found (PREV to return)" - iaudiox5,iaudiom5,gigabeat*,mrobe100: "Building database... %d found (LEFT to return)" + iaudiox5,iaudiom5,gigabeat*,mrobe100,samsungyh*: "Building database... %d found (LEFT to return)" iriverh10,iriverh10_5gb,sansae200*,sansac200*,sansafuze*,vibe500: "Building database... %d found (PREV to return)" gogearsa9200: "Building database... %d found (REW to return)" archosplayer: "Building DB %d found" @@ -4033,7 +4033,7 @@ mrobe500: "HEART = Set" iriverh100,iriverh120,iriverh300: "NAVI = Set" ipod*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,sansae200*,sansac200*,gigabeat*,mrobe100,sansaclip*,sansafuze*,sansaconnect: "SELECT = Set" - gogearsa9200: "PLAY = Set" + gogearsa9200,samsungyh*: "PLAY = Set" vibe500: "OK = Set" mpiohd300: "ENTER = Set" @@ -4043,13 +4043,13 @@ mrobe500: "HEART = Set" iriverh100,iriverh120,iriverh300: "NAVI = Set" ipod*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,sansae200*,sansac200*,gigabeat*,mrobe100,sansaclip*,sansafuze*,sansaconnect: "SELECT = Set" - gogearsa9200: "PLAY = Set" + gogearsa9200,samsungyh*: "PLAY = Set" vibe500: "OK = Set" mpiohd300: "ENTER = Set" *: none - rtc,iriverh100,iriverh120,iriverh300,iriverh10,iriverh10_5gb,iaudiox5,iaudiom5,ipod*,sansae200*,sansac200*,gigabeat*,mrobe100,gogearsa9200: "" + rtc,iriverh100,iriverh120,iriverh300,iriverh10,iriverh10_5gb,iaudiox5,iaudiom5,ipod*,sansae200*,sansac200*,gigabeat*,mrobe100,gogearsa9200,samsungyh*: "" @@ -4070,6 +4070,7 @@ gigabeats: "BACK = Revert" gogearsa9200: "LEFT = Revert" vibe500: "CANCEL = Revert" + samsungyh*: "REW = Revert" *: none @@ -4085,10 +4086,11 @@ gigabeats: "BACK = Revert" gogearsa9200: "LEFT = Revert" vibe500: "CANCEL = Revert" + samsungyh*: "REW = Revert" *: none - rtc,iriverh100,iriverh120,iriverh300,ipod*,sansae200*,sansac200*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,gigabeat*,mrobe100,gogearsa9200: "" + rtc,iriverh100,iriverh120,iriverh300,ipod*,sansae200*,sansac200*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,gigabeat*,mrobe100,gogearsa9200,samsungyh*: "" @@ -8068,6 +8070,7 @@ iriverh100,iriverh120,iriverh300: "The disk is full. Press STOP to continue." iaudiom5,iaudiox5: "The disk is full. Press POWER to continue." sansae200*,sansac200*,vibe500: "The disk is full. Press PREV to continue." + samsungyh*: "Disk full. Press LEFT to continue." *: none @@ -8075,10 +8078,11 @@ iriverh100,iriverh120,iriverh300: "The disk is full. Press STOP to continue." iaudiom5,iaudiox5: "The disk is full. Press POWER to continue." sansae200*,sansac200*,vibe500: "The disk is full. Press PREV to continue." + samsungyh*: "Disk full. Press LEFT to continue." *: none - recording,iriverh100,iriverh120,iriverh300,iaudiom5,iaudiox5,sansae200*,sansac200*: "" + recording,iriverh100,iriverh120,iriverh300,iaudiom5,iaudiox5,sansae200*,sansac200*,vibe500,samsungyh*: "" -- cgit v1.2.3