never/noctalia-shell
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

NText: Reverted my change to support Richtext by default + All tooltips are no longer using capital letter at the start of every word

Browse source
This commit is contained in:
LemmyCook 2025-08-31 08:41:51 -04:00
parent 4ad851fdd2
commit 53405c13af
19 changed files with 66 additions and 68 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Modules/Bar/Widgets/ArchUpdater.qml
View file

@ -48,10 +48,10 @@ NIconButton {
let tooltip = header
if (pacmanTooltip !== "") {
tooltip += "<br/>" + pacmanTooltip
tooltip += "\n" + pacmanTooltip
}
if (aurTooltip !== "") {
tooltip += "<br/>" + aurTooltip
tooltip += "\n" + aurTooltip
}
return tooltip
}

4
Modules/Bar/Widgets/Battery.qml
View file

@ -103,7 +103,7 @@ Item {
let lines = []
if (testMode) {
lines.push("Time left: " + Time.formatVagueHumanReadableDuration(12345))
return lines.join("<br/>")
return lines.join("\n")
}
if (!isReady || !battery.isLaptopBattery) {
return "No battery detected"
@ -130,7 +130,7 @@ Item {
if (battery.healthPercentage !== undefined && battery.healthPercentage > 0) {
lines.push("Health: " + Math.round(battery.healthPercentage) + "%")
}
return lines.join("<br/>")
return lines.join("\n")
}
}
}

2
Modules/Bar/Widgets/Bluetooth.qml
View file

@ -21,6 +21,6 @@ NIconButton {
colorBorderHover: Color.transparent
icon: "bluetooth"
tooltipText: "Bluetooth Devices"
tooltipText: "Bluetooth devices"
onClicked: PanelService.getPanel("bluetoothPanel")?.toggle(screen, this)
}

4
Modules/Bar/Widgets/Brightness.qml
View file

