Commits

commits@gajim.org

17632 discussions

[Git][gajim/gajim][master] Roster: Improve contact filter look
by Philipp Hörist 04 Nov '18

04 Nov '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 2ec1baa7 by André at 2018-11-04T21:59:56Z Roster: Improve contact filter look - - - - - 1 changed file: - gajim/data/gui/roster_window.ui Changes: ===================================== gajim/data/gui/roster_window.ui ===================================== @@ -115,12 +115,11 @@ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> <property name="orientation">vertical</property> <child> - <object class="GtkEntry" id="rfilter_entry"> + <object class="GtkSearchEntry" id="rfilter_entry"> <property name="can_focus">True</property> <property name="no_show_all">True</property> <property name="editable">False</property> - <property name="primary_icon_name">edit-clear</property> - <signal name="changed" handler="on_rfilter_entry_changed" swapped="no"/> + <signal name="search-changed" handler="on_rfilter_entry_changed" swapped="no"/> <signal name="icon-press" handler="on_rfilter_entry_icon_press" swapped="no"/> </object> <packing> View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/2ec1baa7bd3bf054cc48d5ddfddf0dc601… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/2ec1baa7bd3bf054cc48d5ddfddf0dc601… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Use always an action to open the history window
by Philipp Hörist 04 Nov '18

