Skip to content

Commit

Permalink
Merge pull request #13 from makoni/develop
Browse files Browse the repository at this point in the history 
1.06
  • Loading branch information
@makoni
makoni authored Dec 11, 2020
2 parents 43fb44c + f97d877 commit 7e1ba8d
Show file tree
Hide file tree
Showing 6 changed files with 188 additions and 88 deletions.
24 changes: 19 additions & 5 deletions JPG to HEIF Converter.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
2407286A20B313F000E704B8 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 2407286920B313F000E704B8 /* Assets.xcassets */; };
2407286D20B313F000E704B8 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 2407286B20B313F000E704B8 /* Main.storyboard */; };
2407287720B34D5500E704B8 /* MainWindowController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2407287620B34D5500E704B8 /* MainWindowController.swift */; };
24F4F3B325836E6C00FF15A9 /* URL+contains.swift in Sources */ = {isa = PBXBuildFile; fileRef = 24F4F3B225836E6C00FF15A9 /* URL+contains.swift */; };
CD181F4A21407A9000D58033 /* UserDefaultsManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = CD181F4921407A9000D58033 /* UserDefaultsManager.swift */; };
CDF981C92139FB6500EBC90E /* FileTypeEnum.swift in Sources */ = {isa = PBXBuildFile; fileRef = CDF981C82139FB6500EBC90E /* FileTypeEnum.swift */; };
/* End PBXBuildFile section */
Expand All @@ -30,6 +31,7 @@
2407286F20B313F000E704B8 /* JPG_to_HEIF_Converter.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = JPG_to_HEIF_Converter.entitlements; sourceTree = "<group>"; };
2407287520B31FF300E704B8 /* JPG to HEIF Converter.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = "JPG to HEIF Converter.entitlements"; sourceTree = "<group>"; };
2407287620B34D5500E704B8 /* MainWindowController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MainWindowController.swift; sourceTree = "<group>"; };
24F4F3B225836E6C00FF15A9 /* URL+contains.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "URL+contains.swift"; sourceTree = "<group>"; };
CD181F4921407A9000D58033 /* UserDefaultsManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UserDefaultsManager.swift; sourceTree = "<group>"; };
CDF981C82139FB6500EBC90E /* FileTypeEnum.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FileTypeEnum.swift; sourceTree = "<group>"; };
/* End PBXFileReference section */
Expand Down Expand Up @@ -64,6 +66,7 @@
2407286420B313EE00E704B8 /* JPG to HEIF Converter */ = {
isa = PBXGroup;
children = (
24F4F3B125836E5C00FF15A9 /* extensions */,
2429921F232E7C6500477607 /* controllers */,
24299221232E7CD000477607 /* managers */,
24299220232E7CC700477607 /* models */,
Expand Down Expand Up @@ -103,6 +106,14 @@
path = managers;
sourceTree = "<group>";
};
24F4F3B125836E5C00FF15A9 /* extensions */ = {
isa = PBXGroup;
children = (
24F4F3B225836E6C00FF15A9 /* URL+contains.swift */,
);
path = extensions;
sourceTree = "<group>";
};
/* End PBXGroup section */

/* Begin PBXNativeTarget section */
Expand Down Expand Up @@ -130,7 +141,7 @@
isa = PBXProject;
attributes = {
LastSwiftUpdateCheck = 0930;
LastUpgradeCheck = 1100;
LastUpgradeCheck = 1220;
ORGANIZATIONNAME = "Sergey Armodin";
TargetAttributes = {
2407286120B313EE00E704B8 = {
Expand Down Expand Up @@ -183,6 +194,7 @@
files = (
CDF981C92139FB6500EBC90E /* FileTypeEnum.swift in Sources */,
CD181F4A21407A9000D58033 /* UserDefaultsManager.swift in Sources */,
24F4F3B325836E6C00FF15A9 /* URL+contains.swift in Sources */,
2407286820B313EE00E704B8 /* ViewController.swift in Sources */,
2407286620B313EE00E704B8 /* AppDelegate.swift in Sources */,
2407287720B34D5500E704B8 /* MainWindowController.swift in Sources */,
Expand Down Expand Up @@ -240,6 +252,7 @@
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
CLANG_WARN_STRICT_PROTOTYPES = YES;
CLANG_WARN_SUSPICIOUS_MOVE = YES;
Expand Down Expand Up @@ -301,6 +314,7 @@
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
CLANG_WARN_STRICT_PROTOTYPES = YES;
CLANG_WARN_SUSPICIOUS_MOVE = YES;
Expand Down Expand Up @@ -335,7 +349,7 @@
CODE_SIGN_IDENTITY = "-";
CODE_SIGN_STYLE = Automatic;
COMBINE_HIDPI_IMAGES = YES;
CURRENT_PROJECT_VERSION = 6;
CURRENT_PROJECT_VERSION = 7;
DEVELOPMENT_TEAM = 345VKAJA5N;
ENABLE_HARDENED_RUNTIME = YES;
INFOPLIST_FILE = "JPG to HEIF Converter/Info.plist";
Expand All @@ -344,7 +358,7 @@
"@executable_path/../Frameworks",
);
MACOSX_DEPLOYMENT_TARGET = 10.13;
MARKETING_VERSION = 1.05;
MARKETING_VERSION = 1.06;
PRODUCT_BUNDLE_IDENTIFIER = "me.spaceinbox.JPG-to-HEIF-Converter";
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 5.0;
Expand All @@ -358,7 +372,7 @@
CODE_SIGN_IDENTITY = "-";
CODE_SIGN_STYLE = Automatic;
COMBINE_HIDPI_IMAGES = YES;
CURRENT_PROJECT_VERSION = 6;
CURRENT_PROJECT_VERSION = 7;
DEVELOPMENT_TEAM = 345VKAJA5N;
ENABLE_HARDENED_RUNTIME = YES;
INFOPLIST_FILE = "JPG to HEIF Converter/Info.plist";
Expand All @@ -367,7 +381,7 @@
"@executable_path/../Frameworks",
);
MACOSX_DEPLOYMENT_TARGET = 10.13;
MARKETING_VERSION = 1.05;
MARKETING_VERSION = 1.06;
PRODUCT_BUNDLE_IDENTIFIER = "me.spaceinbox.JPG-to-HEIF-Converter";
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 5.0;
Expand Down
69 changes: 60 additions & 9 deletions JPG to HEIF Converter/Base.lproj/Main.storyboard
View file
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="14460.31" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" initialViewController="B8D-0N-5wS">
<document type="com.apple.InterfaceBuilder3.Cocoa.Storyboard.XIB" version="3.0" toolsVersion="17506" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" initialViewController="B8D-0N-5wS">
<dependencies>
<deployment identifier="macosx"/>
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="14460.31"/>
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="17506"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<scenes>
Expand Down Expand Up @@ -160,22 +160,22 @@
<objects>
<viewController id="XfG-lQ-9wD" customClass="ViewController" customModule="JPG_to_HEIF_Converter" customModuleProvider="target" sceneMemberID="viewController">
<view key="view" wantsLayer="YES" id="m2S-Jp-Qdl">
<rect key="frame" x="0.0" y="0.0" width="480" height="519"/>
<rect key="frame" x="0.0" y="0.0" width="480" height="560"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<stackView distribution="fill" orientation="vertical" alignment="centerX" spacing="16" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="QnE-b4-jIf">
<rect key="frame" x="16" y="32" width="448" height="455"/>
<rect key="frame" x="16" y="32" width="448" height="496"/>
<subviews>
<imageView horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="eiq-Ko-s37">
<rect key="frame" x="160" y="255" width="128" height="200"/>
<rect key="frame" x="160" y="296" width="128" height="200"/>
<constraints>
<constraint firstAttribute="width" constant="128" id="dU9-FE-I3a"/>
<constraint firstAttribute="height" constant="200" id="ez8-Wg-5Ib"/>
</constraints>
<imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageAlignment="top" imageScaling="proportionallyUpOrDown" image="applogo" id="2tc-a7-mn3"/>
</imageView>
<button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="duI-Ep-9mW">
<rect key="frame" x="173" y="211" width="102" height="32"/>
<rect key="frame" x="176" y="253" width="96" height="32"/>
<buttonCell key="cell" type="push" title="Open files" bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="93x-s1-82K">
<behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
<font key="font" metaFont="system"/>
Expand All @@ -184,8 +184,55 @@
</connections>
</buttonCell>
</button>
<stackView distribution="fill" orientation="horizontal" alignment="top" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Ss3-Tp-Xu2">
<rect key="frame" x="103" y="224" width="243" height="20"/>
<subviews>
<textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="53c-Zq-iCm">
<rect key="frame" x="-2" y="4" width="51" height="16"/>
<textFieldCell key="cell" lineBreakMode="clipping" title="Quality:" id="eLK-cp-42T">
<font key="font" metaFont="system"/>
<color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
</textField>
<textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="m8O-j2-QsU">
<rect key="frame" x="53" y="4" width="44" height="16"/>
<constraints>
<constraint firstAttribute="width" constant="40" id="x5W-OB-YVk"/>
</constraints>
<textFieldCell key="cell" lineBreakMode="clipping" title="0.95" id="gSy-QI-BCf">
<font key="font" metaFont="system"/>
<color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
</textField>
<slider verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="JVv-pq-yW3">
<rect key="frame" x="101" y="-6" width="144" height="28"/>
<constraints>
<constraint firstAttribute="width" constant="140" id="UJh-aU-Ow8"/>
</constraints>
<sliderCell key="cell" state="on" alignment="left" maxValue="1" tickMarkPosition="above" numberOfTickMarks="1" sliderType="linear" id="zgr-ir-Fdm"/>
<connections>
<action selector="sliderChanged:" target="XfG-lQ-9wD" id="EKQ-89-6dV"/>
</connections>
</slider>
</subviews>
<constraints>
<constraint firstAttribute="height" constant="20" id="dmf-WS-2gq"/>
</constraints>
<visibilityPriorities>
<integer value="1000"/>
<integer value="1000"/>
<integer value="1000"/>
</visibilityPriorities>
<customSpacing>
<real value="3.4028234663852886e+38"/>
<real value="3.4028234663852886e+38"/>
<real value="3.4028234663852886e+38"/>
</customSpacing>
</stackView>
<button verticalHuggingPriority="750" imageHugsTitle="YES" translatesAutoresizingMaskIntoConstraints="NO" id="TvC-d6-ANv">
<rect key="frame" x="157" y="186" width="135" height="18"/>
<rect key="frame" x="154" y="191" width="139" height="18"/>
<buttonCell key="cell" type="check" title="Keep Original Files" bezelStyle="regularSquare" imagePosition="left" state="on" inset="2" id="oxZ-yn-cLQ">
<behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
<font key="font" metaFont="system"/>
Expand All @@ -195,10 +242,10 @@
</connections>
</button>
<progressIndicator wantsLayer="YES" maxValue="100" style="bar" translatesAutoresizingMaskIntoConstraints="NO" id="9Cy-wp-cDd">
<rect key="frame" x="0.0" y="32" width="448" height="141"/>
<rect key="frame" x="0.0" y="31" width="448" height="146"/>
</progressIndicator>
<textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="Kw5-4a-0oz">
<rect key="frame" x="175" y="0.0" width="98" height="17"/>
<rect key="frame" x="175" y="0.0" width="98" height="16"/>
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="1 of 2 complete" id="dRN-in-KeR">
<font key="font" metaFont="system"/>
<color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
Expand All @@ -212,13 +259,15 @@
<integer value="1000"/>
<integer value="1000"/>
<integer value="1000"/>
<integer value="1000"/>
</visibilityPriorities>
<customSpacing>
<real value="3.4028234663852886e+38"/>
<real value="3.4028234663852886e+38"/>
<real value="3.4028234663852886e+38"/>
<real value="3.4028234663852886e+38"/>
<real value="3.4028234663852886e+38"/>
<real value="3.4028234663852886e+38"/>
</customSpacing>
</stackView>
</subviews>
Expand All @@ -242,6 +291,8 @@
<outlet property="keepOriginalsCheckbox" destination="TvC-d6-ANv" id="aCP-0T-AqB"/>
<outlet property="openFilesButton" destination="93x-s1-82K" id="S7R-kp-Y5G"/>
<outlet property="progressIndicator" destination="9Cy-wp-cDd" id="7dS-zs-K9B"/>
<outlet property="qualitySlider" destination="JVv-pq-yW3" id="tRM-dj-An9"/>
<outlet property="qualityValueLabel" destination="m8O-j2-QsU" id="W8n-Bc-Bzw"/>
</connections>
</viewController>
<customObject id="rPt-NT-nkU" userLabel="First Responder" customClass="NSResponder" sceneMemberID="firstResponder"/>
Expand Down
Loading

0 comments on commit 7e1ba8d

Please sign in to comment.