#9 Merge branch 'issue/QM-9'

Automatic update
qvacua · Apr 5, 2013 · a7f8acc · a7f8acc
2 parents b8923a1 + 3248afc
commit a7f8acc
Show file tree

Hide file tree

Showing 29 changed files with 546 additions and 55 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -4,3 +4,6 @@
 [submodule "tbcacao"]
 	path = tbcacao
 	url = git@github.com:qvacua/tbcacao.git
+[submodule "sparke"]
+	path = sparke
+	url = git://github.com/andymatuschak/Sparkle.git
diff --git a/Qmind.xcodeproj/project.pbxproj b/Qmind.xcodeproj/project.pbxproj
diff --git a/Qmind/QMAppDelegate.h b/Qmind/QMAppDelegate.h
@@ -8,6 +8,9 @@
 
 #import <Cocoa/Cocoa.h>
 
+static NSString *const qBundleVersionKey = @"CFBundleVersion";
+static NSString *const qDefaultsVersionKey = @"Version";
+
 /**
 * The NSApp delegate.
 *
@@ -18,4 +21,12 @@
 @property (weak) IBOutlet NSMenuItem *insertNewChildNodeMenuItem;
 @property (weak) IBOutlet NSMenuItem *insertNewLeftChildNodeMenuItem;
 
+@property (unsafe_unretained) IBOutlet NSWindow *preferencesWindow;
+
+@property NSUserDefaults *userDefaults;
+@property NSBundle *mainBundle;
+@property NSDocumentController *documentController;
+
+- (IBAction)showPreferencesWindow:(id)sender;
+
 @end
diff --git a/Qmind/QMAppDelegate.m b/Qmind/QMAppDelegate.m
@@ -7,11 +7,28 @@
  */
 
 #import "QMAppDelegate.h"
+#import "TBCacao/TBCacao.h"
 
 @implementation QMAppDelegate
 
