Merge branch 'staging' into svg

# Conflicts:
#	bauh/gems/web/controller.py

CHANGELOG.md

@@ -9,7 +9,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 - All icons are now SVG files
 - HDPI support ( by [octopusSD](https://github.com/octopusSD) )
 - Web:
-    - not using HTTP sessions anymore to perform the searches. It seems to avoid URLs not being found after an internet drop event. 
+    - not using HTTP sessions anymore to perform the searches. It seems to avoid URLs not being found after an internet drop event.
+    - supporting JPEG images as custom icons
     
 ### Fixes
 - missing categories i18n [48](https://github.com/vinifmor/bauh/issues/48)

bauh/gems/web/controller.py

@@ -420,7 +420,7 @@ class WebApplicationManager(SoftwareManager):
                                          default_option=icon_op_disp if app.icon_url and app.save_icon else icon_op_ded,
                                          label=self.i18n['web.install.option.wicon.label'])
 
-        icon_chooser = FileChooserComponent(allowed_extensions={'png', 'svg', 'ico', 'xpm'}, label=self.i18n['web.install.option.icon.label'])
+        icon_chooser = FileChooserComponent(allowed_extensions={'png', 'svg', 'ico', 'jpg', 'jpeg'}, label=self.i18n['web.install.option.icon.label'])
 
         form_1 = FormComponent(components=[inp_url, inp_name, inp_desc, inp_cat, inp_icon, icon_chooser, inp_tray], label=self.i18n['web.install.options.basic'].capitalize())
 
@@ -515,7 +515,7 @@ class WebApplicationManager(SoftwareManager):
 
     def _ask_update_permission(self, to_update: List[EnvironmentComponent], watcher: ProcessWatcher) -> bool:
 
-        icon = resource.get_path('img/web.svg', ROOT_DIR)
+        icon = resource.get_path('img/web.png', ROOT_DIR)
         opts = [InputOption(label='{} ( {} )'.format(f.name, f.size or '?'),
                             tooltip=f.url, icon_path=icon, read_only=True, value=f.name) for f in to_update]