diff --git a/CHANGELOG.md b/CHANGELOG.md index 293e0085..648e6741 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). +## [0.9.2] 2020 +- UI + - icons, buttons and colors changes + ## [0.9.1] 2020-04-24 ### Features - Tray diff --git a/bauh/__init__.py b/bauh/__init__.py index 22d8b479..7a7cc384 100644 --- a/bauh/__init__.py +++ b/bauh/__init__.py @@ -1,4 +1,4 @@ -__version__ = '0.9.1' +__version__ = '0.9.2' __app_name__ = 'bauh' import os diff --git a/bauh/api/abstract/context.py b/bauh/api/abstract/context.py index b14c9b11..d85a0e9e 100644 --- a/bauh/api/abstract/context.py +++ b/bauh/api/abstract/context.py @@ -43,3 +43,6 @@ class ApplicationContext: def is_system_x86_64(self): return self.arch_x86_64 + + def get_view_path(self): + return self.app_root_dir + '/view' diff --git a/bauh/gems/appimage/controller.py b/bauh/gems/appimage/controller.py index 43131ffe..6e85bf6c 100644 --- a/bauh/gems/appimage/controller.py +++ b/bauh/gems/appimage/controller.py @@ -60,6 +60,11 @@ class AppImageManager(SoftwareManager): manager_method='install_file', icon_path=resource.get_path('img/appimage.svg', ROOT_DIR), requires_root=False)] + self.custom_app_actions = [CustomSoftwareAction(i18_label_key='appimage.custom_action.manual_update', + i18n_status_key='appimage.custom_action.manual_update.status', + manager_method='update_file', + requires_root=False, + icon_path=resource.get_path('img/upgrade.svg', ROOT_DIR))] def install_file(self, root_password: str, watcher: ProcessWatcher) -> bool: file_chooser = FileChooserComponent(label=self.i18n['file'].capitalize(), allowed_extensions={'AppImage'}) @@ -92,7 +97,7 @@ class AppImageManager(SoftwareManager): else: return False - appim = AppImage(i18n=self.i18n, imported=True) + appim = AppImage(i18n=self.i18n, imported=True, custom_actions=self.custom_app_actions) appim.name = input_name.get_value().strip() appim.local_file_path = file_chooser.file_path appim.version = input_version.get_value() @@ -164,7 +169,7 @@ class AppImageManager(SoftwareManager): found_map = {} idx = 0 for l in cursor.fetchall(): - app = AppImage(*l, i18n=self.i18n) + app = AppImage(*l, i18n=self.i18n, custom_actions=self.custom_app_actions) res.new.append(app) found_map[self._gen_app_key(app)] = {'app': app, 'idx': idx} idx += 1 @@ -200,7 +205,7 @@ class AppImageManager(SoftwareManager): for path in installed.split('\n'): if path: with open(path) as f: - app = AppImage(installed=True, i18n=self.i18n, **json.loads(f.read())) + app = AppImage(installed=True, i18n=self.i18n, custom_actions=self.custom_app_actions, **json.loads(f.read())) app.icon_url = app.icon_path res.installed.append(app) @@ -576,7 +581,7 @@ class AppImageManager(SoftwareManager): cursor.execute(query.FIND_APPS_BY_NAME_FULL.format(','.join(["'{}'".format(s) for s in sugs_map.keys()]))) for t in cursor.fetchall(): - app = AppImage(*t, i18n=self.i18n) + app = AppImage(*t, i18n=self.i18n, custom_actions=self.custom_app_actions) res.append(PackageSuggestion(app, sugs_map[app.name.lower()])) self.logger.info("Mapped {} suggestions".format(len(res))) except: diff --git a/bauh/gems/appimage/model.py b/bauh/gems/appimage/model.py index 4d70f1be..5663bb64 100644 --- a/bauh/gems/appimage/model.py +++ b/bauh/gems/appimage/model.py @@ -8,12 +8,6 @@ from bauh.view.util.translation import I18n CACHED_ATTRS = {'name', 'description', 'version', 'url_download', 'author', 'license', 'source', 'icon_path', 'github', 'categories', 'imported', 'install_dir'} -CUSTOM_ACTIONS = [CustomSoftwareAction(i18_label_key='appimage.custom_action.manual_update', - i18n_status_key='appimage.custom_action.manual_update.status', - manager_method='update_file', - requires_root=False, - icon_path=resource.get_path('img/refresh.svg', ROOT_DIR))] - class AppImage(SoftwarePackage): @@ -21,7 +15,7 @@ class AppImage(SoftwarePackage): url_download: str = None, url_icon: str = None, url_screenshot: str = None, license: str = None, author: str = None, categories=None, icon_path: str = None, installed: bool = False, url_download_latest_version: str = None, local_file_path: str = None, imported: bool = False, - i18n: I18n = None, install_dir: str = None, **kwargs): + i18n: I18n = None, install_dir: str = None, custom_actions: List[CustomSoftwareAction] = None, **kwargs): super(AppImage, self).__init__(id=name, name=name, version=version, latest_version=version, icon_url=url_icon, license=license, description=description, installed=installed) @@ -37,6 +31,7 @@ class AppImage(SoftwarePackage): self.imported = imported self.i18n = i18n self.install_dir = install_dir + self.custom_actions = custom_actions def __repr__(self): return "{} (name={}, github={})".format(self.__class__.__name__, self.name, self.github) @@ -108,7 +103,7 @@ class AppImage(SoftwarePackage): def get_custom_supported_actions(self) -> List[CustomSoftwareAction]: if self.imported: - return CUSTOM_ACTIONS + return self.custom_actions def supports_backup(self) -> bool: return False diff --git a/bauh/gems/appimage/resources/img/refresh.svg b/bauh/gems/appimage/resources/img/refresh.svg deleted file mode 100755 index 16952792..00000000 --- a/bauh/gems/appimage/resources/img/refresh.svg +++ /dev/null @@ -1,146 +0,0 @@ - - - -image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/bauh/gems/appimage/resources/img/upgrade.svg b/bauh/gems/appimage/resources/img/upgrade.svg new file mode 100644 index 00000000..72d53637 --- /dev/null +++ b/bauh/gems/appimage/resources/img/upgrade.svg @@ -0,0 +1,76 @@ + + + + + + image/svg+xml + + + + + + + + + + + + + diff --git a/bauh/gems/snap/controller.py b/bauh/gems/snap/controller.py index 1c42f898..5a843b13 100644 --- a/bauh/gems/snap/controller.py +++ b/bauh/gems/snap/controller.py @@ -8,8 +8,9 @@ from bauh.api.abstract.controller import SoftwareManager, SearchResult, Applicat from bauh.api.abstract.disk import DiskCacheLoader from bauh.api.abstract.handler import ProcessWatcher, TaskManager from bauh.api.abstract.model import SoftwarePackage, PackageHistory, PackageUpdate, PackageSuggestion, \ - SuggestionPriority + SuggestionPriority, CustomSoftwareAction from bauh.api.abstract.view import SingleSelectComponent, SelectViewType, InputOption +from bauh.commons import resource from bauh.commons.category import CategoriesDownloader from bauh.commons.html import bold from bauh.commons.system import SystemProcess, ProcessHandler, new_root_subprocess @@ -36,6 +37,13 @@ class SnapManager(SoftwareManager): self.categories = {} self.suggestions_cache = context.cache_factory.new() self.info_path = None + self.custom_actions = [ + CustomSoftwareAction(i18n_status_key='snap.action.refresh.status', + i18_label_key='snap.action.refresh.label', + icon_path=resource.get_path('img/refresh.svg', context.get_view_path()), + manager_method='refresh', + requires_root=True) + ] def get_info_path(self) -> str: if self.info_path is None: @@ -53,7 +61,8 @@ class SnapManager(SoftwareManager): version=app_json.get('version'), latest_version=app_json.get('version'), description=app_json.get('description', app_json.get('summary')), - verified_publisher=app_json.get('developer_validation', '') == 'verified') + verified_publisher=app_json.get('developer_validation', '') == 'verified', + extra_actions=self.custom_actions) if app.publisher and app.publisher.endswith('*'): app.verified_publisher = True diff --git a/bauh/gems/snap/model.py b/bauh/gems/snap/model.py index 723211ee..668d4cb7 100644 --- a/bauh/gems/snap/model.py +++ b/bauh/gems/snap/model.py @@ -4,14 +4,6 @@ from bauh.api.abstract.model import SoftwarePackage, CustomSoftwareAction from bauh.commons import resource from bauh.gems.snap import ROOT_DIR -EXTRA_INSTALLED_ACTIONS = [ - CustomSoftwareAction(i18n_status_key='snap.action.refresh.status', - i18_label_key='snap.action.refresh.label', - icon_path=resource.get_path('img/refresh.svg', ROOT_DIR), - manager_method='refresh', - requires_root=True) -] - KNOWN_RUNTIME_NAMES = {'snapd', 'snapcraft', 'multipass'} @@ -19,7 +11,7 @@ class SnapApplication(SoftwarePackage): def __init__(self, id: str = None, name: str = None, version: str = None, latest_version: str = None, description: str = None, publisher: str = None, rev: str = None, notes: str = None, - confinement: str = None, has_apps_field: bool = None, verified_publisher: bool = False): + confinement: str = None, has_apps_field: bool = None, verified_publisher: bool = False, extra_actions: List[CustomSoftwareAction] = None): super(SnapApplication, self).__init__(id=id, name=name, version=version, latest_version=latest_version, description=description) self.publisher = publisher @@ -28,6 +20,7 @@ class SnapApplication(SoftwarePackage): self.confinement = confinement self.has_apps_field = has_apps_field self.verified_publisher = verified_publisher + self.extra_actions = extra_actions def supports_disk_cache(self): return self.installed @@ -81,7 +74,7 @@ class SnapApplication(SoftwarePackage): def get_custom_supported_actions(self) -> List[CustomSoftwareAction]: if self.installed: - return EXTRA_INSTALLED_ACTIONS + return self.extra_actions def supports_backup(self) -> bool: return True diff --git a/bauh/gems/snap/resources/img/refresh.svg b/bauh/gems/snap/resources/img/refresh.svg deleted file mode 100755 index 16952792..00000000 --- a/bauh/gems/snap/resources/img/refresh.svg +++ /dev/null @@ -1,146 +0,0 @@ - - - -image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/bauh/view/qt/apps_table.py b/bauh/view/qt/apps_table.py index 5b7a7c78..d01af863 100644 --- a/bauh/view/qt/apps_table.py +++ b/bauh/view/qt/apps_table.py @@ -14,13 +14,12 @@ from bauh.api.abstract.cache import MemoryCache from bauh.api.abstract.model import PackageStatus from bauh.commons.html import strip_html from bauh.view.qt import dialog +from bauh.view.qt.colors import DARK_GREEN, GREEN from bauh.view.qt.components import IconButton from bauh.view.qt.view_model import PackageView from bauh.view.util import resource from bauh.view.util.translation import I18n -INSTALL_BT_STYLE = 'background: {back}; color: white; font-size: 10px; font-weight: bold' - NAME_MAX_SIZE = 30 DESC_MAX_SIZE = 40 PUBLISHER_MAX_SIZE = 25 @@ -46,7 +45,7 @@ class UpdateToggleButton(QWidget): if clickable: self.bt.clicked.connect(self.change_state) - self.bt.setStyleSheet('QToolButton { background: #20A435 } ' + + self.bt.setStyleSheet('QToolButton { background: ' + GREEN + ' }' + 'QToolButton:checked { background: gray } ' + ('QToolButton:disabled { background: #d69003 }' if not clickable and not checked else '')) @@ -302,7 +301,8 @@ class AppsTable(QTableWidget): def uninstall(): self._uninstall_app(pkg) - item = self._gen_row_button(self.i18n['uninstall'].capitalize(), INSTALL_BT_STYLE.format(back='#ff1a1a'), uninstall) + style = 'color: {c}; font-size: 10px; font-weight: bold;'.format(c='#996633') + item = self._gen_row_button(self.i18n['uninstall'].capitalize(), style, uninstall) else: item = QLabel() item.setPixmap((QPixmap(resource.get_path('img/checked.svg')))) @@ -312,7 +312,8 @@ class AppsTable(QTableWidget): def install(): self._install_app(pkg) - item = self._gen_row_button(self.i18n['install'].capitalize(), INSTALL_BT_STYLE.format(back='#088A08'), install) + style = 'background: {b}; color: white; font-size: 10px; font-weight: bold'.format(b=GREEN) + item = self._gen_row_button(self.i18n['install'].capitalize(), style, install) else: item = None @@ -349,7 +350,7 @@ class AppsTable(QTableWidget): tooltip = self.i18n['version.unknown'] if pkg.model.update: - label_version.setStyleSheet("color: #20A435; font-weight: bold") + label_version.setStyleSheet("color: {}; font-weight: bold".format(DARK_GREEN)) tooltip = self.i18n['version.installed_outdated'] if pkg.model.installed and pkg.model.update and pkg.model.version and pkg.model.latest_version and pkg.model.version != pkg.model.latest_version: @@ -458,34 +459,36 @@ class AppsTable(QTableWidget): def run(): self.window.run_app(pkg) - bt = IconButton(QIcon(resource.get_path('img/app_play.svg')), i18n=self.i18n, action=run, background='#088A08', tooltip=self.i18n['action.run.tooltip']) + bt = IconButton(QIcon(resource.get_path('img/app_play.svg')), i18n=self.i18n, action=run, tooltip=self.i18n['action.run.tooltip']) bt.setEnabled(pkg.model.can_be_run()) item.addWidget(bt) - def get_info(): - self.window.get_app_info(pkg) - - bt = IconButton(QIcon(resource.get_path('img/app_info.svg')), i18n=self.i18n, action=get_info, background='#2E68D3', tooltip=self.i18n['action.info.tooltip']) - bt.setEnabled(bool(pkg.model.has_info())) - item.addWidget(bt) - - if not pkg.model.installed: - def get_screenshots(): - self.window.get_screenshots(pkg) - - bt = IconButton(QIcon(resource.get_path('img/camera.svg')), i18n=self.i18n, action=get_screenshots, background='#ac00e6', tooltip=self.i18n['action.screenshots.tooltip']) - bt.setEnabled(bool(pkg.model.has_screenshots())) - item.addWidget(bt) - def handle_click(): self.show_pkg_settings(pkg) settings = self.has_any_settings(pkg) if pkg.model.installed: - bt = IconButton(QIcon(resource.get_path('img/app_settings.svg')), i18n=self.i18n, action=handle_click, background='#12ABAB', tooltip=self.i18n['action.settings.tooltip']) + icon = QIcon(QIcon(resource.get_path('img/custom_actions.svg')).pixmap(12, 12)) + bt = IconButton(icon, i18n=self.i18n, action=handle_click, tooltip=self.i18n['action.settings.tooltip']) bt.setEnabled(bool(settings)) item.addWidget(bt) + def get_info(): + self.window.get_app_info(pkg) + + icon = QIcon(QIcon(resource.get_path('img/app_info.svg')).pixmap(14, 14)) + bt = IconButton(icon, i18n=self.i18n, action=get_info, tooltip=self.i18n['action.info.tooltip']) + bt.setEnabled(bool(pkg.model.has_info())) + item.addWidget(bt) + + if not pkg.model.installed: + def get_screenshots(): + self.window.get_screenshots(pkg) + + bt = IconButton(QIcon(resource.get_path('img/camera.svg')), i18n=self.i18n, action=get_screenshots, tooltip=self.i18n['action.screenshots.tooltip']) + bt.setEnabled(bool(pkg.model.has_screenshots())) + item.addWidget(bt) + self.setCellWidget(pkg.table_index, col, item) def change_headers_policy(self, policy: QHeaderView = QHeaderView.ResizeToContents): diff --git a/bauh/view/qt/colors.py b/bauh/view/qt/colors.py new file mode 100644 index 00000000..d7974b36 --- /dev/null +++ b/bauh/view/qt/colors.py @@ -0,0 +1,2 @@ +GREEN = '#68A92E' +DARK_GREEN = '#5EAA1A' diff --git a/bauh/view/qt/components.py b/bauh/view/qt/components.py index a980f761..58f4e355 100644 --- a/bauh/view/qt/components.py +++ b/bauh/view/qt/components.py @@ -401,7 +401,7 @@ class IconButton(QWidget): if background: style = 'QToolButton { color: white; background: ' + background + '} ' - style += 'QToolButton:disabled { color: white; background: grey }' + style += 'QToolButton:disabled { color: white; background: blue }' self.bt.setStyleSheet(style) if tooltip: diff --git a/bauh/view/qt/css.py b/bauh/view/qt/css.py index 49b411b0..b1008f43 100644 --- a/bauh/view/qt/css.py +++ b/bauh/view/qt/css.py @@ -1,7 +1,7 @@ +from bauh.view.qt.colors import GREEN -OK_BUTTON = """QPushButton { background: green; color: white; font-weight: bold} - QPushButton:disabled { background-color: gray; } - """ +OK_BUTTON = """QPushButton { background: %s; color: white; font-weight: bold} + QPushButton:disabled { background-color: gray; }""" % GREEN GROUP_BOX = """ QGroupBox { diff --git a/bauh/view/qt/prepare.py b/bauh/view/qt/prepare.py index f9396c81..701103e3 100644 --- a/bauh/view/qt/prepare.py +++ b/bauh/view/qt/prepare.py @@ -13,7 +13,7 @@ from bauh import __app_name__ from bauh.api.abstract.context import ApplicationContext from bauh.api.abstract.controller import SoftwareManager from bauh.api.abstract.handler import TaskManager -from bauh.view.qt import root +from bauh.view.qt import root, styles from bauh.view.qt.components import new_spacer from bauh.view.qt.qt_utils import centralize from bauh.view.qt.thread import AnimateProgress @@ -121,7 +121,7 @@ class PreparePanel(QWidget, TaskManager): self.i18n = i18n self.context = context self.manage_window = manage_window - self.setWindowTitle('{} ({})'.format(self.i18n['prepare_panel.title.start'].capitalize(), __app_name__)) + self.setWindowTitle('{} ({})'.format(__app_name__, self.i18n['prepare_panel.title.start'].lower())) self.setMinimumWidth(screen_size.width() * 0.5) self.setMinimumHeight(screen_size.height() * 0.35) self.setMaximumHeight(screen_size.height() * 0.95) @@ -177,6 +177,7 @@ class PreparePanel(QWidget, TaskManager): toolbar.addWidget(new_spacer()) self.progress_bar = QProgressBar() + self.progress_bar.setStyleSheet(styles.PROGRESS_BAR) self.progress_bar.setMaximumHeight(10 if QApplication.instance().style().objectName().lower() == 'windows' else 4) self.progress_bar.setTextVisible(False) self.progress_bar.setVisible(False) @@ -245,7 +246,7 @@ class PreparePanel(QWidget, TaskManager): lb_status = QLabel(label) lb_status.setMinimumWidth(50) lb_status.setSizePolicy(QSizePolicy.Minimum, QSizePolicy.Preferred) - lb_status.setStyleSheet("QLabel { color: blue; font-weight: bold; }") + lb_status.setStyleSheet("QLabel { font-weight: bold; }") self.table.setCellWidget(task_row, 1, lb_status) lb_sub = QLabel() @@ -256,7 +257,7 @@ class PreparePanel(QWidget, TaskManager): lb_progress = QLabel('{0:.2f}'.format(0) + '%') lb_progress.setContentsMargins(10, 0, 10, 0) - lb_progress.setStyleSheet("QLabel { color: blue; font-weight: bold; }") + lb_progress.setStyleSheet("QLabel { font-weight: bold; }") lb_progress.setSizePolicy(QSizePolicy.Minimum, QSizePolicy.Preferred) self.table.setCellWidget(task_row, 3, lb_progress) @@ -288,7 +289,7 @@ class PreparePanel(QWidget, TaskManager): task['lb_sub'].setText('') for key in ('lb_prog', 'lb_status'): - task[key].setStyleSheet('QLabel { color: green; text-decoration: line-through; }') + task[key].setStyleSheet('QLabel { color: #68A92E; text-decoration: line-through; }') task['finished'] = True self._resize_columns() diff --git a/bauh/view/qt/styles.py b/bauh/view/qt/styles.py new file mode 100644 index 00000000..a7b01ad8 --- /dev/null +++ b/bauh/view/qt/styles.py @@ -0,0 +1,3 @@ +from bauh.view.qt.colors import GREEN + +PROGRESS_BAR = """QProgressBar::chunk { background-color: %s; }""" % GREEN diff --git a/bauh/view/qt/window.py b/bauh/view/qt/window.py index 8a90dfdd..f6e5c450 100755 --- a/bauh/view/qt/window.py +++ b/bauh/view/qt/window.py @@ -20,9 +20,10 @@ from bauh.api.http import HttpClient from bauh.commons import user from bauh.commons.html import bold from bauh.view.core.tray_client import notify_tray -from bauh.view.qt import dialog, commons, qt_utils, root +from bauh.view.qt import dialog, commons, qt_utils, root, styles from bauh.view.qt.about import AboutDialog from bauh.view.qt.apps_table import AppsTable, UpdateToggleButton +from bauh.view.qt.colors import GREEN from bauh.view.qt.components import new_spacer, InputFilter, IconButton from bauh.view.qt.confirmation import ConfirmationDialog from bauh.view.qt.history import HistoryDialog @@ -231,7 +232,7 @@ class ManageWindow(QWidget): self.bt_upgrade.setToolTip(i18n['manage_window.bt.upgrade.tooltip']) self.bt_upgrade.setIcon(QIcon(resource.get_path('img/app_update.svg'))) self.bt_upgrade.setText(i18n['manage_window.bt.upgrade.text']) - self.bt_upgrade.setStyleSheet(toolbar_button_style('#20A435', 'white')) + self.bt_upgrade.setStyleSheet(toolbar_button_style(GREEN, 'white')) self.bt_upgrade.clicked.connect(self.update_selected) toolbar_bts.append(self.bt_upgrade) self.ref_bt_upgrade = self.toolbar.addWidget(self.bt_upgrade) @@ -319,6 +320,7 @@ class ManageWindow(QWidget): self.toolbar_bottom.addWidget(new_spacer()) self.progress_bar = QProgressBar() + self.progress_bar.setStyleSheet(styles.PROGRESS_BAR) self.progress_bar.setMaximumHeight(10 if QApplication.instance().style().objectName().lower() == 'windows' else 4) self.progress_bar.setTextVisible(False) @@ -334,16 +336,14 @@ class ManageWindow(QWidget): bt_custom_actions.setVisible(bool(self.custom_actions)) self.ref_bt_custom_actions = self.toolbar_bottom.addWidget(bt_custom_actions) - bt_settings = IconButton(QIcon(resource.get_path('img/app_settings.svg')), + bt_settings = IconButton(QIcon(resource.get_path('img/settings.svg')), action=self.show_settings, - background='#12ABAB', i18n=self.i18n, tooltip=self.i18n['manage_window.bt_settings.tooltip']) self.ref_bt_settings = self.toolbar_bottom.addWidget(bt_settings) - bt_about = IconButton(QIcon(resource.get_path('img/question.svg')), + bt_about = IconButton(QIcon(resource.get_path('img/app_info.svg')), action=self._show_about, - background='#2E68D3', i18n=self.i18n, tooltip=self.i18n['manage_window.settings.about']) self.ref_bt_about = self.toolbar_bottom.addWidget(bt_about) diff --git a/bauh/view/resources/img/about.svg b/bauh/view/resources/img/about.svg index 9e7b371f..320d1a2d 100755 --- a/bauh/view/resources/img/about.svg +++ b/bauh/view/resources/img/about.svg @@ -7,7 +7,6 @@ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" - xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" version="1.1" @@ -19,29 +18,13 @@ viewBox="0 0 23.99629 24.016451" xml:space="preserve" sodipodi:docname="about.svg" - inkscape:version="0.92.4 5da689c313, 2019-01-14">image/svg+xml + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> - @@ -128,15 +111,14 @@ transform="translate(239.5083,-10.347359)"> \ No newline at end of file + style="fill:#ffffff;stroke-width:0.40259773" /> \ No newline at end of file diff --git a/bauh/view/resources/img/app_info.svg b/bauh/view/resources/img/app_info.svg old mode 100755 new mode 100644 index 442805df..91002ddb --- a/bauh/view/resources/img/app_info.svg +++ b/bauh/view/resources/img/app_info.svg @@ -1,6 +1,4 @@ - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file + sodipodi:docname="app_info.svg" + inkscape:version="0.92.5 (2060ec1f9f, 2020-04-08)"> + + + + image/svg+xml + + + + + + + + + + + + diff --git a/bauh/view/resources/img/app_play.svg b/bauh/view/resources/img/app_play.svg index 284bd52e..8c3fa8ef 100755 --- a/bauh/view/resources/img/app_play.svg +++ b/bauh/view/resources/img/app_play.svg @@ -15,13 +15,13 @@ y="0px" viewBox="0 0 24 24" xml:space="preserve" - sodipodi:docname="app_play_s.svg" + sodipodi:docname="app_play.svg" width="24" height="24" - inkscape:version="0.92.4 5da689c313, 2019-01-14">image/svg+xml + style="fill:#5eaa1a;stroke:#5eaa1a;stroke-width:64.42242432;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;fill-opacity:1"> - + \ No newline at end of file diff --git a/bauh/view/resources/img/app_settings.svg b/bauh/view/resources/img/app_settings.svg deleted file mode 100755 index 784659f8..00000000 --- a/bauh/view/resources/img/app_settings.svg +++ /dev/null @@ -1,63 +0,0 @@ - - - - - - - - image/svg+xml - - - - - - - - - diff --git a/bauh/view/resources/img/camera.svg b/bauh/view/resources/img/camera.svg index 24067e82..166de991 100755 --- a/bauh/view/resources/img/camera.svg +++ b/bauh/view/resources/img/camera.svg @@ -13,12 +13,12 @@ id="Capa_1" x="0px" y="0px" - viewBox="0 0 47.999996 44" + viewBox="0 0 26.545199 24.006175" xml:space="preserve" - sodipodi:docname="camera_2.svg" - width="47.999996" - height="44" - inkscape:version="0.92.4 5da689c313, 2019-01-14">image/svg+xml + inkscape:current-layer="Capa_1" + showguides="true" + inkscape:guide-bbox="true"> + d="m 13.18747,19.762222 c 3.410675,0 6.189744,-3.004972 6.189744,-6.692885 0,-3.687913 -2.779069,-6.69288 -6.189744,-6.69288 -3.4106757,0 -6.1897442,2.998464 -6.1897442,6.69288 0,3.694422 2.7790685,6.692885 6.1897442,6.692885 z m 0,-11.7922197 c 2.59861,0 4.715995,2.2894957 4.715995,5.0993347 0,2.809844 -2.117385,5.099341 -4.715995,5.099341 -2.59861,0 -4.7159952,-2.289497 -4.7159952,-5.099341 0,-2.809839 2.1173852,-5.0993347 4.7159952,-5.0993347 z" /> + transform="matrix(1.1013612,0,0,1.1013612,-0.37597036,-474.86373)"> + transform="matrix(1.1013612,0,0,1.1013612,-0.37597036,-474.86373)"> + transform="matrix(1.1013612,0,0,1.1013612,-0.37597036,-474.86373)"> + transform="matrix(1.1013612,0,0,1.1013612,-0.37597036,-474.86373)"> + transform="matrix(1.1013612,0,0,1.1013612,-0.37597036,-474.86373)"> + transform="matrix(1.1013612,0,0,1.1013612,-0.37597036,-474.86373)"> + transform="matrix(1.1013612,0,0,1.1013612,-0.37597036,-474.86373)"> + transform="matrix(1.1013612,0,0,1.1013612,-0.37597036,-474.86373)"> + transform="matrix(1.1013612,0,0,1.1013612,-0.37597036,-474.86373)"> + transform="matrix(1.1013612,0,0,1.1013612,-0.37597036,-474.86373)"> + transform="matrix(1.1013612,0,0,1.1013612,-0.37597036,-474.86373)"> + transform="matrix(1.1013612,0,0,1.1013612,-0.37597036,-474.86373)"> + transform="matrix(1.1013612,0,0,1.1013612,-0.37597036,-474.86373)"> + transform="matrix(1.1013612,0,0,1.1013612,-0.37597036,-474.86373)"> + transform="matrix(1.1013612,0,0,1.1013612,-0.37597036,-474.86373)"> \ No newline at end of file diff --git a/bauh/view/resources/img/checked.svg b/bauh/view/resources/img/checked.svg index 40ad2bc5..d683dd69 100755 --- a/bauh/view/resources/img/checked.svg +++ b/bauh/view/resources/img/checked.svg @@ -14,7 +14,7 @@ sodipodi:docname="checked.svg" width="11.999997" height="12" - inkscape:version="0.92.3 (2405546, 2018-03-11)"> + inkscape:version="0.92.5 (2060ec1f9f, 2020-04-08)"> @@ -23,7 +23,7 @@ image/svg+xml - + @@ -39,7 +39,7 @@ inkscape:pageopacity="0" inkscape:pageshadow="2" inkscape:window-width="1366" - inkscape:window-height="703" + inkscape:window-height="739" id="namedview819" showgrid="false" showborder="false" @@ -47,16 +47,16 @@ fit-margin-left="0" fit-margin-right="0" fit-margin-bottom="0" - inkscape:zoom="4.7692308" - inkscape:cx="-42.8741" - inkscape:cy="25.96043" + inkscape:zoom="9.5384616" + inkscape:cx="-12.641135" + inkscape:cy="14.456686" inkscape:window-x="0" - inkscape:window-y="260" + inkscape:window-y="0" inkscape:window-maximized="1" inkscape:current-layer="svg817" /> + style="fill:#68a92e;stroke-width:0.52623481;fill-opacity:1" /> diff --git a/bauh/view/resources/img/custom_actions.svg b/bauh/view/resources/img/custom_actions.svg index c4b4fead..415ad876 100644 --- a/bauh/view/resources/img/custom_actions.svg +++ b/bauh/view/resources/img/custom_actions.svg @@ -22,7 +22,7 @@ image/svg+xml - + @@ -46,9 +46,9 @@ fit-margin-left="0" fit-margin-right="0" fit-margin-bottom="0" - inkscape:zoom="3.1607143" - inkscape:cx="64.104382" - inkscape:cy="34.001197" + inkscape:zoom="8.9398501" + inkscape:cx="21.953042" + inkscape:cy="22.538918" inkscape:window-x="0" inkscape:window-y="0" inkscape:window-maximized="1" @@ -57,6 +57,6 @@ diff --git a/bauh/view/resources/img/disk.svg b/bauh/view/resources/img/disk.svg index 0769fa0d..f17dc666 100755 --- a/bauh/view/resources/img/disk.svg +++ b/bauh/view/resources/img/disk.svg @@ -47,7 +47,7 @@ fit-margin-right="0" fit-margin-bottom="-0.3" inkscape:zoom="4.5416668" - inkscape:cx="-23.902643" + inkscape:cx="81.555444" inkscape:cy="1.3146742" inkscape:window-x="0" inkscape:window-y="0" @@ -117,14 +117,14 @@ \ No newline at end of file diff --git a/bauh/view/resources/img/downgrade.svg b/bauh/view/resources/img/downgrade.svg index 605ad3d7..64ecc74e 100755 --- a/bauh/view/resources/img/downgrade.svg +++ b/bauh/view/resources/img/downgrade.svg @@ -8,12 +8,12 @@ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" version="1.1" - viewBox="0 0 24 24" + viewBox="0 0 23.882839 24" enable-background="new 0 0 26 26" id="svg8" sodipodi:docname="downgrade.svg" inkscape:version="0.92.5 (2060ec1f9f, 2020-04-08)" - width="24" + width="23.882839" height="24"> @@ -23,7 +23,7 @@ image/svg+xml - + @@ -43,9 +43,9 @@ id="namedview10" showgrid="false" showborder="false" - inkscape:zoom="4.5384616" - inkscape:cx="-59.821151" - inkscape:cy="12.13426" + inkscape:zoom="9.0769232" + inkscape:cx="10.512667" + inkscape:cy="4.4534573" inkscape:window-x="0" inkscape:window-y="0" inkscape:window-maximized="1" @@ -56,17 +56,17 @@ fit-margin-bottom="0" /> + transform="matrix(0.86449642,0,0,0.9365378,0.70296592,-0.17499137)" + style="fill:none;stroke:#ff7f2a;stroke-width:1.62630153"> + style="fill:none;stroke:#ff7f2a;stroke-width:1.62630153" /> + style="fill:none;stroke:#ff7f2a;stroke-width:1.62630153" /> diff --git a/bauh/view/resources/img/history.svg b/bauh/view/resources/img/history.svg index adfe80d3..798d4c22 100755 --- a/bauh/view/resources/img/history.svg +++ b/bauh/view/resources/img/history.svg @@ -18,11 +18,27 @@ sodipodi:docname="history.svg" width="24" height="24" - inkscape:version="0.92.3 (2405546, 2018-03-11)">image/svg+xml + + + + + + + + + + + + + + + + @@ -109,112 +125,92 @@ transform="translate(0,-8)"> - - - - - - - - - - - - - - - - \ No newline at end of file + d="M 2.4276896,22.344739 C 2.1106751,22.203237 1.7445239,21.819184 1.6249792,21.502783 1.5634613,21.339963 1.534502,18.776226 1.534502,13.492924 V 5.722532 L 1.7962251,5.502307 C 2.0073848,5.3246275 2.1470753,5.2820815 2.5192817,5.2820815 h 0.4613335 l 0.010064,7.4644955 c 0.00554,4.105472 0.034245,7.579334 0.063799,7.719692 0.076744,0.364473 0.5911559,0.615223 0.9538887,0.464975 0.1401024,-0.05803 0.301118,-0.186393 0.3578125,-0.285245 0.078584,-0.137018 0.1087332,-2.374931 0.1268655,-9.417098 L 4.51683,1.9915325 4.7541593,1.7641565 4.9914886,1.5367805 13.552896,1.5592555 c 8.088131,0.021235 8.569803,0.030875 8.713294,0.1743655 0.143714,0.143716 0.153206,0.6678555 0.176399,9.739997 0.01348,5.273459 0.002,9.713334 -0.02547,9.866389 -0.06207,0.345639 -0.501372,0.85764 -0.866909,1.010372 -0.405258,0.169327 -18.7426553,0.163918 -19.1225276,-0.0056 z M 12.629758,20.853868 c 0.187087,-0.155269 0.16598,-0.321638 -0.05587,-0.440368 -0.238661,-0.127728 -3.835291,-0.20827 -5.36372,-0.120113 -0.8934075,0.05153 -1.0991205,0.08822 -1.162901,0.207392 -0.241416,0.451089 0.2189925,0.511207 3.7115315,0.484626 2.0977425,-0.01597 2.7687475,-0.04671 2.8709595,-0.131537 z m 8.193341,0.0084 c 0.226602,-0.123386 0.245187,-0.287948 0.05074,-0.449343 -0.113616,-0.0943 -0.744442,-0.116747 -3.281735,-0.116747 -2.980825,0 -3.147082,0.0082 -3.258671,0.160615 -0.185514,0.253398 -0.01807,0.460865 0.407866,0.505343 0.198628,0.02074 1.605225,0.03021 3.12577,0.02103 1.993071,-0.01202 2.818044,-0.04576 2.956026,-0.120898 z m -8.290763,-2.18714 c 0.211353,-0.0811 0.270914,-0.374334 0.10894,-0.536337 -0.12383,-0.123851 -0.473071,-0.139379 -3.134899,-0.139379 -1.6475495,0 -3.0965905,0.02838 -3.220092,0.06306 -0.28737,0.08071 -0.372303,0.300329 -0.192837,0.498637 0.1025195,0.113283 0.3009425,0.163807 0.746374,0.190052 0.858951,0.05061 5.524898,-0.01171 5.692514,-0.07604 z m 8.241653,0.0039 c 0.190459,-0.07336 0.258521,-0.274372 0.157081,-0.463916 -0.07318,-0.136742 -0.258694,-0.16216 -1.594673,-0.218496 -1.520637,-0.06412 -4.639486,-0.0059 -4.892862,0.09131 -0.207959,0.0798 -0.254141,0.301439 -0.09862,0.473288 0.104974,0.115996 0.301326,0.163213 0.788906,0.189707 0.935843,0.05085 5.471589,-0.007 5.640166,-0.0719 z m -8.112311,-2.370646 c 0.108516,-0.108516 0.119719,-0.175137 0.04849,-0.288384 C 12.570774,15.79836 11.567063,15.734064 8.6943085,15.762749 6.362662,15.786029 6.1915,15.798189 6.081841,15.94828 c -0.193643,0.265042 -0.01814,0.461984 0.450762,0.505831 0.221953,0.02075 1.6600415,0.02821 3.1957515,0.01656 2.4694015,-0.01872 2.8085145,-0.03749 2.9333175,-0.162291 z m 8.161421,0.0464 c 0.105268,-0.05789 0.191397,-0.156632 0.191397,-0.219436 0,-0.301606 -0.223937,-0.332909 -2.669605,-0.373168 -3.498494,-0.05759 -4.293481,0.03946 -4.050014,0.494378 0.118216,0.220887 0.374556,0.23659 3.572196,0.21883 2.011473,-0.01118 2.81677,-0.04403 2.956026,-0.120604 z m 0.02511,-2.227956 c 0.181979,-0.09739 0.207328,-0.226611 0.08303,-0.423269 -0.07047,-0.111497 -0.995028,-0.13046 -7.327098,-0.150281 -6.406459,-0.02005 -7.2696235,-0.0075 -7.4463465,0.108292 -0.220397,0.144411 -0.2355505,0.194006 -0.1167895,0.382251 0.064388,0.10206 0.383354,0.138422 1.593675,0.181677 2.38072,0.08508 13.018607,0.0057 13.213524,-0.09867 z m -0.01535,-2.288552 c 0.0999,-0.05347 0.181638,-0.15194 0.181638,-0.218827 0,-0.328079 -0.143018,-0.334563 -7.44323,-0.33746 -3.883239,-0.0015 -7.1614805,0.02558 -7.284982,0.06026 -0.2534055,0.07117 -0.3802345,0.301716 -0.242211,0.440286 0.159771,0.160404 2.0810655,0.200618 8.43014,0.176453 4.428991,-0.01686 6.228407,-0.05102 6.358644,-0.12072 z M 12.478653,9.573559 12.763145,9.356566 V 6.4095245 3.462483 L 12.534567,3.2238982 12.305988,2.9853135 H 9.41246 6.518932 L 6.2384195,3.2571969 5.957907,3.5290804 V 6.359127 9.1891735 l 0.2640085,0.300689 0.2640085,0.300689 H 9.3400425 12.194161 Z M 20.90057,9.600674 C 21.072313,9.428931 20.97705,9.125099 20.732364,9.064198 20.630214,9.038773 19.157581,9.029113 17.459846,9.042733 c -2.632761,0.02112 -3.098644,0.04353 -3.167386,0.152361 -0.09974,0.1579025 -0.09986,0.182207 -0.0017,0.3374435 0.129326,0.20448 0.837811,0.24675 3.730086,0.222546 2.343977,-0.019615 2.767624,-0.04233 2.879703,-0.1544105 z M 20.713409,7.4099965 c 0.279024,-0.1060845 0.362602,-0.31648 0.193068,-0.486015 -0.109282,-0.109282 -0.506838,-0.1386685 -2.372199,-0.1753455 -3.35395,-0.065947 -4.430273,0.043175 -4.300833,0.4360275 0.09054,0.274803 0.436818,0.306611 3.351628,0.3078675 1.70654,7.5e-4 2.999005,-0.033365 3.128336,-0.082534 z m 0.191065,-2.321697 c 0.171363,-0.1713644 0.08909,-0.3815037 -0.191065,-0.4880187 -0.129317,-0.049167 -1.440521,-0.083789 -3.173207,-0.083789 -2.534863,0 -2.979587,0.018744 -3.141885,0.1324218 -0.208628,0.1461286 -0.222588,0.1932818 -0.109921,0.3712917 0.135527,0.2141295 0.758765,0.2528865 3.648421,0.226884 2.436848,-0.02193 2.853065,-0.0442 2.967658,-0.158792 z" + style="fill:none;stroke:none;stroke-width:0.08506548" /> \ No newline at end of file diff --git a/bauh/view/resources/img/question.svg b/bauh/view/resources/img/question.svg index d6194738..1ad2bd4f 100644 --- a/bauh/view/resources/img/question.svg +++ b/bauh/view/resources/img/question.svg @@ -9,12 +9,12 @@ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" id="Capa_1" enable-background="new 0 0 512 512" - height="512" - viewBox="0 0 512 512" - width="512" + height="23.967955" + viewBox="0 0 15.215549 23.967955" + width="15.215549" version="1.1" sodipodi:docname="question.svg" - inkscape:version="0.92.4 5da689c313, 2019-01-14"> + inkscape:version="0.92.5 (2060ec1f9f, 2020-04-08)"> @@ -23,7 +23,7 @@ image/svg+xml - + @@ -38,30 +38,36 @@ guidetolerance="10" inkscape:pageopacity="0" inkscape:pageshadow="2" - inkscape:window-width="1360" - inkscape:window-height="703" + inkscape:window-width="1366" + inkscape:window-height="739" id="namedview873" showgrid="false" showborder="false" - inkscape:zoom="0.17712196" - inkscape:cx="-1248.9069" - inkscape:cy="793.31938" + inkscape:zoom="5.6679028" + inkscape:cx="-23.418989" + inkscape:cy="9.6513721" inkscape:window-x="0" inkscape:window-y="0" inkscape:window-maximized="1" - inkscape:current-layer="Capa_1" /> + inkscape:current-layer="Capa_1" + fit-margin-top="0" + fit-margin-left="0" + fit-margin-right="0" + fit-margin-bottom="0" /> + id="g7850" + transform="scale(1.0021734,0.95647647)" + style="stroke:#0088aa"> + style="fill:none;stroke:#0088aa;stroke-width:1.42732489" /> + style="fill:none;stroke:#0088aa;stroke-width:1.42732489" + inkscape:connector-curvature="0" /> diff --git a/bauh/view/resources/img/refresh.svg b/bauh/view/resources/img/refresh.svg index a0d12a94..61d7754a 100755 --- a/bauh/view/resources/img/refresh.svg +++ b/bauh/view/resources/img/refresh.svg @@ -13,15 +13,15 @@ id="Capa_1" x="0px" y="0px" - width="24.052713" - height="24.049257" - viewBox="0 0 24.052713 24.049257" + width="48.250984" + height="48" + viewBox="0 0 48.250983 47.999999" xml:space="preserve" sodipodi:docname="refresh.svg" inkscape:version="0.92.5 (2060ec1f9f, 2020-04-08)">image/svg+xml + transform="matrix(0.0976088,0,0,0.09117309,0.34656718,1.7888681)" + style="fill:none;fill-opacity:1;stroke:#37abc8;stroke-width:39.24114227"> + style="fill:none;fill-opacity:1;stroke:#37abc8;stroke-width:39.24114227"> + style="fill:none;fill-opacity:1;stroke:#37abc8;stroke-width:39.24114227" /> + style="fill:none;fill-opacity:1;stroke:#37abc8;stroke-width:39.24114227" /> + transform="translate(-15.027876,-440.19647)"> + transform="translate(-15.027876,-440.19647)"> + transform="translate(-15.027876,-440.19647)"> + transform="translate(-15.027876,-440.19647)"> + transform="translate(-15.027876,-440.19647)"> + transform="translate(-15.027876,-440.19647)"> + transform="translate(-15.027876,-440.19647)"> + transform="translate(-15.027876,-440.19647)"> + transform="translate(-15.027876,-440.19647)"> + transform="translate(-15.027876,-440.19647)"> + transform="translate(-15.027876,-440.19647)"> + transform="translate(-15.027876,-440.19647)"> + transform="translate(-15.027876,-440.19647)"> + transform="translate(-15.027876,-440.19647)"> + transform="translate(-15.027876,-440.19647)"> \ No newline at end of file diff --git a/bauh/view/resources/img/settings.svg b/bauh/view/resources/img/settings.svg new file mode 100755 index 00000000..1468c2da --- /dev/null +++ b/bauh/view/resources/img/settings.svg @@ -0,0 +1,63 @@ + + + + + + + + image/svg+xml + + + + + + + + + diff --git a/bauh/view/resources/img/suggestions.svg b/bauh/view/resources/img/suggestions.svg index 3d243e4a..1ff9e632 100644 --- a/bauh/view/resources/img/suggestions.svg +++ b/bauh/view/resources/img/suggestions.svg @@ -13,16 +13,30 @@ id="Capa_1" x="0px" y="0px" - viewBox="0 0 48.000001 48.000001" + viewBox="0 0 21.962843 24.000001" xml:space="preserve" sodipodi:docname="suggestions.svg" inkscape:version="0.92.5 (2060ec1f9f, 2020-04-08)" - width="48" - height="48">image/svg+xml + + + + + + + + + + + + + + - - - - - - - - - - - - - - + id="g10054" + transform="matrix(0.5189189,0,0,0.5189189,-0.00218031,0.00160743)" + style="fill:#aa8800;stroke:#aa8800"> + transform="translate(-38.804984,-406.525)"> + transform="translate(-38.804984,-406.525)"> + transform="translate(-38.804984,-406.525)"> + transform="translate(-38.804984,-406.525)"> + transform="translate(-38.804984,-406.525)"> + transform="translate(-38.804984,-406.525)"> + transform="translate(-38.804984,-406.525)"> + transform="translate(-38.804984,-406.525)"> + transform="translate(-38.804984,-406.525)"> + transform="translate(-38.804984,-406.525)"> + transform="translate(-38.804984,-406.525)"> + transform="translate(-38.804984,-406.525)"> + transform="translate(-38.804984,-406.525)"> + transform="translate(-38.804984,-406.525)"> + transform="translate(-38.804984,-406.525)"> \ No newline at end of file diff --git a/bauh/view/resources/img/verified.svg b/bauh/view/resources/img/verified.svg index 5cf6c99d..0eceb525 100644 --- a/bauh/view/resources/img/verified.svg +++ b/bauh/view/resources/img/verified.svg @@ -14,7 +14,7 @@ sodipodi:docname="verified.svg" width="8" height="8" - inkscape:version="0.92.4 5da689c313, 2019-01-14"> + inkscape:version="0.92.5 (2060ec1f9f, 2020-04-08)"> @@ -23,7 +23,7 @@ image/svg+xml - + @@ -38,8 +38,8 @@ guidetolerance="10" inkscape:pageopacity="0" inkscape:pageshadow="2" - inkscape:window-width="1920" - inkscape:window-height="1019" + inkscape:window-width="1366" + inkscape:window-height="739" id="namedview819" showgrid="false" showborder="false" @@ -47,9 +47,9 @@ fit-margin-left="0" fit-margin-right="0" fit-margin-bottom="0" - inkscape:zoom="1.1923077" - inkscape:cx="-358.68351" - inkscape:cy="156.16568" + inkscape:zoom="13.489422" + inkscape:cx="24.427128" + inkscape:cy="5.0927218" inkscape:window-x="0" inkscape:window-y="0" inkscape:window-maximized="1" @@ -58,5 +58,5 @@ d="M 0.09230771,4.4 C 0.03076924,4.32 0,4.2 0,4.12 0,4.04 0.03076924,3.92 0.09230771,3.84 l 0.4307693,-0.56 c 0.12307694,-0.16 0.30769231,-0.16 0.43076928,0 l 0.0307687,0.04 1.69230781,2.36 c 0.061539,0.08 0.1538463,0.08 0.2153848,0 L 7.0153863,0.12 h 0.030767 v 0 c 0.1230774,-0.16 0.3076932,-0.16 0.4307692,0 L 7.907692,0.68 c 0.1230773,0.16 0.1230773,0.4 0,0.56 v 0 L 2.9846157,7.88 C 2.9230775,7.96 2.8615389,8 2.7692313,8 2.6769233,8 2.6153851,7.96 2.5538465,7.88 L 0.15384617,4.52 Z" id="path815" inkscape:connector-curvature="0" - style="fill:#00aa00;stroke-width:0.35082322" /> + style="fill:#68a92e;stroke-width:0.35082322;fill-opacity:1" />