Commits June 2020

commits@gajim.org

1 participants
55 discussions

[Git][gajim/gajim][gajim_1.2] 2 commits: PluginManager: Fix string format
by Philipp Hörist 30 Jun '20

30 Jun '20

Philipp Hörist pushed to branch gajim_1.2 at gajim / gajim Commits: 0aefeeae by André Apitzsch at 2020-06-30T20:07:16+02:00 PluginManager: Fix string format - - - - - 85c1c835 by lovetox at 2020-06-30T20:07:16+02:00 PluginManager: Load plugins on Windows correctly On Windows we ship compiled files - - - - - 1 changed file: - gajim/plugins/pluginmanager.py Changes: ===================================== gajim/plugins/pluginmanager.py ===================================== @@ -79,7 +79,7 @@ class Plugin: shipped = is_shipped_plugin(path) manifest = path / 'manifest.ini' if not manifest.exists() and not manifest.is_dir(): - raise ValueError('Not a plugin path: {path}') + raise ValueError(f'Not a plugin path: {path}') conf = configparser.ConfigParser() conf.remove_section('info') @@ -130,11 +130,15 @@ class Plugin: path=path) def load_module(self): - moduel_path = self.path / '__init__.py' + module_path = self.path / '__init__.py' + if not module_path.exists(): + # On Windows we only ship compiled files + module_path = self.path/ '__init__.pyc' + module_name = self.path.stem try: - spec = spec_from_file_location(module_name, moduel_path) + spec = spec_from_file_location(module_name, module_path) if spec is None: return None module = module_from_spec(spec) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/c57db6dddd8cbbb09b5290fb348207b… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/c57db6dddd8cbbb09b5290fb348207b… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] PluginManager: Load plugins on Windows correctly
by Philipp Hörist 30 Jun '20

30 Jun '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: c057c605 by lovetox at 2020-06-30T20:05:26+02:00 PluginManager: Load plugins on Windows correctly On Windows we ship compiled files - - - - - 1 changed file: - gajim/plugins/pluginmanager.py Changes: ===================================== gajim/plugins/pluginmanager.py ===================================== @@ -130,11 +130,15 @@ class Plugin: path=path) def load_module(self): - moduel_path = self.path / '__init__.py' + module_path = self.path / '__init__.py' + if not module_path.exists(): + # On Windows we only ship compiled files + module_path = self.path/ '__init__.pyc' + module_name = self.path.stem try: - spec = spec_from_file_location(module_name, moduel_path) + spec = spec_from_file_location(module_name, module_path) if spec is None: return None module = module_from_spec(spec) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/c057c605e3a0a7831e6870bf6bc52655… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/c057c605e3a0a7831e6870bf6bc52655… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] PluginManager: Fix string format
by Philipp Hörist 30 Jun '20

30 Jun '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: ca4c2d67 by André Apitzsch at 2020-06-30T11:22:22+02:00 PluginManager: Fix string format - - - - - 1 changed file: - gajim/plugins/pluginmanager.py Changes: ===================================== gajim/plugins/pluginmanager.py ===================================== @@ -79,7 +79,7 @@ class Plugin: shipped = is_shipped_plugin(path) manifest = path / 'manifest.ini' if not manifest.exists() and not manifest.is_dir(): - raise ValueError('Not a plugin path: {path}') + raise ValueError(f'Not a plugin path: {path}') conf = configparser.ConfigParser() conf.remove_section('info') View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/ca4c2d6764febae03c56171c21a565cb… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/ca4c2d6764febae03c56171c21a565cb… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][gajim_1.2] 14 commits: ServerInfo: Add status address
by Philipp Hörist 29 Jun '20

29 Jun '20

