Permalink
Browse files

Merge branch 'master' of https://github.com/sequelpro/sequelpro

  • Loading branch information...
abhibeckert committed May 9, 2016
2 parents c7fc016 + 5f54e31 commit 05407e7246a5781dd2523feac920d6fcc0f08f79
Showing with 11,345 additions and 93,197 deletions.
  1. +160 −1,067 Interfaces/English.lproj/AboutPanel.xib
  2. +850 −4,852 Interfaces/English.lproj/BundleEditor.xib
  3. +47 −297 Interfaces/English.lproj/BundleHTMLOutput.xib
  4. +89 −429 Interfaces/English.lproj/ConnectionErrorDialog.xib
  5. +292 −1,621 Interfaces/English.lproj/Console.xib
  6. +421 −6,010 Interfaces/English.lproj/ContentFilterManager.xib
  7. +166 −4,423 Interfaces/English.lproj/ContentPaginationView.xib
  8. +5 −5 Interfaces/English.lproj/DBView.xib
  9. +952 −8,669 Interfaces/English.lproj/DataMigrationDialog.xib
  10. +444 −2,282 Interfaces/English.lproj/DatabaseProcessList.xib
  11. +178 −970 Interfaces/English.lproj/DatabaseServerVariables.xib
  12. +48 −335 Interfaces/English.lproj/EncodingPopupView.xib
  13. +4 −4 Interfaces/English.lproj/ExportDialog.xib
  14. +1,479 −8,248 Interfaces/English.lproj/FieldEditorSheet.xib
  15. +134 −952 Interfaces/English.lproj/GotoDatabaseDialog.xib
  16. +349 −2,291 Interfaces/English.lproj/ImportAccessory.xib
  17. +338 −5,305 Interfaces/English.lproj/IndexesView.xib
  18. +1,094 −12,581 Interfaces/English.lproj/MainMenu.xib
  19. +230 −1,271 Interfaces/English.lproj/Navigator.xib
  20. +1,736 −9,470 Interfaces/English.lproj/Preferences.xib
  21. +39 −232 Interfaces/English.lproj/PrintAccessory.xib
  22. +76 −3,867 Interfaces/English.lproj/ProgressIndicatorLayer.xib
  23. +517 −6,449 Interfaces/English.lproj/QueryFavoriteManager.xib
  24. +185 −956 Interfaces/English.lproj/SSHQuestionDialog.xib
  25. +116 −4,060 Interfaces/English.lproj/SaveSPFAccessory.xib
  26. +1,378 −6,533 Interfaces/English.lproj/UserManagerView.xib
  27. +1 −1 Models/SPUserManager.xcdatamodel/contents
  28. +13 −6 Source/SPCustomQuery.m
  29. +1 −1 Source/SPTextView.h
  30. +3 −10 Source/SPTextView.m

Large diffs are not rendered by default.

Oops, something went wrong.

Large diffs are not rendered by default.

Oops, something went wrong.

Large diffs are not rendered by default.

Oops, something went wrong.

Large diffs are not rendered by default.

Oops, something went wrong.

Large diffs are not rendered by default.

Oops, something went wrong.

Large diffs are not rendered by default.

Oops, something went wrong.

Large diffs are not rendered by default.

Oops, something went wrong.
@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="10116" systemVersion="15E65" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none">
<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="9532" systemVersion="15E39d" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none">
<dependencies>
<deployment identifier="macosx"/>
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="10116"/>
<plugIn identifier="com.apple.WebKitIBPlugin" version="10116"/>
<capability name="box content view" minToolsVersion="7.0"/>
<development version="5100" identifier="xcode"/>
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="9532"/>
<plugIn identifier="com.apple.WebKitIBPlugin" version="9532"/>
</dependencies>
<objects>
<customObject id="-2" userLabel="File's Owner" customClass="SPDatabaseDocument">
@@ -1018,7 +1018,7 @@
</subviews>
<color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
</clipView>
<scroller key="horizontalScroller" verticalHuggingPriority="750" horizontal="YES" id="3922">
<scroller key="horizontalScroller" hidden="YES" verticalHuggingPriority="750" horizontal="YES" id="3922">
<rect key="frame" x="1" y="142" width="690" height="16"/>
<autoresizingMask key="autoresizingMask"/>
</scroller>

Large diffs are not rendered by default.

Oops, something went wrong.

Large diffs are not rendered by default.

Oops, something went wrong.

Large diffs are not rendered by default.

Oops, something went wrong.

Large diffs are not rendered by default.

Oops, something went wrong.
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="9532" systemVersion="15D21" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none">
<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="9532" systemVersion="15E39d" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none">
<dependencies>
<deployment identifier="macosx"/>
<development version="5100" identifier="xcode"/>
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="9532"/>
<capability name="box content view" minToolsVersion="7.0"/>
</dependencies>
<objects>
<customObject id="-2" userLabel="File's Owner" customClass="SPExportController">
@@ -1038,12 +1038,12 @@ Gw
<popUpButton verticalHuggingPriority="750" id="1103">
<rect key="frame" x="17" y="285" width="207" height="22"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
<popUpButtonCell key="cell" type="push" title="Filtered Results" bezelStyle="rounded" alignment="left" controlSize="small" lineBreakMode="truncatingTail" state="on" borderStyle="borderAndBezel" imageScaling="proportionallyDown" inset="2" autoenablesItems="NO" id="1104">
<popUpButtonCell key="cell" type="push" bezelStyle="rounded" alignment="left" controlSize="small" lineBreakMode="truncatingTail" borderStyle="borderAndBezel" imageScaling="proportionallyDown" inset="2" autoenablesItems="NO" id="1104">
<behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
<font key="font" metaFont="smallSystem"/>
<menu key="menu" title="OtherViews" autoenablesItems="NO" id="1105">
<items>
<menuItem title="Filtered Results" state="on" id="1108"/>
<menuItem title="Filtered Results" id="1108"/>
<menuItem title="Query Results" id="1107"/>
<menuItem title="Tables" id="1106"/>
</items>

Large diffs are not rendered by default.

Oops, something went wrong.

Large diffs are not rendered by default.

Oops, something went wrong.

Large diffs are not rendered by default.

Oops, something went wrong.

Large diffs are not rendered by default.

Oops, something went wrong.

Large diffs are not rendered by default.

Oops, something went wrong.

Large diffs are not rendered by default.

Oops, something went wrong.

Large diffs are not rendered by default.

Oops, something went wrong.
@@ -1,232 +1,39 @@
<?xml version="1.0" encoding="UTF-8"?>
<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="8.00">
<data>
<int key="IBDocument.SystemTarget">1060</int>
<string key="IBDocument.SystemVersion">13F34</string>
<string key="IBDocument.InterfaceBuilderVersion">6254</string>
<string key="IBDocument.AppKitVersion">1265.21</string>
<string key="IBDocument.HIToolboxVersion">698.00</string>
<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="NS.object.0">6254</string>
</object>
<array key="IBDocument.IntegratedClassDependencies">
<string>NSButton</string>
<string>NSButtonCell</string>
<string>NSCustomObject</string>
<string>NSCustomView</string>
<string>NSUserDefaultsController</string>
</array>
<array key="IBDocument.PluginDependencies">
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
</array>
<object class="NSMutableDictionary" key="IBDocument.Metadata">
<string key="NS.key.0">PluginDependencyRecalculationVersion</string>
<integer value="1" key="NS.object.0"/>
</object>
<array class="NSMutableArray" key="IBDocument.RootObjects" id="1000">
<object class="NSCustomObject" id="1001">
<string key="NSClassName">SPPrintAccessory</string>
</object>
<object class="NSCustomObject" id="1003">
<string key="NSClassName">FirstResponder</string>
</object>
<object class="NSCustomObject" id="1004">
<string key="NSClassName">NSApplication</string>
</object>
<object class="NSCustomView" id="753469230">
<reference key="NSNextResponder"/>
<int key="NSvFlags">268</int>
<array class="NSMutableArray" key="NSSubviews">
<object class="NSButton" id="522835044">
<reference key="NSNextResponder" ref="753469230"/>
<int key="NSvFlags">268</int>
<string key="NSFrame">{{158, 18}, {226, 18}}</string>
<reference key="NSSuperview" ref="753469230"/>
<reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="482038798">
<int key="NSCellFlags">-2080374784</int>
<int key="NSCellFlags2">0</int>
<string key="NSContents">Print Backgrounds</string>
<object class="NSFont" key="NSSupport">
<bool key="IBIsSystemFont">YES</bool>
<double key="NSSize">13</double>
<int key="NSfFlags">1044</int>
</object>
<reference key="NSControlView" ref="522835044"/>
<int key="NSButtonFlags">1211912448</int>
<int key="NSButtonFlags2">2</int>
<object class="NSCustomResource" key="NSNormalImage">
<string key="NSClassName">NSImage</string>
<string key="NSResourceName">NSSwitch</string>
</object>
<object class="NSButtonImageSource" key="NSAlternateImage">
<string key="NSImageName">NSSwitch</string>
</object>
<string key="NSAlternateContents"/>
<string key="NSKeyEquivalent"/>
<int key="NSPeriodicDelay">200</int>
<int key="NSPeriodicInterval">25</int>
</object>
<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
</object>
</array>
<string key="NSFrameSize">{400, 54}</string>
<reference key="NSSuperview"/>
<reference key="NSWindow"/>
<string key="NSClassName">NSView</string>
</object>
<object class="NSUserDefaultsController" id="1038709952">
<bool key="NSSharedInstance">YES</bool>
</object>
</array>
<object class="IBObjectContainer" key="IBDocument.Objects">
<bool key="usesAutoincrementingIDs">NO</bool>
<array key="connectionRecords">
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">printAccessoryView</string>
<reference key="source" ref="1001"/>
<reference key="destination" ref="753469230"/>
</object>
<string key="id">4</string>
</object>
<object class="IBConnectionRecord">
<object class="IBBindingConnection" key="connection">
<string key="label">value: values.PrintBackground</string>
<reference key="source" ref="522835044"/>
<reference key="destination" ref="1038709952"/>
<object class="NSNibBindingConnector" key="connector">
<reference key="NSSource" ref="522835044"/>
<reference key="NSDestination" ref="1038709952"/>
<string key="NSLabel">value: values.PrintBackground</string>
<string key="NSBinding">value</string>
<string key="NSKeyPath">values.PrintBackground</string>
<int key="NSNibBindingConnectorVersion">2</int>
</object>
</object>
<string key="id">7</string>
</object>
</array>
<object class="IBMutableOrderedSet" key="objectRecords">
<array key="orderedObjects">
<object class="IBObjectRecord">
<string key="id">0</string>
<array key="object" id="0"/>
<reference key="children" ref="1000"/>
<nil key="parent"/>
</object>
<object class="IBObjectRecord">
<string key="id">-2</string>
<reference key="object" ref="1001"/>
<reference key="parent" ref="0"/>
<string key="objectName">File's Owner</string>
</object>
<object class="IBObjectRecord">
<string key="id">-1</string>
<reference key="object" ref="1003"/>
<reference key="parent" ref="0"/>
<string key="objectName">First Responder</string>
</object>
<object class="IBObjectRecord">
<string key="id">-3</string>
<reference key="object" ref="1004"/>
<reference key="parent" ref="0"/>
<string key="objectName">Application</string>
</object>
<object class="IBObjectRecord">
<string key="id">1</string>
<reference key="object" ref="753469230"/>
<array class="NSMutableArray" key="children">
<reference ref="522835044"/>
</array>
<reference key="parent" ref="0"/>
</object>
<object class="IBObjectRecord">
<string key="id">2</string>
<reference key="object" ref="522835044"/>
<array class="NSMutableArray" key="children">
<reference ref="482038798"/>
</array>
<reference key="parent" ref="753469230"/>
</object>
<object class="IBObjectRecord">
<string key="id">3</string>
<reference key="object" ref="482038798"/>
<reference key="parent" ref="522835044"/>
</object>
<object class="IBObjectRecord">
<string key="id">5</string>
<reference key="object" ref="1038709952"/>
<reference key="parent" ref="0"/>
</object>
</array>
</object>
<dictionary class="NSMutableDictionary" key="flattenedProperties">
<string key="-1.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="-2.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="-3.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="1.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<array class="NSMutableArray" key="1.IBUserGuides">
<object class="IBUserGuide">
<reference key="view" ref="753469230"/>
<double key="location">160</double>
<int key="affinity">0</int>
</object>
<object class="IBUserGuide">
<reference key="view" ref="753469230"/>
<double key="location">151</double>
<int key="affinity">0</int>
</object>
</array>
<string key="2.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="3.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="5.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
</dictionary>
<dictionary class="NSMutableDictionary" key="unlocalizedProperties"/>
<nil key="activeLocalization"/>
<dictionary class="NSMutableDictionary" key="localizations"/>
<nil key="sourceID"/>
</object>
<object class="IBClassDescriber" key="IBDocument.Classes">
<array class="NSMutableArray" key="referencedPartialClassDescriptions">
<object class="IBPartialClassDescription">
<string key="className">SPPrintAccessory</string>
<string key="superclassName">NSViewController</string>
<dictionary class="NSMutableDictionary" key="outlets">
<string key="defaultsController">NSUserDefaultsController</string>
<string key="printAccessoryView">NSView</string>
</dictionary>
<dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
<object class="IBToOneOutletInfo" key="defaultsController">
<string key="name">defaultsController</string>
<string key="candidateClassName">NSUserDefaultsController</string>
</object>
<object class="IBToOneOutletInfo" key="printAccessoryView">
<string key="name">printAccessoryView</string>
<string key="candidateClassName">NSView</string>
</object>
</dictionary>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBProjectSource</string>
<string key="minorKey">../Source/SPPrintAccessory.h</string>
</object>
</object>
</array>
</object>
<int key="IBDocument.localizationMode">0</int>
<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaFramework</string>
<bool key="IBDocument.previouslyAttemptedUpgradeToXcode5">YES</bool>
<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDevelopmentDependencies">
<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.InterfaceBuilder3</string>
<integer value="4600" key="NS.object.0"/>
</object>
<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
<int key="IBDocument.defaultPropertyAccessControl">3</int>
<object class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes">
<string key="NS.key.0">NSSwitch</string>
<string key="NS.object.0">{15, 15}</string>
</object>
</data>
</archive>
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="6751" systemVersion="13F1507" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none">
<dependencies>
<deployment identifier="macosx"/>
<development version="5100" identifier="xcode"/>
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="6751"/>
</dependencies>
<objects>
<customObject id="-2" userLabel="File's Owner" customClass="SPPrintAccessory">
<connections>
<outlet property="printAccessoryView" destination="1" id="4"/>
</connections>
</customObject>
<customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
<customObject id="-3" userLabel="Application"/>
<customView id="1">
<rect key="frame" x="0.0" y="0.0" width="400" height="54"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
<userGuides>
<userLayoutGuide location="160" affinity="minX"/>
<userLayoutGuide location="151" affinity="minX"/>
</userGuides>
<subviews>
<button id="2">
<rect key="frame" x="158" y="18" width="226" height="18"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
<buttonCell key="cell" type="check" title="Print Backgrounds" bezelStyle="regularSquare" imagePosition="left" alignment="left" state="on" inset="2" id="3">
<behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
<font key="font" metaFont="system"/>
</buttonCell>
<connections>
<binding destination="5" name="value" keyPath="values.PrintBackground" id="7"/>
</connections>
</button>
</subviews>
</customView>
<userDefaultsController representsSharedInstance="YES" id="5"/>
</objects>
</document>
Oops, something went wrong.

0 comments on commit 05407e7

Please sign in to comment.