Commit 7dd8cdfd authored by Jérome Decoodt's avatar Jérome Decoodt

Change the searchField in NSSearchField when macos >= 10.3

Move MACOS_VERSION macro to intf.h
parent c37c7fd5
......@@ -45,6 +45,10 @@ unsigned int CocoaKeyToVLC( unichar i_key );
* the translated string. the translation should be '1:translatedstring' though */
#define _ANS(s) [[[VLCMain sharedInstance] localizedString: _(s)] substringFromIndex:2]
#define MACOS_VERSION [[[NSDictionary dictionaryWithContentsOfFile: \
@"/System/Library/CoreServices/SystemVersion.plist"] \
objectForKey: @"ProductVersion"] floatValue]
/*****************************************************************************
* intf_sys_t: description and status of the interface
*****************************************************************************/
......
......@@ -78,6 +78,7 @@
}
- (void)initStrings;
- (void)searchfieldChanged:(NSNotification *)o_notification;
- (NSMenu *)menuForEvent:(NSEvent *)o_event;
- (NSOutlineView *)outlineView;
......
......@@ -187,10 +187,35 @@ belongs to an Apple hidden private API, and then can "disapear" at any time*/
vlc_list_release( p_list );
vlc_object_release( p_playlist );
/* Change the simple textfield into a searchField if we can... */
if( MACOS_VERSION >= 10.3 )
{
NSView *o_parentview = [o_status_field superview];
NSSearchField *o_better_search_field = [[NSSearchField alloc]initWithFrame:[o_search_field frame]];
[o_better_search_field setRecentsAutosaveName:@"VLC media player search"];
[o_better_search_field setDelegate:self];
[[NSNotificationCenter defaultCenter] addObserver: self
selector: @selector(searchfieldChanged:)
name: NSControlTextDidChangeNotification
object: o_better_search_field];
[o_better_search_field setTarget:self];
[o_better_search_field setAction:@selector(searchItem:)];
[o_better_search_field setAutoresizingMask:NSViewMinXMargin];
[o_parentview addSubview:o_better_search_field];
[o_search_field setHidden:YES];
}
[self initStrings];
//[self playlistUpdated];
}
- (void)searchfieldChanged:(NSNotification *)o_notification
{
[o_search_field setStringValue:[[o_notification object] stringValue]];
}
- (void)initStrings
{
[o_mi_save_playlist setTitle: _NS("Save Playlist...")];
......@@ -838,7 +863,6 @@ belongs to an Apple hidden private API, and then can "disapear" at any time*/
if( p_playlist == NULL )
return;
p_view = playlist_ViewFind( p_playlist, i_current_view );
if( p_view )
......
......@@ -38,10 +38,6 @@
#define OFFSET_RIGHT 20
#define OFFSET_BETWEEN 2
#define MACOS_VERSION [[[NSDictionary dictionaryWithContentsOfFile: \
@"/System/Library/CoreServices/SystemVersion.plist"] \
objectForKey: @"ProductVersion"] floatValue]
#define UPWARDS_WHITE_ARROW "\xE2\x87\xA7"
#define OPTION_KEY "\xE2\x8C\xA5"
#define UP_ARROWHEAD "\xE2\x8C\x83"
......
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