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
5d011500
Commit
5d011500
authored
Nov 05, 2006
by
Felix Paul Kühne
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
* forward-port [17501] and [17500]
parent
3d27df46
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
7 additions
and
21 deletions
+7
-21
modules/gui/macosx/controls.m
modules/gui/macosx/controls.m
+6
-15
modules/gui/macosx/fspanel.h
modules/gui/macosx/fspanel.h
+0
-1
modules/gui/macosx/fspanel.m
modules/gui/macosx/fspanel.m
+1
-5
No files found.
modules/gui/macosx/controls.m
View file @
5d011500
...
...
@@ -178,24 +178,18 @@
/* three little ugly helpers */
-
(
void
)
repeatOne
{
[
o_btn_repeat
setImage
:
[[
NSImage
alloc
]
initWithContentsOfFile
:
[[
NSBundle
mainBundle
]
pathForImageResource
:
@"repeat_single_embedded_blue.png"
]]];
[
o_btn_repeat
setAlternateImage
:
[[
NSImage
alloc
]
initWithContentsOfFile
:
[[
NSBundle
mainBundle
]
pathForImageResource
:
@"repeat_embedded_blue.png"
]]];
[
o_btn_repeat
setImage
:
[
NSImage
imageNamed
:
@"repeat_single_embedded_blue"
]];
[
o_btn_repeat
setAlternateImage
:
[
NSImage
imageNamed
:
@"repeat_embedded_blue"
]];
}
-
(
void
)
repeatAll
{
[
o_btn_repeat
setImage
:
[[
NSImage
alloc
]
initWithContentsOfFile
:
[[
NSBundle
mainBundle
]
pathForImageResource
:
@"repeat_embedded_blue.png"
]]];
[
o_btn_repeat
setAlternateImage
:
[[
NSImage
alloc
]
initWithContentsOfFile
:
[[
NSBundle
mainBundle
]
pathForImageResource
:
@"repeat_embedded.png"
]]];
[
o_btn_repeat
setImage
:
[
NSImage
imageNamed
:
@"repeat_embedded_blue"
]];
[
o_btn_repeat
setAlternateImage
:
[
NSImage
imageNamed
:
@"repeat_embedded"
]];
}
-
(
void
)
repeatOff
{
[
o_btn_repeat
setImage
:
[[
NSImage
alloc
]
initWithContentsOfFile
:
[[
NSBundle
mainBundle
]
pathForImageResource
:
@"repeat_embedded.png"
]]];
[
o_btn_repeat
setAlternateImage
:
[[
NSImage
alloc
]
initWithContentsOfFile
:
[[
NSBundle
mainBundle
]
pathForImageResource
:
@"repeat_single_embedded_blue.png"
]]];
[
o_btn_repeat
setImage
:
[
NSImage
imageNamed
:
@"repeat_embedded"
]];
[
o_btn_repeat
setAlternateImage
:
[
NSImage
imageNamed
:
@"repeat_single_embedded_blue"
]];
}
-
(
void
)
shuffle
{
...
...
@@ -215,9 +209,6 @@
var_Get
(
p_playlist
,
"repeat"
,
&
repeating
);
var_Get
(
p_playlist
,
"loop"
,
&
looping
);
[[
o_btn_repeat
image
]
release
];
[[
o_btn_repeat
alternateImage
]
release
];
if
(
!
repeating
.
b_bool
&&
!
looping
.
b_bool
)
{
/* was: no repeating at all, switching to Repeat One */
...
...
modules/gui/macosx/fspanel.h
View file @
5d011500
...
...
@@ -48,7 +48,6 @@
-
(
void
)
focus
:(
NSTimer
*
)
timer
;
-
(
void
)
unfocus
:(
NSTimer
*
)
timer
;
-
(
void
)
mouseEntered
:(
NSEvent
*
)
theEvent
;
-
(
void
)
mouseExited
:(
NSEvent
*
)
theEvent
;
-
(
void
)
fadeIn
;
...
...
modules/gui/macosx/fspanel.m
View file @
5d011500
...
...
@@ -181,7 +181,7 @@
-
(
void
)
fadeOut
{
if
(
(
[
self
alphaValue
]
>
0
.
0
)
&&
!
NSPointInRect
(
[
NSEvent
mouseLocation
],
[
self
frame
]
)
)
if
(
(
[
self
alphaValue
]
>
0
.
0
)
)
{
if
(
!
[
self
fadeTimer
])
[
self
setFadeTimer
:[
NSTimer
scheduledTimerWithTimeInterval
:
0
.
1
target
:
self
selector
:
@selector
(
unfocus
:
)
userInfo
:
[
NSNumber
numberWithShort
:
0
]
repeats
:
YES
]];
...
...
@@ -369,7 +369,6 @@
-
(
void
)
setPlay
{
NSBundle
*
bundle
=
[
NSBundle
mainBundle
];
NSImage
*
image
;
image
=
[
NSImage
imageNamed
:
@"fs_play"
];
[
o_play
setImage
:
image
];
...
...
@@ -379,7 +378,6 @@
-
(
void
)
setPause
{
NSBundle
*
bundle
=
[
NSBundle
mainBundle
];
NSImage
*
image
;
image
=
[
NSImage
imageNamed
:
@"fs_pause"
];
[
o_play
setImage
:
image
];
...
...
@@ -481,7 +479,6 @@
@implementation
VLCFSTimeSlider
-
(
void
)
drawKnobInRect
:(
NSRect
)
knobRect
{
NSBundle
*
bundle
=
[
NSBundle
mainBundle
];
NSRect
image_rect
;
NSImage
*
img
=
[
NSImage
imageNamed
:
@"fs_time_slider_knob_highlight"
];
image_rect
.
size
=
[
img
size
];
...
...
@@ -515,7 +512,6 @@
@implementation
VLCFSVolumeSlider
-
(
void
)
drawKnobInRect
:(
NSRect
)
knobRect
{
NSBundle
*
bundle
=
[
NSBundle
mainBundle
];
NSRect
image_rect
;
NSImage
*
img
=
[
NSImage
imageNamed
:
@"fs_volume_slider_knob"
];
image_rect
.
size
=
[
img
size
];
...
...
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