Commits

commits@gajim.org

17632 discussions

[Git][gajim/gajim][master] Roster: Don't build resources submenu for start_chat_menuitem
by Philipp Hörist 20 Nov '19

20 Nov '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 887f1112 by Daniel Brötzmann at 2019-11-20T09:21:27Z Roster: Don't build resources submenu for start_chat_menuitem This avoids being able to open multiple ChatControls for one contact. Historically, this was used to send a message to a specific resource. - - - - - 1 changed file: - gajim/gui_menu_builder.py Changes: ===================================== gajim/gui_menu_builder.py ===================================== @@ -206,8 +206,6 @@ control=None, gc_contact=None, is_anonymous=True): contacts = app.contacts.get_contacts(account, jid) if len(contacts) > 1 and use_multiple_contacts: # several resources - start_chat_menuitem.set_submenu(build_resources_submenu(contacts, - account, app.interface.on_open_chat_window)) send_file_menuitem.set_submenu(build_resources_submenu( contacts, account, @@ -216,8 +214,6 @@ control=None, gc_contact=None, is_anonymous=True): execute_command_menuitem.set_submenu(build_resources_submenu( contacts, account, roster.on_execute_command, cap=NS_COMMANDS)) else: - start_chat_menuitem.connect('activate', - app.interface.on_open_chat_window, contact, account) if contact.supports(NS_JINGLE_FILE_TRANSFER_5): send_file_menuitem.set_sensitive(True) send_file_menuitem.connect('activate', @@ -238,6 +234,9 @@ control=None, gc_contact=None, is_anonymous=True): else: execute_command_menuitem.set_sensitive(False) + start_chat_menuitem.connect( + 'activate', app.interface.on_open_chat_window, contact, account) + rename_menuitem.connect('activate', roster.on_rename, 'contact', jid, account) View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/887f1112c8b1dcdaf0172fe7a31168d809… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/887f1112c8b1dcdaf0172fe7a31168d809… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Preferences: Remove unused methods
by Philipp Hörist 19 Nov '19

19 Nov '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 45f078d1 by Philipp Hörist at 2019-11-19T21:58:42Z Preferences: Remove unused methods Functionality has been moved to Accounts - - - - - 1 changed file: - gajim/gtk/preferences.py Changes: ===================================== gajim/gtk/preferences.py ===================================== @@ -912,25 +912,6 @@ class Preferences(Gtk.ApplicationWindow): if event.keyval == Gdk.KEY_Delete: self.on_delete_msg_button_clicked(widget) - ### Privacy tab ### - def on_send_idle_time_checkbutton_toggled(self, widget): - widget.set_inconsistent(False) - self.on_per_account_checkbutton_toggled(widget, 'send_idle_time') - - def on_send_time_info_checkbutton_toggled(self, widget): - widget.set_inconsistent(False) - self.on_per_account_checkbutton_toggled(widget, 'send_time_info') - - def on_send_os_info_checkbutton_toggled(self, widget): - widget.set_inconsistent(False) - self.on_per_account_checkbutton_toggled(widget, 'send_os_info') - for con in app.connections.values(): - con.get_module('SoftwareVersion').set_enabled(widget.get_active()) - - def on_ignore_events_from_unknown_contacts_checkbutton_toggled(self, widget): - widget.set_inconsistent(False) - self.on_per_account_checkbutton_toggled(widget, 'ignore_unknown_contacts') - ### Style ### @staticmethod def on_theme_combobox_changed(combobox): View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/45f078d11d131415c6e12223206c175d3a… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/45f078d11d131415c6e12223206c175d3a… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 3 commits: SingleMessage: Refactor code
by Philipp Hörist 19 Nov '19

