Commits

commits@gajim.org

17632 discussions

[Git][gajim/gajim] Deleted branch splash_screen
by Philipp Hörist 29 Sep '19

29 Sep '19

Philipp Hörist deleted branch splash_screen at gajim / gajim -- You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim] Deleted branch osx_newbuildsys
by Philipp Hörist 29 Sep '19

29 Sep '19

Philipp Hörist deleted branch osx_newbuildsys at gajim / gajim -- You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][chat_markers] Remove chat marker from modules
by Philipp Hörist 29 Sep '19

29 Sep '19

Philipp Hörist pushed to branch chat_markers at gajim / gajim Commits: f5377d98 by Philipp Hörist at 2019-09-29T19:07:51Z Remove chat marker from modules - - - - - 1 changed file: - gajim/common/modules/__init__.py Changes: ===================================== gajim/common/modules/__init__.py ===================================== @@ -40,7 +40,6 @@ MODULES = [ 'bookmarks', 'caps', 'carbons', - 'chat_markers', 'chatstates', 'delimiter', 'discovery', View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/f5377d98af23483244d71196a8e5cfab96… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/f5377d98af23483244d71196a8e5cfab96… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][chat_markers] 68 commits: DialogButton: Add Accept button type
by Philipp Hörist 29 Sep '19

29 Sep '19

