From ac46c7787bf3700743f9c0799acedf799bc10e49 Mon Sep 17 00:00:00 2001 From: allsochen Date: Tue, 16 Jul 2024 15:31:25 +0800 Subject: [PATCH] feat: adjust the appearance model of UI --- src/logic/Preferences.swift | 53 +--------------- .../tabs/AppearanceTab.swift | 62 +++++++++---------- 2 files changed, 33 insertions(+), 82 deletions(-) diff --git a/src/logic/Preferences.swift b/src/logic/Preferences.swift index acc02246..8522962b 100644 --- a/src/logic/Preferences.swift +++ b/src/logic/Preferences.swift @@ -62,8 +62,6 @@ class Preferences { "showOnScreen": ShowOnScreenPreference.active.rawValue, "appVerticalAlignment": AppVerticalAlignmentPreference.centered.rawValue, "titleTruncation": TitleTruncationPreference.end.rawValue, - "radioIconSize": IconSizePreference.medium.rawValue, - "radioTitleFontSize": TitleFontSizePreference.medium.rawValue, "alignThumbnails": AlignThumbnailsPreference.center.rawValue, "appsToShow": AppsToShowPreference.all.rawValue, "appsToShow2": AppsToShowPreference.active.rawValue, @@ -223,7 +221,7 @@ class Preferences { appearance.intraCellPadding = 7 appearance.interCellPadding = 7 if size == AppearanceSizePreference.small { - appearance.rowsCount = 6 + appearance.rowsCount = 5 appearance.windowMinWidthInRow = 8 appearance.windowMaxWidthInRow = 90 appearance.iconSize = 25 @@ -231,7 +229,7 @@ class Preferences { appearance.maxWidthOnScreen = 85 appearance.maxHeightOnScreen = 80 } else if size == AppearanceSizePreference.medium { - appearance.rowsCount = 5 + appearance.rowsCount = 4 appearance.windowMinWidthInRow = 10 appearance.windowMaxWidthInRow = 90 appearance.iconSize = 30 @@ -239,7 +237,7 @@ class Preferences { appearance.maxWidthOnScreen = 90 appearance.maxHeightOnScreen = 80 } else if size == AppearanceSizePreference.large { - appearance.rowsCount = 4 + appearance.rowsCount = 3 appearance.windowMinWidthInRow = 10 appearance.windowMaxWidthInRow = 90 appearance.iconSize = 30 @@ -808,51 +806,6 @@ enum AppearanceSizePreference: String, CaseIterable, ImageMacroPreference { } } -enum TitleFontSizePreference: String, CaseIterable, ImageMacroPreference { - case small = "0" - case medium = "1" - case large = "2" - - var localizedString: LocalizedString { - switch self { - case .small: return NSLocalizedString("Small", comment: "") - case .medium: return NSLocalizedString("Medium", comment: "") - case .large: return NSLocalizedString("Large", comment: "") - } - } - - var image: WidthHeightImage { - switch self { - case .small: return WidthHeightImage(name: "small") - case .medium: return WidthHeightImage(name: "medium") - case .large: return WidthHeightImage(name: "large") - } - } -} - -enum IconSizePreference: String, CaseIterable, ImageMacroPreference { - case small = "0" - case medium = "1" - case large = "2" - - var localizedString: LocalizedString { - switch self { - case .small: return NSLocalizedString("Small", comment: "") - case .medium: return NSLocalizedString("Medium", comment: "") - case .large: return NSLocalizedString("Large", comment: "") - } - } - - var image: WidthHeightImage { - switch self { - case .small: return WidthHeightImage(name: "small") - case .medium: return WidthHeightImage(name: "medium") - case .large: return WidthHeightImage(name: "large") - } - } -} - - enum AppearanceThemePreference: String, CaseIterable, ImageMacroPreference { case auto = "0" case light = "1" diff --git a/src/ui/preferences-window/tabs/AppearanceTab.swift b/src/ui/preferences-window/tabs/AppearanceTab.swift index 200212d0..c4a4429e 100644 --- a/src/ui/preferences-window/tabs/AppearanceTab.swift +++ b/src/ui/preferences-window/tabs/AppearanceTab.swift @@ -37,8 +37,6 @@ class AppearanceTab { static var infoPopover: NSPopover! static var titleTruncation: [NSView]! - static var radioIconSize: [NSView]! - static var radioTitleFontSize: [NSView]! static var showHideItems: [ShowHideItem] = [ ShowHideItem(uncheckedImageLight: "show_app_badges_light", @@ -120,16 +118,12 @@ class AppearanceTab { static func initTab() -> NSView { titleTruncation = LabelAndControl.makeLabelWithDropdown(NSLocalizedString("Window title truncation:", comment: ""), "titleTruncation", TitleTruncationPreference.allCases) - radioIconSize = LabelAndControl.makeLabelWithRadioButtons(NSLocalizedString("Icon size:", comment: ""), - "radioIconSize", IconSizePreference.allCases) - radioTitleFontSize = LabelAndControl.makeLabelWithRadioButtons(NSLocalizedString("Title font size:", comment: ""), - "radioTitleFontSize", TitleFontSizePreference.allCases) let generalSettings: [[NSView]] = [ LabelAndControl.makeLabelWithImageRadioButtons(NSLocalizedString("Appearance model:", comment: ""), "appearanceModel", AppearanceModelPreference.allCases, extraAction: { sender in let button = sender as! NSButton - toggleOptionUnderModel(button: button) +// toggleOptionUnderModel(button: button) }), [makeSeparator(), makeSeparator(), makeSeparator()], LabelAndControl.makeLabelWithImageRadioButtons(NSLocalizedString("Theme:", comment: ""), @@ -140,12 +134,12 @@ class AppearanceTab { [makeSeparator(), makeSeparator(), makeSeparator()], LabelAndControl.makeLabelWithRadioButtons(NSLocalizedString("Appearance size:", comment: ""), "appearanceSize", AppearanceSizePreference.allCases), - [makeSeparator(), makeSeparator(), makeSeparator()], - radioIconSize, - [makeSeparator(), makeSeparator(), makeSeparator()], - radioTitleFontSize, - [makeSeparator(), makeSeparator(), makeSeparator()], - titleTruncation, +// [makeSeparator(), makeSeparator(), makeSeparator()], +// radioIconSize, +// [makeSeparator(), makeSeparator(), makeSeparator()], +// radioTitleFontSize, +// [makeSeparator(), makeSeparator(), makeSeparator()], +// titleTruncation, ] var showHideSettings: [[NSView]] = [ @@ -168,7 +162,7 @@ class AppearanceTab { let generalGrid = GridView(generalSettings) generalGrid.column(at: 0).xPlacement = .trailing // merge cells for separator - [1, 3, 5, 7, 9, 11].forEach { row in + [1, 3, 5].forEach { row in generalGrid.mergeCells(inHorizontalRange: NSRange(location: 0, length: 3), verticalRange: NSRange(location: row, length: 1)) } generalGrid.fit() @@ -437,24 +431,28 @@ class AppearanceTab { } private static func toggleOptionUnderModel(button: NSButton) { - (titleTruncation[1] as! NSPopUpButton).isEnabled = (Preferences.appearanceModel == .thumbnails - || Preferences.appearanceModel == .titles) - (titleTruncation[0] as! TextField).textColor = (Preferences.appearanceModel == .thumbnails - || Preferences.appearanceModel == .titles) ? .labelColor : .gray +// (titleTruncation[1] as! NSPopUpButton).isEnabled = (Preferences.appearanceModel == .thumbnails +// || Preferences.appearanceModel == .titles) +// (titleTruncation[0] as! TextField).textColor = (Preferences.appearanceModel == .thumbnails +// || Preferences.appearanceModel == .titles) ? .labelColor : .gray +// +// [radioIconSize[1], radioTitleFontSize[1]].forEach { view in +// var buttons = findButtons(in: view as! NSStackView) +// buttons.forEach { button in +// button.isEnabled = Preferences.appearanceModel == .titles +// } +// } +// [radioIconSize[0], radioTitleFontSize[0]].forEach { view in +// let field = view as? TextField +// if Preferences.appearanceModel != .titles { +// field?.textColor = NSColor.gray +// } else { +// field?.textColor = NSColor.labelColor +// } +// } + } - [radioIconSize[1], radioTitleFontSize[1]].forEach { view in - var buttons = findButtons(in: view as! NSStackView) - buttons.forEach { button in - button.isEnabled = Preferences.appearanceModel == .titles - } - } - [radioIconSize[0], radioTitleFontSize[0]].forEach { view in - let field = view as? TextField - if Preferences.appearanceModel != .titles { - field?.textColor = NSColor.gray - } else { - field?.textColor = NSColor.labelColor - } - } + private static func openAdvancedSettings() { + debugPrint("openAdvancedSettings") } }