19 Nov '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 10194d68 by Philipp Hörist at 2019-11-19T21:50:12Z SingleMessage: Refactor code - Remove ApplicationWindow form glade file, we already inherit form ApplicatonWindow - Make some methods private - Fix pylint errors - - - - - c6df02f0 by Philipp Hörist at 2019-11-19T21:50:12Z RosterItemExchange: Fix pylint errors - - - - - 70f1c0f4 by Philipp Hörist at 2019-11-19T21:50:12Z PrivacyLists: Refactor code - Make handler private - Fix pylint errors - Access widgets directly via builder - - - - - 6 changed files: - gajim/data/gui/privacy_list_window.ui - gajim/data/gui/privacy_lists_window.ui - gajim/data/gui/single_message_window.ui - gajim/gtk/privacy_list.py - gajim/gtk/roster_item_exchange.py - gajim/gtk/single_message.py Changes: ===================================== gajim/data/gui/privacy_list_window.ui ===================================== @@ -46,7 +46,7 @@ <property name="border_width">6</property> <property name="title" translatable="yes">Privacy List</property> <property name="type_hint">dialog</property> - <signal name="destroy" handler="on_privacy_list_edit_window_destroy" swapped="no"/> + <signal name="destroy" handler="_on_edit_window_destroy" swapped="no"/> <signal name="key-press-event" handler="on_key_press_event" swapped="no"/> <child> <object class="GtkBox" id="main_vbox"> @@ -81,7 +81,7 @@ <property name="use_underline">True</property> <property name="xalign">0.5</property> <property name="draw_indicator">True</property> - <signal name="toggled" handler="on_privacy_list_active_checkbutton_toggled" swapped="no"/> + <signal name="toggled" handler="_on_privacy_list_active_toggled" swapped="no"/> </object> <packing> <property name="expand">False</property> @@ -98,7 +98,7 @@ <property name="use_underline">True</property> <property name="xalign">0.5</property> <property name="draw_indicator">True</property> - <signal name="toggled" handler="on_privacy_list_default_checkbutton_toggled" swapped="no"/> + <signal name="toggled" handler="_on_privacy_list_default_toggled" swapped="no"/> </object> <packing> <property name="expand">False</property> @@ -144,7 +144,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="model">liststore3</property> - <signal name="changed" handler="on_list_of_rules_combobox_changed" swapped="no"/> + <signal name="changed" handler="_on_list_of_rules_changed" swapped="no"/> <child> <object class="GtkCellRendererText" id="cellrenderertext3"/> <attributes> @@ -679,7 +679,7 @@ <property name="can_default">True</property> <property name="receives_default">False</property> <property name="use_stock">True</property> - <signal name="clicked" handler="on_close_button_clicked" swapped="no"/> + <signal name="clicked" handler="_on_close_clicked" swapped="no"/> </object> <packing> <property name="expand">False</property> ===================================== gajim/data/gui/privacy_lists_window.ui ===================================== @@ -14,7 +14,7 @@ <property name="border_width">12</property> <property name="title">window1</property> <property name="type_hint">dialog</property> - <signal name="destroy" handler="on_privacy_lists_first_window_destroy" swapped="no"/> + <signal name="destroy" handler="_on_privacy_lists_first_destroy" swapped="no"/> <signal name="key-press-event" handler="on_key_press_event" swapped="no"/> <child> <object class="GtkBox" id="vbox1"> @@ -84,7 +84,7 @@ <property name="receives_default">False</property> <property name="border_width">5</property> <property name="use_stock">True</property> - <signal name="clicked" handler="on_delete_privacy_list_button_clicked" swapped="no"/> + <signal name="clicked" handler="_on_delete_privacy_list_clicked" swapped="no"/> </object> <packing> <property name="expand">False</property> @@ -100,7 +100,7 @@ <property name="receives_default">False</property> <property name="border_width">5</property> <property name="use_stock">True</property> - <signal name="clicked" handler="on_open_privacy_list_button_clicked" swapped="no"/> + <signal name="clicked" handler="_on_open_privacy_list_clicked" swapped="no"/> </object> <packing> <property name="expand">False</property> @@ -138,7 +138,7 @@ <property name="receives_default">False</property> <property name="border_width">5</property> <property name="use_stock">True</property> - <signal name="clicked" handler="on_new_privacy_list_button_clicked" swapped="no"/> + <signal name="clicked" handler="_on_new_privacy_list_clicked" swapped="no"/> </object> <packing> <property name="expand">False</property> @@ -173,7 +173,7 @@ <property name="receives_default">False</property> <property name="border_width">5</property> <property name="use_stock">True</property> - <signal name="clicked" handler="on_close_button_clicked" swapped="no"/> + <signal name="clicked" handler="_on_close_clicked" swapped="no"/> </object> <packing> <property name="expand">False</property> ===================================== gajim/data/gui/single_message_window.ui ===================================== @@ -22,369 +22,358 @@ <property name="can_focus">False</property> <property name="icon_name">user-info-symbolic</property> </object> - <object class="GtkWindow" id="single_message_window"> + <object class="GtkBox" id="box"> + <property name="visible">True</property> <property name="can_focus">False</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> - <placeholder/> - </child> + <property name="border_width">18</property> + <property name="orientation">vertical</property> <child> - <object class="GtkBox"> + <object class="GtkGrid" id="send_grid"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="border_width">18</property> - <property name="orientation">vertical</property> + <property name="no_show_all">True</property> + <property name="row_spacing">6</property> + <property name="column_spacing">12</property> <child> - <object class="GtkGrid" id="send_grid"> + <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="row_spacing">6</property> - <property name="column_spacing">12</property> - <child> - <object class="GtkLabel" id="to_label"> - <property name="visible">True</property> - <property name="can_focus">False</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> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkEntry" id="to_entry"> - <property name="visible">True</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">1</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="subject_label"> - <property name="visible">True</property> - <property name="can_focus">False</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">1</property> - </packing> - </child> - <child> - <object class="GtkEntry" id="subject_entry"> - <property name="visible">True</property> - <property name="can_focus">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">1</property> - <property name="width">2</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="message_label_send"> - <property name="visible">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">0</property> - <property name="top_attach">2</property> - </packing> - </child> - <child> - <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="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="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">0</property> - </packing> - </child> + <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="expand">True</property> - <property name="fill">True</property> - <property name="position">0</property> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkEntry" id="to_entry"> + <property name="visible">True</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">1</property> + <property name="top_attach">0</property> </packing> </child> <child> - <object class="GtkGrid" id="received_grid"> + <object class="GtkLabel" id="subject_label"> <property name="visible">True</property> <property name="can_focus">False</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"> - <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"><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"><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> - <child> - <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="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> + <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="expand">True</property> - <property name="fill">True</property> - <property name="position">1</property> + <property name="left_attach">0</property> + <property name="top_attach">1</property> </packing> </child> <child> - <object class="GtkButtonBox"> + <object class="GtkEntry" id="subject_entry"> + <property name="visible">True</property> + <property name="can_focus">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">1</property> + <property name="width">2</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="message_label_send"> <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> - <object class="GtkButton" id="close_button"> - <property name="label">gtk-close</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_close_button_clicked" swapped="no"/> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkButton" id="send_button"> - <property name="label" translatable="yes">Sen_d</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="tooltip_text" translatable="yes">Send message</property> - <property name="image">image2</property> - <property name="use_underline">True</property> - <signal name="clicked" handler="on_send_button_clicked" swapped="no"/> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">2</property> - </packing> - </child> + <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">0</property> + <property name="top_attach">2</property> + </packing> + </child> + <child> + <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="vexpand">True</property> + <property name="shadow_type">in</property> <child> - <object class="GtkButton" id="reply_button"> - <property name="label" translatable="yes">_Reply</property> + <object class="GtkTextView" id="message_textview"> <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="tooltip_text" translatable="yes">Reply to this message</property> - <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> + <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> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">3</property> - </packing> </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="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_contact_info_clicked" swapped="no"/> + </object> + <packing> + <property name="left_attach">2</property> + <property name="top_attach">0</property> + </packing> + </child> + </object> + <packing> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkGrid" id="received_grid"> + <property name="visible">True</property> + <property name="can_focus">False</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"> + <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"><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"><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> + <child> + <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="hexpand">True</property> + <property name="vexpand">True</property> + <property name="shadow_type">in</property> <child> - <object class="GtkButton" id="send_and_close_button"> - <property name="label" translatable="yes">_Send & Close</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="tooltip_text" translatable="yes">Send message and close window</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> - <property name="fill">False</property> - <property name="position">4</property> - </packing> + <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">1</property> + </packing> + </child> + <child> + <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> + <object class="GtkButton" id="close_button"> + <property name="label">gtk-close</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_close_clicked" swapped="no"/> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkButton" id="send_button"> + <property name="label" translatable="yes">Sen_d</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="tooltip_text" translatable="yes">Send message</property> + <property name="image">image2</property> + <property name="use_underline">True</property> + <signal name="clicked" handler="_on_send_clicked" swapped="no"/> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">2</property> + </packing> + </child> + <child> + <object class="GtkButton" id="reply_button"> + <property name="label" translatable="yes">_Reply</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="tooltip_text" translatable="yes">Reply to this message</property> + <property name="image">image1</property> + <property name="use_underline">True</property> + <signal name="clicked" handler="_on_reply_clicked" swapped="no"/> + <style> + <class name="suggested-action"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">3</property> + </packing> + </child> + <child> + <object class="GtkButton" id="send_and_close_button"> + <property name="label" translatable="yes">_Send & Close</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="tooltip_text" translatable="yes">Send message and close window</property> + <property name="image">image3</property> + <property name="use_underline">True</property> + <signal name="clicked" handler="_on_send_and_close_clicked" swapped="no"/> + <style> + <class name="suggested-action"/> + </style> + </object> <packing> <property name="expand">False</property> - <property name="fill">True</property> - <property name="padding">6</property> + <property name="fill">False</property> <property name="position">4</property> </packing> </child> </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="padding">6</property> + <property name="position">4</property> + </packing> </child> </object> </interface> ===================================== gajim/gtk/privacy_list.py ===================================== @@ -46,29 +46,10 @@ class PrivacyListWindow(EventHelper): self.allow_deny = 'allow' # Connect to gtk builder - self.xml = get_builder('privacy_list_window.ui') - self.window = self.xml.get_object('privacy_list_edit_window') - - # Add Widgets - - for widget_to_add in ('title_hbox', 'privacy_lists_title_label', - 'list_of_rules_label', 'add_edit_rule_label', 'delete_open_buttons_hbox', - 'privacy_list_active_checkbutton', 'privacy_list_default_checkbutton', - 'list_of_rules_combobox', 'delete_open_buttons_hbox', - 'delete_rule_button', 'open_rule_button', 'edit_allow_radiobutton', - 'edit_deny_radiobutton', 'edit_type_jabberid_radiobutton', - 'edit_type_jabberid_entry', 'edit_type_group_radiobutton', - 'edit_type_group_combobox', 'edit_type_subscription_radiobutton', - 'edit_type_subscription_combobox', 'edit_type_select_all_radiobutton', - 'edit_queries_send_checkbutton', 'edit_send_messages_checkbutton', - 'edit_view_status_checkbutton', 'edit_all_checkbutton', - 'edit_order_spinbutton', 'new_rule_button', 'save_rule_button', - 'privacy_list_refresh_button', 'privacy_list_close_button', - 'edit_send_status_checkbutton', 'add_edit_vbox', - 'privacy_list_active_checkbutton', 'privacy_list_default_checkbutton'): - self.__dict__[widget_to_add] = self.xml.get_object(widget_to_add) - - self.privacy_lists_title_label.set_label( + self._ui = get_builder('privacy_list_window.ui') + self.window = self._ui.get_object('privacy_list_edit_window') + + self._ui.privacy_lists_title_label.set_label( _('Privacy List <b><i>%s</i></b>') % GLib.markup_escape_text(self.privacy_list_name)) @@ -77,11 +58,11 @@ class PrivacyListWindow(EventHelper): else: title = _('Privacy List') - self.delete_rule_button.set_sensitive(False) - self.open_rule_button.set_sensitive(False) - self.privacy_list_active_checkbutton.set_sensitive(False) - self.privacy_list_default_checkbutton.set_sensitive(False) - self.list_of_rules_combobox.set_sensitive(False) + self._ui.delete_rule_button.set_sensitive(False) + self._ui.open_rule_button.set_sensitive(False) + self._ui.privacy_list_active_checkbutton.set_sensitive(False) + self._ui.privacy_list_default_checkbutton.set_sensitive(False) + self._ui.list_of_rules_combobox.set_sensitive(False) # set jabber id completion jids_list_store = Gtk.ListStore(GObject.TYPE_STRING) @@ -91,17 +72,17 @@ class PrivacyListWindow(EventHelper): jid_entry_completion.set_text_column(0) jid_entry_completion.set_model(jids_list_store) jid_entry_completion.set_popup_completion(True) - self.edit_type_jabberid_entry.set_completion(jid_entry_completion) + self._ui.edit_type_jabberid_entry.set_completion(jid_entry_completion) if action == 'EDIT': self.refresh_rules() - model = self.edit_type_group_combobox.get_model() + model = self._ui.edit_type_group_combobox.get_model() count = 0 for group in app.groups[self.account]: self.list_of_groups[group] = count count += 1 model.append([group]) - self.edit_type_group_combobox.set_active(0) + self._ui.edit_type_group_combobox.set_active(0) self.window.set_title(title) @@ -113,15 +94,15 @@ class PrivacyListWindow(EventHelper): # pylint: enable=line-too-long self.window.show_all() - self.add_edit_vbox.hide() + self._ui.add_edit_vbox.hide() - self.xml.connect_signals(self) + self._ui.connect_signals(self) - def on_key_press_event(self, widget, event): + def on_key_press_event(self, _widget, event): if event.keyval == Gdk.KEY_Escape: self.window.destroy() - def on_privacy_list_edit_window_destroy(self, widget): + def _on_edit_window_destroy(self, _widget): key_name = 'privacy_list_%s' % self.privacy_list_name if key_name in app.interface.instances[self.account]: del app.interface.instances[self.account][key_name] @@ -131,23 +112,26 @@ class PrivacyListWindow(EventHelper): if obj.conn.name != self.account: return if obj.active_list == self.privacy_list_name: - self.privacy_list_active_checkbutton.set_active(True) + self._ui.privacy_list_active_checkbutton.set_active(True) else: - self.privacy_list_active_checkbutton.set_active(False) + self._ui.privacy_list_active_checkbutton.set_active(False) if obj.default_list == self.privacy_list_name: - self.privacy_list_default_checkbutton.set_active(True) + self._ui.privacy_list_default_checkbutton.set_active(True) else: - self.privacy_list_default_checkbutton.set_active(False) + self._ui.privacy_list_default_checkbutton.set_active(False) def privacy_list_received(self, rules): - model = self.list_of_rules_combobox.get_model() + model = self._ui.list_of_rules_combobox.get_model() model.clear() self.global_rules = {} for rule in rules: if 'type' in rule: - text_item = _('Order: %(order)s, action: %(action)s, type: %(type)s' - ', value: %(value)s') % {'order': rule['order'], - 'action': rule['action'], 'type': rule['type'], + text_item = _( + 'Order: %(order)s, action: %(action)s, type: %(type)s' + ', value: %(value)s') % { + 'order': rule['order'], + 'action': rule['action'], + 'type': rule['type'], 'value': rule['value']} else: text_item = _('Order: %(order)s, action: %(action)s') % \ @@ -157,20 +141,20 @@ class PrivacyListWindow(EventHelper): self.global_rules[text_item] = rule model.append([text_item]) if not rules: - self.title_hbox.set_sensitive(False) - self.list_of_rules_combobox.set_sensitive(False) - self.delete_rule_button.set_sensitive(False) - self.open_rule_button.set_sensitive(False) - self.privacy_list_active_checkbutton.set_sensitive(False) - self.privacy_list_default_checkbutton.set_sensitive(False) + self._ui.title_hbox.set_sensitive(False) + self._ui.list_of_rules_combobox.set_sensitive(False) + self._ui.delete_rule_button.set_sensitive(False) + self._ui.open_rule_button.set_sensitive(False) + self._ui.privacy_list_active_checkbutton.set_sensitive(False) + self._ui.privacy_list_default_checkbutton.set_sensitive(False) else: - self.list_of_rules_combobox.set_active(0) - self.title_hbox.set_sensitive(True) - self.list_of_rules_combobox.set_sensitive(True) - self.delete_rule_button.set_sensitive(True) - self.open_rule_button.set_sensitive(True) - self.privacy_list_active_checkbutton.set_sensitive(True) - self.privacy_list_default_checkbutton.set_sensitive(True) + self._ui.list_of_rules_combobox.set_active(0) + self._ui.title_hbox.set_sensitive(True) + self._ui.list_of_rules_combobox.set_sensitive(True) + self._ui.delete_rule_button.set_sensitive(True) + self._ui.open_rule_button.set_sensitive(True) + self._ui.privacy_list_active_checkbutton.set_sensitive(True) + self._ui.privacy_list_default_checkbutton.set_sensitive(True) self.reset_fields() con = app.connections[self.account] con.get_module('PrivacyLists').get_privacy_lists() @@ -186,9 +170,9 @@ class PrivacyListWindow(EventHelper): con = app.connections[self.account] con.get_module('PrivacyLists').get_privacy_list(self.privacy_list_name) - def on_delete_rule_button_clicked(self, widget): - model = self.list_of_rules_combobox.get_model() - iter_ = self.list_of_rules_combobox.get_active_iter() + def on_delete_rule_button_clicked(self, _widget): + model = self._ui.list_of_rules_combobox.get_model() + iter_ = self._ui.list_of_rules_combobox.get_active_iter() _rule = model[iter_][0] tags = [] for rule in self.global_rules: @@ -198,95 +182,96 @@ class PrivacyListWindow(EventHelper): con.get_module('PrivacyLists').set_privacy_list( self.privacy_list_name, tags) self.privacy_list_received(tags) - self.add_edit_vbox.hide() + self._ui.add_edit_vbox.hide() if not tags: # we removed latest rule if 'privacy_lists' in app.interface.instances[self.account]: win = app.interface.instances[self.account]['privacy_lists'] - win.remove_privacy_list_from_combobox(self.privacy_list_name) + win.remove_privacy_list(self.privacy_list_name) win.draw_widgets() - def on_open_rule_button_clicked(self, widget): - self.add_edit_rule_label.set_label(_('<b>Edit a rule</b>')) - active_num = self.list_of_rules_combobox.get_active() + def on_open_rule_button_clicked(self, _widget): + self._ui.add_edit_rule_label.set_label(_('<b>Edit a rule</b>')) + active_num = self._ui.list_of_rules_combobox.get_active() if active_num == -1: self.active_rule = '' else: - model = self.list_of_rules_combobox.get_model() - iter_ = self.list_of_rules_combobox.get_active_iter() + model = self._ui.list_of_rules_combobox.get_model() + iter_ = self._ui.list_of_rules_combobox.get_active_iter() self.active_rule = model[iter_][0] if self.active_rule != '': rule_info = self.global_rules[self.active_rule] - self.edit_order_spinbutton.set_value(int(rule_info['order'])) + self._ui.edit_order_spinbutton.set_value(int(rule_info['order'])) if 'type' in rule_info: if rule_info['type'] == 'jid': - self.edit_type_jabberid_radiobutton.set_active(True) - self.edit_type_jabberid_entry.set_text(rule_info['value']) + self._ui.edit_type_jabberid_radiobutton.set_active(True) + self._ui.edit_type_jabberid_entry.set_text( + rule_info['value']) elif rule_info['type'] == 'group': - self.edit_type_group_radiobutton.set_active(True) + self._ui.edit_type_group_radiobutton.set_active(True) if rule_info['value'] in self.list_of_groups: - self.edit_type_group_combobox.set_active( + self._ui.edit_type_group_combobox.set_active( self.list_of_groups[rule_info['value']]) else: - self.edit_type_group_combobox.set_active(0) + self._ui.edit_type_group_combobox.set_active(0) elif rule_info['type'] == 'subscription': - self.edit_type_subscription_radiobutton.set_active(True) + self._ui.edit_type_subscription_radiobutton.set_active(True) sub_value = rule_info['value'] if sub_value == 'none': - self.edit_type_subscription_combobox.set_active(0) + self._ui.edit_type_subscription_combobox.set_active(0) elif sub_value == 'both': - self.edit_type_subscription_combobox.set_active(1) + self._ui.edit_type_subscription_combobox.set_active(1) elif sub_value == 'from': - self.edit_type_subscription_combobox.set_active(2) + self._ui.edit_type_subscription_combobox.set_active(2) elif sub_value == 'to': - self.edit_type_subscription_combobox.set_active(3) + self._ui.edit_type_subscription_combobox.set_active(3) else: - self.edit_type_select_all_radiobutton.set_active(True) + self._ui.edit_type_select_all_radiobutton.set_active(True) else: - self.edit_type_select_all_radiobutton.set_active(True) - self.edit_send_messages_checkbutton.set_active(False) - self.edit_queries_send_checkbutton.set_active(False) - self.edit_view_status_checkbutton.set_active(False) - self.edit_send_status_checkbutton.set_active(False) - self.edit_all_checkbutton.set_active(False) + self._ui.edit_type_select_all_radiobutton.set_active(True) + self._ui.edit_send_messages_checkbutton.set_active(False) + self._ui.edit_queries_send_checkbutton.set_active(False) + self._ui.edit_view_status_checkbutton.set_active(False) + self._ui.edit_send_status_checkbutton.set_active(False) + self._ui.edit_all_checkbutton.set_active(False) if not rule_info['child']: - self.edit_all_checkbutton.set_active(True) + self._ui.edit_all_checkbutton.set_active(True) else: if 'presence-out' in rule_info['child']: - self.edit_send_status_checkbutton.set_active(True) + self._ui.edit_send_status_checkbutton.set_active(True) if 'presence-in' in rule_info['child']: - self.edit_view_status_checkbutton.set_active(True) + self._ui.edit_view_status_checkbutton.set_active(True) if 'iq' in rule_info['child']: - self.edit_queries_send_checkbutton.set_active(True) + self._ui.edit_queries_send_checkbutton.set_active(True) if 'message' in rule_info['child']: - self.edit_send_messages_checkbutton.set_active(True) + self._ui.edit_send_messages_checkbutton.set_active(True) if rule_info['action'] == 'allow': - self.edit_allow_radiobutton.set_active(True) + self._ui.edit_allow_radiobutton.set_active(True) else: - self.edit_deny_radiobutton.set_active(True) - self.add_edit_vbox.show() + self._ui.edit_deny_radiobutton.set_active(True) + self._ui.add_edit_vbox.show() def on_edit_all_checkbutton_toggled(self, widget): if widget.get_active(): - self.edit_send_messages_checkbutton.set_active(True) - self.edit_queries_send_checkbutton.set_active(True) - self.edit_view_status_checkbutton.set_active(True) - self.edit_send_status_checkbutton.set_active(True) - self.edit_send_messages_checkbutton.set_sensitive(False) - self.edit_queries_send_checkbutton.set_sensitive(False) - self.edit_view_status_checkbutton.set_sensitive(False) - self.edit_send_status_checkbutton.set_sensitive(False) + self._ui.edit_send_messages_checkbutton.set_active(True) + self._ui.edit_queries_send_checkbutton.set_active(True) + self._ui.edit_view_status_checkbutton.set_active(True) + self._ui.edit_send_status_checkbutton.set_active(True) + self._ui.edit_send_messages_checkbutton.set_sensitive(False) + self._ui.edit_queries_send_checkbutton.set_sensitive(False) + self._ui.edit_view_status_checkbutton.set_sensitive(False) + self._ui.edit_send_status_checkbutton.set_sensitive(False) else: - self.edit_send_messages_checkbutton.set_active(False) - self.edit_queries_send_checkbutton.set_active(False) - self.edit_view_status_checkbutton.set_active(False) - self.edit_send_status_checkbutton.set_active(False) - self.edit_send_messages_checkbutton.set_sensitive(True) - self.edit_queries_send_checkbutton.set_sensitive(True) - self.edit_view_status_checkbutton.set_sensitive(True) - self.edit_send_status_checkbutton.set_sensitive(True) - - def on_privacy_list_active_checkbutton_toggled(self, widget): + self._ui.edit_send_messages_checkbutton.set_active(False) + self._ui.edit_queries_send_checkbutton.set_active(False) + self._ui.edit_view_status_checkbutton.set_active(False) + self._ui.edit_send_status_checkbutton.set_active(False) + self._ui.edit_send_messages_checkbutton.set_sensitive(True) + self._ui.edit_queries_send_checkbutton.set_sensitive(True) + self._ui.edit_view_status_checkbutton.set_sensitive(True) + self._ui.edit_send_status_checkbutton.set_sensitive(True) + + def _on_privacy_list_active_toggled(self, widget): name = None if widget.get_active(): name = self.privacy_list_name @@ -294,7 +279,7 @@ class PrivacyListWindow(EventHelper): con = app.connections[self.account] con.get_module('PrivacyLists').set_active_list(name) - def on_privacy_list_default_checkbutton_toggled(self, widget): + def _on_privacy_list_default_toggled(self, widget): name = None if widget.get_active(): name = self.privacy_list_name @@ -302,62 +287,63 @@ class PrivacyListWindow(EventHelper): con = app.connections[self.account] con.get_module('PrivacyLists').set_default_list(name) - def on_new_rule_button_clicked(self, widget): + def on_new_rule_button_clicked(self, _widget): self.reset_fields() - self.add_edit_vbox.show() + self._ui.add_edit_vbox.show() def reset_fields(self): - self.edit_type_jabberid_entry.set_text('') - self.edit_allow_radiobutton.set_active(True) - self.edit_type_jabberid_radiobutton.set_active(True) + self._ui.edit_type_jabberid_entry.set_text('') + self._ui.edit_allow_radiobutton.set_active(True) + self._ui.edit_type_jabberid_radiobutton.set_active(True) self.active_rule = '' - self.edit_send_messages_checkbutton.set_active(False) - self.edit_queries_send_checkbutton.set_active(False) - self.edit_view_status_checkbutton.set_active(False) - self.edit_send_status_checkbutton.set_active(False) - self.edit_all_checkbutton.set_active(False) - self.edit_order_spinbutton.set_value(self.max_order + 1) - self.edit_type_group_combobox.set_active(0) - self.edit_type_subscription_combobox.set_active(0) - self.add_edit_rule_label.set_label(_('<b>Add a rule</b>')) + self._ui.edit_send_messages_checkbutton.set_active(False) + self._ui.edit_queries_send_checkbutton.set_active(False) + self._ui.edit_view_status_checkbutton.set_active(False) + self._ui.edit_send_status_checkbutton.set_active(False) + self._ui.edit_all_checkbutton.set_active(False) + self._ui.edit_order_spinbutton.set_value(self.max_order + 1) + self._ui.edit_type_group_combobox.set_active(0) + self._ui.edit_type_subscription_combobox.set_active(0) + self._ui.add_edit_rule_label.set_label(_('<b>Add a rule</b>')) def get_current_tags(self): - if self.edit_type_jabberid_radiobutton.get_active(): + if self._ui.edit_type_jabberid_radiobutton.get_active(): edit_type = 'jid' - edit_value = self.edit_type_jabberid_entry.get_text() - elif self.edit_type_group_radiobutton.get_active(): + edit_value = self._ui.edit_type_jabberid_entry.get_text() + elif self._ui.edit_type_group_radiobutton.get_active(): edit_type = 'group' - model = self.edit_type_group_combobox.get_model() - iter_ = self.edit_type_group_combobox.get_active_iter() + model = self._ui.edit_type_group_combobox.get_model() + iter_ = self._ui.edit_type_group_combobox.get_active_iter() edit_value = model[iter_][0] - elif self.edit_type_subscription_radiobutton.get_active(): + elif self._ui.edit_type_subscription_radiobutton.get_active(): edit_type = 'subscription' subs = ['none', 'both', 'from', 'to'] - edit_value = subs[self.edit_type_subscription_combobox.get_active()] - elif self.edit_type_select_all_radiobutton.get_active(): + edit_value = subs[ + self._ui.edit_type_subscription_combobox.get_active()] + elif self._ui.edit_type_select_all_radiobutton.get_active(): edit_type = '' edit_value = '' - edit_order = str(self.edit_order_spinbutton.get_value_as_int()) - if self.edit_allow_radiobutton.get_active(): + edit_order = str(self._ui.edit_order_spinbutton.get_value_as_int()) + if self._ui.edit_allow_radiobutton.get_active(): edit_deny = 'allow' else: edit_deny = 'deny' child = [] - if not self.edit_all_checkbutton.get_active(): - if self.edit_send_messages_checkbutton.get_active(): + if not self._ui.edit_all_checkbutton.get_active(): + if self._ui.edit_send_messages_checkbutton.get_active(): child.append('message') - if self.edit_queries_send_checkbutton.get_active(): + if self._ui.edit_queries_send_checkbutton.get_active(): child.append('iq') - if self.edit_send_status_checkbutton.get_active(): + if self._ui.edit_send_status_checkbutton.get_active(): child.append('presence-out') - if self.edit_view_status_checkbutton.get_active(): + if self._ui.edit_view_status_checkbutton.get_active(): child.append('presence-in') if edit_type != '': return {'order': edit_order, 'action': edit_deny, 'type': edit_type, 'value': edit_value, 'child': child} return {'order': edit_order, 'action': edit_deny, 'child': child} - def on_save_rule_button_clicked(self, widget): + def on_save_rule_button_clicked(self, _widget): tags = [] current_tags = self.get_current_tags() if int(current_tags['order']) > self.max_order: @@ -375,26 +361,26 @@ class PrivacyListWindow(EventHelper): con.get_module('PrivacyLists').set_privacy_list( self.privacy_list_name, tags) self.refresh_rules() - self.add_edit_vbox.hide() + self._ui.add_edit_vbox.hide() if 'privacy_lists' in app.interface.instances[self.account]: win = app.interface.instances[self.account]['privacy_lists'] win.add_privacy_list_to_combobox(self.privacy_list_name) win.draw_widgets() - def on_list_of_rules_combobox_changed(self, widget): - self.add_edit_vbox.hide() + def _on_list_of_rules_changed(self, _widget): + self._ui.add_edit_vbox.hide() - def on_edit_type_radiobutton_changed(self, widget, radiobutton): + def _on_edit_type_changed(self, widget, radiobutton): active_bool = widget.get_active() if active_bool: self.edit_rule_type = radiobutton - def on_edit_allow_radiobutton_changed(self, widget, radiobutton): + def _on_edit_allow_changed(self, widget, radiobutton): active_bool = widget.get_active() if active_bool: self.allow_deny = radiobutton - def on_close_button_clicked(self, widget): + def _on_close_clicked(self, _widget): self.window.destroy() @@ -408,15 +394,9 @@ class PrivacyListsWindow(EventHelper): self.account = account self.privacy_lists_save = [] - self.xml = get_builder('privacy_lists_window.ui') + self._ui = get_builder('privacy_lists_window.ui') - self.window = self.xml.get_object('privacy_lists_first_window') - for widget_to_add in ( - 'list_of_privacy_lists_combobox', 'delete_privacy_list_button', - 'open_privacy_list_button', 'new_privacy_list_button', - 'new_privacy_list_entry', 'privacy_lists_refresh_button', - 'close_privacy_lists_window_button'): - self.__dict__[widget_to_add] = self.xml.get_object(widget_to_add) + self.window = self._ui.get_object('privacy_lists_first_window') self.draw_privacy_lists_in_combobox([]) self.privacy_lists_refresh() @@ -439,22 +419,22 @@ class PrivacyListsWindow(EventHelper): self.window.show_all() - self.xml.connect_signals(self) + self._ui.connect_signals(self) - def on_key_press_event(self, widget, event): + def on_key_press_event(self, _widget, event): if event.keyval == Gdk.KEY_Escape: self.window.destroy() - def on_privacy_lists_first_window_destroy(self, widget): + def _on_privacy_lists_first_destroy(self, _widget): if 'privacy_lists' in app.interface.instances[self.account]: del app.interface.instances[self.account]['privacy_lists'] self.unregister_events() - def remove_privacy_list_from_combobox(self, privacy_list): + def remove_privacy_list(self, privacy_list): if privacy_list not in self.privacy_lists_save: return - model = self.list_of_privacy_lists_combobox.get_model() + model = self._ui.list_of_privacy_lists_combobox.get_model() for entry in model: if entry[0] == privacy_list: model.remove(entry.iter) @@ -464,13 +444,13 @@ class PrivacyListsWindow(EventHelper): def add_privacy_list_to_combobox(self, privacy_list): if privacy_list in self.privacy_lists_save: return - model = self.list_of_privacy_lists_combobox.get_model() + model = self._ui.list_of_privacy_lists_combobox.get_model() model.append([privacy_list]) self.privacy_lists_save.append(privacy_list) def draw_privacy_lists_in_combobox(self, privacy_lists): - self.list_of_privacy_lists_combobox.set_active(-1) - self.list_of_privacy_lists_combobox.get_model().clear() + self._ui.list_of_privacy_lists_combobox.set_active(-1) + self._ui.list_of_privacy_lists_combobox.get_model().clear() self.privacy_lists_save = [] for add_item in privacy_lists: self.add_privacy_list_to_combobox(add_item) @@ -478,21 +458,21 @@ class PrivacyListsWindow(EventHelper): def draw_widgets(self): if not self.privacy_lists_save: - self.list_of_privacy_lists_combobox.set_sensitive(False) - self.open_privacy_list_button.set_sensitive(False) - self.delete_privacy_list_button.set_sensitive(False) + self._ui.list_of_privacy_lists_combobox.set_sensitive(False) + self._ui.open_privacy_list_button.set_sensitive(False) + self._ui.delete_privacy_list_button.set_sensitive(False) else: - self.list_of_privacy_lists_combobox.set_sensitive(True) - self.list_of_privacy_lists_combobox.set_active(0) - self.open_privacy_list_button.set_sensitive(True) - self.delete_privacy_list_button.set_sensitive(True) + self._ui.list_of_privacy_lists_combobox.set_sensitive(True) + self._ui.list_of_privacy_lists_combobox.set_active(0) + self._ui.open_privacy_list_button.set_sensitive(True) + self._ui.delete_privacy_list_button.set_sensitive(True) - def on_close_button_clicked(self, widget): + def _on_close_clicked(self, _widget): self.window.destroy() - def on_delete_privacy_list_button_clicked(self, widget): + def _on_delete_privacy_list_clicked(self, _widget): active_list = self.privacy_lists_save[ - self.list_of_privacy_lists_combobox.get_active()] + self._ui.list_of_privacy_lists_combobox.get_active()] con = app.connections[self.account] con.get_module('PrivacyLists').del_privacy_list(active_list) @@ -520,8 +500,8 @@ class PrivacyListsWindow(EventHelper): con = app.connections[self.account] con.get_module('PrivacyLists').get_privacy_lists() - def on_new_privacy_list_button_clicked(self, widget): - name = self.new_privacy_list_entry.get_text() + def _on_new_privacy_list_clicked(self, _widget): + name = self._ui.new_privacy_list_entry.get_text() if not name: ErrorDialog( _('Invalid List Name'), @@ -534,14 +514,14 @@ class PrivacyListsWindow(EventHelper): else: app.interface.instances[self.account][key_name] = \ PrivacyListWindow(self.account, name, 'NEW') - self.new_privacy_list_entry.set_text('') + self._ui.new_privacy_list_entry.set_text('') - def on_privacy_lists_refresh_button_clicked(self, widget): + def _on_privacy_lists_refresh_clicked(self, _widget): self.privacy_lists_refresh() - def on_open_privacy_list_button_clicked(self, widget): + def _on_open_privacy_list_clicked(self, _widget): name = self.privacy_lists_save[ - self.list_of_privacy_lists_combobox.get_active()] + self._ui.list_of_privacy_lists_combobox.get_active()] key_name = 'privacy_list_%s' % name if key_name in app.interface.instances[self.account]: app.interface.instances[self.account][key_name].window.present() ===================================== gajim/gtk/roster_item_exchange.py ===================================== @@ -184,14 +184,14 @@ class RosterItemExchangeWindow(Gtk.ApplicationWindow): self._ui.accept_button.set_label(_('Delete')) - def _on_accept_button_clicked(self, widget): + def _on_accept_button_clicked(self, _widget): model = self._ui.items_list_treeview.get_model() iter_ = model.get_iter_first() if self.action == 'add': - a = 0 + count = 0 while iter_: if model[iter_][0]: - a += 1 + count += 1 # It is selected message = _('%s suggested me to add you to my ' 'contact list.' % self.jid_from) @@ -209,20 +209,21 @@ class RosterItemExchangeWindow(Gtk.ApplicationWindow): nickname=model[iter_][2], auto_auth=True) iter_ = model.iter_next(iter_) InformationDialog(i18n.ngettext('Added %d contact', - 'Added %d contacts', a, a, a)) + 'Added %d contacts', + count, count, count)) elif self.action == 'modify': - a = 0 + count = 0 while iter_: if model[iter_][0]: - a += 1 + count += 1 # It is selected jid = model[iter_][1] # Keep same groups and same nickname groups = model[iter_][3].split(', ') if groups == ['']: groups = [] - for u in app.contacts.get_contact(self.account, jid): - u.name = model[iter_][2] + for contact in app.contacts.get_contact(self.account, jid): + contact.name = model[iter_][2] con = app.connections[self.account] con.get_module('Roster').update_contact( jid, model[iter_][2], groups) @@ -238,10 +239,10 @@ class RosterItemExchangeWindow(Gtk.ApplicationWindow): win.show_title() iter_ = model.iter_next(iter_) elif self.action == 'delete': - a = 0 + count = 0 while iter_: if model[iter_][0]: - a += 1 + count += 1 # It is selected jid = model[iter_][1] app.connections[self.account].get_module( @@ -250,8 +251,9 @@ class RosterItemExchangeWindow(Gtk.ApplicationWindow): app.contacts.remove_jid(self.account, jid) iter_ = model.iter_next(iter_) InformationDialog(i18n.ngettext('Removed %d contact', - 'Removed %d contacts', a, a, a)) + 'Removed %d contacts', + count, count, count)) self.destroy() - def _on_cancel_button_clicked(self, widget): + def _on_cancel_button_clicked(self, _widget): self.destroy() ===================================== gajim/gtk/single_message.py ===================================== @@ -44,42 +44,45 @@ class SingleMessageWindow(Gtk.ApplicationWindow): action argument which can be 'send' or 'receive' """ def __init__(self, account, to='', action='', from_whom='', subject='', - message='', resource='', session=None): + message='', resource='', session=None): Gtk.ApplicationWindow.__init__(self) self.set_application(app.app) + self.set_position(Gtk.WindowPosition.CENTER) + self.set_show_menubar(False) self.set_title(_('Send Single Message')) self.set_name('SendSingleMessageWindow') self.account = account - self.action = action + self._action = action - self.subject = subject - self.message = message - self.to = to - self.from_whom = from_whom - self.resource = resource - self.session = session + self._subject = subject + self._message = message + self._to = to + self._from_whom = from_whom + self._resource = resource + self._session = session self._ui = get_builder('single_message_window.ui') - self.message_tv_buffer = self._ui.message_textview.get_buffer() - self.conversation_textview = ConversationTextview( + 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._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._ui.conversation_scrolledwindow.add( - self.conversation_textview.tv) + self._conversation_textview.tv) - self.message_tv_buffer.connect('changed', self.update_char_counter) + self._message_tv_buffer.connect('changed', self._update_char_counter) if isinstance(to, list): jid = ', '.join([i[0].jid for i in to]) self._ui.to_entry.set_text(jid) else: self._ui.to_entry.set_text(to) - if app.config.get('use_speller') and app.is_installed('GSPELL') and action == 'send': + if (app.config.get('use_speller') and + app.is_installed('GSPELL') and + action == 'send'): lang = app.config.get('speller_language') gspell_lang = Gspell.language_lookup(lang) if gspell_lang is None: @@ -93,95 +96,64 @@ class SingleMessageWindow(Gtk.ApplicationWindow): spell_view.set_inline_spell_checking(True) spell_view.set_enable_language_menu(True) - self.prepare_widgets_for(self.action) + self._prepare_widgets_for(self._action) # set_text(None) raises TypeError exception - if self.subject is None: - self.subject = _('(No subject)') - self._ui.subject_entry.set_text(self.subject) - self._ui.subject_from_entry_label.set_text(self.subject) + if self._subject is None: + 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._ui.to_entry) - self.completion_dict = helpers.get_contact_dict_for_account(account) - keys = sorted(self.completion_dict.keys()) + self._completion_dict = helpers.get_contact_dict_for_account( + account) + keys = sorted(self._completion_dict.keys()) for jid in keys: - contact = self.completion_dict[jid] + contact = self._completion_dict[jid] status_icon = get_icon_name(contact.show) liststore.append((status_icon, jid)) else: - self.completion_dict = {} + self._completion_dict = {} - self._ui.to_entry.connect('changed', self.on_to_entry_changed) + self.add(self._ui.box) + + self.connect('delete-event', self._on_delete) + self.connect('destroy', self._on_destroy) + self.connect('key-press-event', self._on_key_press_event) + + 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._ui.single_message_window, - app.config.get('single-msg-width'), - app.config.get('single-msg-height')) - move_window(self._ui.single_message_window, - app.config.get('single-msg-x-position'), - app.config.get('single-msg-y-position')) - - self._ui.single_message_window.show_all() - - def on_single_message_window_destroy(self, widget): - c = app.contacts.get_contact_with_highest_priority(self.account, - self.from_whom) - if not c: - # Groupchat is maybe already destroyed - return - if c.is_groupchat and self.from_whom not in \ - app.interface.minimized_controls[self.account] and self.action == \ - 'receive' and app.events.get_nb_roster_events(self.account, - self.from_whom, types=['chat', 'normal']) == 0: - app.interface.roster.remove_groupchat(self.from_whom, self.account) + resize_window(self, + app.config.get('single-msg-width'), + app.config.get('single-msg-height')) + move_window(self, + app.config.get('single-msg-x-position'), + app.config.get('single-msg-y-position')) + + self.show_all() - def set_cursor_to_end(self): - end_iter = self.message_tv_buffer.get_end_iter() - self.message_tv_buffer.place_cursor(end_iter) + def _set_cursor_to_end(self): + end_iter = self._message_tv_buffer.get_end_iter() + self._message_tv_buffer.place_cursor(end_iter) - def save_pos(self): + def _save_position(self): # save the window size and 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._ui.single_message_window.get_size() + x_pos, y_pos = self.get_position() + app.config.set('single-msg-x-position', x_pos) + app.config.set('single-msg-y-position', y_pos) + width, height = self.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): + 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): + def _prepare_widgets_for(self, action): if len(app.connections) > 1: if action == 'send': title = _('Single Message using account %s') % self.account @@ -200,13 +172,13 @@ class SingleMessageWindow(Gtk.ApplicationWindow): self._ui.send_grid.show() self._ui.received_grid.hide() - if self.message: # we come from a reply? + if self._message: # we come from a reply? 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) + 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) - if self.to: # do we already have jid? + if self._to: # do we already have jid? self._ui.subject_entry.grab_focus() elif action == 'receive': # prepare UI for Receiving @@ -220,54 +192,52 @@ class SingleMessageWindow(Gtk.ApplicationWindow): 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) + if self._message: + self._conversation_textview.print_real_text(self._message) + fjid = self._from_whom + if self._resource: + fjid += '/' + self._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._ui.single_message_window.destroy() + self.set_title(title) - def update_char_counter(self, widget): - characters_no = self.message_tv_buffer.get_char_count() + def _update_char_counter(self, _widget): + characters_no = self._message_tv_buffer.get_char_count() self._ui.count_chars_label.set_text( _('Characters typed: %s') % str(characters_no)) - def send_single_message(self): + def _send_single_message(self): if not app.account_is_connected(self.account): # if offline or connecting ErrorDialog(_('Connection not available'), - _('Please make sure you are connected with "%s".') % self.account) + _('Please make sure you are connected with "%s".') % + self.account) return True - if isinstance(self.to, list): + if isinstance(self._to, list): sender_list = [] - for i in self.to: + for i in self._to: if i[0].resource: sender_list.append(i[0].jid + '/' + i[0].resource) else: sender_list.append(i[0].jid) else: - sender_list = [j.strip() for j in self._ui.to_entry.get_text().split( - ',')] + sender_list = [j.strip() for j + in self._ui.to_entry.get_text().split(',')] 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) + begin, end = self._message_tv_buffer.get_bounds() + message = self._message_tv_buffer.get_text(begin, end, True) recipient_list = [] for to_whom_jid in sender_list: - if to_whom_jid in self.completion_dict: - to_whom_jid = self.completion_dict[to_whom_jid].jid + if to_whom_jid in self._completion_dict: + to_whom_jid = self._completion_dict[to_whom_jid].jid try: to_whom_jid = helpers.parse_jid(to_whom_jid) except helpers.InvalidFormat: - ErrorDialog(_('Invalid XMPP Address'), + ErrorDialog( + _('Invalid XMPP Address'), _('It is not possible to send a message to %s, this ' 'XMPP Address is not valid.') % to_whom_jid) return True @@ -280,34 +250,91 @@ class SingleMessageWindow(Gtk.ApplicationWindow): recipient_list.append(to_whom_jid) - app.nec.push_outgoing_event(MessageOutgoingEvent(None, - account=self.account, jid=recipient_list, message=message, - type_='normal', subject=subject)) + app.nec.push_outgoing_event(MessageOutgoingEvent( + None, + account=self.account, + jid=recipient_list, + message=message, + type_='normal', + subject=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 + self._message_tv_buffer.set_text('') # we sent ok, clear the textview + return False + + def _on_destroy(self, _widget): + contact = app.contacts.get_contact_with_highest_priority( + self.account, self._from_whom) + if not contact: + # Groupchat is maybe already destroyed + return + controls = app.interface.minimized_controls[self.account] + events = app.events.get_nb_roster_events(self.account, + self._from_whom, + types=['chat', 'normal']) + if (contact.is_groupchat and + self._from_whom not in controls and + self._action == 'receive' and + events == 0): + app.interface.roster.remove_groupchat(self._from_whom, self.account) + + def _on_delete(self, *args): + self._save_position() + + def _on_contact_info_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_close_clicked(self, _widget): + self._save_position() + self.destroy() - def on_send_button_clicked(self, widget): - self.send_single_message() + def _on_send_clicked(self, _widget): + self._send_single_message() - def on_reply_button_clicked(self, widget): + def _on_reply_clicked(self, _widget): # we create a new blank window to send and we preset RE: and to jid - self.subject = _('RE: %s') % self.subject - self.message = _('%s wrote:\n') % self.from_whom + self.message + self._subject = _('RE: %s') % self._subject + 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._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) - - def on_send_and_close_button_clicked(self, widget): - if self.send_single_message(): + self._message = self._message.replace('\n', '\n> ') + '\n\n' + self.destroy() + SingleMessageWindow(self.account, + to=self._from_whom, + action='send', + from_whom=self._from_whom, + subject=self._subject, + message=self._message, + session=self._session) + + def _on_send_and_close_clicked(self, _widget): + if self._send_single_message(): return - self.save_pos() - self._ui.single_message_window.destroy() + self._save_position() + self.destroy() - def on_single_message_window_key_press_event(self, widget, event): + def _on_key_press_event(self, _widget, event): if event.keyval == Gdk.KEY_Escape: # ESCAPE - self.save_pos() - self._ui.single_message_window.destroy() + self._save_position() + self.destroy() View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/425f50f827cb0cbef1676371e028badb5… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/425f50f827cb0cbef1676371e028badb5… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Always use bare JID when sending message to group
by Philipp Hörist 19 Nov '19

