Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

New App Icon and small fixes. #74

Merged
merged 3 commits into from
Jul 13, 2015
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions Buildasaur.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -834,6 +834,7 @@
3A5687681A3B93BD0066DB2B /* Project object */ = {
isa = PBXProject;
attributes = {
LastSwiftUpdateCheck = 0700;
LastUpgradeCheck = 0610;
ORGANIZATIONNAME = "Honza Dvorsky";
TargetAttributes = {
Expand Down
22 changes: 12 additions & 10 deletions Buildasaur/Images.xcassets/AppIcon.appiconset/Contents.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,59 +3,61 @@
{
"size" : "16x16",
"idiom" : "mac",
"filename" : "builda_icon@16x.png",
"filename" : "Icon_16.png",
"scale" : "1x"
},
{
"size" : "16x16",
"idiom" : "mac",
"filename" : "builda_icon@32x-2.png",
"filename" : "Icon_16@2x.png",
"scale" : "2x"
},
{
"size" : "32x32",
"idiom" : "mac",
"filename" : "builda_icon@32x.png",
"filename" : "Icon_32.png",
"scale" : "1x"
},
{
"size" : "32x32",
"idiom" : "mac",
"filename" : "builda_icon@64x.png",
"filename" : "Icon_32@2x.png",
"scale" : "2x"
},
{
"size" : "128x128",
"idiom" : "mac",
"filename" : "builda_icon@128x.png",
"filename" : "Icon_128.png",
"scale" : "1x"
},
{
"size" : "128x128",
"idiom" : "mac",
"filename" : "builda_icon@256x-2.png",
"filename" : "Icon_128@2x.png",
"scale" : "2x"
},
{
"size" : "256x256",
"idiom" : "mac",
"filename" : "builda_icon@256x.png",
"filename" : "Icon_256.png",
"scale" : "1x"
},
{
"size" : "256x256",
"idiom" : "mac",
"filename" : "builda_icon@512x.png",
"filename" : "Icon_256@2x.png",
"scale" : "2x"
},
{
"idiom" : "mac",
"size" : "512x512",
"idiom" : "mac",
"filename" : "Icon_512.png",
"scale" : "1x"
},
{
"idiom" : "mac",
"size" : "512x512",
"idiom" : "mac",
"filename" : "[email protected]",
"scale" : "2x"
}
],
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
10 changes: 6 additions & 4 deletions Buildasaur/Images.xcassets/icon.imageset/Contents.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,20 +3,22 @@
{
"idiom" : "universal",
"scale" : "1x",
"filename" : "[email protected].png"
"filename" : "Icon_mono_16.png"
},
{
"idiom" : "universal",
"scale" : "2x",
"filename" : "[email protected].png"
"filename" : "Icon_mono_16@2x.png"
},
{
"idiom" : "universal",
"scale" : "3x"
"scale" : "3x",
"filename" : "[email protected]"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
"author" : "xcode",
"template-rendering-intent" : "template"
}
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Binary file not shown.
5 changes: 2 additions & 3 deletions Buildasaur/MenuItemManager.swift
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,12 @@ class MenuItemManager : NSObject, NSMenuDelegate {

let statusItem = statusBar.statusItemWithLength(32)
statusItem.title = ""
let image = NSImage(named: "icon")
image?.setTemplate(true)
statusItem.image = image
statusItem.image = NSImage(named: "icon")
statusItem.highlightMode = true
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This was added because of issues with compatibility with both light and dark menu bar modes. Did you test that it looks good on both even when you disable templating?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes I set it for icon image as default, so you don't have to set anything in code manually...

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Right, of course, you explained it to me before and I just forgot. All good.


var menu = NSMenu()
menu.addItemWithTitle("Open Buildasaur", action: "showMainWindow", keyEquivalent: "")
menu.addItemWithTitle("Quit Buildasaur", action: "terminate:", keyEquivalent: "")
menu.addItem(NSMenuItem.separatorItem())
self.firstIndexLastSyncedMenuItem = menu.numberOfItems

Expand Down