Commit f0d15924 authored by David Fuhrmann's avatar David Fuhrmann

macosx: Remove the dark titlebar view

For now, this is not needed anymore as the dark mode is gone.
parent 67587d2c
......@@ -33,7 +33,6 @@
1C3113BC1E508C6900D4DD76 /* VLCKeyboardBacklightControl.m in Sources */ = {isa = PBXBuildFile; fileRef = 7DF812F01B555C8E0052293C /* VLCKeyboardBacklightControl.m */; };
1C3113BD1E508C6900D4DD76 /* macosx.m in Sources */ = {isa = PBXBuildFile; fileRef = 8ED6C27E03E2EB1C0059A3A7 /* macosx.m */; };
1C3113C11E508C6900D4DD76 /* VLCMainWindow.m in Sources */ = {isa = PBXBuildFile; fileRef = CC448A6313B68A0B009F72E0 /* VLCMainWindow.m */; };
1C3113C31E508C6900D4DD76 /* VLCMainWindowTitleView.m in Sources */ = {isa = PBXBuildFile; fileRef = CC017A0C14A4C8AF00C09A4F /* VLCMainWindowTitleView.m */; };
1C3113C51E508C6900D4DD76 /* misc.m in Sources */ = {isa = PBXBuildFile; fileRef = 8ED6C28003E2EB1C0059A3A7 /* misc.m */; };
1C3113C71E508C6900D4DD76 /* VLCOpenWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = 8ED6C28203E2EB1C0059A3A7 /* VLCOpenWindowController.m */; };
1C3113C91E508C6900D4DD76 /* VLCOutput.m in Sources */ = {isa = PBXBuildFile; fileRef = 8E55FB800459B0FD00FB3317 /* VLCOutput.m */; };
......@@ -459,8 +458,6 @@
8ED6C28403E2EB1C0059A3A7 /* VLCPlaylist.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = VLCPlaylist.m; sourceTree = "<group>"; };
8ED6C28503E2EB1C0059A3A7 /* prefs.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = prefs.h; sourceTree = "<group>"; };
8ED6C28603E2EB1C0059A3A7 /* prefs.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = prefs.m; sourceTree = "<group>"; };
CC017A0B14A4C8AF00C09A4F /* VLCMainWindowTitleView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = VLCMainWindowTitleView.h; sourceTree = "<group>"; };
CC017A0C14A4C8AF00C09A4F /* VLCMainWindowTitleView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = VLCMainWindowTitleView.m; sourceTree = "<group>"; };
CC0663341566C34C003A411C /* VLCConvertAndSaveWindowController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = VLCConvertAndSaveWindowController.h; sourceTree = "<group>"; };
CC0663351566C34C003A411C /* VLCConvertAndSaveWindowController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = VLCConvertAndSaveWindowController.m; sourceTree = "<group>"; };
CC0CD0DF13DE0EAE00B0D90D /* PXSourceList.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PXSourceList.h; sourceTree = "<group>"; };
......@@ -1060,8 +1057,6 @@
7D5678EF1D5BA397002698F3 /* VLCMainWindowControlsBar.m */,
CC448A6213B68A0B009F72E0 /* VLCMainWindow.h */,
CC448A6313B68A0B009F72E0 /* VLCMainWindow.m */,
CC017A0B14A4C8AF00C09A4F /* VLCMainWindowTitleView.h */,
CC017A0C14A4C8AF00C09A4F /* VLCMainWindowTitleView.m */,
);
name = "Main Window";
sourceTree = "<group>";
......@@ -1488,7 +1483,7 @@
};
};
};
buildConfigurationList = C2F2A6EA09588F1B00018C74 /* Build configuration list for PBXProject "VLC" */;
buildConfigurationList = C2F2A6EA09588F1B00018C74 /* Build configuration list for PBXProject "vlc" */;
compatibilityVersion = "Xcode 6.3";
developmentRegion = English;
hasScannedForEncodings = 1;
......@@ -1593,7 +1588,6 @@
1C3113BD1E508C6900D4DD76 /* macosx.m in Sources */,
1C3113C11E508C6900D4DD76 /* VLCMainWindow.m in Sources */,
6B0292E61F43256300A50082 /* VLCBottomBarView.m in Sources */,
1C3113C31E508C6900D4DD76 /* VLCMainWindowTitleView.m in Sources */,
1C3113C51E508C6900D4DD76 /* misc.m in Sources */,
1C3113C71E508C6900D4DD76 /* VLCOpenWindowController.m in Sources */,
1C3113C91E508C6900D4DD76 /* VLCOutput.m in Sources */,
......@@ -1869,7 +1863,7 @@
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Default;
};
C2F2A6EA09588F1B00018C74 /* Build configuration list for PBXProject "VLC" */ = {
C2F2A6EA09588F1B00018C74 /* Build configuration list for PBXProject "vlc" */ = {
isa = XCConfigurationList;
buildConfigurations = (
C2F2A6EB09588F1B00018C74 /* Development */,
......
SUFFIXES += .xib
libmacosx_plugin_la_OBJCFLAGS = $(AM_OBJCFLAGS) -fobjc-exceptions -fobjc-arc
libmacosx_plugin_la_OBJCFLAGS = $(AM_OBJCFLAGS) -fobjc-exceptions -fobjc-arc
libmacosx_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(guidir)' \
-Wl,-framework,Cocoa -Wl,-framework,Carbon -Wl,-framework,CoreServices \
-Wl,-framework,AVFoundation -Wl,-framework,CoreMedia -Wl,-framework,IOKit \
......@@ -36,7 +36,6 @@ libmacosx_plugin_la_SOURCES = \
gui/macosx/VLCKeyboardBacklightControl.h gui/macosx/VLCKeyboardBacklightControl.m \
gui/macosx/macosx.m \
gui/macosx/VLCMainMenu.h gui/macosx/VLCMainMenu.m \
gui/macosx/VLCMainWindowTitleView.h gui/macosx/VLCMainWindowTitleView.m \
gui/macosx/misc.h gui/macosx/misc.m \
gui/macosx/NSSound+VLCAdditions.h gui/macosx/NSSound+VLCAdditions.m \
gui/macosx/NSScreen+VLCAdditions.h gui/macosx/NSScreen+VLCAdditions.m \
......
This diff is collapsed.
......@@ -33,7 +33,6 @@
#import "Windows.h"
#import "misc.h"
#import "VLCFSPanelController.h"
#import "VLCMainWindowTitleView.h"
@class VLCDetachedVideoWindow;
@class VLCMainWindowControlsBar;
......
/*****************************************************************************
* MainWindowTitle.h: MacOS X interface module
*****************************************************************************
* Copyright (C) 2011-2012 Felix Paul Kühne
* $Id$
*
* Authors: Felix Paul Kühne <fkuehne -at- videolan -dot- org>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
#import <Cocoa/Cocoa.h>
#import "misc.h"
/*****************************************************************************
* VLCMainWindowTitleView
*****************************************************************************/
@class VLCCustomWindowCloseButton;
@class VLCCustomWindowMinimizeButton;
@class VLCCustomWindowZoomButton;
@class VLCCustomWindowFullscreenButton;
@class VLCWindowTitleTextField;
@interface VLCMainWindowTitleView : VLCThreePartImageView
@property (readwrite, strong) IBOutlet VLCCustomWindowCloseButton *redButton;
@property (readwrite, strong) IBOutlet VLCCustomWindowMinimizeButton *yellowButton;
@property (readwrite, strong) IBOutlet VLCCustomWindowZoomButton *greenButton;
@property (readwrite, strong) IBOutlet VLCCustomWindowFullscreenButton *fullscreenButton;
@property (readwrite, strong) IBOutlet VLCWindowTitleTextField *titleLabel;
@property (readonly) NSButton * closeButton;
@property (readonly) NSButton * minimizeButton;
@property (readonly) NSButton * zoomButton;
- (void)informModifierPressed:(BOOL)b_is_altkey;
- (void)loadButtonIcons;
- (IBAction)buttonAction:(id)sender;
- (void)setWindowTitle:(NSString *)title;
- (void)setWindowButtonOver:(BOOL)b_value;
- (void)setWindowFullscreenButtonOver:(BOOL)b_value;
@end
@interface VLCWindowButtonCell : NSButtonCell
@end
@interface VLCCustomWindowButtonPrototype : NSButton
- (NSArray*)extendedAccessibilityAttributeNames: (NSArray*)theAttributeNames;
- (id)extendedAccessibilityAttributeValue: (NSString*)theAttributeName;
- (NSNumber*)extendedAccessibilityIsAttributeSettable: (NSString*)theAttributeName;
@end
@interface VLCCustomWindowCloseButton : VLCCustomWindowButtonPrototype
@end
@interface VLCCustomWindowMinimizeButton : VLCCustomWindowButtonPrototype
@end
@interface VLCCustomWindowZoomButton : VLCCustomWindowButtonPrototype
@end
@interface VLCCustomWindowFullscreenButton : VLCCustomWindowButtonPrototype
@end
@interface VLCWindowTitleTextField : NSTextField
@end
This diff is collapsed.
......@@ -62,8 +62,6 @@ static const float f_min_video_height = 70.0;
@interface VLCVideoWindowCommon : VLCWindow <NSWindowDelegate, NSAnimationDelegate>
@property (nonatomic, weak) IBOutlet VLCMainWindowTitleView *titlebarView; // only set in main or detached window
@property (weak) IBOutlet NSLayoutConstraint *videoViewTopConstraint;
@property (weak) IBOutlet NSLayoutConstraint *videoViewBottomConstraint;
@property (nonatomic, weak) IBOutlet VLCVoutView* videoView;
......
......@@ -255,11 +255,6 @@
[self setCollectionBehavior: NSWindowCollectionBehaviorFullScreenAuxiliary];
}
if (self.titlebarView) {
[self.titlebarView removeFromSuperview];
self.titlebarView = nil;
}
[super awakeFromNib];
}
......@@ -528,17 +523,6 @@
[self setLevel: i_originalLevel];
}
#pragma mark -
#pragma mark Key events
- (void)flagsChanged:(NSEvent *)theEvent
{
BOOL b_alt_pressed = ([theEvent modifierFlags] & NSAlternateKeyMask) != 0;
[self.titlebarView informModifierPressed: b_alt_pressed];
[super flagsChanged:theEvent];
}
#pragma mark -
#pragma mark Lion native fullscreen handling
......@@ -1023,28 +1007,4 @@
[self hasBecomeFullscreen];
}
#pragma mark -
#pragma mark Accessibility stuff
- (NSArray *)accessibilityAttributeNames
{
if (!self.titlebarView)
return [super accessibilityAttributeNames];
static NSMutableArray *attributes = nil;
if (attributes == nil) {
attributes = [[super accessibilityAttributeNames] mutableCopy];
NSArray *appendAttributes = [NSArray arrayWithObjects:NSAccessibilitySubroleAttribute,
NSAccessibilityCloseButtonAttribute,
NSAccessibilityMinimizeButtonAttribute,
NSAccessibilityZoomButtonAttribute, nil];
for(NSString *attribute in appendAttributes) {
if (![attributes containsObject:attribute])
[attributes addObject:attribute];
}
}
return attributes;
}
@end
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment