diff --git a/Assets/Translations/en.json b/Assets/Translations/en.json index ef74507f..93d67a84 100644 --- a/Assets/Translations/en.json +++ b/Assets/Translations/en.json @@ -102,6 +102,10 @@ "step-size": { "label": "Volume step size", "description": "Adjust the step size for volume changes (scroll wheel, keyboard shortcuts)." + }, + "volume-overdrive": { + "label": "Allow volume overdrive", + "description": "Allow raising volume above 100%. May not be supported by all hardware." } }, "devices": { @@ -1086,6 +1090,9 @@ "hover": "Scroll On Hover", "never": "Never Scroll" }, + "frame-rates": { + "fps": "{fps} FPS" + }, "screen-recording": { "sources": { diff --git a/Modules/Bar/Widgets/MediaMini.qml b/Modules/Bar/Widgets/MediaMini.qml index ba46f5e1..08c43af0 100644 --- a/Modules/Bar/Widgets/MediaMini.qml +++ b/Modules/Bar/Widgets/MediaMini.qml @@ -72,8 +72,6 @@ Item { radius: (barPosition === "left" || barPosition === "right") ? width / 2 : Math.round(Style.radiusM * scaling) color: Settings.data.bar.showCapsule ? Color.mSurfaceVariant : Color.transparent - - Item { id: mainContainer anchors.fill: parent @@ -359,7 +357,8 @@ Item { } onEntered: { - if (scrollingMode !== "never") return + if (scrollingMode !== "never") + return if (barPosition === "left" || barPosition === "right") { tooltip.show() } else if (tooltip.text !== "") { @@ -367,7 +366,8 @@ Item { } } onExited: { - if (scrollingMode !== "never") return + if (scrollingMode !== "never") + return if (barPosition === "left" || barPosition === "right") { tooltip.hide() } else { @@ -400,4 +400,4 @@ Item { positionAbove: Settings.data.bar.position === "bottom" delay: Style.tooltipDelayLong } -} \ No newline at end of file +} diff --git a/Modules/Settings/Tabs/AudioTab.qml b/Modules/Settings/Tabs/AudioTab.qml index 64919045..b1a534da 100644 --- a/Modules/Settings/Tabs/AudioTab.qml +++ b/Modules/Settings/Tabs/AudioTab.qml @@ -134,8 +134,8 @@ ColumnLayout { Layout.fillWidth: true NToggle { - label: "Allow volume overdrive" - description: "Allow raising volume above 100%. May not be supported by all hardware." + label: I18n.tr("settings.audio.volumes.volume-overdrive.label") + description: I18n.tr("settings.audio.volumes.volume-overdrive.description") checked: Settings.data.audio.volumeOverdrive onToggled: checked => Settings.data.audio.volumeOverdrive = checked } @@ -362,25 +362,39 @@ ColumnLayout { description: I18n.tr("settings.audio.media.frame-rate.description") model: [{ "key": "30", - "name": I18n.tr("options.frame-rates.30-fps") + "name": I18n.tr("options.frame-rates.fps", { + "fps": "30" + }) }, { "key": "60", - "name": I18n.tr("options.frame-rates.60-fps") + "name": I18n.tr("options.frame-rates.fps", { + "fps": "60" + }) }, { "key": "100", - "name": I18n.tr("options.frame-rates.100-fps") + "name": I18n.tr("options.frame-rates.fps", { + "fps": "100" + }) }, { "key": "120", - "name": I18n.tr("options.frame-rates.120-fps") + "name": I18n.tr("options.frame-rates.fps", { + "fps": "120" + }) }, { "key": "144", - "name": I18n.tr("options.frame-rates.144-fps") + "name": I18n.tr("options.frame-rates.fps", { + "fps": "144" + }) }, { "key": "165", - "name": I18n.tr("options.frame-rates.165-fps") + "name": I18n.tr("options.frame-rates.fps", { + "fps": "165" + }) }, { "key": "240", - "name": I18n.tr("options.frame-rates.240-fps") + "name": I18n.tr("options.frame-rates.fps", { + "fps": "240" + }) }] currentKey: Settings.data.audio.cavaFrameRate onSelected: key => Settings.data.audio.cavaFrameRate = key diff --git a/Modules/Settings/Tabs/ScreenRecorderTab.qml b/Modules/Settings/Tabs/ScreenRecorderTab.qml index 8c129117..fad7eb11 100644 --- a/Modules/Settings/Tabs/ScreenRecorderTab.qml +++ b/Modules/Settings/Tabs/ScreenRecorderTab.qml @@ -76,15 +76,42 @@ ColumnLayout { NComboBox { label: I18n.tr("settings.screen-recorder.video.frame-rate.label") description: I18n.tr("settings.screen-recorder.video.frame-rate.description") - model: (function () { - const values = ["30", "60", "100", "120", "144", "165", "240"] - return values.map(function (v) { - return { - "key": v, - "name": (v + " FPS") - } - }) - })() + model: [{ + "key": "30", + "name": I18n.tr("options.frame-rates.fps", { + "fps": "30" + }) + }, { + "key": "60", + "name": I18n.tr("options.frame-rates.fps", { + "fps": "60" + }) + }, { + "key": "100", + "name": I18n.tr("options.frame-rates.fps", { + "fps": "100" + }) + }, { + "key": "120", + "name": I18n.tr("options.frame-rates.fps", { + "fps": "120" + }) + }, { + "key": "144", + "name": I18n.tr("options.frame-rates.fps", { + "fps": "144" + }) + }, { + "key": "165", + "name": I18n.tr("options.frame-rates.fps", { + "fps": "165" + }) + }, { + "key": "240", + "name": I18n.tr("options.frame-rates.fps", { + "fps": "240" + }) + }] currentKey: Settings.data.screenRecorder.frameRate onSelected: key => Settings.data.screenRecorder.frameRate = key }