Skip to content

GitLab

Commit c6fdee69 authored by David's avatar David
Browse files
Options

macosx: rename to VLCResumeDialogController

parent b3e1b006
Hide whitespace changes
Inline Side-by-side
Showing with 26 additions and 27 deletions
extras/package/macosx/Resources/English.lproj/ResumeDialog.xib
View file @ c6fdee69
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="10117" systemVersion="15G24b" 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="10117"/>
</dependencies>
<objects>
<customObject id="-2" userLabel="File's Owner" customClass="ResumeDialogController">
<customObject id="-2" userLabel="File's Owner" customClass="VLCResumeDialogController">
<connections>
<outlet property="o_always_resume_chk" destination="85X-TN-2Hu" id="ttg-8c-Zbf"/>
<outlet property="o_restart_btn" destination="9" id="37"/>
......
extras/package/macosx/vlc.xcodeproj/project.pbxproj
View file @ c6fdee69
......@@ -22,8 +22,8 @@
/* End PBXAggregateTarget section */
/* Begin PBXBuildFile section */
1C15C7DC1B5146DB003AB729 /* ResumeDialogController.h in Sources */ = {isa = PBXBuildFile; fileRef = 633121CA1B51122700E636DA /* ResumeDialogController.h */; };
1C15C7DD1B5146DB003AB729 /* ResumeDialogController.m in Sources */ = {isa = PBXBuildFile; fileRef = 633121CB1B51122700E636DA /* ResumeDialogController.m */; };
1C15C7DC1B5146DB003AB729 /* VLCResumeDialogController.h in Sources */ = {isa = PBXBuildFile; fileRef = 633121CA1B51122700E636DA /* VLCResumeDialogController.h */; };
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 */; };
......@@ -1260,8 +1260,8 @@
5CCED71314C0D4A90057F8D1 /* ExtensionsManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = ExtensionsManager.m; path = ../../../modules/gui/macosx/ExtensionsManager.m; sourceTree = SOURCE_ROOT; };
5CCED71414C0D4A90057F8D1 /* VLCUIWidgets.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = VLCUIWidgets.h; path = ../../../modules/gui/macosx/VLCUIWidgets.h; sourceTree = SOURCE_ROOT; };
5CCED71514C0D4A90057F8D1 /* VLCUIWidgets.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = VLCUIWidgets.m; path = ../../../modules/gui/macosx/VLCUIWidgets.m; sourceTree = SOURCE_ROOT; };
633121CA1B51122700E636DA /* ResumeDialogController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ResumeDialogController.h; path = ../../../modules/gui/macosx/ResumeDialogController.h; sourceTree = "<group>"; };
633121CB1B51122700E636DA /* ResumeDialogController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = ResumeDialogController.m; path = ../../../modules/gui/macosx/ResumeDialogController.m; sourceTree = "<group>"; };
633121CA1B51122700E636DA /* VLCResumeDialogController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = VLCResumeDialogController.h; path = ../../../modules/gui/macosx/VLCResumeDialogController.h; sourceTree = "<group>"; };
633121CB1B51122700E636DA /* VLCResumeDialogController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = VLCResumeDialogController.m; path = ../../../modules/gui/macosx/VLCResumeDialogController.m; sourceTree = "<group>"; };
633121CF1B5112C300E636DA /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = Resources/English.lproj/ResumeDialog.xib; sourceTree = "<group>"; };
6B13E2A61BC67678001AD24A /* VLCScrollingClipView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = VLCScrollingClipView.h; path = ../../../modules/gui/macosx/VLCScrollingClipView.h; sourceTree = "<group>"; };
6B13E2A71BC67678001AD24A /* VLCScrollingClipView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = VLCScrollingClipView.m; path = ../../../modules/gui/macosx/VLCScrollingClipView.m; sourceTree = "<group>"; };
......@@ -1927,8 +1927,8 @@
8E9CA1A406D7DEE800B7186C /* prefs_widgets.m */,
8ED6C28503E2EB1C0059A3A7 /* prefs.h */,
8ED6C28603E2EB1C0059A3A7 /* prefs.m */,
633121CA1B51122700E636DA /* ResumeDialogController.h */,
633121CB1B51122700E636DA /* ResumeDialogController.m */,
633121CA1B51122700E636DA /* VLCResumeDialogController.h */,
633121CB1B51122700E636DA /* VLCResumeDialogController.m */,
CC461F6C160078340022423C /* SharedDialogs.h */,
CC461F6D160078340022423C /* SharedDialogs.m */,
CCB24D5E0D54BBAE004D780C /* simple_prefs.h */,
......@@ -3947,8 +3947,8 @@
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
1C15C7DC1B5146DB003AB729 /* ResumeDialogController.h in Sources */,
1C15C7DD1B5146DB003AB729 /* ResumeDialogController.m in Sources */,
1C15C7DC1B5146DB003AB729 /* VLCResumeDialogController.h in Sources */,
1C15C7DD1B5146DB003AB729 /* VLCResumeDialogController.m in Sources */,
1CCB5F531A62A724004C3E90 /* AddonListDataSource.h in Sources */,
1CCB5F541A62A724004C3E90 /* AddonListDataSource.m in Sources */,
1CCB5F551A62A724004C3E90 /* AddonsWindowController.h in Sources */,
......
modules/gui/macosx/InputManager.m
View file @ c6fdee69
......@@ -29,7 +29,7 @@
#import "MainWindow.h"
#import "VLCPlaylist.h"
#import "VLCPlaylistInfo.h"
#import "ResumeDialogController.h"
#import "VLCResumeDialogController.h"
#import "TrackSynchronization.h"
#import "VideoView.h"
......
modules/gui/macosx/Makefile.am
View file @ c6fdee69
......@@ -57,7 +57,6 @@ libmacosx_plugin_la_SOURCES = \
prefs_widgets.h prefs_widgets.m \
PXSourceList.h PXSourceList.m \
PXSourceListDataSource.h PXSourceListDelegate.h \
ResumeDialogController.h ResumeDialogController.m \
SideBarItem.h SideBarItem.m \
SharedDialogs.h SharedDialogs.m \
simple_prefs.h simple_prefs.m \
......@@ -85,4 +84,5 @@ libmacosx_plugin_la_SOURCES = \
VLCRendererDiscovery.h VLCRendererDiscovery.m \
VLCRendererItem.h VLCRendererItem.m \
VLCRendererDialog.h VLCRendererDialog.m \
VLCResumeDialogController.h VLCResumeDialogController.m \
VLCVideoEffectsWindowController.h VLCVideoEffectsWindowController.m
modules/gui/macosx/VLCPlaylist.m
View file @ c6fdee69
......@@ -45,7 +45,7 @@
#import "VLCPlaylist.h"
#import "MainMenu.h"
#import "VLCPlaylistInfo.h"
#import "ResumeDialogController.h"
#import "VLCResumeDialogController.h"
#import "open.h"
#include <vlc_keys.h>
......
modules/gui/macosx/ResumeDialogController.h → modules/gui/macosx/VLCResumeDialogController.h
View file @ c6fdee69
/*****************************************************************************
* ResumeDialogController.h: MacOS X interface module
* VLCResumeDialogController.m: MacOS X interface module
*****************************************************************************
* Copyright (C) 2015 VLC authors and VideoLAN
*
......@@ -33,7 +33,7 @@ enum ResumeResult {
typedef void(^CompletionBlock)(enum ResumeResult);
@interface ResumeDialogController : NSWindowController
@interface VLCResumeDialogController : NSWindowController
{
IBOutlet id o_title_lbl;
IBOutlet id o_text_lbl;
......
modules/gui/macosx/ResumeDialogController.m → modules/gui/macosx/VLCResumeDialogController.m
View file @ c6fdee69
/*****************************************************************************
* ResumeDialogController.m: MacOS X interface module
* VLCResumeDialogController.m: MacOS X interface module
*****************************************************************************
* Copyright (C) 2015 VLC authors and VideoLAN
*
......@@ -22,19 +22,19 @@
*****************************************************************************/
#import "ResumeDialogController.h"
#import "VLCResumeDialogController.h"
#import "intf.h"
#import "StringUtility.h"
@interface ResumeDialogController()
@interface VLCResumeDialogController()
{
int currentResumeTimeout;
CompletionBlock completionBlock;
}
@end
@implementation ResumeDialogController
@implementation VLCResumeDialogController
- (id)init
{
......
modules/gui/macosx/VLCVoutWindowController.m
View file @ c6fdee69
......@@ -35,7 +35,7 @@
#import "VLCPlaylistInfo.h"
#import "VLCBookmarksWindowController.h"
#import "TrackSynchronization.h"
#import "ResumeDialogController.h"
#import "VLCResumeDialogController.h"
#import "VLCPlaylist.h"
static atomic_bool b_intf_starting = ATOMIC_VAR_INIT(false);
......
modules/gui/macosx/intf.h
View file @ c6fdee69
......@@ -60,7 +60,7 @@ static NSString * VLCInputChangedNotification = @"VLCInputChangedNotification";
@class VLCMainMenu;
@class VLCPlaylist;
@class VLCInputManager;
@class ResumeDialogController;
@class VLCResumeDialogController;
@class VLCSimplePrefs;
@class VLCPrefs;
@class VLCCoreDialogProvider;
......@@ -92,7 +92,7 @@ static NSString * VLCInputChangedNotification = @"VLCInputChangedNotification";
- (VLCPrefs *)preferences;
- (VLCPlaylist *)playlist;
- (VLCCoreDialogProvider *)coreDialogProvider;
- (ResumeDialogController *)resumeDialog;
- (VLCResumeDialogController *)resumeDialog;
- (VLCInputManager *)inputManager;
- (ExtensionsManager *)extensionsManager;
- (VLCStatusBarIcon *)statusBarIcon;
......
modules/gui/macosx/intf.m
View file @ c6fdee69
......@@ -58,7 +58,7 @@
#import "TrackSynchronization.h"
#import "ExtensionsManager.h"
#import "BWQuincyManager.h"
#import "ResumeDialogController.h"
#import "VLCResumeDialogController.h"
#import "DebugMessageVisualizer.h"
#import "ConvertAndSave.h"
......@@ -171,7 +171,7 @@ static int ShowController(vlc_object_t *p_this, const char *psz_variable,
VLCCoreDialogProvider *_coredialogs;
VLCBookmarksWindowController *_bookmarks;
VLCCoreInteraction *_coreinteraction;
ResumeDialogController *_resume_dialog;
VLCResumeDialogController *_resume_dialog;
VLCInputManager *_input_manager;
VLCPlaylist *_playlist;
VLCDebugMessageVisualizer *_messagePanelController;
......@@ -626,10 +626,10 @@ static VLCMain *sharedInstance = nil;
return _coredialogs;
}
- (ResumeDialogController *)resumeDialog
- (VLCResumeDialogController *)resumeDialog
{
if (!_resume_dialog)
_resume_dialog = [[ResumeDialogController alloc] init];
_resume_dialog = [[VLCResumeDialogController alloc] init];
return _resume_dialog;
}
......
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