Commit 1fc910ce authored by Felix Paul Kühne's avatar Felix Paul Kühne

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

parent 5b326764
...@@ -113,6 +113,7 @@ ...@@ -113,6 +113,7 @@
openWebsite = id; openWebsite = id;
reportABug = id; reportABug = id;
timesliderUpdate = id; timesliderUpdate = id;
viewAbout = id;
viewPreferences = id; viewPreferences = id;
}; };
CLASS = VLCMain; CLASS = VLCMain;
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
<plist version="1.0"> <plist version="1.0">
<dict> <dict>
<key>IBDocumentLocation</key> <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> <key>IBEditorPositions</key>
<dict> <dict>
<key>1617</key> <key>1617</key>
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
<key>2197</key> <key>2197</key>
<string>237 313 596 367 0 0 1024 746 </string> <string>237 313 596 367 0 0 1024 746 </string>
<key>29</key> <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> <key>915</key>
<string>731 416 165 180 0 0 1024 746 </string> <string>731 416 165 180 0 0 1024 746 </string>
</dict> </dict>
...@@ -26,10 +26,9 @@ ...@@ -26,10 +26,9 @@
</array> </array>
<key>IBOpenObjects</key> <key>IBOpenObjects</key>
<array> <array>
<integer>29</integer>
<integer>21</integer> <integer>21</integer>
</array> </array>
<key>IBSystem Version</key> <key>IBSystem Version</key>
<string>7R28</string> <string>7S215</string>
</dict> </dict>
</plist> </plist>
...@@ -49,6 +49,6 @@ ...@@ -49,6 +49,6 @@
} }
+ (VLAboutBox *)sharedInstance; + (VLAboutBox *)sharedInstance;
- (IBAction)showPanel:(id)sender; - (void)showPanel;
@end @end
...@@ -50,7 +50,7 @@ static VLAboutBox *_o_sharedInstance = nil; ...@@ -50,7 +50,7 @@ static VLAboutBox *_o_sharedInstance = nil;
return _o_sharedInstance; return _o_sharedInstance;
} }
- (IBAction)showPanel:(id)sender - (void)showPanel
{ {
if (!o_credits_path) if (!o_credits_path)
{ {
......
...@@ -82,6 +82,7 @@ struct intf_sys_t ...@@ -82,6 +82,7 @@ struct intf_sys_t
{ {
intf_thread_t *p_intf; /* The main intf object */ intf_thread_t *p_intf; /* The main intf object */
id o_prefs; /* VLCPrefs */ id o_prefs; /* VLCPrefs */
id o_about; /* VLAboutBox */
IBOutlet id o_window; /* main window */ IBOutlet id o_window; /* main window */
IBOutlet id o_scrollfield; /* info field */ IBOutlet id o_scrollfield; /* info field */
...@@ -259,6 +260,7 @@ struct intf_sys_t ...@@ -259,6 +260,7 @@ struct intf_sys_t
- (IBAction)clearRecentItems:(id)sender; - (IBAction)clearRecentItems:(id)sender;
- (void)openRecentItem:(id)sender; - (void)openRecentItem:(id)sender;
- (IBAction)viewAbout:(id)sender;
- (IBAction)viewPreferences:(id)sender; - (IBAction)viewPreferences:(id)sender;
- (IBAction)closeError:(id)sender; - (IBAction)closeError:(id)sender;
- (IBAction)openReadMe:(id)sender; - (IBAction)openReadMe:(id)sender;
......
...@@ -36,6 +36,7 @@ ...@@ -36,6 +36,7 @@
#include "prefs.h" #include "prefs.h"
#include "playlist.h" #include "playlist.h"
#include "controls.h" #include "controls.h"
#include "about.h"
/***************************************************************************** /*****************************************************************************
* Local prototypes. * Local prototypes.
...@@ -290,6 +291,8 @@ static VLCMain *_o_sharedMainInstance = nil; ...@@ -290,6 +291,8 @@ static VLCMain *_o_sharedMainInstance = nil;
_o_sharedMainInstance = [super init]; _o_sharedMainInstance = [super init];
} }
o_about = [[VLAboutBox alloc] init];
return _o_sharedMainInstance; return _o_sharedMainInstance;
} }
...@@ -1277,6 +1280,11 @@ static VLCMain *_o_sharedMainInstance = nil; ...@@ -1277,6 +1280,11 @@ static VLCMain *_o_sharedMainInstance = nil;
[self application: nil openFile: [sender title]]; [self application: nil openFile: [sender title]];
} }
- (IBAction)viewAbout:(id)sender
{
[o_about showPanel];
}
- (IBAction)viewPreferences:(id)sender - (IBAction)viewPreferences:(id)sender
{ {
[o_prefs showPrefs]; [o_prefs showPrefs];
......
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