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
73ef71e7
Commit
73ef71e7
authored
Jul 27, 2012
by
Felix Paul Kühne
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
macosx: CAS: re-write the destination section's appearance to make it less cluttered
parent
50329a43
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
983 additions
and
651 deletions
+983
-651
extras/package/macosx/Resources/English.lproj/ConvertAndSave.xib
...package/macosx/Resources/English.lproj/ConvertAndSave.xib
+928
-647
modules/gui/macosx/ConvertAndSave.h
modules/gui/macosx/ConvertAndSave.h
+11
-2
modules/gui/macosx/ConvertAndSave.m
modules/gui/macosx/ConvertAndSave.m
+44
-2
No files found.
extras/package/macosx/Resources/English.lproj/ConvertAndSave.xib
View file @
73ef71e7
This source diff could not be displayed because it is too large. You can
view the blob
instead.
modules/gui/macosx/ConvertAndSave.h
View file @
73ef71e7
...
...
@@ -38,13 +38,19 @@
IBOutlet
id
_profile_pop
;
IBOutlet
id
_profile_btn
;
IBOutlet
id
_destination_box
;
IBOutlet
id
_destination_lbl
;
IBOutlet
id
_destination_btn
;
IBOutlet
id
_destination_b
rowse_b
tn
;
IBOutlet
id
_destination_icon_view
;
IBOutlet
id
_destination_filename_lbl
;
IBOutlet
id
_destination_filename_stub_lbl
;
IBOutlet
id
_destination_stream_btn
;
IBOutlet
id
_destination_stream_lbl
;
IBOutlet
id
_destination_itwantafile_btn
;
IBOutlet
id
_destination_itwantastream_btn
;
IBOutlet
id
_destination_itwantafile_view
;
IBOutlet
id
_destination_itwantastream_view
;
IBOutlet
id
_destination_cancel_btn
;
IBOutlet
id
_dropin_view
;
IBOutlet
id
_dropin_icon_view
;
...
...
@@ -129,7 +135,10 @@
-
(
IBAction
)
switchProfile
:(
id
)
sender
;
-
(
IBAction
)
customizeProfile
:(
id
)
sender
;
-
(
IBAction
)
closeCustomizationSheet
:(
id
)
sender
;
-
(
IBAction
)
chooseDestination
:(
id
)
sender
;
-
(
IBAction
)
iWantAFile
:(
id
)
sender
;
-
(
IBAction
)
iWantAStream
:(
id
)
sender
;
-
(
IBAction
)
cancelDestination
:(
id
)
sender
;
-
(
IBAction
)
browseFileDestination
:(
id
)
sender
;
-
(
IBAction
)
showStreamPanel
:(
id
)
sender
;
-
(
IBAction
)
closeStreamPanel
:(
id
)
sender
;
...
...
modules/gui/macosx/ConvertAndSave.m
View file @
73ef71e7
...
...
@@ -143,8 +143,12 @@ static VLCConvertAndSave *_o_sharedInstance = nil;
[
_destination_lbl
setStringValue
:
_NS
(
"Choose Destination"
)];
[
_destination_filename_stub_lbl
setStringValue
:
_NS
(
"Choose an output location"
)];
[
_destination_filename_lbl
setHidden
:
YES
];
[
_destination_stream_btn
setTitle
:
_NS
(
"Stream..."
)];
[
_destination_browse_btn
setTitle
:
_NS
(
"Browse..."
)];
[
_destination_stream_btn
setTitle
:
_NS
(
"Setup Streaming..."
)];
[
_destination_stream_lbl
setStringValue
:
@""
];
[
_destination_itwantafile_btn
setTitle
:
_NS
(
"Save as File"
)];
[
_destination_itwantastream_btn
setTitle
:
_NS
(
"Stream"
)];
[
_destination_cancel_btn
setHidden
:
YES
];
[
_customize_ok_btn
setTitle
:
_NS
(
"Apply"
)];
[
_customize_cancel_btn
setTitle
:
_NS
(
"Cancel"
)];
[[
_customize_tabview
tabViewItemAtIndex
:
0
]
setLabel
:
_NS
(
"Encapsulation"
)];
...
...
@@ -360,7 +364,45 @@ static VLCConvertAndSave *_o_sharedInstance = nil;
}
}
-
(
IBAction
)
chooseDestination
:(
id
)
sender
-
(
IBAction
)
iWantAFile
:(
id
)
sender
{
NSRect
boxFrame
=
[
_destination_box
frame
];
NSRect
subViewFrame
=
[
_destination_itwantafile_view
frame
];
subViewFrame
.
origin
.
x
=
(
boxFrame
.
size
.
width
-
subViewFrame
.
size
.
width
)
/
2
;
subViewFrame
.
origin
.
y
=
((
boxFrame
.
size
.
height
-
subViewFrame
.
size
.
height
)
/
2
)
-
15
.;
[
_destination_itwantafile_view
setFrame
:
subViewFrame
];
[[
_destination_itwantafile_btn
animator
]
setHidden
:
YES
];
[[
_destination_itwantastream_btn
animator
]
setHidden
:
YES
];
[
_destination_box
performSelector
:
@selector
(
addSubview
:)
withObject
:
_destination_itwantafile_view
afterDelay
:
0
.
2
];
[[
_destination_cancel_btn
animator
]
setHidden
:
NO
];
}
-
(
IBAction
)
iWantAStream
:(
id
)
sender
{
NSRect
boxFrame
=
[
_destination_box
frame
];
NSRect
subViewFrame
=
[
_destination_itwantastream_view
frame
];
subViewFrame
.
origin
.
x
=
(
boxFrame
.
size
.
width
-
subViewFrame
.
size
.
width
)
/
2
;
subViewFrame
.
origin
.
y
=
((
boxFrame
.
size
.
height
-
subViewFrame
.
size
.
height
)
/
2
)
-
15
.;
[
_destination_itwantastream_view
setFrame
:
subViewFrame
];
[[
_destination_itwantafile_btn
animator
]
setHidden
:
YES
];
[[
_destination_itwantastream_btn
animator
]
setHidden
:
YES
];
[
_destination_box
performSelector
:
@selector
(
addSubview
:)
withObject
:
_destination_itwantastream_view
afterDelay
:
0
.
2
];
[[
_destination_cancel_btn
animator
]
setHidden
:
NO
];
}
-
(
IBAction
)
cancelDestination
:(
id
)
sender
{
if
([
_destination_itwantastream_view
superview
]
!=
nil
)
[
_destination_itwantastream_view
removeFromSuperview
];
if
([
_destination_itwantafile_view
superview
]
!=
nil
)
[
_destination_itwantafile_view
removeFromSuperview
];
[
_destination_cancel_btn
setHidden
:
YES
];
[[
_destination_itwantafile_btn
animator
]
setHidden
:
NO
];
[[
_destination_itwantastream_btn
animator
]
setHidden
:
NO
];
}
-
(
IBAction
)
browseFileDestination
:(
id
)
sender
{
NSSavePanel
*
saveFilePanel
=
[
NSSavePanel
savePanel
];
[
saveFilePanel
setCanSelectHiddenExtension
:
YES
];
...
...
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