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

Jump to bottom

Add a loop count setting #218

Merged
merged 30 commits into from
Dec 27, 2020
Merged

Add a loop count setting #218

Show file tree
Hide file tree
Changes from 12 commits
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
1841740
feat: gifski cli can limit animation loops
0bmay Nov 24, 2020
dee11e7
feat: max loops for conversions
0bmay Nov 25, 2020
8eb2c2d
Update EditVideoViewController.swift
sindresorhus Nov 25, 2020
49215fe
fix: revert Development Team updates
0bmay Nov 25, 2020
439473b
Merge remote-tracking branch 'origin/master'
0bmay Nov 25, 2020
2faf66f
fix: timesShown is now loopCount
0bmay Nov 25, 2020
50d4861
fix: loop count for gifsicle
0bmay Nov 25, 2020
b052902
fix: looping Controls UI flow
0bmay Nov 25, 2020
725e769
feat: stepper control for loop count
0bmay Nov 25, 2020
38e0981
fix: variable fixes while updating upstream gifski
0bmay Nov 25, 2020
0411ade
fix: logic flow change for looping in gifski library
0bmay Nov 26, 2020
66e6fe4
fix: loop controls
0bmay Nov 26, 2020
13b5696
fix: Looping Logic
0bmay Nov 26, 2020
50cf2ef
Update EditVideoViewController.swift
sindresorhus Nov 27, 2020
731fc92
fix: ui updates and ease of change modifications
0bmay Nov 27, 2020
4c9e717
Merge branch 'master' into master
sindresorhus Nov 28, 2020
7b5e039
fix: code review updates
0bmay Nov 28, 2020
87612c2
Merge remote-tracking branch 'origin/master'
0bmay Nov 28, 2020
7837ab3
fix: UI Contraints
0bmay Nov 28, 2020
61caefa
feat: animation repeat
0bmay Dec 17, 2020
b311da4
feat: animation looping updates from gifski cli
0bmay Dec 18, 2020
d4a9694
Update EditVideoViewController.swift
sindresorhus Dec 18, 2020
d647ba3
Update EditVideoViewController.swift
sindresorhus Dec 18, 2020
b40f2be
fix: Loop Forever and Loop Count states
0bmay Dec 18, 2020
9bce926
fix: Animation Preview Warning
0bmay Dec 22, 2020
cded813
Update Gifski/EditVideoViewController.swift
0bmay Dec 23, 2020
0b6189c
fix: changed gif loop warning message
0bmay Dec 23, 2020
359097b
fix: shortened looping warning message
0bmay Dec 23, 2020
51f6863
fix: updated code comment and warning text for specific loop counts
0bmay Dec 25, 2020
6e2db7f
Update EditVideoViewController.swift
sindresorhus Dec 27, 2020
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
56 changes: 54 additions & 2 deletions Gifski/EditVideoViewController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,8 @@ final class EditVideoViewController: NSViewController {
@IBOutlet private var dimensionsTypeDropdown: MenuPopUpButton!
@IBOutlet private var cancelButton: NSButton!
@IBOutlet private var playerViewWrapper: NSView!
@IBOutlet private var loopCountTextField: IntTextField!
@IBOutlet private var loopCountStepper: NSStepper!

var inputUrl: URL!
var asset: AVAsset!
Expand All @@ -57,7 +59,8 @@ final class EditVideoViewController: NSViewController {
quality: Defaults[.outputQuality],
dimensions: resizableDimensions.changed(dimensionsType: .pixels).currentDimensions.value,
frameRate: frameRateSlider.integerValue,
loopGif: Defaults[.loopGif]
loopGif: Defaults[.loopGif],
loopCount: Int(loopCountTextField.intValue)
)
}

Expand Down Expand Up @@ -97,6 +100,7 @@ final class EditVideoViewController: NSViewController {
setUpDropdowns()
setUpSliders()
setUpWidthAndHeightTextFields()
setUpLoopCountControls()
setUpDropView()
setUpTrimmingView()
}
Expand Down Expand Up @@ -314,6 +318,52 @@ final class EditVideoViewController: NSViewController {
updateTextFieldsMinMax()
}

