diff --git a/Assets/Translations/de.json b/Assets/Translations/de.json index d325d8713..327c7b66c 100644 --- a/Assets/Translations/de.json +++ b/Assets/Translations/de.json @@ -13,43 +13,6 @@ }, "select-avatar": "Avatar-Bild auswählen" }, - "ui": { - "section": { - "label": "Benutzeroberfläche", - "description": "Passen Sie das Aussehen, die Haptik und das Verhalten der Oberfläche an." - }, - "tooltips": { - "label": "Tooltips anzeigen", - "description": "Tooltips in der gesamten Benutzeroberfläche aktivieren oder deaktivieren." - }, - "dim-desktop": { - "label": "Desktop abdunkeln", - "description": "Desktop abdunkeln, wenn Panels oder Menüs geöffnet sind." - }, - "compact-lockscreen": { - "label": "Kompakter Sperrbildschirm", - "description": "Zeigt nur die Anmeldeeingabe und Systemsteuerungen an, versteckt Wetter- und Medien-Widgets." - }, - "border-radius": { - "label": "Eckenradius", - "description": "Steuert die Rundung der Ecken von Fenstern, Buttons und anderen Elementen.", - "reset": "Rahmenradius zurücksetzen" - }, - "animation-speed": { - "label": "Animationsgeschwindigkeit", - "description": "Globale Animationsgeschwindigkeit anpassen.", - "reset": "Animationsgeschwindigkeit zurücksetzen" - }, - "animation-disable": { - "label": "UI-Animationen deaktivieren", - "description": "Alle Animationen für eine schnellere, reaktionsschnellere Erfahrung deaktivieren." - }, - "scaling": { - "description": "Ändert die Größe der allgemeinen Benutzeroberfläche, mit Ausnahme der Leiste.", - "label": "Oberflächenskalierung", - "reset-scaling": "Schnittstellenskalierung zurücksetzen" - } - }, "screen-corners": { "section": { "label": "Bildschirmecken", @@ -95,33 +58,6 @@ } }, "reset-scaling": "Skalierung zurücksetzen" - }, - "control-center": { - "title": "Kontrollzentrum", - "section": { - "label": "Kontrollzentrum", - "description": "Konfigurieren Sie die Positionierung und das Verhalten des Kontrollzentrum-Panels." - }, - "position": { - "label": "Position", - "description": "Wählen Sie, wo das Kontrollzentrum-Panel beim Öffnen erscheint." - }, - "quickSettingsStyle": { - "section": { - "label": "Schnelleinstellungen-Stil", - "description": "Passen Sie das Aussehen und Verhalten der Schnelleinstellungen im Kontrollzentrum an." - }, - "style": { - "label": "Schnelleinstellungen-Stil", - "description": "Wählen Sie den visuellen Stil für Schnelleinstellungs-Schalter und -Steuerungen." - } - }, - "widgets": { - "section": { - "label": "Widgets", - "description": "Konfigurieren und verwalten Sie Kontrollzentrum-Widgets und deren Anzeigeoptionen." - } - } } }, "audio": { @@ -750,28 +686,6 @@ } } }, - "control-center": { - "title": "Kontrollzentrum", - "quickSettingsStyle": { - "section": { - "label": "Schnelleinstellungen-Stil", - "description": "Passen Sie das Aussehen und Verhalten der Schnelleinstellungen im Kontrollzentrum an." - }, - "style": { - "label": "Schnelleinstellungen-Stil", - "description": "Wählen Sie den visuellen Stil für Schnelleinstellungs-Schalter und -Steuerungen." - } - }, - "widgets": { - "section": { - "label": "Widgets", - "description": "Konfigurieren und verwalten Sie Kontrollzentrum-Widgets und deren Anzeigeoptionen." - } - }, - "quickSettings": { - "sectionName": "Schnelleinstellungen" - } - }, "hooks": { "title": "Hooks", "system-hooks": { @@ -804,6 +718,71 @@ "description": "• Hintergrundbild-Hook: $1 = Hintergrundbild-Pfad, $2 = Bildschirmname\n• Theme-Wechsel-Hook: $1 = true/false (Dunkelmodus-Status)" } } + }, + "control-center": { + "position": { + "description": "Wählen Sie aus, wo das Kontrollzentrum angezeigt wird, wenn es geöffnet wird.", + "label": "Position" + }, + "quickSettingsStyle": { + "section": { + "description": "Passen Sie das Aussehen und Verhalten der Schnelleinstellungen im Kontrollzentrum an.", + "label": "Schnelleinstellungen-Stil" + }, + "style": { + "description": "Wählen Sie den visuellen Stil für Schnellzugriff-Umschalter und -Steuerelemente.", + "label": "Schnelleinstellungen-Stil" + } + }, + "section": { + "description": "Konfigurieren Sie die Positionierung und das Verhalten des Control Center-Panels.", + "label": "Aussehen" + }, + "title": "Kontrollzentrum", + "widgets": { + "section": { + "description": "Control Center Widgets und ihre Anzeigeoptionen konfigurieren und verwalten.", + "label": "Widgets" + } + } + }, + "user-interface": { + "animation-disable": { + "description": "Deaktivieren Sie alle Animationen für eine schnellere und reaktionsfreudigere Erfahrung.", + "label": "UI-Animationen deaktivieren" + }, + "animation-speed": { + "description": "Globale Animationsgeschwindigkeit anpassen.", + "label": "Animationsgeschwindigkeit", + "reset": "Animationsgeschwindigkeit zurücksetzen" + }, + "border-radius": { + "description": "Steuert die Eckenrundung von Fenstern, Schaltflächen und anderen Elementen.", + "label": "Eckenradius", + "reset": "Rahmenradius zurücksetzen" + }, + "compact-lockscreen": { + "description": "Zeige nur die Login-Eingabe und Systemsteuerung, blende Wetter- und Medien-Widgets aus.", + "label": "Kompakter Sperrbildschirm" + }, + "dim-desktop": { + "description": "Den Desktop abdunkeln, wenn Bedienfelder oder Menüs geöffnet sind.", + "label": "Dim Desktop" + }, + "scaling": { + "description": "Ändert die Größe der allgemeinen Benutzeroberfläche, mit Ausnahme der Leiste.", + "label": "Oberflächenskalierung", + "reset-scaling": "Schnittstellenskalierung zurücksetzen" + }, + "section": { + "description": "Passen Sie das Aussehen, die Haptik und das Verhalten der Benutzeroberfläche an.", + "label": "Aussehen" + }, + "title": "Benutzeroberfläche", + "tooltips": { + "description": "Tooltips in der gesamten Benutzeroberfläche aktivieren oder deaktivieren.", + "label": "Tooltips anzeigen" + } } }, "general": { diff --git a/Assets/Translations/en.json b/Assets/Translations/en.json index 905ff182e..e930d7e5e 100644 --- a/Assets/Translations/en.json +++ b/Assets/Translations/en.json @@ -13,43 +13,6 @@ }, "select-avatar": "Select avatar image" }, - "ui": { - "section": { - "label": "User interface", - "description": "Customize the look, feel, and behavior of the interface." - }, - "tooltips": { - "label": "Show tooltips", - "description": "Enable or disable tooltips throughout the interface." - }, - "scaling": { - "label": "Interface scaling", - "description": "Changes the size of the general user interface, excluding the bar.", - "reset-scaling": "Reset interface scaling" - }, - "dim-desktop": { - "label": "Dim desktop", - "description": "Dim the desktop when panels or menus are open." - }, - "compact-lockscreen": { - "label": "Compact lock screen", - "description": "Show only the login input and system controls, hiding weather and media widgets." - }, - "border-radius": { - "label": "Border radius", - "description": "Controls the corner roundness of windows, buttons, and other elements.", - "reset": "Reset border radius" - }, - "animation-speed": { - "label": "Animation speed", - "description": "Adjust global animation speed.", - "reset": "Reset animation speed" - }, - "animation-disable": { - "label": "Disable UI Animations", - "description": "Disable all animations for a faster, more responsive experience." - } - }, "screen-corners": { "section": { "label": "Screen corners", @@ -95,34 +58,8 @@ "description": "Increase or decrease the size of the monospaced text." } } - }, - "control-center": { - "title": "Control Center", - "section": { - "label": "Control Center", - "description": "Configure the Control Center panel positioning and behavior." - }, - "position": { - "label": "Position", - "description": "Choose where the Control Center panel appears when opened." - }, - "quickSettingsStyle": { - "section": { - "label": "Quick Settings Style", - "description": "Customize the appearance and behavior of quick settings in the Control Center." - }, - "style": { - "label": "Quick Settings Style", - "description": "Choose the visual style for quick settings toggles and controls." - } - }, - "widgets": { - "section": { - "label": "Widgets", - "description": "Configure and manage Control Center widgets and their display options." - } - } } + }, "audio": { "title": "Audio", @@ -750,28 +687,6 @@ } } }, - "control-center": { - "title": "Control Center", - "quickSettingsStyle": { - "section": { - "label": "Quick Settings Style", - "description": "Customize the appearance and behavior of quick settings in the Control Center." - }, - "style": { - "label": "Quick Settings Style", - "description": "Choose the visual style for quick settings toggles and controls." - } - }, - "widgets": { - "section": { - "label": "Widgets", - "description": "Configure and manage Control Center widgets and their display options." - } - }, - "quickSettings": { - "sectionName": "Quick Settings" - } - }, "hooks": { "title": "Hooks", "system-hooks": { @@ -804,6 +719,71 @@ "description": "• Wallpaper Hook: $1 = wallpaper path, $2 = screen name\n• Theme Toggle Hook: $1 = true/false (dark mode state)" } } + }, + "control-center": { + "title": "Control Center", + "section": { + "label": "Appearance", + "description": "Configure the Control Center panel positioning and behavior." + }, + "position": { + "label": "Position", + "description": "Choose where the Control Center panel appears when opened." + }, + "quickSettingsStyle": { + "section": { + "label": "Quick Settings Style", + "description": "Customize the appearance and behavior of quick settings in the Control Center." + }, + "style": { + "label": "Quick Settings Style", + "description": "Choose the visual style for quick settings toggles and controls." + } + }, + "widgets": { + "section": { + "label": "Widgets", + "description": "Configure and manage Control Center widgets and their display options." + } + } + }, + "user-interface": { + "title": "User interface", + "section": { + "label": "Appearance", + "description": "Customize the look, feel, and behavior of the interface." + }, + "tooltips": { + "label": "Show tooltips", + "description": "Enable or disable tooltips throughout the interface." + }, + "scaling": { + "label": "Interface scaling", + "description": "Changes the size of the general user interface, excluding the bar.", + "reset-scaling": "Reset interface scaling" + }, + "dim-desktop": { + "label": "Dim desktop", + "description": "Dim the desktop when panels or menus are open." + }, + "compact-lockscreen": { + "label": "Compact lock screen", + "description": "Show only the login input and system controls, hiding weather and media widgets." + }, + "border-radius": { + "label": "Border radius", + "description": "Controls the corner roundness of windows, buttons, and other elements.", + "reset": "Reset border radius" + }, + "animation-speed": { + "label": "Animation speed", + "description": "Adjust global animation speed.", + "reset": "Reset animation speed" + }, + "animation-disable": { + "label": "Disable UI Animations", + "description": "Disable all animations for a faster, more responsive experience." + } } }, "widgets": { diff --git a/Assets/Translations/es.json b/Assets/Translations/es.json index ff013f2d2..bd9edc3b5 100644 --- a/Assets/Translations/es.json +++ b/Assets/Translations/es.json @@ -13,43 +13,6 @@ }, "select-avatar": "Seleccionar imagen de avatar" }, - "ui": { - "section": { - "label": "Interfaz de usuario", - "description": "Personaliza la apariencia, sensación y comportamiento de la interfaz." - }, - "tooltips": { - "label": "Mostrar tooltips", - "description": "Activar o desactivar tooltips en toda la interfaz." - }, - "dim-desktop": { - "label": "Atenuar escritorio", - "description": "Atenúa el escritorio cuando los paneles o menús están abiertos." - }, - "compact-lockscreen": { - "label": "Pantalla de bloqueo compacta", - "description": "Muestra solo la entrada de inicio de sesión y controles del sistema, ocultando widgets de clima y medios." - }, - "border-radius": { - "label": "Radio del borde", - "description": "Controla la redondez de las esquinas de ventanas, botones y otros elementos.", - "reset": "Restablecer el radio del borde" - }, - "animation-speed": { - "label": "Velocidad de la animación", - "description": "Ajusta la velocidad de la animación global.", - "reset": "Restablecer la velocidad de la animación" - }, - "animation-disable": { - "label": "Desactivar animaciones de UI", - "description": "Desactivar todas las animaciones para una experiencia más rápida y responsiva." - }, - "scaling": { - "description": "Cambia el tamaño de la interfaz de usuario general, excluyendo la barra.", - "label": "Escalado de la interfaz", - "reset-scaling": "Restablecer la escala de la interfaz" - } - }, "screen-corners": { "section": { "label": "Esquinas de la pantalla", @@ -95,33 +58,6 @@ } }, "reset-scaling": "Restablecer la escala" - }, - "control-center": { - "title": "Centro de control", - "section": { - "label": "Centro de control", - "description": "Configurar el posicionamiento y comportamiento del panel del centro de control." - }, - "position": { - "label": "Posición", - "description": "Elige dónde aparece el panel del centro de control cuando se abre." - }, - "quickSettingsStyle": { - "section": { - "label": "Estilo de configuración rápida", - "description": "Personaliza la apariencia y el comportamiento de las configuraciones rápidas en el centro de control." - }, - "style": { - "label": "Estilo de configuración rápida", - "description": "Elige el estilo visual para los interruptores y controles de configuración rápida." - } - }, - "widgets": { - "section": { - "label": "Widgets", - "description": "Configura y gestiona los widgets del centro de control y sus opciones de visualización." - } - } } }, "audio": { @@ -750,28 +686,6 @@ } } }, - "control-center": { - "title": "Centro de control", - "quickSettingsStyle": { - "section": { - "label": "Estilo de configuración rápida", - "description": "Personaliza la apariencia y el comportamiento de las configuraciones rápidas en el centro de control." - }, - "style": { - "label": "Estilo de configuración rápida", - "description": "Elige el estilo visual para los interruptores y controles de configuración rápida." - } - }, - "widgets": { - "section": { - "label": "Widgets", - "description": "Configura y gestiona los widgets del centro de control y sus opciones de visualización." - } - }, - "quickSettings": { - "sectionName": "Ajustes rápidos" - } - }, "hooks": { "title": "Hooks", "system-hooks": { @@ -804,6 +718,71 @@ "description": "• Hook de fondo de pantalla: $1 = ruta del fondo de pantalla, $2 = nombre de la pantalla\n• Hook de cambio de tema: $1 = true/false (estado del modo oscuro)" } } + }, + "control-center": { + "position": { + "description": "Elige dónde aparece el panel del Centro de control cuando se abre.", + "label": "Posición" + }, + "quickSettingsStyle": { + "section": { + "description": "Personaliza la apariencia y el comportamiento de los ajustes rápidos en el Centro de control.", + "label": "Estilo de configuración rápida" + }, + "style": { + "description": "Elige el estilo visual para los interruptores y controles de configuración rápida.", + "label": "Estilo de ajustes rápidos" + } + }, + "section": { + "description": "Configurar el posicionamiento y el comportamiento del panel del Centro de control.", + "label": "Apariencia" + }, + "title": "Centro de control", + "widgets": { + "section": { + "description": "Configurar y administrar los widgets del Centro de control y sus opciones de visualización.", + "label": "Widgets" + } + } + }, + "user-interface": { + "animation-disable": { + "description": "Desactiva todas las animaciones para una experiencia más rápida y con mayor capacidad de respuesta.", + "label": "Desactivar animaciones de la interfaz de usuario" + }, + "animation-speed": { + "description": "Ajustar la velocidad global de la animación.", + "label": "Velocidad de animación", + "reset": "Restablecer la velocidad de la animación" + }, + "border-radius": { + "description": "Controla la redondez de las esquinas de las ventanas, los botones y otros elementos.", + "label": "Radio de borde", + "reset": "Restablecer el radio del borde" + }, + "compact-lockscreen": { + "description": "Mostrar solo el campo de inicio de sesión y los controles del sistema, ocultando los widgets del clima y multimedia.", + "label": "Pantalla de bloqueo compacta" + }, + "dim-desktop": { + "description": "Atenuar el escritorio cuando los paneles o menús estén abiertos.", + "label": "Dim escritorio" + }, + "scaling": { + "description": "Cambia el tamaño de la interfaz de usuario general, excluyendo la barra.", + "label": "Escalado de la interfaz", + "reset-scaling": "Restablecer el escalado de la interfaz" + }, + "section": { + "description": "Personaliza la apariencia, el ambiente y el comportamiento de la interfaz.", + "label": "Apariencia" + }, + "title": "Interfaz de usuario", + "tooltips": { + "description": "Activar o desactivar los avisos emergentes en toda la interfaz.", + "label": "Mostrar sugerencias" + } } }, "widgets": { diff --git a/Assets/Translations/fr.json b/Assets/Translations/fr.json index 2831d34f7..6f4e94d7c 100644 --- a/Assets/Translations/fr.json +++ b/Assets/Translations/fr.json @@ -13,43 +13,6 @@ }, "select-avatar": "Sélectionner une image d'avatar" }, - "ui": { - "section": { - "label": "Interface utilisateur", - "description": "Personnalisez l'apparence, l'ergonomie et le comportement de l'interface." - }, - "tooltips": { - "label": "Afficher les tooltips", - "description": "Activer ou désactiver les tooltips dans toute l'interface." - }, - "dim-desktop": { - "label": "Assombrir le bureau", - "description": "Assombrir le bureau lorsque des panneaux ou des menus sont ouverts." - }, - "compact-lockscreen": { - "label": "Écran de verrouillage compact", - "description": "Affiche uniquement la saisie de connexion et les contrôles système, masquant les widgets météo et média." - }, - "border-radius": { - "label": "Rayon de bordure", - "description": "Contrôle l'arrondi des coins des fenêtres, des boutons et d'autres éléments.", - "reset": "Réinitialiser le rayon de la bordure" - }, - "animation-speed": { - "label": "Vitesse d'animation", - "description": "Ajustez la vitesse globale des animations.", - "reset": "Réinitialiser la vitesse de l'animation" - }, - "animation-disable": { - "label": "Désactiver les animations de l'interface", - "description": "Désactiver toutes les animations pour une expérience plus rapide et réactive." - }, - "scaling": { - "description": "Modifie la taille de l'interface utilisateur générale, à l'exception de la barre.", - "label": "Mise à l'échelle de l'interface", - "reset-scaling": "Réinitialiser l'échelle de l'interface" - } - }, "screen-corners": { "section": { "label": "Coins de l'écran", @@ -95,33 +58,6 @@ } }, "reset-scaling": "Réinitialiser l'échelle" - }, - "control-center": { - "title": "Centre de contrôle", - "section": { - "label": "Centre de contrôle", - "description": "Configurer le positionnement et le comportement du panneau du centre de contrôle." - }, - "position": { - "label": "Position", - "description": "Choisissez où apparaît le panneau du centre de contrôle lors de l'ouverture." - }, - "quickSettingsStyle": { - "section": { - "label": "Style des paramètres rapides", - "description": "Personnalisez l'apparence et le comportement des paramètres rapides dans le centre de contrôle." - }, - "style": { - "label": "Style des paramètres rapides", - "description": "Choisissez le style visuel pour les commutateurs et contrôles des paramètres rapides." - } - }, - "widgets": { - "section": { - "label": "Widgets", - "description": "Configurez et gérez les widgets du centre de contrôle et leurs options d'affichage." - } - } } }, "audio": { @@ -750,28 +686,6 @@ } } }, - "control-center": { - "title": "Centre de contrôle", - "quickSettingsStyle": { - "section": { - "label": "Style des paramètres rapides", - "description": "Personnalisez l'apparence et le comportement des paramètres rapides dans le centre de contrôle." - }, - "style": { - "label": "Style des paramètres rapides", - "description": "Choisissez le style visuel pour les commutateurs et contrôles des paramètres rapides." - } - }, - "widgets": { - "section": { - "label": "Widgets", - "description": "Configurez et gérez les widgets du centre de contrôle et leurs options d'affichage." - } - }, - "quickSettings": { - "sectionName": "Paramètres rapides" - } - }, "hooks": { "title": "Hooks", "system-hooks": { @@ -804,6 +718,71 @@ "description": "• Hook Fond d'écran : $1 = chemin du fond d'écran, $2 = nom de l'écran\n• Hook de bascule de thème : $1 = true/false (état du mode sombre)" } } + }, + "control-center": { + "position": { + "description": "Choisissez où le panneau du Centre de contrôle apparaît lorsqu'il est ouvert.", + "label": "Position" + }, + "quickSettingsStyle": { + "section": { + "description": "Personnaliser l'apparence et le comportement des réglages rapides dans le Centre de contrôle.", + "label": "Style des paramètres rapides" + }, + "style": { + "description": "Choisissez le style visuel des bascules et des commandes des paramètres rapides.", + "label": "Style des paramètres rapides" + } + }, + "section": { + "description": "Configurer le positionnement et le comportement du panneau du Centre de contrôle.", + "label": "Apparence" + }, + "title": "Centre de contrôle", + "widgets": { + "section": { + "description": "Configurer et gérer les widgets du Centre de contrôle et leurs options d'affichage.", + "label": "Widgets" + } + } + }, + "user-interface": { + "animation-disable": { + "description": "Désactiver toutes les animations pour une expérience plus rapide et plus réactive.", + "label": "Désactiver les animations de l'interface utilisateur" + }, + "animation-speed": { + "description": "Ajuster la vitesse globale de l'animation.", + "label": "Vitesse d'animation", + "reset": "Réinitialiser la vitesse de l'animation" + }, + "border-radius": { + "description": "Contrôle l'arrondi des angles des fenêtres, des boutons et d'autres éléments.", + "label": "Rayon de bordure", + "reset": "Réinitialiser le rayon de la bordure" + }, + "compact-lockscreen": { + "description": "Afficher uniquement le champ de saisie de connexion et les commandes système, en masquant les widgets météo et multimédia.", + "label": "Écran de verrouillage compact" + }, + "dim-desktop": { + "description": "Atténuer le bureau lorsque des panneaux ou des menus sont ouverts.", + "label": "Dim bureau" + }, + "scaling": { + "description": "Modifie la taille de l'interface utilisateur générale, à l'exception de la barre.", + "label": "Mise à l'échelle de l'interface", + "reset-scaling": "Réinitialiser l'échelle de l'interface" + }, + "section": { + "description": "Personnaliser l'apparence, l'ergonomie et le comportement de l'interface.", + "label": "Apparence" + }, + "title": "Interface utilisateur", + "tooltips": { + "description": "Activer ou désactiver les info-bulles dans toute l'interface.", + "label": "Afficher les infobulles" + } } }, "widgets": { diff --git a/Assets/Translations/pt.json b/Assets/Translations/pt.json index e1f035411..d6e200d83 100644 --- a/Assets/Translations/pt.json +++ b/Assets/Translations/pt.json @@ -13,43 +13,6 @@ }, "select-avatar": "Selecionar imagem de avatar" }, - "ui": { - "section": { - "label": "Interface do usuário", - "description": "Personalize a aparência, a sensação e o comportamento da interface." - }, - "tooltips": { - "label": "Mostrar tooltips", - "description": "Ativar ou desativar tooltips em toda a interface." - }, - "dim-desktop": { - "label": "Escurecer área de trabalho", - "description": "Escurece a área de trabalho quando painéis ou menus estão abertos." - }, - "compact-lockscreen": { - "label": "Tela de bloqueio compacta", - "description": "Mostra apenas a entrada de login e controles do sistema, ocultando widgets de clima e mídia." - }, - "border-radius": { - "label": "Raio da borda", - "description": "Controla o arredondamento dos cantos de janelas, botões e outros elementos.", - "reset": "Redefinir raio da borda" - }, - "animation-speed": { - "label": "Velocidade da animação", - "description": "Ajuste a velocidade global da animação.", - "reset": "Redefinir velocidade da animação" - }, - "animation-disable": { - "label": "Desativar animações da interface", - "description": "Desativar todas as animações para uma experiência mais rápida e responsiva." - }, - "scaling": { - "description": "Altera o tamanho da interface geral do usuário, excluindo a barra.", - "label": "Escalonamento da interface", - "reset-scaling": "Redefinir escala da interface" - } - }, "screen-corners": { "section": { "label": "Cantos da tela", @@ -95,33 +58,6 @@ } }, "reset-scaling": "Redefinir escala" - }, - "control-center": { - "title": "Centro de controle", - "section": { - "label": "Centro de controle", - "description": "Configurar o posicionamento e comportamento do painel do centro de controle." - }, - "position": { - "label": "Posição", - "description": "Escolha onde o painel do centro de controle aparece quando aberto." - }, - "quickSettingsStyle": { - "section": { - "label": "Estilo de configurações rápidas", - "description": "Personalize a aparência e o comportamento das configurações rápidas no centro de controle." - }, - "style": { - "label": "Estilo de configurações rápidas", - "description": "Escolha o estilo visual para os interruptores e controles de configurações rápidas." - } - }, - "widgets": { - "section": { - "label": "Widgets", - "description": "Configure e gerencie os widgets do centro de controle e suas opções de exibição." - } - } } }, "audio": { @@ -712,28 +648,6 @@ } } }, - "control-center": { - "title": "Centro de controle", - "quickSettingsStyle": { - "section": { - "label": "Estilo de configurações rápidas", - "description": "Personalize a aparência e o comportamento das configurações rápidas no centro de controle." - }, - "style": { - "label": "Estilo de configurações rápidas", - "description": "Escolha o estilo visual para os interruptores e controles de configurações rápidas." - } - }, - "widgets": { - "section": { - "label": "Widgets", - "description": "Configure e gerencie os widgets do centro de controle e suas opções de exibição." - } - }, - "quickSettings": { - "sectionName": "Configurações rápidas" - } - }, "hooks": { "title": "Hooks", "system-hooks": { @@ -804,6 +718,71 @@ "description": "Mostrar a OSD em monitores específicos. Padrão é todos se nenhum for escolhido." } } + }, + "control-center": { + "position": { + "description": "Escolha onde o painel da Central de Controle aparece quando aberto.", + "label": "Posição" + }, + "quickSettingsStyle": { + "section": { + "description": "Personalize a aparência e o comportamento das configurações rápidas na Central de Controle.", + "label": "Estilo das Configurações Rápidas" + }, + "style": { + "description": "Escolha o estilo visual para as opções e controles de configurações rápidas.", + "label": "Estilo das Configurações Rápidas" + } + }, + "section": { + "description": "Configurar o posicionamento e o comportamento do painel da Central de Controle.", + "label": "Aparência" + }, + "title": "Central de Controle", + "widgets": { + "section": { + "description": "Configure e gerencie widgets da Central de Controle e suas opções de exibição.", + "label": "Widgets" + } + } + }, + "user-interface": { + "animation-disable": { + "description": "Desative todas as animações para uma experiência mais rápida e responsiva.", + "label": "Desativar animações da interface do usuário" + }, + "animation-speed": { + "description": "Ajustar a velocidade global da animação.", + "label": "Velocidade da animação", + "reset": "Redefinir velocidade da animação" + }, + "border-radius": { + "description": "Controla o arredondamento dos cantos de janelas, botões e outros elementos.", + "label": "Raio da borda", + "reset": "Redefinir raio da borda" + }, + "compact-lockscreen": { + "description": "Mostrar apenas a entrada de login e os controles do sistema, ocultando widgets de clima e mídia.", + "label": "Tela de bloqueio compacta" + }, + "dim-desktop": { + "description": "Escurecer a área de trabalho quando painéis ou menus estiverem abertos.", + "label": "Dim área de trabalho" + }, + "scaling": { + "description": "Altera o tamanho da interface geral do usuário, excluindo a barra.", + "label": "Escalonamento da interface", + "reset-scaling": "Redefinir escala da interface" + }, + "section": { + "description": "Personalize a aparência, a sensação e o comportamento da interface.", + "label": "Aparência" + }, + "title": "Interface do usuário", + "tooltips": { + "description": "Ativar ou desativar dicas de ferramentas em toda a interface.", + "label": "Mostrar dicas de ferramenta" + } } }, "widgets": { diff --git a/Assets/Translations/zh-CN.json b/Assets/Translations/zh-CN.json index 85db3559d..f01c2577d 100644 --- a/Assets/Translations/zh-CN.json +++ b/Assets/Translations/zh-CN.json @@ -13,43 +13,6 @@ }, "select-avatar": "选择头像图片" }, - "ui": { - "section": { - "label": "用户界面", - "description": "自定义界面的外观、风格和行为。" - }, - "tooltips": { - "label": "显示工具提示", - "description": "在整个界面中启用或禁用工具提示。" - }, - "dim-desktop": { - "label": "调暗桌面", - "description": "当面板或菜单打开时调暗桌面。" - }, - "compact-lockscreen": { - "label": "紧凑锁屏", - "description": "仅显示登录输入和系统控件，隐藏天气和媒体小部件。" - }, - "border-radius": { - "label": "边框圆角", - "description": "控制窗口、按钮及其他元素的边角圆度。", - "reset": "重置边框半径" - }, - "animation-speed": { - "label": "动画速度", - "description": "调整全局动画速度。", - "reset": "重置动画速度" - }, - "animation-disable": { - "label": "关闭动画", - "description": "禁用所有动画效果，以获得更快速、更灵敏的体验。" - }, - "scaling": { - "description": "更改常规用户界面（不包括栏）的大小。", - "label": "界面缩放", - "reset-scaling": "重置界面缩放" - } - }, "screen-corners": { "section": { "label": "屏幕边角", @@ -95,33 +58,6 @@ "description": "增大或减小等宽文本的尺寸" } } - }, - "control-center": { - "title": "控制中心", - "section": { - "label": "控制中心", - "description": "配置控制中心面板的定位和行为。" - }, - "position": { - "label": "位置", - "description": "选择控制中心面板打开时出现的位置。" - }, - "quickSettingsStyle": { - "section": { - "label": "快速设置样式", - "description": "自定义控制中心中快速设置的外观和行为。" - }, - "style": { - "label": "快速设置样式", - "description": "选择快速设置开关和控件的视觉样式。" - } - }, - "widgets": { - "section": { - "label": "小部件", - "description": "配置和管理控制中心小部件及其显示选项。" - } - } } }, "audio": { @@ -750,28 +686,6 @@ } } }, - "control-center": { - "title": "控制中心", - "quickSettingsStyle": { - "section": { - "label": "快速设置样式", - "description": "自定义控制中心中快速设置的外观和行为。" - }, - "style": { - "label": "快速设置样式", - "description": "选择快速设置开关和控件的视觉样式。" - } - }, - "widgets": { - "section": { - "label": "小部件", - "description": "配置和管理控制中心小部件及其显示选项。" - } - }, - "quickSettings": { - "sectionName": "快速设置" - } - }, "hooks": { "title": "钩子", "system-hooks": { @@ -804,6 +718,71 @@ "description": "• 壁纸钩子: $1 = 壁纸路径, $2 = 屏幕名称\n• 主题切换钩子: $1 = true/false (深色模式状态)" } } + }, + "control-center": { + "position": { + "description": "选择打开控制中心时面板出现的位置。", + "label": "位置" + }, + "quickSettingsStyle": { + "section": { + "description": "自定义控制中心中快速设置的外观和行为。", + "label": "快速设置样式" + }, + "style": { + "description": "选择快速设置开关和控件的视觉样式。", + "label": "快速设置样式" + } + }, + "section": { + "description": "配置控制中心面板的位置和行为。", + "label": "外观" + }, + "title": "控制中心", + "widgets": { + "section": { + "description": "配置和管理控制中心小组件及其显示选项。", + "label": "小部件" + } + } + }, + "user-interface": { + "animation-disable": { + "description": "禁用所有动画以获得更快、更流畅的体验。", + "label": "禁用 UI 动画" + }, + "animation-speed": { + "description": "调整全局动画速度。", + "label": "动画速度", + "reset": "重置动画速度" + }, + "border-radius": { + "description": "控制窗口、按钮和其他元素的圆角程度。", + "label": "边框半径", + "reset": "重置边框半径" + }, + "compact-lockscreen": { + "description": "仅显示登录输入和系统控制，隐藏天气和媒体小部件。", + "label": "紧凑型锁屏" + }, + "dim-desktop": { + "description": "当面板或菜单打开时，桌面变暗。", + "label": "昏暗的桌面" + }, + "scaling": { + "description": "更改通用用户界面大小，不包括栏。", + "label": "界面缩放", + "reset-scaling": "重置界面缩放" + }, + "section": { + "description": "自定义界面的外观、感觉和行为。", + "label": "外观" + }, + "title": "用户界面", + "tooltips": { + "description": "启用或禁用整个界面的工具提示。", + "label": "显示工具提示" + } } }, "widgets": { diff --git a/Bin/dev/i18n-json-check.sh b/Bin/dev/i18n-json.sh similarity index 99% rename from Bin/dev/i18n-json-check.sh rename to Bin/dev/i18n-json.sh index a847d66c4..0db1585b7 100755 --- a/Bin/dev/i18n-json-check.sh +++ b/Bin/dev/i18n-json.sh @@ -123,13 +123,13 @@ EOF # Make API call to Gemini local api_url="https://generativelanguage.googleapis.com/v1beta/models/gemini-2.0-flash:generateContent?key=${api_key}" - print_color $BLUE " API URL: $api_url" >&2 + # print_color $BLUE " API URL: $api_url" >&2 local response=$(curl -s -X POST "$api_url" \ -H "Content-Type: application/json" \ -d "$request_body" 2>/dev/null) - print_color $BLUE " API Response: $response" >&2 + # print_color $BLUE " API Response: $response" >&2 # Extract the translation from response - try multiple parsing approaches local translation=$(echo "$response" | jq -r '.candidates[0].content.parts[0].text // .text // empty' 2>/dev/null | sed 's/^[[:space:]]*//;s/[[:space:]]*$//') diff --git a/Commons/TablerIcons.qml b/Commons/TablerIcons.qml index 39743adba..3522e30df 100644 --- a/Commons/TablerIcons.qml +++ b/Commons/TablerIcons.qml @@ -101,7 +101,9 @@ Singleton { "brightness-low": "brightness-down-filled", "brightness-high": "brightness-up-filled", "settings-general": "adjustments-horizontal", - "settings-bar": "capsule-horizontal", + "settings-bar": "crop-16-9", + "settings-user-interface": "layout-board", + "settings-control-center": "adjustments-horizontal", "settings-dock": "layout-bottombar", "settings-launcher": "rocket", "settings-audio": "device-speaker", diff --git a/Modules/Bar/Widgets/MediaMini.qml b/Modules/Bar/Widgets/MediaMini.qml index fb1f9d332..e916dda9f 100644 --- a/Modules/Bar/Widgets/MediaMini.qml +++ b/Modules/Bar/Widgets/MediaMini.qml @@ -173,8 +173,8 @@ Item { spacing: 0 Item { - Layout.preferredWidth: 21 - Layout.preferredHeight: 21 + Layout.preferredWidth: Math.round(21 * Style.uiScaleRatio) + Layout.preferredHeight: Math.round(21 * Style.uiScaleRatio) NImageCircled { id: trackArt diff --git a/Modules/ControlCenter/Cards/ProfileCard.qml b/Modules/ControlCenter/Cards/ProfileCard.qml index 0da32c379..7c8911825 100644 --- a/Modules/ControlCenter/Cards/ProfileCard.qml +++ b/Modules/ControlCenter/Cards/ProfileCard.qml @@ -25,8 +25,8 @@ NBox { spacing: Style.marginM NImageCircled { - width: Math.round(Style.baseWidgetSize * 1.25 * Style.uiScaleRatio) - height: width + Layout.preferredWidth: Math.round(Style.baseWidgetSize * 1.25 * Style.uiScaleRatio) + Layout.preferredHeight: Math.round(Style.baseWidgetSize * 1.25 * Style.uiScaleRatio) imagePath: Settings.preprocessPath(Settings.data.general.avatarImage) fallbackIcon: "person" borderColor: Color.mPrimary diff --git a/Modules/ControlCenter/Cards/TopCard.qml b/Modules/ControlCenter/Cards/TopCard.qml deleted file mode 100644 index 62eae416f..000000000 --- a/Modules/ControlCenter/Cards/TopCard.qml +++ /dev/null @@ -1,156 +0,0 @@ -import QtQuick -import QtQuick.Effects -import QtQuick.Layouts -import Quickshell -import Quickshell.Io -import Quickshell.Widgets -import qs.Modules.Settings -import qs.Modules.ControlCenter -import qs.Modules.ControlCenter.Extras -import qs.Commons -import qs.Services -import qs.Widgets - -// Header card with avatar, user and quick actions -NBox { - id: root - - property string uptimeText: "--" - property real spacing: Style.marginS - - ColumnLayout { - anchors.fill: parent - anchors.margins: Style.marginM - - // Profile, Uptime, Settings, SessionMenu, Close - RowLayout { - id: content - - spacing: root.spacing - Layout.alignment: Qt.AlignVCenter - - NImageCircled { - width: Style.baseWidgetSize * 1.25 - height: width - imagePath: Settings.preprocessPath(Settings.data.general.avatarImage) - fallbackIcon: "person" - borderColor: Color.mPrimary - borderWidth: Math.max(1, Style.borderM) - Layout.alignment: Qt.AlignVCenter - Layout.topMargin: Style.marginXS - } - - ColumnLayout { - Layout.fillWidth: true - spacing: Style.marginXXS - NText { - text: Quickshell.env("USER") || "user" - font.weight: Style.fontWeightBold - font.capitalization: Font.Capitalize - } - NText { - text: I18n.tr("system.uptime", { - "uptime": uptimeText - }) - pointSize: Style.fontSizeXS - color: Color.mOnSurfaceVariant - } - } - - Item { - Layout.fillWidth: true - } - - RowLayout { - spacing: root.spacing - Layout.alignment: Qt.AlignRight | Qt.AlignVCenter - - NIconButton { - baseSize: Style.baseWidgetSize * 0.9 - icon: "settings" - tooltipText: I18n.tr("tooltips.open-settings") - onClicked: { - settingsPanel.requestedTab = SettingsPanel.Tab.General - settingsPanel.open() - } - } - - NIconButton { - baseSize: Style.baseWidgetSize * 0.9 - icon: "power" - tooltipText: I18n.tr("tooltips.session-menu") - onClicked: { - sessionMenuPanel.open() - controlCenterPanel.close() - } - } - - NIconButton { - baseSize: Style.baseWidgetSize * 0.9 - icon: "close" - tooltipText: I18n.tr("tooltips.close") - onClicked: { - controlCenterPanel.close() - } - } - } - } - - NDivider { - Layout.fillWidth: true - Layout.topMargin: Style.marginS - Layout.bottomMargin: Style.marginS - } - - GridLayout { - id: grid - Layout.fillWidth: true - columns: (Settings.data.controlCenter.quickSettingsStyle === "compact") ? 4 : 3 - columnSpacing: Style.marginS - rowSpacing: Style.marginS - - Repeater { - model: Settings.data.controlCenter.widgets.quickSettings - delegate: ControlCenterWidgetLoader { - Layout.fillWidth: true - widgetId: (modelData.id !== undefined ? modelData.id : "") - widgetProps: { - "screen": root.modelData || null, - "widgetId": modelData.id, - "section": "quickSettings", - "sectionWidgetIndex": index, - "sectionWidgetsCount": Settings.data.controlCenter.widgets.quickSettings.length - } - Layout.alignment: Qt.AlignVCenter - } - } - } - } - - // ---------------------------------- - // Uptime - Timer { - interval: 60000 - repeat: true - running: true - onTriggered: uptimeProcess.running = true - } - - Process { - id: uptimeProcess - command: ["cat", "/proc/uptime"] - running: true - - stdout: StdioCollector { - onStreamFinished: { - var uptimeSeconds = parseFloat(this.text.trim().split(' ')[0]) - uptimeText = Time.formatVagueHumanReadableDuration(uptimeSeconds) - uptimeProcess.running = false - } - } - } - - function updateSystemInfo() { - uptimeProcess.running = true - } -} diff --git a/Modules/LockScreen/LockScreen.qml b/Modules/LockScreen/LockScreen.qml index e97cb3fe4..247bf68bb 100644 --- a/Modules/LockScreen/LockScreen.qml +++ b/Modules/LockScreen/LockScreen.qml @@ -296,8 +296,8 @@ Loader { NImageCircled { anchors.centerIn: parent - width: 66 - height: 66 + Layout.preferredWidth: 66 + Layout.preferredHeight: 66 imagePath: Settings.preprocessPath(Settings.data.general.avatarImage) fallbackIcon: "person" diff --git a/Modules/Notification/Notification.qml b/Modules/Notification/Notification.qml index fc9831f43..a8c9bc209 100644 --- a/Modules/Notification/Notification.qml +++ b/Modules/Notification/Notification.qml @@ -313,8 +313,8 @@ Variants { // For real-time notification always show the original image // as the cached version is most likely still processing. NImageCircled { - Layout.preferredWidth: 40 - Layout.preferredHeight: 40 + Layout.preferredWidth: Math.round(40 * Style.uiScaleRatio) + Layout.preferredHeight: Math.round(40 * Style.uiScaleRatio) Layout.alignment: Qt.AlignTop Layout.topMargin: 30 imagePath: model.originalImage || "" diff --git a/Modules/Notification/NotificationHistoryPanel.qml b/Modules/Notification/NotificationHistoryPanel.qml index 4615b3a65..8bf5583f5 100644 --- a/Modules/Notification/NotificationHistoryPanel.qml +++ b/Modules/Notification/NotificationHistoryPanel.qml @@ -185,8 +185,8 @@ NPanel { ColumnLayout { NImageCircled { - Layout.preferredWidth: 40 - Layout.preferredHeight: 40 + Layout.preferredWidth: Math.round(40 * Style.uiScaleRatio) + Layout.preferredHeight: Math.round(40 * Style.uiScaleRatio) Layout.alignment: Qt.AlignTop Layout.topMargin: 20 imagePath: model.cachedImage || model.originalImage || "" diff --git a/Modules/OSD/OSD.qml b/Modules/OSD/OSD.qml index 344302510..23c63a0bf 100644 --- a/Modules/OSD/OSD.qml +++ b/Modules/OSD/OSD.qml @@ -146,8 +146,8 @@ Variants { return 0 var base = Style.marginM if (Settings.data.bar.position === "top") { - var floatExtraV = Settings.data.bar.floating ? Settings.data.bar.marginVertical * Style.marginXL : 0 - return Style.barHeight+ base + floatExtraV + var floatExtraV = Settings.data.bar.floating ? Settings.data.bar.marginVertical * Style.marginXL : 0 + return Style.barHeight + base + floatExtraV } return base } @@ -335,7 +335,7 @@ Variants { ColumnLayout { // Ensure inner padding respects the rounded corners; avoid clipping the icon/text - property int vMargin:{ + property int vMargin: { const styleMargin = Style.marginL const cornerGuard = Math.round(osdItem.radius) return Math.max(styleMargin, cornerGuard) @@ -574,4 +574,4 @@ Variants { } } } -} \ No newline at end of file +} diff --git a/Modules/Settings/Bar/WidgetSettings/ControlCenterSettings.qml b/Modules/Settings/Bar/WidgetSettings/ControlCenterSettings.qml index 07076949d..2c0383e26 100644 --- a/Modules/Settings/Bar/WidgetSettings/ControlCenterSettings.qml +++ b/Modules/Settings/Bar/WidgetSettings/ControlCenterSettings.qml @@ -49,11 +49,11 @@ ColumnLayout { } NImageCircled { + Layout.preferredWidth: Style.fontSizeXL * 2 + Layout.preferredHeight: Style.fontSizeXL * 2 Layout.alignment: Qt.AlignVCenter imagePath: valueCustomIconPath visible: valueCustomIconPath !== "" - width: Style.fontSizeXL * 2 - height: Style.fontSizeXL * 2 } NIcon { diff --git a/Modules/Settings/SettingsPanel.qml b/Modules/Settings/SettingsPanel.qml index 9beb0f456..d0802de6b 100644 --- a/Modules/Settings/SettingsPanel.qml +++ b/Modules/Settings/SettingsPanel.qml @@ -18,7 +18,6 @@ NPanel { panelAnchorHorizontalCenter: true panelAnchorVerticalCenter: true - panelKeyboardFocus: true draggable: !PanelService.hasOpenedPopup @@ -40,6 +39,7 @@ NPanel { Network, Notifications, ScreenRecorder, + UserInterface, Wallpaper } @@ -116,7 +116,10 @@ NPanel { id: controlCenterTab ControlCenterTab {} } - + Component { + id: userInterfaceTab + UserInterfaceTab {} + } // Order *DOES* matter function updateTabsModel() { let newTabs = [{ @@ -124,18 +127,22 @@ NPanel { "label": "settings.general.title", "icon": "settings-general", "source": generalTab + }, { + "id": SettingsPanel.Tab.UserInterface, + "label": "settings.user-interface.title", + "icon": "settings-user-interface", + "source": userInterfaceTab }, { "id": SettingsPanel.Tab.Bar, "label": "settings.bar.title", "icon": "settings-bar", "source": barTab - }, //{ - // "id": SettingsPanel.Tab.ControlCenter, - // "label": "settings.control-center.title", - // "icon": "settings-bar", - // "source": controlCenterTab - //}, - { + }, { + "id": SettingsPanel.Tab.ControlCenter, + "label": "settings.control-center.title", + "icon": "settings-control-center", + "source": controlCenterTab + }, { "id": SettingsPanel.Tab.Dock, "label": "settings.dock.title", "icon": "settings-dock", diff --git a/Modules/Settings/Tabs/AboutTab.qml b/Modules/Settings/Tabs/AboutTab.qml index 289eef329..cd5819f17 100644 --- a/Modules/Settings/Tabs/AboutTab.qml +++ b/Modules/Settings/Tabs/AboutTab.qml @@ -133,8 +133,8 @@ ColumnLayout { Item { Layout.alignment: Qt.AlignVCenter - Layout.preferredWidth: Style.baseWidgetSize * 2 - Layout.preferredHeight: Style.baseWidgetSize * 2 + Layout.preferredWidth: Style.baseWidgetSize * 2 * Style.uiScaleRatio + Layout.preferredHeight: Style.baseWidgetSize * 2 * Style.uiScaleRatio NImageCircled { imagePath: modelData.avatar_url || "" diff --git a/Modules/Settings/Tabs/ControlCenterTab.qml b/Modules/Settings/Tabs/ControlCenterTab.qml index b9cbfd50d..9ba335b69 100644 --- a/Modules/Settings/Tabs/ControlCenterTab.qml +++ b/Modules/Settings/Tabs/ControlCenterTab.qml @@ -27,34 +27,45 @@ ColumnLayout { } } - // Quick Settings Style Section ColumnLayout { spacing: Style.marginL Layout.fillWidth: true NHeader { - label: I18n.tr("settings.control-center.quickSettingsStyle.section.label") - description: I18n.tr("settings.control-center.quickSettingsStyle.section.description") + label: I18n.tr("settings.control-center.section.label") + description: I18n.tr("settings.control-center.section.description") } NComboBox { - id: quickSettingsStyle - label: I18n.tr("settings.control-center.quickSettingsStyle.style.label") - description: I18n.tr("settings.control-center.quickSettingsStyle.style.description") + id: controlCenterPosition + label: I18n.tr("settings.control-center.position.label") + description: I18n.tr("settings.control-center.position.description") Layout.fillWidth: true model: [{ - "key": "compact", - "name": I18n.tr("options.control-center.quickSettingsStyle.compact") + "key": "close_to_bar_button", + "name": I18n.tr("options.control-center.position.close_to_bar_button") }, { - "key": "classic", - "name": I18n.tr("options.control-center.quickSettingsStyle.classic") + "key": "top_left", + "name": I18n.tr("options.control-center.position.top_left") }, { - "key": "modern", - "name": I18n.tr("options.control-center.quickSettingsStyle.modern") + "key": "top_right", + "name": I18n.tr("options.control-center.position.top_right") + }, { + "key": "bottom_left", + "name": I18n.tr("options.control-center.position.bottom_left") + }, { + "key": "bottom_right", + "name": I18n.tr("options.control-center.position.bottom_right") + }, { + "key": "bottom_center", + "name": I18n.tr("options.control-center.position.bottom_center") + }, { + "key": "top_center", + "name": I18n.tr("options.control-center.position.top_center") }] - currentKey: Settings.data.controlCenter.quickSettingsStyle || "compact" + currentKey: Settings.data.controlCenter.position onSelected: function (key) { - Settings.data.controlCenter.quickSettingsStyle = key + Settings.data.controlCenter.position = key } } } @@ -65,47 +76,85 @@ ColumnLayout { Layout.bottomMargin: Style.marginXL } - // Widgets Management Section - ColumnLayout { - spacing: Style.marginXXS - Layout.fillWidth: true + // // Quick Settings Style Section + // ColumnLayout { + // spacing: Style.marginL + // Layout.fillWidth: true - NHeader { - label: I18n.tr("settings.control-center.widgets.section.label") - description: I18n.tr("settings.control-center.widgets.section.description") - } + // NHeader { + // label: I18n.tr("settings.control-center.quickSettingsStyle.section.label") + // description: I18n.tr("settings.control-center.quickSettingsStyle.section.description") + // } - // Bar Sections - ColumnLayout { - Layout.fillWidth: true - Layout.fillHeight: true - Layout.topMargin: Style.marginM - spacing: Style.marginM + // NComboBox { + // id: quickSettingsStyle + // label: I18n.tr("settings.control-center.quickSettingsStyle.style.label") + // description: I18n.tr("settings.control-center.quickSettingsStyle.style.description") + // Layout.fillWidth: true + // model: [{ + // "key": "compact", + // "name": I18n.tr("options.control-center.quickSettingsStyle.compact") + // }, { + // "key": "classic", + // "name": I18n.tr("options.control-center.quickSettingsStyle.classic") + // }, { + // "key": "modern", + // "name": I18n.tr("options.control-center.quickSettingsStyle.modern") + // }] + // currentKey: Settings.data.controlCenter.quickSettingsStyle || "compact" + // onSelected: function (key) { + // Settings.data.controlCenter.quickSettingsStyle = key + // } + // } + // } - // Quick Settings - SectionEditor { - sectionName: I18n.tr("settings.control-center.quickSettings.sectionName") - sectionId: "quickSettings" - settingsDialogComponent: "" - widgetRegistry: ControlCenterWidgetRegistry - widgetModel: Settings.data.controlCenter.widgets["quickSettings"] - availableWidgets: availableWidgets - enableMoveBetweenSections: false - onAddWidget: (widgetId, section) => _addWidgetToSection(widgetId, section) - onRemoveWidget: (section, index) => _removeWidgetFromSection(section, index) - onReorderWidget: (section, fromIndex, toIndex) => _reorderWidgetInSection(section, fromIndex, toIndex) - onUpdateWidgetSettings: (section, index, settings) => _updateWidgetSettingsInSection(section, index, settings) - onDragPotentialStarted: root.handleDragStart() - onDragPotentialEnded: root.handleDragEnd() - } - } - } + // NDivider { + // Layout.fillWidth: true + // Layout.topMargin: Style.marginXL + // Layout.bottomMargin: Style.marginXL + // } - NDivider { - Layout.fillWidth: true - Layout.topMargin: Style.marginXL - Layout.bottomMargin: Style.marginXL - } + // // Widgets Management Section + // ColumnLayout { + // spacing: Style.marginXXS + // Layout.fillWidth: true + + // NHeader { + // label: I18n.tr("settings.control-center.widgets.section.label") + // description: I18n.tr("settings.control-center.widgets.section.description") + // } + + // // Bar Sections + // ColumnLayout { + // Layout.fillWidth: true + // Layout.fillHeight: true + // Layout.topMargin: Style.marginM + // spacing: Style.marginM + + // // Quick Settings + // SectionEditor { + // sectionName: I18n.tr("settings.control-center.quickSettings.sectionName") + // sectionId: "quickSettings" + // settingsDialogComponent: "" + // widgetRegistry: ControlCenterWidgetRegistry + // widgetModel: Settings.data.controlCenter.widgets["quickSettings"] + // availableWidgets: availableWidgets + // enableMoveBetweenSections: false + // onAddWidget: (widgetId, section) => _addWidgetToSection(widgetId, section) + // onRemoveWidget: (section, index) => _removeWidgetFromSection(section, index) + // onReorderWidget: (section, fromIndex, toIndex) => _reorderWidgetInSection(section, fromIndex, toIndex) + // onUpdateWidgetSettings: (section, index, settings) => _updateWidgetSettingsInSection(section, index, settings) + // onDragPotentialStarted: root.handleDragStart() + // onDragPotentialEnded: root.handleDragEnd() + // } + // } + // } + + // NDivider { + // Layout.fillWidth: true + // Layout.topMargin: Style.marginXL + // Layout.bottomMargin: Style.marginXL + // } // --------------------------------- // Signal functions diff --git a/Modules/Settings/Tabs/GeneralTab.qml b/Modules/Settings/Tabs/GeneralTab.qml index 212829b08..c45541458 100644 --- a/Modules/Settings/Tabs/GeneralTab.qml +++ b/Modules/Settings/Tabs/GeneralTab.qml @@ -21,8 +21,8 @@ ColumnLayout { // Avatar preview NImageCircled { - width: 108 * Style.uiScaleRatio - height: 108 * Style.uiScaleRatio + Layout.preferredWidth: 88 * Style.uiScaleRatio + Layout.preferredHeight: width imagePath: Settings.preprocessPath(Settings.data.general.avatarImage) fallbackIcon: "person" borderColor: Color.mPrimary @@ -65,299 +65,6 @@ ColumnLayout { Layout.bottomMargin: Style.marginXL } - // User Interface - ColumnLayout { - spacing: Style.marginL - Layout.fillWidth: true - - NHeader { - label: I18n.tr("settings.general.ui.section.label") - description: I18n.tr("settings.general.ui.section.description") - } - - NToggle { - label: I18n.tr("settings.general.ui.dim-desktop.label") - description: I18n.tr("settings.general.ui.dim-desktop.description") - checked: Settings.data.general.dimDesktop - onToggled: checked => Settings.data.general.dimDesktop = checked - } - - ColumnLayout { - spacing: Style.marginXXS - Layout.fillWidth: true - - NLabel { - label: I18n.tr("settings.general.ui.scaling.label") - description: I18n.tr("settings.general.ui.scaling.description") - } - - RowLayout { - spacing: Style.marginL - Layout.fillWidth: true - - NValueSlider { - Layout.fillWidth: true - from: 0.8 - to: 1.2 - stepSize: 0.1 - value: Settings.data.general.scaleRatio - onMoved: value => Settings.data.general.scaleRatio = value - text: Math.floor(Settings.data.general.scaleRatio * 100) + "%" - } - - // Reset button container - Item { - Layout.preferredWidth: 30 * Style.uiScaleRatio - Layout.preferredHeight: 30 * Style.uiScaleRatio - - NIconButton { - icon: "refresh" - baseSize: Style.baseWidgetSize * 0.8 - tooltipText: I18n.tr("settings.general.ui.scaling.reset-scaling") - onClicked: Settings.data.general.scaleRatio = 1.0 - anchors.right: parent.right - anchors.verticalCenter: parent.verticalCenter - } - } - } - } - - NToggle { - label: I18n.tr("settings.general.ui.tooltips.label") - description: I18n.tr("settings.general.ui.tooltips.description") - checked: Settings.data.ui.tooltipsEnabled - onToggled: checked => Settings.data.ui.tooltipsEnabled = checked - } - - NToggle { - label: I18n.tr("settings.general.ui.compact-lockscreen.label") - description: I18n.tr("settings.general.ui.compact-lockscreen.description") - checked: Settings.data.general.compactLockScreen - onToggled: checked => Settings.data.general.compactLockScreen = checked - } - - ColumnLayout { - spacing: Style.marginXXS - Layout.fillWidth: true - - NLabel { - label: I18n.tr("settings.general.ui.border-radius.label") - description: I18n.tr("settings.general.ui.border-radius.description") - } - - RowLayout { - spacing: Style.marginL - Layout.fillWidth: true - - NValueSlider { - Layout.fillWidth: true - from: 0 - to: 1 - stepSize: 0.01 - value: Settings.data.general.radiusRatio - onMoved: value => Settings.data.general.radiusRatio = value - text: Math.floor(Settings.data.general.radiusRatio * 100) + "%" - } - - // Reset button container - Item { - Layout.preferredWidth: 30 * Style.uiScaleRatio - Layout.preferredHeight: 30 * Style.uiScaleRatio - - NIconButton { - icon: "refresh" - baseSize: Style.baseWidgetSize * 0.8 - tooltipText: I18n.tr("settings.general.ui.border-radius.reset") - onClicked: Settings.data.general.radiusRatio = 1.0 - anchors.right: parent.right - anchors.verticalCenter: parent.verticalCenter - } - } - } - } - - // Animation Speed - ColumnLayout { - spacing: Style.marginL - Layout.fillWidth: true - - NToggle { - label: I18n.tr("settings.general.ui.animation-disable.label") - description: I18n.tr("settings.general.ui.animation-disable.description") - checked: Settings.data.general.animationDisabled - onToggled: checked => Settings.data.general.animationDisabled = checked - } - - ColumnLayout { - spacing: Style.marginXXS - Layout.fillWidth: true - visible: !Settings.data.general.animationDisabled - - NLabel { - label: I18n.tr("settings.general.ui.animation-speed.label") - description: I18n.tr("settings.general.ui.animation-speed.description") - } - - RowLayout { - spacing: Style.marginL - Layout.fillWidth: true - - NValueSlider { - Layout.fillWidth: true - from: 0.1 - to: 2.0 - stepSize: 0.01 - value: Settings.data.general.animationSpeed - onMoved: value => Settings.data.general.animationSpeed = value - text: Math.round(Settings.data.general.animationSpeed * 100) + "%" - } - - // Reset button container - Item { - Layout.preferredWidth: 30 * Style.uiScaleRatio - Layout.preferredHeight: 30 * Style.uiScaleRatio - - NIconButton { - icon: "refresh" - baseSize: Style.baseWidgetSize * 0.8 - tooltipText: I18n.tr("settings.general.ui.animation-speed.reset") - onClicked: Settings.data.general.animationSpeed = 1.0 - anchors.right: parent.right - anchors.verticalCenter: parent.verticalCenter - } - } - } - } - } - } - - NDivider { - Layout.fillWidth: true - Layout.topMargin: Style.marginXL - Layout.bottomMargin: Style.marginXL - } - - // Dock - ColumnLayout { - spacing: Style.marginL - Layout.fillWidth: true - - NHeader { - label: I18n.tr("settings.general.screen-corners.section.label") - description: I18n.tr("settings.general.screen-corners.section.description") - } - - NToggle { - label: I18n.tr("settings.general.screen-corners.show-corners.label") - description: I18n.tr("settings.general.screen-corners.show-corners.description") - checked: Settings.data.general.showScreenCorners - onToggled: checked => Settings.data.general.showScreenCorners = checked - } - - NToggle { - label: I18n.tr("settings.general.screen-corners.solid-black.label") - description: I18n.tr("settings.general.screen-corners.solid-black.description") - checked: Settings.data.general.forceBlackScreenCorners - onToggled: checked => Settings.data.general.forceBlackScreenCorners = checked - } - - ColumnLayout { - spacing: Style.marginXXS - Layout.fillWidth: true - - NLabel { - label: I18n.tr("settings.general.screen-corners.radius.label") - description: I18n.tr("settings.general.screen-corners.radius.description") - } - - RowLayout { - spacing: Style.marginL - Layout.fillWidth: true - - NValueSlider { - Layout.fillWidth: true - from: 0 - to: 2 - stepSize: 0.01 - value: Settings.data.general.screenRadiusRatio - onMoved: value => Settings.data.general.screenRadiusRatio = value - text: Math.floor(Settings.data.general.screenRadiusRatio * 100) + "%" - } - - // Reset button container - Item { - Layout.preferredWidth: 30 * Style.uiScaleRatio - Layout.preferredHeight: 30 * Style.uiScaleRatio - - NIconButton { - icon: "refresh" - baseSize: Style.baseWidgetSize * 0.8 - tooltipText: I18n.tr("settings.general.screen-corners.radius.reset") - onClicked: Settings.data.general.screenRadiusRatio = 1.0 - anchors.right: parent.right - anchors.verticalCenter: parent.verticalCenter - } - } - } - } - } - - NDivider { - Layout.fillWidth: true - Layout.topMargin: Style.marginXL - Layout.bottomMargin: Style.marginXL - } - - // Control Center - ColumnLayout { - spacing: Style.marginL - Layout.fillWidth: true - - NHeader { - label: I18n.tr("settings.general.control-center.section.label") - description: I18n.tr("settings.general.control-center.section.description") - } - - NComboBox { - id: controlCenterPosition - label: I18n.tr("settings.general.control-center.position.label") - description: I18n.tr("settings.general.control-center.position.description") - Layout.fillWidth: true - model: [{ - "key": "close_to_bar_button", - "name": I18n.tr("options.control-center.position.close_to_bar_button") - }, { - "key": "top_left", - "name": I18n.tr("options.control-center.position.top_left") - }, { - "key": "top_right", - "name": I18n.tr("options.control-center.position.top_right") - }, { - "key": "bottom_left", - "name": I18n.tr("options.control-center.position.bottom_left") - }, { - "key": "bottom_right", - "name": I18n.tr("options.control-center.position.bottom_right") - }, { - "key": "bottom_center", - "name": I18n.tr("options.control-center.position.bottom_center") - }, { - "key": "top_center", - "name": I18n.tr("options.control-center.position.top_center") - }] - currentKey: Settings.data.controlCenter.position - onSelected: function (key) { - Settings.data.controlCenter.position = key - } - } - } - - NDivider { - Layout.fillWidth: true - Layout.topMargin: Style.marginXL - Layout.bottomMargin: Style.marginXL - } - // Fonts ColumnLayout { spacing: Style.marginL @@ -476,4 +183,10 @@ ColumnLayout { } } } + + NDivider { + Layout.fillWidth: true + Layout.topMargin: Style.marginXL + Layout.bottomMargin: Style.marginXL + } } diff --git a/Modules/Settings/Tabs/UserInterfaceTab.qml b/Modules/Settings/Tabs/UserInterfaceTab.qml new file mode 100644 index 000000000..13557c297 --- /dev/null +++ b/Modules/Settings/Tabs/UserInterfaceTab.qml @@ -0,0 +1,260 @@ +import QtQuick +import QtQuick.Controls +import QtQuick.Layouts +import Quickshell +import qs.Commons +import qs.Services +import qs.Widgets + +ColumnLayout { + id: root + + // User Interface + ColumnLayout { + spacing: Style.marginL + Layout.fillWidth: true + + NHeader { + label: I18n.tr("settings.user-interface.section.label") + description: I18n.tr("settings.user-interface.section.description") + } + + NToggle { + label: I18n.tr("settings.user-interface.dim-desktop.label") + description: I18n.tr("settings.user-interface.dim-desktop.description") + checked: Settings.data.general.dimDesktop + onToggled: checked => Settings.data.general.dimDesktop = checked + } + + NToggle { + label: I18n.tr("settings.user-interface.tooltips.label") + description: I18n.tr("settings.user-interface.tooltips.description") + checked: Settings.data.ui.tooltipsEnabled + onToggled: checked => Settings.data.ui.tooltipsEnabled = checked + } + + NToggle { + label: I18n.tr("settings.user-interface.compact-lockscreen.label") + description: I18n.tr("settings.user-interface.compact-lockscreen.description") + checked: Settings.data.general.compactLockScreen + onToggled: checked => Settings.data.general.compactLockScreen = checked + } + + NDivider { + Layout.fillWidth: true + Layout.topMargin: Style.marginL + Layout.bottomMargin: Style.marginL + } + + ColumnLayout { + spacing: Style.marginXXS + Layout.fillWidth: true + + NLabel { + label: I18n.tr("settings.user-interface.scaling.label") + description: I18n.tr("settings.user-interface.scaling.description") + } + + RowLayout { + spacing: Style.marginL + Layout.fillWidth: true + + NValueSlider { + Layout.fillWidth: true + from: 0.8 + to: 1.2 + stepSize: 0.05 + value: Settings.data.general.scaleRatio + onMoved: value => Settings.data.general.scaleRatio = value + text: Math.floor(Settings.data.general.scaleRatio * 100) + "%" + } + + // Reset button container + Item { + Layout.preferredWidth: 30 * Style.uiScaleRatio + Layout.preferredHeight: 30 * Style.uiScaleRatio + + NIconButton { + icon: "refresh" + baseSize: Style.baseWidgetSize * 0.8 + tooltipText: I18n.tr("settings.user-interface.scaling.reset-scaling") + onClicked: Settings.data.general.scaleRatio = 1.0 + anchors.right: parent.right + anchors.verticalCenter: parent.verticalCenter + } + } + } + } + + ColumnLayout { + spacing: Style.marginXXS + Layout.fillWidth: true + + NLabel { + label: I18n.tr("settings.user-interface.border-radius.label") + description: I18n.tr("settings.user-interface.border-radius.description") + } + + RowLayout { + spacing: Style.marginL + Layout.fillWidth: true + + NValueSlider { + Layout.fillWidth: true + from: 0 + to: 1 + stepSize: 0.01 + value: Settings.data.general.radiusRatio + onMoved: value => Settings.data.general.radiusRatio = value + text: Math.floor(Settings.data.general.radiusRatio * 100) + "%" + } + + // Reset button container + Item { + Layout.preferredWidth: 30 * Style.uiScaleRatio + Layout.preferredHeight: 30 * Style.uiScaleRatio + + NIconButton { + icon: "refresh" + baseSize: Style.baseWidgetSize * 0.8 + tooltipText: I18n.tr("settings.user-interface.border-radius.reset") + onClicked: Settings.data.general.radiusRatio = 1.0 + anchors.right: parent.right + anchors.verticalCenter: parent.verticalCenter + } + } + } + } + + // Animation Speed + ColumnLayout { + spacing: Style.marginL + Layout.fillWidth: true + + ColumnLayout { + spacing: Style.marginXXS + Layout.fillWidth: true + visible: !Settings.data.general.animationDisabled + + NLabel { + label: I18n.tr("settings.user-interface.animation-speed.label") + description: I18n.tr("settings.user-interface.animation-speed.description") + } + + RowLayout { + spacing: Style.marginL + Layout.fillWidth: true + + NValueSlider { + Layout.fillWidth: true + from: 0.1 + to: 2.0 + stepSize: 0.01 + value: Settings.data.general.animationSpeed + onMoved: value => Settings.data.general.animationSpeed = value + text: Math.round(Settings.data.general.animationSpeed * 100) + "%" + } + + // Reset button container + Item { + Layout.preferredWidth: 30 * Style.uiScaleRatio + Layout.preferredHeight: 30 * Style.uiScaleRatio + + NIconButton { + icon: "refresh" + baseSize: Style.baseWidgetSize * 0.8 + tooltipText: I18n.tr("settings.user-interface.animation-speed.reset") + onClicked: Settings.data.general.animationSpeed = 1.0 + anchors.right: parent.right + anchors.verticalCenter: parent.verticalCenter + } + } + } + } + + NToggle { + label: I18n.tr("settings.user-interface.animation-disable.label") + description: I18n.tr("settings.user-interface.animation-disable.description") + checked: Settings.data.general.animationDisabled + onToggled: checked => Settings.data.general.animationDisabled = checked + } + } + } + + NDivider { + Layout.fillWidth: true + Layout.topMargin: Style.marginXL + Layout.bottomMargin: Style.marginXL + } + + // Dock + ColumnLayout { + spacing: Style.marginL + Layout.fillWidth: true + + NHeader { + label: I18n.tr("settings.general.screen-corners.section.label") + description: I18n.tr("settings.general.screen-corners.section.description") + } + + NToggle { + label: I18n.tr("settings.general.screen-corners.show-corners.label") + description: I18n.tr("settings.general.screen-corners.show-corners.description") + checked: Settings.data.general.showScreenCorners + onToggled: checked => Settings.data.general.showScreenCorners = checked + } + + NToggle { + label: I18n.tr("settings.general.screen-corners.solid-black.label") + description: I18n.tr("settings.general.screen-corners.solid-black.description") + checked: Settings.data.general.forceBlackScreenCorners + onToggled: checked => Settings.data.general.forceBlackScreenCorners = checked + } + + ColumnLayout { + spacing: Style.marginXXS + Layout.fillWidth: true + + NLabel { + label: I18n.tr("settings.general.screen-corners.radius.label") + description: I18n.tr("settings.general.screen-corners.radius.description") + } + + RowLayout { + spacing: Style.marginL + Layout.fillWidth: true + + NValueSlider { + Layout.fillWidth: true + from: 0 + to: 2 + stepSize: 0.01 + value: Settings.data.general.screenRadiusRatio + onMoved: value => Settings.data.general.screenRadiusRatio = value + text: Math.floor(Settings.data.general.screenRadiusRatio * 100) + "%" + } + + // Reset button container + Item { + Layout.preferredWidth: 30 * Style.uiScaleRatio + Layout.preferredHeight: 30 * Style.uiScaleRatio + + NIconButton { + icon: "refresh" + baseSize: Style.baseWidgetSize * 0.8 + tooltipText: I18n.tr("settings.general.screen-corners.radius.reset") + onClicked: Settings.data.general.screenRadiusRatio = 1.0 + anchors.right: parent.right + anchors.verticalCenter: parent.verticalCenter + } + } + } + } + } + + NDivider { + Layout.fillWidth: true + Layout.topMargin: Style.marginXL + Layout.bottomMargin: Style.marginXL + } +} diff --git a/Widgets/NComboBox.qml b/Widgets/NComboBox.qml index 60dce4367..00f29bb1b 100644 --- a/Widgets/NComboBox.qml +++ b/Widgets/NComboBox.qml @@ -8,8 +8,8 @@ import qs.Widgets RowLayout { id: root - property real minimumWidth: 280 - property real popupHeight: 180 + property real minimumWidth: 280 * Style.uiScaleRatio + property real popupHeight: 180 * Style.uiScaleRatio property string label: "" property string description: "" @@ -17,7 +17,7 @@ RowLayout { property string currentKey: "" property string placeholder: "" - readonly property real preferredHeight: Style.baseWidgetSize * 1.1 + readonly property real preferredHeight: Style.baseWidgetSize * 1.1 * Style.uiScaleRatio signal selected(string key) diff --git a/Widgets/NSlider.qml b/Widgets/NSlider.qml index fb60bae33..e91ecdb8c 100644 --- a/Widgets/NSlider.qml +++ b/Widgets/NSlider.qml @@ -11,9 +11,9 @@ Slider { property bool snapAlways: true property real heightRatio: 0.7 - readonly property real knobDiameter: Math.round((Style.baseWidgetSize * heightRatio) / 2) * 2 - readonly property real trackHeight: Math.round((knobDiameter * 0.4) / 2) * 2 - readonly property real cutoutExtra: Math.round((Style.baseWidgetSize * 0.1) / 2) * 2 + readonly property real knobDiameter: Math.round((Style.baseWidgetSize * heightRatio * Style.uiScaleRatio) / 2) * 2 + readonly property real trackHeight: Math.round((knobDiameter * 0.4 * Style.uiScaleRatio) / 2) * 2 + readonly property real cutoutExtra: Math.round((Style.baseWidgetSize * 0.1 * Style.uiScaleRatio) / 2) * 2 padding: cutoutExtra / 2 diff --git a/Widgets/NTextInput.qml b/Widgets/NTextInput.qml index 5615d2f7e..adb83cd35 100644 --- a/Widgets/NTextInput.qml +++ b/Widgets/NTextInput.qml @@ -40,8 +40,8 @@ ColumnLayout { id: frameControl Layout.fillWidth: true - Layout.minimumWidth: 80 - implicitHeight: Style.baseWidgetSize * 1.1 + Layout.minimumWidth: 80 * Style.uiScaleRatio + implicitHeight: Style.baseWidgetSize * 1.1 * Style.uiScaleRatio // This is important - makes the control accept focus focusPolicy: Qt.StrongFocus @@ -131,7 +131,7 @@ ColumnLayout { background: null font.family: root.fontFamily - font.pointSize: root.fontSize + font.pointSize: root.fontSize * Style.uiScaleRatio font.weight: root.fontWeight onEditingFinished: root.editingFinished() diff --git a/Widgets/NToggle.qml b/Widgets/NToggle.qml index 822eca55a..18259ed67 100644 --- a/Widgets/NToggle.qml +++ b/Widgets/NToggle.qml @@ -11,7 +11,7 @@ RowLayout { property string description: "" property bool checked: false property bool hovering: false - property int baseSize: Math.round(Style.baseWidgetSize * 0.8) + property int baseSize: Math.round(Style.baseWidgetSize * 0.8 * Style.uiScaleRatio) signal toggled(bool checked) signal entered