Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use small toolbar size and text beside icons #2231

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions blueman/gui/manager/ManagerToolbar.py
Original file line number Diff line number Diff line change
Expand Up @@ -91,8 +91,7 @@ def _update_buttons(self, adapter: Optional[Adapter]) -> None:
self.b_remove.props.sensitive = True
self.b_send.props.sensitive = powered and row["objpush"]

icon_name = "blueman-untrust-symbolic" if row["trusted"] else "blueman-trust-symbolic"
self.b_trust.props.icon_widget = Gtk.Image(icon_name=icon_name, pixel_size=24, visible=True)
self.b_trust.props.icon_name = "blueman-untrust-symbolic" if row["trusted"] else "blueman-trust-symbolic"
self.b_trust.props.label = _("Untrust") if row["trusted"] else _("Trust")

def on_device_propery_changed(self, dev_list: ManagerDeviceList, device: Device, tree_iter: Gtk.TreeIter,
Expand Down
9 changes: 5 additions & 4 deletions data/ui/manager-main.ui
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,6 @@
<child>
<object class="GtkMenuItem" id="item_adapter">
<property name="visible">True</property>
<property name="sensitive">True</property>
<property name="can-focus">False</property>
<property name="label" translatable="yes">_Adapter</property>
<property name="use-underline">True</property>
Expand All @@ -74,7 +73,6 @@
<child>
<object class="GtkImageMenuItem" id="search_item">
<property name="label" translatable="yes">_Search</property>
<property name="visible">False</property>
<property name="can-focus">False</property>
<property name="use-underline">True</property>
<property name="image">im_search</property>
Expand All @@ -96,7 +94,6 @@
<child>
<object class="GtkImageMenuItem" id="prefs_item">
<property name="label" translatable="yes">_Preferences</property>
<property name="visible">False</property>
<property name="can-focus">False</property>
<property name="use-underline">True</property>
<property name="image">im_prefs</property>
Expand All @@ -112,7 +109,6 @@
<child>
<object class="GtkImageMenuItem" id="power_item">
<property name="label" translatable="yes">Turn Bluetooth _On</property>
<property name="visible">False</property>
<property name="can-focus">False</property>
<property name="use-underline">True</property>
<property name="image">im_power</property>
Expand Down Expand Up @@ -309,6 +305,8 @@
<object class="GtkToolbar" id="toolbar">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="toolbar-style">both-horiz</property>
<property name="icon_size">2</property>
<child>
<object class="GtkToolButton" id="b_search">
<property name="visible">True</property>
Expand Down Expand Up @@ -340,6 +338,7 @@
<property name="sensitive">False</property>
<property name="can-focus">False</property>
<property name="tooltip-text" translatable="yes">Create pairing with the device</property>
<property name="is-important">True</property>
<property name="label" translatable="yes" comments="translators: toolbar item: keep it as short as possible">Pair</property>
<property name="icon-name">blueman-pair-symbolic</property>
</object>
Expand All @@ -354,6 +353,7 @@
<property name="sensitive">False</property>
<property name="can-focus">False</property>
<property name="tooltip-text" translatable="yes">Mark/Unmark this device as trusted</property>
<property name="is-important">True</property>
<property name="label" translatable="yes" comments="translators: toolbar item: keep it as short as possible">Trust</property>
<property name="icon-name">blueman-trust-symbolic</property>
</object>
Expand All @@ -368,6 +368,7 @@
<property name="sensitive">False</property>
<property name="can-focus">False</property>
<property name="tooltip-text" translatable="yes">Remove this device from the known devices list</property>
<property name="is-important">True</property>
<property name="label" translatable="yes" comments="translators: toolbar item: keep it as short as possible">Remove</property>
<property name="icon-name">list-remove-symbolic</property>
</object>
Expand Down
Loading