Skip to content

Commit 7096215

Browse files
gee1kgee1k
committed
Merge branch 'release/0.21.1'
2 parents d33e3de + c2bea61 commit 7096215

File tree

5 files changed

+15
-31
lines changed

5 files changed

+15
-31
lines changed

‎uPic.xcodeproj/project.pbxproj‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1249,7 +1249,7 @@
12491249
CODE_SIGN_IDENTITY = "Apple Development";
12501250
CODE_SIGN_STYLE = Automatic;
12511251
COMBINE_HIDPI_IMAGES = YES;
1252-
CURRENT_PROJECT_VERSION = 20201114;
1252+
CURRENT_PROJECT_VERSION = 20201211;
12531253
DEVELOPMENT_TEAM = W863J6W8DZ;
12541254
ENABLE_HARDENED_RUNTIME = YES;
12551255
INFOPLIST_FILE = "$(SRCROOT)/uPic/Supporting Files/Info.plist";
@@ -1258,7 +1258,7 @@
12581258
"@executable_path/../Frameworks",
12591259
);
12601260
MACOSX_DEPLOYMENT_TARGET = 10.12;
1261-
MARKETING_VERSION = 0.21.0;
1261+
MARKETING_VERSION = 0.21.1;
12621262
PRODUCT_BUNDLE_IDENTIFIER = com.svend.uPic;
12631263
PRODUCT_NAME = "$(TARGET_NAME)";
12641264
PROVISIONING_PROFILE_SPECIFIER = "";
@@ -1279,7 +1279,7 @@
12791279
CODE_SIGN_IDENTITY = "Apple Development";
12801280
CODE_SIGN_STYLE = Automatic;
12811281
COMBINE_HIDPI_IMAGES = YES;
1282-
CURRENT_PROJECT_VERSION = 20201114;
1282+
CURRENT_PROJECT_VERSION = 20201211;
12831283
DEVELOPMENT_TEAM = W863J6W8DZ;
12841284
ENABLE_HARDENED_RUNTIME = YES;
12851285
INFOPLIST_FILE = "$(SRCROOT)/uPic/Supporting Files/Info.plist";
@@ -1288,7 +1288,7 @@
12881288
"@executable_path/../Frameworks",
12891289
);
12901290
MACOSX_DEPLOYMENT_TARGET = 10.12;
1291-
MARKETING_VERSION = 0.21.0;
1291+
MARKETING_VERSION = 0.21.1;
12921292
PRODUCT_BUNDLE_IDENTIFIER = com.svend.uPic;
12931293
PRODUCT_NAME = "$(TARGET_NAME)";
12941294
PROVISIONING_PROFILE_SPECIFIER = "";
@@ -1305,7 +1305,7 @@
13051305
CODE_SIGN_IDENTITY = "Apple Development";
13061306
CODE_SIGN_STYLE = Automatic;
13071307
COMBINE_HIDPI_IMAGES = YES;
1308-
CURRENT_PROJECT_VERSION = 20201114;
1308+
CURRENT_PROJECT_VERSION = 20201211;
13091309
DEVELOPMENT_TEAM = W863J6W8DZ;
13101310
ENABLE_HARDENED_RUNTIME = YES;
13111311
INFOPLIST_FILE = uPicFinderExtension/Info.plist;
@@ -1315,7 +1315,7 @@
13151315
"@executable_path/../../../../Frameworks",
13161316
);
13171317
MACOSX_DEPLOYMENT_TARGET = 10.12;
1318-
MARKETING_VERSION = 0.21.0;
1318+
MARKETING_VERSION = 0.21.1;
13191319
PRODUCT_BUNDLE_IDENTIFIER = com.svend.uPic.uPicFinderExtension;
13201320
PRODUCT_NAME = "$(TARGET_NAME)";
13211321
PROVISIONING_PROFILE_SPECIFIER = "";
@@ -1332,7 +1332,7 @@
13321332
CODE_SIGN_IDENTITY = "Apple Development";
13331333
CODE_SIGN_STYLE = Automatic;
13341334
COMBINE_HIDPI_IMAGES = YES;
1335-
CURRENT_PROJECT_VERSION = 20201114;
1335+
CURRENT_PROJECT_VERSION = 20201211;
13361336
DEVELOPMENT_TEAM = W863J6W8DZ;
13371337
ENABLE_HARDENED_RUNTIME = YES;
13381338
INFOPLIST_FILE = uPicFinderExtension/Info.plist;
@@ -1342,7 +1342,7 @@
13421342
"@executable_path/../../../../Frameworks",
13431343
);
13441344
MACOSX_DEPLOYMENT_TARGET = 10.12;
1345-
MARKETING_VERSION = 0.21.0;
1345+
MARKETING_VERSION = 0.21.1;
13461346
PRODUCT_BUNDLE_IDENTIFIER = com.svend.uPic.uPicFinderExtension;
13471347
PRODUCT_NAME = "$(TARGET_NAME)";
13481348
PROVISIONING_PROFILE_SPECIFIER = "";

