Commits June 2019

commits@gajim.org

1 participants
70 discussions

[Git][gajim/gajim][master] MAMPrefereces: Slight layout and code rework
by Philipp Hörist 22 Jun '19

22 Jun '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: acc18364 by Daniel Brötzmann at 2019-06-22T13:24:17Z MAMPrefereces: Slight layout and code rework - - - - - 2 changed files: - gajim/data/gui/mam_preferences.ui - gajim/gtk/mam_preferences.py Changes: ===================================== gajim/data/gui/mam_preferences.ui ===================================== @@ -32,143 +32,76 @@ <column type="gboolean"/> </columns> </object> - <object class="GtkGrid" id="preferences_grid"> + <object class="GtkBox" id="mam_box"> <property name="width_request">400</property> <property name="height_request">300</property> <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="row_spacing">5</property> - <property name="column_spacing">10</property> + <property name="border_width">18</property> + <property name="orientation">vertical</property> <child> - <object class="GtkButtonBox"> + <object class="GtkBox"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="halign">start</property> - <property name="spacing">5</property> - <property name="layout_style">start</property> + <property name="halign">center</property> + <property name="spacing">12</property> <child> - <object class="GtkButton" id="add_button"> + <object class="GtkLabel"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <signal name="clicked" handler="_on_add" swapped="no"/> - <child> - <object class="GtkImage"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="icon_name">list-add-symbolic</property> - </object> - </child> + <property name="can_focus">False</property> + <property name="halign">end</property> + <property name="label" translatable="yes">_Default</property> + <property name="use_underline">True</property> + <property name="xalign">0</property> + <style> + <class name="dim-label"/> + </style> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> <property name="position">0</property> - <property name="non_homogeneous">True</property> - </packing> - </child> - <child> - <object class="GtkButton" id="remove_button"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <signal name="clicked" handler="_on_remove" swapped="no"/> - <child> - <object class="GtkImage"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="icon_name">list-remove-symbolic</property> - </object> - </child> - </object> - <packing> - <property name="expand">True</property> - <property name="fill">True</property> - <property name="position">1</property> - <property name="non_homogeneous">True</property> - </packing> - </child> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">2</property> - </packing> - </child> - <child> - <object class="GtkGrid"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="halign">start</property> - <property name="column_spacing">5</property> - <child> - <object class="GtkLabel" id="default_label"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes">Default:</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="GtkComboBox" id="default_cb"> + <object class="GtkComboBox" id="default_combo"> + <property name="width_request">200</property> <property name="visible">True</property> <property name="can_focus">False</property> <property name="halign">start</property> - <property name="hexpand">False</property> <property name="model">default_store</property> <property name="active">0</property> <property name="id_column">1</property> <child> - <object class="GtkCellRendererText" id="cellrenderertext1"/> + <object class="GtkCellRendererText"/> <attributes> <attribute name="text">0</attribute> </attributes> </child> </object> <packing> - <property name="left_attach">1</property> - <property name="top_attach">0</property> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> </packing> </child> </object> <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkButton" id="save_button"> - <property name="label">Save</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="halign">end</property> - <property name="always_show_image">True</property> - <signal name="clicked" handler="_on_save" swapped="no"/> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">2</property> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> </packing> </child> <child> <object class="GtkOverlay" id="overlay"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="margin_top">6</property> <child> <object class="GtkScrolledWindow"> <property name="height_request">150</property> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="hexpand">True</property> - <property name="vexpand">True</property> <property name="shadow_type">in</property> <child> <object class="GtkTreeView" id="pref_view"> @@ -177,17 +110,17 @@ <property name="model">preferences_store</property> <property name="search_column">0</property> <child internal-child="selection"> - <object class="GtkTreeSelection" id="treeview-selection2"/> + <object class="GtkTreeSelection"/> </child> <child> - <object class="GtkTreeViewColumn" id="treeviewcolumn1"> + <object class="GtkTreeViewColumn"> <property name="title" translatable="yes">Jabber ID</property> <property name="expand">True</property> <property name="clickable">True</property> <property name="sort_indicator">True</property> <property name="sort_column_id">0</property> <child> - <object class="GtkCellRendererText" id="cellrenderertext3"> + <object class="GtkCellRendererText"> <property name="editable">True</property> <property name="placeholder_text">user(a)example.org</property> <signal name="edited" handler="_jid_edited" swapped="no"/> @@ -199,7 +132,7 @@ </object> </child> <child> - <object class="GtkTreeViewColumn" id="treeviewcolumn2"> + <object class="GtkTreeViewColumn"> <property name="title" translatable="yes">Archive</property> <property name="clickable">True</property> <property name="alignment">0.5</property> @@ -224,13 +157,86 @@ </child> </object> <packing> - <property name="left_attach">0</property> - <property name="top_attach">1</property> - <property name="width">2</property> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">2</property> </packing> </child> <child> - <placeholder/> + <object class="GtkBox"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="spacing">12</property> + <child> + <object class="GtkToolbar"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="toolbar_style">icons</property> + <property name="icon_size">4</property> + <child> + <object class="GtkToolButton" id="add"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="tooltip_text" translatable="yes">Add</property> + <property name="use_underline">True</property> + <property name="icon_name">list-add-symbolic</property> + <signal name="clicked" handler="_on_add" swapped="no"/> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="remove"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="tooltip_text" translatable="yes">Remove</property> + <property name="use_underline">True</property> + <property name="icon_name">list-remove-symbolic</property> + <signal name="clicked" handler="_on_remove" swapped="no"/> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + <style> + <class name="inline-toolbar"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkButton" id="save_button"> + <property name="label">_Save</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="valign">center</property> + <property name="use_underline">True</property> + <signal name="clicked" handler="_on_save" swapped="no"/> + <style> + <class name="suggested-action"/> + </style> + </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> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">3</property> + </packing> </child> </object> </interface> ===================================== gajim/gtk/mam_preferences.py ===================================== @@ -22,7 +22,9 @@ from gajim.common import ged from gajim.common.i18n import _ from gajim.gtk.util import get_builder -from gajim.gtk.dialogs import HigDialog +from gajim.gtk.dialogs import DialogButton +from gajim.gtk.dialogs import NewConfirmationDialog +from gajim.gtk.dialogs import InformationDialog log = logging.getLogger('gajim.gtk.mam_preferences') @@ -41,14 +43,11 @@ class MamPreferences(Gtk.ApplicationWindow): self.account = account self._con = app.connections[account] - self._builder = get_builder('mam_preferences.ui') - self.add(self._builder.get_object('preferences_grid')) + self._ui = get_builder('mam_preferences.ui') + self.add(self._ui.get_object('mam_box')) - self._default = self._builder.get_object('default_cb') - self._pref_store = self._builder.get_object('preferences_store') - self._overlay = self._builder.get_object('overlay') self._spinner = Gtk.Spinner() - self._overlay.add_overlay(self._spinner) + self._ui.overlay.add_overlay(self._spinner) app.ged.register_event_handler('mam-prefs-received', ged.GUI1, self._mam_prefs_received) @@ -57,8 +56,8 @@ class MamPreferences(Gtk.ApplicationWindow): app.ged.register_event_handler('mam-prefs-error', ged.GUI1, self._mam_prefs_error) - self._set_grid_state(False) - self._builder.connect_signals(self) + self._set_mam_box_state(False) + self._ui.connect_signals(self) self.show_all() self._activate_spinner() @@ -69,12 +68,12 @@ class MamPreferences(Gtk.ApplicationWindow): if obj.conn.name != self.account: return self._disable_spinner() - self._set_grid_state(True) + self._set_mam_box_state(True) - self._default.set_active_id(obj.default) - self._pref_store.clear() + self._ui.default_combo.set_active_id(obj.default) + self._ui.preferences_store.clear() for item in obj.rules: - self._pref_store.append(item) + self._ui.preferences_store.append(item) def _mam_prefs_saved(self, obj): if obj.conn.name != self.account: @@ -82,13 +81,15 @@ class MamPreferences(Gtk.ApplicationWindow): self._disable_spinner() - def on_ok(dialog): + def _on_ok(): self.destroy() - dialog = HigDialog( - self, Gtk.MessageType.INFO, Gtk.ButtonsType.OK, - _('Success!'), _('Your Archiving Preferences have been saved!'), - on_response_ok=on_ok, on_response_cancel=on_ok) - dialog.popup() + + NewConfirmationDialog( + _('Archiving Preferences'), + _('Archiving Preferences Saved'), + _('Your archiving preferences have successfully been saved.'), + [DialogButton.make('OK', + callback=_on_ok)]).show() def _mam_prefs_error(self, obj=None): if obj and obj.conn.name != self.account: @@ -101,40 +102,37 @@ class MamPreferences(Gtk.ApplicationWindow): else: msg = _('Error received: {}').format(obj.error_msg) - dialog = HigDialog( - self, Gtk.MessageType.INFO, Gtk.ButtonsType.OK, - _('Error!'), msg) - dialog.popup() - self._set_grid_state(True) + InformationDialog(_('Archiving Preferences Error'), msg) + + self._set_mam_box_state(True) - def _set_grid_state(self, state): - self._builder.get_object('preferences_grid').set_sensitive(state) + def _set_mam_box_state(self, state): + self._ui.mam_box.set_sensitive(state) def _jid_edited(self, renderer, path, new_text): - iter_ = self._pref_store.get_iter(path) - self._pref_store.set_value(iter_, 0, new_text) + iter_ = self._ui.preferences_store.get_iter(path) + self._ui.preferences_store.set_value(iter_, 0, new_text) def _pref_toggled(self, renderer, path): - iter_ = self._pref_store.get_iter(path) - current_value = self._pref_store[iter_][1] - self._pref_store.set_value(iter_, 1, not current_value) + iter_ = self._ui.preferences_store.get_iter(path) + current_value = self._ui.preferences_store[iter_][1] + self._ui.preferences_store.set_value(iter_, 1, not current_value) def _on_add(self, button): - self._pref_store.append(['', False]) + self._ui.preferences_store.append(['', False]) def _on_remove(self, button): - pref_view = self._builder.get_object('pref_view') - mod, paths = pref_view.get_selection().get_selected_rows() + mod, paths = self._ui.pref_view.get_selection().get_selected_rows() for path in paths: iter_ = mod.get_iter(path) - self._pref_store.remove(iter_) + self._ui.preferences_store.remove(iter_) def _on_save(self, button): self._activate_spinner() - self._set_grid_state(False) + self._set_mam_box_state(False) items = [] - default = self._default.get_active_id() - for item in self._pref_store: + default = self._ui.default_combo.get_active_id() + for item in self._ui.preferences_store: items.append((item[0].lower(), item[1])) self._con.get_module('MAM').set_mam_preferences(items, default) View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/acc18364970f1a383e889cc7cd8f765577… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/acc18364970f1a383e889cc7cd8f765577… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Fix is_groupchat call
by Philipp Hörist 22 Jun '19

22 Jun '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: ead6d4f2 by Philipp Hörist at 2019-06-22T08:46:10Z Fix is_groupchat call is_groupchat is now a property Fixes #9742 - - - - - 1 changed file: - gajim/gtk/start_chat.py Changes: ===================================== gajim/gtk/start_chat.py ===================================== @@ -98,7 +98,7 @@ class StartChatDialog(Gtk.ApplicationWindow): for jid in app.contacts.get_jid_list(account): contact = app.contacts.get_contact_with_highest_priority( account, jid) - if contact.is_groupchat(): + if contact.is_groupchat: continue row = ContactRow(account, contact, jid, contact.get_shown_name(), show_account) View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/ead6d4f2b0a0f8759ed38e74c6cbbcb471… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/ead6d4f2b0a0f8759ed38e74c6cbbcb471… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Dont make showing received marker a user action
by Philipp Hörist 22 Jun '19

22 Jun '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 35769b38 by Philipp Hörist at 2019-06-22T08:42:50Z Dont make showing received marker a user action - - - - - 1 changed file: - gajim/conversation_textview.py Changes: ===================================== gajim/conversation_textview.py ===================================== @@ -428,14 +428,12 @@ class ConversationTextview(GObject.GObject): return buffer_ = self.tv.get_buffer() - buffer_.begin_user_action() if app.config.get('positive_184_ack'): begin_iter = buffer_.get_iter_at_mark(self.xep0184_marks[id_]) buffer_.insert_with_tags_by_name(begin_iter, ' ✓', 'xep0184-received') - buffer_.end_user_action() del self.xep0184_marks[id_] def show_focus_out_line(self): View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/35769b38c238433bd7583388882e5d9d78… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/35769b38c238433bd7583388882e5d9d78… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] MessageWindow: Allow only JIDs as argument for get_control()
by Philipp Hörist 21 Jun '19

21 Jun '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 3d45a6e0 by Philipp Hörist at 2019-06-21T22:56:09Z MessageWindow: Allow only JIDs as argument for get_control() - - - - - 1 changed file: - gajim/message_window.py Changes: ===================================== gajim/message_window.py ===================================== @@ -732,25 +732,14 @@ class MessageWindow: def get_origin(self): return self.window.get_window().get_origin() - def get_control(self, key, acct): + def get_control(self, jid, acct): """ - Return the MessageControl for jid or n, where n is a notebook page index. - When key is an int index acct may be None + Return the MessageControl for jid """ - - if isinstance(key, str): - jid = key - try: - return self._controls[acct][jid] - except Exception: - return None - else: - page_num = key - notebook = self.notebook - if page_num is None: - page_num = notebook.get_current_page() - nth_child = notebook.get_nth_page(page_num) - return self._widget_to_control(nth_child) + try: + return self._controls[acct][jid] + except Exception: + return None def has_control(self, jid, acct): return acct in self._controls and jid in self._controls[acct] @@ -801,7 +790,9 @@ class MessageWindow: ind = ind - 1 if ind < 0: ind = self.notebook.get_n_pages() - 1 - ctrl = self.get_control(ind, None) + + nth_child = self.notebook.get_nth_page(ind) + ctrl = self._widget_to_control(nth_child) if ctrl.get_nb_unread() > 0: found = True break # found View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/3d45a6e0fc8c8fb805117dd8c347f4bd42… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/3d45a6e0fc8c8fb805117dd8c347f4bd42… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 3 commits: Replace file transfer notification icons with GTK icons
by Philipp Hörist 21 Jun '19

