Skip to content

V
vlc
Commit 3b66dabc authored by Felix Paul Kühne's avatar Felix Paul Kühne
Browse files
Options

macosx: remove the extended controls panel since all of its functionality is... 

macosx: remove the extended controls panel since all of its functionality is present in the * effects panels now
parent 68258909
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 310 additions and 3959 deletions
Makefile.am
View file @ 3b66dabc
......@@ -131,8 +131,6 @@ EXTRA_DIST += \
extras/package/macosx/Resources/English.lproj/Wizard.nib/keyedobjects.nib \
extras/package/macosx/Resources/English.lproj/Bookmarks.nib/designable.nib \
extras/package/macosx/Resources/English.lproj/Bookmarks.nib/keyedobjects.nib \
extras/package/macosx/Resources/English.lproj/Extended.nib/designable.nib \
extras/package/macosx/Resources/English.lproj/Extended.nib/keyedobjects.nib \
extras/package/macosx/Resources/English.lproj/CoreDialogs.nib/designable.nib \
extras/package/macosx/Resources/English.lproj/CoreDialogs.nib/keyedobjects.nib \
extras/package/macosx/Resources/English.lproj/ErrorPanel.nib/designable.nib \
......@@ -447,8 +445,6 @@ VLC-release.app: vlc
voutgl.m \
wizard.h \
wizard.m \
extended.h \
extended.m \
bookmarks.h \
bookmarks.m \
coredialogs.h \
......@@ -585,8 +581,6 @@ VLC.app: vlc $(top_builddir)/src/.libs/libvlccore.dylib $(top_builddir)/src/.lib
voutgl.m \
wizard.h \
wizard.m \
extended.h \
extended.m \
bookmarks.h \
bookmarks.m \
coredialogs.h \
......
extras/package/macosx/Resources/English.lproj/Extended.nib/designable.nib deleted 100644 → 0
View file @ 68258909
This source diff could not be displayed because it is too large. You can view the blob instead.
extras/package/macosx/vlc.xcodeproj/project.pbxproj
View file @ 3b66dabc
......@@ -44,7 +44,6 @@
CC402EEE0E00ABBB006A4BA4 /* Preferences.nib in Resources */ = {isa = PBXBuildFile; fileRef = DCF358B9077F10BA007DB450 /* Preferences.nib */; };
CC402EEF0E00ABBB006A4BA4 /* Open.nib in Resources */ = {isa = PBXBuildFile; fileRef = DCA693C10789DF8700139EC6 /* Open.nib */; };
CC402EF00E00ABBB006A4BA4 /* Wizard.nib in Resources */ = {isa = PBXBuildFile; fileRef = DCFCCDB7085CE18F001E36AF /* Wizard.nib */; };
CC402EF10E00ABBB006A4BA4 /* Extended.nib in Resources */ = {isa = PBXBuildFile; fileRef = DC7F46EB08A183FC0027DB24 /* Extended.nib */; };
CC402EF20E00ABBB006A4BA4 /* Bookmarks.nib in Resources */ = {isa = PBXBuildFile; fileRef = DCE7BD0308A56C8B007B10AE /* Bookmarks.nib */; };
CC402EF30E00ABBB006A4BA4 /* about_bg.png in Resources */ = {isa = PBXBuildFile; fileRef = DCDA5E6408F94518009D93A8 /* about_bg.png */; };
CC402EF50E00ABBB006A4BA4 /* skip_forward_active_embedded.png in Resources */ = {isa = PBXBuildFile; fileRef = C2F2A6FA0958A6E600018C74 /* skip_forward_active_embedded.png */; };
......@@ -394,9 +393,6 @@
CCF11B530F8BFB520088542D /* English */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = English; path = Resources/English.lproj/ErrorPanel.nib; sourceTree = "<group>"; };
DC769AB7085DF0DB001A838D /* wizard.m */ = {isa = PBXFileReference; fileEncoding = 5; indentWidth = 4; lastKnownFileType = sourcecode.c.objc; name = wizard.m; path = ../../../modules/gui/macosx/wizard.m; sourceTree = SOURCE_ROOT; tabWidth = 4; usesTabs = 0; };
DC769AB8085DF0DB001A838D /* wizard.h */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.h; name = wizard.h; path = ../../../modules/gui/macosx/wizard.h; sourceTree = SOURCE_ROOT; };
DC7F46EC08A183FC0027DB24 /* English */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = English; path = Resources/English.lproj/Extended.nib; sourceTree = "<group>"; };
DC7F46F008A187F60027DB24 /* extended.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.objc; fileEncoding = 5; name = extended.h; path = ../../../modules/gui/macosx/extended.h; sourceTree = SOURCE_ROOT; usesTabs = 0; };
DC7F46F108A187F60027DB24 /* extended.m */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.objc; fileEncoding = 4; includeInIndex = 0; name = extended.m; path = ../../../modules/gui/macosx/extended.m; sourceTree = SOURCE_ROOT; };
DCA00AA8075F948800E6BF46 /* English */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = English; path = Resources/English.lproj/About.nib; sourceTree = "<group>"; };
DCA693C20789DF8700139EC6 /* English */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = English; path = Resources/English.lproj/Open.nib; sourceTree = "<group>"; };
DCDA5E6408F94518009D93A8 /* about_bg.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = about_bg.png; path = Resources/about_bg.png; sourceTree = "<group>"; };
......@@ -508,8 +504,6 @@
8E9CA1A506D7DEE800B7186C /* voutgl.m */,
DC769AB8085DF0DB001A838D /* wizard.h */,
DC769AB7085DF0DB001A838D /* wizard.m */,
DC7F46F008A187F60027DB24 /* extended.h */,
DC7F46F108A187F60027DB24 /* extended.m */,
DCE7BD0708A5724D007B10AE /* bookmarks.h */,
DCE7BD0608A5724D007B10AE /* bookmarks.m */,
CC6D8D9C0A878DED006F2BBE /* AppleRemote.h */,
......@@ -807,7 +801,6 @@
DCF358B9077F10BA007DB450 /* Preferences.nib */,
DCA693C10789DF8700139EC6 /* Open.nib */,
DCFCCDB7085CE18F001E36AF /* Wizard.nib */,
DC7F46EB08A183FC0027DB24 /* Extended.nib */,
DCE7BD0308A56C8B007B10AE /* Bookmarks.nib */,
CC5560261365CE4800D54038 /* AudioEffects.nib */,
CC707EC6137474A50003010A /* SyncTracks.nib */,
......@@ -938,7 +931,6 @@
CC402EEE0E00ABBB006A4BA4 /* Preferences.nib in Resources */,
CC402EEF0E00ABBB006A4BA4 /* Open.nib in Resources */,
CC402EF00E00ABBB006A4BA4 /* Wizard.nib in Resources */,
CC402EF10E00ABBB006A4BA4 /* Extended.nib in Resources */,
CC402EF20E00ABBB006A4BA4 /* Bookmarks.nib in Resources */,
CC402EF30E00ABBB006A4BA4 /* about_bg.png in Resources */,
CC402EF50E00ABBB006A4BA4 /* skip_forward_active_embedded.png in Resources */,
......@@ -1064,14 +1056,6 @@
name = ErrorPanel.nib;
sourceTree = "<group>";
};
DC7F46EB08A183FC0027DB24 /* Extended.nib */ = {
isa = PBXVariantGroup;
children = (
DC7F46EC08A183FC0027DB24 /* English */,
);
name = Extended.nib;
sourceTree = "<group>";
};
DCA00AA7075F948800E6BF46 /* About.nib */ = {
isa = PBXVariantGroup;
children = (
......
modules/gui/macosx/Modules.am
View file @ 3b66dabc
......@@ -41,8 +41,6 @@ SOURCES_macosx = \
output.m \
wizard.h \
wizard.m \
extended.h \
extended.m \
AudioEffects.h \
AudioEffects.m \
TrackSynchronization.h \
......
modules/gui/macosx/VideoEffects.h
View file @ 3b66dabc
......@@ -141,6 +141,7 @@
/* generic */
+ (VLCVideoEffects *)sharedInstance;
- (IBAction)toggleWindow:(id)sender;
- (void)resetValues;
- (void)setVideoFilter: (char *)psz_name on:(BOOL)b_on;
......
modules/gui/macosx/VideoEffects.m
View file @ 3b66dabc
......@@ -48,6 +48,14 @@ static VLCVideoEffects *_o_sharedInstance = nil;
return _o_sharedInstance;
}
- (IBAction)toggleWindow:(id)sender
{
if( [o_window isVisible] )
[o_window orderOut:sender];
else
[o_window makeKeyAndOrderFront:sender];
}
- (void)awakeFromNib
{
[o_window setTitle: _NS("Video Effects")];
......@@ -216,7 +224,7 @@ static VLCVideoEffects *_o_sharedInstance = nil;
[o_banding_sld setIntValue: config_GetInt( p_intf, "gradfun-radius" )];
[o_banding_sld setEnabled: [o_banding_ckb state]];
[o_grain_sld setFloatValue: config_GetFloat( p_intf, "grain-variance" )];
[o_grain_sld setEnabled: [o_grain_sld state]];
[o_grain_sld setEnabled: [o_grain_ckb state]];
[o_crop_top_fld setIntValue: 0];
[o_crop_left_fld setIntValue: 0];
......
modules/gui/macosx/extended.h deleted 100644 → 0
View file @ 68258909
/*****************************************************************************
* extended.h: MacOS X Extended interface panel
*****************************************************************************
* Copyright (C) 2005-2007 the VideoLAN team
* $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.
*****************************************************************************/
/*****************************************************************************
* VLCExtended
*****************************************************************************/
#import <Cocoa/Cocoa.h>
#import "intf.h"
#import <vlc_common.h>
@interface VLCExtended : NSObject
{
/* views and window */
IBOutlet id o_adjustImg_view;
IBOutlet id o_audioFlts_view;
IBOutlet id o_videoFilters_view;
IBOutlet id o_extended_window;
/* window content */
IBOutlet id o_selector_pop;
IBOutlet id o_top_controls_box;
/* video filters */
IBOutlet id o_btn_vidFlts_mrInfo;
IBOutlet id o_ckb_blur;
IBOutlet id o_ckb_imgClone;
IBOutlet id o_ckb_imgCrop;
IBOutlet id o_ckb_imgInvers;
IBOutlet id o_ckb_trnsform;
IBOutlet id o_ckb_intZoom;
IBOutlet id o_ckb_wave;
IBOutlet id o_ckb_ripple;
IBOutlet id o_ckb_psycho;
IBOutlet id o_ckb_gradient;
IBOutlet id o_lbl_general;
IBOutlet id o_lbl_distort;
/* audio filters */
IBOutlet id o_ckb_vlme_norm;
IBOutlet id o_ckb_hdphnVirt;
IBOutlet id o_lbl_maxLevel;
IBOutlet id o_sld_maxLevel;
/* adjust image */
IBOutlet id o_btn_rstrDefaults;
IBOutlet id o_ckb_enblAdjustImg;
IBOutlet id o_lbl_brightness;
IBOutlet id o_lbl_contrast;
IBOutlet id o_lbl_gamma;
IBOutlet id o_lbl_hue;
IBOutlet id o_lbl_saturation;
IBOutlet id o_lbl_opaque;
IBOutlet id o_sld_brightness;
IBOutlet id o_sld_contrast;
IBOutlet id o_sld_gamma;
IBOutlet id o_sld_hue;
IBOutlet id o_sld_saturation;
IBOutlet id o_sld_opaque;
/* global variables */
NSView * o_currentlyshown_view;
}
- (IBAction)viewSelectorAction:(id)sender;
- (IBAction)enableAdjustImage:(id)sender;
- (IBAction)restoreDefaultsForAdjustImage:(id)sender;
- (IBAction)sliderActionAdjustImage:(id)sender;
- (IBAction)opaqueSliderAction:(id)sender;
- (IBAction)enableHeadphoneVirtualizer:(id)sender;
- (IBAction)sliderActionMaximumAudioLevel:(id)sender;
- (IBAction)enableVolumeNormalization:(id)sender;
- (IBAction)videoFilterAction:(id)sender;
- (IBAction)moreInfoVideoFilters:(id)sender;
+ (VLCExtended *)sharedInstance;
- (void)showPanel;
- (void)initStrings;
- (void)changeVoutFiltersString: (char *)psz_name onOrOff: (bool )b_add;
- (void)changeVideoFiltersString: (char *)psz_name onOrOff: (bool )b_add;
- (void)changeAFiltersString: (char *)psz_name onOrOff: (bool )b_add;
@end
modules/gui/macosx/extended.m deleted 100644 → 0
View file @ 68258909
This diff is collapsed.
modules/gui/macosx/intf.h
View file @ 3b66dabc
......@@ -105,7 +105,7 @@ struct intf_sys_t
id o_about; /* VLAboutBox */
id o_open; /* VLCOpen */
id o_wizard; /* VLCWizard */
id o_extended; /* VLCExtended */
id o_videoeffects; /* VLCVideoEffects */
id o_bookmarks; /* VLCBookmarks */
id o_embedded_list; /* VLCEmbeddedList*/
id o_coredialogs; /* VLCCoreDialogProvider */
......@@ -117,13 +117,13 @@ struct intf_sys_t
BOOL nib_open_loaded; /* open nibfile */
BOOL nib_about_loaded; /* about nibfile */
BOOL nib_wizard_loaded; /* wizard nibfile */
BOOL nib_extended_loaded; /* extended nibfile */
BOOL nib_bookmarks_loaded; /* bookmarks nibfile */
BOOL nib_prefs_loaded; /* preferences nibfile */
BOOL nib_info_loaded; /* information panel nibfile */
BOOL nib_coredialogs_loaded; /* CoreDialogs nibfile */
BOOL nib_audioeffects_loaded; /* audio effects panel */
BOOL nib_tracksynchro_loaded; /* track synchro panel */
BOOL nib_videoeffects_loaded; /* video effects panel */
IBOutlet VLCControllerWindow * o_window; /* main window */
IBOutlet NSView * o_playlist_view; /* playlist view */
......@@ -284,7 +284,7 @@ struct intf_sys_t
IBOutlet NSMenuItem * o_mi_player;
IBOutlet NSMenuItem * o_mi_controller;
IBOutlet NSMenuItem * o_mi_audioeffects;
IBOutlet NSMenuItem * o_mi_extended;
IBOutlet NSMenuItem * o_mi_videoeffects;
IBOutlet NSMenuItem * o_mi_bookmarks;
IBOutlet NSMenuItem * o_mi_playlist;
IBOutlet NSMenuItem * o_mi_info;
......@@ -407,7 +407,7 @@ struct intf_sys_t
- (IBAction)intfOpenCapture:(id)sender;
- (IBAction)showWizard:(id)sender;
- (IBAction)showExtended:(id)sender;
- (IBAction)showVideoEffects:(id)sender;
- (IBAction)showAudioEffects:(id)sender;
- (IBAction)showTrackSynchronization:(id)sender;
- (IBAction)showBookmarks:(id)sender;
......
modules/gui/macosx/intf.m
View file @ 3b66dabc
......@@ -47,7 +47,6 @@
#import "about.h"
#import "open.h"
#import "wizard.h"
#import "extended.h"
#import "bookmarks.h"
#import "coredialogs.h"
#import "embeddedwindow.h"
......@@ -55,6 +54,7 @@
#import "eyetv.h"
#import "simple_prefs.h"
#import "AudioEffects.h"
#import "VideoEffects.h"
#import "TrackSynchronization.h"
#import <AddressBook/AddressBook.h> /* for crashlog send mechanism */
......@@ -345,7 +345,6 @@ static VLCMain *_o_sharedMainInstance = nil;
o_prefs = nil;
o_open = [[VLCOpen alloc] init];
o_wizard = [[VLCWizard alloc] init];
o_extended = nil;
o_bookmarks = [[VLCBookmarks alloc] init];
//o_embedded_list = [[VLCEmbeddedList alloc] init];
o_coredialogs = [[VLCCoreDialogProvider alloc] init];
......@@ -714,7 +713,7 @@ static VLCMain *_o_sharedMainInstance = nil;
[o_mi_player setTitle: _NS("Player...")];
[o_mi_controller setTitle: _NS("Controller...")];
[o_mi_audioeffects setTitle: _NS("Audio Effects...")];
[o_mi_extended setTitle: _NS("Extended Controls...")];
[o_mi_videoeffects setTitle: _NS("Video Filters...")];
[o_mi_bookmarks setTitle: _NS("Bookmarks...")];
[o_mi_playlist setTitle: _NS("Playlist...")];
[o_mi_info setTitle: _NS("Media Information...")];
......@@ -838,8 +837,8 @@ static VLCMain *_o_sharedMainInstance = nil;
if( nib_open_loaded )
[o_open release];
if( nib_extended_loaded )
[o_extended release];
if( nib_videoeffects_loaded )
[o_videoeffects release];
if (nib_audioeffects_loaded)
[o_audioeffects release];
......@@ -2235,15 +2234,15 @@ end:
}
}
- (IBAction)showExtended:(id)sender
- (IBAction)showVideoEffects:(id)sender
{
if( o_extended == nil )
o_extended = [[VLCExtended alloc] init];
if( o_videoeffects == nil )
o_videoeffects = [[VLCVideoEffects alloc] init];
if( !nib_extended_loaded )
nib_extended_loaded = [NSBundle loadNibNamed:@"Extended" owner: NSApp];
if( !nib_videoeffects_loaded )
nib_videoeffects_loaded = [NSBundle loadNibNamed:@"VideoEffects" owner: NSApp];
[o_extended showPanel];
[o_videoeffects toggleWindow:sender];
}
- (IBAction)showTrackSynchronization:(id)sender
......
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