Daniel Brötzmann pushed to branch mainwindow at gajim / gajim
Commits: 24cca18a by wurstsalat at 2021-05-30T12:52:49+02:00 ConversationView: Fix imports
- - - - - 7439d476 by wurstsalat at 2021-05-30T13:08:39+02:00 BaseControl: Remove unused method
- - - - -
2 changed files:
- gajim/gtk/controls/base.py - gajim/gtk/conversation/view.py
Changes:
===================================== gajim/gtk/controls/base.py ===================================== @@ -821,7 +821,6 @@ def _on_message_textview_key_press_event(self, textview, event):
if event.keyval in (Gdk.KEY_Page_Down, Gdk.KEY_Page_Up): self.conversation_view.event(event) - self._on_scroll(None, event.keyval) return True
if event.get_state() & Gdk.ModifierType.CONTROL_MASK: @@ -868,14 +867,14 @@ def _on_message_textview_key_press_event(self, textview, event): self.last_key_tabs = False if event.keyval == Gdk.KEY_Up: if event_state & Gdk.ModifierType.CONTROL_MASK: - if event_state & Gdk.ModifierType.SHIFT_MASK: # Ctrl+Shift+UP + if event_state & Gdk.ModifierType.SHIFT_MASK: # Ctrl+Shift+UP self.scroll_messages('up', message_buffer, 'received') else: # Ctrl+UP self.scroll_messages('up', message_buffer, 'sent') return True elif event.keyval == Gdk.KEY_Down: if event_state & Gdk.ModifierType.CONTROL_MASK: - if event_state & Gdk.ModifierType.SHIFT_MASK: # Ctrl+Shift+Down + if event_state & Gdk.ModifierType.SHIFT_MASK: # Ctrl+Shift+Down self.scroll_messages('down', message_buffer, 'received') else: # Ctrl+Down self.scroll_messages('down', message_buffer, 'sent')
===================================== gajim/gtk/conversation/view.py ===================================== @@ -26,17 +26,16 @@ from gajim.common.helpers import to_user_string from gajim.common.helpers import get_start_of_day
-from .util import scroll_to_end -from .conversation.rows.read_marker import ReadMarkerRow -from .conversation.rows.scroll_hint import ScrollHintRow -from .conversation.rows.message import MessageRow -from .conversation.rows.info import InfoMessage -from .conversation.rows.date import DateRow -from .conversation.rows.file_transfer import FileTransferRow -from .conversation.rows.muc_subject import MUCSubject -from .conversation.rows.muc_join_left import MUCJoinLeft -from .conversation.rows.muc_user_status import MUCUserStatus - +from .rows.read_marker import ReadMarkerRow +from .rows.scroll_hint import ScrollHintRow +from .rows.message import MessageRow +from .rows.info import InfoMessage +from .rows.date import DateRow +from .rows.file_transfer import FileTransferRow +from .rows.muc_subject import MUCSubject +from .rows.muc_join_left import MUCJoinLeft +from .rows.muc_user_status import MUCUserStatus +from ..util import scroll_to_end
log = logging.getLogger('gajim.gui.conversation_view')
@@ -115,7 +114,8 @@ def _reset_conversation_view(self): self._row_count = 0 self.clearing = False
- def _sort_func(self, row1, row2): + @staticmethod + def _sort_func(row1, row2): if row1.timestamp == row2.timestamp: return 0 return -1 if row1.timestamp < row2.timestamp else 1
View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/898eedee2d9f00409d6ecd06d4c6a700...
-
Daniel Brötzmann