* ALL: ported the WX-bookmarks-window to Cocoa (closes #22)

    - complete functionality except "Extract" (I'm going to fix that next week)
* MainMenu.nib: re-orded the window-menu a bit
* wizard.*: added a method to launch it from the bookmarks

Makefile.am

@@ -164,6 +164,9 @@ EXTRA_DIST += \
 	extras/MacOSX/Resources/English.lproj/Wizard.nib/classes.nib \
 	extras/MacOSX/Resources/English.lproj/Wizard.nib/info.nib \
 	extras/MacOSX/Resources/English.lproj/Wizard.nib/keyedobjects.nib \
+    extras/MacOSX/Resources/English.lproj/Bookmarks.nib/classes.nib \
+	extras/MacOSX/Resources/English.lproj/Bookmarks.nib/info.nib \
+	extras/MacOSX/Resources/English.lproj/Bookmarks.nib/keyedobjects.nib \
 	extras/MacOSX/Resources/English.lproj/InfoPlist.strings \
 	extras/MacOSX/Resources/a52.icns \
 	extras/MacOSX/Resources/aac.icns \
@@ -563,6 +566,8 @@ VLC-release.app: vlc
 	    wizard.m \
 	    extended.h \
 	    extended.m \
+        bookmarks.h \
+        bookmarks.m \
 	    vout.m; do \
 	  cp "$(srcdir)/modules/gui/macosx/$$i" \
              $(top_builddir)/tmp/modules/gui/macosx; \
@@ -576,9 +581,9 @@ VLC-release.app: vlc
 	    cd ../../../; \
 	    cp -r $(top_builddir)/tmp/extras/MacOSX/build/VLC.bundle \
 	          $(top_builddir)/VLC-release.app;; \
-	  *darwin8*) cd $(top_builddir)/tmp/extras/MacOSX && xcodebuild -target vlc | grep -v '^\([ \t]\|$$\)'; \
+	  *darwin8*) cd $(top_builddir)/tmp/extras/Default/MacOSX && xcodebuild -target vlc | grep -v '^\([ \t]\|$$\)'; \
 	    cd ../../../; \
-	    cp -r $(top_builddir)/tmp/extras/MacOSX/build/Default/VLC.bundle \
+	    cp -r $(top_builddir)/tmp/extras/MacOSX/build/VLC.bundle \
 	          $(top_builddir)/VLC-release.app;; \
 	esac
 	rm -Rf $(top_builddir)/tmp
@@ -675,6 +680,8 @@ VLC.app: vlc
 	    wizard.m \
 	    extended.h \
 	    extended.m \
+        bookmarks.h \
+        bookmarks.m \
 	    vout.m; do \
 	  cp "$(srcdir)/modules/gui/macosx/$$i" \
              $(top_builddir)/tmp/modules/gui/macosx; \
@@ -688,9 +695,9 @@ VLC.app: vlc
 	    cd ../../../; \
 	    cp -r $(top_builddir)/tmp/extras/MacOSX/build/VLC.bundle \
 	          $(top_builddir)/VLC.app;; \
-	  *darwin8*) cd $(top_builddir)/tmp/extras/MacOSX && xcodebuild -target vlc | grep -v '^\([ \t]\|$$\)'; \
+	  *darwin8*) cd $(top_builddir)/tmp/extras/Default/MacOSX && xcodebuild -target vlc | grep -v '^\([ \t]\|$$\)'; \
 	    cd ../../../; \
-	    cp -r $(top_builddir)/tmp/extras/MacOSX/build/Default/VLC.bundle \
+	    cp -r $(top_builddir)/tmp/extras/MacOSX/build/VLC.bundle \
 	          $(top_builddir)/VLC.app;; \
 	esac
 	rm -Rf $(top_builddir)/tmp

extras/MacOSX/Resources/English.lproj/Bookmarks.nib/classes.nib