04 Nov '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: b6c4fcfb by Philipp Hörist at 2018-11-04T21:50:21Z Use always an action to open the history window - Make all menus and shortcuts use the 'app.browse-history' action - HistoryWindow: Inherit from Gtk.ApplicationWindow - - - - - 10 changed files: - gajim/app_actions.py - gajim/application.py - gajim/chat_control.py - gajim/chat_control_base.py - gajim/data/gui/history_window.ui - gajim/groupchat_control.py - gajim/gtk/history.py - gajim/gui_menu_builder.py - gajim/message_window.py - gajim/roster_window.py Changes: ===================================== gajim/app_actions.py ===================================== @@ -313,10 +313,7 @@ def on_file_transfers(action, param): def on_history(action, param): - if 'logs' in interface.instances: - interface.instances['logs'].window.present() - else: - interface.instances['logs'] = HistoryWindow() + on_browse_history(action, param) def on_open_event(action, param): @@ -369,3 +366,19 @@ def join_groupchat(_action, param): account, jid = param.get_strv() room_jid = jid.split('?')[0] app.interface.join_gc_minimal(account, room_jid) + + +def on_browse_history(_action, param): + jid, account = None, None + if param is not None: + dict_ = param.unpack() + jid = dict_.get('jid') + account = dict_.get('account') + + window = app.get_app_window(HistoryWindow) + if window is None: + HistoryWindow(jid, account) + else: + window.present() + if jid is not None and account is not None: + window.open_history(jid, account) ===================================== gajim/application.py ===================================== @@ -418,6 +418,11 @@ class GajimApplication(Gtk.Application): act.connect("activate", app_actions.open_link) self.add_action(act) + act = Gio.SimpleAction.new('browse-history', + GLib.VariantType.new('a{sv}')) + act.connect("activate", app_actions.on_browse_history) + self.add_action(act) + for action in general_actions: action_name, func = action act = Gio.SimpleAction.new(action_name, None) ===================================== gajim/chat_control.py ===================================== @@ -110,7 +110,7 @@ class ChatControl(ChatControlBase): # Menu for the HeaderBar self.control_menu = gui_menu_builder.get_singlechat_menu( - self.control_id) + self.control_id, self.account, self.contact.jid) settings_menu = self.xml.get_object('settings_menu') settings_menu.set_menu_model(self.control_menu) ===================================== gajim/chat_control_base.py ===================================== @@ -388,11 +388,6 @@ class ChatControlBase(MessageControl, ChatCommandProcessor, CommandTools): action.connect("change-state", self.change_encryption) self.parent_win.window.add_action(action) - action = Gio.SimpleAction.new( - 'browse-history-%s' % self.control_id, GLib.VariantType.new('s')) - action.connect('activate', self._on_history) - self.parent_win.window.add_action(action) - action = Gio.SimpleAction.new( 'send-file-%s' % self.control_id, None) action.connect('activate', self._on_send_file) @@ -413,21 +408,6 @@ class ChatControlBase(MessageControl, ChatCommandProcessor, CommandTools): # Actions - def _on_history(self, action, param): - """ - When history menuitem is pressed: call history window - """ - jid = param.get_string() - if jid == 'none': - jid = self.contact.jid - - if 'logs' in app.interface.instances: - app.interface.instances['logs'].window.present() - app.interface.instances['logs'].open_history(jid, self.account) - else: - from gajim.gtk.history import HistoryWindow - app.interface.instances['logs'] = HistoryWindow(jid, self.account) - def change_encryption(self, action, param): encryption = param.get_string() if encryption == 'disabled': @@ -1039,20 +1019,6 @@ class ChatControlBase(MessageControl, ChatCommandProcessor, CommandTools): start, end = buffer_.get_bounds() buffer_.delete(start, end) - def _on_history_menuitem_activate(self, widget=None, jid=None): - """ - When history menuitem is pressed: call history window - """ - if not jid: - jid = self.contact.jid - - if 'logs' in app.interface.instances: - app.interface.instances['logs'].window.present() - app.interface.instances['logs'].open_history(jid, self.account) - else: - from gajim.gtk.history import HistoryWindow - app.interface.instances['logs'] = HistoryWindow(jid, self.account) - def _on_send_file(self, action, param): # get file transfer preference ft_pref = app.config.get_per('accounts', self.account, ===================================== gajim/data/gui/history_window.ui ===================================== @@ -278,296 +278,282 @@ </object> </child> </object> - <object class="GtkApplicationWindow" id="history_window"> + <object class="GtkBox" id="history_box"> + <property name="width_request">600</property> + <property name="visible">True</property> <property name="can_focus">False</property> - <property name="title" translatable="yes">Conversation History</property> - <property name="window_position">center</property> - <property name="show_menubar">False</property> - <signal name="delete-event" handler="on_history_window_delete_event" swapped="no"/> - <signal name="destroy" handler="on_history_window_destroy" swapped="no"/> - <signal name="key-press-event" handler="on_history_window_key_press_event" swapped="no"/> - <child type="titlebar"> - <placeholder/> - </child> + <property name="margin_left">18</property> + <property name="margin_right">18</property> + <property name="margin_top">18</property> + <property name="margin_bottom">18</property> + <property name="orientation">vertical</property> + <property name="spacing">24</property> <child> - <object class="GtkBox" id="vbox"> - <property name="width_request">600</property> + <object class="GtkGrid"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="margin_left">18</property> - <property name="margin_right">18</property> - <property name="margin_top">18</property> - <property name="margin_bottom">18</property> - <property name="orientation">vertical</property> - <property name="spacing">24</property> + <property name="row_spacing">6</property> + <property name="column_spacing">12</property> <child> - <object class="GtkGrid"> + <object class="GtkLabel"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="row_spacing">6</property> - <property name="column_spacing">12</property> - <child> - <object class="GtkLabel"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="halign">start</property> - <property name="label" translatable="yes">Chat</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="GtkSwitch" id="log_history_checkbutton"> + <property name="halign">start</property> + <property name="label" translatable="yes">Chat</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="GtkSwitch" id="log_history_checkbutton"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="tooltip_text" translatable="yes">Record history for this chat</property> + <signal name="notify::active" handler="on_log_history_checkbutton_toggled" swapped="no"/> + </object> + <packing> + <property name="left_attach">3</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkLabel"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="margin_left">6</property> + <property name="label" translatable="yes">Record History</property> + <style> + <class name="dim-label"/> + </style> + </object> + <packing> + <property name="left_attach">2</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkComboBox" id="query_entry"> + <property name="width_request">400</property> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="hexpand">True</property> + <property name="model">liststore1</property> + <property name="tearoff_title" translatable="yes">Ttitle</property> + <property name="has_entry">True</property> + <property name="entry_text_column">1</property> + <property name="id_column">1</property> + <signal name="changed" handler="on_jid_entry_changed" swapped="no"/> + <child internal-child="entry"> + <object class="GtkEntry"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="tooltip_text" translatable="yes">Record history for this chat</property> - <signal name="notify::active" handler="on_log_history_checkbutton_toggled" swapped="no"/> - </object> - <packing> - <property name="left_attach">3</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkLabel"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="margin_left">6</property> - <property name="label" translatable="yes">Record History</property> - <style> - <class name="dim-label"/> - </style> + <signal name="activate" handler="on_jid_entry_activate" swapped="no"/> </object> - <packing> - <property name="left_attach">2</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkComboBox" id="query_entry"> - <property name="width_request">400</property> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="hexpand">True</property> - <property name="model">liststore1</property> - <property name="tearoff_title" translatable="yes">Ttitle</property> - <property name="has_entry">True</property> - <property name="entry_text_column">1</property> - <property name="id_column">1</property> - <signal name="changed" handler="on_jid_entry_changed" swapped="no"/> - <child internal-child="entry"> - <object class="GtkEntry"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <signal name="activate" handler="on_jid_entry_activate" swapped="no"/> - </object> - </child> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">0</property> - </packing> </child> </object> <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> + <property name="left_attach">1</property> + <property name="top_attach">0</property> </packing> </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</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="GtkBox"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="orientation">vertical</property> - <child> + <child type="center"> <object class="GtkBox"> <property name="visible">True</property> <property name="can_focus">False</property> - <child type="center"> - <object class="GtkBox"> + <child> + <object class="GtkSearchEntry" id="search_entry"> + <property name="width_request">300</property> <property name="visible">True</property> - <property name="can_focus">False</property> - <child> - <object class="GtkSearchEntry" id="search_entry"> - <property name="width_request">300</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="primary_icon_name">edit-find-symbolic</property> - <property name="primary_icon_activatable">False</property> - <property name="primary_icon_sensitive">False</property> - <signal name="activate" handler="on_search_entry_activate" swapped="no"/> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkMenuButton" id="search_menu_button"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="halign">start</property> - <property name="popover">search_menu</property> - <child> - <object class="GtkBox"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="spacing">6</property> - <child> - <object class="GtkLabel" id="date_label"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="margin_left">3</property> - <property name="margin_right">3</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkImage"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="icon_name">pan-down-symbolic</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> - </object> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> - <style> - <class name="linked"/> - </style> + <property name="can_focus">True</property> + <property name="primary_icon_name">edit-find-symbolic</property> + <property name="primary_icon_activatable">False</property> + <property name="primary_icon_sensitive">False</property> + <signal name="activate" handler="on_search_entry_activate" swapped="no"/> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">2</property> + <property name="position">0</property> </packing> </child> <child> - <object class="GtkBox"> + <object class="GtkMenuButton" id="search_menu_button"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="orientation">vertical</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="halign">start</property> + <property name="popover">search_menu</property> <child> - <object class="GtkMenuButton"> + <object class="GtkBox"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="popover">more_menu</property> + <property name="can_focus">False</property> + <property name="spacing">6</property> + <child> + <object class="GtkLabel" id="date_label"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="margin_left">3</property> + <property name="margin_right">3</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> <child> <object class="GtkImage"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="icon_name">view-more-symbolic</property> + <property name="icon_name">pan-down-symbolic</property> </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</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="expand">False</property> <property name="fill">True</property> - <property name="pack_type">end</property> <property name="position">1</property> </packing> </child> <style> - <class name="inline-toolbar"/> - <class name="ontop-bar"/> + <class name="linked"/> </style> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">0</property> + <property name="position">2</property> </packing> </child> <child> - <object class="GtkPaned"> + <object class="GtkBox"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="vexpand">True</property> + <property name="can_focus">False</property> <property name="orientation">vertical</property> <child> - <object class="GtkScrolledWindow" id="results_scrolledwindow"> + <object class="GtkMenuButton"> + <property name="visible">True</property> <property name="can_focus">True</property> - <property name="no_show_all">True</property> - <property name="shadow_type">in</property> + <property name="receives_default">True</property> + <property name="popover">more_menu</property> <child> - <object class="GtkTreeView" id="results_treeview"> + <object class="GtkImage"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="rules_hint">True</property> - <property name="hover_expand">True</property> - <signal name="cursor-changed" handler="on_results_treeview_cursor_changed" swapped="no"/> - <child internal-child="selection"> - <object class="GtkTreeSelection"/> - </child> + <property name="can_focus">False</property> + <property name="icon_name">view-more-symbolic</property> </object> </child> </object> <packing> - <property name="resize">True</property> - <property name="shrink">True</property> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> </packing> </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="pack_type">end</property> + <property name="position">1</property> + </packing> + </child> + <style> + <class name="inline-toolbar"/> + <class name="ontop-bar"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkPaned"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="vexpand">True</property> + <property name="orientation">vertical</property> + <child> + <object class="GtkScrolledWindow" id="results_scrolledwindow"> + <property name="can_focus">True</property> + <property name="no_show_all">True</property> + <property name="shadow_type">in</property> <child> - <object class="GtkScrolledWindow" id="scrolledwindow"> + <object class="GtkTreeView" id="results_treeview"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="shadow_type">etched-in</property> - <property name="min_content_height">200</property> - <child> - <placeholder/> + <property name="rules_hint">True</property> + <property name="hover_expand">True</property> + <signal name="cursor-changed" handler="on_results_treeview_cursor_changed" swapped="no"/> + <child internal-child="selection"> + <object class="GtkTreeSelection"/> </child> </object> - <packing> - <property name="resize">True</property> - <property name="shrink">True</property> - </packing> </child> </object> <packing> - <property name="expand">True</property> - <property name="fill">True</property> - <property name="position">1</property> + <property name="resize">True</property> + <property name="shrink">True</property> + </packing> + </child> + <child> + <object class="GtkScrolledWindow" id="scrolledwindow"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="shadow_type">etched-in</property> + <property name="min_content_height">200</property> + <child> + <placeholder/> + </child> + </object> + <packing> + <property name="resize">True</property> + <property name="shrink">True</property> </packing> </child> </object> <packing> - <property name="expand">False</property> + <property name="expand">True</property> <property name="fill">True</property> - <property name="position">2</property> + <property name="position">1</property> </packing> </child> </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">2</property> + </packing> </child> </object> </interface> ===================================== gajim/groupchat_control.py ===================================== @@ -494,7 +494,9 @@ class GroupchatControl(ChatControlBase): # GC Roster tooltip self.gc_tooltip = GCTooltip() - self.control_menu = gui_menu_builder.get_groupchat_menu(self.control_id) + self.control_menu = gui_menu_builder.get_groupchat_menu(self.control_id, + self.account, + self.room_jid) settings_menu = self.xml.get_object('settings_menu') settings_menu.set_menu_model(self.control_menu) @@ -2714,8 +2716,11 @@ class GroupchatControl(ChatControlBase): self.handlers[id_] = item item = xml.get_object('history_menuitem') - id_ = item.connect('activate', self.on_history, nick) - self.handlers[id_] = item + item.set_action_name('app.browse-history') + dict_ = {'jid': GLib.Variant('s', fjid), + 'account': GLib.Variant('s', self.account)} + variant = GLib.Variant('a{sv}', dict_) + item.set_action_target_value(variant) item = xml.get_object('add_to_roster_menuitem') our_jid = app.get_jid_from_account(self.account) @@ -2981,10 +2986,6 @@ class GroupchatControl(ChatControlBase): app.interface.instances[self.account]['infos'][contact.jid] = \ vcard.VcardWindow(contact, self.account, gc_contact) - def on_history(self, widget, nick): - jid = app.construct_fjid(self.room_jid, nick) - self._on_history_menuitem_activate(widget=widget, jid=jid) - def on_add_to_roster(self, widget, jid): AddNewContactWindow(self.account, jid) ===================================== gajim/gtk/history.py ===================================== @@ -69,14 +69,17 @@ class Column(IntEnum): LOG_LINE_ID = 5 -class HistoryWindow: - """ - Class for browsing logs of conversations with contacts - """ - +class HistoryWindow(Gtk.ApplicationWindow): def __init__(self, jid=None, account=None): + Gtk.ApplicationWindow.__init__(self) + self.set_application(app.app) + self.set_position(Gtk.WindowPosition.CENTER) + self.set_show_menubar(False) + self.set_title(_('Conversation History')) + self._ui = get_builder('history_window.ui') - self._ui.history_window.set_application(app.app) + + self.add(self._ui.history_box) self.history_textview = conversation_textview.ConversationTextview( account, used_in_history_window=True) @@ -130,15 +133,18 @@ class HistoryWindow: else: self._load_history(None) - resize_window(self._ui.history_window, + resize_window(self, app.config.get('history_window_width'), app.config.get('history_window_height')) - move_window(self._ui.history_window, + move_window(self, app.config.get('history_window_x-position'), app.config.get('history_window_y-position')) self._ui.connect_signals(self) - self._ui.history_window.show_all() + self.connect('delete-event', self._on_delete) + self.connect('destroy', self._on_destroy) + self.connect('key-press-event', self._on_key_press) + self.show_all() # PluginSystem: adding GUI extension point for # HistoryWindow instance object @@ -255,21 +261,20 @@ class HistoryWindow: break return account - def on_history_window_delete_event(self, widget, *args): + def _on_delete(self, widget, *args): self.save_state() - def on_history_window_destroy(self, widget): + def _on_destroy(self, widget): # PluginSystem: removing GUI extension points connected with # HistoryWindow instance object app.plugin_manager.remove_gui_extension_point( 'history_window', self) self.history_textview.del_handlers() - del app.interface.instances['logs'] - def on_history_window_key_press_event(self, widget, event): + def _on_key_press(self, widget, event): if event.keyval == Gdk.KEY_Escape: self.save_state() - self._ui.history_window.destroy() + self.destroy() def on_jid_entry_match_selected(self, widget, model, iter_, *args): self._jid_entry_search(model[iter_][1]) @@ -799,8 +804,8 @@ class HistoryWindow: self._ui.results_scrolledwindow.set_property('visible', False) def save_state(self): - x, y = self._ui.history_window.get_window().get_root_origin() - width, height = self._ui.history_window.get_size() + x, y = self.get_window().get_root_origin() + width, height = self.get_size() app.config.set('history_window_x-position', x) app.config.set('history_window_y-position', y) ===================================== gajim/gui_menu_builder.py ===================================== @@ -272,7 +272,12 @@ control=None, gc_contact=None, is_anonymous=True): rename_menuitem.connect('activate', roster.on_rename, 'contact', jid, account) - history_menuitem.connect('activate', roster.on_history, contact, account) + + history_menuitem.set_action_name('app.browse-history') + dict_ = {'jid': GLib.Variant('s', contact.jid), + 'account': GLib.Variant('s', account)} + variant = GLib.Variant('a{sv}', dict_) + history_menuitem.set_action_target_value(variant) if control: convert_to_gc_menuitem.connect('activate', @@ -605,7 +610,7 @@ def show_save_as_menu(sha, name): menu.popup_at_pointer() -def get_singlechat_menu(control_id): +def get_singlechat_menu(control_id, account, jid): singlechat_menu = [ (_('Send File…'), [ ('win.send-file-httpupload-', _('Upload File…')), @@ -616,7 +621,7 @@ def get_singlechat_menu(control_id): ('win.toggle-audio-', _('Audio Session')), ('win.toggle-video-', _('Video Session')), ('win.information-', _('Information')), - ('win.browse-history-', _('History')), + ('app.browse-history', _('History')), ] def build_menu(preset): @@ -624,8 +629,14 @@ def get_singlechat_menu(control_id): for item in preset: if isinstance(item[1], str): action_name, label = item - if action_name == 'win.browse-history-': - menu.append(label, action_name + control_id + '::none') + if action_name == 'app.browse-history': + menuitem = Gio.MenuItem.new(label, action_name) + dict_ = {'account': GLib.Variant('s', account), + 'jid': GLib.Variant('s', jid)} + variant_dict = GLib.Variant('a{sv}', dict_) + menuitem.set_action_and_target_value(action_name, + variant_dict) + menu.append_item(menuitem) else: menu.append(label, action_name + control_id) else: @@ -638,7 +649,7 @@ def get_singlechat_menu(control_id): return build_menu(singlechat_menu) -def get_groupchat_menu(control_id): +def get_groupchat_menu(control_id, account, jid): groupchat_menu = [ (_('Manage Room'), [ ('win.change-subject-', _('Change Subject')), @@ -653,7 +664,7 @@ def get_groupchat_menu(control_id): ('win.notify-on-message-', _('Notify on all messages')), ('win.minimize-', _('Minimize on close')), ('win.execute-command-', _('Execute command')), - ('win.browse-history-', _('History')), + ('app.browse-history', _('History')), ('win.disconnect-', _('Disconnect')), ] @@ -662,8 +673,14 @@ def get_groupchat_menu(control_id): for item in preset: if isinstance(item[1], str): action_name, label = item - if action_name == 'win.browse-history-': - menu.append(label, action_name + control_id + '::none') + if action_name == 'app.browse-history': + menuitem = Gio.MenuItem.new(label, action_name) + dict_ = {'account': GLib.Variant('s', account), + 'jid': GLib.Variant('s', jid)} + variant_dict = GLib.Variant('a{sv}', dict_) + menuitem.set_action_and_target_value(action_name, + variant_dict) + menu.append_item(menuitem) else: menu.append(label, action_name + control_id) else: ===================================== gajim/message_window.py ===================================== @@ -355,9 +355,10 @@ class MessageWindow: if keyval == Gdk.KEY_h: # CTRL + h if Gtk.Settings.get_default().get_property( 'gtk-key-theme-name') != 'Emacs': - arg = GLib.Variant('s', 'none') - self.window.lookup_action( - 'browse-history-%s' % control.control_id).activate(arg) + dict_ = {'jid': GLib.Variant('s', control.contact.jid), + 'account': GLib.Variant('s', control.account)} + variant = GLib.Variant('a{sv}', dict_) + app.app.activate_action('browse-history', variant) return True elif control.type_id == message_control.TYPE_CHAT and \ keyval == Gdk.KEY_f: # CTRL + f ===================================== gajim/roster_window.py ===================================== @@ -78,7 +78,6 @@ from gajim.gtk.bookmarks import ManageBookmarksWindow from gajim.gtk.account_wizard import AccountCreationWizard from gajim.gtk.service_registration import ServiceRegistration from gajim.gtk.discovery import ServiceDiscoveryWindow -from gajim.gtk.history import HistoryWindow from gajim.gtk.accounts import AccountsWindow from gajim.gtk.tooltips import RosterTooltip from gajim.gtk.adhoc_commands import CommandWindow @@ -3041,16 +3040,6 @@ class RosterWindow: def on_edit_groups(self, widget, list_): dialogs.EditGroupsDialog(list_) - def on_history(self, widget, contact, account): - """ - When history menuitem is activated: call log window - """ - if 'logs' in app.interface.instances: - app.interface.instances['logs'].window.present() - app.interface.instances['logs'].open_history(contact.jid, account) - else: - app.interface.instances['logs'] = HistoryWindow(contact.jid, account) - def on_disconnect(self, widget, jid, account): """ When disconnect menuitem is activated: disconnect from room @@ -3756,6 +3745,9 @@ class RosterWindow: self.on_info(widget, contact, account) elif event.get_state() & Gdk.ModifierType.CONTROL_MASK and event.keyval == \ Gdk.KEY_h: + if app.config.get('one_message_window') == 'always_with_roster': + # Let MessageWindow handle this + return treeselection = self.tree.get_selection() model, list_of_paths = treeselection.get_selected_rows() if len(list_of_paths) != 1: @@ -3767,7 +3759,10 @@ class RosterWindow: account = model[path][Column.ACCOUNT] contact = app.contacts.get_first_contact_from_jid(account, jid) - self.on_history(widget, contact, account) + dict_ = {'jid': GLib.Variant('s', jid), + 'account': GLib.Variant('s', account)} + app.app.activate_action('browse-history', + GLib.Variant('a{sv}', dict_)) def on_roster_window_popup_menu(self, widget): event = Gdk.Event.new(Gdk.EventType.KEY_PRESS) @@ -5392,7 +5387,12 @@ class RosterWindow: menu.append(item) history_menuitem = Gtk.MenuItem.new_with_mnemonic(_('_History')) - history_menuitem.connect('activate', self.on_history, contact, account) + history_menuitem.set_action_name('app.browse-history') + dict_ = {'jid': GLib.Variant('s', contact.jid), + 'account': GLib.Variant('s', account)} + variant = GLib.Variant('a{sv}', dict_) + history_menuitem.set_action_target_value(variant) + menu.append(history_menuitem) event_button = gtkgui_helpers.get_possible_button_event(event) View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/b6c4fcfb548e6d9b5b71787559d0d9963b… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/b6c4fcfb548e6d9b5b71787559d0d9963b… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] GroupchatConfig: Valid form before sending
by Philipp Hörist 04 Nov '18

