Philipp Hörist pushed to branch gtk4 at gajim / gajim
Commits:
48323aa4 by Philipp Hörist at 2024-10-22T22:08:29+02:00
fix: Remove not supported window methods
- - - - -
3 changed files:
- gajim/common/setting_values.py
- gajim/gtk/main.py
- gajim/gtk/util.py
Changes:
=====================================
gajim/common/setting_values.py
=====================================
@@ -66,7 +66,6 @@ class _ACCOUNTDEFAULT:
'print_status_in_chats',
'remote_control',
'show_main_menu',
- 'save_main_window_position',
'send_on_ctrl_enter',
'show_help_start_chat',
'show_in_taskbar',
@@ -244,7 +243,6 @@ class _ACCOUNTDEFAULT:
'print_status_in_chats': False,
'remote_control': False,
'roster_theme': 'default',
- 'save_main_window_position': True,
'search_engine': 'https://duckduckgo.com/?q=%s',
'send_on_ctrl_enter': False,
'show_help_start_chat': True,
@@ -700,9 +698,6 @@ class WorkspaceSettings(TypedDict):
'If enabled, Gajim offers to download plugins hosted on
gajim.org'),
'providers_list_url': _(
'Endpoint for retrieving a list of providers for sign up'),
- 'save_main_window_position': _(
- 'If enabled, Gajim will save the main window position when hiding '
- 'it, and restore it when showing the window again.'),
'search_engine': '',
'send_on_ctrl_enter': _(
'Send message on Ctrl+Enter and make a new line with Enter.'),
=====================================
gajim/gtk/main.py
=====================================
@@ -64,8 +64,6 @@
from gajim.gtk.util import get_app_window
from gajim.gtk.util import open_window
from gajim.gtk.util import resize_window
-from gajim.gtk.util import restore_main_window_position
-from gajim.gtk.util import save_main_window_position
from gajim.gtk.workspace_side_bar import WorkspaceSideBar
if TYPE_CHECKING:
@@ -194,14 +192,7 @@ def is_withdrawn(self) -> bool:
assert toplevel is not None
return bool(Gdk.WindowState.WITHDRAWN & toplevel.get_state())
- def hide(self) -> None:
- save_main_window_position()
- Gtk.ApplicationWindow.hide(self)
-
def show(self) -> None:
- restore_main_window_position()
- # self.present_with_time(Gtk.get_current_event_time())
- # GTK4 TODO
self.present()
def set_skip_taskbar_hint(self, value: bool) -> None:
@@ -240,7 +231,6 @@ def _prepare_window(self) -> None:
window_width = app.settings.get('mainwin_width')
window_height = app.settings.get('mainwin_height')
resize_window(self, window_width, window_height)
- restore_main_window_position()
if app.is_display(Display.X11):
self.set_skip_taskbar_hint(not app.settings.get('show_in_taskbar'))
@@ -1439,7 +1429,6 @@ def _on_file_request(self, event:
events.FileRequestReceivedEvent) -> None:
self.add_chat(event.account, event.jid, 'contact')
def quit(self) -> None:
- save_main_window_position()
window_width, window_height = self.get_width(), self.get_height()
app.settings.set('mainwin_width', window_width)
app.settings.set('mainwin_height', window_height)
=====================================
gajim/gtk/util.py
=====================================
@@ -220,30 +220,6 @@ def move_window(window: Gtk.Window, pos_x: int, pos_y:
int) -> None:
window.move(pos_x, pos_y)
-def save_main_window_position() -> None:
- if not app.settings.get('save_main_window_position'):
- return
- if app.is_display(Display.WAYLAND):
- return
-
- # TODO GTK4
- return
- x_pos, y_pos = app.window.get_position()
- log.debug('Saving main window position: %s %s', x_pos, y_pos)
- app.settings.set('mainwin_x_position', x_pos)
- app.settings.set('mainwin_y_position', y_pos)
-
-
-def restore_main_window_position() -> None:
- if not app.settings.get('save_main_window_position'):
- return
- if app.is_display(Display.WAYLAND):
- return
- move_window(app.window,
- app.settings.get('mainwin_x_position'),
- app.settings.get('mainwin_y_position'))
-
-
def get_source_view_style_scheme() -> GtkSource.StyleScheme | None:
style_scheme_manager = GtkSource.StyleSchemeManager.get_default()
if app.css_config.prefer_dark:
View it on GitLab:
https://dev.gajim.org/gajim/gajim/-/commit/48323aa433ee8a65781e2c7a71abd2d8af3918f3
--
View it on GitLab:
https://dev.gajim.org/gajim/gajim/-/commit/48323aa433ee8a65781e2c7a71abd2d8af3918f3
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]
