Commits April 2019

commits@gajim.org

1 participants
87 discussions

[Git][gajim/gajim][master] 2 commits: Certificate dialog: Add copy info button
by Philipp Hörist 26 Apr '19

26 Apr '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 6e9b605c by Daniel Brötzmann at 2019-04-26T17:53:10Z Certificate dialog: Add copy info button - - - - - a8bd8abe by Philipp Hörist at 2019-04-26T17:53:10Z Add test for CertificateDialog - - - - - 3 changed files: - gajim/data/gui/certificate_dialog.ui - gajim/gtk/dialogs.py - + test/gtk/certificate_dialog.py Changes: ===================================== gajim/data/gui/certificate_dialog.ui ===================================== @@ -160,6 +160,10 @@ <property name="can_focus">False</property> <property name="halign">start</property> <property name="label"><></property> + <property name="wrap">True</property> + <property name="wrap_mode">char</property> + <property name="selectable">True</property> + <property name="max_width_chars">21</property> </object> <packing> <property name="left_attach">1</property> @@ -435,6 +439,31 @@ <property name="width">2</property> </packing> </child> + <child> + <object class="GtkButton" id="copy_cert_info_button"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="has_focus">True</property> + <property name="receives_default">False</property> + <property name="tooltip_text" translatable="yes">Copy Certificate Information</property> + <property name="halign">end</property> + <signal name="clicked" handler="_on_copy_cert_info_button_clicked" swapped="no"/> + <child> + <object class="GtkImage" id="image1"> + <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="left_attach">1</property> + <property name="top_attach">17</property> + </packing> + </child> + <child> + <placeholder/> + </child> </object> <packing> <property name="expand">False</property> ===================================== gajim/gtk/dialogs.py ===================================== @@ -18,6 +18,7 @@ from collections import namedtuple from gi.repository import GLib from gi.repository import Gtk +from gi.repository import Gdk from gi.repository import Pango from gajim.common import app @@ -894,39 +895,68 @@ class CertificateDialog(Gtk.ApplicationWindow): self._ui = get_builder('certificate_dialog.ui') self.add(self._ui.certificate_box) + self._clipboard = Gtk.Clipboard.get(Gdk.SELECTION_CLIPBOARD) + + # Get data for labels and copy button issuer = cert.get_issuer() subject = cert.get_subject() - self._ui.label_cert_for_account.set_text( - _('Certificate for account\n%s') % account) - - self._ui.data_it_common_name.set_text(subject.commonName or '') - self._ui.data_it_organization.set_text(subject.organizationName or '') - self._ui.data_it_organizational_unit.set_text( - subject.organizationalUnitName or '') - self._ui.data_it_serial_number.set_text(str(cert.get_serial_number())) - - self._ui.data_ib_common_name.set_text(issuer.commonName or '') - self._ui.data_ib_organization.set_text(issuer.organizationName or '') - self._ui.data_ib_organizational_unit.set_text( - issuer.organizationalUnitName or '') - + self._headline = _('Certificate for account\n%s') % account + self._it_common_name = subject.commonName or '' + self._it_organization = subject.organizationName or '' + self._it_org_unit = subject.organizationalUnitName or '' + self._it_serial_number = str(cert.get_serial_number()) + self._ib_common_name = issuer.commonName or '' + 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') - issued = issued.strftime('%B %d, %Y, %H:%M:%S %z') - self._ui.data_issued_on.set_text(issued) + '%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') - expires = expires.strftime('%B %d, %Y, %H:%M:%S %z') - self._ui.data_expires_on.set_text(expires) - - self._ui.data_sha1.set_text(cert.digest('sha1').decode('utf-8')) - self._ui.data_sha256.set_text(cert.digest('sha256').decode('utf-8')) + '%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') + + # Set labels + self._ui.label_cert_for_account.set_text(self._headline) + self._ui.data_it_common_name.set_text(self._it_common_name) + self._ui.data_it_organization.set_text(self._it_organization) + self._ui.data_it_organizational_unit.set_text(self._it_org_unit) + self._ui.data_it_serial_number.set_text(self._it_serial_number) + self._ui.data_ib_common_name.set_text(self._ib_common_name) + self._ui.data_ib_organization.set_text(self._ib_organization) + self._ui.data_ib_organizational_unit.set_text(self._ib_org_unit) + self._ui.data_issued_on.set_text(self._issued) + self._ui.data_expires_on.set_text(self._expires) + self._ui.data_sha1.set_text(self._sha1) + self._ui.data_sha256.set_text(self._sha256) self.set_transient_for(transient_for) self._ui.connect_signals(self) self.show_all() + def _on_copy_cert_info_button_clicked(self, widget): + clipboard_text = \ + self._headline + '\n\n' + \ + _('Issued to\n') + \ + _('Common Name (CN): ') + self._it_common_name + '\n' + \ + _('Organization (O): ') + self._it_organization + '\n' + \ + _('Organizational Unit (OU): ') + self._it_org_unit + '\n' + \ + _('Serial Number: ') + self._it_serial_number + '\n\n' + \ + _('Issued by\n') + \ + _('Common Name (CN): ') + self._ib_common_name + '\n' + \ + _('Organization (O): ') + self._ib_organization + '\n' + \ + _('Organizational Unit (OU): ') + self._ib_org_unit + '\n\n' + \ + _('Validity\n') + \ + _('Issued on: ') + self._issued + '\n' + \ + _('Expires on: ') + self._expires + '\n\n' + \ + _('SHA-1:') + '\n' + \ + self._sha1 + '\n' + \ + _('SHA-256:') + '\n' + \ + self._sha256 + '\n' + self._clipboard.set_text(clipboard_text, -1) + class SSLErrorDialog(ConfirmationDialogDoubleCheck): def __init__(self, account, certificate, pritext, sectext, checktext1, ===================================== test/gtk/certificate_dialog.py ===================================== @@ -0,0 +1,51 @@ +import gi +gi.require_version('Gtk', '3.0') +from gi.repository import Gtk + +import OpenSSL + +from test.gtk import util +from gajim.common.const import CSSPriority +from gajim.gtk.dialogs import CertificateDialog + +util.load_style('gajim.css', CSSPriority.APPLICATION) + +cert = ''' +-----BEGIN CERTIFICATE----- +MIIFhDCCBGygAwIBAgISA4oUEifTr7Y+mcdiwu6KWpcVMA0GCSqGSIb3DQEBCwUA +MEoxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1MZXQncyBFbmNyeXB0MSMwIQYDVQQD +ExpMZXQncyBFbmNyeXB0IEF1dGhvcml0eSBYMzAeFw0xOTA0MDMxODE3NDVaFw0x +OTA3MDIxODE3NDVaMBsxGTAXBgNVBAMMECoubGlnaHR3aXRjaC5vcmcwggEiMA0G +CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC/3mcevikse7QwDYwPcGAD9zHw3UWE +7J8SJR349/rFTF2tBFDvEa62OUKTCg5vPKVKaXHlzruk/A7blgqsEdugycORwPD1 +7YNJ27EldrRtotjclurzKL6D/MgcaQ4cTkPOD3cWbf/L+HClGrpFt7su6Z6cTutC +wiAYAdlfmVgSSv15F1xOTyFyfGJKQnW628Xs8xUvZh5H/SsEEum4MwVVGW06Z/A/ +mwX2jmJUb2M25S1Ma025nZpGYyAAqecTmPb3fStnXm4sdytfZhm4+nj9mH9GQIU1 +t/jO/7X7IFpc9DvVRSumSVqvNaVgiWmTLP4VxlCVJO6mibOXXUUDA5RfAgMBAAGj +ggKRMIICjTAOBgNVHQ8BAf8EBAMCBaAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsG +AQUFBwMCMAwGA1UdEwEB/wQCMAAwHQYDVR0OBBYEFC4/ZRurw2wVFsgJBTb9Fh/3 +0aV9MB8GA1UdIwQYMBaAFKhKamMEfd265tE5t6ZFZe/zqOyhMG8GCCsGAQUFBwEB +BGMwYTAuBggrBgEFBQcwAYYiaHR0cDovL29jc3AuaW50LXgzLmxldHNlbmNyeXB0 +Lm9yZzAvBggrBgEFBQcwAoYjaHR0cDovL2NlcnQuaW50LXgzLmxldHNlbmNyeXB0 +Lm9yZy8wSQYDVR0RBEIwQIIQKi5saWdodHdpdGNoLm9yZ4IOKi5tZXRyb25vbWUu +aW2CDmxpZ2h0d2l0Y2gub3JnggxtZXRyb25vbWUuaW0wTAYDVR0gBEUwQzAIBgZn +gQwBAgEwNwYLKwYBBAGC3xMBAQEwKDAmBggrBgEFBQcCARYaaHR0cDovL2Nwcy5s +ZXRzZW5jcnlwdC5vcmcwggECBgorBgEEAdZ5AgQCBIHzBIHwAO4AdQB0ftqDMa0z +EJEhnM4lT0Jwwr/9XkIgCMY3NXnmEHvMVgAAAWnkosBAAAAEAwBGMEQCICEfmTBk +OxS95eiYsfTH5HdL7kfp68BSin5LqeGyyxk9AiA3qeDZNKklJTdWqYjto7kUqJNd +YiL99SrqwzR6w+AqSwB1ACk8UZZUyDlluqpQ/FgH1Ldvv1h6KXLcpMMM9OVFR/R4 +AAABaeSiwEUAAAQDAEYwRAIgFxouOkJeqkQUe6zNI5w/6YBIQFrsrIZdPcX+r6JI +is8CIEEETzlEyj9lWR/BSSruSp0FT5CuoNNeEG7HxrJ+gVhZMA0GCSqGSIb3DQEB +CwUAA4IBAQAQtfs1NPNMmBQRcKsZyGLZsvpp2hIhdYi72RYnHnIl4MXbhyNj9xtI +cJr9PQ+3FsSnxy7LDjZMpbmBuXhawOyPBPw2M0f0Tv6Eo6miwvP/X1kLE3VjTzCo +6JPh6bEB5wa+kH/pUcGlV6uyT7IuXOiArx0VmIpTA3uwlVdfynOnR3CF20Ds4FLc +JxbGMqRuw/sGiTLKlXc1xVil8WZjL3hokzrgI7K6np2skUjWuMZvhJgwi5QiE7/C +ejsJoYkpvcaiaLAyVymTY/n/oM2oQpv5Mqjit+18RB9c2P+ifH5iDKC/jTKn4NNz +8xSTlUlCBTCozjzscZVeVDIojmejWclT +-----END CERTIFICATE-----''' + +cert = OpenSSL.crypto.load_certificate(OpenSSL.crypto.FILETYPE_PEM, cert) +win = CertificateDialog(None, 'testacc', cert) +win.connect("destroy", Gtk.main_quit) +win.show_all() +Gtk.main() View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/5d795b4c1e631d45fa7bf59455b40e9d4… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/5d795b4c1e631d45fa7bf59455b40e9d4… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] MessageWindow: Open new tab relative to the current one
by Philipp Hörist 26 Apr '19