19 Nov '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 425f50f8 by Daniel Brötzmann at 2019-11-19T20:12:48Z Always use bare JID when sending message to group - - - - - 1 changed file: - gajim/gtk/single_message.py Changes: ===================================== gajim/gtk/single_message.py ===================================== @@ -74,7 +74,7 @@ class SingleMessageWindow(Gtk.ApplicationWindow): 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]) + jid = ', '.join([i[0].jid for i in to]) self._ui.to_entry.set_text(jid) else: self._ui.to_entry.set_text(to) View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/425f50f827cb0cbef1676371e028badb5f… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/425f50f827cb0cbef1676371e028badb5f… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: GroupchatControl: Add rename group chat page
by Philipp Hörist 19 Nov '19

19 Nov '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: c352503b by Daniel Brötzmann at 2019-11-19T08:00:24Z GroupchatControl: Add rename group chat page - - - - - bce81396 by Daniel Brötzmann at 2019-11-19T08:29:28Z Roster: Add rename group chat menu item - - - - - 4 changed files: - gajim/data/gui/groupchat_control.ui - gajim/groupchat_control.py - gajim/gui_menu_builder.py - gajim/roster_window.py Changes: ===================================== gajim/data/gui/groupchat_control.ui ===================================== @@ -1584,6 +1584,113 @@ <property name="position">11</property> </packing> </child> + <child> + <object class="GtkBox"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="orientation">vertical</property> + <child> + <object class="GtkGrid"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">center</property> + <property name="valign">center</property> + <property name="hexpand">True</property> + <property name="vexpand">True</property> + <property name="row_spacing">12</property> + <child> + <object class="GtkLabel"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes">Enter a new name for this group chat</property> + <property name="xalign">0</property> + <style> + <class name="bold16"/> + </style> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkEntry" id="name_entry"> + <property name="width_request">200</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="activates_default">True</property> + <property name="caps_lock_warning">False</property> + <property name="secondary_icon_name">face-smile-symbolic</property> + <property name="secondary_icon_tooltip_text" translatable="yes">Insert Emoji</property> + <property name="secondary_icon_tooltip_markup" translatable="yes">Insert Emoji</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="GtkBox"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="homogeneous">True</property> + <child> + <object class="GtkButton"> + <property name="label" translatable="yes">_Cancel</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="halign">start</property> + <property name="valign">start</property> + <property name="use_underline">True</property> + <signal name="clicked" handler="_on_page_cancel_clicked" swapped="no"/> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkButton" id="rename_button"> + <property name="label" translatable="yes">_Rename</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="can_default">True</property> + <property name="receives_default">True</property> + <property name="halign">end</property> + <property name="valign">start</property> + <property name="use_underline">True</property> + <signal name="clicked" handler="_on_rename_clicked" swapped="no"/> + <style> + <class name="suggested-action"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">2</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + </object> + <packing> + <property name="name">rename</property> + <property name="position">12</property> + </packing> + </child> </object> <packing> <property name="expand">True</property> ===================================== gajim/groupchat_control.py ===================================== @@ -256,6 +256,7 @@ class GroupchatControl(ChatControlBase): def add_actions(self): super().add_actions() actions = [ + ('rename-groupchat-', None, self._on_rename_groupchat), ('change-subject-', None, self._on_change_subject), ('change-nickname-', None, self._on_change_nick), ('disconnect-', None, self._on_disconnect), @@ -1991,6 +1992,20 @@ class GroupchatControl(ChatControlBase): self.room_jid, new_nick) self._show_page('groupchat') + def _on_rename_groupchat(self, _action, _param): + if self._get_current_page() != 'groupchat': + return + self.xml.name_entry.set_text(self.room_name) + self.xml.name_entry.grab_focus() + self.xml.rename_button.grab_default() + self._show_page('rename') + + def _on_rename_clicked(self, _button): + new_name = self.xml.name_entry.get_text() + app.connections[self.account].get_module('Bookmarks').modify( + self.room_jid, name=new_name) + self._show_page('groupchat') + def _on_change_subject(self, _action, _param): if self._get_current_page() != 'groupchat': return ===================================== gajim/gui_menu_builder.py ===================================== @@ -574,6 +574,7 @@ def get_groupchat_menu(control_id, account, jid): groupchat_menu = [ ('win.information-', _('Information')), (_('Manage Group Chat'), [ + ('win.rename-groupchat-', _('Rename Group Chat')), ('win.change-subject-', _('Change Subject')), ('win.configure-', _('Configure Group Chat')), ('win.upload-avatar-', _('Upload Avatar…')), ===================================== gajim/roster_window.py ===================================== @@ -3065,6 +3065,25 @@ class RosterWindow: mw.set_active_tab(ctrl) self.remove_groupchat(jid, account, maximize=True) + def on_groupchat_rename(self, _widget, jid, account): + def _on_rename(new_name): + con = app.connections[account] + con.get_module('Bookmarks').modify(jid, name=new_name) + + contact = app.contacts.get_first_contact_from_jid(account, jid) + name = contact.get_shown_name() + + InputDialog( + _('Rename Group Chat'), + _('Rename Group Chat'), + _('Please enter a new name for this group chat'), + [DialogButton.make('Cancel'), + DialogButton.make('Accept', + text=_('_Rename'), + callback=_on_rename)], + input_str=name, + transient_for=self.window).show() + def on_change_status_message_activate(self, widget, account): show = app.SHOW_LIST[app.connections[account].connected] def on_response(message, pep_dict): @@ -5168,6 +5187,13 @@ class RosterWindow: jid, account) menu.append(maximize_menuitem) + rename_menuitem = Gtk.MenuItem.new_with_mnemonic(_('Re_name')) + rename_menuitem.connect('activate', + self.on_groupchat_rename, + jid, + account) + menu.append(rename_menuitem) + if not app.gc_connected[account].get(jid, False): connect_menuitem = Gtk.MenuItem.new_with_mnemonic(_( '_Reconnect')) View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/a3920e3db69dc92a1813adbc2c8f5c5c5… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/a3920e3db69dc92a1813adbc2c8f5c5c5… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 4 commits: HistorySyncAssistant: Fix pylint errors
by Philipp Hörist 17 Nov '19

