From 2ea7e4172e4542a293fc3c4a8cebef0ef188a604 Mon Sep 17 00:00:00 2001 From: Serhiy Mytrovtsiy Date: Wed, 1 Feb 2023 19:29:38 +0100 Subject: [PATCH] feat: renamed OneView to the "Combined modules" (#1084) --- Kit/module/widget.swift | 10 ++-- Stats.xcodeproj/project.pbxproj | 8 +-- Stats/AppDelegate.swift | 2 +- .../bg.lproj/Localizable.strings | 1 + .../ca.lproj/Localizable.strings | 1 + .../cs.lproj/Localizable.strings | 1 + .../da.lproj/Localizable.strings | 1 + .../de.lproj/Localizable.strings | 1 + .../el.lproj/Localizable.strings | 1 + .../en.lproj/Localizable.strings | 1 + .../es.lproj/Localizable.strings | 1 + .../fa.lproj/Localizable.strings | 1 + .../fr.lproj/Localizable.strings | 1 + .../he.lproj/Localizable.strings | 1 + .../hr.lproj/Localizable.strings | 1 + .../hu.lproj/Localizable.strings | 1 + .../id.lproj/Localizable.strings | 1 + .../it.lproj/Localizable.strings | 1 + .../ja.lproj/Localizable.strings | 1 + .../ko.lproj/Localizable.strings | 1 + .../nb.lproj/Localizable.strings | 1 + .../nl.lproj/Localizable.strings | 1 + .../pl.lproj/Localizable.strings | 1 + .../pt-BR.lproj/Localizable.strings | 1 + .../pt-PT.lproj/Localizable.strings | 1 + .../ro.lproj/Localizable.strings | 1 + .../ru.lproj/Localizable.strings | 1 + .../sl.lproj/Localizable.strings | 1 + .../sv.lproj/Localizable.strings | 1 + .../tr.lproj/Localizable.strings | 1 + .../uk.lproj/Localizable.strings | 1 + .../vi.lproj/Localizable.strings | 1 + .../zh-Hans.lproj/Localizable.strings | 1 + .../zh-Hant.lproj/Localizable.strings | 1 + Stats/Views/AppSettings.swift | 56 ++++--------------- .../{OneView.swift => CombinedView.swift} | 8 +-- 36 files changed, 55 insertions(+), 60 deletions(-) rename Stats/Views/{OneView.swift => CombinedView.swift} (94%) diff --git a/Kit/module/widget.swift b/Kit/module/widget.swift index 1ed359a5..6349edec 100644 --- a/Kit/module/widget.swift +++ b/Kit/module/widget.swift @@ -343,8 +343,8 @@ public class MenuBar { private var menuBarItem: NSStatusItem? = nil private var active: Bool = false - private var globalOneView: Bool { - Store.shared.bool(key: "OneView", defaultValue: false) + private var combinedModules: Bool { + Store.shared.bool(key: "CombinedModules", defaultValue: false) } public var view: MenuBarView = MenuBarView() @@ -367,7 +367,7 @@ public class MenuBar { self.oneView = Store.shared.bool(key: "\(self.moduleName)_oneView", defaultValue: self.oneView) self.view.identifier = NSUserInterfaceItemIdentifier(rawValue: moduleName) - if self.globalOneView { + if self.combinedModules { self.oneView = true } else { self.setupMenuBarItem(self.oneView) @@ -413,7 +413,7 @@ public class MenuBar { } public func enable() { - if self.oneView && !self.globalOneView { + if self.oneView && !self.combinedModules { self.setupMenuBarItem(true) } self.active = true @@ -489,7 +489,7 @@ public class MenuBar { w.disable() } - if self.globalOneView { + if self.combinedModules { self.oneView = true self.setupMenuBarItem(false) } else { diff --git a/Stats.xcodeproj/project.pbxproj b/Stats.xcodeproj/project.pbxproj index 0ce3e61b..1df37520 100644 --- a/Stats.xcodeproj/project.pbxproj +++ b/Stats.xcodeproj/project.pbxproj @@ -8,7 +8,7 @@ /* Begin PBXBuildFile section */ 5C0A2A8A292A5B4D009B4C1F /* SMJobBlessUtil.py in Resources */ = {isa = PBXBuildFile; fileRef = 5C0A2A89292A5B4D009B4C1F /* SMJobBlessUtil.py */; }; - 5C21D80B296C7B81005BA16D /* OneView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5C21D80A296C7B81005BA16D /* OneView.swift */; }; + 5C21D80B296C7B81005BA16D /* CombinedView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5C21D80A296C7B81005BA16D /* CombinedView.swift */; }; 5C8E001029269C7F0027C75A /* protocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5CFE493829265055000F2856 /* protocol.swift */; }; 5CFE492A29264DF1000F2856 /* main.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5CFE492929264DF1000F2856 /* main.swift */; }; 5CFE493929265055000F2856 /* protocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5CFE493829265055000F2856 /* protocol.swift */; }; @@ -346,7 +346,7 @@ 40BE2B202745D63800AE9396 /* da */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = da; path = da.lproj/Localizable.strings; sourceTree = ""; }; 4921436D25319699000A1C47 /* ko */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ko; path = ko.lproj/Localizable.strings; sourceTree = ""; }; 5C0A2A89292A5B4D009B4C1F /* SMJobBlessUtil.py */ = {isa = PBXFileReference; lastKnownFileType = text.script.python; path = SMJobBlessUtil.py; sourceTree = ""; }; - 5C21D80A296C7B81005BA16D /* OneView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OneView.swift; sourceTree = ""; }; + 5C21D80A296C7B81005BA16D /* CombinedView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CombinedView.swift; sourceTree = ""; }; 5CFE492729264DF1000F2856 /* eu.exelban.Stats.SMC.Helper */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = eu.exelban.Stats.SMC.Helper; sourceTree = BUILT_PRODUCTS_DIR; }; 5CFE492929264DF1000F2856 /* main.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = main.swift; sourceTree = ""; }; 5CFE493829265055000F2856 /* protocol.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = protocol.swift; sourceTree = ""; }; @@ -799,7 +799,7 @@ 9A81C74B24499C7000825D92 /* AppSettings.swift */, 9A9EA9442476D34500E3B883 /* Update.swift */, 9A83526E2889A03100791BAC /* Setup.swift */, - 5C21D80A296C7B81005BA16D /* OneView.swift */, + 5C21D80A296C7B81005BA16D /* CombinedView.swift */, ); path = Views; sourceTree = ""; @@ -1582,7 +1582,7 @@ 9A045EB72594F8D100ED58F2 /* Dashboard.swift in Sources */, 9A81C74E24499C7000825D92 /* Settings.swift in Sources */, 9A81C74D24499C7000825D92 /* AppSettings.swift in Sources */, - 5C21D80B296C7B81005BA16D /* OneView.swift in Sources */, + 5C21D80B296C7B81005BA16D /* CombinedView.swift in Sources */, 9A83526F2889A03100791BAC /* Setup.swift in Sources */, 9AD33AC624BCD3EE007E8820 /* helpers.swift in Sources */, ); diff --git a/Stats/AppDelegate.swift b/Stats/AppDelegate.swift index cb23bc59..e2b6e681 100755 --- a/Stats/AppDelegate.swift +++ b/Stats/AppDelegate.swift @@ -40,7 +40,7 @@ class AppDelegate: NSObject, NSApplicationDelegate, UNUserNotificationCenterDele internal let updateActivity = NSBackgroundActivityScheduler(identifier: "eu.exelban.Stats.updateCheck") internal var clickInNotification: Bool = false internal var menuBarItem: NSStatusItem? = nil - internal var oneView: OneView = OneView() + internal var combinedView: CombinedView = CombinedView() internal var pauseState: Bool { Store.shared.bool(key: "pause", defaultValue: false) diff --git a/Stats/Supporting Files/bg.lproj/Localizable.strings b/Stats/Supporting Files/bg.lproj/Localizable.strings index f3f9d4eb..7a948a4b 100644 --- a/Stats/Supporting Files/bg.lproj/Localizable.strings +++ b/Stats/Supporting Files/bg.lproj/Localizable.strings @@ -121,6 +121,7 @@ "Reset settings" = "Зануляване на настройките"; "Pause the Stats" = "Паузиране на Stats"; "Resume the Stats" = "Продължаване на Stats"; +"Combined modules" = "Combined modules"; // Dashboard "Serial number" = "Сериен номер"; diff --git a/Stats/Supporting Files/ca.lproj/Localizable.strings b/Stats/Supporting Files/ca.lproj/Localizable.strings index 4676f9b8..63438919 100644 --- a/Stats/Supporting Files/ca.lproj/Localizable.strings +++ b/Stats/Supporting Files/ca.lproj/Localizable.strings @@ -121,6 +121,7 @@ "Reset settings" = "Reset settings"; "Pause the Stats" = "Pause the Stats"; "Resume the Stats" = "Resume the Stats"; +"Combined modules" = "Combined modules"; // Dashboard "Serial number" = "Número de sèrie"; diff --git a/Stats/Supporting Files/cs.lproj/Localizable.strings b/Stats/Supporting Files/cs.lproj/Localizable.strings index fc70f72f..4a9de022 100644 --- a/Stats/Supporting Files/cs.lproj/Localizable.strings +++ b/Stats/Supporting Files/cs.lproj/Localizable.strings @@ -121,6 +121,7 @@ "Reset settings" = "Obnovit nastavení"; "Pause the Stats" = "Pozastavit Stats"; "Resume the Stats" = "Obnovit Stats"; +"Combined modules" = "Combined modules"; // Dashboard "Serial number" = "Sériové číslo"; diff --git a/Stats/Supporting Files/da.lproj/Localizable.strings b/Stats/Supporting Files/da.lproj/Localizable.strings index 6810d5b1..eac3272c 100644 --- a/Stats/Supporting Files/da.lproj/Localizable.strings +++ b/Stats/Supporting Files/da.lproj/Localizable.strings @@ -121,6 +121,7 @@ "Reset settings" = "Reset settings"; "Pause the Stats" = "Pause the Stats"; "Resume the Stats" = "Resume the Stats"; +"Combined modules" = "Combined modules"; // Dashboard "Serial number" = "Serienummer"; diff --git a/Stats/Supporting Files/de.lproj/Localizable.strings b/Stats/Supporting Files/de.lproj/Localizable.strings index 25a40384..2e1bb4a7 100644 --- a/Stats/Supporting Files/de.lproj/Localizable.strings +++ b/Stats/Supporting Files/de.lproj/Localizable.strings @@ -121,6 +121,7 @@ "Reset settings" = "Einstellungen zurücksetzen"; "Pause the Stats" = "Stats pausieren"; "Resume the Stats" = "Stats fortsetzen"; +"Combined modules" = "Combined modules"; // Dashboard "Serial number" = "Seriennummer"; diff --git a/Stats/Supporting Files/el.lproj/Localizable.strings b/Stats/Supporting Files/el.lproj/Localizable.strings index 2f6b6dbe..be339361 100644 --- a/Stats/Supporting Files/el.lproj/Localizable.strings +++ b/Stats/Supporting Files/el.lproj/Localizable.strings @@ -121,6 +121,7 @@ "Reset settings" = "Επαναφορά ρυθμίσεων"; "Pause the Stats" = "Pause the Stats"; "Resume the Stats" = "Resume the Stats"; +"Combined modules" = "Combined modules"; // Dashboard "Serial number" = "Σειριακός αριθμός"; diff --git a/Stats/Supporting Files/en.lproj/Localizable.strings b/Stats/Supporting Files/en.lproj/Localizable.strings index 80bef945..722651a5 100644 --- a/Stats/Supporting Files/en.lproj/Localizable.strings +++ b/Stats/Supporting Files/en.lproj/Localizable.strings @@ -121,6 +121,7 @@ "Reset settings" = "Reset settings"; "Pause the Stats" = "Pause the Stats"; "Resume the Stats" = "Resume the Stats"; +"Combined modules" = "Combined modules"; // Dashboard "Serial number" = "Serial number"; diff --git a/Stats/Supporting Files/es.lproj/Localizable.strings b/Stats/Supporting Files/es.lproj/Localizable.strings index f63c4393..8150a06c 100644 --- a/Stats/Supporting Files/es.lproj/Localizable.strings +++ b/Stats/Supporting Files/es.lproj/Localizable.strings @@ -121,6 +121,7 @@ "Reset settings" = "Reset settings"; "Pause the Stats" = "Pause the Stats"; "Resume the Stats" = "Resume the Stats"; +"Combined modules" = "Combined modules"; // Dashboard "Serial number" = "Número de serie"; diff --git a/Stats/Supporting Files/fa.lproj/Localizable.strings b/Stats/Supporting Files/fa.lproj/Localizable.strings index 5849807e..614334e7 100644 --- a/Stats/Supporting Files/fa.lproj/Localizable.strings +++ b/Stats/Supporting Files/fa.lproj/Localizable.strings @@ -121,6 +121,7 @@ "Reset settings" = "ریست تنظیمات"; "Pause the Stats" = "متوقف کردن Stats"; "Resume the Stats" = "ادامه‌ی کار Stats"; +"Combined modules" = "Combined modules"; // Dashboard "Serial number" = "سریال نامبر"; diff --git a/Stats/Supporting Files/fr.lproj/Localizable.strings b/Stats/Supporting Files/fr.lproj/Localizable.strings index d70e3d3a..7b1f950d 100644 --- a/Stats/Supporting Files/fr.lproj/Localizable.strings +++ b/Stats/Supporting Files/fr.lproj/Localizable.strings @@ -121,6 +121,7 @@ "Reset settings" = "Reset settings"; "Pause the Stats" = "Pause the Stats"; "Resume the Stats" = "Resume the Stats"; +"Combined modules" = "Combined modules"; // Dashboard "Serial number" = "Numéro de série"; diff --git a/Stats/Supporting Files/he.lproj/Localizable.strings b/Stats/Supporting Files/he.lproj/Localizable.strings index e156b8e1..755e8c37 100644 --- a/Stats/Supporting Files/he.lproj/Localizable.strings +++ b/Stats/Supporting Files/he.lproj/Localizable.strings @@ -121,6 +121,7 @@ "Reset settings" = "איפוס הגדרות"; "Pause the Stats" = "Pause the Stats"; "Resume the Stats" = "Resume the Stats"; +"Combined modules" = "Combined modules"; // Dashboard "Serial number" = "מספר סריאלי"; diff --git a/Stats/Supporting Files/hr.lproj/Localizable.strings b/Stats/Supporting Files/hr.lproj/Localizable.strings index 547f230c..42dd2659 100644 --- a/Stats/Supporting Files/hr.lproj/Localizable.strings +++ b/Stats/Supporting Files/hr.lproj/Localizable.strings @@ -121,6 +121,7 @@ "Reset settings" = "Resetiraj postavke"; "Pause the Stats" = "Pause the Stats"; "Resume the Stats" = "Resume the Stats"; +"Combined modules" = "Combined modules"; // Dashboard "Serial number" = "Serijski broj"; diff --git a/Stats/Supporting Files/hu.lproj/Localizable.strings b/Stats/Supporting Files/hu.lproj/Localizable.strings index 6f824a36..39c6a479 100644 --- a/Stats/Supporting Files/hu.lproj/Localizable.strings +++ b/Stats/Supporting Files/hu.lproj/Localizable.strings @@ -121,6 +121,7 @@ "Reset settings" = "Beállítások alaphelyzetbe állítása"; "Pause the Stats" = "Stats felfüggesztése"; "Resume the Stats" = "Stats folytatása"; +"Combined modules" = "Combined modules"; // Dashboard "Serial number" = "Sorozatszám"; diff --git a/Stats/Supporting Files/id.lproj/Localizable.strings b/Stats/Supporting Files/id.lproj/Localizable.strings index beb5510e..042f5ba8 100644 --- a/Stats/Supporting Files/id.lproj/Localizable.strings +++ b/Stats/Supporting Files/id.lproj/Localizable.strings @@ -121,6 +121,7 @@ "Reset settings" = "Atur ulang pengaturan"; "Pause the Stats" = "Pause the Stats"; "Resume the Stats" = "Resume the Stats"; +"Combined modules" = "Combined modules"; // Dashboard "Serial number" = "Nomor serial"; diff --git a/Stats/Supporting Files/it.lproj/Localizable.strings b/Stats/Supporting Files/it.lproj/Localizable.strings index ebe0dad2..db320110 100644 --- a/Stats/Supporting Files/it.lproj/Localizable.strings +++ b/Stats/Supporting Files/it.lproj/Localizable.strings @@ -121,6 +121,7 @@ "Reset settings" = "Reset settings"; "Pause the Stats" = "Pause the Stats"; "Resume the Stats" = "Resume the Stats"; +"Combined modules" = "Combined modules"; // Dashboard "Serial number" = "Numero di serie"; diff --git a/Stats/Supporting Files/ja.lproj/Localizable.strings b/Stats/Supporting Files/ja.lproj/Localizable.strings index 520d1edf..6850e8d4 100644 --- a/Stats/Supporting Files/ja.lproj/Localizable.strings +++ b/Stats/Supporting Files/ja.lproj/Localizable.strings @@ -121,6 +121,7 @@ "Reset settings" = "設定をリセット"; "Pause the Stats" = "Pause the Stats"; "Resume the Stats" = "Resume the Stats"; +"Combined modules" = "Combined modules"; // Dashboard "Serial number" = "シリアル番号"; diff --git a/Stats/Supporting Files/ko.lproj/Localizable.strings b/Stats/Supporting Files/ko.lproj/Localizable.strings index b7d38326..7308a9ab 100644 --- a/Stats/Supporting Files/ko.lproj/Localizable.strings +++ b/Stats/Supporting Files/ko.lproj/Localizable.strings @@ -121,6 +121,7 @@ "Reset settings" = "설정 초기화"; "Pause the Stats" = "Pause the Stats"; "Resume the Stats" = "Resume the Stats"; +"Combined modules" = "Combined modules"; // Dashboard "Serial number" = "일련 번호"; diff --git a/Stats/Supporting Files/nb.lproj/Localizable.strings b/Stats/Supporting Files/nb.lproj/Localizable.strings index 6c1e522e..b6045704 100644 --- a/Stats/Supporting Files/nb.lproj/Localizable.strings +++ b/Stats/Supporting Files/nb.lproj/Localizable.strings @@ -121,6 +121,7 @@ "Reset settings" = "Nullstill innstillinger"; "Pause the Stats" = "Sett Stats på pause"; "Resume the Stats" = "Gjenoppta Stats"; +"Combined modules" = "Combined modules"; // Dashboard "Serial number" = "Serienummer"; diff --git a/Stats/Supporting Files/nl.lproj/Localizable.strings b/Stats/Supporting Files/nl.lproj/Localizable.strings index 7d8b0153..1efc2a4b 100644 --- a/Stats/Supporting Files/nl.lproj/Localizable.strings +++ b/Stats/Supporting Files/nl.lproj/Localizable.strings @@ -121,6 +121,7 @@ "Reset settings" = "Reset settings"; "Pause the Stats" = "Pause the Stats"; "Resume the Stats" = "Resume the Stats"; +"Combined modules" = "Combined modules"; // Dashboard "Serial number" = "Serienummer"; diff --git a/Stats/Supporting Files/pl.lproj/Localizable.strings b/Stats/Supporting Files/pl.lproj/Localizable.strings index f1e742a0..7a1a83cf 100644 --- a/Stats/Supporting Files/pl.lproj/Localizable.strings +++ b/Stats/Supporting Files/pl.lproj/Localizable.strings @@ -121,6 +121,7 @@ "Reset settings" = "Resetowanie ustawień"; "Pause the Stats" = "Wstrzymaj Stats"; "Resume the Stats" = "Wznów Stats"; +"Combined modules" = "Połączone moduły"; // Dashboard "Serial number" = "Numer seryjny"; diff --git a/Stats/Supporting Files/pt-BR.lproj/Localizable.strings b/Stats/Supporting Files/pt-BR.lproj/Localizable.strings index e2971d51..e2ad54ae 100644 --- a/Stats/Supporting Files/pt-BR.lproj/Localizable.strings +++ b/Stats/Supporting Files/pt-BR.lproj/Localizable.strings @@ -121,6 +121,7 @@ "Reset settings" = "Reset settings"; "Pause the Stats" = "Pause the Stats"; "Resume the Stats" = "Resume the Stats"; +"Combined modules" = "Combined modules"; // Dashboard "Serial number" = "Número de série"; diff --git a/Stats/Supporting Files/pt-PT.lproj/Localizable.strings b/Stats/Supporting Files/pt-PT.lproj/Localizable.strings index f2e49504..970d99fa 100644 --- a/Stats/Supporting Files/pt-PT.lproj/Localizable.strings +++ b/Stats/Supporting Files/pt-PT.lproj/Localizable.strings @@ -121,6 +121,7 @@ "Reset settings" = "Reset settings"; "Pause the Stats" = "Pause the Stats"; "Resume the Stats" = "Resume the Stats"; +"Combined modules" = "Combined modules"; // Dashboard "Serial number" = "Número de série"; diff --git a/Stats/Supporting Files/ro.lproj/Localizable.strings b/Stats/Supporting Files/ro.lproj/Localizable.strings index dd5ab053..cafed3d8 100644 --- a/Stats/Supporting Files/ro.lproj/Localizable.strings +++ b/Stats/Supporting Files/ro.lproj/Localizable.strings @@ -121,6 +121,7 @@ "Reset settings" = "Reset settings"; "Pause the Stats" = "Pause the Stats"; "Resume the Stats" = "Resume the Stats"; +"Combined modules" = "Combined modules"; // Dashboard "Serial number" = "Număr de serie"; diff --git a/Stats/Supporting Files/ru.lproj/Localizable.strings b/Stats/Supporting Files/ru.lproj/Localizable.strings index fd0ecaa8..f637118d 100644 --- a/Stats/Supporting Files/ru.lproj/Localizable.strings +++ b/Stats/Supporting Files/ru.lproj/Localizable.strings @@ -121,6 +121,7 @@ "Reset settings" = "Сбросить настройки"; "Pause the Stats" = "Приостановить Stats"; "Resume the Stats" = "Возобновить Stats"; +"Combined modules" = "Комбинированные модули"; // Dashboard "Serial number" = "Серийный номер"; diff --git a/Stats/Supporting Files/sl.lproj/Localizable.strings b/Stats/Supporting Files/sl.lproj/Localizable.strings index f392c4ea..ee7f000f 100644 --- a/Stats/Supporting Files/sl.lproj/Localizable.strings +++ b/Stats/Supporting Files/sl.lproj/Localizable.strings @@ -121,6 +121,7 @@ "Reset settings" = "Ponastavi nastavitve"; "Pause the Stats" = "Začasno zaustavi Stats"; "Resume the Stats" = "Nadaljuj z izvajanjem Stats"; +"Combined modules" = "Combined modules"; // Dashboard "Serial number" = "Serijska številka"; diff --git a/Stats/Supporting Files/sv.lproj/Localizable.strings b/Stats/Supporting Files/sv.lproj/Localizable.strings index 47ecfaea..a8feece6 100644 --- a/Stats/Supporting Files/sv.lproj/Localizable.strings +++ b/Stats/Supporting Files/sv.lproj/Localizable.strings @@ -121,6 +121,7 @@ "Reset settings" = "Återställ inställningar"; "Pause the Stats" = "Pause the Stats"; "Resume the Stats" = "Resume the Stats"; +"Combined modules" = "Combined modules"; // Dashboard "Serial number" = "Serienummer"; diff --git a/Stats/Supporting Files/tr.lproj/Localizable.strings b/Stats/Supporting Files/tr.lproj/Localizable.strings index dad91f2b..025dde18 100644 --- a/Stats/Supporting Files/tr.lproj/Localizable.strings +++ b/Stats/Supporting Files/tr.lproj/Localizable.strings @@ -121,6 +121,7 @@ "Reset settings" = "Ayarları sıfırla"; "Pause the Stats" = "Stats'ı Duraklat"; "Resume the Stats" = "Stats'ı Sürdür"; +"Combined modules" = "Combined modules"; // Dashboard "Serial number" = "Seri numarası"; diff --git a/Stats/Supporting Files/uk.lproj/Localizable.strings b/Stats/Supporting Files/uk.lproj/Localizable.strings index 1b4cd191..1827b07b 100644 --- a/Stats/Supporting Files/uk.lproj/Localizable.strings +++ b/Stats/Supporting Files/uk.lproj/Localizable.strings @@ -121,6 +121,7 @@ "Reset settings" = "Скинути налаштування"; "Pause the Stats" = "Призупинити Stats"; "Resume the Stats" = "Відновити Stats"; +"Combined modules" = "Комбіновані модулі"; // Dashboard "Serial number" = "Серійний номер"; diff --git a/Stats/Supporting Files/vi.lproj/Localizable.strings b/Stats/Supporting Files/vi.lproj/Localizable.strings index 5aa7d7fc..ab6d8ff1 100644 --- a/Stats/Supporting Files/vi.lproj/Localizable.strings +++ b/Stats/Supporting Files/vi.lproj/Localizable.strings @@ -121,6 +121,7 @@ "Reset settings" = "Thiết lập lại cài đặt"; "Pause the Stats" = "Pause the Stats"; "Resume the Stats" = "Resume the Stats"; +"Combined modules" = "Combined modules"; // Dashboard "Serial number" = "Số sê-ri"; diff --git a/Stats/Supporting Files/zh-Hans.lproj/Localizable.strings b/Stats/Supporting Files/zh-Hans.lproj/Localizable.strings index 8397c74a..0c7cd2f2 100644 --- a/Stats/Supporting Files/zh-Hans.lproj/Localizable.strings +++ b/Stats/Supporting Files/zh-Hans.lproj/Localizable.strings @@ -121,6 +121,7 @@ "Reset settings" = "初始化所有设置"; "Pause the Stats" = "暂停 Stats"; "Resume the Stats" = "恢复 Stats"; +"Combined modules" = "Combined modules"; // Dashboard "Serial number" = "序列号"; diff --git a/Stats/Supporting Files/zh-Hant.lproj/Localizable.strings b/Stats/Supporting Files/zh-Hant.lproj/Localizable.strings index 076130d0..eac5cfb8 100644 --- a/Stats/Supporting Files/zh-Hant.lproj/Localizable.strings +++ b/Stats/Supporting Files/zh-Hant.lproj/Localizable.strings @@ -121,6 +121,7 @@ "Reset settings" = "重置設定"; "Pause the Stats" = "暫停 Stats"; "Resume the Stats" = "恢復 Stats"; +"Combined modules" = "Combined modules"; // Dashboard "Serial number" = "序號"; diff --git a/Stats/Views/AppSettings.swift b/Stats/Views/AppSettings.swift index fbaae7cf..31c49af9 100644 --- a/Stats/Views/AppSettings.swift +++ b/Stats/Views/AppSettings.swift @@ -26,12 +26,12 @@ class ApplicationSettings: NSStackView { } } - private var oneViewState: Bool { + private var combinedModulesState: Bool { get { - Store.shared.bool(key: "OneView", defaultValue: false) + Store.shared.bool(key: "CombinedModules", defaultValue: false) } set { - Store.shared.set(key: "OneView", value: newValue) + Store.shared.set(key: "CombinedModules", value: newValue) } } @@ -186,15 +186,15 @@ class ApplicationSettings: NSStackView { ) grid.addRow(with: [NSGridCell.emptyContentView, self.startAtLoginBtn!]) grid.addRow(with: [NSGridCell.emptyContentView, self.toggleView( - action: #selector(self.toggleOneView), - state: self.oneViewState, - text: localizedString("OneView") + action: #selector(self.toggleCombinedModules), + state: self.combinedModulesState, + text: localizedString("Combined modules") )]) view.addArrangedSubview(self.moduleSelector) view.addArrangedSubview(grid) - self.moduleSelector.isHidden = !self.oneViewState + self.moduleSelector.isHidden = !self.combinedModulesState return view } @@ -238,42 +238,6 @@ class ApplicationSettings: NSStackView { return view } - private func oneViewSettingsView() -> NSView { - let view: NSView = NSView(frame: NSRect(x: 0, y: 0, width: self.frame.width, height: 0)) - let grid: NSGridView = NSGridView(frame: NSRect(x: 0, y: 0, width: view.frame.width, height: 0)) - grid.rowSpacing = 10 - grid.columnSpacing = 20 - grid.xPlacement = .trailing - grid.rowAlignment = .firstBaseline - grid.translatesAutoresizingMaskIntoConstraints = false - - grid.setContentHuggingPriority(.defaultHigh, for: .horizontal) - grid.setContentHuggingPriority(.defaultHigh, for: .vertical) - - grid.addRow(with: [self.moduleSelector]) - - view.addSubview(grid) - - var height: CGFloat = grid.rowSpacing - for i in 0.. NSBox { @@ -390,9 +354,9 @@ class ApplicationSettings: NSStackView { SMCHelper.shared.uninstall() } - @objc private func toggleOneView(_ sender: NSButton) { - self.oneViewState = sender.state == NSControl.StateValue.on - self.moduleSelector.isHidden = !self.oneViewState + @objc private func toggleCombinedModules(_ sender: NSButton) { + self.combinedModulesState = sender.state == NSControl.StateValue.on + self.moduleSelector.isHidden = !self.combinedModulesState NotificationCenter.default.post(name: .toggleOneView, object: nil, userInfo: nil) } } diff --git a/Stats/Views/OneView.swift b/Stats/Views/CombinedView.swift similarity index 94% rename from Stats/Views/OneView.swift rename to Stats/Views/CombinedView.swift index 490213bf..993408fb 100644 --- a/Stats/Views/OneView.swift +++ b/Stats/Views/CombinedView.swift @@ -1,5 +1,5 @@ // -// OneView.swift +// CombinedView.swift // Stats // // Created by Serhiy Mytrovtsiy on 09/01/2023 @@ -12,12 +12,12 @@ import Cocoa import Kit -class OneView { +class CombinedView { private var menuBarItem: NSStatusItem? = nil private var view: NSView = NSView(frame: NSRect(x: 0, y: 0, width: 100, height: Constants.Widget.height)) private var status: Bool { - Store.shared.bool(key: "OneView", defaultValue: false) + Store.shared.bool(key: "CombinedModules", defaultValue: false) } init() { @@ -45,7 +45,7 @@ class OneView { public func enable() { self.menuBarItem = NSStatusBar.system.statusItem(withLength: 0) - self.menuBarItem?.autosaveName = "OneView" + self.menuBarItem?.autosaveName = "CombinedModules" self.menuBarItem?.button?.addSubview(self.view) self.menuBarItem?.button?.target = self