fixes #11 odd bubble notifications

hohl · Mar 12, 2015 · d21b11e · d21b11e
1 parent ecf83b5
commit d21b11e
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 13 deletions.
diff --git a/SourceDrop/SDPNotificationPopup.h b/SourceDrop/SDPNotificationPopup.h
@@ -33,14 +33,14 @@
 @interface SDPNotificationPopup : NSViewController<NSPopoverDelegate> {
     @protected
     NSString *_message;
-    NSString *_description;
+    NSString *_descriptionMessage;
 }
 
 /// message to be displayed at the popover
 @property (copy, readonly) NSString *message;
 
 /// message to be displayed at the popover
-@property (copy, readonly) NSString *description;
+@property (copy, readonly) NSString *descriptionMessage;
 
 /// delegate to handle the clicks on the notification
 @property (unsafe_unretained) id<SDPStatusBarNotificationDelegate> delegate;
@@ -55,7 +55,7 @@
 /// @param description which is displayed as the smaller detail of the notification
 /// @return controller created for the notification
 ///
-+ (SDPNotificationPopup *)notificationWithMessage:(NSString *)message description:(NSString *)description;
++ (SDPNotificationPopup *)notificationWithMessage:(NSString *)message description:(NSString *)descriptionMessage;
 
 ///
 /// Displays the popup for the notification.

diff --git a/SourceDrop/SDPNotificationPopup.m b/SourceDrop/SDPNotificationPopup.m
@@ -11,12 +11,12 @@
 
 @implementation SDPNotificationPopup
 
-+ (SDPNotificationPopup *)notificationWithMessage:(NSString *)message description:(NSString *)description
++ (SDPNotificationPopup *)notificationWithMessage:(NSString *)message description:(NSString *)descriptionMessage
 {
     Class popoverClass = NSClassFromString(@"NSPopover");
     if (popoverClass != nil)
     {
-        return [[SDPStatusBarNotificationViewController alloc] initWithMessage:message description:description];
+        return [[SDPStatusBarNotificationViewController alloc] initWithMessage:message description:descriptionMessage];
     }
     else
     {

diff --git a/SourceDrop/SDPStatusBarNotificationViewController.h b/SourceDrop/SDPStatusBarNotificationViewController.h
@@ -28,6 +28,6 @@
 ///
 /// @deprecated
 ///
-- (id)initWithMessage:(NSString *)message description:(NSString *)description;
+- (id)initWithMessage:(NSString *)message description:(NSString *)descriptionMessage;
 
 @end
diff --git a/SourceDrop/SDPStatusBarNotificationViewController.m b/SourceDrop/SDPStatusBarNotificationViewController.m
@@ -17,13 +17,13 @@ @interface SDPStatusBarNotificationViewController ()
 @implementation SDPStatusBarNotificationViewController
 @synthesize closingDelay = _closingDelay;
 
-- (id)initWithMessage:(NSString *)message description:(NSString *)description
+- (id)initWithMessage:(NSString *)message description:(NSString *)descriptionMessage
 {
     self = [super initWithNibName:@"SDPStatusBarNotification" bundle:nil];
     if (self)
     {
         _message = message;
-        _description = description;
+        _descriptionMessage = descriptionMessage;
         _closingDelay = 5.0; // seconds
     }
     return self;
@@ -48,10 +48,10 @@ - (void)awakeFromNib
 
     // calculate sizes for the description
     NSSize descriptionTextSize;
-    if (self.description != nil)
+    if (self.descriptionMessage != nil)
     {
-        _descriptionField.stringValue = self.description;
-        descriptionTextSize = [self.description sizeWithWidth:popoverMessageWidth andFont:_descriptionField.font];
+        _descriptionField.stringValue = self.descriptionMessage;
+        descriptionTextSize = [self.descriptionMessage sizeWithWidth:popoverMessageWidth andFont:_descriptionField.font];
         descriptionTextSize = NSMakeSize(descriptionTextSize.width + TextPadding.width, descriptionTextSize.height + TextPadding.height);
     }
     else

diff --git a/SourceDrop/SourceDrop-Info.plist b/SourceDrop/SourceDrop-Info.plist
@@ -17,11 +17,11 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.6</string>
+	<string>1.6.1</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>1169</string>
+	<string>1174</string>
 	<key>LSApplicationCategoryType</key>
 	<string>public.app-category.developer-tools</string>
 	<key>LSMinimumSystemVersion</key>