Removes trailing spaces. Removes tabs.

[vlc] / modules / gui / macosx / prefs_widgets.h

diff --git a/modules/gui/macosx/prefs_widgets.h b/modules/gui/macosx/prefs_widgets.h
index b664474b4cd0adac3a458ad25060533ebf1d1307..2b0515e1feb6a4dc16d61e38ee56327857d36603 100644 (file)
--- a/modules/gui/macosx/prefs_widgets.h
+++ b/modules/gui/macosx/prefs_widgets.h
@@ -1,16 +1,16 @@
 /*****************************************************************************
  * prefs_widgets.h: Preferences controls
  *****************************************************************************
- * Copyright (C) 2002-2003 VideoLAN
+ * Copyright (C) 2002-2007 the VideoLAN team
  * $Id$
  *
- * Authors: Derk-Jan Hartman <hartman at videolan.org> 
+ * Authors: Derk-Jan Hartman <hartman at videolan.org>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
@@ -18,16 +18,15 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
 #define CONFIG_ITEM_STRING_LIST (CONFIG_ITEM_STRING + 1)
 #define CONFIG_ITEM_RANGED_INTEGER (CONFIG_ITEM_INTEGER + 1)
 #define CONFIG_ITEM_KEY_BEFORE_10_3 (CONFIG_ITEM_KEY + 1)
 #define CONFIG_ITEM_KEY_AFTER_10_3 (CONFIG_ITEM_KEY + 2)
-#define MACOS_VERSION [[[NSDictionary dictionaryWithContentsOfFile: \
-            @"/System/Library/CoreServices/SystemVersion.plist"] \
-            objectForKey: @"ProductVersion"] floatValue]
+#define LEFTMARGIN  18
+#define RIGHTMARGIN 18
 
 @interface VLCConfigControl : NSView
 {
@@ -40,7 +39,7 @@
 }
 
 + (VLCConfigControl *)newControl: (module_config_t *)_p_item
-        withView: (NSView *)o_parent_view yOffset:(int) i_yPos;
+        withView: (NSView *)o_parent_view;
 - (id)initWithFrame: (NSRect)frame item: (module_config_t *)p_item;
 - (NSString *)getName;
 - (int)getType;
@@ -51,6 +50,8 @@
 - (float)floatValue;
 - (char *)stringValue;
 - (void)applyChanges;
+- (int)getLabelSize;
+- (void) alignWithXPosition:(int)i_xPos;
 static NSMenu   *o_keys_menu = nil;
 
 + (int)calcVerticalMargin: (int)i_curItem lastItem:(int)i_lastItem;
@@ -63,8 +64,7 @@ static NSMenu   *o_keys_menu = nil;
 }
 
 - (id) initWithItem: (module_config_t *)_p_item
-           withView: (NSView *)o_parent_view
-           withVerticalOffset: (int)i_yPos;
+           withView: (NSView *)o_parent_view;
 
 @end
 
@@ -74,8 +74,7 @@ static NSMenu   *o_keys_menu = nil;
 }
 
 - (id) initWithItem: (module_config_t *)_p_item
-           withView: (NSView *)o_parent_view
-           withVerticalOffset: (int)i_yPos;
+           withView: (NSView *)o_parent_view;
 
 @end
 
@@ -87,8 +86,7 @@ static NSMenu   *o_keys_menu = nil;
 }
 
 - (id) initWithItem: (module_config_t *)_p_item
-           withView: (NSView *)o_parent_view
-           withVerticalOffset: (int)i_yPos;
+           withView: (NSView *)o_parent_view;
 
 - (IBAction)openFileDialog: (id)sender;
 - (void)pathChosenInPanel:(NSOpenPanel *)o_sheet withReturn:(int)i_return_code contextInfo:(void  *)o_context_info;
@@ -101,8 +99,7 @@ static NSMenu   *o_keys_menu = nil;
 }
 
 - (id) initWithItem: (module_config_t *)_p_item
-           withView: (NSView *)o_parent_view
-           withVerticalOffset: (int)i_yPos;
+           withView: (NSView *)o_parent_view;
 
 @end
 
@@ -114,8 +111,7 @@ static NSMenu   *o_keys_menu = nil;
 
 
 - (id) initWithItem: (module_config_t *)_p_item
-           withView: (NSView *)o_parent_view
-           withVerticalOffset: (int)i_yPos;
+           withView: (NSView *)o_parent_view;
 - (IBAction)stepperChanged:(id)sender;
 - (void)textfieldChanged:(NSNotification *)o_notification;
 
@@ -127,8 +123,7 @@ static NSMenu   *o_keys_menu = nil;
 }
 
 - (id) initWithItem: (module_config_t *)_p_item
-           withView: (NSView *)o_parent_view
-           withVerticalOffset: (int)i_yPos;
+           withView: (NSView *)o_parent_view;
 
 @end
 
@@ -142,8 +137,7 @@ static NSMenu   *o_keys_menu = nil;
 
 
 - (id) initWithItem: (module_config_t *)_p_item
-           withView: (NSView *)o_parent_view
-           withVerticalOffset: (int)i_yPos;
+           withView: (NSView *)o_parent_view;
 - (IBAction)sliderChanged:(id)sender;
 - (void)textfieldChanged:(NSNotification *)o_notification;
 
@@ -155,8 +149,7 @@ static NSMenu   *o_keys_menu = nil;
 }
 
 - (id) initWithItem: (module_config_t *)_p_item
-           withView: (NSView *)o_parent_view
-           withVerticalOffset: (int)i_yPos;
+           withView: (NSView *)o_parent_view;
 
 @end
 
@@ -168,8 +161,7 @@ static NSMenu   *o_keys_menu = nil;
 
 
 - (id) initWithItem: (module_config_t *)_p_item
-           withView: (NSView *)o_parent_view
-           withVerticalOffset: (int)i_yPos;
+           withView: (NSView *)o_parent_view;
 - (IBAction)stepperChanged:(id)sender;
 - (void)textfieldChanged:(NSNotification *)o_notification;
 
@@ -185,36 +177,19 @@ static NSMenu   *o_keys_menu = nil;
 
 
 - (id) initWithItem: (module_config_t *)_p_item
-           withView: (NSView *)o_parent_view
-           withVerticalOffset: (int)i_yPos;
+           withView: (NSView *)o_parent_view;
 - (IBAction)sliderChanged:(id)sender;
 - (void)textfieldChanged:(NSNotification *)o_notification;
 
 @end
 
-@interface KeyConfigControlBefore103 : VLCConfigControl
-{
-    NSButton        *o_cmd_checkbox;
-    NSButton        *o_ctrl_checkbox;
-    NSButton        *o_alt_checkbox;
-    NSButton        *o_shift_checkbox;
-    NSPopUpButton   *o_popup;
-}
-
-- (id) initWithItem: (module_config_t *)_p_item
-           withView: (NSView *)o_parent_view
-           withVerticalOffset: (int)i_yPos;
-
-@end
-
-@interface KeyConfigControlAfter103 : VLCConfigControl
+@interface KeyConfigControl : VLCConfigControl
 {
     NSPopUpButton   *o_popup;
 }
 
 - (id) initWithItem: (module_config_t *)_p_item
-           withView: (NSView *)o_parent_view
-           withVerticalOffset: (int)i_yPos;
+           withView: (NSView *)o_parent_view;
 
 @end
 
@@ -226,9 +201,8 @@ static NSMenu   *o_keys_menu = nil;
 }
 
 - (id) initWithItem: (module_config_t *)_p_item
-           withView: (NSView *)o_parent_view
-           withVerticalOffset: (int)i_yPos;
-
+           withView: (NSView *)o_parent_view;
+ 
 @end
 
 //#undef CONFIG_ITEM_LIST_STRING