Skip to content

V
vlc
Commit ec022e28 authored by Felix Paul Kühne's avatar Felix Paul Kühne
Browse files
Options

* add a 'graphite' button set including the facilities to switch the theme at... 

* add a 'graphite' button set including the facilities to switch the theme at runtime (closes #1379)
parent 15c25c42
Show whitespace changes
Inline Side-by-side
Showing with 355 additions and 77 deletions
extras/MacOSX/Resources/English.lproj/MainMenu.nib/classes.nib
View file @ ec022e28
......@@ -220,7 +220,9 @@
CLASS = VLCMain;
LANGUAGE = ObjC;
OUTLETS = {
"o_btn_equalizer" = id;
"o_btn_ff" = id;
"o_btn_fullscreen" = id;
"o_btn_next" = id;
"o_btn_play" = id;
"o_btn_playlist" = id;
......
extras/MacOSX/Resources/English.lproj/MainMenu.nib/info.nib
View file @ ec022e28
......@@ -9,7 +9,7 @@
<key>1617</key>
<string>788 586 109 149 0 0 1440 878 </string>
<key>2197</key>
<string>422 532 596 143 0 0 1440 878 </string>
<string>342 466 596 143 0 0 1280 778 </string>
<key>2709</key>
<string>305 626 508 82 0 0 1024 746 </string>
<key>2730</key>
......@@ -26,11 +26,12 @@
<key>IBOpenObjects</key>
<array>
<integer>21</integer>
<integer>2769</integer>
<integer>2416</integer>
<integer>29</integer>
<integer>2197</integer>
<integer>1789</integer>
<integer>2769</integer>
<integer>2730</integer>
<integer>29</integer>
<integer>2416</integer>
</array>
<key>IBSystem Version</key>
<string>8S2167</string>
......
extras/MacOSX/Resources/English.lproj/Open.nib/info.nib
View file @ ec022e28
......@@ -5,7 +5,7 @@
<key>IBDocumentLocation</key>
<string>-8 61 505 517 0 0 800 578 </string>
<key>IBFramework Version</key>
<string>446.1</string>
<string>489.0</string>
<key>IBLockedObjects</key>
<array>
<integer>2203</integer>
......
extras/MacOSX/vlc.xcodeproj/project.pbxproj
View file @ ec022e28
......@@ -72,6 +72,25 @@
CC1AC1BC0A7BDA41002478C3 /* InteractionErrorPanel.nib in Resources */ = {isa = PBXBuildFile; fileRef = CC1AC1BA0A7BDA41002478C3 /* InteractionErrorPanel.nib */; };
CC1B4B4D09A8CF9E0078AD2E /* Interaction.nib in Resources */ = {isa = PBXBuildFile; fileRef = CC1B4B4B09A8CF9E0078AD2E /* Interaction.nib */; };
CC26BF2C09A7A05000E94D62 /* Update.nib in Resources */ = {isa = PBXBuildFile; fileRef = CC26BF2A09A7A05000E94D62 /* Update.nib */; };
CC33C2220D2572DE008C4683 /* pause_embedded_graphite.png in Resources */ = {isa = PBXBuildFile; fileRef = CC33C2200D2572DE008C4683 /* pause_embedded_graphite.png */; };
CC33C2230D2572DE008C4683 /* play_embedded_graphite.png in Resources */ = {isa = PBXBuildFile; fileRef = CC33C2210D2572DE008C4683 /* play_embedded_graphite.png */; };
CC33C2510D2578F5008C4683 /* add_embedded_graphite.png in Resources */ = {isa = PBXBuildFile; fileRef = CC33C2400D2578F5008C4683 /* add_embedded_graphite.png */; };
CC33C2520D2578F5008C4683 /* equalizerdrawer_graphite.png in Resources */ = {isa = PBXBuildFile; fileRef = CC33C2410D2578F5008C4683 /* equalizerdrawer_graphite.png */; };
CC33C2530D2578F5008C4683 /* next_graphite.png in Resources */ = {isa = PBXBuildFile; fileRef = CC33C2420D2578F5008C4683 /* next_graphite.png */; };
CC33C2540D2578F5008C4683 /* pause_graphite.png in Resources */ = {isa = PBXBuildFile; fileRef = CC33C2430D2578F5008C4683 /* pause_graphite.png */; };
CC33C2550D2578F5008C4683 /* play_graphite.png in Resources */ = {isa = PBXBuildFile; fileRef = CC33C2440D2578F5008C4683 /* play_graphite.png */; };
CC33C2560D2578F5008C4683 /* playlistdrawer_graphite.png in Resources */ = {isa = PBXBuildFile; fileRef = CC33C2450D2578F5008C4683 /* playlistdrawer_graphite.png */; };
CC33C2570D2578F5008C4683 /* previous_graphite.png in Resources */ = {isa = PBXBuildFile; fileRef = CC33C2460D2578F5008C4683 /* previous_graphite.png */; };
CC33C2580D2578F5008C4683 /* repeat_embedded_graphite.png in Resources */ = {isa = PBXBuildFile; fileRef = CC33C2470D2578F5008C4683 /* repeat_embedded_graphite.png */; };
CC33C2590D2578F5008C4683 /* repeat_single_embedded_graphite.png in Resources */ = {isa = PBXBuildFile; fileRef = CC33C2480D2578F5008C4683 /* repeat_single_embedded_graphite.png */; };
CC33C25A0D2578F5008C4683 /* shuffle_embedded_graphite.png in Resources */ = {isa = PBXBuildFile; fileRef = CC33C2490D2578F5008C4683 /* shuffle_embedded_graphite.png */; };
CC33C25B0D2578F5008C4683 /* skip_forward_embedded_graphite.png in Resources */ = {isa = PBXBuildFile; fileRef = CC33C24A0D2578F5008C4683 /* skip_forward_embedded_graphite.png */; };
CC33C25C0D2578F5008C4683 /* skip_forward_graphite.png in Resources */ = {isa = PBXBuildFile; fileRef = CC33C24B0D2578F5008C4683 /* skip_forward_graphite.png */; };
CC33C25D0D2578F5008C4683 /* skip_previous_embedded_graphite.png in Resources */ = {isa = PBXBuildFile; fileRef = CC33C24C0D2578F5008C4683 /* skip_previous_embedded_graphite.png */; };
CC33C25E0D2578F5008C4683 /* skip_previous_graphite.png in Resources */ = {isa = PBXBuildFile; fileRef = CC33C24D0D2578F5008C4683 /* skip_previous_graphite.png */; };
CC33C25F0D2578F5008C4683 /* stop_graphite.png in Resources */ = {isa = PBXBuildFile; fileRef = CC33C24E0D2578F5008C4683 /* stop_graphite.png */; };
CC33C2600D2578F5008C4683 /* volumeslider_graphite.png in Resources */ = {isa = PBXBuildFile; fileRef = CC33C24F0D2578F5008C4683 /* volumeslider_graphite.png */; };
CC33C2610D2578F5008C4683 /* fullscreen_graphite.png in Resources */ = {isa = PBXBuildFile; fileRef = CC33C2500D2578F5008C4683 /* fullscreen_graphite.png */; };
CC3DC89C0A7CDB9600B53F32 /* ApplicationServices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CC3DC89B0A7CDB9600B53F32 /* ApplicationServices.framework */; };
CC4ED9B30ABE07C800CA4CC5 /* add_embedded_blue.png in Resources */ = {isa = PBXBuildFile; fileRef = CC4ED9AC0ABE07C800CA4CC5 /* add_embedded_blue.png */; };
CC4ED9B40ABE07C800CA4CC5 /* add_embedded.png in Resources */ = {isa = PBXBuildFile; fileRef = CC4ED9AD0ABE07C800CA4CC5 /* add_embedded.png */; };
......@@ -963,34 +982,34 @@
8E6BC6F6041643860059A3A7 /* applescript.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = applescript.h; path = ../../modules/gui/macosx/applescript.h; sourceTree = SOURCE_ROOT; };
8E6BC6F7041643860059A3A7 /* applescript.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = applescript.m; path = ../../modules/gui/macosx/applescript.m; sourceTree = SOURCE_ROOT; };
8E6BC6FA041684EC0059A3A7 /* controls.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = controls.h; path = ../../modules/gui/macosx/controls.h; sourceTree = SOURCE_ROOT; };
8E93909A0565D6D300C7661C /* display_slider.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = display_slider.png; path = Resources/display_slider.png; sourceTree = SOURCE_ROOT; };
8E93909B0565D6D300C7661C /* display_track.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = display_track.png; path = Resources/display_track.png; sourceTree = SOURCE_ROOT; };
8E93909C0565D6D300C7661C /* display.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = display.png; path = Resources/display.png; sourceTree = SOURCE_ROOT; };
8E93909D0565D6D300C7661C /* fullscreen_active.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = fullscreen_active.png; path = Resources/fullscreen_active.png; sourceTree = SOURCE_ROOT; };
8E93909E0565D6D300C7661C /* fullscreen_blue.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = fullscreen_blue.png; path = Resources/fullscreen_blue.png; sourceTree = SOURCE_ROOT; };
8E93909F0565D6D300C7661C /* next_active.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = next_active.png; path = Resources/next_active.png; sourceTree = SOURCE_ROOT; };
8E9390A00565D6D300C7661C /* next_blue.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = next_blue.png; path = Resources/next_blue.png; sourceTree = SOURCE_ROOT; };
8E9390A10565D6D300C7661C /* pause_blue.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = pause_blue.png; path = Resources/pause_blue.png; sourceTree = SOURCE_ROOT; };
8E9390A20565D6D300C7661C /* pause.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = pause.png; path = Resources/pause.png; sourceTree = SOURCE_ROOT; };
8E9390A30565D6D300C7661C /* play_blue.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = play_blue.png; path = Resources/play_blue.png; sourceTree = SOURCE_ROOT; };
8E9390A40565D6D300C7661C /* play.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = play.png; path = Resources/play.png; sourceTree = SOURCE_ROOT; };
8E9390A50565D6D300C7661C /* playlistdrawer_active.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = playlistdrawer_active.png; path = Resources/playlistdrawer_active.png; sourceTree = SOURCE_ROOT; };
8E9390A60565D6D300C7661C /* playlistdrawer_blue.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = playlistdrawer_blue.png; path = Resources/playlistdrawer_blue.png; sourceTree = SOURCE_ROOT; };
8E9390A70565D6D300C7661C /* previous_active.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = previous_active.png; path = Resources/previous_active.png; sourceTree = SOURCE_ROOT; };
8E9390A80565D6D300C7661C /* previous_blue.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = previous_blue.png; path = Resources/previous_blue.png; sourceTree = SOURCE_ROOT; };
8E9390A90565D6D300C7661C /* skip_forward_active.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = skip_forward_active.png; path = Resources/skip_forward_active.png; sourceTree = SOURCE_ROOT; };
8E9390AA0565D6D300C7661C /* skip_forward_blue.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = skip_forward_blue.png; path = Resources/skip_forward_blue.png; sourceTree = SOURCE_ROOT; };
8E9390AB0565D6D300C7661C /* skip_previous_active.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = skip_previous_active.png; path = Resources/skip_previous_active.png; sourceTree = SOURCE_ROOT; };
8E9390AC0565D6D300C7661C /* skip_previous_blue.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = skip_previous_blue.png; path = Resources/skip_previous_blue.png; sourceTree = SOURCE_ROOT; };
8E9390AD0565D6D300C7661C /* stop_blue.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = stop_blue.png; path = Resources/stop_blue.png; sourceTree = SOURCE_ROOT; };
8E9390AE0565D6D300C7661C /* stop.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = stop.png; path = Resources/stop.png; sourceTree = SOURCE_ROOT; };
8E9390AF0565D6D300C7661C /* volume_high.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = volume_high.png; path = Resources/volume_high.png; sourceTree = SOURCE_ROOT; };
8E9390B00565D6D300C7661C /* volume_low.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = volume_low.png; path = Resources/volume_low.png; sourceTree = SOURCE_ROOT; };
8E9390B10565D6D300C7661C /* volumeslider_blue.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = volumeslider_blue.png; path = Resources/volumeslider_blue.png; sourceTree = SOURCE_ROOT; };
8E9390B20565D6D300C7661C /* volumeslider_normal.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = volumeslider_normal.png; path = Resources/volumeslider_normal.png; sourceTree = SOURCE_ROOT; };
8E9390B30565D6D300C7661C /* volumetrack.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = volumetrack.png; path = Resources/volumetrack.png; sourceTree = SOURCE_ROOT; };
8E93909A0565D6D300C7661C /* display_slider.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = display_slider.png; path = Resources/display_slider.png; sourceTree = "<group>"; };
8E93909B0565D6D300C7661C /* display_track.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = display_track.png; path = Resources/display_track.png; sourceTree = "<group>"; };
8E93909C0565D6D300C7661C /* display.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = display.png; path = Resources/display.png; sourceTree = "<group>"; };
8E93909D0565D6D300C7661C /* fullscreen_active.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = fullscreen_active.png; path = Resources/fullscreen_active.png; sourceTree = "<group>"; };
8E93909E0565D6D300C7661C /* fullscreen_blue.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = fullscreen_blue.png; path = Resources/fullscreen_blue.png; sourceTree = "<group>"; };
8E93909F0565D6D300C7661C /* next_active.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = next_active.png; path = Resources/next_active.png; sourceTree = "<group>"; };
8E9390A00565D6D300C7661C /* next_blue.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = next_blue.png; path = Resources/next_blue.png; sourceTree = "<group>"; };
8E9390A10565D6D300C7661C /* pause_blue.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = pause_blue.png; path = Resources/pause_blue.png; sourceTree = "<group>"; };
8E9390A20565D6D300C7661C /* pause.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = pause.png; path = Resources/pause.png; sourceTree = "<group>"; };
8E9390A30565D6D300C7661C /* play_blue.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = play_blue.png; path = Resources/play_blue.png; sourceTree = "<group>"; };
8E9390A40565D6D300C7661C /* play.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = play.png; path = Resources/play.png; sourceTree = "<group>"; };
8E9390A50565D6D300C7661C /* playlistdrawer_active.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = playlistdrawer_active.png; path = Resources/playlistdrawer_active.png; sourceTree = "<group>"; };
8E9390A60565D6D300C7661C /* playlistdrawer_blue.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = playlistdrawer_blue.png; path = Resources/playlistdrawer_blue.png; sourceTree = "<group>"; };
8E9390A70565D6D300C7661C /* previous_active.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = previous_active.png; path = Resources/previous_active.png; sourceTree = "<group>"; };
8E9390A80565D6D300C7661C /* previous_blue.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = previous_blue.png; path = Resources/previous_blue.png; sourceTree = "<group>"; };
8E9390A90565D6D300C7661C /* skip_forward_active.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = skip_forward_active.png; path = Resources/skip_forward_active.png; sourceTree = "<group>"; };
8E9390AA0565D6D300C7661C /* skip_forward_blue.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = skip_forward_blue.png; path = Resources/skip_forward_blue.png; sourceTree = "<group>"; };
8E9390AB0565D6D300C7661C /* skip_previous_active.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = skip_previous_active.png; path = Resources/skip_previous_active.png; sourceTree = "<group>"; };
8E9390AC0565D6D300C7661C /* skip_previous_blue.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = skip_previous_blue.png; path = Resources/skip_previous_blue.png; sourceTree = "<group>"; };
8E9390AD0565D6D300C7661C /* stop_blue.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = stop_blue.png; path = Resources/stop_blue.png; sourceTree = "<group>"; };
8E9390AE0565D6D300C7661C /* stop.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = stop.png; path = Resources/stop.png; sourceTree = "<group>"; };
8E9390AF0565D6D300C7661C /* volume_high.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = volume_high.png; path = Resources/volume_high.png; sourceTree = "<group>"; };
8E9390B00565D6D300C7661C /* volume_low.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = volume_low.png; path = Resources/volume_low.png; sourceTree = "<group>"; };
8E9390B10565D6D300C7661C /* volumeslider_blue.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = volumeslider_blue.png; path = Resources/volumeslider_blue.png; sourceTree = "<group>"; };
8E9390B20565D6D300C7661C /* volumeslider_normal.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = volumeslider_normal.png; path = Resources/volumeslider_normal.png; sourceTree = "<group>"; };
8E9390B30565D6D300C7661C /* volumetrack.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = volumetrack.png; path = Resources/volumetrack.png; sourceTree = "<group>"; };
8E9CA1A306D7DEE800B7186C /* prefs_widgets.h */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.h; name = prefs_widgets.h; path = ../../modules/gui/macosx/prefs_widgets.h; sourceTree = SOURCE_ROOT; };
8E9CA1A406D7DEE800B7186C /* prefs_widgets.m */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.objc; name = prefs_widgets.m; path = ../../modules/gui/macosx/prefs_widgets.m; sourceTree = SOURCE_ROOT; };
8E9CA1A406D7DEE800B7186C /* prefs_widgets.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = prefs_widgets.m; path = ../../modules/gui/macosx/prefs_widgets.m; sourceTree = SOURCE_ROOT; };
8E9CA1A506D7DEE800B7186C /* voutgl.m */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.objc; name = voutgl.m; path = ../../modules/gui/macosx/voutgl.m; sourceTree = SOURCE_ROOT; };
8E9CA1A606D7DEE800B7186C /* voutqt.m */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.objc; name = voutqt.m; path = ../../modules/gui/macosx/voutqt.m; sourceTree = SOURCE_ROOT; };
8EBF3FA303F13FFB0059A3A7 /* vlc.scriptSuite */ = {isa = PBXFileReference; lastKnownFileType = text; name = vlc.scriptSuite; path = Resources/vlc.scriptSuite; sourceTree = SOURCE_ROOT; };
......@@ -1028,6 +1047,25 @@
CC26BF2B09A7A05000E94D62 /* English */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = English; path = Resources/English.lproj/Update.nib; sourceTree = "<group>"; };
CC26BF3109A7A08C00E94D62 /* update.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = update.h; path = ../../modules/gui/macosx/update.h; sourceTree = SOURCE_ROOT; };
CC26BF3209A7A08C00E94D62 /* update.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = update.m; path = ../../modules/gui/macosx/update.m; sourceTree = SOURCE_ROOT; };
CC33C2200D2572DE008C4683 /* pause_embedded_graphite.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = pause_embedded_graphite.png; path = Resources/pause_embedded_graphite.png; sourceTree = "<group>"; };
CC33C2210D2572DE008C4683 /* play_embedded_graphite.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = play_embedded_graphite.png; path = Resources/play_embedded_graphite.png; sourceTree = "<group>"; };
CC33C2400D2578F5008C4683 /* add_embedded_graphite.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = add_embedded_graphite.png; path = Resources/add_embedded_graphite.png; sourceTree = "<group>"; };
CC33C2410D2578F5008C4683 /* equalizerdrawer_graphite.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = equalizerdrawer_graphite.png; path = Resources/equalizerdrawer_graphite.png; sourceTree = "<group>"; };
CC33C2420D2578F5008C4683 /* next_graphite.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = next_graphite.png; path = Resources/next_graphite.png; sourceTree = "<group>"; };
CC33C2430D2578F5008C4683 /* pause_graphite.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = pause_graphite.png; path = Resources/pause_graphite.png; sourceTree = "<group>"; };
CC33C2440D2578F5008C4683 /* play_graphite.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = play_graphite.png; path = Resources/play_graphite.png; sourceTree = "<group>"; };
CC33C2450D2578F5008C4683 /* playlistdrawer_graphite.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = playlistdrawer_graphite.png; path = Resources/playlistdrawer_graphite.png; sourceTree = "<group>"; };
CC33C2460D2578F5008C4683 /* previous_graphite.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = previous_graphite.png; path = Resources/previous_graphite.png; sourceTree = "<group>"; };
CC33C2470D2578F5008C4683 /* repeat_embedded_graphite.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = repeat_embedded_graphite.png; path = Resources/repeat_embedded_graphite.png; sourceTree = "<group>"; };
CC33C2480D2578F5008C4683 /* repeat_single_embedded_graphite.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = repeat_single_embedded_graphite.png; path = Resources/repeat_single_embedded_graphite.png; sourceTree = "<group>"; };
CC33C2490D2578F5008C4683 /* shuffle_embedded_graphite.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = shuffle_embedded_graphite.png; path = Resources/shuffle_embedded_graphite.png; sourceTree = "<group>"; };
CC33C24A0D2578F5008C4683 /* skip_forward_embedded_graphite.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = skip_forward_embedded_graphite.png; path = Resources/skip_forward_embedded_graphite.png; sourceTree = "<group>"; };
CC33C24B0D2578F5008C4683 /* skip_forward_graphite.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = skip_forward_graphite.png; path = Resources/skip_forward_graphite.png; sourceTree = "<group>"; };
CC33C24C0D2578F5008C4683 /* skip_previous_embedded_graphite.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = skip_previous_embedded_graphite.png; path = Resources/skip_previous_embedded_graphite.png; sourceTree = "<group>"; };
CC33C24D0D2578F5008C4683 /* skip_previous_graphite.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = skip_previous_graphite.png; path = Resources/skip_previous_graphite.png; sourceTree = "<group>"; };
CC33C24E0D2578F5008C4683 /* stop_graphite.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = stop_graphite.png; path = Resources/stop_graphite.png; sourceTree = "<group>"; };
CC33C24F0D2578F5008C4683 /* volumeslider_graphite.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = volumeslider_graphite.png; path = Resources/volumeslider_graphite.png; sourceTree = "<group>"; };
CC33C2500D2578F5008C4683 /* fullscreen_graphite.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = fullscreen_graphite.png; path = Resources/fullscreen_graphite.png; sourceTree = "<group>"; };
CC3DC89B0A7CDB9600B53F32 /* ApplicationServices.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = ApplicationServices.framework; path = /System/Library/Frameworks/ApplicationServices.framework; sourceTree = "<absolute>"; };
CC4ED9AC0ABE07C800CA4CC5 /* add_embedded_blue.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = add_embedded_blue.png; path = Resources/add_embedded_blue.png; sourceTree = "<group>"; };
CC4ED9AD0ABE07C800CA4CC5 /* add_embedded.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = add_embedded.png; path = Resources/add_embedded.png; sourceTree = "<group>"; };
......@@ -1272,50 +1310,101 @@
8ECA7E520563CD9500DFC000 /* Controller */ = {
isa = PBXGroup;
children = (
CC4ED9AC0ABE07C800CA4CC5 /* add_embedded_blue.png */,
CC33C2790D2579B2008C4683 /* graphite main window */,
CC33C2740D257994008C4683 /* blue main window */,
CC33C26C0D257958008C4683 /* embedded */,
CC33C27B0D2579C5008C4683 /* main window */,
);
name = Controller;
sourceTree = "<group>";
};
CC33C26C0D257958008C4683 /* embedded */ = {
isa = PBXGroup;
children = (
CC4ED9AD0ABE07C800CA4CC5 /* add_embedded.png */,
CC4ED9AE0ABE07C800CA4CC5 /* repeat_embedded_blue.png */,
CC4ED9AC0ABE07C800CA4CC5 /* add_embedded_blue.png */,
CC33C2400D2578F5008C4683 /* add_embedded_graphite.png */,
C2F2A6FE0958AA9300018C74 /* pause_embedded.png */,
C2F2A702095AE51600018C74 /* pause_embedded_blue.png */,
CC33C2200D2572DE008C4683 /* pause_embedded_graphite.png */,
C2F2A6FC0958A94500018C74 /* play_embedded.png */,
C2F2A703095AE51600018C74 /* play_embedded_blue.png */,
CC33C2210D2572DE008C4683 /* play_embedded_graphite.png */,
CC4ED9AF0ABE07C800CA4CC5 /* repeat_embedded.png */,
CC4ED9AE0ABE07C800CA4CC5 /* repeat_embedded_blue.png */,
CC33C2470D2578F5008C4683 /* repeat_embedded_graphite.png */,
CC4ED9B00ABE07C800CA4CC5 /* repeat_single_embedded_blue.png */,
CC4ED9B10ABE07C800CA4CC5 /* shuffle_embedded_blue.png */,
CC33C2480D2578F5008C4683 /* repeat_single_embedded_graphite.png */,
CC4ED9B20ABE07C800CA4CC5 /* shuffle_embedded.png */,
2A16E07E06C5074F00C87B09 /* equalizerdrawer_active.png */,
CC4ED9B10ABE07C800CA4CC5 /* shuffle_embedded_blue.png */,
CC33C2490D2578F5008C4683 /* shuffle_embedded_graphite.png */,
C2F2A704095AE51600018C74 /* skip_forward_embedded_blue.png */,
CC33C24A0D2578F5008C4683 /* skip_forward_embedded_graphite.png */,
C2F2A7000958AC9000018C74 /* skip_previous_active_embedded.png */,
C2F2A705095AE51600018C74 /* skip_previous_embedded_blue.png */,
CC33C24C0D2578F5008C4683 /* skip_previous_embedded_graphite.png */,
);
name = embedded;
sourceTree = "<group>";
};
CC33C2740D257994008C4683 /* blue main window */ = {
isa = PBXGroup;
children = (
2A16E07F06C5074F00C87B09 /* equalizerdrawer_blue.png */,
8E93909E0565D6D300C7661C /* fullscreen_blue.png */,
8E9390A00565D6D300C7661C /* next_blue.png */,
8E9390A10565D6D300C7661C /* pause_blue.png */,
8E9390A30565D6D300C7661C /* play_blue.png */,
8E9390A60565D6D300C7661C /* playlistdrawer_blue.png */,
8E9390A80565D6D300C7661C /* previous_blue.png */,
8E9390AA0565D6D300C7661C /* skip_forward_blue.png */,
8E9390AC0565D6D300C7661C /* skip_previous_blue.png */,
8E9390AD0565D6D300C7661C /* stop_blue.png */,
8E9390B10565D6D300C7661C /* volumeslider_blue.png */,
);
name = "blue main window";
sourceTree = "<group>";
};
CC33C2790D2579B2008C4683 /* graphite main window */ = {
isa = PBXGroup;
children = (
CC33C2410D2578F5008C4683 /* equalizerdrawer_graphite.png */,
CC33C2500D2578F5008C4683 /* fullscreen_graphite.png */,
CC33C2420D2578F5008C4683 /* next_graphite.png */,
CC33C2430D2578F5008C4683 /* pause_graphite.png */,
CC33C2440D2578F5008C4683 /* play_graphite.png */,
CC33C2450D2578F5008C4683 /* playlistdrawer_graphite.png */,
CC33C2460D2578F5008C4683 /* previous_graphite.png */,
CC33C24B0D2578F5008C4683 /* skip_forward_graphite.png */,
CC33C24D0D2578F5008C4683 /* skip_previous_graphite.png */,
CC33C24E0D2578F5008C4683 /* stop_graphite.png */,
CC33C24F0D2578F5008C4683 /* volumeslider_graphite.png */,
);
name = "graphite main window";
sourceTree = "<group>";
};
CC33C27B0D2579C5008C4683 /* main window */ = {
isa = PBXGroup;
children = (
2A16E07E06C5074F00C87B09 /* equalizerdrawer_active.png */,
8E93909A0565D6D300C7661C /* display_slider.png */,
8E93909B0565D6D300C7661C /* display_track.png */,
8E93909C0565D6D300C7661C /* display.png */,
8E93909D0565D6D300C7661C /* fullscreen_active.png */,
8E93909E0565D6D300C7661C /* fullscreen_blue.png */,
8E93909F0565D6D300C7661C /* next_active.png */,
8E9390A00565D6D300C7661C /* next_blue.png */,
8E9390A10565D6D300C7661C /* pause_blue.png */,
8E9390A20565D6D300C7661C /* pause.png */,
8E9390A30565D6D300C7661C /* play_blue.png */,
8E9390A40565D6D300C7661C /* play.png */,
8E9390A50565D6D300C7661C /* playlistdrawer_active.png */,
8E9390A60565D6D300C7661C /* playlistdrawer_blue.png */,
8E9390A70565D6D300C7661C /* previous_active.png */,
8E9390A80565D6D300C7661C /* previous_blue.png */,
8E9390A90565D6D300C7661C /* skip_forward_active.png */,
8E9390AA0565D6D300C7661C /* skip_forward_blue.png */,
8E9390AB0565D6D300C7661C /* skip_previous_active.png */,
C2F2A7000958AC9000018C74 /* skip_previous_active_embedded.png */,
C2F2A6FE0958AA9300018C74 /* pause_embedded.png */,
C2F2A6FC0958A94500018C74 /* play_embedded.png */,
C2F2A702095AE51600018C74 /* pause_embedded_blue.png */,
C2F2A703095AE51600018C74 /* play_embedded_blue.png */,
C2F2A704095AE51600018C74 /* skip_forward_embedded_blue.png */,
C2F2A705095AE51600018C74 /* skip_previous_embedded_blue.png */,
8E9390AC0565D6D300C7661C /* skip_previous_blue.png */,
8E9390AD0565D6D300C7661C /* stop_blue.png */,
8E9390AE0565D6D300C7661C /* stop.png */,
8E9390AF0565D6D300C7661C /* volume_high.png */,
8E9390B00565D6D300C7661C /* volume_low.png */,
8E9390B10565D6D300C7661C /* volumeslider_blue.png */,
8E9390B20565D6D300C7661C /* volumeslider_normal.png */,
8E9390B30565D6D300C7661C /* volumetrack.png */,
);
name = Controller;
name = "main window";
sourceTree = "<group>";
};
CCCB86BF0ACFDE4A00CF1E10 /* Native FSPanel icons */ = {
......@@ -1506,6 +1595,25 @@
CCCB86F30ACFDFB400CF1E10 /* fs_stop_highlight.png in Resources */,
CCCB86F40ACFDFB400CF1E10 /* fs_stop.png in Resources */,
CCCB86F50ACFDFB400CF1E10 /* fs_background.png in Resources */,
CC33C2220D2572DE008C4683 /* pause_embedded_graphite.png in Resources */,
CC33C2230D2572DE008C4683 /* play_embedded_graphite.png in Resources */,
CC33C2510D2578F5008C4683 /* add_embedded_graphite.png in Resources */,
CC33C2520D2578F5008C4683 /* equalizerdrawer_graphite.png in Resources */,
CC33C2530D2578F5008C4683 /* next_graphite.png in Resources */,
CC33C2540D2578F5008C4683 /* pause_graphite.png in Resources */,
CC33C2550D2578F5008C4683 /* play_graphite.png in Resources */,
CC33C2560D2578F5008C4683 /* playlistdrawer_graphite.png in Resources */,
CC33C2570D2578F5008C4683 /* previous_graphite.png in Resources */,
CC33C2580D2578F5008C4683 /* repeat_embedded_graphite.png in Resources */,
CC33C2590D2578F5008C4683 /* repeat_single_embedded_graphite.png in Resources */,
CC33C25A0D2578F5008C4683 /* shuffle_embedded_graphite.png in Resources */,
CC33C25B0D2578F5008C4683 /* skip_forward_embedded_graphite.png in Resources */,
CC33C25C0D2578F5008C4683 /* skip_forward_graphite.png in Resources */,
CC33C25D0D2578F5008C4683 /* skip_previous_embedded_graphite.png in Resources */,
CC33C25E0D2578F5008C4683 /* skip_previous_graphite.png in Resources */,
CC33C25F0D2578F5008C4683 /* stop_graphite.png in Resources */,
CC33C2600D2578F5008C4683 /* volumeslider_graphite.png in Resources */,
CC33C2610D2578F5008C4683 /* fullscreen_graphite.png in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
......
modules/gui/macosx/controls.h
View file @ ec022e28
......@@ -33,13 +33,16 @@
{
IBOutlet id o_main;
IBOutlet id o_btn_fullscreen;
IBOutlet id o_volumeslider;
IBOutlet id o_btn_shuffle;
IBOutlet id o_btn_addNode;
IBOutlet id o_btn_repeat;
NSImage * o_repeat_single;
NSImage * o_repeat_all;
NSImage * o_repeat_off;
IBOutlet id o_specificTime_cancel_btn;
IBOutlet id o_specificTime_enter_fld;
IBOutlet id o_specificTime_goTo_lbl;
......@@ -51,6 +54,7 @@
VLCFSPanel *o_fs_panel;
}
- (void)controlTintChanged;
- (IBAction)play:(id)sender;
- (IBAction)stop:(id)sender;
......
modules/gui/macosx/controls.m
View file @ ec022e28
......@@ -59,6 +59,60 @@
[o_specificTime_ok_btn setTitle: _NS("OK")];
[o_specificTime_sec_lbl setStringValue: _NS("sec.")];
[o_specificTime_goTo_lbl setStringValue: _NS("Jump to time")];
o_repeat_off = [NSImage imageNamed:@"repeat_embedded"];
[self controlTintChanged];
[[NSNotificationCenter defaultCenter] addObserver: self
selector: @selector( controlTintChanged )
name: NSControlTintDidChangeNotification
object: nil];
}
- (void)controlTintChanged
{
int i_repeat = 0;
if( [o_btn_repeat image] == o_repeat_single )
i_repeat = 1;
else if( [o_btn_repeat image] == o_repeat_all )
i_repeat = 2;
if( [NSColor currentControlTint] == NSGraphiteControlTint )
{
o_repeat_single = [NSImage imageNamed:@"repeat_single_embedded_graphite"];
o_repeat_all = [NSImage imageNamed:@"repeat_embedded_graphite"];
[o_btn_shuffle setAlternateImage: [NSImage imageNamed: @"shuffle_embedded_graphite"]];
[o_btn_addNode setAlternateImage: [NSImage imageNamed: @"add_embedded_graphite"]];
}
else
{
o_repeat_single = [NSImage imageNamed:@"repeat_single_embedded_blue"];
o_repeat_all = [NSImage imageNamed:@"repeat_embedded_blue"];
[o_btn_shuffle setAlternateImage: [NSImage imageNamed: @"shuffle_embedded_blue"]];
[o_btn_addNode setAlternateImage: [NSImage imageNamed: @"add_embedded_blue"]];
}
/* update the repeat button, but keep its state */
if( i_repeat == 1 )
[self repeatOne];
else if( i_repeat == 2 )
[self repeatAll];
else
[self repeatOff];
}
- (void)dealloc
{
[[NSNotificationCenter defaultCenter] removeObserver: self];
[o_repeat_single release];
[o_repeat_all release];
[o_repeat_off release];
[super dealloc];
}
- (IBAction)play:(id)sender
......@@ -178,18 +232,18 @@
/* three little ugly helpers */
- (void)repeatOne
{
[o_btn_repeat setImage: [NSImage imageNamed:@"repeat_single_embedded_blue"]];
[o_btn_repeat setAlternateImage: [NSImage imageNamed:@"repeat_embedded_blue"]];
[o_btn_repeat setImage: o_repeat_single];
[o_btn_repeat setAlternateImage: o_repeat_all];
}
- (void)repeatAll
{
[o_btn_repeat setImage: [NSImage imageNamed:@"repeat_embedded_blue"]];
[o_btn_repeat setAlternateImage: [NSImage imageNamed:@"repeat_embedded"]];
[o_btn_repeat setImage: o_repeat_all];
[o_btn_repeat setAlternateImage: o_repeat_off];
}
- (void)repeatOff
{
[o_btn_repeat setImage: [NSImage imageNamed:@"repeat_embedded"]];
[o_btn_repeat setAlternateImage: [NSImage imageNamed:@"repeat_single_embedded_blue"]];
[o_btn_repeat setImage: o_repeat_off];
[o_btn_repeat setAlternateImage: o_repeat_single];
}
- (void)shuffle
{
......
modules/gui/macosx/embeddedwindow.h
View file @ ec022e28
......@@ -52,6 +52,8 @@
NSRecursiveLock * o_animation_lock;
}
- (void)controlTintChanged;
- (void)setTime: (NSString *)o_arg_ime position: (float)f_position;
- (void)playStatusUpdated: (int)i_status;
- (void)setSeekable: (BOOL)b_seekable;
......
modules/gui/macosx/embeddedwindow.m
View file @ ec022e28
......@@ -51,9 +51,12 @@
[o_slider setToolTip: _NS("Position")];
o_img_play = [NSImage imageNamed: @"play_embedded"];
o_img_play_pressed = [NSImage imageNamed: @"play_embedded_blue"];
o_img_pause = [NSImage imageNamed: @"pause_embedded"];
o_img_pause_pressed = [NSImage imageNamed: @"pause_embedded_blue"];
[self controlTintChanged];
[[NSNotificationCenter defaultCenter] addObserver: self
selector: @selector( controlTintChanged )
name: NSControlTintDidChangeNotification
object: nil];
/* Useful to save o_view frame in fullscreen mode */
o_temp_view = [[NSView alloc] init];
......@@ -72,6 +75,39 @@
b_animation_lock_alreadylocked = NO;
}
- (void)controlTintChanged
{
if( [NSColor currentControlTint] == NSGraphiteControlTint )
{
o_img_play_pressed = [NSImage imageNamed: @"play_embedded_graphite"];
o_img_pause_pressed = [NSImage imageNamed: @"pause_embedded_graphite"];
[o_btn_backward setAlternateImage: [NSImage imageNamed: @"skip_previous_embedded_graphite"]];
[o_btn_forward setAlternateImage: [NSImage imageNamed: @"skip_forward_embedded_graphite"]];
[o_btn_play setAlternateImage: o_img_play_pressed];
[o_btn_fullscreen setAlternateImage: [NSImage imageNamed: @"fullscreen_graphite"]];
}
else
{
o_img_play_pressed = [NSImage imageNamed: @"play_embedded_blue"];
o_img_pause_pressed = [NSImage imageNamed: @"pause_embedded_blue"];
[o_btn_backward setAlternateImage: [NSImage imageNamed: @"skip_previous_embedded_blue"]];
[o_btn_forward setAlternateImage: [NSImage imageNamed: @"skip_forward_embedded_blue"]];
[o_btn_play setAlternateImage: o_img_play_pressed];
[o_btn_fullscreen setAlternateImage: [NSImage imageNamed: @"fullscreen_blue"]];
}
}
- (void)dealloc
{
[[NSNotificationCenter defaultCenter] removeObserver: self];
[o_img_play release];
[o_img_play_pressed release];
[o_img_pause release];
[o_img_pause_pressed release];
[super dealloc];
}
- (void)setTime:(NSString *)o_arg_time position:(float)f_position
{
[o_time setStringValue: o_arg_time];
......
modules/gui/macosx/intf.h
View file @ ec022e28
......@@ -133,6 +133,7 @@ struct intf_sys_t
IBOutlet id o_btn_next; /* btn next */
IBOutlet id o_btn_fullscreen;/* btn fullscreen (embedded vout window) */
IBOutlet id o_btn_playlist; /* btn playlist */
IBOutlet id o_btn_equalizer; /* eq btn */
NSImage * o_img_play; /* btn play img */
NSImage * o_img_pause; /* btn pause img */
......@@ -300,6 +301,8 @@ struct intf_sys_t
- (intf_thread_t *)getIntf;
- (void)setIntf:(intf_thread_t *)p_mainintf;
- (void)controlTintChanged;
- (id)getControls;
- (id)getPlaylist;
- (id)getInfo;
......
modules/gui/macosx/intf.m
View file @ ec022e28
......@@ -545,9 +545,61 @@ static VLCMain *_o_sharedMainInstance = nil;
name: NSApplicationDidChangeScreenParametersNotification
object: nil];
o_img_play = [NSImage imageNamed: @"play"];
o_img_pause = [NSImage imageNamed: @"pause"];
[self controlTintChanged];
[[NSNotificationCenter defaultCenter] addObserver: self
selector: @selector( controlTintChanged )
name: NSControlTintDidChangeNotification
object: nil];
nib_main_loaded = TRUE;
}
- (void)controlTintChanged
{
BOOL b_playing = NO;
if( [o_btn_play image] == o_img_play_pressed )
b_playing = YES;
if( [NSColor currentControlTint] == NSGraphiteControlTint )
{
o_img_play_pressed = [NSImage imageNamed: @"play_graphite"];
o_img_pause_pressed = [NSImage imageNamed: @"pause_graphite"];
[o_btn_prev setAlternateImage: [NSImage imageNamed: @"previous_graphite"]];
[o_btn_rewind setAlternateImage: [NSImage imageNamed: @"skip_previous_graphite"]];
[o_btn_stop setAlternateImage: [NSImage imageNamed: @"stop_graphite"]];
[o_btn_ff setAlternateImage: [NSImage imageNamed: @"skip_forward_graphite"]];
[o_btn_next setAlternateImage: [NSImage imageNamed: @"next_graphite"]];
[o_btn_fullscreen setAlternateImage: [NSImage imageNamed: @"fullscreen_graphite"]];
[o_btn_playlist setAlternateImage: [NSImage imageNamed: @"playlistdrawer_graphite"]];
[o_btn_equalizer setAlternateImage: [NSImage imageNamed: @"equalizerdrawer_graphite"]];
}
else
{
o_img_play_pressed = [NSImage imageNamed: @"play_blue"];
o_img_pause_pressed = [NSImage imageNamed: @"pause_blue"];
[o_btn_prev setAlternateImage: [NSImage imageNamed: @"previous_blue"]];
[o_btn_rewind setAlternateImage: [NSImage imageNamed: @"skip_previous_blue"]];
[o_btn_stop setAlternateImage: [NSImage imageNamed: @"stop_blue"]];
[o_btn_ff setAlternateImage: [NSImage imageNamed: @"skip_forward_blue"]];
[o_btn_next setAlternateImage: [NSImage imageNamed: @"next_blue"]];
[o_btn_fullscreen setAlternateImage: [NSImage imageNamed: @"fullscreen_blue"]];
[o_btn_playlist setAlternateImage: [NSImage imageNamed: @"playlistdrawer_blue"]];
[o_btn_equalizer setAlternateImage: [NSImage imageNamed: @"equalizerdrawer_blue"]];
}
if( b_playing )
[o_btn_play setImage: o_img_play_pressed];
else
[o_btn_play setImage: o_img_pause_pressed];
}
- (void)initStrings
{
[o_window setTitle: _NS("VLC - Controller")];
......@@ -703,11 +755,6 @@ static VLCMain *_o_sharedMainInstance = nil;
o_msg_lock = [[NSLock alloc] init];
o_msg_arr = [[NSMutableArray arrayWithCapacity: 200] retain];
o_img_play = [[NSImage imageNamed: @"play"] retain];
o_img_play_pressed = [[NSImage imageNamed: @"play_blue"] retain];
o_img_pause = [[NSImage imageNamed: @"pause"] retain];
o_img_pause_pressed = [[NSImage imageNamed: @"pause_blue"] retain];
[p_intf->p_sys->o_sendport setDelegate: self];
[[NSRunLoop currentRunLoop]
addPort: p_intf->p_sys->o_sendport
......@@ -1683,12 +1730,11 @@ static VLCMain *_o_sharedMainInstance = nil;
var_DelCallback( p_intf, "interaction", InteractCallback, self );
/* remove global observer watching for vout device changes correctly */
[[NSNotificationCenter defaultCenter] removeObserver: self
name: NSApplicationDidChangeScreenParametersNotification
object: nil];
[[NSNotificationCenter defaultCenter] removeObserver: self];
/* release some other objects here, because it isn't sure whether dealloc
* will be called later on -- FK (10/6/05) */
* will be called later on */
if( nib_about_loaded && o_about )
[o_about release];
......@@ -1722,7 +1768,7 @@ static VLCMain *_o_sharedMainInstance = nil;
o_img_pause_pressed = nil;
}
if( o_img_pause_pressed != nil )
if( o_img_play_pressed != nil )
{
[o_img_pause_pressed release];
o_img_pause_pressed = nil;
......
modules/gui/macosx/misc.h
View file @ ec022e28
......@@ -122,7 +122,7 @@
@end
/*****************************************************************************
* ITSliderCell
* ITSlider
*****************************************************************************/
@interface ITSlider : NSSlider
......@@ -141,5 +141,6 @@
NSImage *_knobOn;
BOOL b_mouse_down;
}
- (void)controlTintChanged;
@end
modules/gui/macosx/misc.m
View file @ ec022e28
......@@ -635,14 +635,27 @@ void _drawFrameInRect(NSRect frameRect)
- (id)init
{
self = [super init];
_knobOff = [[NSImage imageNamed:@"volumeslider_normal"] retain];
_knobOn = [[NSImage imageNamed:@"volumeslider_blue"] retain];
_knobOff = [NSImage imageNamed:@"volumeslider_normal"];
[self controlTintChanged];
[[NSNotificationCenter defaultCenter] addObserver: self
selector: @selector( controlTintChanged )
name: NSControlTintDidChangeNotification
object: nil];
b_mouse_down = FALSE;
return self;
}
- (void)controlTintChanged
{
if( [NSColor currentControlTint] == NSGraphiteControlTint )
_knobOn = [NSImage imageNamed:@"volumeslider_graphite"];
else
_knobOn = [NSImage imageNamed:@"volumeslider_blue"];
}
- (void)dealloc
{
[[NSNotificationCenter defaultCenter] removeObserver: self];
[_knobOff release];
[_knobOn release];
[super dealloc];
......
modules/gui/macosx/vout.m
View file @ ec022e28
......@@ -1093,6 +1093,13 @@ int DeviceCallback( vlc_object_t *p_this, const char *psz_variable,
{
s_rect.size.width = p_vout->i_window_width;
s_rect.size.height = p_vout->i_window_height;
/* go to our default position, if set */
if( var_GetInteger( p_vout, "video-x" ) > -1 )
s_rect.origin.x = var_GetInteger( p_vout, "video-x" );
if( var_GetInteger( p_vout, "video-y" ) > -1 )
s_rect.origin.y = var_GetInteger( p_vout, "video-y" );
msg_Dbg( p_vout, "vout will open at %i:%i", s_rect.origin.x, s_rect.origin.y );
}
else
{
......@@ -1108,6 +1115,7 @@ int DeviceCallback( vlc_object_t *p_this, const char *psz_variable,
if( !s_frame )
{
msg_Warn( p_vout, "no frame found, centering vout" );
[self center];
}
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment