FreshRSS
/
NetNewsWire
mirror of https://github.com/Ranchero-Software/NetNewsWire.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2149 from stuartbreckenridge/swiftui 

KeyCommands
This commit is contained in:
Maurice Parker 2020-06-29 07:42:55 -05:00 committed by GitHub
parent be39448e01 2e6e934b6f
commit dc9d4d8235
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 99 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

97
Multiplatform/Shared/MainApp.swift
View File

@ -20,19 +20,108 @@ struct MainApp: App {
@StateObject private var sceneModel = SceneModel() @StateObject private var sceneModel = SceneModel()
var body: some Scene { @SceneBuilder var body: some Scene {
WindowGroup {
#if os(macOS) #if os(macOS)
WindowGroup {
SceneNavigationView() SceneNavigationView()
.frame(minWidth: 600, idealWidth: 1000, maxWidth: .infinity, minHeight: 600, idealHeight: 700, maxHeight: .infinity) .frame(minWidth: 600, idealWidth: 1000, maxWidth: .infinity, minHeight: 600, idealHeight: 700, maxHeight: .infinity)
.environmentObject(sceneModel) .environmentObject(sceneModel)
}
.commands {
CommandGroup(after: .newItem, addition: {
Button("New Feed", action: {})
.keyboardShortcut("N")
Button("New Folder", action: {})
.keyboardShortcut("N", modifiers: [.shift, .command])
Button("Refresh", action: {})
.keyboardShortcut("R")
})
CommandGroup(before: .sidebar, addition: {
Button("Show Sidebar", action: {})
.keyboardShortcut("S", modifiers: [.control, .command])
})
CommandMenu("Subscriptions", content: {
Button("Import Subscriptions", action: {})
.keyboardShortcut("I", modifiers: [.shift, .command])
Button("Import NNW 3 Subscriptions", action: {})
.keyboardShortcut("O", modifiers: [.shift, .command])
Button("Export Subscriptions", action: {})
.keyboardShortcut("E", modifiers: [.shift, .command])
})
CommandMenu("Go", content: {
Button("Next Unread", action: {})
.keyboardShortcut("/", modifiers: [.command])
Button("Today", action: {})
.keyboardShortcut("1", modifiers: [.command])
Button("All Unread", action: {})
.keyboardShortcut("2", modifiers: [.command])
Button("Starred", action: {})
.keyboardShortcut("3", modifiers: [.command])
})
CommandMenu("Article", content: {
Button("Mark as Read", action: {})
.keyboardShortcut("U", modifiers: [.shift, .command])
Button("Mark All as Read", action: {})
.keyboardShortcut("K", modifiers: [.command])
Button("Mark Older as Read", action: {})
.keyboardShortcut("K", modifiers: [.shift, .command])
Button("Mark as Starred", action: {})
.keyboardShortcut("L", modifiers: [.shift, .command])
Button("Open in Browser", action: {})
.keyboardShortcut(.rightArrow, modifiers: [.command])
})
}
.windowToolbarStyle(UnifiedWindowToolbarStyle())
#endif #endif
#if os(iOS) #if os(iOS)
WindowGroup {
SceneNavigationView() SceneNavigationView()
.environmentObject(sceneModel) .environmentObject(sceneModel)
}.commands {
CommandGroup(after: .newItem, addition: {
Button("New Feed", action: {})
.keyboardShortcut("N")
Button("New Folder", action: {})
.keyboardShortcut("N", modifiers: [.shift, .command])
Button("Refresh", action: {})
.keyboardShortcut("R")
})
CommandGroup(before: .sidebar, addition: {
Button("Show Sidebar", action: {})
.keyboardShortcut("S", modifiers: [.control, .command])
})
CommandMenu("Subscriptions", content: {
Button("Import Subscriptions", action: {})
.keyboardShortcut("I", modifiers: [.shift, .command])
Button("Import NNW 3 Subscriptions", action: {})
.keyboardShortcut("O", modifiers: [.shift, .command])
Button("Export Subscriptions", action: {})
.keyboardShortcut("E", modifiers: [.shift, .command])
})
CommandMenu("Go", content: {
Button("Next Unread", action: {})
.keyboardShortcut("/", modifiers: [.command])
Button("Today", action: {})
.keyboardShortcut("1", modifiers: [.command])
Button("All Unread", action: {})
.keyboardShortcut("2", modifiers: [.command])
Button("Starred", action: {})
.keyboardShortcut("3", modifiers: [.command])
})
CommandMenu("Article", content: {
Button("Mark as Read", action: {})
.keyboardShortcut("U", modifiers: [.shift, .command])
Button("Mark All as Read", action: {})
.keyboardShortcut("K", modifiers: [.command])
Button("Mark Older as Read", action: {})
.keyboardShortcut("K", modifiers: [.shift, .command])
Button("Mark as Starred", action: {})
.keyboardShortcut("L", modifiers: [.shift, .command])
Button("Open in Browser", action: {})
.keyboardShortcut(.rightArrow, modifiers: [.command])
})
}
#endif #endif
} }
} }
}