Commit 75e0ab4d authored by hartman's avatar hartman

* Added a Reset prefs option

* New prefs dialog much like the wxWindows and BeOS one.
  - translated instances might be broken.
  - still need sliders for min/max values
  - improved sizing should be done.
parent 765454f1
......@@ -162,6 +162,7 @@
"o_mu_videotrack" = id;
"o_mu_window" = id;
"o_playlist" = id;
"o_prefs" = id;
"o_timefield" = id;
"o_timeslider" = id;
"o_volumeslider" = id;
......@@ -311,7 +312,22 @@
};
SUPERCLASS = NSObject;
},
{CLASS = VLCPlaylistView; LANGUAGE = ObjC; SUPERCLASS = NSTableView; }
{CLASS = VLCPlaylistView; LANGUAGE = ObjC; SUPERCLASS = NSTableView; },
{
ACTIONS = {advancedToggle = id; closePrefs = id; resetAll = id; savePrefs = id; };
CLASS = VLCPrefs;
LANGUAGE = ObjC;
OUTLETS = {
"o_advanced_ckb" = id;
"o_cancel_btn" = id;
"o_prefs_view" = id;
"o_prefs_window" = id;
"o_reset_btn" = id;
"o_save_btn" = id;
"o_tree" = id;
};
SUPERCLASS = NSObject;
}
);
IBVersion = 1;
}
\ No newline at end of file
......@@ -3,7 +3,7 @@
<plist version="1.0">
<dict>
<key>IBDocumentLocation</key>
<string>36 88 365 441 0 0 1280 1002 </string>
<string>32 550 365 441 0 0 1280 1002 </string>
<key>IBEditorPositions</key>
<dict>
<key>29</key>
......@@ -23,8 +23,7 @@
</array>
<key>IBOpenObjects</key>
<array>
<integer>1411</integer>
<integer>29</integer>
<integer>1530</integer>
</array>
<key>IBSystem Version</key>
<string>6L29</string>
......
......@@ -2,7 +2,7 @@
* intf.m: MacOS X interface plugin
*****************************************************************************
* Copyright (C) 2002-2003 VideoLAN
* $Id: intf.m,v 1.83 2003/05/15 01:23:05 hartman Exp $
* $Id: intf.m,v 1.84 2003/05/20 15:23:25 hartman Exp $
*
* Authors: Jon Lech Johansen <jon-vl@nanocrew.net>
* Christophe Massiot <massiot@via.ecp.fr>
......@@ -503,8 +503,6 @@ int PlaylistChanged( vlc_object_t *p_this, const char *psz_variable,
- (void)manage:(playlist_t *)p_playlist
{
vlc_value_t val;
intf_thread_t * p_intf = [NSApp getIntf];
#define p_input p_playlist->p_input
......@@ -972,12 +970,6 @@ int PlaylistChanged( vlc_object_t *p_this, const char *psz_variable,
o_msg_lock = nil;
}
if( o_prefs != nil )
{
[o_prefs release];
o_prefs = nil;
}
[NSApp stop: nil];
/* write cached user defaults to disk */
......@@ -1143,12 +1135,7 @@ int PlaylistChanged( vlc_object_t *p_this, const char *psz_variable,
- (IBAction)viewPreferences:(id)sender
{
if( o_prefs == nil )
{
o_prefs = [[VLCPrefs alloc] init];
}
[o_prefs createPrefPanel: @"main"];
[o_prefs showPrefs];
}
- (IBAction)timesliderUpdate:(id)sender
......
......@@ -2,7 +2,7 @@
* prefs.h: MacOS X plugin for vlc
*****************************************************************************
* Copyright (C) 2002-2003 VideoLAN
* $Id: prefs.h,v 1.5 2003/05/09 00:41:11 hartman Exp $
* $Id: prefs.h,v 1.6 2003/05/20 15:23:25 hartman Exp $
*
* Authors: Jon Lech Johansen <jon-vl@nanocrew.net>
*
......@@ -23,6 +23,23 @@
#define PREFS_WRAP 60
@interface VLCTreeItem : NSObject
{
NSString *o_name;
int i_object_id;
VLCTreeItem *o_parent;
NSMutableArray *o_children;
}
+ (VLCTreeItem *)rootItem;
- (int)numberOfChildren;
- (VLCTreeItem *)childAtIndex:(int)i_index;
- (int)getObjectID;
- (NSString *)getName;
- (BOOL)hasPrefs:(NSString *)o_module_name;
@end
/*****************************************************************************
* VLCPrefs interface
*****************************************************************************/
......@@ -30,27 +47,27 @@
{
intf_thread_t *p_intf;
vlc_bool_t b_advanced;
VLCTreeItem *o_config_tree;
NSView *o_empty_view;
NSMutableDictionary *o_pref_panels;
NSMutableDictionary *o_toolbars;
NSMutableDictionary *o_scroll_views;
NSMutableDictionary *o_panel_views;
NSMutableDictionary *o_save_prefs;
IBOutlet id o_prefs_window;
IBOutlet id o_tree;
IBOutlet id o_prefs_view;
IBOutlet id o_save_btn;
IBOutlet id o_cancel_btn;
IBOutlet id o_reset_btn;
IBOutlet id o_advanced_ckb;
}
- (BOOL)hasPrefs:(NSString *)o_module_name;
- (void)createPrefPanel:(NSString *)o_module_name;
- (void)destroyPrefPanel:(id)o_unknown;
- (void)selectPrefView:(id)sender;
- (void)moduleSelected:(id)sender;
- (void)configureModule:(id)sender;
- (void)selectModule:(id)sender;
- (void)initStrings;
- (void)showPrefs;
- (IBAction)savePrefs: (id)sender;
- (IBAction)closePrefs: (id)sender;
- (IBAction)resetAll: (id)sender;
- (IBAction)advancedToggle: (id)sender;
- (void)showViewForID: (int) i_id andName:(NSString *)o_item_name;
- (void)configChanged:(id)o_unknown;
- (void)clickedApplyCancelOK:(id)sender;
@end
@interface VLCFlippedView : NSView
......@@ -135,6 +152,7 @@
@end
INTF_CONTROL_CONFIG(Button);
INTF_CONTROL_CONFIG(PopUpButton);
INTF_CONTROL_CONFIG(ComboBox);
INTF_CONTROL_CONFIG(TextField);
......
......@@ -2,9 +2,10 @@
* prefs.m: MacOS X plugin for vlc
*****************************************************************************
* Copyright (C) 2002-2003 VideoLAN
* $Id: prefs.m,v 1.21 2003/05/11 23:17:30 hartman Exp $
* $Id: prefs.m,v 1.22 2003/05/20 15:23:25 hartman Exp $
*
* Authors: Jon Lech Johansen <jon-vl@nanocrew.net>
* Authors: Jon Lech Johansen <jon-vl@nanocrew.net>
* Derk-Jan Hartman <thedj at users.sf.net>
*
* 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
......@@ -42,14 +43,7 @@
if( self != nil )
{
p_intf = [NSApp getIntf];
o_pref_panels = [[NSMutableDictionary alloc] init];
o_toolbars = [[NSMutableDictionary alloc] init];
o_scroll_views = [[NSMutableDictionary alloc] init];
o_panel_views = [[NSMutableDictionary alloc] init];
o_save_prefs = [[NSMutableDictionary alloc] init];
b_advanced = config_GetInt( p_intf, "advanced" );
o_empty_view = [[NSView alloc] init];
}
return( self );
......@@ -57,158 +51,168 @@
- (void)dealloc
{
id v1, v2;
NSEnumerator *o_e1;
NSEnumerator *o_e2;
[o_empty_view release];
[super dealloc];
}
#define DIC_REL1(o_dic) \
{ \
o_e1 = [o_dic objectEnumerator]; \
while( (v1 = [o_e1 nextObject]) ) \
{ \
[v1 release]; \
} \
[o_dic removeAllObjects]; \
[o_dic release]; \
}
- (void)awakeFromNib
{
p_intf = [NSApp getIntf];
b_advanced = config_GetInt( p_intf, "advanced" );
[self initStrings];
[o_advanced_ckb setState: b_advanced];
[o_prefs_view setBorderType: NSGrooveBorder];
[o_prefs_view setHasVerticalScroller: YES];
[o_prefs_view setDrawsBackground: NO];
[o_prefs_view setRulersVisible: YES];
[o_prefs_view setDocumentView: o_empty_view];
[o_tree selectRow:0 byExtendingSelection:NO];
//[self loadConfigTree];
}
#define DIC_REL2(o_dic) \
{ \
o_e2 = [o_dic objectEnumerator]; \
while( (v2 = [o_e2 nextObject]) ) \
{ \
DIC_REL1(v2); \
} \
[o_dic removeAllObjects]; \
}
- (void)initStrings
{
[o_prefs_window setTitle: _NS("Preferences")];
[o_save_btn setTitle: _NS("Save")];
[o_cancel_btn setTitle: _NS("Cancel")];
[o_reset_btn setTitle: _NS("Reset All")];
[o_advanced_ckb setTitle: _NS("Advanced")];
}
DIC_REL1(o_pref_panels);
DIC_REL2(o_toolbars);
DIC_REL1(o_scroll_views);
DIC_REL2(o_panel_views);
DIC_REL1(o_save_prefs);
- (void)showPrefs
{
[o_prefs_window center];
[o_prefs_window makeKeyAndOrderFront:self];
}
#undef DIC_REL1
#undef DIC_REL2
- (IBAction)savePrefs: (id)sender
{
config_SaveConfigFile( p_intf, NULL );
[o_prefs_window orderOut:self];
}
[super dealloc];
- (IBAction)closePrefs: (id)sender
{
[o_prefs_window orderOut:self];
}
- (BOOL)hasPrefs:(NSString *)o_module_name
- (IBAction)resetAll: (id)sender
{
module_t *p_parser;
vlc_list_t *p_list;
char *psz_module_name;
int i_index;
config_ResetAll( p_intf );
}
psz_module_name = (char *)[o_module_name lossyCString];
- (IBAction)advancedToggle: (id)sender
{
b_advanced = !b_advanced;
[o_advanced_ckb setState: b_advanced];
[o_tree selectRow: [o_tree selectedRow] byExtendingSelection:NO];
}
/* look for module */
p_list = vlc_list_find( p_intf, VLC_OBJECT_MODULE, FIND_ANYWHERE );
- (void)loadConfigTree
{
}
for( i_index = 0; i_index < p_list->i_count; i_index++ )
- (void)outlineViewSelectionIsChanging:(NSNotification *)o_notification
{
}
- (void)outlineViewSelectionDidChange:(NSNotification *)o_notification
{
NSLog( [[o_tree itemAtRow:[o_tree selectedRow]] getName] );
[self showViewForID: [[o_tree itemAtRow:[o_tree selectedRow]] getObjectID] andName: [[o_tree itemAtRow:[o_tree selectedRow]] getName]];
}
- (void)configChanged:(id)o_unknown
{
id o_vlc_config = [o_unknown isKindOfClass: [NSNotification class]] ?
[o_unknown object] : o_unknown;
NSString *o_module_name = [o_vlc_config moduleName];
int i_type = [o_vlc_config configType];
NSString *o_name = [o_vlc_config configName];
NSLog( o_name);
char *psz_name = (char *)[o_name UTF8String];
switch( i_type )
{
p_parser = (module_t *)p_list->p_values[i_index].p_object ;
if( !strcmp( p_parser->psz_object_name, psz_module_name ) )
case CONFIG_ITEM_MODULE:
{
BOOL b_has_prefs = p_parser->i_config_items != 0;
vlc_list_release( p_list );
return( b_has_prefs );
char *psz_value;
NSString *o_value;
o_value = [o_vlc_config titleOfSelectedItem];
NSLog( o_value);
psz_value = (char *)[o_value UTF8String];
config_PutPsz( p_intf, psz_name, psz_value );
}
}
break;
vlc_list_release( p_list );
case CONFIG_ITEM_STRING:
case CONFIG_ITEM_FILE:
case CONFIG_ITEM_DIRECTORY:
{
char *psz_value;
NSString *o_value;
return( NO );
o_value = [o_vlc_config stringValue];
NSLog( o_value);
psz_value = (char *)[o_value UTF8String];
config_PutPsz( p_intf, psz_name, psz_value );
}
break;
case CONFIG_ITEM_INTEGER:
case CONFIG_ITEM_BOOL:
{
int i_value = [o_vlc_config intValue];
config_PutInt( p_intf, psz_name, i_value );
}
break;
case CONFIG_ITEM_FLOAT:
{
float f_value = [o_vlc_config floatValue];
config_PutFloat( p_intf, psz_name, f_value );
}
break;
}
}
- (void)createPrefPanel:(NSString *)o_module_name
- (void)showViewForID: (int)i_id andName: (NSString *)o_item_name
{
int i_pos;
int i_module_tag;
module_t *p_parser = NULL;
vlc_list_t *p_list;
module_t *p_parser;
module_config_t *p_item;
char *psz_module_name;
int i_index;
NSPanel *o_panel; /* panel */
NSRect s_panel_rc; /* panel rect */
NSView *o_panel_view; /* panel view */
NSToolbar *o_toolbar; /* panel toolbar */
NSMutableDictionary *o_tb_items; /* panel toolbar items */
NSScrollView *o_scroll_view; /* panel scroll view */
NSRect s_scroll_rc; /* panel scroll view rect */
NSMutableDictionary *o_views; /* panel scroll view docviews */
int i_pos, i_module_tag, i_index;
NSString *o_module_name;
NSRect s_rc; /* rect */
NSView *o_view; /* view */
NSRect s_vrc; /* view rect */
NSButton *o_button; /* button */
NSRect s_brc; /* button rect */
VLCTextField *o_text_field; /* input field / label */
o_panel = [o_pref_panels objectForKey: o_module_name];
if( o_panel != nil )
{
[o_panel center];
[o_panel makeKeyAndOrderFront: nil];
return;
}
psz_module_name = (char *)[o_module_name lossyCString];
/* Look for the selected module */
p_list = vlc_list_find( p_intf, VLC_OBJECT_MODULE, FIND_ANYWHERE );
for( i_index = 0; i_index < p_list->i_count; i_index++ )
{
p_parser = (module_t *)p_list->p_values[i_index].p_object ;
if( psz_module_name
&& !strcmp( psz_module_name, p_parser->psz_object_name ) )
{
break;
}
}
if( !p_parser || i_index == p_list->i_count )
/* Get a pointer to the module */
p_parser = (module_t *)vlc_object_get( p_intf, i_id );
if( p_parser->i_object_type != VLC_OBJECT_MODULE )
{
vlc_list_release( p_list );
/* 0OOoo something went really bad */
return;
}
/* We found it, now we can start building its configuration interface */
s_panel_rc = NSMakeRect( 0, 0, 450, 450 );
o_panel = [[NSPanel alloc] initWithContentRect: s_panel_rc
styleMask: NSTitledWindowMask
backing: NSBackingStoreBuffered
defer: YES];
o_toolbar = [[NSToolbar alloc] initWithIdentifier: o_module_name];
[o_panel setTitle: [NSString stringWithFormat: @"%@ (%@)",
_NS("Preferences"), o_module_name]];
o_panel_view = [o_panel contentView];
s_scroll_rc = s_panel_rc;
s_scroll_rc.size.height -= 55; s_scroll_rc.origin.y += 55;
o_scroll_view = [[NSScrollView alloc] initWithFrame: s_scroll_rc];
[o_scroll_views setObject: o_scroll_view forKey: o_module_name];
[o_scroll_view setBorderType: NSGrooveBorder];
[o_scroll_view setHasVerticalScroller: YES];
[o_scroll_view setDrawsBackground: NO];
[o_scroll_view setRulersVisible: YES];
[o_panel_view addSubview: o_scroll_view];
o_tb_items = [[NSMutableDictionary alloc] init];
o_views = [[NSMutableDictionary alloc] init];
[o_save_prefs setObject: [[NSMutableArray alloc] init]
forKey: o_module_name];
/* Enumerate config options and add corresponding config boxes */
o_module_name = [NSString stringWithUTF8String: p_parser->psz_object_name];
p_item = p_parser->p_config;
i_pos = 0;
......@@ -282,597 +286,522 @@
#define INPUT_FIELD_STRING( name, label, w, param, tip ) \
INPUT_FIELD( CONFIG_ITEM_STRING, name, label, w, setStringValue, param, tip )
/* Init View */
s_vrc = [[o_prefs_view contentView] bounds]; s_vrc.size.height -= 4;
o_view = [[VLCFlippedView alloc] initWithFrame: s_vrc];
s_rc.origin.x = X_ORIGIN;
s_rc.origin.y = Y_ORIGIN;
BOOL b_right_cat = FALSE;
if( p_item ) do
{
if( p_item->b_advanced && !b_advanced )
if( p_item->i_type == CONFIG_HINT_CATEGORY )
{
if( !strcmp( p_parser->psz_object_name, "main" ) &&
[o_item_name isEqualToString: [NSApp localizedString: p_item->psz_text]] )
{
b_right_cat = TRUE;
} else if( strcmp( p_parser->psz_object_name, "main" ) )
{
b_right_cat = TRUE;
} else b_right_cat = FALSE;
} else if( p_item->i_type == CONFIG_HINT_END && !strcmp( p_parser->psz_object_name, "main" ) )
{
b_right_cat = FALSE;
}
if( (p_item->b_advanced && !b_advanced ) || !b_right_cat )
{
continue;
}
switch( p_item->i_type )
{
case CONFIG_HINT_CATEGORY:
{
NSString *o_key;
NSString *o_label;
NSToolbarItem *o_tbi;
o_label = [NSApp localizedString: p_item->psz_text];
o_tbi = [[NSToolbarItem alloc] initWithItemIdentifier: o_label];
[o_tbi setImage: [NSImage imageNamed: @"NSApplicationIcon"]];
[o_tbi setLabel: o_label];
[o_tbi setTarget: self];
[o_tbi setAction: @selector(selectPrefView:)];
o_key = [NSString stringWithFormat: @"%02d %@",
i_pos, o_label];
[o_tb_items setObject: o_tbi forKey: o_key];
s_vrc = s_scroll_rc; s_vrc.size.height -= 4;
o_view = [[VLCFlippedView alloc] initWithFrame: s_vrc];
[o_views setObject: o_view forKey: o_label];
s_rc.origin.x = X_ORIGIN;
s_rc.origin.y = Y_ORIGIN;
i_module_tag = 3;
if( i_pos == 0 )
case CONFIG_ITEM_MODULE:
{
[o_scroll_view setDocumentView: o_view];
}
i_pos++;
}
break;
VLCPopUpButton *o_modules;
module_t *p_a_module;
char * psz_duptip = NULL;
if ( p_item->psz_longtext != NULL && [NSApp getEncoding] == NSISOLatin1StringEncoding )
psz_duptip = strdup(p_item->psz_longtext);
s_rc.size.height = 30;
s_rc.size.width = 200;
s_rc.origin.y += 10;
CHECK_VIEW_HEIGHT;
o_modules = [[VLCPopUpButton alloc] initWithFrame: s_rc];
CONTROL_CONFIG( o_modules, o_module_name,
CONFIG_ITEM_MODULE, p_item->psz_name );
[o_modules setTarget: self];
[o_modules setAction: @selector(configChanged:)];
[o_modules sendActionOn:NSLeftMouseUpMask];
if ( psz_duptip != NULL )
{
[o_modules setToolTip: [NSApp localizedString:
vlc_wraptext(psz_duptip, PREFS_WRAP)]];
free( psz_duptip );
}
[o_view addSubview: [o_modules autorelease]];
case CONFIG_ITEM_MODULE:
{
NSBox *o_box;
NSRect s_crc;
NSView *o_cview;
NSPopUpButton *o_modules;
NSButton *o_btn_select;
NSButton *o_btn_configure;
char * psz_duptip = NULL;
if ( p_item->psz_longtext != NULL && [NSApp getEncoding] == NSISOLatin1StringEncoding )
psz_duptip = strdup(p_item->psz_longtext);
#define MODULE_BUTTON( button, title, sel ) \
{ \
s_brc.size.height = 32; \
s_brc.origin.x += s_brc.size.width + 10; \
s_brc.size.width = s_crc.size.width - s_brc.origin.x - 10; \
button = [[NSButton alloc] initWithFrame: s_brc]; \
[button setButtonType: NSMomentaryPushInButton]; \
[button setBezelStyle: NSRoundedBezelStyle]; \
[button setTitle: title]; \
[button setTag: i_module_tag++]; \
<