Skip to content

Add ImageCodec #194 #198

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

Open
bqlin wants to merge 27 commits into
base: old-v0.21.1
Choose a base branch
from
+5,254 −821
Open

Add ImageCodec #194 #198

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
674b7b9
MAS
gee1k Jan 15, 2021
725f135
删除打赏、重启 Finder
gee1k Jan 16, 2021
15e9ece
修改一些信息
L1cardo Jan 16, 2021
96e67cc
Merge branch 'feature/mas' into feature/mas
L1cardo Jan 16, 2021
71be7e4
Merge pull request #169 from L1cardo/feature/mas
gee1k Jan 16, 2021
f8229e8
增加 自定义输出格式配置
L1cardo Jan 17, 2021
e9f6e80
输出格式支持自定义、上传记录图床、大小、时间
gee1k Jan 18, 2021
601e275
修正 Share 分享路径
gee1k Jan 18, 2021
cef4c05
添加磁盘访问授权
L1cardo Jan 18, 2021
ba9dba0
授权磁盘访问
gee1k Jan 19, 2021
a443774
添加欢迎界面，优化数据库页面
L1cardo Jan 20, 2021
3ff0689
接入欢迎页、改造磁盘授权逻辑
gee1k Jan 20, 2021
9ba3447
releasing v1.1.0
gee1k Jan 20, 2021
d55d5d0
添加重启 finder 的帮助
L1cardo Jan 20, 2021
cc8c139
Releasing v1.1.0 build 7
gee1k Jan 20, 2021
9b26605
增加截图权限获取教程、首次请求磁盘权限改为用户主目录
gee1k Jan 21, 2021
62111f7
修复问题
gee1k Jan 23, 2021
765fe5e
数据库界面增加新功能
L1cardo Jan 24, 2021
a48dd1f
录屏权限页面添加约束
L1cardo Jan 24, 2021
467d42a
修复 Bugs 和更新阿里云区域数据
gee1k Jan 25, 2021
be36231
更新命令行参数
gee1k Feb 18, 2021
9cbefbe
移除 Finder Toolbar
gee1k Apr 25, 2021
2f0b4b0
添加 apple script支持
L1cardo Jun 6, 2021
9fe4ab0
升级LoginServiceKit 到版本2.2.1，修复问题#180
L1cardo Jun 6, 2021
ba8d8ac
v1.2.0
gee1k Jun 7, 2021
4d548d2
Add ImageCodec #194
bqlin Jun 15, 2021
832dfe5
Remove ImageCodec meta files
bqlin Jun 15, 2021
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
12 changes: 6 additions & 6 deletions uPic.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1398,7 +1398,7 @@
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
COMBINE_HIDPI_IMAGES = YES;
CURRENT_PROJECT_VERSION = 2;
CURRENT_PROJECT_VERSION = 3;
DEVELOPMENT_TEAM = W863J6W8DZ;
ENABLE_HARDENED_RUNTIME = YES;
INFOPLIST_FILE = "$(SRCROOT)/uPic/Supporting Files/Info.plist";
Expand Down Expand Up @@ -1428,7 +1428,7 @@
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
COMBINE_HIDPI_IMAGES = YES;
CURRENT_PROJECT_VERSION = 2;
CURRENT_PROJECT_VERSION = 3;
DEVELOPMENT_TEAM = W863J6W8DZ;
ENABLE_HARDENED_RUNTIME = YES;
INFOPLIST_FILE = "$(SRCROOT)/uPic/Supporting Files/Info.plist";
Expand All @@ -1454,7 +1454,7 @@
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
COMBINE_HIDPI_IMAGES = YES;
CURRENT_PROJECT_VERSION = 2;
CURRENT_PROJECT_VERSION = 3;
DEVELOPMENT_TEAM = W863J6W8DZ;
ENABLE_HARDENED_RUNTIME = YES;
INFOPLIST_FILE = uPicFinderExtension/Info.plist;
Expand All @@ -1481,7 +1481,7 @@
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
COMBINE_HIDPI_IMAGES = YES;
CURRENT_PROJECT_VERSION = 2;
CURRENT_PROJECT_VERSION = 3;
DEVELOPMENT_TEAM = W863J6W8DZ;
ENABLE_HARDENED_RUNTIME = YES;
INFOPLIST_FILE = uPicFinderExtension/Info.plist;
Expand All @@ -1507,7 +1507,7 @@
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
COMBINE_HIDPI_IMAGES = YES;
CURRENT_PROJECT_VERSION = 2;
CURRENT_PROJECT_VERSION = 3;
DEVELOPMENT_TEAM = W863J6W8DZ;
ENABLE_HARDENED_RUNTIME = YES;
INFOPLIST_FILE = uPicShareExtension/Info.plist;
Expand All @@ -1533,7 +1533,7 @@
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
COMBINE_HIDPI_IMAGES = YES;
CURRENT_PROJECT_VERSION = 2;
CURRENT_PROJECT_VERSION = 3;
DEVELOPMENT_TEAM = W863J6W8DZ;
ENABLE_HARDENED_RUNTIME = YES;
INFOPLIST_FILE = uPicShareExtension/Info.plist;
Expand Down
19 changes: 0 additions & 19 deletions uPic/AppDelegate.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -517,25 +517,6 @@ extension AppDelegate: NSWindowDelegate, NSDraggingDestination {

}

