Skip to content

Commit

Permalink
Merge pull request #55 from L1cardo/develop
Browse files Browse the repository at this point in the history 
add history record configuration reset button
  • Loading branch information
@gee1k
gee1k authored Nov 27, 2019
2 parents c006577 + 6a16aa2 commit 9dad5f8
Show file tree
Hide file tree
Showing 14 changed files with 106 additions and 63 deletions.
16 changes: 8 additions & 8 deletions uPic.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -285,7 +285,7 @@
68BBB2F5FAEEFFF55935F022 /* AmazonS3Util.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AmazonS3Util.swift; sourceTree = "<group>"; };
68BBB5C4550545707614BE4D /* AmazonS3Uploader.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AmazonS3Uploader.swift; sourceTree = "<group>"; };
68BBB8CF2838A67CA1AD438F /* AmazonS3HostConfig.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AmazonS3HostConfig.swift; sourceTree = "<group>"; };
96F23538238E2CE800414C98 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/Preferences.strings; sourceTree = "<group>"; };
961AA898238E9764005A25C9 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/Preferences.strings; sourceTree = "<group>"; };
96F2D378235B48CF001F74A5 /* zh-Hans */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hans"; path = "zh-Hans.lproj/Preferences.strings"; sourceTree = "<group>"; };
A116EF79D38D9092D34EFCF5 /* Pods_uPic.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_uPic.framework; sourceTree = BUILT_PRODUCTS_DIR; };
B31C410193F6C634ECBC8F5F /* Pods-uPic.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-uPic.debug.xcconfig"; path = "Target Support Files/Pods-uPic/Pods-uPic.debug.xcconfig"; sourceTree = "<group>"; };
Expand Down Expand Up @@ -1059,7 +1059,7 @@
children = (
169F073C22AF53DE008E8525 /* Base */,
96F2D378235B48CF001F74A5 /* zh-Hans */,
96F23538238E2CE800414C98 /* en */,
961AA898238E9764005A25C9 /* en */,
);
name = Preferences.storyboard;
sourceTree = "<group>";
Expand Down Expand Up @@ -1204,7 +1204,7 @@
CODE_SIGN_STYLE = Manual;
COMBINE_HIDPI_IMAGES = YES;
CURRENT_PROJECT_VERSION = 20191126;
DEVELOPMENT_TEAM = W863J6W8DZ;
DEVELOPMENT_TEAM = 2U23P5CPX2;
ENABLE_HARDENED_RUNTIME = YES;
INFOPLIST_FILE = "$(SRCROOT)/uPic/Supporting Files/Info.plist";
LD_RUNPATH_SEARCH_PATHS = (
Expand Down Expand Up @@ -1234,7 +1234,7 @@
CODE_SIGN_STYLE = Manual;
COMBINE_HIDPI_IMAGES = YES;
CURRENT_PROJECT_VERSION = 20191126;
DEVELOPMENT_TEAM = W863J6W8DZ;
DEVELOPMENT_TEAM = 2U23P5CPX2;
ENABLE_HARDENED_RUNTIME = YES;
INFOPLIST_FILE = "$(SRCROOT)/uPic/Supporting Files/Info.plist";
LD_RUNPATH_SEARCH_PATHS = (
Expand All @@ -1259,7 +1259,7 @@
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Manual;
COMBINE_HIDPI_IMAGES = YES;
DEVELOPMENT_TEAM = W863J6W8DZ;
DEVELOPMENT_TEAM = 2U23P5CPX2;
ENABLE_HARDENED_RUNTIME = YES;
INFOPLIST_FILE = uPicHelper/Info.plist;
LD_RUNPATH_SEARCH_PATHS = (
Expand All @@ -1282,7 +1282,7 @@
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Manual;
COMBINE_HIDPI_IMAGES = YES;
DEVELOPMENT_TEAM = W863J6W8DZ;
DEVELOPMENT_TEAM = 2U23P5CPX2;
ENABLE_HARDENED_RUNTIME = YES;
INFOPLIST_FILE = uPicHelper/Info.plist;
LD_RUNPATH_SEARCH_PATHS = (
Expand All @@ -1305,7 +1305,7 @@
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Manual;
COMBINE_HIDPI_IMAGES = YES;
DEVELOPMENT_TEAM = W863J6W8DZ;
DEVELOPMENT_TEAM = 2U23P5CPX2;
ENABLE_HARDENED_RUNTIME = YES;
INFOPLIST_FILE = uPicFinderExtension/Info.plist;
LD_RUNPATH_SEARCH_PATHS = (
Expand All @@ -1330,7 +1330,7 @@
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Manual;
COMBINE_HIDPI_IMAGES = YES;
DEVELOPMENT_TEAM = W863J6W8DZ;
DEVELOPMENT_TEAM = 2U23P5CPX2;
ENABLE_HARDENED_RUNTIME = YES;
INFOPLIST_FILE = uPicFinderExtension/Info.plist;
LD_RUNPATH_SEARCH_PATHS = (
Expand Down
2 changes: 1 addition & 1 deletion uPic/Assets.xcassets/host_icon_6.imageset/Contents.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"images" : [
{
"idiom" : "universal",
"filename" : "GitHub.png",
"filename" : "github.png",
"scale" : "1x"
},
{
Expand Down
0 ....xcassets/host_icon_6.imageset/GitHub.png → ....xcassets/host_icon_6.imageset/github.png
View file
File renamed without changes
4 changes: 2 additions & 2 deletions uPic/Assets.xcassets/statusIcon.imageset/Contents.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@
},
{
"idiom" : "universal",
"filename" : "menubar.png",
"filename" : "menubar@2x.png.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"filename" : "menubar@2x.png",
"filename" : "menubar@3x.png",
"scale" : "3x"
}
],
Expand Down
0 ....xcassets/statusIcon.imageset/menubar.png → ...ts/statusIcon.imageset/[email protected]
View file
File renamed without changes
0 ...assets/statusIcon.imageset/[email protected] → ...assets/statusIcon.imageset/[email protected]
View file
File renamed without changes
4 changes: 2 additions & 2 deletions uPic/Assets.xcassets/uploadIcon.imageset/Contents.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@
},
{
"idiom" : "universal",
"filename" : "wait.png",
"filename" : "wait@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"filename" : "wait@2x.png",
"filename" : "wait@3x.png",
"scale" : "3x"
}
],
Expand Down
Binary file removed uPic/Assets.xcassets/uploadIcon.imageset/wait.png
View file
Binary file not shown.
Binary file modified uPic/Assets.xcassets/uploadIcon.imageset/[email protected]
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added uPic/Assets.xcassets/uploadIcon.imageset/[email protected]
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
13 changes: 12 additions & 1 deletion uPic/PreferencesWindow/AdvancedPreferencesViewController.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,18 @@ class AdvancedPreferencesViewController: PreferencesViewController {
historyRecordFileNameScrollWaitTime.stringValue = "\(HistoryRecordFileNameScrollWaitTimeGlobal)"
}


@IBAction func didClickHistoryRecordConfigurationResetButton(_ sender: NSButton) {
Defaults[.historyRecordWidth] = Float(500)
Defaults[.historyRecordColumns] = Int(3)
Defaults[.historyRecordSpacing] = Float(5)
Defaults[.historyRecordPadding] = Float(5)
Defaults[.historyRecordFileNameScrollSpeed] = Double(30)
Defaults[.historyRecordFileNameScrollWaitTime] = Float(1)

setHistoryRecordTextFieldDefaultText()
ConfigNotifier.postNotification(.changeHistoryList)
}

@IBAction func didClickHistoryRecordConfigurationSaveButton(_ sender: NSButton) {
Defaults[.historyRecordWidth] = Float(historyRecordWidth.stringValue)
Defaults[.historyRecordColumns] = Int(historyRecordColumns.stringValue)
Expand Down
Loading

0 comments on commit 9dad5f8

Please sign in to comment.