From 36f6db3725af71f71589a5e0adf1974523e5aff5 Mon Sep 17 00:00:00 2001 From: David Fuhrmann Date: Mon, 8 Aug 2016 16:06:32 +0200 Subject: [PATCH] macosx: rename to VLCBookmarksWindowController --- .../macosx/Resources/English.lproj/Bookmarks.xib | 7 +++---- .../package/macosx/vlc.xcodeproj/project.pbxproj | 16 ++++++++-------- modules/gui/macosx/MainMenu.m | 2 +- modules/gui/macosx/Makefile.am | 2 +- ...ookmarks.h => VLCBookmarksWindowController.h} | 4 ++-- ...ookmarks.m => VLCBookmarksWindowController.m} | 8 ++++---- modules/gui/macosx/VLCVoutWindowController.m | 2 +- modules/gui/macosx/intf.h | 4 ++-- modules/gui/macosx/intf.m | 8 ++++---- 9 files changed, 26 insertions(+), 27 deletions(-) rename modules/gui/macosx/{bookmarks.h => VLCBookmarksWindowController.h} (95%) rename modules/gui/macosx/{bookmarks.m => VLCBookmarksWindowController.m} (98%) diff --git a/extras/package/macosx/Resources/English.lproj/Bookmarks.xib b/extras/package/macosx/Resources/English.lproj/Bookmarks.xib index 194b9d92b7..0c2a1de7a3 100644 --- a/extras/package/macosx/Resources/English.lproj/Bookmarks.xib +++ b/extras/package/macosx/Resources/English.lproj/Bookmarks.xib @@ -1,11 +1,10 @@ - + - - + - + diff --git a/extras/package/macosx/vlc.xcodeproj/project.pbxproj b/extras/package/macosx/vlc.xcodeproj/project.pbxproj index 3adc407bbc..2dc698195b 100644 --- a/extras/package/macosx/vlc.xcodeproj/project.pbxproj +++ b/extras/package/macosx/vlc.xcodeproj/project.pbxproj @@ -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 = ""; }; DCC8017816FCA036007FE736 /* avcapture.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = avcapture.m; path = ../../../modules/access/avcapture.m; sourceTree = ""; }; 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 */, diff --git a/modules/gui/macosx/MainMenu.m b/modules/gui/macosx/MainMenu.m index e6a98f8634..d30ca0af47 100644 --- a/modules/gui/macosx/MainMenu.m +++ b/modules/gui/macosx/MainMenu.m @@ -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" diff --git a/modules/gui/macosx/Makefile.am b/modules/gui/macosx/Makefile.am index eb0a2adcc9..94b4dbc3f2 100644 --- a/modules/gui/macosx/Makefile.am +++ b/modules/gui/macosx/Makefile.am @@ -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 \ diff --git a/modules/gui/macosx/bookmarks.h b/modules/gui/macosx/VLCBookmarksWindowController.h similarity index 95% rename from modules/gui/macosx/bookmarks.h rename to modules/gui/macosx/VLCBookmarksWindowController.h index 78c24b3999..c0152a9690 100644 --- a/modules/gui/macosx/bookmarks.h +++ b/modules/gui/macosx/VLCBookmarksWindowController.h @@ -1,5 +1,5 @@ /***************************************************************************** - * 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 -@interface VLCBookmarks : NSWindowController +@interface VLCBookmarksWindowController : NSWindowController /* main window */ @property (readwrite, weak) IBOutlet NSButton *addButton; diff --git a/modules/gui/macosx/bookmarks.m b/modules/gui/macosx/VLCBookmarksWindowController.m similarity index 98% rename from modules/gui/macosx/bookmarks.m rename to modules/gui/macosx/VLCBookmarksWindowController.m index eaeeecdec9..a5660dc9ef 100644 --- a/modules/gui/macosx/bookmarks.m +++ b/modules/gui/macosx/VLCBookmarksWindowController.m @@ -1,5 +1,5 @@ /***************************************************************************** - * 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() +@interface VLCBookmarksWindowController() { input_thread_t *p_old_input; } @end -@implementation VLCBookmarks +@implementation VLCBookmarksWindowController /***************************************************************************** * GUI methods diff --git a/modules/gui/macosx/VLCVoutWindowController.m b/modules/gui/macosx/VLCVoutWindowController.m index 2c6bc9b074..f0ba100d14 100644 --- a/modules/gui/macosx/VLCVoutWindowController.m +++ b/modules/gui/macosx/VLCVoutWindowController.m @@ -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" diff --git a/modules/gui/macosx/intf.h b/modules/gui/macosx/intf.h index 6a35290749..6ea11e7967 100644 --- a/modules/gui/macosx/intf.h +++ b/modules/gui/macosx/intf.h @@ -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; diff --git a/modules/gui/macosx/intf.m b/modules/gui/macosx/intf.m index 79b22b751c..69216c155c 100644 --- a/modules/gui/macosx/intf.m +++ b/modules/gui/macosx/intf.m @@ -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; } -- GitLab