diff --git a/.github/pref_1.png b/.github/pref_1.png index 3addc43..6870001 100644 Binary files a/.github/pref_1.png and b/.github/pref_1.png differ diff --git a/.github/pref_2.png b/.github/pref_2.png index 1b26046..212dee1 100644 Binary files a/.github/pref_2.png and b/.github/pref_2.png differ diff --git a/.github/pref_3.png b/.github/pref_3.png index 2cf147b..3e71fdb 100644 Binary files a/.github/pref_3.png and b/.github/pref_3.png differ diff --git a/.github/pref_4.png b/.github/pref_4.png index 9d6b5d4..62ac4d3 100644 Binary files a/.github/pref_4.png and b/.github/pref_4.png differ diff --git a/.github/screenshot.png b/.github/screenshot.png index f7e7e89..1b271df 100644 Binary files a/.github/screenshot.png and b/.github/screenshot.png differ diff --git a/MonitorControl/Enums/PrefKey.swift b/MonitorControl/Enums/PrefKey.swift index 4e4b335..9896be5 100644 --- a/MonitorControl/Enums/PrefKey.swift +++ b/MonitorControl/Enums/PrefKey.swift @@ -45,9 +45,6 @@ enum PrefKey: String { // Use separated OSD scale for combined brightness case separateCombinedScale - // Fallback to software control for other displays with no DDC - case disableSoftwareFallback - // Do not show sliders for Apple displays (including built-in display) in menu case hideAppleFromMenu diff --git a/MonitorControl/Info.plist b/MonitorControl/Info.plist index 71dd76b..6285ee9 100644 --- a/MonitorControl/Info.plist +++ b/MonitorControl/Info.plist @@ -19,7 +19,7 @@ CFBundleShortVersionString $(MARKETING_VERSION) CFBundleVersion - 6632 + 6670 LSApplicationCategoryType public.app-category.utilities LSMinimumSystemVersion diff --git a/MonitorControl/Model/Display.swift b/MonitorControl/Model/Display.swift index 7831e6f..b792f67 100644 --- a/MonitorControl/Model/Display.swift +++ b/MonitorControl/Model/Display.swift @@ -269,7 +269,7 @@ class Display: Equatable { func checkGammaInterference() { let currentSwBrightness = self.getSwBrightness() - guard !DisplayManager.shared.gammaInterferenceWarningShown, !(prefs.bool(forKey: PrefKey.disableSoftwareFallback.rawValue) && prefs.bool(forKey: PrefKey.disableCombinedBrightness.rawValue)), !self.readPrefAsBool(key: .avoidGamma), !self.smoothBrightnessRunning, self.prefExists(key: .SwBrightness), abs(currentSwBrightness - self.readPrefAsFloat(key: .SwBrightness)) > 0.02 else { + guard !DisplayManager.shared.gammaInterferenceWarningShown, !(prefs.bool(forKey: PrefKey.disableCombinedBrightness.rawValue)), !self.readPrefAsBool(key: .avoidGamma), !self.smoothBrightnessRunning, self.prefExists(key: .SwBrightness), abs(currentSwBrightness - self.readPrefAsFloat(key: .SwBrightness)) > 0.02 else { return } DisplayManager.shared.gammaInterferenceCounter += 1 diff --git a/MonitorControl/Model/OtherDisplay.swift b/MonitorControl/Model/OtherDisplay.swift index 3f7b0b3..6ed36e7 100644 --- a/MonitorControl/Model/OtherDisplay.swift +++ b/MonitorControl/Model/OtherDisplay.swift @@ -298,9 +298,7 @@ class OtherDisplay: Display { override func stepBrightness(isUp: Bool, isSmallIncrement: Bool) { if self.isSw() { - if !prefs.bool(forKey: PrefKey.disableSoftwareFallback.rawValue) { - super.stepBrightness(isUp: isUp, isSmallIncrement: isSmallIncrement) - } + super.stepBrightness(isUp: isUp, isSmallIncrement: isSmallIncrement) return } guard !self.readPrefAsBool(key: .unavailableDDC, for: .brightness) else { diff --git a/MonitorControl/Support/AppDelegate.swift b/MonitorControl/Support/AppDelegate.swift index e007d6a..b082cd6 100644 --- a/MonitorControl/Support/AppDelegate.swift +++ b/MonitorControl/Support/AppDelegate.swift @@ -141,7 +141,7 @@ class AppDelegate: NSObject, NSApplicationDelegate { DisplayManager.shared.setupOtherDisplays(firstrun: firstrun) self.updateMenusAndKeys() if !firstrun { - if !prefs.bool(forKey: PrefKey.disableSoftwareFallback.rawValue) || !prefs.bool(forKey: PrefKey.disableCombinedBrightness.rawValue) { + if !prefs.bool(forKey: PrefKey.disableCombinedBrightness.rawValue) { DisplayManager.shared.restoreSwBrightnessForAllDisplays(async: !prefs.bool(forKey: PrefKey.disableSmoothBrightness.rawValue)) } } @@ -250,7 +250,7 @@ class AppDelegate: NSObject, NSApplicationDelegate { func preferenceReset() { os_log("Resetting all preferences.") - if !prefs.bool(forKey: PrefKey.disableSoftwareFallback.rawValue) || !prefs.bool(forKey: PrefKey.disableCombinedBrightness.rawValue) { + if !prefs.bool(forKey: PrefKey.disableCombinedBrightness.rawValue) { DisplayManager.shared.resetSwBrightnessForAllDisplays(async: false) } if let bundleID = Bundle.main.bundleIdentifier { diff --git a/MonitorControl/Support/MenuHandler.swift b/MonitorControl/Support/MenuHandler.swift index 835973c..f583419 100644 --- a/MonitorControl/Support/MenuHandler.swift +++ b/MonitorControl/Support/MenuHandler.swift @@ -36,11 +36,7 @@ class MenuHandler: NSMenu, NSMenuDelegate { if !prefs.bool(forKey: PrefKey.hideAppleFromMenu.rawValue) { displays.append(contentsOf: DisplayManager.shared.getAppleDisplays()) } - if !prefs.bool(forKey: PrefKey.disableSoftwareFallback.rawValue) { - displays.append(contentsOf: DisplayManager.shared.getOtherDisplays()) - } else { - displays.append(contentsOf: DisplayManager.shared.getDdcCapableDisplays()) - } + displays.append(contentsOf: DisplayManager.shared.getOtherDisplays()) let relevant = prefs.integer(forKey: PrefKey.multiSliders.rawValue) == MultiSliders.relevant.rawValue let combine = prefs.integer(forKey: PrefKey.multiSliders.rawValue) == MultiSliders.combine.rawValue let numOfDisplays = displays.count diff --git a/MonitorControl/UI/Base.lproj/Main.storyboard b/MonitorControl/UI/Base.lproj/Main.storyboard index 070c1fe..a8c6495 100644 --- a/MonitorControl/UI/Base.lproj/Main.storyboard +++ b/MonitorControl/UI/Base.lproj/Main.storyboard @@ -11,22 +11,17 @@ - + - + - - - - - @@ -36,8 +31,8 @@ - - + + @@ -45,50 +40,9 @@ - - - - - - - - - - - - - - - - - - - - - - - - + @@ -98,7 +52,7 @@ - - - - - - - - - - - - - - - - - - - - - - + + + @@ -366,38 +297,28 @@ - - - - - - - - - - - + - + - + @@ -408,8 +329,7 @@ - - + @@ -429,7 +349,7 @@ - + @@ -439,7 +359,7 @@ - + @@ -458,7 +378,7 @@ - + @@ -468,7 +388,7 @@ - + @@ -488,7 +408,7 @@ - - - - - - - - - - - + + + + + + + + + + + + + - + - + - + @@ -1335,7 +1277,7 @@ - + @@ -2000,16 +1942,19 @@ - + - + + + + @@ -2018,10 +1963,11 @@ + - + @@ -2130,7 +2076,7 @@ - + diff --git a/MonitorControl/UI/de.lproj/Main.strings b/MonitorControl/UI/de.lproj/Main.strings index a96a9c5..34f9709 100644 --- a/MonitorControl/UI/de.lproj/Main.strings +++ b/MonitorControl/UI/de.lproj/Main.strings @@ -13,6 +13,9 @@ /* Class = "NSTextFieldCell"; title = "DDC min"; ObjectID = "1zE-fg-xEm"; */ "1zE-fg-xEm.title" = "DDC min"; +/* Class = "NSBox"; title = "Box"; ObjectID = "3a3-In-jeQ"; */ +"3a3-In-jeQ.title" = "Box"; + /* Class = "NSMenuItem"; title = "Show separate controls for each display in menu"; ObjectID = "3eO-bN-ZRl"; */ "3eO-bN-ZRl.title" = "Separate Steuerung für jeden Monitor im Menü anzeigen"; @@ -55,9 +58,6 @@ /* Class = "NSTextFieldCell"; title = "Show tick marks at 0%, 25%, 50%, 75% and 100% for accuracy."; ObjectID = "A8P-vn-DEJ"; */ "A8P-vn-DEJ.title" = "Striche bei 0 %, 25 %, 50 %, 75 % und 100 % für Genauigkeit anzeigen."; -/* Class = "NSButtonCell"; title = "Disable software dimming as fallback"; ObjectID = "afB-Xx-Lta"; */ -"afB-Xx-Lta.title" = "Software-Dimmen als Fallback deaktivieren"; - /* Class = "NSTextFieldCell"; title = "Use brightness, volume and other settings from last time or use defaults. Values will be applied to the display upon first change by the user."; ObjectID = "an7-Aj-3fZ"; */ "an7-Aj-3fZ.title" = "Helligkeit, Lautstärke und andere Einstellungen vom letzten Mal oder Standardwerte verwenden. Die Werte werden bei der ersten Änderung durch den Benutzer auf den Monitor angewendet."; @@ -194,7 +194,7 @@ "j72-NF-zsW.title" = "Bei Anmeldung starten"; /* Class = "NSMenuItem"; title = "Change for all screens"; ObjectID = "jSj-HB-T2t"; */ -"jSj-HB-T2t.title" = Ändern für alle Monitore"; +"jSj-HB-T2t.title" = "Change for all screens"; /* Class = "NSTextFieldCell"; title = "Note: you can press Shift during startup for 'Safe mode' to restore defaults and avoid reading or setting anything."; ObjectID = "Jx2-gO-nq9"; */ "Jx2-gO-nq9.title" = "Hinweis: Du kannst während des Starts die Umschalttaste drücken, um den 'Abgesicherten Modus' zu aktivieren, damit die Standardeinstellungen wiederhergestellt werden und nichts gelesen oder eingestellt wird."; @@ -205,9 +205,6 @@ /* Class = "NSTextFieldCell"; title = "Screen to control:"; ObjectID = "Kfj-WK-aSL"; */ "Kfj-WK-aSL.title" = "Monitor für Steuerung:"; -/* Class = "NSTextFieldCell"; title = "Don't use software dimming as fallback if no hardware control is available."; ObjectID = "kgh-b4-gmO"; */ -"kgh-b4-gmO.title" = "Softwaredimmung nicht als Ausweichlösung verwendet werden, wenn keine Hardware-Steuerung verfügbar ist."; - /* Class = "NSMenuItem"; title = "Depends on mouse pointer position"; ObjectID = "km4-hK-auM"; */ "km4-hK-auM.title" = "Abhängig von der Mauszeigerposition"; @@ -265,9 +262,6 @@ /* Class = "NSButtonCell"; title = "Longer delay during DDC read operations"; ObjectID = "pF5-Sw-7BR"; */ "pF5-Sw-7BR.title" = "Längere Verzögerung bei DDC-Lesevorgängen"; -/* Class = "NSTextFieldCell"; title = "For hardware (DDC) controlled displays only."; ObjectID = "POy-35-bh0"; */ -"POy-35-bh0.title" = "Nur für hardwaregesteuerte (DDC) Monitore."; - /* Class = "NSTextFieldCell"; title = "DDC max"; ObjectID = "psF-vX-AFB"; */ "psF-vX-AFB.title" = "DDC max"; @@ -292,15 +286,9 @@ /* Class = "NSButtonCell"; title = "Combine hardware and software dimming"; ObjectID = "r76-Zc-x09"; */ "r76-Zc-x09.title" = "Hardware- und Software-Dimmung kombinieren"; -/* Class = "NSTextFieldCell"; title = "Advanced:"; ObjectID = "r7i-oG-Ab6"; */ -"r7i-oG-Ab6.title" = "Erweitert:"; - /* Class = "NSMenuItem"; title = "Normal"; ObjectID = "Riq-uM-bTs"; */ "Riq-uM-bTs.title" = "Normal"; -/* Class = "NSButtonCell"; title = "Show advanced settings"; ObjectID = "sAR-sh-y8e"; */ -"sAR-sh-y8e.title" = "Erweiterte Einstellungen anzeigen"; - /* Class = "NSTextFieldCell"; title = "General menu items style:"; ObjectID = "thh-DG-ecH"; */ "thh-DG-ecH.title" = "Stil der Menüpunkte:"; @@ -310,6 +298,9 @@ /* Class = "NSTextFieldCell"; title = "Menu Icon:"; ObjectID = "u6s-Pb-BCG"; */ "u6s-Pb-BCG.title" = "Menü-Symbol:"; +/* Class = "NSButtonCell"; title = "Show advanced settings"; ObjectID = "UBq-Od-SIB"; */ +"UBq-Od-SIB.title" = "Erweiterte Einstellungen anzeigen"; + /* Class = "NSTextFieldCell"; title = "Works if an audio device is selected with no native volume control."; ObjectID = "uF5-a9-Ngz"; */ "uF5-a9-Ngz.title" = "Funktioniert, wenn ein Audiogerät ohne eigene Lautstärkesteuerung ausgewählt ist."; @@ -340,9 +331,6 @@ /* Class = "NSTextFieldCell"; title = "Changes that are caused by the Ambient light sensor or made using Touch Bar, Control Center, System Preferences will be replicated to all displays."; ObjectID = "wjv-tq-iUx"; */ "wjv-tq-iUx.title" = "Änderungen, die durch den Umgebungslichtsensor verursacht oder über die Touch Bar, das Control Center oder die Systemeinstellungen vorgenommen werden, werden auf alle Monitore übertragen."; -/* Class = "NSTextFieldCell"; title = "Display advanced settings and additional information in Preferences."; ObjectID = "X6w-Ee-9Jq"; */ -"X6w-Ee-9Jq.title" = "Erweiterte Einstellungen und zusätzliche Informationen in den Einstellungen anzeigen."; - /* Class = "NSMenuItem"; title = "Change volume for all screens"; ObjectID = "Xih-P5-NyM"; */ "Xih-P5-NyM.title" = "Lautstärke für alle Monitore ändern"; diff --git a/MonitorControl/UI/en.lproj/Main.strings b/MonitorControl/UI/en.lproj/Main.strings index d987e7e..656a48d 100644 --- a/MonitorControl/UI/en.lproj/Main.strings +++ b/MonitorControl/UI/en.lproj/Main.strings @@ -13,6 +13,9 @@ /* Class = "NSTextFieldCell"; title = "DDC min"; ObjectID = "1zE-fg-xEm"; */ "1zE-fg-xEm.title" = "DDC min"; +/* Class = "NSBox"; title = "Box"; ObjectID = "3a3-In-jeQ"; */ +"3a3-In-jeQ.title" = "Box"; + /* Class = "NSMenuItem"; title = "Show separate controls for each display in menu"; ObjectID = "3eO-bN-ZRl"; */ "3eO-bN-ZRl.title" = "Show separate controls for each display in menu"; @@ -55,9 +58,6 @@ /* Class = "NSTextFieldCell"; title = "Show tick marks at 0%, 25%, 50%, 75% and 100% for accuracy."; ObjectID = "A8P-vn-DEJ"; */ "A8P-vn-DEJ.title" = "Show tick marks at 0%, 25%, 50%, 75% and 100% for accuracy."; -/* Class = "NSButtonCell"; title = "Disable software dimming as fallback"; ObjectID = "afB-Xx-Lta"; */ -"afB-Xx-Lta.title" = "Disable software dimming as fallback"; - /* Class = "NSTextFieldCell"; title = "Use brightness, volume and other settings from last time or use defaults. Values will be applied to the display upon first change by the user."; ObjectID = "an7-Aj-3fZ"; */ "an7-Aj-3fZ.title" = "Use brightness, volume and other settings from last time or use defaults. Values will be applied to the display upon first change by the user."; @@ -205,9 +205,6 @@ /* Class = "NSTextFieldCell"; title = "Screen to control:"; ObjectID = "Kfj-WK-aSL"; */ "Kfj-WK-aSL.title" = "Screen to control:"; -/* Class = "NSTextFieldCell"; title = "Don't use software dimming as fallback if no hardware control is available."; ObjectID = "kgh-b4-gmO"; */ -"kgh-b4-gmO.title" = "Don't use software dimming as fallback if no hardware control is available."; - /* Class = "NSMenuItem"; title = "Depends on mouse pointer position"; ObjectID = "km4-hK-auM"; */ "km4-hK-auM.title" = "Depends on mouse pointer position"; @@ -265,9 +262,6 @@ /* Class = "NSButtonCell"; title = "Longer delay during DDC read operations"; ObjectID = "pF5-Sw-7BR"; */ "pF5-Sw-7BR.title" = "Longer delay during DDC read operations"; -/* Class = "NSTextFieldCell"; title = "For hardware (DDC) controlled displays only."; ObjectID = "POy-35-bh0"; */ -"POy-35-bh0.title" = "For hardware (DDC) controlled displays only."; - /* Class = "NSTextFieldCell"; title = "DDC max"; ObjectID = "psF-vX-AFB"; */ "psF-vX-AFB.title" = "DDC max"; @@ -292,15 +286,9 @@ /* Class = "NSButtonCell"; title = "Combine hardware and software dimming"; ObjectID = "r76-Zc-x09"; */ "r76-Zc-x09.title" = "Combine hardware and software dimming"; -/* Class = "NSTextFieldCell"; title = "Advanced:"; ObjectID = "r7i-oG-Ab6"; */ -"r7i-oG-Ab6.title" = "Advanced:"; - /* Class = "NSMenuItem"; title = "Normal"; ObjectID = "Riq-uM-bTs"; */ "Riq-uM-bTs.title" = "Normal"; -/* Class = "NSButtonCell"; title = "Show advanced settings"; ObjectID = "sAR-sh-y8e"; */ -"sAR-sh-y8e.title" = "Show advanced settings"; - /* Class = "NSTextFieldCell"; title = "General menu items style:"; ObjectID = "thh-DG-ecH"; */ "thh-DG-ecH.title" = "General menu items style:"; @@ -310,6 +298,9 @@ /* Class = "NSTextFieldCell"; title = "Menu Icon:"; ObjectID = "u6s-Pb-BCG"; */ "u6s-Pb-BCG.title" = "Menu Icon:"; +/* Class = "NSButtonCell"; title = "Show advanced settings"; ObjectID = "UBq-Od-SIB"; */ +"UBq-Od-SIB.title" = "Show advanced settings"; + /* Class = "NSTextFieldCell"; title = "Works if an audio device is selected with no native volume control."; ObjectID = "uF5-a9-Ngz"; */ "uF5-a9-Ngz.title" = "Works if an audio device is selected with no native volume control."; @@ -340,9 +331,6 @@ /* Class = "NSTextFieldCell"; title = "Changes that are caused by the Ambient light sensor or made using Touch Bar, Control Center, System Preferences will be replicated to all displays."; ObjectID = "wjv-tq-iUx"; */ "wjv-tq-iUx.title" = "Changes that are caused by the Ambient light sensor or made using Touch Bar, Control Center, System Preferences will be replicated to all displays."; -/* Class = "NSTextFieldCell"; title = "Display advanced settings and additional information in Preferences."; ObjectID = "X6w-Ee-9Jq"; */ -"X6w-Ee-9Jq.title" = "Display advanced settings and additional information in Preferences."; - /* Class = "NSMenuItem"; title = "Change volume for all screens"; ObjectID = "Xih-P5-NyM"; */ "Xih-P5-NyM.title" = "Change volume for all screens"; diff --git a/MonitorControl/UI/es-419.lproj/Main.strings b/MonitorControl/UI/es-419.lproj/Main.strings index 0b84e8a..23cd7ee 100644 --- a/MonitorControl/UI/es-419.lproj/Main.strings +++ b/MonitorControl/UI/es-419.lproj/Main.strings @@ -13,6 +13,9 @@ /* Class = "NSTextFieldCell"; title = "DDC min"; ObjectID = "1zE-fg-xEm"; */ "1zE-fg-xEm.title" = "DDC min"; +/* Class = "NSBox"; title = "Box"; ObjectID = "3a3-In-jeQ"; */ +"3a3-In-jeQ.title" = "Box"; + /* Class = "NSMenuItem"; title = "Show separate controls for each display in menu"; ObjectID = "3eO-bN-ZRl"; */ "3eO-bN-ZRl.title" = "Show separate controls for each display in menu"; @@ -55,9 +58,6 @@ /* Class = "NSTextFieldCell"; title = "Show tick marks at 0%, 25%, 50%, 75% and 100% for accuracy."; ObjectID = "A8P-vn-DEJ"; */ "A8P-vn-DEJ.title" = "Show tick marks at 0%, 25%, 50%, 75% and 100% for accuracy."; -/* Class = "NSButtonCell"; title = "Disable software dimming as fallback"; ObjectID = "afB-Xx-Lta"; */ -"afB-Xx-Lta.title" = "Disable software dimming as fallback"; - /* Class = "NSTextFieldCell"; title = "Use brightness, volume and other settings from last time or use defaults. Values will be applied to the display upon first change by the user."; ObjectID = "an7-Aj-3fZ"; */ "an7-Aj-3fZ.title" = "Use brightness, volume and other settings from last time or use defaults. Values will be applied to the display upon first change by the user."; @@ -205,9 +205,6 @@ /* Class = "NSTextFieldCell"; title = "Screen to control:"; ObjectID = "Kfj-WK-aSL"; */ "Kfj-WK-aSL.title" = "Screen to control:"; -/* Class = "NSTextFieldCell"; title = "Don't use software dimming as fallback if no hardware control is available."; ObjectID = "kgh-b4-gmO"; */ -"kgh-b4-gmO.title" = "Don't use software dimming as fallback if no hardware control is available."; - /* Class = "NSMenuItem"; title = "Depends on mouse pointer position"; ObjectID = "km4-hK-auM"; */ "km4-hK-auM.title" = "Depends on mouse pointer position"; @@ -265,9 +262,6 @@ /* Class = "NSButtonCell"; title = "Longer delay during DDC read operations"; ObjectID = "pF5-Sw-7BR"; */ "pF5-Sw-7BR.title" = "Mayor retardo en las operaciones de lectura del DDC"; -/* Class = "NSTextFieldCell"; title = "For hardware (DDC) controlled displays only."; ObjectID = "POy-35-bh0"; */ -"POy-35-bh0.title" = "For hardware (DDC) controlled displays only."; - /* Class = "NSTextFieldCell"; title = "DDC max"; ObjectID = "psF-vX-AFB"; */ "psF-vX-AFB.title" = "DDC max"; @@ -292,15 +286,9 @@ /* Class = "NSButtonCell"; title = "Combine hardware and software dimming"; ObjectID = "r76-Zc-x09"; */ "r76-Zc-x09.title" = "Combine hardware and software dimming"; -/* Class = "NSTextFieldCell"; title = "Advanced:"; ObjectID = "r7i-oG-Ab6"; */ -"r7i-oG-Ab6.title" = "Avanzado:"; - /* Class = "NSMenuItem"; title = "Normal"; ObjectID = "Riq-uM-bTs"; */ "Riq-uM-bTs.title" = "Normal"; -/* Class = "NSButtonCell"; title = "Show advanced settings"; ObjectID = "sAR-sh-y8e"; */ -"sAR-sh-y8e.title" = "Show advanced settings"; - /* Class = "NSTextFieldCell"; title = "General menu items style:"; ObjectID = "thh-DG-ecH"; */ "thh-DG-ecH.title" = "General menu items style:"; @@ -310,6 +298,9 @@ /* Class = "NSTextFieldCell"; title = "Menu Icon:"; ObjectID = "u6s-Pb-BCG"; */ "u6s-Pb-BCG.title" = "Menu Icon:"; +/* Class = "NSButtonCell"; title = "Show advanced settings"; ObjectID = "UBq-Od-SIB"; */ +"UBq-Od-SIB.title" = "Show advanced settings"; + /* Class = "NSTextFieldCell"; title = "Works if an audio device is selected with no native volume control."; ObjectID = "uF5-a9-Ngz"; */ "uF5-a9-Ngz.title" = "Works if an audio device is selected with no native volume control."; @@ -340,9 +331,6 @@ /* Class = "NSTextFieldCell"; title = "Changes that are caused by the Ambient light sensor or made using Touch Bar, Control Center, System Preferences will be replicated to all displays."; ObjectID = "wjv-tq-iUx"; */ "wjv-tq-iUx.title" = "Changes that are caused by the Ambient light sensor or made using Touch Bar, Control Center, System Preferences will be replicated to all displays."; -/* Class = "NSTextFieldCell"; title = "Display advanced settings and additional information in Preferences."; ObjectID = "X6w-Ee-9Jq"; */ -"X6w-Ee-9Jq.title" = "Display advanced settings and additional information in Preferences."; - /* Class = "NSMenuItem"; title = "Change volume for all screens"; ObjectID = "Xih-P5-NyM"; */ "Xih-P5-NyM.title" = "Change volume for all screens"; diff --git a/MonitorControl/UI/fr.lproj/Main.strings b/MonitorControl/UI/fr.lproj/Main.strings index b21985e..8944300 100644 --- a/MonitorControl/UI/fr.lproj/Main.strings +++ b/MonitorControl/UI/fr.lproj/Main.strings @@ -13,6 +13,9 @@ /* Class = "NSTextFieldCell"; title = "DDC min"; ObjectID = "1zE-fg-xEm"; */ "1zE-fg-xEm.title" = "min. DDC"; +/* Class = "NSBox"; title = "Box"; ObjectID = "3a3-In-jeQ"; */ +"3a3-In-jeQ.title" = "Box"; + /* Class = "NSMenuItem"; title = "Show separate controls for each display in menu"; ObjectID = "3eO-bN-ZRl"; */ "3eO-bN-ZRl.title" = "Afficher des commandes distinctes pour chaque écran dans le menu"; @@ -55,9 +58,6 @@ /* Class = "NSTextFieldCell"; title = "Show tick marks at 0%, 25%, 50%, 75% and 100% for accuracy."; ObjectID = "A8P-vn-DEJ"; */ "A8P-vn-DEJ.title" = "Afficher les graduations à 0 %, 25 %, 50 %, 75 % et 100 % pour plus de précision."; -/* Class = "NSButtonCell"; title = "Disable software dimming as fallback"; ObjectID = "afB-Xx-Lta"; */ -"afB-Xx-Lta.title" = "Désactiver le contrôle logiciel comme solution de repli"; - /* Class = "NSTextFieldCell"; title = "Use brightness, volume and other settings from last time or use defaults. Values will be applied to the display upon first change by the user."; ObjectID = "an7-Aj-3fZ"; */ "an7-Aj-3fZ.title" = "Utilisez la luminosité, le volume et d'autres paramètres de la dernière utilisation ou utilisez les valeurs par défaut. Les valeurs seront appliquées sur l'écran lors de la première modification par l'utilisateur."; @@ -205,9 +205,6 @@ /* Class = "NSTextFieldCell"; title = "Screen to control:"; ObjectID = "Kfj-WK-aSL"; */ "Kfj-WK-aSL.title" = "Écran à contrôler :"; -/* Class = "NSTextFieldCell"; title = "Don't use software dimming as fallback if no hardware control is available."; ObjectID = "kgh-b4-gmO"; */ -"kgh-b4-gmO.title" = "Ne pas utiliser le contrôle logiciel comme solution de secours si aucun contrôle matériel n'est disponible."; - /* Class = "NSMenuItem"; title = "Depends on mouse pointer position"; ObjectID = "km4-hK-auM"; */ "km4-hK-auM.title" = "Dépend de la position du pointeur de la souris"; @@ -265,9 +262,6 @@ /* Class = "NSButtonCell"; title = "Longer delay during DDC read operations"; ObjectID = "pF5-Sw-7BR"; */ "pF5-Sw-7BR.title" = "Délais plus long pendant les opérations de lecture DDC"; -/* Class = "NSTextFieldCell"; title = "For hardware (DDC) controlled displays only."; ObjectID = "POy-35-bh0"; */ -"POy-35-bh0.title" = "Pour les écrans contrôlés par matériel (DDC) uniquement."; - /* Class = "NSTextFieldCell"; title = "DDC max"; ObjectID = "psF-vX-AFB"; */ "psF-vX-AFB.title" = "max. DDC"; @@ -292,15 +286,9 @@ /* Class = "NSButtonCell"; title = "Combine hardware and software dimming"; ObjectID = "r76-Zc-x09"; */ "r76-Zc-x09.title" = "Combiner le contrôle matériel et logiciel"; -/* Class = "NSTextFieldCell"; title = "Advanced:"; ObjectID = "r7i-oG-Ab6"; */ -"r7i-oG-Ab6.title" = "Avancé :"; - /* Class = "NSMenuItem"; title = "Normal"; ObjectID = "Riq-uM-bTs"; */ "Riq-uM-bTs.title" = "Normal"; -/* Class = "NSButtonCell"; title = "Show advanced settings"; ObjectID = "sAR-sh-y8e"; */ -"sAR-sh-y8e.title" = "Afficher les paramètres avancés"; - /* Class = "NSTextFieldCell"; title = "General menu items style:"; ObjectID = "thh-DG-ecH"; */ "thh-DG-ecH.title" = "Style des éléments généraux du menu :"; @@ -310,6 +298,9 @@ /* Class = "NSTextFieldCell"; title = "Menu Icon:"; ObjectID = "u6s-Pb-BCG"; */ "u6s-Pb-BCG.title" = "Icône du menu :"; +/* Class = "NSButtonCell"; title = "Show advanced settings"; ObjectID = "UBq-Od-SIB"; */ +"UBq-Od-SIB.title" = "Afficher les paramètres avancés"; + /* Class = "NSTextFieldCell"; title = "Works if an audio device is selected with no native volume control."; ObjectID = "uF5-a9-Ngz"; */ "uF5-a9-Ngz.title" = "Fonctionne si un périphérique audio est sélectionné sans contrôle de volume natif."; @@ -340,9 +331,6 @@ /* Class = "NSTextFieldCell"; title = "Changes that are caused by the Ambient light sensor or made using Touch Bar, Control Center, System Preferences will be replicated to all displays."; ObjectID = "wjv-tq-iUx"; */ "wjv-tq-iUx.title" = "Les modifications causées par le capteur de lumière ambiante ou effectuées à l'aide de la barre tactile, du centre de contrôle et des préférences système seront répliquées sur tous les écrans."; -/* Class = "NSTextFieldCell"; title = "Display advanced settings and additional information in Preferences."; ObjectID = "X6w-Ee-9Jq"; */ -"X6w-Ee-9Jq.title" = "Affiche les paramètres avancés et des informations supplémentaires dans les Préférences."; - /* Class = "NSMenuItem"; title = "Change volume for all screens"; ObjectID = "Xih-P5-NyM"; */ "Xih-P5-NyM.title" = "Modifier le volume pour tous les écrans"; diff --git a/MonitorControl/UI/hu.lproj/Main.strings b/MonitorControl/UI/hu.lproj/Main.strings index 9f2b5ee..810ed96 100644 --- a/MonitorControl/UI/hu.lproj/Main.strings +++ b/MonitorControl/UI/hu.lproj/Main.strings @@ -13,6 +13,9 @@ /* Class = "NSTextFieldCell"; title = "DDC min"; ObjectID = "1zE-fg-xEm"; */ "1zE-fg-xEm.title" = "DDC min"; +/* Class = "NSBox"; title = "Box"; ObjectID = "3a3-In-jeQ"; */ +"3a3-In-jeQ.title" = "Box"; + /* Class = "NSMenuItem"; title = "Show separate controls for each display in menu"; ObjectID = "3eO-bN-ZRl"; */ "3eO-bN-ZRl.title" = "Külön vezérlő minden képernyő számára"; @@ -55,9 +58,6 @@ /* Class = "NSTextFieldCell"; title = "Show tick marks at 0%, 25%, 50%, 75% and 100% for accuracy."; ObjectID = "A8P-vn-DEJ"; */ "A8P-vn-DEJ.title" = "Mértékjelek mutatása 0%, 25%, 50%, 75% és 100% pontokon."; -/* Class = "NSButtonCell"; title = "Disable software dimming as fallback"; ObjectID = "afB-Xx-Lta"; */ -"afB-Xx-Lta.title" = "Szoftveres sötétítési opció letiltása"; - /* Class = "NSTextFieldCell"; title = "Use brightness, volume and other settings from last time or use defaults. Values will be applied to the display upon first change by the user."; ObjectID = "an7-Aj-3fZ"; */ "an7-Aj-3fZ.title" = "Utolsó ismert, vagy alapértelmezett fényerő, hangerő és egyéb beálltások használata. A megváltoztatott értékek első változtatáskor érvényesülnek."; @@ -205,9 +205,6 @@ /* Class = "NSTextFieldCell"; title = "Screen to control:"; ObjectID = "Kfj-WK-aSL"; */ "Kfj-WK-aSL.title" = "Vezérelt képernyő:"; -/* Class = "NSTextFieldCell"; title = "Don't use software dimming as fallback if no hardware control is available."; ObjectID = "kgh-b4-gmO"; */ -"kgh-b4-gmO.title" = "Szoftveres sötétítés használatának mellőzése, ha hardveres állítás nem lehetséges."; - /* Class = "NSMenuItem"; title = "Depends on mouse pointer position"; ObjectID = "km4-hK-auM"; */ "km4-hK-auM.title" = "Az egérmutató helyzetétől függ"; @@ -265,9 +262,6 @@ /* Class = "NSButtonCell"; title = "Longer delay during DDC read operations"; ObjectID = "pF5-Sw-7BR"; */ "pF5-Sw-7BR.title" = "Hosszabb várakozás DDC olvasáskor"; -/* Class = "NSTextFieldCell"; title = "For hardware (DDC) controlled displays only."; ObjectID = "POy-35-bh0"; */ -"POy-35-bh0.title" = "Hardveres (DDC) vezérelt kijelzők esetén."; - /* Class = "NSTextFieldCell"; title = "DDC max"; ObjectID = "psF-vX-AFB"; */ "psF-vX-AFB.title" = "DDC max"; @@ -292,15 +286,9 @@ /* Class = "NSButtonCell"; title = "Combine hardware and software dimming"; ObjectID = "r76-Zc-x09"; */ "r76-Zc-x09.title" = "Hardveres és szoftveres fényerővezérlés kombinálása"; -/* Class = "NSTextFieldCell"; title = "Advanced:"; ObjectID = "r7i-oG-Ab6"; */ -"r7i-oG-Ab6.title" = "Haladó:"; - /* Class = "NSMenuItem"; title = "Normal"; ObjectID = "Riq-uM-bTs"; */ "Riq-uM-bTs.title" = "Normál"; -/* Class = "NSButtonCell"; title = "Show advanced settings"; ObjectID = "sAR-sh-y8e"; */ -"sAR-sh-y8e.title" = "Haladó beállítások mutatása"; - /* Class = "NSTextFieldCell"; title = "General menu items style:"; ObjectID = "thh-DG-ecH"; */ "thh-DG-ecH.title" = "Általános menüpontok stílusa:"; @@ -310,6 +298,9 @@ /* Class = "NSTextFieldCell"; title = "Menu Icon:"; ObjectID = "u6s-Pb-BCG"; */ "u6s-Pb-BCG.title" = "Menü ikon:"; +/* Class = "NSButtonCell"; title = "Show advanced settings"; ObjectID = "UBq-Od-SIB"; */ +"UBq-Od-SIB.title" = "Haladó beállítások mutatása"; + /* Class = "NSTextFieldCell"; title = "Works if an audio device is selected with no native volume control."; ObjectID = "uF5-a9-Ngz"; */ "uF5-a9-Ngz.title" = "Akkor működik, ha hangerővezérléssel nem rendelkező hangeszköz van kiválasztva."; @@ -340,9 +331,6 @@ /* Class = "NSTextFieldCell"; title = "Changes that are caused by the Ambient light sensor or made using Touch Bar, Control Center, System Preferences will be replicated to all displays."; ObjectID = "wjv-tq-iUx"; */ "wjv-tq-iUx.title" = "A környezetifény-érzékelő, Touch Bar, Vezérlőközpont módosításai minden kijelzőre hatással vannak."; -/* Class = "NSTextFieldCell"; title = "Display advanced settings and additional information in Preferences."; ObjectID = "X6w-Ee-9Jq"; */ -"X6w-Ee-9Jq.title" = "Haladó beállítások és további információk megjelenítése a Beállításokban."; - /* Class = "NSMenuItem"; title = "Change volume for all screens"; ObjectID = "Xih-P5-NyM"; */ "Xih-P5-NyM.title" = "Hangerő módosítása minden képernyőn"; diff --git a/MonitorControl/UI/it.lproj/Main.strings b/MonitorControl/UI/it.lproj/Main.strings index 7c4d951..1e1e20f 100644 --- a/MonitorControl/UI/it.lproj/Main.strings +++ b/MonitorControl/UI/it.lproj/Main.strings @@ -13,6 +13,9 @@ /* Class = "NSTextFieldCell"; title = "DDC min"; ObjectID = "1zE-fg-xEm"; */ "1zE-fg-xEm.title" = "Min DDC"; +/* Class = "NSBox"; title = "Box"; ObjectID = "3a3-In-jeQ"; */ +"3a3-In-jeQ.title" = "Box"; + /* Class = "NSMenuItem"; title = "Show separate controls for each display in menu"; ObjectID = "3eO-bN-ZRl"; */ "3eO-bN-ZRl.title" = "Mostra slider separati per ciascun monitor nel menu"; @@ -55,9 +58,6 @@ /* Class = "NSTextFieldCell"; title = "Show tick marks at 0%, 25%, 50%, 75% and 100% for accuracy."; ObjectID = "A8P-vn-DEJ"; */ "A8P-vn-DEJ.title" = "Mostra i marcatori a 0%, 25%, 50%, 75% and 100%."; -/* Class = "NSButtonCell"; title = "Disable software dimming as fallback"; ObjectID = "afB-Xx-Lta"; */ -"afB-Xx-Lta.title" = "Disabilità l'attenuazione software come fallback"; - /* Class = "NSTextFieldCell"; title = "Use brightness, volume and other settings from last time or use defaults. Values will be applied to the display upon first change by the user."; ObjectID = "an7-Aj-3fZ"; */ "an7-Aj-3fZ.title" = "Utilizza la luminisità, il volume ed altre impostazioni dell'ultima volta o utilizza il default. I valori saranno applicati al monitor alla prima modifica dell'utente."; @@ -205,9 +205,6 @@ /* Class = "NSTextFieldCell"; title = "Screen to control:"; ObjectID = "Kfj-WK-aSL"; */ "Kfj-WK-aSL.title" = "Monitor da controllare:"; -/* Class = "NSTextFieldCell"; title = "Don't use software dimming as fallback if no hardware control is available."; ObjectID = "kgh-b4-gmO"; */ -"kgh-b4-gmO.title" = "Non utlizzare l'attenuazione software come fallback se il controllo hardware non è disponibile."; - /* Class = "NSMenuItem"; title = "Depends on mouse pointer position"; ObjectID = "km4-hK-auM"; */ "km4-hK-auM.title" = "Dipende dalla posizione del puntatore del mouse"; @@ -265,9 +262,6 @@ /* Class = "NSButtonCell"; title = "Longer delay during DDC read operations"; ObjectID = "pF5-Sw-7BR"; */ "pF5-Sw-7BR.title" = "Ritardo più lungo durante le operazioni di lettura DDC"; -/* Class = "NSTextFieldCell"; title = "For hardware (DDC) controlled displays only."; ObjectID = "POy-35-bh0"; */ -"POy-35-bh0.title" = "Solo per i monitor con controllo hardware (DDC)."; - /* Class = "NSTextFieldCell"; title = "DDC max"; ObjectID = "psF-vX-AFB"; */ "psF-vX-AFB.title" = "Max DDC"; @@ -292,15 +286,9 @@ /* Class = "NSButtonCell"; title = "Combine hardware and software dimming"; ObjectID = "r76-Zc-x09"; */ "r76-Zc-x09.title" = "Combina l'attenuazione hardware e software"; -/* Class = "NSTextFieldCell"; title = "Advanced:"; ObjectID = "r7i-oG-Ab6"; */ -"r7i-oG-Ab6.title" = "Avanzate:"; - /* Class = "NSMenuItem"; title = "Normal"; ObjectID = "Riq-uM-bTs"; */ "Riq-uM-bTs.title" = "Normale"; -/* Class = "NSButtonCell"; title = "Show advanced settings"; ObjectID = "sAR-sh-y8e"; */ -"sAR-sh-y8e.title" = "Mostra impostazioni avanzate"; - /* Class = "NSTextFieldCell"; title = "General menu items style:"; ObjectID = "thh-DG-ecH"; */ "thh-DG-ecH.title" = "Stile elementi del menu:"; @@ -310,6 +298,9 @@ /* Class = "NSTextFieldCell"; title = "Menu Icon:"; ObjectID = "u6s-Pb-BCG"; */ "u6s-Pb-BCG.title" = "Icona menu:"; +/* Class = "NSButtonCell"; title = "Show advanced settings"; ObjectID = "UBq-Od-SIB"; */ +"UBq-Od-SIB.title" = "Mostra impostazioni avanzate"; + /* Class = "NSTextFieldCell"; title = "Works if an audio device is selected with no native volume control."; ObjectID = "uF5-a9-Ngz"; */ "uF5-a9-Ngz.title" = "Funziona se è selezionato un dispositivo audio senza controllo nativo del volume."; @@ -340,9 +331,6 @@ /* Class = "NSTextFieldCell"; title = "Changes that are caused by the Ambient light sensor or made using Touch Bar, Control Center, System Preferences will be replicated to all displays."; ObjectID = "wjv-tq-iUx"; */ "wjv-tq-iUx.title" = "Le modifiche provocate dal sensore di luce ambiente o fatte attraverso la Touch Bar, Centro di Controllo, Preferenze di Sistema verranno replicate su tutti i monitor."; -/* Class = "NSTextFieldCell"; title = "Display advanced settings and additional information in Preferences."; ObjectID = "X6w-Ee-9Jq"; */ -"X6w-Ee-9Jq.title" = "Mostra le impostazioni avanzate e le informazioni aggiuntive."; - /* Class = "NSMenuItem"; title = "Change volume for all screens"; ObjectID = "Xih-P5-NyM"; */ "Xih-P5-NyM.title" = "Cambia il volume per tutti i monitor"; diff --git a/MonitorControl/UI/ja.lproj/Main.strings b/MonitorControl/UI/ja.lproj/Main.strings index 4052bcc..906bfb6 100644 --- a/MonitorControl/UI/ja.lproj/Main.strings +++ b/MonitorControl/UI/ja.lproj/Main.strings @@ -13,6 +13,9 @@ /* Class = "NSTextFieldCell"; title = "DDC min"; ObjectID = "1zE-fg-xEm"; */ "1zE-fg-xEm.title" = "DDC min"; +/* Class = "NSBox"; title = "Box"; ObjectID = "3a3-In-jeQ"; */ +"3a3-In-jeQ.title" = "Box"; + /* Class = "NSMenuItem"; title = "Show separate controls for each display in menu"; ObjectID = "3eO-bN-ZRl"; */ "3eO-bN-ZRl.title" = "Show separate controls for each display in menu"; @@ -55,9 +58,6 @@ /* Class = "NSTextFieldCell"; title = "Show tick marks at 0%, 25%, 50%, 75% and 100% for accuracy."; ObjectID = "A8P-vn-DEJ"; */ "A8P-vn-DEJ.title" = "Show tick marks at 0%, 25%, 50%, 75% and 100% for accuracy."; -/* Class = "NSButtonCell"; title = "Disable software dimming as fallback"; ObjectID = "afB-Xx-Lta"; */ -"afB-Xx-Lta.title" = "Disable software dimming as fallback"; - /* Class = "NSTextFieldCell"; title = "Use brightness, volume and other settings from last time or use defaults. Values will be applied to the display upon first change by the user."; ObjectID = "an7-Aj-3fZ"; */ "an7-Aj-3fZ.title" = "Use brightness, volume and other settings from last time or use defaults. Values will be applied to the display upon first change by the user."; @@ -205,9 +205,6 @@ /* Class = "NSTextFieldCell"; title = "Screen to control:"; ObjectID = "Kfj-WK-aSL"; */ "Kfj-WK-aSL.title" = "Screen to control:"; -/* Class = "NSTextFieldCell"; title = "Don't use software dimming as fallback if no hardware control is available."; ObjectID = "kgh-b4-gmO"; */ -"kgh-b4-gmO.title" = "Don't use software dimming as fallback if no hardware control is available."; - /* Class = "NSMenuItem"; title = "Depends on mouse pointer position"; ObjectID = "km4-hK-auM"; */ "km4-hK-auM.title" = "Depends on mouse pointer position"; @@ -265,9 +262,6 @@ /* Class = "NSButtonCell"; title = "Longer delay during DDC read operations"; ObjectID = "pF5-Sw-7BR"; */ "pF5-Sw-7BR.title" = "Longer delay during DDC read operations"; -/* Class = "NSTextFieldCell"; title = "For hardware (DDC) controlled displays only."; ObjectID = "POy-35-bh0"; */ -"POy-35-bh0.title" = "For hardware (DDC) controlled displays only."; - /* Class = "NSTextFieldCell"; title = "DDC max"; ObjectID = "psF-vX-AFB"; */ "psF-vX-AFB.title" = "DDC max"; @@ -292,15 +286,9 @@ /* Class = "NSButtonCell"; title = "Combine hardware and software dimming"; ObjectID = "r76-Zc-x09"; */ "r76-Zc-x09.title" = "Combine hardware and software dimming"; -/* Class = "NSTextFieldCell"; title = "Advanced:"; ObjectID = "r7i-oG-Ab6"; */ -"r7i-oG-Ab6.title" = "Advanced:"; - /* Class = "NSMenuItem"; title = "Normal"; ObjectID = "Riq-uM-bTs"; */ "Riq-uM-bTs.title" = "普通"; -/* Class = "NSButtonCell"; title = "Show advanced settings"; ObjectID = "sAR-sh-y8e"; */ -"sAR-sh-y8e.title" = "Show advanced settings"; - /* Class = "NSTextFieldCell"; title = "General menu items style:"; ObjectID = "thh-DG-ecH"; */ "thh-DG-ecH.title" = "General menu items style:"; @@ -310,6 +298,9 @@ /* Class = "NSTextFieldCell"; title = "Menu Icon:"; ObjectID = "u6s-Pb-BCG"; */ "u6s-Pb-BCG.title" = "Menu Icon:"; +/* Class = "NSButtonCell"; title = "Show advanced settings"; ObjectID = "UBq-Od-SIB"; */ +"UBq-Od-SIB.title" = "Show advanced settings"; + /* Class = "NSTextFieldCell"; title = "Works if an audio device is selected with no native volume control."; ObjectID = "uF5-a9-Ngz"; */ "uF5-a9-Ngz.title" = "Works if an audio device is selected with no native volume control."; @@ -340,9 +331,6 @@ /* Class = "NSTextFieldCell"; title = "Changes that are caused by the Ambient light sensor or made using Touch Bar, Control Center, System Preferences will be replicated to all displays."; ObjectID = "wjv-tq-iUx"; */ "wjv-tq-iUx.title" = "Changes that are caused by the Ambient light sensor or made using Touch Bar, Control Center, System Preferences will be replicated to all displays."; -/* Class = "NSTextFieldCell"; title = "Display advanced settings and additional information in Preferences."; ObjectID = "X6w-Ee-9Jq"; */ -"X6w-Ee-9Jq.title" = "Display advanced settings and additional information in Preferences."; - /* Class = "NSMenuItem"; title = "Change volume for all screens"; ObjectID = "Xih-P5-NyM"; */ "Xih-P5-NyM.title" = "Change volume for all screens"; diff --git a/MonitorControl/UI/ko.lproj/Main.strings b/MonitorControl/UI/ko.lproj/Main.strings index a0014bc..777c38f 100644 --- a/MonitorControl/UI/ko.lproj/Main.strings +++ b/MonitorControl/UI/ko.lproj/Main.strings @@ -13,6 +13,9 @@ /* Class = "NSTextFieldCell"; title = "DDC min"; ObjectID = "1zE-fg-xEm"; */ "1zE-fg-xEm.title" = "DDC 최솟값"; +/* Class = "NSBox"; title = "Box"; ObjectID = "3a3-In-jeQ"; */ +"3a3-In-jeQ.title" = "Box"; + /* Class = "NSMenuItem"; title = "Show separate controls for each display in menu"; ObjectID = "3eO-bN-ZRl"; */ "3eO-bN-ZRl.title" = "메뉴에서 각 디스플레이에 대해 각각의 컨트롤 표시"; @@ -55,9 +58,6 @@ /* Class = "NSTextFieldCell"; title = "Show tick marks at 0%, 25%, 50%, 75% and 100% for accuracy."; ObjectID = "A8P-vn-DEJ"; */ "A8P-vn-DEJ.title" = "정확도를 위해 0%, 25%, 50%, 75% 및 100%에 눈금을 표시합니다."; -/* Class = "NSButtonCell"; title = "Disable software dimming as fallback"; ObjectID = "afB-Xx-Lta"; */ -"afB-Xx-Lta.title" = "소프트웨어 밝기 조절을 대체 수단으로 사용하지 않기"; - /* Class = "NSTextFieldCell"; title = "Use brightness, volume and other settings from last time or use defaults. Values will be applied to the display upon first change by the user."; ObjectID = "an7-Aj-3fZ"; */ "an7-Aj-3fZ.title" = "최근의 밝기, 볼륨 및 기타 설정을 사용하거나 기본값을 사용합니다. 값은 사용자가 처음 변경할 때 디스플레이에 적용됩니다."; @@ -205,9 +205,6 @@ /* Class = "NSTextFieldCell"; title = "Screen to control:"; ObjectID = "Kfj-WK-aSL"; */ "Kfj-WK-aSL.title" = "제어할 화면:"; -/* Class = "NSTextFieldCell"; title = "Don't use software dimming as fallback if no hardware control is available."; ObjectID = "kgh-b4-gmO"; */ -"kgh-b4-gmO.title" = "하드웨어 제어를 사용할 수 없는 경우 소프트웨어 밝기 조절을 대체 수단으로 사용하지 않습니다."; - /* Class = "NSMenuItem"; title = "Depends on mouse pointer position"; ObjectID = "km4-hK-auM"; */ "km4-hK-auM.title" = "마우스 포인터 위치에 따라 다름"; @@ -265,9 +262,6 @@ /* Class = "NSButtonCell"; title = "Longer delay during DDC read operations"; ObjectID = "pF5-Sw-7BR"; */ "pF5-Sw-7BR.title" = "DDC 읽기 작업 중 응답 지연 시간 연장"; -/* Class = "NSTextFieldCell"; title = "For hardware (DDC) controlled displays only."; ObjectID = "POy-35-bh0"; */ -"POy-35-bh0.title" = "하드웨어 (DDC) 제어 디스플레이 전용."; - /* Class = "NSTextFieldCell"; title = "DDC max"; ObjectID = "psF-vX-AFB"; */ "psF-vX-AFB.title" = "DDC 최댓값"; @@ -292,15 +286,9 @@ /* Class = "NSButtonCell"; title = "Combine hardware and software dimming"; ObjectID = "r76-Zc-x09"; */ "r76-Zc-x09.title" = "하드웨어 및 소프트웨어 밝기 조절 통합"; -/* Class = "NSTextFieldCell"; title = "Advanced:"; ObjectID = "r7i-oG-Ab6"; */ -"r7i-oG-Ab6.title" = "고급:"; - /* Class = "NSMenuItem"; title = "Normal"; ObjectID = "Riq-uM-bTs"; */ "Riq-uM-bTs.title" = "보통"; -/* Class = "NSButtonCell"; title = "Show advanced settings"; ObjectID = "sAR-sh-y8e"; */ -"sAR-sh-y8e.title" = "고급 설정 표시"; - /* Class = "NSTextFieldCell"; title = "General menu items style:"; ObjectID = "thh-DG-ecH"; */ "thh-DG-ecH.title" = "일반 메뉴 항목 스타일:"; @@ -310,6 +298,9 @@ /* Class = "NSTextFieldCell"; title = "Menu Icon:"; ObjectID = "u6s-Pb-BCG"; */ "u6s-Pb-BCG.title" = "메뉴 아이콘:"; +/* Class = "NSButtonCell"; title = "Show advanced settings"; ObjectID = "UBq-Od-SIB"; */ +"UBq-Od-SIB.title" = "고급 설정 표시"; + /* Class = "NSTextFieldCell"; title = "Works if an audio device is selected with no native volume control."; ObjectID = "uF5-a9-Ngz"; */ "uF5-a9-Ngz.title" = "기본 볼륨 컨트롤 없이 오디오 장치를 선택한 경우 동작합니다."; @@ -340,9 +331,6 @@ /* Class = "NSTextFieldCell"; title = "Changes that are caused by the Ambient light sensor or made using Touch Bar, Control Center, System Preferences will be replicated to all displays."; ObjectID = "wjv-tq-iUx"; */ "wjv-tq-iUx.title" = "조도 센서로 인해 변경되었거나 Touch Bar, 제어 센터, 시스템 환경설정을 사용하여 변경한 사항은 모든 디스플레이에 적용됩니다."; -/* Class = "NSTextFieldCell"; title = "Display advanced settings and additional information in Preferences."; ObjectID = "X6w-Ee-9Jq"; */ -"X6w-Ee-9Jq.title" = "기본 설정에서 고급 설정 및 추가 정보를 표시합니다."; - /* Class = "NSMenuItem"; title = "Change volume for all screens"; ObjectID = "Xih-P5-NyM"; */ "Xih-P5-NyM.title" = "모든 화면의 볼륨 변경"; diff --git a/MonitorControl/UI/nl.lproj/Main.strings b/MonitorControl/UI/nl.lproj/Main.strings index da4c65c..2e33565 100644 --- a/MonitorControl/UI/nl.lproj/Main.strings +++ b/MonitorControl/UI/nl.lproj/Main.strings @@ -13,6 +13,9 @@ /* Class = "NSTextFieldCell"; title = "DDC min"; ObjectID = "1zE-fg-xEm"; */ "1zE-fg-xEm.title" = "DDC min"; +/* Class = "NSBox"; title = "Box"; ObjectID = "3a3-In-jeQ"; */ +"3a3-In-jeQ.title" = "Box"; + /* Class = "NSMenuItem"; title = "Show separate controls for each display in menu"; ObjectID = "3eO-bN-ZRl"; */ "3eO-bN-ZRl.title" = "Toon afzonderlijke bedieningselementen voor elk scherm in het menu"; @@ -55,9 +58,6 @@ /* Class = "NSTextFieldCell"; title = "Show tick marks at 0%, 25%, 50%, 75% and 100% for accuracy."; ObjectID = "A8P-vn-DEJ"; */ "A8P-vn-DEJ.title" = "Toon maatstreepjes op 0%, 25%, 50%, 75% en 100% voor nauwkeurigheid."; -/* Class = "NSButtonCell"; title = "Disable software dimming as fallback"; ObjectID = "afB-Xx-Lta"; */ -"afB-Xx-Lta.title" = "Dimmen van software uitschakelen als fallback"; - /* Class = "NSTextFieldCell"; title = "Use brightness, volume and other settings from last time or use defaults. Values will be applied to the display upon first change by the user."; ObjectID = "an7-Aj-3fZ"; */ "an7-Aj-3fZ.title" = "Gebruik helderheid, volume en andere instellingen van de vorige sessie of gebruik standaardinstellingen. Waarden worden toegepast op het display bij de eerste wijziging door de gebruiker."; @@ -205,9 +205,6 @@ /* Class = "NSTextFieldCell"; title = "Screen to control:"; ObjectID = "Kfj-WK-aSL"; */ "Kfj-WK-aSL.title" = "Scherm om te bedienen:"; -/* Class = "NSTextFieldCell"; title = "Don't use software dimming as fallback if no hardware control is available."; ObjectID = "kgh-b4-gmO"; */ -"kgh-b4-gmO.title" = "Gebruik geen software dimming als fallback als er geen hardwarecontrole beschikbaar is."; - /* Class = "NSMenuItem"; title = "Depends on mouse pointer position"; ObjectID = "km4-hK-auM"; */ "km4-hK-auM.title" = "Afhankelijk van de positie van de muisaanwijzer"; @@ -265,9 +262,6 @@ /* Class = "NSButtonCell"; title = "Longer delay during DDC read operations"; ObjectID = "pF5-Sw-7BR"; */ "pF5-Sw-7BR.title" = "Langere vertraging tijdens DDC-leesbewerkingen"; -/* Class = "NSTextFieldCell"; title = "For hardware (DDC) controlled displays only."; ObjectID = "POy-35-bh0"; */ -"POy-35-bh0.title" = "Enkel voor hardware (DDC) gestuurde displays."; - /* Class = "NSTextFieldCell"; title = "DDC max"; ObjectID = "psF-vX-AFB"; */ "psF-vX-AFB.title" = "DDC max"; @@ -292,15 +286,9 @@ /* Class = "NSButtonCell"; title = "Combine hardware and software dimming"; ObjectID = "r76-Zc-x09"; */ "r76-Zc-x09.title" = "Combineer hardware en software dimmen"; -/* Class = "NSTextFieldCell"; title = "Advanced:"; ObjectID = "r7i-oG-Ab6"; */ -"r7i-oG-Ab6.title" = "Geavanceerd:"; - /* Class = "NSMenuItem"; title = "Normal"; ObjectID = "Riq-uM-bTs"; */ "Riq-uM-bTs.title" = "Normaal"; -/* Class = "NSButtonCell"; title = "Show advanced settings"; ObjectID = "sAR-sh-y8e"; */ -"sAR-sh-y8e.title" = "Toon geavanceerde instellingen"; - /* Class = "NSTextFieldCell"; title = "General menu items style:"; ObjectID = "thh-DG-ecH"; */ "thh-DG-ecH.title" = "Stijl algemene menu-items:"; @@ -310,6 +298,9 @@ /* Class = "NSTextFieldCell"; title = "Menu Icon:"; ObjectID = "u6s-Pb-BCG"; */ "u6s-Pb-BCG.title" = "Menu Icoon:"; +/* Class = "NSButtonCell"; title = "Show advanced settings"; ObjectID = "UBq-Od-SIB"; */ +"UBq-Od-SIB.title" = "Toon geavanceerde instellingen"; + /* Class = "NSTextFieldCell"; title = "Works if an audio device is selected with no native volume control."; ObjectID = "uF5-a9-Ngz"; */ "uF5-a9-Ngz.title" = "Werkt als een audioapparaat is geselecteerd zonder native volumeregeling."; @@ -340,9 +331,6 @@ /* Class = "NSTextFieldCell"; title = "Changes that are caused by the Ambient light sensor or made using Touch Bar, Control Center, System Preferences will be replicated to all displays."; ObjectID = "wjv-tq-iUx"; */ "wjv-tq-iUx.title" = "Wijzigingen die worden veroorzaakt door de omgevingslichtsensor of die zijn aangebracht met Touch Bar, Control Center, systeemvoorkeuren, worden gerepliceerd naar alle schermen."; -/* Class = "NSTextFieldCell"; title = "Display advanced settings and additional information in Preferences."; ObjectID = "X6w-Ee-9Jq"; */ -"X6w-Ee-9Jq.title" = "Geavanceerde instellingen en aanvullende informatie weergeven in Voorkeuren."; - /* Class = "NSMenuItem"; title = "Change volume for all screens"; ObjectID = "Xih-P5-NyM"; */ "Xih-P5-NyM.title" = "Volume wijzigen voor alle schermen"; diff --git a/MonitorControl/UI/pl.lproj/Main.strings b/MonitorControl/UI/pl.lproj/Main.strings index d87d316..4ec40a3 100644 --- a/MonitorControl/UI/pl.lproj/Main.strings +++ b/MonitorControl/UI/pl.lproj/Main.strings @@ -13,6 +13,9 @@ /* Class = "NSTextFieldCell"; title = "DDC min"; ObjectID = "1zE-fg-xEm"; */ "1zE-fg-xEm.title" = "DDC min"; +/* Class = "NSBox"; title = "Box"; ObjectID = "3a3-In-jeQ"; */ +"3a3-In-jeQ.title" = "Box"; + /* Class = "NSMenuItem"; title = "Show separate controls for each display in menu"; ObjectID = "3eO-bN-ZRl"; */ "3eO-bN-ZRl.title" = "Show separate controls for each display in menu"; @@ -55,9 +58,6 @@ /* Class = "NSTextFieldCell"; title = "Show tick marks at 0%, 25%, 50%, 75% and 100% for accuracy."; ObjectID = "A8P-vn-DEJ"; */ "A8P-vn-DEJ.title" = "Show tick marks at 0%, 25%, 50%, 75% and 100% for accuracy."; -/* Class = "NSButtonCell"; title = "Disable software dimming as fallback"; ObjectID = "afB-Xx-Lta"; */ -"afB-Xx-Lta.title" = "Disable software dimming as fallback"; - /* Class = "NSTextFieldCell"; title = "Use brightness, volume and other settings from last time or use defaults. Values will be applied to the display upon first change by the user."; ObjectID = "an7-Aj-3fZ"; */ "an7-Aj-3fZ.title" = "Use brightness, volume and other settings from last time or use defaults. Values will be applied to the display upon first change by the user."; @@ -205,9 +205,6 @@ /* Class = "NSTextFieldCell"; title = "Screen to control:"; ObjectID = "Kfj-WK-aSL"; */ "Kfj-WK-aSL.title" = "Screen to control:"; -/* Class = "NSTextFieldCell"; title = "Don't use software dimming as fallback if no hardware control is available."; ObjectID = "kgh-b4-gmO"; */ -"kgh-b4-gmO.title" = "Don't use software dimming as fallback if no hardware control is available."; - /* Class = "NSMenuItem"; title = "Depends on mouse pointer position"; ObjectID = "km4-hK-auM"; */ "km4-hK-auM.title" = "Depends on mouse pointer position"; @@ -265,9 +262,6 @@ /* Class = "NSButtonCell"; title = "Longer delay during DDC read operations"; ObjectID = "pF5-Sw-7BR"; */ "pF5-Sw-7BR.title" = "Dłuższe opóźnienie podczas odczytywania operacji DDC"; -/* Class = "NSTextFieldCell"; title = "For hardware (DDC) controlled displays only."; ObjectID = "POy-35-bh0"; */ -"POy-35-bh0.title" = "For hardware (DDC) controlled displays only."; - /* Class = "NSTextFieldCell"; title = "DDC max"; ObjectID = "psF-vX-AFB"; */ "psF-vX-AFB.title" = "DDC max"; @@ -292,15 +286,9 @@ /* Class = "NSButtonCell"; title = "Combine hardware and software dimming"; ObjectID = "r76-Zc-x09"; */ "r76-Zc-x09.title" = "Combine hardware and software dimming"; -/* Class = "NSTextFieldCell"; title = "Advanced:"; ObjectID = "r7i-oG-Ab6"; */ -"r7i-oG-Ab6.title" = "Zaawansowane:"; - /* Class = "NSMenuItem"; title = "Normal"; ObjectID = "Riq-uM-bTs"; */ "Riq-uM-bTs.title" = "Normalny"; -/* Class = "NSButtonCell"; title = "Show advanced settings"; ObjectID = "sAR-sh-y8e"; */ -"sAR-sh-y8e.title" = "Show advanced settings"; - /* Class = "NSTextFieldCell"; title = "General menu items style:"; ObjectID = "thh-DG-ecH"; */ "thh-DG-ecH.title" = "General menu items style:"; @@ -310,6 +298,9 @@ /* Class = "NSTextFieldCell"; title = "Menu Icon:"; ObjectID = "u6s-Pb-BCG"; */ "u6s-Pb-BCG.title" = "Menu Icon:"; +/* Class = "NSButtonCell"; title = "Show advanced settings"; ObjectID = "UBq-Od-SIB"; */ +"UBq-Od-SIB.title" = "Show advanced settings"; + /* Class = "NSTextFieldCell"; title = "Works if an audio device is selected with no native volume control."; ObjectID = "uF5-a9-Ngz"; */ "uF5-a9-Ngz.title" = "Works if an audio device is selected with no native volume control."; @@ -340,9 +331,6 @@ /* Class = "NSTextFieldCell"; title = "Changes that are caused by the Ambient light sensor or made using Touch Bar, Control Center, System Preferences will be replicated to all displays."; ObjectID = "wjv-tq-iUx"; */ "wjv-tq-iUx.title" = "Changes that are caused by the Ambient light sensor or made using Touch Bar, Control Center, System Preferences will be replicated to all displays."; -/* Class = "NSTextFieldCell"; title = "Display advanced settings and additional information in Preferences."; ObjectID = "X6w-Ee-9Jq"; */ -"X6w-Ee-9Jq.title" = "Display advanced settings and additional information in Preferences."; - /* Class = "NSMenuItem"; title = "Change volume for all screens"; ObjectID = "Xih-P5-NyM"; */ "Xih-P5-NyM.title" = "Change volume for all screens"; diff --git a/MonitorControl/UI/ru.lproj/Main.strings b/MonitorControl/UI/ru.lproj/Main.strings index ae6c23f..bae0847 100644 --- a/MonitorControl/UI/ru.lproj/Main.strings +++ b/MonitorControl/UI/ru.lproj/Main.strings @@ -13,6 +13,9 @@ /* Class = "NSTextFieldCell"; title = "DDC min"; ObjectID = "1zE-fg-xEm"; */ "1zE-fg-xEm.title" = "DDC min"; +/* Class = "NSBox"; title = "Box"; ObjectID = "3a3-In-jeQ"; */ +"3a3-In-jeQ.title" = "Box"; + /* Class = "NSMenuItem"; title = "Show separate controls for each display in menu"; ObjectID = "3eO-bN-ZRl"; */ "3eO-bN-ZRl.title" = "Show separate controls for each display in menu"; @@ -55,9 +58,6 @@ /* Class = "NSTextFieldCell"; title = "Show tick marks at 0%, 25%, 50%, 75% and 100% for accuracy."; ObjectID = "A8P-vn-DEJ"; */ "A8P-vn-DEJ.title" = "Show tick marks at 0%, 25%, 50%, 75% and 100% for accuracy."; -/* Class = "NSButtonCell"; title = "Disable software dimming as fallback"; ObjectID = "afB-Xx-Lta"; */ -"afB-Xx-Lta.title" = "Disable software dimming as fallback"; - /* Class = "NSTextFieldCell"; title = "Use brightness, volume and other settings from last time or use defaults. Values will be applied to the display upon first change by the user."; ObjectID = "an7-Aj-3fZ"; */ "an7-Aj-3fZ.title" = "Use brightness, volume and other settings from last time or use defaults. Values will be applied to the display upon first change by the user."; @@ -205,9 +205,6 @@ /* Class = "NSTextFieldCell"; title = "Screen to control:"; ObjectID = "Kfj-WK-aSL"; */ "Kfj-WK-aSL.title" = "Screen to control:"; -/* Class = "NSTextFieldCell"; title = "Don't use software dimming as fallback if no hardware control is available."; ObjectID = "kgh-b4-gmO"; */ -"kgh-b4-gmO.title" = "Don't use software dimming as fallback if no hardware control is available."; - /* Class = "NSMenuItem"; title = "Depends on mouse pointer position"; ObjectID = "km4-hK-auM"; */ "km4-hK-auM.title" = "Depends on mouse pointer position"; @@ -265,9 +262,6 @@ /* Class = "NSButtonCell"; title = "Longer delay during DDC read operations"; ObjectID = "pF5-Sw-7BR"; */ "pF5-Sw-7BR.title" = "Более длительная задержка при выполнении операций считывания данных DDC"; -/* Class = "NSTextFieldCell"; title = "For hardware (DDC) controlled displays only."; ObjectID = "POy-35-bh0"; */ -"POy-35-bh0.title" = "For hardware (DDC) controlled displays only."; - /* Class = "NSTextFieldCell"; title = "DDC max"; ObjectID = "psF-vX-AFB"; */ "psF-vX-AFB.title" = "DDC max"; @@ -292,15 +286,9 @@ /* Class = "NSButtonCell"; title = "Combine hardware and software dimming"; ObjectID = "r76-Zc-x09"; */ "r76-Zc-x09.title" = "Combine hardware and software dimming"; -/* Class = "NSTextFieldCell"; title = "Advanced:"; ObjectID = "r7i-oG-Ab6"; */ -"r7i-oG-Ab6.title" = "Расширенные:"; - /* Class = "NSMenuItem"; title = "Normal"; ObjectID = "Riq-uM-bTs"; */ "Riq-uM-bTs.title" = "Нормально"; -/* Class = "NSButtonCell"; title = "Show advanced settings"; ObjectID = "sAR-sh-y8e"; */ -"sAR-sh-y8e.title" = "Show advanced settings"; - /* Class = "NSTextFieldCell"; title = "General menu items style:"; ObjectID = "thh-DG-ecH"; */ "thh-DG-ecH.title" = "General menu items style:"; @@ -310,6 +298,9 @@ /* Class = "NSTextFieldCell"; title = "Menu Icon:"; ObjectID = "u6s-Pb-BCG"; */ "u6s-Pb-BCG.title" = "Menu Icon:"; +/* Class = "NSButtonCell"; title = "Show advanced settings"; ObjectID = "UBq-Od-SIB"; */ +"UBq-Od-SIB.title" = "Show advanced settings"; + /* Class = "NSTextFieldCell"; title = "Works if an audio device is selected with no native volume control."; ObjectID = "uF5-a9-Ngz"; */ "uF5-a9-Ngz.title" = "Works if an audio device is selected with no native volume control."; @@ -340,9 +331,6 @@ /* Class = "NSTextFieldCell"; title = "Changes that are caused by the Ambient light sensor or made using Touch Bar, Control Center, System Preferences will be replicated to all displays."; ObjectID = "wjv-tq-iUx"; */ "wjv-tq-iUx.title" = "Changes that are caused by the Ambient light sensor or made using Touch Bar, Control Center, System Preferences will be replicated to all displays."; -/* Class = "NSTextFieldCell"; title = "Display advanced settings and additional information in Preferences."; ObjectID = "X6w-Ee-9Jq"; */ -"X6w-Ee-9Jq.title" = "Display advanced settings and additional information in Preferences."; - /* Class = "NSMenuItem"; title = "Change volume for all screens"; ObjectID = "Xih-P5-NyM"; */ "Xih-P5-NyM.title" = "Change volume for all screens"; diff --git a/MonitorControl/UI/tr.lproj/Main.strings b/MonitorControl/UI/tr.lproj/Main.strings index bc24472..3d109ef 100644 --- a/MonitorControl/UI/tr.lproj/Main.strings +++ b/MonitorControl/UI/tr.lproj/Main.strings @@ -13,6 +13,9 @@ /* Class = "NSTextFieldCell"; title = "DDC min"; ObjectID = "1zE-fg-xEm"; */ "1zE-fg-xEm.title" = "DDC min"; +/* Class = "NSBox"; title = "Box"; ObjectID = "3a3-In-jeQ"; */ +"3a3-In-jeQ.title" = "Box"; + /* Class = "NSMenuItem"; title = "Show separate controls for each display in menu"; ObjectID = "3eO-bN-ZRl"; */ "3eO-bN-ZRl.title" = "Menüdeki her ekran için ayrı kontroller göster"; @@ -55,9 +58,6 @@ /* Class = "NSTextFieldCell"; title = "Show tick marks at 0%, 25%, 50%, 75% and 100% for accuracy."; ObjectID = "A8P-vn-DEJ"; */ "A8P-vn-DEJ.title" = "Doğruluk için onay işaretlerini %0, %25, %50, %75 ve %100 olarak gösterin."; -/* Class = "NSButtonCell"; title = "Disable software dimming as fallback"; ObjectID = "afB-Xx-Lta"; */ -"afB-Xx-Lta.title" = "Yazılım karartmasını devre dışı bırakın"; - /* Class = "NSTextFieldCell"; title = "Use brightness, volume and other settings from last time or use defaults. Values will be applied to the display upon first change by the user."; ObjectID = "an7-Aj-3fZ"; */ "an7-Aj-3fZ.title" = "Bir önceki parlaklık, ses seviyesi ve diğer ayarları kullanın veya varsayılanları kullanın. Değerler, kullanıcı tarafından ilk değişiklik yapıldığında ekrana uygulanacaktır."; @@ -205,9 +205,6 @@ /* Class = "NSTextFieldCell"; title = "Screen to control:"; ObjectID = "Kfj-WK-aSL"; */ "Kfj-WK-aSL.title" = "Kontrol edilecek ekran:"; -/* Class = "NSTextFieldCell"; title = "Don't use software dimming as fallback if no hardware control is available."; ObjectID = "kgh-b4-gmO"; */ -"kgh-b4-gmO.title" = "Donanım denetimi yoksa, yazılım karartmasını kullanmayın."; - /* Class = "NSMenuItem"; title = "Depends on mouse pointer position"; ObjectID = "km4-hK-auM"; */ "km4-hK-auM.title" = "Fare işaretçisinin konumuna bağlıdır"; @@ -265,9 +262,6 @@ /* Class = "NSButtonCell"; title = "Longer delay during DDC read operations"; ObjectID = "pF5-Sw-7BR"; */ "pF5-Sw-7BR.title" = "DDC okuma işlemleri sırasında daha uzun gecikme"; -/* Class = "NSTextFieldCell"; title = "For hardware (DDC) controlled displays only."; ObjectID = "POy-35-bh0"; */ -"POy-35-bh0.title" = "Yalnızca donanım (DDC) kontrollü ekranlar için."; - /* Class = "NSTextFieldCell"; title = "DDC max"; ObjectID = "psF-vX-AFB"; */ "psF-vX-AFB.title" = "En yüksek DDC"; @@ -292,15 +286,9 @@ /* Class = "NSButtonCell"; title = "Combine hardware and software dimming"; ObjectID = "r76-Zc-x09"; */ "r76-Zc-x09.title" = "Donanım ve yazılım karartmasını birleştirin"; -/* Class = "NSTextFieldCell"; title = "Advanced:"; ObjectID = "r7i-oG-Ab6"; */ -"r7i-oG-Ab6.title" = "Gelişmiş:"; - /* Class = "NSMenuItem"; title = "Normal"; ObjectID = "Riq-uM-bTs"; */ "Riq-uM-bTs.title" = "Normal"; -/* Class = "NSButtonCell"; title = "Show advanced settings"; ObjectID = "sAR-sh-y8e"; */ -"sAR-sh-y8e.title" = "Gelişmiş ayarları göster"; - /* Class = "NSTextFieldCell"; title = "General menu items style:"; ObjectID = "thh-DG-ecH"; */ "thh-DG-ecH.title" = "Genel menü öğeleri stili:"; @@ -310,6 +298,9 @@ /* Class = "NSTextFieldCell"; title = "Menu Icon:"; ObjectID = "u6s-Pb-BCG"; */ "u6s-Pb-BCG.title" = "Menü ikonu:"; +/* Class = "NSButtonCell"; title = "Show advanced settings"; ObjectID = "UBq-Od-SIB"; */ +"UBq-Od-SIB.title" = "Gelişmiş ayarları göster"; + /* Class = "NSTextFieldCell"; title = "Works if an audio device is selected with no native volume control."; ObjectID = "uF5-a9-Ngz"; */ "uF5-a9-Ngz.title" = "Yerel ses düzeyi denetimi olmayan bir ses aygıtı seçilirse çalışır."; @@ -340,9 +331,6 @@ /* Class = "NSTextFieldCell"; title = "Changes that are caused by the Ambient light sensor or made using Touch Bar, Control Center, System Preferences will be replicated to all displays."; ObjectID = "wjv-tq-iUx"; */ "wjv-tq-iUx.title" = "Ortam ışığı sensöründen kaynaklanan veya Dokunmatik Çubuk, Kontrol Merkezi, Sistem Tercihleri kullanılarak yapılan değişiklikler tüm ekranlara yansıtılacaktır.."; -/* Class = "NSTextFieldCell"; title = "Display advanced settings and additional information in Preferences."; ObjectID = "X6w-Ee-9Jq"; */ -"X6w-Ee-9Jq.title" = "Gelişmiş ayarları ve ek bilgileri Tercihler'de görüntüleyin."; - /* Class = "NSMenuItem"; title = "Change volume for all screens"; ObjectID = "Xih-P5-NyM"; */ "Xih-P5-NyM.title" = "Tüm ekranlar için ses seviyesini değiştir"; diff --git a/MonitorControl/UI/uk.lproj/Main.strings b/MonitorControl/UI/uk.lproj/Main.strings index 4baa3d1..cbe071f 100644 --- a/MonitorControl/UI/uk.lproj/Main.strings +++ b/MonitorControl/UI/uk.lproj/Main.strings @@ -13,6 +13,9 @@ /* Class = "NSTextFieldCell"; title = "DDC min"; ObjectID = "1zE-fg-xEm"; */ "1zE-fg-xEm.title" = "DDC min"; +/* Class = "NSBox"; title = "Box"; ObjectID = "3a3-In-jeQ"; */ +"3a3-In-jeQ.title" = "Box"; + /* Class = "NSMenuItem"; title = "Show separate controls for each display in menu"; ObjectID = "3eO-bN-ZRl"; */ "3eO-bN-ZRl.title" = "Show separate controls for each display in menu"; @@ -55,9 +58,6 @@ /* Class = "NSTextFieldCell"; title = "Show tick marks at 0%, 25%, 50%, 75% and 100% for accuracy."; ObjectID = "A8P-vn-DEJ"; */ "A8P-vn-DEJ.title" = "Show tick marks at 0%, 25%, 50%, 75% and 100% for accuracy."; -/* Class = "NSButtonCell"; title = "Disable software dimming as fallback"; ObjectID = "afB-Xx-Lta"; */ -"afB-Xx-Lta.title" = "Disable software dimming as fallback"; - /* Class = "NSTextFieldCell"; title = "Use brightness, volume and other settings from last time or use defaults. Values will be applied to the display upon first change by the user."; ObjectID = "an7-Aj-3fZ"; */ "an7-Aj-3fZ.title" = "Use brightness, volume and other settings from last time or use defaults. Values will be applied to the display upon first change by the user."; @@ -205,9 +205,6 @@ /* Class = "NSTextFieldCell"; title = "Screen to control:"; ObjectID = "Kfj-WK-aSL"; */ "Kfj-WK-aSL.title" = "Screen to control:"; -/* Class = "NSTextFieldCell"; title = "Don't use software dimming as fallback if no hardware control is available."; ObjectID = "kgh-b4-gmO"; */ -"kgh-b4-gmO.title" = "Don't use software dimming as fallback if no hardware control is available."; - /* Class = "NSMenuItem"; title = "Depends on mouse pointer position"; ObjectID = "km4-hK-auM"; */ "km4-hK-auM.title" = "Depends on mouse pointer position"; @@ -265,9 +262,6 @@ /* Class = "NSButtonCell"; title = "Longer delay during DDC read operations"; ObjectID = "pF5-Sw-7BR"; */ "pF5-Sw-7BR.title" = "Longer delay during DDC read operations"; -/* Class = "NSTextFieldCell"; title = "For hardware (DDC) controlled displays only."; ObjectID = "POy-35-bh0"; */ -"POy-35-bh0.title" = "For hardware (DDC) controlled displays only."; - /* Class = "NSTextFieldCell"; title = "DDC max"; ObjectID = "psF-vX-AFB"; */ "psF-vX-AFB.title" = "DDC max"; @@ -292,15 +286,9 @@ /* Class = "NSButtonCell"; title = "Combine hardware and software dimming"; ObjectID = "r76-Zc-x09"; */ "r76-Zc-x09.title" = "Combine hardware and software dimming"; -/* Class = "NSTextFieldCell"; title = "Advanced:"; ObjectID = "r7i-oG-Ab6"; */ -"r7i-oG-Ab6.title" = "Advanced:"; - /* Class = "NSMenuItem"; title = "Normal"; ObjectID = "Riq-uM-bTs"; */ "Riq-uM-bTs.title" = "Звич."; -/* Class = "NSButtonCell"; title = "Show advanced settings"; ObjectID = "sAR-sh-y8e"; */ -"sAR-sh-y8e.title" = "Show advanced settings"; - /* Class = "NSTextFieldCell"; title = "General menu items style:"; ObjectID = "thh-DG-ecH"; */ "thh-DG-ecH.title" = "General menu items style:"; @@ -310,6 +298,9 @@ /* Class = "NSTextFieldCell"; title = "Menu Icon:"; ObjectID = "u6s-Pb-BCG"; */ "u6s-Pb-BCG.title" = "Menu Icon:"; +/* Class = "NSButtonCell"; title = "Show advanced settings"; ObjectID = "UBq-Od-SIB"; */ +"UBq-Od-SIB.title" = "Show advanced settings"; + /* Class = "NSTextFieldCell"; title = "Works if an audio device is selected with no native volume control."; ObjectID = "uF5-a9-Ngz"; */ "uF5-a9-Ngz.title" = "Works if an audio device is selected with no native volume control."; @@ -340,9 +331,6 @@ /* Class = "NSTextFieldCell"; title = "Changes that are caused by the Ambient light sensor or made using Touch Bar, Control Center, System Preferences will be replicated to all displays."; ObjectID = "wjv-tq-iUx"; */ "wjv-tq-iUx.title" = "Changes that are caused by the Ambient light sensor or made using Touch Bar, Control Center, System Preferences will be replicated to all displays."; -/* Class = "NSTextFieldCell"; title = "Display advanced settings and additional information in Preferences."; ObjectID = "X6w-Ee-9Jq"; */ -"X6w-Ee-9Jq.title" = "Display advanced settings and additional information in Preferences."; - /* Class = "NSMenuItem"; title = "Change volume for all screens"; ObjectID = "Xih-P5-NyM"; */ "Xih-P5-NyM.title" = "Change volume for all screens"; diff --git a/MonitorControl/UI/zh-Hans.lproj/Main.strings b/MonitorControl/UI/zh-Hans.lproj/Main.strings index e8aa9e2..04e1411 100644 --- a/MonitorControl/UI/zh-Hans.lproj/Main.strings +++ b/MonitorControl/UI/zh-Hans.lproj/Main.strings @@ -13,6 +13,9 @@ /* Class = "NSTextFieldCell"; title = "DDC min"; ObjectID = "1zE-fg-xEm"; */ "1zE-fg-xEm.title" = "DDC最小值"; +/* Class = "NSBox"; title = "Box"; ObjectID = "3a3-In-jeQ"; */ +"3a3-In-jeQ.title" = "Box"; + /* Class = "NSMenuItem"; title = "Show separate controls for each display in menu"; ObjectID = "3eO-bN-ZRl"; */ "3eO-bN-ZRl.title" = "显示各个显示器的控制滑杆"; @@ -55,9 +58,6 @@ /* Class = "NSTextFieldCell"; title = "Show tick marks at 0%, 25%, 50%, 75% and 100% for accuracy."; ObjectID = "A8P-vn-DEJ"; */ "A8P-vn-DEJ.title" = "在0%、25%、50%、75%和100%处显示刻度使设置的亮度值更精准。"; -/* Class = "NSButtonCell"; title = "Disable software dimming as fallback"; ObjectID = "afB-Xx-Lta"; */ -"afB-Xx-Lta.title" = "禁用软件设置亮度作为备用选项"; - /* Class = "NSTextFieldCell"; title = "Use brightness, volume and other settings from last time or use defaults. Values will be applied to the display upon first change by the user."; ObjectID = "an7-Aj-3fZ"; */ "an7-Aj-3fZ.title" = "使用者初次设置时使用之前或原始设置（亮度、音量和其它设置）。"; @@ -205,9 +205,6 @@ /* Class = "NSTextFieldCell"; title = "Screen to control:"; ObjectID = "Kfj-WK-aSL"; */ "Kfj-WK-aSL.title" = "控制的显示器："; -/* Class = "NSTextFieldCell"; title = "Don't use software dimming as fallback if no hardware control is available."; ObjectID = "kgh-b4-gmO"; */ -"kgh-b4-gmO.title" = "当硬件控制不可用时不以软件控制作为备用选项。"; - /* Class = "NSMenuItem"; title = "Depends on mouse pointer position"; ObjectID = "km4-hK-auM"; */ "km4-hK-auM.title" = "取决于鼠标指针位置"; @@ -265,9 +262,6 @@ /* Class = "NSButtonCell"; title = "Longer delay during DDC read operations"; ObjectID = "pF5-Sw-7BR"; */ "pF5-Sw-7BR.title" = "延长DDC读取操作的延迟时间"; -/* Class = "NSTextFieldCell"; title = "For hardware (DDC) controlled displays only."; ObjectID = "POy-35-bh0"; */ -"POy-35-bh0.title" = "仅适用硬件（DDC）控制的显示器。"; - /* Class = "NSTextFieldCell"; title = "DDC max"; ObjectID = "psF-vX-AFB"; */ "psF-vX-AFB.title" = "DDC最大值"; @@ -292,15 +286,9 @@ /* Class = "NSButtonCell"; title = "Combine hardware and software dimming"; ObjectID = "r76-Zc-x09"; */ "r76-Zc-x09.title" = "结合硬件与软件的亮度控制"; -/* Class = "NSTextFieldCell"; title = "Advanced:"; ObjectID = "r7i-oG-Ab6"; */ -"r7i-oG-Ab6.title" = "高级："; - /* Class = "NSMenuItem"; title = "Normal"; ObjectID = "Riq-uM-bTs"; */ "Riq-uM-bTs.title" = "正常"; -/* Class = "NSButtonCell"; title = "Show advanced settings"; ObjectID = "sAR-sh-y8e"; */ -"sAR-sh-y8e.title" = "显示高级选项"; - /* Class = "NSTextFieldCell"; title = "General menu items style:"; ObjectID = "thh-DG-ecH"; */ "thh-DG-ecH.title" = "通用选项的风格"; @@ -310,6 +298,9 @@ /* Class = "NSTextFieldCell"; title = "Menu Icon:"; ObjectID = "u6s-Pb-BCG"; */ "u6s-Pb-BCG.title" = "选项图标："; +/* Class = "NSButtonCell"; title = "Show advanced settings"; ObjectID = "UBq-Od-SIB"; */ +"UBq-Od-SIB.title" = "显示高级选项"; + /* Class = "NSTextFieldCell"; title = "Works if an audio device is selected with no native volume control."; ObjectID = "uF5-a9-Ngz"; */ "uF5-a9-Ngz.title" = "当一个没有原生音量控制的音频设备被选择时可用。"; @@ -340,9 +331,6 @@ /* Class = "NSTextFieldCell"; title = "Changes that are caused by the Ambient light sensor or made using Touch Bar, Control Center, System Preferences will be replicated to all displays."; ObjectID = "wjv-tq-iUx"; */ "wjv-tq-iUx.title" = "触发自环境亮度感应器、Touch Bar、控制中心、系统设置的亮度调整将被同步至全部的显示器。"; -/* Class = "NSTextFieldCell"; title = "Display advanced settings and additional information in Preferences."; ObjectID = "X6w-Ee-9Jq"; */ -"X6w-Ee-9Jq.title" = "在偏好选项中显示高级设置和额外信息。"; - /* Class = "NSMenuItem"; title = "Change volume for all screens"; ObjectID = "Xih-P5-NyM"; */ "Xih-P5-NyM.title" = "更改所有显示器的音量"; diff --git a/MonitorControl/UI/zh-Hant-TW.lproj/Main.strings b/MonitorControl/UI/zh-Hant-TW.lproj/Main.strings index d374b8f..e1216eb 100644 --- a/MonitorControl/UI/zh-Hant-TW.lproj/Main.strings +++ b/MonitorControl/UI/zh-Hant-TW.lproj/Main.strings @@ -13,6 +13,9 @@ /* Class = "NSTextFieldCell"; title = "DDC min"; ObjectID = "1zE-fg-xEm"; */ "1zE-fg-xEm.title" = "DDC最小值"; +/* Class = "NSBox"; title = "Box"; ObjectID = "3a3-In-jeQ"; */ +"3a3-In-jeQ.title" = "Box"; + /* Class = "NSMenuItem"; title = "Show separate controls for each display in menu"; ObjectID = "3eO-bN-ZRl"; */ "3eO-bN-ZRl.title" = "顯示各個螢幕的控制滑桿"; @@ -55,9 +58,6 @@ /* Class = "NSTextFieldCell"; title = "Show tick marks at 0%, 25%, 50%, 75% and 100% for accuracy."; ObjectID = "A8P-vn-DEJ"; */ "A8P-vn-DEJ.title" = "在0%、25%、50%、75%和100%處顯示刻度使調整更精確。"; -/* Class = "NSButtonCell"; title = "Disable software dimming as fallback"; ObjectID = "afB-Xx-Lta"; */ -"afB-Xx-Lta.title" = "停用軟體調光作為備用選項"; - /* Class = "NSTextFieldCell"; title = "Use brightness, volume and other settings from last time or use defaults. Values will be applied to the display upon first change by the user."; ObjectID = "an7-Aj-3fZ"; */ "an7-Aj-3fZ.title" = "使用者初次調整時套用前次或原始的設定（亮度、音量及其他設定）。"; @@ -205,9 +205,6 @@ /* Class = "NSTextFieldCell"; title = "Screen to control:"; ObjectID = "Kfj-WK-aSL"; */ "Kfj-WK-aSL.title" = "控制的螢幕："; -/* Class = "NSTextFieldCell"; title = "Don't use software dimming as fallback if no hardware control is available."; ObjectID = "kgh-b4-gmO"; */ -"kgh-b4-gmO.title" = "當硬體控制不可用時不以軟體控制作為備用選項。"; - /* Class = "NSMenuItem"; title = "Depends on mouse pointer position"; ObjectID = "km4-hK-auM"; */ "km4-hK-auM.title" = "取決於鼠標指針位置"; @@ -265,9 +262,6 @@ /* Class = "NSButtonCell"; title = "Longer delay during DDC read operations"; ObjectID = "pF5-Sw-7BR"; */ "pF5-Sw-7BR.title" = "延長DDC讀取操作的延遲時間"; -/* Class = "NSTextFieldCell"; title = "For hardware (DDC) controlled displays only."; ObjectID = "POy-35-bh0"; */ -"POy-35-bh0.title" = "僅適用硬體（DDC）控制的螢幕。"; - /* Class = "NSTextFieldCell"; title = "DDC max"; ObjectID = "psF-vX-AFB"; */ "psF-vX-AFB.title" = "DDC最大值"; @@ -292,15 +286,9 @@ /* Class = "NSButtonCell"; title = "Combine hardware and software dimming"; ObjectID = "r76-Zc-x09"; */ "r76-Zc-x09.title" = "結合硬體與軟體的亮度控制"; -/* Class = "NSTextFieldCell"; title = "Advanced:"; ObjectID = "r7i-oG-Ab6"; */ -"r7i-oG-Ab6.title" = "進階："; - /* Class = "NSMenuItem"; title = "Normal"; ObjectID = "Riq-uM-bTs"; */ "Riq-uM-bTs.title" = "正常"; -/* Class = "NSButtonCell"; title = "Show advanced settings"; ObjectID = "sAR-sh-y8e"; */ -"sAR-sh-y8e.title" = "顯示進階選項"; - /* Class = "NSTextFieldCell"; title = "General menu items style:"; ObjectID = "thh-DG-ecH"; */ "thh-DG-ecH.title" = "一般選單項目的風格"; @@ -310,6 +298,9 @@ /* Class = "NSTextFieldCell"; title = "Menu Icon:"; ObjectID = "u6s-Pb-BCG"; */ "u6s-Pb-BCG.title" = "選單圖示："; +/* Class = "NSButtonCell"; title = "Show advanced settings"; ObjectID = "UBq-Od-SIB"; */ +"UBq-Od-SIB.title" = "顯示進階選項"; + /* Class = "NSTextFieldCell"; title = "Works if an audio device is selected with no native volume control."; ObjectID = "uF5-a9-Ngz"; */ "uF5-a9-Ngz.title" = "當一個沒有原生音量控制的音訊裝置被選擇時可用。"; @@ -340,9 +331,6 @@ /* Class = "NSTextFieldCell"; title = "Changes that are caused by the Ambient light sensor or made using Touch Bar, Control Center, System Preferences will be replicated to all displays."; ObjectID = "wjv-tq-iUx"; */ "wjv-tq-iUx.title" = "觸發自環境亮度感測器、Touch Bar、控制中心、系統設定的亮度調整將被同步至全部的螢幕。"; -/* Class = "NSTextFieldCell"; title = "Display advanced settings and additional information in Preferences."; ObjectID = "X6w-Ee-9Jq"; */ -"X6w-Ee-9Jq.title" = "在偏好選單中顯示進階設定和額外資訊。"; - /* Class = "NSMenuItem"; title = "Change volume for all screens"; ObjectID = "Xih-P5-NyM"; */ "Xih-P5-NyM.title" = "改變所有螢幕的音量"; diff --git a/MonitorControl/View Controllers/DisplaysPrefsViewController.swift b/MonitorControl/View Controllers/DisplaysPrefsViewController.swift index a413b53..8a2e979 100644 --- a/MonitorControl/View Controllers/DisplaysPrefsViewController.swift +++ b/MonitorControl/View Controllers/DisplaysPrefsViewController.swift @@ -21,9 +21,11 @@ class DisplaysPrefsViewController: NSViewController, PreferencePane, NSTableView @IBOutlet var displayList: NSTableView! @IBOutlet var displayScrollView: NSScrollView! @IBOutlet var constraintHeight: NSLayoutConstraint! + @IBOutlet var showAdvancedDisplays: NSButton! override func viewDidLoad() { super.viewDidLoad() + self.showAdvancedDisplays.state = prefs.bool(forKey: PrefKey.showAdvancedSettings.rawValue) ? .on : .off self.loadDisplayList() self.displayScrollView.scrollerStyle = .legacy } @@ -49,6 +51,18 @@ class DisplaysPrefsViewController: NSViewController, PreferencePane, NSTableView self.updateDisplayListRowHeight() } + @IBAction func showAdvancedClicked(_ sender: NSButton) { + switch sender.state { + case .on: + prefs.set(true, forKey: PrefKey.showAdvancedSettings.rawValue) + case .off: + prefs.set(false, forKey: PrefKey.showAdvancedSettings.rawValue) + default: break + } + _ = self.updateGridLayout() + displaysPrefsVc?.view.layoutSubtreeIfNeeded() + } + func numberOfRows(in _: NSTableView) -> Int { return self.displays.count } @@ -306,10 +320,10 @@ class DisplaysPrefsViewController: NSViewController, PreferencePane, NSTableView func updateDisplayListRowHeight() { if prefs.bool(forKey: PrefKey.showAdvancedSettings.rawValue) { self.displayList?.rowHeight = 520 - self.constraintHeight?.constant = self.displayList.rowHeight + 15 + self.constraintHeight?.constant = self.displayList.rowHeight + 15 + 30 } else { - self.displayList?.rowHeight = 150 - self.constraintHeight?.constant = self.displayList.rowHeight * 2 + 15 + self.displayList?.rowHeight = 180 + self.constraintHeight?.constant = self.displayList.rowHeight * 2 + 15 + 30 } } } diff --git a/MonitorControl/View Controllers/KeyboardPrefsViewController.swift b/MonitorControl/View Controllers/KeyboardPrefsViewController.swift index e6d8586..139c0dd 100644 --- a/MonitorControl/View Controllers/KeyboardPrefsViewController.swift +++ b/MonitorControl/View Controllers/KeyboardPrefsViewController.swift @@ -45,25 +45,13 @@ class KeyboardPrefsViewController: NSViewController, PreferencePane { @IBOutlet var rowCustomAudioShortcuts: NSGridRow! @IBOutlet var rowUseAudioMouseText: NSGridRow! @IBOutlet var rowUseAudioNameText: NSGridRow! - @IBOutlet var rowUseFineScaleCheck: NSGridRow! - @IBOutlet var rowUseFineScaleText: NSGridRow! - @IBOutlet var rowSeparateCombinedScaleCheck: NSGridRow! - @IBOutlet var rowSeparateCombinedScaleText: NSGridRow! - - // swiftlint:disable cyclomatic_complexity - func updateGridLayout() -> Bool { - let hide = !prefs.bool(forKey: PrefKey.showAdvancedSettings.rawValue) + func updateGridLayout() { if self.keyboardBrightness.selectedTag() == KeyboardBrightness.media.rawValue { - self.rowKeyboardBrightnessPopUp.bottomPadding = hide ? -6 : -13 - self.rowKeyboardBrightnessText.isHidden = hide - if self.disableAltBrightnessKeys.state == .on { - self.rowDisableAltBrightnessKeysCheck.isHidden = false - self.rowDisableAltBrightnessKeysText.isHidden = false - } else { - self.rowDisableAltBrightnessKeysCheck.isHidden = hide - self.rowDisableAltBrightnessKeysText.isHidden = hide - } + self.rowKeyboardBrightnessPopUp.bottomPadding = -13 + self.rowKeyboardBrightnessText.isHidden = false + self.rowDisableAltBrightnessKeysCheck.isHidden = false + self.rowDisableAltBrightnessKeysText.isHidden = false self.rowCustomBrightnessShortcuts.isHidden = true } else if self.keyboardBrightness.selectedTag() == KeyboardBrightness.custom.rawValue { self.rowKeyboardBrightnessPopUp.bottomPadding = -6 @@ -74,13 +62,8 @@ class KeyboardPrefsViewController: NSViewController, PreferencePane { } else if self.keyboardBrightness.selectedTag() == KeyboardBrightness.both.rawValue { self.rowKeyboardBrightnessPopUp.bottomPadding = -6 self.rowKeyboardBrightnessText.isHidden = true - if self.disableAltBrightnessKeys.state == .on { - self.rowDisableAltBrightnessKeysCheck.isHidden = false - self.rowDisableAltBrightnessKeysText.isHidden = false - } else { - self.rowDisableAltBrightnessKeysCheck.isHidden = hide - self.rowDisableAltBrightnessKeysText.isHidden = hide - } + self.rowDisableAltBrightnessKeysCheck.isHidden = false + self.rowDisableAltBrightnessKeysText.isHidden = false self.rowCustomBrightnessShortcuts.isHidden = false } else { self.rowKeyboardBrightnessPopUp.bottomPadding = -6 @@ -129,28 +112,8 @@ class KeyboardPrefsViewController: NSViewController, PreferencePane { self.rowUseAudioNameText.isHidden = true self.rowUseAudioMouseText.isHidden = false } - - if self.useFineScale.state == .on { - self.rowUseFineScaleCheck.isHidden = false - self.rowUseFineScaleText.isHidden = false - } else { - self.rowUseFineScaleCheck.isHidden = hide - self.rowUseFineScaleText.isHidden = hide - } - - if self.separateCombinedScale.state == .on { - self.rowSeparateCombinedScaleCheck.isHidden = false - self.rowSeparateCombinedScaleText.isHidden = false - } else { - self.rowSeparateCombinedScaleCheck.isHidden = hide - self.rowSeparateCombinedScaleText.isHidden = hide - } - - return !hide } - // swiftlint:enable cyclomatic_complexity - override func viewDidLoad() { super.viewDidLoad() @@ -190,19 +153,19 @@ class KeyboardPrefsViewController: NSViewController, PreferencePane { self.useFineScale.state = prefs.bool(forKey: PrefKey.useFineScaleBrightness.rawValue) ? .on : .off self.useFineScaleVolume.state = prefs.bool(forKey: PrefKey.useFineScaleVolume.rawValue) ? .on : .off self.separateCombinedScale.state = prefs.bool(forKey: PrefKey.separateCombinedScale.rawValue) ? .on : .off - _ = self.updateGridLayout() + self.updateGridLayout() } @IBAction func multiKeyboardBrightness(_ sender: NSPopUpButton) { prefs.set(sender.selectedTag(), forKey: PrefKey.multiKeyboardBrightness.rawValue) app.updateMediaKeyTap() - _ = self.updateGridLayout() + self.updateGridLayout() } @IBAction func multiKeyboardVolume(_ sender: NSPopUpButton) { prefs.set(sender.selectedTag(), forKey: PrefKey.multiKeyboardVolume.rawValue) app.updateMediaKeyTap() - _ = self.updateGridLayout() + self.updateGridLayout() } @IBAction func useFineScaleClicked(_ sender: NSButton) { @@ -213,7 +176,7 @@ class KeyboardPrefsViewController: NSViewController, PreferencePane { prefs.set(false, forKey: PrefKey.useFineScaleBrightness.rawValue) default: break } - _ = self.updateGridLayout() + self.updateGridLayout() } @IBAction func useFineScaleVolumeClicked(_ sender: NSButton) { @@ -234,7 +197,7 @@ class KeyboardPrefsViewController: NSViewController, PreferencePane { prefs.set(false, forKey: PrefKey.separateCombinedScale.rawValue) default: break } - _ = self.updateGridLayout() + self.updateGridLayout() } @IBAction func disableAltBrightnessKeys(_ sender: NSButton) { @@ -245,19 +208,19 @@ class KeyboardPrefsViewController: NSViewController, PreferencePane { prefs.set(false, forKey: PrefKey.disableAltBrightnessKeys.rawValue) default: break } - _ = self.updateGridLayout() + self.updateGridLayout() app.updateMediaKeyTap() } @IBAction func keyboardBrightness(_ sender: NSPopUpButton) { prefs.set(sender.selectedTag(), forKey: PrefKey.keyboardBrightness.rawValue) app.updateMenusAndKeys() - _ = self.updateGridLayout() + self.updateGridLayout() } @IBAction func keyboardVolume(_ sender: NSPopUpButton) { prefs.set(sender.selectedTag(), forKey: PrefKey.keyboardVolume.rawValue) app.updateMenusAndKeys() - _ = self.updateGridLayout() + self.updateGridLayout() } } diff --git a/MonitorControl/View Controllers/MainPrefsViewController.swift b/MonitorControl/View Controllers/MainPrefsViewController.swift index 35671c5..52e9373 100644 --- a/MonitorControl/View Controllers/MainPrefsViewController.swift +++ b/MonitorControl/View Controllers/MainPrefsViewController.swift @@ -19,65 +19,29 @@ class MainPrefsViewController: NSViewController, PreferencePane { @IBOutlet var startAtLogin: NSButton! @IBOutlet var automaticUpdateCheck: NSButton! - @IBOutlet var disableSoftwareFallback: NSButton! @IBOutlet var allowZeroSwBrightness: NSButton! @IBOutlet var combinedBrightness: NSButton! @IBOutlet var enableSmooth: NSButton! @IBOutlet var enableBrightnessSync: NSButton! - @IBOutlet var showAdvancedDisplays: NSButton! @IBOutlet var startupAction: NSPopUpButton! - @IBOutlet var rowStartupSeparator: NSGridRow! - @IBOutlet var rowStartupAction: NSGridRow! @IBOutlet var rowDoNothingStartupText: NSGridRow! @IBOutlet var rowWriteStartupText: NSGridRow! @IBOutlet var rowReadStartupText: NSGridRow! - @IBOutlet var rowSafeModeText: NSGridRow! - @IBOutlet var rowResetButton: NSGridRow! - @IBOutlet var rowDisableSoftwareFallbackCheck: NSGridRow! - @IBOutlet var rowDisableSoftwareFallbackText: NSGridRow! - @IBOutlet var rowAllowZeroSwBrightnessCheck: NSGridRow! - @IBOutlet var rowAllowZeroSwBrightnessText: NSGridRow! - func updateGridLayout() -> Bool { - let hide = !prefs.bool(forKey: PrefKey.showAdvancedSettings.rawValue) + func updateGridLayout() { if self.startupAction.selectedTag() == StartupAction.doNothing.rawValue { - self.rowStartupSeparator.isHidden = hide - self.rowStartupAction.isHidden = hide - self.rowDoNothingStartupText.isHidden = hide + self.rowDoNothingStartupText.isHidden = false self.rowWriteStartupText.isHidden = true self.rowReadStartupText.isHidden = true - self.rowSafeModeText.isHidden = hide } else if self.startupAction.selectedTag() == StartupAction.write.rawValue { - self.rowStartupSeparator.isHidden = false - self.rowStartupAction.isHidden = false self.rowDoNothingStartupText.isHidden = true self.rowWriteStartupText.isHidden = false self.rowReadStartupText.isHidden = true - self.rowSafeModeText.isHidden = false } else { - self.rowStartupSeparator.isHidden = false - self.rowStartupAction.isHidden = false self.rowDoNothingStartupText.isHidden = true self.rowWriteStartupText.isHidden = true self.rowReadStartupText.isHidden = false - self.rowSafeModeText.isHidden = false } - if self.disableSoftwareFallback.state == .on { - self.rowDisableSoftwareFallbackCheck.isHidden = false - self.rowDisableSoftwareFallbackText.isHidden = false - } else { - self.rowDisableSoftwareFallbackCheck.isHidden = hide - self.rowDisableSoftwareFallbackText.isHidden = hide - } - if self.allowZeroSwBrightness.state == .on { - self.rowAllowZeroSwBrightnessCheck.isHidden = false - self.rowAllowZeroSwBrightnessText.isHidden = false - } else { - self.rowAllowZeroSwBrightnessCheck.isHidden = hide - self.rowAllowZeroSwBrightnessText.isHidden = hide - } - self.rowResetButton.isHidden = hide - return !hide } @available(macOS, deprecated: 10.10) @@ -93,18 +57,16 @@ class MainPrefsViewController: NSViewController, PreferencePane { self.startAtLogin.state = startAtLogin ? .on : .off self.automaticUpdateCheck.state = prefs.bool(forKey: PrefKey.SUEnableAutomaticChecks.rawValue) ? .on : .off self.combinedBrightness.state = prefs.bool(forKey: PrefKey.disableCombinedBrightness.rawValue) ? .off : .on - self.disableSoftwareFallback.state = prefs.bool(forKey: PrefKey.disableSoftwareFallback.rawValue) ? .on : .off self.allowZeroSwBrightness.state = prefs.bool(forKey: PrefKey.allowZeroSwBrightness.rawValue) ? .on : .off self.enableSmooth.state = prefs.bool(forKey: PrefKey.disableSmoothBrightness.rawValue) ? .off : .on self.enableBrightnessSync.state = prefs.bool(forKey: PrefKey.enableBrightnessSync.rawValue) ? .on : .off - self.showAdvancedDisplays.state = prefs.bool(forKey: PrefKey.showAdvancedSettings.rawValue) ? .on : .off self.startupAction.selectItem(withTag: prefs.integer(forKey: PrefKey.startupAction.rawValue)) // Preload Display preferences to some extent to properly set up size in orther that animation won't fail menuslidersPrefsVc?.view.layoutSubtreeIfNeeded() keyboardPrefsVc?.view.layoutSubtreeIfNeeded() displaysPrefsVc?.view.layoutSubtreeIfNeeded() aboutPrefsVc?.view.layoutSubtreeIfNeeded() - _ = self.updateGridLayout() + self.updateGridLayout() } @IBAction func startAtLoginClicked(_ sender: NSButton) { @@ -142,22 +104,6 @@ class MainPrefsViewController: NSViewController, PreferencePane { app.configure() } - @IBAction func disableSoftwareFallback(_ sender: NSButton) { - switch sender.state { - case .on: - prefs.set(true, forKey: PrefKey.disableSoftwareFallback.rawValue) - case .off: - prefs.set(false, forKey: PrefKey.disableSoftwareFallback.rawValue) - default: break - } - for display in DisplayManager.shared.getOtherDisplays() { - _ = display.setDirectBrightness(1) - _ = display.setSwBrightness(1) - } - _ = self.updateGridLayout() - app.configure() - } - @IBAction func allowZeroSwBrightness(_ sender: NSButton) { switch sender.state { case .on: @@ -170,7 +116,7 @@ class MainPrefsViewController: NSViewController, PreferencePane { _ = display.setDirectBrightness(1) _ = display.setSwBrightness(1) } - _ = self.updateGridLayout() + self.updateGridLayout() app.configure() } @@ -196,25 +142,7 @@ class MainPrefsViewController: NSViewController, PreferencePane { @IBAction func startupAction(_ sender: NSPopUpButton) { prefs.set(sender.selectedTag(), forKey: PrefKey.startupAction.rawValue) - _ = self.updateGridLayout() - } - - @IBAction func showAdvancedClicked(_ sender: NSButton) { - switch sender.state { - case .on: - prefs.set(true, forKey: PrefKey.showAdvancedSettings.rawValue) - case .off: - prefs.set(false, forKey: PrefKey.showAdvancedSettings.rawValue) - default: break - } - _ = self.updateGridLayout() - _ = menuslidersPrefsVc?.updateGridLayout() - _ = keyboardPrefsVc?.updateGridLayout() - _ = displaysPrefsVc?.updateGridLayout() - menuslidersPrefsVc?.view.layoutSubtreeIfNeeded() - keyboardPrefsVc?.view.layoutSubtreeIfNeeded() - displaysPrefsVc?.view.layoutSubtreeIfNeeded() - aboutPrefsVc?.view.layoutSubtreeIfNeeded() + self.updateGridLayout() } @available(macOS, deprecated: 10.10) @@ -224,7 +152,6 @@ class MainPrefsViewController: NSViewController, PreferencePane { self.populateSettings() menuslidersPrefsVc?.populateSettings() keyboardPrefsVc?.populateSettings() - self.showAdvancedClicked(self.showAdvancedDisplays) } } diff --git a/MonitorControl/View Controllers/MenuslidersPrefsViewController.swift b/MonitorControl/View Controllers/MenuslidersPrefsViewController.swift index 012d59c..3ac3d8c 100644 --- a/MonitorControl/View Controllers/MenuslidersPrefsViewController.swift +++ b/MonitorControl/View Controllers/MenuslidersPrefsViewController.swift @@ -32,80 +32,38 @@ class MenuslidersPrefsViewController: NSViewController, PreferencePane { @IBOutlet var showTickMarks: NSButton! @IBOutlet var enableSliderPercent: NSButton! - @IBOutlet var rowIconShow: NSGridRow! @IBOutlet var rowMenuItemStyle: NSGridRow! @IBOutlet var rowQuitButton: NSGridRow! @IBOutlet var rowQuitButtonText: NSGridRow! - @IBOutlet var rowHideIconSpearator: NSGridRow! - - @IBOutlet var rowShowContrastCheck: NSGridRow! - @IBOutlet var rowShowContrastText: NSGridRow! @IBOutlet var rowMultiSliders: NSGridRow! @IBOutlet var rowSlidersCombineText: NSGridRow! @IBOutlet var rowTickCheck: NSGridRow! @IBOutlet var rowTickText: NSGridRow! - @IBOutlet var rowPercentCheck: NSGridRow! - @IBOutlet var rowPercentText: NSGridRow! - - // swiftlint:disable cyclomatic_complexity - func updateGridLayout() -> Bool { - let hide = !prefs.bool(forKey: PrefKey.showAdvancedSettings.rawValue) - - var doNotHideRowIconSeparator = false - - if self.iconShow.selectedTag() != MenuIcon.show.rawValue { - self.rowIconShow.isHidden = false - doNotHideRowIconSeparator = true - } else { - self.rowIconShow.isHidden = hide - } + func updateGridLayout() { if app.macOS10() { self.rowMenuItemStyle.isHidden = true - } else if self.menuItemStyle.selectedTag() != MenuItemStyle.text.rawValue { - self.rowMenuItemStyle.isHidden = false - doNotHideRowIconSeparator = true } else { - self.rowMenuItemStyle.isHidden = hide + self.rowMenuItemStyle.isHidden = false } if self.iconShow.selectedTag() != MenuIcon.show.rawValue || self.menuItemStyle.selectedTag() == MenuItemStyle.hide.rawValue { self.rowQuitButton.isHidden = false self.rowQuitButtonText.isHidden = false - doNotHideRowIconSeparator = true } else { self.rowQuitButton.isHidden = true self.rowQuitButtonText.isHidden = true } - if doNotHideRowIconSeparator { - self.rowHideIconSpearator.isHidden = false - self.rowHideIconSpearator.isHidden = false - } else { - self.rowHideIconSpearator.isHidden = hide - self.rowHideIconSpearator.isHidden = hide - } - - if self.showContrastSlider.state == .on { - self.rowShowContrastCheck.isHidden = false - self.rowShowContrastText.isHidden = false - } else { - self.rowShowContrastCheck.isHidden = hide - self.rowShowContrastText.isHidden = hide - } - if self.multiSliders.selectedTag() == MultiSliders.separate.rawValue { - self.rowMultiSliders.isHidden = hide self.rowMultiSliders.bottomPadding = -6 self.rowSlidersCombineText.isHidden = true } else if self.multiSliders.selectedTag() == MultiSliders.relevant.rawValue { - self.rowMultiSliders.isHidden = false self.rowMultiSliders.bottomPadding = -6 self.rowSlidersCombineText.isHidden = true } else if self.multiSliders.selectedTag() == MultiSliders.combine.rawValue { - self.rowMultiSliders.isHidden = false self.rowMultiSliders.bottomPadding = -10 self.rowSlidersCombineText.isHidden = false } @@ -113,26 +71,12 @@ class MenuslidersPrefsViewController: NSViewController, PreferencePane { if app.macOS10() { self.rowTickCheck.isHidden = true self.rowTickText.isHidden = true - } else if self.showTickMarks.state == .on { + } else { self.rowTickCheck.isHidden = false self.rowTickText.isHidden = false - } else { - self.rowTickCheck.isHidden = hide - self.rowTickText.isHidden = hide } - - if self.enableSliderPercent.state == .on { - self.rowPercentCheck.isHidden = false - self.rowPercentText.isHidden = false - } else { - self.rowPercentCheck.isHidden = hide - self.rowPercentText.isHidden = hide - } - return !hide } - // swiftlint:enable cyclomatic_complexity - override func viewDidLoad() { super.viewDidLoad() self.populateSettings() @@ -157,19 +101,19 @@ class MenuslidersPrefsViewController: NSViewController, PreferencePane { self.enableSliderSnap.state = prefs.bool(forKey: PrefKey.enableSliderSnap.rawValue) ? .on : .off self.showTickMarks.state = prefs.bool(forKey: PrefKey.showTickMarks.rawValue) ? .on : .off self.enableSliderPercent.state = prefs.bool(forKey: PrefKey.enableSliderPercent.rawValue) ? .on : .off - _ = self.updateGridLayout() + self.updateGridLayout() } @IBAction func icon(_ sender: NSPopUpButton) { prefs.set(sender.selectedTag(), forKey: PrefKey.menuIcon.rawValue) app.updateMenusAndKeys() - _ = self.updateGridLayout() + self.updateGridLayout() } @IBAction func menuItemStyle(_ sender: NSPopUpButton) { prefs.set(sender.selectedTag(), forKey: PrefKey.menuItemStyle.rawValue) app.updateMenusAndKeys() - _ = self.updateGridLayout() + self.updateGridLayout() } @IBAction func quitApplicationClicked(_: NSButton) { @@ -222,7 +166,7 @@ class MenuslidersPrefsViewController: NSViewController, PreferencePane { default: break } app.updateMenusAndKeys() - _ = self.updateGridLayout() + self.updateGridLayout() } @IBAction func enableSliderSnapClicked(_ sender: NSButton) { @@ -234,13 +178,13 @@ class MenuslidersPrefsViewController: NSViewController, PreferencePane { default: break } app.updateMenusAndKeys() - _ = self.updateGridLayout() + self.updateGridLayout() } @IBAction func multiSliders(_ sender: NSPopUpButton) { prefs.set(sender.selectedTag(), forKey: PrefKey.multiSliders.rawValue) app.updateMenusAndKeys() - _ = self.updateGridLayout() + self.updateGridLayout() } @IBAction func showTickMarks(_ sender: NSButton) { @@ -252,7 +196,7 @@ class MenuslidersPrefsViewController: NSViewController, PreferencePane { default: break } app.updateMenusAndKeys() - _ = self.updateGridLayout() + self.updateGridLayout() } @IBAction func enableSliderPercent(_ sender: NSButton) { @@ -264,6 +208,6 @@ class MenuslidersPrefsViewController: NSViewController, PreferencePane { default: break } app.updateMenusAndKeys() - _ = self.updateGridLayout() + self.updateGridLayout() } } diff --git a/MonitorControlHelper/Info.plist b/MonitorControlHelper/Info.plist index 0915699..ed681ab 100644 --- a/MonitorControlHelper/Info.plist +++ b/MonitorControlHelper/Info.plist @@ -19,7 +19,7 @@ CFBundleShortVersionString $(MARKETING_VERSION) CFBundleVersion - 6632 + 6670 LSApplicationCategoryType public.app-category.utilities LSBackgroundOnly diff --git a/README.md b/README.md index 710fe9c..ee2aa81 100644 --- a/README.md +++ b/README.md @@ -35,7 +35,7 @@ Use menulet sliders or the keyboard, including native Apple keys!



-Screenshot
+Screenshot
@@ -76,10 +76,10 @@ Go to [Releases](https://github.com/MonitorControl/MonitorControl/releases) and ## Screenshots (Preferences)
-Screenshot -Screenshot
-Screenshot -Screenshot
+Screenshot +Screenshot
+Screenshot +Screenshot
## Compatibility @@ -92,7 +92,21 @@ Go to [Releases](https://github.com/MonitorControl/MonitorControl/releases) and _* With some limitations - full functionality available on macOS 11 Big Sur or newer._ -Note to f.lux users: the app is now compatible with [f.lux](https://justgetflux.com) as well - please activate `Avoid gamma table manipulation` under `Preferences` » `Displays` (this option is accessible if advanced settings are enabled)! This is not needed if you use Night Shift. +Note to f.lux users: the app is now compatible with [f.lux](https://justgetflux.com) as well - please activate `Avoid gamma table manipulation` under `Preferences` » `Displays`! This step is not needed if you use Night Shift. + +## Supported hardware + +* Most modern LCD displays from all major manufacturers supported implemented DDC/CI protocol via DisplayPort, HDMI, USB-C or VGA to allow for hardware backlight control. +* Apple (and LG-Apple) displays and built-in displays are supported using native protocol. +* LCD and LED Televisions usually do not implement DDC, these are supported using software alternatives to dim the image (some higher-end sets are able to translate this into hardware backlight dimming). +* OLED or mini/micro-LED displays and televisions are fully supported using gamma table manipulation (this is a no-compromise solution for this class of displays). +* DisplayLink, Airplay and Sidecar is supported using shade (dark overlay) control. + +Notable exceptions for hardware control: + +* Some displays (notably EIZO) use MCCS over USB or an entirely custom protocol for control. These displays are supported with software dimming only. +* The HDMI port of the 2018 Intel Mac mini and 2020 M1 Mac mini prohibit DDC communication. Software control is still available. We recommend connecting the display via the USB-C port (USB-C to HDMI dongles usually work). +* DisplayLink docks and dongles do not allow for DDC control on Macs, only software dimming is available for these connections. ## How to help