Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
VideoLAN
VLC-iOS
Commits
db9c81f0
Commit
db9c81f0
authored
May 29, 2013
by
Felix Paul Kühne
Browse files
Code refactoring
parent
088a4b0e
Changes
2
Hide whitespace changes
Inline
Side-by-side
AspenProject/VLCPlaylistViewController.h
View file @
db9c81f0
...
...
@@ -16,7 +16,7 @@
@interface
VLCPlaylistViewController
:
UIViewController
<
UITabBarDelegate
,
UIPopoverControllerDelegate
>
@property
(
nonatomic
,
strong
)
VLCMovieViewController
*
movieViewController
;
@property
(
nonatomic
,
strong
)
VLCMenuViewController
*
addMedia
ViewController
;
@property
(
nonatomic
,
strong
)
VLCMenuViewController
*
menu
ViewController
;
@property
(
nonatomic
,
strong
)
UIPopoverController
*
addMediaPopoverController
;
@property
(
nonatomic
,
strong
)
UITableView
*
tableView
;
...
...
AspenProject/VLCPlaylistViewController.m
View file @
db9c81f0
...
...
@@ -259,13 +259,13 @@
-
(
IBAction
)
leftButtonAction
:(
id
)
sender
{
if
(
self
.
addMedia
ViewController
==
nil
)
self
.
addMedia
ViewController
=
[[
VLCMenuViewController
alloc
]
initWithNibName
:
@"VLC
AddMedia
ViewController"
bundle
:
nil
];
if
(
self
.
menu
ViewController
==
nil
)
self
.
menu
ViewController
=
[[
VLCMenuViewController
alloc
]
initWithNibName
:
@"VLC
Menu
ViewController"
bundle
:
nil
];
if
(
UI_USER_INTERFACE_IDIOM
()
==
UIUserInterfaceIdiomPad
)
{
self
.
addMedia
ViewController
.
contentSizeForViewInPopover
=
self
.
addMedia
ViewController
.
view
.
frame
.
size
;
self
.
menu
ViewController
.
contentSizeForViewInPopover
=
self
.
menu
ViewController
.
view
.
frame
.
size
;
if
(
self
.
addMediaPopoverController
==
nil
)
{
self
.
addMediaPopoverController
=
[[
UIPopoverController
alloc
]
initWithContentViewController
:
self
.
addMedia
ViewController
];
self
.
addMediaPopoverController
=
[[
UIPopoverController
alloc
]
initWithContentViewController
:
self
.
menu
ViewController
];
self
.
addMediaPopoverController
.
delegate
=
self
;
}
...
...
@@ -276,7 +276,7 @@
permittedArrowDirections:
UIPopoverArrowDirectionUp
animated:
YES
];
}
else
[
self
.
navigationController
presentViewController
:
self
.
addMedia
ViewController
animated
:
YES
completion
:
NULL
];
[
self
.
navigationController
presentViewController
:
self
.
menu
ViewController
animated
:
YES
completion
:
NULL
];
}
/* deprecated in iOS 6 */
...
...
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