Skip to content

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

macosx/coredialogs: fix compilation by removing virtually all the legacy code

parent c9c734d3
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 246 additions and 2248 deletions
Makefile.am
View file @ e3f2ec3e
......@@ -141,7 +141,6 @@ EXTRA_DIST += \
extras/package/macosx/Resources/English.lproj/CoreDialogs.xib \
extras/package/macosx/Resources/English.lproj/DebugMessageVisualizer.xib \
extras/package/macosx/Resources/English.lproj/DetachedVideoWindow.xib \
extras/package/macosx/Resources/English.lproj/ErrorPanel.xib \
extras/package/macosx/Resources/English.lproj/FSPanel.xib \
extras/package/macosx/Resources/English.lproj/InfoPlist.strings.in \
extras/package/macosx/Resources/English.lproj/Help.xib \
......
extras/package/macosx/Resources/English.lproj/MainMenu.xib
View file @ e3f2ec3e
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="9531" systemVersion="15C50" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none">
<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="10102" systemVersion="15D21" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none">
<dependencies>
<deployment version="1070" identifier="macosx"/>
<development version="5100" identifier="xcode"/>
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="9531"/>
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="10102"/>
</dependencies>
<objects>
<customObject id="-2" userLabel="File's Owner" customClass="VLCMainMenu">
......@@ -50,7 +50,6 @@
<outlet property="donation" destination="2298" id="ZzJ-yC-jOi"/>
<outlet property="double_window" destination="1171" id="DIg-sW-WS6"/>
<outlet property="editMenu" destination="205" id="6Mt-eK-QAx"/>
<outlet property="errorsAndWarnings" destination="2756" id="omK-pm-N3C"/>
<outlet property="extensions" destination="4942" id="qSU-2W-Chy"/>
<outlet property="extensionsMenu" destination="4943" id="IAw-5Z-Wvo"/>
<outlet property="fileMenu" destination="81" id="lbA-s5-6qj"/>
......@@ -764,12 +763,6 @@
<menuItem isSeparatorItem="YES" id="2394">
<modifierMask key="keyEquivalentModifierMask" command="YES"/>
</menuItem>
<menuItem title="Errors and Warnings..." keyEquivalent="m" id="2756">
<modifierMask key="keyEquivalentModifierMask" option="YES" command="YES"/>
<connections>
<action selector="showErrorsAndWarnings:" target="-2" id="ayP-Wq-8xj"/>
</connections>
</menuItem>
<menuItem title="Messages..." keyEquivalent="M" id="1003">
<connections>
<action selector="showMessagesPanel:" target="-2" id="Suq-dt-QZE"/>
......
extras/package/macosx/vlc.xcodeproj/project.pbxproj
View file @ e3f2ec3e
......@@ -849,7 +849,6 @@
CCD83E4513FEA143004F1652 /* AudioEffects.xib in Resources */ = {isa = PBXBuildFile; fileRef = CCD83E3013FEA143004F1652 /* AudioEffects.xib */; };
CCD83E4613FEA143004F1652 /* Bookmarks.xib in Resources */ = {isa = PBXBuildFile; fileRef = CCD83E3213FEA143004F1652 /* Bookmarks.xib */; };
CCD83E4713FEA143004F1652 /* CoreDialogs.xib in Resources */ = {isa = PBXBuildFile; fileRef = CCD83E3413FEA143004F1652 /* CoreDialogs.xib */; };
CCD83E4813FEA143004F1652 /* ErrorPanel.xib in Resources */ = {isa = PBXBuildFile; fileRef = CCD83E3613FEA143004F1652 /* ErrorPanel.xib */; };
CCD83E4913FEA143004F1652 /* MediaInfo.xib in Resources */ = {isa = PBXBuildFile; fileRef = CCD83E3813FEA143004F1652 /* MediaInfo.xib */; };
CCD83E4A13FEA143004F1652 /* Open.xib in Resources */ = {isa = PBXBuildFile; fileRef = CCD83E3A13FEA143004F1652 /* Open.xib */; };
CCD83E4B13FEA143004F1652 /* Preferences.xib in Resources */ = {isa = PBXBuildFile; fileRef = CCD83E3C13FEA143004F1652 /* Preferences.xib */; };
......@@ -1738,7 +1737,6 @@
CCD83E3113FEA143004F1652 /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = Resources/English.lproj/AudioEffects.xib; sourceTree = "<group>"; };
CCD83E3313FEA143004F1652 /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = Resources/English.lproj/Bookmarks.xib; sourceTree = "<group>"; };
CCD83E3513FEA143004F1652 /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = Resources/English.lproj/CoreDialogs.xib; sourceTree = "<group>"; };
CCD83E3713FEA143004F1652 /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = Resources/English.lproj/ErrorPanel.xib; sourceTree = "<group>"; };
CCD83E3913FEA143004F1652 /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = Resources/English.lproj/MediaInfo.xib; sourceTree = "<group>"; };
CCD83E3B13FEA143004F1652 /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = Resources/English.lproj/Open.xib; sourceTree = "<group>"; };
CCD83E3D13FEA143004F1652 /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = Resources/English.lproj/Preferences.xib; sourceTree = "<group>"; };
......@@ -2928,7 +2926,6 @@
CCD83E3013FEA143004F1652 /* AudioEffects.xib */,
CCD83E3213FEA143004F1652 /* Bookmarks.xib */,
CCD83E3413FEA143004F1652 /* CoreDialogs.xib */,
CCD83E3613FEA143004F1652 /* ErrorPanel.xib */,
CCD83E3813FEA143004F1652 /* MediaInfo.xib */,
CCD83E3A13FEA143004F1652 /* Open.xib */,
CCD83E3C13FEA143004F1652 /* Preferences.xib */,
......@@ -3386,7 +3383,6 @@
CCD83E4613FEA143004F1652 /* Bookmarks.xib in Resources */,
CCD83E4713FEA143004F1652 /* CoreDialogs.xib in Resources */,
1C88BB3619DC7C7800645190 /* ys-play.png in Resources */,
CCD83E4813FEA143004F1652 /* ErrorPanel.xib in Resources */,
1C88BCA419DC7CB300645190 /* ys-fs_skip_next.png in Resources */,
1C88BA7919DC7B2200645190 /* yosemite-window-zoom-graphite@2x.png in Resources */,
1C88BC0E19DC7C8100645190 /* ys-next-6btns-dark@2x.png in Resources */,
......@@ -4160,14 +4156,6 @@
name = CoreDialogs.xib;
sourceTree = "<group>";
};
CCD83E3613FEA143004F1652 /* ErrorPanel.xib */ = {
isa = PBXVariantGroup;
children = (
CCD83E3713FEA143004F1652 /* English */,
);
name = ErrorPanel.xib;
sourceTree = "<group>";
};
CCD83E3813FEA143004F1652 /* MediaInfo.xib */ = {
isa = PBXVariantGroup;
children = (
......
modules/gui/macosx/MainMenu.h
View file @ e3f2ec3e
......@@ -278,7 +278,6 @@
- (IBAction)openWebsite:(id)sender;
- (IBAction)openForum:(id)sender;
- (IBAction)openDonate:(id)sender;
- (IBAction)showErrorsAndWarnings:(id)sender;
- (IBAction)showMessagesPanel:(id)showMessagesPanel;
- (IBAction)showMainWindow:(id)sender;
- (IBAction)showPlaylist:(id)sender;
......
modules/gui/macosx/MainMenu.m
View file @ e3f2ec3e
......@@ -35,7 +35,6 @@
#import "VideoEffects.h"
#import "bookmarks.h"
#import "simple_prefs.h"
#import "coredialogs.h"
#import "VLCPlaylist.h"
#import "VLCPlaylistInfo.h"
#import "VideoView.h"
......@@ -1271,13 +1270,6 @@
[[NSWorkspace sharedWorkspace] openURL: url];
}
#pragma mark - Errors, warnings and messages
- (IBAction)showErrorsAndWarnings:(id)sender
{
[[[[VLCMain sharedInstance] coreDialogProvider] errorPanel] showWindow:self];
}
- (IBAction)showInformationPanel:(id)sender
{
[[[VLCMain sharedInstance] currentMediaInfoPanel] toggleWindow:sender];
......
modules/gui/macosx/coredialogs.h
View file @ e3f2ec3e
/*****************************************************************************
* coredialogs.h: Mac OS X Core Dialogs
*****************************************************************************
* Copyright (C) 2005-2012 VLC authors and VideoLAN
* Copyright (C) 2005-2016 VLC authors and VideoLAN
* $Id$
*
* Authors: Derk-Jan Hartman <hartman at videolan dot org>
......@@ -21,6 +21,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
#import <vlc_common.h>
#import <vlc_dialog.h>
#import <Cocoa/Cocoa.h>
......@@ -29,66 +30,31 @@
* VLCCoreDialogProvider interface
*****************************************************************************/
@class ErrorWindowController;
@interface VLCCoreDialogProvider : NSObject
{
/* authentication dialogue */
IBOutlet id o_auth_cancel_btn;
IBOutlet id o_auth_description_txt;
IBOutlet id o_auth_login_fld;
IBOutlet id o_auth_login_txt;
IBOutlet id o_auth_ok_btn;
IBOutlet id o_auth_pw_fld;
IBOutlet id o_auth_pw_txt;
IBOutlet id o_auth_title_txt;
IBOutlet id o_auth_win;
/* progress dialogue */
IBOutlet NSProgressIndicator * o_prog_bar;
IBOutlet id o_prog_cancel_btn;
IBOutlet id o_prog_description_txt;
IBOutlet id o_prog_title_txt;
IBOutlet id o_prog_win;
/* authentication dialog */
IBOutlet id authenticationCancelButton;
IBOutlet id authenticationDescriptionLabel;
IBOutlet id authenticationLoginTextField;
IBOutlet id authenticationLoginLabel;
IBOutlet id authenticationOkButton;
IBOutlet id authenticationPasswordTextField;
IBOutlet id authenticationPasswordLabel;
IBOutlet id authenticationTitleLabel;
IBOutlet id authenticationWindow;
/* progress dialog */
IBOutlet NSProgressIndicator * progressIndicator;
IBOutlet id progressCancelButton;
IBOutlet id progressDescriptionLabel;
IBOutlet id progressTitleLabel;
IBOutlet id progressWindow;
}
@property (atomic,readwrite) BOOL progressCancelled;
-(void)performEventWithObject: (NSValue *)o_value ofType: (const char*)type;
-(void)showFatalDialog: (NSValue *)o_value;
-(void)showFatalWaitDialog: (NSValue *)o_value;
-(void)showQuestionDialog: (NSValue *)o_value;
-(void)showLoginDialog: (NSValue *)o_value;
-(IBAction)loginDialogAction:(id)sender;
-(void)showProgressDialogOnMainThread: (NSValue *)o_value;
-(void)showProgressDialog: (NSValue *)o_value;
-(IBAction)progDialogAction:(id)sender;
-(void)updateProgressPanelWithText: (NSString *)string andNumber: (double)d_number;
-(void)destroyProgressPanel;
-(id)errorPanel;
@end
/*****************************************************************************
* VLCErrorPanel interface
*****************************************************************************/
@interface ErrorWindowController : NSWindowController
{
IBOutlet id o_cleanup_button;
IBOutlet id o_error_table;
NSMutableArray *o_errors;
NSMutableArray *o_icons;
}
- (IBAction)cleanupTable:(id)sender;
- (IBAction)authenticationDialogAction:(id)sender;
-(void)addError:(NSString *)o_error withMsg:(NSString *)o_msg;
- (IBAction)progressDialogAction:(id)sender;
@end
modules/gui/macosx/coredialogs.m
View file @ e3f2ec3e
This diff is collapsed.
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