Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-2-2
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-2-2
Commits
e954e55c
Commit
e954e55c
authored
Oct 24, 2013
by
Felix Paul Kühne
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
macosx/CAS: add missing Cancel button (close #9728)
parent
a074804f
Changes
3
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
834 additions
and
31 deletions
+834
-31
extras/package/macosx/Resources/English.lproj/ConvertAndSave.xib
...package/macosx/Resources/English.lproj/ConvertAndSave.xib
+825
-27
modules/gui/macosx/ConvertAndSave.h
modules/gui/macosx/ConvertAndSave.h
+1
-0
modules/gui/macosx/ConvertAndSave.m
modules/gui/macosx/ConvertAndSave.m
+8
-4
No files found.
extras/package/macosx/Resources/English.lproj/ConvertAndSave.xib
View file @
e954e55c
This diff is collapsed.
Click to expand it.
modules/gui/macosx/ConvertAndSave.h
View file @
e954e55c
...
...
@@ -98,6 +98,7 @@
IBOutlet
id
_customize_subs_overlay_ckb
;
IBOutlet
id
_stream_panel
;
IBOutlet
id
_stream_cancel_btn
;
IBOutlet
id
_stream_ok_btn
;
IBOutlet
id
_stream_destination_lbl
;
IBOutlet
id
_stream_announcement_lbl
;
...
...
modules/gui/macosx/ConvertAndSave.m
View file @
e954e55c
...
...
@@ -190,7 +190,8 @@ static VLCConvertAndSave *_o_sharedInstance = nil;
[
_customize_aud_samplerate_lbl
setStringValue
:
_NS
(
"Samplerate"
)];
[
_customize_subs_ckb
setTitle
:
_NS
(
"Subtitles"
)];
[
_customize_subs_overlay_ckb
setTitle
:
_NS
(
"Overlay subtitles on the video"
)];
[
_stream_ok_btn
setTitle
:
_NS
(
"OK"
)];
[
_stream_ok_btn
setTitle
:
_NS
(
"Apply"
)];
[
_stream_cancel_btn
setTitle
:
_NS
(
"Cancel"
)];
[
_stream_destination_lbl
setStringValue
:
_NS
(
"Stream Destination"
)];
[
_stream_announcement_lbl
setStringValue
:
_NS
(
"Stream Announcement"
)];
[
_stream_type_lbl
setStringValue
:
_NS
(
"Type"
)];
...
...
@@ -457,6 +458,12 @@ static VLCConvertAndSave *_o_sharedInstance = nil;
-
(
IBAction
)
closeStreamPanel
:(
id
)
sender
{
[
_stream_panel
orderOut
:
sender
];
[
NSApp
endSheet
:
_stream_panel
];
if
(
sender
==
_stream_cancel_btn
)
return
;
/* provide a summary of the user selections */
NSMutableString
*
labelContent
=
[[
NSMutableString
alloc
]
initWithFormat
:
_NS
(
"%@ stream to %@:%@"
),
[
_stream_type_pop
titleOfSelectedItem
],
[
_stream_address_fld
stringValue
],
[
_stream_port_fld
stringValue
]];
...
...
@@ -491,9 +498,6 @@ static VLCConvertAndSave *_o_sharedInstance = nil;
/* store destination for further reference and update UI */
[
self
setOutputDestination
:
[
_stream_address_fld
stringValue
]];
[
self
updateOKButton
];
[
_stream_panel
orderOut
:
sender
];
[
NSApp
endSheet
:
_stream_panel
];
}
-
(
IBAction
)
streamTypeToggle
:(
id
)
sender
...
...
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