fix(bar): simplified floating margins ui

This commit is contained in:
Lemmy
2026-03-08 12:57:54 -04:00
parent 3e89e17031
commit 4d07c8ad18
22 changed files with 88 additions and 103 deletions
+3 -3
View File
@@ -457,6 +457,7 @@
"lock": "Sperren",
"logout": "Abmelden",
"look": "Aussehen",
"margins": "Ränder",
"media": "Medien",
"media-player": "Medienplayer",
"memory": "Arbeitsspeicher",
@@ -834,9 +835,8 @@
"appearance-hide-on-overview-description": "Die Leiste ausblenden und Panels schließen, wenn die Compositor-Übersicht aktiv ist.",
"appearance-hide-on-overview-label": "Leiste in der Übersicht ausblenden",
"appearance-margins-description": "Ränder um die schwebende Leiste anpassen.",
"appearance-margins-horizontal": "Horizontal",
"appearance-margins-label": "Ränder",
"appearance-margins-vertical": "Vertikal",
"appearance-margins-horizontal": "Horizontaler Rand",
"appearance-margins-vertical": "Vertikaler Rand",
"appearance-outer-corners-description": "Nach außen gewölbte Ecken auf der Leiste anzeigen.",
"appearance-outer-corners-label": "Äußere Ecken",
"appearance-position-description": "Wählen Sie, wo die Leiste auf dem Bildschirm platziert werden soll.",
+3 -3
View File
@@ -457,6 +457,7 @@
"lock": "Lock",
"logout": "Logout",
"look": "Look",
"margins": "Margins",
"media": "Media",
"media-player": "Media Player",
"memory": "Memory",
@@ -834,9 +835,8 @@
"appearance-hide-on-overview-description": "Hide the bar and close panels when the compositor overview is active.",
"appearance-hide-on-overview-label": "Hide bar on overview",
"appearance-margins-description": "Adjust the margins around the floating bar.",
"appearance-margins-horizontal": "Horizontal",
"appearance-margins-label": "Margins",
"appearance-margins-vertical": "Vertical",
"appearance-margins-horizontal": "Horizontal Margin ",
"appearance-margins-vertical": "Vertical Margin",
"appearance-outer-corners-description": "Display outwardly curved corners on the bar.",
"appearance-outer-corners-label": "Outer corners",
"appearance-position-description": "Choose where to place the bar on the screen.",
+3 -3
View File
@@ -457,6 +457,7 @@
"lock": "Bloquear",
"logout": "Cerrar sesión",
"look": "Aspecto",
"margins": "Márgenes",
"media": "Medios",
"media-player": "Reproductor multimedia",
"memory": "Memoria",
@@ -834,9 +835,8 @@
"appearance-hide-on-overview-description": "Ocultar la barra y cerrar los paneles cuando la vista general del compositor esté activa.",
"appearance-hide-on-overview-label": "Ocultar barra en la vista general",
"appearance-margins-description": "Ajusta los márgenes alrededor de la barra flotante.",
"appearance-margins-horizontal": "Horizontal",
"appearance-margins-label": "Márgenes",
"appearance-margins-vertical": "Vertical",
"appearance-margins-horizontal": "Margen Horizontal",
"appearance-margins-vertical": "Margen Vertical",
"appearance-outer-corners-description": "Muestra esquinas curvadas hacia afuera en la barra.",
"appearance-outer-corners-label": "Esquinas exteriores",
"appearance-position-description": "Elige dónde colocar la barra en la pantalla.",
+3 -3
View File
@@ -457,6 +457,7 @@
"lock": "Verrouiller",
"logout": "Déconnexion",
"look": "Apparence",
"margins": "Marges",
"media": "Médias",
"media-player": "Lecteur multimédia",
"memory": "Mémoire",
@@ -834,9 +835,8 @@
"appearance-hide-on-overview-description": "Masquer la barre et fermer les panneaux lorsque l'aperçu du compositeur est actif.",
"appearance-hide-on-overview-label": "Masquer la barre dans l'aperçu",
"appearance-margins-description": "Ajustez les marges autour de la barre flottante.",
"appearance-margins-horizontal": "Horizontale",
"appearance-margins-label": "Marges",
"appearance-margins-vertical": "Verticale",
"appearance-margins-horizontal": "Marge Horizontale",
"appearance-margins-vertical": "Marge Verticale",
"appearance-outer-corners-description": "Afficher des coins incurvés vers l'extérieur sur la barre.",
"appearance-outer-corners-label": "Coins extérieurs",
"appearance-position-description": "Choisissez où placer la barre sur l'écran.",
+3 -3
View File
@@ -457,6 +457,7 @@
"lock": "Zárolás",
"logout": "Kijelentkezés",
"look": "Megjelenés",
"margins": "Margók",
"media": "Média",
"media-player": "Médialejátszó",
"memory": "Memória",
@@ -834,9 +835,8 @@
"appearance-hide-on-overview-description": "A sáv elrejtése és a panelek bezárása, amikor a kompozitor áttekintése aktív.",
"appearance-hide-on-overview-label": "Sáv elrejtése az áttekintésben",
"appearance-margins-description": "A lebegő sáv körüli margók.",
"appearance-margins-horizontal": "Vízszintes",
"appearance-margins-label": "Margók",
"appearance-margins-vertical": "Függőleges",
"appearance-margins-horizontal": "Vízszintes Margó",
"appearance-margins-vertical": "Függőleges Margó",
"appearance-outer-corners-description": "Megjelenít kifelé ívelt sarkokat a sávon.",
"appearance-outer-corners-label": "Külső sarkok",
"appearance-position-description": "A sáv a képernyőn való elhelyezése.",
+3 -3
View File
@@ -457,6 +457,7 @@
"lock": "Blocca",
"logout": "Disconnetti sessione",
"look": "Aspetto",
"margins": "Margini",
"media": "Media",
"media-player": "Lettore multimediale",
"memory": "Memoria",
@@ -834,9 +835,8 @@
"appearance-hide-on-overview-description": "Nascondi barra e chiudi pannelli quando loverview compositor è attiva.",
"appearance-hide-on-overview-label": "Nascondi barra in overview",
"appearance-margins-description": "Regola i margini attorno alla barra flottante.",
"appearance-margins-horizontal": "Orizzontale",
"appearance-margins-label": "Margini",
"appearance-margins-vertical": "Verticale",
"appearance-margins-horizontal": "Margine Orizzontale",
"appearance-margins-vertical": "Margine Verticale",
"appearance-outer-corners-description": "Mostra angoli curvati verso lesterno sulla barra.",
"appearance-outer-corners-label": "Angoli esterni",
"appearance-position-description": "Scegli dove posizionare la barra sullo schermo.",
+3 -3
View File
@@ -457,6 +457,7 @@
"lock": "ロック",
"logout": "ログアウト",
"look": "外観",
"margins": "余白",
"media": "メディア",
"media-player": "メディアプレーヤー",
"memory": "メモリ",
@@ -834,9 +835,8 @@
"appearance-hide-on-overview-description": "コンポジタの概要がアクティブなときは、バーを非表示にしてパネルを閉じます。",
"appearance-hide-on-overview-label": "概要のバーを非表示にする",
"appearance-margins-description": "フローティングバーの周囲の余白を調整します。",
"appearance-margins-horizontal": "水平方向",
"appearance-margins-label": "余白",
"appearance-margins-vertical": "垂直方向",
"appearance-margins-horizontal": "水平マージン",
"appearance-margins-vertical": "垂直マージン",
"appearance-outer-corners-description": "バーの角に、外向きの丸み(装飾)を表示します。",
"appearance-outer-corners-label": "外側のコーナー",
"appearance-position-description": "画面上のバーの配置場所を選択します。",
+3 -3
View File
@@ -457,6 +457,7 @@
"lock": "잠금",
"logout": "로그아웃",
"look": "외관",
"margins": "여백",
"media": "미디어",
"media-player": "미디어 재생기",
"memory": "메모리",
@@ -834,9 +835,8 @@
"appearance-hide-on-overview-description": "컴포지터 개요(Overview)가 활성 상태일 때 바를 숨기고 패널을 닫습니다.",
"appearance-hide-on-overview-label": "개요에서 바 숨기기",
"appearance-margins-description": "플로팅 바 주위의 여백을 조정합니다.",
"appearance-margins-horizontal": "수평",
"appearance-margins-label": "여백",
"appearance-margins-vertical": "수직",
"appearance-margins-horizontal": "수평 여백",
"appearance-margins-vertical": "수직 여백",
"appearance-outer-corners-description": "바에 바깥쪽으로 굽은 모서리를 표시합니다.",
"appearance-outer-corners-label": "외부 모서리",
"appearance-position-description": "화면에서 바를 배치할 위치를 선택하세요.",
+1 -1
View File
@@ -413,6 +413,7 @@
"lock": "Kilît bike",
"logout": "Derkeve",
"look": "Xuyang",
"margins": "Qirax",
"media": "Medya",
"media-player": "Lîstikvanê medyayê",
"memory": "Bîr",
@@ -757,7 +758,6 @@
"appearance-hide-on-overview-label": "Li ser dîtinê bar veşêre",
"appearance-margins-description": "Marginên dora bara herikbar eyar bike.",
"appearance-margins-horizontal": "Asoyî",
"appearance-margins-label": "Qirax",
"appearance-margins-vertical": "Stûnî",
"appearance-outer-corners-description": "Goşeyên derveyî yên çemandî li ser barî nîşan bide.",
"appearance-outer-corners-label": "Goşeyên derve",
+3 -3
View File
@@ -457,6 +457,7 @@
"lock": "Vergrendelen",
"logout": "Uitloggen",
"look": "Uiterlijk",
"margins": "Marges",
"media": "Media",
"media-player": "Mediaplayer",
"memory": "Geheugen",
@@ -834,9 +835,8 @@
"appearance-hide-on-overview-description": "Verberg de balk en sluit panelen wanneer het compositoroverzicht actief is.",
"appearance-hide-on-overview-label": "Balk verbergen in overzicht",
"appearance-margins-description": "Pas de marges rond de zwevende balk aan.",
"appearance-margins-horizontal": "Horizontaal",
"appearance-margins-label": "Marges",
"appearance-margins-vertical": "Verticaal",
"appearance-margins-horizontal": "Horizontale Marge",
"appearance-margins-vertical": "Verticale Marge",
"appearance-outer-corners-description": "Toon naar buiten afgeronde hoeken op de balk weer.",
"appearance-outer-corners-label": "Buitenhoeken",
"appearance-position-description": "Kies waar je de balk op het scherm wilt plaatsen.",
+1 -1
View File
@@ -439,6 +439,7 @@
"lock": "Lås",
"logout": "Skriv ut",
"look": "Sjå",
"margins": "Margar",
"media": "Media",
"media-player": "Mediaavspelar",
"memory": "Minne",
@@ -803,7 +804,6 @@
"appearance-hide-on-overview-label": "Gøym opggåvelina i oversyn",
"appearance-margins-description": "Endrar på margane kring den flytande oppgåvelina.",
"appearance-margins-horizontal": "Vassrett",
"appearance-margins-label": "Margar",
"appearance-margins-vertical": "Loddrett",
"appearance-outer-corners-description": "Viser hyrner som bøygjer ut på oppgåvelina.",
"appearance-outer-corners-label": "Ytterhyrne",
+3 -3
View File
@@ -457,6 +457,7 @@
"lock": "Zablokuj",
"logout": "Wyloguj",
"look": "Wygląd",
"margins": "Marginesy",
"media": "Media",
"media-player": "Odtwarzacz multimedialny",
"memory": "Pamięć",
@@ -834,9 +835,8 @@
"appearance-hide-on-overview-description": "Ukryj pasek i zamknij panele, gdy aktywny jest przegląd kompozytora.",
"appearance-hide-on-overview-label": "Ukryj pasek w przeglądzie",
"appearance-margins-description": "Dostosuj marginesy wokół pływającego paska.",
"appearance-margins-horizontal": "Poziome",
"appearance-margins-label": "Marginesy",
"appearance-margins-vertical": "Pionowe",
"appearance-margins-horizontal": "Margines Poziomy",
"appearance-margins-vertical": "Margines Pionowy",
"appearance-outer-corners-description": "Wyświetl zaokrąglone narożniki na zewnątrz paska.",
"appearance-outer-corners-label": "Narożniki zewnętrzne",
"appearance-position-description": "Wybierz miejsce umieszczenia paska na ekranie.",
+3 -3
View File
@@ -457,6 +457,7 @@
"lock": "Bloquear",
"logout": "Sair",
"look": "Aparência",
"margins": "Margens",
"media": "Mídia",
"media-player": "Reprodutor de mídia",
"memory": "Memória",
@@ -834,9 +835,8 @@
"appearance-hide-on-overview-description": "Ocultar a barra e fechar os painéis quando a visão geral do compositor estiver ativa.",
"appearance-hide-on-overview-label": "Ocultar barra na visão geral",
"appearance-margins-description": "Ajuste as margens ao redor da barra flutuante.",
"appearance-margins-horizontal": "Horizontal",
"appearance-margins-label": "Margens",
"appearance-margins-vertical": "Vertical",
"appearance-margins-horizontal": "Margem Horizontal",
"appearance-margins-vertical": "Margem Vertical",
"appearance-outer-corners-description": "Exibe cantos curvados para fora na barra.",
"appearance-outer-corners-label": "Cantos externos",
"appearance-position-description": "Escolha onde posicionar a barra na tela.",
+3 -3
View File
@@ -457,6 +457,7 @@
"lock": "Заблокировать",
"logout": "Выйти",
"look": "Внешний вид",
"margins": "Отступы",
"media": "Плеер",
"media-player": "Медиаплеер",
"memory": "Память",
@@ -834,9 +835,8 @@
"appearance-hide-on-overview-description": "Скрыть панель и закрыть панели, когда активен обзор компоновщика.",
"appearance-hide-on-overview-label": "Скрыть панель в обзоре",
"appearance-margins-description": "Настройка отступов вокруг плавающей панели.",
"appearance-margins-horizontal": "Горизонтальный",
"appearance-margins-label": "Отступы",
"appearance-margins-vertical": "Вертикальный",
"appearance-margins-horizontal": "Горизонтальный Отступ",
"appearance-margins-vertical": "Вертикальный Отступ",
"appearance-outer-corners-description": "Отображает внешне изогнутые углы на панели.",
"appearance-outer-corners-label": "Внешние углы",
"appearance-position-description": "Выберите, где разместить панель на экране.",
+3 -3
View File
@@ -457,6 +457,7 @@
"lock": "Lås",
"logout": "Logga ut",
"look": "Titta",
"margins": "Marginaler",
"media": "Media",
"media-player": "Mediaspelare",
"memory": "Minne",
@@ -834,9 +835,8 @@
"appearance-hide-on-overview-description": "Dölj fältet och stäng panelerna när kompositörsöversikten är aktiv.",
"appearance-hide-on-overview-label": "Dölj fältet på översikten",
"appearance-margins-description": "Justera marginalerna runt det flytande fältet.",
"appearance-margins-horizontal": "Horisontell",
"appearance-margins-label": "Marginaler",
"appearance-margins-vertical": "Vertikal",
"appearance-margins-horizontal": "Horisontell Marginal",
"appearance-margins-vertical": "Vertikal Marginal",
"appearance-outer-corners-description": "Visa utåtböjda hörn på stapeln.",
"appearance-outer-corners-label": "Ytterhörn",
"appearance-position-description": "Välj var fältet ska placeras på skärmen.",
+3 -3
View File
@@ -457,6 +457,7 @@
"lock": "Kilitle",
"logout": "Çıkış yap",
"look": "Görünüm",
"margins": "Kenar boşlukları",
"media": "Medya",
"media-player": "Medya oynatıcı",
"memory": "Hafıza",
@@ -834,9 +835,8 @@
"appearance-hide-on-overview-description": "Kompozitör önizlemesi aktif olduğunda çubuğu gizle ve panelleri kapat.",
"appearance-hide-on-overview-label": "Genel bakışta çubuğu gizle",
"appearance-margins-description": "Yüzen araç çubuğunun etrafındaki kenar boşluklarını ayarlayın.",
"appearance-margins-horizontal": "Yatay",
"appearance-margins-label": "Kenar boşlukları",
"appearance-margins-vertical": "Dikey",
"appearance-margins-horizontal": "Yatay Kenar Boşluğu",
"appearance-margins-vertical": "Dikey Kenar Boşluğu",
"appearance-outer-corners-description": "Çubuğun dışa doğru kavisli köşelerini görüntüler.",
"appearance-outer-corners-label": "Dış köşeler",
"appearance-position-description": "Araç çubuğunu ekranda nereye yerleştireceğinizi seçin.",
+3 -3
View File
@@ -457,6 +457,7 @@
"lock": "Заблокувати",
"logout": "Вийти",
"look": "Вигляд",
"margins": "Поля",
"media": "Медіа",
"media-player": "Медіапрогравач",
"memory": "Пам'ять",
@@ -834,9 +835,8 @@
"appearance-hide-on-overview-description": "Приховати панель і закрити панелі, коли активний огляд компонувальника.",
"appearance-hide-on-overview-label": "Приховати панель на огляді",
"appearance-margins-description": "Налаштуйте поля навколо плаваючої панелі.",
"appearance-margins-horizontal": "Горизонтальні",
"appearance-margins-label": "Поля",
"appearance-margins-vertical": "Вертикальні",
"appearance-margins-horizontal": "Горизонтальний Відступ",
"appearance-margins-vertical": "Вертикальний Відступ",
"appearance-outer-corners-description": "Відображає назовні закруглені кути на панелі.",
"appearance-outer-corners-label": "Зовнішні кути",
"appearance-position-description": "Виберіть, де розмістити панель на екрані.",
+3 -3
View File
@@ -457,6 +457,7 @@
"lock": "锁屏",
"logout": "退出登录",
"look": "样式",
"margins": "边距",
"media": "媒体",
"media-player": "媒体播放器",
"memory": "内存",
@@ -834,9 +835,8 @@
"appearance-hide-on-overview-description": "当合成器概览处于活动状态时,隐藏栏并关闭面板。",
"appearance-hide-on-overview-label": "在概览中隐藏栏",
"appearance-margins-description": "调整浮动状态栏周围的边距。",
"appearance-margins-horizontal": "水平",
"appearance-margins-label": "边距",
"appearance-margins-vertical": "垂直",
"appearance-margins-horizontal": "水平边距",
"appearance-margins-vertical": "垂直边距",
"appearance-outer-corners-description": "在栏上显示向外弯曲的角。",
"appearance-outer-corners-label": "外角",
"appearance-position-description": "选择在屏幕上的位置。",
+3 -3
View File
@@ -457,6 +457,7 @@
"lock": "鎖定",
"logout": "登出",
"look": "樣式",
"margins": "邊距",
"media": "媒體",
"media-player": "媒體播放器",
"memory": "記憶體",
@@ -834,9 +835,8 @@
"appearance-hide-on-overview-description": "當在合成器概覽時, 隱藏工具列並關閉面板",
"appearance-hide-on-overview-label": "概覽時隱藏工具列",
"appearance-margins-description": "調整懸浮工具列的邊距",
"appearance-margins-horizontal": "水平",
"appearance-margins-label": "邊距",
"appearance-margins-vertical": "垂直",
"appearance-margins-horizontal": "水平邊距",
"appearance-margins-vertical": "垂直邊距",
"appearance-outer-corners-description": "將工具列向外延伸顯示畫面圓角",
"appearance-outer-corners-label": "外側圓角",
"appearance-position-description": "選擇要把工具列放在螢幕哪裡",
+2 -11
View File
@@ -296,18 +296,9 @@
"subTab": 0,
"subTabLabel": "common.appearance"
},
{
"labelKey": "panels.bar.appearance-margins-label",
"descriptionKey": "panels.bar.appearance-margins-description",
"widget": "NLabel",
"tab": 4,
"tabLabel": "panels.bar.title",
"subTab": 0,
"subTabLabel": "common.appearance"
},
{
"labelKey": "panels.bar.appearance-margins-vertical",
"descriptionKey": null,
"descriptionKey": "panels.bar.appearance-margins-description",
"widget": "NSpinBox",
"tab": 4,
"tabLabel": "panels.bar.title",
@@ -316,7 +307,7 @@
},
{
"labelKey": "panels.bar.appearance-margins-horizontal",
"descriptionKey": null,
"descriptionKey": "panels.bar.appearance-margins-description",
"widget": "NSpinBox",
"tab": 4,
"tabLabel": "panels.bar.title",
@@ -290,41 +290,33 @@ ColumnLayout {
ColumnLayout {
visible: Settings.data.bar.barType === "floating"
spacing: Style.marginS
spacing: Style.marginL
Layout.fillWidth: true
NLabel {
label: I18n.tr("panels.bar.appearance-margins-label")
description: I18n.tr("panels.bar.appearance-margins-description")
NDivider {
Layout.fillWidth: true
}
RowLayout {
Layout.fillWidth: true
spacing: Style.marginL
NSpinBox {
label: I18n.tr("panels.bar.appearance-margins-vertical")
description: I18n.tr("panels.bar.appearance-margins-description")
from: 0
to: 500
suffix: "px"
value: Settings.data.bar.marginVertical
defaultValue: Settings.getDefaultValue("bar.marginVertical")
onValueChanged: Settings.data.bar.marginVertical = value
}
NSpinBox {
label: I18n.tr("panels.bar.appearance-margins-vertical")
from: 0
to: 500
suffix: "px"
value: Settings.data.bar.marginVertical
defaultValue: Settings.getDefaultValue("bar.marginVertical")
onValueChanged: Settings.data.bar.marginVertical = value
}
Item {
Layout.fillWidth: true
}
NSpinBox {
label: I18n.tr("panels.bar.appearance-margins-horizontal")
from: 0
to: 500
suffix: "px"
value: Settings.data.bar.marginHorizontal
defaultValue: Settings.getDefaultValue("bar.marginHorizontal")
onValueChanged: Settings.data.bar.marginHorizontal = value
}
NSpinBox {
label: I18n.tr("panels.bar.appearance-margins-horizontal")
description: I18n.tr("panels.bar.appearance-margins-description")
from: 0
to: 500
suffix: "px"
value: Settings.data.bar.marginHorizontal
defaultValue: Settings.getDefaultValue("bar.marginHorizontal")
onValueChanged: Settings.data.bar.marginHorizontal = value
}
}
+11 -9
View File
@@ -35,21 +35,23 @@ ColumnLayout {
}
NText {
Layout.fillWidth: !root.showIndicator
id: labelText
Layout.fillWidth: true
text: root.label
pointSize: Style.fontSizeL
font.weight: Style.fontWeightSemiBold
color: labelColor
wrapMode: Text.WordWrap
}
// Settings indicator
Loader {
active: root.showIndicator
sourceComponent: NSettingsIndicator {
show: true
tooltipText: root.indicatorTooltip || ""
Layout.alignment: Qt.AlignVCenter
// Settings indicator dot positioned right after the text content
Loader {
active: root.showIndicator
x: labelText.contentWidth + Style.marginXS
anchors.verticalCenter: parent.verticalCenter
sourceComponent: NSettingsIndicator {
show: true
tooltipText: root.indicatorTooltip || ""
}
}
}
}