Philipp Hörist pushed to branch chat_markers at gajim / gajim Commits: ee7ad12f by Daniel Brötzmann at 2019-09-02T15:25:57Z DialogButton: Add Accept button type - - - - - 1044d1c7 by Philipp Hörist at 2019-09-02T19:55:01Z Improve default avatar caching Caches now also the circle clipping - - - - - 032930ce by Philipp Hörist at 2019-09-03T20:47:30Z Avatar: Add indicator for show value - - - - - 279143f8 by Philipp Hörist at 2019-09-03T20:50:27Z StartChat: Display show value with avatar - - - - - d15ec5e7 by Philipp Hörist at 2019-09-03T20:50:31Z ChatControl: Display show value with avatar - - - - - c51e8498 by Philipp Hörist at 2019-09-03T22:53:10Z PrivateChatControl: Display show value with avatar - - - - - 2745d3ce by Philipp Hörist at 2019-09-04T16:50:26Z Use cross-platform compatible cursors see: https://lazka.github.io/pgi-docs/Gdk-3.0/classes/Cursor.html#Gdk.Cursor.new… Fixes #9800 - - - - - 0927655c by Philipp Hörist at 2019-09-04T16:51:13Z Remove unused import - - - - - 18070f59 by Philipp Hörist at 2019-09-04T18:29:28Z Avatar: Make show indicator smaller - - - - - 0a3bd34e by Daniel Brötzmann at 2019-09-05T19:33:28Z Replace PlainConnectionDialog with NewConfirmationCheckDialog - - - - - 911aaa1f by Daniel Brötzmann at 2019-09-05T19:34:05Z Remove PlainConnectionDialog - - - - - 2257da6c by Daniel Brötzmann at 2019-09-05T21:02:00Z CommandSystem: Add setting to disable execution of commands by default - - - - - 9f59eb54 by Daniel Brötzmann at 2019-09-05T21:02:00Z CommandSystem: Fix some pylint errors - - - - - 45a200f7 by Philipp Hörist at 2019-09-06T20:23:28Z Remove menu for saving avatar to harddisk All avatars are available under ~/.cache/gajim/avatars - - - - - ea251998 by Philipp Hörist at 2019-09-06T20:23:28Z Avatar: Force avatars to be square - - - - - 5623dfba by Philipp Hörist at 2019-09-06T20:23:28Z Avatar: Remove unused method - - - - - a27a4003 by Daniel Brötzmann at 2019-09-07T15:09:32Z Use Accept (and make it the default) for image pasting - - - - - d47bee03 by Daniel Brötzmann at 2019-09-07T15:10:23Z Use Accept default button, adapt some text strings - - - - - 07bb750d by Daniel Brötzmann at 2019-09-09T12:35:06Z Fix handle_event_http_auth answers from NewConfirmationDialog - - - - - ac428f11 by Daniel Brötzmann at 2019-09-11T05:02:45Z Rework SSLErrorDialog - - - - - ed80f936 by Daniel Brötzmann at 2019-09-11T09:11:27Z Remove obsolete ConfirmationDialogDoubleCheck - - - - - 16046d7e by Andrey Gursky at 2019-09-11T15:17:47Z ChatControlBase: fix autoscroll on keyboard shortcuts The issue reported by concerto [1] is a regression since af312830ef42fdb7. [1] https://conference.gajim.org:5281/muc_log/gajim/2019-09-10#df591057-8693-4e… - - - - - 890846fc by Philipp Hörist at 2019-09-12T18:50:24Z Show SSLError dialog for all errors Fixes #9835 - - - - - c4a4f60f by Philipp Hörist at 2019-09-15T20:13:42Z GroupChat: Use correct key when formatting message - - - - - 92d127ae by Philipp Hörist at 2019-09-16T19:37:30Z AddContact: Handle only bare JIDs - - - - - 2c4f4d1e by Philipp Hörist at 2019-09-16T19:41:21Z AddContact: Set info button sensitive if JID is passed - - - - - a1c352f2 by Philipp Hörist at 2019-09-17T18:03:16Z XMLConsole: Inject jabber:client into message, presence and iq - - - - - fee45899 by Philipp Hörist at 2019-09-21T11:02:11Z Remove unused glade file - - - - - 642638be by Philipp Hörist at 2019-09-21T11:03:09Z Make GCTooltip destructable - - - - - 7f5a6d0a by Philipp Hörist at 2019-09-21T21:57:33Z Change some MUC helper methods - Add plural support for get_uf_affiliation() - Accept nbxmpp.Role and nbxmpp.Affiliation as arguments - Add is_affiliation_change_allowed() - Add is_role_change_allowed() - - - - - 921594c1 by Philipp Hörist at 2019-09-21T21:59:47Z Rework Groupchat Roster - Add own module for roster code - Use avatars with status integrated - Favor performance over features - - - - - e1cdd603 by Philipp Hörist at 2019-09-22T07:29:36Z MUC: Improve change affiliation logic - - - - - 933702df by Philipp Hörist at 2019-09-22T08:22:52Z MUC: Show Make/Revoke Member menu entry correctly - - - - - dcbd5f9c by Philipp Hörist at 2019-09-22T08:31:49Z Remove unused import - - - - - 837e9a1a by Philipp Hörist at 2019-09-22T09:35:22Z Icons: Add 32 px feather icons for HiDPI Screens - - - - - c230f5c4 by Philipp Hörist at 2019-09-22T16:43:17Z Consider private variables for @event_filter - - - - - 94b058cd by Philipp Hörist at 2019-09-22T16:59:32Z Add account-disconnected event This is a dedicated event so we dont have to use the our-show event - - - - - 44e6b0f0 by Philipp Hörist at 2019-09-22T19:58:58Z MUC: Refactor auto-rejoin - Rewrite auto-rejoin code and move it into muc module - - - - - 9922ce1d by Philipp Hörist at 2019-09-23T15:16:23Z Groupchat: Remove traces of continued conversations - - - - - ca328a67 by Philipp Hörist at 2019-09-23T15:20:19Z Groupchat: Remove unused argument - - - - - 19e862c2 by Philipp Hörist at 2019-09-23T18:17:46Z Update pylint-ci.sh - - - - - 1e37087a by Philipp Hörist at 2019-09-23T19:16:49Z Update pylint-ci.sh - - - - - 1d4f0a58 by Philipp Hörist at 2019-09-23T19:36:15Z Update gitlab-ci.yml - - - - - a01c130a by Philipp Hörist at 2019-09-23T20:23:36Z CI: Disable pylint E1136 for now This reports a false positiv, see https://gitlab.gnome.org/GNOME/pygobject/issues/361 - - - - - 40ea0c9d by Philipp Hörist at 2019-09-23T20:34:03Z CI: Disable pylint E1133 for now see https://gitlab.gnome.org/GNOME/pygobject/issues/361 - - - - - 3647524a by Philipp Hörist at 2019-09-24T16:31:58Z Presence: Dont show SubscriptionRequestWindow on auto approve - - - - - 3de999d9 by Daniel Brötzmann at 2019-09-25T16:32:05Z Fix show_unsubscribed_dialog - - - - - 3d381a98 by Philipp Hörist at 2019-09-28T23:16:57Z Add Bookmarks 2 (XEP-0402) support - - - - - 0c84072e by Philipp Hörist at 2019-09-28T23:33:52Z Bookmarks: Register event handler correctly - - - - - 8936a07e by Daniel Brötzmann at 2019-09-29T00:31:30Z ServerInfo: Rework Dialog - Split information into different notebook tabs - Show connection information (Fixes #6096) - - - - - 1f663a24 by Philipp Hörist at 2019-09-29T08:35:03Z Remove unused function - - - - - f5244e37 by Philipp Hörist at 2019-09-29T11:20:16Z Bookmarks: Don't accept PEP notificiations before request - - - - - a934551c by Philipp Hörist at 2019-09-29T11:32:03Z Bookmarks: Add dev config setting for testing bookmarks 2 - - - - - 56e3a0bc by Philipp Hörist at 2019-09-29T12:44:45Z MUC: Move muc state code into MUCManager - - - - - 61fce039 by Philipp Hörist at 2019-09-29T12:46:41Z Remove unused attributes - - - - - bcd15212 by Philipp Hörist at 2019-09-29T12:57:44Z Groupchat: Fix hide_groupchat_banner option - - - - - 52ccca95 by Philipp Hörist at 2019-09-29T13:46:35Z ChatControl: Move set_lock_image to ChatControlBase - - - - - 687d0fda by Philipp Hörist at 2019-09-29T14:53:02Z ChatControl: Access attributes on GtkBuilder directly - - - - - a4c82784 by Philipp Hörist at 2019-09-29T15:03:39Z ChatControl: Remove usage of widget_set_visible() - - - - - 5324291c by Philipp Hörist at 2019-09-29T15:03:56Z Remove unused method - - - - - 7cadbc69 by Philipp Hörist at 2019-09-29T15:37:47Z Groupchat: Fix various pylint errors - - - - - 9403eaba by Philipp Hörist at 2019-09-29T15:59:33Z Modules: Fix various pylint errors - - - - - 18583623 by Philipp Hörist at 2019-09-29T16:11:28Z DBus: Fix various pylint errors - - - - - f70365da by Philipp Hörist at 2019-09-29T16:19:47Z Jingle: Fix undefined variable - - - - - 97625a72 by Link Mauve at 2019-09-29T18:28:52Z Preferences: Add a video preview widget In order to work on every system Gajim runs on (instead of only X11), this new widget uses GTK+ Gstreamer elements. It currently completely breaks the actual Jingle thing, but that was already pretty broken so will be fixed in a later commit. It might be nice to think about the way we want to make preferences interact with a currently-running audio/video session, since it currently uses a separate pipeline and thus will conflict when e.g. both will want to access the same camera device, if the OS doesn’t implement multiplexing (Linux doesn’t). - - - - - 3b1f1cd5 by Philipp Hörist at 2019-09-29T18:45:31Z Groupchat: Fix tab completion - - - - - e5347232 by Yann Leboulanger at 2019-09-29T18:59:13Z start implementing XEP-0333, chat markers - - - - - d8887381 by Yann Leboulanger at 2019-09-29T18:59:13Z fix error - - - - - 30 changed files: - .gitlab-ci.yml - gajim/app_actions.py - gajim/chat_control.py - gajim/chat_control_base.py - gajim/command_system/errors.py - gajim/command_system/framework.py - gajim/command_system/implementation/custom.py - gajim/command_system/implementation/execute.py - gajim/command_system/implementation/hosts.py - gajim/command_system/implementation/middleware.py - gajim/command_system/implementation/standard.py - gajim/command_system/mapping.py - gajim/command_system/tools.py - gajim/common/app.py - gajim/common/config.py - gajim/common/connection.py - gajim/common/contacts.py - gajim/common/dbus/location.py - gajim/common/dbus/logind.py - gajim/common/dbus/music_track.py - gajim/common/dbus/screensaver.py - gajim/common/events.py - gajim/common/helpers.py - gajim/common/modules/__init__.py - gajim/common/modules/adhoc_commands.py - gajim/common/modules/base.py - gajim/common/modules/bits_of_binary.py - gajim/common/modules/bookmarks.py - gajim/common/modules/chatstates.py - gajim/common/modules/discovery.py The diff was not included because it is too large. View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/b22005a86aabbc404f2670fc90997c582… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/b22005a86aabbc404f2670fc90997c582… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Groupchat: Fix tab completion
by Philipp Hörist 29 Sep '19

29 Sep '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 3b1f1cd5 by Philipp Hörist at 2019-09-29T18:45:31Z Groupchat: Fix tab completion - - - - - 1 changed file: - gajim/groupchat_control.py Changes: ===================================== gajim/groupchat_control.py ===================================== @@ -1769,7 +1769,7 @@ class GroupchatControl(ChatControlBase): if res: return True - if event.keyval != Gdk.KEY_Tab: # TAB + if event.keyval == Gdk.KEY_Tab: # TAB message_buffer = widget.get_buffer() start_iter, end_iter = message_buffer.get_bounds() cursor_position = message_buffer.get_insert() View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/3b1f1cd51ecb5cd165956cf7dfce5141d4… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/3b1f1cd51ecb5cd165956cf7dfce5141d4… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Preferences: Add a video preview widget
by Philipp Hörist 29 Sep '19

