spalencsar/bearhub
1
0
Fork 0
mirror of https://github.com/spalencsar/bearhub.git synced 2026-07-09 18:54:16 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'staging' into svg

Browse Source 
# Conflicts:
#	bauh/gems/web/controller.py
This commit is contained in:
Vinícius Moreira
2020-01-09 15:46:40 -03:00
parent 3b8d2d5a76 6615df0502
commit 37820ed047
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGELOG.md
View File

@@ -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 - All icons are now SVG files
- HDPI support ( by [octopusSD](https://github.com/octopusSD) ) - HDPI support ( by [octopusSD](https://github.com/octopusSD) )
- Web: - 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 ### Fixes
- missing categories i18n [48](https://github.com/vinifmor/bauh/issues/48) - missing categories i18n [48](https://github.com/vinifmor/bauh/issues/48)

4
bauh/gems/web/controller.py
View File

@@ -420,7 +420,7 @@ class WebApplicationManager(SoftwareManager):
default_option=icon_op_disp if app.icon_url and app.save_icon else icon_op_ded, 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']) 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()) 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: 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 '?'), 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] tooltip=f.url, icon_path=icon, read_only=True, value=f.name) for f in to_update]