Skip to content

Commit

Permalink
macosx: modernize controls bar coding style
Browse files Browse the repository at this point in the history
  • Loading branch information
@fkuehne
fkuehne committed May 9, 2016
1 parent 2244a1d commit 679b36e
Show file tree
Hide file tree
Showing 4 changed files with 448 additions and 449 deletions.
29 changes: 15 additions & 14 deletions extras/package/macosx/Resources/English.lproj/DetachedVideoWindow.xib
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="10102" systemVersion="15D21" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none">
<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="10117" systemVersion="15E65" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none">
<dependencies>
<deployment identifier="macosx"/>
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="10102"/>
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="10117"/>
</dependencies>
<objects>
<customObject id="-2" userLabel="File's Owner" customClass="NSWindowController">
Expand All @@ -11,7 +11,7 @@
</connections>
</customObject>
<customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
<customObject id="-3" userLabel="Application"/>
<customObject id="-3" userLabel="Application" customClass="NSObject"/>
<window title="VLC media player" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" restorable="NO" releasedWhenClosed="NO" showsToolbarButton="NO" visibleAtLaunch="NO" frameAutosaveName="detachedvideowindow" animationBehavior="default" id="2" userLabel="Detached Video Window" customClass="VLCDetachedVideoWindow">
<windowStyleMask key="styleMask" titled="YES" closable="YES" miniaturizable="YES" resizable="YES"/>
<windowPositionMask key="initialPositionMask" leftStrut="YES" topStrut="YES"/>
Expand Down Expand Up @@ -199,19 +199,20 @@
</customView>
<customObject id="3" userLabel="Detached Window Controls Bar" customClass="VLCControlsBarCommon">
<connections>
<outlet property="backwardButton" destination="11" id="aQU-S3-4ZI"/>
<outlet property="bottomBarView" destination="5" id="67"/>
<outlet property="o_bwd_btn" destination="11" id="50"/>
<outlet property="o_drop_view" destination="65" id="66"/>
<outlet property="o_fullscreen_btn" destination="8" id="44"/>
<outlet property="o_fwd_btn" destination="12" id="43"/>
<outlet property="o_play_btn" destination="10" id="40"/>
<outlet property="o_progress_bar" destination="21" id="49"/>
<outlet property="dropView" destination="65" id="9kL-XQ-Akn"/>
<outlet property="forwardButton" destination="12" id="f7L-YR-p1H"/>
<outlet property="fullscreenButton" destination="8" id="HTb-D0-BTG"/>
<outlet property="o_progress_view" destination="6" id="42"/>
<outlet property="o_resize_view" destination="7" id="48"/>
<outlet property="o_time_fld" destination="9" id="47"/>
<outlet property="o_time_sld" destination="20" id="60"/>
<outlet property="o_time_sld_background" destination="22" id="45"/>
<outlet property="o_time_sld_fancygradient_view" destination="19" id="58"/>
<outlet property="playButton" destination="10" id="Gsq-tx-qf3"/>
<outlet property="progressBar" destination="21" id="lME-my-FW0"/>
<outlet property="progressView" destination="6" id="Z9X-x2-mTB"/>
<outlet property="resizeView" destination="7" id="3ba-BO-w95"/>
<outlet property="timeField" destination="9" id="uzI-2c-bs3"/>
<outlet property="timeSlider" destination="20" id="AFS-sq-vuw"/>
<outlet property="timeSliderBackgroundView" destination="22" id="jag-ln-qOC"/>
<outlet property="timeSliderGradientView" destination="19" id="3iv-ry-UEy"/>
</connections>
</customObject>
</objects>
Expand Down
46 changes: 23 additions & 23 deletions extras/package/macosx/Resources/English.lproj/MainWindow.xib
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="10102" systemVersion="15D21" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none">
<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="10117" systemVersion="15E65" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none">
<dependencies>
<deployment version="1070" identifier="macosx"/>
<development version="7000" identifier="xcode"/>
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="10102"/>
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="10117"/>
<capability name="box content view" minToolsVersion="7.0"/>
</dependencies>
<objects>
Expand Down Expand Up @@ -408,28 +408,28 @@
</window>
<customObject id="5339" customClass="VLCMainWindowControlsBar">
<connections>
<outlet property="backwardButton" destination="3651" id="spd-Ox-yOI"/>
<outlet property="bottomBarView" destination="4756" id="5621"/>
<outlet property="o_bwd_btn" destination="3651" id="5340"/>
<outlet property="o_drop_view" destination="5608" id="5609"/>
<outlet property="o_effects_btn" destination="3654" id="5353"/>
<outlet property="o_fullscreen_btn" destination="4419" id="5355"/>
<outlet property="o_fwd_btn" destination="3648" id="5344"/>
<outlet property="o_play_btn" destination="3571" id="5342"/>
<outlet property="o_playlist_btn" destination="4671" id="5348"/>
<outlet property="o_progress_bar" destination="3584" id="5368"/>
<outlet property="o_progress_view" destination="5335" id="5366"/>
<outlet property="o_repeat_btn" destination="2789" id="5349"/>
<outlet property="o_resize_view" destination="4839" id="5364"/>
<outlet property="o_shuffle_btn" destination="2208" id="5351"/>
<outlet property="o_stop_btn" destination="3647" id="5346"/>
<outlet property="o_time_fld" destination="4423" id="5393"/>
<outlet property="o_time_sld" destination="4422" id="5369"/>
<outlet property="o_time_sld_background" destination="4919" id="5367"/>
<outlet property="o_time_sld_fancygradient_view" destination="4701" id="5371"/>
<outlet property="o_volume_down_btn" destination="3653" id="5360"/>
<outlet property="o_volume_sld" destination="3649" id="5357"/>
<outlet property="o_volume_track_view" destination="4417" id="5395"/>
<outlet property="o_volume_up_btn" destination="3652" id="5362"/>
<outlet property="dropView" destination="5608" id="zUe-aW-9EY"/>
<outlet property="effectsButton" destination="3654" id="VfE-Hs-5Ni"/>
<outlet property="forwardButton" destination="3648" id="0bA-YS-tkr"/>
<outlet property="fullscreenButton" destination="4419" id="hgS-Tk-jle"/>
<outlet property="playButton" destination="3571" id="5Mf-48-Ga9"/>
<outlet property="playlistButton" destination="4671" id="AZd-5b-MrA"/>
<outlet property="progressBar" destination="3584" id="d57-az-Grm"/>
<outlet property="progressView" destination="5335" id="dBT-U1-rmL"/>
<outlet property="repeatButton" destination="2789" id="lRj-JN-Yry"/>
<outlet property="resizeView" destination="4839" id="26r-ET-oqH"/>
<outlet property="shuffleButton" destination="2208" id="kf1-mU-75T"/>
<outlet property="stopButton" destination="3647" id="ddx-Gq-iPV"/>
<outlet property="timeField" destination="4423" id="Wvo-az-Lou"/>
<outlet property="timeSlider" destination="4422" id="I3H-rQ-4GH"/>
<outlet property="timeSliderBackgroundView" destination="4919" id="6gl-QT-tF7"/>
<outlet property="timeSliderGradientView" destination="4701" id="2CZ-VD-eHh"/>
<outlet property="volumeDownButton" destination="3653" id="brO-P5-sUM"/>
<outlet property="volumeSlider" destination="3649" id="NDW-el-poL"/>
<outlet property="volumeTrackImageView" destination="4417" id="xH3-Dg-2Ok"/>
<outlet property="volumeUpButton" destination="3652" id="vXR-KC-L2N"/>
</connections>
</customObject>
<customView id="4850" customClass="VLCMainWindowTitleView">
Expand Down
54 changes: 27 additions & 27 deletions modules/gui/macosx/ControlsBar.h
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*****************************************************************************
* ControlsBar.h: MacOS X interface module
*****************************************************************************
* Copyright (C) 2012-2014 VLC authors and VideoLAN
* Copyright (C) 2012-2016 VLC authors and VideoLAN
* $Id$
*
* Authors: Felix Paul Kühne <fkuehne -at- videolan -dot- org>
Expand All @@ -26,6 +26,7 @@
#import "misc.h"

