Commit 9f5bed00 authored by David Fuhrmann's avatar David Fuhrmann

macosx: save debug log to rtf instead rtfd

parent 8af1d49f
...@@ -2117,13 +2117,12 @@ unsigned int CocoaKeyToVLC( unichar i_key ) ...@@ -2117,13 +2117,12 @@ unsigned int CocoaKeyToVLC( unichar i_key )
[saveFolderPanel setCanSelectHiddenExtension: NO]; [saveFolderPanel setCanSelectHiddenExtension: NO];
[saveFolderPanel setCanCreateDirectories: YES]; [saveFolderPanel setCanCreateDirectories: YES];
[saveFolderPanel setAllowedFileTypes: [NSArray arrayWithObject:@"rtfd"]]; [saveFolderPanel setAllowedFileTypes: [NSArray arrayWithObject:@"rtf"]];
[saveFolderPanel beginSheetForDirectory:nil file: [NSString stringWithFormat: _NS("VLC Debug Log (%s).rtfd"), VERSION_MESSAGE] modalForWindow: o_msgs_panel modalDelegate:self didEndSelector:@selector(saveDebugLogAsRTF:returnCode:contextInfo:) contextInfo:nil]; [saveFolderPanel beginSheetForDirectory:nil file: [NSString stringWithFormat: _NS("VLC Debug Log (%s).rtf"), VERSION_MESSAGE] modalForWindow: o_msgs_panel modalDelegate:self didEndSelector:@selector(saveDebugLogAsRTF:returnCode:contextInfo:) contextInfo:nil];
} }
- (void)saveDebugLogAsRTF: (NSSavePanel *)sheet returnCode: (int)returnCode contextInfo: (void *)contextInfo - (void)saveDebugLogAsRTF: (NSSavePanel *)sheet returnCode: (int)returnCode contextInfo: (void *)contextInfo
{ {
BOOL b_returned;
if( returnCode == NSOKButton ) if( returnCode == NSOKButton )
{ {
NSUInteger count = [o_msg_arr count]; NSUInteger count = [o_msg_arr count];
...@@ -2132,11 +2131,14 @@ unsigned int CocoaKeyToVLC( unichar i_key ) ...@@ -2132,11 +2131,14 @@ unsigned int CocoaKeyToVLC( unichar i_key )
{ {
[string appendAttributedString: [o_msg_arr objectAtIndex: i]]; [string appendAttributedString: [o_msg_arr objectAtIndex: i]];
} }
b_returned = [[string RTFDFileWrapperFromRange:NSMakeRange( 0, [string length] ) documentAttributes:[NSDictionary dictionaryWithObject: NSRTFDTextDocumentType forKey: NSDocumentTypeDocumentAttribute]] writeToFile:[[sheet URL] path] atomically:YES updateFilenames:NO];
[string release];
if(! b_returned ) NSData *data = [string RTFFromRange:NSMakeRange( 0, [string length] )
documentAttributes:[NSDictionary dictionaryWithObject: NSRTFTextDocumentType forKey: NSDocumentTypeDocumentAttribute]];
if( [data writeToFile: [[sheet URL] path] atomically: YES] == NO )
msg_Warn( p_intf, "Error while saving the debug log" ); msg_Warn( p_intf, "Error while saving the debug log" );
[string release];
} }
} }
......
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