+{
+    IBClasses = (
+        {CLASS = FirstResponder; LANGUAGE = ObjC; SUPERCLASS = NSObject; }, 
+        {
+            ACTIONS = {
+                add = id; 
+                clear = id; 
+                edit = id; 
+                "edit_cancel" = id; 
+                "edit_ok" = id; 
+                extract = id; 
+                goToBookmark = id; 
+                myAction = id; 
+                remove = id; 
+            }; 
+            CLASS = VLCBookmarks; 
+            LANGUAGE = ObjC; 
+            OUTLETS = {
+                "o_bookmarks_window" = id; 
+                "o_btn_add" = id; 
+                "o_btn_clear" = id; 
+                "o_btn_edit" = id; 
+                "o_btn_extract" = id; 
+                "o_btn_rm" = id; 
+                "o_edit_btn_cancel" = id; 
+                "o_edit_btn_ok" = id; 
+                "o_edit_fld_bytes" = id; 
+                "o_edit_fld_name" = id; 
+                "o_edit_fld_time" = id; 
+                "o_edit_lbl_bytes" = id; 
+                "o_edit_lbl_name" = id; 
+                "o_edit_lbl_time" = id; 
+                "o_edit_window" = id; 
+                "o_tbl_dataTable" = id; 
+            }; 
+            SUPERCLASS = NSObject; 
+        }
+    ); 
+    IBVersion = 1; 
+}
\ No newline at end of file

extras/MacOSX/Resources/English.lproj/Bookmarks.nib/info.nib

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>IBDocumentLocation</key>
+	<string>69 67 356 240 0 0 1440 878 </string>
+	<key>IBFramework Version</key>
+	<string>437.0</string>
+	<key>IBOpenObjects</key>
+	<array>
+		<integer>38</integer>
+		<integer>5</integer>
+	</array>
+	<key>IBSystem Version</key>
+	<string>8C46</string>
+</dict>
+</plist>

extras/MacOSX/Resources/English.lproj/MainMenu.nib/classes.nib

@@ -107,6 +107,7 @@
                 openRecentItem = id; 
                 openWebsite = id; 
                 reportABug = id; 
+                showBookmarks = id; 
                 showExtended = id; 
                 showWizard = id; 
                 timesliderUpdate = id; 
@@ -143,6 +144,7 @@
                 "o_mi_about" = id; 
                 "o_mi_add_intf" = id; 
                 "o_mi_audiotrack" = id; 
+                "o_mi_bookmarks" = id; 
                 "o_mi_bring_atf" = id; 
                 "o_mi_bwd" = id; 
                 "o_mi_channels" = id; 

extras/MacOSX/Resources/English.lproj/MainMenu.nib/info.nib

@@ -21,8 +21,8 @@
 	<array/>
 	<key>IBOpenObjects</key>
 	<array>
-		<integer>29</integer>
 		<integer>2029</integer>
+		<integer>29</integer>
 		<integer>21</integer>
 	</array>
 	<key>IBSystem Version</key>

extras/MacOSX/vlc.pbproj/project.pbxproj

@@ -826,6 +826,7 @@
 				DCA693C30789DF8700139EC6,
 				DCFCCDB9085CE18F001E36AF,
 				DC7F46ED08A183FC0027DB24,
+				DCE7BD0508A56C8B007B10AE,
 			);
 			isa = PBXResourcesBuildPhase;
 			runOnlyForDeploymentPostprocessing = 0;
@@ -910,6 +911,8 @@
 				DC769AB7085DF0DB001A838D,
 				DC7F46F008A187F60027DB24,
 				DC7F46F108A187F60027DB24,
+				DCE7BD0708A5724D007B10AE,
+				DCE7BD0608A5724D007B10AE,
 			);
 			isa = PBXGroup;
 			name = Classes;
@@ -2291,6 +2294,48 @@
 			settings = {
 			};
 		};
