use Gtk.ButtonBox instead of Gtk.Toolbar for header bar buttons and fix button icons
This commit is contained in:
parent
6b75674031
commit
267973e72c
1 changed files with 143 additions and 159 deletions
170
data/gtk.glade
170
data/gtk.glade
|
@ -655,18 +655,6 @@
|
||||||
<property name="visible">True</property>
|
<property name="visible">True</property>
|
||||||
<property name="can_focus">False</property>
|
<property name="can_focus">False</property>
|
||||||
<property name="show_close_button">True</property>
|
<property name="show_close_button">True</property>
|
||||||
<child>
|
|
||||||
<placeholder/>
|
|
||||||
</child>
|
|
||||||
<child>
|
|
||||||
<object class="GtkToolbar">
|
|
||||||
<property name="visible">True</property>
|
|
||||||
<property name="can_focus">False</property>
|
|
||||||
<property name="show_arrow">False</property>
|
|
||||||
<child>
|
|
||||||
<object class="GtkToolItem">
|
|
||||||
<property name="visible">True</property>
|
|
||||||
<property name="can_focus">False</property>
|
|
||||||
<child>
|
<child>
|
||||||
<object class="GtkSwitch" id="headerbar-connection">
|
<object class="GtkSwitch" id="headerbar-connection">
|
||||||
<property name="visible">True</property>
|
<property name="visible">True</property>
|
||||||
|
@ -674,40 +662,37 @@
|
||||||
<signal name="notify::active" handler="on_headerbar-connection_active_notify" swapped="no"/>
|
<signal name="notify::active" handler="on_headerbar-connection_active_notify" swapped="no"/>
|
||||||
<signal name="state-set" handler="on_headerbar-connection_state_set" swapped="no"/>
|
<signal name="state-set" handler="on_headerbar-connection_state_set" swapped="no"/>
|
||||||
</object>
|
</object>
|
||||||
</child>
|
|
||||||
</object>
|
|
||||||
<packing>
|
<packing>
|
||||||
<property name="expand">False</property>
|
<property name="position">1</property>
|
||||||
<property name="homogeneous">True</property>
|
|
||||||
</packing>
|
</packing>
|
||||||
</child>
|
</child>
|
||||||
<child>
|
<child>
|
||||||
<object class="GtkSeparatorToolItem">
|
<object class="GtkSeparator">
|
||||||
<property name="visible">True</property>
|
<property name="visible">True</property>
|
||||||
<property name="can_focus">False</property>
|
<property name="can_focus">False</property>
|
||||||
</object>
|
</object>
|
||||||
<packing>
|
<packing>
|
||||||
<property name="expand">False</property>
|
<property name="position">2</property>
|
||||||
<property name="homogeneous">True</property>
|
|
||||||
</packing>
|
</packing>
|
||||||
</child>
|
</child>
|
||||||
<child>
|
<child>
|
||||||
<object class="GtkToggleToolButton" id="headerbar-playpause">
|
<object class="GtkToggleButton" id="headerbar-playpause">
|
||||||
<property name="visible">True</property>
|
<property name="visible">True</property>
|
||||||
<property name="can_focus">False</property>
|
<property name="can_focus">True</property>
|
||||||
<property name="use_underline">True</property>
|
<property name="receives_default">True</property>
|
||||||
<property name="icon_name">media-playback-start</property>
|
|
||||||
<signal name="toggled" handler="on_headerbar-playpause_toggled" swapped="no"/>
|
<signal name="toggled" handler="on_headerbar-playpause_toggled" swapped="no"/>
|
||||||
</object>
|
|
||||||
<packing>
|
|
||||||
<property name="expand">False</property>
|
|
||||||
<property name="homogeneous">True</property>
|
|
||||||
</packing>
|
|
||||||
</child>
|
|
||||||
<child>
|
<child>
|
||||||
<object class="GtkToolItem">
|
<object class="GtkImage">
|
||||||
<property name="visible">True</property>
|
<property name="visible">True</property>
|
||||||
<property name="can_focus">False</property>
|
<property name="can_focus">False</property>
|
||||||
|
<property name="icon_name">media-playback-start</property>
|
||||||
|
</object>
|
||||||
|
</child>
|
||||||
|
</object>
|
||||||
|
<packing>
|
||||||
|
<property name="position">3</property>
|
||||||
|
</packing>
|
||||||
|
</child>
|
||||||
<child>
|
<child>
|
||||||
<object class="GtkVolumeButton" id="headerbar-volume">
|
<object class="GtkVolumeButton" id="headerbar-volume">
|
||||||
<property name="visible">True</property>
|
<property name="visible">True</property>
|
||||||
|
@ -716,10 +701,10 @@
|
||||||
<property name="receives_default">True</property>
|
<property name="receives_default">True</property>
|
||||||
<property name="relief">none</property>
|
<property name="relief">none</property>
|
||||||
<property name="orientation">vertical</property>
|
<property name="orientation">vertical</property>
|
||||||
<property name="icons">audio-volume-muted-symbolic
|
<property name="icons">audio-volume-muted
|
||||||
audio-volume-high-symbolic
|
audio-volume-high
|
||||||
audio-volume-low-symbolic
|
audio-volume-low
|
||||||
audio-volume-medium-symbolic</property>
|
audio-volume-medium</property>
|
||||||
<signal name="button-press-event" handler="on_headerbar-volume_button_press_event" swapped="no"/>
|
<signal name="button-press-event" handler="on_headerbar-volume_button_press_event" swapped="no"/>
|
||||||
<signal name="button-release-event" handler="on_headerbar-volume_button_release_event" swapped="no"/>
|
<signal name="button-release-event" handler="on_headerbar-volume_button_release_event" swapped="no"/>
|
||||||
<signal name="value-changed" handler="on_headerbar-volume_value_changed" swapped="no"/>
|
<signal name="value-changed" handler="on_headerbar-volume_value_changed" swapped="no"/>
|
||||||
|
@ -742,20 +727,12 @@
|
||||||
</object>
|
</object>
|
||||||
</child>
|
</child>
|
||||||
</object>
|
</object>
|
||||||
</child>
|
|
||||||
</object>
|
|
||||||
<packing>
|
<packing>
|
||||||
<property name="expand">False</property>
|
<property name="position">4</property>
|
||||||
<property name="homogeneous">True</property>
|
|
||||||
</packing>
|
</packing>
|
||||||
</child>
|
</child>
|
||||||
<style>
|
<child>
|
||||||
<class name="no-bg"/>
|
<placeholder/>
|
||||||
</style>
|
|
||||||
</object>
|
|
||||||
<packing>
|
|
||||||
<property name="position">1</property>
|
|
||||||
</packing>
|
|
||||||
</child>
|
</child>
|
||||||
<child type="title">
|
<child type="title">
|
||||||
<object class="GtkStackSwitcher" id="header-panelswitcher">
|
<object class="GtkStackSwitcher" id="header-panelswitcher">
|
||||||
|
@ -769,56 +746,63 @@
|
||||||
<property name="visible">True</property>
|
<property name="visible">True</property>
|
||||||
<property name="can_focus">False</property>
|
<property name="can_focus">False</property>
|
||||||
<child>
|
<child>
|
||||||
<object class="GtkToolbar" id="server-toolbar">
|
<object class="GtkButtonBox" id="cover-toolbar">
|
||||||
<property name="visible">True</property>
|
<property name="visible">True</property>
|
||||||
<property name="can_focus">False</property>
|
<property name="can_focus">False</property>
|
||||||
<property name="halign">end</property>
|
<property name="spacing">6</property>
|
||||||
<style>
|
<property name="layout_style">end</property>
|
||||||
<class name="no-bg"/>
|
|
||||||
</style>
|
|
||||||
</object>
|
|
||||||
<packing>
|
|
||||||
<property name="name">server</property>
|
|
||||||
<property name="title" translatable="yes">Server</property>
|
|
||||||
</packing>
|
|
||||||
</child>
|
|
||||||
<child>
|
<child>
|
||||||
<object class="GtkToolbar" id="cover-toolbar">
|
<placeholder/>
|
||||||
<property name="visible">True</property>
|
</child>
|
||||||
<property name="can_focus">False</property>
|
|
||||||
<property name="halign">end</property>
|
|
||||||
<style>
|
|
||||||
<class name="no-bg"/>
|
|
||||||
</style>
|
|
||||||
</object>
|
</object>
|
||||||
<packing>
|
<packing>
|
||||||
<property name="name">cover</property>
|
<property name="name">cover</property>
|
||||||
<property name="title" translatable="yes">Cover</property>
|
<property name="title" translatable="yes">Cover</property>
|
||||||
|
</packing>
|
||||||
|
</child>
|
||||||
|
<child>
|
||||||
|
<object class="GtkButtonBox" id="server-toolbar">
|
||||||
|
<property name="visible">True</property>
|
||||||
|
<property name="can_focus">False</property>
|
||||||
|
<property name="spacing">6</property>
|
||||||
|
<property name="layout_style">end</property>
|
||||||
|
<child>
|
||||||
|
<placeholder/>
|
||||||
|
</child>
|
||||||
|
</object>
|
||||||
|
<packing>
|
||||||
|
<property name="name">server</property>
|
||||||
|
<property name="title" translatable="yes">Server</property>
|
||||||
<property name="position">1</property>
|
<property name="position">1</property>
|
||||||
</packing>
|
</packing>
|
||||||
</child>
|
</child>
|
||||||
<child>
|
<child>
|
||||||
<object class="GtkToolbar" id="playlist-toolbar">
|
<object class="GtkButtonBox" id="playlist-toolbar">
|
||||||
<property name="visible">True</property>
|
<property name="visible">True</property>
|
||||||
<property name="can_focus">False</property>
|
<property name="can_focus">False</property>
|
||||||
<property name="halign">end</property>
|
<property name="spacing">6</property>
|
||||||
<property name="show_arrow">False</property>
|
<property name="layout_style">end</property>
|
||||||
<child>
|
<child>
|
||||||
<object class="GtkToolButton" id="playlist-toolbar-clear">
|
<object class="GtkButton" id="playlist-toolbar-clear">
|
||||||
|
<property name="visible">True</property>
|
||||||
|
<property name="can_focus">True</property>
|
||||||
|
<property name="receives_default">True</property>
|
||||||
|
<signal name="clicked" handler="on_playlist-toolbar-clear_clicked" swapped="no"/>
|
||||||
|
<child>
|
||||||
|
<object class="GtkImage">
|
||||||
<property name="visible">True</property>
|
<property name="visible">True</property>
|
||||||
<property name="can_focus">False</property>
|
<property name="can_focus">False</property>
|
||||||
<property name="use_underline">True</property>
|
|
||||||
<property name="icon_name">edit-clear</property>
|
<property name="icon_name">edit-clear</property>
|
||||||
<signal name="clicked" handler="on_playlist-toolbar-clear_clicked" swapped="no"/>
|
</object>
|
||||||
|
</child>
|
||||||
</object>
|
</object>
|
||||||
<packing>
|
<packing>
|
||||||
<property name="expand">False</property>
|
<property name="expand">False</property>
|
||||||
<property name="homogeneous">True</property>
|
<property name="fill">False</property>
|
||||||
|
<property name="position">0</property>
|
||||||
|
<property name="non_homogeneous">True</property>
|
||||||
</packing>
|
</packing>
|
||||||
</child>
|
</child>
|
||||||
<style>
|
|
||||||
<class name="no-bg"/>
|
|
||||||
</style>
|
|
||||||
</object>
|
</object>
|
||||||
<packing>
|
<packing>
|
||||||
<property name="name">playlist</property>
|
<property name="name">playlist</property>
|
||||||
|
@ -827,34 +811,37 @@
|
||||||
</packing>
|
</packing>
|
||||||
</child>
|
</child>
|
||||||
<child>
|
<child>
|
||||||
<object class="GtkToolbar" id="library-toolbar">
|
<object class="GtkButtonBox" id="library-toolbar">
|
||||||
<property name="visible">True</property>
|
<property name="visible">True</property>
|
||||||
<property name="can_focus">False</property>
|
<property name="can_focus">False</property>
|
||||||
<property name="halign">end</property>
|
<property name="spacing">6</property>
|
||||||
<property name="show_arrow">False</property>
|
<property name="layout_style">end</property>
|
||||||
<child>
|
<child>
|
||||||
<object class="GtkToggleToolButton" id="library-toolbar-search">
|
<object class="GtkToggleButton" id="library-toolbar-search">
|
||||||
|
<property name="visible">True</property>
|
||||||
|
<property name="can_focus">True</property>
|
||||||
|
<property name="receives_default">True</property>
|
||||||
|
<signal name="toggled" handler="on_library-toolbar-search_toggled" swapped="no"/>
|
||||||
|
<child>
|
||||||
|
<object class="GtkImage">
|
||||||
<property name="visible">True</property>
|
<property name="visible">True</property>
|
||||||
<property name="can_focus">False</property>
|
<property name="can_focus">False</property>
|
||||||
<property name="use_underline">True</property>
|
<property name="icon_name">system-search-symbolic</property>
|
||||||
<property name="icon_name">edit-find-symbolic</property>
|
</object>
|
||||||
<signal name="toggled" handler="on_library-toolbar-search_toggled" swapped="no"/>
|
</child>
|
||||||
</object>
|
</object>
|
||||||
<packing>
|
<packing>
|
||||||
<property name="expand">False</property>
|
<property name="expand">False</property>
|
||||||
<property name="homogeneous">False</property>
|
<property name="fill">False</property>
|
||||||
|
<property name="position">0</property>
|
||||||
|
<property name="non_homogeneous">True</property>
|
||||||
</packing>
|
</packing>
|
||||||
</child>
|
</child>
|
||||||
<child>
|
|
||||||
<object class="GtkToolItem">
|
|
||||||
<property name="visible">True</property>
|
|
||||||
<property name="can_focus">False</property>
|
|
||||||
<child>
|
<child>
|
||||||
<object class="GtkMenuButton">
|
<object class="GtkMenuButton">
|
||||||
<property name="visible">True</property>
|
<property name="visible">True</property>
|
||||||
<property name="can_focus">True</property>
|
<property name="can_focus">True</property>
|
||||||
<property name="receives_default">True</property>
|
<property name="receives_default">True</property>
|
||||||
<property name="relief">none</property>
|
|
||||||
<property name="popover">library-toolbar-popover</property>
|
<property name="popover">library-toolbar-popover</property>
|
||||||
<child>
|
<child>
|
||||||
<object class="GtkImage">
|
<object class="GtkImage">
|
||||||
|
@ -864,16 +851,13 @@
|
||||||
</object>
|
</object>
|
||||||
</child>
|
</child>
|
||||||
</object>
|
</object>
|
||||||
</child>
|
|
||||||
</object>
|
|
||||||
<packing>
|
<packing>
|
||||||
<property name="expand">False</property>
|
<property name="expand">False</property>
|
||||||
<property name="homogeneous">False</property>
|
<property name="fill">False</property>
|
||||||
|
<property name="position">1</property>
|
||||||
|
<property name="non_homogeneous">True</property>
|
||||||
</packing>
|
</packing>
|
||||||
</child>
|
</child>
|
||||||
<style>
|
|
||||||
<class name="no-bg"/>
|
|
||||||
</style>
|
|
||||||
</object>
|
</object>
|
||||||
<packing>
|
<packing>
|
||||||
<property name="name">library</property>
|
<property name="name">library</property>
|
||||||
|
@ -884,7 +868,7 @@
|
||||||
</object>
|
</object>
|
||||||
<packing>
|
<packing>
|
||||||
<property name="pack_type">end</property>
|
<property name="pack_type">end</property>
|
||||||
<property name="position">1</property>
|
<property name="position">5</property>
|
||||||
</packing>
|
</packing>
|
||||||
</child>
|
</child>
|
||||||
</object>
|
</object>
|
||||||
|
|
Loading…
Reference in a new issue