Improvements to the statusbar icon/menu

Author: elasticthreads

AppController.h

@@ -29,7 +29,6 @@
 @class TitlebarButton;
 @class LinearDividerShader;
 @class TagEditingManager;
-@class StatusItemView;
 @class DFView;
 @class PreviewController;
 @class WordCountToken;
@@ -63,7 +62,6 @@
     BOOL wasDeleting;
     IBOutlet ETContentView *mainView;
 	DFView *dualFieldView;
-	StatusItemView *cView;
     NSStatusItem *statusItem;
 	IBOutlet NSMenu *statBarMenu;
 	TagEditingManager *tagEditor;
@@ -186,8 +184,6 @@ void outletObjectAwoke(id sender);
 //- (void)setIsEditing:(BOOL)inBool inCell:(NSCell *)theCell;
 //- (void)focusOnCtrlFld:(id)sender;
 - (NSMenu *)statBarMenu;
-- (void)toggleAttachedWindow:(NSNotification *)aNotification;
-- (void)toggleAttachedMenu:(NSNotification *)aNotification;
 - (NSArray *)commonLabelsForNotesAtIndexes:(NSIndexSet *)selDexes;
 - (IBAction)multiTag:(id)sender;
 - (void)releaseTagEditor:(NSNotification *)note;

AppController.m

@@ -43,7 +43,6 @@
 #import "TagEditingManager.h"
 #import "NotesTableHeaderCell.h"
 #import "DFView.h"
-#import "StatusItemView.h"
 #import "ETContentView.h"
 #import "PreviewController.h"
 #import "ETClipView.h"