Philipp Hörist pushed to branch gajim_1.2 at gajim / gajim Commits: 392ecc2c by Daniel Brötzmann at 2020-06-29T21:23:32+02:00 ServerInfo: Add status address - - - - - 5dccc667 by Daniel Brötzmann at 2020-06-29T21:23:32+02:00 DOAP: Add XEP-0157 - - - - - 2ab258f3 by André Apitzsch at 2020-06-29T21:24:14+02:00 Remove unused script The script has been moved to gajim-plugins repo. - - - - - d09fe651 by Daniel Brötzmann at 2020-06-29T21:24:14+02:00 ChatControlBase: Rework drag and drop - - - - - f8a2abdb by lovetox at 2020-06-29T21:24:15+02:00 GroupchatRoster: Sort by status in correct order - - - - - 96d83b43 by lovetox at 2020-06-29T21:24:15+02:00 About: Update current developers - - - - - 7a5f935c by lovetox at 2020-06-29T21:24:15+02:00 Client: Register screensaver handler on all platforms This is no problem because the signal is not emited if the platform does not support it Fixes #10152 - - - - - 06a7db81 by lovetox at 2020-06-29T21:24:15+02:00 Remove unused import - - - - - 2bea664d by Daniel Brötzmann at 2020-06-29T21:24:15+02:00 DOAP: Add XEPs 0080, 0082, and 0224 - - - - - b2dd45d3 by lovetox at 2020-06-29T21:24:15+02:00 Interface: Use rsplit for extracting the port - - - - - 79d2c579 by lovetox at 2020-06-29T21:26:56+02:00 Windows: Update build - Remove some unused dirs to reduce the size of the installation - Add some needed executables - - - - - 93a8a584 by lovetox at 2020-06-29T21:26:56+02:00 PluginManager: Refactor loading plugins - Auto enable all plugins in the base folder, this allows package maintainers to ship plugins - Give plugins in the user folder priority over plugins in the base folder - - - - - 9b71233b by wurstsalat at 2020-06-29T21:26:56+02:00 Encryption menu: Make 'disabled' item translatable - - - - - c57db6dd by lovetox at 2020-06-29T21:26:56+02:00 Plugins: Don't fail if plugins dir does not exist - - - - - 17 changed files: - data/gajim.doap - gajim/chat_control_base.py - gajim/common/client.py - gajim/common/configpaths.py - gajim/common/const.py - gajim/data/gui/chat_control.ui - gajim/data/gui/groupchat_control.ui - gajim/data/style/gajim.css - gajim/gtk/groupchat_roster.py - gajim/gtk/server_info.py - gajim/gui_interface.py - gajim/gui_menu_builder.py - gajim/plugins/gui.py - gajim/plugins/helpers.py - gajim/plugins/pluginmanager.py - − scripts/dev/plugins_translate - win/_base.sh Changes: ===================================== data/gajim.doap ===================================== @@ -179,6 +179,20 @@ <xmpp:version>2.4</xmpp:version> </xmpp:SupportedXep> </implements> + <implements> + <xmpp:SupportedXep> + <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0080.html" /> + <xmpp:status>complete</xmpp:status> + <xmpp:version>1.9</xmpp:version> + </xmpp:SupportedXep> + </implements> + <implements> + <xmpp:SupportedXep> + <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0082.html" /> + <xmpp:status>complete</xmpp:status> + <xmpp:version>1.1</xmpp:version> + </xmpp:SupportedXep> + </implements> <implements> <xmpp:SupportedXep> <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0084.html" /> @@ -279,6 +293,13 @@ <xmpp:note>Only DNS method.</xmpp:note> </xmpp:SupportedXep> </implements> + <implements> + <xmpp:SupportedXep> + <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0157.html" /> + <xmpp:status>complete</xmpp:status> + <xmpp:version>1.1.0</xmpp:version> + </xmpp:SupportedXep> + </implements> <implements> <xmpp:SupportedXep> <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0158.html" /> @@ -394,6 +415,13 @@ <xmpp:version>1.1</xmpp:version> </xmpp:SupportedXep> </implements> + <implements> + <xmpp:SupportedXep> + <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0224.html" /> + <xmpp:status>complete</xmpp:status> + <xmpp:version>1.0</xmpp:version> + </xmpp:SupportedXep> + </implements> <implements> <xmpp:SupportedXep> <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0231.html" /> @@ -556,4 +584,4 @@ </xmpp:SupportedXep> </implements> </Project> -</rdf:RDF> \ No newline at end of file +</rdf:RDF> ===================================== gajim/chat_control_base.py ===================================== @@ -148,7 +148,10 @@ class ChatControlBase(ChatCommandProcessor, CommandTools, EventHelper): self.xml.account_badge.add(account_badge) account_badge.show() - # Init DND + # Drag and drop + self.xml.overlay.add_overlay(self.xml.drop_area) + self.xml.drop_area.hide() + self.TARGET_TYPE_URI_LIST = 80 uri_entry = Gtk.TargetEntry.new( 'text/uri-list', @@ -156,40 +159,33 @@ class ChatControlBase(ChatCommandProcessor, CommandTools, EventHelper): self.TARGET_TYPE_URI_LIST) dst_targets = Gtk.TargetList.new([uri_entry]) dst_targets.add_text_targets(0) - self.dnd_list = [uri_entry, - Gtk.TargetEntry.new( - 'MY_TREE_MODEL_ROW', - Gtk.TargetFlags.SAME_APP, - 0)] - id_ = self.widget.connect('drag_data_received', - self._on_drag_data_received) - self.handlers[id_] = self.widget - self.widget.drag_dest_set( + self._dnd_list = [uri_entry, + Gtk.TargetEntry.new( + 'MY_TREE_MODEL_ROW', + Gtk.TargetFlags.SAME_APP, + 0)] + + id_ = self.xml.overlay.connect('drag_data_received', + self._on_drag_data_received) + + self.handlers[id_] = self.xml.overlay + id_ = self.xml.overlay.connect('drag_motion', self._on_drag_motion) + self.handlers[id_] = self.xml.overlay + id_ = self.xml.overlay.connect('drag_leave', self._on_drag_leave) + self.handlers[id_] = self.xml.overlay + + self.xml.overlay.drag_dest_set( Gtk.DestDefaults.ALL, - self.dnd_list, + self._dnd_list, Gdk.DragAction.COPY) - self.widget.drag_dest_set_target_list(dst_targets) + self.xml.overlay.drag_dest_set_target_list(dst_targets) # Create textviews and connect signals self.conv_textview = ConversationTextview(self.account) + self.conv_textview.tv.drag_dest_unset() id_ = self.conv_textview.connect('quote', self.on_quote) self.handlers[id_] = self.conv_textview.tv - # FIXME: DND on non editable TextView, find a better way - self.drag_entered = False - id_ = self.conv_textview.tv.connect('drag_data_received', - self._on_drag_data_received) - self.handlers[id_] = self.conv_textview.tv - id_ = self.conv_textview.tv.connect('drag_motion', self._on_drag_motion) - self.handlers[id_] = self.conv_textview.tv - id_ = self.conv_textview.tv.connect('drag_leave', self._on_drag_leave) - self.handlers[id_] = self.conv_textview.tv - self.conv_textview.tv.drag_dest_set( - Gtk.DestDefaults.ALL, - self.dnd_list, - Gdk.DragAction.COPY) - self.conv_textview.tv.drag_dest_set_target_list(dst_targets) - id_ = self.conv_textview.tv.connect('grab-focus', self._on_html_textview_grab_focus) self.handlers[id_] = self.conv_textview.tv @@ -938,14 +934,12 @@ class ChatControlBase(ChatCommandProcessor, CommandTools, EventHelper): """ def _on_drag_leave(self, *args): - # FIXME: DND on non editable TextView, find a better way - self.drag_entered = False - self.conv_textview.tv.set_editable(False) + self.xml.drop_area.set_no_show_all(True) + self.xml.drop_area.hide() def _on_drag_motion(self, *args): - # FIXME: DND on non editable TextView, find a better way - if not self.drag_entered: - self.conv_textview.tv.set_editable(True) + self.xml.drop_area.set_no_show_all(False) + self.xml.drop_area.show_all() def drag_data_file_transfer(self, selection): # we may have more than one file dropped ===================================== gajim/common/client.py ===================================== @@ -12,7 +12,6 @@ # You should have received a copy of the GNU General Public License # along with Gajim. If not, see <http://www.gnu.org/licenses/>. -import sys import logging import nbxmpp @@ -93,9 +92,8 @@ class Client(ConnectionHandlers): self._idle_handler_id = Monitor.connect('state-changed', self._idle_state_changed) - if sys.platform not in ('win32', 'darwin'): - self._screensaver_handler_id = app.app.connect( - 'notify::screensaver-active', self._screensaver_state_changed) + self._screensaver_handler_id = app.app.connect( + 'notify::screensaver-active', self._screensaver_state_changed) ConnectionHandlers.__init__(self) ===================================== gajim/common/configpaths.py ===================================== @@ -42,12 +42,12 @@ def get(key: str) -> str: return _paths[key] -def get_plugin_dirs() -> List[str]: +def get_plugin_dirs() -> List[Path]: if gajim.IS_FLATPAK: - return ['/app/plugins', - _paths['PLUGINS_BASE']] - return [_paths['PLUGINS_BASE'], - _paths['PLUGINS_USER']] + return [Path(_paths['PLUGINS_BASE']), + Path('/app/plugins')] + return [Path(_paths['PLUGINS_BASE']), + Path(_paths['PLUGINS_USER'])] def get_paths(type_: PathType) -> Generator[str, None, None]: ===================================== gajim/common/const.py ===================================== @@ -627,6 +627,8 @@ Jakub Szypulka DEVS_CURRENT = u"""\ Yann Leboulanger (asterix AT lagaule.org) Philipp Hörist (philipp AT hoerist.com) +Daniel Brötzmann (wurstsalat AT posteo.de) +André Apitzsch """.strip().split("\n") DEVS_PAST = u"""\ ===================================== gajim/data/gui/chat_control.ui ===================================== @@ -14,6 +14,51 @@ <property name="page_increment">10</property> <property name="page_size">10</property> </object> + <object class="GtkBox" id="drop_area"> + <property name="name">DropArea</property> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="no_show_all">True</property> + <property name="opacity">0.9</property> + <property name="hexpand">True</property> + <property name="vexpand">True</property> + <property name="orientation">vertical</property> + <property name="spacing">18</property> + <child> + <object class="GtkImage"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">end</property> + <property name="vexpand">True</property> + <property name="icon_name">mail-attachment-symbolic</property> + <property name="icon_size">6</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkLabel"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">start</property> + <property name="vexpand">True</property> + <property name="label" translatable="yes">Drop files or contacts</property> + <property name="wrap">True</property> + <property name="max_width_chars">40</property> + <style> + <class name="bold16"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + </object> <object class="GtkPopover" id="dtmf_popover"> <property name="can_focus">False</property> <child> @@ -344,130 +389,351 @@ </object> <object class="GtkBox" id="chat_control_hbox"> <property name="can_focus">True</property> - <property name="margin_left">7</property> - <property name="margin_right">7</property> + <property name="margin_start">7</property> + <property name="margin_end">7</property> <property name="margin_top">5</property> <property name="margin_bottom">7</property> <property name="spacing">1</property> <child> - <object class="GtkPaned" id="paned1"> + <object class="GtkOverlay" id="overlay"> <property name="visible">True</property> - <property name="can_focus">True</property> + <property name="can_focus">False</property> <child> - <object class="GtkBox" id="vbox2"> + <object class="GtkPaned" id="paned1"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="orientation">vertical</property> + <property name="can_focus">True</property> <child> - <object class="GtkEventBox" id="banner_eventbox"> - <property name="name">ChatControl-BannerEventBox</property> + <object class="GtkBox" id="vbox2"> + <property name="visible">True</property> <property name="can_focus">False</property> - <property name="no_show_all">True</property> + <property name="orientation">vertical</property> <child> - <object class="GtkBox"> - <property name="visible">True</property> + <object class="GtkEventBox" id="banner_eventbox"> + <property name="name">ChatControl-BannerEventBox</property> <property name="can_focus">False</property> - <property name="spacing">6</property> + <property name="no_show_all">True</property> <child> - <object class="GtkEventBox" id="avatar_eventbox"> + <object class="GtkBox"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="visible_window">False</property> + <property name="spacing">6</property> <child> - <object class="GtkImage" id="avatar_image"> - <property name="width_request">48</property> - <property name="height_request">48</property> + <object class="GtkEventBox" id="avatar_eventbox"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="stock">gtk-missing-image</property> + <property name="visible_window">False</property> + <child> + <object class="GtkImage" id="avatar_image"> + <property name="width_request">48</property> + <property name="height_request">48</property> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="stock">gtk-missing-image</property> + </object> + </child> </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">0</property> + </packing> </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkGrid"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="valign">center</property> - <property name="hexpand">True</property> - <property name="row_spacing">3</property> - <property name="column_spacing">3</property> <child> - <object class="GtkLabel" id="banner_name_label"> - <property name="name">ChatControl-BannerNameLabel</property> + <object class="GtkGrid"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="halign">start</property> + <property name="valign">center</property> <property name="hexpand">True</property> - <property name="label">Contact name</property> - <property name="ellipsize">end</property> - <property name="xalign">0</property> - <style> - <class name="large-header"/> - </style> + <property name="row_spacing">3</property> + <property name="column_spacing">3</property> + <child> + <object class="GtkLabel" id="banner_name_label"> + <property name="name">ChatControl-BannerNameLabel</property> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">start</property> + <property name="hexpand">True</property> + <property name="label">Contact name</property> + <property name="ellipsize">end</property> + <property name="xalign">0</property> + <style> + <class name="large-header"/> + </style> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + <property name="width">2</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="banner_label"> + <property name="name">ChatControl-BannerLabel</property> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">start</property> + <property name="hexpand">True</property> + <property name="label">label</property> + <property name="selectable">True</property> + <property name="ellipsize">end</property> + <property name="xalign">0</property> + <signal name="populate-popup" handler="on_banner_label_populate_popup" swapped="no"/> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="GtkImage" id="phone_image"> + <property name="can_focus">False</property> + <property name="no_show_all">True</property> + <property name="tooltip_text" translatable="yes">The last message was written on a mobile client</property> + <property name="halign">start</property> + <property name="margin_right">4</property> + <property name="icon_name">phone-apple-iphone-symbolic</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="GtkBox" id="account_badge"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">end</property> + <property name="valign">center</property> + <property name="orientation">vertical</property> + <child> + <placeholder/> + </child> + </object> + <packing> + <property name="left_attach">2</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <placeholder/> + </child> </object> <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> - <property name="width">2</property> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> </packing> </child> <child> - <object class="GtkLabel" id="banner_label"> - <property name="name">ChatControl-BannerLabel</property> + <object class="GtkBox" id="hbox2"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="halign">start</property> - <property name="hexpand">True</property> - <property name="label">label</property> - <property name="selectable">True</property> - <property name="ellipsize">end</property> - <property name="xalign">0</property> - <signal name="populate-popup" handler="on_banner_label_populate_popup" swapped="no"/> + <property name="spacing">4</property> + <child> + <object class="GtkImage" id="mood_image"> + <property name="can_focus">False</property> + <property name="no_show_all">True</property> + <property name="stock">gtk-missing-image</property> + <property name="icon_size">1</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkImage" id="activity_image"> + <property name="can_focus">False</property> + <property name="no_show_all">True</property> + <property name="stock">gtk-missing-image</property> + <property name="icon_size">1</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="GtkImage" id="tune_image"> + <property name="can_focus">False</property> + <property name="no_show_all">True</property> + <property name="stock">gtk-missing-image</property> + <property name="icon_size">1</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">2</property> + </packing> + </child> + <child> + <object class="GtkEventBox" id="location_eventbox"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="visible_window">False</property> + <child> + <object class="GtkImage" id="location_image"> + <property name="can_focus">False</property> + <property name="no_show_all">True</property> + <property name="stock">gtk-missing-image</property> + <property name="icon_size">1</property> + </object> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">3</property> + </packing> + </child> + <child> + <object class="GtkImage" id="audio_banner_image"> + <property name="can_focus">False</property> + <property name="no_show_all">True</property> + <property name="stock">gtk-missing-image</property> + <property name="icon_size">1</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">4</property> + </packing> + </child> + <child> + <object class="GtkImage" id="video_banner_image"> + <property name="can_focus">False</property> + <property name="no_show_all">True</property> + <property name="stock">gtk-missing-image</property> + <property name="icon_size">1</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">5</property> + </packing> + </child> </object> <packing> - <property name="left_attach">1</property> - <property name="top_attach">1</property> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">2</property> </packing> </child> + </object> + </child> + <style> + <class name="gajim-banner"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkSeparator"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <style> + <class name="chatcontrol-separator-top"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="GtkScrolledWindow" id="conversation_scrolledwindow"> + <property name="height_request">60</property> + <property name="can_focus">True</property> + <property name="shadow_type">in</property> + <property name="overlay_scrolling">False</property> + <signal name="edge-reached" handler="_on_edge_reached" swapped="no"/> + <signal name="scroll-event" handler="_on_scroll" swapped="no"/> + <child> + <placeholder/> + </child> + <style> + <class name="scrolled-no-border"/> + <class name="no-scroll-indicator"/> + <class name="scrollbar-style"/> + </style> + </object> + <packing> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">2</property> + </packing> + </child> + <child> + <object class="GtkSeparator"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <style> + <class name="chatcontrol-separator"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">3</property> + </packing> + </child> + <child> + <object class="GtkBox" id="hbox"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> + <child> + <object class="GtkMenuButton" id="emoticons_button"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="tooltip_text" translatable="yes">Show a list of emojis (Alt+M)</property> + <property name="relief">none</property> <child> - <object class="GtkImage" id="phone_image"> + <object class="GtkImage"> + <property name="visible">True</property> <property name="can_focus">False</property> - <property name="no_show_all">True</property> - <property name="tooltip_text" translatable="yes">The last message was written on a mobile client</property> - <property name="halign">start</property> - <property name="margin_right">4</property> - <property name="icon_name">phone-apple-iphone-symbolic</property> + <property name="icon_name">face-smile-symbolic</property> </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">1</property> - </packing> </child> + <style> + <class name="chatcontrol-actionbar-button"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkMenuButton" id="formattings_button"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="focus_on_click">False</property> + <property name="receives_default">True</property> + <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> + <property name="has_tooltip">True</property> + <property name="relief">none</property> + <property name="popup">formattings_menu</property> <child> - <object class="GtkBox" id="account_badge"> + <object class="GtkImage" id="image10"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="halign">end</property> - <property name="valign">center</property> - <property name="orientation">vertical</property> - <child> - <placeholder/> - </child> + <property name="icon_name">format-text-bold-symbolic</property> + <property name="icon_size">1</property> </object> - <packing> - <property name="left_attach">2</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <placeholder/> </child> + <style> + <class name="chatcontrol-actionbar-button"/> + </style> </object> <packing> <property name="expand">False</property> @@ -476,264 +742,153 @@ </packing> </child> <child> - <object class="GtkBox" id="hbox2"> - <property name="visible">True</property> + <object class="GtkBox" id="audio_buttons_hbox"> <property name="can_focus">False</property> - <property name="spacing">4</property> + <property name="no_show_all">True</property> <child> - <object class="GtkImage" id="mood_image"> + <object class="GtkSeparator" id="vseparator2"> + <property name="visible">True</property> <property name="can_focus">False</property> - <property name="no_show_all">True</property> - <property name="stock">gtk-missing-image</property> - <property name="icon_size">1</property> + <property name="orientation">vertical</property> </object> <packing> <property name="expand">False</property> - <property name="fill">False</property> + <property name="fill">True</property> <property name="position">0</property> </packing> </child> <child> - <object class="GtkImage" id="activity_image"> - <property name="can_focus">False</property> - <property name="no_show_all">True</property> - <property name="stock">gtk-missing-image</property> - <property name="icon_size">1</property> + <object class="GtkVolumeButton" id="sound_hscale"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="focus_on_click">False</property> + <property name="receives_default">True</property> + <property name="has_tooltip">True</property> + <property name="relief">none</property> + <property name="orientation">vertical</property> + <property name="size">menu</property> + <property name="adjustment">adjustment1</property> + <property name="icons">audio-volume-muted-symbolic +audio-volume-low-symbolic +audio-volume-medium-symbolic +audio-volume-high-symbolic</property> + <property name="use_symbolic">False</property> + <child internal-child="plus_button"> + <object class="GtkButton" id="volumebutton-plus_button1"> + <property name="can_focus">False</property> + <property name="receives_default">False</property> + </object> + </child> + <child internal-child="minus_button"> + <object class="GtkButton" id="volumebutton-minus_button1"> + <property name="can_focus">False</property> + <property name="receives_default">False</property> + </object> + </child> + <style> + <class name="chatcontrol-actionbar-button"/> + </style> </object> <packing> <property name="expand">False</property> - <property name="fill">False</property> + <property name="fill">True</property> <property name="position">1</property> </packing> </child> <child> - <object class="GtkImage" id="tune_image"> - <property name="can_focus">False</property> - <property name="no_show_all">True</property> - <property name="stock">gtk-missing-image</property> - <property name="icon_size">1</property> + <object class="GtkVolumeButton" id="mic_hscale"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="focus_on_click">False</property> + <property name="receives_default">True</property> + <property name="has_tooltip">True</property> + <property name="relief">none</property> + <property name="orientation">vertical</property> + <property name="size">menu</property> + <property name="adjustment">adjustment2</property> + <property name="icons">microphone-sensitivity-muted-symbolic +microphone-sensitivity-low-symbolic +microphone-sensitivity-medium-symbolic +microphone-sensitivity-high-symbolic</property> + <property name="use_symbolic">False</property> + <child internal-child="plus_button"> + <object class="GtkButton" id="volumebutton-plus_button2"> + <property name="can_focus">False</property> + <property name="receives_default">False</property> + </object> + </child> + <child internal-child="minus_button"> + <object class="GtkButton" id="volumebutton-minus_button2"> + <property name="can_focus">False</property> + <property name="receives_default">False</property> + </object> + </child> + <style> + <class name="chatcontrol-actionbar-button"/> + </style> </object> <packing> <property name="expand">False</property> - <property name="fill">False</property> + <property name="fill">True</property> <property name="position">2</property> </packing> </child> <child> - <object class="GtkEventBox" id="location_eventbox"> + <object class="GtkMenuButton" id="dtmf_button"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="visible_window">False</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="relief">none</property> + <property name="direction">up</property> + <property name="popover">dtmf_popover</property> <child> - <object class="GtkImage" id="location_image"> + <object class="GtkImage"> + <property name="visible">True</property> <property name="can_focus">False</property> - <property name="no_show_all">True</property> - <property name="stock">gtk-missing-image</property> + <property name="icon_name">input-dialpad-symbolic</property> <property name="icon_size">1</property> </object> </child> + <style> + <class name="chatcontrol-actionbar-button"/> + </style> </object> <packing> <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">3</property> - </packing> - </child> - <child> - <object class="GtkImage" id="audio_banner_image"> - <property name="can_focus">False</property> - <property name="no_show_all">True</property> - <property name="stock">gtk-missing-image</property> - <property name="icon_size">1</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> + <property name="fill">True</property> <property name="position">4</property> </packing> </child> - <child> - <object class="GtkImage" id="video_banner_image"> - <property name="can_focus">False</property> - <property name="no_show_all">True</property> - <property name="stock">gtk-missing-image</property> - <property name="icon_size">1</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">5</property> - </packing> - </child> </object> <packing> <property name="expand">False</property> - <property name="fill">False</property> + <property name="fill">True</property> + <property name="pack_type">end</property> <property name="position">2</property> </packing> </child> - </object> - </child> - <style> - <class name="gajim-banner"/> - </style> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkSeparator"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <style> - <class name="chatcontrol-separator-top"/> - </style> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> - <child> - <object class="GtkScrolledWindow" id="conversation_scrolledwindow"> - <property name="height_request">60</property> - <property name="can_focus">True</property> - <property name="shadow_type">in</property> - <property name="overlay_scrolling">False</property> - <signal name="edge-reached" handler="_on_edge_reached" swapped="no"/> - <signal name="scroll-event" handler="_on_scroll" swapped="no"/> - <child> - <placeholder/> - </child> - <style> - <class name="scrolled-no-border"/> - <class name="no-scroll-indicator"/> - <class name="scrollbar-style"/> - </style> - </object> - <packing> - <property name="expand">True</property> - <property name="fill">True</property> - <property name="position">2</property> - </packing> - </child> - <child> - <object class="GtkSeparator"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <style> - <class name="chatcontrol-separator"/> - </style> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">3</property> - </packing> - </child> - <child> - <object class="GtkBox" id="hbox"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> - <child> - <object class="GtkMenuButton" id="emoticons_button"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="tooltip_text" translatable="yes">Show a list of emojis (Alt+M)</property> - <property name="relief">none</property> <child> - <object class="GtkImage"> + <object class="GtkComboBox" id="label_selector"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="icon_name">face-smile-symbolic</property> - </object> - </child> - <style> - <class name="chatcontrol-actionbar-button"/> - </style> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkMenuButton" id="formattings_button"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="focus_on_click">False</property> - <property name="receives_default">True</property> - <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> - <property name="has_tooltip">True</property> - <property name="relief">none</property> - <property name="popup">formattings_menu</property> - <child> - <object class="GtkImage" id="image10"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="icon_name">format-text-bold-symbolic</property> - <property name="icon_size">1</property> - </object> - </child> - <style> - <class name="chatcontrol-actionbar-button"/> - </style> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> - <child> - <object class="GtkBox" id="audio_buttons_hbox"> - <property name="can_focus">False</property> - <property name="no_show_all">True</property> - <child> - <object class="GtkSeparator" id="vseparator2"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="orientation">vertical</property> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">0</property> + <property name="position">3</property> </packing> </child> <child> - <object class="GtkVolumeButton" id="sound_hscale"> + <object class="GtkMenuButton" id="settings_menu"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="focus_on_click">False</property> <property name="receives_default">True</property> - <property name="has_tooltip">True</property> <property name="relief">none</property> - <property name="orientation">vertical</property> - <property name="size">menu</property> - <property name="adjustment">adjustment1</property> - <property name="icons">audio-volume-muted-symbolic -audio-volume-low-symbolic -audio-volume-medium-symbolic -audio-volume-high-symbolic</property> - <property name="use_symbolic">False</property> - <child internal-child="plus_button"> - <object class="GtkButton" id="volumebutton-plus_button1"> - <property name="can_focus">False</property> - <property name="receives_default">False</property> - </object> - </child> - <child internal-child="minus_button"> - <object class="GtkButton" id="volumebutton-minus_button1"> + <child> + <object class="GtkImage"> + <property name="visible">True</property> <property name="can_focus">False</property> - <property name="receives_default">False</property> + <property name="icon_name">open-menu-symbolic</property> </object> </child> <style> @@ -743,36 +898,47 @@ audio-volume-high-symbolic</property> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">1</property> + <property name="pack_type">end</property> + <property name="position">4</property> </packing> </child> <child> - <object class="GtkVolumeButton" id="mic_hscale"> - <property name="visible">True</property> + <object class="GtkButton" id="authentication_button"> <property name="can_focus">True</property> <property name="focus_on_click">False</property> <property name="receives_default">True</property> - <property name="has_tooltip">True</property> + <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> + <property name="no_show_all">True</property> <property name="relief">none</property> - <property name="orientation">vertical</property> - <property name="size">menu</property> - <property name="adjustment">adjustment2</property> - <property name="icons">microphone-sensitivity-muted-symbolic -microphone-sensitivity-low-symbolic -microphone-sensitivity-medium-symbolic -microphone-sensitivity-high-symbolic</property> - <property name="use_symbolic">False</property> - <child internal-child="plus_button"> - <object class="GtkButton" id="volumebutton-plus_button2"> + <signal name="clicked" handler="_on_authentication_button_clicked" swapped="no"/> + <child> + <object class="GtkImage" id="lock_image"> + <property name="visible">True</property> <property name="can_focus">False</property> - <property name="receives_default">False</property> + <property name="stock">gtk-dialog-authentication</property> + <property name="icon_size">1</property> </object> </child> - <child internal-child="minus_button"> - <object class="GtkButton" id="volumebutton-minus_button2"> - <property name="can_focus">False</property> - <property name="receives_default">False</property> - </object> + <style> + <class name="chatcontrol-actionbar-button"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="pack_type">end</property> + <property name="position">5</property> + </packing> + </child> + <child> + <object class="GtkMenuButton" id="encryption_menu"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="tooltip_text" translatable="yes">Choose encryption</property> + <property name="relief">none</property> + <child> + <placeholder/> </child> <style> <class name="chatcontrol-actionbar-button"/> @@ -781,22 +947,23 @@ microphone-sensitivity-high-symbolic</property> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">2</property> + <property name="pack_type">end</property> + <property name="position">6</property> </packing> </child> <child> - <object class="GtkMenuButton" id="dtmf_button"> + <object class="GtkButton" id="sendfile_button"> <property name="visible">True</property> <property name="can_focus">True</property> + <property name="focus_on_click">False</property> <property name="receives_default">True</property> + <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> <property name="relief">none</property> - <property name="direction">up</property> - <property name="popover">dtmf_popover</property> <child> <object class="GtkImage"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="icon_name">input-dialpad-symbolic</property> + <property name="icon_name">mail-attachment-symbolic</property> <property name="icon_size">1</property> </object> </child> @@ -806,181 +973,73 @@ microphone-sensitivity-high-symbolic</property> </object> <packing> <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">4</property> + <property name="fill">False</property> + <property name="pack_type">end</property> + <property name="position">7</property> </packing> </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="pack_type">end</property> - <property name="position">2</property> - </packing> - </child> - <child> - <object class="GtkComboBox" id="label_selector"> - <property name="visible">True</property> - <property name="can_focus">False</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">3</property> - </packing> - </child> - <child> - <object class="GtkMenuButton" id="settings_menu"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="relief">none</property> <child> - <object class="GtkImage"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="icon_name">open-menu-symbolic</property> - </object> + <placeholder/> </child> - <style> - <class name="chatcontrol-actionbar-button"/> - </style> </object> <packing> <property name="expand">False</property> - <property name="fill">True</property> - <property name="pack_type">end</property> + <property name="fill">False</property> <property name="position">4</property> </packing> </child> + </object> + <packing> + <property name="resize">False</property> + <property name="shrink">True</property> + </packing> + </child> + <child> + <object class="GtkBox" id="video_hbox"> + <property name="can_focus">False</property> + <property name="no_show_all">True</property> + <property name="spacing">6</property> <child> - <object class="GtkButton" id="authentication_button"> - <property name="can_focus">True</property> - <property name="focus_on_click">False</property> - <property name="receives_default">True</property> - <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> + <object class="GtkFixed" id="outgoing_fixed"> + <property name="can_focus">False</property> <property name="no_show_all">True</property> - <property name="relief">none</property> - <signal name="clicked" handler="_on_authentication_button_clicked" swapped="no"/> <child> - <object class="GtkImage" id="lock_image"> + <object class="GtkViewport" id="outgoing_viewport"> + <property name="width_request">160</property> + <property name="height_request">120</property> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="stock">gtk-dialog-authentication</property> - <property name="icon_size">1</property> + <child> + <placeholder/> + </child> </object> </child> - <style> - <class name="chatcontrol-actionbar-button"/> - </style> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="pack_type">end</property> - <property name="position">5</property> - </packing> - </child> - <child> - <object class="GtkMenuButton" id="encryption_menu"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="tooltip_text" translatable="yes">Choose encryption</property> - <property name="relief">none</property> - <child> - <placeholder/> - </child> - <style> - <class name="chatcontrol-actionbar-button"/> - </style> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="pack_type">end</property> - <property name="position">6</property> + <property name="position">0</property> </packing> </child> <child> - <object class="GtkButton" id="sendfile_button"> + <object class="GtkBox" id="vbox1"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="focus_on_click">False</property> - <property name="receives_default">True</property> - <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> - <property name="relief">none</property> + <property name="can_focus">False</property> + <property name="orientation">vertical</property> <child> - <object class="GtkImage"> + <object class="GtkViewport" id="incoming_viewport"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="icon_name">mail-attachment-symbolic</property> - <property name="icon_size">1</property> + <child> + <placeholder/> + </child> </object> + <packing> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> </child> - <style> - <class name="chatcontrol-actionbar-button"/> - </style> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="pack_type">end</property> - <property name="position">7</property> - </packing> - </child> - <child> - <placeholder/> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">4</property> - </packing> - </child> - </object> - <packing> - <property name="resize">False</property> - <property name="shrink">True</property> - </packing> - </child> - <child> - <object class="GtkBox" id="video_hbox"> - <property name="can_focus">False</property> - <property name="no_show_all">True</property> - <property name="spacing">6</property> - <child> - <object class="GtkFixed" id="outgoing_fixed"> - <property name="can_focus">False</property> - <property name="no_show_all">True</property> - <child> - <object class="GtkViewport" id="outgoing_viewport"> - <property name="width_request">160</property> - <property name="height_request">120</property> - <property name="visible">True</property> - <property name="can_focus">False</property> - <child> - <placeholder/> - </child> - </object> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkBox" id="vbox1"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="orientation">vertical</property> - <child> - <object class="GtkViewport" id="incoming_viewport"> - <property name="visible">True</property> - <property name="can_focus">False</property> <child> <placeholder/> </child> @@ -988,30 +1047,25 @@ microphone-sensitivity-high-symbolic</property> <packing> <property name="expand">True</property> <property name="fill">True</property> - <property name="position">0</property> + <property name="position">1</property> </packing> </child> - <child> - <placeholder/> - </child> </object> <packing> - <property name="expand">True</property> - <property name="fill">True</property> - <property name="position">1</property> + <property name="resize">True</property> + <property name="shrink">True</property> </packing> </child> </object> <packing> - <property name="resize">True</property> - <property name="shrink">True</property> + <property name="index">-1</property> </packing> </child> </object> <packing> <property name="expand">True</property> <property name="fill">True</property> - <property name="position">0</property> + <property name="position">1</property> </packing> </child> </object> ===================================== gajim/data/gui/groupchat_control.ui ===================================== The diff for this file was not included because it is too large. ===================================== gajim/data/style/gajim.css ===================================== @@ -24,6 +24,8 @@ #MessageWindow, #RosterWindow paned { background-color: @theme_base_color; } +#DropArea {background-color: @theme_base_color;} + .chatcontrol-separator-top {margin-top: 5px;} .chatcontrol-separator {margin-bottom: 5px;} ===================================== gajim/gtk/groupchat_roster.py ===================================== @@ -345,7 +345,7 @@ class GroupchatRoster(Gtk.ScrolledWindow, EventHelper): self.room_jid, nick2) if gc_contact1.show != gc_contact2.show: - return -1 if gc_contact1.show < gc_contact2.show else 1 + return -1 if gc_contact1.show > gc_contact2.show else 1 return locale.strcoll(nick1.lower(), nick2.lower()) ===================================== gajim/gtk/server_info.py ===================================== @@ -126,6 +126,7 @@ class ServerInfo(Gtk.ApplicationWindow, EventHelper): def _add_contact_addresses(self, dataforms): fields = { 'admin-addresses': _('Admin'), + 'status-addresses': _('Status'), 'support-addresses': _('Support'), 'security-addresses': _('Security'), 'feedback-addresses': _('Feedback'), ===================================== gajim/gui_interface.py ===================================== @@ -1533,7 +1533,7 @@ class Interface: config['use_custom_host'] = use_custom_host if custom_host: host, _protocol, type_ = custom_host - host, port = host.split(':') + host, port = host.rsplit(':', maxsplit=1) config['custom_port'] = int(port) config['custom_host'] = host config['custom_type'] = type_.value @@ -1901,11 +1901,7 @@ class Interface: self.avatar_storage = AvatarStorage() - cfg_was_read = parser.read() - - if not cfg_was_read: - # enable plugin_installer by default when creating config file - app.config.set_per('plugins', 'plugin_installer', 'active', True) + parser.read() # Load CSS files app.load_css_config() ===================================== gajim/gui_menu_builder.py ===================================== @@ -749,7 +749,8 @@ def build_accounts_menu(): def get_encryption_menu(control_id, control_type, zeroconf=False): menu = Gio.Menu() menu.append( - 'Disabled', 'win.set-encryption-{}::{}'.format(control_id, 'disabled')) + _('Disabled'), + 'win.set-encryption-{}::{}'.format(control_id, 'disabled')) for name, plugin in app.plugin_manager.encryption_plugins.items(): if control_type.is_groupchat: if not hasattr(plugin, 'allow_groupchat'): ===================================== gajim/plugins/gui.py ===================================== @@ -30,7 +30,6 @@ from gi.repository import GdkPixbuf from gi.repository import Gdk from gajim.common import app -from gajim.common import configpaths from gajim.common import ged from gajim.common.exceptions import PluginsystemError from gajim.common.helpers import open_uri @@ -167,8 +166,7 @@ class PluginsWindow(Gtk.ApplicationWindow, EventHelper): self._ui.description.set_text(plugin.description) - self._ui.uninstall_plugin_button.set_sensitive( - configpaths.get('PLUGINS_USER') in plugin.__path__) + self._ui.uninstall_plugin_button.set_sensitive(True) self._ui.configure_plugin_button.set_sensitive( plugin.config_dialog is not None) ===================================== gajim/plugins/helpers.py ===================================== @@ -27,7 +27,9 @@ from typing import List import logging import functools +from pathlib import Path +from gajim.common import configpaths from gajim.plugins import plugins_i18n from gajim.gtk.util import Builder @@ -121,3 +123,11 @@ def get_builder(file_name: str, widgets: List[str] = None) -> Builder: widgets, domain=plugins_i18n.DOMAIN, gettext_=plugins_i18n._) + + +def is_shipped_plugin(path): + base = Path(configpaths.get('PLUGINS_BASE')) + if not base.exists(): + return False + plugin_parent = Path(path).parent + return base.samefile(plugin_parent) ===================================== gajim/plugins/pluginmanager.py ===================================== @@ -25,10 +25,13 @@ __all__ = ['PluginManager'] import os import sys -import fnmatch import zipfile +from pathlib import Path +from importlib.util import spec_from_file_location +from importlib.util import module_from_spec from shutil import rmtree, move import configparser +from dataclasses import dataclass from packaging.version import Version as V import gajim @@ -40,12 +43,117 @@ from gajim.common.nec import NetworkEvent from gajim.common.i18n import _ from gajim.common.exceptions import PluginsystemError from gajim.common.helpers import Singleton -from gajim.plugins import plugins_i18n +from gajim.plugins.plugins_i18n import _ as p_ from gajim.plugins.helpers import log from gajim.plugins.helpers import GajimPluginActivateException +from gajim.plugins.helpers import is_shipped_plugin from gajim.plugins.gajimplugin import GajimPlugin, GajimPluginException + +FIELDS = ('name', + 'short_name', + 'version', + 'min_gajim_version', + 'max_gajim_version', + 'description', + 'authors', + 'homepage') + + +@dataclass +class Plugin: + name: str + short_name: str + description: str + authors: str + homepage: str + version: V + min_gajim_version: V + max_gajim_version: V + shipped: bool + path: Path + + @classmethod + def from_manifest(cls, path): + shipped = is_shipped_plugin(path) + manifest = path / 'manifest.ini' + if not manifest.exists() and not manifest.is_dir(): + raise ValueError('Not a plugin path: {path}') + + conf = configparser.ConfigParser() + conf.remove_section('info') + + with manifest.open() as conf_file: + try: + conf.read_file(conf_file) + except configparser.Error as error: + raise ValueError(f'Error while parsing manifest: ' + f'{path.name}, {error}') + + for field in FIELDS: + try: + value = conf.get('info', field, fallback=None) + except configparser.Error as error: + raise ValueError(f'Error while parsing manifest: ' + f'{path.name}, {error}') + + if value is None: + raise ValueError(f'No {field} found for {path.name}') + + name = conf.get('info', 'name') + short_name = conf.get('info', 'short_name') + description = p_(conf.get('info', 'description')) + authors = conf.get('info', 'authors') + homepage = conf.get('info', 'homepage') + version = V(conf.get('info', 'version')) + min_gajim_version = V(conf.get('info', 'min_gajim_version')) + max_gajim_version = V(conf.get('info', 'max_gajim_version')) + gajim_version = V(gajim.__version__.split('+', 1)[0]) + + if not min_gajim_version <= gajim_version <= max_gajim_version: + raise ValueError( + f'Plugin {path.name} not loaded, ' + f'newer version of gajim required: ' + f'{min_gajim_version} <= {gajim_version} <= {max_gajim_version}' + ) + + return cls(name=name, + short_name=short_name, + description=description, + authors=authors, + homepage=homepage, + version=version, + min_gajim_version=min_gajim_version, + max_gajim_version=max_gajim_version, + shipped=shipped, + path=path) + + def load_module(self): + moduel_path = self.path / '__init__.py' + module_name = self.path.stem + + try: + spec = spec_from_file_location(module_name, moduel_path) + if spec is None: + return None + module = module_from_spec(spec) + sys.modules[spec.name] = module + spec.loader.exec_module(module) + except Exception as error: + log.warning('Error while loading module: %s', error) + return None + + for module_attr_name in dir(module): + module_attr = getattr(module, module_attr_name) + if issubclass(module_attr, GajimPlugin): + for field in FIELDS: + setattr(module_attr, field, str(getattr(self, field))) + setattr(module_attr, '__path__', str(self.path)) + return module_attr + return None + + class PluginManager(metaclass=Singleton): ''' Main plug-in management class. @@ -109,10 +217,7 @@ class PluginManager(metaclass=Singleton): ''' self.update_plugins() - - for path in reversed(configpaths.get_plugin_dirs()): - pc = self.scan_dir_for_plugins(path) - self.add_plugins(pc) + self._load_plugins() def _plugin_has_entry_in_global_config(self, plugin): if app.config.get_per('plugins', plugin.short_name) is None: @@ -152,48 +257,55 @@ class PluginManager(metaclass=Singleton): self.delete_plugin_files(dst_dir) move(src_dir, dst_dir) except Exception: - log.exception('Upgrade of plugin %s failed. Impossible to move ' - 'files from "%s" to "%s"', directory, src_dir, dst_dir) + log.exception('Upgrade of plugin %s failed. ' + 'Impossible to move files from "%s" to "%s"', + directory, src_dir, dst_dir) continue updated_plugins.append(directory) if activate: - pc = self.scan_dir_for_plugins(dst_dir, scan_dirs=True, - package=True) - if not pc: + plugin = self._load_plugin(Path(dst_dir)) + if plugin is None: + log.warning('Error while updating plugin') continue - self.add_plugin(pc[0]) - plugin = self.plugins[-1] - self.activate_plugin(plugin) + + self.add_plugin(plugin, activate=True) return updated_plugins def init_plugins(self): self._activate_all_plugins_from_global_config() - def add_plugin(self, plugin_class): - ''' - :todo: what about adding plug-ins that are already added? Module reload - and adding class from reloaded module or ignoring adding plug-in? - ''' + def add_plugin(self, plugin, activate=False): + plugin_class = plugin.load_module() + if plugin_class is None: + return None + + if plugin in self.plugins: + log.info('Not loading plugin %s v %s. Plugin already loaded.', + plugin.short_name, plugin.version) + return None + try: - plugin = plugin_class() + plugin_obj = plugin_class() except Exception: log.exception('Error while loading a plugin') - return + return None - if plugin not in self.plugins: - if not self._plugin_has_entry_in_global_config(plugin): - self._create_plugin_entry_in_global_config(plugin) + if not self._plugin_has_entry_in_global_config(plugin): + self._create_plugin_entry_in_global_config(plugin) + if plugin.shipped: + self._set_plugin_active_in_global_config(plugin) - self.plugins.append(plugin) - plugin.active = False - app.nec.push_incoming_event( - NetworkEvent('plugin-added', plugin=plugin)) - else: - log.info('Not loading plugin %s v%s from module %s ' - '(identified by short name: %s). Plugin already loaded.', - plugin.name, plugin.version, - plugin.__module__, plugin.short_name) + self.plugins.append(plugin_obj) + plugin_obj.active = False + + if activate: + self.activate_plugin(plugin_obj) + + app.nec.push_incoming_event( + NetworkEvent('plugin-added', plugin=plugin_obj)) + + return plugin_obj def remove_plugin(self, plugin): ''' @@ -220,16 +332,18 @@ class PluginManager(metaclass=Singleton): for module_to_remove in modules_to_remove: del sys.modules[module_to_remove] - def add_plugins(self, plugin_classes): - for plugin_class in plugin_classes: - self.add_plugin(plugin_class) - def get_active_plugin(self, plugin_name): for plugin in self.active_plugins: if plugin.short_name == plugin_name: return plugin return None + def get_plugin(self, short_name): + for plugin in self.plugins: + if plugin.short_name == short_name: + return plugin + return None + def extension_point(self, gui_extpoint_name, *args): ''' Invokes all handlers (from plugins) for a particular extension point, but @@ -478,10 +592,6 @@ class PluginManager(metaclass=Singleton): self._set_plugin_active_in_global_config(plugin, False) plugin.active = False - def _deactivate_all_plugins(self): - for plugin_object in self.active_plugins: - self.deactivate_plugin(plugin_object) - def _add_gui_extension_points_handlers_from_plugin(self, plugin): for gui_extpoint_name, gui_extpoint_handlers in \ plugin.gui_extension_points.items(): @@ -506,19 +616,6 @@ class PluginManager(metaclass=Singleton): log.warning('Error executing %s', handler, exc_info=True) - - def _activate_all_plugins(self): - ''' - Activates all plugins in `plugins`. - - Activated plugins are appended to `active_plugins` list. - ''' - for plugin in self.plugins: - try: - self.activate_plugin(plugin) - except GajimPluginActivateException: - pass - def _activate_all_plugins_from_global_config(self): for plugin in self.plugins: if self._plugin_is_active_in_global_config(plugin) and \ @@ -552,159 +649,35 @@ class PluginManager(metaclass=Singleton): def _set_plugin_active_in_global_config(self, plugin, active=True): app.config.set_per('plugins', plugin.short_name, 'active', active) - def scan_dir_for_plugins(self, path, scan_dirs=True, package=False): - r''' - Scans given directory for plugin classes. - - :param path: directory to scan for plugins - :type path: str - - :param scan_dirs: folders inside path are processed as modules - :type scan_dirs: boolean - - :param package: if path points to a single package folder - :type package: boolean - - :return: list of found plugin classes (subclasses of `GajimPlugin` - :rtype: [] of class objects - - :note: currently it only searches for plugin classes in '\*.py' files - present in given directory `path` (no recursion here) - - :todo: add scanning zipped modules - ''' - plugins_found = [] - conf = configparser.ConfigParser() - fields = ('name', 'short_name', 'version', 'description', 'authors', - 'homepage') - if not os.path.isdir(path): - return plugins_found - - if package: - path, package_name = os.path.split(path) - dir_list = [package_name] - else: - dir_list = os.listdir(path) - - sys.path.insert(0, path) - - for elem_name in dir_list: - file_path = os.path.join(path, elem_name) - - if os.path.isfile(file_path) and fnmatch.fnmatch(file_path, '*.py'): - module_name = os.path.splitext(elem_name)[0] - elif os.path.isdir(file_path) and scan_dirs: - module_name = elem_name - file_path += os.path.sep - else: - continue - - manifest_path = os.path.join(os.path.dirname(file_path), - 'manifest.ini') - if scan_dirs and (not os.path.isfile(manifest_path)): + @staticmethod + def _load_plugin(plugin_path): + try: + return Plugin.from_manifest(plugin_path) + except Exception as error: + log.warning(error) + + def _load_plugins(self): + plugins = {} + for plugin_dir in configpaths.get_plugin_dirs(): + if not plugin_dir.is_dir(): continue - # read metadata from manifest.ini - conf.remove_section('info') - with open(manifest_path, encoding='utf-8') as conf_file: - try: - conf.read_file(conf_file) - except configparser.Error: - log.warning('Plugin %s not loaded, error loading manifest', - elem_name, exc_info=True) + for plugin_path in plugin_dir.iterdir(): + plugin = self._load_plugin(plugin_path) + if plugin is None: continue - short_name = conf.get('info', 'short_name', fallback=None) - if short_name is None: - log.error('No short_name defined for %s', elem_name) - - # Check if the plugin is already loaded - try: - for plugin in self.plugins: - if plugin.short_name == short_name: - raise PluginAlreadyLoaded( - 'Skip Plugin %s because its ' - 'already loaded' % elem_name) - except PluginAlreadyLoaded as error: - log.warning(error) - continue - - min_v = conf.get('info', 'min_gajim_version', fallback=None) - max_v = conf.get('info', 'max_gajim_version', fallback=None) - - if min_v is None or max_v is None: - log.warning('Plugin without min/max version: %s', elem_name) - continue - - gajim_v = gajim.__version__.split('+', 1)[0] - gajim_v_cmp = V(gajim_v) - - if min_v and gajim_v_cmp < V(min_v): - log.warning('Plugin %s not loaded, newer version of' - 'gajim required: %s < %s', - elem_name, gajim_v, min_v) - continue - if max_v and gajim_v_cmp > V(max_v): - log.warning('Plugin %s not loaded, plugin incompatible ' - 'with current version of gajim: ' - '%s > %s', elem_name, gajim_v, max_v) - continue - - module = None - try: - log.info('Loading %s', module_name) - module = __import__(module_name) - except Exception: - log.warning( - 'While trying to load %s, exception occurred', - elem_name, exc_info=True) - continue - - if module is None: - continue + same_plugin = plugins.get(plugin.short_name) + if same_plugin is not None: + if same_plugin.version > plugin.version: + continue - log.debug('Attributes processing started') - for module_attr_name in [attr_name for attr_name in dir(module) - if not (attr_name.startswith('__') or attr_name.endswith('__'))]: - module_attr = getattr(module, module_attr_name) - log.debug('%s: %s', module_attr_name, module_attr) + log.info('Found plugin %s %s', + plugin.short_name, plugin.version) + plugins[plugin.short_name] = plugin - try: - if not issubclass(module_attr, GajimPlugin) or \ - module_attr is GajimPlugin: - continue - log.debug('is subclass of GajimPlugin') - module_attr.__path__ = os.path.abspath( - os.path.dirname(file_path)) - - for option in fields: - if conf.get('info', option) == '': - raise configparser.NoOptionError(option, 'info') - if option == 'description': - setattr(module_attr, option, plugins_i18n._(conf.get('info', option))) - continue - setattr(module_attr, option, conf.get('info', option)) - - plugins_found.append(module_attr) - except TypeError: - pass - except configparser.NoOptionError: - # all fields are required - log.debug( - '%s: wrong manifest file. all fields are required!', - module_attr_name) - except configparser.NoSectionError: - # info section are required - log.debug( - '%s: wrong manifest file. info section are required!', - module_attr_name) - except configparser.MissingSectionHeaderError: - # info section are required - log.debug('%s: wrong manifest file. section are required!', - module_attr_name) - - sys.path.remove(path) - return plugins_found + for plugin in plugins.values(): + self.add_plugin(plugin) def install_from_zip(self, zip_filename, overwrite=None): ''' @@ -734,28 +707,30 @@ class PluginManager(metaclass=Singleton): if 'manifest.ini' in filename.split('/')[1]: manifest = True if not manifest: - return + return None if len(dirs) > 1: raise PluginsystemError(_('Archive is malformed')) - user_dir = configpaths.get('PLUGINS_USER') - plugin_dir = os.path.join(user_dir, dirs[0]) + plugin_name = dirs[0] + user_dir = Path(configpaths.get('PLUGINS_USER')) + plugin_path = user_dir / plugin_name - if os.path.isdir(plugin_dir): + if plugin_path.exists(): # Plugin dir already exists if not overwrite: raise PluginsystemError(_('Plugin already exists')) - self.uninstall_plugin(self.get_plugin_by_path(plugin_dir)) + self.uninstall_plugin(self.get_plugin_by_path(str(plugin_path))) zip_file.extractall(user_dir) zip_file.close() - plugins = self.scan_dir_for_plugins(plugin_dir, package=True) - if not plugins: - return - self.add_plugin(plugins[0]) - plugin = self.plugins[-1] - return plugin + plugin = self._load_plugin(plugin_path) + if plugin is None: + log.warning('Error while installing from zip') + rmtree(plugin_path) + raise PluginsystemError(_('Installation failed')) + + return self.add_plugin(plugin) def delete_plugin_files(self, plugin_path): def on_error(func, path, error): @@ -777,6 +752,10 @@ class PluginManager(metaclass=Singleton): self.remove_plugin(plugin) self.delete_plugin_files(plugin.__path__) + if not is_shipped_plugin(Path(plugin.__path__)): + path = Path(configpaths.get('PLUGINS_BASE')) / plugin.short_name + if path.exists(): + self.delete_plugin_files(str(path)) if self._plugin_has_entry_in_global_config(plugin): self._remove_plugin_entry_in_global_config(plugin) @@ -787,7 +766,4 @@ class PluginManager(metaclass=Singleton): for plugin in self.plugins: if plugin.__path__ in plugin_dir: return plugin - - -class PluginAlreadyLoaded(Exception): - pass + return None ===================================== scripts/dev/plugins_translate deleted ===================================== @@ -1,88 +0,0 @@ -#!/bin/sh - -PYFILES=$(find -L ./ -type f -name "*.py") -GLADEFILES=$(find -L ./ -type f -name "*.ui") - - -check_args() -{ - if [ $# -ne 2 ]; then - echo "Missing lang argument" >&2 - exit 4 - fi -} - -init_ln() -{ - if [ ! -L "community_plugins" ]; then - echo "community_plugins should be a symbolic link to gajim-plugins repository, else they won't be in po files" - fi -} - -make_pot() -{ - # Generate .ui.h - find -L ./ -type f -name "*.ui" -exec intltool-extract --type="gettext/glade" {} \; - GLADEHFILES=$(find -L ./ -type f -name "*.ui.h") - xgettext -k_ -kN_ -o plugins_translations.pot $PYFILES $GLADEHFILES --from-code=utf-8 - rm $GLADEHFILES -} - -make_po() -{ - if [ -f $1.po ]; then - echo "Updating '$1' language"; - msgmerge -U $1.po plugins_translations.pot; - else - msginit -l $1.UTF-8 -o $1.po; - fi -} - -make_mo() -{ - if [ ! -f $1.po ]; then - echo "$1.po doesn't exist. Use plugins_translation make_po $1 to create it."; - exit 3 - fi - mkdir -p locale/$1/LC_MESSAGES - msgfmt -o $1.mo $1.po -} - -install_mo() -{ - if [ -L community_plugins ]; then - cp $1.mo community_plugins/plugins_translations/ - fi - mkdir -p ~/.local/share/gajim/plugins/locale/$1/LC_MESSAGES/ - cp $1.mo ~/.local/share/gajim/plugins/locale/$1/LC_MESSAGES/gajim_plugins.mo -} - - -case "$1" in - make_po) - check_args $@ - init_ln - make_pot - make_po $2 - ;; - make_mo) - check_args $@ - make_mo $2 - ;; - install_mo) - install_mo $2 - ;; - all) - check_args $@ - init_ln - make_pot - make_po $2 - make_mo $2 - install_mo $2 - ;; - *) - echo "Usage: plugins_translation {all|make_po|make_mo|install_mo}" >&2 - echo "example: plugins_translation make_po fr_FR" - exit 2 - ;; -esac ===================================== win/_base.sh ===================================== @@ -190,9 +190,11 @@ function cleanup_install { fi done - find "${MINGW_ROOT}" -regextype "posix-extended" -name "*.exe" -a ! \ - -iregex ".*/(gajim|python|history_manager)[^/]*\\.exe" \ - -exec rm -f {} \; + KEEP="gajim|gajim-debug|python3|gajim-history-manager|gdbus|gspawn-win32-helper" + + echo "deleting .exe files" + find "${MINGW_ROOT}" -regextype "posix-extended" -name "*.exe" -and ! \ + -iregex ".*/(${KEEP})\.exe" -exec rm -f {} \; -print rm -Rf "${MINGW_ROOT}"/libexec rm -Rf "${MINGW_ROOT}"/share/gtk-doc @@ -227,6 +229,7 @@ function cleanup_install { rm -Rf "${MINGW_ROOT}"/share/fontconfig rm -Rf "${MINGW_ROOT}"/share/gettext-* rm -Rf "${MINGW_ROOT}"/share/gstreamer-1.0 + rm -Rf "${MINGW_ROOT}"/share/terminfo find "${MINGW_ROOT}"/share/glib-2.0 -type f ! \ -name "*.compiled" -exec rm -f {} \; @@ -240,6 +243,10 @@ function cleanup_install { rm -Rf "${MINGW_ROOT}"/lib/ruby rm -Rf "${MINGW_ROOT}"/lib/tcl8 rm -Rf "${MINGW_ROOT}"/lib/tcl8.6 + rm -Rf "${MINGW_ROOT}"/lib/terminfo + rm -Rf "${MINGW_ROOT}"/lib/installed-tests + rm -Rf "${MINGW_ROOT}"/lib/tabset + rm -Rf "${MINGW_ROOT}"/lib/libthai rm -f "${MINGW_ROOT}"/lib/gstreamer-1.0/libgstvpx.dll rm -f "${MINGW_ROOT}"/lib/gstreamer-1.0/libgstdaala.dll View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/27fb8bbcea5876d25f74a601195f9de… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/27fb8bbcea5876d25f74a601195f9de… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] Client: Determine allowed type and protocol correctly
by Philipp Hörist 29 Jun '20

