[improvement][settings] new property 'ui.scale_factor' responsible for defining the interface scale factor

2026-07-09 06:24:15 +02:00 · 2020-06-24 12:23:05 -03:00
parent cab309b023
commit 1088966991
16 changed files with 117 additions and 5 deletions
--- a/bauh/view/core/config.py
+++ b/bauh/view/core/config.py
@@ -39,7 +39,8 @@ def read_config(update_file: bool = False) -> dict:
            },
            'style': None,
            'hdpi': True,
-            "auto_scale": False
+            "auto_scale": False,
+            "scale_factor": 1.0

        },
        'download': {
--- a/bauh/view/core/settings.py
+++ b/bauh/view/core/settings.py
@@ -11,7 +11,7 @@ from bauh.api.abstract.controller import SoftwareManager
 from bauh.api.abstract.download import FileDownloader
 from bauh.api.abstract.view import ViewComponent, TabComponent, InputOption, TextComponent, MultipleSelectComponent, \
    PanelComponent, FormComponent, TabGroupComponent, SingleSelectComponent, SelectViewType, TextInputComponent, \
-    FileChooserComponent
+    FileChooserComponent, RangeInputComponent
 from bauh.view.core import config, timeshift
 from bauh.view.core.config import read_config
 from bauh.view.core.downloader import AdaptableFileDownloader
@@ -191,6 +191,19 @@ class GenericSettingsManager:
                                                 max_width=default_width,
                                                 id_='auto_scale')

+        try:
+            scale = float(core_config['ui']['scale_factor'])
+
+            if scale < 1.0:
+                scale = 1.0
+        except:
+            scale = 1.0
+
+        select_scale = RangeInputComponent(id_="scalef", label=self.i18n['core.config.ui.scale_factor'] + ' (%)',
+                                           tooltip=self.i18n['core.config.ui.scale_factor.tip'],
+                                           min_value=100, max_value=400, step_value=5, value=scale * 100,
+                                           max_width=default_width)
+
        cur_style = QApplication.instance().style().objectName().lower() if not core_config['ui']['style'] else core_config['ui']['style']
        style_opts = [InputOption(label=self.i18n['core.config.ui.style.default'].capitalize(), value=None)]
        style_opts.extend([InputOption(label=s.capitalize(), value=s.lower()) for s in QStyleFactory.keys()])
@@ -226,7 +239,7 @@ class GenericSettingsManager:
                                                 max_width=default_width,
                                                 value=core_config['download']['icons'])

-        sub_comps = [FormComponent([select_hdpi, select_ascale, select_dicons, select_style, input_maxd], spaces=False)]
+        sub_comps = [FormComponent([select_hdpi, select_ascale, select_scale, select_dicons, select_style, input_maxd], spaces=False)]
        return TabComponent(self.i18n['core.config.tab.ui'].capitalize(), PanelComponent(sub_comps), None, 'core.ui')

    def _gen_general_settings(self, core_config: dict, screen_width: int, screen_height: int) -> TabComponent:
@@ -388,6 +401,7 @@ class GenericSettingsManager:
            self.logger.info("Deleting environment variable QT_AUTO_SCREEN_SCALE_FACTOR")
            del os.environ['QT_AUTO_SCREEN_SCALE_FACTOR']

+        core_config['ui']['scale_factor'] = ui_form.get_component('scalef').value / 100
        core_config['ui']['table']['max_displayed'] = ui_form.get_component('table_max').get_int_value()

        style = ui_form.get_component('style').get_selected()
--- a/bauh/view/qt/components.py
+++ b/bauh/view/qt/components.py
@@ -9,11 +9,11 @@ from PyQt5.QtCore import Qt, QSize
 from PyQt5.QtGui import QIcon, QPixmap, QIntValidator, QCursor
 from PyQt5.QtWidgets import QRadioButton, QGroupBox, QCheckBox, QComboBox, QGridLayout, QWidget, \
    QLabel, QSizePolicy, QLineEdit, QToolButton, QHBoxLayout, QFormLayout, QFileDialog, QTabWidget, QVBoxLayout, \
-    QSlider, QScrollArea, QFrame, QAction
+    QSlider, QScrollArea, QFrame, QAction, QSpinBox

 from bauh.api.abstract.view import SingleSelectComponent, InputOption, MultipleSelectComponent, SelectViewType, \
    TextInputComponent, FormComponent, FileChooserComponent, ViewComponent, TabGroupComponent, PanelComponent, \
-    TwoStateButtonComponent, TextComponent, SpacerComponent
+    TwoStateButtonComponent, TextComponent, SpacerComponent, RangeInputComponent
 from bauh.view.qt import css
 from bauh.view.qt.colors import RED
 from bauh.view.util import resource
@@ -699,6 +699,9 @@ class FormQt(QGroupBox):
                label = self._new_label(c)
                field = FormComboBoxQt(c) if c.type == SelectViewType.COMBO else FormRadioSelectQt(c)
                self.layout().addRow(label, self._wrap(field, c))
