Permalink
Browse files

Merge branch 'sp-master'

* sp-master: (27 commits)
  #2485: Fix completion popup background colour when using dark mode.
  Perfom duplicate table name validation on suggested name.
  #2600: Remember copy content when duplicating a table.
  Update copyright year.
  Fix nullability specifier warnings.
  Drop support for i386 architecture to allow building release builds in Xcode 10 (#2785 & #3179)
  Fix UI interaction from background thread when selecting a table that doesn't exist.
  Fix menu item validation warning.
  Tidy up some parameter naming.
  #2485: Fix typo.
  Update copyright year.
  Switch more URL's to https.
  #2485: Remove unncessary dark mode check.
  Disable query column resizing in console.
  Use https links in credits where possible.
  #2636: Fix display of indexes against geometry columns.
  #2636: Fix display of indexes against geometry columns.
  #2485: Make external links in help viewer more readable in dark mode.
  Link to https URLs.
  Another attempt at #3187
  ...
  • Loading branch information...
Kaspik committed Oct 9, 2018
2 parents 29a5583 + b50b180 commit c2a03fc997dc49f035270196cdcc6e195fdea70a
@@ -436,7 +436,6 @@
17E5952D14F302740054EE08 /* Distribution */ = {
isa = XCBuildConfiguration;
buildSettings = {
ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
CLANG_LINK_OBJC_RUNTIME = NO;
CLANG_STATIC_ANALYZER_MODE = deep;
CLANG_WARN_BOOL_CONVERSION = YES;
@@ -461,7 +460,6 @@
INFOPLIST_FILE = Resources/Info.plist;
INFOPLIST_PREFIX_HEADER = "";
MACOSX_DEPLOYMENT_TARGET = 10.6;
VALID_ARCHS = "i386 x86_64";
};
name = Distribution;
};
@@ -673,7 +671,6 @@
1DEB91B208733DA50010E9CD /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
CLANG_LINK_OBJC_RUNTIME = NO;
CLANG_STATIC_ANALYZER_MODE = deep;
CLANG_WARN_BOOL_CONVERSION = YES;
@@ -701,14 +698,12 @@
INFOPLIST_PREFIX_HEADER = "";
MACOSX_DEPLOYMENT_TARGET = 10.6;
ONLY_ACTIVE_ARCH = YES;
VALID_ARCHS = "i386 x86_64";
};
name = Debug;
};
1DEB91B308733DA50010E9CD /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
CLANG_LINK_OBJC_RUNTIME = NO;
CLANG_STATIC_ANALYZER_MODE = deep;
CLANG_WARN_BOOL_CONVERSION = YES;
@@ -733,7 +728,6 @@
INFOPLIST_FILE = Resources/Info.plist;
INFOPLIST_PREFIX_HEADER = "";
MACOSX_DEPLOYMENT_TARGET = 10.6;
VALID_ARCHS = "i386 x86_64";
};
name = Release;
};
@@ -667,7 +667,6 @@
1DEB91B208733DA50010E9CD /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
CLANG_LINK_OBJC_RUNTIME = NO;
CLANG_WARN_BOOL_CONVERSION = YES;
CLANG_WARN_CONSTANT_CONVERSION = YES;
@@ -697,14 +696,12 @@
MACOSX_DEPLOYMENT_TARGET = 10.6;
ONLY_ACTIVE_ARCH = YES;
SDKROOT = macosx;
VALID_ARCHS = "i386 x86_64";
};
name = Debug;
};
1DEB91B308733DA50010E9CD /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
CLANG_LINK_OBJC_RUNTIME = NO;
CLANG_WARN_BOOL_CONVERSION = YES;
CLANG_WARN_CONSTANT_CONVERSION = YES;
@@ -731,7 +728,6 @@
MACH_O_TYPE = mh_dylib;
MACOSX_DEPLOYMENT_TARGET = 10.6;
SDKROOT = macosx;
VALID_ARCHS = "i386 x86_64";
};
name = Release;
};
@@ -835,7 +831,6 @@
507FF2361BC0E0A800104523 /* Unit Testing */ = {
isa = XCBuildConfiguration;
buildSettings = {
ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
CLANG_LINK_OBJC_RUNTIME = NO;
CLANG_WARN_BOOL_CONVERSION = YES;
CLANG_WARN_CONSTANT_CONVERSION = YES;
@@ -865,7 +860,6 @@
MACOSX_DEPLOYMENT_TARGET = 10.6;
ONLY_ACTIVE_ARCH = YES;
SDKROOT = macosx;
VALID_ARCHS = "i386 x86_64";
};
name = "Unit Testing";
};
@@ -935,7 +929,6 @@
586AA55214F5D599007F82BF /* Distribution */ = {
isa = XCBuildConfiguration;
buildSettings = {
ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
CLANG_LINK_OBJC_RUNTIME = NO;
CLANG_WARN_BOOL_CONVERSION = YES;
CLANG_WARN_CONSTANT_CONVERSION = YES;
@@ -962,7 +955,6 @@
MACH_O_TYPE = mh_dylib;
MACOSX_DEPLOYMENT_TARGET = 10.6;
SDKROOT = macosx;
VALID_ARCHS = "i386 x86_64";
};
name = Distribution;
};
@@ -113,7 +113,7 @@
<color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
<tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/>
<tableColumnResizingMask key="resizingMask" resizeWithTable="YES" />
</tableColumn>
</tableColumns>
<connections>
@@ -3099,15 +3099,18 @@ Gw
</textFieldCell>
</textField>
<button id="514">
<rect key="frame" x="19" y="43" width="223" height="18"/>
<rect key="frame" x="17" y="43" width="227" height="18"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<buttonCell key="cell" type="check" title="Duplicate table content" bezelStyle="regularSquare" imagePosition="left" alignment="left" controlSize="small" inset="2" id="3832">
<behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
<font key="font" metaFont="smallSystem"/>
</buttonCell>
<connections>
<binding destination="1907" name="value" keyPath="values.CopyContentOnTableCopy" id="4I8-Es-EDn"/>
</connections>
</button>
<button verticalHuggingPriority="750" tag="1" id="515">
<rect key="frame" x="148" y="13" width="97" height="28"/>
<rect key="frame" x="150" y="13" width="97" height="28"/>
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxY="YES"/>
<buttonCell key="cell" type="push" title="Duplicate" bezelStyle="rounded" alignment="center" controlSize="small" borderStyle="border" tag="1" inset="2" id="3833">
<behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
@@ -3121,7 +3124,7 @@ DQ
</connections>
</button>
<button verticalHuggingPriority="750" id="516">
<rect key="frame" x="59" y="13" width="91" height="28"/>
<rect key="frame" x="61" y="13" width="91" height="28"/>
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxY="YES"/>
<buttonCell key="cell" type="push" title="Cancel" bezelStyle="rounded" alignment="center" controlSize="small" borderStyle="border" inset="2" id="3834">
<behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
@@ -3139,7 +3142,7 @@ Gw
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
<textFieldCell key="cell" controlSize="small" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" drawsBackground="YES" usesSingleLineMode="YES" id="n3P-gU-pX8">
<font key="font" metaFont="smallSystem"/>
<color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
<color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
<connections>
@@ -3148,6 +3151,7 @@ Gw
</textField>
</subviews>
</view>
<point key="canvasLocation" x="183" y="402.5"/>
</window>
<window title="Key Sheet" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" releasedWhenClosed="NO" visibleAtLaunch="NO" animationBehavior="default" id="409" userLabel="Key Sheet">
<windowStyleMask key="styleMask" titled="YES"/>
View
@@ -1,8 +1,8 @@
Copyright (c) 2002-2017 Sequel Pro & CocoaMySQL Teams.
Copyright (c) 2002-2018 Sequel Pro & CocoaMySQL Teams.
All rights reserved.
http://sequelpro.com/
https://sequelpro.com/
Permission is hereby granted, free of charge, to any person
obtaining a copy of this software and associated documentation
@@ -9,6 +9,7 @@
<attribute name="create_view_priv" optional="YES" attributeType="Boolean" defaultValueString="NO" syncable="YES"/>
<attribute name="db" attributeType="String" maxValueString="64" indexed="YES" syncable="YES"/>
<attribute name="delete_priv" optional="YES" attributeType="Boolean" defaultValueString="NO" syncable="YES"/>
<attribute name="delete_versioning_rows_priv" optional="YES" attributeType="Boolean" syncable="YES"/>
<attribute name="drop_priv" optional="YES" attributeType="Boolean" defaultValueString="NO" syncable="YES"/>
<attribute name="event_priv" optional="YES" attributeType="Boolean" defaultValueString="NO" syncable="YES"/>
<attribute name="execute_priv" optional="YES" attributeType="Boolean" defaultValueString="NO" syncable="YES"/>
@@ -35,6 +36,7 @@
<attribute name="create_user_priv" optional="YES" attributeType="Boolean" defaultValueString="NO" syncable="YES"/>
<attribute name="create_view_priv" optional="YES" attributeType="Boolean" defaultValueString="NO" syncable="YES"/>
<attribute name="delete_priv" optional="YES" attributeType="Boolean" defaultValueString="NO" syncable="YES"/>
<attribute name="delete_versioning_rows_priv" optional="YES" attributeType="Boolean" syncable="YES"/>
<attribute name="drop_priv" optional="YES" attributeType="Boolean" defaultValueString="NO" syncable="YES"/>
<attribute name="event_priv" optional="YES" attributeType="Boolean" defaultValueString="NO" syncable="YES"/>
<attribute name="execute_priv" optional="YES" attributeType="Boolean" defaultValueString="NO" syncable="YES"/>
Oops, something went wrong.

0 comments on commit c2a03fc

Please sign in to comment.