26 Apr '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 5d795b4c by Daniel Brötzmann at 2019-04-26T15:11:59Z MessageWindow: Open new tab relative to the current one - - - - - 1 changed file: - gajim/message_window.py Changes: ===================================== gajim/message_window.py ===================================== @@ -317,7 +317,8 @@ class MessageWindow: id_ = tab_label_box.connect('button-press-event', self.on_tab_eventbox_button_press_event, control.widget) control.handlers[id_] = tab_label_box - self.notebook.append_page(control.widget, tab_label_box) + position = self.notebook.get_current_page() + 1 + self.notebook.insert_page(control.widget, tab_label_box, position) self.notebook.set_tab_reorderable(control.widget, True) View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/5d795b4c1e631d45fa7bf59455b40e9d47… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/5d795b4c1e631d45fa7bf59455b40e9d47… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Rework SingleMessageWindow
by Philipp Hörist 26 Apr '19

26 Apr '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: f6c3d032 by Daniel Brötzmann at 2019-04-26T15:09:18Z Rework SingleMessageWindow - - - - - 2 changed files: - gajim/data/gui/single_message_window.ui - gajim/gtk/single_message.py Changes: ===================================== gajim/data/gui/single_message_window.ui ===================================== @@ -1,49 +1,59 @@ <?xml version="1.0" encoding="UTF-8"?> - + <interface> - <requires lib="gtk+" version="3.12"/> + <requires lib="gtk+" version="3.20"/> <object class="GtkImage" id="image1"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="stock">gtk-ok</property> + <property name="icon_name">mail-reply-sender-symbolic</property> </object> <object class="GtkImage" id="image2"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="stock">gtk-ok</property> + <property name="icon_name">mail-send-symbolic</property> </object> <object class="GtkImage" id="image3"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="stock">gtk-jump-to</property> + <property name="icon_name">mail-send-symbolic</property> + </object> + <object class="GtkImage" id="image4"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="icon_name">user-info-symbolic</property> </object> <object class="GtkWindow" id="single_message_window"> <property name="can_focus">False</property> - <property name="border_width">6</property> - <property name="default_width">550</property> - <property name="default_height">280</property> <signal name="delete-event" handler="on_single_message_window_delete_event" swapped="no"/> <signal name="destroy" handler="on_single_message_window_destroy" swapped="no"/> <signal name="key-press-event" handler="on_single_message_window_key_press_event" swapped="no"/> <child> - <object class="GtkBox" id="vbox97"> + <placeholder/> + </child> + <child> + <object class="GtkBox"> <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">6</property> <child> - <object class="GtkGrid" id="grid1"> + <object class="GtkGrid" id="send_grid"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="row_spacing">3</property> - <property name="column_spacing">3</property> + <property name="no_show_all">True</property> + <property name="row_spacing">6</property> + <property name="column_spacing">12</property> <child> - <object class="GtkLabel" id="from_label"> + <object class="GtkLabel" id="to_label"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="no_show_all">True</property> - <property name="xalign">0</property> - <property name="label" translatable="yes">From:</property> + <property name="halign">end</property> + <property name="label" translatable="yes">_To</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">to_entry</property> + <style> + <class name="dim-label"/> + </style> </object> <packing> <property name="left_attach">0</property> @@ -51,124 +61,239 @@ </packing> </child> <child> - <object class="GtkLabel" id="to_label"> + <object class="GtkEntry" id="to_entry"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="no_show_all">True</property> - <property name="xalign">0</property> - <property name="label" translatable="yes">To:</property> + <property name="can_focus">True</property> + <property name="hexpand">True</property> + <property name="placeholder_text" translatable="yes">user(a)example.org</property> </object> <packing> - <property name="left_attach">0</property> - <property name="top_attach">1</property> + <property name="left_attach">1</property> + <property name="top_attach">0</property> </packing> </child> <child> - <object class="GtkLabel" id="label335"> + <object class="GtkLabel" id="subject_label"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">Subject:</property> + <property name="halign">end</property> + <property name="label" translatable="yes">Su_bject</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">subject_entry</property> + <property name="single_line_mode">True</property> + <style> + <class name="dim-label"/> + </style> </object> <packing> <property name="left_attach">0</property> - <property name="top_attach">2</property> + <property name="top_attach">1</property> </packing> </child> <child> - <object class="GtkEntry" id="from_entry"> + <object class="GtkEntry" id="subject_entry"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="no_show_all">True</property> - <property name="hexpand">True</property> + <property name="placeholder_text" translatable="yes">Type the subject here...</property> + <property name="show_emoji_icon">True</property> </object> <packing> <property name="left_attach">1</property> - <property name="top_attach">0</property> + <property name="top_attach">1</property> <property name="width">2</property> </packing> </child> <child> - <object class="GtkEntry" id="to_entry"> + <object class="GtkLabel" id="message_label_send"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="no_show_all">True</property> - <property name="hexpand">True</property> + <property name="can_focus">False</property> + <property name="halign">end</property> + <property name="label" translatable="yes">_Message</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">message_textview</property> + <style> + <class name="dim-label"/> + </style> </object> <packing> - <property name="left_attach">1</property> - <property name="top_attach">1</property> - <property name="width">2</property> + <property name="left_attach">0</property> + <property name="top_attach">2</property> </packing> </child> <child> - <object class="GtkEntry" id="subject_entry"> + <object class="GtkScrolledWindow" id="message_scrolledwindow"> + <property name="height_request">100</property> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="hexpand">True</property> + <property name="vexpand">True</property> + <property name="shadow_type">in</property> + <child> + <object class="GtkTextView" id="message_textview"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="wrap_mode">word-char</property> + <property name="left_margin">6</property> + <property name="right_margin">6</property> + <property name="top_margin">6</property> + <property name="bottom_margin">6</property> + </object> + </child> </object> <packing> <property name="left_attach">1</property> <property name="top_attach">2</property> + <property name="width">2</property> </packing> </child> <child> <object class="GtkLabel" id="count_chars_label"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">0</property> + <property name="halign">end</property> + <property name="label" translatable="yes">Characters typed: 0</property> + <style> + <class name="dim-label"/> + </style> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">3</property> + <property name="width">3</property> + </packing> + </child> + <child> + <object class="GtkButton" id="show_contact_info_button"> + <property name="visible">True</property> + <property name="sensitive">False</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="tooltip_text" translatable="yes">Query Contact Info</property> + <property name="image">image4</property> + <signal name="clicked" handler="on_show_contact_info_button_clicked" swapped="no"/> </object> <packing> <property name="left_attach">2</property> - <property name="top_attach">2</property> + <property name="top_attach">0</property> </packing> </child> </object> <packing> - <property name="expand">False</property> + <property name="expand">True</property> <property name="fill">True</property> <property name="position">0</property> </packing> </child> <child> - <object class="GtkScrolledWindow" id="conversation_scrolledwindow"> + <object class="GtkGrid" id="received_grid"> <property name="visible">True</property> - <property name="can_focus">True</property> + <property name="can_focus">False</property> <property name="no_show_all">True</property> - <property name="shadow_type">in</property> + <property name="row_spacing">6</property> + <property name="column_spacing">12</property> <child> - <placeholder/> + <object class="GtkLabel" id="from_label"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">end</property> + <property name="label" translatable="yes">_From</property> + <property name="use_underline">True</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="subject_from_label"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">end</property> + <property name="label" translatable="yes">Subject</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="from_entry_label"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes"><user(a)example.org></property> + <property name="xalign">0</property> + <style> + <class name="bold"/> + </style> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="subject_from_entry_label"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes"><from Subject></property> + <property name="wrap">True</property> + <property name="max_width_chars">50</property> + <property name="xalign">0</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">1</property> + </packing> </child> - </object> - <packing> - <property name="expand">True</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> - <child> - <object class="GtkScrolledWindow" id="message_scrolledwindow"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="no_show_all">True</property> - <property name="shadow_type">in</property> <child> - <object class="GtkTextView" id="message_textview"> + <object class="GtkScrolledWindow" id="conversation_scrolledwindow"> + <property name="height_request">100</property> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="wrap_mode">word</property> + <property name="hexpand">True</property> + <property name="vexpand">True</property> + <property name="shadow_type">in</property> + <child> + <placeholder/> + </child> </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">2</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="message_label_received"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">end</property> + <property name="label" translatable="yes">Message</property> + <style> + <class name="dim-label"/> + </style> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">2</property> + </packing> </child> </object> <packing> <property name="expand">True</property> <property name="fill">True</property> - <property name="position">2</property> + <property name="position">1</property> </packing> </child> <child> - <object class="GtkButtonBox" id="hbuttonbox26"> + <object class="GtkButtonBox"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="margin_top">12</property> <property name="spacing">12</property> <property name="layout_style">end</property> <child> @@ -188,23 +313,6 @@ <property name="position">0</property> </packing> </child> - <child> - <object class="GtkButton" id="cancel_button"> - <property name="label">gtk-cancel</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="can_default">True</property> - <property name="receives_default">False</property> - <property name="no_show_all">True</property> - <property name="use_stock">True</property> - <signal name="clicked" handler="on_cancel_button_clicked" swapped="no"/> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">1</property> - </packing> - </child> <child> <object class="GtkButton" id="send_button"> <property name="label" translatable="yes">Sen_d</property> @@ -214,7 +322,7 @@ <property name="receives_default">False</property> <property name="no_show_all">True</property> <property name="tooltip_text" translatable="yes">Send message</property> - <property name="image">image3</property> + <property name="image">image2</property> <property name="use_underline">True</property> <signal name="clicked" handler="on_send_button_clicked" swapped="no"/> </object> @@ -236,6 +344,9 @@ <property name="image">image1</property> <property name="use_underline">True</property> <signal name="clicked" handler="on_reply_button_clicked" swapped="no"/> + <style> + <class name="suggested-action"/> + </style> </object> <packing> <property name="expand">False</property> @@ -252,9 +363,12 @@ <property name="receives_default">False</property> <property name="no_show_all">True</property> <property name="tooltip_text" translatable="yes">Send message and close window</property> - <property name="image">image2</property> + <property name="image">image3</property> <property name="use_underline">True</property> <signal name="clicked" handler="on_send_and_close_button_clicked" swapped="no"/> + <style> + <class name="suggested-action"/> + </style> </object> <packing> <property name="expand">False</property> @@ -267,7 +381,7 @@ <property name="expand">False</property> <property name="fill">True</property> <property name="padding">6</property> - <property name="position">3</property> + <property name="position">4</property> </packing> </child> </object> ===================================== gajim/gtk/single_message.py ===================================== @@ -16,7 +16,9 @@ from typing import List # pylint: disable=unused-import from gi.repository import Gdk from gi.repository import GLib +from gi.repository import Gtk +from gajim import vcard from gajim.common import app from gajim.common import helpers from gajim.common.i18n import _ @@ -37,16 +39,17 @@ if app.is_installed('GSPELL'): from gi.repository import Gspell # pylint: disable=ungrouped-imports -class SingleMessageWindow: +class SingleMessageWindow(Gtk.ApplicationWindow): """ SingleMessageWindow can send or show a received singled message depending on action argument which can be 'send' or 'receive' """ - # Keep a reference on windows so garbage collector don't restroy them - instances = [] # type: List[SingleMessageWindow] def __init__(self, account, to='', action='', from_whom='', subject='', message='', resource='', session=None, form_node=None): - self.instances.append(self) + Gtk.ApplicationWindow.__init__(self) + self.set_application(app.app) + self.set_title(_('Send Single Message')) + self.set_name('SendSingleMessageWindow') self.account = account self.action = action @@ -57,51 +60,38 @@ class SingleMessageWindow: self.resource = resource self.session = session - self.xml = get_builder('single_message_window.ui') - self.window = self.xml.get_object('single_message_window') - self.count_chars_label = self.xml.get_object('count_chars_label') - self.from_label = self.xml.get_object('from_label') - self.from_entry = self.xml.get_object('from_entry') - self.to_label = self.xml.get_object('to_label') - self.to_entry = self.xml.get_object('to_entry') - self.subject_entry = self.xml.get_object('subject_entry') - self.message_scrolledwindow = self.xml.get_object( - 'message_scrolledwindow') - self.message_textview = self.xml.get_object('message_textview') - self.message_tv_buffer = self.message_textview.get_buffer() - self.conversation_scrolledwindow = self.xml.get_object( - 'conversation_scrolledwindow') + self._ui = get_builder('single_message_window.ui') + self.message_tv_buffer = self._ui.message_textview.get_buffer() self.conversation_textview = ConversationTextview( account, used_in_history_window=True) self.conversation_textview.tv.show() + self.conversation_textview.tv.set_left_margin(6) + self.conversation_textview.tv.set_right_margin(6) + self.conversation_textview.tv.set_top_margin(6) + self.conversation_textview.tv.set_bottom_margin(6) self.conversation_tv_buffer = self.conversation_textview.tv.get_buffer() - self.xml.get_object('conversation_scrolledwindow').add( - self.conversation_textview.tv) + self._ui.conversation_scrolledwindow.add( + self.conversation_textview.tv) self.form_widget = None - parent_box = self.xml.get_object('conversation_scrolledwindow').\ - get_parent() + parent_box = self._ui.conversation_scrolledwindow.get_parent() if form_node: self.form_widget = DataFormWidget(form_node) self.form_widget.show_all() + self._ui.conversation_scrolledwindow.hide() + self._ui.message_label_received.hide() parent_box.add(self.form_widget) - parent_box.child_set_property(self.form_widget, 'position', - parent_box.child_get_property(self.xml.get_object( - 'conversation_scrolledwindow'), 'position')) + parent_box.child_set_property(self.form_widget, 'top-attach', 2) + parent_box.child_set_property(self.form_widget, 'left-attach', 0) + parent_box.child_set_property(self.form_widget, 'width', 2) self.action = 'form' - self.send_button = self.xml.get_object('send_button') - self.reply_button = self.xml.get_object('reply_button') - self.send_and_close_button = self.xml.get_object('send_and_close_button') - self.cancel_button = self.xml.get_object('cancel_button') - self.close_button = self.xml.get_object('close_button') self.message_tv_buffer.connect('changed', self.update_char_counter) if isinstance(to, list): jid = ', '.join([i[0].get_full_jid() for i in to]) - self.to_entry.set_text(jid) - self.to_entry.set_sensitive(False) + self._ui.to_entry.set_text(jid) else: - self.to_entry.set_text(to) + self._ui.to_entry.set_text(to) if app.config.get('use_speller') and app.is_installed('GSPELL') and action == 'send': lang = app.config.get('speller_language') @@ -110,10 +100,10 @@ class SingleMessageWindow: AspellDictError(lang) else: spell_buffer = Gspell.TextBuffer.get_from_gtk_text_buffer( - self.message_textview.get_buffer()) + self._ui.message_textview.get_buffer()) spell_buffer.set_spell_checker(Gspell.Checker.new(gspell_lang)) spell_view = Gspell.TextView.get_from_gtk_text_view( - self.message_textview) + self._ui.message_textview) spell_view.set_inline_spell_checking(True) spell_view.set_enable_language_menu(True) @@ -121,12 +111,12 @@ class SingleMessageWindow: # set_text(None) raises TypeError exception if self.subject is None: - self.subject = '' - self.subject_entry.set_text(self.subject) - + self.subject = _('(No subject)') + self._ui.subject_entry.set_text(self.subject) + self._ui.subject_from_entry_label.set_text(self.subject) if to == '': - liststore = get_completion_liststore(self.to_entry) + liststore = get_completion_liststore(self._ui.to_entry) self.completion_dict = helpers.get_contact_dict_for_account(account) keys = sorted(self.completion_dict.keys()) for jid in keys: @@ -135,20 +125,21 @@ class SingleMessageWindow: liststore.append((status_icon, jid)) else: self.completion_dict = {} - self.xml.connect_signals(self) + + self._ui.to_entry.connect('changed', self.on_to_entry_changed) + self._ui.connect_signals(self) # get window position and size from config - resize_window(self.window, + resize_window(self._ui.single_message_window, app.config.get('single-msg-width'), app.config.get('single-msg-height')) - move_window(self.window, + move_window(self._ui.single_message_window, app.config.get('single-msg-x-position'), app.config.get('single-msg-y-position')) - self.window.show_all() + self._ui.single_message_window.show_all() def on_single_message_window_destroy(self, widget): - self.instances.remove(self) c = app.contacts.get_contact_with_highest_priority(self.account, self.from_whom) if not c: @@ -166,16 +157,44 @@ class SingleMessageWindow: def save_pos(self): # save the window size and position - x, y = self.window.get_position() + x, y = self._ui.single_message_window.get_position() app.config.set('single-msg-x-position', x) app.config.set('single-msg-y-position', y) - width, height = self.window.get_size() + width, height = self._ui.single_message_window.get_size() app.config.set('single-msg-width', width) app.config.set('single-msg-height', height) def on_single_message_window_delete_event(self, window, ev): self.save_pos() + def on_show_contact_info_button_clicked(self, widget): + """ + Ask for vCard + """ + entry = self._ui.to_entry.get_text().strip() + + keys = sorted(self.completion_dict.keys()) + for key in keys: + contact = self.completion_dict[key] + if entry in key: + entry = contact.jid + break + + if entry in app.interface.instances[self.account]['infos']: + app.interface.instances[self.account]['infos'][entry].window.present() + else: + contact = app.contacts.create_contact(jid=entry, account=self.account) + app.interface.instances[self.account]['infos'][entry] = \ + vcard.VcardWindow(contact, self.account) + # Remove xmpp page + app.interface.instances[self.account]['infos'][entry].xml.\ + get_object('information_notebook').remove_page(0) + + def on_to_entry_changed(self, widget): + entry = self._ui.to_entry.get_text() + is_empty = bool(not entry == '' and not ',' in entry) + self._ui.show_contact_info_button.set_sensitive(is_empty) + def prepare_widgets_for(self, action): if len(app.connections) > 1: if action == 'send': @@ -187,75 +206,67 @@ class SingleMessageWindow: if action == 'send': # prepare UI for Sending title = _('Send %s') % title - self.send_button.show() - self.send_and_close_button.show() - self.to_label.show() - self.to_entry.show() - self.reply_button.hide() - self.from_label.hide() - self.from_entry.hide() - self.conversation_scrolledwindow.hide() - self.message_scrolledwindow.show() + self._ui.send_button.show() + self._ui.send_and_close_button.show() + self._ui.reply_button.hide() + self._ui.close_button.hide() + + self._ui.send_grid.show() + self._ui.received_grid.hide() if self.message: # we come from a reply? - self.message_textview.grab_focus() - self.cancel_button.hide() - self.close_button.show() + self._ui.show_contact_info_button.set_sensitive(True) + self._ui.message_textview.grab_focus() self.message_tv_buffer.set_text(self.message) GLib.idle_add(self.set_cursor_to_end) else: # we write a new message (not from reply) - self.close_button.hide() if self.to: # do we already have jid? - self.subject_entry.grab_focus() + self._ui.subject_entry.grab_focus() elif action == 'receive': # prepare UI for Receiving title = _('Received %s') % title - self.reply_button.show() - self.from_label.show() - self.from_entry.show() - self.send_button.hide() - self.send_and_close_button.hide() - self.to_label.hide() - self.to_entry.hide() - self.conversation_scrolledwindow.show() - self.message_scrolledwindow.hide() + self._ui.reply_button.show() + self._ui.close_button.show() + self._ui.send_button.hide() + self._ui.send_and_close_button.hide() + self._ui.reply_button.grab_focus() + + self._ui.received_grid.show() + self._ui.send_grid.hide() if self.message: self.conversation_textview.print_real_text(self.message) fjid = self.from_whom if self.resource: fjid += '/' + self.resource # Full jid of sender (with resource) - self.from_entry.set_text(fjid) - self.from_entry.set_property('editable', False) - self.subject_entry.set_property('editable', False) - self.reply_button.grab_focus() - self.cancel_button.hide() - self.close_button.show() + self._ui.from_entry_label.set_text(fjid) + elif action == 'form': # prepare UI for Receiving - title = _('Form %s') % title - self.send_button.show() - self.send_and_close_button.show() - self.to_label.show() - self.to_entry.show() - self.reply_button.hide() - self.from_label.hide() - self.from_entry.hide() - self.conversation_scrolledwindow.hide() - self.message_scrolledwindow.hide() - - self.window.set_title(title) - - def on_cancel_button_clicked(self, widget): - self.save_pos() - self.window.destroy() + title = self.form_widget.title + title = _('Form: %s') % title + self._ui.send_button.hide() + self._ui.send_and_close_button.hide() + self._ui.reply_button.show() + self._ui.close_button.show() + + self._ui.send_grid.hide() + self._ui.received_grid.show() + + fjid = self.from_whom + if self.resource: + fjid += '/' + self.resource # Full jid of sender (with resource) + self._ui.from_entry_label.set_text(fjid) + + self._ui.single_message_window.set_title(title) def on_close_button_clicked(self, widget): self.save_pos() - self.window.destroy() + self._ui.single_message_window.destroy() def update_char_counter(self, widget): characters_no = self.message_tv_buffer.get_char_count() - self.count_chars_label.set_text(str(characters_no)) + self._ui.count_chars_label.set_text( + _('Characters typed: %s') % str(characters_no)) def send_single_message(self): if app.connections[self.account].connected <= 1: @@ -271,10 +282,10 @@ class SingleMessageWindow: else: sender_list.append(i[0].jid) else: - sender_list = [j.strip() for j in self.to_entry.get_text().split( + sender_list = [j.strip() for j in self._ui.to_entry.get_text().split( ',')] - subject = self.subject_entry.get_text() + subject = self._ui.subject_entry.get_text() begin, end = self.message_tv_buffer.get_bounds() message = self.message_tv_buffer.get_text(begin, end, True) @@ -292,8 +303,8 @@ class SingleMessageWindow: to_whom_jid = helpers.parse_jid(to_whom_jid) except helpers.InvalidFormat: ErrorDialog(_('Invalid JID'), - _('It is not possible to send a message to %s, this JID is not ' - 'valid.') % to_whom_jid) + _('It is not possible to send a message to %s, this JID ' + 'is not valid.') % to_whom_jid) return True if '/announce/' in to_whom_jid: @@ -307,7 +318,7 @@ class SingleMessageWindow: account=self.account, jid=recipient_list, message=message, type_='normal', subject=subject, form_node=form_node)) - self.subject_entry.set_text('') # we sent ok, clear the subject + self._ui.subject_entry.set_text('') # we sent ok, clear the subject self.message_tv_buffer.set_text('') # we sent ok, clear the textview def on_send_button_clicked(self, widget): @@ -319,7 +330,7 @@ class SingleMessageWindow: self.message = _('%s wrote:\n') % self.from_whom + self.message # add > at the begining of each line self.message = self.message.replace('\n', '\n> ') + '\n\n' - self.window.destroy() + self._ui.single_message_window.destroy() SingleMessageWindow(self.account, to=self.from_whom, action='send', from_whom=self.from_whom, subject=self.subject, message=self.message, session=self.session) @@ -328,9 +339,9 @@ class SingleMessageWindow: if self.send_single_message(): return self.save_pos() - self.window.destroy() + self._ui.single_message_window.destroy() def on_single_message_window_key_press_event(self, widget, event): if event.keyval == Gdk.KEY_Escape: # ESCAPE self.save_pos() - self.window.destroy() + self._ui.single_message_window.destroy() View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/f6c3d03261bfd5ff4b93c50c0736f9bdee… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/f6c3d03261bfd5ff4b93c50c0736f9bdee… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] MessageWindow: When grouped by type, show contact's name if only one conversation
by Philipp Hörist 26 Apr '19