-@synthesize insertNewChildNodeMenuItem = _insertNewChildNodeMenuItem;
-@synthesize insertNewLeftChildNodeMenuItem = _insertNewLeftChildNodeMenuItem;
+TB_MANUALWIRE(userDefaults)
+TB_MANUALWIRE(mainBundle)
+TB_MANUALWIRE(documentController)
+
+#pragma mark IBActions
+- (IBAction)showPreferencesWindow:(id)sender {
+    [self.preferencesWindow makeKeyAndOrderFront:self];
+}
+
+#pragma mark NSObject
+- (id)init {
+    self = [super init];
+    if (self) {
+        [[TBContext sharedContext] autowireSeed:self];
+    }
+
+    return self;
+}
 
 #pragma mark NSApplicationDelegate
 - (BOOL)applicationShouldOpenUntitledFile:(NSApplication *)sender {
@@ -23,17 +40,27 @@ - (BOOL)applicationShouldOpenUntitledFile:(NSApplication *)sender {
 }
 
 - (void)applicationDidFinishLaunching:(NSNotification *)notification {
+    NSInteger currentVersion = [[self.mainBundle objectForInfoDictionaryKey:qBundleVersionKey] integerValue];
+    [self readPreferencesWithCurrentVersion:currentVersion];
+
 #ifdef DEBUG
     NSString *template = [NSString stringWithFormat:@"%@%@", NSHomeDirectory(), @"/Projects/qmind/Meta/TestFiles/%d.mm"];
 
     int count = 7;
-
     for (int i = 6; i < count; i++) {
-        [[NSDocumentController sharedDocumentController]
-                openDocumentWithContentsOfURL:[NSURL fileURLWithPath:[NSString stringWithFormat:template, i]]
-                                      display:YES error:nil];
+        [self.documentController openDocumentWithContentsOfURL:[NSURL fileURLWithPath:[NSString stringWithFormat:template, i]] display:YES error:nil];
     }
 #endif
 }
 
+#pragma mark Private
+- (void)readPreferencesWithCurrentVersion:(NSInteger)currentVersion {
+    NSInteger versionOfDefaults = [self.userDefaults integerForKey:qDefaultsVersionKey];
+
+    if (versionOfDefaults == 0) {
+        // user defaults does not exist
+        [self.userDefaults setInteger:currentVersion forKey:qDefaultsVersionKey];
+    }
+}
+
 @end
diff --git a/Qmind/QMCellDrawer.m b/Qmind/QMCellDrawer.m
@@ -19,10 +19,11 @@
 @implementation QMCellDrawer
 
 TB_BEAN
-TB_AUTOWIRE_WITH_INSTANCE_VAR(textLayoutManager, _textLayoutManager)
-TB_AUTOWIRE_WITH_INSTANCE_VAR(cellLayoutManager, _cellLayoutManager)
-TB_AUTOWIRE_WITH_INSTANCE_VAR(textDrawer, _textDrawer)
-TB_AUTOWIRE_WITH_INSTANCE_VAR(settings, _settings)
+
+TB_AUTOWIRE(textLayoutManager)
+TB_AUTOWIRE(cellLayoutManager)
+TB_AUTOWIRE(textDrawer)
+TB_AUTOWIRE(settings)
 
 #pragma mark Public
 - (void)drawContentForCell:(QMCell *)cell rect:(NSRect)dirtyRect {

diff --git a/Qmind/QMCellEditor.m b/Qmind/QMCellEditor.m
@@ -47,7 +47,7 @@ @implementation QMCellEditor {
     QShadowedView *_containerView;
 }
 
-TB_MANUALWIRE_WITH_INSTANCE_VAR(settings, _settings)
+TB_MANUALWIRE(settings)
 
 @synthesize view = _view;
 @synthesize delegate = _delegate;

diff --git a/Qmind/QMCellLayoutManager.m b/Qmind/QMCellLayoutManager.m
@@ -15,7 +15,7 @@
 @implementation QMCellLayoutManager
 
 TB_BEAN
-TB_AUTOWIRE_WITH_INSTANCE_VAR(settings, _settings)
+TB_AUTOWIRE(settings)
 
 #pragma mark Public
 - (QMCellRegion)regionOfCell:(QMCell *)cell atPoint:(NSPoint)locationInView {

diff --git a/Qmind/QMCellSizeManager.m b/Qmind/QMCellSizeManager.m
@@ -16,8 +16,8 @@
 @implementation QMCellSizeManager
 
 TB_BEAN
-TB_AUTOWIRE_WITH_INSTANCE_VAR(textLayoutManager, _textLayoutManager)
-TB_AUTOWIRE_WITH_INSTANCE_VAR(settings, _settings)
+TB_AUTOWIRE(textLayoutManager)
+TB_AUTOWIRE(settings)
 
 #pragma mark Public
 - (NSSize)sizeOfCell:(QMCell *)cell {

diff --git a/Qmind/QMCellStateManager.h b/Qmind/QMCellStateManager.h
@@ -24,7 +24,7 @@
 - (BOOL)hasSelectedCells;
 - (QMCell *)objectInSelectedCellsAtIndex:(NSUInteger)index;
 - (void)addCellToSelection:(QMCell *)cellToAdd modifier:(NSUInteger)modifier;
-- (void)removeCellFromSelection:(QMCell *)cellToRemove modifier:(int)modifier;
+- (void)removeCellFromSelection:(QMCell *)cellToRemove modifier:(NSUInteger)modifier;
 - (void)clearSelection;
 
 - (void)clearCellsForDrag;

diff --git a/Qmind/QMCellStateManager.m b/Qmind/QMCellStateManager.m
@@ -75,7 +75,7 @@ - (void)addCellToSelection:(QMCell *)cellToAdd modifier:(NSUInteger)modifier {
     [self addSingleCell:cellToAdd];
 }
 
-- (void)removeCellFromSelection:(QMCell *)cellToRemove modifier:(int)modifier {
+- (void)removeCellFromSelection:(QMCell *)cellToRemove modifier:(NSUInteger)modifier {
     if (modifier & NSCommandKeyMask & NSShiftKeyMask) {
         // both modifiers
         return;

diff --git a/Qmind/QMDocument.m b/Qmind/QMDocument.m
@@ -25,9 +25,9 @@ @implementation QMDocument {
     QMDocumentWindowController *_windowController;
 }
 
-TB_MANUALWIRE_WITH_INSTANCE_VAR(settings, _settings)
-TB_MANUALWIRE_WITH_INSTANCE_VAR(mindmapReader, _mindmapReader)
-TB_MANUALWIRE_WITH_INSTANCE_VAR(mindmapWriter, _mindmapWriter)
+TB_MANUALWIRE(settings)
+TB_MANUALWIRE(mindmapReader)
+TB_MANUALWIRE(mindmapWriter)
 
 @synthesize windowController = _windowController;
 
@@ -40,8 +40,8 @@ - (void)copyItemsToPasteboard:(NSArray *)items {
 }
 
 - (void)cutItemsToPasteboard:(NSArray *)items {
-    id const anyItem = [items lastObject];
-    QMNode *parent = [anyItem parent];
+    QMNode *anyItem = [items lastObject];
+    QMNode *parent = anyItem.parent;
 
     [_windowController clearSelection:self];
 

diff --git a/Qmind/QMDocumentWindowController.m b/Qmind/QMDocumentWindowController.m
@@ -40,8 +40,8 @@ @implementation QMDocumentWindowController {
     CGFloat _lastIconsPaneWidth;
 }
 
-TB_MANUALWIRE_WITH_INSTANCE_VAR(settings, _settings)
-TB_MANUALWIRE_WITH_INSTANCE_VAR(iconManager, _iconManager)
+TB_MANUALWIRE(settings)
+TB_MANUALWIRE(iconManager)
 
 @synthesize mindmapView = _mindmapView;
 @synthesize availableIconsArray = _availableIconsArray;
@@ -89,7 +89,7 @@ - (void)updateCellWithIdentifier:(id)identifier withNewLeftChild:(id)childIdenti
 
 #pragma mark IBActions
 - (IBAction)zoomByMode:(id)sender {
-    int clickedSegment = [sender selectedSegment];
+    NSInteger clickedSegment = [sender selectedSegment];
 
     switch (clickedSegment) {
         case 0:

diff --git a/Qmind/QMFontConverter.m b/Qmind/QMFontConverter.m
@@ -25,8 +25,8 @@ @implementation QMFontConverter {
 }
 
 TB_BEAN
-TB_AUTOWIRE_WITH_INSTANCE_VAR(settings, _settings)
-TB_AUTOWIRE_WITH_INSTANCE_VAR(fontManager, _fontManager)
+TB_AUTOWIRE(settings)
+TB_AUTOWIRE(fontManager)
 
 #pragma mark Public
 - (NSFont *)fontFromFontAttrDict:(NSDictionary *)fontAttrDict {

diff --git a/Qmind/QMManualBeanProvider.m b/Qmind/QMManualBeanProvider.m
@@ -15,7 +15,10 @@ + (NSArray *)beanContainers {
 
     if (manualBeans == nil) {
         manualBeans = @[
-                [TBBeanContainer beanContainerWithBean:[NSFontManager sharedFontManager]]
+                [TBBeanContainer beanContainerWithBean:[NSFontManager sharedFontManager]],
+                [TBBeanContainer beanContainerWithBean:[NSUserDefaults standardUserDefaults]],
+                [TBBeanContainer beanContainerWithBean:[NSBundle mainBundle]],
+                [TBBeanContainer beanContainerWithBean:[NSDocumentController sharedDocumentController]],
         ];
     }
 

diff --git a/Qmind/QMMindmapReader.m b/Qmind/QMMindmapReader.m
@@ -13,7 +13,7 @@
 #import "QMRootNode.h"
 
 static NSString * const qMapKey = @"map";
-static NSString * const qVersionKey = @"version";
+static NSString * const qDefaultsVersionKey = @"version";
 static NSString * const qNodeKey = @"node";
 
 @implementation QMMindmapReader {
@@ -53,7 +53,7 @@ - (void)parser:(NSXMLParser *)parser
 
     if ([elementName isEqualToString:qMapKey]) {
         // This is the map node which contains everything
-        NSString *version = [attributeDict objectForKey:qVersionKey];
+        NSString *version = [attributeDict objectForKey:qDefaultsVersionKey];
         log4Debug(@"MindMap version: %@", version);
 
         return;

diff --git a/Qmind/QMMindmapView.h b/Qmind/QMMindmapView.h
@@ -87,8 +87,6 @@ static const int qDeleteAllIconsMenuItemTag = 1100;
 #pragma mark NSResponder
 - (void)keyDown:(NSEvent *)theEvent;
 - (void)mouseDown:(NSEvent *)event;
-- (void)mouseDragged:(NSEvent *)event;
-- (void)mouseUp:(NSEvent *)event;
 - (void)scrollWheel:(NSEvent *)event;
 - (void)magnifyWithEvent:(NSEvent *)event;
 - (BOOL)acceptsFirstResponder;

diff --git a/Qmind/QMMindmapView.m b/Qmind/QMMindmapView.m
@@ -51,10 +51,10 @@ @implementation QMMindmapView {
     NSUInteger _mouseDownModifier;
 }
 
-TB_MANUALWIRE_WITH_INSTANCE_VAR(cellSelector, _cellSelector)
-TB_MANUALWIRE_WITH_INSTANCE_VAR(cellLayoutManager, _cellLayoutManager)
-TB_MANUALWIRE_WITH_INSTANCE_VAR(settings, _settings)
-TB_MANUALWIRE_WITH_INSTANCE_VAR(uiDrawer, _uiDrawer)
+TB_MANUALWIRE(cellSelector)
+TB_MANUALWIRE(cellLayoutManager)
+TB_MANUALWIRE(settings)
+TB_MANUALWIRE(uiDrawer)
 
 @synthesize dataSource = _dataSource;
 @synthesize rootCell = _rootCell;

diff --git a/Qmind/QMMindmapViewDataSourceImpl.m b/Qmind/QMMindmapViewDataSourceImpl.m
@@ -23,8 +23,8 @@ @implementation QMMindmapViewDataSourceImpl {
     __weak QMMindmapView *_view;
 }
 
-TB_MANUALWIRE_WITH_INSTANCE_VAR(settings, _settings)
-TB_MANUALWIRE_WITH_INSTANCE_VAR(iconManager, _iconManager)
+TB_MANUALWIRE(settings)
+TB_MANUALWIRE(iconManager)
 
 #pragma mark Public
 - (BOOL)mindmapView:(QMMindmapView *)mindmapView isItemLeft:(id)item {
@@ -105,7 +105,7 @@ - (void)mindmapView:(QMMindmapView *)mindmapView deleteIconOfItem:(id)item atInd
 }
 
 - (void)mindmapView:(QMMindmapView *)mindmapView deleteAllIconsOfItem:(id)item {
-    [self doInsideUndoGroup:NSLocalizedString(@"undo.node.icon.delete", @"Delete Icon") usingBlock:^{
+    [self doInsideUndoGroup:NSLocalizedString(@"undo.node.icon.all.delete", @"Delete Icon") usingBlock:^{
         [_doc deleteAllIconsOfItem:item];
     }];
 }

diff --git a/Qmind/QMMindmapWriter.m b/Qmind/QMMindmapWriter.m
@@ -16,7 +16,7 @@
 @implementation QMMindmapWriter
 
 TB_BEAN
-TB_AUTOWIRE_WITH_INSTANCE_VAR(fontConverter, _fontConverter)
+TB_AUTOWIRE(fontConverter)
 
 #pragma mark Public
 - (NSData *)dataForRootNode:(QMRootNode *)rootNode {

diff --git a/Qmind/QMTextLayoutManager.m b/Qmind/QMTextLayoutManager.m
@@ -18,7 +18,7 @@ @implementation QMTextLayoutManager {
 }
 
 TB_BEAN
-TB_AUTOWIRE_WITH_INSTANCE_VAR(settings, _settings)
+TB_AUTOWIRE(settings)
 
 #pragma mark Public
 - (CGFloat)widthOfString:(NSString *)string {

diff --git a/Qmind/Qmind-Info.plist b/Qmind/Qmind-Info.plist
@@ -2,6 +2,10 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
+	<key>SUFeedURL</key>
+	<string>http://qvacua.com/qmind/appcast.xml</string>
+	<key>SUPublicDSAKeyFile</key>
+	<string>sparkle-pub.pem</string>
 	<key>CFBundleDevelopmentRegion</key>
 	<string>en</string>
 	<key>CFBundleDocumentTypes</key>
@@ -42,11 +46,11 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>0.1.0</string>
+	<string>0.2.0</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>15</string>
+	<string>16</string>
 	<key>LSApplicationCategoryType</key>
 	<string>public.app-category.productivity</string>
 	<key>LSMinimumSystemVersion</key>

diff --git a/Qmind/Resources/sparkle-pub.pem b/Qmind/Resources/sparkle-pub.pem
@@ -0,0 +1,12 @@
+-----BEGIN PUBLIC KEY-----
+MIIBtzCCASsGByqGSM44BAEwggEeAoGBAOlzzBvZj77sIuH3M0UXswch8coQOl9R
+nbyfZDaiU19Treuh0T3xtWCcL3wf8vaCnD9ITTmjYmigJy9w9EHeqa5/z/MN11Vo
+sHSjrTQ7yejmSM8P+SQlImPQC3QoQkxtHvocwJTjriDQQspOaoOIvCMTNeYwy8Wh
+ESF6ARwfqVJHAhUAlZkcLRR1a148vjIC7DwYQPNZ1bkCgYAZBdblHvHv2xq286La
+lV/E6dzpcSOV5cF53KBbPyyhmteqUQwmGBs9vSrH5WfI7xVRMILb3dGLTmFPa9ZJ
+VwaN0SGG8TWEcoaI4O2YfHiFwmGN1NfggnOi8J8peldFu2vap6OwdiNNGH5jwVu+
+atFX70UkFzKh39OuvdJVFLkYSQOBhQACgYEAu3DYq91S9AHGWhBMObRNUTisbcVx
+czAXiMqiTog3l+jPyaALOe7ocEvWB5OtTAk3o40Rp01JtLytXce+UqecjS6J1bOH
+AaUK0XyMSiAfv8f8ghfWHAFsy53HAh9IU8DTVx3lTqpYtymTSVkiEeNEffDr6Nfu
+QvtgWdK215ATy3o=
+-----END PUBLIC KEY-----
diff --git a/Qmind/en.lproj/Localizable.strings b/Qmind/en.lproj/Localizable.strings
@@ -18,8 +18,10 @@
 
 "undo.node.icon.add" = "Insert Icon";
 "undo.node.icon.delete" = "Delete Icon";
+"undo.node.icon.all.delete" = "Delete All Icons";
 
 "delete.node.icon" = "Delete %@";
 "delete.node.icon.generic" = "Delete Icon";
 "delete.node.unsupported.icon" = "Unsupported Icon";
 
+