- Use NSTextField instead of NSSearchfield for the playlist search, since it is not...

- Search now restarts at the beginning of the playlist when reaching the end.

diff --git a/extras/MacOSX/Resources/English.lproj/MainMenu.nib/classes.nib b/extras/MacOSX/Resources/English.lproj/MainMenu.nib/classes.nib
index fdf85b00bec3b17ffbdc126420367c375acc7143..fcb34e3ffae94ea5f1325b5b4357581026c2006c 100644 (file)
--- a/extras/MacOSX/Resources/English.lproj/MainMenu.nib/classes.nib
+++ b/extras/MacOSX/Resources/English.lproj/MainMenu.nib/classes.nib
@@ -339,6 +339,7 @@
                 "o_mi_selectall" = id; 
                 "o_random_ckb" = id; 
                 "o_repeat_ckb" = id; 
+                "o_search_button" = id; 
                 "o_search_keyword" = id; 
                 "o_status_field" = id; 
                 "o_table_view" = id; 

diff --git a/extras/MacOSX/Resources/English.lproj/MainMenu.nib/info.nib b/extras/MacOSX/Resources/English.lproj/MainMenu.nib/info.nib
index 116dfa27168e601ddac9690511017ef51e4a9272..3cbb07e2a1e9ecd8b87d3ed1791c3ace62a9a5ac 100644 (file)
--- a/extras/MacOSX/Resources/English.lproj/MainMenu.nib/info.nib
+++ b/extras/MacOSX/Resources/English.lproj/MainMenu.nib/info.nib
@@ -3,7 +3,7 @@
 <plist version="1.0">
 <dict>
        <key>IBDocumentLocation</key>
-       <string>31 168 505 541 0 0 1024 746 </string>
+       <string>497 164 505 541 0 0 1024 746 </string>
        <key>IBEditorPositions</key>
        <dict>
                <key>1617</key>
@@ -19,11 +19,10 @@
        <array/>
        <key>IBOpenObjects</key>
        <array>
-               <integer>915</integer>
-               <integer>21</integer>
-               <integer>636</integer>
                <integer>29</integer>
                <integer>1647</integer>
+               <integer>915</integer>
+               <integer>21</integer>
        </array>
        <key>IBSystem Version</key>
        <string>7C107</string>

diff --git a/extras/MacOSX/Resources/English.lproj/MainMenu.nib/objects.nib b/extras/MacOSX/Resources/English.lproj/MainMenu.nib/objects.nib
index 25825ca3d094dfb3cd663c87d800d7bb5517b658..aa2e3abbcd36ad383a0cd9f16975849a569bf67a 100644 (file)
Binary files a/extras/MacOSX/Resources/English.lproj/MainMenu.nib/objects.nib and b/extras/MacOSX/Resources/English.lproj/MainMenu.nib/objects.nib differ

diff --git a/modules/gui/macosx/playlist.h b/modules/gui/macosx/playlist.h
index 1a2bbd919064b978d76bfba565fcb2b272ce5db6..371a438f84d701586fc13140ff80f713d7c9f850 100644 (file)
--- a/modules/gui/macosx/playlist.h
+++ b/modules/gui/macosx/playlist.h
@@ -2,7 +2,7 @@
  * playlist.h: MacOS X interface plugin
  *****************************************************************************
  * Copyright (C) 2002-2003 VideoLAN
- * $Id: playlist.h,v 1.14 2003/11/17 13:05:17 bigben Exp $
+ * $Id: playlist.h,v 1.15 2003/11/17 23:36:12 bigben Exp $
  *
  * Authors: Jon Lech Johansen <jon-vl@nanocrew.net>
  *          Derk-Jan Hartman <thedj@users.sourceforge.net>
@@ -56,6 +56,7 @@
     IBOutlet id o_repeat_ckb;
 
     IBOutlet id o_search_keyword;
+    IBOutlet id o_search_button;
 
 }
 

diff --git a/modules/gui/macosx/playlist.m b/modules/gui/macosx/playlist.m
index f60b09c30a50574bfdf69beb160bb45c734921e6..91de639a5c797b0eda3a9e37d2a9f4d1cae61374 100644 (file)
--- a/modules/gui/macosx/playlist.m
+++ b/modules/gui/macosx/playlist.m
@@ -2,7 +2,7 @@
  * playlist.m: MacOS X interface plugin
  *****************************************************************************
  * Copyright (C) 2002-2003 VideoLAN
- * $Id: playlist.m,v 1.42 2003/11/17 19:05:03 hartman Exp $
+ * $Id: playlist.m,v 1.43 2003/11/17 23:36:12 bigben Exp $
  *
  * Authors: Jon Lech Johansen <jon-vl@nanocrew.net>
  *          Derk-Jan Hartman <thedj@users.sourceforge.net>
@@ -144,6 +144,7 @@
     [o_random_ckb setTitle: _NS("Random")];
     [o_loop_ckb setTitle: _NS("Repeat All")];
     [o_repeat_ckb setTitle: _NS("Repeat One")];
+    [o_search_button setTitle: _NS("Search")];
 
 
     vlc_value_t val;
@@ -163,8 +164,6 @@
 
         vlc_object_release( p_playlist );
     }
-
-
 }
 
 - (BOOL)tableView:(NSTableView *)o_tv 
@@ -285,7 +284,7 @@
 
 - (IBAction)searchItem:(id)sender
 {
-    int i_start, i_current;
+    int i_current = 0, i_counter;
     NSString *o_current_name;
     NSString *o_current_author;
 
@@ -298,16 +297,16 @@
         return;
     }
 
-    if ( [o_table_view selectedRow] == [o_table_view numberOfRows]-1 )
+    if ([o_table_view selectedRow] == [o_table_view numberOfRows]-1 )
     {
-         i_start = -1;
+        i_current = 0;
     }
-    else 
+    else
     {
-         i_start = [o_table_view selectedRow];
+        i_current = [o_table_view selectedRow]+1; 
     }
 
-    for ( i_current = i_start + 1 ; i_current < [o_table_view numberOfRows] ; i_current++ )
+    for ( i_counter = 0 ; i_counter < [o_table_view numberOfRows] ; i_counter++ )
     {
         vlc_mutex_lock( &p_playlist->object_lock );
         o_current_name = [NSString stringWithUTF8String: 
@@ -316,6 +315,7 @@
             p_playlist->pp_items[i_current]->psz_author];
         vlc_mutex_unlock( &p_playlist->object_lock );
 
+
         if( [o_current_name rangeOfString:[o_search_keyword stringValue] options:NSCaseInsensitiveSearch ].length ||
              [o_current_author rangeOfString:[o_search_keyword stringValue] options:NSCaseInsensitiveSearch ].length )
         {
@@ -323,8 +323,14 @@
              [o_table_view scrollRowToVisible: i_current];
              break;
         }
-        [o_table_view selectRow: i_start byExtendingSelection: NO];
-        [o_table_view scrollRowToVisible: i_start];
+        if ( i_current == [o_table_view numberOfRows] - 1 )
+        {
+             i_current = 0;
+        }
+        else
+        {
+             i_current++;
+        }
     }
     vlc_object_release( p_playlist );
 }