Skip to content

ManagerDeviceList: Expand connect/disconnect to more input methods #3378

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
ricmatsui wants to merge 2 commits into
base: main
Choose a base branch
from
+27 −16
Open

ManagerDeviceList: Expand connect/disconnect to more input methods #3378

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c922384
ManagerDeviceList: Expand connect/disconnect to more input methods
ricmatsui Aug 25, 2026
c0398ba
ManagerDeviceList: Variable cleanup
ricmatsui Aug 26, 2026
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
43 changes: 27 additions & 16 deletions blueman/gui/manager/ManagerDeviceList.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,7 @@ def __init__(self, inst: "Blueman", adapter: str | None = None) -> None:
self.connect("popup-menu", self._on_popup_menu)
self.connect("button-press-event", self._on_event_clicked)
self.connect("button-release-event", self._on_event_clicked)
self.connect("row-activated", self._on_row_activated)
self.connect("key-press-event", self._on_key_pressed)

self.menu: ManagerDeviceMenu | None = None
Expand Down Expand Up @@ -218,35 +219,45 @@ def _on_popup_menu(self, _widget: Gtk.Widget) -> bool:

return True

def _row_at_tree_path(self, tree_path: Gtk.TreePath) -> dict[str, Any] | None:
tree_iter = self.filter.get_iter(tree_path)
assert tree_iter is not None
child_iter = self.filter.convert_iter_to_child_iter(tree_iter)
assert child_iter is not None
row = self.get(child_iter, "device", "connected")
return row if row else None

def _on_row_activated(self, _widget: Gtk.Widget, tree_path: Gtk.TreePath, _column: Gtk.TreeViewColumn) -> None:
row = self._row_at_tree_path(tree_path)
if row is None:
return

if self.menu is None:
self.menu = ManagerDeviceMenu(self.Blueman)

if self.menu.show_generic_connect_calc(row["device"]['UUIDs']):
if row["connected"]:
self.menu.disconnect_service(row["device"])
elif Adapter(obj_path=row["device"]["Adapter"])["Powered"]:
self.menu.connect_service(row["device"])

def _on_event_clicked(self, _widget: Gtk.Widget, event: Gdk.Event) -> bool:
if event.type not in (Gdk.EventType._2BUTTON_PRESS, Gdk.EventType.BUTTON_PRESS):
if event.type != Gdk.EventType.BUTTON_PRESS:
return False

posdata = self.get_path_at_pos(int(cast(Gdk.EventButton, event).x), int(cast(Gdk.EventButton, event).y))
if posdata is None:
return False
else:
path = posdata[0]
assert path is not None
tree_path = posdata[0]
assert tree_path is not None

tree_iter = self.filter.get_iter(path)
assert tree_iter is not None
child_iter = self.filter.convert_iter_to_child_iter(tree_iter)
assert child_iter is not None
row = self.get(child_iter, "device", "connected")
if not row:
if not self._row_at_tree_path(tree_path):
return False

if self.menu is None:
self.menu = ManagerDeviceMenu(self.Blueman)

if event.type == Gdk.EventType._2BUTTON_PRESS and cast(Gdk.EventButton, event).button == 1:
if self.menu.show_generic_connect_calc(row["device"]['UUIDs']):
if row["connected"]:
self.menu.disconnect_service(row["device"])
elif Adapter(obj_path=row["device"]["Adapter"])["Powered"]:
self.menu.connect_service(row["device"])

if event.type == Gdk.EventType.BUTTON_PRESS and cast(Gdk.EventButton, event).button == 3:
self.menu.popup_at_pointer(event)

Expand Down