17 Nov '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: bdf75a82 by Philipp Hörist at 2019-11-17T21:47:21Z HistorySyncAssistant: Fix pylint errors - - - - - cd510a8a by Philipp Hörist at 2019-11-17T21:47:58Z MamPreferences: Fix pylint errors - - - - - f2bcc8dc by Philipp Hörist at 2019-11-17T21:56:32Z EmojiData: Fix pylint errors - - - - - a3920e3d by Philipp Hörist at 2019-11-17T21:59:39Z EmojiChooser: Fix pylint errors - - - - - 4 changed files: - gajim/gtk/emoji_chooser.py - gajim/gtk/emoji_data.py - gajim/gtk/history_sync.py - gajim/gtk/mam_preferences.py Changes: ===================================== gajim/gtk/emoji_chooser.py ===================================== @@ -94,7 +94,7 @@ class Section(Gtk.Box): continue if pixbuf_ == 'font': - if not self._chooser._font_supports_codepoint( + if not self._chooser.font_supports_codepoint( codepoint_): continue else: @@ -195,6 +195,7 @@ class EmojiModifierChild(Gtk.FlowBoxChild): if event.button == 1: self.get_parent().emit('child-activated', self) return True + return False def get_emoji(self): if self.pixbuf != 'font': @@ -278,10 +279,10 @@ class EmojiChooser(Gtk.Popover): # the ChatControl self._text_widget = weakref.ref(value) - def _key_press(self, widget, event): + def _key_press(self, _widget, event): return self._search.handle_event(event) - def _search_changed(self, entry): + def _search_changed(self, _entry): for section in self._sections.values(): section.hide() section.flowbox.invalidate_filter() @@ -298,7 +299,8 @@ class EmojiChooser(Gtk.Popover): return self._stack.set_visible_child_name('not-found') - def _get_current_theme(self): + @staticmethod + def _get_current_theme(): theme = app.config.get('emoticons_theme') themes = helpers.get_available_emoticon_themes() if theme not in themes: @@ -327,6 +329,7 @@ class EmojiChooser(Gtk.Popover): return emoticons_user_path log.warning('Could not find emoji theme: %s', theme) + return None def load(self): theme = self._get_current_theme() @@ -360,7 +363,7 @@ class EmojiChooser(Gtk.Popover): # We dont add these to the UI continue - if font and not self._font_supports_codepoint(codepoint): + if font and not self.font_supports_codepoint(codepoint): continue section = self._sections[attrs['group']] @@ -368,7 +371,7 @@ class EmojiChooser(Gtk.Popover): self._load_source_id = None emoji_pixbufs.complete = True - def _font_supports_codepoint(self, codepoint): + def font_supports_codepoint(self, codepoint): self._pango_layout.set_text(codepoint, -1) if self._pango_layout.get_unknown_glyphs_count(): return False @@ -379,7 +382,8 @@ class EmojiChooser(Gtk.Popover): return False return True - def _get_next_pixbuf(self, path): + @staticmethod + def _get_next_pixbuf(path): src_x = src_y = cur_column = 0 atlas = GdkPixbuf.Pixbuf.new_from_file(path) ===================================== gajim/gtk/emoji_data.py ===================================== @@ -12,6 +12,8 @@ # You should have received a copy of the GNU General Public License # along with Gajim. If not, see <http://www.gnu.org/licenses/>. +# pylint: disable=too-many-lines + import re import weakref from enum import IntEnum @@ -49,7 +51,7 @@ def get_emoji_pixbuf(codepoints): pixbuf = emoji_pixbufs.get(codepoints, None) if pixbuf is None: - return + return None pixbuf = pixbuf.scale_simple(Emoji.TEXT_SIZE, Emoji.TEXT_SIZE, GdkPixbuf.InterpType.HYPER) @@ -178,6 +180,8 @@ class EmojiAsciiData(dict): emoji_pixbufs = EmojiPixbufs() +# pylint: disable=line-too-long + emoji_ascii_data = EmojiAsciiData([ ("':-D", '\U0001F605'), (':)', '\U0001F642'), ===================================== gajim/gtk/history_sync.py ===================================== @@ -168,14 +168,14 @@ class HistorySyncAssistant(Gtk.Assistant, EventHelper): log.debug('Received message') GLib.idle_add(self.download_history.set_fraction) - def on_row_selected(self, listbox, row): + def on_row_selected(self, _listbox, row): self.timedelta = row.get_child().get_delta() if row: self.set_page_complete(self.select_time, True) else: self.set_page_complete(self.select_time, False) - def _on_page_change(self, assistant, page): + def _on_page_change(self, _assistant, page): if page == self.download_history: self.next.hide() self._prepare_query() ===================================== gajim/gtk/mam_preferences.py ===================================== @@ -109,25 +109,25 @@ class MamPreferences(Gtk.ApplicationWindow, EventHelper): def _set_mam_box_state(self, state): self._ui.mam_box.set_sensitive(state) - def _jid_edited(self, renderer, path, new_text): + def _jid_edited(self, _renderer, path, new_text): iter_ = self._ui.preferences_store.get_iter(path) self._ui.preferences_store.set_value(iter_, 0, new_text) - def _pref_toggled(self, renderer, path): + def _pref_toggled(self, _renderer, path): iter_ = self._ui.preferences_store.get_iter(path) current_value = self._ui.preferences_store[iter_][1] self._ui.preferences_store.set_value(iter_, 1, not current_value) - def _on_add(self, button): + def _on_add(self, _button): self._ui.preferences_store.append(['', False]) - def _on_remove(self, button): + def _on_remove(self, _button): mod, paths = self._ui.pref_view.get_selection().get_selected_rows() for path in paths: iter_ = mod.get_iter(path) self._ui.preferences_store.remove(iter_) - def _on_save(self, button): + def _on_save(self, _button): self._activate_spinner() self._set_mam_box_state(False) items = [] @@ -144,6 +144,6 @@ class MamPreferences(Gtk.ApplicationWindow, EventHelper): self._spinner.hide() self._spinner.stop() - def _on_key_press(self, widget, event): + def _on_key_press(self, _widget, event): if event.keyval == Gdk.KEY_Escape: self.destroy() View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/af7ce2010d0410ac28e4d12e381766d53… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/af7ce2010d0410ac28e4d12e381766d53… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 5 commits: ServiceRegistration: Fix pylint errors
by Philipp Hörist 17 Nov '19