@class VLCFSPanel;
@class VLCResizeControl;

/*****************************************************************************
* VLCControlsBarCommon
Expand All @@ -35,25 +36,25 @@
*****************************************************************************/

@interface VLCControlsBarCommon : NSObject
{
IBOutlet VLCDragDropView *o_drop_view;

IBOutlet id o_play_btn;
IBOutlet id o_bwd_btn;
IBOutlet id o_fwd_btn;
@property (readwrite, strong) IBOutlet VLCDragDropView *dropView;

IBOutlet id o_progress_view;
IBOutlet id o_time_sld;
IBOutlet id o_time_sld_fancygradient_view;
IBOutlet id o_time_sld_background;
IBOutlet id o_progress_bar;
@property (readwrite, strong) IBOutlet NSButton *playButton;
@property (readwrite, strong) IBOutlet NSButton *backwardButton;
@property (readwrite, strong) IBOutlet NSButton *forwardButton;

IBOutlet id o_time_fld;
IBOutlet id o_fullscreen_btn;
IBOutlet id o_resize_view;
}
@property (readwrite, strong) IBOutlet VLCProgressView *progressView;
@property (readwrite, strong) IBOutlet TimeLineSlider *timeSlider;
@property (readwrite, strong) IBOutlet VLCThreePartImageView *timeSliderGradientView;
@property (readwrite, strong) IBOutlet VLCThreePartImageView *timeSliderBackgroundView;
@property (readwrite, strong) IBOutlet NSProgressIndicator *progressBar;

