From 714e1e12523e2c972725b3a80396ba14bec108ee Mon Sep 17 00:00:00 2001 From: Duncan Robertson Date: Wed, 8 Jan 2014 13:28:16 +0000 Subject: [PATCH] better vote info and add jukebox link --- Gemfile.lock | 4 ++-- app/_buttons/vote_button.rb | 2 -- app/_views/nowplaying_view.rb | 21 ++++++++++++++++----- app/_views/vote_buttons_view.rb | 6 ++++++ app/_views/vote_view.rb | 1 - app/config/constants.rb | 3 +++ app/menu.rb | 3 ++- resources/jukebox.png | Bin 0 -> 3554 bytes 8 files changed, 29 insertions(+), 11 deletions(-) create mode 100644 resources/jukebox.png diff --git a/Gemfile.lock b/Gemfile.lock index 287217d..7bb8c71 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,8 +1,8 @@ GIT remote: git@github.com:kyan/kyan_jukebox_websocket_lib.git - revision: 092ab4ee680b0c382919d41ede1d9b9731fdb470 + revision: f702e1268351d140d8c7ee7ba6b587ade0cfeaa3 specs: - kyan_jukebox (0.1.7) + kyan_jukebox (0.1.9) GEM remote: https://rubygems.org/ diff --git a/app/_buttons/vote_button.rb b/app/_buttons/vote_button.rb index 91cf1be..6475c66 100644 --- a/app/_buttons/vote_button.rb +++ b/app/_buttons/vote_button.rb @@ -12,10 +12,8 @@ def initWithVote vote if vote button.cell.setImage(NSImage.imageNamed(NSImageNameAddTemplate)) - button.setToolTip(" Vote Up ") else button.cell.setImage(NSImage.imageNamed(NSImageNameRemoveTemplate)) - button.setToolTip(" Vote Down ") end end end diff --git a/app/_views/nowplaying_view.rb b/app/_views/nowplaying_view.rb index c9cb172..294cdfe 100644 --- a/app/_views/nowplaying_view.rb +++ b/app/_views/nowplaying_view.rb @@ -228,12 +228,23 @@ def update_image end def update_votes - puts "Changed: #{@jukebox.whats_changed}" - - score = if valid_jb_data?(:rating) - rating.rating unless rating.nil? - elsif valid_jb_data?(:track) + score = if valid_jb_data?(:track) track.rating unless track.nil? + elsif valid_jb_data?(:rating) + rating.rating unless rating.nil? + end + + if superview + uvote_button = superview.viewWithTag(U_VOTE_BUTTON) + dvote_button = superview.viewWithTag(D_VOTE_BUTTON) + + if !uvote_button.nil? + uvote_button.setToolTip(rating.p_ratings) + end + + if !dvote_button.nil? + dvote_button.setToolTip(rating.n_ratings) + end end @image.handle_vote(score, rating) diff --git a/app/_views/vote_buttons_view.rb b/app/_views/vote_buttons_view.rb index c0d98e1..41367aa 100644 --- a/app/_views/vote_buttons_view.rb +++ b/app/_views/vote_buttons_view.rb @@ -1,5 +1,7 @@ class VoteButtonsView < NSView + attr_reader :up_vote_button, :down_vote_button + def init super.tap do |v| v.translatesAutoresizingMaskIntoConstraints = false @@ -51,10 +53,14 @@ def init def up_vote_button @up_vote_button ||= VoteButton.alloc.initWithVote(true) + @up_vote_button.tag = U_VOTE_BUTTON + @up_vote_button end def down_vote_button @down_vote_button ||= VoteButton.alloc.initWithVote(false) + @down_vote_button.tag = D_VOTE_BUTTON + @down_vote_button end end \ No newline at end of file diff --git a/app/_views/vote_view.rb b/app/_views/vote_view.rb index 14e8537..65c04bb 100644 --- a/app/_views/vote_view.rb +++ b/app/_views/vote_view.rb @@ -46,7 +46,6 @@ def do_vote(score, rating) 'NSColor' => fg_col }) @label.setAttributedStringValue(txt) - @label.setToolTip(rating.description) unless rating.nil? @bg_color = bg_col end diff --git a/app/config/constants.rb b/app/config/constants.rb index 387770a..c98a792 100644 --- a/app/config/constants.rb +++ b/app/config/constants.rb @@ -12,6 +12,9 @@ VOTE_VIEW_H=19 VOTE_VIEW_W=21 +U_VOTE_BUTTON=32 +D_VOTE_BUTTON=33 + MENU_NOWPLAYING=111 MENU_CONSOLE_BUTT=222 diff --git a/app/menu.rb b/app/menu.rb index 9fd1cc7..537b981 100644 --- a/app/menu.rb +++ b/app/menu.rb @@ -136,7 +136,8 @@ def links ["Pivotal" , "https://www.pivotaltracker.com/google_domain_openid/redirect_for_auth?domain=kyanmedia.com"], ["Support" , "https://kyan.sirportly.com"], ["Holiday" , "https://appogee-leave.appspot.com/login?domain=kyanmedia.com"], - ["Campfire" , "https://kyanmedia.campfirenow.com"] + ["Campfire" , "https://kyanmedia.campfirenow.com"], + ["Jukebox" , "http://jukebox.local"] ] end diff --git a/resources/jukebox.png b/resources/jukebox.png new file mode 100644 index 0000000000000000000000000000000000000000..103d27d1328d5d2564849538e2404c4e114d616b GIT binary patch literal 3554 zcmZu!2UJr_8omjkcj<@{ks=BSRi%Ya2%vz1CP+)@H5iakq)L${-2h4x1pz4vN;4ou z`Vx^QDj?FO3sQ|Nyyxz|eYzo4o-cqebj=xtZ^T<35Q~ma;trb|PeZwcICKGY*;e(K5kqg?QbO4j?(0SEhalRRF+SRJJ0&)kC z?#*;bxhPpV-h9SK&qSu$D%`hwCa^qRmHx2xow1Nap> zO~*oFP`EJ@P$_3@9ToZFdmuC$;)Lz z%gdPIS?ArR(TS76SE*{90sH3b;!Bhq&G;P5g!|GnIGGpN618}6qN*|79H{o7)0mlj zX1odozS9EL;}17ZM!8$3w0&ifV2)c_a`y)1y1~xPU)awL$9FeHDQ#!=tn6P?DdbZR zJB{LzchH?FEGjhA>Fs43kYvM2vGoq-q#C z31-g}5i&Fx!hc?ZULZKzjobN_4G{Q&a4$wh9Ox7smD94Q*R@5G<-pS@F( zuWh2XdD=&?p26zQULO5Br~(}o6coXk0Up4zegIyDj#jD&F(6xdzUcVzJf!D)^J&tc zmKVWR)514-d<~F_v}s9Y(CB2K>DNOu9ADSbNt-dfJw9HSpr3qm znuabqADh9?+b%E_jftPcUBeFJ3}l8f>@uzy@y(uh=9Xad&Z9 zxES1>uZnL?#a^d`rPLfVF4kD6d@uIol%UqY6aV+M)t9Q3KRSGrIf1a?NV;P>C_S;n$Q(b!J(OMIQDQtO<0|fobscrxAA*%8P>LwT97?v0!ol><=x>$v zF#)xEu0LA8seMZo%o1!A6c98QBq_8j3S@a^b!E+D%_($LJ6kZngjmd2%)PXhNzYvA zHFFfJic`ujD_<^>?ngWxD^)AAds>BdD!5$L$7PiQyKzCY#ji8`DuP^eiJqaTQF&Nx+J-@|7?LpflB*DyH_`3*AY`U z#4BU6Q7Nc|u1i-x433-G)>En}EN-*T;tHjT4IPgvKVvY@^oH}4T2(u57x+KeJ;$sT zhmOnU9pkl;T9&#hy(lG&k;KrVJ*vM|?zMhw%W|`_3+jk+owBRyD;%4BSyn7P;oGzv zq>^P-ImX*?xq-69wk5JJzAsC!7VQ^JX50SY<9ntdB4~(naelJ4Z#{mBULsK9`2ebD zA{)~u*~i*fz|6w8#y2RWy!l~L3eUus{A+a!3B}v*#|)#VmcBAgt-$0h?^i8-B)ps{?xBK}dEA%B9IMJ)KaoVN`+wkizQ%qv7Wr0K-us3en zvb!YOCsxZneL*&;a77LkeS7>ZOfWHPmi#TSW;y#~$ET5|36GEgPy)?cdc;X?q1Pdu z+a_*hnjUYlpC_NSQWhV5t8a1&u?f*x)?ZJiAS01aI$9EM4XF%{TzGmR?R-l@O8fJv zn;m%Smmk`JT%`*p@&$D}kc+33*1vY_2(RX_sE+!_29+#GP;<9ly|ak5$RGYZ9P{e& zd6z(=z=?&>f$S4~C#2OM9NgZF-^$FY>UJ`uB=_+=e4vy|4F0aw9=RSD!xyc5-3L)$ zJ^enrys~_}CyZ2KyOo%c zs-oVXD!bQ68#K3PwGSWPst=mEcaVLYCXQ}z1=bjNVEtKbA!wZ1PhZS#t==1Ok?Ksf zTbg<#!DM_kr$oJsI2N=7ez zj5h!Ox)(z%y?=8^>jjsE$-w`g$j8O;KjHnC z>S*Op*&kW`=}h&oG|Jip2dodCV1~!LBQ)*s1W%~11HtVJ`nV4G1QBckZtM0AfbzXqsK*w6o3Qkiqq@(sMJ@qHTXJXAYb`3RE6(qmKU-e{;;L1$ixH$2_0P=l