29 Sep '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 97625a72 by Link Mauve at 2019-09-29T18:28:52Z Preferences: Add a video preview widget In order to work on every system Gajim runs on (instead of only X11), this new widget uses GTK+ Gstreamer elements. It currently completely breaks the actual Jingle thing, but that was already pretty broken so will be fixed in a later commit. It might be nice to think about the way we want to make preferences interact with a currently-running audio/video session, since it currently uses a separate pipeline and thus will conflict when e.g. both will want to access the same camera device, if the OS doesn’t implement multiplexing (Linux doesn’t). - - - - - 4 changed files: - gajim/common/config.py - gajim/common/multimedia_helpers.py - gajim/data/gui/preferences_window.ui - gajim/gtk/preferences.py Changes: ===================================== gajim/common/config.py ===================================== @@ -257,7 +257,6 @@ class Config: 'audio_input_device': [opt_str, 'autoaudiosrc ! volume name=gajim_vol'], 'audio_output_device': [opt_str, 'autoaudiosink'], 'video_input_device': [opt_str, 'autovideosrc'], - 'video_output_device': [opt_str, 'autovideosink'], 'video_framerate': [opt_str, '', _('Optionally fix Jingle output video framerate. Example: 10/1 or 25/2.')], 'video_size': [opt_str, '', _('Optionally resize Jingle output video. Example: 320x240.')], 'video_see_self': [opt_bool, True, _('If enabled, you will see your webcam\'s video stream as well.')], ===================================== gajim/common/multimedia_helpers.py ===================================== @@ -97,24 +97,16 @@ class VideoInputManager(DeviceManager): self.devices = {} # Test src self.detect_element('videotestsrc', _('Video test'), - '%s is-live=true ! video/x-raw,framerate=10/1') + '%s is-live=true ! video/x-raw,framerate=10/1 ! videoconvert') # Auto src self.detect_element('autovideosrc', _('Autodetect')) - # V4L2 src + # Best source on Linux, for both camera and screen sharing + self.detect_element('pipewiresrc', _('Pipewire')) + # Camera source on Linux self.detect_element('v4l2src', _('V4L2: %s')) - # Funny things, just to test... - # self.devices['GOOM'] = 'audiotestsrc ! goom' - self.detect_element('ximagesrc', _('Screen'), '%s ! ffmpegcolorspace') - - -class VideoOutputManager(DeviceManager): - def detect(self): - self.devices = {} - # Fake video output - self.detect_element('fakesink', _('Fake video output')) - # Auto sink - self.detect_element('xvimagesink', - _('X Window System (X11/XShm/Xv): %s')) - # ximagesink - self.detect_element('ximagesink', _('X Window System (without Xv)')) - self.detect_element('autovideosink', _('Autodetect')) + # X11 screen sharing on Linux + self.detect_element('ximagesrc', _('X11'), '%s ! ffmpegcolorspace') + # Recommended source on Windows + self.detect_element('ksvideosrc', _('Windows')) + # Recommended source on OS X + self.detect_element('avfvideosrc', _('macOS')) ===================================== gajim/data/gui/preferences_window.ui ===================================== @@ -2232,9 +2232,8 @@ $T will be replaced by auto-not-available timeout.</property> <property name="visible">True</property> <property name="can_focus">False</property> <property name="halign">end</property> - <property name="label" translatable="yes">V_ideo output device</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">video_output_combobox</property> + <property name="label" translatable="yes">Video output</property> + <property name="mnemonic_widget">selected_video_output</property> <style> <class name="dim-label"/> </style> @@ -2245,10 +2244,10 @@ $T will be replaced by auto-not-available timeout.</property> </packing> </child> <child> - <object class="GtkComboBox" id="video_output_combobox"> + <object class="GtkLabel" id="selected_video_output"> <property name="visible">True</property> <property name="can_focus">False</property> - <signal name="changed" handler="on_video_output_combobox_changed" swapped="no"/> + <property name="halign">start</property> </object> <packing> <property name="left_attach">1</property> ===================================== gajim/gtk/preferences.py ===================================== @@ -13,6 +13,7 @@ # along with Gajim. If not, see <http://www.gnu.org/licenses/>. import os +import logging from gi.repository import Gtk from gi.repository import Gdk @@ -41,7 +42,8 @@ from gajim.gtk.sounds import ManageSounds try: from gajim.common.multimedia_helpers import AudioInputManager, AudioOutputManager - from gajim.common.multimedia_helpers import VideoInputManager, VideoOutputManager + from gajim.common.multimedia_helpers import VideoInputManager + from gi.repository import Gst # pylint: disable=ungrouped-imports HAS_GST = True except (ImportError, ValueError): HAS_GST = False @@ -49,6 +51,8 @@ except (ImportError, ValueError): if app.is_installed('GSPELL'): from gi.repository import Gspell # pylint: disable=ungrouped-imports +log = logging.getLogger('gajim.gtk.preferences') + class Preferences(Gtk.ApplicationWindow): def __init__(self): @@ -333,7 +337,8 @@ class Preferences(Gtk.ApplicationWindow): ### Audio/Video tab ### def create_av_combobox(opt_name, device_dict, config_name=None, - key=None): + # This key is there to give the first index to autovideosrc and co. + key=lambda x: '' if x[1].startswith('auto') else x[0].lower()): combobox = self._ui.get_object(opt_name + '_combobox') cell = Gtk.CellRendererText() cell.set_property('ellipsize', Pango.EllipsizeMode.END) @@ -348,33 +353,109 @@ class Preferences(Gtk.ApplicationWindow): config = app.config.get(opt_name + '_device') for index, (name, value) in enumerate(sorted(device_dict.items(), - key=key)): + key=key)): model.append((name, value)) if config == value: combobox.set_active(index) if HAS_GST and app.is_installed('FARSTREAM'): create_av_combobox('audio_input', AudioInputManager().get_devices()) - create_av_combobox('audio_output', AudioOutputManager().get_devices( - )) + create_av_combobox('audio_output', AudioOutputManager().get_devices()) create_av_combobox('video_input', VideoInputManager().get_devices()) - create_av_combobox('video_output', VideoOutputManager().get_devices( - )) - - create_av_combobox('video_framerate', {_('Default'): '', - '15fps': '15/1', '10fps': '10/1', '5fps': '5/1', - '2.5fps': '5/2'}, 'video_framerate', key=lambda x: -1 if \ - not x[1] else float(x[0][:-3])) - create_av_combobox('video_size', {_('Default'): '', - '800x600': '800x600', '640x480': '640x480', - '320x240': '320x240'}, 'video_size', key=lambda x: -1 if \ - not x[1] else int(x[0][:3])) + + create_av_combobox( + 'video_framerate', + {_('Default'): '', + '15fps': '15/1', + '10fps': '10/1', + '5fps': '5/1', + '2.5fps': '5/2'}, + 'video_framerate', + key=lambda x: -1 if not x[1] else float(x[0][:-3])) + create_av_combobox( + 'video_size', + {_('Default'): '', + '800x600': '800x600', + '640x480': '640x480', + '320x240': '320x240'}, + 'video_size', + key=lambda x: -1 if not x[1] else int(x[0][:3])) st = app.config.get('video_see_self') self._ui.video_see_self_checkbutton.set_active(st) + def on_av_map(tab): + label = self._ui.selected_video_output + sink, widget, name = self.setup_video_output() + if sink is None: + log.error('Failed to obtain a working Gstreamer GTK+ sink, ' + 'video support will be disabled') + self._ui.video_input_combobox.set_sensitive(False) + label.set_markup( + _('<span color="red" font-weight="bold">' + 'Unavailable</span>, video support will be disabled')) + return + + text = '' + if name == 'gtkglsink': + text = _('<span color="green" font-weight="bold">' + 'OpenGL</span> accelerated') + elif name == 'gtksink': + text = _('<span color="yellow" font-weight="bold">' + 'Unaccelerated</span>') + label.set_markup(text) + if self.av_pipeline is None: + self.av_pipeline = Gst.Pipeline.new('preferences-pipeline') + else: + self.av_pipeline.set_state(Gst.State.NULL) + self.av_pipeline.add(sink) + self.av_sink = sink + if self.av_widget is not None: + tab.remove(self.av_widget) + tab.add(widget) + self.av_widget = widget + + src_name = app.config.get('video_input_device') + self.av_src = Gst.parse_bin_from_description(src_name, True) + if self.av_src is not None: + self.av_pipeline.add(self.av_src) + self.av_src.link(self.av_sink) + self.av_pipeline.set_state(Gst.State.PLAYING) + else: + # Parsing the pipeline stored in video_input_device failed, + # let’s try the default one. + self.av_src = Gst.ElementFactory.make('autovideosrc', None) + if self.av_src is None: + log.error('Failed to obtain a working Gstreamer source,' + ' video will be disabled.') + self._ui.video_input_combobox.set_sensitive(False) + return + # Great, this succeeded, let’s store it back into the + # config and use it. We’ve made autovideosrc the first + # element in the combobox so we can pick index 0 without + # worry. + combobox = self._ui.video_input_combobox + combobox.set_active(0) + + def on_av_unmap(tab): + self.av_pipeline.set_state(Gst.State.NULL) + self.av_pipeline.remove(self.av_src) + self.av_src = None + self.av_pipeline.remove(self.av_sink) + self.av_sink = None + tab.remove(self.av_widget) + self.av_widget = None + + self.av_pipeline = None + self.av_src = None + self.av_sink = None + self.av_widget = None + tab = self._ui.audio_video_tab + tab.connect('map', on_av_map) + tab.connect('unmap', on_av_unmap) + else: for opt_name in ('audio_input', 'audio_output', 'video_input', - 'video_output', 'video_framerate', 'video_size'): + 'video_framerate', 'video_size'): combobox = self._ui.get_object(opt_name + '_combobox') combobox.set_sensitive(False) @@ -438,6 +519,27 @@ class Preferences(Gtk.ApplicationWindow): if event.keyval == Gdk.KEY_Escape: self.destroy() + @staticmethod + def setup_video_output(): + gtkglsink = Gst.ElementFactory.make('gtkglsink', None) + if gtkglsink is not None: + glsinkbin = Gst.ElementFactory.make('glsinkbin', None) + if glsinkbin is None: + return None, None, None + glsinkbin.set_property('sink', gtkglsink) + sink = glsinkbin + widget = gtkglsink.get_property('widget') + name = 'gtkglsink' + else: + sink = Gst.ElementFactory.make('gtksink', None) + if sink is None: + return None, None, None + widget = sink.get_property('widget') + name = 'gtksink' + widget.set_visible(True) + widget.set_property('expand', True) + return sink, widget, name + def get_per_account_option(self, opt): """ Return the value of the option opt if it's the same in all accounts else @@ -919,6 +1021,7 @@ class Preferences(Gtk.ApplicationWindow): active = combobox.get_active() device = model[active][1] app.config.set(config_name, device) + return device def on_audio_input_combobox_changed(self, widget): self.on_av_combobox_changed(widget, 'audio_input_device') @@ -927,10 +1030,19 @@ class Preferences(Gtk.ApplicationWindow): self.on_av_combobox_changed(widget, 'audio_output_device') def on_video_input_combobox_changed(self, widget): - self.on_av_combobox_changed(widget, 'video_input_device') + device = self.on_av_combobox_changed(widget, 'video_input_device') + + src = Gst.parse_bin_from_description(device, True) + if src is None: + return - def on_video_output_combobox_changed(self, widget): - self.on_av_combobox_changed(widget, 'video_output_device') + self.av_pipeline.set_state(Gst.State.NULL) + if self.av_src is not None: + self.av_pipeline.remove(self.av_src) + self.av_pipeline.add(src) + src.link(self.av_sink) + self.av_src = src + self.av_pipeline.set_state(Gst.State.PLAYING) def on_video_framerate_combobox_changed(self, widget): self.on_av_combobox_changed(widget, 'video_framerate') View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/97625a726e5e31a5aa202c8440669abf3d… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/97625a726e5e31a5aa202c8440669abf3d… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Jingle: Fix undefined variable
by Philipp Hörist 29 Sep '19