extension AppDelegate {
// sponsor

func sponsorByPaypal() {
guard let url = URL(string: "https://paypal.me/geeee1k") else { return }
NSWorkspace.shared.open(url)
}

func sponsorByAlipay() {
guard let url = URL(string: "https://raw.githubusercontent.com/gee1k/oss/master/qrcode/alipay.JPG") else { return }
NSWorkspace.shared.open(url)
}

func sponsorByWechatPay() {
guard let url = URL(string: "https://raw.githubusercontent.com/gee1k/oss/master/qrcode/wechat_pay.JPG") else { return }
NSWorkspace.shared.open(url)
}
}

// MARK: - Global shortcut
extension AppDelegate {

Expand Down
6 changes: 0 additions & 6 deletions uPic/Supporting Files/Info.plist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,12 +50,6 @@
<string>Main</string>
<key>NSPrincipalClass</key>
<string>NSApplication</string>
<key>SUEnableAutomaticChecks</key>
<true/>
<key>SUFeedURL</key>
<string>https://gee1k.github.io/uPic/appcast.xml</string>
<key>SUPublicEDKey</key>
<string>vUMkY2STUDaVpL98q1m9zE3VugD/sdejNO4MPo1hu5Y=</string>
<key>TeamIdentifierPrefix</key>
<string>$(TeamIdentifierPrefix)</string>
</dict>
Expand Down
12 changes: 0 additions & 12 deletions uPic/Views/PreferencesWindow/AboutPreferencesViewController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,18 +54,6 @@ class AboutPreferencesViewController: PreferencesViewController {
NSWorkspace.shared.open(url)
}

@IBAction func paypalButtonClicked(_ sender: NSButton) {
(NSApplication.shared.delegate as? AppDelegate)?.sponsorByPaypal()
}

@IBAction func alipayButtonClicked(_ sender: NSButton) {
(NSApplication.shared.delegate as? AppDelegate)?.sponsorByAlipay()
}

@IBAction func weChatPayButtonClicked(_ sender: NSButton) {
(NSApplication.shared.delegate as? AppDelegate)?.sponsorByWechatPay()
}

}

class LinkButton: NSButton {
Expand Down
6 changes: 0 additions & 6 deletions uPic/Views/PreferencesWindow/AdvancedPreferencesViewController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,12 +88,6 @@ class AdvancedPreferencesViewController: PreferencesViewController {
FinderUtil.setIcon(sender.indexOfSelectedItem)
}

@IBAction func didClickRestartFinder(_ sender: NSButton) {
let killFinderScript = #"do shell script "killall Finder""#
let script = NSAppleScript(source: killFinderScript)
script!.executeAndReturnError(nil)
}

@IBAction func resetPreferencesButtonClicked(_ sender: NSButton) {
let alert = NSAlert()

Expand Down
122 changes: 25 additions & 97 deletions uPic/Views/PreferencesWindow/Base.lproj/Preferences.storyboard
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions uPic/Views/PreferencesWindow/en.lproj/Preferences.strings
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
/* Class = "NSButtonCell"; title = "svend.cc"; ObjectID = "0dV-As-mmQ"; */
"0dV-As-mmQ.title" = "svend.cc";

/* Class = "NSTextFieldCell"; title = "may require a"; ObjectID = "2Rg-te-FPU"; */
"2Rg-te-FPU.title" = "may require a";
/* Class = "NSTextFieldCell"; title = "may require a Finder Restart"; ObjectID = "2Rg-te-FPU"; */
"2Rg-te-FPU.title" = "may require a Finder Restart";

/* Class = "NSButtonCell"; title = "Paypal"; ObjectID = "59m-hG-lVw"; */
"59m-hG-lVw.title" = "Paypal";
Expand Down
2 changes: 1 addition & 1 deletion uPic/Views/PreferencesWindow/zh-Hans.lproj/Preferences.strings
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"0dV-As-mmQ.title" = "svend.cc";

/* Class = "NSTextFieldCell"; title = "may require a"; ObjectID = "2Rg-te-FPU"; */
"2Rg-te-FPU.title" = "可能需要";
"2Rg-te-FPU.title" = "可能需要重启访达";

/* Class = "NSButtonCell"; title = "Paypal"; ObjectID = "59m-hG-lVw"; */
"59m-hG-lVw.title" = "Paypal";
Expand Down
2 changes: 1 addition & 1 deletion uPic/Views/PreferencesWindow/zh-Hant.lproj/Preferences.strings
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"0dV-As-mmQ.title" = "svend.cc";

/* Class = "NSTextFieldCell"; title = "may require a"; ObjectID = "2Rg-te-FPU"; */
"2Rg-te-FPU.title" = "可能需要";
"2Rg-te-FPU.title" = "可能需要重启访达";

/* Class = "NSButtonCell"; title = "Paypal"; ObjectID = "59m-hG-lVw"; */
"59m-hG-lVw.title" = "PayPal";
Expand Down