videolan
/
vlc
mirror of https://code.videolan.org/videolan/vlc
1
Fork 0
Code Releases Activity

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

This commit is contained in:
Felix Paul Kühne 2012-05-18 20:35:14 +02:00
parent fa76779bd6
commit bc87dd70bc
9 changed files with 20541 additions and 18703 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Makefile.am
View File

@ -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 \

1608
extras/package/macosx/Resources/English.lproj/ConvertAndSave.xib Normal file
View File

File diff suppressed because it is too large Load Diff

37462
extras/package/macosx/Resources/English.lproj/MainMenu.xib
View File

File diff suppressed because it is too large Load Diff

16
extras/package/macosx/vlc.xcodeproj/project.pbxproj
View File

@ -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 = (

60
modules/gui/macosx/ConvertAndSave.h Normal file
View File

@ -0,0 +1,60 @@
/*****************************************************************************
* 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

75
modules/gui/macosx/ConvertAndSave.m Normal file
View File

@ -0,0 +1,75 @@
/*****************************************************************************
* 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

4
modules/gui/macosx/MainMenu.h
View File

@ -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;

16
modules/gui/macosx/MainMenu.m
View File

@ -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 )

2
modules/gui/macosx/Modules.am
View File

@ -74,5 +74,7 @@ SOURCES_macosx = \
VideoView.m \
MainWindowTitle.h \
MainWindowTitle.m \
ConvertAndSave.h \
ConvertAndSave.m \
$(NULL)