diff --git a/app/connections.py b/app/connections.py index 4cfce30b..2c894dca 100644 --- a/app/connections.py +++ b/app/connections.py @@ -649,10 +649,16 @@ class HttpAPI: EXIT = "174" OK = "352" INFO = "358" + TV = "377" + RADIO = "385" + AUDIO = "392" + FAV = "393" RED = "398" GREEN = "399" YELLOW = "400" BLUE = "401" + CH_UP = "402" + CH_DOWN = "403" BACK = "412" class Power(str, Enum): diff --git a/app/ui/control.glade b/app/ui/control.glade index 38eee72a..75ff7b3d 100644 --- a/app/ui/control.glade +++ b/app/ui/control.glade @@ -363,6 +363,27 @@ Author: Dmitriy Yefremov 5 5 vertical + + + True + False + 2 + 2 + 2 + 2 + + + False + + + + + + True + True + 1 + + True @@ -509,27 +530,6 @@ Author: Dmitriy Yefremov False True end - 1 - - - - - True - False - 2 - 2 - 2 - 2 - - - False - - - - - - True - True 2 @@ -559,8 +559,8 @@ Author: Dmitriy Yefremov center 25 25 - 20 - 20 + 10 + 10 vertical 5 @@ -719,6 +719,69 @@ Author: Dmitriy Yefremov + + False + True + 0 + + + + + True + False + center + 5 + 15 + + + True + False + Ch + + + 1 + 0 + + + + + True + True + True + app.on_ch_up + + + True + False + up + + + + + 0 + 0 + + + + + True + True + True + app.on_ch_down + + + True + False + down + + + + + 2 + 0 + + + False True @@ -760,7 +823,7 @@ audio-volume-medium-symbolic False True - 1 + 2 @@ -771,7 +834,7 @@ audio-volume-medium-symbolic False True - 2 + 3 @@ -794,6 +857,26 @@ audio-volume-medium-symbolic + + 0 + 0 + + + + + status-bar-button + True + True + True + app.on_prev_media + + + True + False + media-skip-backward + + + 0 1 @@ -812,6 +895,26 @@ audio-volume-medium-symbolic + + 1 + 0 + + + + + status-bar-button + True + True + True + app.on_play_media + + + True + False + media-playback-start + + + 1 1 @@ -832,7 +935,7 @@ audio-volume-medium-symbolic 2 - 1 + 0 @@ -848,25 +951,6 @@ audio-volume-medium-symbolic - - 3 - 1 - - - - - True - True - True - app.on_next_media - - - True - False - media-skip-forward - - - 3 0 @@ -874,6 +958,7 @@ audio-volume-medium-symbolic + status-bar-button True True True @@ -888,52 +973,90 @@ audio-volume-medium-symbolic 2 - 0 + 1 - + + status-bar-button True True True - app.on_play_media + app.on_next_media - + True False - media-playback-start + media-skip-forward + + 3 + 1 + + + + + TV + status-bar-button + True + True + True + app.on_tv + 1 - 0 + 2 - + + Radio + status-bar-button True True True - app.on_prev_media - - - True - False - media-skip-backward - - + app.on_radio + + + 2 + 2 + + + + + Audio + status-bar-button + True + True + True + app.on_audio 0 - 0 + 2 + + + + + FAV + status-bar-button + True + True + True + app.on_fav + + + 3 + 2 False True - 3 + 4 @@ -945,12 +1068,12 @@ audio-volume-medium-symbolic center 10 10 - True + False False True - 4 + 5 @@ -958,7 +1081,6 @@ audio-volume-medium-symbolic True False center - 15 0.5 none diff --git a/app/ui/control.py b/app/ui/control.py index cc9441bc..32f25061 100644 --- a/app/ui/control.py +++ b/app/ui/control.py @@ -92,10 +92,16 @@ class ControlTool(Gtk.Box): app.set_action("on_ok", lambda a, v: self.on_remote_action(HttpAPI.Remote.OK)) app.set_action("on_menu", lambda a, v: self.on_remote_action(HttpAPI.Remote.MENU)) app.set_action("on_exit", lambda a, v: self.on_remote_action(HttpAPI.Remote.EXIT)) + app.set_action("on_ch_up", lambda a, v: self.on_remote_action(HttpAPI.Remote.CH_UP)) + app.set_action("on_ch_down", lambda a, v: self.on_remote_action(HttpAPI.Remote.CH_DOWN)) app.set_action("on_red", lambda a, v: self.on_remote_action(HttpAPI.Remote.RED)) app.set_action("on_green", lambda a, v: self.on_remote_action(HttpAPI.Remote.GREEN)) app.set_action("on_yellow", lambda a, v: self.on_remote_action(HttpAPI.Remote.YELLOW)) app.set_action("on_blue", lambda a, v: self.on_remote_action(HttpAPI.Remote.BLUE)) + app.set_action("on_audio", lambda a, v: self.on_remote_action(HttpAPI.Remote.AUDIO)) + app.set_action("on_tv", lambda a, v: self.on_remote_action(HttpAPI.Remote.TV)) + app.set_action("on_radio", lambda a, v: self.on_remote_action(HttpAPI.Remote.RADIO)) + app.set_action("on_fav", lambda a, v: self.on_remote_action(HttpAPI.Remote.FAV)) # Playback. app.set_action("on_prev_media", lambda a, v: self.on_player_action(HttpAPI.Request.PLAYER_PREV)) app.set_action("on_play_media", lambda a, v: self.on_player_action(HttpAPI.Request.PLAYER_PLAY))