Commit 4904b1c8 authored by David Fuhrmann's avatar David Fuhrmann

macosx: rename to VLCAboutWindowController

parent bf31e1f5
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="9532" 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 version="1070" identifier="macosx"/>
<development version="7000" identifier="xcode"/>
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="9532"/>
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="10117"/>
<capability name="box content view" minToolsVersion="7.0"/>
</dependencies>
<objects>
<customObject id="-2" userLabel="File's Owner" customClass="AboutWindowController">
<customObject id="-2" userLabel="File's Owner" customClass="VLCAboutWindowController">
<connections>
<outlet property="o_authors_btn" destination="2286" id="2323"/>
<outlet property="o_copyright_field" destination="2233" id="2320"/>
......@@ -46,10 +46,10 @@
<rect key="frame" x="0.0" y="0.0" width="415" height="204"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="calibratedRGB"/>
<size key="minSize" width="415" height="204"/>
<size key="minSize" width="430" height="204"/>
<size key="maxSize" width="564" height="10000000"/>
<color key="insertionPointColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
<size key="minSize" width="415" height="204"/>
<size key="minSize" width="430" height="204"/>
<size key="maxSize" width="564" height="10000000"/>
</textView>
</subviews>
......
......@@ -27,7 +27,7 @@
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 */; };
1C67C8A81D58C0A40079E1C1 /* AboutWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = 1C67C8A71D58C0A40079E1C1 /* AboutWindowController.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 */; };
1C88BA5619DC7B2200645190 /* yosemite-window-close-on-graphite.png in Resources */ = {isa = PBXBuildFile; fileRef = 1C88BA2619DC7B2200645190 /* yosemite-window-close-on-graphite.png */; };
......@@ -903,8 +903,8 @@
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>"; };
1C67C8A61D58C0A40079E1C1 /* AboutWindowController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AboutWindowController.h; path = ../../../modules/gui/macosx/AboutWindowController.h; sourceTree = "<group>"; };
1C67C8A71D58C0A40079E1C1 /* AboutWindowController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AboutWindowController.m; path = ../../../modules/gui/macosx/AboutWindowController.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>"; };
1C88BA2519DC7B2200645190 /* yosemite-window-close-graphite@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "yosemite-window-close-graphite@2x.png"; sourceTree = "<group>"; };
1C88BA2619DC7B2200645190 /* yosemite-window-close-on-graphite.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "yosemite-window-close-on-graphite.png"; sourceTree = "<group>"; };
......@@ -1864,8 +1864,8 @@
08FB77AFFE84173DC02AAC07 /* Classes */ = {
isa = PBXGroup;
children = (
1C67C8A61D58C0A40079E1C1 /* AboutWindowController.h */,
1C67C8A71D58C0A40079E1C1 /* AboutWindowController.m */,
1C67C8A61D58C0A40079E1C1 /* VLCAboutWindowController.h */,
1C67C8A71D58C0A40079E1C1 /* VLCAboutWindowController.m */,
1C67C8A31D58C0980079E1C1 /* HelpWindowController.h */,
1C67C8A41D58C0980079E1C1 /* HelpWindowController.m */,
7DF0435E1972E26A0022B534 /* AddonListDataSource.h */,
......@@ -4001,7 +4001,7 @@
1CCB5F7D1A62A724004C3E90 /* VLCPlaylist.h in Sources */,
1CCB5F7E1A62A724004C3E90 /* VLCPlaylist.m in Sources */,
1CCB5F7F1A62A724004C3E90 /* VLCPlaylistInfo.h in Sources */,
1C67C8A81D58C0A40079E1C1 /* AboutWindowController.m in Sources */,
1C67C8A81D58C0A40079E1C1 /* VLCAboutWindowController.m in Sources */,
1CCB5F801A62A724004C3E90 /* VLCPlaylistInfo.m in Sources */,
1CCB5F811A62A724004C3E90 /* prefs_widgets.h in Sources */,
1CCB5F821A62A724004C3E90 /* prefs_widgets.m in Sources */,
......
......@@ -28,7 +28,7 @@
#import <vlc_playlist.h>
#import <vlc_input.h>
#import "AboutWindowController.h"
#import "VLCAboutWindowController.h"
#import "open.h"
#import "VLCAudioEffectsWindowController.h"
#import "VLCTrackSynchronizationWindowController.h"
......@@ -55,7 +55,7 @@
@interface VLCMainMenu()
{
AboutWindowController *_aboutWindowController;
VLCAboutWindowController *_aboutWindowController;
HelpWindowController *_helpWindowController;
AddonsWindowController *_addonsController;
VLCRendererDialog *_rendererDialog;
......@@ -1225,7 +1225,7 @@
- (IBAction)showAbout:(id)sender
{
if (!_aboutWindowController)
_aboutWindowController = [[AboutWindowController alloc] init];
_aboutWindowController = [[VLCAboutWindowController alloc] init];
[_aboutWindowController showAbout];
}
......@@ -1233,7 +1233,7 @@
- (IBAction)showLicense:(id)sender
{
if (!_aboutWindowController)
_aboutWindowController = [[AboutWindowController alloc] init];
_aboutWindowController = [[VLCAboutWindowController alloc] init];
[_aboutWindowController showGPL];
}
......
......@@ -20,7 +20,7 @@ gui_LTLIBRARIES = $(LTLIBmacosx)
libmacosx_plugin_la_SOURCES = \
helpers.h \
AboutWindowController.h AboutWindowController.m \
VLCAboutWindowController.h VLCAboutWindowController.m \
AddonListDataSource.h AddonListDataSource.m \
AddonsWindowController.h AddonsWindowController.m \
applescript.h applescript.m \
......
/*****************************************************************************
* AboutWindowController.h
* VLCAboutWindowController.h
*****************************************************************************
* Copyright (C) 2001-2013 VLC authors and VideoLAN
* $Id$
......@@ -24,7 +24,7 @@
#import <Cocoa/Cocoa.h>
@interface AboutWindowController : NSWindowController<NSWindowDelegate>
@interface VLCAboutWindowController : NSWindowController<NSWindowDelegate>
{
/* main about panel and stuff related to its views */
IBOutlet id o_name_version_field;
......
/*****************************************************************************
* AboutWindowController.m
* VLCAboutWindowController.m
*****************************************************************************
* Copyright (C) 2001-2014 VLC authors and VideoLAN
* $Id$
......@@ -26,7 +26,7 @@
* Preamble
*****************************************************************************/
#import "AboutWindowController.h"
#import "VLCAboutWindowController.h"
#import "intf.h"
#import <vlc_intf_strings.h>
......@@ -40,16 +40,13 @@
* one arch to support again one day */
#define PLATFORM "Intel 64bit"
/*****************************************************************************
* AboutWindowController implementation
*****************************************************************************/
@interface AboutWindowController ()
@interface VLCAboutWindowController ()
{
NSString *o_authors;
}
@end
@implementation AboutWindowController
@implementation VLCAboutWindowController
- (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