17 Nov '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: f8da1e7b by Philipp Hörist at 2019-11-17T20:55:11Z ServiceRegistration: Fix pylint errors - - - - - fe177d62 by Philipp Hörist at 2019-11-17T21:24:46Z StatusIcon: Refactor code - Make methods private - Rename some methods (shorter names) - Fix pylint errors - - - - - 7de35bbd by Philipp Hörist at 2019-11-17T21:26:55Z SubscriptionRequest: Rename class - - - - - c948830e by Philipp Hörist at 2019-11-17T21:35:41Z SubscriptionRequest: Use open_window() - - - - - af7ce201 by Philipp Hörist at 2019-11-17T21:40:38Z SubscriptionRequest: Refactor code - Rename methods - Make methods private - Fix pylint errors - - - - - 8 changed files: - gajim/data/gui/subscription_request_window.ui - gajim/data/gui/systray_context_menu.ui - gajim/gtk/const.py - gajim/gtk/service_registration.py - gajim/gtk/statusicon.py - gajim/gtk/subscription_request.py - gajim/gui_interface.py - gajim/roster_window.py Changes: ===================================== gajim/data/gui/subscription_request_window.ui ===================================== @@ -91,7 +91,7 @@ <property name="tooltip_text" translatable="yes">Contact Information</property> <property name="valign">center</property> <property name="image">image2</property> - <signal name="clicked" handler="on_contact_info_button_clicked" swapped="no"/> + <signal name="clicked" handler="_on_contact_info_clicked" swapped="no"/> </object> <packing> <property name="left_attach">0</property> @@ -106,7 +106,7 @@ <property name="tooltip_text" translatable="yes">Start Chat</property> <property name="valign">center</property> <property name="image">image1</property> - <signal name="clicked" handler="on_start_chat_button_clicked" swapped="no"/> + <signal name="clicked" handler="_on_start_chat_clicked" swapped="no"/> </object> <packing> <property name="left_attach">0</property> @@ -152,7 +152,7 @@ <property name="receives_default">False</property> <property name="tooltip_text" translatable="yes">Deny authorization from contact so the contact cannot know if you are connected</property> <property name="use_underline">True</property> - <signal name="clicked" handler="on_deny_button_clicked" swapped="no"/> + <signal name="clicked" handler="_on_deny_clicked" swapped="no"/> </object> <packing> <property name="expand">False</property> @@ -170,7 +170,7 @@ <property name="receives_default">False</property> <property name="tooltip_text" translatable="yes">Authorize contact so the contact can know if you are connected</property> <property name="use_underline">True</property> - <signal name="clicked" handler="on_authorize_button_clicked" swapped="no"/> + <signal name="clicked" handler="_on_authorize_clicked" swapped="no"/> <style> <class name="suggested-action"/> </style> ===================================== gajim/data/gui/systray_context_menu.ui ===================================== @@ -19,7 +19,7 @@ <property name="can_focus">False</property> <property name="label" translatable="yes">_Start Chat...</property> <property name="use_underline">True</property> - <signal name="activate" handler="on_new_chat" swapped="no"/> + <signal name="activate" handler="_on_new_chat" swapped="no"/> </object> </child> <child> @@ -42,7 +42,7 @@ <property name="can_focus">False</property> <property name="label" translatable="yes">Show All Pending _Events</property> <property name="use_underline">True</property> - <signal name="activate" handler="on_show_all_events_menuitem_activate" swapped="no"/> + <signal name="activate" handler="_on_show_all_events" swapped="no"/> </object> </child> <child> @@ -51,7 +51,7 @@ <property name="can_focus">False</property> <property name="label" translatable="yes">Mute Sounds</property> <property name="use_underline">True</property> - <signal name="activate" handler="on_sounds_mute_menuitem_activate" swapped="no"/> + <signal name="activate" handler="_on_sounds_mute" swapped="no"/> </object> </child> <child> @@ -67,7 +67,7 @@ <property name="can_focus">False</property> <property name="label" translatable="yes">_Preferences</property> <property name="use_underline">True</property> - <signal name="activate" handler="on_preferences_menuitem_activate" swapped="no"/> + <signal name="activate" handler="_on_preferences" swapped="no"/> </object> </child> <child> @@ -82,7 +82,7 @@ <property name="can_focus">False</property> <property name="label" translatable="yes">_Quit</property> <property name="use_underline">True</property> - <signal name="activate" handler="on_quit_menuitem_activate" swapped="no"/> + <signal name="activate" handler="_on_quit" swapped="no"/> </object> </child> </object> ===================================== gajim/gtk/const.py ===================================== @@ -128,4 +128,5 @@ WINDOW_MODULES = { 'Themes': 'gajim.gtk.themes', 'AdvancedConfig': 'gajim.gtk.advanced_config', 'CertificateDialog': 'gajim.gtk.dialogs', + 'SubscriptionRequest': 'gajim.gtk.subscription_request', } ===================================== gajim/gtk/service_registration.py ===================================== @@ -88,7 +88,7 @@ class ServiceRegistration(Gtk.Assistant): form_widget.validate() return form_widget - def _on_page_change(self, assistant, page): + def _on_page_change(self, _assistant, _page): if self.get_current_page() == Page.REQUEST: self._con.get_module('Register').get_register_form( self._agent, self._on_get_success, self._on_error) @@ -111,14 +111,15 @@ class ServiceRegistration(Gtk.Assistant): log.info('Show Form page') self._is_form = is_form self._data_form_widget = self._build_dataform(form, is_form) - self.get_nth_page(Page.FORM).set_form(self._data_form_widget, error_text=error_text) + self.get_nth_page(Page.FORM).set_form(self._data_form_widget, + error_text=error_text) self.set_current_page(Page.FORM) else: log.info('Show Error page') self.get_nth_page(Page.ERROR).set_text(error_text) self.set_current_page(Page.ERROR) - def _on_cancel(self, widget): + def _on_cancel(self, _widget): self.destroy() def _register(self): ===================================== gajim/gtk/statusicon.py ===================================== @@ -45,8 +45,8 @@ class StatusIcon: """ def __init__(self): - self.single_message_handler_id = None - self.show_roster_handler_id = None + self._single_message_handler_id = None + self._show_roster_handler_id = None # click somewhere else does not popdown menu. workaround this. self.added_hide_menuitem = False self.status = 'offline' @@ -56,75 +56,85 @@ class StatusIcon: self.popup_menus = [] self.status_icon = None self.tooltip = NotificationAreaTooltip() + self._icon_size = '16' - def subscribe_events(self): + def show_icon(self): + if not self.status_icon: + self.status_icon = Gtk.StatusIcon() + self.status_icon.set_property('has-tooltip', True) + self.status_icon.connect('activate', self._on_activate) + self.status_icon.connect('popup-menu', self._on_popup_menu) + self.status_icon.connect('query-tooltip', self._on_query_tooltip) + self.status_icon.connect('size-changed', self.set_img) + + self.set_img() + self._subscribe_events() + + def hide_icon(self): + self.status_icon.set_visible(False) + self._unsubscribe_events() + + def change_status(self, global_status): + """ + Set tray image to 'global_status' + """ + # change image and status, only if it is different + if global_status is not None and self.status != global_status: + self.status = global_status + self.set_img() + + def _subscribe_events(self): """ Register listeners to the events class """ - app.events.event_added_subscribe(self.on_event_added) - app.events.event_removed_subscribe(self.on_event_removed) + app.events.event_added_subscribe(self._on_event_added) + app.events.event_removed_subscribe(self._on_event_removed) - def unsubscribe_events(self): + def _unsubscribe_events(self): """ Unregister listeners to the events class """ - app.events.event_added_unsubscribe(self.on_event_added) - app.events.event_removed_unsubscribe(self.on_event_removed) + app.events.event_added_unsubscribe(self._on_event_added) + app.events.event_removed_unsubscribe(self._on_event_removed) - def on_event_added(self, event): + def _on_event_added(self, event): """ Called when an event is added to the event list """ if event.show_in_systray: self.set_img() - def on_event_removed(self, event_list): + def _on_event_removed(self, _event_list): """ Called when one or more events are removed from the event list """ self.set_img() - def show_icon(self): - if not self.status_icon: - self.status_icon = Gtk.StatusIcon() - self.status_icon.set_property('has-tooltip', True) - self.status_icon.connect('activate', self._on_activate) - self.status_icon.connect('popup-menu', self._on_popup_menu) - self.status_icon.connect('query-tooltip', self._on_query_tooltip) - self.status_icon.connect('size-changed', self.set_img) - - self.set_img() - self.subscribe_events() - def _on_query_tooltip(self, _status_icon, _x, _y, _keyboard_mode, tooltip): tooltip.set_custom(self.tooltip.get_tooltip()) return True - def hide_icon(self): - self.status_icon.set_visible(False) - self.unsubscribe_events() - def _on_popup_menu(self, _status_icon, button, activate_time): if button == 1: # Left click - self.on_left_click() + self._on_left_click() elif button == 2: # middle click - self.on_middle_click() + self._on_middle_click() elif button == 3: # right click - self.make_menu(button, activate_time) + self._make_menu(button, activate_time) def _on_activate(self, _status_icon): - self.on_left_click() + self._on_left_click() - def on_status_icon_size_changed(self, statusicon, size): + def on_status_icon_size_changed(self, _statusicon, size): if size > 31: - self.statusicon_size = '32' + self._icon_size = '32' elif size > 23: - self.statusicon_size = '24' + self._icon_size = '24' else: - self.statusicon_size = '16' + self._icon_size = '16' if os.environ.get('KDE_FULL_SESSION') == 'true': # detect KDE session. see #5476 - self.statusicon_size = '32' + self._icon_size = '32' self.set_img() def set_img(self, *args): @@ -148,37 +158,20 @@ class StatusIcon: icon_name = get_icon_name(self.status) self.status_icon.set_from_icon_name(icon_name) - def change_status(self, global_status): - """ - Set tray image to 'global_status' - """ - # change image and status, only if it is different - if global_status is not None and self.status != global_status: - self.status = global_status - self.set_img() - - def start_chat(self, widget, account, jid): - contact = app.contacts.get_first_contact_from_jid(account, jid) - if app.interface.msg_win_mgr.has_window(jid, account): - app.interface.msg_win_mgr.get_window(jid, account).set_active_tab( - jid, account) - elif contact: - app.interface.new_chat(contact, account) - app.interface.msg_win_mgr.get_window(jid, account).set_active_tab( - jid, account) - - def on_single_message_menuitem_activate(self, widget, account): + @staticmethod + def _on_single_message(_widget, account): SingleMessageWindow(account, action='send') - def on_new_chat(self, _widget): + @staticmethod + def _on_new_chat(_widget): app.app.activate_action('start-chat', GLib.Variant('s', '')) - def make_menu(self, event_button, event_time): + def _make_menu(self, _event_button, event_time): """ Create chat with and new message (sub) menus/menuitems """ - for m in self.popup_menus: - m.destroy() + for menu in self.popup_menus: + menu.destroy() start_chat_menuitem = self._ui.start_chat_menuitem single_message_menuitem = self._ui.single_message_menuitem @@ -186,10 +179,10 @@ class StatusIcon: sounds_mute_menuitem = self._ui.sounds_mute_menuitem show_roster_menuitem = self._ui.show_roster_menuitem - if self.single_message_handler_id: + if self._single_message_handler_id: single_message_menuitem.handler_disconnect( - self.single_message_handler_id) - self.single_message_handler_id = None + self._single_message_handler_id) + self._single_message_handler_id = None sub_menu = Gtk.Menu() self.popup_menus.append(sub_menu) @@ -199,14 +192,14 @@ class StatusIcon: uf_show = helpers.get_uf_show(show, use_mnemonic=True) item = Gtk.MenuItem.new_with_mnemonic(uf_show) sub_menu.append(item) - item.connect('activate', self.on_show_menuitem_activate, show) + item.connect('activate', self._on_show, show) item = Gtk.SeparatorMenuItem.new() sub_menu.append(item) item = Gtk.MenuItem.new_with_mnemonic(_('_Change Status Message…')) sub_menu.append(item) - item.connect('activate', self.on_change_status_message_activate) + item.connect('activate', self._on_change_status) connected_accounts = app.get_number_of_connected_accounts() if connected_accounts < 1: @@ -218,10 +211,10 @@ class StatusIcon: uf_show = helpers.get_uf_show('offline', use_mnemonic=True) item = Gtk.MenuItem.new_with_mnemonic(uf_show) sub_menu.append(item) - item.connect('activate', self.on_show_menuitem_activate, 'offline') + item.connect('activate', self._on_show, 'offline') - iskey = connected_accounts > 0 and not (connected_accounts == 1 and - app.zeroconf_is_connected()) + is_zeroconf = connected_accounts == 1 and app.zeroconf_is_connected() + iskey = connected_accounts > 0 and not is_zeroconf start_chat_menuitem.set_sensitive(iskey) single_message_menuitem.set_sensitive(iskey) @@ -238,15 +231,15 @@ class StatusIcon: # for single message single_message_menuitem.set_submenu(None) - self.single_message_handler_id = single_message_menuitem.\ + self._single_message_handler_id = single_message_menuitem.\ connect('activate', - self.on_single_message_menuitem_activate, account) + self._on_single_message, account) break # No other account connected else: # 2 or more 'real' accounts are connected, make submenus account_menu_for_single_message = Gtk.Menu() single_message_menuitem.set_submenu( - account_menu_for_single_message) + account_menu_for_single_message) self.popup_menus.append(account_menu_for_single_message) for account in accounts_list: @@ -258,22 +251,25 @@ class StatusIcon: item = Gtk.MenuItem.new_with_label( _('using account %s') % account_label) item.connect('activate', - self.on_single_message_menuitem_activate, account) + self._on_single_message, account) account_menu_for_single_message.append(item) sounds_mute_menuitem.set_active(not app.config.get('sounds_on')) win = app.interface.roster.window - if self.show_roster_handler_id: - show_roster_menuitem.handler_disconnect(self.show_roster_handler_id) + if self._show_roster_handler_id: + show_roster_menuitem.handler_disconnect( + self._show_roster_handler_id) if win.get_property('has-toplevel-focus'): - show_roster_menuitem.get_children()[0].set_label(_('Hide _Contact List')) - self.show_roster_handler_id = show_roster_menuitem.connect( - 'activate', self.on_hide_roster_menuitem_activate) + show_roster_menuitem.get_children()[0].set_label( + _('Hide _Contact List')) + self._show_roster_handler_id = show_roster_menuitem.connect( + 'activate', self._on_hide_roster) else: - show_roster_menuitem.get_children()[0].set_label(_('Show _Contact List')) - self.show_roster_handler_id = show_roster_menuitem.connect( - 'activate', self.on_show_roster_menuitem_activate) + show_roster_menuitem.get_children()[0].set_label( + _('Show _Contact List')) + self._show_roster_handler_id = show_roster_menuitem.connect( + 'activate', self._on_show_roster) if os.name == 'nt': if self.added_hide_menuitem is False: @@ -286,31 +282,37 @@ class StatusIcon: self.systray_context_menu.show_all() self.systray_context_menu.popup(None, None, None, None, 0, event_time) - def on_show_all_events_menuitem_activate(self, widget): + @staticmethod + def _on_show_all_events(_widget): events = app.events.get_systray_events() for account in events: for jid in events[account]: for event in events[account][jid]: app.interface.handle_event(account, jid, event.type_) - def on_sounds_mute_menuitem_activate(self, widget): + @staticmethod + def _on_sounds_mute(widget): app.config.set('sounds_on', not widget.get_active()) - def on_show_roster_menuitem_activate(self, widget): + @staticmethod + def _on_show_roster(_widget): win = app.interface.roster.window win.present() - def on_hide_roster_menuitem_activate(self, widget): + @staticmethod + def _on_hide_roster(_widget): win = app.interface.roster.window win.hide() - def on_preferences_menuitem_activate(self, widget): + @staticmethod + def _on_preferences(_widget): open_window('Preferences') - def on_quit_menuitem_activate(self, widget): + @staticmethod + def _on_quit(_widget): app.interface.roster.on_quit_request() - def on_left_click(self): + def _on_left_click(self): win = app.interface.roster.window if not app.events.get_systray_events(): # No pending events, so toggle visible/hidden for roster window @@ -325,9 +327,10 @@ class StatusIcon: win.set_property('skip-taskbar-hint', False) win.present_with_time(Gtk.get_current_event_time()) else: - self.handle_first_event() + self._handle_first_event() - def handle_first_event(self): + @staticmethod + def _handle_first_event(): account, jid, event = app.events.get_first_systray_event() if not event: return @@ -337,23 +340,26 @@ class StatusIcon: restore_roster_position(win) app.interface.handle_event(account, jid, event.type_) - def on_middle_click(self): + @staticmethod + def _on_middle_click(): """ Middle click raises window to have complete focus (fe. get kbd events) but if already raised, it hides it """ win = app.interface.roster.window - if win.is_active(): # is it fully raised? (eg does it receive kbd events?) + if win.is_active(): win.hide() else: win.present() - def on_show_menuitem_activate(self, widget, show): + @staticmethod + def _on_show(_widget, show): # we all add some fake (we cannot select those nor have them as show) # but this helps to align with roster's status_combobox index positions - l = ['online', 'chat', 'away', 'xa', 'dnd', 'invisible', 'SEPARATOR', - 'CHANGE_STATUS_MSG_MENUITEM', 'SEPARATOR', 'offline'] - index = l.index(show) + status = ['online', 'chat', 'away', 'xa', 'dnd', 'invisible', + 'SEPARATOR', 'CHANGE_STATUS_MSG_MENUITEM', 'SEPARATOR', + 'offline'] + index = status.index(show) if not helpers.statuses_unified(): app.interface.roster.status_combobox.set_active(index + 2) return @@ -361,7 +367,8 @@ class StatusIcon: if index != current: app.interface.roster.status_combobox.set_active(index) - def on_change_status_message_activate(self, widget): + @staticmethod + def _on_change_status(_widget): model = app.interface.roster.status_combobox.get_model() active = app.interface.roster.status_combobox.get_active() status = model[active][2] @@ -370,8 +377,9 @@ class StatusIcon: return accounts = app.connections.keys() for acct in accounts: - if not app.config.get_per('accounts', acct, - 'sync_with_global_status'): + if not app.config.get_per('accounts', + acct, + 'sync_with_global_status'): continue show = app.SHOW_LIST[app.connections[acct].connected] app.interface.roster.send_status(acct, show, message) ===================================== gajim/gtk/subscription_request.py ===================================== @@ -23,8 +23,8 @@ from gajim.gtk.add_contact import AddNewContactWindow from gajim.gtk.util import get_builder -class SubscriptionRequestWindow(Gtk.ApplicationWindow): - def __init__(self, jid, text, account, user_nick=None): +class SubscriptionRequest(Gtk.ApplicationWindow): + def __init__(self, account, jid, text, user_nick=None): Gtk.ApplicationWindow.__init__(self) self.set_name('SubscriptionRequest') self.set_application(app.app) @@ -52,49 +52,45 @@ class SubscriptionRequestWindow(Gtk.ApplicationWindow): self._ui.connect_signals(self) self.show_all() - def on_subscription_request_window_destroy(self, widget): - """ - Close window - """ - if self.jid in app.interface.instances[self.account]['sub_request']: - # Remove us from open windows - del app.interface.instances[self.account]['sub_request'][self.jid] - - def on_authorize_button_clicked(self, widget): + def _on_authorize_clicked(self, _widget): """ Accept the request """ - app.connections[self.account].get_module('Presence').subscribed(self.jid) + con = app.connections[self.account] + con.get_module('Presence').subscribed(self.jid) self.destroy() contact = app.contacts.get_contact(self.account, self.jid) if not contact or _('Not in contact list') in contact.groups: AddNewContactWindow(self.account, self.jid, self.user_nick) - def on_contact_info_button_clicked(self, widget): + def _on_contact_info_clicked(self, _widget): """ Ask for vCard """ - if self.jid in app.interface.instances[self.account]['infos']: - app.interface.instances[self.account]['infos'][self.jid].window.present() + open_windows = app.interface.instances[self.account]['infos'] + if self.jid in open_windows: + open_windows[self.jid].window.present() else: - contact = app.contacts.create_contact(jid=self.jid, account=self.account) + contact = app.contacts.create_contact(jid=self.jid, + account=self.account) app.interface.instances[self.account]['infos'][self.jid] = \ vcard.VcardWindow(contact, self.account) # Remove xmpp page app.interface.instances[self.account]['infos'][self.jid].xml.\ get_object('information_notebook').remove_page(0) - def on_start_chat_button_clicked(self, widget): + def _on_start_chat_clicked(self, _widget): """ Open chat """ app.interface.new_chat_from_jid(self.account, self.jid) - def on_deny_button_clicked(self, widget): + def _on_deny_clicked(self, _widget): """ Refuse the request """ - app.connections[self.account].get_module('Presence').unsubscribed(self.jid) + con = app.connections[self.account] + con.get_module('Presence').unsubscribed(self.jid) contact = app.contacts.get_contact(self.account, self.jid) if contact and _('Not in contact list') in contact.get_shown_groups(): app.interface.roster.remove_contact(self.jid, self.account) ===================================== gajim/gui_interface.py ===================================== @@ -106,7 +106,6 @@ from gajim.gtk.emoji_data import emoji_ascii_data from gajim.gtk.filetransfer import FileTransfersWindow from gajim.gtk.http_upload_progress import HTTPUploadProgressWindow from gajim.gtk.roster_item_exchange import RosterItemExchangeWindow -from gajim.gtk.subscription_request import SubscriptionRequestWindow from gajim.gtk.util import get_show_in_roster from gajim.gtk.util import get_show_in_systray from gajim.gtk.util import open_window @@ -305,11 +304,11 @@ class Interface: #('SUBSCRIBE', account, (jid, text, user_nick)) user_nick is JEP-0172 account = obj.conn.name if helpers.allow_popup_window(account) or not self.systray_enabled: - if obj.jid in self.instances[account]['sub_request']: - self.instances[account]['sub_request'][obj.jid].destroy() - self.instances[account]['sub_request'][obj.jid] = \ - SubscriptionRequestWindow(obj.jid, obj.status, account, - obj.user_nick) + open_window('SubscriptionRequest', + account=account, + jid=obj.jid, + text=obj.status, + user_nick=obj.user_nick) return event = events.SubscriptionRequestEvent(obj.status, obj.user_nick) @@ -1270,7 +1269,11 @@ class Interface: event = app.events.get_first_event(account, jid, type_) if event is None: return - SubscriptionRequestWindow(jid, event.text, account, event.nick) + open_window('SubscriptionRequest', + account=account, + jid=jid, + text=event.text, + user_nick=event.nick) app.events.remove_events(account, jid, event) self.roster.draw_contact(jid, account) elif type_ == 'unsubscribed': ===================================== gajim/roster_window.py ===================================== @@ -80,7 +80,6 @@ from gajim.gtk.service_registration import ServiceRegistration from gajim.gtk.discovery import ServiceDiscoveryWindow from gajim.gtk.tooltips import RosterTooltip from gajim.gtk.adhoc import AdHocCommand -from gajim.gtk.subscription_request import SubscriptionRequestWindow from gajim.gtk.util import get_icon_name from gajim.gtk.util import resize_window from gajim.gtk.util import restore_roster_position @@ -88,6 +87,7 @@ from gajim.gtk.util import get_metacontact_surface from gajim.gtk.util import get_builder from gajim.gtk.util import set_urgency_hint from gajim.gtk.util import get_activity_icon_name +from gajim.gtk.util import open_window log = logging.getLogger('gajim.roster') @@ -1971,7 +1971,11 @@ class RosterWindow: return True if event.type_ == 'subscription_request': - SubscriptionRequestWindow(jid, event.text, account, event.nick) + open_window('SubscriptionRequest', + account=account, + jid=jid, + text=event.text, + user_nick=event.nick) app.events.remove_events(account, jid, event) return True View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/c8aaab32b151835e6217a53d07edb9c00… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/c8aaab32b151835e6217a53d07edb9c00… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 6 commits: Util: Fix pylint errors
by Philipp Hörist 17 Nov '19