21 Jun '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 9fee0160 by Daniel Brötzmann at 2019-06-21T21:35:35Z Replace file transfer notification icons with GTK icons - - - - - e78e041b by Daniel Brötzmann at 2019-06-21T21:35:35Z Remove obsolete file transfer icons - - - - - fa434f54 by Daniel Brötzmann at 2019-06-21T21:35:35Z Clean up file transfer related code - - - - - 10 changed files: - − gajim/data/icons/hicolor/48x48/status/gajim-ft_done.png - − gajim/data/icons/hicolor/48x48/status/gajim-ft_error.png - − gajim/data/icons/hicolor/48x48/status/gajim-ft_request.png - − gajim/data/icons/hicolor/48x48/status/gajim-ft_stopped.png - − gajim/data/icons/hicolor/scalable/status/gajim-ft_done.svg - − gajim/data/icons/hicolor/scalable/status/gajim-ft_error.svg - − gajim/data/icons/hicolor/scalable/status/gajim-ft_request.svg - − gajim/data/icons/hicolor/scalable/status/gajim-ft_stopped.svg - − gajim/data/icons/hicolor/scalable/status/gajim-ft_stopsvg.svg - gajim/gui_interface.py Changes: ===================================== gajim/data/icons/hicolor/48x48/status/gajim-ft_done.png deleted ===================================== Binary files a/gajim/data/icons/hicolor/48x48/status/gajim-ft_done.png and /dev/null differ ===================================== gajim/data/icons/hicolor/48x48/status/gajim-ft_error.png deleted ===================================== Binary files a/gajim/data/icons/hicolor/48x48/status/gajim-ft_error.png and /dev/null differ ===================================== gajim/data/icons/hicolor/48x48/status/gajim-ft_request.png deleted ===================================== Binary files a/gajim/data/icons/hicolor/48x48/status/gajim-ft_request.png and /dev/null differ ===================================== gajim/data/icons/hicolor/48x48/status/gajim-ft_stopped.png deleted ===================================== Binary files a/gajim/data/icons/hicolor/48x48/status/gajim-ft_stopped.png and /dev/null differ ===================================== gajim/data/icons/hicolor/scalable/status/gajim-ft_done.svg deleted ===================================== @@ -1,694 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> - -<svg - xmlns:dc="http://purl.org/dc/elements/1.1/" - xmlns:cc="http://web.resource.org/cc/" - xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" - xmlns:svg="http://www.w3.org/2000/svg" - xmlns="http://www.w3.org/2000/svg" - xmlns:xlink="http://www.w3.org/1999/xlink" - xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" - xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - width="48px" - height="48px" - id="svg6398" - sodipodi:version="0.32" - inkscape:version="0.44+devel" - sodipodi:docbase="/home/cornelius/Desktop/GAJIM iconset/sources" - sodipodi:docname="ft_done.svg" - inkscape:output_extension="org.inkscape.output.svg.inkscape" - inkscape:export-filename="/home/cornelius/Desktop/GAJIM iconset/data/pixmaps/events/ft_done.png" - inkscape:export-xdpi="90" - inkscape:export-ydpi="90" - sodipodi:modified="TRUE"> - <defs - id="defs6400"> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient3126" - id="linearGradient4073" - gradientUnits="userSpaceOnUse" - gradientTransform="translate(51,2)" - x1="24.571428" - y1="43.141502" - x2="24.571428" - y2="45.021946" /> - <linearGradient - inkscape:collect="always" - id="linearGradient3126"> - <stop - style="stop-color:#eeeeec;stop-opacity:1;" - offset="0" - id="stop3128" /> - <stop - style="stop-color:#a9a99e;stop-opacity:1" - offset="1" - id="stop3130" /> - </linearGradient> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient3126" - id="linearGradient4075" - gradientUnits="userSpaceOnUse" - gradientTransform="translate(-2,45)" - x1="-41.57143" - y1="23.785715" - x2="-45.145054" - y2="23.785715" /> - <linearGradient - inkscape:collect="always" - id="linearGradient3650"> - <stop - style="stop-color:white;stop-opacity:1;" - offset="0" - id="stop3652" /> - <stop - style="stop-color:white;stop-opacity:0;" - offset="1" - id="stop3654" /> - </linearGradient> - <radialGradient - inkscape:collect="always" - xlink:href="#linearGradient3650" - id="radialGradient3656" - cx="20.541832" - cy="22.496302" - fx="20.541832" - fy="22.496302" - r="12.475384" - gradientUnits="userSpaceOnUse" /> - <linearGradient - id="linearGradient3630" - inkscape:collect="always"> - <stop - id="stop3632" - offset="0" - style="stop-color:#78a3d1;stop-opacity:1" /> - <stop - id="stop3634" - offset="1" - style="stop-color:#316396;stop-opacity:1" /> - </linearGradient> - <radialGradient - inkscape:collect="always" - xlink:href="#linearGradient3630" - id="radialGradient3660" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.651204,8.154067e-3,-8.829574e-3,0.708317,6.767187,5.820332)" - cx="18.883078" - cy="20.482094" - fx="18.883078" - fy="20.482094" - r="12.975384" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient3059" - id="linearGradient3085" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(-1,0,0,-1,52.06863,44.04156)" - x1="22.642857" - y1="24.571428" - x2="17.464285" - y2="35.392857" /> - <linearGradient - inkscape:collect="always" - id="linearGradient3059"> - <stop - style="stop-color:white;stop-opacity:1;" - offset="0" - id="stop3061" /> - <stop - style="stop-color:white;stop-opacity:0;" - offset="1" - id="stop3063" /> - </linearGradient> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient3059" - id="linearGradient3159" - gradientUnits="userSpaceOnUse" - gradientTransform="translate(-4,2)" - x1="22.642857" - y1="24.571428" - x2="17.464285" - y2="35.392857" /> - <linearGradient - id="linearGradient5060" - inkscape:collect="always"> - <stop - id="stop5062" - offset="0" - style="stop-color:black;stop-opacity:1;" /> - <stop - id="stop5064" - offset="1" - style="stop-color:black;stop-opacity:0;" /> - </linearGradient> - <linearGradient - id="linearGradient5048"> - <stop - id="stop5050" - offset="0" - style="stop-color:black;stop-opacity:0;" /> - <stop - style="stop-color:black;stop-opacity:1;" - offset="0.5" - id="stop5056" /> - <stop - id="stop5052" - offset="1" - style="stop-color:black;stop-opacity:0;" /> - </linearGradient> - <linearGradient - inkscape:collect="always" - id="linearGradient6166"> - <stop - style="stop-color:#73d216;stop-opacity:1" - offset="0" - id="stop6168" /> - <stop - style="stop-color:#66ba13;stop-opacity:1" - offset="1" - id="stop6170" /> - </linearGradient> - <linearGradient - id="linearGradient3058" - inkscape:collect="always"> - <stop - id="stop3060" - offset="0" - style="stop-color:#ffffff;stop-opacity:1" /> - <stop - id="stop3062" - offset="1" - style="stop-color:#ececec;stop-opacity:1" /> - </linearGradient> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient3058" - id="linearGradient6146" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.829269,0,0,1.538463,54.597559,-17.269227)" - x1="19.293913" - y1="15.841996" - x2="19.293913" - y2="38.184418" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient5048" - id="linearGradient6502" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(3.4230519,0,0,1.892176,-1463.9294,-825.6305)" - x1="512.28497" - y1="365.21631" - x2="512.28497" - y2="609.5199" /> - <radialGradient - inkscape:collect="always" - xlink:href="#linearGradient5060" - id="radialGradient6504" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(2.746819,0,0,1.900281,-1055.7171,-828.6181)" - cx="602.65948" - cy="488.07959" - fx="602.65948" - fy="488.07959" - r="117.14286" /> - <radialGradient - inkscape:collect="always" - xlink:href="#linearGradient5060" - id="radialGradient6506" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(-2.74682,0,0,1.900281,602.2346,-828.6181)" - cx="605.71429" - cy="486.64789" - fx="605.71429" - fy="486.64789" - r="117.14286" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient6166" - id="linearGradient6546" - gradientUnits="userSpaceOnUse" - gradientTransform="translate(33,26)" - x1="0.76677579" - y1="12.333853" - x2="8.8127251" - y2="18.376608" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient6166" - id="linearGradient7101" - gradientUnits="userSpaceOnUse" - gradientTransform="translate(33,26)" - x1="0.76677579" - y1="12.333853" - x2="8.8127251" - y2="18.376608" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient5048" - id="linearGradient7149" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(3.4230519,0,0,1.892176,-1463.9294,-825.6305)" - x1="512.28497" - y1="365.21631" - x2="512.28497" - y2="609.5199" /> - <radialGradient - inkscape:collect="always" - xlink:href="#linearGradient5060" - id="radialGradient7151" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(2.746819,0,0,1.900281,-1055.7171,-828.6181)" - cx="602.65948" - cy="488.07959" - fx="602.65948" - fy="488.07959" - r="117.14286" /> - <radialGradient - inkscape:collect="always" - xlink:href="#linearGradient5060" - id="radialGradient7153" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(-2.74682,0,0,1.900281,602.2346,-828.6181)" - cx="605.71429" - cy="486.64789" - fx="605.71429" - fy="486.64789" - r="117.14286" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient3058" - id="linearGradient7155" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.829269,0,0,1.538463,4.597559,-17.269227)" - x1="19.293913" - y1="15.841996" - x2="19.293913" - y2="38.184418" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient3059" - id="linearGradient7157" - gradientUnits="userSpaceOnUse" - gradientTransform="translate(-4,2)" - x1="22.642857" - y1="24.571428" - x2="17.464285" - y2="35.392857" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient3059" - id="linearGradient7159" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(-1,0,0,-1,52.06863,44.04156)" - x1="22.642857" - y1="24.571428" - x2="17.464285" - y2="35.392857" /> - </defs> - <sodipodi:namedview - id="base" - pagecolor="#ffffff" - bordercolor="#666666" - borderopacity="1.0" - inkscape:pageopacity="0.0" - inkscape:pageshadow="2" - inkscape:zoom="19.79899" - inkscape:cx="37.831995" - inkscape:cy="13.641416" - inkscape:current-layer="g7096" - showgrid="true" - inkscape:grid-bbox="true" - inkscape:document-units="px" - inkscape:window-width="872" - inkscape:window-height="885" - inkscape:window-x="0" - inkscape:window-y="26" /> - <metadata - id="metadata6403"> - <rdf:RDF> - <cc:Work - rdf:about=""> - <dc:format>image/svg+xml</dc:format> - <dc:type - rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> - </cc:Work> - </rdf:RDF> - </metadata> - <g - id="layer1" - inkscape:label="Layer 1" - inkscape:groupmode="layer"> - <g - style="opacity:0.48034931;display:inline" - transform="matrix(1.754551e-2,0,0,1.733565e-2,78.478325,41.28602)" - id="g3197"> - <rect - style="opacity:0.40206185;color:#000000;fill:url(#linearGradient6502);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" - id="rect3199" - width="1652.8442" - height="459.52847" - x="-1053.1652" - y="-131.86813" /> - <path - style="opacity:0.40200004;color:#000000;fill:url(#radialGradient6504);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" - d="M 599.67934,-131.86814 C 599.67934,-131.86814 599.67934,329.60325 599.67934,329.60325 C 741.1337,330.47196 941.64732,226.21092 941.64722,98.837854 C 941.64722,-28.535234 783.79474,-131.86813 599.67934,-131.86814 z " - id="path3201" - sodipodi:nodetypes="cccc" /> - <path - sodipodi:nodetypes="cccc" - id="path3203" - d="M -1053.1653,-131.86814 C -1053.1653,-131.86814 -1053.1653,329.60325 -1053.1653,329.60325 C -1194.6198,330.47196 -1395.1333,226.21093 -1395.1333,98.837855 C -1395.1333,-28.535231 -1237.2808,-131.86812 -1053.1653,-131.86814 z " - style="opacity:0.40200004;color:#000000;fill:url(#radialGradient6506);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" /> - </g> - <rect - style="color:#000000;fill:url(#linearGradient6146);fill-opacity:1;fill-rule:evenodd;stroke:#62645f;stroke-width:1.00000024px;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" - id="rect3056" - width="34" - height="40.000004" - x="57.5" - y="3.5000002" - rx="2.0101535" - ry="2.0101528" /> - <rect - ry="0.98774666" - rx="0.9877466" - y="4.5" - x="58.5" - height="38" - width="31.999998" - id="rect3086" - style="color:#000000;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> - <g - id="g3544" - transform="translate(19.499997,-58)"> - <path - transform="matrix(0.881736,0,0,0.879764,32.79151,9.131509)" - d="M 35.96143 26.534258 A 12.475384 12.475384 0 1 1 11.010662,26.534258 A 12.475384 12.475384 0 1 1 35.96143 26.534258 z" - sodipodi:ry="12.475384" - sodipodi:rx="12.475384" - sodipodi:cy="26.534258" - sodipodi:cx="23.486046" - id="path3447" - style="color:#000000;fill:url(#radialGradient3660);fill-opacity:1;fill-rule:evenodd;stroke:#204a87;stroke-width:1.13539636px;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" - sodipodi:type="arc" /> - <path - style="opacity:0.6419214;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.85547471px;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" - d="M 51,23.250484 C 51,23.250484 52.268922,24.994204 56,23.162342 C 56,23.162342 51.950634,22.743969 51,23.250484 z " - id="path3455" /> - <path - style="opacity:0.6419214;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.85547471px;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" - d="M 50.06066,41.474692 C 50.06066,41.474692 51.012627,41.331014 52.069448,41.066019 C 53.12627,40.801025 54.711501,41.419346 55.239912,41.419346 C 55.768322,41.419346 56.951687,41.345421 56.951687,41.345421 C 53.882204,42.534757 51.337539,41.67741 50.06066,41.474692 z " - id="path3461" - sodipodi:nodetypes="csscc" /> - <path - id="path3517" - d="M 55.830738,27 C 55.866219,27.677344 56.193176,28.442404 55.830738,29 C 55.772387,29.526189 55.385923,29.262453 54.999991,29 C 54.995206,28.163786 55.395554,27.57141 55.830738,27 z " - style="opacity:0.6419214;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.85547471px;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" - sodipodi:nodetypes="cccc" /> - <path - style="opacity:0.6419214;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.85547471px;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" - d="M 58.957107,24.740283 C 58.448524,25.124153 58.192827,26.096156 57.660188,27.031073 C 57.660188,27.031073 57.229592,27.857143 56.846938,28.303571 C 56.464286,28.75 56.464286,29.642857 56.464286,29.642857 L 55.11686,30.283176 L 55.571429,31.428571 L 56.464286,31.428571 L 57.256127,30.889267 L 58.26628,30.551994 L 59.748948,30.703517 L 61.239756,31.545866 L 63.084119,32.218746 L 63.067839,30.956055 C 63.158093,30.883776 62.174867,26.437385 58.957107,24.740283 z " - id="path3459" - sodipodi:nodetypes="ccsccccccccccc" /> - <path - style="opacity:0.6419214;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.85547471px;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" - d="M 36,34 L 37,34 L 38,33.554819 L 39,33.504311 L 40,34 L 41,34 L 42,35 L 42,36 L 42,37 L 41.466762,39 L 41,40.423856 L 40,41.484516 L 39,41 L 38,37 L 36,37 L 35,36 C 35,36 35,35 35,35 L 36,34 z " - id="path3624" - transform="translate(20,-2)" /> - <path - style="opacity:0.6419214;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.85547471px;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" - d="M 48.228975,39.513201 C 48.228975,39.513201 48.647849,40.420015 49.119833,39.758317 C 49.528836,39.184916 50,37.605352 50,37.158051 C 50,36.194569 49.991009,34.374714 49.991009,34.374714 L 49.561738,32.914818 L 47.164561,32 L 45.572437,32.340642 L 45,33.450113 C 45.077341,35.330718 45.86494,36.227763 47.254013,36.291895 L 47.611813,37.576456 L 48.228975,39.513201 z " - id="path3628" - sodipodi:nodetypes="csscccccccc" /> - <path - style="opacity:0.6419214;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.85547471px;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" - d="M 29.212183,26.090863 C 29.212183,26.090863 29,28 31,27 C 31,27 30.010153,29.050508 30.010153,29.050508 L 27.646447,30.444416 L 25.989847,30.989847 L 25,32 L 24.445692,33 L 26.010153,32.93934 L 24,34 C 24,34 23.991123,28.756594 29.212183,26.090863 z " - id="path3636" - transform="translate(20,-2)" - sodipodi:nodetypes="cccccccccc" /> - <path - sodipodi:type="arc" - style="opacity:0.63318775;color:#000000;fill:url(#radialGradient3656);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.13539636px;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" - id="path3640" - sodipodi:cx="23.486046" - sodipodi:cy="26.534258" - sodipodi:rx="12.475384" - sodipodi:ry="12.475384" - d="M 35.96143 26.534258 A 12.475384 12.475384 0 1 1 11.010662,26.534258 A 12.475384 12.475384 0 1 1 35.96143 26.534258 z" - transform="matrix(0.921905,0,0,0.919843,31.8481,8.068044)" /> - <path - sodipodi:type="arc" - style="opacity:0.72925762;color:#000000;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:1.24261963px;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" - id="path3449" - sodipodi:cx="23.486046" - sodipodi:cy="26.534258" - sodipodi:rx="12.475384" - sodipodi:ry="12.475384" - d="M 35.96143 26.534258 A 12.475384 12.475384 0 1 1 11.010662,26.534258 A 12.475384 12.475384 0 1 1 35.96143 26.534258 z" - transform="matrix(0.807937,0,0,0.801578,34.60409,11.23071)" /> - </g> - <path - sodipodi:type="arc" - style="opacity:1;color:#000000;fill:#555753;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.00000024px;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" - id="path6510" - sodipodi:cx="9.75" - sodipodi:cy="19.5" - sodipodi:rx="0.39285713" - sodipodi:ry="0.5" - d="M 10.142857 19.5 A 0.39285713 0.5 0 1 1 9.3571429,19.5 A 0.39285713 0.5 0 1 1 10.142857 19.5 z" - transform="matrix(2.5454547,0,0,2,36.181817,-23)" /> - <path - transform="matrix(2.5454547,0,0,2,36.181817,-6)" - d="M 10.142857 19.5 A 0.39285713 0.5 0 1 1 9.3571429,19.5 A 0.39285713 0.5 0 1 1 10.142857 19.5 z" - sodipodi:ry="0.5" - sodipodi:rx="0.39285713" - sodipodi:cy="19.5" - sodipodi:cx="9.75" - id="path6522" - style="opacity:1;color:#000000;fill:#555753;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.00000024px;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" - sodipodi:type="arc" /> - <rect - style="opacity:1;color:#000000;fill:#d3d3d3;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.00000024px;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" - id="rect6524" - width="1" - height="33" - x="63" - y="7" /> - <rect - y="8" - x="64" - height="33" - width="1" - id="rect6526" - style="opacity:1;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.00000024px;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> - <rect - style="opacity:1;color:#000000;fill:#d3d3d3;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.00000024px;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" - id="rect6528" - width="21" - height="1" - x="67" - y="10" /> - <rect - y="13" - x="67" - height="1" - width="21" - id="rect6530" - style="opacity:1;color:#000000;fill:#d3d3d3;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.00000024px;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> - <rect - style="opacity:1;color:#000000;fill:#d3d3d3;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.00000024px;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" - id="rect6532" - width="21" - height="1" - x="67" - y="16" /> - <rect - y="19" - x="67" - height="1" - width="21" - id="rect6534" - style="opacity:1;color:#000000;fill:#d3d3d3;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.00000024px;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> - <rect - style="opacity:1;color:#000000;fill:#d3d3d3;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.00000024px;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" - id="rect6536" - width="17" - height="1" - x="67" - y="22" /> - <g - id="g3075" - transform="matrix(1.022771,0.2471105,-0.2860292,0.9681745,54.590241,-3.0518735)"> - <path - sodipodi:nodetypes="ccccccc" - id="path2167" - d="M 22.059679,38.534736 C 4.5188777,35.596951 9.098902,22.50001 9.098902,22.50001 C 8.996083,22.592006 8.474656,34.169298 22.54319,32.546946 L 22.866877,28.866511 L 28.5,35.9627 L 21.84406,41.750019 L 22.059679,38.534736 z " - style="fill:#8ae234;fill-rule:evenodd;stroke:#4e9a06;stroke-width:0.9708733px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /> - <path - sodipodi:nodetypes="ccccc" - id="path2169" - d="M 9.068628,26.158086 C 9.81595,36.798392 19.978022,36.321095 28,35.84375 L 23.3125,30.245536 L 23.004464,33.040179 C 11.269522,34.509157 9.164634,26.698762 9.068628,26.158086 z " - style="opacity:1;color:#000000;fill:url(#linearGradient3159);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.97521734px;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> - <path - style="opacity:0.46724889;color:#000000;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:0.970873px;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" - d="M 23.075462,37.82364 C 9.9572548,35.643661 9.7145549,28.181175 9.7145549,28.181175 C 9.5413293,28.724886 12.550929,34.894947 23.655497,33.538956 L 23.663307,31.509449 L 27.007638,35.838018 L 23.00256,39.371918 L 23.075462,37.82364 z " - id="path3152" - sodipodi:nodetypes="ccccccc" /> - </g> - <g - id="g3079" - transform="matrix(1.022771,0.2471105,-0.2860282,0.9681743,59.140349,-6.8892749)"> - <path - style="fill:#8ae234;fill-rule:evenodd;stroke:#4e9a06;stroke-width:0.97087353px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" - d="M 26.000192,7.715293 C 44.925244,8.6708703 38.482486,23.677818 38.482486,23.677818 C 38.634006,23.273368 39.876434,10.212335 25.516681,13.703083 L 25.192994,17.383518 L 19.559871,10.287329 L 26.215811,4.50001 L 26.000192,7.715293 z " - id="path3067" - sodipodi:nodetypes="ccccccc" /> - <path - style="opacity:1;color:#000000;fill:url(#linearGradient3085);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.97521734px;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" - d="M 39,19.88348 C 37.494783,7.7784775 28.090606,9.720471 20.068628,10.197816 L 24.756128,15.79603 L 25.135593,13.215673 C 37.23065,10.209062 38.903994,19.342804 39,19.88348 z " - id="path3069" - sodipodi:nodetypes="ccccc" /> - <path - style="opacity:0.46724889;color:#000000;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:0.970873px;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" - d="M 25.064642,8.6570118 C 37.812447,7.9827438 39.360979,18.198885 38.963366,18.571596 C 39.191185,17.79478 36.267031,9.900081 24.796676,12.817922 L 24.50188,15.015191 L 20.981967,10.378704 L 25.11004,6.7729057 L 25.064642,8.6570118 z " - id="path3154" - sodipodi:nodetypes="ccccccc" /> - </g> - <g - id="g7103" - transform="matrix(1.754551e-2,0,0,1.733565e-2,28.478325,41.28602)" - style="opacity:0.48034931;display:inline"> - <rect - y="-131.86813" - x="-1053.1652" - height="459.52847" - width="1652.8442" - id="rect7105" - style="opacity:0.40206185;color:#000000;fill:url(#linearGradient7149);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" /> - <path - sodipodi:nodetypes="cccc" - id="path7107" - d="M 599.67934,-131.86814 C 599.67934,-131.86814 599.67934,329.60325 599.67934,329.60325 C 741.1337,330.47196 941.64732,226.21092 941.64722,98.837854 C 941.64722,-28.535234 783.79474,-131.86813 599.67934,-131.86814 z " - style="opacity:0.40200004;color:#000000;fill:url(#radialGradient7151);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" /> - <path - style="opacity:0.40200004;color:#000000;fill:url(#radialGradient7153);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" - d="M -1053.1653,-131.86814 C -1053.1653,-131.86814 -1053.1653,329.60325 -1053.1653,329.60325 C -1194.6198,330.47196 -1395.1333,226.21093 -1395.1333,98.837855 C -1395.1333,-28.535231 -1237.2808,-131.86812 -1053.1653,-131.86814 z " - id="path7109" - sodipodi:nodetypes="cccc" /> - </g> - <rect - ry="2.0101528" - rx="2.0101535" - y="3.5000002" - x="7.5" - height="40.000004" - width="34" - id="rect7111" - style="color:#000000;fill:url(#linearGradient7155);fill-opacity:1;fill-rule:evenodd;stroke:#62645f;stroke-width:1.00000024px;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> - <rect - style="color:#000000;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" - id="rect7113" - width="31.999998" - height="38" - x="8.5" - y="4.5" - rx="0.9877466" - ry="0.98774666" /> - <path - transform="matrix(2.5454547,0,0,2,-13.818183,-23)" - d="M 10.142857 19.5 A 0.39285713 0.5 0 1 1 9.3571429,19.5 A 0.39285713 0.5 0 1 1 10.142857 19.5 z" - sodipodi:ry="0.5" - sodipodi:rx="0.39285713" - sodipodi:cy="19.5" - sodipodi:cx="9.75" - id="path7115" - style="opacity:1;color:#000000;fill:#555753;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.00000024px;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" - sodipodi:type="arc" /> - <path - sodipodi:type="arc" - style="opacity:1;color:#000000;fill:#555753;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.00000024px;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" - id="path7117" - sodipodi:cx="9.75" - sodipodi:cy="19.5" - sodipodi:rx="0.39285713" - sodipodi:ry="0.5" - d="M 10.142857 19.5 A 0.39285713 0.5 0 1 1 9.3571429,19.5 A 0.39285713 0.5 0 1 1 10.142857 19.5 z" - transform="matrix(2.5454547,0,0,2,-13.818183,-6)" /> - <rect - y="7" - x="13" - height="33" - width="1" - id="rect7119" - style="opacity:1;color:#000000;fill:#d3d3d3;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.00000024px;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> - <rect - style="opacity:1;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.00000024px;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" - id="rect7121" - width="1" - height="33" - x="14" - y="8" /> - <rect - y="10" - x="17" - height="1" - width="21" - id="rect7123" - style="opacity:1;color:#000000;fill:#d3d3d3;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.00000024px;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> - <rect - style="opacity:1;color:#000000;fill:#d3d3d3;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.00000024px;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" - id="rect7125" - width="21" - height="1" - x="17" - y="13" /> - <rect - y="16" - x="17" - height="1" - width="21" - id="rect7127" - style="opacity:1;color:#000000;fill:#d3d3d3;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.00000024px;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> - <rect - style="opacity:1;color:#000000;fill:#d3d3d3;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.00000024px;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" - id="rect7129" - width="21" - height="1" - x="17" - y="19" /> - <rect - y="22" - x="17" - height="1" - width="17" - id="rect7131" - style="opacity:1;color:#000000;fill:#d3d3d3;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.00000024px;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> - <g - id="g7096" - transform="translate(-19,0)"> - <path - transform="matrix(1.5084945,0,0,1.5084945,2.1571448,-22.183926)" - d="M 40.002039 39.565228 A 5.3033009 5.3033009 0 1 1 29.395437,39.565228 A 5.3033009 5.3033009 0 1 1 40.002039 39.565228 z" - sodipodi:ry="5.3033009" - sodipodi:rx="5.3033009" - sodipodi:cy="39.565228" - sodipodi:cx="34.698738" - id="path6542" - style="opacity:1;color:#000000;fill:url(#linearGradient7101);fill-opacity:1;fill-rule:nonzero;stroke:#4e9a06;stroke-width:0.66291261;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" - sodipodi:type="arc" /> - <path - sodipodi:type="arc" - style="opacity:0.5414847;color:#000000;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:0.75761431;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" - id="path6550" - sodipodi:cx="34.698738" - sodipodi:cy="39.565228" - sodipodi:rx="5.3033009" - sodipodi:ry="5.3033009" - d="M 40.002039 39.565228 A 5.3033009 5.3033009 0 1 1 29.395437,39.565228 A 5.3033009 5.3033009 0 1 1 40.002039 39.565228 z" - transform="matrix(1.3199326,0,0,1.3199328,8.7000044,-14.723441)" /> - </g> - </g> -</svg> ===================================== gajim/data/icons/hicolor/scalable/status/gajim-ft_error.svg deleted ===================================== @@ -1,366 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> - -<svg - xmlns:dc="http://purl.org/dc/elements/1.1/" - xmlns:cc="http://web.resource.org/cc/" - xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" - xmlns:svg="http://www.w3.org/2000/svg" - xmlns="http://www.w3.org/2000/svg" - xmlns:xlink="http://www.w3.org/1999/xlink" - xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" - xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - width="48px" - height="48px" - id="svg6398" - sodipodi:version="0.32" - inkscape:version="0.44+devel" - sodipodi:docbase="/home/cornelius/Desktop/GAJIM iconset/sources" - sodipodi:docname="ft_error.svg" - inkscape:output_extension="org.inkscape.output.svg.inkscape" - inkscape:export-filename="/home/cornelius/Desktop/GAJIM iconset/data/pixmaps/events/ft_error.png" - inkscape:export-xdpi="90" - inkscape:export-ydpi="90" - sodipodi:modified="true"> - <defs - id="defs6400"> - <linearGradient - inkscape:collect="always" - id="linearGradient7188"> - <stop - style="stop-color:#ef2929;stop-opacity:1" - offset="0" - id="stop7190" /> - <stop - style="stop-color:#cc0000;stop-opacity:1" - offset="1" - id="stop7192" /> - </linearGradient> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient7188" - id="linearGradient7194" - x1="22.801796" - y1="18.995821" - x2="36.166046" - y2="40.61446" - gradientUnits="userSpaceOnUse" /> - <linearGradient - inkscape:collect="always" - id="linearGradient7170"> - <stop - style="stop-color:#f13c3c;stop-opacity:1" - offset="0" - id="stop7172" /> - <stop - style="stop-color:#ef2929;stop-opacity:1" - offset="1" - id="stop7174" /> - </linearGradient> - <linearGradient - inkscape:collect="always" - id="linearGradient3650"> - <stop - style="stop-color:white;stop-opacity:1;" - offset="0" - id="stop3652" /> - <stop - style="stop-color:white;stop-opacity:0;" - offset="1" - id="stop3654" /> - </linearGradient> - <radialGradient - inkscape:collect="always" - xlink:href="#linearGradient3650" - id="radialGradient3656" - cx="20.541832" - cy="22.496302" - fx="20.541832" - fy="22.496302" - r="12.475384" - gradientUnits="userSpaceOnUse" /> - <linearGradient - id="linearGradient3630" - inkscape:collect="always"> - <stop - id="stop3632" - offset="0" - style="stop-color:#78a3d1;stop-opacity:1" /> - <stop - id="stop3634" - offset="1" - style="stop-color:#316396;stop-opacity:1" /> - </linearGradient> - <radialGradient - inkscape:collect="always" - xlink:href="#linearGradient3630" - id="radialGradient3660" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.651204,8.154067e-3,-8.829574e-3,0.708317,6.767187,5.820332)" - cx="18.883078" - cy="20.482094" - fx="18.883078" - fy="20.482094" - r="12.975384" /> - <linearGradient - id="linearGradient5060" - inkscape:collect="always"> - <stop - id="stop5062" - offset="0" - style="stop-color:black;stop-opacity:1;" /> - <stop - id="stop5064" - offset="1" - style="stop-color:black;stop-opacity:0;" /> - </linearGradient> - <linearGradient - id="linearGradient5048"> - <stop - id="stop5050" - offset="0" - style="stop-color:black;stop-opacity:0;" /> - <stop - style="stop-color:black;stop-opacity:1;" - offset="0.5" - id="stop5056" /> - <stop - id="stop5052" - offset="1" - style="stop-color:black;stop-opacity:0;" /> - </linearGradient> - <linearGradient - id="linearGradient3058" - inkscape:collect="always"> - <stop - id="stop3060" - offset="0" - style="stop-color:#ffffff;stop-opacity:1" /> - <stop - id="stop3062" - offset="1" - style="stop-color:#ececec;stop-opacity:1" /> - </linearGradient> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient5048" - id="linearGradient7149" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(3.4230519,0,0,1.892176,-1463.9294,-825.6305)" - x1="512.28497" - y1="365.21631" - x2="512.28497" - y2="609.5199" /> - <radialGradient - inkscape:collect="always" - xlink:href="#linearGradient5060" - id="radialGradient7151" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(2.746819,0,0,1.900281,-1055.7171,-828.6181)" - cx="602.65948" - cy="488.07959" - fx="602.65948" - fy="488.07959" - r="117.14286" /> - <radialGradient - inkscape:collect="always" - xlink:href="#linearGradient5060" - id="radialGradient7153" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(-2.74682,0,0,1.900281,602.2346,-828.6181)" - cx="605.71429" - cy="486.64789" - fx="605.71429" - fy="486.64789" - r="117.14286" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient3058" - id="linearGradient7155" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.829269,0,0,1.538463,4.597559,-17.269227)" - x1="19.293913" - y1="15.841996" - x2="19.293913" - y2="38.184418" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient7170" - id="linearGradient7176" - x1="30.827738" - y1="22.807632" - x2="35.874142" - y2="39.729187" - gradientUnits="userSpaceOnUse" /> - </defs> - <sodipodi:namedview - id="base" - pagecolor="#ffffff" - bordercolor="#666666" - borderopacity="1.0" - inkscape:pageopacity="0.0" - inkscape:pageshadow="2" - inkscape:zoom="28" - inkscape:cx="38.061411" - inkscape:cy="8.6054004" - inkscape:current-layer="g7096" - showgrid="true" - inkscape:grid-bbox="true" - inkscape:document-units="px" - inkscape:window-width="872" - inkscape:window-height="861" - inkscape:window-x="0" - inkscape:window-y="50" /> - <metadata - id="metadata6403"> - <rdf:RDF> - <cc:Work - rdf:about=""> - <dc:format>image/svg+xml</dc:format> - <dc:type - rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> - </cc:Work> - </rdf:RDF> - </metadata> - <g - id="layer1" - inkscape:label="Layer 1" - inkscape:groupmode="layer"> - <g - id="g7103" - transform="matrix(1.754551e-2,0,0,1.733565e-2,28.478325,41.28602)" - style="opacity:0.48034931;display:inline"> - <rect - y="-131.86813" - x="-1053.1652" - height="459.52847" - width="1652.8442" - id="rect7105" - style="opacity:0.40206185;color:#000000;fill:url(#linearGradient7149);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" /> - <path - sodipodi:nodetypes="cccc" - id="path7107" - d="M 599.67934,-131.86814 C 599.67934,-131.86814 599.67934,329.60325 599.67934,329.60325 C 741.1337,330.47196 941.64732,226.21092 941.64722,98.837854 C 941.64722,-28.535234 783.79474,-131.86813 599.67934,-131.86814 z " - style="opacity:0.40200004;color:#000000;fill:url(#radialGradient7151);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" /> - <path - style="opacity:0.40200004;color:#000000;fill:url(#radialGradient7153);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" - d="M -1053.1653,-131.86814 C -1053.1653,-131.86814 -1053.1653,329.60325 -1053.1653,329.60325 C -1194.6198,330.47196 -1395.1333,226.21093 -1395.1333,98.837855 C -1395.1333,-28.535231 -1237.2808,-131.86812 -1053.1653,-131.86814 z " - id="path7109" - sodipodi:nodetypes="cccc" /> - </g> - <rect - ry="2.0101528" - rx="2.0101535" - y="3.5000002" - x="7.5" - height="40.000004" - width="34" - id="rect7111" - style="color:#000000;fill:url(#linearGradient7155);fill-opacity:1;fill-rule:evenodd;stroke:#62645f;stroke-width:1.00000024px;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> - <rect - style="color:#000000;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" - id="rect7113" - width="31.999998" - height="38" - x="8.5" - y="4.5" - rx="0.9877466" - ry="0.98774666" /> - <path - transform="matrix(2.5454547,0,0,2,-13.818183,-23)" - d="M 10.142857 19.5 A 0.39285713 0.5 0 1 1 9.3571429,19.5 A 0.39285713 0.5 0 1 1 10.142857 19.5 z" - sodipodi:ry="0.5" - sodipodi:rx="0.39285713" - sodipodi:cy="19.5" - sodipodi:cx="9.75" - id="path7115" - style="opacity:1;color:#000000;fill:#555753;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.00000024px;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" - sodipodi:type="arc" /> - <path - sodipodi:type="arc" - style="opacity:1;color:#000000;fill:#555753;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.00000024px;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" - id="path7117" - sodipodi:cx="9.75" - sodipodi:cy="19.5" - sodipodi:rx="0.39285713" - sodipodi:ry="0.5" - d="M 10.142857 19.5 A 0.39285713 0.5 0 1 1 9.3571429,19.5 A 0.39285713 0.5 0 1 1 10.142857 19.5 z" - transform="matrix(2.5454547,0,0,2,-13.818183,-6)" /> - <rect - y="7" - x="13" - height="33" - width="1" - id="rect7119" - style="opacity:1;color:#000000;fill:#d3d3d3;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.00000024px;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> - <rect - style="opacity:1;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.00000024px;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" - id="rect7121" - width="1" - height="33" - x="14" - y="8" /> - <rect - y="10" - x="17" - height="1" - width="21" - id="rect7123" - style="opacity:1;color:#000000;fill:#d3d3d3;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.00000024px;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> - <rect - style="opacity:1;color:#000000;fill:#d3d3d3;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.00000024px;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" - id="rect7125" - width="21" - height="1" - x="17" - y="13" /> - <rect - y="16" - x="17" - height="1" - width="21" - id="rect7127" - style="opacity:1;color:#000000;fill:#d3d3d3;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.00000024px;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> - <rect - style="opacity:1;color:#000000;fill:#d3d3d3;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.00000024px;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" - id="rect7129" - width="21" - height="1" - x="17" - y="19" /> - <rect - y="22" - x="17" - height="1" - width="17" - id="rect7131" - style="opacity:1;color:#000000;fill:#d3d3d3;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.00000024px;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> - <g - id="g7096" - transform="translate(-19,0)"> - <path - transform="matrix(1.5084947,0,0,1.5084945,2.1571395,-22.183927)" - d="M 40.002039 39.565228 A 5.3033009 5.3033009 0 1 1 29.395437,39.565228 A 5.3033009 5.3033009 0 1 1 40.002039 39.565228 z" - sodipodi:ry="5.3033009" - sodipodi:rx="5.3033009" - sodipodi:cy="39.565228" - sodipodi:cx="34.698738" - id="path6542" - style="opacity:1;color:#000000;fill:url(#linearGradient7194);fill-opacity:1;fill-rule:nonzero;stroke:#cc0000;stroke-width:0.66291249;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" - sodipodi:type="arc" /> - <path - sodipodi:type="arc" - style="opacity:0.5414847;color:#000000;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:0.75761431;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" - id="path6550" - sodipodi:cx="34.698738" - sodipodi:cy="39.565228" - sodipodi:rx="5.3033009" - sodipodi:ry="5.3033009" - d="M 40.002039 39.565228 A 5.3033009 5.3033009 0 1 1 29.395437,39.565228 A 5.3033009 5.3033009 0 1 1 40.002039 39.565228 z" - transform="matrix(1.3199327,0,0,1.3199327,8.7000014,-14.723438)" /> - <path - style="opacity:1;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.99999988;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" - d="M 51,35.5 L 53,37.5 L 51,39.5 L 52.5,41 L 54.5,39 L 56.5,41 L 58,39.5 L 56,37.5 L 58,35.5 L 56.5,34 L 54.5,36 L 52.5,34 L 51,35.5 z " - id="rect7624" /> - </g> - </g> -</svg> ===================================== gajim/data/icons/hicolor/scalable/status/gajim-ft_request.svg deleted ===================================== @@ -1,321 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> - -<svg - xmlns:dc="http://purl.org/dc/elements/1.1/" - xmlns:cc="http://web.resource.org/cc/" - xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" - xmlns:svg="http://www.w3.org/2000/svg" - xmlns="http://www.w3.org/2000/svg" - xmlns:xlink="http://www.w3.org/1999/xlink" - xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" - xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - width="48px" - height="48px" - id="svg9400" - sodipodi:version="0.32" - inkscape:version="0.44+devel" - sodipodi:docbase="/home/cornelius/Desktop/GAJIM iconset/sources" - sodipodi:docname="ft_request.svg" - inkscape:output_extension="org.inkscape.output.svg.inkscape" - inkscape:export-filename="/home/cornelius/Desktop/GAJIM iconset/data/pixmaps/events/ft_request.png" - inkscape:export-xdpi="90" - inkscape:export-ydpi="90" - sodipodi:modified="TRUE"> - <defs - id="defs9402"> - <radialGradient - inkscape:collect="always" - xlink:href="#linearGradient5060" - id="radialGradient6506" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(-2.74682,0,0,1.900281,602.2346,-828.6181)" - cx="605.71429" - cy="486.64789" - fx="605.71429" - fy="486.64789" - r="117.14286" /> - <linearGradient - id="linearGradient5060" - inkscape:collect="always"> - <stop - id="stop5062" - offset="0" - style="stop-color:black;stop-opacity:1;" /> - <stop - id="stop5064" - offset="1" - style="stop-color:black;stop-opacity:0;" /> - </linearGradient> - <radialGradient - inkscape:collect="always" - xlink:href="#linearGradient5060" - id="radialGradient6504" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(2.746819,0,0,1.900281,-1055.7171,-828.6181)" - cx="602.65948" - cy="488.07959" - fx="602.65948" - fy="488.07959" - r="117.14286" /> - <linearGradient - id="linearGradient5048"> - <stop - id="stop5050" - offset="0" - style="stop-color:black;stop-opacity:0;" /> - <stop - style="stop-color:black;stop-opacity:1;" - offset="0.5" - id="stop5056" /> - <stop - id="stop5052" - offset="1" - style="stop-color:black;stop-opacity:0;" /> - </linearGradient> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient5048" - id="linearGradient6502" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(3.4230519,0,0,1.892176,-1463.9294,-825.6305)" - x1="512.28497" - y1="365.21631" - x2="512.28497" - y2="609.5199" /> - <linearGradient - id="linearGradient3058" - inkscape:collect="always"> - <stop - id="stop3060" - offset="0" - style="stop-color:#ffffff;stop-opacity:1" /> - <stop - id="stop3062" - offset="1" - style="stop-color:#ececec;stop-opacity:1" /> - </linearGradient> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient3058" - id="linearGradient6146" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.829269,0,0,1.538463,4.597559,-17.269227)" - x1="19.293913" - y1="15.841996" - x2="19.293913" - y2="38.184418" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient3059" - id="linearGradient3159" - gradientUnits="userSpaceOnUse" - gradientTransform="translate(-4,2)" - x1="22.642857" - y1="24.571428" - x2="17.464285" - y2="35.392857" /> - <linearGradient - inkscape:collect="always" - id="linearGradient3059"> - <stop - style="stop-color:white;stop-opacity:1;" - offset="0" - id="stop3061" /> - <stop - style="stop-color:white;stop-opacity:0;" - offset="1" - id="stop3063" /> - </linearGradient> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient3059" - id="linearGradient3085" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(-1,0,0,-1,52.06863,44.04156)" - x1="22.642857" - y1="24.571428" - x2="17.464285" - y2="35.392857" /> - </defs> - <sodipodi:namedview - id="base" - pagecolor="#ffffff" - bordercolor="#666666" - borderopacity="1.0" - inkscape:pageopacity="0.0" - inkscape:pageshadow="2" - inkscape:zoom="7" - inkscape:cx="24" - inkscape:cy="24" - inkscape:current-layer="layer1" - showgrid="true" - inkscape:grid-bbox="true" - inkscape:document-units="px" - inkscape:window-width="872" - inkscape:window-height="627" - inkscape:window-x="10" - inkscape:window-y="73" /> - <metadata - id="metadata9405"> - <rdf:RDF> - <cc:Work - rdf:about=""> - <dc:format>image/svg+xml</dc:format> - <dc:type - rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> - </cc:Work> - </rdf:RDF> - </metadata> - <g - id="layer1" - inkscape:label="Layer 1" - inkscape:groupmode="layer"> - <g - style="opacity:0.48034931;display:inline" - transform="matrix(1.754551e-2,0,0,1.733565e-2,28.478325,41.28602)" - id="g3197"> - <rect - style="opacity:0.40206185;color:#000000;fill:url(#linearGradient6502);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" - id="rect3199" - width="1652.8442" - height="459.52847" - x="-1053.1652" - y="-131.86813" /> - <path - style="opacity:0.40200004;color:#000000;fill:url(#radialGradient6504);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" - d="M 599.67934,-131.86814 C 599.67934,-131.86814 599.67934,329.60325 599.67934,329.60325 C 741.1337,330.47196 941.64732,226.21092 941.64722,98.837854 C 941.64722,-28.535234 783.79474,-131.86813 599.67934,-131.86814 z " - id="path3201" - sodipodi:nodetypes="cccc" /> - <path - sodipodi:nodetypes="cccc" - id="path3203" - d="M -1053.1653,-131.86814 C -1053.1653,-131.86814 -1053.1653,329.60325 -1053.1653,329.60325 C -1194.6198,330.47196 -1395.1333,226.21093 -1395.1333,98.837855 C -1395.1333,-28.535231 -1237.2808,-131.86812 -1053.1653,-131.86814 z " - style="opacity:0.40200004;color:#000000;fill:url(#radialGradient6506);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" /> - </g> - <rect - style="color:#000000;fill:url(#linearGradient6146);fill-opacity:1;fill-rule:evenodd;stroke:#62645f;stroke-width:1.00000024px;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" - id="rect3056" - width="34" - height="40.000004" - x="7.5" - y="3.5000002" - rx="2.0101535" - ry="2.0101528" /> - <rect - ry="0.98774666" - rx="0.9877466" - y="4.5" - x="8.5" - height="38" - width="31.999998" - id="rect3086" - style="color:#000000;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> - <path - sodipodi:type="arc" - style="opacity:1;color:#000000;fill:#555753;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.00000024px;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" - id="path6510" - sodipodi:cx="9.75" - sodipodi:cy="19.5" - sodipodi:rx="0.39285713" - sodipodi:ry="0.5" - d="M 10.142857 19.5 A 0.39285713 0.5 0 1 1 9.3571429,19.5 A 0.39285713 0.5 0 1 1 10.142857 19.5 z" - transform="matrix(2.5454547,0,0,2,-13.818183,-23)" /> - <path - transform="matrix(2.5454547,0,0,2,-13.818183,-6)" - d="M 10.142857 19.5 A 0.39285713 0.5 0 1 1 9.3571429,19.5 A 0.39285713 0.5 0 1 1 10.142857 19.5 z" - sodipodi:ry="0.5" - sodipodi:rx="0.39285713" - sodipodi:cy="19.5" - sodipodi:cx="9.75" - id="path6522" - style="opacity:1;color:#000000;fill:#555753;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.00000024px;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" - sodipodi:type="arc" /> - <rect - style="opacity:1;color:#000000;fill:#d3d3d3;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.00000024px;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" - id="rect6524" - width="1" - height="33" - x="13" - y="7" /> - <rect - y="8" - x="14" - height="33" - width="1" - id="rect6526" - style="opacity:1;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.00000024px;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> - <rect - style="opacity:1;color:#000000;fill:#d3d3d3;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.00000024px;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" - id="rect6528" - width="21" - height="1" - x="17" - y="10" /> - <rect - y="13" - x="17" - height="1" - width="21" - id="rect6530" - style="opacity:1;color:#000000;fill:#d3d3d3;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.00000024px;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> - <rect - style="opacity:1;color:#000000;fill:#d3d3d3;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.00000024px;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" - id="rect6532" - width="21" - height="1" - x="17" - y="16" /> - <rect - y="19" - x="17" - height="1" - width="21" - id="rect6534" - style="opacity:1;color:#000000;fill:#d3d3d3;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.00000024px;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> - <rect - style="opacity:1;color:#000000;fill:#d3d3d3;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.00000024px;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" - id="rect6536" - width="17" - height="1" - x="17" - y="22" /> - <g - id="g3075" - transform="matrix(1.022771,0.2471105,-0.2860292,0.9681745,4.590241,-3.0518735)"> - <path - sodipodi:nodetypes="ccccccc" - id="path2167" - d="M 22.059679,38.534736 C 4.5188777,35.596951 9.098902,22.50001 9.098902,22.50001 C 8.996083,22.592006 8.474656,34.169298 22.54319,32.546946 L 22.866877,28.866511 L 28.5,35.9627 L 21.84406,41.750019 L 22.059679,38.534736 z " - style="fill:#8ae234;fill-rule:evenodd;stroke:#4e9a06;stroke-width:0.9708733px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /> - <path - sodipodi:nodetypes="ccccc" - id="path2169" - d="M 9.068628,26.158086 C 9.81595,36.798392 19.978022,36.321095 28,35.84375 L 23.3125,30.245536 L 23.004464,33.040179 C 11.269522,34.509157 9.164634,26.698762 9.068628,26.158086 z " - style="opacity:1;color:#000000;fill:url(#linearGradient3159);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.97521734px;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> - <path - style="opacity:0.46724889;color:#000000;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:0.970873px;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" - d="M 23.075462,37.82364 C 9.9572548,35.643661 9.7145549,28.181175 9.7145549,28.181175 C 9.5413293,28.724886 12.550929,34.894947 23.655497,33.538956 L 23.663307,31.509449 L 27.007638,35.838018 L 23.00256,39.371918 L 23.075462,37.82364 z " - id="path3152" - sodipodi:nodetypes="ccccccc" /> - </g> - <g - id="g3079" - transform="matrix(1.022771,0.2471105,-0.2860282,0.9681743,9.140349,-6.8892749)"> - <path - style="fill:#8ae234;fill-rule:evenodd;stroke:#4e9a06;stroke-width:0.97087353px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" - d="M 26.000192,7.715293 C 44.925244,8.6708703 38.482486,23.677818 38.482486,23.677818 C 38.634006,23.273368 39.876434,10.212335 25.516681,13.703083 L 25.192994,17.383518 L 19.559871,10.287329 L 26.215811,4.50001 L 26.000192,7.715293 z " - id="path3067" - sodipodi:nodetypes="ccccccc" /> - <path - style="opacity:1;color:#000000;fill:url(#linearGradient3085);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.97521734px;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" - d="M 39,19.88348 C 37.494783,7.7784775 28.090606,9.720471 20.068628,10.197816 L 24.756128,15.79603 L 25.135593,13.215673 C 37.23065,10.209062 38.903994,19.342804 39,19.88348 z " - id="path3069" - sodipodi:nodetypes="ccccc" /> - <path - style="opacity:0.46724889;color:#000000;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:0.970873px;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" - d="M 25.064642,8.6570118 C 37.812447,7.9827438 39.360979,18.198885 38.963366,18.571596 C 39.191185,17.79478 36.267031,9.900081 24.796676,12.817922 L 24.50188,15.015191 L 20.981967,10.378704 L 25.11004,6.7729057 L 25.064642,8.6570118 z " - id="path3154" - sodipodi:nodetypes="ccccccc" /> - </g> - </g> -</svg> ===================================== gajim/data/icons/hicolor/scalable/status/gajim-ft_stopped.svg deleted ===================================== @@ -1,390 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> - -<svg - xmlns:dc="http://purl.org/dc/elements/1.1/" - xmlns:cc="http://web.resource.org/cc/" - xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" - xmlns:svg="http://www.w3.org/2000/svg" - xmlns="http://www.w3.org/2000/svg" - xmlns:xlink="http://www.w3.org/1999/xlink" - xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" - xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - width="48px" - height="48px" - id="svg6398" - sodipodi:version="0.32" - inkscape:version="0.44+devel" - sodipodi:docbase="/home/cornelius/Desktop/GAJIM iconset/sources" - sodipodi:docname="ft_stopsvg.svg" - inkscape:output_extension="org.inkscape.output.svg.inkscape" - inkscape:export-filename="/home/cornelius/Desktop/GAJIM iconset/data/pixmaps/events/ft_stopped.png" - inkscape:export-xdpi="90" - inkscape:export-ydpi="90" - sodipodi:modified="true"> - <defs - id="defs6400"> - <linearGradient - inkscape:collect="always" - id="linearGradient9499"> - <stop - style="stop-color:#eeeeec;stop-opacity:1;" - offset="0" - id="stop9501" /> - <stop - style="stop-color:#d8d8d4;stop-opacity:1" - offset="1" - id="stop9503" /> - </linearGradient> - <linearGradient - inkscape:collect="always" - id="linearGradient7188"> - <stop - style="stop-color:#ef2929;stop-opacity:1" - offset="0" - id="stop7190" /> - <stop - style="stop-color:#cc0000;stop-opacity:1" - offset="1" - id="stop7192" /> - </linearGradient> - <linearGradient - inkscape:collect="always" - id="linearGradient7170"> - <stop - style="stop-color:#f13c3c;stop-opacity:1" - offset="0" - id="stop7172" /> - <stop - style="stop-color:#ef2929;stop-opacity:1" - offset="1" - id="stop7174" /> - </linearGradient> - <linearGradient - id="linearGradient5060" - inkscape:collect="always"> - <stop - id="stop5062" - offset="0" - style="stop-color:black;stop-opacity:1;" /> - <stop - id="stop5064" - offset="1" - style="stop-color:black;stop-opacity:0;" /> - </linearGradient> - <linearGradient - id="linearGradient5048"> - <stop - id="stop5050" - offset="0" - style="stop-color:black;stop-opacity:0;" /> - <stop - style="stop-color:black;stop-opacity:1;" - offset="0.5" - id="stop5056" /> - <stop - id="stop5052" - offset="1" - style="stop-color:black;stop-opacity:0;" /> - </linearGradient> - <linearGradient - id="linearGradient3058" - inkscape:collect="always"> - <stop - id="stop3060" - offset="0" - style="stop-color:#ffffff;stop-opacity:1" /> - <stop - id="stop3062" - offset="1" - style="stop-color:#ececec;stop-opacity:1" /> - </linearGradient> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient5048" - id="linearGradient7149" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(3.4230519,0,0,1.892176,-1463.9294,-825.6305)" - x1="512.28497" - y1="365.21631" - x2="512.28497" - y2="609.5199" /> - <radialGradient - inkscape:collect="always" - xlink:href="#linearGradient5060" - id="radialGradient7151" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(2.746819,0,0,1.900281,-1055.7171,-828.6181)" - cx="602.65948" - cy="488.07959" - fx="602.65948" - fy="488.07959" - r="117.14286" /> - <radialGradient - inkscape:collect="always" - xlink:href="#linearGradient5060" - id="radialGradient7153" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(-2.74682,0,0,1.900281,602.2346,-828.6181)" - cx="605.71429" - cy="486.64789" - fx="605.71429" - fy="486.64789" - r="117.14286" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient3058" - id="linearGradient7155" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.829269,0,0,1.538463,4.597559,-17.269227)" - x1="19.293913" - y1="15.841996" - x2="19.293913" - y2="38.184418" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient7170" - id="linearGradient7176" - x1="30.827738" - y1="22.807632" - x2="35.874142" - y2="39.729187" - gradientUnits="userSpaceOnUse" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient7188" - id="linearGradient7194" - x1="22.801796" - y1="18.995821" - x2="36.166046" - y2="40.61446" - gradientUnits="userSpaceOnUse" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient9499" - id="linearGradient9505" - x1="33.941124" - y1="36.38076" - x2="34.395691" - y2="40.293056" - gradientUnits="userSpaceOnUse" /> - </defs> - <sodipodi:namedview - id="base" - pagecolor="#ffffff" - bordercolor="#666666" - borderopacity="1.0" - inkscape:pageopacity="0.0" - inkscape:pageshadow="2" - inkscape:zoom="19.79899" - inkscape:cx="32.850199" - inkscape:cy="11.898734" - inkscape:current-layer="layer1" - showgrid="true" - inkscape:grid-bbox="true" - inkscape:document-units="px" - inkscape:window-width="872" - inkscape:window-height="861" - inkscape:window-x="0" - inkscape:window-y="50" /> - <metadata - id="metadata6403"> - <rdf:RDF> - <cc:Work - rdf:about=""> - <dc:format>image/svg+xml</dc:format> - <dc:type - rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> - </cc:Work> - </rdf:RDF> - </metadata> - <g - id="layer1" - inkscape:label="Layer 1" - inkscape:groupmode="layer"> - <g - id="g7103" - transform="matrix(1.754551e-2,0,0,1.733565e-2,28.478325,41.28602)" - style="opacity:0.48034931;display:inline"> - <rect - y="-131.86813" - x="-1053.1652" - height="459.52847" - width="1652.8442" - id="rect7105" - style="opacity:0.40206185;color:#000000;fill:url(#linearGradient7149);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" /> - <path - sodipodi:nodetypes="cccc" - id="path7107" - d="M 599.67934,-131.86814 C 599.67934,-131.86814 599.67934,329.60325 599.67934,329.60325 C 741.1337,330.47196 941.64732,226.21092 941.64722,98.837854 C 941.64722,-28.535234 783.79474,-131.86813 599.67934,-131.86814 z " - style="opacity:0.40200004;color:#000000;fill:url(#radialGradient7151);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" /> - <path - style="opacity:0.40200004;color:#000000;fill:url(#radialGradient7153);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" - d="M -1053.1653,-131.86814 C -1053.1653,-131.86814 -1053.1653,329.60325 -1053.1653,329.60325 C -1194.6198,330.47196 -1395.1333,226.21093 -1395.1333,98.837855 C -1395.1333,-28.535231 -1237.2808,-131.86812 -1053.1653,-131.86814 z " - id="path7109" - sodipodi:nodetypes="cccc" /> - </g> - <rect - ry="2.0101528" - rx="2.0101535" - y="3.5000002" - x="7.5" - height="40.000004" - width="34" - id="rect7111" - style="color:#000000;fill:url(#linearGradient7155);fill-opacity:1;fill-rule:evenodd;stroke:#62645f;stroke-width:1.00000024px;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> - <rect - style="color:#000000;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" - id="rect7113" - width="31.999998" - height="38" - x="8.5" - y="4.5" - rx="0.9877466" - ry="0.98774666" /> - <path - transform="matrix(2.5454547,0,0,2,-13.818183,-23)" - d="M 10.142857 19.5 A 0.39285713 0.5 0 1 1 9.3571429,19.5 A 0.39285713 0.5 0 1 1 10.142857 19.5 z" - sodipodi:ry="0.5" - sodipodi:rx="0.39285713" - sodipodi:cy="19.5" - sodipodi:cx="9.75" - id="path7115" - style="opacity:1;color:#000000;fill:#555753;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.00000024px;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" - sodipodi:type="arc" /> - <path - sodipodi:type="arc" - style="opacity:1;color:#000000;fill:#555753;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.00000024px;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" - id="path7117" - sodipodi:cx="9.75" - sodipodi:cy="19.5" - sodipodi:rx="0.39285713" - sodipodi:ry="0.5" - d="M 10.142857 19.5 A 0.39285713 0.5 0 1 1 9.3571429,19.5 A 0.39285713 0.5 0 1 1 10.142857 19.5 z" - transform="matrix(2.5454547,0,0,2,-13.818183,-6)" /> - <rect - y="7" - x="13" - height="33" - width="1" - id="rect7119" - style="opacity:1;color:#000000;fill:#d3d3d3;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.00000024px;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> - <rect - style="opacity:1;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.00000024px;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" - id="rect7121" - width="1" - height="33" - x="14" - y="8" /> - <rect - y="10" - x="17" - height="1" - width="21" - id="rect7123" - style="opacity:1;color:#000000;fill:#d3d3d3;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.00000024px;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> - <rect - style="opacity:1;color:#000000;fill:#d3d3d3;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.00000024px;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" - id="rect7125" - width="21" - height="1" - x="17" - y="13" /> - <rect - y="16" - x="17" - height="1" - width="21" - id="rect7127" - style="opacity:1;color:#000000;fill:#d3d3d3;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.00000024px;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> - <rect - style="opacity:1;color:#000000;fill:#d3d3d3;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.00000024px;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" - id="rect7129" - width="21" - height="1" - x="17" - y="19" /> - <rect - y="22" - x="17" - height="1" - width="17" - id="rect7131" - style="opacity:1;color:#000000;fill:#d3d3d3;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.00000024px;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> - <path - sodipodi:type="star" - style="opacity:1;color:#000000;fill:url(#linearGradient7176);fill-opacity:1;fill-rule:nonzero;stroke:#cc0000;stroke-width:0.95955765;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" - id="path7161" - sodipodi:sides="3" - sodipodi:cx="31.819805" - sodipodi:cy="33.756847" - sodipodi:r1="13.632195" - sodipodi:r2="3.1533914" - sodipodi:arg1="0.55690152" - sodipodi:arg2="1.6040991" - inkscape:flatsided="true" - inkscape:rounded="0" - inkscape:randomized="0" - d="M 43.392134,40.962259 L 19.793571,40.176072 L 32.273711,20.132211 L 43.392134,40.962259 z " - transform="matrix(1.0581389,-3.6280594e-2,3.7449453e-2,1.0251126,-0.948919,35.033127)" /> - <path - style="font-size:20.09290695px;font-style:normal;font-weight:normal;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans" - d="M 33.055131,71.269851 L 35,71.269851 L 35,73 L 33.055131,73 L 33.055131,71.269851 M 33.055131,60 L 35,60 L 35,65.703282 L 34.808388,69.512161 L 33.256325,69.512161 L 33.055131,65.703282 L 33.055131,60" - id="text7163" - sodipodi:nodetypes="cccccccccccc" /> - <path - transform="matrix(0.8888367,-3.1097651e-2,3.1457541e-2,0.8786679,4.642908,39.81411)" - d="M 43.392134,40.962259 L 19.793571,40.176072 L 32.273711,20.132211 L 43.392134,40.962259 z " - inkscape:randomized="0" - inkscape:rounded="0" - inkscape:flatsided="true" - sodipodi:arg2="1.6040991" - sodipodi:arg1="0.55690152" - sodipodi:r2="3.1533914" - sodipodi:r1="13.632195" - sodipodi:cy="33.756847" - sodipodi:cx="31.819805" - sodipodi:sides="3" - id="path7168" - style="opacity:1;color:#000000;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:1.13084948;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.43243247;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" - sodipodi:type="star" /> - <path - sodipodi:type="star" - style="opacity:1;color:#000000;fill:url(#linearGradient7194);fill-opacity:1;fill-rule:nonzero;stroke:#cc0000;stroke-width:1.69943297;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" - id="path7178" - sodipodi:sides="8" - sodipodi:cx="26.142857" - sodipodi:cy="26.857143" - sodipodi:r1="15.626377" - sodipodi:r2="14.43689" - sodipodi:arg1="1.1767084" - sodipodi:arg2="1.5694075" - inkscape:flatsided="true" - inkscape:rounded="0" - inkscape:randomized="0" - d="M 32.142857,41.285714 L 20.182957,41.302325 L 11.714286,32.857144 L 11.697675,20.897244 L 20.142856,12.428573 L 32.102756,12.411962 L 40.571427,20.857143 L 40.588038,32.817043 L 32.142857,41.285714 z " - transform="matrix(0.5884315,0,0,0.5884314,19.616719,21.196411)" /> - <path - transform="matrix(0.5192043,0,0,0.5192042,21.426517,23.055657)" - d="M 32.142857,41.285714 L 20.182957,41.302325 L 11.714286,32.857144 L 11.697675,20.897244 L 20.142856,12.428573 L 32.102756,12.411962 L 40.571427,20.857143 L 40.588038,32.817043 L 32.142857,41.285714 z " - inkscape:randomized="0" - inkscape:rounded="0" - inkscape:flatsided="true" - sodipodi:arg2="1.5694075" - sodipodi:arg1="1.1767084" - sodipodi:r2="14.43689" - sodipodi:r1="15.626377" - sodipodi:cy="26.857143" - sodipodi:cx="26.142857" - sodipodi:sides="8" - id="path7182" - style="opacity:1;color:#000000;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:1.92602408;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.58558559;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" - sodipodi:type="star" /> - <rect - style="opacity:1;color:#000000;fill:url(#linearGradient9505);fill-opacity:1.0;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.58558559;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" - id="rect8145" - width="8" - height="8" - x="31" - y="33" /> - </g> -</svg> ===================================== gajim/data/icons/hicolor/scalable/status/gajim-ft_stopsvg.svg deleted ===================================== @@ -1,390 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> - -<svg - xmlns:dc="http://purl.org/dc/elements/1.1/" - xmlns:cc="http://web.resource.org/cc/" - xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" - xmlns:svg="http://www.w3.org/2000/svg" - xmlns="http://www.w3.org/2000/svg" - xmlns:xlink="http://www.w3.org/1999/xlink" - xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" - xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - width="48px" - height="48px" - id="svg6398" - sodipodi:version="0.32" - inkscape:version="0.44+devel" - sodipodi:docbase="/home/cornelius/Desktop/GAJIM iconset/sources" - sodipodi:docname="ft_stopsvg.svg" - inkscape:output_extension="org.inkscape.output.svg.inkscape" - inkscape:export-filename="/home/cornelius/Desktop/GAJIM iconset/data/pixmaps/events/ft_stopped.png" - inkscape:export-xdpi="90" - inkscape:export-ydpi="90" - sodipodi:modified="true"> - <defs - id="defs6400"> - <linearGradient - inkscape:collect="always" - id="linearGradient9499"> - <stop - style="stop-color:#eeeeec;stop-opacity:1;" - offset="0" - id="stop9501" /> - <stop - style="stop-color:#d8d8d4;stop-opacity:1" - offset="1" - id="stop9503" /> - </linearGradient> - <linearGradient - inkscape:collect="always" - id="linearGradient7188"> - <stop - style="stop-color:#ef2929;stop-opacity:1" - offset="0" - id="stop7190" /> - <stop - style="stop-color:#cc0000;stop-opacity:1" - offset="1" - id="stop7192" /> - </linearGradient> - <linearGradient - inkscape:collect="always" - id="linearGradient7170"> - <stop - style="stop-color:#f13c3c;stop-opacity:1" - offset="0" - id="stop7172" /> - <stop - style="stop-color:#ef2929;stop-opacity:1" - offset="1" - id="stop7174" /> - </linearGradient> - <linearGradient - id="linearGradient5060" - inkscape:collect="always"> - <stop - id="stop5062" - offset="0" - style="stop-color:black;stop-opacity:1;" /> - <stop - id="stop5064" - offset="1" - style="stop-color:black;stop-opacity:0;" /> - </linearGradient> - <linearGradient - id="linearGradient5048"> - <stop - id="stop5050" - offset="0" - style="stop-color:black;stop-opacity:0;" /> - <stop - style="stop-color:black;stop-opacity:1;" - offset="0.5" - id="stop5056" /> - <stop - id="stop5052" - offset="1" - style="stop-color:black;stop-opacity:0;" /> - </linearGradient> - <linearGradient - id="linearGradient3058" - inkscape:collect="always"> - <stop - id="stop3060" - offset="0" - style="stop-color:#ffffff;stop-opacity:1" /> - <stop - id="stop3062" - offset="1" - style="stop-color:#ececec;stop-opacity:1" /> - </linearGradient> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient5048" - id="linearGradient7149" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(3.4230519,0,0,1.892176,-1463.9294,-825.6305)" - x1="512.28497" - y1="365.21631" - x2="512.28497" - y2="609.5199" /> - <radialGradient - inkscape:collect="always" - xlink:href="#linearGradient5060" - id="radialGradient7151" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(2.746819,0,0,1.900281,-1055.7171,-828.6181)" - cx="602.65948" - cy="488.07959" - fx="602.65948" - fy="488.07959" - r="117.14286" /> - <radialGradient - inkscape:collect="always" - xlink:href="#linearGradient5060" - id="radialGradient7153" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(-2.74682,0,0,1.900281,602.2346,-828.6181)" - cx="605.71429" - cy="486.64789" - fx="605.71429" - fy="486.64789" - r="117.14286" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient3058" - id="linearGradient7155" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.829269,0,0,1.538463,4.597559,-17.269227)" - x1="19.293913" - y1="15.841996" - x2="19.293913" - y2="38.184418" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient7170" - id="linearGradient7176" - x1="30.827738" - y1="22.807632" - x2="35.874142" - y2="39.729187" - gradientUnits="userSpaceOnUse" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient7188" - id="linearGradient7194" - x1="22.801796" - y1="18.995821" - x2="36.166046" - y2="40.61446" - gradientUnits="userSpaceOnUse" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient9499" - id="linearGradient9505" - x1="33.941124" - y1="36.38076" - x2="34.395691" - y2="40.293056" - gradientUnits="userSpaceOnUse" /> - </defs> - <sodipodi:namedview - id="base" - pagecolor="#ffffff" - bordercolor="#666666" - borderopacity="1.0" - inkscape:pageopacity="0.0" - inkscape:pageshadow="2" - inkscape:zoom="19.79899" - inkscape:cx="32.850199" - inkscape:cy="11.898734" - inkscape:current-layer="layer1" - showgrid="true" - inkscape:grid-bbox="true" - inkscape:document-units="px" - inkscape:window-width="872" - inkscape:window-height="861" - inkscape:window-x="0" - inkscape:window-y="50" /> - <metadata - id="metadata6403"> - <rdf:RDF> - <cc:Work - rdf:about=""> - <dc:format>image/svg+xml</dc:format> - <dc:type - rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> - </cc:Work> - </rdf:RDF> - </metadata> - <g - id="layer1" - inkscape:label="Layer 1" - inkscape:groupmode="layer"> - <g - id="g7103" - transform="matrix(1.754551e-2,0,0,1.733565e-2,28.478325,41.28602)" - style="opacity:0.48034931;display:inline"> - <rect - y="-131.86813" - x="-1053.1652" - height="459.52847" - width="1652.8442" - id="rect7105" - style="opacity:0.40206185;color:#000000;fill:url(#linearGradient7149);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" /> - <path - sodipodi:nodetypes="cccc" - id="path7107" - d="M 599.67934,-131.86814 C 599.67934,-131.86814 599.67934,329.60325 599.67934,329.60325 C 741.1337,330.47196 941.64732,226.21092 941.64722,98.837854 C 941.64722,-28.535234 783.79474,-131.86813 599.67934,-131.86814 z " - style="opacity:0.40200004;color:#000000;fill:url(#radialGradient7151);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" /> - <path - style="opacity:0.40200004;color:#000000;fill:url(#radialGradient7153);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" - d="M -1053.1653,-131.86814 C -1053.1653,-131.86814 -1053.1653,329.60325 -1053.1653,329.60325 C -1194.6198,330.47196 -1395.1333,226.21093 -1395.1333,98.837855 C -1395.1333,-28.535231 -1237.2808,-131.86812 -1053.1653,-131.86814 z " - id="path7109" - sodipodi:nodetypes="cccc" /> - </g> - <rect - ry="2.0101528" - rx="2.0101535" - y="3.5000002" - x="7.5" - height="40.000004" - width="34" - id="rect7111" - style="color:#000000;fill:url(#linearGradient7155);fill-opacity:1;fill-rule:evenodd;stroke:#62645f;stroke-width:1.00000024px;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> - <rect - style="color:#000000;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" - id="rect7113" - width="31.999998" - height="38" - x="8.5" - y="4.5" - rx="0.9877466" - ry="0.98774666" /> - <path - transform="matrix(2.5454547,0,0,2,-13.818183,-23)" - d="M 10.142857 19.5 A 0.39285713 0.5 0 1 1 9.3571429,19.5 A 0.39285713 0.5 0 1 1 10.142857 19.5 z" - sodipodi:ry="0.5" - sodipodi:rx="0.39285713" - sodipodi:cy="19.5" - sodipodi:cx="9.75" - id="path7115" - style="opacity:1;color:#000000;fill:#555753;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.00000024px;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" - sodipodi:type="arc" /> - <path - sodipodi:type="arc" - style="opacity:1;color:#000000;fill:#555753;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.00000024px;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" - id="path7117" - sodipodi:cx="9.75" - sodipodi:cy="19.5" - sodipodi:rx="0.39285713" - sodipodi:ry="0.5" - d="M 10.142857 19.5 A 0.39285713 0.5 0 1 1 9.3571429,19.5 A 0.39285713 0.5 0 1 1 10.142857 19.5 z" - transform="matrix(2.5454547,0,0,2,-13.818183,-6)" /> - <rect - y="7" - x="13" - height="33" - width="1" - id="rect7119" - style="opacity:1;color:#000000;fill:#d3d3d3;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.00000024px;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> - <rect - style="opacity:1;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.00000024px;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" - id="rect7121" - width="1" - height="33" - x="14" - y="8" /> - <rect - y="10" - x="17" - height="1" - width="21" - id="rect7123" - style="opacity:1;color:#000000;fill:#d3d3d3;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.00000024px;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> - <rect - style="opacity:1;color:#000000;fill:#d3d3d3;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.00000024px;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" - id="rect7125" - width="21" - height="1" - x="17" - y="13" /> - <rect - y="16" - x="17" - height="1" - width="21" - id="rect7127" - style="opacity:1;color:#000000;fill:#d3d3d3;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.00000024px;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> - <rect - style="opacity:1;color:#000000;fill:#d3d3d3;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.00000024px;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" - id="rect7129" - width="21" - height="1" - x="17" - y="19" /> - <rect - y="22" - x="17" - height="1" - width="17" - id="rect7131" - style="opacity:1;color:#000000;fill:#d3d3d3;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.00000024px;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> - <path - sodipodi:type="star" - style="opacity:1;color:#000000;fill:url(#linearGradient7176);fill-opacity:1;fill-rule:nonzero;stroke:#cc0000;stroke-width:0.95955765;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" - id="path7161" - sodipodi:sides="3" - sodipodi:cx="31.819805" - sodipodi:cy="33.756847" - sodipodi:r1="13.632195" - sodipodi:r2="3.1533914" - sodipodi:arg1="0.55690152" - sodipodi:arg2="1.6040991" - inkscape:flatsided="true" - inkscape:rounded="0" - inkscape:randomized="0" - d="M 43.392134,40.962259 L 19.793571,40.176072 L 32.273711,20.132211 L 43.392134,40.962259 z " - transform="matrix(1.0581389,-3.6280594e-2,3.7449453e-2,1.0251126,-0.948919,35.033127)" /> - <path - style="font-size:20.09290695px;font-style:normal;font-weight:normal;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans" - d="M 33.055131,71.269851 L 35,71.269851 L 35,73 L 33.055131,73 L 33.055131,71.269851 M 33.055131,60 L 35,60 L 35,65.703282 L 34.808388,69.512161 L 33.256325,69.512161 L 33.055131,65.703282 L 33.055131,60" - id="text7163" - sodipodi:nodetypes="cccccccccccc" /> - <path - transform="matrix(0.8888367,-3.1097651e-2,3.1457541e-2,0.8786679,4.642908,39.81411)" - d="M 43.392134,40.962259 L 19.793571,40.176072 L 32.273711,20.132211 L 43.392134,40.962259 z " - inkscape:randomized="0" - inkscape:rounded="0" - inkscape:flatsided="true" - sodipodi:arg2="1.6040991" - sodipodi:arg1="0.55690152" - sodipodi:r2="3.1533914" - sodipodi:r1="13.632195" - sodipodi:cy="33.756847" - sodipodi:cx="31.819805" - sodipodi:sides="3" - id="path7168" - style="opacity:1;color:#000000;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:1.13084948;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.43243247;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" - sodipodi:type="star" /> - <path - sodipodi:type="star" - style="opacity:1;color:#000000;fill:url(#linearGradient7194);fill-opacity:1;fill-rule:nonzero;stroke:#cc0000;stroke-width:1.69943297;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" - id="path7178" - sodipodi:sides="8" - sodipodi:cx="26.142857" - sodipodi:cy="26.857143" - sodipodi:r1="15.626377" - sodipodi:r2="14.43689" - sodipodi:arg1="1.1767084" - sodipodi:arg2="1.5694075" - inkscape:flatsided="true" - inkscape:rounded="0" - inkscape:randomized="0" - d="M 32.142857,41.285714 L 20.182957,41.302325 L 11.714286,32.857144 L 11.697675,20.897244 L 20.142856,12.428573 L 32.102756,12.411962 L 40.571427,20.857143 L 40.588038,32.817043 L 32.142857,41.285714 z " - transform="matrix(0.5884315,0,0,0.5884314,19.616719,21.196411)" /> - <path - transform="matrix(0.5192043,0,0,0.5192042,21.426517,23.055657)" - d="M 32.142857,41.285714 L 20.182957,41.302325 L 11.714286,32.857144 L 11.697675,20.897244 L 20.142856,12.428573 L 32.102756,12.411962 L 40.571427,20.857143 L 40.588038,32.817043 L 32.142857,41.285714 z " - inkscape:randomized="0" - inkscape:rounded="0" - inkscape:flatsided="true" - sodipodi:arg2="1.5694075" - sodipodi:arg1="1.1767084" - sodipodi:r2="14.43689" - sodipodi:r1="15.626377" - sodipodi:cy="26.857143" - sodipodi:cx="26.142857" - sodipodi:sides="8" - id="path7182" - style="opacity:1;color:#000000;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:1.92602408;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.58558559;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" - sodipodi:type="star" /> - <rect - style="opacity:1;color:#000000;fill:url(#linearGradient9505);fill-opacity:1.0;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.58558559;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" - id="rect8145" - width="8" - height="8" - x="31" - y="33" /> - </g> -</svg> ===================================== gajim/gui_interface.py ===================================== @@ -647,7 +647,7 @@ class Interface: event_type = _('File Transfer Error') app.notification.popup( event_type, event.jid, event.account, - 'file-send-error', 'gajim-ft_error', + 'file-send-error', 'dialog-error', event_type, event.file_props.name) def handle_event_file_request_error(self, obj): @@ -674,32 +674,37 @@ class Interface: self.add_event(obj.conn.name, obj.jid, event) if helpers.allow_showing_notification(obj.conn.name): - # check if we should be notified + # Check if we should be notified event_type = _('File Transfer Error') app.notification.popup( - event_type, obj.jid, obj.conn.name, - msg_type, 'gajim-ft_error', - title=event_type, text=obj.file_props.name) + event_type, + obj.jid, + obj.conn.name, + msg_type, + 'dialog-error', + title=event_type, + text=obj.file_props.name) def handle_event_file_request(self, obj): account = obj.conn.name if obj.jid not in app.contacts.get_jid_list(account): - contact = app.contacts.create_not_in_roster_contact(jid=obj.jid, - account=account) + contact = app.contacts.create_not_in_roster_contact( + jid=obj.jid, account=account) app.contacts.add_contact(account, contact) self.roster.add_contact(obj.jid, account) contact = app.contacts.get_first_contact_from_jid(account, obj.jid) if obj.file_props.session_type == 'jingle': - request = obj.stanza.getTag('jingle').getTag('content')\ - .getTag('description').getTag('request') + request = \ + obj.stanza.getTag('jingle').getTag('content').getTag( + 'description').getTag('request') if request: # If we get a request instead ft_win = self.instances['file_transfers'] ft_win.add_transfer(account, contact, obj.file_props) return if helpers.allow_popup_window(account): - self.instances['file_transfers'].show_file_request(account, contact, - obj.file_props) + self.instances['file_transfers'].show_file_request( + account, contact, obj.file_props) return event = events.FileRequestEvent(obj.file_props) self.add_event(account, obj.jid, event) @@ -708,8 +713,13 @@ class Interface: account, obj.jid) event_type = _('File Transfer Request') app.notification.popup( - event_type, obj.jid, account, 'file-request', - icon_name='gajim-ft_request', title=event_type, text=txt) + event_type, + obj.jid, + account, + 'file-request', + icon_name='document-send', + title=event_type, + text=txt) @staticmethod def handle_event_file_error(title, message): @@ -717,14 +727,14 @@ class Interface: def handle_event_file_progress(self, account, file_props): if time.time() - self.last_ftwindow_update > 0.5: - # update ft window every 500ms + # Update ft window every 500ms self.last_ftwindow_update = time.time() - self.instances['file_transfers'].set_progress(file_props.type_, - file_props.sid, file_props.received_len) + self.instances['file_transfers'].set_progress( + file_props.type_, file_props.sid, file_props.received_len) def __compare_hashes(self, account, file_props): - session = app.connections[account].get_module('Jingle').get_jingle_session( - jid=None, sid=file_props.sid) + session = app.connections[account].get_module( + 'Jingle').get_jingle_session(jid=None, sid=file_props.sid) ft_win = self.instances['file_transfers'] h = Hashes2() try: @@ -740,7 +750,7 @@ class Interface: GLib.idle_add(self.popup_ft_result, account, jid, file_props) GLib.idle_add(ft_win.set_status, file_props, 'ok') else: - # wrong hash, we need to get the file again! + # Wrong hash, we need to get the file again! file_props.error = -10 GLib.idle_add(self.popup_ft_result, account, jid, file_props) GLib.idle_add(ft_win.set_status, file_props, 'hash_error') @@ -751,37 +761,41 @@ class Interface: def handle_event_file_rcv_completed(self, account, file_props): ft = self.instances['file_transfers'] if file_props.error == 0: - ft.set_progress(file_props.type_, file_props.sid, - file_props.received_len) - app.nec.push_incoming_event(FileTransferCompletedEvent(None, - file_props=file_props)) + ft.set_progress( + file_props.type_, file_props.sid, file_props.received_len) + app.nec.push_incoming_event( + FileTransferCompletedEvent(None, file_props=file_props)) else: ft.set_status(file_props, 'stop') - if not file_props.completed and (file_props.stalled or \ - file_props.paused): + if not file_props.completed and (file_props.stalled or + file_props.paused): return - if file_props.type_ == 'r': # we receive a file + if file_props.type_ == 'r': # We receive a file app.socks5queue.remove_receiver(file_props.sid, True, True) if file_props.session_type == 'jingle': if file_props.hash_ and file_props.error == 0: # We compare hashes in a new thread self.hashThread = Thread(target=self.__compare_hashes, - args=(account, file_props)) + args=(account, file_props)) self.hashThread.start() else: - # We disn't get the hash, sender probably don't support that + # We didn't get the hash, sender probably doesn't + # support that jid = file_props.sender self.popup_ft_result(account, jid, file_props) if file_props.error == 0: ft.set_status(file_props, 'ok') - session = app.connections[account].get_module('Jingle').get_jingle_session( - jid=None, sid=file_props.sid) + session = \ + app.connections[account].get_module( + 'Jingle').get_jingle_session(jid=None, + sid=file_props.sid) # End jingle session - # TODO: only if there are no other parallel downloads in this session + # TODO: Only if there are no other parallel downloads in + # this session if session: session.end_session() - else: # we send a file + else: # We send a file jid = file_props.receiver app.socks5queue.remove_sender(file_props.sid, True, True) self.popup_ft_result(account, jid, file_props) @@ -793,22 +807,31 @@ class Interface: if app.config.get('notify_on_file_complete'): ft.show_completed(jid, file_props) elif file_props.error == -1: - ft.show_stopped(jid, file_props, - error_msg=_('Remote contact stopped transfer')) + ft.show_stopped( + jid, + file_props, + error_msg=_('Remote Contact Stopped Transfer')) elif file_props.error == -6: - ft.show_stopped(jid, file_props, - error_msg=_('Error opening file')) + ft.show_stopped( + jid, + file_props, + error_msg=_('Error Opening File')) elif file_props.error == -10: - ft.show_hash_error(jid, file_props, account) + ft.show_hash_error( + jid, + file_props, + account) elif file_props.error == -12: - ft.show_stopped(jid, file_props, - error_msg=_('SSL certificate error')) + ft.show_stopped( + jid, + file_props, + error_msg=_('SSL Certificate Error')) return msg_type = '' event_type = '' - if file_props.error == 0 and app.config.get( - 'notify_on_file_complete'): + if (file_props.error == 0 and + app.config.get('notify_on_file_complete')): event_class = events.FileCompletedEvent msg_type = 'file-completed' event_type = _('File Transfer Completed') @@ -835,56 +858,73 @@ class Interface: if file_props is not None: if file_props.type_ == 'r': - # get the name of the sender, as it is in the roster + # Get the name of the sender, as it is in the roster sender = file_props.sender.split('/')[0] - name = app.contacts.get_first_contact_from_jid(account, - sender).get_shown_name() + name = app.contacts.get_first_contact_from_jid( + account, sender).get_shown_name() filename = os.path.basename(file_props.file_name) + if event_type == _('File Transfer Completed'): - txt = _('%(filename)s received from %(name)s.')\ - % {'filename': filename, 'name': name} - icon_name = 'gajim-ft_done' + txt = _('%(filename)s received from %(name)s.') % { + 'filename': filename, + 'name': name} + icon_name = 'emblem-default' elif event_type == _('File Transfer Stopped'): txt = _('File transfer of %(filename)s from %(name)s ' - 'stopped.') % {'filename': filename, 'name': name} - icon_name = 'gajim-ft_stopped' - else: # ft hash error + 'stopped.') % { + 'filename': filename, + 'name': name} + icon_name = 'process-stop' + else: # File transfer hash error txt = _('File transfer of %(filename)s from %(name)s ' - 'failed.') % {'filename': filename, 'name': name} - icon_name = 'gajim-ft_stopped' + 'failed.') % { + 'filename': filename, + 'name': name} + icon_name = 'process-stop' else: receiver = file_props.receiver if hasattr(receiver, 'jid'): receiver = receiver.jid receiver = receiver.split('/')[0] - # get the name of the contact, as it is in the roster - name = app.contacts.get_first_contact_from_jid(account, - receiver).get_shown_name() + # Get the name of the contact, as it is in the roster + name = app.contacts.get_first_contact_from_jid( + account, receiver).get_shown_name() filename = os.path.basename(file_props.file_name) if event_type == _('File Transfer Completed'): - txt = _('You successfully sent %(filename)s to %(name)s.')\ - % {'filename': filename, 'name': name} - icon_name = 'gajim-ft_done' + txt = _('You successfully sent %(filename)s to ' + '%(name)s.') % { + 'filename': filename, + 'name': name} + icon_name = 'emblem-default' elif event_type == _('File Transfer Stopped'): txt = _('File transfer of %(filename)s to %(name)s ' - 'stopped.') % {'filename': filename, 'name': name} - icon_name = 'gajim-ft_stopped' - else: # ft hash error + 'stopped.') % { + 'filename': filename, + 'name': name} + icon_name = 'process-stop' + else: # File transfer hash error txt = _('File transfer of %(filename)s to %(name)s ' - 'failed.') % {'filename': filename, 'name': name} - icon_name = 'gajim-ft_stopped' + 'failed.') % { + 'filename': filename, + 'name': name} + icon_name = 'process-stop' else: txt = '' icon_name = None - if app.config.get('notify_on_file_complete') and \ - (app.config.get('autopopupaway') or \ - app.connections[account].connected in (2, 3)): - # we want to be notified and we are online/chat or we don't mind - # bugged when away/na/busy + if (app.config.get('notify_on_file_complete') and + (app.config.get('autopopupaway') or + app.connections[account].connected in (2, 3))): + # We want to be notified and we are online/chat or we don't mind + # to be bugged when away/na/busy app.notification.popup( - event_type, jid, account, msg_type, - icon_name=icon_name, title=event_type, text=txt) + event_type, + jid, + account, + msg_type, + icon_name=icon_name, + title=event_type, + text=txt) def handle_event_signed_in(self, obj): """ View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/542b70aa0c91a0c0dc11088b3a0081d22… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/542b70aa0c91a0c0dc11088b3a0081d22… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Accounts: Destroy all GroupchatControl on disable
by Philipp Hörist 21 Jun '19