29 Sep '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: f70365da by Philipp Hörist at 2019-09-29T16:19:47Z Jingle: Fix undefined variable - - - - - 1 changed file: - gajim/common/modules/jingle.py Changes: ===================================== gajim/common/modules/jingle.py ===================================== @@ -245,7 +245,7 @@ class Jingle(BaseModule): if media: if media not in ('audio', 'video', 'file'): return [] - return [se for se in sessions if session.get_content(media)] + return [se for se in sessions if se.get_content(media)] return sessions def set_file_info(self, file_): View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/f70365da8e7f57c3aa1af6d70f98793dd0… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/f70365da8e7f57c3aa1af6d70f98793dd0… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Bookmarks: Add dev config setting for testing bookmarks 2
by Philipp Hörist 29 Sep '19

29 Sep '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: a934551c by Philipp Hörist at 2019-09-29T11:32:03Z Bookmarks: Add dev config setting for testing bookmarks 2 - - - - - 2 changed files: - gajim/common/config.py - gajim/common/modules/bookmarks.py Changes: ===================================== gajim/common/config.py ===================================== @@ -289,6 +289,7 @@ class Config: 'auto_copy': [opt_bool, True, _('Selecting text will copy it to the clipboard')], 'command_system_execute': [opt_bool, False, _('If enabled, Gajim will execute commands (/show, /sh, /execute, /exec).')], 'groupchat_roster_width': [opt_int, 210, _('Width of group chat roster in pixel')], + 'dev_force_bookmark_2': [opt_bool, False, _('Force Bookmark 2 usage')], }, {}) # type: Tuple[Dict[str, List[Any]], Dict[Any, Any]] __options_per_key = { ===================================== gajim/common/modules/bookmarks.py ===================================== @@ -155,7 +155,12 @@ class Bookmarks(BaseModule): NetworkEvent('bookmarks-received', account=self._account)) def pass_disco(self, info): - if nbxmpp.NS_BOOKMARKS_COMPAT in info.features: + if app.config.get('dev_force_bookmark_2'): + self._log.info('Forcing Bookmark 2 usage, ' + 'without server conversion support: %s', info.jid) + self._conversion_2 = True + + elif nbxmpp.NS_BOOKMARKS_COMPAT in info.features: self._conversion_2 = True self._log.info('Discovered Bookmarks Conversion 2: %s', info.jid) View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/a934551cb1b643724f25b83db073c2cc38… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/a934551cb1b643724f25b83db073c2cc38… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: Remove unused function
by Philipp Hörist 29 Sep '19