+            elif isinstance(c, RangeInputComponent):
+                label = self._new_label(c)
+                self.layout().addRow(label, self._wrap(self._new_range_input(c), c))
            elif isinstance(c, FileChooserComponent):
                label, field = self._new_file_chooser(c)
                self.layout().addRow(label, field)
@@ -712,6 +715,8 @@ class FormQt(QGroupBox):
                self.layout().addRow(label, FormMultipleSelectQt(c))
            elif isinstance(c, TextComponent):
                self.layout().addRow(self._new_label(c), QWidget())
+            elif isinstance(c, RangeInputComponent):
+                self.layout()
            else:
                raise Exception('Unsupported component type {}'.format(c.__class__.__name__))

@@ -792,6 +797,22 @@ class FormQt(QGroupBox):

        return label, self._wrap(line_edit, c)

+    def _new_range_input(self, model: RangeInputComponent) -> QSpinBox:
+        spinner = QSpinBox()
+        spinner.setMinimum(model.min)
+        spinner.setMaximum(model.max)
+        spinner.setSingleStep(model.step)
+        spinner.setValue(model.value if model.value is not None else model.min)
+
+        if model.tooltip:
+            spinner.setToolTip(model.tooltip)
+
+        def _update_value():
+            model.value = spinner.value()
+
+        spinner.valueChanged.connect(_update_value)
+        return spinner
+
    def _wrap(self, comp: QWidget, model: ViewComponent) -> QWidget:
        field_container = QWidget()
        field_container.setLayout(QHBoxLayout())
@@ -904,6 +925,8 @@ def to_widget(comp: ViewComponent, i18n: I18n, parent: QWidget = None) -> QWidge
        return MultipleSelectQt(comp, None)
    elif isinstance(comp, TextInputComponent):
        return TextInputQt(comp)
+    elif isinstance(comp, RangeInputComponent):
+        return RangeInputQt(comp)
    elif isinstance(comp, FormComponent):
        return FormQt(comp, i18n)
    elif isinstance(comp, TabGroupComponent):
@@ -924,3 +947,32 @@ def to_widget(comp: ViewComponent, i18n: I18n, parent: QWidget = None) -> QWidge
        return new_spacer()
    else:
        raise Exception("Cannot render instances of " + comp.__class__.__name__)
+
+
+class RangeInputQt(QGroupBox):
+
+    def __init__(self, model: RangeInputComponent):
+        super(RangeInputQt, self).__init__()
+        self.model = model
+        self.setLayout(QGridLayout())
+        self.setStyleSheet('QGridLayout {margin-left: 0} QLabel { font-weight: bold}')
+        self.layout().addWidget(QLabel(model.label.capitalize() + ' :' if model.label else ''), 0, 0)
+
+        if self.model.max_width > 0:
+            self.setMaximumWidth(self.model.max_width)
+
+        self.spinner = QSpinBox()
+        self.spinner.setMinimum(model.min)
+        self.spinner.setMaximum(model.max)
+        self.spinner.setSingleStep(model.step)
+        self.spinner.setValue(model.value if model.value is not None else model.min)
+
+        if model.tooltip:
+            self.spinner.setToolTip(model.tooltip)
+
+        self.layout().addWidget(self.spinner, 0, 1)
+
+        self.spinner.valueChanged.connect(self._update_value)
+
+    def _update_value(self):
+        self.model.value = self.spinner.value()
--- a/bauh/view/resources/locale/ca
+++ b/bauh/view/resources/locale/ca
@@ -231,6 +231,8 @@ core.config.ui.hdpi=HDPI
 core.config.ui.hdpi.tip=If improvements related to HDPI resolutions should be activated
 core.config.ui.max_displayed=Applications displayed
 core.config.ui.max_displayed.tip=Maximum number of applications displayed on the table
+core.config.ui.scale_factor=Scale
+core.config.ui.scale_factor.tip=It defines the interface display scaling factor (Qt). Raise the value to raise the interface size. Restart required.
 core.config.ui.style.default=Default
 core.config.ui.tray.default_icon=Default icon
 core.config.ui.tray.default_icon.tip=The default icon for {app} displayed on the tray
--- a/bauh/view/resources/locale/de
+++ b/bauh/view/resources/locale/de
@@ -230,6 +230,8 @@ core.config.ui.hdpi=HiDPI
 core.config.ui.hdpi.tip=Falls aktiviert werden Optimierungen für hochauflösende Displays vorgenommen
 core.config.ui.max_displayed=Anzahl der Anwendungen
 core.config.ui.max_displayed.tip=Maximale Anzahl von Anwendungen, die in der Tabelle angezeigt werden
+core.config.ui.scale_factor=Scale
+core.config.ui.scale_factor.tip=It defines the interface display scaling factor (Qt). Raise the value to raise the interface size. Restart required.
 core.config.ui.style.default=Default
 core.config.ui.tray.default_icon=Anwendungs-Icon
 core.config.ui.tray.default_icon.tip=The default icon for {app} displayed on the tray
