[vlc-commits] macOS: Remove unused VLCHUDRadiobuttonCell
Marvin Scholz
git at videolan.org
Sat Jun 24 11:21:45 CEST 2017
vlc | branch: master | Marvin Scholz <epirat07 at gmail.com> | Sat Jun 24 11:20:50 2017 +0200| [17eba896c3af456a8c51b39fd6727c240546cf9d] | committer: Marvin Scholz
macOS: Remove unused VLCHUDRadiobuttonCell
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=17eba896c3af456a8c51b39fd6727c240546cf9d
---
.../package/macosx/VLC.xcodeproj/project.pbxproj | 6 -
modules/gui/macosx/Makefile.am | 1 -
modules/gui/macosx/VLCHUDRadiobuttonCell.h | 44 -------
modules/gui/macosx/VLCHUDRadiobuttonCell.m | 130 ---------------------
4 files changed, 181 deletions(-)
diff --git a/extras/package/macosx/VLC.xcodeproj/project.pbxproj b/extras/package/macosx/VLC.xcodeproj/project.pbxproj
index ab72d48e82..d56bd2823a 100644
--- a/extras/package/macosx/VLC.xcodeproj/project.pbxproj
+++ b/extras/package/macosx/VLC.xcodeproj/project.pbxproj
@@ -61,7 +61,6 @@
1C3113F51E508C7600D4DD76 /* VLCHUDTextFieldCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 6B846FEA1CF5DBFF00112E54 /* VLCHUDTextFieldCell.m */; };
1C3113F71E508C7600D4DD76 /* VLCHUDButtonCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 6B846FDD1CF5D88C00112E54 /* VLCHUDButtonCell.m */; };
1C3113F91E508C7600D4DD76 /* VLCHUDCheckboxCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 6B846FDF1CF5D88C00112E54 /* VLCHUDCheckboxCell.m */; };
- 1C3113FB1E508C7600D4DD76 /* VLCHUDRadiobuttonCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 6B846FE11CF5D88C00112E54 /* VLCHUDRadiobuttonCell.m */; };
1C3113FD1E508C7600D4DD76 /* VLCHUDSliderCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 6B846FE31CF5D88C00112E54 /* VLCHUDSliderCell.m */; };
1C3114031E508C8800D4DD76 /* AppleRemote.m in Sources */ = {isa = PBXBuildFile; fileRef = CC6D8D9D0A878DED006F2BBE /* AppleRemote.m */; };
1C3114051E508C8800D4DD76 /* SideBarItem.m in Sources */ = {isa = PBXBuildFile; fileRef = CCCDDEF013E870BB00A35661 /* SideBarItem.m */; };
@@ -683,8 +682,6 @@
6B846FDD1CF5D88C00112E54 /* VLCHUDButtonCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = VLCHUDButtonCell.m; sourceTree = "<group>"; };
6B846FDE1CF5D88C00112E54 /* VLCHUDCheckboxCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = VLCHUDCheckboxCell.h; sourceTree = "<group>"; };
6B846FDF1CF5D88C00112E54 /* VLCHUDCheckboxCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = VLCHUDCheckboxCell.m; sourceTree = "<group>"; };
- 6B846FE01CF5D88C00112E54 /* VLCHUDRadiobuttonCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = VLCHUDRadiobuttonCell.h; sourceTree = "<group>"; };
- 6B846FE11CF5D88C00112E54 /* VLCHUDRadiobuttonCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = VLCHUDRadiobuttonCell.m; sourceTree = "<group>"; };
6B846FE21CF5D88C00112E54 /* VLCHUDSliderCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = VLCHUDSliderCell.h; sourceTree = "<group>"; };
6B846FE31CF5D88C00112E54 /* VLCHUDSliderCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = VLCHUDSliderCell.m; sourceTree = "<group>"; };
6B846FE91CF5DBFF00112E54 /* VLCHUDTextFieldCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = VLCHUDTextFieldCell.h; sourceTree = "<group>"; };
@@ -1615,8 +1612,6 @@
6B846FDF1CF5D88C00112E54 /* VLCHUDCheckboxCell.m */,
6BF5C4FF1EFE03CF008A9C12 /* VLCHUDStepperCell.h */,
6BF5C5001EFE03CF008A9C12 /* VLCHUDStepperCell.m */,
- 6B846FE01CF5D88C00112E54 /* VLCHUDRadiobuttonCell.h */,
- 6B846FE11CF5D88C00112E54 /* VLCHUDRadiobuttonCell.m */,
6B846FE21CF5D88C00112E54 /* VLCHUDSliderCell.h */,
6B846FE31CF5D88C00112E54 /* VLCHUDSliderCell.m */,
6B9FD0371EEB5D8A0085151F /* VLCHUDScroller.h */,
@@ -1892,7 +1887,6 @@
1C3113F71E508C7600D4DD76 /* VLCHUDButtonCell.m in Sources */,
6B4D50931E7979CB004479B5 /* VLCSimplePrefsWindow.m in Sources */,
1C3113F91E508C7600D4DD76 /* VLCHUDCheckboxCell.m in Sources */,
- 1C3113FB1E508C7600D4DD76 /* VLCHUDRadiobuttonCell.m in Sources */,
1C3113FD1E508C7600D4DD76 /* VLCHUDSliderCell.m in Sources */,
1C31138E1E508C6900D4DD76 /* VLCAboutWindowController.m in Sources */,
1C3113901E508C6900D4DD76 /* VLCHelpWindowController.m in Sources */,
diff --git a/modules/gui/macosx/Makefile.am b/modules/gui/macosx/Makefile.am
index 4165e2e971..faaf4125c1 100644
--- a/modules/gui/macosx/Makefile.am
+++ b/modules/gui/macosx/Makefile.am
@@ -75,7 +75,6 @@ libmacosx_plugin_la_SOURCES = \
gui/macosx/VLCHUDSliderCell.h gui/macosx/VLCHUDSliderCell.m \
gui/macosx/VLCHUDButtonCell.h gui/macosx/VLCHUDButtonCell.m \
gui/macosx/VLCHUDCheckboxCell.h gui/macosx/VLCHUDCheckboxCell.m \
- gui/macosx/VLCHUDRadiobuttonCell.h gui/macosx/VLCHUDRadiobuttonCell.m \
gui/macosx/VLCHUDTextFieldCell.h gui/macosx/VLCHUDTextFieldCell.m \
gui/macosx/VLCHUDScroller.h gui/macosx/VLCHUDScroller.m \
gui/macosx/VLCHUDOutlineView.h gui/macosx/VLCHUDOutlineView.m \
diff --git a/modules/gui/macosx/VLCHUDRadiobuttonCell.h b/modules/gui/macosx/VLCHUDRadiobuttonCell.h
deleted file mode 100644
index 05d15a2fd9..0000000000
--- a/modules/gui/macosx/VLCHUDRadiobuttonCell.h
+++ /dev/null
@@ -1,44 +0,0 @@
-//
-// VLCHUDRadiobuttonCell.m
-// BGHUDAppKit
-//
-// Created by BinaryGod on 5/25/08.
-//
-// Copyright (c) 2008, Tim Davis (BinaryMethod.com, binary.god at gmail.com)
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without modification,
-// are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following disclaimer in the documentation and/or
-// other materials provided with the distribution.
-//
-// Neither the name of the BinaryMethod.com nor the names of its contributors
-// may be used to endorse or promote products derived from this software without
-// specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS AS IS AND
-// ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-// WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-// IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
-// INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
-// OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-// WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-
-#import <Cocoa/Cocoa.h>
-
- at interface VLCHUDRadiobuttonCell : NSButtonCell
-
- at property NSGradient *normalGradient;
- at property NSGradient *highlightGradient;
- at property NSGradient *pushedGradient;
- at property NSColor *textColor;
-
- at end
diff --git a/modules/gui/macosx/VLCHUDRadiobuttonCell.m b/modules/gui/macosx/VLCHUDRadiobuttonCell.m
deleted file mode 100644
index e69e69a779..0000000000
--- a/modules/gui/macosx/VLCHUDRadiobuttonCell.m
+++ /dev/null
@@ -1,130 +0,0 @@
-//
-// VLCHUDRadiobuttonCell.m
-// BGHUDAppKit
-//
-// Created by BinaryGod on 5/25/08.
-//
-// Copyright (c) 2008, Tim Davis (BinaryMethod.com, binary.god at gmail.com)
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without modification,
-// are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following disclaimer in the documentation and/or
-// other materials provided with the distribution.
-//
-// Neither the name of the BinaryMethod.com nor the names of its contributors
-// may be used to endorse or promote products derived from this software without
-// specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS AS IS AND
-// ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-// WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-// IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
-// INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
-// OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-// WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-
-#import "VLCHUDRadiobuttonCell.h"
-
- at implementation VLCHUDRadiobuttonCell
-
-- (instancetype)initWithCoder:(NSCoder *)coder
-{
- self = [super initWithCoder:coder];
- if (self) {
- _normalGradient = [[NSGradient alloc] initWithStartingColor:[NSColor colorWithDeviceRed:0.251f green:0.251f blue:0.255f alpha:1.0f]
- endingColor:[NSColor colorWithDeviceRed:0.118f green:0.118f blue:0.118f alpha:1.0f]];
- _highlightGradient = [[NSGradient alloc] initWithStartingColor:[NSColor colorWithDeviceRed:0.451f green:0.451f blue:0.455f alpha:1.0f]
- endingColor:[NSColor colorWithDeviceRed:0.318f green:0.318f blue:0.318f alpha:1.0f]];
- _pushedGradient = [[NSGradient alloc] initWithStartingColor:[NSColor colorWithDeviceRed:0.451f green:0.451f blue:0.455f alpha:1.0f]
- endingColor:[NSColor colorWithDeviceRed:0.318f green:0.318f blue:0.318f alpha:1.0f]];
- _textColor = [NSColor whiteColor];
- }
- return self;
-}
-
-- (void)drawImage:(NSImage *)image withFrame:(NSRect)frame inView:(NSView *)controlView
-{
- // Set text color
- NSMutableAttributedString *colorTitle = [[NSMutableAttributedString alloc] initWithAttributedString:self.attributedTitle];
- NSRange titleRange = NSMakeRange(0, [colorTitle length]);
- [colorTitle addAttribute:NSForegroundColorAttributeName value:_textColor range:titleRange];
- [self setAttributedTitle:colorTitle];
-
- // Set frame size correctly
- NSRect innerFrame = frame;
- if (self.controlSize == NSSmallControlSize) {
- frame.origin.x += 3.5;
- frame.origin.y += 4;
- frame.size.width -= 7;
- frame.size.height -= 7;
- innerFrame = NSInsetRect(frame, 2, 2);
- } else if (self.controlSize == NSMiniControlSize) {
- frame.origin.x += 2;
- frame.origin.y += 4;
- frame.size.width -= 6.5;
- frame.size.height -= 6.5;
- innerFrame = NSInsetRect(frame, 4, 4);
- }
-
- // Set fill frame
- NSBezierPath *backgroundPath = [NSBezierPath bezierPathWithOvalInRect:frame];
-
- // Draw border and background
- [NSColor.whiteColor setStroke];
-
- [NSGraphicsContext saveGraphicsState];
- if ([super showsFirstResponder] && [[[self controlView] window] isKeyWindow] &&
- ([self focusRingType] == NSFocusRingTypeDefault ||
- [self focusRingType] == NSFocusRingTypeExterior)) {
- NSSetFocusRingStyle(NSFocusRingOnly);
- }
- [backgroundPath setLineWidth:1.5];
- [backgroundPath stroke];
- [NSGraphicsContext restoreGraphicsState];
-
- if ([self isEnabled]) {
- if ([self isHighlighted]) {
- [_normalGradient drawInBezierPath:backgroundPath angle:90.0];
- } else {
- [_pushedGradient drawInBezierPath:backgroundPath angle:90.0];
- }
- } else {
- [[NSColor lightGrayColor] setFill];
- [backgroundPath fill];
- }
-
- // Draw dot
- if ([self integerValue] && [self isEnabled]) {
- NSBezierPath* bezierPath = [NSBezierPath bezierPathWithOvalInRect:innerFrame];
- [[NSColor whiteColor] setFill];
- [bezierPath fill];
- }
-}
-
-- (NSRect)drawTitle:(NSAttributedString *)title withFrame:(NSRect)frame inView:(NSView *)controlView
-{
- NSMutableAttributedString *coloredTitle = [title mutableCopy];
-
- if (self.isEnabled) {
- [coloredTitle addAttribute:NSForegroundColorAttributeName
- value:[NSColor whiteColor]
- range:NSMakeRange(0, coloredTitle.length)];
- } else {
- [coloredTitle addAttribute:NSForegroundColorAttributeName
- value:[NSColor grayColor]
- range:NSMakeRange(0, coloredTitle.length)];
- }
-
- return [super drawTitle:coloredTitle withFrame:frame inView:controlView];
-}
-
- at end
More information about the vlc-commits
mailing list