26 Apr '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 87bbf473 by Daniel Brötzmann at 2019-04-26T14:45:16Z MessageWindow: When grouped by type, show contact's name if only one conversation When chat windows are grouped by type, the window title is either Chats or Group Chats. If there is only one conversation of either type, the window's title now shows the contact's or group chat's name. - - - - - 1 changed file: - gajim/message_window.py Changes: ===================================== gajim/message_window.py ===================================== @@ -520,8 +520,12 @@ class MessageWindow: # Show the plural form since number of tabs > 1 if self.type_ == 'chat': label = Q_('?Noun:Chats') + if self.get_num_controls() == 1: + label = name elif self.type_ == 'gc': - label = _('Groupchats') + label = _('Group Chats') + if self.get_num_controls() == 1: + label = name else: label = _('Private Chats') elif window_mode == MessageWindowMgr.ONE_MSG_WINDOW_ALWAYS_WITH_ROSTER: View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/87bbf4738a3621bb70c212dc5dbcb580b9… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/87bbf4738a3621bb70c212dc5dbcb580b9… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Disable contact sign-in notification by default
by Philipp Hörist 26 Apr '19

26 Apr '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: b262d5ad by Daniel Brötzmann at 2019-04-26T08:04:02Z Disable contact sign-in notification by default - - - - - 1 changed file: - gajim/common/config.py Changes: ===================================== gajim/common/config.py ===================================== @@ -73,7 +73,7 @@ class Config: # name: [ type, default_value, help_string ] 'verbose': [opt_bool, False, '', True], 'autopopup': [opt_bool, False], - 'notify_on_signin': [opt_bool, True], + 'notify_on_signin': [opt_bool, False], 'notify_on_signout': [opt_bool, False], 'notify_on_new_message': [opt_bool, True], 'autopopupaway': [opt_bool, False], View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/b262d5add93f4e31a21fcfb961d9079fc5… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/b262d5add93f4e31a21fcfb961d9079fc5… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Display server in remote-server-not-found error dialog
by Philipp Hörist 24 Apr '19

