Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge branch 'master' of github.com:sequelpro/sequelpro
  • Loading branch information
@stuconnolly
stuconnolly committed Oct 1, 2018
2 parents 969f5c3 + c0ac6ed commit d437b40
Show file tree
Hide file tree
Showing 40 changed files with 926 additions and 679 deletions.
181 changes: 88 additions & 93 deletions Interfaces/English.lproj/BundleEditor.xib
View file

Large diffs are not rendered by default.

10 changes: 4 additions & 6 deletions Interfaces/English.lproj/ConnectionView.xib
View file
Expand Up @@ -76,11 +76,10 @@
<rect key="frame" x="0.0" y="0.0" width="200" height="513"/>
<autoresizingMask key="autoresizingMask" heightSizable="YES"/>
<subviews>
<imageView id="5822">
<customView id="Eax-vh-nTp" customClass="SPButtonBar">
<rect key="frame" x="0.0" y="0.0" width="200" height="23"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
<imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="axesIndependently" image="button_bar_spacer" id="5823"/>
</imageView>
</customView>
<popUpButton id="5824">
<rect key="frame" x="2" y="0.0" width="34" height="23"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
Expand Down Expand Up @@ -223,7 +222,7 @@
</scroller>
</scrollView>
<button id="5853">
<rect key="frame" x="69" y="1" width="34" height="23"/>
<rect key="frame" x="69" y="0.0" width="34" height="23"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<buttonCell key="cell" type="smallSquare" bezelStyle="smallSquare" image="button_add" imagePosition="overlaps" alignment="center" alternateImage="button_add" inset="2" id="5854">
<behavior key="behavior" lightByContents="YES"/>
Expand All @@ -234,7 +233,7 @@
</connections>
</button>
<button id="5851">
<rect key="frame" x="35" y="1" width="34" height="23"/>
<rect key="frame" x="35" y="0.0" width="34" height="23"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<buttonCell key="cell" type="smallSquare" bezelStyle="smallSquare" image="button_add_folder" imagePosition="only" alignment="center" alternateImage="button_add_folder" inset="2" id="5852">
<behavior key="behavior" lightByContents="YES"/>
Expand Down Expand Up @@ -2596,7 +2595,6 @@ DQ
<image name="button_add" width="30" height="22"/>
<image name="button_add_folder" width="30" height="22"/>
<image name="button_bar_handle" width="15" height="23"/>
<image name="button_bar_spacer" width="11" height="23"/>
<image name="key-icon" width="16" height="9"/>
<image name="key-icon-alternate" width="16" height="9"/>
</resources>
Expand Down
44 changes: 21 additions & 23 deletions Interfaces/English.lproj/Console.xib
View file
Expand Up @@ -33,22 +33,6 @@
<rect key="frame" x="0.0" y="0.0" width="575" height="203"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<imageView misplaced="YES" id="71">
<rect key="frame" x="-1" y="0.0" width="578" height="23"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
<imageCell key="cell" refusesFirstResponder="YES" alignment="left" animates="YES" imageScaling="axesIndependently" image="button_bar_spacer" id="72"/>
</imageView>
<button verticalHuggingPriority="750" id="9">
<rect key="frame" x="399" y="2" width="166" height="17"/>
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxY="YES"/>
<buttonCell key="cell" type="roundRect" title="Save As..." bezelStyle="roundedRect" alignment="center" controlSize="small" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="12">
<behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
<font key="font" metaFont="smallSystem"/>
</buttonCell>
<connections>
<action selector="saveConsoleAs:" target="-2" id="54"/>
</connections>
</button>
<searchField wantsLayer="YES" verticalHuggingPriority="750" id="8">
<rect key="frame" x="10" y="174" width="531" height="19"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/>
Expand All @@ -61,6 +45,10 @@
<outlet property="delegate" destination="-2" id="61"/>
</connections>
</searchField>
<progressIndicator hidden="YES" horizontalHuggingPriority="750" verticalHuggingPriority="750" minValue="16" maxValue="100" doubleValue="16" bezeled="NO" indeterminate="YES" controlSize="small" style="spinning" id="62">
<rect key="frame" x="549" y="175" width="16" height="16"/>
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMinY="YES"/>
</progressIndicator>
<scrollView autohidesScrollers="YES" horizontalLineScroll="18" horizontalPageScroll="10" verticalLineScroll="18" verticalPageScroll="10" usesPredominantAxisScrolling="NO" id="7">
<rect key="frame" x="-1" y="22" width="578" height="144"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
Expand Down Expand Up @@ -120,7 +108,7 @@
<color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" name="headerColor" catalog="System" colorSpace="catalog"/>
</tableHeaderCell>
<textFieldCell key="dataCell" controlSize="small" lineBreakMode="truncatingTail" selectable="YES" editable="YES" alignment="left" title="Text Cell" id="g2D-wF-fcB">
<textFieldCell key="dataCell" controlSize="small" lineBreakMode="truncatingTail" truncatesLastVisibleLine="YES" selectable="YES" editable="YES" alignment="left" title="Text Cell" id="g2D-wF-fcB">
<font key="font" metaFont="smallSystem"/>
<color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
Expand Down Expand Up @@ -152,10 +140,21 @@
</connections>
</tableHeaderView>
</scrollView>
<progressIndicator hidden="YES" horizontalHuggingPriority="750" verticalHuggingPriority="750" minValue="16" maxValue="100" doubleValue="16" bezeled="NO" indeterminate="YES" controlSize="small" style="spinning" id="62">
<rect key="frame" x="549" y="175" width="16" height="16"/>
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMinY="YES"/>
</progressIndicator>
<customView id="plS-KC-BwQ" customClass="SPButtonBar">
<rect key="frame" x="0.0" y="0.0" width="575" height="23"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
</customView>
<button verticalHuggingPriority="750" id="9">
<rect key="frame" x="399" y="2" width="166" height="17"/>
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxY="YES"/>
<buttonCell key="cell" type="roundRect" title="Save As..." bezelStyle="roundedRect" alignment="center" controlSize="small" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="12">
<behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
<font key="font" metaFont="smallSystem"/>
</buttonCell>
<connections>
<action selector="saveConsoleAs:" target="-2" id="54"/>
</connections>
</button>
<button toolTip="Clear Console" id="73">
<rect key="frame" x="30" y="-1" width="32" height="25"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
Expand Down Expand Up @@ -233,7 +232,7 @@
</popUpButtonCell>
</popUpButton>
<textField verticalHuggingPriority="750" id="108">
<rect key="frame" x="67" y="4" width="375" height="14"/>
<rect key="frame" x="67" y="4" width="326" height="14"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
<textFieldCell key="cell" controlSize="small" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" id="109">
<font key="font" metaFont="smallSystem"/>
Expand Down Expand Up @@ -329,7 +328,6 @@
</objects>
<resources>
<image name="button_action" width="30" height="22"/>
<image name="button_bar_spacer" width="11" height="23"/>
<image name="button_clear" width="30" height="22"/>
</resources>
</document>
8 changes: 2 additions & 6 deletions Interfaces/English.lproj/ContentFilterManager.xib
View file
Expand Up @@ -51,11 +51,10 @@
<rect key="frame" x="0.0" y="0.0" width="213" height="361"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<imageView id="380">
<customView id="yka-k0-BGx" customClass="SPButtonBar">
<rect key="frame" x="0.0" y="0.0" width="213" height="23"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
<imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="axesIndependently" image="button_bar_spacer" id="381"/>
</imageView>
</customView>
<imageView id="382">
<rect key="frame" x="198" y="0.0" width="15" height="23"/>
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxY="YES"/>
Expand Down Expand Up @@ -314,8 +313,6 @@ Gw
<size key="minSize" width="244" height="82"/>
<size key="maxSize" width="592" height="10000000"/>
<color key="insertionPointColor" white="0.0" alpha="1" colorSpace="calibratedWhite"/>
<size key="minSize" width="244" height="82"/>
<size key="maxSize" width="592" height="10000000"/>
<connections>
<binding destination="143" name="font" keyPath="values.CustomQueryEditorFont" id="306">
<dictionary key="options">
Expand Down Expand Up @@ -415,7 +412,6 @@ Gw
<image name="button_action" width="16" height="16"/>
<image name="button_add" width="16" height="16"/>
<image name="button_bar_handle" width="16" height="16"/>
<image name="button_bar_spacer" width="10" height="29"/>
<image name="button_remove" width="32" height="23"/>
</resources>
</document>

0 comments on commit d437b40

Please sign in to comment.