‎uPic.xcodeproj/xcshareddata/xcschemes/uPic.xcscheme‎

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -59,23 +59,6 @@
5959
ReferencedContainer = "container:uPic.xcodeproj">
6060
</BuildableReference>
6161
</BuildableProductRunnable>
62-
<CommandLineArguments>
63-
<CommandLineArgument
64-
argument = "-u"
65-
isEnabled = "YES">
66-
</CommandLineArgument>
67-
<CommandLineArgument
68-
argument = "http://qiniu.svend.cc/test/image-20200410130539430.png"
69-
isEnabled = "YES">
70-
</CommandLineArgument>
71-
</CommandLineArguments>
72-
<EnvironmentVariables>
73-
<EnvironmentVariable
74-
key = "CG_PDF_VERBOSE"
75-
value = "1"
76-
isEnabled = "YES">
77-
</EnvironmentVariable>
78-
</EnvironmentVariables>
7962
</LaunchAction>
8063
<ProfileAction
8164
buildConfiguration = "Release"

‎uPic/AppDelegate.swift‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -117,6 +117,7 @@ extension AppDelegate {
117117
width: 16,
118118
height: 16)
119119
button.addSubview(indicator)
120+
indicator.controlTint = .blueControlTint
120121
}
121122
// 初始化任务栏进度图标
122123
indicator.minValue = 0.0

‎uPic/PreferencesWindow/Base.lproj/Preferences.storyboard‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -553,7 +553,7 @@
553553
</textFieldCell>
554554
</textField>
555555
<stackView distribution="fill" orientation="horizontal" alignment="centerY" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="hpV-OT-Zx9">
556-
<rect key="frame" x="20" y="100" width="134" height="20"/>
556+
<rect key="frame" x="20" y="100" width="128" height="20"/>
557557
<subviews>
558558
<textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="zSd-NZ-L7B">
559559
<rect key="frame" x="-2" y="2" width="34" height="16"/>
@@ -564,7 +564,7 @@
564564
</textFieldCell>
565565
</textField>
566566
<popUpButton verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="pHb-90-42w">
567-
<rect key="frame" x="35" y="-4" width="103" height="25"/>
567+
<rect key="frame" x="35" y="-4" width="97" height="25"/>
568568
<popUpButtonCell key="cell" type="push" title="Single" bezelStyle="rounded" alignment="left" lineBreakMode="truncatingTail" state="on" borderStyle="borderAndBezel" tag="1" imageScaling="proportionallyDown" inset="2" selectedItem="dGv-rY-F7Z" id="ETf-eR-mih">
569569
<behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
570570
<font key="font" metaFont="menu"/>
@@ -1484,10 +1484,10 @@ Gw
14841484
<image name="NSPreferencesGeneral" width="32" height="32"/>
14851485
<image name="NSRemoveTemplate" width="14" height="4"/>
14861486
<image name="about" width="512" height="513"/>
1487-
<image name="color" width="22" height="22"/>
1487+
<image name="color" width="16" height="16"/>
14881488
<image name="downloadOnAppStore" width="120" height="40"/>
14891489
<image name="host" width="64" height="64"/>
1490-
<image name="single" width="22" height="22"/>
1490+
<image name="single" width="16" height="16"/>
14911491
<image name="uPicForiOS" width="64" height="64"/>
14921492
</resources>
14931493
</document>

‎uPic/Views/HistoryRecord/HistoryThumbnailView.swift‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,10 +85,10 @@ class HistoryThumbnailView: NSView {
8585
center.addObserver(self, selector: #selector(boundsDidChangeNotification(notification:)), name: NSView.boundsDidChangeNotification, object: mainScrollView.contentView)
8686

8787
clearHistoryButton = NSButton(image: NSImage(named: "cleanButton")!, target: self, action: #selector(clearHistory))
88-
clearHistoryButton.appearance = NSAppearance(named: NSAppearance.Name.aqua)
88+
8989
clearHistoryButton.bezelStyle = .smallSquare
90+
clearHistoryButton.isBordered = false
9091
clearHistoryButton.toolTip = "\("Clear history record".localized) \(historyList.count)"
91-
clearHistoryButton.isTransparent = true
9292
addSubview(clearHistoryButton)
9393

9494
preImageViewController = HistoryPreviewViewController()

0 commit comments

Comments
 (0)