17 Nov '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: bd6675d2 by Philipp Hörist at 2019-11-17T20:03:08Z Util: Fix pylint errors - - - - - 2b1a22ec by Philipp Hörist at 2019-11-17T20:04:38Z SSLErrorDialog: Fix pylint errors - - - - - f8259e7c by Philipp Hörist at 2019-11-17T20:06:30Z ManageSounds: Fix pylint errors - - - - - 7c3c9c20 by Philipp Hörist at 2019-11-17T20:11:00Z Update .pylintrc - - - - - 9b58bcd1 by Philipp Hörist at 2019-11-17T20:11:11Z Settings: Fix pylint errors - - - - - c8aaab32 by Philipp Hörist at 2019-11-17T20:12:30Z ServerInfo: Fix pylint errors - - - - - 6 changed files: - gajim/gtk/server_info.py - gajim/gtk/settings.py - gajim/gtk/sounds.py - gajim/gtk/ssl_error_dialog.py - gajim/gtk/util.py - pylintrc Changes: ===================================== gajim/gtk/server_info.py ===================================== @@ -129,7 +129,7 @@ class ServerInfo(Gtk.ApplicationWindow, EventHelper): self._ui.cert_button.set_sensitive(self.cert) - def _on_cert_button_clicked(self, button_): + def _on_cert_button_clicked(self, _button): open_window('CertificateDialog', account=self.account, transient_for=self, @@ -180,7 +180,7 @@ class ServerInfo(Gtk.ApplicationWindow, EventHelper): row.get_child().update(item) row.set_tooltip_text(row.get_child().tooltip) - def _server_disco_received(self, obj): + def _server_disco_received(self, _event): self.update(self.get_features, self.feature_listbox) def add_feature(self, feature): @@ -236,7 +236,7 @@ class ServerInfo(Gtk.ApplicationWindow, EventHelper): con.get_module('Bookmarks').conversion) ] - def _on_clipboard_button_clicked(self, widget): + def _on_clipboard_button_clicked(self, _widget): server_software = 'Server Software: %s\n' % self.version server_features = '' ===================================== gajim/gtk/settings.py ===================================== @@ -635,6 +635,7 @@ class CutstomHostnameSetting(DialogSetting): class ChangePasswordSetting(DialogSetting): def __init__(self, *args, **kwargs): DialogSetting.__init__(self, *args, **kwargs) + self.change_dialog = None def show_dialog(self, parent): try: ===================================== gajim/gtk/sounds.py ===================================== @@ -68,6 +68,7 @@ class ManageSounds: # NOTE: sounds_ui_names MUST have all items of # sounds = app.config.get_per('soundevents') as keys + # pylint: disable=line-too-long sounds_dict = { 'attention_received': _('Attention Message Received'), 'first_message_received': _('First Message Received'), @@ -79,6 +80,7 @@ class ManageSounds: 'muc_message_highlight': _('Group Chat Message Highlight'), 'muc_message_received': _('Group Chat Message Received'), } + # pylint: enable=line-too-long for config_name, sound_name in sounds_dict.items(): enabled = app.config.get_per('soundevents', config_name, 'enabled') @@ -117,11 +119,12 @@ class ManageSounds: snd_event_config_name = model[iter_][3] helpers.play_sound(snd_event_config_name) - def _on_key_press(self, widget, event): + def _on_key_press(self, _widget, event): if event.keyval == Gdk.KEY_Escape: self.window.destroy() - def _on_destroy(self, *args): + @staticmethod + def _on_destroy(*args): window = get_app_window('Preferences') if window is not None: window.sounds_preferences = None ===================================== gajim/gtk/ssl_error_dialog.py ===================================== @@ -94,12 +94,12 @@ class SSLErrorDialog(Gtk.ApplicationWindow): certs = '' my_ca_certs = configpaths.get('MY_CACERTS') if os.path.isfile(my_ca_certs): - with open(my_ca_certs, encoding='utf-8') as f: - certs = f.read() + with open(my_ca_certs, encoding='utf-8') as file_: + certs = file_.read() if pem not in certs: - with open(my_ca_certs, 'a', encoding='utf-8') as f: - f.write(self._server + '\n') - f.write(pem + '\n\n') + with open(my_ca_certs, 'a', encoding='utf-8') as file_: + file_.write(self._server + '\n') + file_.write(pem + '\n\n') self.destroy() self._con.process_ssl_errors() ===================================== gajim/gtk/util.py ===================================== @@ -139,7 +139,8 @@ class NickCompletionGenerator: # handle people who have not posted/mentioned us other_nicks = [ - n for n in nicks if nick_matching(n) and n not in potential_matches_set + n for n in nicks + if nick_matching(n) and n not in potential_matches_set ] other_nicks.sort(key=str.lower) log.debug('Other matches: %s', other_nicks) @@ -515,8 +516,8 @@ def get_hardware_key_codes(keyval): def ensure_not_destroyed(func): @wraps(func) def func_wrapper(self, *args, **kwargs): - if self._destroyed: - return + if self._destroyed: # pylint: disable=protected-access + return None return func(self, *args, **kwargs) return func_wrapper @@ -533,7 +534,7 @@ def format_mood(mood, text): def format_activity(activity, subactivity, text): if activity is None: - return + return None if subactivity in ACTIVITIES[activity]: subactivity = ACTIVITIES[activity][subactivity] @@ -555,9 +556,9 @@ def get_activity_icon_name(activity, subactivity=None): return icon_name -def format_tune(artist, length, rating, source, title, track, uri): +def format_tune(artist, _length, _rating, source, title, _track, _uri): if artist is None and title is None and source is None: - return + return None artist = GLib.markup_escape_text(artist or _('Unknown Artist')) title = GLib.markup_escape_text(title or _('Unknown Title')) source = GLib.markup_escape_text(source or _('Unknown Source')) @@ -590,8 +591,8 @@ def format_fingerprint(fingerprint): fplen = len(fingerprint) wordsize = fplen // 8 buf = '' - for w in range(0, fplen, wordsize): - buf += '{0} '.format(fingerprint[w:w + wordsize]) + for char in range(0, fplen, wordsize): + buf += '{0} '.format(fingerprint[char:char + wordsize]) buf = textwrap.fill(buf, width=36) return buf.rstrip().upper() @@ -602,6 +603,7 @@ def find_widget(name, container): return child if isinstance(child, Gtk.Box): return find_widget(name, child) + return None class MultiLineLabel(Gtk.Label): @@ -623,7 +625,8 @@ class MaxWidthComboBoxText(Gtk.ComboBoxText): self._max_width = size def do_get_preferred_width(self): - minimum_width, natural_width = Gtk.ComboBoxText.do_get_preferred_width(self) + minimum_width, natural_width = Gtk.ComboBoxText.do_get_preferred_width( + self) if natural_width > self._max_width: natural_width = self._max_width ===================================== pylintrc ===================================== @@ -359,7 +359,7 @@ known-third-party=enchant [DESIGN] # Maximum number of arguments for function / method -max-args=10 +max-args=15 # Maximum number of attributes for a class (see R0902). max-attributes=9999 View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/baac812eb0c0c013fc9a45a5f278aac92… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/baac812eb0c0c013fc9a45a5f278aac92… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: Themes: Access widgets directly
by Philipp Hörist 17 Nov '19

