modernize code

74hc595 · Jun 10, 2014 · 03240f1 · 03240f1
1 parent 8fa3b7d
commit 03240f1
Show file tree

Hide file tree

Showing 9 changed files with 738 additions and 707 deletions.
diff --git a/Source/CurrentsongAppDelegate.h b/Source/CurrentsongAppDelegate.h
@@ -12,22 +12,15 @@
 @class LaunchAtLoginController;
 
 @interface CurrentsongAppDelegate : NSObject <NSApplicationDelegate,NSMenuDelegate>
-{
-    NSStatusItem *mStatusItem;
-    CurrentsongStatusView *mStatusView;
-    NSTimer *mMenuUpdateTimer;
-    BOOL mMenuIsOpen;
-
-    IBOutlet NSMenu *mMenu;
-    IBOutlet NSMenuItem *mNameMenuItem;
-    IBOutlet NSMenuItem *mArtistMenuItem;
-    IBOutlet NSMenuItem *mAlbumMenuItem;
-    IBOutlet NSMenuItem *mStreamTitleMenuItem;
-    IBOutlet NSMenuItem *mTimeMenuItem;
-    IBOutlet NSMenuItem *mVersionMenuItem;
-
-    IBOutlet LaunchAtLoginController *mLaunchAtLoginController;
-}
+
+@property (weak) IBOutlet NSMenu *menu;
+@property (weak) IBOutlet NSMenuItem *nameMenuItem;
+@property (weak) IBOutlet NSMenuItem *artistMenuItem;
+@property (weak) IBOutlet NSMenuItem *albumMenuItem;
+@property (weak) IBOutlet NSMenuItem *streamTitleMenuItem;
+@property (weak) IBOutlet NSMenuItem *timeMenuItem;
+@property (weak) IBOutlet NSMenuItem *versionMenuItem;
+@property (weak) IBOutlet LaunchAtLoginController *launchAtLoginController;
 
 - (IBAction)toggleShowArtist:(id)sender;
 - (IBAction)toggleShowAlbum:(id)sender;

diff --git a/Source/CurrentsongAppDelegate.m b/Source/CurrentsongAppDelegate.m
diff --git a/Source/CurrentsongStatusView.h b/Source/CurrentsongStatusView.h
@@ -8,44 +8,15 @@
 
 #import <Cocoa/Cocoa.h>
 
-typedef enum
+typedef NS_ENUM(NSInteger, CurrentsongViewStyle)
 {
     kCSStyleFormatted,
     kCSStylePlain,
     kCSStyleTwoLevel
-} CurrentsongViewStyle;
+};
 
 
 @interface CurrentsongStatusView : NSView
-{
-    NSStatusItem *mStatusItem;
-
-    // Properties
-    BOOL mHighlighted;
-    CurrentsongViewStyle mViewStyle;
-    CGFloat mMaxWidth;
-    BOOL mShowArtist;
-    BOOL mShowAlbum;
-    BOOL mShouldScroll;
-
-    // Track data
-    BOOL mShowPauseIcon;
-    BOOL mIsStream;
-    NSString *mArtist;
-    NSString *mName;
-    NSString *mAlbum;
-
-    NSAttributedString *mTopRow;
-    NSAttributedString *mBottomRow;
-    CGFloat mTopRowScrollOffset;
-    CGFloat mBottomRowScrollOffset;
-    BOOL mScrollTopRow;
-    BOOL mScrollBottomRow;
-    NSTimer *mScrollTimer;
-
-    CGImageRef mAlphaMask;
-    BOOL mAlphaMaskAccountsForPauseIcon;
-}
 
 @property (nonatomic,strong) NSStatusItem *statusItem;
 @property (nonatomic,assign) BOOL highlighted;