Skip to content

[WIP] Update Menu on Status Update #139

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.

Sign up for GitHub

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

Open
NPScript wants to merge 2 commits into
base: master
Choose a base branch
from
Open

[WIP] Update Menu on Status Update #139

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ced5d5e
tray: update menu too on status change
NPScript Apr 21, 2024
d95b603
tray: minor cleanup
NPScript Apr 21, 2024
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
151 changes: 79 additions & 72 deletions usr/lib/blueberry/blueberry-tray.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,42 +5,46 @@
import gi
gi.require_version('Gtk', '3.0')
gi.require_version('GnomeBluetooth', '1.0')
gi.require_version('XApp', '1.0')
from gi.repository import Gtk, Gdk, GnomeBluetooth, Gio, XApp
gi.require_version('AppIndicator3', '0.1')
from gi.repository import AppIndicator3, Gtk, GnomeBluetooth, Gio
import rfkillMagic
import setproctitle
import subprocess

# i18n
gettext.install("blueberry", "/usr/share/locale")
_ = gettext.gettext

setproctitle.setproctitle("blueberry-tray")

class BluetoothTray(Gtk.Application):
def __init__(self):
super(BluetoothTray, self).__init__(register_session=True, application_id="org.linuxmint.blueberry.tray")
super(BluetoothTray, self).__init__(
register_session=True,
application_id="org.linuxmint.blueberry.tray"
)

def do_activate(self):
self.hold()

def do_startup(self):
Gtk.Application.do_startup(self)

debug = False
if len(sys.argv) > 1 and sys.argv[1] == "debug":
debug = True
debug = len(sys.argv) > 1 and sys.argv[1] == "debug"

self.rfkill = rfkillMagic.Interface(self.update_icon_callback, debug)
self.settings = Gio.Settings(schema="org.blueberry")
self.settings.connect("changed::tray-enabled", self.on_settings_changed_cb)

self.tray_icon = "blueberry-tray"
self.tray_active_icon = "blueberry-tray-active"
self.tray_disabled_icon = "blueberry-tray-disabled"
self.icons = {
'default': 'blueberry-tray',
'active': 'blueberry-tray-active',
'disabled': 'blueberry-tray-disabled',
}

if self.settings.get_boolean("use-symbolic-icons"):
self.tray_icon = "blueberry-tray-symbolic"
self.tray_active_icon = "blueberry-tray-active-symbolic"
self.tray_disabled_icon = "blueberry-tray-disabled-symbolic"
for state in self.icons:
self.icons[state] += '-symbolic'

# If we have no adapter, or disabled tray, end early
if (not self.rfkill.have_adapter) or (not self.settings.get_boolean("tray-enabled")):
Expand All @@ -53,13 +57,16 @@ def do_startup(self):
self.model.connect('row-deleted', self.update_icon_callback)
self.model.connect('row-inserted', self.update_icon_callback)

self.icon = XApp.StatusIcon()
self.icon.set_name("blueberry")
self.icon.set_tooltip_text(_("Bluetooth"))
self.icon.connect("activate", self.on_statusicon_activated)
self.icon.connect("button-release-event", self.on_statusicon_released)
self.paired_devices = {}

self.icon = AppIndicator3.Indicator.new(
'BlueBerry',
'blueberry',
AppIndicator3.IndicatorCategory.SYSTEM_SERVICES
)
self.icon.set_status(AppIndicator3.IndicatorStatus.ACTIVE)

self.update_icon_callback(None, None, None)
self.update_icon_callback()

def on_settings_changed_cb(self, setting, key, data=None):
if not self.settings.get_boolean("tray-enabled"):
Expand All @@ -71,21 +78,20 @@ def update_icon_callback(self, path=None, iter=None, data=None):
return

if self.rfkill.hard_block or self.rfkill.soft_block:
self.icon.set_icon_name(self.tray_disabled_icon)
self.icon.set_tooltip_text(_("Bluetooth is disabled"))
self.icon.set_icon_full(self.icons['disabled'], '')
else:
self.icon.set_icon_name(self.tray_icon)
self.icon.set_icon_full(self.icons['default'], '')
self.update_connected_state()

self.icon.set_menu(self.build_menu())

def update_connected_state(self):
self.get_devices()

if len(self.connected_devices) > 0:
self.icon.set_icon_name(self.tray_active_icon)
self.icon.set_tooltip_text(_("Bluetooth: Connected to %s") % (", ".join(self.connected_devices)))
self.icon.set_icon_full(self.icons['active'], '')
else:
self.icon.set_icon_name(self.tray_icon)
self.icon.set_tooltip_text(_("Bluetooth"))
self.icon.set_icon_full(self.icons['default'], '')