29 Jun '20

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: dafb82e8 by lovetox at 2020-06-29T20:26:39+02:00 Client: Determine allowed type and protocol correctly Returns now the type and protocol set via custom_host instead of falling back to the allowed default type and protocol - - - - - 1 changed file: - nbxmpp/client.py Changes: ===================================== nbxmpp/client.py ===================================== @@ -244,6 +244,8 @@ class Client(Observable): @property def connection_types(self): + if self._custom_host is not None: + return [self._custom_host[2]] return list(self._allowed_con_types or [ConnectionType.DIRECT_TLS, ConnectionType.START_TLS]) @@ -263,6 +265,8 @@ class Client(Observable): @property def protocols(self): + if self._custom_host is not None: + return [self._custom_host[1]] return list(self._allowed_protocols or [ConnectionProtocol.TCP, ConnectionProtocol.WEBSOCKET]) View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/dafb82e82694cace846fb114… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/dafb82e82694cace846fb114… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Plugins: Don't fail if plugins dir does not exist
by Philipp Hörist 28 Jun '20

28 Jun '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: 4010161a by lovetox at 2020-06-28T23:37:17+02:00 Plugins: Don't fail if plugins dir does not exist - - - - - 1 changed file: - gajim/plugins/helpers.py Changes: ===================================== gajim/plugins/helpers.py ===================================== @@ -127,5 +127,7 @@ def get_builder(file_name: str, widgets: List[str] = None) -> Builder: def is_shipped_plugin(path): base = Path(configpaths.get('PLUGINS_BASE')) + if not base.exists(): + return False plugin_parent = Path(path).parent return base.samefile(plugin_parent) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/4010161a203a6aa0f60cbea246539063… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/4010161a203a6aa0f60cbea246539063… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Encryption menu: Make 'disabled' item translatable
by Philipp Hörist 28 Jun '20