+		DCE7BD0308A56C8B007B10AE = {
+			children = (
+				DCE7BD0408A56C8B007B10AE,
+			);
+			isa = PBXVariantGroup;
+			name = Bookmarks.nib;
+			path = "";
+			refType = 4;
+			sourceTree = "<group>";
+		};
+		DCE7BD0408A56C8B007B10AE = {
+			isa = PBXFileReference;
+			lastKnownFileType = wrapper.nib;
+			name = English;
+			path = Resources/English.lproj/Bookmarks.nib;
+			refType = 4;
+			sourceTree = "<group>";
+		};
+		DCE7BD0508A56C8B007B10AE = {
+			fileRef = DCE7BD0308A56C8B007B10AE;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
+		DCE7BD0608A5724D007B10AE = {
+			fileEncoding = 30;
+			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.objc;
+			name = bookmarks.m;
+			path = ../../modules/gui/macosx/bookmarks.m;
+			refType = 2;
+			sourceTree = SOURCE_ROOT;
+		};
+		DCE7BD0708A5724D007B10AE = {
+			fileEncoding = 30;
+			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.h;
+			name = bookmarks.h;
+			path = ../../modules/gui/macosx/bookmarks.h;
+			refType = 2;
+			sourceTree = SOURCE_ROOT;
+		};
 		DCF358B9077F10BA007DB450 = {
 			children = (
 				DCF358BA077F10BA007DB450,
@@ -2323,6 +2368,7 @@
 				DCA693C10789DF8700139EC6,
 				DCFCCDB7085CE18F001E36AF,
 				DC7F46EB08A183FC0027DB24,
+				DCE7BD0308A56C8B007B10AE,
 			);
 			isa = PBXGroup;
 			name = nibs;

modules/gui/macosx/Modules.am

@@ -32,5 +32,7 @@ SOURCES_macosx = \
 	wizard.m \
 	extended.h \
 	extended.m \
+    bookmarks.h \
+    bookmarks.m \
 	$(NULL)
 

modules/gui/macosx/bookmarks.h

+/*****************************************************************************
+ * bookmarks.h: MacOS X Bookmarks window
+ *****************************************************************************
+ * Copyright (C) 2005 the VideoLAN team
+ * $Id$
+ *
+ * Authors: Felix Khne <fkuehne@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
+ * 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
+ * GNU General Public License for more details.
+ *
+ * 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.
+ *****************************************************************************/
+
+#import <Cocoa/Cocoa.h>
+#import <vlc/vlc.h>
+
+@interface VLCBookmarks : NSObject
+{
+    /* main window */
+    IBOutlet id o_bookmarks_window;
+    IBOutlet id o_btn_add;
+    IBOutlet id o_btn_clear;
+    IBOutlet id o_btn_edit;
+    IBOutlet id o_btn_extract;
+    IBOutlet id o_btn_rm;
+    IBOutlet id o_tbl_dataTable;
+    
+    /* edit window */
+    IBOutlet id o_edit_window;
+    IBOutlet id o_edit_btn_ok;
+    IBOutlet id o_edit_btn_cancel;
+    IBOutlet id o_edit_lbl_name;
+    IBOutlet id o_edit_lbl_time;
+    IBOutlet id o_edit_lbl_bytes;
+    IBOutlet id o_edit_fld_name;
+    IBOutlet id o_edit_fld_time;
+    IBOutlet id o_edit_fld_bytes;
+    
+    input_thread_t *p_old_input;
+}
+
+- (IBAction)add:(id)sender;
+- (IBAction)clear:(id)sender;
+- (IBAction)edit:(id)sender;
+- (IBAction)extract:(id)sender;
+- (IBAction)remove:(id)sender;
+- (IBAction)goToBookmark:(id)sender;
+
+- (IBAction)edit_cancel:(id)sender;
+- (IBAction)edit_ok:(id)sender;
+
++ (VLCBookmarks *)sharedInstance;
+
+- (void)initStrings;
+- (void)showBookmarks;
+- (id)getDataTable;
+@end

modules/gui/macosx/intf.h

@@ -92,10 +92,12 @@ struct intf_sys_t
     id o_open;                  /* VLCOpen        */
     id o_wizard;                /* VLCWizard      */
     id o_extended;              /* VLCExtended    */
+    id o_bookmarks;             /* VLCBookmarks   */
     BOOL nib_open_loaded;       /* reference to the open-nib */
     BOOL nib_about_loaded;      /* reference to the about-nib */
     BOOL nib_wizard_loaded;     /* reference to the wizard-nib */
     BOOL nib_extended_loaded;   /* reference to the extended-nib */
+    BOOL nib_bookmarks_loaded;  /* reference to the bookmarks-nib */ 
 
     IBOutlet id o_window;       /* main window    */
     IBOutlet id o_playlist_view;/* playlist view  */
@@ -229,6 +231,7 @@ struct intf_sys_t
     IBOutlet id o_mi_controller;
     IBOutlet id o_mi_equalizer;
     IBOutlet id o_mi_extended;
+    IBOutlet id o_mi_bookmarks;
     IBOutlet id o_mi_playlist;
     IBOutlet id o_mi_info;
     IBOutlet id o_mi_messages;
@@ -266,6 +269,7 @@ struct intf_sys_t
 - (id)getPlaylist;
 - (id)getInfo;
 - (id)getWizard;
+- (id)getBookmarks;
 - (void)terminate;
 - (NSString *)localizedString:(char *)psz;
 - (char *)delocalizeString:(NSString *)psz;
@@ -296,6 +300,7 @@ struct intf_sys_t
 
 - (IBAction)showWizard:(id)sender;
 - (IBAction)showExtended:(id)sender;
+- (IBAction)showBookmarks:(id)sender;
 
 - (IBAction)viewAbout:(id)sender;
 - (IBAction)viewPreferences:(id)sender;

modules/gui/macosx/intf.m

@@ -40,7 +40,7 @@
 #include "open.h"
 #include "wizard.h"
 #include "extended.h"
-//#include "bookmarks.h"
+#include "bookmarks.h"
 
 /*****************************************************************************
  * Local prototypes.
@@ -301,7 +301,7 @@ static VLCMain *_o_sharedMainInstance = nil;
     o_open = [[VLCOpen alloc] init];
     o_wizard = [[VLCWizard alloc] init];
     o_extended = [[VLCExtended alloc] init];
-    //o_bookmarks = [[VLCBookmarks alloc] init];
+    o_bookmarks = [[VLCBookmarks alloc] init];
 
     i_lastShownVolume = -1;
     return _o_sharedMainInstance;
@@ -432,7 +432,7 @@ static VLCMain *_o_sharedMainInstance = nil;
     [o_prefs release];
     [o_open release];
     [o_extended release];
-    //[o_bookmarks release];
+    [o_bookmarks release];
     
     [super dealloc];
 }
@@ -543,7 +543,7 @@ static VLCMain *_o_sharedMainInstance = nil;
     [o_mi_controller setTitle: _NS("Controller")];
     [o_mi_equalizer setTitle: _NS("Equalizer")];
     [o_mi_extended setTitle: _NS("Extended controls")];
-    //[o_mi_bookmarks setTitle: _NS("Bookmarks")];
+    [o_mi_bookmarks setTitle: _NS("Bookmarks")];
     [o_mi_playlist setTitle: _NS("Playlist")];
     [o_mi_info setTitle: _NS("Info")];
     [o_mi_messages setTitle: _NS("Messages")];
@@ -566,8 +566,10 @@ static VLCMain *_o_sharedMainInstance = nil;
 
     /* error panel */
     [o_error setTitle: _NS("Error")];
-    [o_err_lbl setStringValue: _NS("An error has occurred which probably prevented the execution of your request:")];
-    [o_err_bug_lbl setStringValue: _NS("If you believe that it is a bug, please follow the instructions at:")];
+    [o_err_lbl setStringValue: _NS("An error has occurred which probably " \
+        "prevented the execution of your request:")];
+    [o_err_bug_lbl setStringValue: _NS("If you believe that it is a bug, " \
+        "please follow the instructions at:")];
     [o_err_btn_msgs setTitle: _NS("Open Messages Window")];
     [o_err_btn_dismiss setTitle: _NS("Dismiss")];
     [o_err_ckbk_surpress setTitle: _NS("Suppress further errors")];
@@ -792,6 +794,15 @@ static VLCMain *_o_sharedMainInstance = nil;
     return nil;
 }
 
+- (id)getBookmarks
+{
+    if ( o_bookmarks )
+    {
+        return o_bookmarks;
+    }
+    return nil;
+}
+
 - (void)manage
 {
     NSDate * o_sleep_date;
@@ -1463,14 +1474,22 @@ static VLCMain *_o_sharedMainInstance = nil;
     {
         nib_wizard_loaded = [NSBundle loadNibNamed:@"Wizard" owner:self];
         [o_wizard initStrings];
+        [o_wizard resetWizard];
         [o_wizard showWizard];
     } else {
+        [o_wizard resetWizard];
         [o_wizard showWizard];
     }
 }
 
 - (IBAction)showExtended:(id)sender
 {
+    /* we need the wizard-nib for the bookmarks's extract functionality */
+    if (!nib_wizard_loaded)
+    {
+        nib_wizard_loaded = [NSBundle loadNibNamed:@"Wizard" owner:self];
+    }
+
     if (!nib_extended_loaded)
     {
         nib_extended_loaded = [NSBundle loadNibNamed:@"Extended" owner:self];
@@ -1481,17 +1500,16 @@ static VLCMain *_o_sharedMainInstance = nil;
     }
 }
 
-/*- (IBAction)showBookmarks:(id)sender
+- (IBAction)showBookmarks:(id)sender
 {
     if (!nib_bookmarks_loaded)
     {
         nib_bookmarks_loaded = [NSBundle loadNibNamed:@"Bookmarks" owner:self];
-        [o_bookmarks initStrings];
-        [o_bookmarks showPanel];
+        [o_bookmarks showBookmarks];
     } else {
-        [o_bookmarks showPanel];
+        [o_bookmarks showBookmarks];
     }
-}*/
+}
 
 - (IBAction)viewAbout:(id)sender
 {

modules/gui/macosx/playlist.m

@@ -45,7 +45,8 @@
 #include <vlc_keys.h>
 
 #include "intf.h"
-#include "wizard.h"
+#import "wizard.h"
+#import "bookmarks.h"
 #include "playlist.h"
 #include "controls.h"
 #include "osd.h"
@@ -524,6 +525,7 @@ belongs to an Apple hidden private API, and then can "disapear" at any time*/
     //[o_outline_dict removeAllObjects];
     [o_outline_view reloadData];
     [[[[VLCMain sharedInstance] getWizard] getPlaylistWizard] reloadOutlineView];
+    [[[[VLCMain sharedInstance] getBookmarks] getDataTable] reloadData];
 }
 
 - (void)playModeUpdated

