Commits

commits@gajim.org

17632 discussions

[Git][gajim/gajim][master] 6 commits: Fix inserting a newline on shift-enter.
by Philipp Hörist 26 Jan '17

26 Jan '17

Philipp Hörist pushed to branch master at gajim / gajim Commits: 18a3258c by Tomasz Miąsko at 2017-01-25T17:05:49+01:00 Fix inserting a newline on shift-enter. Return false from key-press-event to propagate event to a default handler that will insert a newline into the entry widget. - - - - - ffeeb8f9 by Tomasz Miąsko at 2017-01-25T17:05:49+01:00 Simplify send or insert newline logic. - - - - - 2e133d25 by Tomasz Miąsko at 2017-01-25T17:05:49+01:00 Fix tab switching with ctrl+page up and ctrl+page down. - - - - - 0b7d6cc1 by Tomasz Miąsko at 2017-01-25T17:05:49+01:00 Fix moving between lines with up and down arrows. - - - - - b678165d by Tomasz Miąsko at 2017-01-25T18:04:12+01:00 Use the same code path for shift-enter as for ctrl-enter. - - - - - b1940459 by Philipp Hörist at 2017-01-26T19:17:32+01:00 Merge branch 'fix-gtk3-shortcuts' into 'master' Fix keyboard shortcuts in GTK3 See merge request !41 - - - - - 2 changed files: - src/chat_control_base.py - src/message_window.py Changes: ===================================== src/chat_control_base.py ===================================== --- a/src/chat_control_base.py +++ b/src/chat_control_base.py @@ -668,49 +668,37 @@ class ChatControlBase(MessageControl, ChatCommandProcessor, CommandTools): self.scroll_messages('up', message_buffer, 'received') else: # Ctrl+UP self.scroll_messages('up', message_buffer, 'sent') - return True + 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 self.scroll_messages('down', message_buffer, 'received') else: # Ctrl+Down self.scroll_messages('down', message_buffer, 'sent') - return True - + return True elif event.keyval == Gdk.KEY_Return or \ event.keyval == Gdk.KEY_KP_Enter: # ENTER - if event_state & Gdk.ModifierType.SHIFT_MASK: - return True message_textview = widget message_buffer = message_textview.get_buffer() start_iter, end_iter = message_buffer.get_bounds() message = message_buffer.get_text(start_iter, end_iter, False) xhtml = self.msg_textview.get_xhtml() - if gajim.config.get('send_on_ctrl_enter'): - if event_state & Gdk.ModifierType.CONTROL_MASK: # CTRL + ENTER - send_message = True - else: - end_iter = message_buffer.get_end_iter() - message_buffer.insert_at_cursor('\n') - send_message = False - - else: # send on Enter, do newline on Ctrl Enter - if event_state & Gdk.ModifierType.CONTROL_MASK: # Ctrl + ENTER - end_iter = message_buffer.get_end_iter() - message_buffer.insert_at_cursor('\n') - send_message = False - else: # ENTER - send_message = True - - if gajim.connections[self.account].connected < 2 and send_message: + if event_state & Gdk.ModifierType.SHIFT_MASK: + send_message = False + else: + is_ctrl_enter = bool(event_state & Gdk.ModifierType.CONTROL_MASK) + send_message = is_ctrl_enter == gajim.config.get('send_on_ctrl_enter') + + if send_message and gajim.connections[self.account].connected < 2: # we are not connected dialogs.ErrorDialog(_('A connection is not available'), - _('Your message can not be sent until you are connected.')) - send_message = False + _('Your message can not be sent until you are connected.')) + elif send_message: + self.send_message(message, xhtml=xhtml) + else: + message_buffer.insert_at_cursor('\n') - if send_message: - self.send_message(message, xhtml=xhtml) # send the message return True elif event.keyval == Gdk.KEY_z: # CTRL+z if event_state & Gdk.ModifierType.CONTROL_MASK: ===================================== src/message_window.py ===================================== --- a/src/message_window.py +++ b/src/message_window.py @@ -401,7 +401,7 @@ class MessageWindow(object): elif keyval in (Gdk.KEY_Page_Up, Gdk.KEY_Page_Down): # CTRL + PageUp | PageDown # Create event and send it to notebook - event = Gdk.Event(Gdk.EventType.KEY_PRESS) + event = Gdk.Event.new(Gdk.EventType.KEY_PRESS) event.window = self.window.get_window() event.time = int(time.time()) event.state = Gdk.ModifierType.CONTROL_MASK View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/179777239e17ae9917051e8ab218c4d48…

