floraachy
/
vChewing-macOS
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Repo // Compatibility with Xcode 15.

This commit is contained in:
ShikiSuen 2023-06-06 20:42:08 +08:00
parent 0bb6a26b3a
commit 3f0f308c81
47 changed files with 124 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
Installer/AppDelegate.swift
View File

@ -8,7 +8,7 @@
// marks, or product names of Contributor, except as required to fulfill notice
// requirements defined in MIT License.
import Cocoa
import AppKit
import IMKUtils
import InputMethodKit
import SwiftExtension
@ -111,7 +111,7 @@ class AppDelegate: NSWindowController, NSApplicationDelegate {
window.center()
window.orderFront(self)
NSApp.activate(ignoringOtherApps: true)
NSApp.popup()
}
@IBAction func agreeAndInstallAction(_: AnyObject) {
@ -179,3 +179,21 @@ class AppDelegate: NSWindowController, NSApplicationDelegate {
return output
}
}
// MARK: - NSApp Activation Helper
// This is to deal with changes brought by macOS 14.
private extension NSApplication {
func popup() {
#if compiler(>=5.9) && canImport(AppKit, _version: "14.0")
if #available(macOS 14.0, *) {
NSApp.activate()
} else {
NSApp.activate(ignoringOtherApps: true)
}
#else
NSApp.activate(ignoringOtherApps: true)
#endif
}
}

2
Installer/AppDelegate_Extension.swift
View File