def get_devices(self):
self.connected_devices = []
Expand Down Expand Up @@ -117,58 +123,59 @@ def get_devices(self):

iter = self.model.iter_next(iter)

def on_statusicon_activated(self, icon, button, time):
if button == Gdk.BUTTON_PRIMARY:
subprocess.Popen(["blueberry"])

def on_statusicon_released(self, icon, x, y, button, time, position):
if button == 3:
menu = Gtk.Menu()

if not self.rfkill.hard_block:
if self.rfkill.soft_block:
item = Gtk.MenuItem(label=_("Turn on Bluetooth"))
item.connect("activate", self.turn_on_bluetooth)
menu.append(item)
else:
item = Gtk.MenuItem(label=_("Turn off Bluetooth"))
item.connect("activate", self.turn_off_bluetooth)
menu.append(item)

if not(self.rfkill.hard_block or self.rfkill.soft_block):
item = Gtk.MenuItem(label=_("Send files to a device"))
item.connect("activate", self.send_files_cb)
def start_blueberry(self, item):
subprocess.Popen(["blueberry"])

def build_menu(self):
menu = Gtk.Menu()
blueberry_exec = Gtk.MenuItem(label=_("BlueBerry"))
blueberry_exec.connect("activate", self.start_blueberry)
menu.append(blueberry_exec)

if not self.rfkill.hard_block:
if self.rfkill.soft_block:
item = Gtk.MenuItem(label=_("Turn on Bluetooth"))
item.connect("activate", self.turn_on_bluetooth)
menu.append(item)
else:
item = Gtk.MenuItem(label=_("Turn off Bluetooth"))
item.connect("activate", self.turn_off_bluetooth)
menu.append(item)

item = Gtk.MenuItem(label=_("Open Bluetooth device manager"))
item.connect("activate", self.open_manager_cb)
if not(self.rfkill.hard_block or self.rfkill.soft_block):
item = Gtk.MenuItem(label=_("Send files to a device"))
item.connect("activate", self.send_files_cb)
menu.append(item)

if len(self.paired_devices) > 0:
menu.append(Gtk.SeparatorMenuItem())
m_item = Gtk.MenuItem(label=_("Paired devices"))
menu.append(m_item)
paired_menu = Gtk.Menu()
m_item.set_submenu(paired_menu)
for device in self.paired_devices:
label = device
item = Gtk.ImageMenuItem(label=label)
if device in self.connected_devices:
image = Gtk.Image.new_from_icon_name("emblem-ok-symbolic", Gtk.IconSize.MENU)
image.set_tooltip_text(_("Connected"))
item.set_always_show_image(True)
item.set_image(image)
item.connect("activate",self.toggle_connect_cb, device)
paired_menu.append(item)
item = Gtk.MenuItem(label=_("Open Bluetooth device manager"))
item.connect("activate", self.open_manager_cb)
menu.append(item)

if len(self.paired_devices) > 0:
menu.append(Gtk.SeparatorMenuItem())

item = Gtk.MenuItem(label=_("Quit"))
item.connect("activate", self.terminate)
menu.append(item)

menu.show_all()
icon.popup_menu(menu, x, y, button, time, position)
m_item = Gtk.MenuItem(label=_("Paired devices"))
menu.append(m_item)
paired_menu = Gtk.Menu()
m_item.set_submenu(paired_menu)
for device in self.paired_devices:
label = device
item = Gtk.ImageMenuItem(label=label)
if device in self.connected_devices:
image = Gtk.Image.new_from_icon_name("emblem-ok-symbolic", Gtk.IconSize.MENU)
image.set_tooltip_text(_("Connected"))
item.set_always_show_image(True)
item.set_image(image)
item.connect("activate",self.toggle_connect_cb, device)
paired_menu.append(item)

menu.append(Gtk.SeparatorMenuItem())

item = Gtk.MenuItem(label=_("Quit"))
item.connect("activate", self.terminate)
menu.append(item)

menu.show_all()
return menu

def toggle_connect_cb(self, item, data = None):
proxy = self.paired_devices[data]
Expand All @@ -185,7 +192,7 @@ def turn_on_bluetooth(self, item):
self.rfkill.try_set_blocked(False)
return True

def turn_off_bluetooth(self,item):
def turn_off_bluetooth(self, item):
self.rfkill.try_set_blocked(True)
return True

Expand Down