From f5111213b8920e7c0eaaa65f5c8afc7ee1c4e24f Mon Sep 17 00:00:00 2001 From: Vinicius Moreira Date: Tue, 30 Nov 2021 13:27:50 -0300 Subject: [PATCH] [flatpak] improvement: not displaying the installation target option when bauh is launched by the root user (settings) --- CHANGELOG.md | 3 +++ bauh/gems/flatpak/controller.py | 37 +++++++++++++++++---------------- 2 files changed, 22 insertions(+), 18 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 669c28c8..841f1ddb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -32,6 +32,9 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). - AppImage - faster reading of installed applications (subprocess call replaced by Python call) +- Flatpak + - settings: not displaying the installation target option when bauh is launched by the root user + - Web - the Electron builds cache directory has been moved to the environment directory `~/.local/share/bauh/web/env/electron` - letting the Electron client to download the Electron build file instead of bauh (to avoid wrong caching paths) diff --git a/bauh/gems/flatpak/controller.py b/bauh/gems/flatpak/controller.py index fe171b9f..987541b0 100644 --- a/bauh/gems/flatpak/controller.py +++ b/bauh/gems/flatpak/controller.py @@ -592,27 +592,28 @@ class FlatpakManager(SoftwareManager): return urls def get_settings(self, screen_width: int, screen_height: int) -> Optional[ViewComponent]: - fields = [] + if not self.context.root_user: + fields = [] - flatpak_config = self.configman.get_config() + flatpak_config = self.configman.get_config() - install_opts = [InputOption(label=self.i18n['flatpak.config.install_level.system'].capitalize(), - value='system', - tooltip=self.i18n['flatpak.config.install_level.system.tip']), - InputOption(label=self.i18n['flatpak.config.install_level.user'].capitalize(), - value='user', - tooltip=self.i18n['flatpak.config.install_level.user.tip']), - InputOption(label=self.i18n['ask'].capitalize(), - value=None, - tooltip=self.i18n['flatpak.config.install_level.ask.tip'].format(app=self.context.app_name))] - fields.append(SingleSelectComponent(label=self.i18n['flatpak.config.install_level'], - options=install_opts, - default_option=[o for o in install_opts if o.value == flatpak_config['installation_level']][0], - max_per_line=len(install_opts), - max_width=floor(screen_width * 0.22), - type_=SelectViewType.RADIO)) + install_opts = [InputOption(label=self.i18n['flatpak.config.install_level.system'].capitalize(), + value='system', + tooltip=self.i18n['flatpak.config.install_level.system.tip']), + InputOption(label=self.i18n['flatpak.config.install_level.user'].capitalize(), + value='user', + tooltip=self.i18n['flatpak.config.install_level.user.tip']), + InputOption(label=self.i18n['ask'].capitalize(), + value=None, + tooltip=self.i18n['flatpak.config.install_level.ask.tip'].format(app=self.context.app_name))] + fields.append(SingleSelectComponent(label=self.i18n['flatpak.config.install_level'], + options=install_opts, + default_option=[o for o in install_opts if o.value == flatpak_config['installation_level']][0], + max_per_line=len(install_opts), + max_width=floor(screen_width * 0.22), + type_=SelectViewType.RADIO)) - return PanelComponent([FormComponent(fields, self.i18n['installation'].capitalize())]) + return PanelComponent([FormComponent(fields, self.i18n['installation'].capitalize())]) def save_settings(self, component: PanelComponent) -> Tuple[bool, Optional[List[str]]]: flatpak_config = self.configman.get_config()