17 Nov '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: c1316483 by Philipp Hörist at 2019-11-17T19:53:14Z Themes: Access widgets directly - - - - - baac812e by Philipp Hörist at 2019-11-17T19:57:01Z Themes: Fix pylint errors - - - - - 1 changed file: - gajim/gtk/themes.py Changes: ===================================== gajim/gtk/themes.py ===================================== @@ -180,19 +180,13 @@ class Themes(Gtk.ApplicationWindow): self.set_resizable(True) self.set_default_size(600, 400) - self.builder = get_builder('themes_window.ui') - self.add(self.builder.get_object('theme_grid')) - - widgets = ['option_listbox', 'remove_theme_button', 'theme_store', - 'theme_treeview', 'choose_option_listbox', - 'placeholder', 'option_popover'] - for widget in widgets: - setattr(self, '_%s' % widget, self.builder.get_object(widget)) + self._ui = get_builder('themes_window.ui') + self.add(self._ui.theme_grid) self._get_themes() - self._option_listbox.set_placeholder(self._placeholder) + self._ui.option_listbox.set_placeholder(self._ui.placeholder) - self.builder.connect_signals(self) + self._ui.connect_signals(self) self.connect('destroy', self._on_destroy) self.show_all() @@ -200,11 +194,11 @@ class Themes(Gtk.ApplicationWindow): def _get_themes(self): for theme in app.css_config.themes: - self._theme_store.append([theme]) + self._ui.theme_store.append([theme]) - def _on_theme_name_edit(self, renderer, path, new_name): - iter_ = self._theme_store.get_iter(path) - old_name = self._theme_store[iter_][Column.THEME] + def _on_theme_name_edit(self, _renderer, path, new_name): + iter_ = self._ui.theme_store.get_iter(path) + old_name = self._ui.theme_store[iter_][Column.THEME] if new_name == 'default': ErrorDialog( @@ -227,10 +221,10 @@ class Themes(Gtk.ApplicationWindow): if result is False: return - self._theme_store.set_value(iter_, Column.THEME, new_name) + self._ui.theme_store.set_value(iter_, Column.THEME, new_name) def _select_theme_row(self, iter_): - self._theme_treeview.get_selection().select_iter(iter_) + self._ui.theme_treeview.get_selection().select_iter(iter_) def _on_theme_selected(self, tree_selection): store, iter_ = tree_selection.get_selected() @@ -240,11 +234,11 @@ class Themes(Gtk.ApplicationWindow): theme = store[iter_][Column.THEME] app.css_config.change_preload_theme(theme) - self._remove_theme_button.set_sensitive(True) - self._load_options(theme) + self._ui.remove_theme_button.set_sensitive(True) + self._load_options() - def _load_options(self, name): - self._option_listbox.foreach(self._remove_option) + def _load_options(self): + self._ui.option_listbox.foreach(self._remove_option) for option in CSS_STYLE_OPTIONS: value = app.css_config.get_value( option.selector, option.attr, pre=True) @@ -253,31 +247,31 @@ class Themes(Gtk.ApplicationWindow): continue row = Option(option, value) - self._option_listbox.add(row) + self._ui.option_listbox.add(row) - def _add_option(self, listbox, row): + def _add_option(self, _listbox, row): # Add theme if there is none - store, iter_ = self._theme_treeview.get_selection().get_selected() + store, _ = self._ui.theme_treeview.get_selection().get_selected() first = store.get_iter_first() if first is None: self._on_add_new_theme() - for option in self._option_listbox.get_children(): + for option in self._ui.option_listbox.get_children(): if option == row: return row = Option(row.option, None) - self._option_listbox.add(row) - self._option_popover.popdown() + self._ui.option_listbox.add(row) + self._ui.option_popover.popdown() def _clear_options(self): - self._option_listbox.foreach(self._remove_option) + self._ui.option_listbox.foreach(self._remove_option) def _fill_choose_listbox(self): for option in CSS_STYLE_OPTIONS: - self._choose_option_listbox.add(ChooseOption(option)) + self._ui.choose_option_listbox.add(ChooseOption(option)) def _remove_option(self, row): - self._option_listbox.remove(row) + self._ui.option_listbox.remove(row) row.destroy() def _on_add_new_theme(self, *args): @@ -285,12 +279,13 @@ class Themes(Gtk.ApplicationWindow): if not app.css_config.add_new_theme(name): return - self._remove_theme_button.set_sensitive(True) - iter_ = self._theme_store.append([name]) + self._ui.remove_theme_button.set_sensitive(True) + iter_ = self._ui.theme_store.append([name]) self._select_theme_row(iter_) self._apply_theme(name) - def _apply_theme(self, theme): + @staticmethod + def _apply_theme(theme): app.config.set('roster_theme', theme) app.css_config.change_theme(theme) app.nec.push_incoming_event(NetworkEvent('theme-update')) @@ -312,7 +307,7 @@ class Themes(Gtk.ApplicationWindow): return 'newtheme%s' % i def _on_remove_theme(self, *args): - store, iter_ = self._theme_treeview.get_selection().get_selected() + store, iter_ = self._ui.theme_treeview.get_selection().get_selected() if iter_ is None: return @@ -327,7 +322,7 @@ class Themes(Gtk.ApplicationWindow): first = store.get_iter_first() if first is None: - self._remove_theme_button.set_sensitive(False) + self._ui.remove_theme_button.set_sensitive(False) self._clear_options() text = _('Do you want to delete this theme?') @@ -354,7 +349,7 @@ class Themes(Gtk.ApplicationWindow): class Option(Gtk.ListBoxRow): def __init__(self, option, value): Gtk.ListBoxRow.__init__(self) - self._option = option + self.option = option self._box = Gtk.Box(spacing=12) label = Gtk.Label() @@ -400,25 +395,25 @@ class Option(Gtk.ListBoxRow): color = color_button.get_rgba() color_string = color.to_string() app.css_config.set_value( - self._option.selector, self._option.attr, color_string, pre=True) + self.option.selector, self.option.attr, color_string, pre=True) app.nec.push_incoming_event(NetworkEvent('style-changed')) def _on_font_set(self, font_button): desc = font_button.get_font_desc() - app.css_config.set_font(self._option.selector, desc, pre=True) + app.css_config.set_font(self.option.selector, desc, pre=True) app.nec.push_incoming_event(NetworkEvent('style-changed')) def _on_remove(self, *args): self.get_parent().remove(self) app.css_config.remove_value( - self._option.selector, self._option.attr, pre=True) + self.option.selector, self.option.attr, pre=True) app.nec.push_incoming_event(NetworkEvent('style-changed')) self.destroy() def __eq__(self, other): if isinstance(other, ChooseOption): - return other.option == self._option - return other._option == self._option + return other.option == self.option + return other.option == self.option class ChooseOption(Gtk.ListBoxRow): View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/e089f9f6fe45da3623f5b0071766e1396… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/e089f9f6fe45da3623f5b0071766e1396… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 3 commits: Themes: Switch active theme when adding or removing theme
by Philipp Hörist 17 Nov '19

