network+bt: uniformizing icon buttons vs buttons, replaced circle-info icon which was giving a circle in a circle.

This commit is contained in:
Lemmy
2026-01-23 11:05:24 -05:00
parent f6794f88d6
commit 62b62799ed
5 changed files with 20 additions and 15 deletions
+2 -1
View File
@@ -176,7 +176,8 @@ Singleton {
"filepicker-eye": "eye",
"filepicker-eye-off": "eye-off",
"filepicker-folder-current": "checks",
"plugin": "plug-connected"
"plugin": "plug-connected",
"info": "file-description"
}
// Fonts Codepoints - do not change!
@@ -193,9 +193,9 @@ NBox {
// Info for connected device (placed before the CTA for consistency with WiFi)
NIconButton {
visible: modelData.connected
icon: "info-circle"
icon: "info"
tooltipText: I18n.tr("common.info")
baseSize: Style.baseWidgetSize
baseSize: Style.baseWidgetSize * 0.8
onClicked: {
const key = BluetoothService.deviceKey(modelData);
root.expandedDeviceKey = (root.expandedDeviceKey === key) ? "" : key;
@@ -207,7 +207,7 @@ NBox {
visible: (modelData.paired || modelData.trusted) && !modelData.connected && !isBusy && !modelData.blocked
icon: "trash"
tooltipText: I18n.tr("common.unpair")
baseSize: Style.baseWidgetSize
baseSize: Style.baseWidgetSize * 0.8
onClicked: BluetoothService.unpairDevice(modelData)
}
@@ -217,8 +217,7 @@ NBox {
visible: (modelData.state !== BluetoothDeviceState.Connecting)
enabled: (canConnect || canDisconnect || canPair) && !isBusy
outlined: !button.hovered
fontSize: Style.fontSizeXS
fontWeight: Style.fontWeightMedium
fontSize: Style.fontSizeS
backgroundColor: {
if (device.canDisconnect && !isBusy) {
return Color.mError;
@@ -284,6 +283,7 @@ NBox {
// Use Tabler layout icons; "grid" alone doesn't exist in our font
icon: root.detailsGrid ? "layout-list" : "layout-grid"
tooltipText: root.detailsGrid ? I18n.tr("tooltips.list-view") : I18n.tr("tooltips.grid-view")
baseSize: Style.baseWidgetSize * 0.8
onClicked: {
root.detailsGrid = !root.detailsGrid;
if (Settings.data && Settings.data.ui) {
+4 -3
View File
@@ -178,7 +178,7 @@ SmartPanel {
visible: panelViewMode === "wifi"
checked: Settings.data.network.wifiEnabled
onToggled: checked => NetworkService.setWifiEnabled(checked)
baseSize: Style.baseWidgetSize * 0.65
baseSize: Style.baseWidgetSize * 0.7 // Slightly smaller
}
NIconButton {
@@ -600,9 +600,9 @@ SmartPanel {
// Info button on the right
NIconButton {
icon: "info-circle"
baseSize: Style.baseWidgetSize * 0.7
icon: "info"
tooltipText: I18n.tr("common.info")
baseSize: Style.baseWidgetSize * 0.8
enabled: true
onClicked: {
if (NetworkService.activeEthernetIf === modelData.ifname && ethernetInfoExpanded) {
@@ -656,6 +656,7 @@ SmartPanel {
anchors.margins: Style.marginS
icon: ethernetDetailsGrid ? "layout-list" : "layout-grid"
tooltipText: ethernetDetailsGrid ? I18n.tr("tooltips.list-view") : I18n.tr("tooltips.grid-view")
baseSize: Style.baseWidgetSize * 0.8
onClicked: {
ethernetDetailsGrid = !ethernetDetailsGrid;
if (Settings.data && Settings.data.ui) {
+8 -5
View File
@@ -249,8 +249,9 @@ NBox {
// Info toggle for connected network
NIconButton {
visible: modelData.connected && NetworkService.disconnectingFrom !== modelData.ssid
icon: "info-circle"
icon: "info"
tooltipText: I18n.tr("common.info")
baseSize: Style.baseWidgetSize * 0.8
onClicked: {
if (root.infoSsid === modelData.ssid) {
root.infoSsid = "";
@@ -265,6 +266,7 @@ NBox {
visible: (modelData.existing || modelData.cached) && !modelData.connected && NetworkService.connectingTo !== modelData.ssid && NetworkService.forgettingNetwork !== modelData.ssid && NetworkService.disconnectingFrom !== modelData.ssid
icon: "trash"
tooltipText: I18n.tr("tooltips.forget-network")
baseSize: Style.baseWidgetSize * 0.8
onClicked: root.forgetRequested(modelData.ssid)
}
@@ -278,7 +280,7 @@ NBox {
return I18n.tr("common.password");
}
outlined: !hovered
fontSize: Style.fontSizeXS
fontSize: Style.fontSizeS
enabled: !NetworkService.connecting
onClicked: {
if (modelData.existing || modelData.cached || !NetworkService.isSecured(modelData.security)) {
@@ -327,6 +329,7 @@ NBox {
// Use Tabler layout icons; "grid" alone doesn't exist in our font
icon: root.detailsGrid ? "layout-list" : "layout-grid"
tooltipText: root.detailsGrid ? I18n.tr("tooltips.list-view") : I18n.tr("tooltips.grid-view")
baseSize: Style.baseWidgetSize * 0.8
onClicked: {
root.detailsGrid = !root.detailsGrid;
if (Settings.data && Settings.data.ui) {
@@ -642,7 +645,7 @@ NBox {
NButton {
text: I18n.tr("common.connect")
fontSize: Style.fontSizeXXS
fontSize: Style.fontSizeS
enabled: pwdInput.text.length > 0 && !NetworkService.connecting
outlined: true
onClicked: root.passwordSubmitted(modelData.ssid, pwdInput.text)
@@ -650,7 +653,7 @@ NBox {
NIconButton {
icon: "close"
baseSize: Style.baseWidgetSize
baseSize: Style.baseWidgetSize * 0.8
onClicked: root.passwordCancelled()
}
}
@@ -698,7 +701,7 @@ NBox {
NIconButton {
icon: "close"
baseSize: Style.baseWidgetSize
baseSize: Style.baseWidgetSize * 0.8
onClicked: root.forgetCancelled()
}
}
@@ -134,7 +134,7 @@ Popup {
spacing: Style.marginS
NIcon {
icon: "info-circle"
icon: "info"
color: Color.mOnSurfaceVariant
pointSize: Style.fontSizeM
}