-
-
Notifications
You must be signed in to change notification settings - Fork 293
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
13 changed files
with
333 additions
and
32 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,24 @@ | ||
| // | ||
| // Bundle+Extensions.swift | ||
| // Whisky | ||
| // | ||
| // This file is part of Whisky. | ||
| // | ||
| // Whisky is free software: you can redistribute it and/or modify it under the terms | ||
| // of the GNU General Public License as published by the Free Software Foundation, | ||
| // either version 3 of the License, or (at your option) any later version. | ||
| // | ||
| // Whisky is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; | ||
| // without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. | ||
| // See the GNU General Public License for more details. | ||
| // | ||
| // You should have received a copy of the GNU General Public License along with Whisky. | ||
| // If not, see https://www.gnu.org/licenses/. | ||
| // | ||
|
|
||
| import Foundation | ||
| extension Bundle { | ||
| static var wiskeyBundleIdentifier: String { | ||
| return "com.isaacmarovitz.Whisky" | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,72 @@ | ||
| // | ||
| // BottleBarView.swift | ||
| // Whisky | ||
| // | ||
| // This file is part of Whisky. | ||
| // | ||
| // Whisky is free software: you can redistribute it and/or modify it under the terms | ||
| // of the GNU General Public License as published by the Free Software Foundation, | ||
| // either version 3 of the License, or (at your option) any later version. | ||
| // | ||
| // Whisky is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; | ||
| // without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. | ||
| // See the GNU General Public License for more details. | ||
| // | ||
| // You should have received a copy of the GNU General Public License along with Whisky. | ||
| // If not, see https://www.gnu.org/licenses/. | ||
| // | ||
|
|
||
| import SwiftUI | ||
| import WhiskyKit | ||
|
|
||
| /// A menu for a single bottle | ||
| struct BottleBarView: View { | ||
| @ObservedObject var bottle: Bottle | ||
|
|
||
| var body: some View { | ||
| Group { | ||
| Button("button.run", systemImage: "play") { | ||
| Task { | ||
| guard let fileURL = await bottle.choseFileForRun() else { return } | ||
|
|
||
| do { | ||
| try await bottle.openFileForRun(url: fileURL) | ||
| } catch { | ||
| Bottle.logger.error("Failed to run external program: \(error)") | ||
| } | ||
| } | ||
| } | ||
|
|
||
| Section("tab.programs") { | ||
| let pinnedPrograms = bottle.programs.pinned | ||
| let unpinnedPrograms = bottle.programs.unpinned | ||
| let changeCallback: () -> Void = { | ||
| // Force a reload by re-setting the programs | ||
| bottle.programs = bottle.programs | ||
| } | ||
|
|
||
| ForEach(pinnedPrograms, id: \.url) { program in | ||
| ProgramBarView(program: program, changed: changeCallback) | ||
| } | ||
|
|
||
| Menu("menubar.morePrograms") { | ||
| ForEach(unpinnedPrograms, id: \.url) { program in | ||
| ProgramBarView(program: program, changed: changeCallback) | ||
| } | ||
| }.badge(unpinnedPrograms.count) | ||
| } | ||
| } | ||
| } | ||
| } | ||
|
|
||
| private extension Sequence where Iterator.Element == Program { | ||
| /// Filter all pinned programs | ||
| var pinned: [Program] { | ||
| return self.filter({ $0.pinned }) | ||
| } | ||
|
|
||
| /// Filter all unpinned programs | ||
| var unpinned: [Program] { | ||
| return self.filter({ !$0.pinned }) | ||
| } | ||
| } |
Oops, something went wrong.