Merge pull request #34 from kyan/duncan/fix_upcoming_list

Fix upcoming list

.gitignore

@@ -1,5 +1,4 @@
 .repl_history
-build
 tags
 app/pixate_code.rb
 resources/*.nib
@@ -18,4 +17,25 @@ sparkle/release
 sparkle/release/*
 sparkle/config/dsa_priv.pem
 *.dat*
-vendor
+vendor
+.bundle
+
+## Build generated
+build/
+DerivedData/
+
+## Various settings
+*.pbxuser
+!default.pbxuser
+*.mode1v3
+!default.mode1v3
+*.mode2v3
+!default.mode2v3
+*.perspectivev3
+!default.perspectivev3
+xcuserdata/
+
+## Other
+*.moved-aside
+*.xccheckout
+*.xcscmblueprint

Rakefile

@@ -12,7 +12,7 @@ Motion::Project::App.setup do |app|
   app.name = 'KyanBar'
   app.icon = "icon.icns"
   app.identifier = 'com.kyan.kyanbar'
-  app.deployment_target = '10.8'
+  app.deployment_target = '10.9'
   app.codesign_for_release = false
 
   app.info_plist['NSUIElement'] = 1

app/_views/upcoming_table_view.rb

@@ -4,6 +4,11 @@ def init
     super.tap do |v|
       v.translatesAutoresizingMaskIntoConstraints = false
 
+      col1 = NSTableColumn.alloc.initWithIdentifier "col1"
+      col1.setWidth 18
+      col1.identifier = :blank
+      v.addTableColumn col1
+
       col2 = NSTableColumn.alloc.initWithIdentifier "col2"
       col2.setWidth 20
       col2.identifier = :thumb
@@ -18,6 +23,11 @@ def init
       col4.setWidth 40
       col4.identifier = :duration
       v.addTableColumn col4
+
+      col5 = NSTableColumn.alloc.initWithIdentifier "col5"
+      col5.setWidth 18
+      col5.identifier = :blank
+      v.addTableColumn col5
     end
   end
 

app/controllers/preferences_controller.rb

@@ -1,8 +1,8 @@
 class PreferencesController < NSWindowController
   extend IB
 
-  outlet :u_vote_shortcut
-  outlet :d_vote_shortcut
+  outlet :u_vote_shortcut, MASShortcutView
+  outlet :d_vote_shortcut, MASShortcutView
 
   def init
     initWithWindowNibName('Preferences').tap do |pc|

app/controllers/upcoming_controller.rb

@@ -23,8 +23,6 @@ def init_data
 
   def build_view
     @table_view = UpcomingTableView.alloc.init
-    @table_view.setBoundsOrigin([-10,0]);
-    @table_view.setBoundsSize([@table_view.bounds.size.width+20, @table_view.bounds.size.height]);
     @table_view.delegate = self
     @table_view.dataSource = self
     self.setView(@table_view)

ib.xcodeproj/Stubs.h

@@ -1,8 +1,15 @@
-// Generated by IB v0.7.2 gem. Do not edit it manually
+// Generated by IB v0.8.0 gem. Do not edit it manually
 // Run `rake ib:open` to refresh
 
 #import <AppKit/AppKit.h>
+#import <ApplicationServices/ApplicationServices.h>
+#import <AudioToolbox/AudioToolbox.h>
+#import <AudioUnit/AudioUnit.h>
+#import <CFNetwork/CFNetwork.h>
 #import <Carbon/Carbon.h>
+#import <CoreAudio/CoreAudio.h>
+#import <CoreData/CoreData.h>
+#import <CoreFoundation/CoreFoundation.h>
 #import <CoreGraphics/CoreGraphics.h>
 #import <CoreServices/CoreServices.h>
 #import <Foundation/Foundation.h>
@@ -42,6 +49,7 @@
 -(IBAction) update_album;
 -(IBAction) update_addedby;
 -(IBAction) update_image;
+-(IBAction) set_missing_artwork;
 -(IBAction) update_votes;
 -(IBAction) update_vote_txt;
 -(IBAction) update_progress;
@@ -59,6 +67,11 @@
 
 @end
 
+@interface UpcomingTableView: NSTableView
+-(IBAction) init;
+
+@end
+
 @interface VoteButtonsView: NSView
 -(IBAction) init;
 -(IBAction) up_vote_button;
@@ -142,6 +155,17 @@
 
 @end
 
+@interface UpcomingController: NSViewController
+-(IBAction) init;
+-(IBAction) refresh:(id) jukebox;
+-(IBAction) init_data;
+-(IBAction) build_view;
+-(IBAction) numberOfRowsInTableView:(id) table_view;
+-(IBAction) refresh_tracks;
+-(IBAction) current_track;
+
+@end
+
 @interface JukeboxHandler: NSObject
 -(IBAction) initialize:(id) jukebox;
 -(IBAction) after_update;
@@ -160,10 +184,7 @@
 @interface PlaylistHandler: NSObject
 -(IBAction) initialize:(id) track;
 -(IBAction) add;
--(IBAction) dest_url;
--(IBAction) alert_creds_wrong;
 -(IBAction) alert_no_creds;
--(IBAction) parse_json:(id) str;
 -(IBAction) do_notification;
 
 @end

ib.xcodeproj/Stubs.m

@@ -1,4 +1,4 @@
-// Generated by IB v0.7.2 gem. Do not edit it manually
+// Generated by IB v0.8.0 gem. Do not edit it manually
 // Run `rake ib:open` to refresh
 
 #import "Stubs.h"
@@ -15,6 +15,9 @@ @implementation NowplayingView
 @implementation ProgressView
 @end
 
+@implementation UpcomingTableView
+@end
+
 @implementation VoteButtonsView
 @end
 
@@ -39,6 +42,9 @@ @implementation NowplayingController
 @implementation PreferencesController
 @end
 
+@implementation UpcomingController
+@end
+
 @implementation JukeboxHandler
 @end