Skip to content

V
vlc-2-2
Commit bc87dd70 authored by Felix Paul Kühne's avatar Felix Paul Kühne
Browse files
Options

macosx: added UI stub for a new Convert & Save panel (refs #5900)

parent fa76779b
Expand all Show whitespace changes
Inline Side-by-side
Showing with 20541 additions and 18703 deletions
Makefile.am
View file @ bc87dd70
......@@ -103,6 +103,7 @@ EXTRA_DIST += \
extras/package/macosx/Resources/English.lproj/About.xib \
extras/package/macosx/Resources/English.lproj/AudioEffects.xib \
extras/package/macosx/Resources/English.lproj/Bookmarks.xib \
extras/package/macosx/Resources/English.lproj/ConvertAndSave.xib \
extras/package/macosx/Resources/English.lproj/CoreDialogs.xib \
extras/package/macosx/Resources/English.lproj/ErrorPanel.xib \
extras/package/macosx/Resources/English.lproj/InfoPlist.strings.in \
......
extras/package/macosx/Resources/English.lproj/MainMenu.xib
View file @ bc87dd70
......@@ -21,16 +21,16 @@
</object>
<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
<bool key="EncodedWithXMLCoder">YES</bool>
<integer value="2770"/>
<integer value="235"/>
<integer value="2730"/>
<integer value="1617"/>
<integer value="4596"/>
<integer value="4756"/>
<integer value="4722"/>
<integer value="4850"/>
<integer value="4948"/>
<integer value="4722"/>
<integer value="915"/>
<integer value="1617"/>
<integer value="4596"/>
<integer value="2770"/>
<integer value="81"/>
<integer value="4948"/>
</object>
<object class="NSArray" key="IBDocument.PluginDependencies">
<bool key="EncodedWithXMLCoder">YES</bool>
......@@ -1505,6 +1505,15 @@
<reference key="NSOnImage" ref="447396056"/>
<reference key="NSMixedImage" ref="100133332"/>
</object>
<object class="NSMenuItem" id="964223566">
<reference key="NSMenu" ref="1050252183"/>
<string key="NSTitle">Convert / Save...</string>
<string key="NSKeyEquiv">S</string>
<int key="NSKeyEquivModMask">1048576</int>
<int key="NSMnemonicLoc">2147483647</int>
<reference key="NSOnImage" ref="447396056"/>
<reference key="NSMixedImage" ref="100133332"/>
</object>
<object class="NSMenuItem" id="754650504">
<reference key="NSMenu" ref="1050252183"/>
<bool key="NSIsDisabled">YES</bool>
......@@ -8027,6 +8036,22 @@ LCAuLi4</string>
</object>
<int key="connectionID">5094</int>
</object>
<object class="IBConnectionRecord">
<object class="IBActionConnection" key="connection">
<string key="label">showConvertAndSave:</string>
<reference key="source" ref="651263286"/>
<reference key="destination" ref="964223566"/>
</object>
<int key="connectionID">5097</int>
</object>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">o_mi_convertandsave</string>
<reference key="source" ref="651263286"/>
<reference key="destination" ref="964223566"/>
</object>
<int key="connectionID">5098</int>
</object>
</object>
<object class="IBMutableOrderedSet" key="objectRecords">
<object class="NSArray" key="orderedObjects">
......@@ -8346,6 +8371,7 @@ LCAuLi4</string>
<reference ref="252497091"/>
<reference ref="764543718"/>
<reference ref="957503076"/>
<reference ref="964223566"/>
</object>
<reference key="parent" ref="13508166"/>
</object>
......@@ -11098,6 +11124,11 @@ LCAuLi4</string>
<reference key="object" ref="833088677"/>
<reference key="parent" ref="1017583928"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">5095</int>
<reference key="object" ref="964223566"/>
<reference key="parent" ref="1050252183"/>
</object>
</object>
</object>
<object class="NSMutableDictionary" key="flattenedProperties">
......@@ -11911,6 +11942,8 @@ LCAuLi4</string>
<string>5087.IBPluginDependency</string>
<string>5088.IBPluginDependency</string>
<string>5091.IBPluginDependency</string>
<string>5095.IBPluginDependency</string>
<string>5095.ImportedFromIB2</string>
<string>56.IBPluginDependency</string>
<string>56.ImportedFromIB2</string>
<string>57.IBEditorWindowLastContentRect</string>
......@@ -12207,7 +12240,7 @@ LCAuLi4</string>
<boolean value="YES"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<boolean value="YES"/>
<string>{{855, 592}, {243, 283}}</string>
<string>{{1148, 453}, {243, 283}}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<boolean value="YES"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
......@@ -12874,6 +12907,8 @@ LCAuLi4</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<boolean value="YES"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<boolean value="YES"/>
<string>{{329, 186}, {267, 263}}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<boolean value="YES"/>
......@@ -12885,7 +12920,7 @@ LCAuLi4</string>
<boolean value="YES"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<boolean value="YES"/>
<string>{{577, 632}, {297, 243}}</string>
<string>{{870, 473}, {297, 263}}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<boolean value="YES"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
......@@ -12929,7 +12964,7 @@ LCAuLi4</string>
</object>
</object>
<nil key="sourceID"/>
<int key="maxID">5094</int>
<int key="maxID">5098</int>
</object>
<object class="IBClassDescriber" key="IBDocument.Classes">
<object class="NSMutableArray" key="referencedPartialClassDescriptions">
......@@ -15728,6 +15763,7 @@ LCAuLi4</string>
<string>setPlaybackRate:</string>
<string>showAudioEffects:</string>
<string>showBookmarks:</string>
<string>showConvertAndSave:</string>
<string>showInformationPanel:</string>
<string>showLicense:</string>
<string>showTrackSynchronization:</string>
......@@ -15777,6 +15813,7 @@ LCAuLi4</string>
<string>id</string>
<string>id</string>
<string>id</string>
<string>id</string>
</object>
</object>
<object class="NSMutableDictionary" key="actionInfosByName">
......@@ -15799,6 +15836,7 @@ LCAuLi4</string>
<string>setPlaybackRate:</string>
<string>showAudioEffects:</string>
<string>showBookmarks:</string>
<string>showConvertAndSave:</string>
<string>showInformationPanel:</string>
<string>showLicense:</string>
<string>showTrackSynchronization:</string>
......@@ -15881,6 +15919,10 @@ LCAuLi4</string>
<string key="name">showBookmarks:</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBActionInfo">
<string key="name">showConvertAndSave:</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBActionInfo">
<string key="name">showInformationPanel:</string>
<string key="candidateClassName">id</string>
......@@ -15950,6 +15992,7 @@ LCAuLi4</string>
<string>o_about</string>
<string>o_audioeffects</string>
<string>o_bookmarks</string>
<string>o_convertandsave</string>
<string>o_dmi_mute</string>
<string>o_dmi_next</string>
<string>o_dmi_play</string>
......@@ -15971,6 +16014,7 @@ LCAuLi4</string>
<string>o_mi_clear</string>
<string>o_mi_close_window</string>
<string>o_mi_controller</string>
<string>o_mi_convertandsave</string>
<string>o_mi_copy</string>
<string>o_mi_crop</string>
<string>o_mi_cut</string>
......@@ -16095,6 +16139,7 @@ LCAuLi4</string>
<string>id</string>
<string>id</string>
<string>id</string>
<string>id</string>
<string>NSMenuItem</string>
<string>NSMenuItem</string>
<string>NSMenuItem</string>
......@@ -16163,6 +16208,7 @@ LCAuLi4</string>
<string>NSMenuItem</string>
<string>NSMenuItem</string>
<string>NSMenuItem</string>
<string>NSMenuItem</string>
<string>id</string>
<string>id</string>
<string>id</string>
......@@ -16243,6 +16289,7 @@ LCAuLi4</string>
<string>o_about</string>
<string>o_audioeffects</string>
<string>o_bookmarks</string>
<string>o_convertandsave</string>
<string>o_dmi_mute</string>
<string>o_dmi_next</string>
<string>o_dmi_play</string>
......@@ -16264,6 +16311,7 @@ LCAuLi4</string>
<string>o_mi_clear</string>
<string>o_mi_close_window</string>
<string>o_mi_controller</string>
<string>o_mi_convertandsave</string>
<string>o_mi_copy</string>
<string>o_mi_crop</string>
<string>o_mi_cut</string>
......@@ -16397,6 +16445,10 @@ LCAuLi4</string>
<string key="name">o_bookmarks</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">o_convertandsave</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">o_dmi_mute</string>
<string key="candidateClassName">NSMenuItem</string>
......@@ -16481,6 +16533,10 @@ LCAuLi4</string>
<string key="name">o_mi_controller</string>
<string key="candidateClassName">NSMenuItem</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">o_mi_convertandsave</string>
<string key="candidateClassName">NSMenuItem</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">o_mi_copy</string>
<string key="candidateClassName">NSMenuItem</string>
......
extras/package/macosx/vlc.xcodeproj/project.pbxproj
View file @ bc87dd70
......@@ -156,6 +156,7 @@
CC0586BD14ACF7C000659A99 /* sidebar-pictures.png in Resources */ = {isa = PBXBuildFile; fileRef = CC0586B714ACF7C000659A99 /* sidebar-pictures.png */; };
CC0586BE14ACF7C000659A99 /* sidebar-playlist.png in Resources */ = {isa = PBXBuildFile; fileRef = CC0586B814ACF7C000659A99 /* sidebar-playlist.png */; };
CC0586BF14ACF7C000659A99 /* sidebar-podcast.png in Resources */ = {isa = PBXBuildFile; fileRef = CC0586B914ACF7C000659A99 /* sidebar-podcast.png */; };
CC0663391566CD5A003A411C /* ConvertAndSave.xib in Resources */ = {isa = PBXBuildFile; fileRef = CC0663371566CD5A003A411C /* ConvertAndSave.xib */; };
CC0F725215063C820086B6A0 /* fullscreen-one-button-pressed.png in Resources */ = {isa = PBXBuildFile; fileRef = CC0F725015063C820086B6A0 /* fullscreen-one-button-pressed.png */; };
CC0F725315063C820086B6A0 /* fullscreen-one-button.png in Resources */ = {isa = PBXBuildFile; fileRef = CC0F725115063C820086B6A0 /* fullscreen-one-button.png */; };
CC0F725715063C980086B6A0 /* fullscreen-one-button_dark.png in Resources */ = {isa = PBXBuildFile; fileRef = CC0F725515063C980086B6A0 /* fullscreen-one-button_dark.png */; };
......@@ -480,6 +481,9 @@
CC0586B714ACF7C000659A99 /* sidebar-pictures.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "sidebar-pictures.png"; path = "Resources/sidebar-icons/sidebar-pictures.png"; sourceTree = "<group>"; };
CC0586B814ACF7C000659A99 /* sidebar-playlist.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "sidebar-playlist.png"; path = "Resources/sidebar-icons/sidebar-playlist.png"; sourceTree = "<group>"; };
CC0586B914ACF7C000659A99 /* sidebar-podcast.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "sidebar-podcast.png"; path = "Resources/sidebar-icons/sidebar-podcast.png"; sourceTree = "<group>"; };
CC0663341566C34C003A411C /* ConvertAndSave.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = ConvertAndSave.h; path = ../../../modules/gui/macosx/ConvertAndSave.h; sourceTree = "<group>"; };
CC0663351566C34C003A411C /* ConvertAndSave.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = ConvertAndSave.m; path = ../../../modules/gui/macosx/ConvertAndSave.m; sourceTree = "<group>"; };
CC0663381566CD5A003A411C /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = Resources/English.lproj/ConvertAndSave.xib; sourceTree = "<group>"; };
CC0CD0DF13DE0EAE00B0D90D /* PXSourceList.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = PXSourceList.h; path = ../../../modules/gui/macosx/PXSourceList.h; sourceTree = "<group>"; };
CC0CD0E013DE0EAE00B0D90D /* PXSourceList.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = PXSourceList.m; path = ../../../modules/gui/macosx/PXSourceList.m; sourceTree = "<group>"; };
CC0CD0E113DE0EAE00B0D90D /* PXSourceListDataSource.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = PXSourceListDataSource.h; path = ../../../modules/gui/macosx/PXSourceListDataSource.h; sourceTree = "<group>"; };
......@@ -777,6 +781,8 @@
CC707EC4137464CD0003010A /* TrackSynchronization.m */,
CCCE366D13817E4500694F2A /* VideoEffects.h */,
CCCE366E13817E4500694F2A /* VideoEffects.m */,
CC0663341566C34C003A411C /* ConvertAndSave.h */,
CC0663351566C34C003A411C /* ConvertAndSave.m */,
CC017A0E14A4C8B600C09A4F /* custom UI code */,
CC0CD0E513DE0FC600B0D90D /* Imported Code */,
);
......@@ -1245,6 +1251,7 @@
CCD83E4013FEA143004F1652 /* VideoEffects.xib */,
CCD83E4213FEA143004F1652 /* Wizard.xib */,
CCD83E2B13FE9B90004F1652 /* MainMenu.xib */,
CC0663371566CD5A003A411C /* ConvertAndSave.xib */,
);
name = xibs;
sourceTree = "<group>";
......@@ -1559,12 +1566,21 @@
CCE4057B15655B1900FA5CCA /* forward-single.png in Resources */,
CCE4057F15655B2100FA5CCA /* back-pressed-single.png in Resources */,
CCE4058215655B3300FA5CCA /* back-single.png in Resources */,
CC0663391566CD5A003A411C /* ConvertAndSave.xib in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
/* End PBXResourcesBuildPhase section */
/* Begin PBXVariantGroup section */
CC0663371566CD5A003A411C /* ConvertAndSave.xib */ = {
isa = PBXVariantGroup;
children = (
CC0663381566CD5A003A411C /* English */,
);
name = ConvertAndSave.xib;
sourceTree = "<group>";
};
CCD83E2B13FE9B90004F1652 /* MainMenu.xib */ = {
isa = PBXVariantGroup;
children = (
......
modules/gui/macosx/ConvertAndSave.h 0 → 100644
View file @ bc87dd70
/*****************************************************************************
* ConvertAndSave.h: MacOS X interface module
*****************************************************************************
* Copyright (C) 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>
@interface VLCConvertAndSave : NSObject
{
IBOutlet id o_window;
IBOutlet id o_cancel_btn;
IBOutlet id o_ok_btn;
IBOutlet id o_drop_lbl;
IBOutlet id o_drop_image_view;
IBOutlet id o_drop_btn;
IBOutlet id o_profile_lbl;
IBOutlet id o_profile_pop;
IBOutlet id o_profile_btn;
IBOutlet id o_destination_lbl;
IBOutlet id o_destination_btn;
IBOutlet id o_destination_icon_view;
IBOutlet id o_destination_filename_lbl;
IBOutlet id o_destination_filename_stub_lbl;
IBOutlet id o_dropin_view;
IBOutlet id o_dropin_icon_view;
IBOutlet id o_dropin_media_lbl;
}
+ (VLCConvertAndSave *)sharedInstance;
- (IBAction)toggleWindow;
- (IBAction)windowButtonAction:(id)sender;
- (IBAction)openMedia:(id)sender;
- (IBAction)profileSelection:(id)sender;
- (IBAction)customizeProfile:(id)sender;
- (IBAction)chooseDestination:(id)sender;
@end
modules/gui/macosx/ConvertAndSave.m 0 → 100644
View file @ bc87dd70
/*****************************************************************************
* ConvertAndSave.h: MacOS X interface module
*****************************************************************************
* Copyright (C) 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 "ConvertAndSave.h"
@implementation VLCConvertAndSave
static VLCConvertAndSave *_o_sharedInstance = nil;
+ (VLCConvertAndSave *)sharedInstance
{
return _o_sharedInstance ? _o_sharedInstance : [[self alloc] init];
}
- (id)init
{
if (_o_sharedInstance) {
[self dealloc];
} else {
_o_sharedInstance = [super init];
}
return _o_sharedInstance;
}
- (void)awakeFromNib
{
// i18n, bla
}
- (void)toggleWindow
{
[o_window makeKeyAndOrderFront: nil];
}
- (IBAction)windowButtonAction:(id)sender
{
}
- (IBAction)openMedia:(id)sender
{
}
- (IBAction)profileSelection:(id)sender
{
}
- (IBAction)customizeProfile:(id)sender
{
}
- (IBAction)chooseDestination:(id)sender
{
}
@end
modules/gui/macosx/MainMenu.h
View file @ bc87dd70
......@@ -34,12 +34,14 @@
BOOL b_nib_audioeffects_loaded;
BOOL b_nib_tracksynchro_loaded;
BOOL b_nib_bookmarks_loaded;
BOOL b_nib_convertandsave_loaded;
id o_about; /* VLAboutBox */
id o_videoeffects; /* VLCVideoEffects */
id o_audioeffects; /* VLCAudioEffects */
id o_trackSynchronization; /* VLCTrackSynchronization */
id o_bookmarks; /* VLCBookmarks */
id o_convertandsave; /* VLCConvertAndSave */
id o_extMgr; /* Extensions Manager */
......@@ -66,6 +68,7 @@
IBOutlet NSMenuItem * o_mi_open_capture;
IBOutlet NSMenuItem * o_mi_open_recent;
IBOutlet NSMenuItem * o_mi_open_wizard;
IBOutlet NSMenuItem * o_mi_convertandsave;
IBOutlet NSMenu * o_mu_edit;
IBOutlet NSMenuItem * o_mi_cut;
......@@ -224,6 +227,7 @@
- (IBAction)toggleFullscreenDevice:(id)sender;
- (IBAction)showWizard:(id)sender;
- (IBAction)showConvertAndSave:(id)sender;
- (IBAction)showVideoEffects:(id)sender;
- (IBAction)showAudioEffects:(id)sender;
- (IBAction)showTrackSynchronization:(id)sender;
......
modules/gui/macosx/MainMenu.m
View file @ bc87dd70
......@@ -41,6 +41,7 @@
#import "CoreInteraction.h"
#import "MainWindow.h"
#import "ExtensionsManager.h"
#import "ConvertAndSave.h"
@implementation VLCMainMenu
static VLCMainMenu *_o_sharedInstance = nil;
......@@ -84,6 +85,9 @@ static VLCMainMenu *_o_sharedInstance = nil;
if (b_nib_tracksynchro_loaded)
[o_trackSynchronization release];
if (b_nib_convertandsave_loaded)
[o_convertandsave release];
[o_extMgr release];
[super dealloc];
......@@ -254,6 +258,7 @@ static VLCMainMenu *_o_sharedInstance = nil;
[o_mi_open_capture setTitle: _NS("Open Capture Device...")];
[o_mi_open_recent setTitle: _NS("Open Recent")];
[o_mi_open_wizard setTitle: _NS("Streaming/Exporting Wizard...")];
[o_mi_convertandsave setTitle: _NS("Convert / Save...")];
[o_mu_edit setTitle: _NS("Edit")];
[o_mi_cut setTitle: _NS("Cut")];
......@@ -735,6 +740,17 @@ static VLCMainMenu *_o_sharedInstance = nil;
[[[VLCMain sharedInstance] wizard] showWizard];
}
- (IBAction)showConvertAndSave:(id)sender
{
if( o_convertandsave == nil )
o_convertandsave = [[VLCConvertAndSave alloc] init];
if( !b_nib_convertandsave_loaded )
b_nib_convertandsave_loaded = [NSBundle loadNibNamed:@"ConvertAndSave" owner: NSApp];
[o_convertandsave toggleWindow];
}
- (IBAction)showVideoEffects:(id)sender
{
if( o_videoeffects == nil )
......
modules/gui/macosx/Modules.am
View file @ bc87dd70
......@@ -74,5 +74,7 @@ SOURCES_macosx = \
VideoView.m \
MainWindowTitle.h \
MainWindowTitle.m \
ConvertAndSave.h \
ConvertAndSave.m \
$(NULL)
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