24 Apr '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: eb6762a4 by Daniel Brötzmann at 2019-04-24T20:56:06Z Display server in remote-server-not-found error dialog - - - - - 2 changed files: - gajim/common/modules/discovery.py - gajim/dialog_messages.py Changes: ===================================== gajim/common/modules/discovery.py ===================================== @@ -296,7 +296,11 @@ class Discovery(BaseModule): self._log.info('MUC disco error: %s', error) app.nec.push_incoming_event( InformationEvent( - None, dialog_name='unable-join-groupchat', args=error)) + None, + dialog_name='unable-join-groupchat', + kwargs={ + 'server':stanza.getFrom(), + 'error': error})) return self._log.info('MUC info received: %s', stanza.getFrom()) ===================================== gajim/dialog_messages.py ===================================== @@ -108,8 +108,8 @@ messages = { ErrorDialog), 'unable-join-groupchat': Message( - _('Unable to join Groupchat'), - '%s', + _('Unable to Join Group Chat'), + '%(server)s\n%(error)s', ErrorDialog), 'gstreamer-error': Message( View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/eb6762a461b946b4853367ac11eb068a88… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/eb6762a461b946b4853367ac11eb068a88… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] GroupchatControl: Switch encrypted symbol to symbolic
by Philipp Hörist 24 Apr '19

