diff --git a/data/gtk.glade b/data/gtk.glade index 8cbb041..a440b80 100644 --- a/data/gtk.glade +++ b/data/gtk.glade @@ -587,105 +587,139 @@ - + True False - 2 - 5 + vertical + 10 - + True False - start - file: + dialog-information-symbolic + 6 - 0 - 0 + False + True + 0 - + True False - start - audio: + 2 + 5 + + + True + False + start + file: + + + 0 + 0 + + + + + True + False + start + audio: + + + 0 + 1 + + + + + True + False + start + bitrate: + + + 0 + 2 + + + + + True + False + start + error: + + + 0 + 3 + + + + + True + False + start + <i>none</i> + True + True + + + 1 + 2 + + + + + True + False + start + <i>none</i> + True + True + + + 1 + 1 + + + + + True + False + start + <i>none</i> + True + True + + + 1 + 0 + + + + + True + False + start + <i>none</i> + True + True + + + 1 + 3 + + - 0 - 1 - - - - - True - False - start - bitrate: - - - 0 - 2 - - - - - True - False - start - error: - - - 0 - 3 - - - - - True - False - start - True - - - 1 - 2 - - - - - True - False - start - True - - - 1 - 1 - - - - - True - False - start - True - - - 1 - 0 - - - - - True - False - start - True - - - 1 - 3 + False + True + 1 @@ -724,164 +758,190 @@ - + True False - 2 - 5 + vertical + 10 - + True False - end - right - True + starred-symbolic + 6 - 0 - 0 + False + True + 0 - + True False - end - right + 2 + 5 + + + True + False + end + right + True + + + 0 + 0 + + + + + True + False + end + right + + + 0 + 1 + + + + + True + False + end + right + + + 0 + 2 + + + + + True + False + start + albums + + + 1 + 1 + + + + + True + False + start + songs + + + 1 + 2 + + + + + True + False + start + artists + + + 1 + 0 + + + + + True + False + end + right + + + 0 + 3 + + + + + True + False + start + seconds + + + 1 + 3 + + + + + True + False + end + right + + + 0 + 6 + + + + + True + False + end + right + + + 0 + 5 + + + + + True + False + + + 0 + 4 + 2 + + + + + True + False + start + seconds played + + + 1 + 5 + + + + + True + False + seconds running + + + 1 + 6 + + - 0 - 1 - - - - - True - False - end - right - - - 0 - 2 - - - - - True - False - start - albums - - - 1 - 1 - - - - - True - False - start - songs - - - 1 - 2 - - - - - True - False - start - artists - - - 1 - 0 - - - - - True - False - end - right - - - 0 - 3 - - - - - True - False - start - seconds - - - 1 - 3 - - - - - True - False - end - right - - - 0 - 6 - - - - - True - False - end - right - - - 0 - 5 - - - - - True - False - - - 0 - 4 - 2 - - - - - True - False - start - seconds played - - - 1 - 5 - - - - - True - False - seconds running - - - 1 - 6 + False + True + 1 @@ -921,13 +981,39 @@ - + True False - none - + vertical + 10 + + + True + False + audio-speakers-symbolic + 6 + + + False + True + 0 + + + + + True + False + none + + + + False + True + 1 + + False diff --git a/mcg/widgets.py b/mcg/widgets.py index 54bc881..7e02737 100644 --- a/mcg/widgets.py +++ b/mcg/widgets.py @@ -818,6 +818,7 @@ class ServerPanel(GObject.GObject): def __init__(self, builder): GObject.GObject.__init__(self) + self._none_label = "" self._output_buttons = {} # Widgets @@ -830,6 +831,7 @@ class ServerPanel(GObject.GObject): self._status_audio = builder.get_object('server-status-audio') self._status_bitrate = builder.get_object('server-status-bitrate') self._status_error = builder.get_object('server-status-error') + self._none_label = self._status_file.get_label() # Stats widgets self._stats_artists = builder.get_object('server-stats-artists') @@ -856,26 +858,30 @@ class ServerPanel(GObject.GObject): def set_status(self, file, audio, bitrate, error): - if not file: - file = "" - self._status_file.set_text(file) + if file: + file = GObject.markup_escape_text(file) + else: + file = self._none_label + self._status_file.set_markup(file) # Audio information if audio: parts = audio.split(":") if len(parts) == 3: audio = "{} Hz, {} bit, {} channels".format(parts[0], parts[1], parts[2]) else: - audio = "" - self._status_audio.set_text(audio) + audio = self._none_label + self._status_audio.set_markup(audio) # Bitrate if bitrate: bitrate = bitrate + " kb/s" else: - bitrate = "" - self._status_bitrate.set_text(bitrate) + bitrate = self._none_label + self._status_bitrate.set_markup(bitrate) # Error - if not error: - error = "" + if error: + error = GObject.markup_escape_text(error) + else: + error = self._none_label self._status_error.set_markup(error)