private func setUpLoopCountControls() {
loopCountTextField.onBlur = { [weak self] loopCount in
guard let self = self else {
return
}
self.loopCountTextField.stringValue = "\(loopCount)"
self.loopCountStepper.intValue = Int32(loopCount)
if loopCount > 0 {
self.loopCheckbox.state = .off
}
}

loopCountTextField.onValueChange = { [weak self] loopCount in
guard let self = self else {
return
}
let validLoopCount = loopCount.clamped(to: 0...100)
self.loopCountTextField.stringValue = "\(validLoopCount)"
self.loopCountStepper.intValue = Int32(validLoopCount)
if validLoopCount > 0 {
self.loopCheckbox.state = .off
}
}

loopCheckbox.onAction = { [weak self] _ in
guard let self = self else {
return
}

if self.loopCheckbox.state == .on {
self.loopCountTextField.stringValue = "0"
self.loopCountStepper.intValue = 0
}
self.loopCountTextField.isEnabled = (self.loopCheckbox.state == .off)
self.loopCountStepper.isEnabled = (self.loopCheckbox.state == .off)
}

loopCountStepper.onAction = { [weak self] _ in
guard let self = self else {
return
}

self.loopCountTextField.stringValue = "\(self.loopCountStepper.intValue)"
}
}