24 Apr '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 04717274 by Daniel Brötzmann at 2019-04-24T14:07:24Z GroupchatControl: Switch encrypted symbol to symbolic - - - - - 1 changed file: - gajim/groupchat_control.py Changes: ===================================== gajim/groupchat_control.py ===================================== @@ -1044,11 +1044,11 @@ class GroupchatControl(ChatControlBase): if authenticated: authenticated_string = _('and authenticated') self.lock_image.set_from_icon_name( - 'security-high', Gtk.IconSize.MENU) + 'security-high-symbolic', Gtk.IconSize.MENU) else: authenticated_string = _('and NOT authenticated') self.lock_image.set_from_icon_name( - 'security-low', Gtk.IconSize.MENU) + 'security-low-symbolic', Gtk.IconSize.MENU) tooltip = _('%(type)s encryption is active %(authenticated)s.') % { 'type': enc_type, 'authenticated': authenticated_string} View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/04717274b315cc796b4616b59b4bc25e94… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/04717274b315cc796b4616b59b4bc25e94… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Rework PassphraseDialog
by Philipp Hörist 23 Apr '19

23 Apr '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 245cecf1 by Daniel Brötzmann at 2019-04-23T21:11:25Z Rework PassphraseDialog - - - - - 5 changed files: - gajim/data/gui/passphrase_dialog.ui - gajim/dialogs.py - gajim/gtk/accounts.py - gajim/gtk/dialogs.py - gajim/gui_interface.py Changes: ===================================== gajim/data/gui/passphrase_dialog.ui ===================================== @@ -1,112 +1,150 @@ <?xml version="1.0" encoding="UTF-8"?> - + <interface> - <requires lib="gtk+" version="3.12"/> + <requires lib="gtk+" version="3.20"/> <object class="GtkDialog" id="passphrase_dialog"> <property name="can_focus">False</property> - <property name="border_width">12</property> + <property name="border_width">18</property> <property name="title" translatable="yes">Passphrase</property> + <property name="resizable">False</property> <property name="type_hint">dialog</property> <signal name="destroy" handler="on_passphrase_dialog_destroy" swapped="no"/> + <child> + <placeholder/> + </child> <child internal-child="vbox"> - <object class="GtkBox" id="dialog-vbox4"> + <object class="GtkBox"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="orientation">vertical</property> <property name="spacing">6</property> <child internal-child="action_area"> - <object class="GtkButtonBox" id="dialog-action_area3"> + <object class="GtkButtonBox"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="margin_top">12</property> <property name="layout_style">end</property> <child> <object class="GtkButton" id="cancel_button"> - <property name="label">gtk-cancel</property> + <property name="label">_Cancel</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="can_default">True</property> <property name="receives_default">False</property> - <property name="use_stock">True</property> + <property name="use_underline">True</property> </object> <packing> <property name="expand">False</property> - <property name="fill">False</property> + <property name="fill">True</property> <property name="position">0</property> </packing> </child> <child> <object class="GtkButton" id="ok_button"> - <property name="label">gtk-ok</property> + <property name="label">_OK</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="can_default">True</property> <property name="has_default">True</property> <property name="receives_default">False</property> - <property name="use_stock">True</property> + <property name="use_underline">True</property> + <style> + <class name="suggested-action"/> + </style> </object> <packing> <property name="expand">False</property> - <property name="fill">False</property> + <property name="fill">True</property> <property name="position">1</property> </packing> </child> </object> <packing> <property name="expand">False</property> - <property name="fill">False</property> + <property name="fill">True</property> <property name="pack_type">end</property> <property name="position">1</property> </packing> </child> <child> - <object class="GtkBox" id="vbox30"> + <object class="GtkBox"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="border_width">6</property> - <property name="orientation">vertical</property> - <property name="spacing">6</property> + <property name="spacing">18</property> <child> - <object class="GtkLabel" id="message_label"> + <object class="GtkImage"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="wrap">True</property> + <property name="icon_name">dialog-password-symbolic</property> + <property name="icon_size">6</property> </object> <packing> <property name="expand">False</property> - <property name="fill">False</property> - <property name="padding">5</property> + <property name="fill">True</property> <property name="position">0</property> </packing> </child> <child> - <object class="GtkEntry" id="passphrase_entry"> + <object class="GtkBox"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="has_focus">True</property> - <property name="visibility">False</property> - <property name="activates_default">True</property> + <property name="can_focus">False</property> + <property name="orientation">vertical</property> + <property name="spacing">6</property> + <child> + <object class="GtkLabel" id="message_label"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="margin_bottom">6</property> + <property name="wrap">True</property> + <property name="max_width_chars">40</property> + <property name="xalign">0</property> + <style> + <class name="bold"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkEntry" id="passphrase_entry"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="has_focus">True</property> + <property name="visibility">False</property> + <property name="activates_default">True</property> + <property name="input_purpose">password</property> + <property name="input_hints">GTK_INPUT_HINT_NO_SPELLCHECK | GTK_INPUT_HINT_NONE</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="GtkCheckButton" id="save_passphrase_checkbutton"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="use_underline">True</property> + <property name="draw_indicator">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">2</property> + </packing> + </child> </object> <packing> - <property name="expand">False</property> - <property name="fill">False</property> + <property name="expand">True</property> + <property name="fill">True</property> <property name="position">1</property> </packing> </child> - <child> - <object class="GtkCheckButton" id="save_passphrase_checkbutton"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="use_underline">True</property> - <property name="xalign">0.5</property> - <property name="draw_indicator">True</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">2</property> - </packing> - </child> </object> <packing> <property name="expand">False</property> ===================================== gajim/dialogs.py ===================================== @@ -217,68 +217,6 @@ class EditGroupsDialog: column.add_attribute(renderer, 'active', 1) column.add_attribute(renderer, 'inconsistent', 2) -class PassphraseDialog: - """ - Class for Passphrase dialog - """ - def __init__(self, titletext, labeltext, checkbuttontext=None, - ok_handler=None, cancel_handler=None, transient_for=None): - self.xml = get_builder('passphrase_dialog.ui') - self.window = self.xml.get_object('passphrase_dialog') - self.passphrase_entry = self.xml.get_object('passphrase_entry') - self.passphrase = -1 - self.window.set_title(titletext) - self.xml.get_object('message_label').set_text(labeltext) - - self.ok = False - - self.cancel_handler = cancel_handler - self.ok_handler = ok_handler - okbutton = self.xml.get_object('ok_button') - okbutton.connect('clicked', self.on_okbutton_clicked) - cancelbutton = self.xml.get_object('cancel_button') - cancelbutton.connect('clicked', self.on_cancelbutton_clicked) - - self.xml.connect_signals(self) - if transient_for is None: - transient_for = app.app.get_active_window() - self.window.set_transient_for(transient_for) - self.window.show_all() - - self.check = bool(checkbuttontext) - checkbutton = self.xml.get_object('save_passphrase_checkbutton') - if self.check: - checkbutton.set_label(checkbuttontext) - else: - checkbutton.hide() - - def on_okbutton_clicked(self, widget): - if not self.ok_handler: - return - - passph = self.passphrase_entry.get_text() - - if self.check: - checked = self.xml.get_object('save_passphrase_checkbutton').\ - get_active() - else: - checked = False - - self.ok = True - - self.window.destroy() - - if isinstance(self.ok_handler, tuple): - self.ok_handler[0](passph, checked, *self.ok_handler[1:]) - else: - self.ok_handler(passph, checked) - - def on_cancelbutton_clicked(self, widget): - self.window.destroy() - - def on_passphrase_dialog_destroy(self, widget): - if self.cancel_handler and not self.ok: - self.cancel_handler() class ChangeActivityDialog: PAGELIST = [ ===================================== gajim/gtk/accounts.py ===================================== @@ -31,13 +31,13 @@ from gajim.common.connection import Connection from gajim.common.zeroconf.connection_zeroconf import ConnectionZeroconf from gajim import gui_menu_builder -from gajim.dialogs import PassphraseDialog from gajim.gtk.settings import SettingsDialog from gajim.gtk.settings import SettingsBox from gajim.gtk.dialogs import ConfirmationDialog from gajim.gtk.dialogs import ConfirmationDialogDoubleRadio from gajim.gtk.dialogs import ErrorDialog +from gajim.gtk.dialogs import PassphraseDialog from gajim.gtk.dialogs import YesNoDialog from gajim.gtk.dialogs import DialogButton from gajim.gtk.dialogs import NewConfirmationDialog ===================================== gajim/gtk/dialogs.py ===================================== @@ -1071,6 +1071,65 @@ class InvitationReceivedDialog(Gtk.ApplicationWindow): self.destroy() +class PassphraseDialog: + """ + Class for Passphrase dialog + """ + def __init__(self, titletext, labeltext, checkbuttontext=None, + ok_handler=None, cancel_handler=None, transient_for=None): + self._ui = get_builder('passphrase_dialog.ui') + self.window = self._ui.get_object('passphrase_dialog') + self.passphrase = -1 + self.window.set_title(titletext) + self._ui.message_label.set_text(labeltext) + + self.ok = False + + self.cancel_handler = cancel_handler + self.ok_handler = ok_handler + self._ui.ok_button.connect('clicked', self.on_okbutton_clicked) + self._ui.cancel_button.connect('clicked', self.on_cancelbutton_clicked) + + self._ui.connect_signals(self) + if transient_for is None: + transient_for = app.app.get_active_window() + self.window.set_transient_for(transient_for) + self.window.show_all() + + self.check = bool(checkbuttontext) + if self._ui.save_passphrase_checkbutton: + self._ui.save_passphrase_checkbutton.set_label(checkbuttontext) + else: + self._ui.save_passphrase_checkbutton.hide() + + def on_okbutton_clicked(self, widget): + if not self.ok_handler: + return + + passph = self._ui.passphrase_entry.get_text() + + if self.check: + checked = self._ui.save_passphrase_checkbutton.get_active() + else: + checked = False + + self.ok = True + + self.window.destroy() + + if isinstance(self.ok_handler, tuple): + self.ok_handler[0](passph, checked, *self.ok_handler[1:]) + else: + self.ok_handler(passph, checked) + + def on_cancelbutton_clicked(self, widget): + self.window.destroy() + + def on_passphrase_dialog_destroy(self, widget): + if self.cancel_handler and not self.ok: + self.cancel_handler() + + class NewConfirmationDialog(Gtk.MessageDialog): def __init__(self, title, text, sec_text, buttons, modal=True, transient_for=None): ===================================== gajim/gui_interface.py ===================================== @@ -109,6 +109,7 @@ from gajim.gtk.dialogs import WarningDialog from gajim.gtk.dialogs import InformationDialog from gajim.gtk.dialogs import InputDialog from gajim.gtk.dialogs import YesNoDialog +from gajim.gtk.dialogs import PassphraseDialog from gajim.gtk.dialogs import PlainConnectionDialog from gajim.gtk.dialogs import SSLErrorDialog from gajim.gtk.dialogs import ChangeNickDialog @@ -574,9 +575,10 @@ class Interface: obj.conn.on_client_cert_passphrase('', obj.con, obj.port, obj.secure_tuple) - dialogs.PassphraseDialog(_('Certificate Passphrase Required'), - _('Enter the certificate passphrase for account %s') % \ - obj.conn.name, ok_handler=on_ok, cancel_handler=on_cancel) + PassphraseDialog(_('Certificate Passphrase Required'), + _('Enter the certificate passphrase for account %s') % \ + obj.conn.name, ok_handler=on_ok, + cancel_handler=on_cancel) def handle_event_password_required(self, obj): #('PASSWORD_REQUIRED', account, None) @@ -595,7 +597,7 @@ class Interface: obj.conn.disconnect(reconnect=False, immediately=True) del self.pass_dialog[account] - self.pass_dialog[account] = dialogs.PassphraseDialog( + self.pass_dialog[account] = PassphraseDialog( _('Password Required'), text, _('Save password'), ok_handler=on_ok, cancel_handler=on_cancel) View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/245cecf1a99675d064b2b856ebff916d18… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/245cecf1a99675d064b2b856ebff916d18… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Use symbolic icon in RemoveAccountWindow
by Philipp Hörist 23 Apr '19