@@ -143,8 +142,6 @@ - (id)init {
 
         NSNotificationCenter *nc=[NSNotificationCenter defaultCenter];
         [nc addObserver:previewController selector:@selector(requestPreviewUpdate:) name:@"TextViewHasChangedContents" object:self];
-        [nc addObserver:self selector:@selector(toggleAttachedWindow:) name:@"NVShouldActivate" object:nil];
-        [nc addObserver:self selector:@selector(toggleAttachedMenu:) name:@"StatusItemMenuShouldDrop" object:nil];
         [nc addObserver:self selector:@selector(togDockIcon:) name:@"AppShouldToggleDockIcon" object:nil];
         [nc addObserver:self selector:@selector(toggleStatusItem:) name:@"AppShouldToggleStatusItem" object:nil];
 
@@ -344,65 +341,54 @@ - (void)runDelayedUIActionsAfterLaunch {
 	[[prefsController bookmarksController] setAppController:self];
 	[[prefsController bookmarksController] restoreWindowFromSave];
 	[[prefsController bookmarksController] updateBookmarksUI];
-	[self updateNoteMenus];
-	[textView setupFontMenu];
-	[prefsController registerAppActivationKeystrokeWithTarget:self selector:@selector(toggleNVActivation:)];
-	[notationController updateLabelConnectionsAfterDecoding];
-	[notationController checkIfNotationIsTrashed];
-	[[SecureTextEntryManager sharedInstance] checkForIncompatibleApps];
-
-	//connect sparkle programmatically to avoid loading its framework at nib awake;
-	
-	if (!NSClassFromString(@"SUUpdater")) {
-		NSString *frameworkPath = [[[NSBundle bundleForClass:[self class]] privateFrameworksPath] stringByAppendingPathComponent:@"Sparkle.framework"];
-		if ([[NSBundle bundleWithPath:frameworkPath] load]) {
-			SUUpdater *updater =[NSClassFromString(@"SUUpdater") performSelector:@selector(sharedUpdater)];
-            if (IsLionOrLater) {
-                [updater setFeedURL:[NSURL URLWithString:kSparkleUpdateFeedForLions]];
-            }else{
-                [updater setFeedURL:[NSURL URLWithString:kSparkleUpdateFeedForSnowLeopard]];
-            }
-			[sparkleUpdateItem setTarget:updater];
-			[sparkleUpdateItem setAction:@selector(checkForUpdates:)];
-			NSMenuItem *siSparkle = [statBarMenu itemWithTag:902];
-			[siSparkle setTarget:updater];
-			[siSparkle setAction:@selector(checkForUpdates:)];
-			if (![[prefsController notationPrefs] firstTimeUsed]) {
-				//don't do anything automatically on the first launch; afterwards, check every 4 days, as specified in Info.plist
-//				SEL checksSEL = @selector(setAutomaticallyChecksForUpdates:);
-                [updater setAutomaticallyChecksForUpdates:YES];
-//				[updater methodForSelector:checksSEL](updater, checksSEL, YES);
-			}
-		} else {
-			NSLog(@"Could not load %@!", frameworkPath);
-		}
-	}else{
-        NSLog(@"su");
-    }
-	// add elasticthreads' menuitems
-	NSMenuItem *theMenuItem = [[[NSMenuItem alloc] init] autorelease];
-	[theMenuItem setTarget:self];
-    //	NSMenu *notesMenu = [[[NSApp mainMenu] itemWithTag:NOTES_MENU_ID] submenu];
-	theMenuItem = [theMenuItem copy];
-    //	[statBarMenu insertItem:theMenuItem atIndex:4];
-	[theMenuItem release];
-    //theMenuItem = [[viewMenu itemWithTag:801] copy];
-	//[statBarMenu insertItem:theMenuItem atIndex:11];
-    //[theMenuItem release];
+    [self updateNoteMenus];
+    [textView setupFontMenu];
+    [prefsController registerAppActivationKeystrokeWithTarget:self selector:@selector(toggleNVActivation:)];
+    [notationController updateLabelConnectionsAfterDecoding];
+    [notationController checkIfNotationIsTrashed];
+    [[SecureTextEntryManager sharedInstance] checkForIncompatibleApps];
+
+    //connect sparkle programmatically to avoid loading its framework at nib awake;
+    //    if (!NSClassFromString(@"SUUpdater")) {
+    //        NSLog(@"su:%@ SEL:%@",sparkleUpdateItem.target,sparkleUpdateItem.action);
+    //    }else{
+    NSString *frameworkPath = [[[NSBundle bundleForClass:[self class]] privateFrameworksPath] stringByAppendingPathComponent:@"Sparkle.framework"];
+    if ([[NSBundle bundleWithPath:frameworkPath] load]) {
+        SUUpdater *updater =[SUUpdater sharedUpdater];
+        if (IsLionOrLater) {
+            [updater setFeedURL:[NSURL URLWithString:kSparkleUpdateFeedForLions]];
+        }else{
+            [updater setFeedURL:[NSURL URLWithString:kSparkleUpdateFeedForSnowLeopard]];
+        }
+        [sparkleUpdateItem setTarget:updater];
+        [sparkleUpdateItem setAction:@selector(checkForUpdates:)];
+        NSMenuItem *siSparkle = [statBarMenu itemWithTag:902];
+        [siSparkle setTarget:updater];
+        [siSparkle setAction:@selector(checkForUpdates:)];
+        if (![[prefsController notationPrefs] firstTimeUsed]) {
+            //don't do anything automatically on the first launch; afterwards, check every 4 days, as specified in Info.plist
+            //				SEL checksSEL = @selector(setAutomaticallyChecksForUpdates:);
+            [updater setAutomaticallyChecksForUpdates:YES];
+            //				[updater methodForSelector:checksSEL](updater, checksSEL, YES);
+        }
+    } else {
+        NSLog(@"Could not load %@!", frameworkPath);
+    }
+    //    }
+    // add elasticthreads' menuitems
     if(IsLeopardOrLater){
-        //theMenuItem =[viewMenu itemWithTag:314];
         [fsMenuItem setEnabled:YES];
         [fsMenuItem setHidden:NO];
-		
+
 #if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_7
         if (IsLionOrLater) {
             //  [window setCollectionBehavior:NSWindowCollectionBehaviorTransient|NSWindowCollectionBehaviorMoveToActiveSpace];
             //
             [window setCollectionBehavior:NSWindowCollectionBehaviorFullScreenPrimary];
             //            [window setCollectionBehavior:NSWindowCollectionBehaviorFullScreenAuxiliary];
-//            [NSApp setPresentationOptions:[NSApp currentSystemPresentationOptions]|NSApplicationPresentationFullScreen];
-            
-            
+            //            [NSApp setPresentationOptions:[NSApp currentSystemPresentationOptions]|NSApplicationPresentationFullScreen];
+
+
         }else{
 #endif
             [fsMenuItem setTarget:self];
@@ -411,7 +397,8 @@ - (void)runDelayedUIActionsAfterLaunch {
 #if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_7
         }
 #endif
-        theMenuItem = [fsMenuItem copy];
+
+        NSMenuItem *theMenuItem = [fsMenuItem copy];
         [statBarMenu insertItem:theMenuItem atIndex:14];
         [theMenuItem release];
     }
@@ -2228,7 +2215,6 @@ - (void)dealloc {
 	[dividerShader release];
 	[[NSStatusBar systemStatusBar] removeStatusItem:statusItem];
     [statusItem release];
-    [cView release];
     [statBarMenu release];
 	[self postTextUpdate];
 
@@ -2467,15 +2453,7 @@ - (NSMenu *)statBarMenu{
 	return statBarMenu;
 }
 
-- (void)toggleAttachedWindow:(NSNotification *)aNotification
-{
-	[self toggleNVActivation:[aNotification object]];
-}
 
-- (void)toggleAttachedMenu:(NSNotification *)aNotification
-{
-	[statusItem popUpStatusItemMenu:statBarMenu];
-}
 
 #pragma mark multitagging
 
@@ -2807,7 +2785,7 @@ - (IBAction)switchFullScreen:(id)sender
         NSResponder *currentResponder = [window firstResponder];
         NSDictionary* options;
         if (([[NSUserDefaults standardUserDefaults] boolForKey:@"ShowDockIcon"])&&(IsSnowLeopardOrLater)) {
-            options = [NSDictionary dictionaryWithObjectsAndKeys:[NSNumber numberWithInt:(NSApplicationPresentationAutoHideMenuBar | NSApplicationPresentationHideDock)],@"NSFullScreenModeApplicationPresentationOptions", nil];
+            options = @{@"NSFullScreenModeApplicationPresentationOptions":@(NSApplicationPresentationAutoHideMenuBar | NSApplicationPresentationHideDock)};
         }else {
             options = nil;
         }
@@ -3377,22 +3355,49 @@ - (void)hideDockIconAfterDelay{
 
         [self performSelector:@selector(hideDockIcon) withObject:nil afterDelay:0.22];
     }
-    
+
+
+
+- (IBAction)statusItemAction:(id)sender{
+
+    NSEvent *curEv=[NSApp currentEvent];
+    if ((curEv.type==NSEventTypeRightMouseUp)||((NSEventModifierFlagControl&curEv.modifierFlags)!=0)) {
+        [statusItem popUpStatusItemMenu:statBarMenu];
+        //        NSPoint og=NSMakePoint(statusItem.button.frame.origin.x, 27.f);//NSMaxY(statusItem.button.frame));
+        //        [self.statusMenu popUpMenuPositioningItem:nil atLocation:og inView:statusItem.button];
+    }else{
+        [self toggleNVActivation:sender];
+    }
+}
+
+
 - (void)setUpStatusBarItem{
-    NSRect viewFrame = NSMakeRect(0.0f, 0.0f, 24.0f,[[NSStatusBar systemStatusBar] thickness]);
-    statusItem = [[[NSStatusBar systemStatusBar] statusItemWithLength:24.0f] retain];
-    cView = [[[StatusItemView alloc] initWithFrame:viewFrame] autorelease];
-    [statusItem setView:cView];
-    
-    [[NSNotificationCenter defaultCenter]postNotificationName:@"StatusBarMenuIsAwake" object:statBarMenu];
+
+    NSImage *statusIcon=[NSImage imageNamed:@"nvMenuDark"];
+    [statusIcon setSize:NSMakeSize(16.0, 16.0)];
+    [statusIcon setTemplate:YES];
+    statusItem =[[NSStatusBar systemStatusBar] statusItemWithLength:24.f];
+    if (!IsYosemiteOrLater) {
+        statusItem.button.image=statusIcon;
+        statusItem.button.target=self;
+        statusItem.button.action=@selector(statusItemAction:);
+        [statusItem.button sendActionOn:NSEventMaskLeftMouseUp|NSEventMaskRightMouseUp];
+    }else{
+        statusItem.image=statusIcon;
+        statusItem.target=self;
+        statusItem.action=@selector(statusItemAction:);
+         [statusItem sendActionOn:NSEventMaskLeftMouseUp|NSEventMaskRightMouseUp];
+        statusItem.highlightMode=YES;
+    }
+    [statusItem retain];
+
 }
 
     - (void)toggleStatusItem:(NSNotification *)notification{
         if (!statusItem) {
             [self setUpStatusBarItem];
         }else{
             [[NSStatusBar systemStatusBar]removeStatusItem:statusItem];
-            cView=nil;
             statusItem=nil;
         }
     }

GlobalPrefs.m

@@ -663,16 +663,14 @@ - (NSDictionary*)noteBodyAttributes {
 		NSMutableDictionary *attrs = [[NSMutableDictionary dictionaryWithObjectsAndKeys:bodyFont, NSFontAttributeName, nil] retain];
 
 		//not storing the foreground color in each note will make the database smaller, and black is assumed when drawing text
-		//NSColor *fgColor = [self foregroundTextColor];
-		NSColor *fgColor = [[NSApp delegate] foregrndColor];
+		NSColor *fgColor = [(AppController *)[NSApp delegate] foregrndColor];
 
 		if (!ColorsEqualWith8BitChannels([NSColor blackColor], fgColor)) {
 			[attrs setObject:fgColor forKey:NSForegroundColorAttributeName];
 		}
 		// background text color is handled directly by the NSTextView subclass and so does not need to be stored here
-		if ([self _bodyFontIsMonospace]) {
-			
-		//	NSLog(@"notebody att3");
+		if ([self _bodyFontIsMonospace]) {			
+//			NSLog(@"notebody att3");
 			NSParagraphStyle *pStyle = [self noteBodyParagraphStyle];
 			if (pStyle)
 				[attrs setObject:pStyle forKey:NSParagraphStyleAttributeName];
@@ -683,7 +681,7 @@ - (NSDictionary*)noteBodyAttributes {
 	}else {
 		//NSLog(@"notebody att4");
 		NSMutableDictionary *attrs = [[NSMutableDictionary dictionaryWithObjectsAndKeys:bodyFont, NSFontAttributeName, nil] retain];
-		NSColor *fgColor = [[NSApp delegate] foregrndColor];
+		NSColor *fgColor = [(AppController *)[NSApp delegate] foregrndColor];
 
 		//	if (!ColorsEqualWith8BitChannels([NSColor blackColor], fgColor)) {
 		[attrs setObject:fgColor forKey:NSForegroundColorAttributeName];
@@ -709,18 +707,16 @@ - (NSParagraphStyle*)noteBodyParagraphStyle {
 		while (numberOfSpaces--) {
 			[sizeString appendString:@" "];
 		}
-		NSDictionary *sizeAttribute = [[NSDictionary alloc] initWithObjectsAndKeys:bodyFont, NSFontAttributeName, nil];
-		float sizeOfTab = [sizeString sizeWithAttributes:sizeAttribute].width;
-		[sizeAttribute release];
+
+		float sizeOfTab = [sizeString sizeWithAttributes:@{NSFontAttributeName:bodyFont}].width;
 		[sizeString release];
 
 		noteBodyParagraphStyle = [[NSParagraphStyle defaultParagraphStyle] mutableCopy];
-		
-		NSTextTab *textTabToBeRemoved;
-		NSEnumerator *enumerator = [[noteBodyParagraphStyle tabStops] objectEnumerator];
-		while ((textTabToBeRemoved = [enumerator nextObject])) {
-			[noteBodyParagraphStyle removeTabStop:textTabToBeRemoved];
-		}
+
+
+        for (NSTextTab *textTabToBeRemoved in [noteBodyParagraphStyle tabStops]) {
+            [noteBodyParagraphStyle removeTabStop:textTabToBeRemoved];
+        }
 		//[paragraphStyle setHeadIndent:sizeOfTab]; //for soft-indents, this would probably have to be applied contextually, and heaven help us for soft tabs
 
 		[noteBodyParagraphStyle setDefaultTabInterval:sizeOfTab];

LinkingEditor.m

@@ -170,9 +170,10 @@ - (BOOL)becomeFirstResponder {
 			[self performSelector:@selector(indicateRange:) withObject:[NSValue valueWithRange:range] afterDelay:0];
 		}
 	}
-	
 	[self setTypingAttributes:[prefsController noteBodyAttributes]];
-	
+//    NSLog(@"exist :>%@<",self.defaultParagraphStyle);
+//    [self.textStorage setAttributes:@{NSParagraphStyleAttributeName:[NSParagraphStyle defaultParagraphStyle]} range:NSMakeRange(0, self.string.length)];
+//    NSLog(@"exist :>%@<",self.defaultParagraphStyle);
 	[self performSelector:@selector(_fixCursorForBackgroundUpdatingMouseInside:) withObject:[NSNumber numberWithBool:YES] afterDelay:0.0];
 
 	return [super becomeFirstResponder];
@@ -1007,11 +1008,11 @@ - (void)deleteBackward:(id)sender {
 					[super deleteBackward:sender];
 				} else {
 
-					unsigned tabWidth = [prefsController numberOfSpacesInTab];
-					unsigned indentWidth = 4;
+					NSInteger tabWidth = [prefsController numberOfSpacesInTab];
+					NSInteger indentWidth = 4;
 					BOOL usesTabs = ![prefsController softTabs];
 					NSRange leadingSpaceRange = paraRange;
-					unsigned leadingSpaces = [string numberOfLeadingSpacesFromRange:&leadingSpaceRange tabWidth:tabWidth];
+					NSInteger leadingSpaces = [string numberOfLeadingSpacesFromRange:&leadingSpaceRange tabWidth:tabWidth];
 
 					if (charRange.location > NSMaxRange(leadingSpaceRange)) {
 
@@ -1031,7 +1032,7 @@ - (void)deleteBackward:(id)sender {
 						}
 
 						NSTextStorage *text = [self textStorage];
-						unsigned leadingIndents = leadingSpaces / indentWidth;
+						NSInteger leadingIndents = leadingSpaces / indentWidth;
 						NSString *replaceString;
 
 						// If we were indented to an fractional level just go back to the last even multiple of indentWidth, if we were exactly on, go back a full level.
@@ -1735,7 +1736,7 @@ - (void)showGeneratedPasswords:(id)sender {
     // display modal overlay, get user selection and insert it
     // Nice to have:
     // keep stats on the user's selection and then use the most frequent choice in [insertGeneratedPassword] (instead of just [strong])
-    #lse
+    #else
     [self insertGeneratedPassword:nil];
     #endif
 }

NSString_NV.h

@@ -39,8 +39,8 @@ CFDateFormatterRef simplenoteDateFormatter(int lowPrecision);
 - (NSString*)syntheticTitleAndSeparatorWithContext:(NSString**)sepStr bodyLoc:(NSUInteger*)bodyLoc 
 										  oldTitle:(NSString*)oldTitle maxTitleLen:(NSUInteger)maxTitleLen;
 - (NSString*)syntheticTitleAndTrimmedBody:(NSString**)newBody;
-+ (NSString *)tabbifiedStringWithNumberOfSpaces:(unsigned)origNumSpaces tabWidth:(unsigned)tabWidth usesTabs:(BOOL)usesTabs;
-- (unsigned)numberOfLeadingSpacesFromRange:(NSRange*)range tabWidth:(unsigned)tabWidth;
++ (NSString *)tabbifiedStringWithNumberOfSpaces:(NSInteger)origNumSpaces tabWidth:(NSInteger)tabWidth usesTabs:(BOOL)usesTabs;
+- (NSInteger)numberOfLeadingSpacesFromRange:(NSRange*)range tabWidth:(NSInteger)tabWidth;
 
 	BOOL IsHardLineBreakUnichar(unichar uchar, NSString *str, unsigned charIndex);