[vlc-commits] macosx: fixed disappearing repeat button images introduced in [ 8f79caa3e4b56c73c719bfa7c444cccbf203aa19]

[Felix Paul Kühne]

vlc/vlc-1.1 | branch: master | Felix Paul Kühne <fkuehne at videolan.org> | Wed Jun  8 18:39:38 2011 +0200| [4829bb06f13d0e5287f951566ca9a99b0a706a79] | committer: Felix Paul Kühne

macosx: fixed disappearing repeat button images introduced in [8f79caa3e4b56c73c719bfa7c444cccbf203aa19]

Closes #4886

> http://git.videolan.org/gitweb.cgi/vlc/vlc-1.1.git/?a=commit;h=4829bb06f13d0e5287f951566ca9a99b0a706a79
---

 modules/gui/macosx/controls.h |    8 ++------
 modules/gui/macosx/controls.m |   27 +++++++++------------------
 2 files changed, 11 insertions(+), 24 deletions(-)

diff --git a/modules/gui/macosx/controls.h b/modules/gui/macosx/controls.h
index 2b9b1d8..7937363 100644
--- a/modules/gui/macosx/controls.h
+++ b/modules/gui/macosx/controls.h
@@ -40,10 +40,6 @@
     IBOutlet id o_btn_repeat;
     IBOutlet id o_btn_repeat_embed;
     IBOutlet id o_btn_shuffle_embed;
-    
-    NSImage * o_repeat_single;
-    NSImage * o_repeat_all;
-    NSImage * o_repeat_off;
 
     IBOutlet id o_specificTime_cancel_btn;
     IBOutlet id o_specificTime_enter_fld;
@@ -132,9 +128,9 @@
     int i_type;
 }
 
-- (id)initWithVariableName: (const char *)name 
+- (id)initWithVariableName: (const char *)name
                   ofObject: (vlc_object_t *)object
-                  andValue: (vlc_value_t)value 
+                  andValue: (vlc_value_t)value
                     ofType: (int)type;
 - (const char *)name;
 - (vlc_value_t)value;
diff --git a/modules/gui/macosx/controls.m b/modules/gui/macosx/controls.m
index c6c94c9..80d02c7 100644
--- a/modules/gui/macosx/controls.m
+++ b/modules/gui/macosx/controls.m
@@ -1,7 +1,7 @@
 /*****************************************************************************
  * controls.m: MacOS X interface module
  *****************************************************************************
- * Copyright (C) 2002-2009 the VideoLAN team
+ * Copyright (C) 2002-2011 the VideoLAN team
  * $Id$
  *
  * Authors: Jon Lech Johansen <jon-vl at nanocrew.net>
@@ -61,9 +61,6 @@
     [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"];
-
 }
 
 
@@ -72,9 +69,6 @@
     [[NSNotificationCenter defaultCenter] removeObserver: self];
 
     [o_fs_panel release];
-    [o_repeat_single release];
-    [o_repeat_all release];
-    [o_repeat_off release];
 
     [super dealloc];
 }
@@ -188,21 +182,18 @@
 /* three little ugly helpers */
 - (void)repeatOne
 {
-    [o_btn_repeat setImage: o_repeat_single];
-    [o_btn_repeat setAlternateImage: o_repeat_all];
-    [o_btn_repeat_embed setImage: [NSImage imageNamed:@"sidebarRepeatOneOn"]];
+    [o_btn_repeat setImage: [NSImage imageNamed:@"repeat_single_embedded_graphite"]];
+    [o_btn_repeat setAlternateImage: [NSImage imageNamed:@"repeat_embedded_graphite"]];
 }
 - (void)repeatAll
 {
-    [o_btn_repeat setImage: o_repeat_all];
-    [o_btn_repeat setAlternateImage: o_repeat_off];
-    [o_btn_repeat_embed setImage: [NSImage imageNamed:@"sidebarRepeatOn"]];
+    [o_btn_repeat setImage: [NSImage imageNamed:@"repeat_embedded_graphite"]];
+    [o_btn_repeat setAlternateImage: [NSImage imageNamed:@"repeat_embedded"]];
 }
 - (void)repeatOff
 {
-    [o_btn_repeat setImage: o_repeat_off];
-    [o_btn_repeat setAlternateImage: o_repeat_single];
-    [o_btn_repeat_embed setImage: [NSImage imageNamed:@"sidebarRepeat"]];
+    [o_btn_repeat setImage: [NSImage imageNamed:@"repeat_embedded"]];
+    [o_btn_repeat setAlternateImage: [NSImage imageNamed:@"repeat_embedded_graphite"]];
 }
 - (void)shuffle
 {
@@ -211,9 +202,9 @@
     var_Get( p_playlist, "random", &val );
     [o_btn_shuffle setState: val.b_bool];
 	if(val.b_bool)
-        [o_btn_shuffle_embed setImage: [NSImage imageNamed:@"sidebarShuffleOn"]];
+        [o_btn_shuffle_embed setImage: [NSImage imageNamed:@"shuffle_embedded_graphite"]];
 	else
-        [o_btn_shuffle_embed setImage: [NSImage imageNamed:@"sidebarShuffle"]];
+        [o_btn_shuffle_embed setImage: [NSImage imageNamed:@"shuffle_embedded"]];
 }
 
 - (IBAction)repeatButtonAction:(id)sender