23 Apr '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: a9499386 by Daniel Brötzmann at 2019-04-23T12:07:21Z Use symbolic icon in RemoveAccountWindow - - - - - 1 changed file: - gajim/data/gui/remove_account_window.ui Changes: ===================================== gajim/data/gui/remove_account_window.ui ===================================== @@ -5,6 +5,7 @@ <object class="GtkWindow" id="remove_account_window"> <property name="can_focus">False</property> <property name="border_width">18</property> + <property name="resizable">False</property> <property name="type_hint">dialog</property> <signal name="destroy" handler="on_remove_account_window_destroy" swapped="no"/> <child> @@ -42,7 +43,7 @@ <object class="GtkImage"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="icon_name">user-trash</property> + <property name="icon_name">user-trash-symbolic</property> <property name="icon_size">6</property> </object> <packing> @@ -114,12 +115,12 @@ <property name="layout_style">end</property> <child> <object class="GtkButton" id="cancel_button"> - <property name="label">gtk-cancel</property> + <property name="label">_Cancel</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="can_default">True</property> <property name="receives_default">False</property> - <property name="use_stock">True</property> + <property name="use_underline">True</property> <signal name="clicked" handler="on_cancel_button_clicked" swapped="no"/> </object> <packing> View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/a9499386be2f4f06cbf35bec5cd202b255… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/a9499386be2f4f06cbf35bec5cd202b255… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][gajim_1.1] update appveyor uploaded filename
by Yann Leboulanger 23 Apr '19

