From 6e381725804c3458fa4332f053ccf71f8ebdd839 Mon Sep 17 00:00:00 2001 From: Erik Doernenburg Date: Mon, 7 Aug 2023 21:21:13 +0200 Subject: [PATCH] Preparation for pre-release 1. --- CCMenu.xcodeproj/project.pbxproj | 2 +- CCMenu/Resources/Info.plist | 4 ++-- CCMenu/Source/Pipeline Window/EditPipelineSheet.swift | 2 +- .../GithubAuthController.swift | 2 +- CCMenu/Source/Server Monitor/ServerMonitor.swift | 2 +- README.md | 6 ++++-- 6 files changed, 10 insertions(+), 8 deletions(-) rename CCMenu/Source/{Server Monitor => Pipeline Window}/GithubAuthController.swift (99%) diff --git a/CCMenu.xcodeproj/project.pbxproj b/CCMenu.xcodeproj/project.pbxproj index ec798c7..913db94 100644 --- a/CCMenu.xcodeproj/project.pbxproj +++ b/CCMenu.xcodeproj/project.pbxproj @@ -289,6 +289,7 @@ 03F6830A25C743F2005D56D9 /* PipelineListToolbar.swift */, 0336DBAB29848FE200E5811C /* AddCCTrayPipeline.swift */, 0336DBAD2984903A00E5811C /* AddGithubPipeline.swift */, + 032FE8E32A654D96003244D7 /* GithubAuthController.swift */, 03F682FC25C73584005D56D9 /* EditPipelineSheet.swift */, ); path = "Pipeline Window"; @@ -335,7 +336,6 @@ 03CC11F1265467C200130833 /* CCTrayResponseParser.swift */, 03D4BB02265EE5840023F4CB /* GithubFeedReader.swift */, 03D4BB04265EE6B50023F4CB /* GithubResponseParser.swift */, - 032FE8E32A654D96003244D7 /* GithubAuthController.swift */, ); path = "Server Monitor"; sourceTree = ""; diff --git a/CCMenu/Resources/Info.plist b/CCMenu/Resources/Info.plist index 3ec0a79..2be6696 100644 --- a/CCMenu/Resources/Info.plist +++ b/CCMenu/Resources/Info.plist @@ -19,7 +19,7 @@ CFBundlePackageType $(PRODUCT_BUNDLE_PACKAGE_TYPE) CFBundleShortVersionString - 20 + 20.0 CFBundleURLTypes @@ -34,7 +34,7 @@ CFBundleVersion - 2200.2 + 2200.3 LSApplicationCategoryType public.app-category.developer-tools LSMinimumSystemVersion diff --git a/CCMenu/Source/Pipeline Window/EditPipelineSheet.swift b/CCMenu/Source/Pipeline Window/EditPipelineSheet.swift index 05f3c44..d034fbe 100644 --- a/CCMenu/Source/Pipeline Window/EditPipelineSheet.swift +++ b/CCMenu/Source/Pipeline Window/EditPipelineSheet.swift @@ -23,7 +23,7 @@ struct EditPipelineSheet: View { VStack { Text("Edit Pipeline") .font(.headline) - Text("\(pipeline.name)") + Text("missing") HStack { Button("Cancel") { presentation.dismiss() diff --git a/CCMenu/Source/Server Monitor/GithubAuthController.swift b/CCMenu/Source/Pipeline Window/GithubAuthController.swift similarity index 99% rename from CCMenu/Source/Server Monitor/GithubAuthController.swift rename to CCMenu/Source/Pipeline Window/GithubAuthController.swift index d72db3b..8bea6cf 100644 --- a/CCMenu/Source/Server Monitor/GithubAuthController.swift +++ b/CCMenu/Source/Pipeline Window/GithubAuthController.swift @@ -86,7 +86,7 @@ class GithubAuthController: ObservableObject { } let alert = NSAlert() - alert.messageText = "Github sign in" + alert.messageText = "GitHub sign in" alert.informativeText = "CCMenu will open a page on GitHub. Please copy the code below. You will have to enter it on the web page.\n\n" + userCode + "\n\nWhen you return to CCMenu please wait until a token has arrived." alert.alertStyle = .informational alert.addButton(withTitle: "Continue") diff --git a/CCMenu/Source/Server Monitor/ServerMonitor.swift b/CCMenu/Source/Server Monitor/ServerMonitor.swift index 9b202c7..a4e8f42 100644 --- a/CCMenu/Source/Server Monitor/ServerMonitor.swift +++ b/CCMenu/Source/Server Monitor/ServerMonitor.swift @@ -17,7 +17,7 @@ class ServerMonitor: FeedReaderDelegate { public func start() { Timer.scheduledTimer(withTimeInterval: 0.1, repeats: false, block: pollServers) - Timer.scheduledTimer(withTimeInterval: 15, repeats: true, block: pollServers) + Timer.scheduledTimer(withTimeInterval: 10, repeats: true, block: pollServers) } func pollServers(t: Timer) { diff --git a/README.md b/README.md index c553388..abb1be8 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,8 @@ # CCMenu 2 -This is work-in-progress of a complete rewrite of [CCMenu](https://github.com/erikdoe/ccmenu) in Swift/SwiftUI. It is not usable at this stage. +This is a complete rewrite of [CCMenu](https://github.com/erikdoe/ccmenu). + +There will be a number of pre-releases via Github before it replaces the old version in the AppStore. Significant known issues are filed as bugs. @@ -9,7 +11,7 @@ For now the roadmap is tracked in this readme file. ## Roadmap -### Pre-release 1 +### Version 20.0 (CCMenu2 pre-release 1) - [X] Monitor hard-coded pipelines - [X] Read legacy config