1 0

[Git][gajim/gajim][gajim_0.16] 3 commits: Highlight all paragraphs of a search result in the history window
by Philipp Hörist 26 Jan '17

26 Jan '17

Philipp Hörist pushed to branch gajim_0.16 at gajim / gajim Commits: 7d39b384 by Markus Böhme at 2017-01-25T10:46:31+01:00 Highlight all paragraphs of a search result in the history window A single message may span multiple paragraphs. Highlight all lines belonging to the paragraph containing the search keyword. When filling the history textbuffer, tag each newline character that is ending a message with an invisible tag. Then at search time highlight all lines up to that tag. - - - - - b2e41e93 by Markus Böhme at 2017-01-25T10:48:33+01:00 Remove unnecessary code in message highlighting in the history window The message to be highlighted is searched via an already formatted timestamp, and the match contains the whole timestamp with any preceding characters (like "["). Therefore, calling backward_char on the start iterator of the match just goes back to the previous line and is not needed. - - - - - 27618b2d by Philipp Hörist at 2017-01-26T19:17:06+01:00 Merge branch 'gajim_0.16' into 'gajim_0.16' History window: Highlight all paragraphs of a search result See merge request !31 - - - - - 1 changed file: - src/history_window.py Changes: ===================================== src/history_window.py ===================================== --- a/src/history_window.py +++ b/src/history_window.py @@ -75,6 +75,8 @@ class HistoryWindow: self.history_buffer = self.history_textview.tv.get_buffer() self.history_buffer.create_tag('highlight', background = 'yellow') self.history_buffer.create_tag('invisible', invisible=True) + self.eom_tag = self.history_buffer.create_tag('endofmessage', + invisible=True) self.checkbutton = xml.get_object('log_history_checkbutton') self.checkbutton.connect('toggled', self.on_log_history_checkbutton_toggled) @@ -515,7 +517,7 @@ class HistoryWindow: else: self.history_textview.print_real_text(message, name=contact_name, xhtml=xhtml) - self.history_textview.print_real_text('\n') + self.history_textview.print_real_text('\n', ['endofmessage']) def on_query_entry_activate(self, widget): text = self.query_entry.get_text() @@ -624,13 +626,10 @@ class HistoryWindow: self.calendar.select_day(day) unix_time = model[path][C_TIME] self._scroll_to_result(unix_time) - #FIXME: one day do not search just for unix_time but the whole and user - # specific format of the textbuffer line [time] nick: message - # and highlight all that def _scroll_to_result(self, unix_time): """ - Scroll to the result using unix_time and highlight line + Scroll to the result using unix_time and highlight message """ start_iter = self.history_buffer.get_start_iter() local_time = time.localtime(float(unix_time)) @@ -641,9 +640,9 @@ class HistoryWindow: None) if result is not None: match_start_iter, match_end_iter = result - # include '[' or other character before time - match_start_iter.backward_char() - match_end_iter.forward_line() # highlight all message not just time + while not match_end_iter.has_tag(self.eom_tag): + if not match_end_iter.forward_to_line_end(): + break self.history_buffer.apply_tag_by_name('highlight', match_start_iter, match_end_iter) View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/32085e8bd7b92d37b5cab52d59b77e54f…

1 0

[Git][gajim/gajim][gajim_0.16] update po files
by Yann Leboulanger 25 Jan '17

25 Jan '17

Yann Leboulanger pushed to branch gajim_0.16 at gajim / gajim Commits: 32085e8b by Yann Leboulanger at 2017-01-25T14:07:14+00:00 update po files - - - - - 4 changed files: - po/bg.po - po/da.po - po/de.po - po/el.po The diff was not included because it is too large. View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/32085e8bd7b92d37b5cab52d59b77e54f4…

1 0

[Git][gajim/gajim][gajim_0.16] update resource with .$rand if it was the default "Gajim"
by Yann Leboulanger 24 Jan '17

24 Jan '17

