From 9dfc86a1577ae98c0b65ea98ed9d22ad30cad115 Mon Sep 17 00:00:00 2001 From: Markus Reiter Date: Wed, 8 May 2019 00:55:04 +0200 Subject: [PATCH] Add vendor and model to display list. --- MonitorControl.xcodeproj/project.pbxproj | 8 +- MonitorControl/Info.plist | 2 +- .../Support/de.lproj/Localizable.strings | 53 +++++----- MonitorControl/UI/Base.lproj/Main.storyboard | 100 +++++++++++++++--- MonitorControl/UI/de.lproj/Main.strings | 46 ++++---- MonitorControl/UI/de.lproj/MainMenu.strings | 2 +- .../DisplayPrefsViewController.swift | 10 ++ MonitorControlHelper/Info.plist | 2 +- 8 files changed, 153 insertions(+), 70 deletions(-) diff --git a/MonitorControl.xcodeproj/project.pbxproj b/MonitorControl.xcodeproj/project.pbxproj index 255c56a..8e182bc 100644 --- a/MonitorControl.xcodeproj/project.pbxproj +++ b/MonitorControl.xcodeproj/project.pbxproj @@ -618,7 +618,7 @@ CODE_SIGN_IDENTITY = "Mac Developer"; CODE_SIGN_STYLE = Automatic; COMBINE_HIDPI_IMAGES = YES; - CURRENT_PROJECT_VERSION = 229; + CURRENT_PROJECT_VERSION = 239; DEVELOPMENT_TEAM = KJ5F4KTDFH; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", @@ -644,7 +644,7 @@ CODE_SIGN_IDENTITY = "Mac Developer"; CODE_SIGN_STYLE = Automatic; COMBINE_HIDPI_IMAGES = YES; - CURRENT_PROJECT_VERSION = 229; + CURRENT_PROJECT_VERSION = 239; DEVELOPMENT_TEAM = KJ5F4KTDFH; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", @@ -674,7 +674,7 @@ CODE_SIGN_IDENTITY = "Mac Developer"; CODE_SIGN_STYLE = Automatic; COMBINE_HIDPI_IMAGES = YES; - CURRENT_PROJECT_VERSION = 229; + CURRENT_PROJECT_VERSION = 239; DEVELOPMENT_TEAM = KJ5F4KTDFH; GCC_C_LANGUAGE_STANDARD = gnu11; INFOPLIST_FILE = MonitorControlHelper/Info.plist; @@ -698,7 +698,7 @@ CODE_SIGN_IDENTITY = "Mac Developer"; CODE_SIGN_STYLE = Automatic; COMBINE_HIDPI_IMAGES = YES; - CURRENT_PROJECT_VERSION = 229; + CURRENT_PROJECT_VERSION = 239; DEVELOPMENT_TEAM = KJ5F4KTDFH; GCC_C_LANGUAGE_STANDARD = gnu11; INFOPLIST_FILE = MonitorControlHelper/Info.plist; diff --git a/MonitorControl/Info.plist b/MonitorControl/Info.plist index e4939b5..5b9aa89 100644 --- a/MonitorControl/Info.plist +++ b/MonitorControl/Info.plist @@ -19,7 +19,7 @@ CFBundleShortVersionString 1.5.0 CFBundleVersion - 229 + 239 LSApplicationCategoryType public.app-category.utilities LSMinimumSystemVersion diff --git a/MonitorControl/Support/de.lproj/Localizable.strings b/MonitorControl/Support/de.lproj/Localizable.strings index 7608e0f..b94a192 100644 --- a/MonitorControl/Support/de.lproj/Localizable.strings +++ b/MonitorControl/Support/de.lproj/Localizable.strings @@ -1,4 +1,4 @@ -/* Sown in menu */ +/* Shown in menu */ "Brightness" = "Helligkeit"; /* Shown in menu */ @@ -7,35 +7,36 @@ /* Shown in menu */ "Default" = "Standard"; -/* No comment provided by engineer. */ +/* Shown in the main prefs window */ "Display" = "Monitor"; -/* Shown in menu */ -"No supported display found" = "Kein unterstützter Monitor angeschlossen"; - -/* Shown in menu */ -"Set as default" = "Als Standard festlegen"; - -/* No comment provided by engineer. */ -"Unknown" = "Unbekannt"; - -/* Shown in menu */ -"Volume" = "Lautstärke"; - -/* Shown in Preferences window */ -"Preferences" = "Einstellungen"; - -/* Shown in the alert dialog */ -"Ok" = "OK"; - -/* Shown in the alert dialog */ -"Shortcuts not available" = "Kurzbefehle nicht verfügbar"; - -/* Shown in the alert dialog */ -"You need to enable MonitorControl in System Preferences > Security and Privacy > Accessibility for the keyboard shortcuts to work" = "Du musst MonitorControl in Systemeinstellungen > Sicherheit > Datenschutz > Bedienungshilfen aktivieren, damit die Kurzbefehle funktionieren."; - /* Shown in the main prefs window */ "General" = "Allgemein"; /* Shown in the main prefs window */ "Keys" = "Tasten"; + +/* Shown in menu */ +"No supported display found" = "Kein unterstützter Monitor angeschlossen"; + +/* Shown in the alert dialog */ +"Ok" = "OK"; + +/* Shown in Preferences window */ +"Preferences" = "Einstellungen"; + +/* Shown in menu */ +"Set as default" = "Als Standard festlegen"; + +/* Shown in the alert dialog */ +"Shortcuts not available" = "Kurzbefehle nicht verfügbar"; + +/* unknown display name */ +"Unknown" = "Unbekannt"; + +/* Shown in menu */ +"Volume" = "Lautstärke"; + +/* Shown in the alert dialog */ +"You need to enable MonitorControl in System Preferences > Security and Privacy > Accessibility for the keyboard shortcuts to work" = "Du musst MonitorControl in Systemeinstellungen > Sicherheit > Datenschutz > Bedienungshilfen aktivieren, damit die Kurzbefehle funktionieren."; + diff --git a/MonitorControl/UI/Base.lproj/Main.storyboard b/MonitorControl/UI/Base.lproj/Main.storyboard index 91e8a70..3d9ff53 100644 --- a/MonitorControl/UI/Base.lproj/Main.storyboard +++ b/MonitorControl/UI/Base.lproj/Main.storyboard @@ -11,7 +11,7 @@ - + @@ -72,14 +72,14 @@ - + - + @@ -91,13 +91,13 @@ - + - + - + @@ -134,8 +134,8 @@ - - + + @@ -148,11 +148,11 @@ - + - + @@ -167,8 +167,8 @@ - - + + @@ -181,11 +181,11 @@ - + - + @@ -200,6 +200,72 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -218,7 +284,7 @@ - + @@ -253,14 +319,14 @@ - + - + diff --git a/MonitorControl/UI/de.lproj/Main.strings b/MonitorControl/UI/de.lproj/Main.strings index db4acd9..ff63e59 100644 --- a/MonitorControl/UI/de.lproj/Main.strings +++ b/MonitorControl/UI/de.lproj/Main.strings @@ -1,40 +1,30 @@ - /* Class = "NSButtonCell"; title = "Change Brightness/Volume for all screens"; ObjectID = "0Z7-PQ-Bl8"; */ "0Z7-PQ-Bl8.title" = "Helligkeit/Lautstärke für alle Monitore ändern"; /* Class = "NSTableColumn"; headerCell.title = "Enabled"; ObjectID = "8U8-ec-Zbv"; */ "8U8-ec-Zbv.headerCell.title" = "Aktiv"; -/* Class = "NSTableColumn"; headerCell.title = "Display Name"; ObjectID = "CHc-s5-4MN"; */ +/* Class = "NSTextFieldCell"; title = "Table View Cell"; ObjectID = "aSw-3H-uNa"; */ +"aSw-3H-uNa.title" = "Table View Cell"; + +/* Class = "NSTableColumn"; headerCell.title = "Name"; ObjectID = "CHc-s5-4MN"; */ "CHc-s5-4MN.headerCell.title" = "Name"; +/* Class = "NSTextFieldCell"; title = "Table View Cell"; ObjectID = "cnb-Li-1lE"; */ +"cnb-Li-1lE.title" = "Table View Cell"; + /* Class = "NSTextFieldCell"; title = "Keys"; ObjectID = "Dcz-GG-1li"; */ "Dcz-GG-1li.title" = "Tasten"; +/* Class = "NSTableColumn"; headerCell.title = "ID"; ObjectID = "dgp-q7-cBK"; */ +"dgp-q7-cBK.headerCell.title" = "ID"; + /* Class = "NSTextFieldCell"; title = "General"; ObjectID = "ENU-js-huy"; */ "ENU-js-huy.title" = "Allgemein"; /* Class = "NSTextFieldCell"; title = "Display"; ObjectID = "ExD-7P-6XI"; */ "ExD-7P-6XI.title" = "Monitor"; -/* Class = "NSMenuItem"; title = "Volume only"; ObjectID = "NLP-dU-Dam"; */ -"NLP-dU-Dam.title" = "Lautstärke"; - -/* Class = "NSTextFieldCell"; title = "Listen for"; ObjectID = "Vh8-06-U3K"; */ -"Vh8-06-U3K.title" = "Hören auf"; - -/* Class = "NSMenuItem"; title = "Both Brightness & Volume"; ObjectID = "Vr4-xb-B4o"; */ -"Vr4-xb-B4o.title" = "Helligkeit & Lautstärke"; - -/* Class = "NSTextFieldCell"; title = "Table View Cell"; ObjectID = "aSw-3H-uNa"; */ -"aSw-3H-uNa.title" = "Table View Cell"; - -/* Class = "NSTextFieldCell"; title = "Table View Cell"; ObjectID = "cnb-Li-1lE"; */ -"cnb-Li-1lE.title" = "Table View Cell"; - -/* Class = "NSTableColumn"; headerCell.title = "Display Id"; ObjectID = "dgp-q7-cBK"; */ -"dgp-q7-cBK.headerCell.title" = "ID"; - /* Class = "NSButtonCell"; title = "Lower Contrast after Brightness"; ObjectID = "fhy-Er-0aI"; */ "fhy-Er-0aI.title" = "Lower Contrast after Brightness"; @@ -44,5 +34,21 @@ /* Class = "NSButtonCell"; title = "Start MonitorControl at Login"; ObjectID = "j72-NF-zsW"; */ "j72-NF-zsW.title" = "MonitorControl beim Login starten"; +/* Class = "NSTableColumn"; headerCell.title = "Vendor"; ObjectID = "LRJ-fb-Z9E"; */ +"LRJ-fb-Z9E.headerCell.title" = "Hersteller"; + +/* Class = "NSMenuItem"; title = "Volume only"; ObjectID = "NLP-dU-Dam"; */ +"NLP-dU-Dam.title" = "Lautstärke"; + +/* Class = "NSTableColumn"; headerCell.title = "Model"; ObjectID = "Nvp-hI-w4x"; */ +"Nvp-hI-w4x.headerCell.title" = "Modell"; + +/* Class = "NSTextFieldCell"; title = "Listen for"; ObjectID = "Vh8-06-U3K"; */ +"Vh8-06-U3K.title" = "Hören auf"; + +/* Class = "NSMenuItem"; title = "Both Brightness & Volume"; ObjectID = "Vr4-xb-B4o"; */ +"Vr4-xb-B4o.title" = "Helligkeit & Lautstärke"; + /* Class = "NSButtonCell"; title = "Show a slider for contrast"; ObjectID = "xSI-8W-Xd0"; */ "xSI-8W-Xd0.title" = "Slider für Kontrast anzeigen"; + diff --git a/MonitorControl/UI/de.lproj/MainMenu.strings b/MonitorControl/UI/de.lproj/MainMenu.strings index bba1184..b57f7af 100644 --- a/MonitorControl/UI/de.lproj/MainMenu.strings +++ b/MonitorControl/UI/de.lproj/MainMenu.strings @@ -1,6 +1,6 @@ - /* Class = "NSMenuItem"; title = "Quit"; ObjectID = "JTa-2I-AsI"; */ "JTa-2I-AsI.title" = "MonitorControl beenden"; /* Class = "NSMenuItem"; title = "Preferences..."; ObjectID = "SOS-eZ-uU5"; */ "SOS-eZ-uU5.title" = "Einstellungen …"; + diff --git a/MonitorControl/View Controllers/DisplayPrefsViewController.swift b/MonitorControl/View Controllers/DisplayPrefsViewController.swift index 2e78c58..c59c5d8 100644 --- a/MonitorControl/View Controllers/DisplayPrefsViewController.swift +++ b/MonitorControl/View Controllers/DisplayPrefsViewController.swift @@ -14,6 +14,8 @@ class DisplayPrefsViewController: NSViewController, MASPreferencesViewController case checkbox case name case identifier + case vendor + case model } @IBOutlet var allScreens: NSButton! @@ -93,6 +95,14 @@ class DisplayPrefsViewController: NSViewController, MASPreferencesViewController // Identifier text = "\(display.identifier)" cellType = DisplayCell.identifier + } else if tableColumn == tableView.tableColumns[3] { + // Vendor + text = display.identifier.vendorNumber.map { String(format: "0x%02X", $0) } ?? NSLocalizedString("unknown", comment: "unknown vendor") + cellType = DisplayCell.vendor + } else if tableColumn == tableView.tableColumns[4] { + // Model + text = display.identifier.modelNumber.map { String(format: "0x%02X", $0) } ?? NSLocalizedString("unknown", comment: "unknown model") + cellType = DisplayCell.model } if cellType == DisplayCell.checkbox { if let cell = tableView.makeView(withIdentifier: (tableColumn?.identifier)!, owner: nil) as? ButtonCellView { diff --git a/MonitorControlHelper/Info.plist b/MonitorControlHelper/Info.plist index f243c68..459cd14 100644 --- a/MonitorControlHelper/Info.plist +++ b/MonitorControlHelper/Info.plist @@ -19,7 +19,7 @@ CFBundleShortVersionString 1.5.0 CFBundleVersion - 229 + 239 LSApplicationCategoryType public.app-category.utilities LSBackgroundOnly