mirror/mpdevil
1
0
Fork 0
mirror of https://github.com/SoongNoonien/mpdevil.git synced 2023-08-10 21:12:44 +03:00
Code Issues Projects Releases Wiki Activity

made AudioFormat optional

Browse Source
This commit is contained in:
Martin Wagner 2021-07-16 20:07:52 +02:00
parent 6f2d6e797f
commit f99519db82
2 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
bin/mpdevil
View File

@ -976,6 +976,7 @@ class GeneralSettings(Gtk.Box):
check_buttons_data=[ check_buttons_data=[
(_("Use Client-side decoration"), "use-csd"), (_("Use Client-side decoration"), "use-csd"),
(_("Show stop button"), "show-stop"), (_("Show stop button"), "show-stop"),
(_("Show audio format"), "show-audio-format"),
(_("Show lyrics button"), "show-lyrics-button"), (_("Show lyrics button"), "show-lyrics-button"),
(_("Place playlist at the side"), "playlist-right"), (_("Place playlist at the side"), "playlist-right"),
(_("Use “Album Artist” tag"), "use-album-artist"), (_("Use “Album Artist” tag"), "use-album-artist"),
@ -1011,6 +1012,7 @@ class GeneralSettings(Gtk.Box):
self.pack_start(view_heading, False, False, 0) self.pack_start(view_heading, False, False, 0)
self.pack_start(csd_box, False, False, 0) self.pack_start(csd_box, False, False, 0)
self.pack_start(check_buttons["show-stop"], False, False, 0) self.pack_start(check_buttons["show-stop"], False, False, 0)
self.pack_start(check_buttons["show-audio-format"], False, False, 0)
self.pack_start(check_buttons["show-lyrics-button"], False, False, 0) self.pack_start(check_buttons["show-lyrics-button"], False, False, 0)
self.pack_start(check_buttons["playlist-right"], False, False, 0) self.pack_start(check_buttons["playlist-right"], False, False, 0)
self.pack_start(view_grid, False, False, 0) self.pack_start(view_grid, False, False, 0)
@ -3366,7 +3368,7 @@ class SeekBar(Gtk.Box):
if state == "stop": if state == "stop":
self._disable() self._disable()
class AudioType(Gtk.Box): class AudioFormat(Gtk.Box):
def __init__(self, client, settings): def __init__(self, client, settings):
super().__init__(spacing=6) super().__init__(spacing=6)
self._client=client self._client=client
@ -3377,7 +3379,7 @@ class AudioType(Gtk.Box):
# connect # connect
self._settings.connect("notify::mini-player", self._on_mini_player) self._settings.connect("notify::mini-player", self._on_mini_player)
# self._settings.connect("changed::show-stop", self._on_show_audio_details_changed) # TODO self._settings.connect("changed::show-audio-format", self._on_show_audio_format_changed)
self._client.emitter.connect("audio", self._on_audio) self._client.emitter.connect("audio", self._on_audio)
self._client.emitter.connect("bitrate", self._on_bitrate) self._client.emitter.connect("bitrate", self._on_bitrate)
self._client.emitter.connect("current_song_changed", self._on_song_changed) self._client.emitter.connect("current_song_changed", self._on_song_changed)
@ -3414,11 +3416,10 @@ class AudioType(Gtk.Box):
self._top_label.set_text(" kb/s • "+file_type) self._top_label.set_text(" kb/s • "+file_type)
def _on_mini_player(self, obj, typestring): def _on_mini_player(self, obj, typestring):
self._on_show_audio_details_changed() self._on_show_audio_format_changed()
def _on_show_audio_details_changed(self, *args): def _on_show_audio_format_changed(self, *args):
# visibility=(self._settings.get_boolean("show-stop") and not self._settings.get_property("mini-player")) visibility=(self._settings.get_boolean("show-audio-format") and not self._settings.get_property("mini-player"))
visibility=not self._settings.get_property("mini-player")
self.set_property("visible", visibility) self.set_property("visible", visibility)
self.set_property("no-show-all", not(visibility)) self.set_property("no-show-all", not(visibility))
@ -3814,7 +3815,7 @@ class MainWindow(Gtk.ApplicationWindow):
self._cover_playlist_window=CoverPlaylistWindow(self._client, self._settings) self._cover_playlist_window=CoverPlaylistWindow(self._client, self._settings)
playback_control=PlaybackControl(self._client, self._settings) playback_control=PlaybackControl(self._client, self._settings)
seek_bar=SeekBar(self._client) seek_bar=SeekBar(self._client)
audio=AudioType(self._client, self._settings) audio=AudioFormat(self._client, self._settings)
playback_options=PlaybackOptions(self._client, self._settings) playback_options=PlaybackOptions(self._client, self._settings)
volume_button=VolumeButton(self._client, self._settings) volume_button=VolumeButton(self._client, self._settings)
connection_notify=ConnectionNotify(self._client, self._settings) connection_notify=ConnectionNotify(self._client, self._settings)

5
data/org.mpdevil.mpdevil.gschema.xml
View File

@ -61,6 +61,11 @@
<summary>Show stop button</summary> <summary>Show stop button</summary>
<description></description> <description></description>
</key> </key>
<key type="b" name="show-audio-format">
<default>true</default>
<summary>Show audio format</summary>
<description></description>
</key>
<key type="b" name="show-lyrics-button"> <key type="b" name="show-lyrics-button">
<default>true</default> <default>true</default>
<summary>Show lyrics button</summary> <summary>Show lyrics button</summary>