Yann Leboulanger pushed to branch gajim_0.16 at gajim / gajim Commits: f91e9079 by Yann Leboulanger at 2017-01-24T22:21:04+01:00 update resource with .$rand if it was the default "Gajim" - - - - - 2 changed files: - src/common/defs.py - src/common/optparser.py Changes: ===================================== src/common/defs.py ===================================== --- a/src/common/defs.py +++ b/src/common/defs.py @@ -30,7 +30,7 @@ import os.path docdir = '../' basedir = '../' localedir = '../po' -version = '0.16.6' +version = '0.16.6.1' try: node = subprocess.Popen('git rev-parse --short=12 HEAD', shell=True, ===================================== src/common/optparser.py ===================================== --- a/src/common/optparser.py +++ b/src/common/optparser.py @@ -240,6 +240,8 @@ class OptionsParser: self.update_config_to_01601() if old < [0, 16, 4, 1] and new >= [0, 16, 4, 1]: self.update_config_to_01641() + if old < [0, 16, 6, 1] and new >= [0, 16, 6, 1]: + self.update_config_to_01661() gajim.logger.init_vars() gajim.logger.attach_cache_database() @@ -945,3 +947,10 @@ class OptionsParser: gajim.config.set_per('accounts', account, 'connection_types', ' '.join(connection_types)) gajim.config.set('version', '0.16.4.1') + + def update_config_to_01661(self): + for account in self.old_values['accounts'].keys(): + resource = self.old_values['accounts'][account]['resource'] + if resource.lower() == 'gajim': + gajim.config.set_per('accounts', account, 'resource', 'gajim.$rand') + gajim.config.set('version', '0.16.6.1') View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/f91e9079cca8f6b7a0028d80f3313b60b3…

1 0

[Git][gajim/gajim][gajim_0.16] ability to have a random string in the resource
by Yann Leboulanger 24 Jan '17

24 Jan '17

Yann Leboulanger pushed to branch gajim_0.16 at gajim / gajim Commits: 5a251c86 by Yann Leboulanger at 2017-01-24T22:14:02+01:00 ability to have a random string in the resource - - - - - 2 changed files: - src/common/config.py - src/common/connection.py Changes: ===================================== src/common/config.py ===================================== --- a/src/common/config.py +++ b/src/common/config.py @@ -325,7 +325,7 @@ class Config: 'client_cert_encrypted': [ opt_bool, False, '', False ], 'savepass': [ opt_bool, False ], 'password': [ opt_str, '' ], - 'resource': [ opt_str, 'gajim', '', True ], + 'resource': [ opt_str, 'gajim.$rand', '', True ], 'priority': [ opt_int, 5, '', True ], 'adjust_priority_with_status': [ opt_bool, True, _('Priority will change automatically according to your status. Priorities are defined in autopriority_* options.') ], 'autopriority_online': [ opt_int, 50], ===================================== src/common/connection.py ===================================== --- a/src/common/connection.py +++ b/src/common/connection.py @@ -36,7 +36,7 @@ import os import random import socket import operator - +import string import time import locale import hmac @@ -199,8 +199,10 @@ class CommonConnection: resource = gajim.config.get_per('accounts', self.name, 'resource') # All valid resource substitution strings should be added to this hash. if resource: + rand = ''.join(random.choice(string.ascii_uppercase + string.digits) for _ in range(8)) resource = Template(resource).safe_substitute({ - 'hostname': socket.gethostname() + 'hostname': socket.gethostname(), + 'rand': rand }) return resource View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/5a251c86d82dcb07f52cf309c9c78a1e3e…

1 0

[Git][gajim/gajim][gajim_0.16] 2 commits: Add HTMLParser to windows build
by Philipp Hörist 24 Jan '17

24 Jan '17

Philipp Hörist pushed to branch gajim_0.16 at gajim / gajim Commits: db010446 by Philipp Hörist at 2017-01-24T19:47:05+01:00 Add HTMLParser to windows build This Module is needed by the OTR Plugin - - - - - 9cb8733b by Philipp Hörist at 2017-01-24T19:58:05+01:00 Merge branch 'gajim_0.16' into 'gajim_0.16' Add HTMLParser to windows build See merge request !45 - - - - - 1 changed file: - setup_win32.py Changes: ===================================== setup_win32.py ===================================== --- a/setup_win32.py +++ b/setup_win32.py @@ -33,7 +33,7 @@ sys.path.append('src') options = { 'build_exe': { - 'includes': ['new', 'win32com.server', 'win32com.client'], + 'includes': ['new', 'win32com.server', 'win32com.client', 'HTMLParser'], 'packages': ['pkg_resources', 'cffi', 'gtk', 'cryptography', 'Crypto', 'PIL', 'qrcode', 'axolotl', 'google', 'common', 'keyring'], View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/8b6a59fe8f80c8519e5b22e266a31a44c…

1 0

[Git][gajim/gajim][master] Update README.md
by Philipp Hörist 24 Jan '17

24 Jan '17

Philipp Hörist pushed to branch master at gajim / gajim Commits: 17977723 by Philipp Hörist at 2017-01-24T19:04:44+01:00 Update README.md - - - - - 1 changed file: - README.md Changes: ===================================== README.md ===================================== --- a/README.md +++ b/README.md @@ -18,6 +18,6 @@ The goal of Gajim is to provide a full featured and easy to use Jabber/XMPP clie - Latest release: * [Gajim 0.16.6 (.tar.gz)](https://www.gajim.org/downloads/0.16/gajim-0.16.6.tar.gz) * [Gajim 0.16.6-1 (.exe)](https://www.gajim.org/downloads/0.16/gajim-0.16.6-1.exe) - * [Daily snapshot (.tar.gz)](https://www.gajim.org/downloads/snap/?M=D) + * [Daily snapshot](https://www.gajim.org/downloads/snap/?M=D) - [Bug reports and Feature requests](https://dev.gajim.org/gajim/gajim/issues) \ No newline at end of file View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/179777239e17ae9917051e8ab218c4d489…

1 0

[Git][gajim/gajim][master] 3 commits: Use GtkShortcutsWindow to display keyboard shortcuts.
by Philipp Hörist 24 Jan '17

24 Jan '17

Philipp Hörist pushed to branch master at gajim / gajim Commits: 6f6a8d3f by Tomasz Miąsko at 2017-01-24T17:22:05+01:00 Use GtkShortcutsWindow to display keyboard shortcuts. - - - - - 058562b9 by Tomasz Miąsko at 2017-01-24T17:22:08+01:00 Backward compatible keyboard shortcuts information. Use GtkShortcutsWindow if supported, otherwise just point the user to the wiki page with keyboard shortcuts. - - - - - 7a429701 by Philipp Hörist at 2017-01-24T18:01:23+01:00 Merge branch 'shortcuts-window' into 'master' Use GtkShortcutsWindow to display keyboard shortcuts. See merge request !44 - - - - - 3 changed files: - + data/gui/shortcuts_window.ui - src/roster_window.py - + src/shortcuts_window.py Changes: ===================================== data/gui/shortcuts_window.ui ===================================== --- /dev/null +++ b/data/gui/shortcuts_window.ui @@ -0,0 +1,285 @@ +<?xml version="1.0" encoding="UTF-8"?> +<interface> + <object class="GtkShortcutsWindow" id="shortcuts_window"> + <child> + <object class="GtkShortcutsSection"> + <property name="visible">1</property> + <property name="section-name">chat</property> + <property name="title" translatable="yes">Chat Shortcuts</property> + <child> + <object class="GtkShortcutsGroup"> + <property name="visible">1</property> + <property name="title" translatable="yes">Message composition</property> + <child> + <object class="GtkShortcutsShortcut"> + <property name="visible">1</property> + <property name="accelerator">Return</property> + <property name="title" translatable="yes">Send the message</property> + </object> + </child> + <child> + <object class="GtkShortcutsShortcut"> + <property name="visible">1</property> + <property name="accelerator"><shift>Return <ctrl>Return</property> + <property name="title" translatable="yes">Create a new line</property> + </object> + </child> + <child> + <object class="GtkShortcutsShortcut"> + <property name="visible">1</property> + <property name="accelerator"><alt>m</property> + <property name="title" translatable="yes">Select an emoticon</property> + </object> + </child> + <child> + <object class="GtkShortcutsShortcut"> + <property name="visible">1</property> + <property name="accelerator">Tab</property> + <property name="title" translatable="yes">Complete a command or a nick</property> + </object> + </child> + <child> + <object class="GtkShortcutsShortcut"> + <property name="visible">1</property> + <property name="accelerator"><ctrl>Up</property> + <property name="title" translatable="yes">Previous sent message</property> + </object> + </child> + <child> + <object class="GtkShortcutsShortcut"> + <property name="visible">1</property> + <property name="accelerator"><ctrl>Down</property> + <property name="title" translatable="yes">Next sent messages</property> + </object> + </child> + <child> + <object class="GtkShortcutsShortcut"> + <property name="visible">1</property> + <property name="accelerator"><ctrl><alt>Up</property> + <property name="title" translatable="yes">Quote previous message</property> + </object> + </child> + <child> + <object class="GtkShortcutsShortcut"> + <property name="visible">1</property> + <property name="accelerator"><ctrl><alt>Down</property> + <property name="title" translatable="yes">Quote next message</property> + </object> + </child> + <child> + <object class="GtkShortcutsShortcut"> + <property name="visible">1</property> + <property name="accelerator"><ctrl>u</property> + <property name="title" translatable="yes">Clear message entry</property> + </object> + </child> + </object> + </child> + <child> + <object class="GtkShortcutsGroup"> + <property name="visible">1</property> + <property name="title" translatable="yes">Appearance</property> + <child> + <object class="GtkShortcutsShortcut"> + <property name="visible">1</property> + <property name="accelerator"><alt>c</property> + <property name="title" translatable="yes">Toggle full / compact view</property> + </object> + </child> + </object> + </child> + <child> + <object class="GtkShortcutsGroup"> + <property name="visible">1</property> + <property name="title" translatable="yes">Recent history</property> + <child> + <object class="GtkShortcutsShortcut"> + <property name="visible">1</property> + <property name="accelerator"><shift>Page_Up</property> + <property name="title" translatable="yes">Scroll up</property> + </object> + </child> + <child> + <object class="GtkShortcutsShortcut"> + <property name="visible">1</property> + <property name="accelerator"><shift>Page_Down</property> + <property name="title" translatable="yes">Sroll down</property> + </object> + </child> + <child> + <object class="GtkShortcutsShortcut"> + <property name="visible">1</property> + <property name="accelerator"><ctrl>l</property> + <property name="title" translatable="yes">Clear</property> + </object> + </child> + </object> + </child> + <child> + <object class="GtkShortcutsGroup"> + <property name="visible">1</property> + <property name="title" translatable="yes">Tabs</property> + <child> + <object class="GtkShortcutsShortcut"> + <property name="visible">1</property> + <property name="accelerator"><alt>Left <ctrl>Page_Up</property> + <property name="title" translatable="yes">Switch to the previous tab</property> + </object> + </child> + <child> + <object class="GtkShortcutsShortcut"> + <property name="visible">1</property> + <property name="accelerator"><alt>Right <ctrl>Page_Down</property> + <property name="title" translatable="yes">Switch to the next tab</property> + </object> + </child> + <child> + <object class="GtkShortcutsShortcut"> + <property name="visible">1</property> + <property name="accelerator"><Alt>1...9</property> + <property name="title" translatable="yes">Switch to the first - ninth tab</property> + </object> + </child> + <child> + <object class="GtkShortcutsShortcut"> + <property name="visible">1</property> + <property name="accelerator"><ctrl><shift>Tab</property> + <property name="title" translatable="yes">Switch to the previous unread tab</property> + </object> + </child> + <child> + <object class="GtkShortcutsShortcut"> + <property name="visible">1</property> + <property name="accelerator"><ctrl>Tab</property> + <property name="title" translatable="yes">Switch to the next unread tab</property> + </object> + </child> + <child> + <object class="GtkShortcutsShortcut"> + <property name="visible">1</property> + <property name="accelerator">Escape <ctrl>w <ctrl>F4</property> + <property name="title" translatable="yes">Close chat</property> + </object> + </child> + </object> + </child> + </object> + </child> + <child> + <object class="GtkShortcutsSection"> + <property name="visible">1</property> + <property name="section-name">roster</property> + <property name="title" translatable="yes">Roster Shortcuts</property> + <child> + <object class="GtkShortcutsGroup"> + <property name="visible">1</property> + <property name="title" translatable="yes">General</property> + <child> + <object class="GtkShortcutsShortcut"> + <property name="visible">1</property> + <property name="accelerator"><ctrl><shift>a</property> + <property name="title" translatable="yes">Accounts</property> + </object> + </child> + <child> + <object class="GtkShortcutsShortcut"> + <property name="visible">1</property> + <property name="accelerator"><ctrl>p</property> + <property name="title" translatable="yes">Preferences</property> + </object> + </child> + <child> + <object class="GtkShortcutsShortcut"> + <property name="visible">1</property> + <property name="accelerator"><ctrl>t</property> + <property name="title" translatable="yes">File transfers</property> + </object> + </child> + <child> + <object class="GtkShortcutsShortcut"> + <property name="visible">1</property> + <property name="accelerator"><ctrl>n</property> + <property name="title" translatable="yes">Start a new chat</property> + </object> + </child> + <child> + <object class="GtkShortcutsShortcut"> + <property name="visible">1</property> + <property name="accelerator"><ctrl>j</property> + <property name="title" translatable="yes">Join a group chat</property> + </object> + </child> + <child> + <object class="GtkShortcutsShortcut"> + <property name="visible">1</property> + <property name="accelerator"><ctrl>s</property> + <property name="title" translatable="yes">Set the status message</property> + </object> + </child> + <child> + <object class="GtkShortcutsShortcut"> + <property name="visible">1</property> + <property name="accelerator"><ctrl>q</property> + <property name="title" translatable="yes">Quit Gajim</property> + </object> + </child> + </object> + </child> + <child> + <object class="GtkShortcutsGroup"> + <property name="visible">1</property> + <property name="title" translatable="yes">Appearance</property> + <child> + <object class="GtkShortcutsShortcut"> + <property name="visible">1</property> + <property name="accelerator"><ctrl>o</property> + <property name="title" translatable="yes">Show offline contacts</property> + </object> + </child> + <child> + <object class="GtkShortcutsShortcut"> + <property name="visible">1</property> + <property name="accelerator"><ctrl>y</property> + <property name="title" translatable="yes">Show only active contacts</property> + </object> + </child> + <child> + <object class="GtkShortcutsShortcut"> + <property name="visible">1</property> + <property name="accelerator"><ctrl>k</property> + <property name="title" translatable="yes">Enable roster filtering</property> + </object> + </child> + </object> + </child> + <child> + <object class="GtkShortcutsGroup"> + <property name="visible">1</property> + <property name="title" translatable="yes">Contacts</property> + <child> + <object class="GtkShortcutsShortcut"> + <property name="visible">1</property> + <property name="accelerator"><ctrl>i</property> + <property name="title" translatable="yes">Contact information</property> + </object> + </child> + <child> + <object class="GtkShortcutsShortcut"> + <property name="visible">1</property> + <property name="accelerator">F2</property> + <property name="title" translatable="yes">Rename contact</property> + </object> + </child> + <child> + <object class="GtkShortcutsShortcut"> + <property name="visible">1</property> + <property name="accelerator">Delete</property> + <property name="title" translatable="yes">Delete contact</property> + </object> + </child> + </object> + </child> + </object> + </child> + </object> +</interface> ===================================== src/roster_window.py ===================================== --- a/src/roster_window.py +++ b/src/roster_window.py @@ -56,6 +56,7 @@ import tooltips import message_control import adhoc_commands import features_window +import shortcuts_window import plugins import plugins.gui @@ -3852,8 +3853,7 @@ class RosterWindow: 'http://trac.gajim.org/wiki/GajimFaq') def on_keyboard_shortcuts_menuitem_activate(self, widget): - helpers.launch_browser_mailer('url', - 'http://trac.gajim.org/wiki/KeyboardShortcuts') + shortcuts_window.show(self.window) def on_features_menuitem_activate(self, widget): features_window.FeaturesWindow() ===================================== src/shortcuts_window.py ===================================== --- /dev/null +++ b/src/shortcuts_window.py @@ -0,0 +1,50 @@ +# -*- coding:utf-8 -*- +## src/shortcuts_window.py +## +## This file is part of Gajim. +## +## Gajim is free software; you can redistribute it and/or modify +## it under the terms of the GNU General Public License as published +## by the Free Software Foundation; version 3 only. +## +## Gajim is distributed in the hope that it will be useful, +## but WITHOUT ANY WARRANTY; without even the implied warranty of +## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +## GNU General Public License for more details. +## +## You should have received a copy of the GNU General Public License +## along with Gajim. If not, see <http://www.gnu.org/licenses/>. +## + +from gi.repository import Gtk + +import gtkgui_helpers + +from common import helpers + +__all__ = ['show'] + +class ShortcutsWindow: + def __init__(self): + self.window = None + + def show(self, parent=None): + if self.window is None: + builder = gtkgui_helpers.get_gtk_builder('shortcuts_window.ui') + self.window = builder.get_object('shortcuts_window') + self.window.connect('destroy', self._on_window_destroy) + self.window.set_transient_for(parent) + self.window.show_all() + self.window.present() + + def _on_window_destroy(self, widget): + self.window = None + +def show_shortcuts_webpage(self, parent=None): + helpers.launch_browser_mailer('url', + 'https://dev.gajim.org/gajim/gajim/wikis/help/keyboardshortcuts') + +if (3, 19) <= (Gtk.get_major_version(), Gtk.get_minor_version()): + show = ShortcutsWindow().show +else: + show = show_shortcuts_webpage View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/d2cfa9bbba11e3725b2ceb206b274583a…

1 0

[Git][gajim/gajim][master] 2 commits: Fix history scrolling in gtk3 #8481.
by Philipp Hörist 24 Jan '17

24 Jan '17

Philipp Hörist pushed to branch master at gajim / gajim Commits: 0dce40bb by Tomasz Miąsko at 2017-01-24T15:29:15+01:00 Fix history scrolling in gtk3 #8481. * Delay scrolling using GLib.idle_add. According to the GTK documentation the scroll_to_mark should be doing this internally already, but it is not the case. * Center highlighted message vertically. - - - - - d2cfa9bb by Philipp Hörist at 2017-01-24T16:24:32+01:00 Merge branch 'history-scrolling' into 'master' Fix history scrolling in gtk3 #8481. See merge request !39 - - - - - 1 changed file: - src/history_window.py Changes: ===================================== src/history_window.py ===================================== --- a/src/history_window.py +++ b/src/history_window.py @@ -622,10 +622,9 @@ class HistoryWindow: match_end_iter.forward_line() # highlight all message not just time self.history_buffer.apply_tag_by_name('highlight', match_start_iter, match_end_iter) - - match_start_mark = self.history_buffer.create_mark('match_start', - match_start_iter, True) - self.history_textview.tv.scroll_to_mark(match_start_mark, 0, True) + mark = self.history_buffer.create_mark('match', match_start_iter, True) + GLib.idle_add(self.history_textview.tv.scroll_to_mark, mark, + 0, True, 0.0, 0.5) def on_log_history_checkbutton_toggled(self, widget): # log conversation history? View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/a779066a61b29e22a67139eab5bcf9996…

1 0

[Git][gajim/gajim][gajim_0.16] 2 commits: Add qrcode to windows build
by Philipp Hörist 24 Jan '17

24 Jan '17

Philipp Hörist pushed to branch gajim_0.16 at gajim / gajim Commits: 7af6a8fb by Philipp Hörist at 2017-01-24T15:04:41+01:00 Add qrcode to windows build The OMEMO Plugin needs this for showing QR Codes - - - - - 8b6a59fe by Philipp Hörist at 2017-01-24T15:24:32+01:00 Merge branch 'gajim_0.16' into 'gajim_0.16' Add qrcode to windows build See merge request !43 - - - - - 2 changed files: - requirements.txt - setup_win32.py Changes: ===================================== requirements.txt ===================================== --- a/requirements.txt +++ b/requirements.txt @@ -14,3 +14,4 @@ pillow pycurl docutils pygments +qrcode ===================================== setup_win32.py ===================================== --- a/setup_win32.py +++ b/setup_win32.py @@ -33,11 +33,10 @@ sys.path.append('src') options = { 'build_exe': { - 'includes': ['win32com.server', 'win32com.client'], + 'includes': ['new', 'win32com.server', 'win32com.client'], 'packages': ['pkg_resources', 'cffi', 'gtk', - 'cryptography', 'Crypto', 'PIL', + 'cryptography', 'Crypto', 'PIL', 'qrcode', 'axolotl', 'google', 'common', 'keyring'], - 'includes': ['new'], 'excludes': ['Tkinter', 'unittest', 'psutil'], } } View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/2761be11167b507f53d9e6cfd3dd69e0f…

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits