diff options
-rw-r--r-- | Interfaces/English.lproj/Console.xib | 34 | ||||
-rw-r--r-- | sequel-pro.xcodeproj/project.pbxproj | 4 |
2 files changed, 21 insertions, 17 deletions
diff --git a/Interfaces/English.lproj/Console.xib b/Interfaces/English.lproj/Console.xib index 9cbd0526..4a9d818a 100644 --- a/Interfaces/English.lproj/Console.xib +++ b/Interfaces/English.lproj/Console.xib @@ -1,9 +1,9 @@ -<?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"> +<?xml version="1.0" encoding="UTF-8"?> +<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="11762" systemVersion="16D32" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none"> <dependencies> <deployment identifier="macosx"/> - <development version="5100" identifier="xcode"/> - <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="6751"/> + <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="11762"/> + <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/> </dependencies> <objects> <customObject id="-2" userLabel="File's Owner" customClass="SPQueryController"> @@ -22,7 +22,7 @@ </connections> </customObject> <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/> - <customObject id="-3" userLabel="Application"/> + <customObject id="-3" userLabel="Application" customClass="NSObject"/> <window title="Console" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" oneShot="NO" showsToolbarButton="NO" visibleAtLaunch="NO" frameAutosaveName="" animationBehavior="default" id="3" userLabel="Console" customClass="NSPanel"> <windowStyleMask key="styleMask" titled="YES" closable="YES" miniaturizable="YES" resizable="YES"/> <windowPositionMask key="initialPositionMask" leftStrut="YES" rightStrut="YES" topStrut="YES" bottomStrut="YES"/> @@ -33,8 +33,8 @@ <rect key="frame" x="0.0" y="0.0" width="575" height="203"/> <autoresizingMask key="autoresizingMask"/> <subviews> - <imageView id="71"> - <rect key="frame" x="62" y="0.0" width="513" height="23"/> + <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> @@ -49,7 +49,7 @@ <action selector="saveConsoleAs:" target="-2" id="54"/> </connections> </button> - <searchField verticalHuggingPriority="750" id="8"> + <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"/> <searchFieldCell key="cell" controlSize="small" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" borderStyle="bezel" placeholderString="Filter" usesSingleLineMode="YES" bezelStyle="round" id="13"> @@ -65,14 +65,14 @@ <rect key="frame" x="-1" y="22" width="578" height="144"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> <clipView key="contentView" id="Jw2-4l-Mr3"> - <rect key="frame" x="1" y="17" width="576" height="126"/> + <rect key="frame" x="1" y="0.0" width="576" height="143"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> <subviews> <tableView verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnAutoresizingStyle="lastColumnOnly" autosaveColumns="NO" rowHeight="16" headerView="112" id="14"> <rect key="frame" x="0.0" y="0.0" width="576" height="126"/> <autoresizingMask key="autoresizingMask"/> <size key="intercellSpacing" width="3" height="2"/> - <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/> + <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/> <color key="gridColor" name="gridColor" catalog="System" colorSpace="catalog"/> <tableColumns> <tableColumn identifier="messageDate" editable="NO" width="100" minWidth="50" maxWidth="1000" id="18"> @@ -135,7 +135,6 @@ </connections> </tableView> </subviews> - <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/> </clipView> <scroller key="horizontalScroller" hidden="YES" verticalHuggingPriority="750" horizontal="YES" id="15"> <rect key="frame" x="1" y="127" width="576" height="16"/> @@ -157,8 +156,8 @@ <button toolTip="Clear Console" id="73"> <rect key="frame" x="30" y="-1" width="32" height="25"/> <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/> - <buttonCell key="cell" type="roundTextured" title="Clear" bezelStyle="texturedRounded" image="button_clear" imagePosition="only" alignment="center" state="on" imageScaling="proportionallyDown" inset="2" id="74"> - <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/> + <buttonCell key="cell" type="roundTextured" title="Clear" bezelStyle="texturedRounded" image="button_clear" imagePosition="only" alignment="center" alternateImage="button_clear" state="on" imageScaling="proportionallyDown" inset="2" id="74"> + <behavior key="behavior" lightByContents="YES"/> <font key="font" metaFont="system"/> </buttonCell> <connections> @@ -170,7 +169,7 @@ <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/> <popUpButtonCell key="cell" type="bevel" bezelStyle="regularSquare" imagePosition="right" alignment="center" lineBreakMode="truncatingTail" inset="2" pullsDown="YES" arrowPosition="noArrow" selectedItem="80" id="78"> <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/> - <font key="font" metaFont="system"/> + <font key="font" metaFont="menu"/> <menu key="menu" title="OtherViews" id="79"> <items> <menuItem image="button_action" hidden="YES" id="83"/> @@ -241,6 +240,7 @@ </textField> </subviews> </view> + <point key="canvasLocation" x="139.5" y="161.5"/> </window> <customView id="49" userLabel="saveLogView"> <rect key="frame" x="0.0" y="0.0" width="278" height="79"/> @@ -285,8 +285,8 @@ <userDefaultsController representsSharedInstance="YES" id="89"/> </objects> <resources> - <image name="button_action" width="16" height="16"/> - <image name="button_bar_spacer" width="10" height="29"/> - <image name="button_clear" width="32" height="23"/> + <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> diff --git a/sequel-pro.xcodeproj/project.pbxproj b/sequel-pro.xcodeproj/project.pbxproj index b84b20e4..4ddaedf3 100644 --- a/sequel-pro.xcodeproj/project.pbxproj +++ b/sequel-pro.xcodeproj/project.pbxproj @@ -99,6 +99,7 @@ 17A20AC6124F9B110095CEFB /* SPServerSupport.m in Sources */ = {isa = PBXBuildFile; fileRef = 17A20AC5124F9B110095CEFB /* SPServerSupport.m */; }; 17A7773411C52D8E001E27B4 /* SPIndexesController.m in Sources */ = {isa = PBXBuildFile; fileRef = 17A7773311C52D8E001E27B4 /* SPIndexesController.m */; }; 17A7773811C52E61001E27B4 /* IndexesView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 17A7773611C52E61001E27B4 /* IndexesView.xib */; }; + 17AD35F51E79888D000F213E /* button_clear@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 17AD35F41E79888D000F213E /* button_clear@2x.png */; }; 17AED4161888BD67008E380F /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B5EAC0FC0EC87FF900CC579C /* Security.framework */; }; 17AF787B11FC41C00073D043 /* SPExportFilenameUtilities.m in Sources */ = {isa = PBXBuildFile; fileRef = 17AF787A11FC41C00073D043 /* SPExportFilenameUtilities.m */; }; 17BA2A3215275D8600389803 /* SPExportInterfaceController.m in Sources */ = {isa = PBXBuildFile; fileRef = 17BA2A3115275D8600389803 /* SPExportInterfaceController.m */; }; @@ -802,6 +803,7 @@ 17A7773211C52D8E001E27B4 /* SPIndexesController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SPIndexesController.h; sourceTree = "<group>"; }; 17A7773311C52D8E001E27B4 /* SPIndexesController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SPIndexesController.m; sourceTree = "<group>"; }; 17A7773711C52E61001E27B4 /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = Interfaces/English.lproj/IndexesView.xib; sourceTree = "<group>"; }; + 17AD35F41E79888D000F213E /* button_clear@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "button_clear@2x.png"; sourceTree = "<group>"; }; 17AF787911FC41C00073D043 /* SPExportFilenameUtilities.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SPExportFilenameUtilities.h; sourceTree = "<group>"; }; 17AF787A11FC41C00073D043 /* SPExportFilenameUtilities.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SPExportFilenameUtilities.m; sourceTree = "<group>"; }; 17B7B591101602AE00F057DE /* libssl.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libssl.dylib; path = /usr/lib/libssl.dylib; sourceTree = "<absolute>"; }; @@ -2186,6 +2188,7 @@ C9C9943F1678A439001F5DA8 /* button_bar_spacer.png */, 582E940D1682A2AD003459FD /* button_bar_spacer@2x.png */, 582E94151682A463003459FD /* button_clear.png */, + 17AD35F41E79888D000F213E /* button_clear@2x.png */, 582E94171682A4B4003459FD /* button_duplicate.png */, 582E942316835EA9003459FD /* button_edit.png */, 582E941E16835DD4003459FD /* button_edit_mode.png */, @@ -3057,6 +3060,7 @@ BC962D661144EACA006170BD /* CompletionTokens.plist in Resources */, 17E0937E114AE154007FC1B4 /* SPTableInfoPrintTemplate.html in Resources */, B51D6B9E114C310C0074704E /* toolbar-switch-to-table-triggers.png in Resources */, + 17AD35F51E79888D000F213E /* button_clear@2x.png in Resources */, 17DD52B7115071D0007D8950 /* SPPrintTemplate.html in Resources */, 17F90E2C1210B34900274C98 /* Credits.rtf in Resources */, 17DD52C3115074B3007D8950 /* InfoPlist.strings in Resources */, |