@ -8,7 +8,7 @@
// marks, or product names of Contributor, except as required to fulfill notice
// requirements defined in MIT License.
import Cocoa
import AppKit
import InputMethodKit
extension AppDelegate {

2
Packages/Fuziki_NSAttributedTextView/Sources/NSAttributedTextView/NSAttributedTextView.swift
View File

@ -5,7 +5,7 @@
// Ref: https://qiita.com/fuziki/items/b31055a69330a3ce55a5
// Modified by The vChewing Project in order to use it with AppKit.
import Cocoa
import AppKit
import CocoaExtension
import SwiftUI

2
Packages/Jad_BookmarkManager/Sources/BookmarkManager/BookmarkManager.swift
View File

@ -1,7 +1,7 @@
// Ref: https://stackoverflow.com/a/61695824
// License: https://creativecommons.org/licenses/by-sa/4.0/
import Cocoa
import AppKit
public class BookmarkManager {
public static let shared = BookmarkManager()

2
Packages/Qwertyyb_ShiftKeyUpChecker/Sources/ShiftKeyUpChecker/ShiftKeyUpChecker.swift
View File

@ -2,8 +2,8 @@
// ====================
// This code is released under the MIT license (SPDX-License-Identifier: MIT)
import AppKit
import Carbon
import Cocoa
private extension Date {
static func - (lhs: Date, rhs: Date) -> TimeInterval {

4
Packages/ShapsBenkau_SwiftUIBackports/Sources/SwiftUIBackports/Internal/Environment+String.swift
View File

@ -99,8 +99,8 @@ private extension EnvironmentValues {
@available(macOS 10.15, *)
@propertyWrapper
internal struct StringlyTypedEnvironment<Value> {
final class Store<Value>: ObservableObject {
var value: Value?
final class Store<StoredValue>: ObservableObject {
var value: StoredValue?
}
@Environment(\.self) private var env

2
Packages/Sindresorhus_SSPreferences/Sources/SSPreferences/SegmentedControlStyleViewController.swift
View File

@ -2,7 +2,7 @@
// ====================
// This code is released under the MIT license (SPDX-License-Identifier: MIT)
import Cocoa
import AppKit
extension NSToolbarItem.Identifier {
static let toolbarSegmentedControlItem = Self("toolbarSegmentedControlItem")

2
Packages/Sindresorhus_SSPreferences/Sources/SSPreferences/SettingsPane.swift
View File

@ -2,7 +2,7 @@
// ====================
// This code is released under the MIT license (SPDX-License-Identifier: MIT)
import Cocoa
import AppKit
public extension Settings {
struct PaneIdentifier: Hashable, RawRepresentable, Codable {

2
Packages/Sindresorhus_SSPreferences/Sources/SSPreferences/SettingsStyleController.swift
View File

@ -2,7 +2,7 @@
// ====================
// This code is released under the MIT license (SPDX-License-Identifier: MIT)
import Cocoa
import AppKit
protocol SettingsStyleController: AnyObject {
var delegate: SettingsStyleControllerDelegate? { get set }

2
Packages/Sindresorhus_SSPreferences/Sources/SSPreferences/SettingsTabViewController.swift
View File

@ -2,7 +2,7 @@
// ====================
// This code is released under the MIT license (SPDX-License-Identifier: MIT)
import Cocoa
import AppKit
final class SettingsTabViewController: NSViewController, SettingsStyleControllerDelegate {
private var activeTab: Int?

10
Packages/Sindresorhus_SSPreferences/Sources/SSPreferences/SettingsWindowController.swift
View File

@ -2,7 +2,7 @@
// ====================
// This code is released under the MIT license (SPDX-License-Identifier: MIT)
import Cocoa
import AppKit
extension NSWindow.FrameAutosaveName {
static let settings: NSWindow.FrameAutosaveName = "com.sindresorhus.Preferences.FrameAutosaveName"
@ -100,8 +100,16 @@ public final class SettingsWindowController: NSWindowController {
showWindow(self)
restoreWindowPosition()
#if compiler(>=5.9) && canImport(AppKit, _version: "14.0")
if #available(macOS 14.0, *) {
NSApp.activate()
} else {
NSApp.activate(ignoringOtherApps: true)
}
#else
NSApp.activate(ignoringOtherApps: true)
#endif
}
private func restoreWindowPosition() {
guard

2
Packages/Sindresorhus_SSPreferences/Sources/SSPreferences/Style.swift
View File

@ -2,7 +2,7 @@
// ====================
// This code is released under the MIT license (SPDX-License-Identifier: MIT)
import Cocoa
import AppKit
public extension Settings {
enum Style {

2
Packages/Sindresorhus_SSPreferences/Sources/SSPreferences/ToolbarItemStyleViewController.swift
View File

@ -2,7 +2,7 @@
// ====================
// This code is released under the MIT license (SPDX-License-Identifier: MIT)
import Cocoa
import AppKit
final class ToolbarItemStyleViewController: NSObject, SettingsStyleController {
let toolbar: NSToolbar

2
Packages/vChewing_CandidateWindow/Sources/CandidateWindow/CandidateCellData_Core.swift
View File

@ -6,7 +6,7 @@
// marks, or product names of Contributor, except as required to fulfill notice
// requirements defined in MIT License.
import Cocoa
import AppKit
import Shared
import SwiftUI
import SwiftUIBackports

2
Packages/vChewing_CandidateWindow/Sources/CandidateWindow/CandidatePool_CocoaImpl.swift
View File

@ -6,7 +6,7 @@
// marks, or product names of Contributor, except as required to fulfill notice
// requirements defined in MIT License.
import Cocoa
import AppKit
// MARK: - Using One Single NSAttributedString.

2
Packages/vChewing_CandidateWindow/Sources/CandidateWindow/CtlCandidate.swift
View File

@ -6,7 +6,7 @@
// marks, or product names of Contributor, except as required to fulfill notice
// requirements defined in MIT License.
import Cocoa
import AppKit
import Shared
open class CtlCandidate: NSWindowController, CtlCandidateProtocol {

2
Packages/vChewing_CandidateWindow/Sources/CandidateWindow/TDKCandidates/CtlCandidateTDK.swift
View File

@ -6,7 +6,7 @@
// marks, or product names of Contributor, except as required to fulfill notice
// requirements defined in MIT License.
import Cocoa
import AppKit
import CocoaExtension
import Shared
import SwiftExtension

2
Packages/vChewing_CandidateWindow/Sources/CandidateWindow/TDKCandidates/VwrCandidateTDK_Cocoa.swift
View File

@ -6,7 +6,7 @@
// marks, or product names of Contributor, except as required to fulfill notice
// requirements defined in MIT License.
import Cocoa
import AppKit
import Shared
/// 田所選字窗的 Cocoa 版本，繪製效率不受 SwiftUI 的限制。

2
Packages/vChewing_CandidateWindow/Sources/CandidateWindow/TDKCandidates/VwrCandidateTDK_SwiftUI.swift
View File

@ -6,7 +6,7 @@
// marks, or product names of Contributor, except as required to fulfill notice
// requirements defined in MIT License.
import Cocoa
import AppKit
import Shared
import SwiftUI
import SwiftUIBackports

2
Packages/vChewing_CandidateWindow/Tests/CandidateWindowTests/CandidatePoolTests.swift
View File

@ -6,7 +6,7 @@
// marks, or product names of Contributor, except as required to fulfill notice
// requirements defined in MIT License.
import Cocoa
import AppKit
import XCTest
@testable import CandidateWindow

20
Packages/vChewing_CocoaExtension/Sources/CocoaExtension/CocoaExtension_Misc.swift
View File

@ -6,7 +6,7 @@
// marks, or product names of Contributor, except as required to fulfill notice
// requirements defined in MIT License.
import Cocoa
import AppKit
import SwiftExtension
// MARK: - NSSize extension
@ -238,3 +238,21 @@ public extension NSApplication {
return machine == "arm64"
}
}
// MARK: - NSApp Activation Helper
// This is to deal with changes brought by macOS 14.
public extension NSApplication {
func popup() {
#if compiler(>=5.9) && canImport(AppKit, _version: "14.0")
if #available(macOS 14.0, *) {
NSApp.activate()
} else {
NSApp.activate(ignoringOtherApps: true)
}
#else
NSApp.activate(ignoringOtherApps: true)
#endif
}
}

2
Packages/vChewing_CocoaExtension/Sources/CocoaExtension/CocoaExtension_NSEvent.swift
View File

@ -6,7 +6,7 @@
// marks, or product names of Contributor, except as required to fulfill notice
// requirements defined in MIT License.
import Cocoa
import AppKit
import IMKUtils
// MARK: - NSEvent Extension - Reconstructors

2
Packages/vChewing_CocoaExtension/Sources/CocoaExtension/CocoaExtension_NSSound.swift
View File

@ -6,8 +6,8 @@
// marks, or product names of Contributor, except as required to fulfill notice
// requirements defined in MIT License.
import AppKit
import AVFoundation
import Cocoa
public extension NSSound {
static func buzz(fart: Bool = false) {

2
Packages/vChewing_CocoaExtension/Sources/CocoaExtension/CocoaExtension_NSWindowController.swift
View File

@ -6,7 +6,7 @@
// marks, or product names of Contributor, except as required to fulfill notice
// requirements defined in MIT License.
import Cocoa
import AppKit
import InputMethodKit
public extension NSWindowController {

2
Packages/vChewing_CocoaExtension/Sources/CocoaExtension/CocoaExtension_NSWindowPositioner.swift
View File

@ -2,7 +2,7 @@
// Written by Alexis Bridoux - https://github.com/ABridoux
// Ref: https://gist.github.com/ABridoux/b935c21c7ead92033d39b357fae6366b
import Cocoa
import AppKit
import SwiftUI
// MARK: Model

2
Packages/vChewing_Megrez/Tests/MegrezTests/MegrezTests.swift
View File

@ -3,7 +3,7 @@
// ====================
// This code is released under the MIT license (SPDX-License-Identifier: MIT)
import Cocoa
import AppKit
import XCTest
@testable import Megrez

2
Packages/vChewing_NotifierUI/Sources/NotifierUI/NotifierUI.swift
View File

@ -6,7 +6,7 @@
// marks, or product names of Contributor, except as required to fulfill notice
// requirements defined in MIT License.
import Cocoa
import AppKit
import CocoaExtension
public class Notifier: NSWindowController {

2
Packages/vChewing_PhraseEditorUI/Sources/PhraseEditorUI/PhraseEditorUI.swift
View File

@ -6,7 +6,7 @@
// marks, or product names of Contributor, except as required to fulfill notice
// requirements defined in MIT License.
import Cocoa
import AppKit
import Combine
import Foundation
import LangModelAssembly

2
Packages/vChewing_PinyinPhonaConverter/Sources/PinyinPhonaConverter/PinyinPhonaConverter.swift
View File

@ -6,7 +6,7 @@
// marks, or product names of Contributor, except as required to fulfill notice
// requirements defined in MIT License.
import Cocoa
import AppKit
public extension String {
mutating func convertToPhonabets(newToneOne: String = "") {

2
Packages/vChewing_PopupCompositionBuffer/Sources/PopupCompositionBuffer/PopupCompositionBuffer.swift
View File

@ -6,7 +6,7 @@
// marks, or product names of Contributor, except as required to fulfill notice
// requirements defined in MIT License.
import Cocoa
import AppKit
import Shared
public class PopupCompositionBuffer: NSWindowController {

2
Packages/vChewing_Shared/Sources/Shared/Protocols/CtlCandidateProtocol.swift
View File

@ -6,7 +6,7 @@
// marks, or product names of Contributor, except as required to fulfill notice
// requirements defined in MIT License.
import Cocoa
import AppKit
public protocol CtlCandidateDelegate {
func candidatePairs(conv: Bool) -> [(keyArray: [String], value: String)]

2
Packages/vChewing_Shared/Sources/Shared/Protocols/IMEStateProtocol.swift
View File

@ -6,7 +6,7 @@
// marks, or product names of Contributor, except as required to fulfill notice
// requirements defined in MIT License.
import Cocoa
import AppKit
import InputMethodKit
// 所有 IMEState 均遵守該協定：

2
Packages/vChewing_Shared/Sources/Shared/Protocols/InputSignalProtocol.swift
View File

@ -6,7 +6,7 @@
// marks, or product names of Contributor, except as required to fulfill notice
// requirements defined in MIT License.
import Cocoa
import AppKit
import CocoaExtension
extension NSEvent: InputSignalProtocol {}

2
Packages/vChewing_TooltipUI/Sources/TooltipUI/TooltipUI.swift
View File

@ -6,7 +6,7 @@
// marks, or product names of Contributor, except as required to fulfill notice
// requirements defined in MIT License.
import Cocoa
import AppKit
import CocoaExtension
import NSAttributedTextView
import Shared

2
Packages/vChewing_Uninstaller/Sources/Uninstaller/Uninstaller.swift
View File

@ -6,7 +6,7 @@
// marks, or product names of Contributor, except as required to fulfill notice
// requirements defined in MIT License.
import Cocoa
import AppKit
import CocoaExtension
public enum Uninstaller {

24
Packages/vChewing_UpdateSputnik/Sources/UpdateSputnik/UpdateSputnik.swift
View File

@ -6,7 +6,7 @@
// marks, or product names of Contributor, except as required to fulfill notice
// requirements defined in MIT License.
import Cocoa
import AppKit
public class UpdateSputnik {
public static let shared: UpdateSputnik = .init()
@ -113,7 +113,7 @@ public class UpdateSputnik {
alert.informativeText = NSLocalizedString("You are already using the latest version.", comment: "")
alert.addButton(withTitle: NSLocalizedString("OK", comment: ""))
alert.runModal()
NSApp.activate(ignoringOtherApps: true)
NSApp.popup()
return
}
@ -144,7 +144,7 @@ public class UpdateSputnik {
}
let result = alert.runModal()
NSApp.activate(ignoringOtherApps: true)
NSApp.popup()
switch result {
case .alertFirstButtonReturn:
DispatchQueue.main.async {
@ -172,6 +172,24 @@ public class UpdateSputnik {
alert.informativeText = content
alert.addButton(withTitle: NSLocalizedString("OK", comment: ""))
alert.runModal()
NSApp.popup()
}
}
// MARK: - NSApp Activation Helper
// This is to deal with changes brought by macOS 14.
private extension NSApplication {
func popup() {
#if compiler(>=5.9) && canImport(AppKit, _version: "14.0")
if #available(macOS 14.0, *) {
NSApp.activate()
} else {
NSApp.activate(ignoringOtherApps: true)
}
#else
NSApp.activate(ignoringOtherApps: true)
#endif
}
}

4
Source/Modules/AppDelegate.swift
View File

@ -130,7 +130,7 @@ public extension AppDelegate {
}
alert.addButton(withTitle: NSLocalizedString("Not Now", comment: ""))
let result = alert.runModal()
NSApp.activate(ignoringOtherApps: true)
NSApp.popup()
if result == NSApplication.ModalResponse.alertFirstButtonReturn {
NSWorkspace.shared.openFile(
LMMgr.dataFolderPath(isDefaultFolder: true), withApplication: "Finder"
@ -167,6 +167,6 @@ public extension AppDelegate {
// New About Window
@IBAction func about(_: Any) {
CtlAboutWindow.show()
NSApp.activate(ignoringOtherApps: true)
NSApp.popup()
}
}

2
Source/Modules/LMMgr_Utilities.swift
View File

@ -302,7 +302,7 @@ public extension LMMgr {
alert.informativeText = content
alert.addButton(withTitle: NSLocalizedString("OK", comment: ""))
alert.runModal()
NSApp.activate(ignoringOtherApps: true)
NSApp.popup()
}
return false
}

2
Source/Modules/SessionCtl_Core.swift
View File

@ -358,7 +358,7 @@ public extension SessionCtl {
break modeCheck
}
let result = sharedAlertForInputModeToggling.runModal()
NSApp.activate(ignoringOtherApps: true)
NSApp.popup()
if result == NSApplication.ModalResponse.alertFirstButtonReturn {
neta.activate()
}

12
Source/Modules/SessionCtl_Menu.swift
View File

@ -225,11 +225,11 @@ public extension SessionCtl {
// CtlPrefUIShared.shared.controller.window?.setPosition(vertical: .top, horizontal: .right, padding: 20)
default: CtlPrefUI.show()
}
NSApp.activate(ignoringOtherApps: true)
NSApp.popup()
return
}
CtlPrefWindow.show()
NSApp.activate(ignoringOtherApps: true)
NSApp.popup()
}
@objc func showCheatSheet(_: Any? = nil) {
@ -241,7 +241,7 @@ public extension SessionCtl {
@objc func showClientListMgr(_: Any? = nil) {
CtlClientListMgr.show()
NSApp.activate(ignoringOtherApps: true)
NSApp.popup()
}
@objc func toggleCassetteMode(_: Any? = nil) {
@ -253,7 +253,7 @@ public extension SessionCtl {
let informativeText = "Please reconfigure the cassette path to a valid one before enabling this mode."
alert.informativeText = informativeText.localized
let result = alert.runModal()
NSApp.activate(ignoringOtherApps: true)
NSApp.popup()
if result == NSApplication.ModalResponse.alertFirstButtonReturn {
LMMgr.resetCassettePath()
PrefMgr.shared.cassetteEnabled = false
@ -367,7 +367,7 @@ public extension SessionCtl {
}
@objc func selfTerminate(_: Any? = nil) {
NSApp.activate(ignoringOtherApps: true)
NSApp.popup()
NSApp.terminate(nil)
}
@ -428,6 +428,6 @@ public extension SessionCtl {
@objc func showAbout(_: Any? = nil) {
CtlAboutWindow.show()
NSApp.activate(ignoringOtherApps: true)
NSApp.popup()
}
}

2
Source/Modules/UIModules/PrefUI/CtlPrefUI.swift
View File

@ -67,7 +67,7 @@ class CtlPrefUI: NSWindowController, NSWindowDelegate {
sharedWindow.orderFrontRegardless() // 逼著視窗往最前方顯示
sharedWindow.level = .statusBar
shared.showWindow(shared)
NSApp.activate(ignoringOtherApps: true)
NSApp.popup()
}
private var currentLanguageSelectItem: NSMenuItem?

2
Source/Modules/UIModules/PrefUITabs.swift
View File

@ -6,7 +6,7 @@
// marks, or product names of Contributor, except as required to fulfill notice
// requirements defined in MIT License.
import Cocoa
import AppKit
import Shared
enum PrefUITabs: String, CaseIterable {

4
Source/Modules/WindowControllers/CtlAboutWindow.swift
View File

@ -6,7 +6,7 @@
// marks, or product names of Contributor, except as required to fulfill notice
// requirements defined in MIT License.
import Cocoa
import AppKit
class CtlAboutWindow: NSWindowController {
@IBOutlet var appVersionLabel: NSTextField!
@ -23,7 +23,7 @@ class CtlAboutWindow: NSWindowController {
sharedWindow.level = .statusBar
sharedWindow.titlebarAppearsTransparent = true
shared.showWindow(shared)
NSApp.activate(ignoringOtherApps: true)
NSApp.popup()
}
override func windowDidLoad() {

4
Source/Modules/WindowControllers/CtlClientListMgr.swift
View File

@ -6,7 +6,7 @@
// marks, or product names of Contributor, except as required to fulfill notice
// requirements defined in MIT License.
import Cocoa
import AppKit
class CtlClientListMgr: NSWindowController, NSTableViewDelegate, NSTableViewDataSource {
@IBOutlet var tblClients: NSTableView!
@ -24,7 +24,7 @@ class CtlClientListMgr: NSWindowController, NSTableViewDelegate, NSTableViewData
sharedWindow.level = .statusBar
sharedWindow.titlebarAppearsTransparent = true
shared.showWindow(shared)
NSApp.activate(ignoringOtherApps: true)
NSApp.popup()
}
override func windowDidLoad() {

2
Source/Modules/WindowControllers/CtlPrefWindow.swift
View File

@ -73,7 +73,7 @@ class CtlPrefWindow: NSWindowController, NSWindowDelegate {
sharedWindow.level = .statusBar
shared.showWindow(shared)
if resetPhraseEditor { shared.initPhraseEditor() }
NSApp.activate(ignoringOtherApps: true)
NSApp.popup()
}
private var currentLanguageSelectItem: NSMenuItem?

4
Source/Modules/WindowControllers/CtlRevLookupWindow.swift
View File

@ -6,7 +6,7 @@
// marks, or product names of Contributor, except as required to fulfill notice
// requirements defined in MIT License.
import Cocoa
import AppKit
import LangModelAssembly
class CtlRevLookupWindow: NSWindowController, NSWindowDelegate {
@ -22,7 +22,7 @@ class CtlRevLookupWindow: NSWindowController, NSWindowDelegate {
window.level = .statusBar
window.titlebarAppearsTransparent = true
shared.showWindow(shared)
NSApp.activate(ignoringOtherApps: true)
NSApp.popup()
}
}

2
Source/Modules/main.swift
View File

@ -6,7 +6,7 @@
// marks, or product names of Contributor, except as required to fulfill notice
// requirements defined in MIT License.
import Cocoa
import AppKit
import CocoaExtension
import IMKUtils
import InputMethodKit