[vlc-commits] macosx: rename to VLCHelpWindowController
David Fuhrmann
git at videolan.org
Mon Aug 8 18:47:38 CEST 2016
vlc | branch: master | David Fuhrmann <dfuhrmann at videolan.org> | Mon Aug 8 18:08:21 2016 +0200| [edfe6050f1e12c5a689d5c2effc9f4cec17fc90e] | committer: David Fuhrmann
macosx: rename to VLCHelpWindowController
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=edfe6050f1e12c5a689d5c2effc9f4cec17fc90e
---
extras/package/macosx/Resources/English.lproj/Help.xib | 9 ++++-----
extras/package/macosx/vlc.xcodeproj/project.pbxproj | 12 ++++++------
modules/gui/macosx/MainMenu.m | 6 +++---
modules/gui/macosx/Makefile.am | 2 +-
.../{HelpWindowController.h => VLCHelpWindowController.h} | 2 +-
.../{HelpWindowController.m => VLCHelpWindowController.m} | 4 ++--
6 files changed, 17 insertions(+), 18 deletions(-)
diff --git a/extras/package/macosx/Resources/English.lproj/Help.xib b/extras/package/macosx/Resources/English.lproj/Help.xib
index 7f54571..a9c1870 100644
--- a/extras/package/macosx/Resources/English.lproj/Help.xib
+++ b/extras/package/macosx/Resources/English.lproj/Help.xib
@@ -1,13 +1,12 @@
<?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"/>
<development version="7000" identifier="xcode"/>
- <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="9531"/>
- <plugIn identifier="com.apple.WebKitIBPlugin" version="9531"/>
+ <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="10117"/>
+ <plugIn identifier="com.apple.WebKitIBPlugin" version="10117"/>
</dependencies>
<objects>
- <customObject id="-2" userLabel="File's Owner" customClass="HelpWindowController">
+ <customObject id="-2" userLabel="File's Owner" customClass="VLCHelpWindowController">
<connections>
<outlet property="o_help_bwd_btn" destination="2257" id="2336"/>
<outlet property="o_help_fwd_btn" destination="2258" id="2335"/>
diff --git a/extras/package/macosx/vlc.xcodeproj/project.pbxproj b/extras/package/macosx/vlc.xcodeproj/project.pbxproj
index ad7386a..c003c20 100644
--- a/extras/package/macosx/vlc.xcodeproj/project.pbxproj
+++ b/extras/package/macosx/vlc.xcodeproj/project.pbxproj
@@ -26,7 +26,7 @@
1C15C7DD1B5146DB003AB729 /* VLCResumeDialogController.m in Sources */ = {isa = PBXBuildFile; fileRef = 633121CB1B51122700E636DA /* VLCResumeDialogController.m */; };
1C51BDE51B7A221B0056B9AA /* TimeSelectionPanel.xib in Resources */ = {isa = PBXBuildFile; fileRef = 1C51BDE31B7A221B0056B9AA /* TimeSelectionPanel.xib */; };
1C57690E19DC93620099F5A6 /* topbar_background.png in Resources */ = {isa = PBXBuildFile; fileRef = 1C57690D19DC93620099F5A6 /* topbar_background.png */; };
- 1C67C8A51D58C0980079E1C1 /* HelpWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = 1C67C8A41D58C0980079E1C1 /* HelpWindowController.m */; };
+ 1C67C8A51D58C0980079E1C1 /* VLCHelpWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = 1C67C8A41D58C0980079E1C1 /* VLCHelpWindowController.m */; };
1C67C8A81D58C0A40079E1C1 /* VLCAboutWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = 1C67C8A71D58C0A40079E1C1 /* VLCAboutWindowController.m */; };
1C88BA5419DC7B2200645190 /* yosemite-window-close-graphite.png in Resources */ = {isa = PBXBuildFile; fileRef = 1C88BA2419DC7B2200645190 /* yosemite-window-close-graphite.png */; };
1C88BA5519DC7B2200645190 /* yosemite-window-close-graphite at 2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 1C88BA2519DC7B2200645190 /* yosemite-window-close-graphite at 2x.png */; };
@@ -901,8 +901,8 @@
1C3AABB01B1BB00A00FDF001 /* VLC-dev.app */ = {isa = PBXFileReference; lastKnownFileType = wrapper.application; name = "VLC-dev.app"; path = "../VLC-dev.app"; sourceTree = BUILT_PRODUCTS_DIR; };
1C51BDE41B7A221B0056B9AA /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = Resources/English.lproj/TimeSelectionPanel.xib; sourceTree = "<group>"; };
1C57690D19DC93620099F5A6 /* topbar_background.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = topbar_background.png; path = Resources/mainwindow/topbar_background.png; sourceTree = "<group>"; };
- 1C67C8A31D58C0980079E1C1 /* HelpWindowController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = HelpWindowController.h; path = ../../../modules/gui/macosx/HelpWindowController.h; sourceTree = "<group>"; };
- 1C67C8A41D58C0980079E1C1 /* HelpWindowController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = HelpWindowController.m; path = ../../../modules/gui/macosx/HelpWindowController.m; sourceTree = "<group>"; };
+ 1C67C8A31D58C0980079E1C1 /* VLCHelpWindowController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = VLCHelpWindowController.h; path = ../../../modules/gui/macosx/VLCHelpWindowController.h; sourceTree = "<group>"; };
+ 1C67C8A41D58C0980079E1C1 /* VLCHelpWindowController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = VLCHelpWindowController.m; path = ../../../modules/gui/macosx/VLCHelpWindowController.m; sourceTree = "<group>"; };
1C67C8A61D58C0A40079E1C1 /* VLCAboutWindowController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = VLCAboutWindowController.h; path = ../../../modules/gui/macosx/VLCAboutWindowController.h; sourceTree = "<group>"; };
1C67C8A71D58C0A40079E1C1 /* VLCAboutWindowController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = VLCAboutWindowController.m; path = ../../../modules/gui/macosx/VLCAboutWindowController.m; sourceTree = "<group>"; };
1C88BA2419DC7B2200645190 /* yosemite-window-close-graphite.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "yosemite-window-close-graphite.png"; sourceTree = "<group>"; };
@@ -1866,8 +1866,8 @@
children = (
1C67C8A61D58C0A40079E1C1 /* VLCAboutWindowController.h */,
1C67C8A71D58C0A40079E1C1 /* VLCAboutWindowController.m */,
- 1C67C8A31D58C0980079E1C1 /* HelpWindowController.h */,
- 1C67C8A41D58C0980079E1C1 /* HelpWindowController.m */,
+ 1C67C8A31D58C0980079E1C1 /* VLCHelpWindowController.h */,
+ 1C67C8A41D58C0980079E1C1 /* VLCHelpWindowController.m */,
7DF0435E1972E26A0022B534 /* AddonListDataSource.h */,
7DF0435F1972E26A0022B534 /* AddonListDataSource.m */,
7DB65D5218ABD6380053B874 /* AddonsWindowController.h */,
@@ -4048,7 +4048,7 @@
1CCB5FA91A62A724004C3E90 /* SPInvocationGrabbing.h in Sources */,
1CCB5FAA1A62A724004C3E90 /* SPInvocationGrabbing.m in Sources */,
1CCB5FAB1A62A724004C3E90 /* SPMediaKeyTap.h in Sources */,
- 1C67C8A51D58C0980079E1C1 /* HelpWindowController.m in Sources */,
+ 1C67C8A51D58C0980079E1C1 /* VLCHelpWindowController.m in Sources */,
1CCB5FAC1A62A724004C3E90 /* SPMediaKeyTap.m in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
diff --git a/modules/gui/macosx/MainMenu.m b/modules/gui/macosx/MainMenu.m
index f8d657d..9961e27 100644
--- a/modules/gui/macosx/MainMenu.m
+++ b/modules/gui/macosx/MainMenu.m
@@ -32,7 +32,7 @@
#import "open.h"
#import "VLCAudioEffectsWindowController.h"
#import "VLCTrackSynchronizationWindowController.h"
-#import "HelpWindowController.h"
+#import "VLCHelpWindowController.h"
#import "VLCVideoEffectsWindowController.h"
#import "VLCBookmarksWindowController.h"
#import "simple_prefs.h"
@@ -56,7 +56,7 @@
@interface VLCMainMenu()
{
VLCAboutWindowController *_aboutWindowController;
- HelpWindowController *_helpWindowController;
+ VLCHelpWindowController *_helpWindowController;
AddonsWindowController *_addonsController;
VLCRendererDialog *_rendererDialog;
@@ -1241,7 +1241,7 @@
- (IBAction)showHelp:(id)sender
{
if (!_helpWindowController)
- _helpWindowController = [[HelpWindowController alloc] init];
+ _helpWindowController = [[VLCHelpWindowController alloc] init];
[_helpWindowController showHelp];
}
diff --git a/modules/gui/macosx/Makefile.am b/modules/gui/macosx/Makefile.am
index 86155e0..9eca429 100644
--- a/modules/gui/macosx/Makefile.am
+++ b/modules/gui/macosx/Makefile.am
@@ -34,7 +34,7 @@ libmacosx_plugin_la_SOURCES = \
ExtensionsDialogProvider.h ExtensionsDialogProvider.m \
ExtensionsManager.h ExtensionsManager.m \
fspanel.h fspanel.m \
- HelpWindowController.h HelpWindowController.m \
+ VLCHelpWindowController.h VLCHelpWindowController.m \
intf-prefs.h intf-prefs.m \
intf.h intf.m \
iTunes.h \
diff --git a/modules/gui/macosx/HelpWindowController.h b/modules/gui/macosx/VLCHelpWindowController.h
similarity index 96%
rename from modules/gui/macosx/HelpWindowController.h
rename to modules/gui/macosx/VLCHelpWindowController.h
index 58c0088..02d4d6d 100644
--- a/modules/gui/macosx/HelpWindowController.h
+++ b/modules/gui/macosx/VLCHelpWindowController.h
@@ -24,7 +24,7 @@
#import <WebKit/WebKit.h> //we need to be here, because we're using a WebView object below
- at interface HelpWindowController : NSWindowController
+ at interface VLCHelpWindowController : NSWindowController
{
IBOutlet WebView *o_help_web_view; //we may _not_ use id here because of method name collisions
IBOutlet id o_help_bwd_btn;
diff --git a/modules/gui/macosx/HelpWindowController.m b/modules/gui/macosx/VLCHelpWindowController.m
similarity index 96%
rename from modules/gui/macosx/HelpWindowController.m
rename to modules/gui/macosx/VLCHelpWindowController.m
index bdd545f..bbe8e47 100644
--- a/modules/gui/macosx/HelpWindowController.m
+++ b/modules/gui/macosx/VLCHelpWindowController.m
@@ -22,7 +22,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
-#import "HelpWindowController.h"
+#import "VLCHelpWindowController.h"
#import "intf.h"
#import <vlc_intf_strings.h>
@@ -30,7 +30,7 @@
#import "CompatibilityFixes.h"
#import "VLCScrollingClipView.h"
- at implementation HelpWindowController
+ at implementation VLCHelpWindowController
- (id)init
{
More information about the vlc-commits
mailing list