Commits

commits@gajim.org

17632 discussions

[Git][gajim/gajim][master] Update History Manager GUI
by Philipp Hörist 07 Nov '18

07 Nov '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: bd7e3218 by Daniel Brötzmann at 2018-11-07T21:52:23Z Update History Manager GUI - - - - - 2 changed files: - gajim/data/gui/history_manager.ui - gajim/history_manager.py Changes: ===================================== gajim/data/gui/history_manager.ui ===================================== @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?>  <interface> - <requires lib="gtk+" version="3.12"/> + <requires lib="gtk+" version="3.20"/> <object class="GtkMenu" id="context_menu"> <property name="can_focus">False</property> <child> @@ -22,34 +22,33 @@ </object> </child> </object> - <object class="GtkImage" id="image1"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="stock">gtk-find</property> - </object> <object class="GtkWindow" id="history_manager_window"> + <property name="width_request">1000</property> + <property name="height_request">500</property> <property name="can_focus">False</property> - <property name="border_width">6</property> + <property name="title" translatable="yes">Gajim History Logs Manager</property> <property name="window_position">center</property> - <property name="default_width">650</property> + <property name="default_width">1000</property> <property name="default_height">500</property> <signal name="delete-event" handler="on_history_manager_window_delete_event" swapped="no"/> <child> <placeholder/> </child> <child> - <object class="GtkBox" id="vbox"> + <object class="GtkBox"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="border_width">18</property> <property name="orientation">vertical</property> - <property name="spacing">6</property> + <property name="spacing">12</property> <child> - <object class="GtkPaned" id="hpaned"> + <object class="GtkPaned"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="position">200</property> + <property name="position">250</property> <child> <object class="GtkScrolledWindow" id="jids_scrolledwindow"> + <property name="width_request">250</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="shadow_type">in</property> @@ -72,13 +71,13 @@ </packing> </child> <child> - <object class="GtkBox" id="vbox1"> + <object class="GtkBox"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="orientation">vertical</property> + <property name="spacing">6</property> <child> - <object class="GtkBox" id="welcome_vbox"> - <property name="width_request">300</property> + <object class="GtkBox" id="welcome_box"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="margin_left">20</property> @@ -89,9 +88,12 @@ <object class="GtkLabel"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="halign">center</property> - <property name="label" translatable="yes"><big><b>Welcome to Gajim History Logs Manager</b></big></property> + <property name="label" translatable="yes">Gajim History Logs Manager</property> <property name="use_markup">True</property> + <property name="xalign">0.5</property> + <style> + <class name="large-header"/> + </style> </object> <packing> <property name="expand">False</property> @@ -103,11 +105,11 @@ <object class="GtkLabel"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="halign">start</property> <property name="label" translatable="yes">This log manager is not intended for log viewing. If you are looking for such functionality, use the history window instead. Use this program to delete or export logs. You can select logs from the left and/or search database from below.</property> <property name="wrap">True</property> + <property name="xalign">0</property> </object> <packing> <property name="expand">False</property> @@ -119,11 +121,11 @@ Use this program to delete or export logs. You can select logs from the left and <object class="GtkLabel"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="halign">start</property> <property name="label" translatable="yes"><b>WARNING:</b> If you plan to do massive deletions, please make sure Gajim is not running. Generally avoid deletions with contacts you currently chat with.</property> <property name="use_markup">True</property> <property name="wrap">True</property> + <property name="xalign">0</property> </object> <packing> <property name="expand">False</property> @@ -142,6 +144,7 @@ If you plan to do massive deletions, please make sure Gajim is not running. Gene <object class="GtkScrolledWindow" id="logs_scrolledwindow"> <property name="can_focus">True</property> <property name="no_show_all">True</property> + <property name="margin_left">6</property> <property name="shadow_type">in</property> <child> <object class="GtkTreeView" id="logs_listview"> @@ -167,6 +170,7 @@ If you plan to do massive deletions, please make sure Gajim is not running. Gene <object class="GtkScrolledWindow" id="search_results_scrolledwindow"> <property name="can_focus">True</property> <property name="no_show_all">True</property> + <property name="margin_left">6</property> <property name="shadow_type">in</property> <child> <object class="GtkTreeView" id="search_results_listview"> @@ -201,15 +205,16 @@ If you plan to do massive deletions, please make sure Gajim is not running. Gene </packing> </child> <child> - <object class="GtkBox" id="hbox"> + <object class="GtkBox"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="spacing">6</property> + <property name="spacing">12</property> <child> <object class="GtkEntry" id="search_entry"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="activates_default">True</property> + <property name="placeholder_text" translatable="yes">Search database...</property> </object> <packing> <property name="expand">True</property> @@ -219,20 +224,26 @@ If you plan to do massive deletions, please make sure Gajim is not running. Gene </child> <child> <object class="GtkButton" id="search_db_button"> - <property name="label" translatable="yes">_Search Database</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="can_default">True</property> <property name="has_default">True</property> <property name="receives_default">False</property> - <property name="image">image1</property> + <property name="tooltip_text" translatable="yes">Search in database</property> <property name="use_underline">True</property> <property name="image_position">bottom</property> <signal name="clicked" handler="on_search_db_button_clicked" swapped="no"/> + <child> + <object class="GtkImage"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="icon_name">edit-find-symbolic</property> + </object> + </child> </object> <packing> <property name="expand">False</property> - <property name="fill">False</property> + <property name="fill">True</property> <property name="position">1</property> </packing> </child> ===================================== gajim/history_manager.py ===================================== @@ -41,6 +41,7 @@ from gi.repository import Gtk from gi.repository import Gdk from gi.repository import GLib from gi.repository import Gio +from gi.repository import Pango from gajim.common import app from gajim.common import i18n @@ -109,18 +110,9 @@ class HistoryManager: '%s does not exist.' % log_db_path) sys.exit() - xml = get_builder('history_manager.ui') - self.window = xml.get_object('history_manager_window') - Gtk.Window.set_default_icon_list(get_app_icon_list(self.window)) - - self.jids_listview = xml.get_object('jids_listview') - self.logs_listview = xml.get_object('logs_listview') - self.search_results_listview = xml.get_object('search_results_listview') - self.search_entry = xml.get_object('search_entry') - self.logs_scrolledwindow = xml.get_object('logs_scrolledwindow') - self.search_results_scrolledwindow = xml.get_object( - 'search_results_scrolledwindow') - self.welcome_vbox = xml.get_object('welcome_vbox') + self._ui = get_builder('history_manager.ui') + Gtk.Window.set_default_icon_list(get_app_icon_list( + self._ui.history_manager_window)) self.jids_already_in = [] # holds jids that we already have in DB self.AT_LEAST_ONE_DELETION_DONE = False @@ -136,36 +128,36 @@ class HistoryManager: self._fill_jids_listview() - self.search_entry.grab_focus() + self._ui.search_entry.grab_focus() - self.window.show_all() + self._ui.history_manager_window.show_all() - xml.connect_signals(self) + self._ui.connect_signals(self) def _init_jids_listview(self): self.jids_liststore = Gtk.ListStore(str, str) # jid, jid_id - self.jids_listview.set_model(self.jids_liststore) - self.jids_listview.get_selection().set_mode(Gtk.SelectionMode.MULTIPLE) + self._ui.jids_listview.set_model(self.jids_liststore) + self._ui.jids_listview.get_selection().set_mode(Gtk.SelectionMode.MULTIPLE) renderer_text = Gtk.CellRendererText() # holds jid col = Gtk.TreeViewColumn(_('JID'), renderer_text, text=0) - self.jids_listview.append_column(col) + self._ui.jids_listview.append_column(col) - self.jids_listview.get_selection().connect('changed', + self._ui.jids_listview.get_selection().connect('changed', self.on_jids_listview_selection_changed) def _init_logs_listview(self): # log_line_id(HIDDEN), jid_id(HIDDEN), time, message, subject, nickname self.logs_liststore = Gtk.ListStore(str, str, str, str, str, str) - self.logs_listview.set_model(self.logs_liststore) - self.logs_listview.get_selection().set_mode(Gtk.SelectionMode.MULTIPLE) + self._ui.logs_listview.set_model(self.logs_liststore) + self._ui.logs_listview.get_selection().set_mode(Gtk.SelectionMode.MULTIPLE) renderer_text = Gtk.CellRendererText() # holds time col = Gtk.TreeViewColumn(_('Date'), renderer_text, text=Column.UNIXTIME) # user can click this header and sort col.set_sort_column_id(Column.UNIXTIME) col.set_resizable(True) - self.logs_listview.append_column(col) + self._ui.logs_listview.append_column(col) renderer_text = Gtk.CellRendererText() # holds nickname col = Gtk.TreeViewColumn(_('Nickname'), renderer_text, text=Column.NICKNAME) @@ -174,61 +166,69 @@ class HistoryManager: col.set_resizable(True) col.set_visible(False) self.nickname_col_for_logs = col - self.logs_listview.append_column(col) + self._ui.logs_listview.append_column(col) renderer_text = Gtk.CellRendererText() # holds message + renderer_text.set_property('width_chars', 60) + renderer_text.set_property('ellipsize', Pango.EllipsizeMode.END) col = Gtk.TreeViewColumn(_('Message'), renderer_text, markup=Column.MESSAGE) # user can click this header and sort col.set_sort_column_id(Column.MESSAGE) col.set_resizable(True) self.message_col_for_logs = col - self.logs_listview.append_column(col) + self._ui.logs_listview.append_column(col) renderer_text = Gtk.CellRendererText() # holds subject col = Gtk.TreeViewColumn(_('Subject'), renderer_text, text=Column.SUBJECT) - col.set_sort_column_id(Column.SUBJECT) # user can click this header and sort + # user can click this header and sort + col.set_sort_column_id(Column.SUBJECT) col.set_resizable(True) col.set_visible(False) self.subject_col_for_logs = col - self.logs_listview.append_column(col) + self._ui.logs_listview.append_column(col) def _init_search_results_listview(self): # log_line_id (HIDDEN), jid, time, message, subject, nickname self.search_results_liststore = Gtk.ListStore(int, str, str, str, str, str) - self.search_results_listview.set_model(self.search_results_liststore) + self._ui.search_results_listview.set_model(self.search_results_liststore) renderer_text = Gtk.CellRendererText() # holds JID (who said this) col = Gtk.TreeViewColumn(_('JID'), renderer_text, text=1) - col.set_sort_column_id(1) # user can click this header and sort + # user can click this header and sort + col.set_sort_column_id(1) col.set_resizable(True) - self.search_results_listview.append_column(col) + self._ui.search_results_listview.append_column(col) renderer_text = Gtk.CellRendererText() # holds time col = Gtk.TreeViewColumn(_('Date'), renderer_text, text=Column.UNIXTIME) # user can click this header and sort col.set_sort_column_id(Column.UNIXTIME) col.set_resizable(True) - self.search_results_listview.append_column(col) + self._ui.search_results_listview.append_column(col) renderer_text = Gtk.CellRendererText() # holds message + renderer_text.set_property('width_chars', 60) + renderer_text.set_property('ellipsize', Pango.EllipsizeMode.END) col = Gtk.TreeViewColumn(_('Message'), renderer_text, text=Column.MESSAGE) - col.set_sort_column_id(Column.MESSAGE) # user can click this header and sort + # user can click this header and sort + col.set_sort_column_id(Column.MESSAGE) col.set_resizable(True) - self.search_results_listview.append_column(col) + self._ui.search_results_listview.append_column(col) renderer_text = Gtk.CellRendererText() # holds subject col = Gtk.TreeViewColumn(_('Subject'), renderer_text, text=Column.SUBJECT) - col.set_sort_column_id(Column.SUBJECT) # user can click this header and sort + # user can click this header and sort + col.set_sort_column_id(Column.SUBJECT) col.set_resizable(True) - self.search_results_listview.append_column(col) + self._ui.search_results_listview.append_column(col) renderer_text = Gtk.CellRendererText() # holds nickname col = Gtk.TreeViewColumn(_('Nickname'), renderer_text, text=Column.NICKNAME) # user can click this header and sort col.set_sort_column_id(Column.NICKNAME) col.set_resizable(True) - self.search_results_listview.append_column(col) + self._ui.search_results_listview.append_column(col) def on_history_manager_window_delete_event(self, widget, event): if not self.AT_LEAST_ONE_DELETION_DONE: @@ -269,16 +269,16 @@ class HistoryManager: self.jids_liststore.append([row[0], str(row[1])]) # jid, jid_id def on_jids_listview_selection_changed(self, widget, data=None): - liststore, list_of_paths = self.jids_listview.get_selection()\ + liststore, list_of_paths = self._ui.jids_listview.get_selection()\ .get_selected_rows() self.logs_liststore.clear() if not list_of_paths: return - self.welcome_vbox.hide() - self.search_results_scrolledwindow.hide() - self.logs_scrolledwindow.show() + self._ui.welcome_box.hide() + self._ui.search_results_scrolledwindow.hide() + self._ui.logs_scrolledwindow.show() list_of_rowrefs = [] for path in list_of_paths: # make them treerowrefs (it's needed) @@ -440,31 +440,31 @@ class HistoryManager: message, subject, nickname)) def on_logs_listview_key_press_event(self, widget, event): - liststore, list_of_paths = self.logs_listview.get_selection()\ + liststore, list_of_paths = self._ui.logs_listview.get_selection()\ .get_selected_rows() if event.keyval == Gdk.KEY_Delete: self._delete_logs(liststore, list_of_paths) def on_listview_button_press_event(self, widget, event): if event.button == 3: # right click - xml = get_builder('history_manager.ui', ['context_menu']) + _ui = get_builder('history_manager.ui', ['context_menu']) if Gtk.Buildable.get_name(widget) != 'jids_listview': - xml.get_object('export_menuitem').hide() - xml.get_object('delete_menuitem').connect('activate', + _ui.export_menuitem.hide() + _ui.delete_menuitem.connect('activate', self.on_delete_menuitem_activate, widget) - xml.connect_signals(self) - xml.get_object('context_menu').popup(None, None, None, None, + _ui.connect_signals(self) + _ui.context_menu.popup(None, None, None, None, event.button, event.time) return True def on_export_menuitem_activate(self, widget): FileSaveDialog(self._on_export, - transient_for=self.window, + transient_for=self._ui.history_manager_window, modal=True) def _on_export(self, filename): - liststore, list_of_paths = self.jids_listview.get_selection()\ + liststore, list_of_paths = self._ui.jids_listview.get_selection()\ .get_selected_rows() self._export_jids_logs_to_file(liststore, list_of_paths, filename) @@ -479,7 +479,7 @@ class HistoryManager: return def on_jids_listview_key_press_event(self, widget, event): - liststore, list_of_paths = self.jids_listview.get_selection()\ + liststore, list_of_paths = self._ui.jids_listview.get_selection()\ .get_selected_rows() if event.keyval == Gdk.KEY_Delete: self._delete_jid_logs(liststore, list_of_paths) @@ -580,7 +580,7 @@ class HistoryManager: dialog.set_markup(pri_text) ok_button = dialog.get_children()[0].get_children()[1].get_children()[0] ok_button.grab_focus() - dialog.set_transient_for(self.window) + dialog.set_transient_for(self._ui.history_manager_window) def _delete_logs(self, liststore, list_of_paths): paths_len = len(list_of_paths) @@ -613,21 +613,21 @@ class HistoryManager: 'Do you really want to delete the selected message?', 'Do you really want to delete the selected messages?', paths_len) dialog = ConfirmationDialog(pri_text, - _('This is an irreversible operation.'), on_response_ok=(on_ok, + _('This can not be undone.'), on_response_ok=(on_ok, liststore, list_of_paths)) dialog.set_title(_('Deletion Confirmation')) ok_button = dialog.get_children()[0].get_children()[1].get_children()[0] ok_button.grab_focus() - dialog.set_transient_for(self.window) + dialog.set_transient_for(self._ui.history_manager_window) def on_search_db_button_clicked(self, widget): - text = self.search_entry.get_text() + text = self._ui.search_entry.get_text() if not text: return - self.welcome_vbox.hide() - self.logs_scrolledwindow.hide() - self.search_results_scrolledwindow.show() + self._ui.welcome_box.hide() + self._ui.logs_scrolledwindow.hide() + self._ui.search_results_scrolledwindow.show() self._fill_search_results_listview(text) @@ -650,7 +650,7 @@ class HistoryManager: return path = self.jids_liststore.get_path(iter_) - self.jids_listview.set_cursor(path) + self._ui.jids_listview.set_cursor(path) iter_ = self.logs_liststore.get_iter_first() while iter_: @@ -660,8 +660,8 @@ class HistoryManager: iter_ = self.logs_liststore.iter_next(iter_) path = self.logs_liststore.get_path(iter_) - self.logs_listview.scroll_to_cell(path) - self.logs_listview.get_selection().select_path(path) + self._ui.logs_listview.scroll_to_cell(path) + self._ui.logs_listview.get_selection().select_path(path) def main(): View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/bd7e32187d5717b05375720b64423be7da… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/bd7e32187d5717b05375720b64423be7da… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Test: Remove unused xmpp_mocks
by Philipp Hörist 07 Nov '18

