* small clean-up, so the about-class is not needed in the main-nib anymore

diff --git a/extras/MacOSX/Resources/English.lproj/MainMenu.nib/classes.nib b/extras/MacOSX/Resources/English.lproj/MainMenu.nib/classes.nib
index dfcdc839b8858d8cb51f1eb28d2109cd743a49f3..1e0c4b19fb98985c307ab970d585216c5502aac4 100644 (file)
--- a/extras/MacOSX/Resources/English.lproj/MainMenu.nib/classes.nib
+++ b/extras/MacOSX/Resources/English.lproj/MainMenu.nib/classes.nib
@@ -113,6 +113,7 @@
                 openWebsite = id; 
                 reportABug = id; 
                 timesliderUpdate = id; 
+                viewAbout = id; 
                 viewPreferences = id; 
             }; 
             CLASS = VLCMain; 

diff --git a/extras/MacOSX/Resources/English.lproj/MainMenu.nib/info.nib b/extras/MacOSX/Resources/English.lproj/MainMenu.nib/info.nib
index 6af1c0e3a99e8a15f71f76d1b1e6d767959ca09f..ee2c196459843891d451127cdd86de1c365ad652 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>172 -174 505 517 0 0 1024 746 </string>
+       <string>47 61 505 517 0 0 800 578 </string>
        <key>IBEditorPositions</key>
        <dict>
                <key>1617</key>
@@ -11,7 +11,7 @@
                <key>2197</key>
                <string>237 313 596 367 0 0 1024 746 </string>
                <key>29</key>
-               <string>84 667 419 44 0 0 1024 746 </string>
+               <string>421 486 419 44 0 0 800 578 </string>
                <key>915</key>
                <string>731 416 165 180 0 0 1024 746 </string>
        </dict>
@@ -26,10 +26,9 @@
        </array>
        <key>IBOpenObjects</key>
        <array>
-               <integer>29</integer>
                <integer>21</integer>
        </array>
        <key>IBSystem Version</key>
-       <string>7R28</string>
+       <string>7S215</string>
 </dict>
 </plist>

diff --git a/extras/MacOSX/Resources/English.lproj/MainMenu.nib/objects.nib b/extras/MacOSX/Resources/English.lproj/MainMenu.nib/objects.nib
index 86ea5cd798acbfcf36d67aa5c677742c6afe30ad..77d6dd901be30c30c28cc44e411b3b1fabd783ca 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/about.h b/modules/gui/macosx/about.h
index d6ce84bdf902259aebfa2722a04fae1663aa90b5..a516be72ab895162f56c7eec13910852fdfcde3d 100644 (file)
--- a/modules/gui/macosx/about.h
+++ b/modules/gui/macosx/about.h
@@ -49,6 +49,6 @@
 }
 
 + (VLAboutBox *)sharedInstance;
-- (IBAction)showPanel:(id)sender;
+- (void)showPanel;
 
 @end

diff --git a/modules/gui/macosx/about.m b/modules/gui/macosx/about.m
index 048a424468318ef0824a4d4cb12672e2e48c1e20..9de9c918d63eb7633e4f3aa5bd879c0728eaddbe 100644 (file)
--- a/modules/gui/macosx/about.m
+++ b/modules/gui/macosx/about.m
@@ -50,7 +50,7 @@ static VLAboutBox *_o_sharedInstance = nil;
     return _o_sharedInstance;
 }
 
-- (IBAction)showPanel:(id)sender
+- (void)showPanel
 {    
     if (!o_credits_path)
     {

diff --git a/modules/gui/macosx/intf.h b/modules/gui/macosx/intf.h
index 278bdec77b993901964471b699b854f416e038f4..d39aeecbb073c8f458242c255f0f710218bf1681 100644 (file)
--- a/modules/gui/macosx/intf.h
+++ b/modules/gui/macosx/intf.h
@@ -82,6 +82,7 @@ struct intf_sys_t
 {
     intf_thread_t *p_intf;      /* The main intf object */
     id o_prefs;                 /* VLCPrefs       */
+    id o_about;                 /* VLAboutBox */
 
     IBOutlet id o_window;       /* main window    */
     IBOutlet id o_scrollfield;  /* info field     */
@@ -259,6 +260,7 @@ struct intf_sys_t
 - (IBAction)clearRecentItems:(id)sender;
 - (void)openRecentItem:(id)sender;
 
+- (IBAction)viewAbout:(id)sender;
 - (IBAction)viewPreferences:(id)sender;
 - (IBAction)closeError:(id)sender;
 - (IBAction)openReadMe:(id)sender;

diff --git a/modules/gui/macosx/intf.m b/modules/gui/macosx/intf.m
index afb39695c810c0067503f603740e1998340e1064..ce7710ee2220e0b2de882a612cc63f08176f7960 100644 (file)
--- a/modules/gui/macosx/intf.m
+++ b/modules/gui/macosx/intf.m
@@ -36,6 +36,7 @@
 #include "prefs.h"
 #include "playlist.h"
 #include "controls.h"
+#include "about.h"
 
 /*****************************************************************************
  * Local prototypes.
@@ -289,7 +290,9 @@ static VLCMain *_o_sharedMainInstance = nil;
     } else {
         _o_sharedMainInstance = [super init];
     }
-
+    
+    o_about = [[VLAboutBox alloc] init];
+    
     return _o_sharedMainInstance;
 }
 
@@ -1277,6 +1280,11 @@ static VLCMain *_o_sharedMainInstance = nil;
     [self application: nil openFile: [sender title]];
 }
 
+- (IBAction)viewAbout:(id)sender
+{
+    [o_about showPanel];
+}
+
 - (IBAction)viewPreferences:(id)sender
 {
     [o_prefs showPrefs];