23 Apr '19

Yann Leboulanger pushed to branch gajim_1.1 at gajim / gajim Commits: b63dd2ed by Yann Leboulanger at 2019-04-23T19:41:58Z update appveyor uploaded filename - - - - - 1 changed file: - appveyor.yml Changes: ===================================== appveyor.yml ===================================== @@ -32,8 +32,8 @@ build_script: bash "git clone C:/projects/gajim C:/msys64/home/appveyor/gajim" bash "C:/msys64/home/appveyor/gajim/win/build.sh $($env:MSYS_ARCH)" - Push-AppveyorArtifact "$($env:BUILDROOT)/Gajim.exe" -FileName "Gajim-1.1.2-$($env:ARCH)-$($env:TIME_STRING).exe" - Push-AppveyorArtifact "$($env:BUILDROOT)/Gajim-Portable.exe" -FileName "Gajim-Portable-1.1.2-$($env:ARCH)-$($env:TIME_STRING).exe" + Push-AppveyorArtifact "$($env:BUILDROOT)/Gajim.exe" -FileName "Gajim-1.1.3-$($env:ARCH)-$($env:TIME_STRING).exe" + Push-AppveyorArtifact "$($env:BUILDROOT)/Gajim-Portable.exe" -FileName "Gajim-Portable-1.1.3-$($env:ARCH)-$($env:TIME_STRING).exe" # on_finish: # - ps: $blockRdp = $true; iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1')) View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/b63dd2ed86789f870beeb98a31acca7e48… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/b63dd2ed86789f870beeb98a31acca7e48… You're receiving this email because of your account on dev.gajim.org.

1 0

← Newer
1
2
3
4
5
6
7
8
9
Older →

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits April 2019