private func setUpDropView() {
let videoDropController = VideoDropViewController(dropLabelIsHidden: true)
add(childController: videoDropController)
Expand Down Expand Up @@ -342,7 +392,8 @@ final class EditVideoViewController: NSViewController {
heightTextField.nextKeyView = dimensionsTypeDropdown
dimensionsTypeDropdown.nextKeyView = frameRateSlider
frameRateSlider.nextKeyView = qualitySlider
qualitySlider.nextKeyView = loopCheckbox
qualitySlider.nextKeyView = loopCountTextField
loopCountTextField.nextKeyView = loopCheckbox
loopCheckbox.nextKeyView = cancelButton
}

Expand All @@ -351,6 +402,7 @@ final class EditVideoViewController: NSViewController {
let heightMinMax = resizableDimensions.heightMinMax
widthTextField.minMax = Int(widthMinMax.lowerBound)...Int(widthMinMax.upperBound)
heightTextField.minMax = Int(heightMinMax.lowerBound)...Int(heightMinMax.upperBound)
loopCountTextField.minMax = 0...100
0bmay marked this conversation as resolved.
Show resolved Hide resolved
}

private func dimensionsUpdated() {
Expand Down
53 changes: 47 additions & 6 deletions Gifski/EditVideoViewController.xib
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.XIB" version="3.0" toolsVersion="15400" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="17506" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
<dependencies>
<deployment identifier="macosx"/>
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="15400"/>
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="17506"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<objects>
Expand All @@ -15,6 +15,8 @@
<outlet property="frameRateSlider" destination="Rej-Dl-z8Y" id="cIA-dv-KJw"/>
<outlet property="heightTextField" destination="bzf-LM-SxO" id="67N-9X-vzq"/>
<outlet property="loopCheckbox" destination="Mk2-3o-6CT" id="jrz-yA-sLw"/>
<outlet property="loopCountStepper" destination="x03-mN-zhh" id="wsc-CK-KzW"/>
<outlet property="loopCountTextField" destination="taC-H3-jcv" id="Rdc-pf-FRN"/>
<outlet property="playerViewWrapper" destination="64m-0V-WWu" id="6cd-p2-aMe"/>
<outlet property="predefinedSizesDropdown" destination="BWw-q9-45K" id="mLx-BM-G3f"/>
<outlet property="qualitySlider" destination="wmm-UU-g6g" id="RlB-Ty-dIN"/>
Expand Down Expand Up @@ -91,7 +93,7 @@
</textFieldCell>
</textField>
<textField horizontalHuggingPriority="251" verticalHuggingPriority="750" preferredMaxLayoutWidth="76" translatesAutoresizingMaskIntoConstraints="NO" id="y55-Nm-2MG">
<rect key="frame" x="18" y="52" width="79" height="16"/>
<rect key="frame" x="18" y="51" width="79" height="16"/>
<textFieldCell key="cell" lineBreakMode="clipping" alignment="right" title="Width:" id="lvt-MD-r8L">
<font key="font" usesAppearanceFont="YES"/>
<color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
Expand All @@ -110,7 +112,7 @@
</textFieldCell>
</textField>
<textField horizontalHuggingPriority="251" verticalHuggingPriority="750" preferredMaxLayoutWidth="76" translatesAutoresizingMaskIntoConstraints="NO" id="iPX-cO-cRP">
<rect key="frame" x="18" y="20" width="79" height="17"/>
<rect key="frame" x="18" y="21" width="79" height="15"/>
<textFieldCell key="cell" lineBreakMode="clipping" alignment="right" title="Height:" id="stb-YD-0DW">
<font key="font" usesAppearanceFont="YES"/>
<color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
Expand Down Expand Up @@ -206,8 +208,30 @@
<color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
</textField>
<textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="taC-H3-jcv" customClass="IntTextField" customModule="Gifski" customModuleProvider="target">
<rect key="frame" x="84" y="17" width="70" height="21"/>
<constraints>
<constraint firstAttribute="width" constant="70" id="5HI-Ct-v80"/>
</constraints>
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" borderStyle="bezel" title="0" drawsBackground="YES" id="bLQ-hB-2aY">
<font key="font" usesAppearanceFont="YES"/>
<color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
</textField>
<textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="VFJ-xS-F2B">
<rect key="frame" x="18" y="19" width="60" height="17"/>
<constraints>
<constraint firstAttribute="width" constant="56" id="jKq-aA-DK5"/>
</constraints>
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="right" title="Loops:" id="mzK-oH-PZl">
<font key="font" metaFont="system"/>
<color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
</textField>
<button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="Mk2-3o-6CT">
<rect key="frame" x="82" y="19" width="102" height="18"/>
<rect key="frame" x="198" y="19" width="102" height="18"/>
<buttonCell key="cell" type="check" title="Loop Forever" bezelStyle="regularSquare" imagePosition="left" inset="2" id="c3l-oV-Y0b">
<behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
<font key="font" metaFont="system"/>
Expand All @@ -221,22 +245,39 @@
</binding>
</connections>
</button>
<stepper horizontalHuggingPriority="750" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="x03-mN-zhh">
<rect key="frame" x="159" y="14" width="19" height="27"/>
<constraints>
<constraint firstAttribute="width" constant="13" id="hkR-an-gRW"/>
</constraints>
<stepperCell key="cell" continuous="YES" alignment="left" maxValue="100" id="d96-4O-hec"/>
</stepper>
</subviews>
<constraints>
<constraint firstAttribute="trailing" secondItem="5Ke-gz-J2u" secondAttribute="trailing" constant="20" symbolic="YES" id="2kR-fz-ftG"/>
<constraint firstItem="Rej-Dl-z8Y" firstAttribute="leading" secondItem="wmm-UU-g6g" secondAttribute="leading" id="5gr-Y1-Ixw"/>
<constraint firstItem="Fxs-GY-NUz" firstAttribute="leading" secondItem="iFf-bP-MLi" secondAttribute="leading" id="AOu-eR-uC7"/>
<constraint firstItem="iFf-bP-MLi" firstAttribute="top" secondItem="Fxs-GY-NUz" secondAttribute="bottom" constant="18" id="BdX-Ip-Sfw"/>
<constraint firstItem="VFJ-xS-F2B" firstAttribute="centerY" secondItem="taC-H3-jcv" secondAttribute="centerY" id="Ce4-nQ-SIA"/>
<constraint firstItem="Fxs-GY-NUz" firstAttribute="trailing" secondItem="iFf-bP-MLi" secondAttribute="trailing" id="HTv-ji-VLV"/>
<constraint firstItem="iFf-bP-MLi" firstAttribute="baseline" secondItem="wmm-UU-g6g" secondAttribute="baseline" id="JaM-6Y-r2w"/>
<constraint firstItem="x03-mN-zhh" firstAttribute="top" secondItem="taC-H3-jcv" secondAttribute="top" id="Joy-1o-zaE"/>
<constraint firstItem="Fxs-GY-NUz" firstAttribute="leading" secondItem="d7l-jL-VWi" secondAttribute="leading" constant="20" symbolic="YES" id="LrM-Ia-FKl"/>
<constraint firstItem="Rej-Dl-z8Y" firstAttribute="trailing" secondItem="wmm-UU-g6g" secondAttribute="trailing" id="PvJ-zU-xzT"/>
<constraint firstAttribute="bottom" secondItem="x03-mN-zhh" secondAttribute="bottom" constant="17" id="Q5W-Gx-0ff"/>
<constraint firstItem="Mk2-3o-6CT" firstAttribute="top" secondItem="wmm-UU-g6g" secondAttribute="bottom" constant="18" id="QeK-R7-HH4"/>
<constraint firstItem="VFJ-xS-F2B" firstAttribute="firstBaseline" secondItem="Mk2-3o-6CT" secondAttribute="baseline" id="S08-Db-IIm"/>
<constraint firstItem="5Ke-gz-J2u" firstAttribute="firstBaseline" secondItem="Fxs-GY-NUz" secondAttribute="firstBaseline" id="YcA-vG-aBS"/>
<constraint firstItem="VFJ-xS-F2B" firstAttribute="baseline" secondItem="taC-H3-jcv" secondAttribute="firstBaseline" id="cF9-z1-Ege"/>
<constraint firstItem="x03-mN-zhh" firstAttribute="leading" secondItem="taC-H3-jcv" secondAttribute="trailing" constant="8" id="crK-jR-hpb"/>
<constraint firstItem="VFJ-xS-F2B" firstAttribute="leading" secondItem="iFf-bP-MLi" secondAttribute="leading" id="eAS-rc-ZTd"/>
<constraint firstItem="VFJ-xS-F2B" firstAttribute="baseline" secondItem="taC-H3-jcv" secondAttribute="baseline" id="eXM-GQ-78a"/>
<constraint firstItem="5Ke-gz-J2u" firstAttribute="leading" secondItem="Rej-Dl-z8Y" secondAttribute="trailing" constant="8" symbolic="YES" id="eXk-Bv-HWg"/>
<constraint firstItem="Rej-Dl-z8Y" firstAttribute="leading" secondItem="Fxs-GY-NUz" secondAttribute="trailing" constant="8" symbolic="YES" id="er2-bc-7th"/>
<constraint firstItem="Fxs-GY-NUz" firstAttribute="top" secondItem="d7l-jL-VWi" secondAttribute="top" constant="18" id="ivK-Jk-HzZ"/>
<constraint firstItem="Mk2-3o-6CT" firstAttribute="leading" secondItem="wmm-UU-g6g" secondAttribute="leading" id="qeA-E1-JIA"/>
<constraint firstItem="taC-H3-jcv" firstAttribute="leading" secondItem="VFJ-xS-F2B" secondAttribute="trailing" constant="8" symbolic="YES" id="kfm-tz-40e"/>
<constraint firstItem="x03-mN-zhh" firstAttribute="centerY" secondItem="taC-H3-jcv" secondAttribute="centerY" id="qQQ-L0-l5o"/>
<constraint firstItem="Mk2-3o-6CT" firstAttribute="leading" secondItem="wmm-UU-g6g" secondAttribute="leading" constant="116" id="qeA-E1-JIA"/>
<constraint firstItem="Fxs-GY-NUz" firstAttribute="firstBaseline" secondItem="Rej-Dl-z8Y" secondAttribute="firstBaseline" id="tLB-lC-RNe"/>
</constraints>
</view>
Expand Down
4 changes: 3 additions & 1 deletion Gifski/Gifski.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ final class Gifski {
var dimensions: CGSize?
var frameRate: Int?
var loopGif: Bool = true
var loopCount: Int?
}

private var gifData = NSMutableData()
Expand Down Expand Up @@ -97,7 +98,8 @@ final class Gifski {
height: UInt32(conversion.dimensions?.height ?? 0),
quality: UInt8(conversion.quality * 100),
once: !conversion.loopGif,
fast: false
fast: false,
loop_count: UInt16(conversion.loopCount ?? 0)
)

self.gifski = GifskiWrapper(settings: settings)
Expand Down
Loading