Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/git-up/GitUp
Browse files Browse the repository at this point in the history
  • Loading branch information
@actions-user
actions-user committed Feb 18, 2024
2 parents ee332ed + 519ef0e commit fa9b7a2
Show file tree
Hide file tree
Showing 8 changed files with 145 additions and 100 deletions.
2 changes: 1 addition & 1 deletion GitUp/Application/Base.lproj/Document.xib
View file
Original file line number Diff line number Diff line change
Expand Up @@ -278,7 +278,7 @@
<outlet property="secondaryControl" destination="khT-H7-lYh" id="3YC-ek-EN6"/>
</connections>
</toolbarItem>
<toolbarItem implicitItemIdentifier="B5339F67-DADA-4EB4-8EBA-79AA8C91CC9C" label="Snapshots" paletteLabel="Snapshots" image="clock.arrow.circlepath" catalog="system" sizingBehavior="auto" id="Aag-2S-fcP" customClass="GICustomToolbarItem">
<toolbarItem implicitItemIdentifier="B5339F67-DADA-4EB4-8EBA-79AA8C91CC9C" label="Snapshots" toolTip="Snapshots pane" paletteLabel="Snapshots" image="clock.arrow.circlepath" catalog="system" sizingBehavior="auto" id="Aag-2S-fcP" customClass="GICustomToolbarItem">
<nil key="toolTip"/>
<button key="view" verticalHuggingPriority="750" id="9B3-Yw-IMy">
<rect key="frame" x="17" y="14" width="29" height="23"/>
Expand Down
69 changes: 50 additions & 19 deletions GitUp/Application/Base.lproj/WelcomeWindowController.xib
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.XIB" version="3.0" toolsVersion="17506" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="19529" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
<dependencies>
<deployment version="110000" identifier="macosx"/>
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="17506"/>
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="19529"/>
<capability name="System colors introduced in macOS 10.14" minToolsVersion="10.0"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
Expand All @@ -20,21 +20,21 @@
<customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
<customObject id="-3" userLabel="Application" customClass="NSObject"/>
<window allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" restorable="NO" releasedWhenClosed="NO" visibleAtLaunch="NO" frameAutosaveName="" animationBehavior="default" id="mjY-As-hbN" userLabel="Welcome" customClass="WelcomeWindow">
<rect key="contentRect" x="131" y="158" width="280" height="349"/>
<rect key="screenRect" x="0.0" y="0.0" width="1680" height="1025"/>
<rect key="contentRect" x="131" y="158" width="280" height="384"/>
<rect key="screenRect" x="0.0" y="0.0" width="1440" height="875"/>
<view key="contentView" id="36m-6r-JT2">
<rect key="frame" x="0.0" y="0.0" width="280" height="349"/>
<rect key="frame" x="0.0" y="0.0" width="280" height="384"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<box fixedFrame="YES" boxType="custom" borderType="none" borderWidth="0.0" cornerRadius="10" title="Box" titlePosition="noTitle" translatesAutoresizingMaskIntoConstraints="NO" id="UoN-n1-xSr">
<rect key="frame" x="0.0" y="0.0" width="280" height="349"/>
<rect key="frame" x="0.0" y="0.0" width="280" height="384"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<view key="contentView" id="UVs-2r-EAT" customClass="WelcomeWindowView">
<rect key="frame" x="0.0" y="0.0" width="280" height="349"/>
<rect key="frame" x="0.0" y="0.0" width="280" height="384"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<button fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Fwx-IU-wXQ">
<rect key="frame" x="0.0" y="319" width="30" height="30"/>
<rect key="frame" x="0.0" y="354" width="30" height="30"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
<buttonCell key="cell" type="square" bezelStyle="shadowlessSquare" image="NSStopProgressFreestandingTemplate" imagePosition="only" alignment="center" imageScaling="proportionallyDown" inset="2" id="9ia-bK-Ohr">
<behavior key="behavior" lightByContents="YES"/>
Expand All @@ -43,12 +43,12 @@
<accessibility description="Close window"/>
</button>
<imageView horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Apd-kA-Fr2">
<rect key="frame" x="76" y="180" width="128" height="128"/>
<rect key="frame" x="76" y="215" width="128" height="128"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
<imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="proportionallyDown" image="NSApplicationIcon" id="hqR-yy-x5J"/>
</imageView>
<textField horizontalHuggingPriority="251" verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="jwH-EW-hhE">
<rect key="frame" x="58" y="145" width="164" height="17"/>
<rect key="frame" x="58" y="180" width="164" height="17"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" allowsUndo="NO" sendsActionOnEndEditing="YES" alignment="center" title="Welcome to GitUp" id="mWe-61-l7s">
<font key="font" metaFont="systemBold"/>
Expand All @@ -57,17 +57,44 @@
</textFieldCell>
</textField>
<box verticalHuggingPriority="750" fixedFrame="YES" boxType="separator" translatesAutoresizingMaskIntoConstraints="NO" id="zd1-ko-kkJ">
<rect key="frame" x="0.0" y="121" width="280" height="5"/>
<rect key="frame" x="0.0" y="156" width="280" height="5"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
</box>
<box autoresizesSubviews="NO" fixedFrame="YES" boxType="custom" borderType="none" title="Box" titlePosition="noTitle" translatesAutoresizingMaskIntoConstraints="NO" id="Yk1-Lc-GjF">
<rect key="frame" x="0.0" y="88" width="280" height="35"/>
<rect key="frame" x="0.0" y="123" width="280" height="35"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
<view key="contentView" id="e59-at-kYh">
<rect key="frame" x="0.0" y="0.0" width="280" height="35"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<customView fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="edN-Xy-LJd" customClass="GILinkButton">
<rect key="frame" x="50" y="7" width="180" height="20"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="string" keyPath="link" value="Clone a Git Repository…"/>
<userDefinedRuntimeAttribute type="color" keyPath="linkColor">
<color key="value" name="textColor" catalog="System" colorSpace="catalog"/>
</userDefinedRuntimeAttribute>
<userDefinedRuntimeAttribute type="color" keyPath="alternateLinkColor">
<color key="value" name="secondaryLabelColor" catalog="System" colorSpace="catalog"/>
</userDefinedRuntimeAttribute>
</userDefinedRuntimeAttributes>
<connections>
<action selector="cloneRepository:" target="-1" id="e3f-ba-Ilm"/>
</connections>
</customView>
</subviews>
</view>
<color key="fillColor" name="alternatingContentBackgroundColor" catalog="System" colorSpace="catalog"/>
</box>
<box autoresizesSubviews="NO" fixedFrame="YES" boxType="custom" borderType="none" title="Box" titlePosition="noTitle" translatesAutoresizingMaskIntoConstraints="NO" id="xQb-J3-oL4">
<rect key="frame" x="0.0" y="88" width="280" height="35"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
<view key="contentView" id="7dg-K9-ehZ">
<rect key="frame" x="0.0" y="0.0" width="280" height="35"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<customView fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="ICh-W7-gfv" customClass="GILinkButton">
<rect key="frame" x="50" y="7" width="180" height="20"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
<userDefinedRuntimeAttributes>
Expand All @@ -80,19 +107,19 @@
</userDefinedRuntimeAttribute>
</userDefinedRuntimeAttributes>
<connections>
<action selector="openDocument:" target="-1" id="PnG-74-JXS"/>
<action selector="openDocument:" target="-1" id="Z9o-ql-9Ia"/>
</connections>
</customView>
</subviews>
</view>
<color key="fillColor" name="alternatingContentBackgroundColor" catalog="System" colorSpace="catalog"/>
</box>
<box verticalHuggingPriority="750" fixedFrame="YES" boxType="separator" translatesAutoresizingMaskIntoConstraints="NO" id="FXE-km-lcD">
<rect key="frame" x="0.0" y="85" width="280" height="5"/>
<rect key="frame" x="0.0" y="120" width="280" height="5"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
</box>
<box autoresizesSubviews="NO" fixedFrame="YES" boxType="custom" borderType="none" title="Box" titlePosition="noTitle" translatesAutoresizingMaskIntoConstraints="NO" id="ll1-UT-nBS">
<rect key="frame" x="0.0" y="52" width="280" height="35"/>
<rect key="frame" x="0.0" y="54" width="280" height="35"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
<view key="contentView" id="qq4-a6-dvv">
<rect key="frame" x="0.0" y="0.0" width="280" height="35"/>
Expand All @@ -116,10 +143,6 @@
</view>
<color key="fillColor" name="alternatingContentBackgroundColor" catalog="System" colorSpace="catalog"/>
</box>
<box verticalHuggingPriority="750" fixedFrame="YES" boxType="separator" translatesAutoresizingMaskIntoConstraints="NO" id="3Ya-QW-NlZ">
<rect key="frame" x="0.0" y="49" width="280" height="5"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
</box>
<imageView horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="TgX-Ty-AUa">
<rect key="frame" x="45" y="20" width="12" height="12"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
Expand Down Expand Up @@ -161,6 +184,14 @@
<action selector="viewIssues:" target="-1" id="aqi-az-ote"/>
</connections>
</customView>
<box verticalHuggingPriority="750" fixedFrame="YES" boxType="separator" translatesAutoresizingMaskIntoConstraints="NO" id="3Ya-QW-NlZ">
<rect key="frame" x="0.0" y="86" width="280" height="5"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
</box>
<box verticalHuggingPriority="750" fixedFrame="YES" boxType="separator" translatesAutoresizingMaskIntoConstraints="NO" id="pHv-zS-O89">
<rect key="frame" x="0.0" y="52" width="280" height="5"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
</box>
</subviews>
<connections>
<outlet property="imageView" destination="Apd-kA-Fr2" id="22r-bO-hHz"/>
Expand Down
12 changes: 12 additions & 0 deletions GitUp/Application/Document.m
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1774,16 +1774,28 @@ - (IBAction)toggleTags:(id)sender {

- (IBAction)toggleSnapshots:(id)sender {
if (_snapshotsView.superview) {
[self setSnapshotToggleState:NSOffState];
_mapViewController.previewHistory = nil;
[self _removeSideView:_snapshotsView completion:NULL];
[_mainWindow makeFirstResponder:_mapViewController.preferredFirstResponder];
} else {
[self setSnapshotToggleState:NSOnState];
[_mainWindow makeFirstResponder:nil]; // Force end-editing in search field to avoid close button remaining around
[self _addSideView:_snapshotsView withIdentifier:kSideViewIdentifier_Snapshots completion:NULL];
[_mainWindow makeFirstResponder:_snapshotListViewController.preferredFirstResponder];
}
}

- (void)setSnapshotToggleState:(NSControlStateValue)state {
NSButton* button = (NSButton*)_snapshotsItem.view;
if (![button isKindOfClass:[NSButton class]]) {
XLOG_ERROR(@"This used to be a button, update this function if the layout has changed.");
return;
}

[button setState:state];
}

- (IBAction)toggleReflog:(id)sender {
if (_reflogView.superview) {
_mapViewController.forceShowAllTips = NO;
Expand Down
6 changes: 3 additions & 3 deletions GitUpKit/Views/Base.lproj/GIAdvancedCommitViewController.xib
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.XIB" version="3.0" toolsVersion="17506" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="20037" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
<dependencies>
<deployment identifier="macosx"/>
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="17506"/>
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="20037"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<objects>
Expand Down Expand Up @@ -225,7 +225,7 @@
<string key="keyEquivalent" base64-UTF8="YES">
DQ
</string>
<modifierMask key="keyEquivalentModifierMask" option="YES"/>
<modifierMask key="keyEquivalentModifierMask" command="YES"/>
<connections>
<action selector="commit:" target="-2" id="TeY-Mz-e1l"/>
</connections>
Expand Down
Loading

0 comments on commit fa9b7a2

Please sign in to comment.