--- a/bauh/view/resources/locale/en
+++ b/bauh/view/resources/locale/en
@@ -230,6 +230,8 @@ core.config.ui.hdpi.tip=If improvements related to HDPI resolutions should be ac
 core.config.ui.hdpi=HDPI
 core.config.ui.max_displayed.tip=Maximum number of applications displayed on the table
 core.config.ui.max_displayed=Applications displayed
+core.config.ui.scale_factor=Scale
+core.config.ui.scale_factor.tip=It defines the interface display scaling factor (Qt). Raise the value to raise the interface size. Restart required.
 core.config.ui.style.default=Default
 core.config.ui.tray.default_icon.tip=The default icon for {app} displayed on the tray
 core.config.ui.tray.default_icon=Default icon
--- a/bauh/view/resources/locale/es
+++ b/bauh/view/resources/locale/es
@@ -231,6 +231,8 @@ core.config.ui.hdpi=HDPI
 core.config.ui.hdpi.tip=Si se deben activar las mejoras relacionadas con las resoluciones HDPI
 core.config.ui.max_displayed=Aplicaciones mostradas
 core.config.ui.max_displayed.tip=Número máximo de aplicaciones que se muestran en la tabla
+core.config.ui.scale_factor=Escala
+core.config.ui.scale_factor.tip=Define el factor de escala de visualización de la interfaz (Qt). Aumente el valor para aumentar el tamaño de la interfaz. Reinicio requerido.
 core.config.ui.style.default=Predeterminado
 core.config.ui.tray.default_icon=Ícono predeterminado
 core.config.ui.tray.default_icon.tip=El icono predeterminado que se muestra en la bandeja
--- a/bauh/view/resources/locale/it
+++ b/bauh/view/resources/locale/it
@@ -231,6 +231,8 @@ core.config.ui.hdpi=HDPI
 core.config.ui.hdpi.tip=If improvements related to HDPI resolutions should be activated
 core.config.ui.max_displayed=Applications displayed
 core.config.ui.max_displayed.tip=Maximum number of applications displayed on the table
+core.config.ui.scale_factor=Scale
+core.config.ui.scale_factor.tip=It defines the interface display scaling factor (Qt). Raise the value to raise the interface size. Restart required.
 core.config.ui.style.default=Default
 core.config.ui.tray.default_icon=Default icon
 core.config.ui.tray.default_icon.tip=The default icon for {app} displayed on the tray
--- a/bauh/view/resources/locale/pt
+++ b/bauh/view/resources/locale/pt
@@ -230,6 +230,8 @@ core.config.ui.hdpi.tip=Se melhorias para resoluções HDPI devem ser ativadas
 core.config.ui.hdpi=HDPI
 core.config.ui.max_displayed.tip=Número máximo de aplicativos exibidos na tabela
 core.config.ui.max_displayed=Aplicativos exibidos
+core.config.ui.scale_factor=Escala
+core.config.ui.scale_factor.tip=Define o fator de escala de exibição da interface (Qt). Aumente o valor para aumentar o tamanho da interface. Reinicialização necessária.
 core.config.ui.style.default=Padrão
 core.config.ui.tray.default_icon.tip=O ícone padrão exibido na bandeja
 core.config.ui.tray.default_icon=Ícone padrão
--- a/bauh/view/resources/locale/ru
+++ b/bauh/view/resources/locale/ru
@@ -230,6 +230,8 @@ core.config.ui.hdpi=HDPI
 core.config.ui.hdpi.tip=Если улучшения, связанные с разрешением HDPI должны быть активированы
 core.config.ui.max_displayed=Отображаемые приложения
 core.config.ui.max_displayed.tip=Максимальное количество приложений, отображаемых в  таблице
+core.config.ui.scale_factor=Scale
+core.config.ui.scale_factor.tip=It defines the interface display scaling factor (Qt). Raise the value to raise the interface size. Restart required.
 core.config.ui.style.default=Default
 core.config.ui.tray.default_icon=Значок по умолчанию
 core.config.ui.tray.default_icon.tip=Значок по умолчанию для {app}, отображаемый в трее
--- a/bauh/view/resources/locale/tr
+++ b/bauh/view/resources/locale/tr
@@ -230,6 +230,8 @@ core.config.ui.hdpi.tip=HDPI çözünürlükleri ile ilgili iyileştirmeler etki
 core.config.ui.hdpi=HDPI
 core.config.ui.max_displayed.tip=Tabloda görüntülenen azami uygulama sayısı
 core.config.ui.max_displayed=Görüntülenen uygulamalar
+core.config.ui.scale_factor=Scale
+core.config.ui.scale_factor.tip=It defines the interface display scaling factor (Qt). Raise the value to raise the interface size. Restart required.
 core.config.ui.style.default=Default
 core.config.ui.tray.default_icon.tip=Tepside görüntülenen {app} için varsayılan simge
 core.config.ui.tray.default_icon=Varsayılan simge