Commit b8afd5b8 authored by Derk-Jan Hartman's avatar Derk-Jan Hartman

* added a "Open CrashLog" button to the messages window in OSX.

parent 0e925ba0
...@@ -34,6 +34,7 @@ ...@@ -34,6 +34,7 @@
ACTIONS = { ACTIONS = {
clearRecentItems = id; clearRecentItems = id;
closeError = id; closeError = id;
openCrashLog = id;
openLicense = id; openLicense = id;
openReadMe = id; openReadMe = id;
openRecentItem = id; openRecentItem = id;
...@@ -112,6 +113,7 @@ ...@@ -112,6 +113,7 @@
"o_mi_vol_down" = id; "o_mi_vol_down" = id;
"o_mi_vol_up" = id; "o_mi_vol_up" = id;
"o_mi_website" = id; "o_mi_website" = id;
"o_msgs_btn_crashog" = id;
"o_msgs_btn_ok" = id; "o_msgs_btn_ok" = id;
"o_msgs_panel" = id; "o_msgs_panel" = id;
"o_mu_audio" = id; "o_mu_audio" = id;
......
...@@ -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>282 82 365 441 0 0 1152 746 </string> <string>913 -102 365 441 0 0 1280 1002 </string>
<key>IBEditorPositions</key> <key>IBEditorPositions</key>
<dict> <dict>
<key>29</key> <key>29</key>
...@@ -25,7 +25,6 @@ ...@@ -25,7 +25,6 @@
<array> <array>
<integer>21</integer> <integer>21</integer>
<integer>29</integer> <integer>29</integer>
<integer>303</integer>
</array> </array>
<key>IBSystem Version</key> <key>IBSystem Version</key>
<string>6G30</string> <string>6G30</string>
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* intf.h: MacOS X interface plugin * intf.h: MacOS X interface plugin
***************************************************************************** *****************************************************************************
* Copyright (C) 2002 VideoLAN * Copyright (C) 2002 VideoLAN
* $Id: intf.h,v 1.21 2003/02/05 01:36:00 hartman Exp $ * $Id: intf.h,v 1.22 2003/02/05 16:23:06 hartman Exp $
* *
* Authors: Jon Lech Johansen <jon-vl@nanocrew.net> * Authors: Jon Lech Johansen <jon-vl@nanocrew.net>
* Christophe Massiot <massiot@via.ecp.fr> * Christophe Massiot <massiot@via.ecp.fr>
...@@ -117,6 +117,7 @@ struct intf_sys_t ...@@ -117,6 +117,7 @@ struct intf_sys_t
IBOutlet id o_msgs_btn_ok; /* messages btn */ IBOutlet id o_msgs_btn_ok; /* messages btn */
NSMutableArray * o_msg_arr; /* messages array */ NSMutableArray * o_msg_arr; /* messages array */
NSLock * o_msg_lock; /* messages lock */ NSLock * o_msg_lock; /* messages lock */
IBOutlet id o_msgs_btn_crashlog; /* messages open crashlog */
IBOutlet id o_error; /* error panel */ IBOutlet id o_error; /* error panel */
IBOutlet id o_err_msg; /* NSTextView */ IBOutlet id o_err_msg; /* NSTextView */
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* intf.m: MacOS X interface plugin * intf.m: MacOS X interface plugin
***************************************************************************** *****************************************************************************
* Copyright (C) 2002-2003 VideoLAN * Copyright (C) 2002-2003 VideoLAN
* $Id: intf.m,v 1.45 2003/02/05 01:36:00 hartman Exp $ * $Id: intf.m,v 1.46 2003/02/05 16:23:06 hartman Exp $
* *
* Authors: Jon Lech Johansen <jon-vl@nanocrew.net> * Authors: Jon Lech Johansen <jon-vl@nanocrew.net>
* Christophe Massiot <massiot@via.ecp.fr> * Christophe Massiot <massiot@via.ecp.fr>
...@@ -262,6 +262,7 @@ int ExecuteOnMainThread( id target, SEL sel, void * p_arg ) ...@@ -262,6 +262,7 @@ int ExecuteOnMainThread( id target, SEL sel, void * p_arg )
[o_msgs_panel setTitle: _NS("Messages")]; [o_msgs_panel setTitle: _NS("Messages")];
[o_msgs_panel setExcludedFromWindowsMenu: TRUE]; [o_msgs_panel setExcludedFromWindowsMenu: TRUE];
[o_msgs_btn_ok setTitle: _NS("Close")]; [o_msgs_btn_ok setTitle: _NS("Close")];
[o_msgs_btn_crashlog setTitle: _NS("Open CrashLog")];
/* main menu */ /* main menu */
[o_mi_about setTitle: _NS("About VLC Media Player")]; [o_mi_about setTitle: _NS("About VLC Media Player")];
...@@ -1387,6 +1388,24 @@ int ExecuteOnMainThread( id target, SEL sel, void * p_arg ) ...@@ -1387,6 +1388,24 @@ int ExecuteOnMainThread( id target, SEL sel, void * p_arg )
withApplication: @"TextEdit"]; withApplication: @"TextEdit"];
} }
- (IBAction)openCrashLog:(id)sender
{
NSString * o_path = [@"~/Library/Logs/CrashReporter/vlc.crash.log"
stringByExpandingTildeInPath];
if ( [[NSFileManager defaultManager] fileExistsAtPath: o_path ] )
{
[[NSWorkspace sharedWorkspace] openFile: o_path
withApplication: @"Console"];
}
else
{
NSBeginInformationalAlertSheet(_NS("No CrashLog found"), @"Continue", nil, nil, o_msgs_panel, self, NULL, NULL, nil, _NS("Either you are running Mac OS X pre 10.2 or you haven't experienced any heavy crashes yet.") );
}
}
- (void)windowDidBecomeKey:(NSNotification *)o_notification - (void)windowDidBecomeKey:(NSNotification *)o_notification
{ {
if( [o_notification object] == o_msgs_panel ) if( [o_notification object] == o_msgs_panel )
......
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