modules/gui/macosx/wizard.h

@@ -173,5 +173,7 @@
 - (void)createOpts;
 - (void)rebuildCodecMenus;
 - (id)getPlaylistWizard;
+- (void)initWithExtractValuesFrom: (NSString *)from to: (NSString *)to \
+    ofItem: (NSString *)item;
 
 @end

modules/gui/macosx/wizard.m

@@ -287,8 +287,6 @@ static VLCWizard *_o_sharedInstance = nil;
     /* just present the window to the user */
     [o_tab_pageHolder selectFirstTabViewItem:self];
 
-    [self resetWizard];
-
     [o_wizard_window center];
     [o_wizard_window displayIfNeeded];
     [o_wizard_window makeKeyAndOrderFront:nil];
@@ -459,6 +457,28 @@ static VLCWizard *_o_sharedInstance = nil;
     [o_wh_btn_okay setTitle: _NS("OK")];
 }
 
+- (void)initWithExtractValuesFrom: (NSString *)from to: (NSString *)to \
+    ofItem: (NSString *)item
+{
+    [self resetWizard];
+    msg_Dbg(VLCIntf, "wizard was resetted");
+    [o_userSelections setObject:@"trnscd" forKey:@"trnscdOrStrmg"];
+    [o_btn_backward setEnabled:YES];
+    [o_tab_pageHolder selectTabViewItemAtIndex:1];
+    [o_t2_fld_prtExtrctFrom setStringValue: from];
+    [o_t2_fld_prtExtrctTo setStringValue: to];
+    [o_t2_fld_pathToNewStrm setStringValue: item];
+    [o_t1_matrix_strmgOrTrnscd selectCellAtRow:1 column:0];
+    [[o_t1_matrix_strmgOrTrnscd cellAtRow:0 column:0] setState: NSOffState];
+    [o_t2_ckb_enblPartExtrct setState: NSOnState];
+    msg_Dbg(VLCIntf, "wizard interface is set");
+    
+    [o_wizard_window center];
+    [o_wizard_window display];
+    [o_wizard_window makeKeyAndOrderFront:nil];
+    msg_Dbg(VLCIntf, "wizard window displayed");
+}
+
 - (IBAction)cancelRun:(id)sender
 {
     [o_wizard_window close];