07 Nov '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: fd97d642 by André Apitzsch at 2018-11-07T21:36:54Z Test: Remove unused xmpp_mocks - - - - - 2 changed files: - test/integration/test_resolver.py - − test/lib/xmpp_mocks.py Changes: ===================================== test/integration/test_resolver.py ===================================== @@ -10,7 +10,6 @@ from gi.repository import GLib from gajim.common import resolver from gajim_mocks import * -from xmpp_mocks import IdleQueueThread NONSENSE_NAME = 'sfsdfsdfsdf.sdfs.fsd' JABBERCZ_TXT_NAME = '_xmppconnect.jabber.cz' ===================================== test/lib/xmpp_mocks.py deleted ===================================== @@ -1,94 +0,0 @@ -''' -Module with dummy classes for unit testing of XMPP and related code. -''' - -import threading, time - -from mock import Mock - -from nbxmpp import idlequeue - -IDLEQUEUE_INTERVAL = 0.2 # polling interval. 200ms is used in Gajim as default -IDLEMOCK_TIMEOUT = 30 # how long we wait for an event - -class IdleQueueThread(threading.Thread): - ''' - Thread for regular processing of idlequeue. - ''' - def __init__(self): - self.iq = idlequeue.IdleQueue() - self.stop = threading.Event() # Event to stop the thread main loop. - self.stop.clear() - threading.Thread.__init__(self) - - def run(self): - while not self.stop.isSet(): - self.iq.process() - time.sleep(IDLEQUEUE_INTERVAL) - - def stop_thread(self): - self.stop.set() - - -class IdleMock: - ''' - Serves as template for testing objects that are normally controlled by GUI. - Allows to wait for asynchronous callbacks with wait() method. - ''' - def __init__(self): - self._event = threading.Event() - self._event.clear() - - def wait(self): - ''' - Block until some callback sets the event and clearing the event - subsequently. - Returns True if event was set, False on timeout - ''' - self._event.wait(IDLEMOCK_TIMEOUT) - if self._event.isSet(): - self._event.clear() - return True - else: - return False - - def set_event(self): - self._event.set() - -class MockConnection(IdleMock, Mock): - ''' - Class simulating Connection class from gajim/common/connection.py - - It is derived from Mock in order to avoid defining all methods - from real Connection that are called from NBClient or Dispatcher - ( _event_dispatcher for example) - ''' - - def __init__(self, *args): - self.connect_succeeded = True - IdleMock.__init__(self) - Mock.__init__(self, *args) - - def on_connect(self, success, *args): - ''' - Method called after connecting - after receiving <stream:features> - from server (NOT after TLS stream restart) or connect failure - ''' - self.connect_succeeded = success - self.set_event() - - - def on_auth(self, con, auth): - ''' - Method called after authentication, regardless of the result. - - :Parameters: - con : NonBlockingClient - reference to authenticated object - auth : string - type of authetication in case of success ('old_auth', 'sasl') or - None in case of auth failure - ''' - self.auth_connection = con - self.auth = auth - self.set_event() View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/fd97d64205b2772c850b7e3cdc47def6b8… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/fd97d64205b2772c850b7e3cdc47def6b8… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 4 commits: ManageProxies GUI update
by Philipp Hörist 07 Nov '18

07 Nov '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: d106c0d3 by Daniel Brötzmann at 2018-11-07T16:07:24Z ManageProxies GUI update - - - - - 43f07c19 by Daniel Brötzmann at 2018-11-07T16:07:24Z Merge destroy handlers, connect ESC key, remove transient - - - - - 56f948f5 by Daniel Brötzmann at 2018-11-07T16:07:24Z Remove unnecessary .destroy - - - - - 02f16d53 by Daniel Brötzmann at 2018-11-07T20:22:25Z Remove None from list, rename None to No Proxy in combobox - - - - - 5 changed files: - gajim/app_actions.py - gajim/data/gui/manage_proxies_window.ui - gajim/gtk/preferences.py - gajim/gtk/proxies.py - gajim/options_dialog.py Changes: ===================================== gajim/app_actions.py ===================================== @@ -251,8 +251,7 @@ def on_manage_proxies(action, param): if 'manage_proxies' in app.interface.instances: app.interface.instances['manage_proxies'].window.present() else: - app.interface.instances['manage_proxies'] = \ - ManageProxies(interface.roster.window) + app.interface.instances['manage_proxies'] = ManageProxies() # Admin Actions ===================================== gajim/data/gui/manage_proxies_window.ui ===================================== @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> - + <interface> - <requires lib="gtk+" version="3.12"/> + <requires lib="gtk+" version="3.20"/> <object class="GtkListStore" id="liststore1"> <columns>  @@ -20,385 +20,93 @@ </data> </object> <object class="GtkWindow" id="manage_proxies_window"> + <property name="width_request">500</property> + <property name="height_request">440</property> <property name="can_focus">False</property> - <property name="border_width">12</property> + <property name="border_width">18</property> <property name="title" translatable="yes">Manage Proxy Profiles</property> - <property name="resizable">False</property> <property name="window_position">center-on-parent</property> + <property name="default_width">500</property> + <property name="default_height">440</property> <property name="type_hint">dialog</property> - <signal name="destroy" handler="on_manage_proxies_window_destroy" swapped="no"/> + <signal name="destroy" handler="_on_destroy" swapped="no"/> + <signal name="key-press-event" handler="_on_key_press" swapped="no"/> <child> - <object class="GtkBox" id="vbox87"> + <placeholder/> + </child> + <child> + <object class="GtkBox"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="orientation">vertical</property> <property name="spacing">12</property> <child> - <object class="GtkBox" id="hbox2966"> + <object class="GtkBox"> + <property name="width_request">200</property> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="spacing">12</property> + <property name="orientation">vertical</property> <child> - <object class="GtkBox" id="vbox89"> + <object class="GtkScrolledWindow"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="margin_bottom">6</property> - <property name="orientation">vertical</property> - <property name="spacing">6</property> + <property name="can_focus">True</property> + <property name="shadow_type">in</property> <child> - <object class="GtkScrolledWindow" id="scrolledwindow38"> + <object class="GtkTreeView" id="proxies_treeview"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="shadow_type">in</property> - <child> - <object class="GtkTreeView" id="proxies_treeview"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="headers_visible">False</property> - <signal name="cursor-changed" handler="on_proxies_treeview_cursor_changed" swapped="no"/> - <signal name="key-press-event" handler="on_proxies_treeview_key_press_event" swapped="no"/> - <child internal-child="selection"> - <object class="GtkTreeSelection" id="treeview-selection1"/> - </child> - </object> - </child> - </object> - <packing> - <property name="expand">True</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkButtonBox" id="hbuttonbox21"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="spacing">6</property> - <property name="layout_style">center</property> - <child> - <object class="GtkButton" id="add_proxy_button"> - <property name="label">gtk-add</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="can_default">True</property> - <property name="receives_default">False</property> - <property name="use_stock">True</property> - <signal name="clicked" handler="on_add_proxy_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="remove_proxy_button"> - <property name="label">gtk-remove</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="can_default">True</property> - <property name="receives_default">False</property> - <property name="use_stock">True</property> - <signal name="clicked" handler="on_remove_proxy_button_clicked" swapped="no"/> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">1</property> - </packing> + <property name="headers_visible">False</property> + <signal name="cursor-changed" handler="on_proxies_treeview_cursor_changed" swapped="no"/> + <signal name="key-press-event" handler="on_proxies_treeview_key_press_event" swapped="no"/> + <child internal-child="selection"> + <object class="GtkTreeSelection" id="treeview-selection1"/> </child> </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="expand">True</property> <property name="fill">True</property> <property name="position">0</property> </packing> </child> <child> - <object class="GtkBox" id="vbox90"> + <object class="GtkToolbar"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="orientation">vertical</property> + <property name="toolbar_style">icons</property> + <property name="show_arrow">False</property> + <property name="icon_size">1</property> <child> - <object class="GtkFrame" id="frame34"> + <object class="GtkToolButton" id="add_proxy_button"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label_xalign">0</property> - <property name="shadow_type">none</property> - <child> - <object class="GtkGrid" id="grid1"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="margin_left">12</property> - <property name="border_width">6</property> - <property name="row_spacing">6</property> - <property name="column_spacing">6</property> - <child> - <object class="GtkLabel" id="label320"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="halign">start</property> - <property name="label" translatable="yes">_Name:</property> - <property name="use_underline">True</property> - <property name="xalign">0</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="label321"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes">_Type:</property> - <property name="use_underline">True</property> - <property name="xalign">0</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">1</property> - </packing> - </child> - <child> - <object class="GtkEntry" id="proxyname_entry"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <signal name="changed" handler="on_proxyname_entry_changed" swapped="no"/> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkComboBox" id="proxytype_combobox"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="model">liststore1</property> - <signal name="changed" handler="on_proxytype_combobox_changed" swapped="no"/> - <child> - <object class="GtkCellRendererText" id="cellrenderertext1"/> - <attributes> - <attribute name="text">0</attribute> - </attributes> - </child> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">1</property> - </packing> - </child> - </object> - </child> - <child type="label"> - <object class="GtkLabel" id="label319"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes"><b>Properties</b></property> - <property name="use_markup">True</property> - </object> - </child> + <property name="tooltip_text" translatable="yes">Add Proxy</property> + <property name="use_underline">True</property> + <property name="icon_name">list-add-symbolic</property> + <signal name="clicked" handler="on_add_proxy_button_clicked" swapped="no"/> </object> <packing> <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> + <property name="homogeneous">True</property> </packing> </child> <child> - <object class="GtkFrame" id="frame23"> + <object class="GtkToolButton" id="remove_proxy_button"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label_xalign">0</property> - <property name="shadow_type">none</property> - <child> - <object class="GtkGrid" id="proxy_table"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="margin_left">12</property> - <property name="border_width">6</property> - <property name="row_spacing">6</property> - <property name="column_spacing">6</property> - <child> - <object class="GtkLabel" id="boshuri_label"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes">_BOSH URL:</property> - <property name="use_underline">True</property> - <property name="xalign">0</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkEntry" id="boshuri_entry"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <signal name="changed" handler="on_boshuri_entry_changed" swapped="no"/> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="label135"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes">Proxy _Host:</property> - <property name="use_underline">True</property> - <property name="xalign">0</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">2</property> - </packing> - </child> - <child> - <object class="GtkCheckButton" id="boshuseproxy_checkbutton"> - <property name="label" translatable="yes">Use HTTP prox_y</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="use_underline">True</property> - <property name="xalign">0</property> - <property name="draw_indicator">True</property> - <signal name="toggled" handler="on_boshuseproxy_checkbutton_toggled" swapped="no"/> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">1</property> - <property name="width">2</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="label136"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes">Proxy _Port:</property> - <property name="use_underline">True</property> - <property name="xalign">0</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">3</property> - </packing> - </child> - <child> - <object class="GtkCheckButton" id="useauth_checkbutton"> - <property name="label" translatable="yes">Use proxy auth_entication</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="use_underline">True</property> - <property name="xalign">0</property> - <property name="draw_indicator">True</property> - <signal name="toggled" handler="on_useauth_checkbutton_toggled" swapped="no"/> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">4</property> - <property name="width">2</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="label253"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes">_Username:</property> - <property name="use_underline">True</property> - <property name="xalign">0</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">5</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="label254"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes">Pass_word:</property> - <property name="use_underline">True</property> - <property name="xalign">0</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">6</property> - </packing> - </child> - <child> - <object class="GtkEntry" id="proxyhost_entry"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <signal name="changed" handler="on_proxyhost_entry_changed" swapped="no"/> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">2</property> - </packing> - </child> - <child> - <object class="GtkEntry" id="proxyport_entry"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <signal name="changed" handler="on_proxyport_entry_changed" swapped="no"/> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">3</property> - </packing> - </child> - <child> - <object class="GtkEntry" id="proxyuser_entry"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <signal name="changed" handler="on_proxyuser_entry_changed" swapped="no"/> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">5</property> - </packing> - </child> - <child> - <object class="GtkEntry" id="proxypass_entry"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="visibility">False</property> - <signal name="changed" handler="on_proxypass_entry_changed" swapped="no"/> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">6</property> - </packing> - </child> - </object> - </child> - <child type="label"> - <object class="GtkLabel" id="label216"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes"><b>Settings</b></property> - <property name="use_markup">True</property> - </object> - </child> + <property name="tooltip_text" translatable="yes">Remove Proxy</property> + <property name="use_underline">True</property> + <property name="icon_name">list-remove-symbolic</property> + <signal name="clicked" handler="on_remove_proxy_button_clicked" swapped="no"/> </object> <packing> <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> + <property name="homogeneous">True</property> </packing> </child> + <style> + <class name="inline-toolbar"/> + </style> </object> <packing> <property name="expand">False</property> @@ -414,28 +122,313 @@ </packing> </child> <child> - <object class="GtkButtonBox" id="hbuttonbox22"> + <object class="GtkBox"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="margin_right">6</property> - <property name="spacing">12</property> - <property name="layout_style">end</property> + <property name="orientation">vertical</property> + <property name="spacing">6</property> <child> - <object class="GtkButton" id="close_button"> - <property name="label">gtk-close</property> + <object class="GtkGrid"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="can_default">True</property> - <property name="receives_default">False</property> - <property name="use_stock">True</property> - <signal name="clicked" handler="on_close_button_clicked" swapped="no"/> + <property name="can_focus">False</property> + <property name="row_spacing">6</property> + <property name="column_spacing">12</property> + <child> + <object class="GtkLabel"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">end</property> + <property name="label" translatable="yes">Properties</property> + <property name="use_markup">True</property> + <style> + <class name="bold"/> + </style> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkLabel"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">end</property> + <property name="label" translatable="yes">_Name</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">1</property> + </packing> + </child> + <child> + <object class="GtkLabel"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">end</property> + <property name="label" translatable="yes">_Type</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">2</property> + </packing> + </child> + <child> + <object class="GtkEntry" id="proxyname_entry"> + <property name="width_request">200</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <signal name="changed" handler="on_proxyname_entry_changed" swapped="no"/> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="GtkComboBox" id="proxytype_combobox"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="margin_bottom">6</property> + <property name="model">liststore1</property> + <signal name="changed" handler="on_proxytype_combobox_changed" swapped="no"/> + <child> + <object class="GtkCellRendererText"/> + <attributes> + <attribute name="text">0</attribute> + </attributes> + </child> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">2</property> + </packing> + </child> + <child> + <placeholder/> + </child> </object> <packing> <property name="expand">False</property> - <property name="fill">False</property> + <property name="fill">True</property> <property name="position">0</property> </packing> </child> + <child> + <object class="GtkGrid" id="proxy_table"> + <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" id="boshuri_label"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">end</property> + <property name="label" translatable="yes">_BOSH URL</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">1</property> + </packing> + </child> + <child> + <object class="GtkEntry" id="boshuri_entry"> + <property name="width_request">200</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <signal name="changed" handler="on_boshuri_entry_changed" swapped="no"/> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="GtkCheckButton" id="boshuseproxy_checkbutton"> + <property name="label" translatable="yes">Use HTTP prox_y</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="halign">start</property> + <property name="use_underline">True</property> + <property name="draw_indicator">True</property> + <signal name="toggled" handler="on_boshuseproxy_checkbutton_toggled" swapped="no"/> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">2</property> + </packing> + </child> + <child> + <object class="GtkLabel"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">end</property> + <property name="label" translatable="yes">Proxy _Host</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">3</property> + </packing> + </child> + <child> + <object class="GtkEntry" id="proxyhost_entry"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <signal name="changed" handler="on_proxyhost_entry_changed" swapped="no"/> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">3</property> + </packing> + </child> + <child> + <object class="GtkLabel"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">end</property> + <property name="label" translatable="yes">Proxy _Port</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">4</property> + </packing> + </child> + <child> + <object class="GtkEntry" id="proxyport_entry"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <signal name="changed" handler="on_proxyport_entry_changed" swapped="no"/> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">4</property> + </packing> + </child> + <child> + <object class="GtkLabel"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">end</property> + <property name="label" translatable="yes">_Username</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">6</property> + </packing> + </child> + <child> + <object class="GtkCheckButton" id="useauth_checkbutton"> + <property name="label" translatable="yes">Use proxy auth_entication</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="halign">start</property> + <property name="use_underline">True</property> + <property name="draw_indicator">True</property> + <signal name="toggled" handler="on_useauth_checkbutton_toggled" swapped="no"/> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">5</property> + </packing> + </child> + <child> + <object class="GtkEntry" id="proxyuser_entry"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <signal name="changed" handler="on_proxyuser_entry_changed" swapped="no"/> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">6</property> + </packing> + </child> + <child> + <object class="GtkLabel"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">end</property> + <property name="label" translatable="yes">Pass_word</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">7</property> + </packing> + </child> + <child> + <object class="GtkEntry" id="proxypass_entry"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="visibility">False</property> + <signal name="changed" handler="on_proxypass_entry_changed" swapped="no"/> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">7</property> + </packing> + </child> + <child> + <object class="GtkLabel"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">end</property> + <property name="label" translatable="yes">Settings</property> + <property name="use_markup">True</property> + <style> + <class name="bold"/> + </style> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + </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> ===================================== gajim/gtk/preferences.py ===================================== @@ -492,14 +492,14 @@ class Preferences(Gtk.ApplicationWindow): return val def on_checkbutton_toggled(self, widget, config_name, - change_sensitivity_widgets=None): + change_sensitivity_widgets=None): app.config.set(config_name, widget.get_active()) if change_sensitivity_widgets: for w in change_sensitivity_widgets: w.set_sensitive(widget.get_active()) def on_per_account_checkbutton_toggled(self, widget, config_name, - change_sensitivity_widgets=None): + change_sensitivity_widgets=None): for account in app.connections: app.config.set_per('accounts', account, config_name, widget.get_active()) @@ -1014,8 +1014,10 @@ class Preferences(Gtk.ApplicationWindow): # Proxies def on_proxies_combobox_changed(self, widget): active = widget.get_active() + if active == -1: + return proxy = widget.get_model()[active][0] - if proxy == _('None'): + if proxy == _('No Proxy'): proxy = '' app.config.set('global_proxy', proxy) @@ -1023,20 +1025,22 @@ class Preferences(Gtk.ApplicationWindow): if 'manage_proxies' in app.interface.instances: app.interface.instances['manage_proxies'].window.present() else: - app.interface.instances['manage_proxies'] = ManageProxies(self) + app.interface.instances['manage_proxies'] = ManageProxies() def update_proxy_list(self): our_proxy = app.config.get('global_proxy') if not our_proxy: - our_proxy = _('None') + our_proxy = _('No Proxy') model = self._ui.proxies_combobox.get_model() model.clear() proxies = app.config.get_per('proxies') - proxies.insert(0, _('None')) + proxies.insert(0, _('No Proxy')) for index, proxy in enumerate(proxies): model.append([proxy]) if our_proxy == proxy: self._ui.proxies_combobox.set_active(index) + if not our_proxy in proxies: + self._ui.proxies_combobox.set_active(0) # Log status changes of contacts def on_log_show_changes_checkbutton_toggled(self, widget): ===================================== gajim/gtk/proxies.py ===================================== @@ -12,46 +12,50 @@ # You should have received a copy of the GNU General Public License # along with Gajim. If not, see <http://www.gnu.org/licenses/>. -from gi.repository import Gtk from gi.repository import Gdk +from gi.repository import Gtk from gajim.common import app -from gajim.common.i18n import _ from gajim.gtk.util import get_builder class ManageProxies: - def __init__(self, transient_for=None): + def __init__(self): self._ui = get_builder('manage_proxies_window.ui') self.window = self._ui.manage_proxies_window - self.window.set_transient_for(transient_for) + self.window.set_transient_for(app.app.get_active_window()) self.init_list() self.block_signal = False self._ui.connect_signals(self) self.window.show_all() + # hide the BOSH fields by default self.show_bosh_fields() + self._ui.boshuri_entry.hide() + self._ui.boshuri_label.hide() + self._ui.boshuseproxy_checkbutton.hide() def show_bosh_fields(self, show=True): if show: self._ui.boshuri_entry.show() self._ui.boshuri_label.show() self._ui.boshuseproxy_checkbutton.show() + act = self._ui.boshuseproxy_checkbutton.get_active() + self._ui.proxyhost_entry.set_sensitive(act) + self._ui.proxyport_entry.set_sensitive(act) else: - cb = self._ui.boshuseproxy_checkbutton - cb.hide() - cb.set_active(True) - self.on_boshuseproxy_checkbutton_toggled(cb) + self._ui.boshuseproxy_checkbutton.hide() + self._ui.boshuseproxy_checkbutton.set_active(True) + self.on_boshuseproxy_checkbutton_toggled( + self._ui.boshuseproxy_checkbutton) self._ui.boshuri_entry.hide() self._ui.boshuri_label.hide() def fill_proxies_treeview(self): model = self._ui.proxies_treeview.get_model() model.clear() - iter_ = model.append() - model.set(iter_, 0, _('None')) for proxy in app.config.get_per('proxies'): iter_ = model.append() model.set(iter_, 0, proxy) @@ -70,12 +74,6 @@ class ManageProxies: self.fill_proxies_treeview() self._ui.proxytype_combobox.set_active(0) - def on_manage_proxies_window_destroy(self, _widget): - window = app.get_app_window('AccountsWindow') - if window is not None: - window.update_proxy_list() - del app.interface.instances['manage_proxies'] - def on_add_proxy_button_clicked(self, _widget): model = self._ui.proxies_treeview.get_model() proxies = app.config.get_per('proxies') @@ -102,9 +100,6 @@ class ManageProxies: self.on_proxies_treeview_cursor_changed(self._ui.proxies_treeview) self.block_signal = False - def on_close_button_clicked(self, _widget): - self.window.destroy() - def on_useauth_checkbutton_toggled(self, widget): if self.block_signal: return @@ -149,37 +144,43 @@ class ManageProxies: proxy = model[iter_][0] self._ui.proxyname_entry.set_text(proxy) - if proxy == _('None'): # special proxy None - self.show_bosh_fields(False) - self._ui.proxyname_entry.set_editable(False) - self._ui.remove_proxy_button.set_sensitive(False) - self._ui.proxytype_combobox.set_sensitive(False) - self._ui.proxy_table.set_sensitive(False) - else: - proxytype = app.config.get_per('proxies', proxy, 'type') - - self.show_bosh_fields(proxytype == 'bosh') - - self._ui.proxyname_entry.set_editable(True) - self._ui.remove_proxy_button.set_sensitive(True) - self._ui.proxytype_combobox.set_sensitive(True) - self._ui.proxy_table.set_sensitive(True) - self._ui.proxyhost_entry.set_text( - app.config.get_per('proxies', proxy, 'host')) - self._ui.proxyport_entry.set_text( - str(app.config.get_per('proxies', proxy, 'port'))) - self._ui.proxyuser_entry.set_text( - app.config.get_per('proxies', proxy, 'user')) - self._ui.proxypass_entry.set_text( - app.config.get_per('proxies', proxy, 'pass')) - self._ui.boshuri_entry.set_text( - app.config.get_per('proxies', proxy, 'bosh_uri')) - types = ['http', 'socks5', 'bosh'] - self._ui.proxytype_combobox.set_active(types.index(proxytype)) - self._ui.boshuseproxy_checkbutton.set_active( - app.config.get_per('proxies', proxy, 'bosh_useproxy')) - self._ui.useauth_checkbutton.set_active( - app.config.get_per('proxies', proxy, 'useauth')) + proxytype = app.config.get_per('proxies', proxy, 'type') + + self.show_bosh_fields(proxytype == 'bosh') + + self._ui.proxyname_entry.set_editable(True) + self._ui.proxyname_entry.set_sensitive(True) + self._ui.remove_proxy_button.set_sensitive(True) + self._ui.proxytype_combobox.set_sensitive(True) + self._ui.proxy_table.set_sensitive(True) + + self._ui.boshuri_entry.set_text( + app.config.get_per('proxies', proxy, 'bosh_uri')) + self._ui.boshuseproxy_checkbutton.set_active( + app.config.get_per('proxies', proxy, 'bosh_useproxy')) + if proxytype == 'bosh': + act = self._ui.boshuseproxy_checkbutton.get_active() + self._ui.proxyhost_entry.set_sensitive(act) + self._ui.proxyport_entry.set_sensitive(act) + + self._ui.proxyhost_entry.set_text( + app.config.get_per('proxies', proxy, 'host')) + self._ui.proxyport_entry.set_text( + str(app.config.get_per('proxies', proxy, 'port'))) + self._ui.proxyuser_entry.set_text( + app.config.get_per('proxies', proxy, 'user')) + self._ui.proxypass_entry.set_text( + app.config.get_per('proxies', proxy, 'pass')) + + types = ['http', 'socks5', 'bosh'] + self._ui.proxytype_combobox.set_active(types.index(proxytype)) + + self._ui.useauth_checkbutton.set_active( + app.config.get_per('proxies', proxy, 'useauth')) + act = self._ui.useauth_checkbutton.get_active() + self._ui.proxyuser_entry.set_sensitive(act) + self._ui.proxypass_entry.set_sensitive(act) + self.block_signal = False def on_proxies_treeview_key_press_event(self, widget, event): @@ -217,6 +218,13 @@ class ManageProxies: proxy = self._ui.proxyname_entry.get_text() app.config.set_per('proxies', proxy, 'type', types[type_]) + def on_boshuri_entry_changed(self, widget): + if self.block_signal: + return + value = widget.get_text() + proxy = self._ui.proxyname_entry.get_text() + app.config.set_per('proxies', proxy, 'bosh_uri', value) + def on_proxyhost_entry_changed(self, widget): if self.block_signal: return @@ -238,16 +246,22 @@ class ManageProxies: proxy = self._ui.proxyname_entry.get_text() app.config.set_per('proxies', proxy, 'user', value) - def on_boshuri_entry_changed(self, widget): - if self.block_signal: - return - value = widget.get_text() - proxy = self._ui.proxyname_entry.get_text() - app.config.set_per('proxies', proxy, 'bosh_uri', value) - def on_proxypass_entry_changed(self, widget): if self.block_signal: return value = widget.get_text() proxy = self._ui.proxyname_entry.get_text() app.config.set_per('proxies', proxy, 'pass', value) + + def _on_key_press(self, widget, event): + if event.keyval == Gdk.KEY_Escape: + self.window.destroy() + + def _on_destroy(self, *args): + window_pref = app.get_app_window('Preferences') + window_accounts = app.get_app_window('AccountsWindow') + if window_pref is not None: + window_pref.update_proxy_list() + if window_accounts is not None: + window_accounts.update_proxy_list() + del app.interface.instances['manage_proxies'] ===================================== gajim/options_dialog.py ===================================== @@ -492,7 +492,7 @@ class ProxyComboOption(GenericOption): def update_values(self): proxies = app.config.get_per('proxies') - proxies.insert(0, _('None')) + proxies.insert(0, _('No Proxy')) self.combo.remove_all() for index, value in enumerate(proxies): self.combo.insert_text(-1, value) View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/ea2f76f24e0144e1f7503c5d58b42591d… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/ea2f76f24e0144e1f7503c5d58b42591d… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim] Pushed new tag gajim-1.1.0
by Yann Leboulanger 06 Nov '18

06 Nov '18

Yann Leboulanger pushed new tag gajim-1.1.0 at gajim / gajim -- View it on GitLab: https://dev.gajim.org/gajim/gajim/tree/gajim-1.1.0 You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][gajim_1.1] set new Gajim version to 1.1.0
by Yann Leboulanger 06 Nov '18

06 Nov '18

Yann Leboulanger pushed to branch gajim_1.1 at gajim / gajim Commits: 817e5cdf by Yann Leboulanger at 2018-11-06T20:12:20Z set new Gajim version to 1.1.0 - - - - - 2 changed files: - data/org.gajim.Gajim.appdata.xml.in - gajim/__init__.py Changes: ===================================== data/org.gajim.Gajim.appdata.xml.in ===================================== @@ -101,6 +101,7 @@ <content_attribute id="money-gambling">none</content_attribute> </content_rating> <releases> + <release version="1.1.0" date="2018-11-06" /> <release version="1.0.3" date="2018-05-20" /> <release version="1.0.2" date="2018-04-30" /> <release version="1.0.1" date="2018-04-01" /> ===================================== gajim/__init__.py ===================================== @@ -1,7 +1,7 @@ import os import subprocess -__version__ = "1.0.99.1" +__version__ = "1.1.0" IS_FLATPAK = False if os.path.exists('/app/share/run-as-flatpak'): View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/817e5cdf5a8d13ed68d5c04e9d557a8117… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/817e5cdf5a8d13ed68d5c04e9d557a8117… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Show correct icon in roster tooltip
by Philipp Hörist 06 Nov '18

06 Nov '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: ea2f76f2 by Philipp Hörist at 2018-11-06T20:31:43Z Show correct icon in roster tooltip - - - - - 1 changed file: - gajim/gtk/tooltips.py Changes: ===================================== gajim/gtk/tooltips.py ===================================== @@ -383,6 +383,8 @@ class RosterTooltip(Gtk.Window, StatusTable): if self.num_resources > 1: self._ui.status_label.show() transport = app.get_transport_name_from_jid(self.prim_contact.jid) + if transport == 'jabber': + transport = None contact_keys = sorted(contacts_dict.keys()) contact_keys.reverse() for priority in contact_keys: View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/ea2f76f24e0144e1f7503c5d58b42591d7… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/ea2f76f24e0144e1f7503c5d58b42591d7… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][gajim_1.1] update translations
by Yann Leboulanger 05 Nov '18

05 Nov '18

Yann Leboulanger pushed to branch gajim_1.1 at gajim / gajim Commits: 380882cc by Yann Leboulanger at 2018-11-05T22:23:58Z update translations - - - - - 1 changed file: - po/be.po The diff was not included because it is too large. View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/380882ccaa5a9d243e0af07a49a8b8eb77… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/380882ccaa5a9d243e0af07a49a8b8eb77… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][gajim_1.1] Cast messages from a bare muc jid to groupchat
by Philipp Hörist 05 Nov '18

05 Nov '18

Philipp Hörist pushed to branch gajim_1.1 at gajim / gajim Commits: 7730bc0e by Philipp Hörist at 2018-11-05T20:11:39Z Cast messages from a bare muc jid to groupchat - - - - - 1 changed file: - gajim/common/modules/message.py Changes: ===================================== gajim/common/modules/message.py ===================================== @@ -163,6 +163,7 @@ class Message: # TODO: why is this here? if stanza.getTag('html'): stanza.delChild('html') + type_ = 'groupchat' session = None if type_ != 'groupchat': View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/7730bc0e37776bd9013a232ba49fda1773… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/7730bc0e37776bd9013a232ba49fda1773… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: Move XEP-0231 into its own module
by Philipp Hörist 05 Nov '18

05 Nov '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: b4d34bf7 by Emmanuel Gil Peyrot at 2018-11-05T18:58:49Z Move XEP-0231 into its own module - - - - - f5a19c24 by Philipp Hörist at 2018-11-05T20:08:34Z Cast messages from a bare muc jid to groupchat - - - - - 5 changed files: - gajim/common/connection.py - gajim/common/connection_handlers.py - gajim/common/connection_handlers_events.py - + gajim/common/modules/bits_of_binary.py - gajim/common/modules/message.py Changes: ===================================== gajim/common/connection.py ===================================== @@ -116,8 +116,6 @@ class CommonConnection: self.muc_jid = {} # jid of muc server for each transport type self._stun_servers = [] # STUN servers of our jabber server - self.awaiting_cids = {} # Used for XEP-0231 - # Tracks the calls of the connect_machine() method self._connect_machine_calls = 0 ===================================== gajim/common/connection_handlers.py ===================================== @@ -446,54 +446,6 @@ class ConnectionHandlers(ConnectionSocks5Bytestream, app.nec.push_incoming_event(GcMessageReceivedEvent(None, conn=self, msg_obj=msg_obj)) - def _on_bob_received(self, conn, result, cid): - """ - Called when we receive BoB data - """ - if cid not in self.awaiting_cids: - return - - if result.getType() == 'result': - data = result.getTags('data', namespace=nbxmpp.NS_BOB) - if data.getAttr('cid') == cid: - for func in self.awaiting_cids[cid]: - cb = func[0] - args = func[1] - pos = func[2] - bob_data = data.getData() - def recurs(node, cid, data): - if node.getData() == 'cid:' + cid: - node.setData(data) - else: - for child in node.getChildren(): - recurs(child, cid, data) - recurs(args[pos], cid, bob_data) - cb(*args) - del self.awaiting_cids[cid] - return - - # An error occured, call callback without modifying data. - for func in self.awaiting_cids[cid]: - cb = func[0] - args = func[1] - cb(*args) - del self.awaiting_cids[cid] - - def get_bob_data(self, cid, to, callback, args, position): - """ - Request for BoB (XEP-0231) and when data will arrive, call callback - with given args, after having replaced cid by it's data in - args[position] - """ - if cid in self.awaiting_cids: - self.awaiting_cids[cid].appends((callback, args, position)) - else: - self.awaiting_cids[cid] = [(callback, args, position)] - iq = nbxmpp.Iq(to=to, typ='get') - iq.addChild(name='data', attrs={'cid': cid}, namespace=nbxmpp.NS_BOB) - self.connection.SendAndCallForResponse(iq, self._on_bob_received, - {'cid': cid}) - def _nec_agent_removed(self, obj): if obj.conn.name != self.name: return ===================================== gajim/common/connection_handlers_events.py ===================================== @@ -490,7 +490,8 @@ class GcMessageReceivedEvent(nec.NetworkIncomingEvent): uri.setData(data.getData()) found = True if not found: - self.conn.get_bob_data(uri_data, self.fjid, + self.conn.get_module('BitsOfBinary').get_bob_data( + uri_data, self.fjid, self.conn._dispatch_gc_msg_with_captcha, [self.stanza, self.msg_obj], 0) return ===================================== gajim/common/modules/bits_of_binary.py ===================================== @@ -0,0 +1,95 @@ +# Copyright (C) 2018 Emmanuel Gil Peyrot <linkmauve AT linkmauve.fr> +# +# This file is part of Gajim. +# +# Gajim is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published +# by the Free Software Foundation; version 3 only. +# +# Gajim is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with Gajim. If not, see <http://www.gnu.org/licenses/>. + +import logging + +import nbxmpp + +log = logging.getLogger('gajim.c.m.bob') + + +class BitsOfBinary: + def __init__(self, con): + self._con = con + self._account = con.name + + self.handlers = [ + ('iq', self._answer_bob_request, 'get', nbxmpp.NS_BOB) + ] + + # Used to track which cids are in-flight. + self.awaiting_cids = {} + + def _answer_bob_request(self, _con, stanza): + log.info('Request from %s for BoB data', stanza.getFrom()) + iq = stanza.buildReply('error') + err = nbxmpp.ErrorNode(nbxmpp.ERR_ITEM_NOT_FOUND) + iq.addChild(node=err) + log.info('Sending item-not-found') + self._con.connection.send(iq) + raise nbxmpp.NodeProcessed + + def _on_bob_received(self, _con, result, cid): + """ + Called when we receive BoB data + """ + if cid not in self.awaiting_cids: + return + + if result.getType() == 'result': + data = result.getTags('data', namespace=nbxmpp.NS_BOB) + if data.getAttr('cid') == cid: + for func in self.awaiting_cids[cid]: + cb = func[0] + args = func[1] + pos = func[2] + bob_data = data.getData() + def recurs(node, cid, data): + if node.getData() == 'cid:' + cid: + node.setData(data) + else: + for child in node.getChildren(): + recurs(child, cid, data) + recurs(args[pos], cid, bob_data) + cb(*args) + del self.awaiting_cids[cid] + return + + # An error occured, call callback without modifying data. + for func in self.awaiting_cids[cid]: + cb = func[0] + args = func[1] + cb(*args) + del self.awaiting_cids[cid] + + def get_bob_data(self, cid, to, callback, args, position): + """ + Request for BoB (XEP-0231) and when data will arrive, call callback + with given args, after having replaced cid by it's data in + args[position] + """ + if cid in self.awaiting_cids: + self.awaiting_cids[cid].appends((callback, args, position)) + else: + self.awaiting_cids[cid] = [(callback, args, position)] + iq = nbxmpp.Iq(to=to, typ='get') + iq.addChild(name='data', attrs={'cid': cid}, namespace=nbxmpp.NS_BOB) + self._con.connection.SendAndCallForResponse( + iq, self._on_bob_received, {'cid': cid}) + + +def get_instance(*args, **kwargs): + return BitsOfBinary(*args, **kwargs), 'BitsOfBinary' ===================================== gajim/common/modules/message.py ===================================== @@ -163,6 +163,7 @@ class Message: # TODO: why is this here? if stanza.getTag('html'): stanza.delChild('html') + type_ = 'groupchat' session = None if type_ != 'groupchat': View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/2ec1baa7bd3bf054cc48d5ddfddf0dc60… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/2ec1baa7bd3bf054cc48d5ddfddf0dc60… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][gajim_1.1] Update ChangeLog
by Philipp Hörist 05 Nov '18

05 Nov '18

Philipp Hörist pushed to branch gajim_1.1 at gajim / gajim Commits: 1e5e62a7 by Philipp Hörist at 2018-11-05T17:42:56Z Update ChangeLog - - - - - 1 changed file: - ChangeLog Changes: ===================================== ChangeLog ===================================== @@ -1,4 +1,4 @@ -Gajim 1.1.0 (TBA) +Gajim 1.1.0 (06 November 2018) New @@ -6,7 +6,9 @@ Gajim 1.1.0 (TBA) Bug fixes + * 8968 Windows: Gajim loads DLLs from wrong location * 9322 Error when adding contact + * 9357 Acquire sleep inhibtor correctly after sleep * 9385 Ignore invalid bookmarks * 9386 Discovery: Browsing nodes without identity * 9393 Error when parsing invalid timestamps View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/1e5e62a758d20caa05c9860e5cc0bde4f1… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/1e5e62a758d20caa05c9860e5cc0bde4f1… 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