Commit 3b66dabc authored by Felix Paul Kühne's avatar Felix Paul Kühne

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
......@@ -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 \
......
......@@ -2,19 +2,19 @@
<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.10">
<data>
<int key="IBDocument.SystemTarget">1040</int>
<string key="IBDocument.SystemVersion">11A444d</string>
<string key="IBDocument.SystemVersion">11A480b</string>
<string key="IBDocument.InterfaceBuilderVersion">851</string>
<string key="IBDocument.AppKitVersion">1119.1</string>
<string key="IBDocument.HIToolboxVersion">555.00</string>
<string key="IBDocument.AppKitVersion">1127</string>
<string key="IBDocument.HIToolboxVersion">561.00</string>
<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="NS.object.0">851</string>
</object>
<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
<bool key="EncodedWithXMLCoder">YES</bool>
<integer value="3568"/>
<integer value="24"/>
<integer value="3654"/>
<integer value="24"/>
<integer value="3568"/>
<integer value="2197"/>
<integer value="2417"/>
</object>
......@@ -1506,7 +1506,7 @@
</object>
<object class="NSMenuItem" id="96198661">
<reference key="NSMenu" ref="1016637396"/>
<string key="NSTitle">Extended Controls...</string>
<string key="NSTitle">Video Effects...</string>
<string key="NSKeyEquiv">e</string>
<int key="NSKeyEquivModMask">1048576</int>
<int key="NSMnemonicLoc">2147483647</int>
......@@ -5606,14 +5606,6 @@ LCAuLi4</string>
</object>
<int key="connectionID">2315</int>
</object>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">o_mi_extended</string>
<reference key="source" ref="199714555"/>
<reference key="destination" ref="96198661"/>
</object>
<int key="connectionID">2391</int>
</object>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">o_mi_bookmarks</string>
......@@ -5662,14 +5654,6 @@ LCAuLi4</string>
</object>
<int key="connectionID">2406</int>
</object>
<object class="IBConnectionRecord">
<object class="IBActionConnection" key="connection">
<string key="label">showExtended:</string>
<reference key="source" ref="199714555"/>
<reference key="destination" ref="96198661"/>
</object>
<int key="connectionID">2413</int>
</object>
<object class="IBConnectionRecord">
<object class="IBActionConnection" key="connection">
<string key="label">windowAction:</string>
......@@ -6958,6 +6942,22 @@ LCAuLi4</string>
</object>
<int key="connectionID">4414</int>
</object>
<object class="IBConnectionRecord">
<object class="IBActionConnection" key="connection">
<string key="label">showVideoEffects:</string>
<reference key="source" ref="199714555"/>
<reference key="destination" ref="96198661"/>
</object>
<int key="connectionID">4415</int>
</object>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">o_mi_videoeffects</string>
<reference key="source" ref="199714555"/>
<reference key="destination" ref="96198661"/>
</object>
<int key="connectionID">4416</int>
</object>
</object>
<object class="IBMutableOrderedSet" key="objectRecords">
<object class="NSArray" key="orderedObjects">
......@@ -10978,7 +10978,7 @@ LCAuLi4</string>
</object>
</object>
<nil key="sourceID"/>
<int key="maxID">4414</int>
<int key="maxID">4416</int>
</object>
<object class="IBClassDescriber" key="IBDocument.Classes">
<object class="NSMutableArray" key="referencedPartialClassDescriptionsV3.1+">
......@@ -11015,11 +11015,11 @@ LCAuLi4</string>
<string>saveDebugLog:</string>
<string>showAudioEffects:</string>
<string>showBookmarks:</string>
<string>showExtended:</string>
<string>showInformationPanel:</string>
<string>showLicense:</string>
<string>showMessagesPanel:</string>
<string>showTrackSynchronization:</string>
<string>showVideoEffects:</string>
<string>showWizard:</string>
<string>timeFieldWasClicked:</string>
<string>timesliderUpdate:</string>
......@@ -11084,11 +11084,11 @@ LCAuLi4</string>
<string>saveDebugLog:</string>
<string>showAudioEffects:</string>
<string>showBookmarks:</string>
<string>showExtended:</string>
<string>showInformationPanel:</string>
<string>showLicense:</string>
<string>showMessagesPanel:</string>
<string>showTrackSynchronization:</string>
<string>showVideoEffects:</string>
<string>showWizard:</string>
<string>timeFieldWasClicked:</string>
<string>timesliderUpdate:</string>
......@@ -11168,10 +11168,6 @@ LCAuLi4</string>
<string key="name">showBookmarks:</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBActionInfo">
<string key="name">showExtended:</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBActionInfo">
<string key="name">showInformationPanel:</string>
<string key="candidateClassName">id</string>
......@@ -11188,6 +11184,10 @@ LCAuLi4</string>
<string key="name">showTrackSynchronization:</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBActionInfo">
<string key="name">showVideoEffects:</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBActionInfo">
<string key="name">showWizard:</string>
<string key="candidateClassName">id</string>
......@@ -11255,7 +11255,6 @@ LCAuLi4</string>
<string>o_dmi_stop</string>
<string>o_embedded_list</string>
<string>o_embedded_window</string>
<string>o_extended</string>
<string>o_eyetv</string>
<string>o_main_pgbar</string>
<string>o_messages</string>
......@@ -11286,7 +11285,6 @@ LCAuLi4</string>
<string>o_mi_donation</string>
<string>o_mi_double_window</string>
<string>o_mi_errorsAndWarnings</string>
<string>o_mi_extended</string>
<string>o_mi_faster</string>
<string>o_mi_ffmpeg_pp</string>
<string>o_mi_fittoscreen</string>
......@@ -11347,6 +11345,7 @@ LCAuLi4</string>
<string>o_mi_teletext_yellow</string>
<string>o_mi_title</string>
<string>o_mi_trackSynchronization</string>
<string>o_mi_videoeffects</string>
<string>o_mi_videotrack</string>
<string>o_mi_visual</string>
<string>o_mi_vol_down</string>
......@@ -11387,6 +11386,7 @@ LCAuLi4</string>
<string>o_timefield</string>
<string>o_timeslider</string>
<string>o_trackSynchronization</string>
<string>o_videoeffects</string>
<string>o_vmi_fullscreen</string>
<string>o_vmi_mute</string>
<string>o_vmi_next</string>
......@@ -11434,7 +11434,6 @@ LCAuLi4</string>
<string>id</string>
<string>VLCEmbeddedWindow</string>
<string>id</string>
<string>id</string>
<string>NSProgressIndicator</string>
<string>NSTextView</string>
<string>NSMenuItem</string>
......@@ -11565,6 +11564,7 @@ LCAuLi4</string>
<string>NSTextField</string>
<string>NSSlider</string>
<string>id</string>
<string>id</string>
<string>NSMenuItem</string>
<string>NSMenuItem</string>
<string>NSMenuItem</string>
......@@ -11614,7 +11614,6 @@ LCAuLi4</string>
<string>o_dmi_stop</string>
<string>o_embedded_list</string>
<string>o_embedded_window</string>
<string>o_extended</string>
<string>o_eyetv</string>
<string>o_main_pgbar</string>
<string>o_messages</string>
......@@ -11645,7 +11644,6 @@ LCAuLi4</string>
<string>o_mi_donation</string>
<string>o_mi_double_window</string>
<string>o_mi_errorsAndWarnings</string>
<string>o_mi_extended</string>
<string>o_mi_faster</string>
<string>o_mi_ffmpeg_pp</string>
<string>o_mi_fittoscreen</string>
......@@ -11706,6 +11704,7 @@ LCAuLi4</string>
<string>o_mi_teletext_yellow</string>
<string>o_mi_title</string>
<string>o_mi_trackSynchronization</string>
<string>o_mi_videoeffects</string>
<string>o_mi_videotrack</string>
<string>o_mi_visual</string>
<string>o_mi_vol_down</string>
......@@ -11746,6 +11745,7 @@ LCAuLi4</string>
<string>o_timefield</string>
<string>o_timeslider</string>
<string>o_trackSynchronization</string>
<string>o_videoeffects</string>
<string>o_vmi_fullscreen</string>
<string>o_vmi_mute</string>
<string>o_vmi_next</string>
......@@ -11879,10 +11879,6 @@ LCAuLi4</string>
<string key="name">o_embedded_window</string>
<string key="candidateClassName">VLCEmbeddedWindow</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">o_extended</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">o_eyetv</string>
<string key="candidateClassName">id</string>
......@@ -12003,10 +11999,6 @@ LCAuLi4</string>
<string key="name">o_mi_errorsAndWarnings</string>
<string key="candidateClassName">NSMenuItem</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">o_mi_extended</string>
<string key="candidateClassName">NSMenuItem</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">o_mi_faster</string>
<string key="candidateClassName">NSMenuItem</string>
......@@ -12247,6 +12239,10 @@ LCAuLi4</string>
<string key="name">o_mi_trackSynchronization</string>
<string key="candidateClassName">NSMenuItem</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">o_mi_videoeffects</string>
<string key="candidateClassName">NSMenuItem</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">o_mi_videotrack</string>
<string key="candidateClassName">NSMenuItem</string>
......@@ -12407,6 +12403,10 @@ LCAuLi4</string>
<string key="name">o_trackSynchronization</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">o_videoeffects</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">o_vmi_fullscreen</string>
<string key="candidateClassName">NSMenuItem</string>
......
......@@ -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 = (
......
......@@ -41,8 +41,6 @@ SOURCES_macosx = \
output.m \
wizard.h \
wizard.m \
extended.h \
extended.m \
AudioEffects.h \
AudioEffects.m \
TrackSynchronization.h \
......
......@@ -141,6 +141,7 @@
/* generic */
+ (VLCVideoEffects *)sharedInstance;
- (IBAction)toggleWindow:(id)sender;
- (void)resetValues;
- (void)setVideoFilter: (char *)psz_name on:(BOOL)b_on;
......
......@@ -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];
......
This diff is collapsed.
This diff is collapsed.
......@@ -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;
......
......@@ -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