Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Open sidebar
VideoLAN
VLC-iOS
Commits
335afc73
Commit
335afc73
authored
Jun 07, 2013
by
Felix Paul Kühne
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
De-uglify Done buttons
parent
00b2a329
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
21 additions
and
18 deletions
+21
-18
AspenProject/VLCAboutViewController.m
AspenProject/VLCAboutViewController.m
+8
-12
AspenProject/VLCDropboxTableViewController.m
AspenProject/VLCDropboxTableViewController.m
+1
-0
AspenProject/VLCMenuViewController.m
AspenProject/VLCMenuViewController.m
+7
-3
AspenProject/VLCPlaylistViewController.m
AspenProject/VLCPlaylistViewController.m
+5
-3
No files found.
AspenProject/VLCAboutViewController.m
View file @
335afc73
...
...
@@ -8,12 +8,6 @@
#import "VLCAboutViewController.h"
@interface
VLCAboutViewController
()
{
UIBarButtonItem
*
_dismissButton
;
}
@end
@implementation
VLCAboutViewController
-
(
id
)
initWithNibName
:(
NSString
*
)
nibNameOrNil
bundle
:(
NSBundle
*
)
nibBundleOrNil
...
...
@@ -32,12 +26,14 @@
self
.
aspenVersion
.
text
=
[[
NSString
stringWithFormat
:
NSLocalizedString
(
@"VERSION_FORMAT"
,
@""
),
[[
NSBundle
mainBundle
]
objectForInfoDictionaryKey
:
@"CFBundleVersion"
]]
stringByAppendingFormat
:
@" %@"
,
kVLCVersionCodename
];
self
.
vlckitVersion
.
text
=
[
NSString
stringWithFormat
:
NSLocalizedString
(
@"BASED_ON_FORMAT"
,
@""
),[[
VLCLibrary
sharedLibrary
]
version
]];
_dismissButton
=
[[
UIBarButtonItem
alloc
]
initWithTitle
:
NSLocalizedString
(
@"BUTTON_DONE"
,
@""
)
style:
UIBarButtonItemStyleBordered
target:
self
action
:
@selector
(
dismiss
)];
[
_dismissButton
setBackgroundImage
:[
UIImage
imageNamed
:
@"doneButton"
]
forState
:
UIControlStateNormal
barMetrics
:
UIBarMetricsDefault
];
[
_dismissButton
setBackgroundImage
:[
UIImage
imageNamed
:
@"doneButtonHighlight"
]
forState
:
UIControlStateHighlighted
barMetrics
:
UIBarMetricsDefault
];
self
.
navigationItem
.
rightBarButtonItem
=
_dismissButton
;
UIBarButtonItem
*
dismissButton
=
[[
UIBarButtonItem
alloc
]
initWithTitle
:
NSLocalizedString
(
@"BUTTON_DONE"
,
@""
)
style:
UIBarButtonItemStyleBordered
target:
self
action:
@selector
(
dismiss
)];
[
dismissButton
setBackgroundImage
:[
UIImage
imageNamed
:
@"doneButton"
]
forState
:
UIControlStateNormal
barMetrics
:
UIBarMetricsDefault
];
[
dismissButton
setBackgroundImage
:[
UIImage
imageNamed
:
@"doneButtonHighlight"
]
forState
:
UIControlStateHighlighted
barMetrics
:
UIBarMetricsDefault
];
[
dismissButton
setTitleTextAttributes
:@{
UITextAttributeTextShadowColor
:
[
UIColor
whiteColor
],
UITextAttributeTextColor
:
[
UIColor
blackColor
]}
forState
:
UIControlStateNormal
];
self
.
navigationItem
.
rightBarButtonItem
=
dismissButton
;
}
-
(
BOOL
)
webView
:(
UIWebView
*
)
webView
shouldStartLoadWithRequest
:(
NSURLRequest
*
)
request
navigationType
:(
UIWebViewNavigationType
)
navigationType
...
...
AspenProject/VLCDropboxTableViewController.m
View file @
335afc73
...
...
@@ -53,6 +53,7 @@
UIBarButtonItem
*
addButton
=
[[
UIBarButtonItem
alloc
]
initWithTitle
:
NSLocalizedString
(
@"BUTTON_DONE"
,
@""
)
style
:
UIBarButtonItemStyleBordered
target
:
self
action
:
@selector
(
dismiss
:
)];
[
addButton
setBackgroundImage
:[
UIImage
imageNamed
:
@"doneButton"
]
forState
:
UIControlStateNormal
barMetrics
:
UIBarMetricsDefault
];
[
addButton
setBackgroundImage
:[
UIImage
imageNamed
:
@"doneButtonHighlight"
]
forState
:
UIControlStateHighlighted
barMetrics
:
UIBarMetricsDefault
];
[
addButton
setTitleTextAttributes
:@{
UITextAttributeTextShadowColor
:
[
UIColor
whiteColor
],
UITextAttributeTextColor
:
[
UIColor
blackColor
]}
forState
:
UIControlStateNormal
];
self
.
navigationItem
.
rightBarButtonItem
=
addButton
;
_backButton
=
[[
UIBarButtonItem
alloc
]
initWithTitle
:
@""
style
:
UIBarButtonItemStyleBordered
target
:
self
action
:
@selector
(
folderUp
:
)];
...
...
AspenProject/VLCMenuViewController.m
View file @
335afc73
...
...
@@ -55,6 +55,8 @@
action:
@selector
(
dismiss
:)];
[
dismissButton
setBackgroundImage
:[
UIImage
imageNamed
:
@"doneButton"
]
forState
:
UIControlStateNormal
barMetrics
:
UIBarMetricsDefault
];
[
dismissButton
setBackgroundImage
:[
UIImage
imageNamed
:
@"doneButtonHighlight"
]
forState
:
UIControlStateHighlighted
barMetrics
:
UIBarMetricsDefault
];
[
dismissButton
setTitleTextAttributes
:@{
UITextAttributeTextShadowColor
:
[
UIColor
whiteColor
],
UITextAttributeTextColor
:
[
UIColor
blackColor
]}
forState
:
UIControlStateNormal
];
dismissButton
.
width
=
80
.;
self
.
dismissToolBar
.
items
=
@[[[
UIBarButtonItem
alloc
]
initWithBarButtonSystemItem
:
UIBarButtonSystemItemFlexibleSpace
target
:
nil
action
:
nil
],
dismissButton
];
...
...
@@ -213,9 +215,11 @@
[
navController
.
navigationBar
setBackgroundImage
:[
UIImage
imageNamed
:
@"navBarBackgroundPhoneLandscape"
]
forBarMetrics
:
UIBarMetricsLandscapePhone
];
[
self
presentModalViewController
:
navController
animated
:
YES
];
[
self
.
settingsViewController
.
navigationItem
.
rightBarButtonItem
setBackgroundImage
:[
UIImage
imageNamed
:
@"doneButton"
]
forState
:
UIControlStateNormal
barMetrics
:
UIBarMetricsDefault
];
[
self
.
settingsViewController
.
navigationItem
.
rightBarButtonItem
setBackgroundImage
:[
UIImage
imageNamed
:
@"doneButtonHighlight"
]
forState
:
UIControlStateHighlighted
barMetrics
:
UIBarMetricsDefault
];
self
.
settingsViewController
.
navigationItem
.
rightBarButtonItem
.
style
=
UIBarButtonItemStylePlain
;
UIBarButtonItem
*
doneButton
=
self
.
settingsViewController
.
navigationItem
.
rightBarButtonItem
;
[
doneButton
setBackgroundImage
:[
UIImage
imageNamed
:
@"doneButton"
]
forState
:
UIControlStateNormal
barMetrics
:
UIBarMetricsDefault
];
[
doneButton
setBackgroundImage
:[
UIImage
imageNamed
:
@"doneButtonHighlight"
]
forState
:
UIControlStateHighlighted
barMetrics
:
UIBarMetricsDefault
];
doneButton
.
style
=
UIBarButtonItemStyleBordered
;
[
doneButton
setTitleTextAttributes
:@{
UITextAttributeTextShadowColor
:
[
UIColor
whiteColor
],
UITextAttributeTextColor
:
[
UIColor
blackColor
]}
forState
:
UIControlStateNormal
];
}
-
(
NSString
*
)
_currentIPAddress
...
...
AspenProject/VLCPlaylistViewController.m
View file @
335afc73
...
...
@@ -252,13 +252,15 @@
{
[
super
setEditing
:
editing
animated
:
animated
];
UIBarButtonItem
*
editButton
=
self
.
editButtonItem
;
NSString
*
editImage
=
editing
?
@"doneButton"
:
@"button"
;
NSString
*
editImageHighlight
=
editing
?
@"doneButtonHighlight"
:
@"buttonHighlight"
;
[
self
.
editButton
Item
setBackgroundImage
:[
UIImage
imageNamed
:
editImage
]
forState
:
UIControlStateNormal
[
editButton
setBackgroundImage
:[
UIImage
imageNamed
:
editImage
]
forState
:
UIControlStateNormal
barMetrics:
UIBarMetricsDefault
];
[
self
.
editButton
Item
setBackgroundImage
:[
UIImage
imageNamed
:
editImageHighlight
]
[
editButton
setBackgroundImage
:[
UIImage
imageNamed
:
editImageHighlight
]
forState:
UIControlStateHighlighted
barMetrics
:
UIBarMetricsDefault
];
[
editButton
setTitleTextAttributes
:
editing
?
@{
UITextAttributeTextShadowColor
:
[
UIColor
whiteColor
],
UITextAttributeTextColor
:
[
UIColor
blackColor
]}
:
@{
UITextAttributeTextShadowColor
:
[
UIColor
colorWithWhite
:
0
.
alpha
:.
37
],
UITextAttributeTextColor
:
[
UIColor
whiteColor
]}
forState
:
UIControlStateNormal
];
if
(
UI_USER_INTERFACE_IDIOM
()
==
UIUserInterfaceIdiomPad
)
[
self
.
gridView
setEditing
:
editing
];
else
...
...
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