Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

状态栏菜单增加截图 app 提示 #254

Merged
merged 2 commits into from
Jan 12, 2025
Merged

状态栏菜单增加截图 app 提示 #254

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7c10d1e
状态栏菜单增加截图 app 提示
L1cardo Dec 21, 2024
0d92310
更新本地化
L1cardo Dec 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Podfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,6 @@ SPEC REPOS:
SPEC CHECKSUMS:
libminipng: a44c35d06b9d54d6640acdf97f4500c034748abb

PODFILE CHECKSUM: 3fdc9b353dcff4aacfa727423bd0bcbed76611cb
PODFILE CHECKSUM: 0c061de81b5e0bec78090b615b2e21324191bdcc

COCOAPODS: 1.15.2
COCOAPODS: 1.16.2
26 changes: 13 additions & 13 deletions uPic.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -987,7 +987,7 @@
attributes = {
BuildIndependentTargetsInParallel = YES;
LastSwiftUpdateCheck = 1230;
LastUpgradeCheck = 1600;
LastUpgradeCheck = 1620;
ORGANIZATIONNAME = "Svend Jin";
TargetAttributes = {
16A6DC5322AA375700813706 = {
Expand Down Expand Up @@ -1574,12 +1574,12 @@
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_ENTITLEMENTS = "uPic/Supporting Files/uPicDebug.entitlements";
CODE_SIGN_IDENTITY = "Apple Development";
"CODE_SIGN_IDENTITY[sdk=macosx*]" = "Apple Development";
"CODE_SIGN_IDENTITY[sdk=macosx*]" = "-";
CODE_SIGN_STYLE = Automatic;
COMBINE_HIDPI_IMAGES = YES;
CURRENT_PROJECT_VERSION = 26;
DEAD_CODE_STRIPPING = YES;
DEVELOPMENT_TEAM = W863J6W8DZ;
DEVELOPMENT_TEAM = "";
ENABLE_HARDENED_RUNTIME = YES;
ENABLE_USER_SCRIPT_SANDBOXING = NO;
INFOPLIST_FILE = "$(SRCROOT)/uPic/Supporting Files/Info.plist";
Expand Down Expand Up @@ -1608,12 +1608,12 @@
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_ENTITLEMENTS = "uPic/Supporting Files/uPic.entitlements";
CODE_SIGN_IDENTITY = "Apple Development";
"CODE_SIGN_IDENTITY[sdk=macosx*]" = "Apple Development";
"CODE_SIGN_IDENTITY[sdk=macosx*]" = "-";
CODE_SIGN_STYLE = Automatic;
COMBINE_HIDPI_IMAGES = YES;
CURRENT_PROJECT_VERSION = 26;
DEAD_CODE_STRIPPING = YES;
DEVELOPMENT_TEAM = W863J6W8DZ;
DEVELOPMENT_TEAM = "";
ENABLE_HARDENED_RUNTIME = YES;
ENABLE_USER_SCRIPT_SANDBOXING = NO;
INFOPLIST_FILE = "$(SRCROOT)/uPic/Supporting Files/Info.plist";
Expand All @@ -1638,12 +1638,12 @@
APPLICATION_EXTENSION_API_ONLY = YES;
CODE_SIGN_ENTITLEMENTS = uPicFinderExtension/uPicFinderExtensionDebug.entitlements;
CODE_SIGN_IDENTITY = "Apple Development";
"CODE_SIGN_IDENTITY[sdk=macosx*]" = "Apple Development";
"CODE_SIGN_IDENTITY[sdk=macosx*]" = "-";
CODE_SIGN_STYLE = Automatic;
COMBINE_HIDPI_IMAGES = YES;
CURRENT_PROJECT_VERSION = 26;
DEAD_CODE_STRIPPING = YES;
DEVELOPMENT_TEAM = W863J6W8DZ;
DEVELOPMENT_TEAM = "";
ENABLE_HARDENED_RUNTIME = YES;
INFOPLIST_FILE = uPicFinderExtension/Info.plist;
LD_RUNPATH_SEARCH_PATHS = (
Expand All @@ -1667,12 +1667,12 @@
APPLICATION_EXTENSION_API_ONLY = YES;
CODE_SIGN_ENTITLEMENTS = uPicFinderExtension/uPicFinderExtension.entitlements;
CODE_SIGN_IDENTITY = "Apple Development";
"CODE_SIGN_IDENTITY[sdk=macosx*]" = "Apple Development";
"CODE_SIGN_IDENTITY[sdk=macosx*]" = "-";
CODE_SIGN_STYLE = Automatic;
COMBINE_HIDPI_IMAGES = YES;
CURRENT_PROJECT_VERSION = 26;
DEAD_CODE_STRIPPING = YES;
DEVELOPMENT_TEAM = W863J6W8DZ;
DEVELOPMENT_TEAM = "";
ENABLE_HARDENED_RUNTIME = YES;
INFOPLIST_FILE = uPicFinderExtension/Info.plist;
LD_RUNPATH_SEARCH_PATHS = (
Expand All @@ -1695,12 +1695,12 @@
buildSettings = {
CODE_SIGN_ENTITLEMENTS = uPicShareExtension/uPicShareExtensionDebug.entitlements;
CODE_SIGN_IDENTITY = "Apple Development";
"CODE_SIGN_IDENTITY[sdk=macosx*]" = "Apple Development";
"CODE_SIGN_IDENTITY[sdk=macosx*]" = "-";
CODE_SIGN_STYLE = Automatic;
COMBINE_HIDPI_IMAGES = YES;
CURRENT_PROJECT_VERSION = 26;
DEAD_CODE_STRIPPING = YES;
DEVELOPMENT_TEAM = W863J6W8DZ;
DEVELOPMENT_TEAM = "";
ENABLE_HARDENED_RUNTIME = YES;
INFOPLIST_FILE = uPicShareExtension/Info.plist;
LD_RUNPATH_SEARCH_PATHS = (
Expand All @@ -1723,12 +1723,12 @@
buildSettings = {
CODE_SIGN_ENTITLEMENTS = uPicShareExtension/uPicShareExtension.entitlements;
CODE_SIGN_IDENTITY = "Apple Development";
"CODE_SIGN_IDENTITY[sdk=macosx*]" = "Apple Development";
"CODE_SIGN_IDENTITY[sdk=macosx*]" = "-";
CODE_SIGN_STYLE = Automatic;
COMBINE_HIDPI_IMAGES = YES;
CURRENT_PROJECT_VERSION = 26;
DEAD_CODE_STRIPPING = YES;
DEVELOPMENT_TEAM = W863J6W8DZ;
DEVELOPMENT_TEAM = "";
ENABLE_HARDENED_RUNTIME = YES;
INFOPLIST_FILE = uPicShareExtension/Info.plist;
LD_RUNPATH_SEARCH_PATHS = (
Expand Down
2 changes: 1 addition & 1 deletion uPic.xcodeproj/xcshareddata/xcschemes/uPic.xcscheme
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1600"
LastUpgradeVersion = "1620"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand Down
4 changes: 2 additions & 2 deletions uPic/AppDelegate.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -338,7 +338,7 @@ extension AppDelegate {
return
}

if ScreenUtil.getScreenshotApp() == 0 {
if ScreenUtil.getScreenshotApp() == .system {
Logger.shared.info("使用 macOS 自带截图工具截图")

// 截图权限检测
Expand Down Expand Up @@ -371,7 +371,7 @@ extension AppDelegate {
self.uploadFiles([imgData!])
}

} else {
} else if ScreenUtil.getScreenshotApp() == .longshot {
Logger.shared.info("使用 Longshot 截图")
guard let url = URL(string: "longshot://x-callback-url/snip?func=start&channel=clipboard&type=data&x-source=uPic&x-success=uPic://x-callback-url/acceptSnip?x-source=longshot&x-error=uPic://x-callback-url/snipError?x-source=longshot&errorMessage=message") else {
return
Expand Down
4 changes: 2 additions & 2 deletions uPic/Base.lproj/Main.storyboard
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.Cocoa.Storyboard.XIB" version="3.0" toolsVersion="23094" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
<document type="com.apple.InterfaceBuilder3.Cocoa.Storyboard.XIB" version="3.0" toolsVersion="23504" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
<dependencies>
<deployment identifier="macosx"/>
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="23094"/>
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="23504"/>
</dependencies>
<scenes>
<!--Application-->
Expand Down
13 changes: 13 additions & 0 deletions uPic/StatusMenuController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ class StatusMenuController: NSObject, NSMenuDelegate {

(NSApplication.shared.delegate as? AppDelegate)?.unbindShortcuts()

refreshUploadFromScreenshotMenuItemTitle()
refreshOutputFormat()
refreshOutputFormatEncoded()
resetCompressFactor()
Expand Down Expand Up @@ -242,6 +243,18 @@ class StatusMenuController: NSObject, NSMenuDelegate {
NotificationExt.shared.postCopySuccessfulNotice(outputUrl)
}

func refreshUploadFromScreenshotMenuItemTitle() {
var title = "Upload from screenshot".localized
switch ScreenUtil.getScreenshotApp() {
case .system:
title += " (System)".localized
case .longshot:
title += " (Longshot)".localized
}

uploadFromScreenshotMenuItem.title = title
}

// refresh current host to select
func refreshDefaultHost() {
let defaultHostId = Defaults[.defaultHostId]
Expand Down
17 changes: 11 additions & 6 deletions uPic/Utils/ScreenUtil.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,21 +57,26 @@ class ScreenUtil {

static func resetScreenshotApp() {
let defaults = UserDefaults.init(suiteName: groupName)
defaults?.set(0, forKey: "uPic_ScreenshotApp")
defaults?.set(ScreenshotApp.system.rawValue, forKey: "uPic_ScreenshotApp")
defaults?.synchronize()
}

static func getScreenshotApp() -> Int {
static func getScreenshotApp() -> ScreenshotApp {
let defaults = UserDefaults.init(suiteName: groupName)
guard let screenshotApp = defaults?.value(forKey: "uPic_ScreenshotApp") else {
return 0
return .system
}
return screenshotApp as! Int
return ScreenshotApp(rawValue: screenshotApp as! Int)!
}

static func setScreenshotApp(_ value: Int) {
static func setScreenshotApp(_ value: ScreenshotApp) {
let defaults = UserDefaults.init(suiteName: groupName)
defaults?.set(value, forKey: "uPic_ScreenshotApp")
defaults?.set(value.rawValue, forKey: "uPic_ScreenshotApp")
defaults?.synchronize()
}
}

enum ScreenshotApp: Int {
case system = 0
case longshot = 1
}
4 changes: 2 additions & 2 deletions uPic/Views/PreferencesWindow/AdvancedPreferencesViewController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ class AdvancedPreferencesViewController: PreferencesViewController {
}

func setScreenshotAppDefaultValue() {
screenshotAppOption.selectItem(at: ScreenUtil.getScreenshotApp())
screenshotAppOption.selectItem(at: ScreenUtil.getScreenshotApp().rawValue)
}

func setFinderExtensionIconDefaultValue() {
Expand Down Expand Up @@ -101,7 +101,7 @@ class AdvancedPreferencesViewController: PreferencesViewController {
}

@IBAction func didChangeScreenshotApp(_ sender: NSPopUpButton) {
ScreenUtil.setScreenshotApp(sender.indexOfSelectedItem)
ScreenUtil.setScreenshotApp(ScreenshotApp(rawValue: sender.indexOfSelectedItem) ?? .system)
}

@IBAction func didChangeFinderExtensionIcon(_ sender: NSPopUpButton) {
Expand Down
Loading