@property (readwrite, strong) IBOutlet VLCTimeField *timeField;
@property (readwrite, strong) IBOutlet NSButton *fullscreenButton;
@property (readwrite, strong) IBOutlet VLCResizeControl *resizeView;

@property (readwrite, strong) IBOutlet VLCThreePartImageView *bottomBarView;

@property (readwrite, strong) IBOutlet id bottomBarView;
@property (readonly) BOOL darkInterface;
@property (readonly) BOOL nativeFullscreenMode;

Expand Down Expand Up @@ -84,20 +85,19 @@
*****************************************************************************/

@interface VLCMainWindowControlsBar : VLCControlsBarCommon
{
IBOutlet id o_stop_btn;

IBOutlet id o_playlist_btn;
IBOutlet id o_repeat_btn;
IBOutlet id o_shuffle_btn;
@property (readwrite, strong) IBOutlet NSButton *stopButton;

@property (readwrite, strong) IBOutlet NSButton *playlistButton;
@property (readwrite, strong) IBOutlet NSButton *repeatButton;
@property (readwrite, strong) IBOutlet NSButton *shuffleButton;

IBOutlet VLCVolumeSliderCommon * o_volume_sld;
IBOutlet id o_volume_track_view;
IBOutlet id o_volume_down_btn;
IBOutlet id o_volume_up_btn;
@property (readwrite, strong) IBOutlet VLCVolumeSliderCommon * volumeSlider;
@property (readwrite, strong) IBOutlet NSImageView *volumeTrackImageView;
@property (readwrite, strong) IBOutlet NSButton *volumeDownButton;
@property (readwrite, strong) IBOutlet NSButton *volumeUpButton;

IBOutlet id o_effects_btn;
}
@property (readwrite, strong) IBOutlet NSButton *effectsButton;

- (IBAction)stop:(id)sender;

Expand Down
Loading

0 comments on commit 679b36e

Please sign in to comment.