Qt4 - Permit QVLCFrame to have empty default size and pos in read settings.

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

diff --git a/modules/gui/macosx/sfilters.h b/modules/gui/macosx/sfilters.h
index e922b4268ba622851c3345ff501b3fc6d3488652..dec8585d92fb4279da4c671d657cc0428faa6aa4 100644 (file)
--- a/modules/gui/macosx/sfilters.h
+++ b/modules/gui/macosx/sfilters.h
@@ -1,10 +1,10 @@
 /*****************************************************************************
  * sfilter.h: MacOS X Subpicture filters dialogue
  *****************************************************************************
- * Copyright (C) 2005 the VideoLAN team
- * $Id:$
+ * Copyright (C) 2005-2008 the VideoLAN team
+ * $Id$
  *
- * Authors: Felix K\9fhne <fkuehne@users.sf.net>
+ * Authors: Felix Paul Kühne <fkuehne -at- videolan -dot- 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
@@ -18,17 +18,19 @@
  *
  * 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.
  *****************************************************************************/
 
 #import <Cocoa/Cocoa.h>
-#import <vlc/intf.h>
+#import "intf.h"
+#import <vlc/vlc.h>
 
 @interface VLCsFilters : NSObject
 {
     /* window stuff */
     IBOutlet id o_sfilter_tabView;
     IBOutlet id o_sfilter_win;
+    IBOutlet id o_sfilter_saveSettings_ckb;
 
     /* logo section */
     IBOutlet id o_logo_enabled_ckb;
@@ -37,16 +39,9 @@
     IBOutlet id o_logo_image_lbl;
     IBOutlet id o_logo_opaque_lbl;
     IBOutlet id o_logo_opaque_sld;
-    IBOutlet id o_logo_pos_fix_btn;
-    IBOutlet id o_logo_pos_fix_X_fld;
-    IBOutlet id o_logo_pos_fix_X_lbl;
-    IBOutlet id o_logo_pos_fix_Y_fld;
-    IBOutlet id o_logo_pos_fix_Y_lbl;
     IBOutlet id o_logo_pos_lbl;
-    IBOutlet id o_logo_pos_rel_btn;
-    IBOutlet id o_logo_pos_rel_pop;
-    IBOutlet id o_logo_pos_matrix;
-    
+    IBOutlet id o_logo_pos_radio;
+
     /* marquee section */
     IBOutlet id o_marq_enabled_ckb;
     IBOutlet id o_marq_color_lbl;
@@ -55,21 +50,14 @@
     IBOutlet id o_marq_marq_lbl;
     IBOutlet id o_marq_opaque_lbl;
     IBOutlet id o_marq_opaque_sld;
-    IBOutlet id o_marq_pos_fix_btn;
-    IBOutlet id o_marq_pos_fix_X_fld;
-    IBOutlet id o_marq_pos_fix_X_lbl;
-    IBOutlet id o_marq_pos_fix_Y_fld;
-    IBOutlet id o_marq_pos_fix_Y_lbl;
     IBOutlet id o_marq_pos_lbl;
-    IBOutlet id o_marq_pos_rel_btn;
-    IBOutlet id o_marq_pos_rel_pop;
+    IBOutlet id o_marq_pos_radio;
     IBOutlet id o_marq_size_inPx_lbl;
     IBOutlet id o_marq_size_lbl;
     IBOutlet id o_marq_size_pop;
     IBOutlet id o_marq_tmOut_fld;
     IBOutlet id o_marq_tmOut_lbl;
     IBOutlet id o_marq_tmOut_ms_lbl;
-    IBOutlet id o_marq_pos_matrix;
 
     /* time section */
     IBOutlet id o_time_enabled_ckb;
@@ -77,21 +65,14 @@
     IBOutlet id o_time_color_pop;
     IBOutlet id o_time_opaque_lbl;
     IBOutlet id o_time_opaque_sld;
-    IBOutlet id o_time_pos_fix_btn;
-    IBOutlet id o_time_pos_fix_X_fld;
-    IBOutlet id o_time_pos_fix_X_lbl;
-    IBOutlet id o_time_pos_fix_Y_fld;
-    IBOutlet id o_time_pos_fix_Y_lbl;
     IBOutlet id o_time_pos_lbl;
-    IBOutlet id o_time_pos_rel_btn;
-    IBOutlet id o_time_pos_rel_pop;
+    IBOutlet id o_time_pos_radio;
     IBOutlet id o_time_size_inPx_lbl;
     IBOutlet id o_time_size_lbl;
     IBOutlet id o_time_size_pop;
     IBOutlet id o_time_stamp_fld;
     IBOutlet id o_time_stamp_lbl;
-    IBOutlet id o_time_pos_matrix;
-    
+
     BOOL o_config_changed;
     BOOL o_save_settings;
     NSArray * o_colors;
@@ -102,9 +83,6 @@
 - (IBAction)logo_selectFile:(id)sender;
 - (IBAction)propertyChanged:(id)sender;
 - (IBAction)enableFilter:(id)sender;
-- (IBAction)otherPositionForLogo:(id)sender;
-- (IBAction)otherPositionForMarq:(id)sender;
-- (IBAction)otherPositionForTime:(id)sender;
 
 - (void)showAsPanel;
 - (void)initStrings;