Skip to content

Commit

Permalink
Merge pull request #29 from kyan/feature/el_capitan
Browse files Browse the repository at this point in the history
Update to make every look nice in El Capitan
  • Loading branch information
whomwah committed Dec 24, 2015
2 parents 3401fd4 + c54c5bf commit 86c50e1
Show file tree
Hide file tree
Showing 6 changed files with 16 additions and 16 deletions.
2 changes: 1 addition & 1 deletion .ruby-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
ruby-2.2.0
2.2.2
16 changes: 8 additions & 8 deletions app/_views/nowplaying_view.rb
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,7 @@ def update_title
paragraph.setLineBreakMode(NSLineBreakByTruncatingTail)

txt = track.title.attrd({
'NSFont' => NSFont.fontWithName("Lucida Grande", size:12),
'NSFont' => NSFont.systemFontOfSize(12.0),
'NSColor' => NSColor.blackColor,
'NSParagraphStyle' => paragraph
}) unless track.title.nil?
Expand All @@ -201,8 +201,8 @@ def update_artist
paragraph.setLineBreakMode(NSLineBreakByTruncatingTail)

txt = track.artist.attrd({
'NSFont' => NSFont.fontWithName("Lucida Grande", size:10),
'NSColor' => NSColor.darkGrayColor,
'NSFont' => NSFont.systemFontOfSize(10.0),
'NSColor' => NSColor.blackColor,
'NSParagraphStyle' => paragraph
}) unless track.artist.nil?
@artist.setAttributedStringValue(txt)
Expand All @@ -215,8 +215,8 @@ def update_album
paragraph.setLineBreakMode(NSLineBreakByTruncatingTail)

txt = track.album.attrd({
'NSFont' => NSFont.fontWithName("Lucida Grande", size:9),
'NSColor' => NSColor.grayColor,
'NSFont' => NSFont.systemFontOfSize(9.0),
'NSColor' => NSColor.blackColor,
'NSParagraphStyle' => paragraph
}) unless track.album.nil?
@album.setAttributedStringValue(txt)
Expand All @@ -229,8 +229,8 @@ def update_addedby
paragraph.setLineBreakMode(NSLineBreakByTruncatingTail)

txt = "#{CHOSEN_BY_TXT} #{track.added_by}".attrd({
'NSFont' => NSFont.fontWithName("Lucida Grande", size:8),
'NSColor' => NSColor.darkGrayColor,
'NSFont' => NSFont.systemFontOfSize(8.0),
'NSColor' => NSColor.blackColor,
'NSParagraphStyle' => paragraph
}) unless track.added_by.nil?
@addedby.setAttributedStringValue(txt)
Expand Down Expand Up @@ -288,4 +288,4 @@ def update_progress
end
end
end
end
end
4 changes: 2 additions & 2 deletions app/_views/vote_view.rb
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ def do_vote(score, rating)
end

txt = score.to_s.attrd({
'NSFont' => NSFont.fontWithName("Helvetica Bold", size:10),
'NSFont' => NSFont.systemFontOfSize(10.0),
'NSColor' => fg_col
})
@label.setAttributedStringValue(txt)
Expand All @@ -53,4 +53,4 @@ def draw_backing
@bg_color.setFill
path.fill
end
end
end
4 changes: 2 additions & 2 deletions app/menu.rb
Original file line number Diff line number Diff line change
Expand Up @@ -147,8 +147,8 @@ def links
["Timesheet" , "https://gapps.harvestapp.com/gapp_company?domain=kyanmedia.com"],
["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"],
["Holiday" , "https://app.timetastic.co.uk"],
["Chat" , "https://kyan.hipchat.com/chat"],
["Jukebox" , "http://jukebox.local"]
]
end
Expand Down
6 changes: 3 additions & 3 deletions release_notes.html
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
KyanBar - version 1.5.1
KyanBar - version 1.6
---------------------

Updates:

* Fix memory bug related to artwork
* Auto attempt to reconnect when websocket connection is closed
* Update rendering for El Capitan
* Update the links to various services
File renamed without changes

0 comments on commit 86c50e1

Please sign in to comment.