21 Jun '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 542b70aa by Philipp Hörist at 2019-06-21T21:29:23Z Accounts: Destroy all GroupchatControl on disable - - - - - 1 changed file: - gajim/gui_interface.py Changes: ===================================== gajim/gui_interface.py ===================================== @@ -1937,7 +1937,10 @@ class Interface: self.roster.send_status(account, 'online', '') def disable_account(self, account): - self.roster.close_all(account) + self.roster.close_all(account, force=True) + for jid in self.minimized_controls[account]: + ctrl = self.minimized_controls[account][jid] + ctrl.shutdown() if account == app.ZEROCONF_ACC_NAME: app.connections[account].disable_account() app.connections[account].cleanup() View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/542b70aa0c91a0c0dc11088b3a0081d225… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/542b70aa0c91a0c0dc11088b3a0081d225… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Remove unused imports
by Philipp Hörist 21 Jun '19

21 Jun '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 3431320a by Philipp Hörist at 2019-06-21T20:36:55Z Remove unused imports - - - - - 1 changed file: - gajim/gtk/accounts.py Changes: ===================================== gajim/gtk/accounts.py ===================================== @@ -25,10 +25,7 @@ from gi.repository import GObject from gajim.common import app from gajim.common import passwords -from gajim.common import helpers from gajim.common.i18n import _ -from gajim.common.connection import Connection -from gajim.common.zeroconf.connection_zeroconf import ConnectionZeroconf from gajim import gui_menu_builder View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/3431320accc0600ede7c1393bf85048ed0… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/3431320accc0600ede7c1393bf85048ed0… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Move enable/disable account methods to interface
by Philipp Hörist 21 Jun '19

