Fixed memory leak in MPDatabaseDocument

Added more Icons
This commit is contained in:
Michael Starke
2013-02-17 19:39:15 +01:00
parent f20e3d6e1e
commit 50931ca327
14 changed files with 50 additions and 6 deletions

Binary file not shown.

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.2 KiB

After

Width:  |  Height:  |  Size: 6.7 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 37 KiB

After

Width:  |  Height:  |  Size: 41 KiB

View File

@@ -76,6 +76,11 @@
4CAD748E15B88AC100104512 /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 4CAD748D15B88AC100104512 /* libz.dylib */; };
4CBA981815BA0DB600721965 /* MPDatabaseDocument.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CBA981715BA0DB600721965 /* MPDatabaseDocument.m */; };
4CC6259115BA1C99002F5B11 /* MPOutlineViewDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CC6259015BA1C99002F5B11 /* MPOutlineViewDelegate.m */; };
4CD78ABC16D155FF00768A1D /* 07_NotepadTemplate.pdf in Resources */ = {isa = PBXBuildFile; fileRef = 4CD78AB716D155FF00768A1D /* 07_NotepadTemplate.pdf */; };
4CD78ABD16D155FF00768A1D /* 08_SocketTemplate.pdf in Resources */ = {isa = PBXBuildFile; fileRef = 4CD78AB816D155FF00768A1D /* 08_SocketTemplate.pdf */; };
4CD78ABE16D155FF00768A1D /* 09_IdentityTemplate.pdf in Resources */ = {isa = PBXBuildFile; fileRef = 4CD78AB916D155FF00768A1D /* 09_IdentityTemplate.pdf */; };
4CD78ABF16D155FF00768A1D /* 10_ContactTemplate.pdf in Resources */ = {isa = PBXBuildFile; fileRef = 4CD78ABA16D155FF00768A1D /* 10_ContactTemplate.pdf */; };
4CD78AC016D155FF00768A1D /* 11_CameraTemplate.pdf in Resources */ = {isa = PBXBuildFile; fileRef = 4CD78ABB16D155FF00768A1D /* 11_CameraTemplate.pdf */; };
4CD884B715BD47080042BBF8 /* MainWindow.xib in Resources */ = {isa = PBXBuildFile; fileRef = 4CD884B615BD47080042BBF8 /* MainWindow.xib */; };
/* End PBXBuildFile section */
@@ -212,6 +217,11 @@
4CBA981715BA0DB600721965 /* MPDatabaseDocument.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MPDatabaseDocument.m; sourceTree = "<group>"; };
4CC6258F15BA1C99002F5B11 /* MPOutlineViewDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MPOutlineViewDelegate.h; sourceTree = "<group>"; };
4CC6259015BA1C99002F5B11 /* MPOutlineViewDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MPOutlineViewDelegate.m; sourceTree = "<group>"; };
4CD78AB716D155FF00768A1D /* 07_NotepadTemplate.pdf */ = {isa = PBXFileReference; lastKnownFileType = image.pdf; path = 07_NotepadTemplate.pdf; sourceTree = "<group>"; };
4CD78AB816D155FF00768A1D /* 08_SocketTemplate.pdf */ = {isa = PBXFileReference; lastKnownFileType = image.pdf; path = 08_SocketTemplate.pdf; sourceTree = "<group>"; };
4CD78AB916D155FF00768A1D /* 09_IdentityTemplate.pdf */ = {isa = PBXFileReference; lastKnownFileType = image.pdf; path = 09_IdentityTemplate.pdf; sourceTree = "<group>"; };
4CD78ABA16D155FF00768A1D /* 10_ContactTemplate.pdf */ = {isa = PBXFileReference; lastKnownFileType = image.pdf; path = 10_ContactTemplate.pdf; sourceTree = "<group>"; };
4CD78ABB16D155FF00768A1D /* 11_CameraTemplate.pdf */ = {isa = PBXFileReference; lastKnownFileType = image.pdf; path = 11_CameraTemplate.pdf; sourceTree = "<group>"; };
4CD884B615BD47080042BBF8 /* MainWindow.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = MainWindow.xib; sourceTree = "<group>"; };
/* End PBXFileReference section */
@@ -285,6 +295,11 @@
4C2E381A16D11FF900037A9D /* 03_ServerTemplate.pdf */,
4C2E381B16D11FF900037A9D /* 04_KlipperTemplate.pdf */,
4C2E381C16D11FF900037A9D /* 05_LanguagesTemplate.pdf */,
4CD78AB716D155FF00768A1D /* 07_NotepadTemplate.pdf */,
4CD78AB816D155FF00768A1D /* 08_SocketTemplate.pdf */,
4CD78AB916D155FF00768A1D /* 09_IdentityTemplate.pdf */,
4CD78ABA16D155FF00768A1D /* 10_ContactTemplate.pdf */,
4CD78ABB16D155FF00768A1D /* 11_CameraTemplate.pdf */,
);
path = Icons;
sourceTree = "<group>";
@@ -605,6 +620,11 @@
4C2E381D16D11FF900037A9D /* 03_ServerTemplate.pdf in Resources */,
4C2E381E16D11FF900037A9D /* 04_KlipperTemplate.pdf in Resources */,
4C2E381F16D11FF900037A9D /* 05_LanguagesTemplate.pdf in Resources */,
4CD78ABC16D155FF00768A1D /* 07_NotepadTemplate.pdf in Resources */,
4CD78ABD16D155FF00768A1D /* 08_SocketTemplate.pdf in Resources */,
4CD78ABE16D155FF00768A1D /* 09_IdentityTemplate.pdf in Resources */,
4CD78ABF16D155FF00768A1D /* 10_ContactTemplate.pdf in Resources */,
4CD78AC016D155FF00768A1D /* 11_CameraTemplate.pdf in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

View File

@@ -83,6 +83,14 @@ NSString *const MPDidLoadDataBaseNotification = @"DidLoadDataBaseNotification";
return self;
}
- (void)dealloc
{
self.tree = nil;
self.file = nil;
self.password = nil;
[super dealloc];
}
- (KdbGroup *)root {
return [self.tree root];
}

View File

@@ -14,7 +14,12 @@ typedef enum {
MPIconWarning,
MPIconServer,
MPIconKlipper,
MPIconLanguages
MPIconLanguages,
MPIconNotepad,
MPIconSocket,
MPIconIdentity,
MPIconContact,
MPIconCamera
} MPIconType;
@interface MPIconHelper : NSObject

View File

@@ -23,8 +23,13 @@
@(MPIconPackageNetwork): @"01_PackageNetworkTemplate",
@(MPIconPassword): @"00_PasswordTemplate",
@(MPIconServer): @"03_ServerTemplate",
@(MPIconWarning): @"02_MessageBoxWarningTemplate" };
@(MPIconWarning): @"02_MessageBoxWarningTemplate",
@(MPIconCamera): @"11_CameraTemplate",
@(MPIconContact): @"10_ContactTemplate",
@(MPIconIdentity): @"09_IdentityTemplate",
@(MPIconNotepad): @"07_NotepadTemplate",
@(MPIconSocket): @"08_SocketTemplate"
};
return imageNames;
}

View File

@@ -91,8 +91,8 @@ NSString *const kOutlineViewIdentifier = @"OutlineView";
NSSize frameSize = [self.contentView frame].size;
[self.passwordView setFrame:NSMakeRect(0,0, frameSize.width, frameSize.height)];
[self.contentView setAutoresizesSubviews:YES];
[self.contentView addSubview:self.passwordView];
[self.contentView replaceSubview:self.welcomeView with:self.passwordView];
[self.window makeFirstResponder:self.passwordView];
}
- (void)usePassword:(id)sender {

View File

@@ -173,6 +173,7 @@
<string key="NSFrame">{{209, 13}, {74, 32}}</string>
<reference key="NSSuperview" ref="1005"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="736946738">
@@ -185,7 +186,7 @@
<int key="NSButtonFlags">-2038284288</int>
<int key="NSButtonFlags2">129</int>
<string key="NSAlternateContents"/>
<string key="NSKeyEquivalent"/>
<string type="base64-UTF8" key="NSKeyEquivalent">DQ</string>
<int key="NSPeriodicDelay">200</int>
<int key="NSPeriodicInterval">25</int>
</object>
@@ -706,6 +707,7 @@
<string key="outlineView">NSOutlineView</string>
<string key="passwordTextField">NSTextField</string>
<string key="passwordView">NSView</string>
<string key="welcomeView">NSView</string>
</dictionary>
<dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
<object class="IBToOneOutletInfo" key="contentView">
@@ -728,6 +730,10 @@
<string key="name">passwordView</string>
<string key="candidateClassName">NSView</string>
</object>
<object class="IBToOneOutletInfo" key="welcomeView">
<string key="name">welcomeView</string>
<string key="candidateClassName">NSView</string>
</object>
</dictionary>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBProjectSource</string>