04 Nov '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 3e387f52 by Philipp Hörist at 2018-11-04T16:45:27Z GroupchatConfig: Valid form before sending - - - - - 2 changed files: - gajim/data/gui/groupchat_config.ui - gajim/gtk/groupchat_config.py Changes: ===================================== gajim/data/gui/groupchat_config.ui ===================================== @@ -101,7 +101,7 @@ <property name="vexpand">False</property> <property name="spacing">6</property> <child> - <object class="GtkMenuButton"> + <object class="GtkMenuButton" id="info_button"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> @@ -195,7 +195,7 @@ </packing> </child> <child> - <object class="GtkButton"> + <object class="GtkButton" id="ok_button"> <property name="label">gtk-ok</property> <property name="visible">True</property> <property name="can_focus">True</property> ===================================== gajim/gtk/groupchat_config.py ===================================== @@ -51,6 +51,7 @@ class GroupchatConfig(Gtk.ApplicationWindow): visible = muc_caps_cache.supports(jid, nbxmpp.NS_REGISTER) self._ui.reserved_name_column.set_visible(visible) + self._ui.info_button.set_sensitive(False) self._form = form self._affiliations = {} @@ -67,8 +68,9 @@ class GroupchatConfig(Gtk.ApplicationWindow): if form is not None: self._ui.stack.set_visible_child_name('config') self._data_form_widget = DataFormWidget(form) + self._data_form_widget.connect('is-valid', self._on_is_valid) + self._data_form_widget.validate() self._ui.config_grid.add(self._data_form_widget) - # self._ui.stack.set_visible_child_name('affiliation') else: self._ui.stack.get_child_by_name('config').hide() self._ui.stack.get_child_by_name('config').set_no_show_all(True) @@ -79,6 +81,9 @@ class GroupchatConfig(Gtk.ApplicationWindow): self.show_all() self._ui.stack.notify('visible-child-name') + def _on_is_valid(self, _widget, is_valid): + self._ui.ok_button.set_sensitive(is_valid) + def _get_current_treeview(self): page_name = self._ui.stack.get_visible_child_name() return getattr(self._ui, '%s_treeview' % page_name) @@ -208,6 +213,7 @@ class GroupchatConfig(Gtk.ApplicationWindow): affiliation = self._own_affiliation in ('admin', 'owner') page = page_name != 'config' self._ui.treeview_buttonbox.set_visible(affiliation and page) + self._ui.info_button.set_sensitive(page_name == 'outcast') def _set_remove_button_state(self, sensitive, selected_affiliations): if self._own_affiliation not in ('admin', 'owner'): View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/3e387f521502c650a81cef644bf9012762… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/3e387f521502c650a81cef644bf9012762… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 3 commits: Tests: Add a DataFormWidget test window
by Philipp Hörist 04 Nov '18