21 Jun '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 1051da2e by Philipp Hörist at 2019-06-21T20:32:45Z Move enable/disable account methods to interface - - - - - 2 changed files: - gajim/gtk/accounts.py - gajim/gui_interface.py Changes: ===================================== gajim/gtk/accounts.py ===================================== @@ -219,81 +219,6 @@ class AccountsWindow(Gtk.ApplicationWindow): log.warning('select_account() failed, account %s not found', account) - @staticmethod - def enable_account(account): - if account == app.ZEROCONF_ACC_NAME: - app.connections[account] = ConnectionZeroconf(account) - else: - app.connections[account] = Connection(account) - - app.plugin_manager.register_modules_for_account( - app.connections[account]) - - # update variables - app.interface.instances[account] = { - 'infos': {}, 'disco': {}, 'gc_config': {}, 'search': {}, - 'online_dialog': {}, 'sub_request': {}} - app.interface.minimized_controls[account] = {} - app.connections[account].connected = 0 - app.groups[account] = {} - app.contacts.add_account(account) - app.gc_connected[account] = {} - app.automatic_rooms[account] = {} - app.newly_added[account] = [] - app.to_be_removed[account] = [] - if account == app.ZEROCONF_ACC_NAME: - app.nicks[account] = app.ZEROCONF_ACC_NAME - else: - app.nicks[account] = app.config.get_per( - 'accounts', account, 'name') - app.block_signed_in_notifications[account] = True - app.sleeper_state[account] = 'off' - app.last_message_time[account] = {} - app.status_before_autoaway[account] = '' - app.gajim_optional_features[account] = [] - app.caps_hash[account] = '' - helpers.update_optional_features(account) - # refresh roster - if len(app.connections) >= 2: - # Do not merge accounts if only one exists - app.interface.roster.regroup = app.config.get('mergeaccounts') - else: - app.interface.roster.regroup = False - app.interface.roster.setup_and_draw_roster() - gui_menu_builder.build_accounts_menu() - - @staticmethod - def disable_account(account): - app.interface.roster.close_all(account) - if account == app.ZEROCONF_ACC_NAME: - app.connections[account].disable_account() - app.connections[account].cleanup() - del app.connections[account] - del app.interface.instances[account] - del app.interface.minimized_controls[account] - del app.nicks[account] - del app.block_signed_in_notifications[account] - del app.groups[account] - app.contacts.remove_account(account) - del app.gc_connected[account] - del app.automatic_rooms[account] - del app.to_be_removed[account] - del app.newly_added[account] - del app.sleeper_state[account] - del app.last_message_time[account] - del app.status_before_autoaway[account] - del app.gajim_optional_features[account] - del app.caps_hash[account] - if len(app.connections) >= 2: - # Do not merge accounts if only one exists - app.interface.roster.regroup = app.config.get('mergeaccounts') - else: - app.interface.roster.regroup = False - app.config.set_per( - 'accounts', account, 'roster_version', '') - app.interface.roster.setup_and_draw_roster() - gui_menu_builder.build_accounts_menu() - class Settings(Gtk.ScrolledWindow): def __init__(self): @@ -632,7 +557,7 @@ class AccountRow(Gtk.ListBoxRow): def _disable(): app.connections[account].change_status('offline', 'offline') app.connections[account].disconnect(reconnect=False) - self.get_toplevel().disable_account(account) + app.interface.disable_account(account) app.config.set_per('accounts', account, 'active', False) switch.set_state(state) @@ -657,9 +582,9 @@ class AccountRow(Gtk.ListBoxRow): return Gdk.EVENT_STOP if state: - self.get_toplevel().enable_account(account) + app.interface.enable_account(account) else: - self.get_toplevel().disable_account(account) + app.interface.disable_account(account) app.config.set_per('accounts', account, 'active', state) return Gdk.EVENT_PROPAGATE ===================================== gajim/gui_interface.py ===================================== @@ -1892,6 +1892,81 @@ class Interface: app.sleeper_state[account] = 'autoxa' return True # renew timeout (loop for ever) + def enable_account(self, account): + if account == app.ZEROCONF_ACC_NAME: + app.connections[account] = connection_zeroconf.ConnectionZeroconf( + account) + else: + app.connections[account] = Connection(account) + + app.plugin_manager.register_modules_for_account( + app.connections[account]) + + # update variables + self.instances[account] = { + 'infos': {}, 'disco': {}, 'gc_config': {}, 'search': {}, + 'online_dialog': {}, 'sub_request': {}} + self.minimized_controls[account] = {} + app.connections[account].connected = 0 + app.groups[account] = {} + app.contacts.add_account(account) + app.gc_connected[account] = {} + app.automatic_rooms[account] = {} + app.newly_added[account] = [] + app.to_be_removed[account] = [] + if account == app.ZEROCONF_ACC_NAME: + app.nicks[account] = app.ZEROCONF_ACC_NAME + else: + app.nicks[account] = app.config.get_per( + 'accounts', account, 'name') + app.block_signed_in_notifications[account] = True + app.sleeper_state[account] = 'off' + app.last_message_time[account] = {} + app.status_before_autoaway[account] = '' + app.gajim_optional_features[account] = [] + app.caps_hash[account] = '' + helpers.update_optional_features(account) + # refresh roster + if len(app.connections) >= 2: + # Do not merge accounts if only one exists + self.roster.regroup = app.config.get('mergeaccounts') + else: + self.roster.regroup = False + self.roster.setup_and_draw_roster() + gui_menu_builder.build_accounts_menu() + self.roster.send_status(account, 'online', '') + + def disable_account(self, account): + self.roster.close_all(account) + if account == app.ZEROCONF_ACC_NAME: + app.connections[account].disable_account() + app.connections[account].cleanup() + del app.connections[account] + del self.instances[account] + del self.minimized_controls[account] + del app.nicks[account] + del app.block_signed_in_notifications[account] + del app.groups[account] + app.contacts.remove_account(account) + del app.gc_connected[account] + del app.automatic_rooms[account] + del app.to_be_removed[account] + del app.newly_added[account] + del app.sleeper_state[account] + del app.last_message_time[account] + del app.status_before_autoaway[account] + del app.gajim_optional_features[account] + del app.caps_hash[account] + if len(app.connections) >= 2: + # Do not merge accounts if only one exists + self.roster.regroup = app.config.get('mergeaccounts') + else: + self.roster.regroup = False + app.config.set_per( + 'accounts', account, 'roster_version', '') + self.roster.setup_and_draw_roster() + gui_menu_builder.build_accounts_menu() + def autoconnect(self): """ Auto connect at startup View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/1051da2e312fa3ed2fc39119b16b53a966… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/1051da2e312fa3ed2fc39119b16b53a966… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] MessageWindow: Fix window resizing in one window mode
by Philipp Hörist 21 Jun '19

