Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
videolan
vlc
Commits
4477fc91
Commit
4477fc91
authored
Jul 20, 2015
by
Felix Paul Kühne
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
macosx/open: reimplement output panel appearance
parent
32043ff0
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
29 additions
and
0 deletions
+29
-0
extras/package/macosx/Resources/English.lproj/Open.xib
extras/package/macosx/Resources/English.lproj/Open.xib
+7
-0
modules/gui/macosx/open.h
modules/gui/macosx/open.h
+2
-0
modules/gui/macosx/open.m
modules/gui/macosx/open.m
+20
-0
No files found.
extras/package/macosx/Resources/English.lproj/Open.xib
View file @
4477fc91
...
@@ -125,6 +125,7 @@
...
@@ -125,6 +125,7 @@
<outlet
property=
"netUDPProtocolMatrix"
destination=
"2860"
id=
"BXg-n9-cH5"
/>
<outlet
property=
"netUDPProtocolMatrix"
destination=
"2860"
id=
"BXg-n9-cH5"
/>
<outlet
property=
"okButton"
destination=
"640"
id=
"S9F-WP-A7y"
/>
<outlet
property=
"okButton"
destination=
"640"
id=
"S9F-WP-A7y"
/>
<outlet
property=
"outputCheckbox"
destination=
"929"
id=
"Gz1-rY-w0Q"
/>
<outlet
property=
"outputCheckbox"
destination=
"929"
id=
"Gz1-rY-w0Q"
/>
<outlet
property=
"outputSettingsButton"
destination=
"1256"
id=
"ruY-7h-HIS"
/>
<outlet
property=
"panel"
destination=
"636"
id=
"POG-Xe-8j5"
/>
<outlet
property=
"panel"
destination=
"636"
id=
"POG-Xe-8j5"
/>
<outlet
property=
"qtkAudioCheckbox"
destination=
"3492"
id=
"5d3-k7-1dB"
/>
<outlet
property=
"qtkAudioCheckbox"
destination=
"3492"
id=
"5d3-k7-1dB"
/>
<outlet
property=
"qtkAudioDevicePopup"
destination=
"3438"
id=
"Jt3-3n-AjR"
/>
<outlet
property=
"qtkAudioDevicePopup"
destination=
"3438"
id=
"Jt3-3n-AjR"
/>
...
@@ -180,6 +181,9 @@
...
@@ -180,6 +181,9 @@
<behavior
key=
"behavior"
changeContents=
"YES"
doesNotDimImage=
"YES"
lightByContents=
"YES"
/>
<behavior
key=
"behavior"
changeContents=
"YES"
doesNotDimImage=
"YES"
lightByContents=
"YES"
/>
<font
key=
"font"
metaFont=
"system"
/>
<font
key=
"font"
metaFont=
"system"
/>
</buttonCell>
</buttonCell>
<connections>
<action
selector=
"outputSettings:"
target=
"-2"
id=
"EUk-e1-Lcu"
/>
</connections>
</button>
</button>
<button
verticalHuggingPriority=
"750"
id=
"640"
>
<button
verticalHuggingPriority=
"750"
id=
"640"
>
<rect
key=
"frame"
x=
"437"
y=
"12"
width=
"123"
height=
"32"
/>
<rect
key=
"frame"
x=
"437"
y=
"12"
width=
"123"
height=
"32"
/>
...
@@ -506,6 +510,9 @@ Gw
...
@@ -506,6 +510,9 @@ Gw
<behavior
key=
"behavior"
pushIn=
"YES"
lightByBackground=
"YES"
lightByGray=
"YES"
/>
<behavior
key=
"behavior"
pushIn=
"YES"
lightByBackground=
"YES"
lightByGray=
"YES"
/>
<font
key=
"font"
metaFont=
"system"
/>
<font
key=
"font"
metaFont=
"system"
/>
</buttonCell>
</buttonCell>
<connections>
<action
selector=
"outputSettings:"
target=
"-2"
id=
"hbB-87-Udf"
/>
</connections>
</button>
</button>
<textField
verticalHuggingPriority=
"750"
id=
"2835"
customClass=
"VLCOpenTextField"
>
<textField
verticalHuggingPriority=
"750"
id=
"2835"
customClass=
"VLCOpenTextField"
>
<rect
key=
"frame"
x=
"38"
y=
"82"
width=
"246"
height=
"17"
/>
<rect
key=
"frame"
x=
"38"
y=
"82"
width=
"246"
height=
"17"
/>
...
...
modules/gui/macosx/open.h
View file @
4477fc91
...
@@ -39,6 +39,7 @@
...
@@ -39,6 +39,7 @@
/* bottom-line items */
/* bottom-line items */
@property
(
readwrite
,
weak
)
IBOutlet
NSButton
*
outputCheckbox
;
@property
(
readwrite
,
weak
)
IBOutlet
NSButton
*
outputCheckbox
;
@property
(
readwrite
,
weak
)
IBOutlet
NSButton
*
outputSettingsButton
;
/* open file */
/* open file */
@property
(
readwrite
,
weak
)
IBOutlet
NSTextField
*
fileNameLabel
;
@property
(
readwrite
,
weak
)
IBOutlet
NSTextField
*
fileNameLabel
;
...
@@ -211,6 +212,7 @@
...
@@ -211,6 +212,7 @@
@property
(
nonatomic
)
float
fileSubDelay
;
@property
(
nonatomic
)
float
fileSubDelay
;
@property
(
nonatomic
)
float
fileSubFps
;
@property
(
nonatomic
)
float
fileSubFps
;
-
(
IBAction
)
outputSettings
:(
id
)
sender
;
-
(
void
)
setSubPanel
;
-
(
void
)
setSubPanel
;
-
(
void
)
tabView
:(
NSTabView
*
)
o_tv
didSelectTabViewItem
:(
NSTabViewItem
*
)
o_tvi
;
-
(
void
)
tabView
:(
NSTabView
*
)
o_tv
didSelectTabViewItem
:(
NSTabViewItem
*
)
o_tvi
;
-
(
void
)
textFieldWasClicked
:(
NSNotification
*
)
o_notification
;
-
(
void
)
textFieldWasClicked
:(
NSNotification
*
)
o_notification
;
...
...
modules/gui/macosx/open.m
View file @
4477fc91
...
@@ -53,6 +53,7 @@ struct display_info_t
...
@@ -53,6 +53,7 @@ struct display_info_t
@interface
VLCOpen
()
@interface
VLCOpen
()
{
{
VLCOutput
*
_output
;
VLCOutput
*
_output
;
BOOL
b_outputNibLoaded
;
NSArray
*
_qtkvideoDevices
;
NSArray
*
_qtkvideoDevices
;
NSArray
*
_qtkaudioDevices
;
NSArray
*
_qtkaudioDevices
;
NSString
*
_qtkCurrentDeviceUID
;
NSString
*
_qtkCurrentDeviceUID
;
...
@@ -92,6 +93,8 @@ struct display_info_t
...
@@ -92,6 +93,8 @@ struct display_info_t
-
(
void
)
awakeFromNib
-
(
void
)
awakeFromNib
{
{
_output
=
[
VLCOutput
new
];
[
_panel
setCollectionBehavior
:
NSWindowCollectionBehaviorFullScreenAuxiliary
];
[
_panel
setCollectionBehavior
:
NSWindowCollectionBehaviorFullScreenAuxiliary
];
[
_panel
setTitle
:
_NS
(
"Open Source"
)];
[
_panel
setTitle
:
_NS
(
"Open Source"
)];
...
@@ -652,6 +655,23 @@ struct display_info_t
...
@@ -652,6 +655,23 @@ struct display_info_t
}
}
}
}
-
(
IBAction
)
outputSettings
:(
id
)
sender
{
if
(
sender
==
self
.
outputCheckbox
)
{
self
.
outputSettingsButton
.
enabled
=
self
.
outputCheckbox
.
state
;
return
;
}
if
(
!
b_outputNibLoaded
)
b_outputNibLoaded
=
[
NSBundle
loadNibNamed
:
@"StreamOutput"
owner
:
_output
];
[
NSApp
beginSheet
:
_output
.
outputSheet
modalForWindow:
self
.
panel
modalDelegate:
self
didEndSelector:
NULL
contextInfo:
nil
];
}
#pragma mark -
#pragma mark -
#pragma mark File Panel
#pragma mark File Panel
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment