Steve Lhomme pushed to branch master at VideoLAN / VLC
Commits:
cdc87346 by Claudio Cambra at 2024-11-09T06:05:58+00:00
macosx: Use standard colours and superclass for bookmarks table view
Signed-off-by: Claudio Cambra <[email protected]>
- - - - -
e1b60577 by Claudio Cambra at 2024-11-09T06:05:58+00:00
macosx: Remove unused VLCHUDTableView
Signed-off-by: Claudio Cambra <[email protected]>
- - - - -
5cde4d87 by Claudio Cambra at 2024-11-09T06:05:58+00:00
macosx: Use standard outline view in information window codec info view
Signed-off-by: Claudio Cambra <[email protected]>
- - - - -
01ebfc73 by Claudio Cambra at 2024-11-09T06:05:58+00:00
macosx: Remove now unused VLCHUDOutlineView and VLCHUDTableCornerView
Signed-off-by: Claudio Cambra <[email protected]>
- - - - -
502ce07e by Claudio Cambra at 2024-11-09T06:05:58+00:00
macosx: Remove HUD class files from POTFILES.in
Signed-off-by: Claudio Cambra <[email protected]>
- - - - -
10 changed files:
- modules/gui/macosx/Makefile.am
- modules/gui/macosx/UI/Bookmarks.xib
- modules/gui/macosx/UI/VLCInformationWindow.xib
- − modules/gui/macosx/views/VLCHUDOutlineView.h
- − modules/gui/macosx/views/VLCHUDOutlineView.m
- − modules/gui/macosx/views/VLCHUDTableCornerView.h
- − modules/gui/macosx/views/VLCHUDTableCornerView.m
- − modules/gui/macosx/views/VLCHUDTableView.h
- − modules/gui/macosx/views/VLCHUDTableView.m
- po/POTFILES.in
Changes:
=====================================
modules/gui/macosx/Makefile.am
=====================================
@@ -368,12 +368,6 @@ libmacosx_plugin_la_SOURCES = \
gui/macosx/views/VLCDefaultValueSliderCell.m \
gui/macosx/views/VLCDragDropView.h \
gui/macosx/views/VLCDragDropView.m \
- gui/macosx/views/VLCHUDOutlineView.h \
- gui/macosx/views/VLCHUDOutlineView.m \
- gui/macosx/views/VLCHUDTableCornerView.h \
- gui/macosx/views/VLCHUDTableCornerView.m \
- gui/macosx/views/VLCHUDTableView.h \
- gui/macosx/views/VLCHUDTableView.m \
gui/macosx/views/VLCImageButton.h \
gui/macosx/views/VLCImageButton.m \
gui/macosx/views/VLCImageView.h \
=====================================
modules/gui/macosx/UI/Bookmarks.xib
=====================================
@@ -62,11 +62,11 @@
<rect key="frame" x="1" y="1" width="472"
height="241"/>
<autoresizingMask key="autoresizingMask"
widthSizable="YES" heightSizable="YES"/>
<subviews>
- <tableView focusRingType="none"
verticalHuggingPriority="750" allowsExpansionToolTips="YES"
columnAutoresizingStyle="lastColumnOnly" alternatingRowBackgroundColors="YES"
autosaveColumns="NO" autosaveName="bookmarks-table" headerView="111" id="110"
customClass="VLCHUDTableView">
+ <tableView focusRingType="none"
verticalHuggingPriority="750" allowsExpansionToolTips="YES"
columnAutoresizingStyle="lastColumnOnly" alternatingRowBackgroundColors="YES"
autosaveColumns="NO" autosaveName="bookmarks-table" headerView="111" id="110">
<rect key="frame" x="0.0" y="0.0"
width="472" height="218"/>
<autoresizingMask key="autoresizingMask"
widthSizable="YES" heightSizable="YES"/>
<size key="intercellSpacing" width="3"
height="2"/>
- <color key="backgroundColor" red="0.0"
green="0.0" blue="0.0" alpha="0.0" colorSpace="calibratedRGB"/>
+ <color key="backgroundColor"
name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
<color key="gridColor" name="gridColor"
catalog="System" colorSpace="catalog"/>
<tableColumns>
<tableColumn identifier="name"
width="128" minWidth="10" maxWidth="3.4028234663852886e+38" id="CfE-Sy-6N7">
@@ -93,7 +93,7 @@
</textFieldCell>
<tableColumnResizingMask
key="resizingMask" resizeWithTable="YES" userResizable="YES"/>
</tableColumn>
- <tableColumn identifier="time_offset"
width="71" minWidth="30" maxWidth="1000" id="113">
+ <tableColumn identifier="time_offset"
width="42" minWidth="30" maxWidth="1000" id="113">
<tableHeaderCell key="headerCell"
lineBreakMode="truncatingTail" borderStyle="border" alignment="left"
title="Time">
<color key="textColor"
name="headerTextColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor"
name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
@@ -108,7 +108,6 @@
</tableColumns>
</tableView>
</subviews>
- <color key="backgroundColor"
name="controlDarkShadowColor" catalog="System" colorSpace="catalog"/>
</clipView>
<constraints>
<constraint firstAttribute="width"
relation="greaterThanOrEqual" constant="200" id="Y3p-2z-GZy"/>
=====================================
modules/gui/macosx/UI/VLCInformationWindow.xib
=====================================
@@ -599,7 +599,7 @@
<rect key="frame" x="0.0"
y="0.0" width="510" height="440"/>
<autoresizingMask
key="autoresizingMask"/>
<subviews>
- <outlineView
focusRingType="none" verticalHuggingPriority="750"
allowsExpansionToolTips="YES" columnAutoresizingStyle="lastColumnOnly"
alternatingRowBackgroundColors="YES" columnReordering="NO"
multipleSelection="NO" emptySelection="NO" autosaveColumns="NO" typeSelect="NO"
indentationPerLevel="16" autoresizesOutlineColumn="YES"
outlineTableColumn="521" id="519" customClass="VLCHUDOutlineView">
+ <outlineView
focusRingType="none" verticalHuggingPriority="750"
allowsExpansionToolTips="YES" columnAutoresizingStyle="lastColumnOnly"
alternatingRowBackgroundColors="YES" columnReordering="NO"
multipleSelection="NO" emptySelection="NO" autosaveColumns="NO" typeSelect="NO"
indentationPerLevel="16" autoresizesOutlineColumn="YES"
outlineTableColumn="521" id="519">
<rect key="frame"
x="0.0" y="0.0" width="510" height="440"/>
<autoresizingMask
key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<size
key="intercellSpacing" width="3" height="2"/>
=====================================
modules/gui/macosx/views/VLCHUDOutlineView.h deleted
=====================================
@@ -1,50 +0,0 @@
-//
-// VLCHUDOutlineView.h
-// BGHUDAppKit
-//
-// Created by BinaryGod on 6/20/08.
-//
-// Copyright (c) 2008, Tim Davis (BinaryMethod.com, [email protected])
-// 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>
-
-@interface VLCHUDOutlineView : NSOutlineView
-
-@property (strong) NSColor *tableBackgroundColor;
-@property (strong) NSArray *cellAlternatingRowColors;
-@property (strong) NSColor *cellHighlightColor;
-@property (strong) NSColor *cellEditingFillColor;
-@property (strong) NSColor *cellTextColor;
-@property (strong) NSColor *cellSelectedTextColor;
-@property (strong) NSColor *strokeColor;
-
-@property (strong) NSGradient *highlightGradient;
-@property (strong) NSGradient *normalGradient;
-
-@end
=====================================
modules/gui/macosx/views/VLCHUDOutlineView.m deleted
=====================================
@@ -1,101 +0,0 @@
-//
-// VLCHUDOutlineView.m
-// BGHUDAppKit
-//
-// Created by BinaryGod on 6/20/08.
-//
-// Copyright (c) 2008, Tim Davis (BinaryMethod.com, [email protected])
-// 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 "VLCHUDOutlineView.h"
-
-#import "views/VLCHUDTableCornerView.h"
-
-@interface NSOutlineView (private)
-- (void)_sendDelegateWillDisplayCell:(id)cell forColumn:(id)column
row:(NSInteger)row;
-@end
-
-@implementation VLCHUDOutlineView
-
-#pragma mark Drawing Functions
-
-- (instancetype)initWithCoder:(NSCoder *)decoder
-{
-
- self = [super initWithCoder: decoder];
-
- if (self) {
- _tableBackgroundColor = [NSColor colorWithCalibratedRed:0 green:0
blue:0 alpha:0];
- _cellEditingFillColor = [NSColor colorWithDeviceRed:0.141f
green:0.141f blue:0.141f alpha:0.5f];
- _cellAlternatingRowColors = @[[NSColor colorWithCalibratedWhite:0.16f
alpha:0.86f],
- [NSColor colorWithCalibratedWhite:0.15f
alpha:0.8f]];
- _cellTextColor = [NSColor whiteColor];
- _cellSelectedTextColor = [NSColor blackColor];
- _strokeColor = [NSColor colorWithDeviceRed:0.749f green:0.761f
blue:0.788f alpha:1.0f];
- _highlightGradient = [[NSGradient alloc]
initWithStartingColor:[NSColor colorWithDeviceRed:0.451f green:0.451f
blue:0.455f alpha:0.5f]
-
endingColor:[NSColor colorWithDeviceRed:0.318f green:0.318f blue:0.318f
alpha:0.5f]];
- _normalGradient = [[NSGradient alloc] initWithStartingColor:[NSColor
colorWithDeviceRed:0.251f green:0.251f blue:0.255f alpha:0.5f]
- endingColor:[NSColor
colorWithDeviceRed:0.118f green:0.118f blue:0.118f alpha:0.5f]];
-
-
- [self setBackgroundColor:_tableBackgroundColor];
- [self setFocusRingType:NSFocusRingTypeNone];
- }
-
- return self;
-}
-
-- (id)_alternatingRowBackgroundColors {
- return _cellAlternatingRowColors;
-}
-
-- (void)_sendDelegateWillDisplayCell:(id)cell forColumn:(id)column
row:(NSInteger)row {
-
- [super _sendDelegateWillDisplayCell:cell forColumn:column row:row];
-
- [[self currentEditor] setBackgroundColor:_cellEditingFillColor];
- [[self currentEditor] setTextColor:_cellTextColor];
-
- if([[self selectedRowIndexes] containsIndex: row]) {
-
- if([cell respondsToSelector: @selector(setTextColor:)]) {
- [cell setTextColor:_cellSelectedTextColor];
- }
- } else {
-
- if ([cell respondsToSelector:@selector(setTextColor:)]) {
- [cell setTextColor:_cellTextColor];
- }
- }
-}
-
-- (void)awakeFromNib {
- [self setCornerView: [[VLCHUDTableCornerView alloc] init]];
-}
-
-@end
=====================================
modules/gui/macosx/views/VLCHUDTableCornerView.h deleted
=====================================
@@ -1,42 +0,0 @@
-//
-// VLCHUDTableCornerView.h
-// BGHUDAppKit
-//
-// Created by BinaryGod on 6/29/08.
-//
-// Copyright (c) 2008, Tim Davis (BinaryMethod.com, [email protected])
-// 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>
-
-@interface VLCHUDTableCornerView : NSView
-
-@property (strong) NSColor *tableHeaderCellBorderColor;
-@property (strong) NSGradient *tableHeaderCellNormalFill;
-
-@end
=====================================
modules/gui/macosx/views/VLCHUDTableCornerView.m deleted
=====================================
@@ -1,59 +0,0 @@
-//
-// VLCHUDTableCornerView.m
-// BGHUDAppKit
-//
-// Created by BinaryGod on 6/29/08.
-//
-// Copyright (c) 2008, Tim Davis (BinaryMethod.com, [email protected])
-// 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 "VLCHUDTableCornerView.h"
-
-@implementation VLCHUDTableCornerView
-
-- (instancetype)init
-{
- self = [super init];
-
- if (self) {
- _tableHeaderCellBorderColor = [NSColor colorWithDeviceRed:0.349f
green:0.361f blue:0.388f alpha:1.0f];
- _tableHeaderCellNormalFill = [[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]];
- }
- return self;
-}
-
-- (void)drawRect:(NSRect)dirtyRect {
-
- // Draw base layer
- [_tableHeaderCellBorderColor set];
- NSRectFill([self bounds]);
-
- [_tableHeaderCellNormalFill drawInRect:NSInsetRect([self bounds], 1, 1)
angle:270];
-}
-
-@end
=====================================
modules/gui/macosx/views/VLCHUDTableView.h deleted
=====================================
@@ -1,50 +0,0 @@
-//
-// VLCHUDTableView.h
-// BGHUDAppKit
-//
-// Created by BinaryGod on 6/17/08.
-//
-// Copyright (c) 2008, Tim Davis (BinaryMethod.com, [email protected])
-// 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>
-
-@interface VLCHUDTableView : NSTableView
-
-@property (strong) NSColor *tableBackgroundColor;
-@property (strong) NSArray *cellAlternatingRowColors;
-@property (strong) NSColor *cellHighlightColor;
-@property (strong) NSColor *cellEditingFillColor;
-@property (strong) NSColor *cellTextColor;
-@property (strong) NSColor *cellSelectedTextColor;
-@property (strong) NSColor *strokeColor;
-
-@property (strong) NSGradient *highlightGradient;
-@property (strong) NSGradient *normalGradient;
-
-@end
=====================================
modules/gui/macosx/views/VLCHUDTableView.m deleted
=====================================
@@ -1,106 +0,0 @@
-//
-// VLCHUDTableView.m
-// BGHUDAppKit
-//
-// Created by BinaryGod on 6/17/08.
-//
-// Copyright (c) 2008, Tim Davis (BinaryMethod.com, [email protected])
-// 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 "VLCHUDTableView.h"
-
-#import "views/VLCHUDTableCornerView.h"
-
-@interface NSTableView (private)
-- (void)_sendDelegateWillDisplayCell:(id)cell forColumn:(id)column
row:(NSInteger)row;
-@end
-
-@implementation VLCHUDTableView
-
-#pragma mark Drawing Functions
-
-- (instancetype)initWithCoder:(NSCoder *)decoder
-{
-
- self = [super initWithCoder: decoder];
-
- if (self) {
- _tableBackgroundColor = [NSColor colorWithCalibratedRed:0 green:0
blue:0 alpha:0];
- _cellHighlightColor = [NSColor colorWithDeviceRed:0.549f green:0.561f
blue:0.588f alpha:1];
- _cellEditingFillColor = [NSColor colorWithDeviceRed:0.141f
green:0.141f blue:0.141f alpha:0.5f];
- _cellAlternatingRowColors = @[[NSColor colorWithCalibratedWhite:0.16f
alpha:0.86f],
- [NSColor colorWithCalibratedWhite:0.15f
alpha:0.8f]];
- _cellTextColor = [NSColor whiteColor];
- _cellSelectedTextColor = [NSColor blackColor];
- _strokeColor = [NSColor colorWithDeviceRed:0.749f green:0.761f
blue:0.788f alpha:1.0f];
- _highlightGradient = [[NSGradient alloc]
initWithStartingColor:[NSColor colorWithDeviceRed:0.451f green:0.451f
blue:0.455f alpha:0.5f]
-
endingColor:[NSColor colorWithDeviceRed:0.318f green:0.318f blue:0.318f
alpha:0.5f]];
- _normalGradient = [[NSGradient alloc] initWithStartingColor:[NSColor
colorWithDeviceRed:0.251f green:0.251f blue:0.255f alpha:0.5f]
- endingColor:[NSColor
colorWithDeviceRed:0.118f green:0.118f blue:0.118f alpha:0.5f]];
-
-
- [self setBackgroundColor:_tableBackgroundColor];
- [self setFocusRingType:NSFocusRingTypeNone];
- }
-
- return self;
-}
-
-- (id)_alternatingRowBackgroundColors {
- return _cellAlternatingRowColors;
-}
-
-- (id)_highlightColorForCell:(id)cell {
- return _cellHighlightColor;
-}
-
-- (void)_sendDelegateWillDisplayCell:(id)cell forColumn:(id)column
row:(NSInteger)row {
-
- [super _sendDelegateWillDisplayCell:cell forColumn:column row:row];
-
- [[self currentEditor] setBackgroundColor:_cellEditingFillColor];
- [[self currentEditor] setTextColor:_cellTextColor];
-
- if([[self selectedRowIndexes] containsIndex: row]) {
-
- if([cell respondsToSelector: @selector(setTextColor:)]) {
- [cell setTextColor:_cellSelectedTextColor];
- }
- } else {
-
- if ([cell respondsToSelector:@selector(setTextColor:)]) {
- [cell setTextColor:_cellTextColor];
- }
- }
-}
-
-- (void)awakeFromNib {
- [self setCornerView: [[VLCHUDTableCornerView alloc] init]];
-}
-
-@end
=====================================
po/POTFILES.in
=====================================
@@ -582,12 +582,6 @@ modules/gui/macosx/views/VLCDefaultValueSliderCell.h
modules/gui/macosx/views/VLCDefaultValueSliderCell.m
modules/gui/macosx/views/VLCDragDropView.h
modules/gui/macosx/views/VLCDragDropView.m
-modules/gui/macosx/views/VLCHUDOutlineView.h
-modules/gui/macosx/views/VLCHUDOutlineView.m
-modules/gui/macosx/views/VLCHUDTableCornerView.h
-modules/gui/macosx/views/VLCHUDTableCornerView.m
-modules/gui/macosx/views/VLCHUDTableView.h
-modules/gui/macosx/views/VLCHUDTableView.m
modules/gui/macosx/views/VLCImageButton.h
modules/gui/macosx/views/VLCImageButton.m
modules/gui/macosx/views/VLCImageView.h
View it on GitLab:
https://code.videolan.org/videolan/vlc/-/compare/2c2eb681922e4e2c5aba3f8cc77dfe83cd185563...502ce07e08e0c3db51e30a87d0d07a17623b51fd
--
View it on GitLab:
https://code.videolan.org/videolan/vlc/-/compare/2c2eb681922e4e2c5aba3f8cc77dfe83cd185563...502ce07e08e0c3db51e30a87d0d07a17623b51fd
You're receiving this email because of your account on code.videolan.org.
VideoLAN code repository instance_______________________________________________
vlc-commits mailing list
[email protected]
https://mailman.videolan.org/listinfo/vlc-commits