28 Jun '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: 9ee85427 by wurstsalat at 2020-06-28T22:04:27+02:00 Encryption menu: Make 'disabled' item translatable - - - - - 1 changed file: - gajim/gui_menu_builder.py Changes: ===================================== gajim/gui_menu_builder.py ===================================== @@ -749,7 +749,8 @@ def build_accounts_menu(): def get_encryption_menu(control_id, control_type, zeroconf=False): menu = Gio.Menu() menu.append( - 'Disabled', 'win.set-encryption-{}::{}'.format(control_id, 'disabled')) + _('Disabled'), + 'win.set-encryption-{}::{}'.format(control_id, 'disabled')) for name, plugin in app.plugin_manager.encryption_plugins.items(): if control_type.is_groupchat: if not hasattr(plugin, 'allow_groupchat'): View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/9ee8542755216985b2a89c18f7e82fe3… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/9ee8542755216985b2a89c18f7e82fe3… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] PluginManager: Refactor loading plugins
by Philipp Hörist 28 Jun '20

28 Jun '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: 387672d9 by lovetox at 2020-06-28T21:56:29+02:00 PluginManager: Refactor loading plugins - Auto enable all plugins in the base folder, this allows package maintainers to ship plugins - Give plugins in the user folder priority over plugins in the base folder - - - - - 5 changed files: - gajim/common/configpaths.py - gajim/gui_interface.py - gajim/plugins/gui.py - gajim/plugins/helpers.py - gajim/plugins/pluginmanager.py Changes: ===================================== gajim/common/configpaths.py ===================================== @@ -42,12 +42,12 @@ def get(key: str) -> str: return _paths[key] -def get_plugin_dirs() -> List[str]: +def get_plugin_dirs() -> List[Path]: if gajim.IS_FLATPAK: - return ['/app/plugins', - _paths['PLUGINS_BASE']] - return [_paths['PLUGINS_BASE'], - _paths['PLUGINS_USER']] + return [Path(_paths['PLUGINS_BASE']), + Path('/app/plugins')] + return [Path(_paths['PLUGINS_BASE']), + Path(_paths['PLUGINS_USER'])] def get_paths(type_: PathType) -> Generator[str, None, None]: ===================================== gajim/gui_interface.py ===================================== @@ -1901,11 +1901,7 @@ class Interface: self.avatar_storage = AvatarStorage() - cfg_was_read = parser.read() - - if not cfg_was_read: - # enable plugin_installer by default when creating config file - app.config.set_per('plugins', 'plugin_installer', 'active', True) + parser.read() # Load CSS files app.load_css_config() ===================================== gajim/plugins/gui.py ===================================== @@ -30,7 +30,6 @@ from gi.repository import GdkPixbuf from gi.repository import Gdk from gajim.common import app -from gajim.common import configpaths from gajim.common import ged from gajim.common.exceptions import PluginsystemError from gajim.common.helpers import open_uri @@ -167,8 +166,7 @@ class PluginsWindow(Gtk.ApplicationWindow, EventHelper): self._ui.description.set_text(plugin.description) - self._ui.uninstall_plugin_button.set_sensitive( - configpaths.get('PLUGINS_USER') in plugin.__path__) + self._ui.uninstall_plugin_button.set_sensitive(True) self._ui.configure_plugin_button.set_sensitive( plugin.config_dialog is not None) ===================================== gajim/plugins/helpers.py ===================================== @@ -27,7 +27,9 @@ from typing import List import logging import functools +from pathlib import Path +from gajim.common import configpaths from gajim.plugins import plugins_i18n from gajim.gtk.util import Builder @@ -121,3 +123,9 @@ def get_builder(file_name: str, widgets: List[str] = None) -> Builder: widgets, domain=plugins_i18n.DOMAIN, gettext_=plugins_i18n._) + + +def is_shipped_plugin(path): + base = Path(configpaths.get('PLUGINS_BASE')) + plugin_parent = Path(path).parent + return base.samefile(plugin_parent) ===================================== gajim/plugins/pluginmanager.py ===================================== @@ -25,10 +25,13 @@ __all__ = ['PluginManager'] import os import sys -import fnmatch import zipfile +from pathlib import Path +from importlib.util import spec_from_file_location +from importlib.util import module_from_spec from shutil import rmtree, move import configparser +from dataclasses import dataclass from packaging.version import Version as V import gajim @@ -40,12 +43,117 @@ from gajim.common.nec import NetworkEvent from gajim.common.i18n import _ from gajim.common.exceptions import PluginsystemError from gajim.common.helpers import Singleton -from gajim.plugins import plugins_i18n +from gajim.plugins.plugins_i18n import _ as p_ from gajim.plugins.helpers import log from gajim.plugins.helpers import GajimPluginActivateException +from gajim.plugins.helpers import is_shipped_plugin from gajim.plugins.gajimplugin import GajimPlugin, GajimPluginException + +FIELDS = ('name', + 'short_name', + 'version', + 'min_gajim_version', + 'max_gajim_version', + 'description', + 'authors', + 'homepage') + + +@dataclass +class Plugin: + name: str + short_name: str + description: str + authors: str + homepage: str + version: V + min_gajim_version: V + max_gajim_version: V + shipped: bool + path: Path + + @classmethod + def from_manifest(cls, path): + shipped = is_shipped_plugin(path) + manifest = path / 'manifest.ini' + if not manifest.exists() and not manifest.is_dir(): + raise ValueError('Not a plugin path: {path}') + + conf = configparser.ConfigParser() + conf.remove_section('info') + + with manifest.open() as conf_file: + try: + conf.read_file(conf_file) + except configparser.Error as error: + raise ValueError(f'Error while parsing manifest: ' + f'{path.name}, {error}') + + for field in FIELDS: + try: + value = conf.get('info', field, fallback=None) + except configparser.Error as error: + raise ValueError(f'Error while parsing manifest: ' + f'{path.name}, {error}') + + if value is None: + raise ValueError(f'No {field} found for {path.name}') + + name = conf.get('info', 'name') + short_name = conf.get('info', 'short_name') + description = p_(conf.get('info', 'description')) + authors = conf.get('info', 'authors') + homepage = conf.get('info', 'homepage') + version = V(conf.get('info', 'version')) + min_gajim_version = V(conf.get('info', 'min_gajim_version')) + max_gajim_version = V(conf.get('info', 'max_gajim_version')) + gajim_version = V(gajim.__version__.split('+', 1)[0]) + + if not min_gajim_version <= gajim_version <= max_gajim_version: + raise ValueError( + f'Plugin {path.name} not loaded, ' + f'newer version of gajim required: ' + f'{min_gajim_version} <= {gajim_version} <= {max_gajim_version}' + ) + + return cls(name=name, + short_name=short_name, + description=description, + authors=authors, + homepage=homepage, + version=version, + min_gajim_version=min_gajim_version, + max_gajim_version=max_gajim_version, + shipped=shipped, + path=path) + + def load_module(self): + moduel_path = self.path / '__init__.py' + module_name = self.path.stem + + try: + spec = spec_from_file_location(module_name, moduel_path) + if spec is None: + return None + module = module_from_spec(spec) + sys.modules[spec.name] = module + spec.loader.exec_module(module) + except Exception as error: + log.warning('Error while loading module: %s', error) + return None + + for module_attr_name in dir(module): + module_attr = getattr(module, module_attr_name) + if issubclass(module_attr, GajimPlugin): + for field in FIELDS: + setattr(module_attr, field, str(getattr(self, field))) + setattr(module_attr, '__path__', str(self.path)) + return module_attr + return None + + class PluginManager(metaclass=Singleton): ''' Main plug-in management class. @@ -109,10 +217,7 @@ class PluginManager(metaclass=Singleton): ''' self.update_plugins() - - for path in reversed(configpaths.get_plugin_dirs()): - pc = self.scan_dir_for_plugins(path) - self.add_plugins(pc) + self._load_plugins() def _plugin_has_entry_in_global_config(self, plugin): if app.config.get_per('plugins', plugin.short_name) is None: @@ -152,48 +257,55 @@ class PluginManager(metaclass=Singleton): self.delete_plugin_files(dst_dir) move(src_dir, dst_dir) except Exception: - log.exception('Upgrade of plugin %s failed. Impossible to move ' - 'files from "%s" to "%s"', directory, src_dir, dst_dir) + log.exception('Upgrade of plugin %s failed. ' + 'Impossible to move files from "%s" to "%s"', + directory, src_dir, dst_dir) continue updated_plugins.append(directory) if activate: - pc = self.scan_dir_for_plugins(dst_dir, scan_dirs=True, - package=True) - if not pc: + plugin = self._load_plugin(Path(dst_dir)) + if plugin is None: + log.warning('Error while updating plugin') continue - self.add_plugin(pc[0]) - plugin = self.plugins[-1] - self.activate_plugin(plugin) + + self.add_plugin(plugin, activate=True) return updated_plugins def init_plugins(self): self._activate_all_plugins_from_global_config() - def add_plugin(self, plugin_class): - ''' - :todo: what about adding plug-ins that are already added? Module reload - and adding class from reloaded module or ignoring adding plug-in? - ''' + def add_plugin(self, plugin, activate=False): + plugin_class = plugin.load_module() + if plugin_class is None: + return None + + if plugin in self.plugins: + log.info('Not loading plugin %s v %s. Plugin already loaded.', + plugin.short_name, plugin.version) + return None + try: - plugin = plugin_class() + plugin_obj = plugin_class() except Exception: log.exception('Error while loading a plugin') - return + return None - if plugin not in self.plugins: - if not self._plugin_has_entry_in_global_config(plugin): - self._create_plugin_entry_in_global_config(plugin) + if not self._plugin_has_entry_in_global_config(plugin): + self._create_plugin_entry_in_global_config(plugin) + if plugin.shipped: + self._set_plugin_active_in_global_config(plugin) - self.plugins.append(plugin) - plugin.active = False - app.nec.push_incoming_event( - NetworkEvent('plugin-added', plugin=plugin)) - else: - log.info('Not loading plugin %s v%s from module %s ' - '(identified by short name: %s). Plugin already loaded.', - plugin.name, plugin.version, - plugin.__module__, plugin.short_name) + self.plugins.append(plugin_obj) + plugin_obj.active = False + + if activate: + self.activate_plugin(plugin_obj) + + app.nec.push_incoming_event( + NetworkEvent('plugin-added', plugin=plugin_obj)) + + return plugin_obj def remove_plugin(self, plugin): ''' @@ -220,16 +332,18 @@ class PluginManager(metaclass=Singleton): for module_to_remove in modules_to_remove: del sys.modules[module_to_remove] - def add_plugins(self, plugin_classes): - for plugin_class in plugin_classes: - self.add_plugin(plugin_class) - def get_active_plugin(self, plugin_name): for plugin in self.active_plugins: if plugin.short_name == plugin_name: return plugin return None + def get_plugin(self, short_name): + for plugin in self.plugins: + if plugin.short_name == short_name: + return plugin + return None + def extension_point(self, gui_extpoint_name, *args): ''' Invokes all handlers (from plugins) for a particular extension point, but @@ -478,10 +592,6 @@ class PluginManager(metaclass=Singleton): self._set_plugin_active_in_global_config(plugin, False) plugin.active = False - def _deactivate_all_plugins(self): - for plugin_object in self.active_plugins: - self.deactivate_plugin(plugin_object) - def _add_gui_extension_points_handlers_from_plugin(self, plugin): for gui_extpoint_name, gui_extpoint_handlers in \ plugin.gui_extension_points.items(): @@ -506,19 +616,6 @@ class PluginManager(metaclass=Singleton): log.warning('Error executing %s', handler, exc_info=True) - - def _activate_all_plugins(self): - ''' - Activates all plugins in `plugins`. - - Activated plugins are appended to `active_plugins` list. - ''' - for plugin in self.plugins: - try: - self.activate_plugin(plugin) - except GajimPluginActivateException: - pass - def _activate_all_plugins_from_global_config(self): for plugin in self.plugins: if self._plugin_is_active_in_global_config(plugin) and \ @@ -552,159 +649,35 @@ class PluginManager(metaclass=Singleton): def _set_plugin_active_in_global_config(self, plugin, active=True): app.config.set_per('plugins', plugin.short_name, 'active', active) - def scan_dir_for_plugins(self, path, scan_dirs=True, package=False): - r''' - Scans given directory for plugin classes. - - :param path: directory to scan for plugins - :type path: str - - :param scan_dirs: folders inside path are processed as modules - :type scan_dirs: boolean - - :param package: if path points to a single package folder - :type package: boolean - - :return: list of found plugin classes (subclasses of `GajimPlugin` - :rtype: [] of class objects - - :note: currently it only searches for plugin classes in '\*.py' files - present in given directory `path` (no recursion here) - - :todo: add scanning zipped modules - ''' - plugins_found = [] - conf = configparser.ConfigParser() - fields = ('name', 'short_name', 'version', 'description', 'authors', - 'homepage') - if not os.path.isdir(path): - return plugins_found - - if package: - path, package_name = os.path.split(path) - dir_list = [package_name] - else: - dir_list = os.listdir(path) - - sys.path.insert(0, path) - - for elem_name in dir_list: - file_path = os.path.join(path, elem_name) - - if os.path.isfile(file_path) and fnmatch.fnmatch(file_path, '*.py'): - module_name = os.path.splitext(elem_name)[0] - elif os.path.isdir(file_path) and scan_dirs: - module_name = elem_name - file_path += os.path.sep - else: - continue - - manifest_path = os.path.join(os.path.dirname(file_path), - 'manifest.ini') - if scan_dirs and (not os.path.isfile(manifest_path)): + @staticmethod + def _load_plugin(plugin_path): + try: + return Plugin.from_manifest(plugin_path) + except Exception as error: + log.warning(error) + + def _load_plugins(self): + plugins = {} + for plugin_dir in configpaths.get_plugin_dirs(): + if not plugin_dir.is_dir(): continue - # read metadata from manifest.ini - conf.remove_section('info') - with open(manifest_path, encoding='utf-8') as conf_file: - try: - conf.read_file(conf_file) - except configparser.Error: - log.warning('Plugin %s not loaded, error loading manifest', - elem_name, exc_info=True) + for plugin_path in plugin_dir.iterdir(): + plugin = self._load_plugin(plugin_path) + if plugin is None: continue - short_name = conf.get('info', 'short_name', fallback=None) - if short_name is None: - log.error('No short_name defined for %s', elem_name) - - # Check if the plugin is already loaded - try: - for plugin in self.plugins: - if plugin.short_name == short_name: - raise PluginAlreadyLoaded( - 'Skip Plugin %s because its ' - 'already loaded' % elem_name) - except PluginAlreadyLoaded as error: - log.warning(error) - continue - - min_v = conf.get('info', 'min_gajim_version', fallback=None) - max_v = conf.get('info', 'max_gajim_version', fallback=None) - - if min_v is None or max_v is None: - log.warning('Plugin without min/max version: %s', elem_name) - continue - - gajim_v = gajim.__version__.split('+', 1)[0] - gajim_v_cmp = V(gajim_v) - - if min_v and gajim_v_cmp < V(min_v): - log.warning('Plugin %s not loaded, newer version of' - 'gajim required: %s < %s', - elem_name, gajim_v, min_v) - continue - if max_v and gajim_v_cmp > V(max_v): - log.warning('Plugin %s not loaded, plugin incompatible ' - 'with current version of gajim: ' - '%s > %s', elem_name, gajim_v, max_v) - continue - - module = None - try: - log.info('Loading %s', module_name) - module = __import__(module_name) - except Exception: - log.warning( - 'While trying to load %s, exception occurred', - elem_name, exc_info=True) - continue - - if module is None: - continue + same_plugin = plugins.get(plugin.short_name) + if same_plugin is not None: + if same_plugin.version > plugin.version: + continue - log.debug('Attributes processing started') - for module_attr_name in [attr_name for attr_name in dir(module) - if not (attr_name.startswith('__') or attr_name.endswith('__'))]: - module_attr = getattr(module, module_attr_name) - log.debug('%s: %s', module_attr_name, module_attr) + log.info('Found plugin %s %s', + plugin.short_name, plugin.version) + plugins[plugin.short_name] = plugin - try: - if not issubclass(module_attr, GajimPlugin) or \ - module_attr is GajimPlugin: - continue - log.debug('is subclass of GajimPlugin') - module_attr.__path__ = os.path.abspath( - os.path.dirname(file_path)) - - for option in fields: - if conf.get('info', option) == '': - raise configparser.NoOptionError(option, 'info') - if option == 'description': - setattr(module_attr, option, plugins_i18n._(conf.get('info', option))) - continue - setattr(module_attr, option, conf.get('info', option)) - - plugins_found.append(module_attr) - except TypeError: - pass - except configparser.NoOptionError: - # all fields are required - log.debug( - '%s: wrong manifest file. all fields are required!', - module_attr_name) - except configparser.NoSectionError: - # info section are required - log.debug( - '%s: wrong manifest file. info section are required!', - module_attr_name) - except configparser.MissingSectionHeaderError: - # info section are required - log.debug('%s: wrong manifest file. section are required!', - module_attr_name) - - sys.path.remove(path) - return plugins_found + for plugin in plugins.values(): + self.add_plugin(plugin) def install_from_zip(self, zip_filename, overwrite=None): ''' @@ -734,28 +707,30 @@ class PluginManager(metaclass=Singleton): if 'manifest.ini' in filename.split('/')[1]: manifest = True if not manifest: - return + return None if len(dirs) > 1: raise PluginsystemError(_('Archive is malformed')) - user_dir = configpaths.get('PLUGINS_USER') - plugin_dir = os.path.join(user_dir, dirs[0]) + plugin_name = dirs[0] + user_dir = Path(configpaths.get('PLUGINS_USER')) + plugin_path = user_dir / plugin_name - if os.path.isdir(plugin_dir): + if plugin_path.exists(): # Plugin dir already exists if not overwrite: raise PluginsystemError(_('Plugin already exists')) - self.uninstall_plugin(self.get_plugin_by_path(plugin_dir)) + self.uninstall_plugin(self.get_plugin_by_path(str(plugin_path))) zip_file.extractall(user_dir) zip_file.close() - plugins = self.scan_dir_for_plugins(plugin_dir, package=True) - if not plugins: - return - self.add_plugin(plugins[0]) - plugin = self.plugins[-1] - return plugin + plugin = self._load_plugin(plugin_path) + if plugin is None: + log.warning('Error while installing from zip') + rmtree(plugin_path) + raise PluginsystemError(_('Installation failed')) + + return self.add_plugin(plugin) def delete_plugin_files(self, plugin_path): def on_error(func, path, error): @@ -777,6 +752,10 @@ class PluginManager(metaclass=Singleton): self.remove_plugin(plugin) self.delete_plugin_files(plugin.__path__) + if not is_shipped_plugin(Path(plugin.__path__)): + path = Path(configpaths.get('PLUGINS_BASE')) / plugin.short_name + if path.exists(): + self.delete_plugin_files(str(path)) if self._plugin_has_entry_in_global_config(plugin): self._remove_plugin_entry_in_global_config(plugin) @@ -787,7 +766,4 @@ class PluginManager(metaclass=Singleton): for plugin in self.plugins: if plugin.__path__ in plugin_dir: return plugin - - -class PluginAlreadyLoaded(Exception): - pass + return None View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/387672d9f08f69777e265840cc732c7f… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/387672d9f08f69777e265840cc732c7f… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Windows: Update build
by Philipp Hörist 28 Jun '20

28 Jun '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: 8913d83a by lovetox at 2020-06-28T13:27:42+02:00 Windows: Update build - Remove some unused dirs to reduce the size of the installation - Add some needed executables - - - - - 1 changed file: - win/_base.sh Changes: ===================================== win/_base.sh ===================================== @@ -190,9 +190,11 @@ function cleanup_install { fi done - find "${MINGW_ROOT}" -regextype "posix-extended" -name "*.exe" -a ! \ - -iregex ".*/(gajim|python|history_manager)[^/]*\\.exe" \ - -exec rm -f {} \; + KEEP="gajim|gajim-debug|python3|gajim-history-manager|gdbus|gspawn-win32-helper" + + echo "deleting .exe files" + find "${MINGW_ROOT}" -regextype "posix-extended" -name "*.exe" -and ! \ + -iregex ".*/(${KEEP})\.exe" -exec rm -f {} \; -print rm -Rf "${MINGW_ROOT}"/libexec rm -Rf "${MINGW_ROOT}"/share/gtk-doc @@ -227,6 +229,7 @@ function cleanup_install { rm -Rf "${MINGW_ROOT}"/share/fontconfig rm -Rf "${MINGW_ROOT}"/share/gettext-* rm -Rf "${MINGW_ROOT}"/share/gstreamer-1.0 + rm -Rf "${MINGW_ROOT}"/share/terminfo find "${MINGW_ROOT}"/share/glib-2.0 -type f ! \ -name "*.compiled" -exec rm -f {} \; @@ -240,6 +243,10 @@ function cleanup_install { rm -Rf "${MINGW_ROOT}"/lib/ruby rm -Rf "${MINGW_ROOT}"/lib/tcl8 rm -Rf "${MINGW_ROOT}"/lib/tcl8.6 + rm -Rf "${MINGW_ROOT}"/lib/terminfo + rm -Rf "${MINGW_ROOT}"/lib/installed-tests + rm -Rf "${MINGW_ROOT}"/lib/tabset + rm -Rf "${MINGW_ROOT}"/lib/libthai rm -f "${MINGW_ROOT}"/lib/gstreamer-1.0/libgstvpx.dll rm -f "${MINGW_ROOT}"/lib/gstreamer-1.0/libgstdaala.dll View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/8913d83a45694483b2f48fafea61e0a1… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/8913d83a45694483b2f48fafea61e0a1… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Interface: Use rsplit for extracting the port
by Philipp Hörist 27 Jun '20

27 Jun '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: e195994b by lovetox at 2020-06-27T20:05:03+02:00 Interface: Use rsplit for extracting the port - - - - - 1 changed file: - gajim/gui_interface.py Changes: ===================================== gajim/gui_interface.py ===================================== @@ -1533,7 +1533,7 @@ class Interface: config['use_custom_host'] = use_custom_host if custom_host: host, _protocol, type_ = custom_host - host, port = host.split(':') + host, port = host.rsplit(':', maxsplit=1) config['custom_port'] = int(port) config['custom_host'] = host config['custom_type'] = type_.value View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/e195994b75feed11231d147ef66c648d… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/e195994b75feed11231d147ef66c648d… 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 2020