21 Jun '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 7a3b82d1 by Daniel Brötzmann at 2019-06-21T19:39:26Z MessageWindow: Fix window resizing in one window mode When using one window mode, we get the allocated size of our message control notebook and save it before closing. The allocated width of our notebook does not include the background-size of the Paned's separator. Calculating width by subtracting roster_hpaned_position from allocated width of our window fixes this. - - - - - 1 changed file: - gajim/message_window.py Changes: ===================================== gajim/message_window.py ===================================== @@ -1031,10 +1031,8 @@ class MessageWindowMgr(GObject.GObject): size = (app.config.get('msgwin-width'), app.config.get('msgwin-height')) if self.mode == self.ONE_MSG_WINDOW_ALWAYS_WITH_ROSTER: - # Need to add the size of the now visible paned handle, otherwise - # the saved width of the message window decreases by this amount - handle_size = win.parent_paned.style_get_property('handle-size') - size = (hpaned + size[0] + handle_size, size[1]) + # Add the hpaned position to our message window's size + size = (hpaned + size[0], size[1]) elif self.mode == self.ONE_MSG_WINDOW_PERACCT: size = (app.config.get_per('accounts', acct, 'msgwin-width'), app.config.get_per('accounts', acct, 'msgwin-height')) @@ -1245,8 +1243,10 @@ class MessageWindowMgr(GObject.GObject): size_width_key = type_ + '-msgwin-width' size_height_key = type_ + '-msgwin-height' elif self.mode == self.ONE_MSG_WINDOW_ALWAYS_WITH_ROSTER: - # Ignore any hpaned width - width = msg_win.notebook.get_allocation().width + # Ignore hpaned separator's width and calculate width ourselves + win_width = msg_win.window.get_allocation().width + hpaned_position = app.config.get('roster_hpaned_position') + width = win_width - hpaned_position if acct: app.config.set_per('accounts', acct, size_width_key, width) View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/7a3b82d15792c457cc6dae27f9827e72da… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/7a3b82d15792c457cc6dae27f9827e72da… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] HTTP Upload Progress: Add ETA
by Philipp Hörist 21 Jun '19