17 Nov '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 819e64fd by Daniel Brötzmann at 2019-11-17T19:26:41Z Themes: Switch active theme when adding or removing theme When adding a new theme, it is automatically applied. This enables users to view their changes directly without switching the active theme in Preferences first. Deleting the currently active theme will fallback to default. - - - - - 5e018f61 by Daniel Brötzmann at 2019-11-17T19:26:41Z Themes: Rearrange dialog buttons, close popover after adding option - - - - - e089f9f6 by Daniel Brötzmann at 2019-11-17T19:26:41Z Themes: Make Add Setting button sensivite in all circumstances This enabled the user to directly add a setting without having to add a theme first. - - - - - 2 changed files: - gajim/data/gui/themes_window.ui - gajim/gtk/themes.py Changes: ===================================== gajim/data/gui/themes_window.ui ===================================== @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?>  <interface> - <requires lib="gtk+" version="3.18"/> - <object class="GtkPopover" id="popover1"> + <requires lib="gtk+" version="3.20"/> + <object class="GtkPopover" id="option_popover"> <property name="can_focus">False</property> <child> <object class="GtkScrolledWindow"> @@ -32,6 +32,27 @@ </object> </child> </object> + <object class="GtkBox" id="placeholder"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="orientation">vertical</property> + <child> + <object class="GtkLabel"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes">Add a setting you would like to change</property> + <style> + <class name="bold"/> + <class name="dim-label"/> + </style> + </object> + <packing> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + </object> <object class="GtkListStore" id="theme_store"> <columns>  @@ -41,7 +62,6 @@ <object class="GtkGrid" id="theme_grid"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="row_spacing">6</property> <property name="column_spacing">6</property> <child> <object class="GtkScrolledWindow"> @@ -82,62 +102,6 @@ <property name="top_attach">0</property> </packing> </child> - <child> - <object class="GtkBox"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <child> - <object class="GtkButton"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <signal name="clicked" handler="_on_add_new_theme" swapped="no"/> - <child> - <object class="GtkImage"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="icon_name">list-add-symbolic</property> - <property name="icon_size">1</property> - </object> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkButton" id="remove_theme_button"> - <property name="visible">True</property> - <property name="sensitive">False</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <signal name="clicked" handler="_on_remove_theme" swapped="no"/> - <child> - <object class="GtkImage"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="icon_name">list-remove-symbolic</property> - <property name="icon_size">1</property> - </object> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">1</property> - </packing> - </child> - <style> - <class name="linked"/> - </style> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">1</property> - </packing> - </child> <child> <object class="GtkScrolledWindow"> <property name="visible">True</property> @@ -174,18 +138,44 @@ <object class="GtkBox"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="halign">center</property> + <property name="valign">center</property> <child> <object class="GtkMenuButton" id="add_option_button"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> - <property name="popover">popover1</property> + <property name="popover">option_popover</property> <child> - <object class="GtkImage"> + <object class="GtkBox"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="icon_name">list-add-symbolic</property> - <property name="icon_size">1</property> + <property name="spacing">6</property> + <child> + <object class="GtkImage"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="icon_name">list-add-symbolic</property> + <property name="icon_size">1</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkLabel"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes">Add Setting</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> </object> </child> </object> @@ -196,12 +186,52 @@ <property name="position">0</property> </packing> </child> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="GtkToolbar"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="icon_size">2</property> + <child> + <object class="GtkToolButton" id="add_theme_button"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="tooltip_text" translatable="yes">Add new Theme</property> + <property name="use_underline">True</property> + <property name="icon_name">list-add-symbolic</property> + <signal name="clicked" handler="_on_add_new_theme" swapped="no"/> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="remove_theme_button"> + <property name="visible">True</property> + <property name="sensitive">False</property> + <property name="can_focus">False</property> + <property name="tooltip_text" translatable="yes">Remove Theme</property> + <property name="use_underline">True</property> + <property name="icon_name">list-remove-symbolic</property> + <signal name="clicked" handler="_on_remove_theme" swapped="no"/> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> <style> - <class name="linked"/> + <class name="inline-toolbar"/> </style> </object> <packing> - <property name="left_attach">1</property> + <property name="left_attach">0</property> <property name="top_attach">1</property> </packing> </child> ===================================== gajim/gtk/themes.py ===================================== @@ -185,14 +185,12 @@ class Themes(Gtk.ApplicationWindow): widgets = ['option_listbox', 'remove_theme_button', 'theme_store', 'theme_treeview', 'choose_option_listbox', - 'add_option_button'] + 'placeholder', 'option_popover'] for widget in widgets: setattr(self, '_%s' % widget, self.builder.get_object(widget)) - # Doesnt work if we set it in Glade - self._add_option_button.set_sensitive(False) - self._get_themes() + self._option_listbox.set_placeholder(self._placeholder) self.builder.connect_signals(self) self.connect('destroy', self._on_destroy) @@ -242,7 +240,6 @@ class Themes(Gtk.ApplicationWindow): theme = store[iter_][Column.THEME] app.css_config.change_preload_theme(theme) - self._add_option_button.set_sensitive(True) self._remove_theme_button.set_sensitive(True) self._load_options(theme) @@ -259,11 +256,18 @@ class Themes(Gtk.ApplicationWindow): self._option_listbox.add(row) def _add_option(self, listbox, row): + # Add theme if there is none + store, iter_ = self._theme_treeview.get_selection().get_selected() + first = store.get_iter_first() + if first is None: + self._on_add_new_theme() + for option in self._option_listbox.get_children(): if option == row: return row = Option(row.option, None) self._option_listbox.add(row) + self._option_popover.popdown() def _clear_options(self): self._option_listbox.foreach(self._remove_option) @@ -284,6 +288,21 @@ class Themes(Gtk.ApplicationWindow): self._remove_theme_button.set_sensitive(True) iter_ = self._theme_store.append([name]) self._select_theme_row(iter_) + self._apply_theme(name) + + def _apply_theme(self, theme): + app.config.set('roster_theme', theme) + app.css_config.change_theme(theme) + app.nec.push_incoming_event(NetworkEvent('theme-update')) + + # Begin repainting themed widgets throughout + app.interface.roster.repaint_themed_widgets() + app.interface.roster.change_roster_style(None) + + # Update Preferences theme combobox + window = get_app_window('Preferences') + if window is not None: + window.update_theme_list() @staticmethod def _create_theme_name(): @@ -298,28 +317,28 @@ class Themes(Gtk.ApplicationWindow): return theme = store[iter_][Column.THEME] - if theme == app.config.get('roster_theme'): - ErrorDialog( - _('Active Theme'), - _('You tried to delete the currently active theme. ' - 'Please switch to a different theme first.'), - transient_for=self) - return def _remove_theme(): + if theme == app.config.get('roster_theme'): + self._apply_theme('default') + app.css_config.remove_theme(theme) store.remove(iter_) first = store.get_iter_first() if first is None: self._remove_theme_button.set_sensitive(False) - self._add_option_button.set_sensitive(False) self._clear_options() + text = _('Do you want to delete this theme?') + if theme == app.config.get('roster_theme'): + text = _('This is the theme you are currently using.\n' + 'Do you want to delete this theme?') + NewConfirmationDialog( _('Delete'), _('Delete Theme'), - _('Do you want to permanently delete this theme?'), + text, [DialogButton.make('Cancel'), DialogButton.make('Delete', callback=_remove_theme)], @@ -351,6 +370,7 @@ class Option(Gtk.ListBoxRow): remove_button = Gtk.Button.new_from_icon_name( 'list-remove-symbolic', Gtk.IconSize.MENU) + remove_button.set_tooltip_text(_('Remove Setting')) remove_button.get_style_context().add_class('theme_remove_button') remove_button.connect('clicked', self._on_remove) self._box.add(remove_button) View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/7d755dc2bd4b238d68036b106b30be698… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/7d755dc2bd4b238d68036b106b30be698… 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