Skip to content

GitLab

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

macosx: rename to VLCHelpWindowController

parent 4904b1c8
Hide whitespace changes
Inline Side-by-side
Showing with 17 additions and 18 deletions
extras/package/macosx/Resources/English.lproj/Help.xib
View file @ edfe6050
<?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"/>
......
extras/package/macosx/vlc.xcodeproj/project.pbxproj
View file @ edfe6050
......@@ -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@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 1C88BA2519DC7B2200645190 /* yosemite-window-close-graphite@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;
......
modules/gui/macosx/MainMenu.m
View file @ edfe6050
......@@ -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];
}
......
modules/gui/macosx/Makefile.am
View file @ edfe6050
......@@ -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 \
......
modules/gui/macosx/HelpWindowController.h → modules/gui/macosx/VLCHelpWindowController.h
View file @ edfe6050
......@@ -24,7 +24,7 @@
#import <WebKit/WebKit.h> //we need to be here, because we're using a WebView object below
@interface HelpWindowController : NSWindowController
@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;
......
modules/gui/macosx/HelpWindowController.m → modules/gui/macosx/VLCHelpWindowController.m
View file @ edfe6050
......@@ -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"
@implementation HelpWindowController
@implementation VLCHelpWindowController
- (id)init
{
......
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