diff --git a/Frameworks/OakFileBrowser/gfx/Header Icons/Computer Pressed.png b/Frameworks/OakFileBrowser/gfx/Header Icons/Computer Pressed.png deleted file mode 100644 index dd874722..00000000 Binary files a/Frameworks/OakFileBrowser/gfx/Header Icons/Computer Pressed.png and /dev/null differ diff --git a/Frameworks/OakFileBrowser/gfx/Header Icons/Computer Pressed@2x.png b/Frameworks/OakFileBrowser/gfx/Header Icons/Computer Pressed@2x.png deleted file mode 100644 index 556471c5..00000000 Binary files a/Frameworks/OakFileBrowser/gfx/Header Icons/Computer Pressed@2x.png and /dev/null differ diff --git a/Frameworks/OakFileBrowser/gfx/Header Icons/Computer.png b/Frameworks/OakFileBrowser/gfx/Header Icons/Computer.png deleted file mode 100644 index 4ca41235..00000000 Binary files a/Frameworks/OakFileBrowser/gfx/Header Icons/Computer.png and /dev/null differ diff --git a/Frameworks/OakFileBrowser/gfx/Header Icons/Computer@2x.png b/Frameworks/OakFileBrowser/gfx/Header Icons/Computer@2x.png deleted file mode 100644 index 58368029..00000000 Binary files a/Frameworks/OakFileBrowser/gfx/Header Icons/Computer@2x.png and /dev/null differ diff --git a/Frameworks/OakFileBrowser/gfx/Header Icons/Divider.png b/Frameworks/OakFileBrowser/gfx/Header Icons/Divider.png new file mode 100644 index 00000000..bc8884e5 Binary files /dev/null and b/Frameworks/OakFileBrowser/gfx/Header Icons/Divider.png differ diff --git a/Frameworks/OakFileBrowser/gfx/Header Icons/Divider@2x.png b/Frameworks/OakFileBrowser/gfx/Header Icons/Divider@2x.png new file mode 100644 index 00000000..37fbe84a Binary files /dev/null and b/Frameworks/OakFileBrowser/gfx/Header Icons/Divider@2x.png differ diff --git a/Frameworks/OakFileBrowser/gfx/Header Icons/Favorites Pressed.png b/Frameworks/OakFileBrowser/gfx/Header Icons/Favorites Pressed.png deleted file mode 100644 index b179b74c..00000000 Binary files a/Frameworks/OakFileBrowser/gfx/Header Icons/Favorites Pressed.png and /dev/null differ diff --git a/Frameworks/OakFileBrowser/gfx/Header Icons/Favorites Pressed@2x.png b/Frameworks/OakFileBrowser/gfx/Header Icons/Favorites Pressed@2x.png deleted file mode 100644 index 51938bec..00000000 Binary files a/Frameworks/OakFileBrowser/gfx/Header Icons/Favorites Pressed@2x.png and /dev/null differ diff --git a/Frameworks/OakFileBrowser/gfx/Header Icons/Favorites.png b/Frameworks/OakFileBrowser/gfx/Header Icons/Favorites.png index 056dbbf8..2f18f0a6 100644 Binary files a/Frameworks/OakFileBrowser/gfx/Header Icons/Favorites.png and b/Frameworks/OakFileBrowser/gfx/Header Icons/Favorites.png differ diff --git a/Frameworks/OakFileBrowser/gfx/Header Icons/Favorites@2x.png b/Frameworks/OakFileBrowser/gfx/Header Icons/Favorites@2x.png index ca88b582..12361acf 100644 Binary files a/Frameworks/OakFileBrowser/gfx/Header Icons/Favorites@2x.png and b/Frameworks/OakFileBrowser/gfx/Header Icons/Favorites@2x.png differ diff --git a/Frameworks/OakFileBrowser/gfx/Header Icons/Home Pressed.png b/Frameworks/OakFileBrowser/gfx/Header Icons/Home Pressed.png deleted file mode 100644 index 7689f4d3..00000000 Binary files a/Frameworks/OakFileBrowser/gfx/Header Icons/Home Pressed.png and /dev/null differ diff --git a/Frameworks/OakFileBrowser/gfx/Header Icons/Home Pressed@2x.png b/Frameworks/OakFileBrowser/gfx/Header Icons/Home Pressed@2x.png deleted file mode 100644 index 040a3a33..00000000 Binary files a/Frameworks/OakFileBrowser/gfx/Header Icons/Home Pressed@2x.png and /dev/null differ diff --git a/Frameworks/OakFileBrowser/gfx/Header Icons/Home.png b/Frameworks/OakFileBrowser/gfx/Header Icons/Home.png deleted file mode 100644 index 7df4e031..00000000 Binary files a/Frameworks/OakFileBrowser/gfx/Header Icons/Home.png and /dev/null differ diff --git a/Frameworks/OakFileBrowser/gfx/Header Icons/Home@2x.png b/Frameworks/OakFileBrowser/gfx/Header Icons/Home@2x.png deleted file mode 100644 index 92c4c179..00000000 Binary files a/Frameworks/OakFileBrowser/gfx/Header Icons/Home@2x.png and /dev/null differ diff --git a/Frameworks/OakFileBrowser/gfx/Header Icons/Mount.png b/Frameworks/OakFileBrowser/gfx/Header Icons/Mount.png deleted file mode 100644 index 662a44d2..00000000 Binary files a/Frameworks/OakFileBrowser/gfx/Header Icons/Mount.png and /dev/null differ diff --git a/Frameworks/OakFileBrowser/gfx/Header Icons/Mount@2x.png b/Frameworks/OakFileBrowser/gfx/Header Icons/Mount@2x.png deleted file mode 100644 index 45281281..00000000 Binary files a/Frameworks/OakFileBrowser/gfx/Header Icons/Mount@2x.png and /dev/null differ diff --git a/Frameworks/OakFileBrowser/gfx/Header Icons/SCM.png b/Frameworks/OakFileBrowser/gfx/Header Icons/SCM.png new file mode 100644 index 00000000..2592ca4e Binary files /dev/null and b/Frameworks/OakFileBrowser/gfx/Header Icons/SCM.png differ diff --git a/Frameworks/OakFileBrowser/gfx/Header Icons/SCM@2x.png b/Frameworks/OakFileBrowser/gfx/Header Icons/SCM@2x.png new file mode 100644 index 00000000..470599a8 Binary files /dev/null and b/Frameworks/OakFileBrowser/gfx/Header Icons/SCM@2x.png differ diff --git a/Frameworks/OakFileBrowser/gfx/Header Icons/Search.png b/Frameworks/OakFileBrowser/gfx/Header Icons/Search.png new file mode 100644 index 00000000..5346b54a Binary files /dev/null and b/Frameworks/OakFileBrowser/gfx/Header Icons/Search.png differ diff --git a/Frameworks/OakFileBrowser/gfx/Header Icons/Search@2x.png b/Frameworks/OakFileBrowser/gfx/Header Icons/Search@2x.png new file mode 100644 index 00000000..9742be12 Binary files /dev/null and b/Frameworks/OakFileBrowser/gfx/Header Icons/Search@2x.png differ diff --git a/Frameworks/OakFileBrowser/gfx/Header Icons/SmartFolder Pressed.png b/Frameworks/OakFileBrowser/gfx/Header Icons/SmartFolder Pressed.png deleted file mode 100644 index 79146c98..00000000 Binary files a/Frameworks/OakFileBrowser/gfx/Header Icons/SmartFolder Pressed.png and /dev/null differ diff --git a/Frameworks/OakFileBrowser/gfx/Header Icons/SmartFolder Pressed@2x.png b/Frameworks/OakFileBrowser/gfx/Header Icons/SmartFolder Pressed@2x.png deleted file mode 100644 index eec17364..00000000 Binary files a/Frameworks/OakFileBrowser/gfx/Header Icons/SmartFolder Pressed@2x.png and /dev/null differ diff --git a/Frameworks/OakFileBrowser/gfx/Header Icons/SmartFolder.png b/Frameworks/OakFileBrowser/gfx/Header Icons/SmartFolder.png deleted file mode 100644 index 79146c98..00000000 Binary files a/Frameworks/OakFileBrowser/gfx/Header Icons/SmartFolder.png and /dev/null differ diff --git a/Frameworks/OakFileBrowser/gfx/Header Icons/SmartFolder@2x.png b/Frameworks/OakFileBrowser/gfx/Header Icons/SmartFolder@2x.png deleted file mode 100644 index eec17364..00000000 Binary files a/Frameworks/OakFileBrowser/gfx/Header Icons/SmartFolder@2x.png and /dev/null differ diff --git a/Frameworks/OakFileBrowser/src/ui/OFBActionsView.mm b/Frameworks/OakFileBrowser/src/ui/OFBActionsView.mm index e42e2ebe..49504088 100644 --- a/Frameworks/OakFileBrowser/src/ui/OFBActionsView.mm +++ b/Frameworks/OakFileBrowser/src/ui/OFBActionsView.mm @@ -2,17 +2,17 @@ #import #import -static NSButton* OakCreateImageButton (NSImage* image, NSSize imageSize = NSMakeSize(16, 16)) +static NSButton* OakCreateImageButton (NSImage* image) { NSButton* res = [NSButton new]; - // [[res cell] setBackgroundStyle:NSBackgroundStyleRaised]; + [[res cell] setBackgroundStyle:NSBackgroundStyleRaised]; [res setButtonType:NSMomentaryChangeButton]; - [res setBezelStyle:NSSmallSquareBezelStyle]; + [res setBezelStyle:NSRecessedBezelStyle]; [res setBordered:NO]; - // image = [image copy]; - // [image setSize:imageSize]; + image = [image copy]; + [image setTemplate:YES]; [res setImage:image]; [res setImagePosition:NSImageOnly]; @@ -27,11 +27,12 @@ static NSPopUpButton* OakCreatePopUpButton () NSPopUpButton* res = [NSPopUpButton new]; res.bordered = NO; res.pullsDown = YES; + [[res cell] setBackgroundStyle:NSBackgroundStyleRaised]; NSMenuItem* item = [NSMenuItem new]; item.title = @""; item.image = [NSImage imageNamed:NSImageNameActionTemplate]; - [item.image setSize:NSMakeSize(12, 12)]; + [item.image setSize:NSMakeSize(14, 14)]; [[res cell] setUsesItemFromMenu:NO]; [[res cell] setMenuItem:item]; @@ -39,6 +40,13 @@ static NSPopUpButton* OakCreatePopUpButton () return res; } +static NSImageView* OakCreateImageView (NSImage* image) +{ + NSImageView* res = [[NSImageView alloc] initWithFrame:NSZeroRect]; + [res setImage:image]; + return res; +} + @implementation OFBActionsView - (id)initWithFrame:(NSRect)aRect { @@ -47,15 +55,15 @@ static NSPopUpButton* OakCreatePopUpButton () self.createButton = OakCreateImageButton([NSImage imageNamed:NSImageNameAddTemplate]); self.actionsPopUpButton = OakCreatePopUpButton(); self.reloadButton = OakCreateImageButton([NSImage imageNamed:NSImageNameRefreshTemplate]); - self.searchButton = OakCreateImageButton([NSImage imageNamed:NSImageNameRevealFreestandingTemplate]); + self.searchButton = OakCreateImageButton([NSImage imageNamed:@"Search" inSameBundleAsClass:[self class]]); self.favoritesButton = OakCreateImageButton([NSImage imageNamed:@"Favorites" inSameBundleAsClass:[self class]]); - self.scmButton = OakCreateImageButton([NSImage imageNamed:@"SmartFolder" inSameBundleAsClass:[self class]]); - - self.createButton.toolTip = @"Create new file"; - self.reloadButton.toolTip = @"Reload "; - self.searchButton.toolTip = @""; - self.favoritesButton.toolTip = @"Show favorites"; - self.scmButton.toolTip = @"Show source control management status"; + self.scmButton = OakCreateImageButton([NSImage imageNamed:@"SCM" inSameBundleAsClass:[self class]]); + + self.createButton.toolTip = @"Create new file"; + self.reloadButton.toolTip = @"Reload file browser"; + self.searchButton.toolTip = @"Search current folder"; + self.favoritesButton.toolTip = @"Show favorites"; + self.scmButton.toolTip = @"Show source control management status"; NSMenu* menu = [NSMenu new]; [menu addItemWithTitle:@"Unused" action:@selector(nop:) keyEquivalent:@""]; @@ -70,8 +78,7 @@ static NSPopUpButton* OakCreatePopUpButton () NSDictionary* views = @{ @"create" : self.createButton, - @"leftDivider" : OakCreateVerticalLine([NSColor colorWithCalibratedWhite:0.551 alpha:1], [NSColor colorWithCalibratedWhite:0.801 alpha:1]), - @"leftShading" : OakCreateVerticalLine([NSColor colorWithCalibratedWhite:0.869 alpha:1], [NSColor colorWithCalibratedWhite:0.869 alpha:0]), + @"divider" : OakCreateImageView([NSImage imageNamed:@"Divider" inSameBundleAsClass:[self class]]), @"actions" : wrappedActionsPopUpButton, @"reload" : self.reloadButton, @"search" : self.searchButton, @@ -85,8 +92,8 @@ static NSPopUpButton* OakCreatePopUpButton () [self addSubview:view]; } - [self addConstraints:[NSLayoutConstraint constraintsWithVisualFormat:@"H:|-(24)-[create(==22)][leftDivider][leftShading][actions(==30)]-(>=8)-[reload(==22,==search,==favorites,==scm)][search][favorites][scm]-(24)-|" options:0 metrics:nil views:views]]; - [self addConstraints:[NSLayoutConstraint constraintsWithVisualFormat:@"V:|[create(==leftDivider,==leftShading,==actions,==reload,==search,==favorites,==scm)]|" options:0 metrics:nil views:views]]; + [self addConstraints:[NSLayoutConstraint constraintsWithVisualFormat:@"H:|-9-[create(==22)]-1-[divider]-5-[actions(==30)]-(>=8)-[reload(==22,==search,==favorites,==scm)][search]-1-[favorites]-2-[scm]-(12)-|" options:0 metrics:nil views:views]]; + [self addConstraints:[NSLayoutConstraint constraintsWithVisualFormat:@"V:|[create(==divider,==actions,==reload,==search,==favorites,==scm)]|" options:0 metrics:nil views:views]]; } return self; }