@ -70,8 +70,8 @@ Item {
var monitor = getMonitor()
if (!monitor)
return ""
return "Brightness: " + Math.round(monitor.brightness * 100) + "%<br/>Method: " + monitor.method
+ "<br/>Left click for advanced settings.<br/>Scroll up/down to change brightness."
return "Brightness: " + Math.round(monitor.brightness * 100) + "%\nMethod: " + monitor.method
+ "\nLeft click for advanced settings.\nScroll up/down to change brightness."
}
onWheel: function (angle) {

2
Modules/Bar/Widgets/KeyboardLayout.qml
View file

@ -25,7 +25,7 @@ Row {
collapsedIconColor: Color.mOnSurface
autoHide: false // Important to be false so we can hover as long as we want
text: currentLayout
tooltipText: "Keyboard Layout: " + currentLayout
tooltipText: "Keyboard layout: " + currentLayout
onClicked: {

83
Modules/Bar/Widgets/MediaMini.qml
View file

@ -26,9 +26,8 @@ Row {
NText {
id: fullTitleMetrics
visible: false
text: getTitle()
font.pointSize: Style.fontSizeS * scaling
font.weight: Style.fontWeightMedium
text: titleText.text
font: titleText.font
}
Rectangle {
@ -50,37 +49,6 @@ Row {
width: 200 * scaling
}
// Mouse area for hover detection - direct child of Rectangle
MouseArea {
id: mouseArea
anchors.fill: parent
hoverEnabled: true
cursorShape: Qt.PointingHandCursor
acceptedButtons: Qt.LeftButton | Qt.RightButton | Qt.MiddleButton
onClicked: mouse => {
if (mouse.button === Qt.LeftButton) {
MediaService.playPause()
} else if (mouse.button == Qt.RightButton) {
MediaService.next()
// Need to hide the tooltip instantly
tooltip.visible = false
} else if (mouse.button == Qt.MiddleButton) {
MediaService.previous()
// Need to hide the tooltip instantly
tooltip.visible = false
}
}
onEntered: {
if (tooltip.text !== "") {
tooltip.show()
}
}
onExited: {
tooltip.hide()
}
}
Item {
id: mainContainer
anchors.fill: parent
@ -172,18 +140,18 @@ Row {
NText {
id: titleText
// If hovered, show up to 400 pixels, otherwise show up to 120 pixels
width: (mouseArea.containsMouse) ? Math.min(fullTitleMetrics.contentWidth + (Style.marginS * scaling),
400 * scaling) : Math.min(
fullTitleMetrics.contentWidth + (Style.marginS * scaling), 120 * scaling)
// If hovered or just switched window, show up to 400 pixels
// If not hovered show up to 120 pixels
width: (mouseArea.containsMouse) ? Math.min(fullTitleMetrics.contentWidth,
400 * scaling) : Math.min(fullTitleMetrics.contentWidth,
120 * scaling)
text: getTitle()
font.pointSize: Style.fontSizeS * scaling
font.weight: Style.fontWeightMedium
elide: mouseArea.containsMouse ? Text.ElideNone : Text.ElideRight
elide: Text.ElideRight
anchors.verticalCenter: parent.verticalCenter
verticalAlignment: Text.AlignVCenter
color: Color.mTertiary
clip: true
Behavior on width {
NumberAnimation {
@ -193,6 +161,37 @@ Row {
}
}
}
// Mouse area for hover detection
MouseArea {
id: mouseArea
anchors.fill: parent
hoverEnabled: true
cursorShape: Qt.PointingHandCursor
acceptedButtons: Qt.LeftButton | Qt.RightButton | Qt.MiddleButton
onClicked: mouse => {
if (mouse.button === Qt.LeftButton) {
MediaService.playPause()
} else if (mouse.button == Qt.RightButton) {
MediaService.next()
// Need to hide the tooltip instantly
tooltip.visible = false
} else if (mouse.button == Qt.MiddleButton) {
MediaService.previous()
// Need to hide the tooltip instantly
tooltip.visible = false
}
}
onEntered: {
if (tooltip.text !== "") {
tooltip.show()
}
}
onExited: {
tooltip.hide()
}
}
}
}
@ -201,10 +200,10 @@ Row {
text: {
var str = ""
if (MediaService.canGoNext) {
str += "Right click for next<br/>"
str += "Right click for next\n"
}
if (MediaService.canGoPrevious) {
str += "Middle click for previous<br/>"
str += "Middle click for previous\n"
}
return str
}

2
Modules/Bar/Widgets/NightLight.qml
View file

@ -21,7 +21,7 @@ NIconButton {
colorBorderHover: Color.transparent
icon: Settings.data.nightLight.enabled ? "bedtime" : "bedtime_off"
tooltipText: `Night Light: ${Settings.data.nightLight.enabled ? "enabled" : "disabled"}<br/>Left click to toggle.<br/>Right click to access settings.`
tooltipText: `Night light: ${Settings.data.nightLight.enabled ? "enabled" : "disabled"}\nLeft click to toggle.\nRight click to access settings.`
onClicked: Settings.data.nightLight.enabled = !Settings.data.nightLight.enabled
onRightClicked: {

2
Modules/Bar/Widgets/ScreenRecorderIndicator.qml
View file

@ -12,7 +12,7 @@ NIconButton {
visible: ScreenRecorderService.isRecording
icon: "videocam"
tooltipText: "Screen Recording Active\nClick To Stop Recording"
tooltipText: "Screen recording is active\nClick to stop recording"
sizeRatio: 0.8
colorBg: Color.mPrimary
colorFg: Color.mOnPrimary

2
Modules/Bar/Widgets/SidePanelToggle.qml
View file

@ -10,7 +10,7 @@ NIconButton {
property real scaling: ScalingService.scale(screen)
icon: "widgets"
tooltipText: "Open Side Panel"
tooltipText: "Open side panel"
sizeRatio: 0.8
colorBg: Color.mSurfaceVariant

2
Modules/Bar/Widgets/Volume.qml
View file

@ -59,7 +59,7 @@ Item {
autoHide: false // Important to be false so we can hover as long as we want
text: Math.floor(AudioService.volume * 100) + "%"
tooltipText: "Volume: " + Math.round(
AudioService.volume * 100) + "%<br/>Left click for advanced settings.<br/>Scroll up/down to change volume."
AudioService.volume * 100) + "%\nLeft click for advanced settings.\nScroll up/down to change volume."
onWheel: function (delta) {
wheelAccumulator += delta

2
Modules/Bar/Widgets/WiFi.qml
View file

@ -50,6 +50,6 @@ NIconButton {
return "signal_wifi_bad"
}
}
tooltipText: "Network / WiFi"
tooltipText: "Network / Wi-Fi"
onClicked: PanelService.getPanel("wifiPanel")?.toggle(screen, this)
}

4
Modules/Calendar/Calendar.qml
View file

@ -29,7 +29,7 @@ NPanel {
NIconButton {
icon: "chevron_left"
tooltipText: "Previous Month"
tooltipText: "Previous month"
onClicked: {
let newDate = new Date(grid.year, grid.month - 1, 1)
grid.year = newDate.getFullYear()
@ -48,7 +48,7 @@ NPanel {
NIconButton {
icon: "chevron_right"
tooltipText: "Next Month"
tooltipText: "Next month"
onClicked: {
let newDate = new Date(grid.year, grid.month + 1, 1)
grid.year = newDate.getFullYear()

4
Modules/Notification/NotificationHistoryPanel.qml
View file

@ -45,7 +45,7 @@ NPanel {
NIconButton {
icon: "delete"
tooltipText: "Clear History"
tooltipText: "Clear history"
sizeRatio: 0.8
onClicked: NotificationService.clearHistory()
}
@ -158,7 +158,7 @@ NPanel {
// Trash icon button
NIconButton {
icon: "delete"
tooltipText: "Delete Notification"
tooltipText: "Delete notification"
sizeRatio: 0.7
onClicked: {

2
Modules/SettingsPanel/Tabs/DisplayTab.qml
View file

@ -212,7 +212,7 @@ ColumnLayout {
NIconButton {
icon: "refresh"
tooltipText: "Reset Scaling"
tooltipText: "Reset scaling"
onClicked: ScalingService.setMonitorScale(modelData.name, 1.0)
}
}

2
Modules/SidePanel/Cards/MediaCard.qml
View file

@ -324,7 +324,7 @@ NBox {
// Next button
NIconButton {
icon: "skip_next"
tooltipText: "Next Media"
tooltipText: "Next media"
visible: MediaService.canGoNext
onClicked: MediaService.canGoNext ? MediaService.next() : {}
}

6
Modules/SidePanel/Cards/ProfileCard.qml
View file

@ -58,7 +58,7 @@ NBox {
}
NIconButton {
icon: "settings"
tooltipText: "Open Settings"
tooltipText: "Open settings"
onClicked: {
settingsPanel.requestedTab = SettingsPanel.Tab.General
settingsPanel.open(screen)
@ -68,7 +68,7 @@ NBox {
NIconButton {
id: powerButton
icon: "power_settings_new"
tooltipText: "Power Menu"
tooltipText: "Power menu"
onClicked: {
powerPanel.open(screen)
sidePanel.close()
@ -78,7 +78,7 @@ NBox {
NIconButton {
id: closeButton
icon: "close"
tooltipText: "Close Side Panel"
tooltipText: "Close side panel"
onClicked: {
sidePanel.close()
}

2
Modules/SidePanel/Cards/UtilitiesCard.qml
View file

@ -48,7 +48,7 @@ NBox {
// Wallpaper
NIconButton {
icon: "image"
tooltipText: "Open Wallpaper Selector"
tooltipText: "Open wallpaper selector"
onClicked: {
var settingsPanel = PanelService.getPanel("settingsPanel")
settingsPanel.requestedTab = SettingsPanel.Tab.WallpaperSelector

2
Modules/WiFiPanel/WiFiPanel.qml
View file

@ -51,7 +51,7 @@ NPanel {
NIconButton {
icon: "refresh"
tooltipText: "Refresh Networks"
tooltipText: "Refresh networks"
sizeRatio: 0.8
enabled: Settings.data.network.wifiEnabled && !NetworkService.isLoading
onClicked: {

1
Widgets/NText.qml
View file

@ -13,5 +13,4 @@ Text {
font.kerning: true
color: Color.mOnSurface
renderType: Text.QtRendering
textFormat: Text.RichText
}