Philipp Hörist pushed to branch gtk4 at gajim / gajim
Commits:
0eb26a34 by Philipp Hörist at 2024-10-03T00:11:09+02:00
refactor: Fix Server Info Dialog
- - - - -
2 changed files:
- gajim/gtk/certificate_dialog.py
- gajim/gtk/server_info.py
Changes:
=====================================
gajim/gtk/certificate_dialog.py
=====================================
@@ -2,6 +2,7 @@
#
# SPDX-License-Identifier: GPL-3.0-only
+from typing import Any
from typing import cast
import logging
=====================================
gajim/gtk/server_info.py
=====================================
@@ -64,10 +64,7 @@ def __init__(self, account: str) -> None:
self.set_child(self._ui.server_info_notebook)
self.connect('destroy', self._on_destroy)
-
- controller = Gtk.EventControllerKey()
- controller.connect('key-pressed', self._on_key_pressed)
- self.add_controller(controller)
+ # self.connect('key-press-event', self._on_key_press)
self.register_events([
('server-disco-received', ged.GUI1, self._server_disco_received),
@@ -94,25 +91,22 @@ def __init__(self, account: str) -> None:
else:
cert_box = CertificateBox(account, self._client.certificate)
self._ui.cert_scrolled.set_child(cert_box)
- self._ui.cert_scrolled.show()
for feature in self._get_features():
self._add_feature(feature)
+ display = Gdk.Display.get_default()
+ assert display is not None
+ self._clipboard = display.get_primary_clipboard()
+
+ self.show()
+
def _on_destroy(self, *args: Any) -> None:
self._destroyed = True
- def _on_key_pressed(
- self,
- _event_controller_key: Gtk.EventControllerKey,
- keyval: int,
- _keycode: int,
- _state: Gdk.ModifierType
- ) -> bool:
- if keyval == Gdk.KEY_Escape:
+ def _on_key_press(self, _widget: Gtk.Widget, event: Any) -> None:
+ if event.keyval == Gdk.KEY_Escape:
self.destroy()
- return True
- return False
def _add_connection_info(self) -> None:
# Connection type
@@ -331,11 +325,7 @@ def _on_clipboard_button_clicked(self, _widget:
Gtk.Button) -> None:
server_features += f'{feature.name}: {available} {additional}\n'
clipboard_text = server_software + server_features
-
- default_display = Gdk.Display.get_default()
- if default_display is not None:
- clipboard = default_display.get_clipboard()
- clipboard.set(clipboard_text)
+ self._clipboard.set_text(clipboard_text, -1)
class FeatureItem(Gtk.ListBoxRow):
@@ -358,7 +348,6 @@ def __init__(self, feature: Feature) -> None:
grid.attach(self._additional_label, 1, 1, 1, 1)
self._set_feature()
-
self.set_child(grid)
def _set_feature(self) -> None:
@@ -371,12 +360,10 @@ def _set_feature(self) -> None:
self._icon.get_style_context().remove_class('success-color')
if self._feature.available:
- self._icon.set_from_icon_name(
- 'emblem-ok-symbolic')
+ self._icon.set_from_icon_name('emblem-ok-symbolic')
self._icon.get_style_context().add_class('success-color')
else:
- self._icon.set_from_icon_name(
- 'window-close-symbolic')
+ self._icon.set_from_icon_name('window-close-symbolic')
self._icon.get_style_context().add_class('error-color')
def update(self, feature: Feature) -> None:
View it on GitLab:
https://dev.gajim.org/gajim/gajim/-/commit/0eb26a34b3b02b36917ed5a83f78e7b6cc3fed9e
--
View it on GitLab:
https://dev.gajim.org/gajim/gajim/-/commit/0eb26a34b3b02b36917ed5a83f78e7b6cc3fed9e
You're receiving this email because of your account on dev.gajim.org.
_______________________________________________
Commits mailing list -- [email protected]
To unsubscribe send an email to [email protected]
