From 52b734239f3bddd8e8ead491e9a26ccc452af4d4 Mon Sep 17 00:00:00 2001 From: michael starke Date: Mon, 4 Nov 2013 00:26:19 +0100 Subject: [PATCH] Fixed layout constraints bug in InspectorView Updated more xibs to Xcode 5 format More stubbing regarding autotype --- MacPass.xcodeproj/project.pbxproj | 6 + .../xcshareddata/xcschemes/MacPass.xcscheme | 14 +- MacPass/Base.lproj/InspectorView.xib | 20 +- MacPass/DatabaseSettingsWindow.xib | 54 +- MacPass/DocumentWindow.xib | 235 +- MacPass/EntryInspectorView.xib | 2 +- MacPass/GroupInspectorView.xib | 1950 ++--------------- MacPass/MPDocument+Autotype.h | 2 + MacPass/MPDocument+Autotype.m | 4 + MacPass/MPDocument.h | 2 +- MacPass/OutlineView.xib | 1391 ++---------- MacPass/OverlayWindow.xib | 603 +---- MacPass/PasswordCreatorWindow.xib | 193 +- MacPass/PasswordEditWindow.xib | 1817 ++------------- MacPass/WelcomeWindow.xib | 887 +------- MacPassTests/MPDatabaseCreation.m | 3 +- MacPassTests/MPDatabasePasswordAndKeyfile.m | 19 +- 17 files changed, 857 insertions(+), 6345 deletions(-) diff --git a/MacPass.xcodeproj/project.pbxproj b/MacPass.xcodeproj/project.pbxproj index 93415770..1778578c 100644 --- a/MacPass.xcodeproj/project.pbxproj +++ b/MacPass.xcodeproj/project.pbxproj @@ -38,6 +38,7 @@ 4C19E500178E26EF002F2CD0 /* Test_Password_1234.kdbx in Resources */ = {isa = PBXBuildFile; fileRef = 4C19E4FF178E26EF002F2CD0 /* Test_Password_1234.kdbx */; }; 4C19E503178E2871002F2CD0 /* MPDatabasePasswordAndKeyfile.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C19E502178E2871002F2CD0 /* MPDatabasePasswordAndKeyfile.m */; }; 4C1DDCDD1711ECEB00C98DA3 /* PasswordCreatorWindow.xib in Resources */ = {isa = PBXBuildFile; fileRef = 4C1DDCDC1711ECEB00C98DA3 /* PasswordCreatorWindow.xib */; }; + 4C1FA07B18231900003A3F8C /* MPDocument+Autotype.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C1FA07A18231900003A3F8C /* MPDocument+Autotype.m */; }; 4C224B4217DFCB2400FF6AEE /* MPNumericalInputFormatter.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C224B4117DFCB2400FF6AEE /* MPNumericalInputFormatter.m */; }; 4C245B76176E1E3D0086100E /* DDData.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C245A6A176E1E3C0086100E /* DDData.m */; }; 4C245B77176E1E3D0086100E /* DDNumber.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C245A6C176E1E3C0086100E /* DDNumber.m */; }; @@ -330,6 +331,8 @@ 4C19E501178E2871002F2CD0 /* MPDatabasePasswordAndKeyfile.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MPDatabasePasswordAndKeyfile.h; sourceTree = ""; }; 4C19E502178E2871002F2CD0 /* MPDatabasePasswordAndKeyfile.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MPDatabasePasswordAndKeyfile.m; sourceTree = ""; }; 4C1DDCDC1711ECEB00C98DA3 /* PasswordCreatorWindow.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = PasswordCreatorWindow.xib; sourceTree = ""; }; + 4C1FA07918231900003A3F8C /* MPDocument+Autotype.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "MPDocument+Autotype.h"; sourceTree = ""; }; + 4C1FA07A18231900003A3F8C /* MPDocument+Autotype.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "MPDocument+Autotype.m"; sourceTree = ""; }; 4C224B4017DFCB2300FF6AEE /* MPNumericalInputFormatter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MPNumericalInputFormatter.h; sourceTree = ""; }; 4C224B4117DFCB2400FF6AEE /* MPNumericalInputFormatter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MPNumericalInputFormatter.m; sourceTree = ""; }; 4C245A69176E1E3C0086100E /* DDData.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DDData.h; sourceTree = ""; }; @@ -1106,6 +1109,8 @@ 4CE5B548173AFBA700207B39 /* MPDocument.h */, 4CE5B549173AFBA700207B39 /* MPDocument.m */, 4C3666401787327E00B249F1 /* MPDocument+Attachments.m */, + 4C1FA07918231900003A3F8C /* MPDocument+Autotype.h */, + 4C1FA07A18231900003A3F8C /* MPDocument+Autotype.m */, ); name = Model; sourceTree = ""; @@ -1978,6 +1983,7 @@ 4CCEDE32179F5B6C008402BE /* KPKDataStreamReader.m in Sources */, 4C17D8E517A1C780006C8C1E /* MPDocumentWindowDelegate.m in Sources */, 4C63B8FB17A3154D0091BD72 /* MPContextToolbarButton.m in Sources */, + 4C1FA07B18231900003A3F8C /* MPDocument+Autotype.m in Sources */, 4C4B7EE917A45EC6000234C7 /* MPDatePickingViewController.m in Sources */, 4C4B7EEE17A467E1000234C7 /* MPGroupInspectorViewController.m in Sources */, 4C4B7EF317A467FC000234C7 /* MPEntryInspectorViewController.m in Sources */, diff --git a/MacPass.xcodeproj/xcshareddata/xcschemes/MacPass.xcscheme b/MacPass.xcodeproj/xcshareddata/xcschemes/MacPass.xcscheme index d878443e..c7857ba5 100644 --- a/MacPass.xcodeproj/xcshareddata/xcschemes/MacPass.xcscheme +++ b/MacPass.xcodeproj/xcshareddata/xcschemes/MacPass.xcscheme @@ -48,6 +48,13 @@ ReferencedContainer = "container:MacPass.xcodeproj"> + + + + + isEnabled = "YES"> + + 1080 - 12F45 - 4510 - 1187.40 - 626.00 + 13A603 + 4514 + 1265 + 695.00 com.apple.InterfaceBuilder.CocoaPlugin - 4510 + 4514 IBNSLayoutConstraint @@ -48,7 +48,7 @@ 268 - {{57, 409}, {204, 17}} + {{58, 409}, {202, 17}} @@ -60,7 +60,7 @@ 272636224 Label - LucidaGrande + .LucidaGrandeUI 13 1044 @@ -86,6 +86,7 @@ NO + 1 @@ -232,6 +233,7 @@ NO + 1 {278, 369} @@ -915,6 +917,8 @@ + + com.apple.InterfaceBuilder.CocoaPlugin InitialTabViewItem @@ -1100,7 +1104,7 @@ 3 {16, 16} - {15, 15} + {14, 14} YES diff --git a/MacPass/DatabaseSettingsWindow.xib b/MacPass/DatabaseSettingsWindow.xib index 526a8944..bf676d24 100644 --- a/MacPass/DatabaseSettingsWindow.xib +++ b/MacPass/DatabaseSettingsWindow.xib @@ -1,8 +1,8 @@ - + - + @@ -34,7 +34,7 @@ - + @@ -63,7 +63,7 @@ DQ - + @@ -75,7 +75,7 @@ DQ - + @@ -84,7 +84,7 @@ DQ - + @@ -93,24 +93,24 @@ DQ - + - + - + - + - + @@ -128,7 +128,7 @@ DQ - + @@ -137,7 +137,7 @@ DQ - + @@ -157,11 +157,11 @@ DQ -