mirror of
https://github.com/noctalia-dev/noctalia-shell.git
synced 2026-05-11 17:08:27 +08:00
fix container outlines in connections tab
This commit is contained in:
@@ -1241,7 +1241,6 @@
|
||||
},
|
||||
"connections": {
|
||||
"authentication-required": "Authentication required",
|
||||
"bluetooth-description": "Activate Bluetooth management.",
|
||||
"bluetooth-devices-unnamed": "Unnamed devices are not shown.",
|
||||
"bluetooth-discoverable": "This device is discoverable as <b> {hostName} </b> while this settings tab is open.",
|
||||
"bluetooth-rssi-polling-description": "Periodically sample RSSI for connected devices via bluetoothctl. May not be available for all devices; uses minimal resources when enabled.",
|
||||
@@ -1253,9 +1252,7 @@
|
||||
"hide-unnamed-devices-label": "Hide unnamed devices",
|
||||
"hide-unnamed-devices-description": "Hide devices that appear only as Bluetooth addresses.",
|
||||
"pin-instructions": "Please enter the PIN code displayed on your device.",
|
||||
"title": "Connections",
|
||||
"wifi-description": "Manage wireless networks (requires NetworkManager)."
|
||||
|
||||
"title": "Connections"
|
||||
},
|
||||
"notifications": {
|
||||
"duration-critical-urgency-description": "How long critical priority notifications stay visible.",
|
||||
|
||||
@@ -377,53 +377,14 @@
|
||||
"subTab": 1,
|
||||
"subTabLabel": "common.templates"
|
||||
},
|
||||
{
|
||||
"labelKey": "common.bluetooth",
|
||||
"descriptionKey": null,
|
||||
"widget": "NLabel",
|
||||
"tab": 15,
|
||||
"tabLabel": "panels.connections.title",
|
||||
"subTab": null
|
||||
},
|
||||
{
|
||||
"labelKey": "panels.connections.hide-unnamed-devices-label",
|
||||
"descriptionKey": "panels.connections.hide-unnamed-devices-description",
|
||||
"widget": "NToggle",
|
||||
"tab": 15,
|
||||
"tabLabel": "panels.connections.title",
|
||||
"subTab": null
|
||||
},
|
||||
{
|
||||
"labelKey": "panels.connections.disable-discoverability-label",
|
||||
"descriptionKey": "panels.connections.disable-discoverability-description",
|
||||
"widget": "NToggle",
|
||||
"tab": 15,
|
||||
"tabLabel": "panels.connections.title",
|
||||
"subTab": null
|
||||
},
|
||||
{
|
||||
"labelKey": "panels.connections.bluetooth-rssi-polling-label",
|
||||
"descriptionKey": "panels.connections.bluetooth-rssi-polling-description",
|
||||
"widget": "NToggle",
|
||||
"tab": 15,
|
||||
"tabLabel": "panels.connections.title",
|
||||
"subTab": null
|
||||
},
|
||||
{
|
||||
"labelKey": "panels.connections.bluetooth-rssi-polling-interval-label",
|
||||
"descriptionKey": "panels.connections.bluetooth-rssi-polling-interval-description",
|
||||
"widget": "NSpinBox",
|
||||
"tab": 15,
|
||||
"tabLabel": "panels.connections.title",
|
||||
"subTab": null
|
||||
},
|
||||
{
|
||||
"labelKey": "toast.airplane-mode.title",
|
||||
"descriptionKey": null,
|
||||
"widget": "NLabel",
|
||||
"tab": 15,
|
||||
"tabLabel": "panels.connections.title",
|
||||
"subTab": null
|
||||
"subTab": 0,
|
||||
"subTabLabel": "common.wifi"
|
||||
},
|
||||
{
|
||||
"labelKey": "common.wifi",
|
||||
@@ -431,7 +392,53 @@
|
||||
"widget": "NLabel",
|
||||
"tab": 15,
|
||||
"tabLabel": "panels.connections.title",
|
||||
"subTab": null
|
||||
"subTab": 0,
|
||||
"subTabLabel": "common.wifi"
|
||||
},
|
||||
{
|
||||
"labelKey": "common.bluetooth",
|
||||
"descriptionKey": null,
|
||||
"widget": "NLabel",
|
||||
"tab": 15,
|
||||
"tabLabel": "panels.connections.title",
|
||||
"subTab": 1,
|
||||
"subTabLabel": "common.bluetooth"
|
||||
},
|
||||
{
|
||||
"labelKey": "panels.connections.hide-unnamed-devices-label",
|
||||
"descriptionKey": "panels.connections.hide-unnamed-devices-description",
|
||||
"widget": "NToggle",
|
||||
"tab": 15,
|
||||
"tabLabel": "panels.connections.title",
|
||||
"subTab": 1,
|
||||
"subTabLabel": "common.bluetooth"
|
||||
},
|
||||
{
|
||||
"labelKey": "panels.connections.disable-discoverability-label",
|
||||
"descriptionKey": "panels.connections.disable-discoverability-description",
|
||||
"widget": "NToggle",
|
||||
"tab": 15,
|
||||
"tabLabel": "panels.connections.title",
|
||||
"subTab": 1,
|
||||
"subTabLabel": "common.bluetooth"
|
||||
},
|
||||
{
|
||||
"labelKey": "panels.connections.bluetooth-rssi-polling-label",
|
||||
"descriptionKey": "panels.connections.bluetooth-rssi-polling-description",
|
||||
"widget": "NToggle",
|
||||
"tab": 15,
|
||||
"tabLabel": "panels.connections.title",
|
||||
"subTab": 1,
|
||||
"subTabLabel": "common.bluetooth"
|
||||
},
|
||||
{
|
||||
"labelKey": "panels.connections.bluetooth-rssi-polling-interval-label",
|
||||
"descriptionKey": "panels.connections.bluetooth-rssi-polling-interval-description",
|
||||
"widget": "NSpinBox",
|
||||
"tab": 15,
|
||||
"tabLabel": "panels.connections.title",
|
||||
"subTab": 1,
|
||||
"subTabLabel": "common.bluetooth"
|
||||
},
|
||||
{
|
||||
"labelKey": "common.position",
|
||||
|
||||
@@ -9,6 +9,7 @@ import qs.Modules.Panels.Settings.Tabs.About
|
||||
import qs.Modules.Panels.Settings.Tabs.Audio
|
||||
import qs.Modules.Panels.Settings.Tabs.Bar
|
||||
import qs.Modules.Panels.Settings.Tabs.ColorScheme
|
||||
import qs.Modules.Panels.Settings.Tabs.Connections
|
||||
import qs.Modules.Panels.Settings.Tabs.ControlCenter
|
||||
import qs.Modules.Panels.Settings.Tabs.Display
|
||||
import qs.Modules.Panels.Settings.Tabs.Dock
|
||||
|
||||
@@ -20,8 +20,8 @@ Item {
|
||||
// Configuration for shared use (e.g. by BluetoothPanel)
|
||||
property bool showOnlyLists: false
|
||||
|
||||
property bool isScanningActive: BluetoothService.scanningActive
|
||||
property bool isDiscoverable: BluetoothService.discoverable
|
||||
readonly property bool isScanningActive: BluetoothService.scanningActive
|
||||
readonly property bool isDiscoverable: BluetoothService.discoverable
|
||||
|
||||
// Device lists with local filtering logic
|
||||
readonly property var connectedDevices: {
|
||||
@@ -145,6 +145,7 @@ Item {
|
||||
visible: !btprefs.showOnlyLists
|
||||
Layout.fillWidth: true
|
||||
Layout.preferredHeight: masterControlCol.implicitHeight
|
||||
border.color: "transparent"
|
||||
|
||||
ColumnLayout {
|
||||
id: masterControlCol
|
||||
@@ -206,6 +207,7 @@ Item {
|
||||
visible: btprefs.connectedDevices.length > 0 && BluetoothService.enabled
|
||||
Layout.fillWidth: true
|
||||
Layout.preferredHeight: connectedDevicesCol.implicitHeight + Style.marginXL
|
||||
border.color: showOnlyLists ? Style.boxBorderColor : "transparent"
|
||||
|
||||
ColumnLayout {
|
||||
id: connectedDevicesCol
|
||||
@@ -238,6 +240,7 @@ Item {
|
||||
visible: btprefs.pairedDevices.length > 0 && BluetoothService.enabled
|
||||
Layout.fillWidth: true
|
||||
Layout.preferredHeight: pairedDevicesCol.implicitHeight + Style.marginXL
|
||||
border.color: showOnlyLists ? Style.boxBorderColor : "transparent"
|
||||
|
||||
ColumnLayout {
|
||||
id: pairedDevicesCol
|
||||
@@ -270,6 +273,7 @@ Item {
|
||||
visible: !btprefs.showOnlyLists && btprefs.unnamedAvailableDevices.length > 0 && BluetoothService.enabled
|
||||
Layout.fillWidth: true
|
||||
Layout.preferredHeight: availableDevicesCol.implicitHeight + Style.marginXL
|
||||
border.color: "transparent"
|
||||
|
||||
ColumnLayout {
|
||||
id: availableDevicesCol
|
||||
|
||||
+1
-2
@@ -2,7 +2,6 @@ import QtQuick
|
||||
import QtQuick.Controls
|
||||
import QtQuick.Layouts
|
||||
import qs.Commons
|
||||
import qs.Modules.Panels.Settings.Tabs.Connections
|
||||
import qs.Services.Networking
|
||||
import qs.Widgets
|
||||
|
||||
@@ -38,8 +37,8 @@ ColumnLayout {
|
||||
|
||||
NTabView {
|
||||
id: tabView
|
||||
Layout.fillHeight: true
|
||||
currentIndex: subTabBar.currentIndex
|
||||
|
||||
WifiSubTab {}
|
||||
BluetoothSubTab {}
|
||||
}
|
||||
@@ -29,6 +29,7 @@ Item {
|
||||
NBox {
|
||||
Layout.fillWidth: true
|
||||
Layout.preferredHeight: masterControlColAirplane.implicitHeight
|
||||
border.color: "transparent"
|
||||
|
||||
ColumnLayout {
|
||||
id: masterControlColAirplane
|
||||
@@ -66,6 +67,7 @@ Item {
|
||||
NBox {
|
||||
Layout.fillWidth: true
|
||||
Layout.preferredHeight: masterControlCol.implicitHeight
|
||||
border.color: "transparent"
|
||||
|
||||
ColumnLayout {
|
||||
id: masterControlCol
|
||||
|
||||
@@ -75,7 +75,7 @@ Singleton {
|
||||
"hooks": SettingsPanel.Tab.Hooks,
|
||||
"launcher": SettingsPanel.Tab.Launcher,
|
||||
"location": SettingsPanel.Tab.Location,
|
||||
"network": SettingsPanel.Tab.Network,
|
||||
"connections": SettingsPanel.Tab.Connections,
|
||||
"notifications": SettingsPanel.Tab.Notifications,
|
||||
"plugins": SettingsPanel.Tab.Plugins,
|
||||
"sessionmenu": SettingsPanel.Tab.SessionMenu,
|
||||
|
||||
Reference in New Issue
Block a user