Skip to content

GitLab

V
vlc
Commit 36f6db37 authored by David Fuhrmann's avatar David Fuhrmann
Browse files
Options

macosx: rename to VLCBookmarksWindowController

parent fa1f5d02
Hide whitespace changes
Inline Side-by-side
Showing with 26 additions and 27 deletions
extras/package/macosx/Resources/English.lproj/Bookmarks.xib
View file @ 36f6db37
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="9531" 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"/>
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="9531"/>
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="10117"/>
</dependencies>
<objects>
<customObject id="-2" userLabel="File's Owner" customClass="VLCBookmarks">
<customObject id="-2" userLabel="File's Owner" customClass="VLCBookmarksWindowController">
<connections>
<outlet property="addButton" destination="88" id="163"/>
<outlet property="clearButton" destination="94" id="165"/>
......
extras/package/macosx/vlc.xcodeproj/project.pbxproj
View file @ 36f6db37
......@@ -374,8 +374,8 @@
1CCB5F581A62A724004C3E90 /* applescript.m in Sources */ = {isa = PBXBuildFile; fileRef = 8E6BC6F7041643860059A3A7 /* applescript.m */; };
1CCB5F591A62A724004C3E90 /* AudioEffects.h in Sources */ = {isa = PBXBuildFile; fileRef = CC5560231365CDC700D54038 /* AudioEffects.h */; };
1CCB5F5A1A62A724004C3E90 /* AudioEffects.m in Sources */ = {isa = PBXBuildFile; fileRef = CC5560241365CDC800D54038 /* AudioEffects.m */; };
1CCB5F5B1A62A724004C3E90 /* bookmarks.h in Sources */ = {isa = PBXBuildFile; fileRef = DCE7BD0708A5724D007B10AE /* bookmarks.h */; };
1CCB5F5C1A62A724004C3E90 /* bookmarks.m in Sources */ = {isa = PBXBuildFile; fileRef = DCE7BD0608A5724D007B10AE /* bookmarks.m */; };
1CCB5F5B1A62A724004C3E90 /* VLCBookmarksWindowController.h in Sources */ = {isa = PBXBuildFile; fileRef = DCE7BD0708A5724D007B10AE /* VLCBookmarksWindowController.h */; };
1CCB5F5C1A62A724004C3E90 /* VLCBookmarksWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = DCE7BD0608A5724D007B10AE /* VLCBookmarksWindowController.m */; };
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 */; };
......@@ -1781,8 +1781,8 @@
DC1A176914E2778A001477C6 /* qtsound.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = qtsound.m; path = ../../../modules/access/qtsound.m; sourceTree = "<group>"; };
DCC8017816FCA036007FE736 /* avcapture.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = avcapture.m; path = ../../../modules/access/avcapture.m; sourceTree = "<group>"; };
DCC8017916FCA0DA007FE736 /* AVFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AVFoundation.framework; path = System/Library/Frameworks/AVFoundation.framework; sourceTree = SDKROOT; };
DCE7BD0608A5724D007B10AE /* bookmarks.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = bookmarks.m; path = ../../../modules/gui/macosx/bookmarks.m; sourceTree = SOURCE_ROOT; };
DCE7BD0708A5724D007B10AE /* bookmarks.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = bookmarks.h; path = ../../../modules/gui/macosx/bookmarks.h; sourceTree = SOURCE_ROOT; };
DCE7BD0608A5724D007B10AE /* VLCBookmarksWindowController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = VLCBookmarksWindowController.m; path = ../../../modules/gui/macosx/VLCBookmarksWindowController.m; sourceTree = SOURCE_ROOT; };
DCE7BD0708A5724D007B10AE /* VLCBookmarksWindowController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = VLCBookmarksWindowController.h; path = ../../../modules/gui/macosx/VLCBookmarksWindowController.h; sourceTree = SOURCE_ROOT; };
E0382C00160BA09E0031D7FF /* ControlsBar.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ControlsBar.h; path = ../../../modules/gui/macosx/ControlsBar.h; sourceTree = SOURCE_ROOT; };
E0382C01160BA09E0031D7FF /* ControlsBar.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = ControlsBar.m; path = ../../../modules/gui/macosx/ControlsBar.m; sourceTree = SOURCE_ROOT; };
E06CF7F416020F6200C698B7 /* Windows.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Windows.h; path = ../../../modules/gui/macosx/Windows.h; sourceTree = SOURCE_ROOT; };
......@@ -1876,8 +1876,8 @@
8E6BC6F7041643860059A3A7 /* applescript.m */,
CC5560231365CDC700D54038 /* AudioEffects.h */,
CC5560241365CDC800D54038 /* AudioEffects.m */,
DCE7BD0708A5724D007B10AE /* bookmarks.h */,
DCE7BD0608A5724D007B10AE /* bookmarks.m */,
DCE7BD0708A5724D007B10AE /* VLCBookmarksWindowController.h */,
DCE7BD0608A5724D007B10AE /* VLCBookmarksWindowController.m */,
CCB0BB3013FAC9F40095BD0A /* CompatibilityFixes.h */,
E0382C00160BA09E0031D7FF /* ControlsBar.h */,
E0382C01160BA09E0031D7FF /* ControlsBar.m */,
......@@ -3958,8 +3958,8 @@
1CCB5F591A62A724004C3E90 /* AudioEffects.h in Sources */,
1CCB5F5A1A62A724004C3E90 /* AudioEffects.m in Sources */,
7D9516BA1C60B6AB00D14E1A /* VLCStatusBarIcon.m in Sources */,
1CCB5F5B1A62A724004C3E90 /* bookmarks.h in Sources */,
1CCB5F5C1A62A724004C3E90 /* bookmarks.m in Sources */,
1CCB5F5B1A62A724004C3E90 /* VLCBookmarksWindowController.h in Sources */,
1CCB5F5C1A62A724004C3E90 /* VLCBookmarksWindowController.m in Sources */,
1CCB5F5D1A62A724004C3E90 /* CompatibilityFixes.h in Sources */,
1CCB5F601A62A724004C3E90 /* ControlsBar.h in Sources */,
1CCB5F611A62A724004C3E90 /* ControlsBar.m in Sources */,
......
modules/gui/macosx/MainMenu.m
View file @ 36f6db37
......@@ -34,7 +34,7 @@
#import "TrackSynchronization.h"
#import "HelpWindowController.h"
#import "VideoEffects.h"
#import "bookmarks.h"
#import "VLCBookmarksWindowController.h"
#import "simple_prefs.h"
#import "VLCPlaylist.h"
#import "VLCPlaylistInfo.h"
......
modules/gui/macosx/Makefile.am
View file @ 36f6db37
......@@ -26,7 +26,6 @@ libmacosx_plugin_la_SOURCES = \
applescript.h applescript.m \
AppleRemote.h AppleRemote.m \
AudioEffects.h AudioEffects.m \
bookmarks.h bookmarks.m \
BWQuincyManager.h BWQuincyManager.m \
BWQuincyUI.h BWQuincyUI.m \
CompatibilityFixes.h \
......@@ -76,6 +75,7 @@ libmacosx_plugin_la_SOURCES = \
VLCStatusBarIcon.h VLCStatusBarIcon.m \
VLCVoutWindowController.h VLCVoutWindowController.m \
Windows.h Windows.m \
VLCBookmarksWindowController.h VLCBookmarksWindowController.m \
VLCCoreDialogProvider.h VLCCoreDialogProvider.m \
VLCEyeTvController.h VLCEyeTvController.m \
VLCHUDSliderCell.h VLCHUDSliderCell.m \
......
modules/gui/macosx/bookmarks.h → modules/gui/macosx/VLCBookmarksWindowController.h
View file @ 36f6db37
/*****************************************************************************
* bookmarks.h: MacOS X Bookmarks window
* VLCBookmarksWindowController.h: MacOS X Bookmarks window
*****************************************************************************
* Copyright (C) 2005, 2007, 2015 VLC authors and VideoLAN
* $Id$
......@@ -25,7 +25,7 @@
#import "intf.h"
#import <vlc_common.h>
@interface VLCBookmarks : NSWindowController
@interface VLCBookmarksWindowController : NSWindowController
/* main window */
@property (readwrite, weak) IBOutlet NSButton *addButton;
......
modules/gui/macosx/bookmarks.m → modules/gui/macosx/VLCBookmarksWindowController.m
View file @ 36f6db37
/*****************************************************************************
* bookmarks.m: MacOS X Bookmarks window
* VLCBookmarksWindowController.m: MacOS X Bookmarks window
*****************************************************************************
* Copyright (C) 2005 - 2015 VLC authors and VideoLAN
* $Id$
......@@ -34,16 +34,16 @@
* Preamble
*****************************************************************************/
#import "bookmarks.h"
#import "VLCBookmarksWindowController.h"
#import "CompatibilityFixes.h"
@interface VLCBookmarks() <NSTableViewDataSource, NSTableViewDelegate>
@interface VLCBookmarksWindowController() <NSTableViewDataSource, NSTableViewDelegate>
{
input_thread_t *p_old_input;
}
@end
@implementation VLCBookmarks
@implementation VLCBookmarksWindowController
/*****************************************************************************
* GUI methods
......
modules/gui/macosx/VLCVoutWindowController.m
View file @ 36f6db37
......@@ -33,7 +33,7 @@
#import "VideoEffects.h"
#import "AudioEffects.h"
#import "VLCPlaylistInfo.h"
#import "bookmarks.h"
#import "VLCBookmarksWindowController.h"
#import "TrackSynchronization.h"
#import "ResumeDialogController.h"
#import "VLCPlaylist.h"
......
modules/gui/macosx/intf.h
View file @ 36f6db37
......@@ -64,7 +64,7 @@ static NSString * VLCInputChangedNotification = @"VLCInputChangedNotification";
@class VLCSimplePrefs;
@class VLCPrefs;
@class VLCCoreDialogProvider;
@class VLCBookmarks;
@class VLCBookmarksWindowController;
@class VLCOpen;
@class VLCDebugMessageVisualizer;
@class VLCTrackSynchronization;
......@@ -86,7 +86,7 @@ static NSString * VLCInputChangedNotification = @"VLCInputChangedNotification";
- (VLCMainMenu *)mainMenu;
- (VLCMainWindow *)mainWindow;
- (VLCBookmarks *)bookmarks;
- (VLCBookmarksWindowController *)bookmarks;
- (VLCOpen *)open;
- (VLCSimplePrefs *)simplePreferences;
- (VLCPrefs *)preferences;
......
modules/gui/macosx/intf.m
View file @ 36f6db37
......@@ -51,7 +51,7 @@
#import "VLCPlaylistInfo.h"
#import "VLCPlaylistInfo.h"
#import "open.h"
#import "bookmarks.h"
#import "VLCBookmarksWindowController.h"
#import "VLCCoreDialogProvider.h"
#import "simple_prefs.h"
#import "CoreInteraction.h"
......@@ -169,7 +169,7 @@ static int ShowController(vlc_object_t *p_this, const char *psz_variable,
VLCSimplePrefs *_sprefs;
VLCOpen *_open;
VLCCoreDialogProvider *_coredialogs;
VLCBookmarks *_bookmarks;
VLCBookmarksWindowController *_bookmarks;
VLCCoreInteraction *_coreinteraction;
ResumeDialogController *_resume_dialog;
VLCInputManager *_input_manager;
......@@ -576,10 +576,10 @@ static VLCMain *sharedInstance = nil;
return _currentMediaInfoPanel;
}
- (VLCBookmarks *)bookmarks
- (VLCBookmarksWindowController *)bookmarks
{
if (!_bookmarks)
_bookmarks = [[VLCBookmarks alloc] init];
_bookmarks = [[VLCBookmarksWindowController alloc] init];
return _bookmarks;
}
......
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