diff --git a/Interfaces/ConnectionView.xib b/Interfaces/ConnectionView.xib index b35d81310..1aeb152da 100644 --- a/Interfaces/ConnectionView.xib +++ b/Interfaces/ConnectionView.xib @@ -67,7 +67,7 @@ - + @@ -256,7 +256,7 @@ - + diff --git a/Resources/Credits.rtf b/Resources/Credits.rtf index f0966cbd8..f6254780b 100644 --- a/Resources/Credits.rtf +++ b/Resources/Credits.rtf @@ -1,4 +1,4 @@ -{\rtf1\ansi\ansicpg1252\cocoartf2513 +{\rtf1\ansi\ansicpg1252\cocoartf2578 \cocoatextscaling0\cocoaplatform0{\fonttbl\f0\fnil\fcharset0 LucidaGrande-Bold;\f1\fnil\fcharset0 LucidaGrande;\f2\fnil\fcharset128 HiraKakuProN-W3; \f3\fmodern\fcharset0 Courier;} {\colortbl;\red255\green255\blue255;\red25\green25\blue25;\red0\green27\blue199;} @@ -14,12 +14,25 @@ \pard\pardeftab720\qc\partightenfactor0 {\field{\*\fldinst{HYPERLINK "https://github.com/jamesstout"}}{\fldrslt \cf0 James Stout}}\ \pard\pardeftab720\qc\partightenfactor0 -{\field{\*\fldinst{HYPERLINK "https://github.com/gboudreau"}}{\fldrslt \cf0 Guillaume Boudreau}}\ -\pard\pardeftab720\qc\partightenfactor0 {\field{\*\fldinst{HYPERLINK "https://github.com/Kaspik"}}{\fldrslt \cf0 Jakub Ka\'9apar}}\ +\ +\pard\tx566\tx1133\tx1700\tx2267\tx2834\tx3401\tx3968\tx4535\tx5102\tx5669\tx6236\tx6803\pardeftab720\pardirnatural\qc\partightenfactor0 + +\f0\b\fs30 \cf0 Past Developers\ + +\f1\b0\fs22 \ +\pard\pardeftab720\qc\partightenfactor0 +{\field{\*\fldinst{HYPERLINK "https://github.com/gboudreau"}}{\fldrslt \cf0 Guillaume Boudreau}}\ \pard\pardeftab720\qc\partightenfactor0 {\field{\*\fldinst{HYPERLINK "https://github.com/stychos"}}{\fldrslt \cf0 Daniel Luchinets}}\ \ +\pard\pardeftab720\li1\fi-2\ri-15617\qc\partightenfactor0 + +\f0\b\fs30 \cf0 Translations\ +\pard\pardeftab720\qc\partightenfactor0 + +\f1\b0\fs22 \cf0 \ +\ \pard\pardeftab720\qc\partightenfactor0 \f0\b\fs30 \cf2 Former Sequel Pro Developers diff --git a/Source/Controllers/Window/SPWindowController.swift b/Source/Controllers/Window/SPWindowController.swift index dcf7bf031..c9f66014c 100644 --- a/Source/Controllers/Window/SPWindowController.swift +++ b/Source/Controllers/Window/SPWindowController.swift @@ -11,7 +11,7 @@ import SnapKit extension SPWindowController { @objc func setupAppearance() { - // Here should ahppen all UI / layout setups in the future ocne we remove .xib + // Here should happen all UI / layout setups in the future once we remove .xib } @objc func setupConstraints() { diff --git a/Source/Views/SPFlippedView.h b/Source/Views/SPFlippedView.h deleted file mode 100644 index e6fbae1c1..000000000 --- a/Source/Views/SPFlippedView.h +++ /dev/null @@ -1,33 +0,0 @@ -// -// SPFlippedView.h -// sequel-pro -// -// Created by Rowan Beentje on June 28, 2009. -// Copyright (c) 2009 Arboreal. All rights reserved. -// -// Permission is hereby granted, free of charge, to any person -// obtaining a copy of this software and associated documentation -// files (the "Software"), to deal in the Software without -// restriction, including without limitation the rights to use, -// copy, modify, merge, publish, distribute, sublicense, and/or sell -// copies of the Software, and to permit persons to whom the -// Software is furnished to do so, subject to the following -// conditions: -// -// The above copyright notice and this permission notice shall be -// included in all copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES -// OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT -// HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, -// WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR -// OTHER DEALINGS IN THE SOFTWARE. -// -// More info at - -@interface SPFlippedView : NSView - -@end diff --git a/Source/Views/SPFlippedView.m b/Source/Views/SPFlippedView.m deleted file mode 100644 index 9b787f768..000000000 --- a/Source/Views/SPFlippedView.m +++ /dev/null @@ -1,43 +0,0 @@ -// -// SPFlippedView.m -// sequel-pro -// -// Created by Rowan Beentje on June 28, 2009. -// Copyright (c) 2009 Arboreal. All rights reserved. -// -// Permission is hereby granted, free of charge, to any person -// obtaining a copy of this software and associated documentation -// files (the "Software"), to deal in the Software without -// restriction, including without limitation the rights to use, -// copy, modify, merge, publish, distribute, sublicense, and/or sell -// copies of the Software, and to permit persons to whom the -// Software is furnished to do so, subject to the following -// conditions: -// -// The above copyright notice and this permission notice shall be -// included in all copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES -// OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT -// HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, -// WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR -// OTHER DEALINGS IN THE SOFTWARE. -// -// More info at - -#import "SPFlippedView.h" - -@implementation SPFlippedView - -/** - * Is flipped to simplify drawing. - */ -- (BOOL)isFlipped -{ - return YES; -} - -@end diff --git a/sequel-ace.xcodeproj/project.pbxproj b/sequel-ace.xcodeproj/project.pbxproj index f3a7246e5..176dbca86 100644 --- a/sequel-ace.xcodeproj/project.pbxproj +++ b/sequel-ace.xcodeproj/project.pbxproj @@ -55,7 +55,6 @@ 1798F1951550181B004B0AB8 /* SPGroupNode.m in Sources */ = {isa = PBXBuildFile; fileRef = 1798F1941550181B004B0AB8 /* SPGroupNode.m */; }; 1798F19815501838004B0AB8 /* SPMutableArrayAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = 1798F19715501838004B0AB8 /* SPMutableArrayAdditions.m */; }; 1798F19B1550185B004B0AB8 /* SPTreeNode.m in Sources */ = {isa = PBXBuildFile; fileRef = 1798F19A1550185B004B0AB8 /* SPTreeNode.m */; }; - 1798F19E15501892004B0AB8 /* SPFlippedView.m in Sources */ = {isa = PBXBuildFile; fileRef = 1798F19D15501892004B0AB8 /* SPFlippedView.m */; }; 1798F1C4155018E2004B0AB8 /* SPMutableArrayAdditionsTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 1798F1C2155018D4004B0AB8 /* SPMutableArrayAdditionsTests.m */; }; 179ECECA11F265FC009C6A40 /* libbz2.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 179ECEC611F265EE009C6A40 /* libbz2.dylib */; }; 179F15060F7C433C00579954 /* SPEditorTokens.l in Sources */ = {isa = PBXBuildFile; fileRef = 179F15050F7C433C00579954 /* SPEditorTokens.l */; }; @@ -682,8 +681,6 @@ 1798F19715501838004B0AB8 /* SPMutableArrayAdditions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SPMutableArrayAdditions.m; sourceTree = ""; }; 1798F1991550185B004B0AB8 /* SPTreeNode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SPTreeNode.h; sourceTree = ""; }; 1798F19A1550185B004B0AB8 /* SPTreeNode.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SPTreeNode.m; sourceTree = ""; }; - 1798F19C15501892004B0AB8 /* SPFlippedView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SPFlippedView.h; sourceTree = ""; }; - 1798F19D15501892004B0AB8 /* SPFlippedView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SPFlippedView.m; sourceTree = ""; }; 1798F1C2155018D4004B0AB8 /* SPMutableArrayAdditionsTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SPMutableArrayAdditionsTests.m; sourceTree = ""; }; 179ECEC611F265EE009C6A40 /* libbz2.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libbz2.dylib; path = usr/lib/libbz2.dylib; sourceTree = SDKROOT; }; 179F15040F7C433C00579954 /* SPEditorTokens.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SPEditorTokens.h; sourceTree = ""; }; @@ -1934,8 +1931,6 @@ 583CA21412EC8B2200C9E763 /* SPWindow.m */, 17E6417E0EF01FA8001BC333 /* SPImageView.h */, 17E6417F0EF01FA8001BC333 /* SPImageView.m */, - 1798F19C15501892004B0AB8 /* SPFlippedView.h */, - 1798F19D15501892004B0AB8 /* SPFlippedView.m */, 58DF9F7115AB8509003B4330 /* SPSplitView.h */, 58DF9F7215AB8509003B4330 /* SPSplitView.m */, 58C56EF30F438E120035701E /* SPDataCellFormatter.h */, @@ -3267,7 +3262,6 @@ 1A1EE94A2551185D0056FECD /* DateFormatterExtension.swift in Sources */, 513515EF2593568B001E4533 /* PSMRolloverButton.m in Sources */, 1798F19B1550185B004B0AB8 /* SPTreeNode.m in Sources */, - 1798F19E15501892004B0AB8 /* SPFlippedView.m in Sources */, 17D5B49E1553059F00EF3BB3 /* SPViewCopy.m in Sources */, 176E14D115570FE300FAF326 /* SPBundleCommandRunner.m in Sources */, 58DF9F3315AB26C2003B4330 /* SPDateAdditions.m in Sources */,