21 Jun '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: c99ee623 by Daniel Brötzmann at 2019-06-21T19:28:54Z HTTP Upload Progress: Add ETA - - - - - 4 changed files: - gajim/data/gui/httpupload_progress_dialog.ui - gajim/dialogs.py - + gajim/gtk/http_upload_progress.py - gajim/gui_interface.py Changes: ===================================== gajim/data/gui/httpupload_progress_dialog.ui ===================================== @@ -2,14 +2,13 @@  <interface> <requires lib="gtk+" version="3.20"/> - <object class="GtkGrid" id="grid"> - <property name="width_request">300</property> + <object class="GtkBox" id="box"> + <property name="width_request">350</property> <property name="visible">True</property> <property name="can_focus">False</property> <property name="border_width">18</property> - <property name="row_spacing">6</property> - <property name="column_spacing">12</property> - <property name="column_homogeneous">True</property> + <property name="orientation">vertical</property> + <property name="spacing">6</property> <child> <object class="GtkImage"> <property name="visible">True</property> @@ -18,8 +17,25 @@ <property name="icon_size">6</property> </object> <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="label"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="margin_top">6</property> + <property name="label"><placeholder></property> + <style> + <class name="bold"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> </packing> </child> <child> @@ -29,21 +45,111 @@ <property name="label"><file name></property> </object> <packing> - <property name="left_attach">0</property> - <property name="top_attach">2</property> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">2</property> </packing> </child> <child> - <object class="GtkLabel" id="progress_label"> + <object class="GtkGrid"> <property name="visible">True</property> <property name="can_focus">False</property> - <style> - <class name="dim-label"/> - </style> + <property name="margin_top">6</property> + <property name="row_spacing">6</property> + <property name="column_spacing">12</property> + <property name="column_homogeneous">True</property> + <child> + <object class="GtkLabel" id="progress_label"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">start</property> + <style> + <class name="dim-label"/> + </style> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="speed_label"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">start</property> + <style> + <class name="dim-label"/> + </style> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="eta_label"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">start</property> + <style> + <class name="dim-label"/> + </style> + </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">Progress</property> + <style> + <class name="dim-label"/> + </style> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkLabel"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">end</property> + <property name="label" translatable="yes">Speed</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">Time remaining</property> + <style> + <class name="dim-label"/> + </style> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">2</property> + </packing> + </child> </object> <packing> - <property name="left_attach">0</property> - <property name="top_attach">3</property> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">3</property> </packing> </child> <child> @@ -54,41 +160,29 @@ <property name="pulse_step">0.10000000149</property> </object> <packing> - <property name="left_attach">0</property> - <property name="top_attach">4</property> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">5</property> </packing> </child> <child> <object class="GtkButton" id="cancel_upload_button"> - <property name="label" translatable="yes">Cancel Upload</property> + <property name="label" translatable="yes">_Cancel Upload</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> <property name="halign">center</property> <property name="margin_top">6</property> - <signal name="clicked" handler="on_cancel_upload_button_clicked" swapped="no"/> + <property name="use_underline">True</property> + <signal name="clicked" handler="_on_cancel_upload_button_clicked" swapped="no"/> <style> <class name="destructive-action"/> </style> </object> <packing> - <property name="left_attach">0</property> - <property name="top_attach">5</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="label"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="margin_top">6</property> - <property name="label"><placeholder></property> - <style> - <class name="bold"/> - </style> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">1</property> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">6</property> </packing> </child> </object> ===================================== gajim/dialogs.py ===================================== @@ -32,13 +32,11 @@ from typing import Tuple # pylint: disable=unused-import import os import uuid import logging -import time from gi.repository import Gtk from gi.repository import Gdk from gi.repository import GLib -from gajim.common import ged from gajim.common.i18n import _ from gajim.common.const import ACTIVITIES from gajim.common.const import MOODS @@ -1146,79 +1144,3 @@ class VoIPCallReceivedDialog: session.reject_content(content) dialog.destroy() - -class ProgressWindow(Gtk.ApplicationWindow): - def __init__(self, file): - Gtk.ApplicationWindow.__init__(self) - self.set_name('HTTPUploadProgressWindow') - self.set_application(app.app) - self.set_position(Gtk.WindowPosition.CENTER) - self.set_show_menubar(False) - self.set_title(_('File Transfer')) - - self.event = file.event - self.file = file - self._ui = get_builder('httpupload_progress_dialog.ui') - file_name = os.path.basename(file.path) - self._ui.file_name_label.set_text(file_name) - self._start_time = time.time() - - self.add(self._ui.grid) - - self.pulse = GLib.timeout_add(100, self._pulse_progressbar) - self.show_all() - - self.connect('destroy', self._on_destroy) - self._ui.connect_signals(self) - app.ged.register_event_handler('httpupload-progress', ged.CORE, - self._on_httpupload_progress) - - def _on_httpupload_progress(self, obj): - if self.file != obj.file: - return - - if obj.status == 'request': - self._ui.label.set_text(_('Requesting HTTP File Upload Slot…')) - elif obj.status == 'close': - self.destroy() - elif obj.status == 'upload': - self._ui.label.set_text(_('Uploading via HTTP File Upload…')) - elif obj.status == 'update': - self.update_progress(obj.seen, obj.total) - elif obj.status == 'encrypt': - self._ui.label.set_text(_('Encrypting file…')) - - def _pulse_progressbar(self): - self._ui.progressbar.pulse() - return True - - def on_cancel_upload_button_clicked(self, widget): - self.destroy() - - def _on_destroy(self, *args): - self.event.set() - if self.pulse: - GLib.source_remove(self.pulse) - app.ged.remove_event_handler('httpupload-progress', ged.CORE, - self._on_httpupload_progress) - - def update_progress(self, seen, total): - if self.event.isSet(): - return - if self.pulse: - GLib.source_remove(self.pulse) - self.pulse = None - - size_total = round(total / (1024 * 1024), 1) - size_progress = round(seen / (1024 * 1024), 1) - - time_now = time.time() - mbytes_sec = round(size_progress / (time_now - self._start_time), 1) - - self._ui.progressbar.set_fraction(float(seen) / total) - - self._ui.progress_label.set_text( - _('%(progress)s of %(total)s MiB sent (%(speed)s MiB/s)') % \ - {'progress': str(size_progress), - 'total': str(size_total), - 'speed': str(mbytes_sec)}) ===================================== gajim/gtk/http_upload_progress.py ===================================== @@ -0,0 +1,116 @@ +# 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 os +import time + +from gi.repository import Gtk +from gi.repository import GLib + +from gajim.common import app +from gajim.common import ged +from gajim.common.i18n import _ + +from gajim.gtk.util import get_builder + + +class HTTPUploadProgressWindow(Gtk.ApplicationWindow): + def __init__(self, file): + Gtk.ApplicationWindow.__init__(self) + self.set_name('HTTPUploadProgressWindow') + self.set_application(app.app) + self.set_position(Gtk.WindowPosition.CENTER) + self.set_show_menubar(False) + self.set_title(_('File Transfer')) + + self.event = file.event + self.file = file + self._ui = get_builder('httpupload_progress_dialog.ui') + file_name = os.path.basename(file.path) + self._ui.file_name_label.set_text(file_name) + self._start_time = time.time() + + self.add(self._ui.box) + + self.pulse = GLib.timeout_add(100, self._pulse_progressbar) + self.show_all() + + self.connect('destroy', self._on_destroy) + self._ui.connect_signals(self) + app.ged.register_event_handler('httpupload-progress', ged.CORE, + self._on_httpupload_progress) + + def _on_httpupload_progress(self, obj): + if self.file != obj.file: + return + + if obj.status == 'request': + self._ui.label.set_text(_('Requesting HTTP File Upload Slot…')) + elif obj.status == 'close': + self.destroy() + elif obj.status == 'upload': + self._ui.label.set_text(_('Uploading via HTTP File Upload…')) + elif obj.status == 'update': + self._update_progress(obj.seen, obj.total) + elif obj.status == 'encrypt': + self._ui.label.set_text(_('Encrypting file…')) + + def _pulse_progressbar(self): + self._ui.progressbar.pulse() + return True + + def _on_cancel_upload_button_clicked(self, widget): + self.destroy() + + def _on_destroy(self, *args): + self.event.set() + if self.pulse: + GLib.source_remove(self.pulse) + app.ged.remove_event_handler('httpupload-progress', ged.CORE, + self._on_httpupload_progress) + + def _update_progress(self, seen, total): + if self.event.isSet(): + return + if self.pulse: + GLib.source_remove(self.pulse) + self.pulse = None + + size_total = round(total / (1024 * 1024), 1) + size_progress = round(seen / (1024 * 1024), 1) + + time_now = time.time() + mbytes_sec = round(size_progress / (time_now - self._start_time), 1) + eta = self._format_eta( + round((size_total - size_progress) / mbytes_sec)) + + self._ui.progressbar.set_fraction(float(seen) / total) + + self._ui.progress_label.set_text( + _('%(progress)s of %(total)s MiB') % { + 'progress': str(size_progress), + 'total': str(size_total)}) + + self._ui.speed_label.set_text(_('%s MiB/s') % str(mbytes_sec)) + self._ui.eta_label.set_text(str(eta)) + + def _format_eta(self, time_): + times = {'minutes': 0, 'seconds': 0} + time_ = int(time_) + times['seconds'] = time_ % 60 + if time_ >= 60: + time_ /= 60 + times['minutes'] = time_ % 60 + + return _('%(minutes)s min %(seconds)s sec') % times ===================================== gajim/gui_interface.py ===================================== @@ -58,7 +58,6 @@ from gajim import gui_menu_builder from gajim import dialogs from gajim import message_control from gajim.dialog_messages import get_dialog -from gajim.dialogs import ProgressWindow from gajim.chat_control_base import ChatControlBase from gajim.chat_control import ChatControl @@ -111,6 +110,7 @@ from gajim.gtk.emoji_data import emoji_data from gajim.gtk.emoji_data import emoji_ascii_data from gajim.gtk.groupchat_config import GroupchatConfig from gajim.gtk.filetransfer import FileTransfersWindow +from gajim.gtk.http_upload_progress import HTTPUploadProgressWindow from gajim.gtk.roster_item_exchange import RosterItemExchangeWindow from gajim.gtk.subscription_request import SubscriptionRequestWindow from gajim.gtk.util import get_show_in_roster @@ -928,7 +928,7 @@ class Interface: @staticmethod def show_httpupload_progress(file): - ProgressWindow(file) + HTTPUploadProgressWindow(file) def send_httpupload(self, chat_control): accept_cb = partial(self.on_file_dialog_ok, chat_control) View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/c99ee623fc9fd10111600d4a720e2374b3… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/c99ee623fc9fd10111600d4a720e2374b3… You're receiving this email because of your account on dev.gajim.org.

1 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits June 2019