From a54b3327239ef1cbff78d9205fd8dacba0c87bba Mon Sep 17 00:00:00 2001 From: Scarriffle Date: Tue, 11 Aug 2026 12:12:31 +0200 Subject: [PATCH] =?UTF-8?q?Notch:=20Toleranz=20f=C3=BCr=20zitternde=20H?= =?UTF-8?q?=C3=A4nde,=20=E2=80=9EPanel=20=C3=B6ffnen"=20fliegt=20raus?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Warum meine Proben grün waren und deine Hand nicht: jedes einzelne Abtastbild außerhalb der Auslösefläche hat das Aufziehen sofort abgebrochen. Ein Zeiger, den eine Hand an den oberen Rand führt, steht dort aber nicht still — er wandert um ein paar Punkte. Damit fing die Entprellzeit von 220 ms dauernd von vorn an und kam nie ans Ziel. `CGWarpMouseCursorPosition` setzt den Zeiger auf einen Punkt und hält ihn absolut still; deshalb war jede automatisierte Probe 19 von 19 grün. Kurzes Herausrutschen bricht jetzt nicht mehr ab: die Entprellzeit läuft weiter, parallel läuft die Abbruchfrist von 300 ms. Kommt der Zeiger zurück, wird die Frist gestoppt — die Entprellzeit setzt bewusst nicht neu an, sonst dauerte es bei jedem Grenzübertritt wieder von vorn. Das allein hätte einen neuen Fehler gebracht, und ein vorhandener Test hat ihn gefunden: beim beiläufigen Streifen der Notch wäre die Entprellzeit abgelaufen, während der Zeiger längst weg war — das Panel wäre für ein Zehntel aufgeblitzt. Die Maschine merkt sich deshalb, wo der Zeiger steht, und öffnet nur, wenn er da ist. Ist die Entprellzeit abgelaufen, während er draußen war, geht es beim Zurückkommen ohne weiteres Warten auf. Die Auslösefläche reicht außerdem 14 statt 4 Punkte unter die Notch. Vier Punkte sind keine Fläche, die eine Hand trifft. „Panel öffnen" ist aus dem Menü verschwunden. Ein Menüeintrag für etwas, das beim Berühren der Notch von selbst passiert, beschreibt einen Umweg um die eigentliche Bedienung herum. Als Notausgang bleibt es erreichbar, nur ohne eigene Zeile: Linksklick auf das Symbol fährt das Panel aus, Rechtsklick zeigt Einstellungen und Beenden. Dazu Protokollierung jedes Zustandswechsels und jeder Unterdrückung. Ohne diese Spur ist ein Panel, das sich „manchmal nicht öffnet", nicht zu untersuchen. Co-Authored-By: Claude Opus 5 --- Onyx/Localizable.xcstrings | 2431 +++++++++-------- Onyx/OnyxApp.swift | 44 +- .../Sources/OnyxNotch/NotchCoordinator.swift | 5 + .../Sources/OnyxNotch/NotchGeometry.swift | 5 +- .../OnyxNotch/NotchScreenController.swift | 18 +- .../Sources/OnyxNotch/NotchStateMachine.swift | 45 + .../NotchStateMachineTests.swift | 104 +- 7 files changed, 1414 insertions(+), 1238 deletions(-) diff --git a/Onyx/Localizable.xcstrings b/Onyx/Localizable.xcstrings index 47b8e44..6d38b29 100644 --- a/Onyx/Localizable.xcstrings +++ b/Onyx/Localizable.xcstrings @@ -1,1889 +1,1890 @@ { - "sourceLanguage": "en", - "strings": { - "%@": { - "comment": "A label showing the minimum RPM of a fan.", - "isCommentAutoGenerated": true, - "localizations": { - "de": { - "stringUnit": { - "state": "translated", - "value": "%@" + "sourceLanguage" : "en", + "strings" : { + "%@" : { + "comment" : "A label showing the minimum RPM of a fan.", + "isCommentAutoGenerated" : true, + "localizations" : { + "de" : { + "stringUnit" : { + "state" : "translated", + "value" : "%@" } }, - "en": { - "stringUnit": { - "state": "translated", - "value": "%@" + "en" : { + "stringUnit" : { + "state" : "translated", + "value" : "%@" } } } }, - "%@ U/min": { - "comment": "A label that shows the current speed of a fan. The argument is the current speed of the fan.", - "isCommentAutoGenerated": true, - "localizations": { - "de": { - "stringUnit": { - "state": "translated", - "value": "%@ U/min" + "%@ °C" : { + "comment" : "A label showing the temperature of the hottest fan in the report, in degrees Celsius. The argument is the temperature in degrees Celsius.", + "isCommentAutoGenerated" : true, + "localizations" : { + "de" : { + "stringUnit" : { + "state" : "translated", + "value" : "%@ °C" } }, - "en": { - "stringUnit": { - "state": "translated", - "value": "%@ U/min" + "en" : { + "stringUnit" : { + "state" : "translated", + "value" : "%@ °C" } } } }, - "%@ °C": { - "comment": "A label showing the temperature of the hottest fan in the report, in degrees Celsius. The argument is the temperature in degrees Celsius.", - "isCommentAutoGenerated": true, - "localizations": { - "de": { - "stringUnit": { - "state": "translated", - "value": "%@ °C" + "%@ U/min" : { + "comment" : "A label that shows the current speed of a fan. The argument is the current speed of the fan.", + "isCommentAutoGenerated" : true, + "localizations" : { + "de" : { + "stringUnit" : { + "state" : "translated", + "value" : "%@ U/min" } }, - "en": { - "stringUnit": { - "state": "translated", - "value": "%@ °C" + "en" : { + "stringUnit" : { + "state" : "translated", + "value" : "%@ U/min" } } } }, - "%@°": { - "comment": "A temperature in °C.", - "isCommentAutoGenerated": true, - "localizations": { - "de": { - "stringUnit": { - "state": "translated", - "value": "%@°" + "%@°" : { + "comment" : "A temperature in °C.", + "isCommentAutoGenerated" : true, + "localizations" : { + "de" : { + "stringUnit" : { + "state" : "translated", + "value" : "%@°" } }, - "en": { - "stringUnit": { - "state": "translated", - "value": "%@°" + "en" : { + "stringUnit" : { + "state" : "translated", + "value" : "%@°" } } } }, - "charge.limit": { - "localizations": { - "de": { - "stringUnit": { - "state": "translated", - "value": "Ladelimit" + "charge.limit" : { + "localizations" : { + "de" : { + "stringUnit" : { + "state" : "translated", + "value" : "Ladelimit" } }, - "en": { - "stringUnit": { - "state": "translated", - "value": "Charge limit" + "en" : { + "stringUnit" : { + "state" : "translated", + "value" : "Charge limit" } } } }, - "charge.limit.hint": { - "localizations": { - "de": { - "stringUnit": { - "state": "translated", - "value": "Ein Akku, der dauerhaft bei 100 % am Netz hängt, altert schneller. 80 bis 100 % ist der Bereich, den macOS selbst anbietet — darunter ist für dieses Gerät ungemessen." + "charge.limit.hint" : { + "localizations" : { + "de" : { + "stringUnit" : { + "state" : "translated", + "value" : "Ein Akku, der dauerhaft bei 100 % am Netz hängt, altert schneller. 80 bis 100 % ist der Bereich, den macOS selbst anbietet — darunter ist für dieses Gerät ungemessen." } }, - "en": { - "stringUnit": { - "state": "translated", - "value": "A battery kept at 100 % on power ages faster. 80 to 100 % is the range macOS itself offers — below that is untested for this machine." + "en" : { + "stringUnit" : { + "state" : "translated", + "value" : "A battery kept at 100 % on power ages faster. 80 to 100 % is the range macOS itself offers — below that is untested for this machine." } } } }, - "charge.limit.off": { - "localizations": { - "de": { - "stringUnit": { - "state": "translated", - "value": "Aus" + "charge.limit.off" : { + "localizations" : { + "de" : { + "stringUnit" : { + "state" : "translated", + "value" : "Aus" } }, - "en": { - "stringUnit": { - "state": "translated", - "value": "Off" + "en" : { + "stringUnit" : { + "state" : "translated", + "value" : "Off" } } } }, - "charge.section": { - "localizations": { - "de": { - "stringUnit": { - "state": "translated", - "value": "Akku" + "charge.section" : { + "extractionState" : "stale", + "localizations" : { + "de" : { + "stringUnit" : { + "state" : "translated", + "value" : "Akku" } }, - "en": { - "stringUnit": { - "state": "translated", - "value": "Battery" + "en" : { + "stringUnit" : { + "state" : "translated", + "value" : "Battery" } } } }, - "fans.approval.needed": { - "extractionState": "stale", - "localizations": { - "de": { - "stringUnit": { - "state": "translated", - "value": "macOS wartet auf deine Freigabe. Öffne die Systemeinstellungen und erlaube den Hintergrunddienst von Onyx." + "fans.approval.needed" : { + "extractionState" : "stale", + "localizations" : { + "de" : { + "stringUnit" : { + "state" : "translated", + "value" : "macOS wartet auf deine Freigabe. Öffne die Systemeinstellungen und erlaube den Hintergrunddienst von Onyx." } }, - "en": { - "stringUnit": { - "state": "translated", - "value": "macOS is waiting for your approval. Open System Settings and allow Onyx's background service." + "en" : { + "stringUnit" : { + "state" : "translated", + "value" : "macOS is waiting for your approval. Open System Settings and allow Onyx's background service." } } } }, - "fans.approval.open": { - "extractionState": "stale", - "localizations": { - "de": { - "stringUnit": { - "state": "translated", - "value": "Systemeinstellungen öffnen" + "fans.approval.open" : { + "extractionState" : "stale", + "localizations" : { + "de" : { + "stringUnit" : { + "state" : "translated", + "value" : "Systemeinstellungen öffnen" } }, - "en": { - "stringUnit": { - "state": "translated", - "value": "Open System Settings" + "en" : { + "stringUnit" : { + "state" : "translated", + "value" : "Open System Settings" } } } }, - "fans.approval.recheck": { - "extractionState": "stale", - "localizations": { - "de": { - "stringUnit": { - "state": "translated", - "value": "Erneut prüfen" + "fans.approval.recheck" : { + "extractionState" : "stale", + "localizations" : { + "de" : { + "stringUnit" : { + "state" : "translated", + "value" : "Erneut prüfen" } }, - "en": { - "stringUnit": { - "state": "translated", - "value": "Check again" + "en" : { + "stringUnit" : { + "state" : "translated", + "value" : "Check again" } } } }, - "fans.auto": { - "comment": "A button to set a fan to automatic mode.", - "isCommentAutoGenerated": true, - "localizations": { - "de": { - "stringUnit": { - "state": "translated", - "value": "Auto" + "fans.auto" : { + "comment" : "A button to set a fan to automatic mode.", + "isCommentAutoGenerated" : true, + "localizations" : { + "de" : { + "stringUnit" : { + "state" : "translated", + "value" : "Auto" } }, - "en": { - "stringUnit": { - "state": "translated", - "value": "Auto" + "en" : { + "stringUnit" : { + "state" : "translated", + "value" : "Auto" } } } }, - "fans.connecting": { - "localizations": { - "de": { - "stringUnit": { - "state": "translated", - "value": "Verbinde mit dem Hilfsdienst …" + "fans.connecting" : { + "localizations" : { + "de" : { + "stringUnit" : { + "state" : "translated", + "value" : "Verbinde mit dem Hilfsdienst …" } }, - "en": { - "stringUnit": { - "state": "translated", - "value": "Connecting to the helper…" + "en" : { + "stringUnit" : { + "state" : "translated", + "value" : "Connecting to the helper…" } } } }, - "fans.fan %@": { - "comment": "A label showing the index of a fan. The argument is the index of the fan.", - "isCommentAutoGenerated": true, - "localizations": { - "de": { - "stringUnit": { - "state": "translated", - "value": "Lüfter %@" + "fans.fan %@" : { + "comment" : "A label showing the index of a fan. The argument is the index of the fan.", + "isCommentAutoGenerated" : true, + "localizations" : { + "de" : { + "stringUnit" : { + "state" : "translated", + "value" : "Lüfter %@" } }, - "en": { - "stringUnit": { - "state": "translated", - "value": "Fan %@" + "en" : { + "stringUnit" : { + "state" : "translated", + "value" : "Fan %@" } } } }, - "fans.fan %lld": { - "extractionState": "stale", - "localizations": { - "de": { - "stringUnit": { - "state": "translated", - "value": "Lüfter %lld" + "fans.fan %lld" : { + "extractionState" : "stale", + "localizations" : { + "de" : { + "stringUnit" : { + "state" : "translated", + "value" : "Lüfter %lld" } }, - "en": { - "stringUnit": { - "state": "translated", - "value": "Fan %lld" + "en" : { + "stringUnit" : { + "state" : "translated", + "value" : "Fan %lld" } } } }, - "fans.hottest": { - "extractionState": "stale", - "localizations": { - "de": { - "stringUnit": { - "state": "translated", - "value": "Wärmster Kern" + "fans.hottest" : { + "extractionState" : "stale", + "localizations" : { + "de" : { + "stringUnit" : { + "state" : "translated", + "value" : "Wärmster Kern" } }, - "en": { - "stringUnit": { - "state": "translated", - "value": "Hottest core" + "en" : { + "stringUnit" : { + "state" : "translated", + "value" : "Hottest core" } } } }, - "fans.install": { - "localizations": { - "de": { - "stringUnit": { - "state": "translated", - "value": "Installieren" + "fans.install" : { + "localizations" : { + "de" : { + "stringUnit" : { + "state" : "translated", + "value" : "Installieren" } }, - "en": { - "stringUnit": { - "state": "translated", - "value": "Install" + "en" : { + "stringUnit" : { + "state" : "translated", + "value" : "Install" } } } }, - "fans.intro": { - "localizations": { - "de": { - "stringUnit": { - "state": "translated", - "value": "Onyx kann die Lüfterdrehzahl fest vorgeben, statt sie macOS zu überlassen. Dafür wird ein Hilfsdienst mit Systemrechten eingerichtet — Schreibzugriff auf den SMC geht nicht anders." + "fans.intro" : { + "localizations" : { + "de" : { + "stringUnit" : { + "state" : "translated", + "value" : "Onyx kann die Lüfterdrehzahl fest vorgeben, statt sie macOS zu überlassen. Dafür wird ein Hilfsdienst mit Systemrechten eingerichtet — Schreibzugriff auf den SMC geht nicht anders." } }, - "en": { - "stringUnit": { - "state": "translated", - "value": "Onyx can set a fixed fan speed instead of leaving it to macOS. This requires a helper service with system privileges — writing to the SMC is not possible otherwise." + "en" : { + "stringUnit" : { + "state" : "translated", + "value" : "Onyx can set a fixed fan speed instead of leaving it to macOS. This requires a helper service with system privileges — writing to the SMC is not possible otherwise." } } } }, - "fans.left": { - "extractionState": "stale", - "localizations": { - "de": { - "stringUnit": { - "state": "translated", - "value": "Lüfter links" + "fans.left" : { + "extractionState" : "stale", + "localizations" : { + "de" : { + "stringUnit" : { + "state" : "translated", + "value" : "Lüfter links" } }, - "en": { - "stringUnit": { - "state": "translated", - "value": "Left fan" + "en" : { + "stringUnit" : { + "state" : "translated", + "value" : "Left fan" } } } }, - "fans.manual": { - "extractionState": "stale", - "localizations": { - "de": { - "stringUnit": { - "state": "translated", - "value": "Manuell" + "fans.manual" : { + "extractionState" : "stale", + "localizations" : { + "de" : { + "stringUnit" : { + "state" : "translated", + "value" : "Manuell" } }, - "en": { - "stringUnit": { - "state": "translated", - "value": "Manual" + "en" : { + "stringUnit" : { + "state" : "translated", + "value" : "Manual" } } } }, - "fans.mode.auto": { - "localizations": { - "de": { - "stringUnit": { - "state": "translated", - "value": "Automatik" + "fans.mode.auto" : { + "localizations" : { + "de" : { + "stringUnit" : { + "state" : "translated", + "value" : "Automatik" } }, - "en": { - "stringUnit": { - "state": "translated", - "value": "Automatic" + "en" : { + "stringUnit" : { + "state" : "translated", + "value" : "Automatic" } } } }, - "fans.mode.manual": { - "localizations": { - "de": { - "stringUnit": { - "state": "translated", - "value": "Manuell" + "fans.mode.manual" : { + "localizations" : { + "de" : { + "stringUnit" : { + "state" : "translated", + "value" : "Manuell" } }, - "en": { - "stringUnit": { - "state": "translated", - "value": "Manual" + "en" : { + "stringUnit" : { + "state" : "translated", + "value" : "Manual" } } } }, - "fans.noData": { - "extractionState": "stale", - "localizations": { - "de": { - "stringUnit": { - "state": "translated", - "value": "Noch keine Lüfterdaten." + "fans.noData" : { + "extractionState" : "stale", + "localizations" : { + "de" : { + "stringUnit" : { + "state" : "translated", + "value" : "Noch keine Lüfterdaten." } }, - "en": { - "stringUnit": { - "state": "translated", - "value": "No fan data yet." + "en" : { + "stringUnit" : { + "state" : "translated", + "value" : "No fan data yet." } } } }, - "fans.noRange": { - "localizations": { - "de": { - "stringUnit": { - "state": "translated", - "value": "Kein Regelbereich" + "fans.noRange" : { + "localizations" : { + "de" : { + "stringUnit" : { + "state" : "translated", + "value" : "Kein Regelbereich" } }, - "en": { - "stringUnit": { - "state": "translated", - "value": "No adjustable range" + "en" : { + "stringUnit" : { + "state" : "translated", + "value" : "No adjustable range" } } } }, - "fans.notInstalled": { - "extractionState": "stale", - "localizations": { - "de": { - "stringUnit": { - "state": "translated", - "value": "Die Lüftersteuerung braucht einen kleinen privilegierten Dienst." + "fans.notInstalled" : { + "extractionState" : "stale", + "localizations" : { + "de" : { + "stringUnit" : { + "state" : "translated", + "value" : "Die Lüftersteuerung braucht einen kleinen privilegierten Dienst." } }, - "en": { - "stringUnit": { - "state": "translated", - "value": "Fan control needs a small privileged service." + "en" : { + "stringUnit" : { + "state" : "translated", + "value" : "Fan control needs a small privileged service." } } } }, - "fans.reason.noTemperature": { - "extractionState": "stale", - "localizations": { - "de": { - "stringUnit": { - "state": "translated", - "value": "Zurück auf Automatik: keine Temperatur messbar, damit lässt sich Sicherheit nicht beurteilen." + "fans.reason.noTemperature" : { + "extractionState" : "stale", + "localizations" : { + "de" : { + "stringUnit" : { + "state" : "translated", + "value" : "Zurück auf Automatik: keine Temperatur messbar, damit lässt sich Sicherheit nicht beurteilen." } }, - "en": { - "stringUnit": { - "state": "translated", - "value": "Back to automatic: no temperature reading, so safety cannot be judged." + "en" : { + "stringUnit" : { + "state" : "translated", + "value" : "Back to automatic: no temperature reading, so safety cannot be judged." } } } }, - "fans.reason.other": { - "extractionState": "stale", - "localizations": { - "de": { - "stringUnit": { - "state": "translated", - "value": "Zurück auf Automatik." + "fans.reason.other" : { + "extractionState" : "stale", + "localizations" : { + "de" : { + "stringUnit" : { + "state" : "translated", + "value" : "Zurück auf Automatik." } }, - "en": { - "stringUnit": { - "state": "translated", - "value": "Back to automatic." + "en" : { + "stringUnit" : { + "state" : "translated", + "value" : "Back to automatic." } } } }, - "fans.reason.temperature": { - "extractionState": "stale", - "localizations": { - "de": { - "stringUnit": { - "state": "translated", - "value": "Zurück auf Automatik: zu heiß für eine feste Drehzahl." + "fans.reason.temperature" : { + "extractionState" : "stale", + "localizations" : { + "de" : { + "stringUnit" : { + "state" : "translated", + "value" : "Zurück auf Automatik: zu heiß für eine feste Drehzahl." } }, - "en": { - "stringUnit": { - "state": "translated", - "value": "Back to automatic: too hot for a fixed speed." + "en" : { + "stringUnit" : { + "state" : "translated", + "value" : "Back to automatic: too hot for a fixed speed." } } } }, - "fans.reason.unknownLimits": { - "extractionState": "stale", - "localizations": { - "de": { - "stringUnit": { - "state": "translated", - "value": "Zurück auf Automatik: der erlaubte Drehzahlbereich ist nicht lesbar." + "fans.reason.unknownLimits" : { + "extractionState" : "stale", + "localizations" : { + "de" : { + "stringUnit" : { + "state" : "translated", + "value" : "Zurück auf Automatik: der erlaubte Drehzahlbereich ist nicht lesbar." } }, - "en": { - "stringUnit": { - "state": "translated", - "value": "Back to automatic: the permitted speed range cannot be read." + "en" : { + "stringUnit" : { + "state" : "translated", + "value" : "Back to automatic: the permitted speed range cannot be read." } } } }, - "fans.reason.watchdog": { - "extractionState": "stale", - "localizations": { - "de": { - "stringUnit": { - "state": "translated", - "value": "Zurück auf Automatik: Onyx hat sich zu lange nicht gemeldet." + "fans.reason.watchdog" : { + "extractionState" : "stale", + "localizations" : { + "de" : { + "stringUnit" : { + "state" : "translated", + "value" : "Zurück auf Automatik: Onyx hat sich zu lange nicht gemeldet." } }, - "en": { - "stringUnit": { - "state": "translated", - "value": "Back to automatic: Onyx went silent for too long." + "en" : { + "stringUnit" : { + "state" : "translated", + "value" : "Back to automatic: Onyx went silent for too long." } } } }, - "fans.right": { - "extractionState": "stale", - "localizations": { - "de": { - "stringUnit": { - "state": "translated", - "value": "Lüfter rechts" + "fans.right" : { + "extractionState" : "stale", + "localizations" : { + "de" : { + "stringUnit" : { + "state" : "translated", + "value" : "Lüfter rechts" } }, - "en": { - "stringUnit": { - "state": "translated", - "value": "Right fan" + "en" : { + "stringUnit" : { + "state" : "translated", + "value" : "Right fan" } } } }, - "fans.safety": { - "localizations": { - "de": { - "stringUnit": { - "state": "translated", - "value": "Deshalb greift ein Sicherheitsnetz, das sich nicht abschalten lässt: nie unter das Minimum der Firmware, Rückfall auf Automatik ab 95 °C, Rückfall wenn Onyx sich fünf Sekunden nicht meldet, und Rückfall beim Beenden." + "fans.safety" : { + "localizations" : { + "de" : { + "stringUnit" : { + "state" : "translated", + "value" : "Deshalb greift ein Sicherheitsnetz, das sich nicht abschalten lässt: nie unter das Minimum der Firmware, Rückfall auf Automatik ab 95 °C, Rückfall wenn Onyx sich fünf Sekunden nicht meldet, und Rückfall beim Beenden." } }, - "en": { - "stringUnit": { - "state": "translated", - "value": "A safety net you cannot switch off is therefore always active: never below the firmware minimum, back to automatic above 95 °C, back to automatic if Onyx goes silent for five seconds, and back to automatic on quit." + "en" : { + "stringUnit" : { + "state" : "translated", + "value" : "A safety net you cannot switch off is therefore always active: never below the firmware minimum, back to automatic above 95 °C, back to automatic if Onyx goes silent for five seconds, and back to automatic on quit." } } } }, - "fans.safety.active": { - "localizations": { - "de": { - "stringUnit": { - "state": "translated", - "value": "Das Sicherheitsnetz läuft im Hilfsdienst, nicht in Onyx. Es greift auch dann, wenn Onyx abstürzt oder beendet wird." + "fans.safety.active" : { + "localizations" : { + "de" : { + "stringUnit" : { + "state" : "translated", + "value" : "Das Sicherheitsnetz läuft im Hilfsdienst, nicht in Onyx. Es greift auch dann, wenn Onyx abstürzt oder beendet wird." } }, - "en": { - "stringUnit": { - "state": "translated", - "value": "The safety net runs in the helper, not in Onyx. It works even if Onyx crashes or is quit." + "en" : { + "stringUnit" : { + "state" : "translated", + "value" : "The safety net runs in the helper, not in Onyx. It works even if Onyx crashes or is quit." } } } }, - "fans.uninstall": { - "extractionState": "stale", - "localizations": { - "de": { - "stringUnit": { - "state": "translated", - "value": "Hilfsdienst entfernen" + "fans.uninstall" : { + "extractionState" : "stale", + "localizations" : { + "de" : { + "stringUnit" : { + "state" : "translated", + "value" : "Hilfsdienst entfernen" } }, - "en": { - "stringUnit": { - "state": "translated", - "value": "Remove helper" + "en" : { + "stringUnit" : { + "state" : "translated", + "value" : "Remove helper" } } } }, - "fans.warning": { - "extractionState": "stale", - "localizations": { - "de": { - "stringUnit": { - "state": "translated", - "value": "Eine zu niedrige Drehzahl kann den Rechner überhitzen lassen. Die Automatik regelt nach Temperatur, ein fester Wert nicht." + "fans.warning" : { + "extractionState" : "stale", + "localizations" : { + "de" : { + "stringUnit" : { + "state" : "translated", + "value" : "Eine zu niedrige Drehzahl kann den Rechner überhitzen lassen. Die Automatik regelt nach Temperatur, ein fester Wert nicht." } }, - "en": { - "stringUnit": { - "state": "translated", - "value": "A fan speed set too low can let the Mac overheat. The automatic control adjusts to temperature; a fixed value does not." + "en" : { + "stringUnit" : { + "state" : "translated", + "value" : "A fan speed set too low can let the Mac overheat. The automatic control adjusts to temperature; a fixed value does not." } } } }, - "menu.openPanel": { - "extractionState": "stale", - "localizations": { - "de": { - "stringUnit": { - "state": "translated", - "value": "Panel öffnen" + "menu.openPanel" : { + "extractionState" : "stale", + "localizations" : { + "de" : { + "stringUnit" : { + "state" : "translated", + "value" : "Panel öffnen" } }, - "en": { - "stringUnit": { - "state": "translated", - "value": "Open Panel" + "en" : { + "stringUnit" : { + "state" : "translated", + "value" : "Open Panel" } } } }, - "menu.quit": { - "extractionState": "stale", - "localizations": { - "de": { - "stringUnit": { - "state": "translated", - "value": "Onyx beenden" + "menu.quit" : { + "extractionState" : "stale", + "localizations" : { + "de" : { + "stringUnit" : { + "state" : "translated", + "value" : "Onyx beenden" } }, - "en": { - "stringUnit": { - "state": "translated", - "value": "Quit Onyx" + "en" : { + "stringUnit" : { + "state" : "translated", + "value" : "Quit Onyx" } } } }, - "menu.settings": { - "extractionState": "stale", - "localizations": { - "de": { - "stringUnit": { - "state": "translated", - "value": "Einstellungen …" + "menu.settings" : { + "extractionState" : "stale", + "localizations" : { + "de" : { + "stringUnit" : { + "state" : "translated", + "value" : "Einstellungen …" } }, - "en": { - "stringUnit": { - "state": "translated", - "value": "Settings…" + "en" : { + "stringUnit" : { + "state" : "translated", + "value" : "Settings…" } } } }, - "metric.battery": { - "extractionState": "stale", - "localizations": { - "de": { - "stringUnit": { - "state": "translated", - "value": "Akku" + "metric.battery" : { + "extractionState" : "stale", + "localizations" : { + "de" : { + "stringUnit" : { + "state" : "translated", + "value" : "Akku" } }, - "en": { - "stringUnit": { - "state": "translated", - "value": "Battery" + "en" : { + "stringUnit" : { + "state" : "translated", + "value" : "Battery" } } } }, - "metric.cpu": { - "extractionState": "stale", - "localizations": { - "de": { - "stringUnit": { - "state": "translated", - "value": "CPU" + "metric.cpu" : { + "extractionState" : "stale", + "localizations" : { + "de" : { + "stringUnit" : { + "state" : "translated", + "value" : "CPU" } }, - "en": { - "stringUnit": { - "state": "translated", - "value": "CPU" + "en" : { + "stringUnit" : { + "state" : "translated", + "value" : "CPU" } } } }, - "metric.gpu": { - "extractionState": "stale", - "localizations": { - "de": { - "stringUnit": { - "state": "translated", - "value": "GPU" + "metric.gpu" : { + "extractionState" : "stale", + "localizations" : { + "de" : { + "stringUnit" : { + "state" : "translated", + "value" : "GPU" } }, - "en": { - "stringUnit": { - "state": "translated", - "value": "GPU" + "en" : { + "stringUnit" : { + "state" : "translated", + "value" : "GPU" } } } }, - "metric.memory": { - "extractionState": "stale", - "localizations": { - "de": { - "stringUnit": { - "state": "translated", - "value": "Speicher" + "metric.memory" : { + "extractionState" : "stale", + "localizations" : { + "de" : { + "stringUnit" : { + "state" : "translated", + "value" : "Speicher" } }, - "en": { - "stringUnit": { - "state": "translated", - "value": "Memory" + "en" : { + "stringUnit" : { + "state" : "translated", + "value" : "Memory" } } } }, - "metric.mode.temperature": { - "localizations": { - "de": { - "stringUnit": { - "state": "translated", - "value": "Temperatur" + "metric.mode.temperature" : { + "localizations" : { + "de" : { + "stringUnit" : { + "state" : "translated", + "value" : "Temperatur" } }, - "en": { - "stringUnit": { - "state": "translated", - "value": "Temperature" + "en" : { + "stringUnit" : { + "state" : "translated", + "value" : "Temperature" } } } }, - "metric.mode.usage": { - "localizations": { - "de": { - "stringUnit": { - "state": "translated", - "value": "Auslastung" + "metric.mode.usage" : { + "localizations" : { + "de" : { + "stringUnit" : { + "state" : "translated", + "value" : "Auslastung" } }, - "en": { - "stringUnit": { - "state": "translated", - "value": "Usage" + "en" : { + "stringUnit" : { + "state" : "translated", + "value" : "Usage" } } } }, - "metric.sensors": { - "extractionState": "stale", - "localizations": { - "de": { - "stringUnit": { - "state": "translated", - "value": "Sensoren" + "metric.sensors" : { + "extractionState" : "stale", + "localizations" : { + "de" : { + "stringUnit" : { + "state" : "translated", + "value" : "Sensoren" } }, - "en": { - "stringUnit": { - "state": "translated", - "value": "Sensors" + "en" : { + "stringUnit" : { + "state" : "translated", + "value" : "Sensors" } } } }, - "mixer.menubar.name": { - "extractionState": "stale", - "localizations": { - "de": { - "stringUnit": { - "state": "translated", - "value": "Lautstärkemixer" + "mixer.menubar.name" : { + "extractionState" : "stale", + "localizations" : { + "de" : { + "stringUnit" : { + "state" : "translated", + "value" : "Lautstärkemixer" } }, - "en": { - "stringUnit": { - "state": "translated", - "value": "Volume mixer" + "en" : { + "stringUnit" : { + "state" : "translated", + "value" : "Volume mixer" } } } }, - "network.name": { - "extractionState": "stale", - "localizations": { - "de": { - "stringUnit": { - "state": "translated", - "value": "Netzwerk" + "network.name" : { + "extractionState" : "stale", + "localizations" : { + "de" : { + "stringUnit" : { + "state" : "translated", + "value" : "Netzwerk" } }, - "en": { - "stringUnit": { - "state": "translated", - "value": "Network" + "en" : { + "stringUnit" : { + "state" : "translated", + "value" : "Network" } } } }, - "onboarding.allow": { - "extractionState": "stale", - "localizations": { - "de": { - "stringUnit": { - "state": "translated", - "value": "Erlauben" + "onboarding.allow" : { + "extractionState" : "stale", + "localizations" : { + "de" : { + "stringUnit" : { + "state" : "translated", + "value" : "Erlauben" } }, - "en": { - "stringUnit": { - "state": "translated", - "value": "Allow" + "en" : { + "stringUnit" : { + "state" : "translated", + "value" : "Allow" } } } }, - "onboarding.audio": { - "extractionState": "stale", - "localizations": { - "de": { - "stringUnit": { - "state": "translated", - "value": "Systemton" + "onboarding.audio" : { + "extractionState" : "stale", + "localizations" : { + "de" : { + "stringUnit" : { + "state" : "translated", + "value" : "Systemton" } }, - "en": { - "stringUnit": { - "state": "translated", - "value": "System audio" + "en" : { + "stringUnit" : { + "state" : "translated", + "value" : "System audio" } } } }, - "onboarding.audio.why": { - "extractionState": "stale", - "localizations": { - "de": { - "stringUnit": { - "state": "translated", - "value": "Nötig für die Lautstärke einzelner Programme. Onyx leitet den Ton der geregelten Programme um — und nur deren." + "onboarding.audio.why" : { + "extractionState" : "stale", + "localizations" : { + "de" : { + "stringUnit" : { + "state" : "translated", + "value" : "Nötig für die Lautstärke einzelner Programme. Onyx leitet den Ton der geregelten Programme um — und nur deren." } }, - "en": { - "stringUnit": { - "state": "translated", - "value": "Needed for per-app volume. Onyx routes the audio of the apps you control, and only those." + "en" : { + "stringUnit" : { + "state" : "translated", + "value" : "Needed for per-app volume. Onyx routes the audio of the apps you control, and only those." } } } }, - "onboarding.calendar": { - "extractionState": "stale", - "localizations": { - "de": { - "stringUnit": { - "state": "translated", - "value": "Kalender" + "onboarding.calendar" : { + "extractionState" : "stale", + "localizations" : { + "de" : { + "stringUnit" : { + "state" : "translated", + "value" : "Kalender" } }, - "en": { - "stringUnit": { - "state": "translated", - "value": "Calendar" + "en" : { + "stringUnit" : { + "state" : "translated", + "value" : "Calendar" } } } }, - "onboarding.calendar.why": { - "extractionState": "stale", - "localizations": { - "de": { - "stringUnit": { - "state": "translated", - "value": "Zeigt deine Termine im Panel. Nur lesend — Onyx ändert nie einen Kalender." + "onboarding.calendar.why" : { + "extractionState" : "stale", + "localizations" : { + "de" : { + "stringUnit" : { + "state" : "translated", + "value" : "Zeigt deine Termine im Panel. Nur lesend — Onyx ändert nie einen Kalender." } }, - "en": { - "stringUnit": { - "state": "translated", - "value": "Shows your appointments in the panel. Read-only — Onyx never changes a calendar." + "en" : { + "stringUnit" : { + "state" : "translated", + "value" : "Shows your appointments in the panel. Read-only — Onyx never changes a calendar." } } } }, - "onboarding.done": { - "extractionState": "stale", - "localizations": { - "de": { - "stringUnit": { - "state": "translated", - "value": "Fertig" + "onboarding.done" : { + "extractionState" : "stale", + "localizations" : { + "de" : { + "stringUnit" : { + "state" : "translated", + "value" : "Fertig" } }, - "en": { - "stringUnit": { - "state": "translated", - "value": "Done" + "en" : { + "stringUnit" : { + "state" : "translated", + "value" : "Done" } } } }, - "onboarding.helper": { - "extractionState": "stale", - "localizations": { - "de": { - "stringUnit": { - "state": "translated", - "value": "Lüftersteuerung" + "onboarding.helper" : { + "extractionState" : "stale", + "localizations" : { + "de" : { + "stringUnit" : { + "state" : "translated", + "value" : "Lüftersteuerung" } }, - "en": { - "stringUnit": { - "state": "translated", - "value": "Fan control" + "en" : { + "stringUnit" : { + "state" : "translated", + "value" : "Fan control" } } } }, - "onboarding.helper.why": { - "extractionState": "stale", - "localizations": { - "de": { - "stringUnit": { - "state": "translated", - "value": "Installiert einen kleinen privilegierten Dienst. Er setzt nur Lüfterdrehzahlen und fällt auf Automatik zurück, wenn Onyx schweigt." + "onboarding.helper.why" : { + "extractionState" : "stale", + "localizations" : { + "de" : { + "stringUnit" : { + "state" : "translated", + "value" : "Installiert einen kleinen privilegierten Dienst. Er setzt nur Lüfterdrehzahlen und fällt auf Automatik zurück, wenn Onyx schweigt." } }, - "en": { - "stringUnit": { - "state": "translated", - "value": "Installs a small privileged service. It only sets fan speeds and falls back to automatic if Onyx goes silent." + "en" : { + "stringUnit" : { + "state" : "translated", + "value" : "Installs a small privileged service. It only sets fan speeds and falls back to automatic if Onyx goes silent." } } } }, - "onboarding.launchAtLogin": { - "localizations": { - "de": { - "stringUnit": { - "state": "translated", - "value": "Onyx beim Anmelden starten" + "onboarding.launchAtLogin" : { + "localizations" : { + "de" : { + "stringUnit" : { + "state" : "translated", + "value" : "Onyx beim Anmelden starten" } }, - "en": { - "stringUnit": { - "state": "translated", - "value": "Start Onyx at login" + "en" : { + "stringUnit" : { + "state" : "translated", + "value" : "Start Onyx at login" } } } }, - "onboarding.location": { - "extractionState": "stale", - "localizations": { - "de": { - "stringUnit": { - "state": "translated", - "value": "Standort" + "onboarding.location" : { + "extractionState" : "stale", + "localizations" : { + "de" : { + "stringUnit" : { + "state" : "translated", + "value" : "Standort" } }, - "en": { - "stringUnit": { - "state": "translated", - "value": "Location" + "en" : { + "stringUnit" : { + "state" : "translated", + "value" : "Location" } } } }, - "onboarding.location.why": { - "extractionState": "stale", - "localizations": { - "de": { - "stringUnit": { - "state": "translated", - "value": "Wetter für deinen Aufenthaltsort. Alternativ lässt sich je Widget ein fester Ort einstellen." + "onboarding.location.why" : { + "extractionState" : "stale", + "localizations" : { + "de" : { + "stringUnit" : { + "state" : "translated", + "value" : "Wetter für deinen Aufenthaltsort. Alternativ lässt sich je Widget ein fester Ort einstellen." } }, - "en": { - "stringUnit": { - "state": "translated", - "value": "Weather for where you are. You can also set a fixed place per widget instead." + "en" : { + "stringUnit" : { + "state" : "translated", + "value" : "Weather for where you are. You can also set a fixed place per widget instead." } } } }, - "onboarding.openSettings": { - "extractionState": "stale", - "localizations": { - "de": { - "stringUnit": { - "state": "translated", - "value": "Systemeinstellungen öffnen" + "onboarding.openSettings" : { + "extractionState" : "stale", + "localizations" : { + "de" : { + "stringUnit" : { + "state" : "translated", + "value" : "Systemeinstellungen öffnen" } }, - "en": { - "stringUnit": { - "state": "translated", - "value": "Open System Settings" + "en" : { + "stringUnit" : { + "state" : "translated", + "value" : "Open System Settings" } } } }, - "onboarding.subtitle": { - "localizations": { - "de": { - "stringUnit": { - "state": "translated", - "value": "Onyx braucht vier Dinge vom System. Jedes für etwas anderes, und keines davon ist Pflicht — erlaube, was du nutzen möchtest." + "onboarding.subtitle" : { + "localizations" : { + "de" : { + "stringUnit" : { + "state" : "translated", + "value" : "Onyx braucht vier Dinge vom System. Jedes für etwas anderes, und keines davon ist Pflicht — erlaube, was du nutzen möchtest." } }, - "en": { - "stringUnit": { - "state": "translated", - "value": "Onyx needs four things from the system. Each one is for something different, and none of them is required — grant what you want to use." + "en" : { + "stringUnit" : { + "state" : "translated", + "value" : "Onyx needs four things from the system. Each one is for something different, and none of them is required — grant what you want to use." } } } }, - "onboarding.title": { - "localizations": { - "de": { - "stringUnit": { - "state": "translated", - "value": "Willkommen bei Onyx" + "onboarding.title" : { + "localizations" : { + "de" : { + "stringUnit" : { + "state" : "translated", + "value" : "Willkommen bei Onyx" } }, - "en": { - "stringUnit": { - "state": "translated", - "value": "Welcome to Onyx" + "en" : { + "stringUnit" : { + "state" : "translated", + "value" : "Welcome to Onyx" } } } }, - "settings.display.all": { - "localizations": { - "de": { - "stringUnit": { - "state": "translated", - "value": "Allen Displays" + "settings.display.all" : { + "localizations" : { + "de" : { + "stringUnit" : { + "state" : "translated", + "value" : "Allen Displays" } }, - "en": { - "stringUnit": { - "state": "translated", - "value": "All displays" + "en" : { + "stringUnit" : { + "state" : "translated", + "value" : "All displays" } } } }, - "settings.display.builtInOnly": { - "localizations": { - "de": { - "stringUnit": { - "state": "translated", - "value": "Nur dem internen Display" + "settings.display.builtInOnly" : { + "localizations" : { + "de" : { + "stringUnit" : { + "state" : "translated", + "value" : "Nur dem internen Display" } }, - "en": { - "stringUnit": { - "state": "translated", - "value": "Built-in display only" + "en" : { + "stringUnit" : { + "state" : "translated", + "value" : "Built-in display only" } } } }, - "settings.display.dockIcon": { - "extractionState": "stale", - "localizations": { - "de": { - "stringUnit": { - "state": "translated", - "value": "Symbol im Dock anzeigen" + "settings.display.dockIcon" : { + "extractionState" : "stale", + "localizations" : { + "de" : { + "stringUnit" : { + "state" : "translated", + "value" : "Symbol im Dock anzeigen" } }, - "en": { - "stringUnit": { - "state": "translated", - "value": "Show icon in the Dock" + "en" : { + "stringUnit" : { + "state" : "translated", + "value" : "Show icon in the Dock" } } } }, - "settings.display.dockIcon.hint": { - "localizations": { - "de": { - "stringUnit": { - "state": "translated", - "value": "Standardmäßig aus. Onyx lebt in der Notch und in der Menüleiste und hat kein Hauptfenster — im Dock wäre es ein Symbol, das beim Anklicken nichts öffnet, und es stünde im Programmumschalter zwischen den Programmen, mit denen du arbeitest." + "settings.display.dockIcon.hint" : { + "localizations" : { + "de" : { + "stringUnit" : { + "state" : "translated", + "value" : "Standardmäßig aus. Onyx lebt in der Notch und in der Menüleiste und hat kein Hauptfenster — im Dock wäre es ein Symbol, das beim Anklicken nichts öffnet, und es stünde im Programmumschalter zwischen den Programmen, mit denen du arbeitest." } }, - "en": { - "stringUnit": { - "state": "translated", - "value": "Off by default. Onyx lives in the notch and the menu bar and has no main window — in the Dock it would be an icon that opens nothing, and it would sit in the app switcher among the apps you actually work with." + "en" : { + "stringUnit" : { + "state" : "translated", + "value" : "Off by default. Onyx lives in the notch and the menu bar and has no main window — in the Dock it would be an icon that opens nothing, and it would sit in the app switcher among the apps you actually work with." } } } }, - "settings.display.hint": { - "localizations": { - "de": { - "stringUnit": { - "state": "translated", - "value": "Auf Displays ohne echte Notch erscheint oben mittig ein Balken, der sich genauso verhält. Ist der Deckel geschlossen und kein internes Display vorhanden, erscheint das Panel trotzdem auf einem externen — sonst wäre Onyx nicht erreichbar." + "settings.display.hint" : { + "localizations" : { + "de" : { + "stringUnit" : { + "state" : "translated", + "value" : "Auf Displays ohne echte Notch erscheint oben mittig ein Balken, der sich genauso verhält. Ist der Deckel geschlossen und kein internes Display vorhanden, erscheint das Panel trotzdem auf einem externen — sonst wäre Onyx nicht erreichbar." } }, - "en": { - "stringUnit": { - "state": "translated", - "value": "On displays without a real notch, a bar appears at the top centre and behaves the same. With the lid closed and no built-in display present, the panel still appears on an external one — otherwise Onyx would be unreachable." + "en" : { + "stringUnit" : { + "state" : "translated", + "value" : "On displays without a real notch, a bar appears at the top centre and behaves the same. With the lid closed and no built-in display present, the panel still appears on an external one — otherwise Onyx would be unreachable." } } } }, - "settings.display.menuBarIcon": { - "extractionState": "stale", - "localizations": { - "de": { - "stringUnit": { - "state": "translated", - "value": "Symbol in der Menüleiste anzeigen" + "settings.display.menuBarIcon" : { + "extractionState" : "stale", + "localizations" : { + "de" : { + "stringUnit" : { + "state" : "translated", + "value" : "Symbol in der Menüleiste anzeigen" } }, - "en": { - "stringUnit": { - "state": "translated", - "value": "Show icon in the menu bar" + "en" : { + "stringUnit" : { + "state" : "translated", + "value" : "Show icon in the menu bar" } } } }, - "settings.display.menuBarIcon.hint": { - "localizations": { - "de": { - "stringUnit": { - "state": "translated", - "value": "Über das Symbol erreichst du Panel, Einstellungen und Beenden. Ohne es kommst du nur über die Notch an Onyx heran." + "settings.display.menuBarIcon.hint" : { + "localizations" : { + "de" : { + "stringUnit" : { + "state" : "translated", + "value" : "Über das Symbol erreichst du Panel, Einstellungen und Beenden. Ohne es kommst du nur über die Notch an Onyx heran." } }, - "en": { - "stringUnit": { - "state": "translated", - "value": "The icon gives you the panel, settings and quit. Without it, the notch is the only way to reach Onyx." + "en" : { + "stringUnit" : { + "state" : "translated", + "value" : "The icon gives you the panel, settings and quit. Without it, the notch is the only way to reach Onyx." } } } }, - "settings.display.policy": { - "extractionState": "stale", - "localizations": { - "de": { - "stringUnit": { - "state": "translated", - "value": "Panel anzeigen auf" + "settings.display.policy" : { + "extractionState" : "stale", + "localizations" : { + "de" : { + "stringUnit" : { + "state" : "translated", + "value" : "Panel anzeigen auf" } }, - "en": { - "stringUnit": { - "state": "translated", - "value": "Show panel on" + "en" : { + "stringUnit" : { + "state" : "translated", + "value" : "Show panel on" } } } }, - "settings.general": { - "extractionState": "stale", - "localizations": { - "de": { - "stringUnit": { - "state": "translated", - "value": "Allgemein" + "settings.general" : { + "extractionState" : "stale", + "localizations" : { + "de" : { + "stringUnit" : { + "state" : "translated", + "value" : "Allgemein" } }, - "en": { - "stringUnit": { - "state": "translated", - "value": "General" + "en" : { + "stringUnit" : { + "state" : "translated", + "value" : "General" } } } }, - "settings.launchAtLogin": { - "localizations": { - "de": { - "stringUnit": { - "state": "translated", - "value": "Beim Anmelden starten" + "settings.launchAtLogin" : { + "localizations" : { + "de" : { + "stringUnit" : { + "state" : "translated", + "value" : "Beim Anmelden starten" } }, - "en": { - "stringUnit": { - "state": "translated", - "value": "Start at login" + "en" : { + "stringUnit" : { + "state" : "translated", + "value" : "Start at login" } } } }, - "settings.launchAtLogin.blocked": { - "localizations": { - "de": { - "stringUnit": { - "state": "translated", - "value": "Anmeldeobjekte wurden für Onyx in den Systemeinstellungen abgeschaltet." + "settings.launchAtLogin.blocked" : { + "localizations" : { + "de" : { + "stringUnit" : { + "state" : "translated", + "value" : "Anmeldeobjekte wurden für Onyx in den Systemeinstellungen abgeschaltet." } }, - "en": { - "stringUnit": { - "state": "translated", - "value": "Login items were turned off for Onyx in System Settings." + "en" : { + "stringUnit" : { + "state" : "translated", + "value" : "Login items were turned off for Onyx in System Settings." } } } }, - "settings.menubar.bars": { - "extractionState": "stale", - "localizations": { - "de": { - "stringUnit": { - "state": "translated", - "value": "Balken" + "settings.menubar.bars" : { + "extractionState" : "stale", + "localizations" : { + "de" : { + "stringUnit" : { + "state" : "translated", + "value" : "Balken" } }, - "en": { - "stringUnit": { - "state": "translated", - "value": "Bars" + "en" : { + "stringUnit" : { + "state" : "translated", + "value" : "Bars" } } } }, - "settings.menubar.graph": { - "extractionState": "stale", - "localizations": { - "de": { - "stringUnit": { - "state": "translated", - "value": "Verlauf" + "settings.menubar.graph" : { + "extractionState" : "stale", + "localizations" : { + "de" : { + "stringUnit" : { + "state" : "translated", + "value" : "Verlauf" } }, - "en": { - "stringUnit": { - "state": "translated", - "value": "Graph" + "en" : { + "stringUnit" : { + "state" : "translated", + "value" : "Graph" } } } }, - "settings.menubar.hint": { - "localizations": { - "de": { - "stringUnit": { - "state": "translated", - "value": "Jedes Modul erscheint als eigenes Symbol in der Menüleiste und teilt sich die Messung mit dem Widget im Panel. Standardmäßig ist keines an — die Menüleiste ist knapp, auf einem Notch-Display zusätzlich in der Mitte blockiert." + "settings.menubar.hint" : { + "localizations" : { + "de" : { + "stringUnit" : { + "state" : "translated", + "value" : "Jedes Modul erscheint als eigenes Symbol in der Menüleiste und teilt sich die Messung mit dem Widget im Panel. Standardmäßig ist keines an — die Menüleiste ist knapp, auf einem Notch-Display zusätzlich in der Mitte blockiert." } }, - "en": { - "stringUnit": { - "state": "translated", - "value": "Each module appears as its own menu bar icon and shares its measurement with the panel widget. None are on by default — the menu bar is tight, and on a notched display the middle is blocked as well." + "en" : { + "stringUnit" : { + "state" : "translated", + "value" : "Each module appears as its own menu bar icon and shares its measurement with the panel widget. None are on by default — the menu bar is tight, and on a notched display the middle is blocked as well." } } } }, - "settings.menubar.symbol": { - "extractionState": "stale", - "localizations": { - "de": { - "stringUnit": { - "state": "translated", - "value": "Nur Symbol" + "settings.menubar.symbol" : { + "extractionState" : "stale", + "localizations" : { + "de" : { + "stringUnit" : { + "state" : "translated", + "value" : "Nur Symbol" } }, - "en": { - "stringUnit": { - "state": "translated", - "value": "Symbol only" + "en" : { + "stringUnit" : { + "state" : "translated", + "value" : "Symbol only" } } } }, - "settings.menubar.value": { - "extractionState": "stale", - "localizations": { - "de": { - "stringUnit": { - "state": "translated", - "value": "Wert" + "settings.menubar.value" : { + "extractionState" : "stale", + "localizations" : { + "de" : { + "stringUnit" : { + "state" : "translated", + "value" : "Wert" } }, - "en": { - "stringUnit": { - "state": "translated", - "value": "Value" + "en" : { + "stringUnit" : { + "state" : "translated", + "value" : "Value" } } } }, - "settings.menubar.valueAndGraph": { - "extractionState": "stale", - "localizations": { - "de": { - "stringUnit": { - "state": "translated", - "value": "Wert und Verlauf" + "settings.menubar.valueAndGraph" : { + "extractionState" : "stale", + "localizations" : { + "de" : { + "stringUnit" : { + "state" : "translated", + "value" : "Wert und Verlauf" } }, - "en": { - "stringUnit": { - "state": "translated", - "value": "Value and graph" + "en" : { + "stringUnit" : { + "state" : "translated", + "value" : "Value and graph" } } } }, - "settings.onboarding.show": { - "extractionState": "stale", - "localizations": { - "de": { - "stringUnit": { - "state": "translated", - "value": "Einrichtung erneut zeigen" + "settings.onboarding.show" : { + "extractionState" : "stale", + "localizations" : { + "de" : { + "stringUnit" : { + "state" : "translated", + "value" : "Einrichtung erneut zeigen" } }, - "en": { - "stringUnit": { - "state": "translated", - "value": "Show setup again" + "en" : { + "stringUnit" : { + "state" : "translated", + "value" : "Show setup again" } } } }, - "settings.permissions.calendar": { - "extractionState": "stale", - "localizations": { - "de": { - "stringUnit": { - "state": "translated", - "value": "Kalender" + "settings.permissions.calendar" : { + "extractionState" : "stale", + "localizations" : { + "de" : { + "stringUnit" : { + "state" : "translated", + "value" : "Kalender" } }, - "en": { - "stringUnit": { - "state": "translated", - "value": "Calendar" + "en" : { + "stringUnit" : { + "state" : "translated", + "value" : "Calendar" } } } }, - "settings.permissions.calendar.why": { - "extractionState": "stale", - "localizations": { - "de": { - "stringUnit": { - "state": "translated", - "value": "Onyx zeigt deine Termine im Kalender-Widget an. Es wird ausschließlich gelesen, nie geschrieben." + "settings.permissions.calendar.why" : { + "extractionState" : "stale", + "localizations" : { + "de" : { + "stringUnit" : { + "state" : "translated", + "value" : "Onyx zeigt deine Termine im Kalender-Widget an. Es wird ausschließlich gelesen, nie geschrieben." } }, - "en": { - "stringUnit": { - "state": "translated", - "value": "Onyx shows your events in the calendar widget. It only ever reads, never writes." + "en" : { + "stringUnit" : { + "state" : "translated", + "value" : "Onyx shows your events in the calendar widget. It only ever reads, never writes." } } } }, - "settings.permissions.granted": { - "extractionState": "stale", - "localizations": { - "de": { - "stringUnit": { - "state": "translated", - "value": "Erteilt" + "settings.permissions.granted" : { + "extractionState" : "stale", + "localizations" : { + "de" : { + "stringUnit" : { + "state" : "translated", + "value" : "Erteilt" } }, - "en": { - "stringUnit": { - "state": "translated", - "value": "Granted" + "en" : { + "stringUnit" : { + "state" : "translated", + "value" : "Granted" } } } }, - "settings.permissions.location": { - "extractionState": "stale", - "localizations": { - "de": { - "stringUnit": { - "state": "translated", - "value": "Standort" + "settings.permissions.location" : { + "extractionState" : "stale", + "localizations" : { + "de" : { + "stringUnit" : { + "state" : "translated", + "value" : "Standort" } }, - "en": { - "stringUnit": { - "state": "translated", - "value": "Location" + "en" : { + "stringUnit" : { + "state" : "translated", + "value" : "Location" } } } }, - "settings.permissions.location.why": { - "extractionState": "stale", - "localizations": { - "de": { - "stringUnit": { - "state": "translated", - "value": "Onyx zeigt das Wetter an deinem aktuellen Standort. Ohne Zugriff kannst du stattdessen einen festen Ort wählen." + "settings.permissions.location.why" : { + "extractionState" : "stale", + "localizations" : { + "de" : { + "stringUnit" : { + "state" : "translated", + "value" : "Onyx zeigt das Wetter an deinem aktuellen Standort. Ohne Zugriff kannst du stattdessen einen festen Ort wählen." } }, - "en": { - "stringUnit": { - "state": "translated", - "value": "Onyx shows the weather for your current location. Without access you can pick a fixed place instead." + "en" : { + "stringUnit" : { + "state" : "translated", + "value" : "Onyx shows the weather for your current location. Without access you can pick a fixed place instead." } } } }, - "settings.permissions.openSystem": { - "extractionState": "stale", - "localizations": { - "de": { - "stringUnit": { - "state": "translated", - "value": "Systemeinstellungen öffnen" + "settings.permissions.openSystem" : { + "extractionState" : "stale", + "localizations" : { + "de" : { + "stringUnit" : { + "state" : "translated", + "value" : "Systemeinstellungen öffnen" } }, - "en": { - "stringUnit": { - "state": "translated", - "value": "Open System Settings" + "en" : { + "stringUnit" : { + "state" : "translated", + "value" : "Open System Settings" } } } }, - "settings.permissions.request": { - "extractionState": "stale", - "localizations": { - "de": { - "stringUnit": { - "state": "translated", - "value": "Anfragen" + "settings.permissions.request" : { + "extractionState" : "stale", + "localizations" : { + "de" : { + "stringUnit" : { + "state" : "translated", + "value" : "Anfragen" } }, - "en": { - "stringUnit": { - "state": "translated", - "value": "Request" + "en" : { + "stringUnit" : { + "state" : "translated", + "value" : "Request" } } } }, - "settings.shelf.cleanup": { - "localizations": { - "de": { - "stringUnit": { - "state": "translated", - "value": "Automatisch löschen" + "settings.shelf.cleanup" : { + "localizations" : { + "de" : { + "stringUnit" : { + "state" : "translated", + "value" : "Automatisch löschen" } }, - "en": { - "stringUnit": { - "state": "translated", - "value": "Delete automatically" + "en" : { + "stringUnit" : { + "state" : "translated", + "value" : "Delete automatically" } } } }, - "settings.shelf.count %@": { - "comment": "A label showing the number of items in the shelf. The argument is the number of items in the shelf.", - "isCommentAutoGenerated": true, - "localizations": { - "de": { - "stringUnit": { - "state": "translated", - "value": "%@ Dateien abgelegt" + "settings.shelf.count %@" : { + "comment" : "A label showing the number of items in the shelf. The argument is the number of items in the shelf.", + "isCommentAutoGenerated" : true, + "localizations" : { + "de" : { + "stringUnit" : { + "state" : "translated", + "value" : "%@ Dateien abgelegt" } }, - "en": { - "stringUnit": { - "state": "translated", - "value": "%@ files parked" + "en" : { + "stringUnit" : { + "state" : "translated", + "value" : "%@ files parked" } } } }, - "settings.shelf.count %lld": { - "extractionState": "stale", - "localizations": { - "de": { - "stringUnit": { - "state": "translated", - "value": "%lld Dateien abgelegt" + "settings.shelf.count %lld" : { + "extractionState" : "stale", + "localizations" : { + "de" : { + "stringUnit" : { + "state" : "translated", + "value" : "%lld Dateien abgelegt" } }, - "en": { - "stringUnit": { - "state": "translated", - "value": "%lld files parked" + "en" : { + "stringUnit" : { + "state" : "translated", + "value" : "%lld files parked" } } } }, - "settings.shelf.days %@": { - "comment": "A label that lets the user select how many days to wait before automatically removing items from the shelf. The argument is the number of days.", - "isCommentAutoGenerated": true, - "localizations": { - "de": { - "stringUnit": { - "state": "translated", - "value": "Nach %@ Tagen" + "settings.shelf.days %@" : { + "comment" : "A label that lets the user select how many days to wait before automatically removing items from the shelf. The argument is the number of days.", + "isCommentAutoGenerated" : true, + "localizations" : { + "de" : { + "stringUnit" : { + "state" : "translated", + "value" : "Nach %@ Tagen" } }, - "en": { - "stringUnit": { - "state": "translated", - "value": "After %@ days" + "en" : { + "stringUnit" : { + "state" : "translated", + "value" : "After %@ days" } } } }, - "settings.shelf.days %lld": { - "extractionState": "stale", - "localizations": { - "de": { - "stringUnit": { - "state": "translated", - "value": "Nach %lld Tagen" + "settings.shelf.days %lld" : { + "extractionState" : "stale", + "localizations" : { + "de" : { + "stringUnit" : { + "state" : "translated", + "value" : "Nach %lld Tagen" } }, - "en": { - "stringUnit": { - "state": "translated", - "value": "After %lld days" + "en" : { + "stringUnit" : { + "state" : "translated", + "value" : "After %lld days" } } } }, - "settings.shelf.never": { - "localizations": { - "de": { - "stringUnit": { - "state": "translated", - "value": "Nie" + "settings.shelf.never" : { + "localizations" : { + "de" : { + "stringUnit" : { + "state" : "translated", + "value" : "Nie" } }, - "en": { - "stringUnit": { - "state": "translated", - "value": "Never" + "en" : { + "stringUnit" : { + "state" : "translated", + "value" : "Never" } } } }, - "settings.shelf.reveal": { - "extractionState": "stale", - "localizations": { - "de": { - "stringUnit": { - "state": "translated", - "value": "Im Finder zeigen" + "settings.shelf.reveal" : { + "extractionState" : "stale", + "localizations" : { + "de" : { + "stringUnit" : { + "state" : "translated", + "value" : "Im Finder zeigen" } }, - "en": { - "stringUnit": { - "state": "translated", - "value": "Show in Finder" + "en" : { + "stringUnit" : { + "state" : "translated", + "value" : "Show in Finder" } } } }, - "settings.shelf.title": { - "extractionState": "stale", - "localizations": { - "de": { - "stringUnit": { - "state": "translated", - "value": "Ablage" + "settings.shelf.title" : { + "extractionState" : "stale", + "localizations" : { + "de" : { + "stringUnit" : { + "state" : "translated", + "value" : "Ablage" } }, - "en": { - "stringUnit": { - "state": "translated", - "value": "Shelf" + "en" : { + "stringUnit" : { + "state" : "translated", + "value" : "Shelf" } } } }, - "settings.size.large": { - "extractionState": "stale", - "localizations": { - "de": { - "stringUnit": { - "state": "translated", - "value": "Groß (2×2)" + "settings.size.large" : { + "extractionState" : "stale", + "localizations" : { + "de" : { + "stringUnit" : { + "state" : "translated", + "value" : "Groß (2×2)" } }, - "en": { - "stringUnit": { - "state": "translated", - "value": "Large (2×2)" + "en" : { + "stringUnit" : { + "state" : "translated", + "value" : "Large (2×2)" } } } }, - "settings.size.medium": { - "extractionState": "stale", - "localizations": { - "de": { - "stringUnit": { - "state": "translated", - "value": "Mittel (2×1)" + "settings.size.medium" : { + "extractionState" : "stale", + "localizations" : { + "de" : { + "stringUnit" : { + "state" : "translated", + "value" : "Mittel (2×1)" } }, - "en": { - "stringUnit": { - "state": "translated", - "value": "Medium (2×1)" + "en" : { + "stringUnit" : { + "state" : "translated", + "value" : "Medium (2×1)" } } } }, - "settings.size.small": { - "extractionState": "stale", - "localizations": { - "de": { - "stringUnit": { - "state": "translated", - "value": "Klein (1×1)" + "settings.size.small" : { + "extractionState" : "stale", + "localizations" : { + "de" : { + "stringUnit" : { + "state" : "translated", + "value" : "Klein (1×1)" } }, - "en": { - "stringUnit": { - "state": "translated", - "value": "Small (1×1)" + "en" : { + "stringUnit" : { + "state" : "translated", + "value" : "Small (1×1)" } } } }, - "settings.size.wide": { - "extractionState": "stale", - "localizations": { - "de": { - "stringUnit": { - "state": "translated", - "value": "Breit (4×1)" + "settings.size.wide" : { + "extractionState" : "stale", + "localizations" : { + "de" : { + "stringUnit" : { + "state" : "translated", + "value" : "Breit (4×1)" } }, - "en": { - "stringUnit": { - "state": "translated", - "value": "Wide (4×1)" + "en" : { + "stringUnit" : { + "state" : "translated", + "value" : "Wide (4×1)" } } } }, - "settings.tab.display": { - "extractionState": "stale", - "localizations": { - "de": { - "stringUnit": { - "state": "translated", - "value": "Anzeige" + "settings.tab.display" : { + "extractionState" : "stale", + "localizations" : { + "de" : { + "stringUnit" : { + "state" : "translated", + "value" : "Anzeige" } }, - "en": { - "stringUnit": { - "state": "translated", - "value": "Display" + "en" : { + "stringUnit" : { + "state" : "translated", + "value" : "Display" } } } }, - "settings.tab.fans": { - "extractionState": "stale", - "localizations": { - "de": { - "stringUnit": { - "state": "translated", - "value": "Lüfter" + "settings.tab.fans" : { + "extractionState" : "stale", + "localizations" : { + "de" : { + "stringUnit" : { + "state" : "translated", + "value" : "Lüfter" } }, - "en": { - "stringUnit": { - "state": "translated", - "value": "Fans" + "en" : { + "stringUnit" : { + "state" : "translated", + "value" : "Fans" } } } }, - "settings.tab.menubar": { - "extractionState": "stale", - "localizations": { - "de": { - "stringUnit": { - "state": "translated", - "value": "Menüleiste" + "settings.tab.menubar" : { + "extractionState" : "stale", + "localizations" : { + "de" : { + "stringUnit" : { + "state" : "translated", + "value" : "Menüleiste" } }, - "en": { - "stringUnit": { - "state": "translated", - "value": "Menu bar" + "en" : { + "stringUnit" : { + "state" : "translated", + "value" : "Menu bar" } } } }, - "settings.tab.permissions": { - "extractionState": "stale", - "localizations": { - "de": { - "stringUnit": { - "state": "translated", - "value": "Berechtigungen" + "settings.tab.permissions" : { + "extractionState" : "stale", + "localizations" : { + "de" : { + "stringUnit" : { + "state" : "translated", + "value" : "Berechtigungen" } }, - "en": { - "stringUnit": { - "state": "translated", - "value": "Permissions" + "en" : { + "stringUnit" : { + "state" : "translated", + "value" : "Permissions" } } } }, - "settings.tab.sources": { - "extractionState": "stale", - "localizations": { - "de": { - "stringUnit": { - "state": "translated", - "value": "Quellen" + "settings.tab.sources" : { + "extractionState" : "stale", + "localizations" : { + "de" : { + "stringUnit" : { + "state" : "translated", + "value" : "Quellen" } }, - "en": { - "stringUnit": { - "state": "translated", - "value": "Sources" + "en" : { + "stringUnit" : { + "state" : "translated", + "value" : "Sources" } } } }, - "settings.tab.widgets": { - "extractionState": "stale", - "localizations": { - "de": { - "stringUnit": { - "state": "translated", - "value": "Widgets" + "settings.tab.widgets" : { + "extractionState" : "stale", + "localizations" : { + "de" : { + "stringUnit" : { + "state" : "translated", + "value" : "Widgets" } }, - "en": { - "stringUnit": { - "state": "translated", - "value": "Widgets" + "en" : { + "stringUnit" : { + "state" : "translated", + "value" : "Widgets" } } } }, - "settings.widgets.add": { - "extractionState": "stale", - "localizations": { - "de": { - "stringUnit": { - "state": "translated", - "value": "Hinzufügen" + "settings.widgets.add" : { + "extractionState" : "stale", + "localizations" : { + "de" : { + "stringUnit" : { + "state" : "translated", + "value" : "Hinzufügen" } }, - "en": { - "stringUnit": { - "state": "translated", - "value": "Add" + "en" : { + "stringUnit" : { + "state" : "translated", + "value" : "Add" } } } }, - "settings.widgets.available": { - "extractionState": "stale", - "localizations": { - "de": { - "stringUnit": { - "state": "translated", - "value": "Verfügbar" + "settings.widgets.available" : { + "extractionState" : "stale", + "localizations" : { + "de" : { + "stringUnit" : { + "state" : "translated", + "value" : "Verfügbar" } }, - "en": { - "stringUnit": { - "state": "translated", - "value": "Available" + "en" : { + "stringUnit" : { + "state" : "translated", + "value" : "Available" } } } }, - "settings.widgets.empty": { - "localizations": { - "de": { - "stringUnit": { - "state": "translated", - "value": "Keine Widgets im Panel. Das Panel bleibt leer, bis du eins hinzufügst." + "settings.widgets.empty" : { + "localizations" : { + "de" : { + "stringUnit" : { + "state" : "translated", + "value" : "Keine Widgets im Panel. Das Panel bleibt leer, bis du eins hinzufügst." } }, - "en": { - "stringUnit": { - "state": "translated", - "value": "No widgets in the panel. It stays empty until you add one." + "en" : { + "stringUnit" : { + "state" : "translated", + "value" : "No widgets in the panel. It stays empty until you add one." } } } }, - "settings.widgets.hint": { - "localizations": { - "de": { - "stringUnit": { - "state": "translated", - "value": "Die Reihenfolge bestimmt die Anordnung im Panel. Jedes Widget rückt an die erste Stelle, an die es passt." + "settings.widgets.hint" : { + "localizations" : { + "de" : { + "stringUnit" : { + "state" : "translated", + "value" : "Die Reihenfolge bestimmt die Anordnung im Panel. Jedes Widget rückt an die erste Stelle, an die es passt." } }, - "en": { - "stringUnit": { - "state": "translated", - "value": "The order determines the arrangement in the panel. Each widget takes the first spot it fits into." + "en" : { + "stringUnit" : { + "state" : "translated", + "value" : "The order determines the arrangement in the panel. Each widget takes the first spot it fits into." } } } }, - "settings.widgets.hint.order": { - "extractionState": "stale", - "localizations": { - "de": { - "stringUnit": { - "state": "translated", - "value": "Alle Kacheln sind gleich groß. Die Reihenfolge hier ist die Reihenfolge im Panel — zum Sortieren ziehen." + "settings.widgets.hint.order" : { + "extractionState" : "stale", + "localizations" : { + "de" : { + "stringUnit" : { + "state" : "translated", + "value" : "Alle Kacheln sind gleich groß. Die Reihenfolge hier ist die Reihenfolge im Panel — zum Sortieren ziehen." } }, - "en": { - "stringUnit": { - "state": "translated", - "value": "All tiles are the same size. The order here is the order in the panel — drag to sort." + "en" : { + "stringUnit" : { + "state" : "translated", + "value" : "All tiles are the same size. The order here is the order in the panel — drag to sort." } } } }, - "settings.widgets.inPanel": { - "extractionState": "stale", - "localizations": { - "de": { - "stringUnit": { - "state": "translated", - "value": "Im Panel" + "settings.widgets.inPanel" : { + "extractionState" : "stale", + "localizations" : { + "de" : { + "stringUnit" : { + "state" : "translated", + "value" : "Im Panel" } }, - "en": { - "stringUnit": { - "state": "translated", - "value": "In the panel" + "en" : { + "stringUnit" : { + "state" : "translated", + "value" : "In the panel" } } } }, - "settings.widgets.remove": { - "extractionState": "stale", - "localizations": { - "de": { - "stringUnit": { - "state": "translated", - "value": "Aus dem Panel entfernen" + "settings.widgets.remove" : { + "extractionState" : "stale", + "localizations" : { + "de" : { + "stringUnit" : { + "state" : "translated", + "value" : "Aus dem Panel entfernen" } }, - "en": { - "stringUnit": { - "state": "translated", - "value": "Remove from panel" + "en" : { + "stringUnit" : { + "state" : "translated", + "value" : "Remove from panel" } } } }, - "widget.fans.name": { - "extractionState": "stale", - "localizations": { - "de": { - "stringUnit": { - "state": "translated", - "value": "Lüfter" + "widget.fans.name" : { + "extractionState" : "stale", + "localizations" : { + "de" : { + "stringUnit" : { + "state" : "translated", + "value" : "Lüfter" } }, - "en": { - "stringUnit": { - "state": "translated", - "value": "Fans" + "en" : { + "stringUnit" : { + "state" : "translated", + "value" : "Fans" } } } } }, - "version": "1.1" -} + "version" : "1.1" +} \ No newline at end of file diff --git a/Onyx/OnyxApp.swift b/Onyx/OnyxApp.swift index 3bcd41f..5520c3e 100644 --- a/Onyx/OnyxApp.swift +++ b/Onyx/OnyxApp.swift @@ -233,27 +233,45 @@ final class AppDelegate: NSObject, NSApplicationDelegate { // MARK: - Menüleiste - /// Das feste Onyx-Element: Panel öffnen, Einstellungen, Beenden. Es ist auch - /// das Sicherheitsnetz, falls die Notch einmal nicht reagiert. + /// Das feste Onyx-Element. + /// + /// **Kein „Panel öffnen" im Menü.** Das Panel öffnet sich, wenn man die + /// Notch berührt — ein Menüeintrag dafür beschreibt einen Umweg um die + /// eigentliche Bedienung herum und wirft die Frage auf, wozu es die Notch + /// dann gibt. Als Notausgang bleibt es trotzdem erreichbar, nur ohne + /// eigene Zeile: **Linksklick auf das Symbol fährt das Panel aus, + /// Rechtsklick zeigt das Menü.** private func installOnyxStatusItem() { let item = NSStatusBar.system.statusItem(withLength: NSStatusItem.squareLength) item.autosaveName = "onyx.menubar.main" item.button?.image = Self.menuBarIcon() - - let menu = NSMenu() - menu.addItem(withTitle: String(localized: "menu.openPanel"), - action: #selector(togglePanel), keyEquivalent: "").target = self - menu.addItem(.separator()) - menu.addItem(withTitle: String(localized: "menu.settings"), - action: #selector(openSettings), keyEquivalent: ",").target = self - menu.addItem(.separator()) - menu.addItem(withTitle: String(localized: "menu.quit"), - action: #selector(quit), keyEquivalent: "q").target = self - item.menu = menu + item.button?.target = self + item.button?.action = #selector(onyxItemClicked) + item.button?.sendAction(on: [.leftMouseUp, .rightMouseUp]) onyxItem = item } + /// Links: Panel. Rechts: Menü. + @objc private func onyxItemClicked() { + guard let item = onyxItem, let button = item.button else { return } + if NSApp.currentEvent?.type == .rightMouseUp { + let menu = NSMenu() + menu.addItem(withTitle: String(localized: "menu.settings"), + action: #selector(openSettings), keyEquivalent: ",").target = self + menu.addItem(.separator()) + menu.addItem(withTitle: String(localized: "menu.quit"), + action: #selector(quit), keyEquivalent: "q").target = self + // Das Menü nur für diesen Klick anhängen und danach wieder lösen — + // bleibt es hängen, verschluckt es den Linksklick. + item.menu = menu + button.performClick(nil) + item.menu = nil + } else { + togglePanel() + } + } + /// Das Glyph aus dem App-Icon, auf Menüleistengröße gebracht. /// /// Nicht das vollständige App-Icon: das bringt die abgerundete Kachel samt diff --git a/Packages/OnyxKit/Sources/OnyxNotch/NotchCoordinator.swift b/Packages/OnyxKit/Sources/OnyxNotch/NotchCoordinator.swift index 8620f11..09e548e 100644 --- a/Packages/OnyxKit/Sources/OnyxNotch/NotchCoordinator.swift +++ b/Packages/OnyxKit/Sources/OnyxNotch/NotchCoordinator.swift @@ -1,4 +1,7 @@ import AppKit +import OSLog + +private let log = Logger(subsystem: "com.scarriffleservices.onyx", category: "Notch") /// Hält für jeden in Frage kommenden Bildschirm einen Controller und versorgt /// alle mit der Zeigerposition. @@ -84,6 +87,7 @@ public final class NotchCoordinator { private func rebuild() { let wanted = policy.screens(from: NSScreen.screens.map(\.onyxMetrics)) let wantedIDs = Set(wanted.map(\.displayID)) + log.notice("Bildschirme neu aufgebaut: \(wantedIDs.count, privacy: .public) von \(NSScreen.screens.count, privacy: .public) verwendet") for (id, controller) in controllers where !wantedIDs.contains(id) { controller.tearDown() @@ -186,6 +190,7 @@ public final class NotchCoordinator { RunLoop.main.add(timer, forMode: .common) pointerPollTimer = timer pollInterval = interval + log.notice("Zeigerabfrage: \(Int(1 / interval), privacy: .public) Hz, \(self.controllers.count, privacy: .public) Bildschirm(e)") } /// Im Ruhezustand genügt ein Zehntel: dazu kommt ohnehin die Entprellzeit diff --git a/Packages/OnyxKit/Sources/OnyxNotch/NotchGeometry.swift b/Packages/OnyxKit/Sources/OnyxNotch/NotchGeometry.swift index abe6e29..d785d25 100644 --- a/Packages/OnyxKit/Sources/OnyxNotch/NotchGeometry.swift +++ b/Packages/OnyxKit/Sources/OnyxNotch/NotchGeometry.swift @@ -74,7 +74,10 @@ public struct NotchGeometry: Equatable, Sendable { /// muss man die Notch pixelgenau treffen, und die unteren Bildpunkte der /// Notch selbst nimmt die Menüleiste bereits für sich in Anspruch. public static let triggerInsetX: CGFloat = 16 - public static let triggerInsetY: CGFloat = 4 + /// Nach unten deutlich großzügiger als nach oben: von oben kommt niemand, + /// dort ist der Bildschirmrand. Vier Punkte waren zu wenig — eine Hand + /// hält den Zeiger nicht auf vier Punkte genau. + public static let triggerInsetY: CGFloat = 14 public init(kind: Kind, rect: CGRect, screenFrame: CGRect) { self.kind = kind diff --git a/Packages/OnyxKit/Sources/OnyxNotch/NotchScreenController.swift b/Packages/OnyxKit/Sources/OnyxNotch/NotchScreenController.swift index dc3853f..b66cdbd 100644 --- a/Packages/OnyxKit/Sources/OnyxNotch/NotchScreenController.swift +++ b/Packages/OnyxKit/Sources/OnyxNotch/NotchScreenController.swift @@ -1,4 +1,7 @@ import AppKit +import OSLog + +private let log = Logger(subsystem: "com.scarriffleservices.onyx", category: "Notch") /// Führt für genau einen Bildschirm Geometrie, Zustandsmaschine und Fenster zusammen. /// @@ -75,7 +78,11 @@ public final class NotchScreenController { public func click() { send(.click) } public func escape() { send(.escape) } - public func setSuppressed(_ suppressed: Bool) { send(.suppressed(suppressed)) } + public func setSuppressed(_ suppressed: Bool) { + guard suppressed != machine.isSuppressed else { return } + log.notice("Notch \(self.displayID, privacy: .public): Unterdrückung \(suppressed ? "an" : "aus", privacy: .public)") + send(.suppressed(suppressed)) + } /// Nach einem Wechsel von Auflösung, Anordnung oder Skalierung. public func update(metrics: ScreenMetrics, virtualSize: CGSize) { @@ -103,7 +110,16 @@ public final class NotchScreenController { /// Zustand dort bereits geändert, ein Vergleich käme also immer negativ zurück. private func send(_ input: NotchInput) { let wasVisible = machine.isVisible + let before = machine.phase apply(machine.handle(input)) + // Jeden Zustandswechsel protokollieren — außer den beiden, die + // sekündlich hunderte Male kommen. Ohne diese Spur ist ein Panel, das + // sich „manchmal nicht öffnet", nicht zu untersuchen: hinterher weiß + // niemand mehr, ob der Zeiger erkannt wurde, ob die Maschine + // umgeschaltet hat oder ob die Unterdrückung dazwischenkam. + if machine.phase != before { + log.notice("Notch \(self.displayID, privacy: .public): \(String(describing: before), privacy: .public) → \(String(describing: self.machine.phase), privacy: .public) durch \(String(describing: input), privacy: .public)") + } if machine.isVisible != wasVisible { onVisibilityChanged?(machine.isVisible) } } diff --git a/Packages/OnyxKit/Sources/OnyxNotch/NotchStateMachine.swift b/Packages/OnyxKit/Sources/OnyxNotch/NotchStateMachine.swift index f70ad51..cdfed08 100644 --- a/Packages/OnyxKit/Sources/OnyxNotch/NotchStateMachine.swift +++ b/Packages/OnyxKit/Sources/OnyxNotch/NotchStateMachine.swift @@ -59,6 +59,16 @@ public struct NotchStateMachine: Equatable, Sendable { public private(set) var phase: NotchPhase = .idle public private(set) var isSuppressed: Bool = false + /// Wo der Zeiger zuletzt war. Die Maschine braucht das, um beim Ablauf der + /// Entprellzeit zu entscheiden — ohne diese Angabe würde ein beiläufiges + /// Streifen der Notch das Panel kurz aufblitzen lassen: betreten, + /// verlassen, Entprellzeit läuft trotzdem ab, Panel auf, Frist abgelaufen, + /// Panel zu. + private var isPointerInside = false + /// Ob die Entprellzeit schon abgelaufen ist, während der Zeiger draußen war. + /// Kommt er zurück, wird ohne weiteres Warten geöffnet. + private var debounceElapsed = false + public init() {} /// Sichtbar, egal aus welchem Grund. @@ -88,19 +98,54 @@ public struct NotchStateMachine: Equatable, Sendable { guard !isSuppressed else { return [] } + switch input { + case .pointerEntered: isPointerInside = true + case .pointerExited: isPointerInside = false + default: break + } + switch (phase, input) { // Öffnen case (.idle, .pointerEntered): phase = .arming + debounceElapsed = false return [.startArmTimer(Self.armDelay)] case (.arming, .armTimerFired): + // Nur öffnen, wenn der Zeiger auch da ist. Sonst weitermerken, + // dass die Entprellzeit vorbei ist — kommt er zurück, geht es + // sofort auf; bleibt er weg, beendet die Abbruchfrist die Sache. + guard isPointerInside else { + debounceElapsed = true + return [] + } phase = .open return [.show] + // Kurz herausrutschen bricht nicht ab. + // + // Ein Zeiger, den eine Hand an den oberen Rand führt, steht dort nicht + // still. Jedes Abtastbild außerhalb sofort als Abbruch zu werten hieß: + // bei zitternder Hand fing die Entprellzeit dauernd von vorn an und kam + // nie ans Ziel — das Panel öffnete „manchmal einfach nicht". + // + // Der Aufziehzeitgeber läuft weiter; parallel läuft die Frist, nach der + // wirklich abgebrochen wird. case (.arming, .pointerExited): + return [.startCloseTimer(Self.closeDelay)] + + case (.arming, .pointerEntered): + // Zurück in der Zone: nur die Abbruchfrist stoppen. Die Entprellzeit + // **nicht** neu ansetzen, sonst dauert es bei jedem Grenzübertritt + // wieder von vorn. + guard debounceElapsed else { return [.cancelCloseTimer] } + phase = .open + return [.cancelCloseTimer, .show] + + case (.arming, .closeTimerFired): phase = .idle + debounceElapsed = false return [.cancelArmTimer] // Schließen diff --git a/Packages/OnyxKit/Tests/OnyxNotchTests/NotchStateMachineTests.swift b/Packages/OnyxKit/Tests/OnyxNotchTests/NotchStateMachineTests.swift index dbd44a3..4478d8a 100644 --- a/Packages/OnyxKit/Tests/OnyxNotchTests/NotchStateMachineTests.swift +++ b/Packages/OnyxKit/Tests/OnyxNotchTests/NotchStateMachineTests.swift @@ -32,9 +32,13 @@ struct NotchStateMachineTests { @Test("Zeiger verlässt die Notch vor Ablauf → kein Öffnen") func leavingDuringArmingCancels() { + // Die Absicht ist unverändert: wer die Notch nur streift, bekommt kein + // Panel. Der Weg dorthin führt seit der Toleranz für zitternde Hände + // über die Abbruchfrist statt über einen sofortigen Abbruch. var machine = NotchStateMachine() _ = machine.handle(.pointerEntered) - let effects = machine.handle(.pointerExited) + _ = machine.handle(.pointerExited) + let effects = machine.handle(.closeTimerFired) #expect(machine.phase == .idle) #expect(effects == [.cancelArmTimer]) @@ -191,12 +195,14 @@ struct NotchStateMachineTests { @Test("Zweimal betreten ohne zwischenzeitliches Verlassen startet keinen zweiten Timer") func repeatedEnterIsIdempotent() { + // Worauf es ankommt: die Entprellzeit setzt nicht neu an. Dass dabei + // eine ohnehin nicht laufende Abbruchfrist gestoppt wird, ist folgenlos. var machine = NotchStateMachine() _ = machine.handle(.pointerEntered) let effects = machine.handle(.pointerEntered) #expect(machine.phase == .arming) - #expect(effects.isEmpty) + #expect(!effects.contains(.startArmTimer(NotchStateMachine.armDelay))) } @Test("Verlassen im Ruhezustand tut nichts") @@ -208,15 +214,32 @@ struct NotchStateMachineTests { #expect(effects.isEmpty) } - @Test("Verspäteter Timer nach dem Schließen öffnet nicht mehr") - func staleArmTimerDoesNotOpen() { + @Test("Entprellzeit läuft ab, während der Zeiger draußen ist → kein Öffnen") + func armTimerWhileOutsideDoesNotOpen() { + // Der Fall, der ohne Zeigerkenntnis das Panel aufblitzen ließe: die + // Notch beiläufig streifen. Entprellzeit läuft ab, obwohl der Zeiger + // längst weg ist — geöffnet wird trotzdem nicht. var machine = NotchStateMachine() _ = machine.handle(.pointerEntered) - _ = machine.handle(.pointerExited) // Timer wurde abbestellt … - let effects = machine.handle(.armTimerFired) // … feuert aber trotzdem noch + _ = machine.handle(.pointerExited) + let effects = machine.handle(.armTimerFired) - #expect(machine.phase == .idle) - #expect(effects.isEmpty) + #expect(!effects.contains(.show)) + #expect(machine.phase != .open) + } + + @Test("Kommt der Zeiger nach abgelaufener Entprellzeit zurück, geht es sofort auf") + func returnAfterDebounceOpensAtOnce() { + // Sonst müsste eine zitternde Hand die volle Entprellzeit noch einmal + // durchstehen, obwohl sie längst gewartet hat. + var machine = NotchStateMachine() + _ = machine.handle(.pointerEntered) + _ = machine.handle(.pointerExited) + _ = machine.handle(.armTimerFired) + let effects = machine.handle(.pointerEntered) + + #expect(machine.phase == .open) + #expect(effects.contains(.show)) } @Test("Verspäteter Schließtimer schließt kein wieder geöffnetes Panel") @@ -248,3 +271,68 @@ struct NotchStateMachineTests { #expect(NotchStateMachine.closeDelay == 0.30) } } + +// Nachgetragen, nachdem sich das Panel „manchmal nicht öffnete". Ein Zeiger, +// der von Hand an den oberen Rand geführt wird, steht dort nicht still — er +// wandert um ein paar Punkte. Jedes Abtastbild außerhalb hat das Aufziehen +// sofort abgebrochen, und beim nächsten fing es von vorn an. Bei 220 ms +// Entprellzeit kam es so nie ans Ziel. +// +// Automatisierte Proben haben das nie gezeigt: `CGWarpMouseCursorPosition` +// setzt den Zeiger auf einen Punkt und hält ihn absolut still. + +@Suite("Toleranz beim Aufziehen") +struct NotchArmingToleranceTests { + + @Test("Kurz herausrutschen bricht das Aufziehen nicht ab") + func briefExitKeepsArming() { + var machine = NotchStateMachine() + machine.handle(.pointerEntered) + #expect(machine.phase == .arming) + + machine.handle(.pointerExited) + // Immer noch am Aufziehen — es läuft nur eine Frist. + #expect(machine.phase == .arming) + } + + @Test("Kommt der Zeiger zurück, läuft es weiter") + func returningResumes() { + var machine = NotchStateMachine() + machine.handle(.pointerEntered) + machine.handle(.pointerExited) + machine.handle(.pointerEntered) + machine.handle(.armTimerFired) + #expect(machine.phase == .open) + } + + @Test("Bleibt er draußen, wird abgebrochen") + func lastingExitCancels() { + var machine = NotchStateMachine() + machine.handle(.pointerEntered) + machine.handle(.pointerExited) + machine.handle(.closeTimerFired) + #expect(machine.phase == .idle) + } + + @Test("Beim Abbrechen wird auch der Aufziehzeitgeber gestoppt") + func cancelStopsArmTimer() { + // Sonst fährt das Panel aus, nachdem der Zeiger längst weg ist. + var machine = NotchStateMachine() + machine.handle(.pointerEntered) + machine.handle(.pointerExited) + let effects = machine.handle(.closeTimerFired) + #expect(effects.contains(.cancelArmTimer)) + } + + @Test("Das Aufziehen setzt beim Herausrutschen nicht neu an") + func exitDoesNotRestartArmTimer() { + // Sonst dauert es bei zitternder Hand endlos, weil die Entprellzeit + // bei jedem Grenzübertritt von vorn beginnt. + var machine = NotchStateMachine() + machine.handle(.pointerEntered) + machine.handle(.pointerExited) + let effects = machine.handle(.pointerEntered) + #expect(!effects.contains(.startArmTimer(NotchStateMachine.armDelay))) + #expect(effects.contains(.cancelCloseTimer)) + } +}