04 Nov '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 44d56ac2 by Philipp Hörist at 2018-11-03T22:09:12Z Tests: Add a DataFormWidget test window - - - - - 6b65a233 by Philipp Hörist at 2018-11-03T23:58:34Z DataForms: Make validation possible - Show orange warning icon if a field is required - Show red error icon if validation of the field failed - Set validation error text as tooltip of the icon - DataFormWidget emits a signal 'is-valid' on every change - - - - - 4753e601 by Philipp Hörist at 2018-11-04T00:01:39Z ServiceRegistration: Validate form before sending - - - - - 6 changed files: - gajim/common/modules/dataforms.py - gajim/data/style/gajim.css - gajim/gtk/dataform.py - gajim/gtk/service_registration.py - + test/gtk/dataform.py - + test/gtk/util.py Changes: ===================================== gajim/common/modules/dataforms.py ===================================== @@ -239,7 +239,7 @@ class DataField(ExtendedNode): @staticmethod def is_valid(): - return True + return True, '' class Uri(nbxmpp.Node): @@ -353,6 +353,13 @@ class StringField(DataField): except ValueError: # if there already were no value tag pass + def is_valid(self): + if not self.required: + return True, '' + if not self.value: + return False, '' + return True, '' + class ListField(DataField): """ @@ -404,10 +411,10 @@ class ListSingleField(ListField, StringField): """ def is_valid(self): if not self.required: - return True + return True, '' if not self.value: - return False - return True + return False, '' + return True, '' class JidSingleField(ListSingleField): @@ -418,12 +425,12 @@ class JidSingleField(ListSingleField): if self.value: try: helpers.parse_jid(self.value) - return True - except Exception: - return False + return True, '' + except Exception as error: + return False, error if self.required: - return False - return True + return False, '' + return True, '' class ListMultiField(ListField): @@ -458,10 +465,10 @@ class ListMultiField(ListField): def is_valid(self): if not self.required: - return True + return True, '' if not self.values: - return False - return True + return False, '' + return True, '' class JidMultiField(ListMultiField): @@ -473,12 +480,12 @@ class JidMultiField(ListMultiField): for value in self.values: try: helpers.parse_jid(value) - except Exception: - return False - return True + except Exception as error: + return False, error + return True, '' if self.required: - return False - return True + return False, '' + return True, '' class TextMultiField(DataField): @@ -505,6 +512,13 @@ class TextMultiField(DataField): for element in self.getTags('value'): self.delChild(element) + def is_valid(self): + if not self.required: + return True, '' + if not self.value: + return False, '' + return True, '' + class DataRecord(ExtendedNode): """ @@ -573,7 +587,7 @@ class DataRecord(ExtendedNode): def is_valid(self): for field in self.iter_fields(): - if not field.is_valid(): + if not field.is_valid()[0]: return False return True ===================================== gajim/data/style/gajim.css ===================================== @@ -147,7 +147,7 @@ list.settings > row > box { #StartChatListBox > row:not(.activatable) label { color: @insensitive_fg_color } /* GroupchatConfig */ -#GroupchatConfig buttonbox { margin: 0px 12px 12px 12px; } +#GroupchatConfig > box > buttonbox { margin: 0px 12px 12px 12px; } #GroupchatConfig stack { border-bottom: 1px solid; border-color: @borders;} #GroupchatConfig stacksidebar > scrolledwindow { background-color:@theme_base_color; @@ -249,8 +249,4 @@ button.flat.link { padding: 0; border: 0; } .data-form-title { font-size: 16px; font-weight: bold; } .data-form-widget grid { margin: 18px; } .data-form-widget treeview { padding: 5px; } -.field-required { border: 1px solid; border-color: red; } -.field-normal { border: 1px solid; border-color:@unfocused_borders; } - -.entry-field-required { border: 1px solid; border-color: red; } -.entry-field-required:focus { box-shadow: inset 0 0 0 1px red; border-color: red; } \ No newline at end of file +.data-form-widget scrolledwindow { border: 1px solid; border-color:@unfocused_borders; } ===================================== gajim/gtk/dataform.py ===================================== @@ -13,10 +13,17 @@ # along with Gajim. If not, see <http://www.gnu.org/licenses/>. from gi.repository import Gtk +from gi.repository import GLib +from gi.repository import GObject from gi.repository import Pango +from gajim.common.i18n import _ + class DataFormWidget(Gtk.ScrolledWindow): + + __gsignals__ = {'is-valid': (GObject.SignalFlags.RUN_LAST, None, (bool,))} + def __init__(self, form_node, options=None): Gtk.ScrolledWindow.__init__(self) self.set_hexpand(True) @@ -39,6 +46,9 @@ class DataFormWidget(Gtk.ScrolledWindow): def instructions(self): return self._form_grid.instructions + def validate(self): + return self._form_grid.validate(True) + def get_submit_form(self): self._form_node.type_ = 'submit' return self._form_node @@ -109,10 +119,11 @@ class FormGrid(Gtk.Grid): continue widget = self._fields[field.type_] - self.add_row(widget(field, options)) + self.add_row(widget(field, self, options)) - def is_valid(self): - return self._data_form.is_valid() + def validate(self, is_valid): + value = self._data_form.is_valid() if is_valid else False + self.get_parent().get_parent().emit('is-valid', value) class Title: @@ -135,8 +146,10 @@ class Instructions: class Field: - def __init__(self, field, options): + def __init__(self, field, form_grid, options): self._field = field + self._form_grid = form_grid + self._validate_source_id = None self._label = Gtk.Label(label=field.label) self._label.set_single_line_mode(False) @@ -147,15 +160,64 @@ class Field: self._label.set_xalign(bool(options.get('right_align'))) self._label.set_tooltip_text(field.description) + self._warning_image = Gtk.Image.new_from_icon_name( + 'dialog-warning-symbolic', Gtk.IconSize.MENU) + self._warning_image.get_style_context().add_class('warning-color') + self._warning_image.set_no_show_all(True) + self._warning_image.set_valign(Gtk.Align.CENTER) + self._warning_image.set_tooltip_text(_('Required')) + self._warning_box = Gtk.Box() + self._warning_box.set_size_request(16, -1) + self._warning_box.add(self._warning_image) + def add(self, form_grid, row_number): form_grid.attach(self._label, 0, row_number, 1, 1) - form_grid.attach_next_to( - self._widget, self._label, Gtk.PositionType.RIGHT, 1, 1) + form_grid.attach_next_to(self._widget, + self._label, + Gtk.PositionType.RIGHT, 1, 1) + if self._field.type_ in ('jid-single', + 'jid-multi', + 'text-single', + 'text-private', + 'text-multi'): + form_grid.attach_next_to(self._warning_box, + self._widget, + Gtk.PositionType.RIGHT, 1, 1) + self._set_warning(False, '') + + def _set_warning(self, is_valid, error): + if not self._field.required and not is_valid and not error: + # If its not valid and no error is given, its the inital call + # to show all icons on required fields. + return + + style = self._warning_image.get_style_context() + if error: + style.remove_class('warning-color') + style.add_class('error-color') + else: + error = _('Required') + style.remove_class('error-color') + style.add_class('warning-color') + self._warning_image.set_tooltip_text(str(error)) + self._warning_image.set_visible(not is_valid) + + def _validate(self): + if self._validate_source_id is not None: + GLib.source_remove(self._validate_source_id) + + def _start_validation(): + is_valid, error = self._field.is_valid() + self._set_warning(is_valid, error) + self._form_grid.validate(is_valid) + self._validate_source_id = None + + self._validate_source_id = GLib.timeout_add(500, _start_validation) class BooleanField(Field): - def __init__(self, field, options): - Field.__init__(self, field, options) + def __init__(self, field, form_grid, options): + Field.__init__(self, field, form_grid, options) self._widget = Gtk.CheckButton() self._widget.set_active(field.value) @@ -166,8 +228,8 @@ class BooleanField(Field): class FixedField(Field): - def __init__(self, field, options): - Field.__init__(self, field, options) + def __init__(self, field, form_grid, options): + Field.__init__(self, field, form_grid, options) self._label.set_text(field.value) @@ -186,8 +248,8 @@ class FixedField(Field): class ListSingleField(Field): - def __init__(self, field, options): - Field.__init__(self, field, options) + def __init__(self, field, form_grid, options): + Field.__init__(self, field, form_grid, options) self._widget = Gtk.ComboBoxText() for value, label in field.iter_options(): @@ -203,8 +265,8 @@ class ListSingleField(Field): class ListMultiField(Field): - def __init__(self, field, options): - Field.__init__(self, field, options) + def __init__(self, field, form_grid, options): + Field.__init__(self, field, form_grid, options) self._label.set_valign(Gtk.Align.START) self._treeview = ListMutliTreeView(field) @@ -214,7 +276,6 @@ class ListMultiField(Field): self._widget.set_min_content_height(100) self._widget.set_max_content_height(300) self._widget.add(self._treeview) - self._widget.get_style_context().add_class('field-normal') class ListMutliTreeView(Gtk.TreeView): @@ -264,32 +325,26 @@ class ListMutliTreeView(Gtk.TreeView): class JidMultiField(Field): - def __init__(self, field, options): - Field.__init__(self, field, options) + def __init__(self, field, form_grid, options): + Field.__init__(self, field, form_grid, options) self._label.set_valign(Gtk.Align.START) - self._treeview = JidMutliTreeView(field) + self._treeview = JidMutliTreeView(field, self) - self._add_button = Gtk.Button.new_from_icon_name( - 'list-add-symbolic', Gtk.IconSize.MENU) + self._add_button = Gtk.ToolButton(icon_name='list-add-symbolic') self._add_button.connect('clicked', self._add_clicked) - self._add_button.set_halign(Gtk.Align.START) - self._remove_button = Gtk.Button.new_from_icon_name( - 'list-remove-symbolic', Gtk.IconSize.MENU) + self._remove_button = Gtk.ToolButton(icon_name='list-remove-symbolic') self._remove_button.connect('clicked', self._remove_clicked) - self._remove_button.set_halign(Gtk.Align.START) - self._button_box = Gtk.ButtonBox( - orientation=Gtk.Orientation.HORIZONTAL) - self._button_box.set_layout(Gtk.ButtonBoxStyle.START) - self._button_box.add(self._add_button) - self._button_box.add(self._remove_button) - self._button_box.set_child_non_homogeneous(self._add_button, True) - self._button_box.set_child_non_homogeneous(self._remove_button, True) + self._toolbar = Gtk.Toolbar() + self._toolbar.set_icon_size(Gtk.IconSize.MENU) + self._toolbar.set_style(Gtk.ToolbarStyle.ICONS) + self._toolbar.get_style_context().add_class('inline-toolbar') + self._toolbar.add(self._add_button) + self._toolbar.add(self._remove_button) self._widget = Gtk.Box(orientation=Gtk.Orientation.VERTICAL) - self._widget.set_spacing(6) self._scrolled_window = Gtk.ScrolledWindow() self._scrolled_window.set_propagate_natural_height(True) @@ -298,9 +353,7 @@ class JidMultiField(Field): self._scrolled_window.add(self._treeview) self._widget.pack_start(self._scrolled_window, True, True, 0) - self._widget.pack_end(self._button_box, False, False, 0) - - self._treeview.update_required_css() + self._widget.pack_end(self._toolbar, False, False, 0) def _add_clicked(self, _widget): self._treeview.get_model().append(['']) @@ -317,14 +370,18 @@ class JidMultiField(Field): continue jids.append(row[0]) self._field.values = jids - self._treeview.update_required_css() + self._validate() + + def validate(self): + self._validate() class JidMutliTreeView(Gtk.TreeView): - def __init__(self, field): + def __init__(self, field, multi_field): Gtk.TreeView.__init__(self) self._field = field + self._multi_field = multi_field self._store = Gtk.ListStore(str) @@ -348,7 +405,7 @@ class JidMutliTreeView(Gtk.TreeView): iter_ = self._store.get_iter(path) self._store.set_value(iter_, 0, new_text) self._set_values() - self.update_required_css() + self._multi_field.validate() def _set_values(self): jids = [] @@ -358,58 +415,35 @@ class JidMutliTreeView(Gtk.TreeView): jids.append(row[0]) self._field.values = jids - def update_required_css(self): - style = self.get_parent().get_style_context() - if not self._field.required: - style.add_class('field-normal') - return - - if self._field.values: - style.remove_class('field-required') - style.add_class('field-normal') - else: - style.remove_class('field-normal') - style.add_class('field-required') - class TextSingleField(Field): - def __init__(self, field, options): - Field.__init__(self, field, options) + def __init__(self, field, form_grid, options): + Field.__init__(self, field, form_grid, options) self._widget = Gtk.Entry() self._widget.set_text(field.value) self._widget.connect('changed', self._changed) - self._update_required_css() def _changed(self, _widget): self._field.value = self._widget.get_text() - self._update_required_css() - - def _update_required_css(self): - if not self._field.required: - return - style = self._widget.get_style_context() - if self._field.value: - style.remove_class('entry-field-required') - else: - style.add_class('entry-field-required') + self._validate() class TextPrivateField(TextSingleField): - def __init__(self, field, options): - TextSingleField.__init__(self, field, options) + def __init__(self, field, form_grid, options): + TextSingleField.__init__(self, field, form_grid, options) self._widget.set_input_purpose(Gtk.InputPurpose.PASSWORD) self._widget.set_visibility(False) class JidSingleField(TextSingleField): - def __init__(self, field, options): - TextSingleField.__init__(self, field, options) + def __init__(self, field, form_grid, options): + TextSingleField.__init__(self, field, form_grid, options) class TextMultiField(Field): - def __init__(self, field, options): - Field.__init__(self, field, options) + def __init__(self, field, form_grid, options): + Field.__init__(self, field, form_grid, options) self._label.set_valign(Gtk.Align.START) self._widget = Gtk.ScrolledWindow() @@ -422,17 +456,7 @@ class TextMultiField(Field): self._textview.get_buffer().connect('changed', self._changed) self._widget.add(self._textview) - self._update_required_css() def _changed(self, widget): self._field.value = widget.get_text(*widget.get_bounds(), False) - self._update_required_css() - - def _update_required_css(self): - if not self._field.required: - return - style = self._widget.get_style_context() - if self._field.value: - style.remove_class('field-required') - else: - style.add_class('field-required') + self._validate() ===================================== gajim/gtk/service_registration.py ===================================== @@ -89,6 +89,8 @@ class ServiceRegistration(Gtk.Assistant): if is_form: dataform = dataforms.extend_form(node=form) self._data_form_widget = DataFormWidget(dataform) + self._data_form_widget.connect('is-valid', self._on_is_valid) + self._data_form_widget.validate() else: from gajim import config self._data_form_widget = config.FakeDataForm(form) @@ -98,6 +100,9 @@ class ServiceRegistration(Gtk.Assistant): self._data_form_widget.show_all() self.set_current_page(Page.FORM) + def _on_is_valid(self, _widget, is_valid): + self.set_page_complete(self.get_nth_page(Page.FORM), is_valid) + def _on_error(self, error_text): log.info('Show Error page') page = self.get_nth_page(Page.ERROR) ===================================== test/gtk/dataform.py ===================================== @@ -0,0 +1,83 @@ +from gi.repository import Gtk +import nbxmpp + +from gajim.gtk.dataform import DataFormWidget +from gajim.common.modules.dataforms import extend_form +from gajim.common.const import CSSPriority + +from test.gtk import util +util.load_style('gajim.css', CSSPriority.APPLICATION) + +FORM = ''' +<x xmlns='jabber:x:data' type='form'> + <title>Bot Configuration</title> + <instructions>Fill out this form to configure your new bot!</instructions> + <field type='hidden' + var='FORM_TYPE'> + <value>jabber:bot</value> + </field> + <field type='fixed'><value>Section 1: Bot Info</value></field> + <field type='text-single' + label='The name of your bot' + var='botname'> + <required/> + </field> + <field type='text-multi' + label='Helpful description of your bot' + var='description'> + <required/> + </field> + <field type='boolean' + label='Public bot?' + var='public'/> + <field type='text-private' + label='Password for special access' + var='password'> + <required/> + </field> + <field type='fixed'><value>Section 2: Features</value></field> + <field type='list-multi' + label='What features will the bot support?' + var='features'> + <option label='Contests'><value>contests</value></option> + <option label='News'><value>news</value></option> + <option label='Polls'><value>polls</value></option> + <option label='Reminders'><value>reminders</value></option> + <option label='Search'><value>search</value></option> + <value>news</value> + <value>search</value> + </field> + <field type='fixed'><value>Section 3: Subscriber List</value></field> + <field type='list-single' + label='Maximum number of subscribers' + var='maxsubs'> + <value>20</value> + <option label='10'><value>10</value></option> + <option label='20'><value>20</value></option> + <option label='30'><value>30</value></option> + <option label='50'><value>50</value></option> + <option label='100'><value>100</value></option> + <option label='None'><value>none</value></option> + </field> + <field type='fixed'><value>Section 4: Invitations</value></field> + <field type='jid-multi' + label='People to invite' + var='invitelist'> + <desc>Tell all your friends about your new bot!</desc> + <required/> + </field> +</x> +''' + +class DataFormWindow(Gtk.Window): + def __init__(self): + Gtk.Window.__init__(self, title="Data Form Test") + self.set_default_size(600, 600) + self._widget = DataFormWidget(extend_form(node=nbxmpp.Node(node=FORM))) + self.add(self._widget) + self.show() + +win = DataFormWindow() +win.connect("destroy", Gtk.main_quit) +win.show_all() +Gtk.main() ===================================== test/gtk/util.py ===================================== @@ -0,0 +1,23 @@ +from pathlib import Path + +from gi.repository import Gdk +from gi.repository import Gtk + + +def get_gajim_dir(): + gajim_path = Path(__file__) / '..' / '..' / '..' / 'gajim' + return gajim_path.resolve() + +def load_style(filename, priority): + path = get_gajim_dir() / 'data' / 'style' / filename + try: + with open(str(path), "r") as file: + css = file.read() + except Exception as exc: + print(exc) + return + provider = Gtk.CssProvider() + provider.load_from_data(bytes(css.encode('utf-8'))) + Gtk.StyleContext.add_provider_for_screen(Gdk.Screen.get_default(), + provider, + priority) View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/09f0835fbd02f4586181d1ea08310f176… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/09f0835fbd02f4586181d1ea08310f176… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Fix some PyGObject deprecation warnings
by Philipp Hörist 03 Nov '18

03 Nov '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 09f0835f by André Apitzsch at 2018-11-03T12:58:11Z Fix some PyGObject deprecation warnings like The "flags" argument for dialog construction is deprecated. Please use initializer keywords: modal=True and/or destroy_with_parent=True. or Using positional arguments with the GObject constructor has been deprecated. Please specify keyword(s) for "title, transient_for, flags" or use a class specific constructor. See: https://wiki.gnome.org/PyGObject/InitializerDeprecations - - - - - 5 changed files: - gajim/application.py - gajim/dialogs.py - gajim/gtk/dialogs.py - gajim/gtk/features.py - gajim/gtk/server_info.py Changes: ===================================== gajim/application.py ===================================== @@ -189,11 +189,12 @@ class GajimApplication(Gtk.Application): caps_cache.initialize(app.logger) except exceptions.DatabaseMalformed as error: dlg = Gtk.MessageDialog( - None, - Gtk.DialogFlags.DESTROY_WITH_PARENT | Gtk.DialogFlags.MODAL, - Gtk.MessageType.ERROR, - Gtk.ButtonsType.OK, - _('Database Error')) + transient_for=None, + destroy_with_parent=True, + modal=True, + message_type=Gtk.MessageType.ERROR, + buttons=Gtk.ButtonsType.OK, + text=_('Database Error')) dlg.format_secondary_text(str(error)) dlg.run() dlg.destroy() ===================================== gajim/dialogs.py ===================================== @@ -1511,8 +1511,9 @@ class TransformChatToMUC: class Dialog(Gtk.Dialog): def __init__(self, parent, title, buttons, default=None, on_response_ok=None, on_response_cancel=None): - Gtk.Dialog.__init__(self, title, parent, - Gtk.DialogFlags.DESTROY_WITH_PARENT) + super().__init__(title=title, + transient_for=parent, + destroy_with_parent=True) self.user_response_ok = on_response_ok self.user_response_cancel = on_response_cancel ===================================== gajim/gtk/dialogs.py ===================================== @@ -900,8 +900,9 @@ class SSLErrorDialog(ConfirmationDialogDoubleCheck): class ChangePasswordDialog(Gtk.Dialog): def __init__(self, account, success_cb, transient_for): - flags = Gtk.DialogFlags.DESTROY_WITH_PARENT - super().__init__(_('Change Password'), None, flags) + super().__init__(title=_('Change Password'), + transient_for=transient_for, + destroy_with_parent=True) self._account = account self._success_cb = success_cb @@ -913,8 +914,6 @@ class ChangePasswordDialog(Gtk.Dialog): self._password2_entry = self._builder.get_object('password2_entry') self._error_label = self._builder.get_object('error_label') - self.set_transient_for(transient_for) - self.add_button(_('_OK'), Gtk.ResponseType.OK) self.set_default_response(Gtk.ResponseType.OK) self.get_style_context().add_class('dialog-margin') ===================================== gajim/gtk/features.py ===================================== @@ -31,8 +31,9 @@ from gajim.common.i18n import _ class FeaturesDialog(Gtk.Dialog): def __init__(self): - flags = Gtk.DialogFlags.DESTROY_WITH_PARENT - super().__init__(_('Features'), None, flags) + super().__init__(title=_('Features'), + transient_for=None, + destroy_with_parent=True) self.set_transient_for(app.interface.roster.window) self.set_resizable(False) @@ -205,12 +206,14 @@ class FeatureItem(Gtk.Grid): if not feature.available: self.feature_dependency_u.set_halign(Gtk.Align.START) - self.feature_dependency_u.set_alignment(0.0, 0.0) + self.feature_dependency_u.set_xalign(0.0) + self.feature_dependency_u.set_yalign(0.0) self.feature_dependency_u.set_line_wrap(True) self.feature_dependency_u.set_max_width_chars(50) self.feature_dependency_u.set_selectable(True) self.feature_dependency_w.set_halign(Gtk.Align.START) - self.feature_dependency_w.set_alignment(0.0, 0.0) + self.feature_dependency_w.set_xalign(0.0) + self.feature_dependency_w.set_yalign(0.0) self.feature_dependency_w.set_line_wrap(True) self.feature_dependency_w.set_max_width_chars(50) self.feature_dependency_w.set_selectable(True) ===================================== gajim/gtk/server_info.py ===================================== @@ -29,8 +29,9 @@ log = logging.getLogger('gajim.gtk.serverinfo') class ServerInfoDialog(Gtk.Dialog): def __init__(self, account): - flags = Gtk.DialogFlags.DESTROY_WITH_PARENT - super().__init__(_('Server Info'), None, flags) + super().__init__(title=_('Server Info'), + transient_for=None, + destroy_with_parent=True) self.account = account self.set_transient_for(app.interface.roster.window) View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/09f0835fbd02f4586181d1ea08310f1765… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/09f0835fbd02f4586181d1ea08310f1765… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][gajim_1.1] Remove unused imports
by Philipp Hörist 03 Nov '18

03 Nov '18

Philipp Hörist pushed to branch gajim_1.1 at gajim / gajim Commits: 4011dbfb by Philipp Hörist at 2018-11-03T13:10:28Z Remove unused imports - - - - - 1 changed file: - gajim/gtkgui_helpers.py Changes: ===================================== gajim/gtkgui_helpers.py ===================================== @@ -30,8 +30,6 @@ import math import logging from io import BytesIO import xml.etree.ElementTree as ET -import xml.sax.saxutils -from xml.sax import ContentHandler # type: ignore from gi.repository import Gtk from gi.repository import Gdk View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/4011dbfb7d8e84a3f8ddcb313f98c90877… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/4011dbfb7d8e84a3f8ddcb313f98c90877… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][gajim_1.1] 11 commits: Fix error with some foreign keyboard layouts
by Philipp Hörist 03 Nov '18

03 Nov '18

Philipp Hörist pushed to branch gajim_1.1 at gajim / gajim Commits: 7121dfbb by Philipp Hörist at 2018-11-03T12:55:50Z Fix error with some foreign keyboard layouts - - - - - 12cd2852 by Philipp Hörist at 2018-11-03T12:56:42Z Remove print statement - - - - - 7e3d3f95 by Philipp Hörist at 2018-11-03T12:57:50Z Use json format for the servers list - - - - - d4986e22 by Philipp Hörist at 2018-11-03T12:58:14Z Remove dead servers from servers list All removed servers did not answer to a IBR request - - - - - f5315619 by André Apitzsch at 2018-11-03T12:58:51Z Setup: move configuration to setup.cfg to improve readability - - - - - b9a6cb4c by Philipp Hörist at 2018-11-03T13:00:28Z Windows: Update dev_env.sh - - - - - 9069b844 by Philipp Hörist at 2018-11-03T13:00:28Z Windows: Fix dev_env.sh - - - - - ac18bd83 by Philipp Hörist at 2018-11-03T13:00:28Z Remove all non-ascii chars from setup.cfg https://github.com/pypa/setuptools/issues/1062 - - - - - 260b6935 by Philipp Hörist at 2018-11-03T13:00:28Z Update win/README.md - - - - - a269f706 by Philipp Hörist at 2018-11-03T13:00:58Z Remove unused shortcut - - - - - 29ad06af by André Apitzsch at 2018-11-03T13:01:09Z Move flake8 config to setup.cfg - - - - - 13 changed files: - − .flake8 - gajim/chat_control_base.py - gajim/common/helpers.py - gajim/data/gui/shortcuts_window.ui - + gajim/data/other/servers.json - − gajim/data/other/servers.xml - gajim/gtk/account_wizard.py - gajim/gtk/dialogs.py - gajim/gtkgui_helpers.py - + setup.cfg - setup.py - win/README.md - win/dev_env.sh Changes: ===================================== .flake8 deleted ===================================== @@ -1,5 +0,0 @@ -[flake8] -ignore = -exclude = .git,__pycache__,.gitlab -max-complexity = 15 -builtins=_ \ No newline at end of file ===================================== gajim/chat_control_base.py ===================================== @@ -82,6 +82,11 @@ class ChatControlBase(MessageControl, ChatCommandProcessor, CommandTools): keycode_c = keymap.get_entries_for_keyval(Gdk.KEY_c)[1][0].keycode except TypeError: keycode_c = 54 + except IndexError: + # FIXME + # On some keyboard layouts there is no keyval for KEY_c + keycode_c = None + try: keycode_ins = keymap.get_entries_for_keyval(Gdk.KEY_Insert)[1][0].keycode except TypeError: ===================================== gajim/common/helpers.py ===================================== @@ -39,6 +39,7 @@ import shlex import socket import time import logging +import json from datetime import datetime, timedelta from distutils.version import LooseVersion as V from encodings.punycode import punycode_encode @@ -1492,3 +1493,15 @@ def get_sync_threshold(jid, archive_info): app.logger.set_archive_infos(jid, sync_threshold=threshold) return threshold return archive_info.sync_threshold + +def load_json(path, key=None, default=None): + try: + with open(path, 'r') as file: + json_dict = json.loads(file.read()) + except Exception: + log.exception('Parsing error') + return default + + if key is None: + return json_dict + return json_dict.get(key, default) ===================================== gajim/data/gui/shortcuts_window.ui ===================================== @@ -75,19 +75,6 @@ </child> </object> </child> - <child> - <object class="GtkShortcutsGroup"> - <property name="visible">1</property> - <property name="title" translatable="yes">Appearance</property> - <child> - <object class="GtkShortcutsShortcut"> - <property name="visible">1</property> - <property name="accelerator"><alt>c</property> - <property name="title" translatable="yes">Toggle full / compact view</property> - </object> - </child> - </object> - </child> <child> <object class="GtkShortcutsGroup"> <property name="visible">1</property> ===================================== gajim/data/other/servers.json ===================================== @@ -0,0 +1,42 @@ +{ + "servers":[ + "0nl1ne.at", + "404.city", + "brauchen.info", + "chatme.im", + "comm.unicate.me", + "creep.im", + "deshalbfrei.org", + "draugr.de", + "im.apinc.org", + "jabber-hosting.de", + "jabber.at", + "jabber.ccc.de", + "jabber.cz", + "jabber.hot-chilli.net", + "jabber.meta.net.nz", + "jabber.no", + "jabber.sk", + "jabber.rueckgr.at", + "jabberes.org", + "jabbim.com", + "jabbim.cz", + "jabbim.pl", + "jabbim.sk", + "jabster.pl", + "lightwitch.org", + "linuxlovers.at", + "njs.netlab.cz", + "pandion.im", + "richim.org", + "suchat.org", + "tigase.im", + "ubuntu-jabber.de", + "ubuntu-jabber.net", + "verdammung.org", + "xabber.de", + "xmpp-hosting.de", + "xmpp.jp", + "zsim.de" + ] +} ===================================== gajim/data/other/servers.xml deleted ===================================== @@ -1,83 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> - -<query xmlns:reg="urn:xmpp:vcard:registration:1"> - <item jid="0nl1ne.at" /> - <item jid="404.city" /> - <item jid="brauchen.info" /> - <item jid="chatme.im" /> - <item jid="climm.org" /> - <item jid="comm.unicate.me" /> - <item jid="creep.im" /> - <item jid="deshalbfrei.org" /> - <item jid="draugr.de" /> - <item jid="einfachjabber.de" /> - <item jid="forumanalogue.fr" /> - <item jid="im.apinc.org" /> - <item jid="im.flosoft.biz" /> - <item jid="jabber-hosting.de" /> - <item jid="jabber.at" /> - <item jid="jabber.ccc.de" /> - <item jid="jabber.chaotic.de" /> - <item jid="jabber.co.nz" /> - <item jid="jabber.cz" /> - <item jid="jabber.earth.li" /> - <item jid="jabber.fourecks.de" /> - <item jid="jabber.hot-chilli.net" /> - <item jid="jabber.i-pobox.net" /> - <item jid="jabber.me" /> - <item jid="jabber.meta.net.nz" /> - <item jid="jabber.no" /> - <item jid="jabber.sk" /> - <item jid="jabber.org" /> - <item jid="jabber.rueckgr.at" /> - <item jid="jabber.scha.de" /> - <item jid="jabber.second-home.de" /> - <item jid="jabber.smash-net.org" /> - <item jid="jabber.sow.as" /> - <item jid="jabber.theforest.us" /> - <item jid="jabberafrica.org" /> - <item jid="jabberes.org" /> - <item jid="jabberpl.org" /> - <item jid="jabbim.com" /> - <item jid="jabbim.cz" /> - <item jid="jabbim.hu" /> - <item jid="jabbim.pl" /> - <item jid="jabbim.sk" /> - <item jid="jabster.pl" /> - <item jid="jaim.at" /> - <item jid="lightwitch.org" /> - <item jid="linuxlovers.at" /> - <item jid="lsd-25.ru" /> - <item jid="njs.netlab.cz" /> - <item jid="palita.net" /> - <item jid="pandion.im" /> - <item jid="richim.org" /> - <item jid="sss.chaoslab.ru" /> - <item jid="sternenschweif.de" /> - <item jid="suchat.org" /> - <item jid="swissjabber.ch" /> - <item jid="swissjabber.de" /> - <item jid="swissjabber.eu" /> - <item jid="swissjabber.li" /> - <item jid="swissjabber.org" /> - <item jid="tcweb.org" /> - <item jid="tekst.me" /> - <item jid="tigase.im" /> - <item jid="ubuntu-jabber.de" /> - <item jid="ubuntu-jabber.net" /> - <item jid="univers-libre.net" /> - <item jid="uprod.biz" /> - <item jid="verdammung.org" /> - <item jid="wtfismyip.com" /> - <item jid="xabber.de" /> - <item jid="xmpp-hosting.de" /> - <item jid="xmpp.jp" /> - <item jid="xmppnet.de" /> - <item jid="zsim.de" /> -</query> ===================================== gajim/gtk/account_wizard.py ===================================== @@ -55,10 +55,11 @@ class AccountCreationWizard: self.update_proxy_list() - # parse servers.xml - servers_xml = os.path.join( - configpaths.get('DATA'), 'other', 'servers.xml') - servers = gtkgui_helpers.parse_server_xml(servers_xml) + # parse servers.json + server_file_path = os.path.join( + configpaths.get('DATA'), 'other', 'servers.json') + servers = helpers.load_json(server_file_path, 'servers', []) + servers_model = self.xml.get_object('server_liststore') for server in servers: servers_model.append((server,)) ===================================== gajim/gtk/dialogs.py ===================================== @@ -1022,7 +1022,6 @@ class NewConfirmationDialog(Gtk.MessageDialog): class ShortcutsWindow: def __init__(self): transient = app.app.get_active_window() - print(transient) builder = get_builder('shortcuts_window.ui') self.window = builder.get_object('shortcuts_window') self.window.connect('destroy', self._on_window_destroy) ===================================== gajim/gtkgui_helpers.py ===================================== @@ -236,32 +236,6 @@ def scroll_to_end(widget): adj_h.set_value(0) return False - -class ServersXMLHandler(ContentHandler): - def __init__(self): - ContentHandler.__init__(self) - self.servers = [] - - def startElement(self, name, attributes): - if name == 'item': - if 'jid' in attributes.getNames(): - self.servers.append(attributes.getValue('jid')) - - def endElement(self, name): - pass - -def parse_server_xml(path_to_file): - try: - handler = ServersXMLHandler() - xml.sax.parse(path_to_file, handler) - return handler.servers - # handle exception if unable to open file - except IOError as message: - print(_('Error reading file:') + str(message), file=sys.stderr) - # handle exception parsing file - except xml.sax.SAXParseException as message: - print(_('Error parsing file:') + str(message), file=sys.stderr) - def set_unset_urgency_hint(window, unread_messages_no): """ Sets/unset urgency hint in window argument depending if we have unread ===================================== setup.cfg ===================================== @@ -0,0 +1,49 @@ +[flake8] +ignore = +exclude = .git,__pycache__,.gitlab +max-complexity = 15 +builtins=_ + +[metadata] +name = gajim +version = attr: gajim.__version__ +description = A GTK+ Jabber client +author = Philipp Hoerist, Yann Leboulanger +author_email = gajim-devel(a)gajim.org +url = https://gajim.org +license = GPL v3 +classifiers = + Programming Language :: Python :: 3 + +[options] +python_requires = >=3.5 +packages = find: +install_requires = + cssutils>=1.0.2 + keyring + nbxmpp>=0.6.8,<0.7.0 + precis-i18n>=1.0.0 + pyOpenSSL>=0.12 + +[options.package_data] +gajim = + data/activities/*/*/*.png + data/emoticons/*/*.png + data/emoticons/*/LICENSE + data/gui/*.ui + data/icons/hicolor/*/*/*.png + data/icons/hicolor/*/*/*.svg + data/iconsets/*/*/*.gif + data/iconsets/*/*/*.png + data/iconsets/transports/*/*/*.png + data/moods/*/*.png + data/other/* + data/sounds/*.wav + data/style/*.css + data/plugins/*/* + +[options.packages.find] +exclude = + gajim.dev + test* + ===================================== setup.py ===================================== @@ -15,8 +15,6 @@ from distutils.util import convert_path, newer import subprocess -import gajim - pos = [x for x in os.listdir('po') if x[-3:] == ".po"] ALL_LINGUAS = sorted([os.path.split(x)[-1][:-3] for x in pos]) MAN_FILES = ['gajim.1', 'gajim-history-manager.1', 'gajim-remote.1'] @@ -213,32 +211,6 @@ class update_po(Command): update_trans() -package_data_activities = ['data/activities/*/*/*.png'] -package_data_emoticons = ['data/emoticons/*/*.png', - 'data/emoticons/*/LICENSE'] -package_data_gui = ['data/gui/*.ui'] -package_data_icons = ['data/icons/hicolor/*/*/*.png', - 'data/icons/hicolor/*/*/*.svg'] -package_data_iconsets = ['data/iconsets/*/*/*.gif', - 'data/iconsets/*/*/*.png', - 'data/iconsets/transports/*/*/*.png'] -package_data_moods = ['data/moods/*/*.png'] -package_data_other = ['data/other/*'] -package_data_sounds = ['data/sounds/*.wav'] -package_data_style = ['data/style/*.css'] -package_plugins_data = ['data/plugins/*/*'] -package_data = (package_data_activities - + package_data_emoticons - + package_data_gui - + package_data_icons - + package_data_iconsets - + package_data_moods - + package_data_other - + package_data_sounds - + package_data_style - + package_plugins_data) - - # only install subdirectories of data data_files_app_icon = [ ("share/icons/hicolor/64x64/apps", @@ -254,16 +226,6 @@ data_files_app_icon = [ data_files = data_files_app_icon setup( - name="gajim", - description='A GTK+ Jabber client', - version=gajim.__version__, - author="Philipp Hörist, Yann Leboulanger", - author_email="gajim-devel(a)gajim.org", - url='https://gajim.org', - license='GPL v3', - classifiers=[ - 'Programming Language :: Python :: 3', - ], cmdclass={ 'build_py': build, 'install': install, @@ -280,14 +242,5 @@ setup( 'gajim-history-manager = gajim.history_manager:main', ] }, - packages=find_packages(exclude=["gajim.dev", "test*"]), - package_data={'gajim': package_data}, - data_files=data_files, - install_requires=[ - 'keyring', - 'nbxmpp>=0.6.8,<0.7.0', - 'pyOpenSSL>=0.12', - 'cssutils>=1.0.2', - 'precis-i18n>=1.0.0', - ] + data_files=data_files ) ===================================== win/README.md ===================================== @@ -10,7 +10,7 @@ and development on Windows. Download [msys2](http://www.msys2.org/) (msys2-x86_64-xxx.exe) and follow the install instructions on the [msys2](http://www.msys2.org/) startpage (**Important!**) * Fork the master branch on dev.gajim.org -* Execute ``C:\msys64\mingw32.exe`` +* Execute ``C:\msys64\msys2_shell.cmd -mingw64`` * Run ``pacman -S git`` to install git * Run ``git clone https://dev.gajim.org/USERNAME/gajim.git`` * Run ``cd gajim/win`` to end up where this README exists. ===================================== win/dev_env.sh ===================================== @@ -9,18 +9,25 @@ function main { mingw-w64-x86_64-python3-gobject \ mingw-w64-x86_64-python3-pip \ mingw-w64-x86_64-toolchain \ + mingw-w64-x86_64-adwaita-icon-theme \ mingw-w64-x86_64-gtk3 \ + mingw-w64-x86_64-python3-setuptools-scm \ + mingw-w64-x86_64-python3-cryptography \ + mingw-w64-x86_64-python3-certifi \ mingw-w64-x86_64-python3-pyopenssl \ - mingw-w64-x86_64-python3-pillow + mingw-w64-x86_64-python3-pillow \ + mingw-w64-x86_64-python3-six PIP_REQUIREMENTS="\ -certifi git+https://dev.gajim.org/gajim/python-nbxmpp.git git+https://dev.gajim.org/lovetox/pybonjour-python3.git +git+https://github.com/enthought/pywin32-ctypes.git python-axolotl python-gnupg keyring cssutils +qrcode +precis-i18n " pip3 install $(echo "$PIP_REQUIREMENTS" | tr ["\\n"] [" "]) View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/d86f7806dc902f2568bca1194c9c71b17… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/d86f7806dc902f2568bca1194c9c71b17… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] gui_menu_builder: remove unused variable
by Philipp Hörist 03 Nov '18

03 Nov '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 4e0295fc by André Apitzsch at 2018-11-03T12:47:03Z gui_menu_builder: remove unused variable - - - - - 1 changed file: - gajim/gui_menu_builder.py Changes: ===================================== gajim/gui_menu_builder.py ===================================== @@ -36,9 +36,6 @@ def build_resources_submenu(contacts, account, action, room_jid=None, roster = app.interface.roster sub_menu = Gtk.Menu() - iconset = app.config.get('iconset') - if not iconset: - iconset = app.config.DEFAULT_ICONSET for c in contacts: item = Gtk.MenuItem.new_with_label( '%s (%s)' % (c.resource, str(c.priority))) View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/4e0295fcd97864a69b372fc6d8dd01324f… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/4e0295fcd97864a69b372fc6d8dd01324f… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: DataFormWidget: Color required fields red
by Philipp Hörist 03 Nov '18

03 Nov '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 5d5d6864 by Philipp Hörist at 2018-11-03T12:44:36Z DataFormWidget: Color required fields red - - - - - 6e416992 by Philipp Hörist at 2018-11-03T12:44:50Z GroupchatConfig: Tidy up some rough edges - - - - - 4 changed files: - gajim/data/gui/groupchat_config.ui - gajim/data/style/gajim.css - gajim/gtk/dataform.py - gajim/gtk/groupchat_config.py Changes: ===================================== gajim/data/gui/groupchat_config.ui ===================================== @@ -323,6 +323,7 @@ <property name="sort_column_id">1</property> <child> <object class="GtkCellRendererText"> + <property name="placeholder_text">Name</property> <signal name="edited" handler="_on_nick_edited" swapped="no"/> </object> <attributes> @@ -442,7 +443,7 @@ <property name="sort_column_id">1</property> <child> <object class="GtkCellRendererText"> - <property name="placeholder_text">spam</property> + <property name="placeholder_text">Spam</property> <signal name="edited" handler="_on_reason_edited" swapped="no"/> </object> <attributes> ===================================== gajim/data/style/gajim.css ===================================== @@ -153,6 +153,7 @@ list.settings > row > box { background-color:@theme_base_color; border-bottom: 1px solid; border-color: @borders;} +#GroupchatConfig treeview { padding: 5px; } /* Popover Treeview */ .popover_treeview { border-radius: 3px; background-color: @theme_bg_color; } @@ -247,5 +248,9 @@ button.flat.link { padding: 0; border: 0; } .field-fixed { font-size: 16px; font-weight: bold; padding-top:5px;} .data-form-title { font-size: 16px; font-weight: bold; } .data-form-widget grid { margin: 18px; } -.data-form-widget scrolledwindow { border: 1px solid; border-color:@unfocused_borders; } .data-form-widget treeview { padding: 5px; } +.field-required { border: 1px solid; border-color: red; } +.field-normal { border: 1px solid; border-color:@unfocused_borders; } + +.entry-field-required { border: 1px solid; border-color: red; } +.entry-field-required:focus { box-shadow: inset 0 0 0 1px red; border-color: red; } \ No newline at end of file ===================================== gajim/gtk/dataform.py ===================================== @@ -214,6 +214,7 @@ class ListMultiField(Field): self._widget.set_min_content_height(100) self._widget.set_max_content_height(300) self._widget.add(self._treeview) + self._widget.get_style_context().add_class('field-normal') class ListMutliTreeView(Gtk.TreeView): @@ -299,6 +300,8 @@ class JidMultiField(Field): self._widget.pack_start(self._scrolled_window, True, True, 0) self._widget.pack_end(self._button_box, False, False, 0) + self._treeview.update_required_css() + def _add_clicked(self, _widget): self._treeview.get_model().append(['']) @@ -314,6 +317,7 @@ class JidMultiField(Field): continue jids.append(row[0]) self._field.values = jids + self._treeview.update_required_css() class JidMutliTreeView(Gtk.TreeView): @@ -344,6 +348,7 @@ class JidMutliTreeView(Gtk.TreeView): iter_ = self._store.get_iter(path) self._store.set_value(iter_, 0, new_text) self._set_values() + self.update_required_css() def _set_values(self): jids = [] @@ -353,6 +358,19 @@ class JidMutliTreeView(Gtk.TreeView): jids.append(row[0]) self._field.values = jids + def update_required_css(self): + style = self.get_parent().get_style_context() + if not self._field.required: + style.add_class('field-normal') + return + + if self._field.values: + style.remove_class('field-required') + style.add_class('field-normal') + else: + style.remove_class('field-normal') + style.add_class('field-required') + class TextSingleField(Field): def __init__(self, field, options): @@ -361,9 +379,20 @@ class TextSingleField(Field): self._widget = Gtk.Entry() self._widget.set_text(field.value) self._widget.connect('changed', self._changed) + self._update_required_css() def _changed(self, _widget): self._field.value = self._widget.get_text() + self._update_required_css() + + def _update_required_css(self): + if not self._field.required: + return + style = self._widget.get_style_context() + if self._field.value: + style.remove_class('entry-field-required') + else: + style.add_class('entry-field-required') class TextPrivateField(TextSingleField): @@ -387,12 +416,23 @@ class TextMultiField(Field): self._widget.set_propagate_natural_height(True) self._widget.set_min_content_height(100) self._widget.set_max_content_height(300) - self._textview = Gtk.TextView() + self._textview = Gtk.TextView() self._textview.get_buffer().set_text(field.value) self._textview.get_buffer().connect('changed', self._changed) self._widget.add(self._textview) + self._update_required_css() def _changed(self, widget): self._field.value = widget.get_text(*widget.get_bounds(), False) + self._update_required_css() + + def _update_required_css(self): + if not self._field.required: + return + style = self._widget.get_style_context() + if self._field.value: + style.remove_class('field-required') + else: + style.add_class('field-required') ===================================== gajim/gtk/groupchat_config.py ===================================== @@ -75,6 +75,7 @@ class GroupchatConfig(Gtk.ApplicationWindow): self._ui.stack.set_visible_child_name('affiliation') self._ui.connect_signals(self) + self.connect('delete-event', self._cancel) self.show_all() self._ui.stack.notify('visible-child-name') @@ -94,19 +95,19 @@ class GroupchatConfig(Gtk.ApplicationWindow): affiliation = 'member' treeview = self._get_current_treeview() - treeview.get_model().append([None, - None, - None, - affiliation, - text, - affiliation_edit, - jid_edit]) + iter_ = treeview.get_model().append([None, + None, + None, + affiliation, + text, + affiliation_edit, + jid_edit]) # Scroll to added row - row = treeview.get_model()[-1] - treeview.scroll_to_cell(row.path, None, False, 0, 0) + path = treeview.get_model().get_path(iter_) + treeview.scroll_to_cell(path, None, False, 0, 0) treeview.get_selection().unselect_all() - treeview.get_selection().select_path(row.path) + treeview.get_selection().select_path(path) def _on_remove(self, *args): treeview = self._get_current_treeview() @@ -286,10 +287,13 @@ class GroupchatConfig(Gtk.ApplicationWindow): return add, remove, modified def _on_cancel(self, *args): + self._cancel() + self.destroy() + + def _cancel(self, *args): if self._form and self._own_affiliation == 'owner': con = app.connections[self.account] con.get_module('MUC').cancel_config(self.jid) - self.destroy() def _set_affiliations(self): add, remove, modified = self._get_diff() View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/21656ebfe8e48ad74b29c5601fb48f880… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/21656ebfe8e48ad74b29c5601fb48f880… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Move flake8 config to setup.cfg
by Philipp Hörist 03 Nov '18

03 Nov '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 21656ebf by André Apitzsch at 2018-11-03T11:02:45Z Move flake8 config to setup.cfg - - - - - 2 changed files: - − .flake8 - setup.cfg Changes: ===================================== .flake8 deleted ===================================== @@ -1,5 +0,0 @@ -[flake8] -ignore = -exclude = .git,__pycache__,.gitlab -max-complexity = 15 -builtins=_ \ No newline at end of file ===================================== setup.cfg ===================================== @@ -1,3 +1,9 @@ +[flake8] +ignore = +exclude = .git,__pycache__,.gitlab +max-complexity = 15 +builtins=_ + [metadata] name = gajim version = attr: gajim.__version__ View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/21656ebfe8e48ad74b29c5601fb48f880b… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/21656ebfe8e48ad74b29c5601fb48f880b… 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