29 Sep '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 1f663a24 by Philipp Hörist at 2019-09-29T08:35:03Z Remove unused function - - - - - f5244e37 by Philipp Hörist at 2019-09-29T11:20:16Z Bookmarks: Don't accept PEP notificiations before request - - - - - 2 changed files: - gajim/common/modules/adhoc_commands.py - gajim/common/modules/bookmarks.py Changes: ===================================== gajim/common/modules/adhoc_commands.py ===================================== @@ -179,24 +179,6 @@ class ChangeStatusCommand(AdHocCommand): return False # finish the session -def find_current_groupchats(account): - from gajim import message_control - rooms = [] - for gc_control in app.interface.msg_win_mgr.get_controls( - message_control.TYPE_GC) + \ - app.interface.minimized_controls[account].values(): - acct = gc_control.account - # check if account is the good one - if acct != account: - continue - room_jid = gc_control.room_jid - nick = gc_control.nick - if (room_jid in app.gc_connected[acct] and - app.gc_connected[acct][room_jid]): - rooms.append((room_jid, nick,)) - return rooms - - class AdHocCommands(BaseModule): _nbxmpp_extends = 'AdHoc' ===================================== gajim/common/modules/bookmarks.py ===================================== @@ -48,7 +48,7 @@ class Bookmarks(BaseModule): self._conversion_2 = False self._bookmarks = [] self._join_timeouts = [] - self._request_in_progress = False + self._request_in_progress = True @property def conversion(self): View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/8936a07e46a0e54bb4a43dcb6cd907286… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/8936a07e46a0e54bb4a43dcb6cd907286… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] ServerInfo: Rework Dialog
by Philipp Hörist 29 Sep '19

