Welcome to mirror list, hosted at ThFree Co, Russian Federation.

dev.gajim.org/gajim/gajim.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhilipp Hörist <philipp@hoerist.com>2023-06-08 17:11:26 +0300
committerPhilipp Hörist <philipp@hoerist.com>2023-06-08 17:11:26 +0300
commitc4836921873640f9e660e674327c431f4f621ecf (patch)
tree9d82baef34402e7cf962cc50d2507b6cd0cdaeb4
parentafa5d7449bb6263b0d98a299912be90c4ae57dcb (diff)
refactor: Control: Sort methods
-rw-r--r--gajim/gtk/control.py138
1 files changed, 69 insertions, 69 deletions
diff --git a/gajim/gtk/control.py b/gajim/gtk/control.py
index 6a8efae8b..d7615ee04 100644
--- a/gajim/gtk/control.py
+++ b/gajim/gtk/control.py
@@ -121,6 +121,18 @@ class ChatControl(EventHelper):
assert self._client is not None
return self._client
+ @property
+ def is_chat(self) -> bool:
+ return isinstance(self.contact, BareContact)
+
+ @property
+ def is_privatechat(self) -> bool:
+ return isinstance(self.contact, GroupchatParticipant)
+
+ @property
+ def is_groupchat(self) -> bool:
+ return isinstance(self.contact, GroupchatContact)
+
def is_loaded(self, account: str, jid: JID) -> bool:
if self._contact is None:
return False
@@ -132,6 +144,34 @@ class ChatControl(EventHelper):
def get_group_chat_roster(self) -> GroupchatRoster:
return self._roster
+ def add_command_output(self, text: str, is_error: bool) -> None:
+ self._scrolled_view.add_command_output(text, is_error)
+
+ def add_info_message(self,
+ text: str,
+ timestamp: float | None = None
+ ) -> None:
+
+ self._scrolled_view.add_info_message(text, timestamp)
+
+ def add_file_transfer(self, transfer: HTTPFileTransfer) -> None:
+ self._scrolled_view.add_file_transfer(transfer)
+
+ def add_jingle_file_transfer(
+ self,
+ event: events.FileRequestReceivedEvent | events.FileRequestSent | None
+ ) -> None:
+ if self._allow_add_message():
+ self._scrolled_view.add_jingle_file_transfer(event)
+
+ def add_call_message(self, event: events.JingleRequestReceived) -> None:
+ if self._allow_add_message():
+ self._scrolled_view.add_call_message(event=event)
+
+ def drag_data_file_transfer(self, selection: Gtk.SelectionData) -> None:
+ app.window.activate_action('send-file',
+ GLib.Variant('as', selection.get_uris()))
+
def clear(self) -> None:
log.info('Clear')
@@ -145,6 +185,35 @@ class ChatControl(EventHelper):
self._roster.clear()
self.unregister_events()
+ def remove_message(self, log_line_id: int) -> None:
+ self._scrolled_view.remove_message(log_line_id)
+
+ def reset_view(self) -> None:
+ self._scrolled_view.reset()
+
+ def get_autoscroll(self) -> bool:
+ return self._scrolled_view.get_autoscroll()
+
+ def scroll_to_message(self, log_line_id: int, timestamp: float) -> None:
+ row = self._scrolled_view.get_row_by_log_line_id(log_line_id)
+ if row is None:
+ # Clear view and reload conversation around timestamp
+ self._scrolled_view.reset()
+ self._scrolled_view.block_signals(True)
+ before, at_after = app.storage.archive.get_conversation_around(
+ self.contact.account, self.contact.jid, timestamp)
+ self.add_messages(before)
+ self.add_messages(at_after)
+ self._scrolled_view.set_history_complete(False, False)
+
+ GLib.idle_add(self._scrolled_view.block_signals, False)
+ GLib.idle_add(
+ self._scrolled_view.scroll_to_message_and_highlight,
+ log_line_id)
+
+ def mark_as_read(self) -> None:
+ self._jump_to_end_button.reset_unread_count()
+
def switch_contact(
self,
contact: BareContact | GroupchatContact | GroupchatParticipant
@@ -467,21 +536,6 @@ class ChatControl(EventHelper):
if self._allow_add_message():
self._scrolled_view.add_encryption_info(event)
- @property
- def is_chat(self) -> bool:
- return isinstance(self.contact, BareContact)
-
- @property
- def is_privatechat(self) -> bool:
- return isinstance(self.contact, GroupchatParticipant)
-
- @property
- def is_groupchat(self) -> bool:
- return isinstance(self.contact, GroupchatContact)
-
- def mark_as_read(self) -> None:
- self._jump_to_end_button.reset_unread_count()
-
def _on_autoscroll_changed(self,
_widget: ConversationView,
autoscroll: bool
@@ -514,10 +568,6 @@ class ChatControl(EventHelper):
def _on_jump_to_end(self, _button: Gtk.Button) -> None:
self.reset_view()
- def drag_data_file_transfer(self, selection: Gtk.SelectionData) -> None:
- app.window.activate_action('send-file',
- GLib.Variant('as', selection.get_uris()))
-
def get_our_nick(self) -> str:
if isinstance(self.contact, GroupchatParticipant):
muc_data = self.client.get_module('MUC').get_muc_data(
@@ -530,30 +580,6 @@ class ChatControl(EventHelper):
def _allow_add_message(self) -> bool:
return self._scrolled_view.get_lower_complete()
- def add_command_output(self, text: str, is_error: bool) -> None:
- self._scrolled_view.add_command_output(text, is_error)
-
- def add_info_message(self,
- text: str,
- timestamp: float | None = None
- ) -> None:
-
- self._scrolled_view.add_info_message(text, timestamp)
-
- def add_file_transfer(self, transfer: HTTPFileTransfer) -> None:
- self._scrolled_view.add_file_transfer(transfer)
-
- def add_jingle_file_transfer(
- self,
- event: events.FileRequestReceivedEvent | events.FileRequestSent | None
- ) -> None:
- if self._allow_add_message():
- self._scrolled_view.add_jingle_file_transfer(event)
-
- def add_call_message(self, event: events.JingleRequestReceived) -> None:
- if self._allow_add_message():
- self._scrolled_view.add_call_message(event=event)
-
def _add_message(self,
text: str,
kind: str,
@@ -589,32 +615,6 @@ class ChatControl(EventHelper):
else:
self._jump_to_end_button.add_unread_count()
- def remove_message(self, log_line_id: int) -> None:
- self._scrolled_view.remove_message(log_line_id)
-
- def reset_view(self) -> None:
- self._scrolled_view.reset()
-
- def get_autoscroll(self) -> bool:
- return self._scrolled_view.get_autoscroll()
-
- def scroll_to_message(self, log_line_id: int, timestamp: float) -> None:
- row = self._scrolled_view.get_row_by_log_line_id(log_line_id)
- if row is None:
- # Clear view and reload conversation around timestamp
- self._scrolled_view.reset()
- self._scrolled_view.block_signals(True)
- before, at_after = app.storage.archive.get_conversation_around(
- self.contact.account, self.contact.jid, timestamp)
- self.add_messages(before)
- self.add_messages(at_after)
- self._scrolled_view.set_history_complete(False, False)
-
- GLib.idle_add(self._scrolled_view.block_signals, False)
- GLib.idle_add(
- self._scrolled_view.scroll_to_message_and_highlight,
- log_line_id)
-
def _request_messages(self, before: bool) -> list[ConversationRow]:
if before:
row = self._scrolled_view.get_first_message_row()