Commit fa6c44e1 authored by David Fuhrmann's avatar David Fuhrmann

macosx: rename to VLCConvertAndSaveWindowController

parent f49de4e4
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="9532" systemVersion="15D21" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="10117" systemVersion="15G31" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
<dependencies>
<deployment identifier="macosx"/>
<development version="7000" identifier="xcode"/>
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="9532"/>
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="10117"/>
<capability name="box content view" minToolsVersion="7.0"/>
</dependencies>
<objects>
<customObject id="-2" userLabel="File's Owner" customClass="VLCConvertAndSave">
<customObject id="-2" userLabel="File's Owner" customClass="VLCConvertAndSaveWindowController">
<connections>
<outlet property="customizeAudBitrateField" destination="214" id="596"/>
<outlet property="customizeAudBitrateLabel" destination="212" id="592"/>
......
......@@ -379,8 +379,8 @@
1CCB5F5D1A62A724004C3E90 /* CompatibilityFixes.h in Sources */ = {isa = PBXBuildFile; fileRef = CCB0BB3013FAC9F40095BD0A /* CompatibilityFixes.h */; };
1CCB5F601A62A724004C3E90 /* ControlsBar.h in Sources */ = {isa = PBXBuildFile; fileRef = E0382C00160BA09E0031D7FF /* ControlsBar.h */; };
1CCB5F611A62A724004C3E90 /* ControlsBar.m in Sources */ = {isa = PBXBuildFile; fileRef = E0382C01160BA09E0031D7FF /* ControlsBar.m */; };
1CCB5F621A62A724004C3E90 /* ConvertAndSave.h in Sources */ = {isa = PBXBuildFile; fileRef = CC0663341566C34C003A411C /* ConvertAndSave.h */; };
1CCB5F631A62A724004C3E90 /* ConvertAndSave.m in Sources */ = {isa = PBXBuildFile; fileRef = CC0663351566C34C003A411C /* ConvertAndSave.m */; };
1CCB5F621A62A724004C3E90 /* VLCConvertAndSaveWindowController.h in Sources */ = {isa = PBXBuildFile; fileRef = CC0663341566C34C003A411C /* VLCConvertAndSaveWindowController.h */; };
1CCB5F631A62A724004C3E90 /* VLCConvertAndSaveWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = CC0663351566C34C003A411C /* VLCConvertAndSaveWindowController.m */; };
1CCB5F641A62A724004C3E90 /* VLCCoreDialogProvider.h in Sources */ = {isa = PBXBuildFile; fileRef = CC4A33220F8CB017000FC4A7 /* VLCCoreDialogProvider.h */; };
1CCB5F651A62A724004C3E90 /* VLCCoreDialogProvider.m in Sources */ = {isa = PBXBuildFile; fileRef = CC4A33210F8CB017000FC4A7 /* VLCCoreDialogProvider.m */; };
1CCB5F661A62A724004C3E90 /* CoreInteraction.h in Sources */ = {isa = PBXBuildFile; fileRef = CC448A6013B68A0B009F72E0 /* CoreInteraction.h */; };
......@@ -1476,8 +1476,8 @@
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; lineEnding = 0; name = ConvertAndSave.h; path = ../../../modules/gui/macosx/ConvertAndSave.h; sourceTree = SOURCE_ROOT; };
CC0663351566C34C003A411C /* ConvertAndSave.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; name = ConvertAndSave.m; path = ../../../modules/gui/macosx/ConvertAndSave.m; sourceTree = SOURCE_ROOT; };
CC0663341566C34C003A411C /* VLCConvertAndSaveWindowController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; lineEnding = 0; name = VLCConvertAndSaveWindowController.h; path = ../../../modules/gui/macosx/VLCConvertAndSaveWindowController.h; sourceTree = SOURCE_ROOT; };
CC0663351566C34C003A411C /* VLCConvertAndSaveWindowController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; name = VLCConvertAndSaveWindowController.m; path = ../../../modules/gui/macosx/VLCConvertAndSaveWindowController.m; sourceTree = SOURCE_ROOT; };
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 = SOURCE_ROOT; };
CC0CD0E013DE0EAE00B0D90D /* PXSourceList.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = PXSourceList.m; path = ../../../modules/gui/macosx/PXSourceList.m; sourceTree = SOURCE_ROOT; };
......@@ -1881,8 +1881,8 @@
CCB0BB3013FAC9F40095BD0A /* CompatibilityFixes.h */,
E0382C00160BA09E0031D7FF /* ControlsBar.h */,
E0382C01160BA09E0031D7FF /* ControlsBar.m */,
CC0663341566C34C003A411C /* ConvertAndSave.h */,
CC0663351566C34C003A411C /* ConvertAndSave.m */,
CC0663341566C34C003A411C /* VLCConvertAndSaveWindowController.h */,
CC0663351566C34C003A411C /* VLCConvertAndSaveWindowController.m */,
CC4A33220F8CB017000FC4A7 /* VLCCoreDialogProvider.h */,
CC4A33210F8CB017000FC4A7 /* VLCCoreDialogProvider.m */,
CC448A6013B68A0B009F72E0 /* CoreInteraction.h */,
......@@ -3963,8 +3963,8 @@
1CCB5F5D1A62A724004C3E90 /* CompatibilityFixes.h in Sources */,
1CCB5F601A62A724004C3E90 /* ControlsBar.h in Sources */,
1CCB5F611A62A724004C3E90 /* ControlsBar.m in Sources */,
1CCB5F621A62A724004C3E90 /* ConvertAndSave.h in Sources */,
1CCB5F631A62A724004C3E90 /* ConvertAndSave.m in Sources */,
1CCB5F621A62A724004C3E90 /* VLCConvertAndSaveWindowController.h in Sources */,
1CCB5F631A62A724004C3E90 /* VLCConvertAndSaveWindowController.m in Sources */,
1CCB5F641A62A724004C3E90 /* VLCCoreDialogProvider.h in Sources */,
1CCB5F651A62A724004C3E90 /* VLCCoreDialogProvider.m in Sources */,
1CCB5F661A62A724004C3E90 /* CoreInteraction.h in Sources */,
......
......@@ -29,7 +29,7 @@ libmacosx_plugin_la_SOURCES = \
BWQuincyUI.h BWQuincyUI.m \
CompatibilityFixes.h \
ControlsBar.m ControlsBar.h \
ConvertAndSave.h ConvertAndSave.m \
VLCConvertAndSaveWindowController.h VLCConvertAndSaveWindowController.m \
CoreInteraction.h CoreInteraction.m \
ExtensionsDialogProvider.h ExtensionsDialogProvider.m \
ExtensionsManager.h ExtensionsManager.m \
......
/*****************************************************************************
* ConvertAndSave.h: MacOS X interface module
* VLCConvertAndSaveWindowController.h: MacOS X interface module
*****************************************************************************
* Copyright (C) 2012 Felix Paul Kühne
* $Id$
......@@ -28,7 +28,7 @@
@class VLCPopupPanelController;
@class VLCTextfieldPanelController;
@interface VLCConvertAndSave : NSWindowController
@interface VLCConvertAndSaveWindowController : NSWindowController
// main panel
@property (weak) IBOutlet VLCDragDropView *dropBox;
......
/*****************************************************************************
* ConvertAndSave.m: MacOS X interface module
* VLCConvertAndSaveWindowController.m: MacOS X interface module
*****************************************************************************
* Copyright (C) 2012 Felix Paul Kühne
* $Id$
......@@ -21,7 +21,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
#import "ConvertAndSave.h"
#import "VLCConvertAndSaveWindowController.h"
#import "intf.h"
#import "VLCPlaylist.h"
#import "misc.h"
......@@ -47,7 +48,7 @@
#define ASF 12
/* 13-15 are present, but not set */
@interface VLCConvertAndSave()
@interface VLCConvertAndSaveWindowController()
{
NSArray *_videoCodecs;
NSArray *_audioCodecs;
......@@ -66,7 +67,7 @@
- (void)recreateProfilePopup;
@end
@implementation VLCConvertAndSave
@implementation VLCConvertAndSaveWindowController
#pragma mark -
#pragma mark Initialization
......
......@@ -43,7 +43,7 @@
#import "VLCMainWindow.h"
#import "ControlsBar.h"
#import "ExtensionsManager.h"
#import "ConvertAndSave.h"
#import "VLCConvertAndSaveWindowController.h"
#import "VLCDebugMessageWindowController.h"
#import "VLCAddonsWindowController.h"
#import "VLCTimeSelectionPanelController.h"
......
......@@ -70,7 +70,7 @@ static NSString * VLCInputChangedNotification = @"VLCInputChangedNotification";
@class VLCTrackSynchronizationWindowController;
@class VLCAudioEffectsWindowController;
@class VLCVideoEffectsWindowController;
@class VLCConvertAndSave;
@class VLCConvertAndSaveWindowController;
@class ExtensionsManager;
@class VLCInfo;
@class VLCStatusBarIcon;
......@@ -106,7 +106,7 @@ static NSString * VLCInputChangedNotification = @"VLCInputChangedNotification";
- (VLCInfo *)currentMediaInfoPanel;
- (VLCConvertAndSave *)convertAndSaveWindow;
- (VLCConvertAndSaveWindowController *)convertAndSaveWindow;
- (void)setActiveVideoPlayback:(BOOL)b_value;
- (BOOL)activeVideoPlayback;
......
......@@ -60,7 +60,7 @@
#import "BWQuincyManager.h"
#import "VLCResumeDialogController.h"
#import "VLCDebugMessageWindowController.h"
#import "ConvertAndSave.h"
#import "VLCConvertAndSaveWindowController.h"
#import "VLCVideoEffectsWindowController.h"
#import "VLCAudioEffectsWindowController.h"
......@@ -179,7 +179,7 @@ static int ShowController(vlc_object_t *p_this, const char *psz_variable,
VLCTrackSynchronizationWindowController *_trackSyncPanel;
VLCAudioEffectsWindowController *_audioEffectsPanel;
VLCVideoEffectsWindowController *_videoEffectsPanel;
VLCConvertAndSave *_convertAndSaveWindow;
VLCConvertAndSaveWindowController *_convertAndSaveWindow;
ExtensionsManager *_extensionsManager;
VLCInfo *_currentMediaInfoPanel;
......@@ -592,10 +592,10 @@ static VLCMain *sharedInstance = nil;
return _open;
}
- (VLCConvertAndSave *)convertAndSaveWindow
- (VLCConvertAndSaveWindowController *)convertAndSaveWindow
{
if (_convertAndSaveWindow == nil)
_convertAndSaveWindow = [[VLCConvertAndSave alloc] init];
_convertAndSaveWindow = [[VLCConvertAndSaveWindowController alloc] init];
return _convertAndSaveWindow;
}
......
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