29 Sep '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 8936a07e by Daniel Brötzmann at 2019-09-29T00:31:30Z ServerInfo: Rework Dialog - Split information into different notebook tabs - Show connection information (Fixes #6096) - - - - - 9 changed files: - gajim/app_actions.py - gajim/common/connection.py - gajim/data/gui/account_context_menu.ui - gajim/data/gui/certificate_dialog.ui - + gajim/data/gui/server_info.ui - gajim/data/style/gajim.css - gajim/gtk/dialogs.py - gajim/gtk/server_info.py - gajim/roster_window.py Changes: ===================================== gajim/app_actions.py ===================================== @@ -27,7 +27,7 @@ import gajim.plugins.gui from gajim.gtk.dialogs import ShortcutsWindow from gajim.gtk.history_sync import HistorySyncAssistant -from gajim.gtk.server_info import ServerInfoDialog +from gajim.gtk.server_info import ServerInfo from gajim.gtk.mam_preferences import MamPreferences from gajim.gtk.preferences import Preferences from gajim.gtk.groupchat_creation import CreateGroupchatWindow @@ -241,11 +241,11 @@ def on_privacy_lists(action, param): def on_server_info(action, param): account = param.get_string() - if 'server_info' in interface.instances[account]: - interface.instances[account]['server_info'].present() + window = app.get_app_window(ServerInfo, account) + if window is None: + ServerInfo(account) else: - interface.instances[account]['server_info'] = \ - ServerInfoDialog(account) + window.present() def on_xml_console(action, param): ===================================== gajim/common/connection.py ===================================== @@ -1018,6 +1018,9 @@ class Connection(CommonConnection, ConnectionHandlers): msg = '%s over proxy %s:%s' % (msg, self._proxy['host'], self._proxy['port']) log.info(msg) + def get_connection_info(self): + return self._current_host, self._proxy + def _connect_failure(self, con_type=None): if not con_type: # we are not retrying, and not conecting ===================================== gajim/data/gui/account_context_menu.ui ===================================== @@ -59,10 +59,10 @@ </object> </child> <child> - <object class="GtkMenuItem" id="view_certificate_menuitem"> + <object class="GtkMenuItem" id="view_server_info_menuitem"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">_View Certificate</property> + <property name="label" translatable="yes">_View Server Info</property> <property name="use_underline">True</property> </object> </child> ===================================== gajim/data/gui/certificate_dialog.ui ===================================== @@ -79,6 +79,7 @@ <property name="can_focus">False</property> <property name="halign">start</property> <property name="label"><></property> + <property name="xalign">0</property> </object> <packing> <property name="left_attach">1</property> @@ -106,6 +107,7 @@ <property name="can_focus">False</property> <property name="halign">start</property> <property name="label"><></property> + <property name="xalign">0</property> </object> <packing> <property name="left_attach">1</property> @@ -133,6 +135,7 @@ <property name="can_focus">False</property> <property name="halign">start</property> <property name="label"><></property> + <property name="xalign">0</property> </object> <packing> <property name="left_attach">1</property> @@ -163,7 +166,8 @@ <property name="wrap">True</property> <property name="wrap_mode">char</property> <property name="selectable">True</property> - <property name="max_width_chars">21</property> + <property name="max_width_chars">30</property> + <property name="xalign">0</property> </object> <packing> <property name="left_attach">1</property> @@ -191,6 +195,7 @@ <property name="can_focus">False</property> <property name="halign">start</property> <property name="label"><></property> + <property name="xalign">0</property> </object> <packing> <property name="left_attach">1</property> @@ -218,6 +223,7 @@ <property name="can_focus">False</property> <property name="halign">start</property> <property name="label"><></property> + <property name="xalign">0</property> </object> <packing> <property name="left_attach">1</property> @@ -245,6 +251,7 @@ <property name="can_focus">False</property> <property name="halign">start</property> <property name="label"><></property> + <property name="xalign">0</property> </object> <packing> <property name="left_attach">1</property> @@ -272,6 +279,7 @@ <property name="can_focus">False</property> <property name="halign">start</property> <property name="label"><></property> + <property name="xalign">0</property> </object> <packing> <property name="left_attach">1</property> @@ -299,6 +307,7 @@ <property name="can_focus">False</property> <property name="halign">start</property> <property name="label"><></property> + <property name="xalign">0</property> </object> <packing> <property name="left_attach">1</property> @@ -347,6 +356,7 @@ <property name="wrap">True</property> <property name="wrap_mode">char</property> <property name="selectable">True</property> + <property name="max_width_chars">52</property> </object> <packing> <property name="left_attach">0</property> @@ -363,7 +373,7 @@ <property name="wrap">True</property> <property name="wrap_mode">char</property> <property name="selectable">True</property> - <property name="max_width_chars">42</property> + <property name="max_width_chars">52</property> </object> <packing> <property name="left_attach">0</property> ===================================== gajim/data/gui/server_info.ui ===================================== @@ -0,0 +1,370 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<interface> + <requires lib="gtk+" version="3.20"/> + <object class="GtkNotebook" id="server_info_notebook"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <child> + <object class="GtkGrid" id="server"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="row_spacing">6</property> + <property name="column_spacing">12</property> + <child> + <object class="GtkLabel"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">end</property> + <property name="label" translatable="yes">Hostname</property> + <style> + <class name="dim-label"/> + </style> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="server_hostname"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">start</property> + <property name="selectable">True</property> + <property name="ellipsize">end</property> + <property name="single_line_mode">True</property> + <property name="xalign">0</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkLabel"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">end</property> + <property name="label" translatable="yes">Server Software</property> + <style> + <class name="dim-label"/> + </style> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="server_software"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">start</property> + <property name="selectable">True</property> + <property name="ellipsize">end</property> + <property name="single_line_mode">True</property> + <property name="xalign">0</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="GtkLabel"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">end</property> + <property name="label" translatable="yes">Server Uptime</property> + <style> + <class name="dim-label"/> + </style> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">2</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="server_uptime"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">start</property> + <property name="selectable">True</property> + <property name="ellipsize">end</property> + <property name="single_line_mode">True</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">2</property> + </packing> + </child> + <child> + <object class="GtkBox" id="spacer1"> + <property name="width_request">160</property> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> + <placeholder/> + </child> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">3</property> + </packing> + </child> + <child> + <placeholder/> + </child> + <style> + <class name="margin-18"/> + </style> + </object> + </child> + <child type="tab"> + <object class="GtkLabel"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes">Server</property> + </object> + <packing> + <property name="tab_fill">False</property> + </packing> + </child> + <child> + <object class="GtkGrid"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="row_spacing">6</property> + <property name="column_spacing">12</property> + <child> + <object class="GtkLabel"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">end</property> + <property name="label" translatable="yes">Type</property> + <style> + <class name="dim-label"/> + </style> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="connection_type"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">start</property> + <property name="single_line_mode">True</property> + <property name="xalign">0</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkLabel"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">end</property> + <property name="label" translatable="yes">Security</property> + <style> + <class name="dim-label"/> + </style> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="connection_security"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">start</property> + <property name="label">-</property> + <property name="single_line_mode">True</property> + <property name="xalign">0</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="GtkLabel"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">end</property> + <property name="label" translatable="yes">Cipher</property> + <style> + <class name="dim-label"/> + </style> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">2</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="connection_cipher"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">start</property> + <property name="label">-</property> + <property name="selectable">True</property> + <property name="xalign">0</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">2</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="connection_proxy_header"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">end</property> + <property name="label" translatable="yes">Proxy</property> + <style> + <class name="dim-label"/> + </style> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">3</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="connection_proxy"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">start</property> + <property name="label" translatable="yes">No proxy used</property> + <property name="xalign">0</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">3</property> + </packing> + </child> + <child> + <object class="GtkButton" id="cert_button"> + <property name="label" translatable="yes">View _Certificate</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="halign">center</property> + <property name="margin_top">12</property> + <property name="use_underline">True</property> + <signal name="clicked" handler="_on_cert_button_clicked" swapped="no"/> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">4</property> + <property name="width">2</property> + </packing> + </child> + <child> + <object class="GtkBox" id="spacer2"> + <property name="width_request">160</property> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> + <placeholder/> + </child> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">5</property> + </packing> + </child> + <child> + <placeholder/> + </child> + <style> + <class name="margin-18"/> + </style> + </object> + <packing> + <property name="position">1</property> + </packing> + </child> + <child type="tab"> + <object class="GtkLabel"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes">Connection</property> + </object> + <packing> + <property name="position">1</property> + <property name="tab_fill">False</property> + </packing> + </child> + <child> + <object class="GtkBox" id="features"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="border_width">18</property> + <property name="orientation">vertical</property> + <property name="spacing">12</property> + <child> + <object class="GtkScrolledWindow" id="features_scrolled"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="hscrollbar_policy">never</property> + <property name="max_content_height">500</property> + <child> + <placeholder/> + </child> + </object> + <packing> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkButton" id="clipboard_button"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="tooltip_text" translatable="yes">Copy info to clipboard</property> + <property name="halign">end</property> + <signal name="clicked" handler="_on_clipboard_button_clicked" swapped="no"/> + <child> + <object class="GtkImage"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="icon_name">edit-copy-symbolic</property> + </object> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="position">2</property> + </packing> + </child> + <child type="tab"> + <object class="GtkLabel"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes">Features</property> + </object> + <packing> + <property name="position">2</property> + <property name="tab_fill">False</property> + </packing> + </child> + </object> +</interface> ===================================== gajim/data/style/gajim.css ===================================== @@ -66,11 +66,11 @@ popover#EmoticonPopover { padding: 5px; background-color: @theme_unfocused_base_ #FinishedLabel { font-size: 14px; font-weight: bold } /* Server Info */ -#ServerInfoGrid > list { border: 1px solid; border-color: @borders; } -#ServerInfoGrid > list > row:first-child { border-top: 1px solid; border-color: @borders; } -#ServerInfoGrid > list > row { padding: 10px 20px 10px 10px; } -#ServerInfoGrid > list > label { padding:10px; color: @insensitive_fg_color; font-weight: bold; } -#ServerInfoGrid > list > row.activatable:active { box-shadow: none; } +#ServerInfo { border: 1px solid; border-color: @borders; } +#ServerInfo > row:first-child { border-top: 1px solid; border-color: @borders; } +#ServerInfo > row { padding: 10px 20px 10px 10px; } +#ServerInfo > label { padding:10px; color: @insensitive_fg_color; font-weight: bold; } +#ServerInfo > row.activatable:active { box-shadow: none; } /* Features Info */ #FeaturesInfoGrid > list { border: 1px solid; border-color: @borders; } @@ -225,6 +225,7 @@ list.settings > row > box { .margin-12 { margin: 12px; } .margin-18 { margin: 18px; } .padding-18 { margin: 18px; } +.padding-left30 { padding-left: 30px; } /* Treeview */ treeview.space { padding: 6px; } ===================================== gajim/gtk/dialogs.py ===================================== @@ -468,6 +468,7 @@ class CertificateDialog(Gtk.ApplicationWindow): self._ui = get_builder('certificate_dialog.ui') self.add(self._ui.certificate_box) + self.account = account self._clipboard = Gtk.Clipboard.get(Gdk.SELECTION_CLIPBOARD) # Get data for labels and copy button @@ -483,10 +484,10 @@ class CertificateDialog(Gtk.ApplicationWindow): self._ib_organization = issuer.organizationName or '' self._ib_org_unit = issuer.organizationalUnitName or '' issued = datetime.strptime(cert.get_notBefore().decode('ascii'), - '%Y%m%d%H%M%SZ') + '%Y%m%d%H%M%SZ') self._issued = issued.strftime('%B %d, %Y, %H:%M:%S %z') expires = datetime.strptime(cert.get_notAfter().decode('ascii'), - '%Y%m%d%H%M%SZ') + '%Y%m%d%H%M%SZ') self._expires = expires.strftime('%B %d, %Y, %H:%M:%S %z') self._sha1 = cert.digest('sha1').decode('utf-8') self._sha256 = cert.digest('sha256').decode('utf-8') ===================================== gajim/gtk/server_info.py ===================================== @@ -20,85 +20,68 @@ import nbxmpp from nbxmpp.util import is_error_result from gi.repository import Gtk from gi.repository import Gdk -from gi.repository import Pango from gajim.common import app from gajim.common import ged from gajim.common.i18n import _ +from gajim.gtk.dialogs import CertificateDialog from gajim.gtk.util import ensure_not_destroyed +from gajim.gtk.util import get_builder -log = logging.getLogger('gajim.gtk.serverinfo') +log = logging.getLogger('gajim.gtk.server_info') -class ServerInfoDialog(Gtk.Dialog): +class ServerInfo(Gtk.ApplicationWindow): def __init__(self, account): - super().__init__(title=_('Server Info'), - transient_for=None, - destroy_with_parent=True) + Gtk.ApplicationWindow.__init__(self) + self.set_name('ServerInfo') + self.set_application(app.app) + self.set_position(Gtk.WindowPosition.CENTER) + self.set_default_size(400, 600) + self.set_show_menubar(False) + self.set_title(_('Server Info')) self.account = account self._destroyed = False - self.set_transient_for(app.interface.roster.window) - self.set_resizable(True) - self.set_size_request(300, 500) - grid = Gtk.Grid() - grid.set_name('ServerInfoGrid') - grid.set_row_spacing(10) - grid.set_hexpand(True) + self._ui = get_builder('server_info.ui') + self.add(self._ui.server_info_notebook) - self.info_listbox = Gtk.ListBox() - self.info_listbox.set_selection_mode(Gtk.SelectionMode.NONE) - self.info_listbox.set_header_func(self.header_func, 'Information') - grid.attach(self.info_listbox, 0, 0, 1, 1) - - self.feature_listbox = Gtk.ListBox() - self.feature_listbox.set_selection_mode(Gtk.SelectionMode.NONE) - self.feature_listbox.set_header_func(self.header_func, 'Features') - grid.attach(self.feature_listbox, 0, 1, 1, 1) - - self.clipboard = Gtk.Clipboard.get(Gdk.SELECTION_CLIPBOARD) - clipboard_button = Gtk.Button(halign=Gtk.Align.END) - clp_image = Gtk.Image.new_from_icon_name('edit-copy-symbolic', - Gtk.IconSize.BUTTON) - clipboard_button.set_image(clp_image) - clipboard_button.set_tooltip_text(_('Copy info to clipboard')) - clipboard_button.connect('clicked', self.on_clipboard_button_clicked) - - box = self.get_content_area() - scrolled = Gtk.ScrolledWindow() - scrolled.set_max_content_height(500) - scrolled.set_policy(Gtk.PolicyType.NEVER, Gtk.PolicyType.AUTOMATIC) - scrolled.add(grid) - box.pack_start(scrolled, True, True, 0) - box.pack_start(clipboard_button, False, True, 0) - box.set_property('margin', 12) - box.set_spacing(18) - - self.connect('response', self.on_response) self.connect('destroy', self.on_destroy) + self.connect('key-press-event', self._on_key_press) + self._ui.connect_signals(self) app.ged.register_event_handler('server-disco-received', ged.GUI1, self._server_disco_received) self.version = '' - self.uptime = '' self.hostname = app.get_hostname_from_account(account) + self._ui.server_hostname.set_text(self.hostname) con = app.connections[account] con.get_module('SoftwareVersion').request_software_version( self.hostname, callback=self._software_version_received) self.request_last_activity() + self.cert = con.connection.Connection.ssl_certificate + self._add_connection_info() + + self.feature_listbox = Gtk.ListBox() + self.feature_listbox.set_name('ServerInfo') + self.feature_listbox.set_selection_mode(Gtk.SelectionMode.NONE) + self.feature_listbox.set_header_func(self.header_func, 'Features') + self._ui.features_scrolled.add(self.feature_listbox) for feature in self.get_features(): self.add_feature(feature) - - for info in self.get_infos(): - self.add_info(info) + self.clipboard = Gtk.Clipboard.get(Gdk.SELECTION_CLIPBOARD) self.show_all() + def _on_key_press(self, _widget, event): + if event.keyval == Gdk.KEY_Escape: + self.destroy() + @staticmethod def header_func(row, before, user_data): if before: @@ -108,12 +91,48 @@ class ServerInfoDialog(Gtk.Dialog): label.set_halign(Gtk.Align.START) row.set_header(label) - @staticmethod - def update(func, listbox): - for index, item in enumerate(func()): - row = listbox.get_row_at_index(index) - row.get_child().update(item) - row.set_tooltip_text(row.get_child().tooltip) + def _add_connection_info(self): + ssl_con = app.connections[self.account].connection.get_ssl_connection() + ssl_version = None + cipher_name = None + if ssl_con is not None: + ssl_version = ssl_con.get_cipher_version() + cipher_name = ssl_con.get_cipher_name() + + host, proxy = app.connections[self.account].get_connection_info() + con_type = host['type'] + + # Connection type + self._ui.connection_type.set_text(con_type.upper()) + if con_type == 'plain': + self._ui.conection_type.get_style_context().add_class( + 'error-color') + + # Connection security + if ssl_version is not None: + self._ui.connection_security.set_text(ssl_version) + + # Connection cipher + if cipher_name is not None: + self._ui.connection_cipher.set_text(cipher_name) + + # Connection proxy + if proxy: + if proxy['type'] == 'bosh': + self._ui.connection_proxy_header.set_text(_('BOSH')) + self._ui.connection_proxy.set_text(proxy['bosh_uri']) + if proxy['type'] in ['http', 'socks5'] or proxy['bosh_useproxy']: + self._ui.connection_proxy.set_text( + proxy['host'] + ':' + proxy['port']) + + self._ui.cert_button.set_sensitive(self.cert) + + def _on_cert_button_clicked(self, button_): + window = app.get_app_window(CertificateDialog, self.account) + if window is None: + CertificateDialog(self, self.account, self.cert) + else: + window.present() def request_last_activity(self): if not app.account_is_connected(self.account): @@ -123,7 +142,7 @@ class ServerInfoDialog(Gtk.Dialog): con.connection.SendAndCallForResponse(iq, self._on_last_activity) def _on_last_activity(self, stanza): - if 'server_info' not in app.interface.instances[self.account]: + if self._destroyed: # Window got closed in the meantime return if not nbxmpp.isResultNode(stanza): @@ -141,9 +160,9 @@ class ServerInfoDialog(Gtk.Dialog): hours = 0 if seconds >= 3600: hours = delta.seconds // 3600 - self.uptime = _('%(days)s days, %(hours)s hours') % { + uptime = _('%(days)s days, %(hours)s hours') % { 'days': delta.days, 'hours': hours} - self.update(self.get_infos, self.info_listbox) + self._ui.server_uptime.set_text(uptime) @ensure_not_destroyed def _software_version_received(self, result): @@ -151,7 +170,14 @@ class ServerInfoDialog(Gtk.Dialog): self.version = _('Unknown') else: self.version = '%s %s' % (result.name, result.version) - self.update(self.get_infos, self.info_listbox) + self._ui.server_software.set_text(self.version) + + @staticmethod + def update(func, listbox): + for index, item in enumerate(func()): + row = listbox.get_row_at_index(index) + row.get_child().update(item) + row.set_tooltip_text(row.get_child().tooltip) def _server_disco_received(self, obj): self.update(self.get_features, self.feature_listbox) @@ -209,18 +235,8 @@ class ServerInfoDialog(Gtk.Dialog): con.get_module('Bookmarks').conversion) ] - def add_info(self, info): - self.info_listbox.add(ServerInfoItem(info)) - - def get_infos(self): - Info = namedtuple('Info', ['name', 'value', 'tooltip']) - return [ - Info(_('Hostname'), self.hostname, None), - Info(_('Server Software'), self.version, None), - Info(_('Server Uptime'), self.uptime, None)] - - def on_clipboard_button_clicked(self, widget): - server_software = 'Server Software: %s\n' % self.get_infos()[1].value + def _on_clipboard_button_clicked(self, widget): + server_software = 'Server Software: %s\n' % self.version server_features = '' for feature in self.get_features(): @@ -232,18 +248,14 @@ class ServerInfoDialog(Gtk.Dialog): tooltip = '(%s)' % feature.tooltip else: tooltip = '' - server_features += '%s: %s %s\n' % (feature.name, available, tooltip) + server_features += '%s: %s %s\n' % ( + feature.name, available, tooltip) clipboard_text = server_software + server_features self.clipboard.set_text(clipboard_text, -1) - def on_response(self, dialog, response): - if response == Gtk.ResponseType.OK: - self.destroy() - def on_destroy(self, *args): self._destroyed = True - del app.interface.instances[self.account]['server_info'] app.ged.remove_event_handler('server-disco-received', ged.GUI1, self._server_disco_received) @@ -274,7 +286,7 @@ class FeatureItem(Gtk.Grid): elif enabled is False: self.icon.set_from_icon_name('dialog-warning-symbolic', Gtk.IconSize.MENU) - self.tooltip += _('\nDisabled in config') + self.tooltip += _('\nDisabled in preferences') self.icon.get_style_context().add_class('warning-color') else: self.icon.set_from_icon_name('emblem-ok-symbolic', @@ -284,28 +296,3 @@ class FeatureItem(Gtk.Grid): def update(self, feature): self.tooltip = feature.tooltip self.set_feature(feature.available, feature.enabled) - - -class ServerInfoItem(Gtk.Grid): - def __init__(self, info): - super().__init__() - self.tooltip = info.tooltip - self.insert_column(0) - - self.info = Gtk.Label(label=info.name) - self.info.set_halign(Gtk.Align.START) - self.info.set_xalign(0) - self.info.set_size_request(160, -1) - self.value = Gtk.Label(label=info.value) - self.value.set_halign(Gtk.Align.START) - self.value.set_ellipsize(Pango.EllipsizeMode.END) - self.value.set_width_chars(20) - self.value.set_xalign(0) - self.value.set_hexpand(True) - self.value.set_selectable(True) - - self.add(self.info) - self.add(self.value) - - def update(self, info): - self.value.set_text(info.value) ===================================== gajim/roster_window.py ===================================== @@ -72,8 +72,8 @@ from gajim.gtk.dialogs import InputDialog from gajim.gtk.dialogs import WarningDialog from gajim.gtk.dialogs import InformationDialog from gajim.gtk.dialogs import NonModalConfirmationDialog -from gajim.gtk.dialogs import CertificateDialog from gajim.gtk.dialogs import InvitationReceivedDialog +from gajim.gtk.server_info import ServerInfo from gajim.gtk.single_message import SingleMessageWindow from gajim.gtk.add_contact import AddNewContactWindow from gajim.gtk.account_wizard import AccountCreationWizard @@ -3531,10 +3531,12 @@ class RosterWindow: jid = jid + '/' + resource AdHocCommand(account, jid) - def on_view_certificate(self, widget, account): - con = app.connections[account] - cert = con.connection.Connection.ssl_certificate - CertificateDialog(self.window, account, cert) + def on_view_server_info(self, _widget, account): + window = app.get_app_window(ServerInfo, account) + if window is None: + ServerInfo(account) + else: + window.present() def on_roster_window_focus_in_event(self, widget, event): # roster received focus, so if we had urgency REMOVE IT @@ -4761,8 +4763,8 @@ class RosterWindow: 'service_discovery_menuitem') execute_command_menuitem = xml.get_object( 'execute_command_menuitem') - view_certificate_menuitem = xml.get_object( - 'view_certificate_menuitem') + view_server_info_menuitem = xml.get_object( + 'view_server_info_menuitem') edit_account_menuitem = xml.get_object('edit_account_menuitem') sub_menu = Gtk.Menu() status_menuitem.set_submenu(sub_menu) @@ -4840,14 +4842,14 @@ class RosterWindow: account=account) # Fake contact execute_command_menuitem.connect('activate', self.on_execute_command, contact, account) - view_certificate_menuitem.connect('activate', - self.on_view_certificate, account) + view_server_info_menuitem.connect('activate', + self.on_view_server_info, account) # make some items insensitive if account is offline if not app.account_is_connected(account): for widget in (add_contact_menuitem, service_discovery_menuitem, - execute_command_menuitem, - view_certificate_menuitem, pep_menuitem): + execute_command_menuitem, view_server_info_menuitem, + pep_menuitem): widget.set_sensitive(False) else: xml = get_builder('zeroconf_context_menu.ui') View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/8936a07e46a0e54bb4a43dcb6cd9072862… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/8936a07e46a0e54bb4a43dcb6cd9072862… You're receiving this email because of your account on dev.gajim.org.

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