macOS: Remove BWQuincyKit crash reporter
authorMarvin Scholz <epirat07@gmail.com>
Wed, 15 Mar 2017 13:09:15 +0000 (14:09 +0100)
committerMarvin Scholz <epirat07@gmail.com>
Wed, 15 Mar 2017 13:09:15 +0000 (14:09 +0100)
Breakpad is used now, so Quincy is no longer necessary.

extras/package/macosx/VLC.xcodeproj/project.pbxproj
modules/gui/macosx/BWQuincyManager.h [deleted file]
modules/gui/macosx/BWQuincyManager.m [deleted file]
modules/gui/macosx/BWQuincyUI.h [deleted file]
modules/gui/macosx/BWQuincyUI.m [deleted file]
modules/gui/macosx/Makefile.am
modules/gui/macosx/UI/BWQuincyMain.xib [deleted file]
modules/gui/macosx/VLCMain.m

index 9250957..31411ac 100644 (file)
                1C3113FB1E508C7600D4DD76 /* VLCHUDRadiobuttonCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 6B846FE11CF5D88C00112E54 /* VLCHUDRadiobuttonCell.m */; };
                1C3113FC1E508C7600D4DD76 /* VLCHUDSliderCell.h in Sources */ = {isa = PBXBuildFile; fileRef = 6B846FE21CF5D88C00112E54 /* VLCHUDSliderCell.h */; };
                1C3113FD1E508C7600D4DD76 /* VLCHUDSliderCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 6B846FE31CF5D88C00112E54 /* VLCHUDSliderCell.m */; };
-               1C3113FE1E508C8800D4DD76 /* BWQuincyManager.h in Sources */ = {isa = PBXBuildFile; fileRef = 7D3F652618805297005776C4 /* BWQuincyManager.h */; };
-               1C3113FF1E508C8800D4DD76 /* BWQuincyManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 7D3F652718805297005776C4 /* BWQuincyManager.m */; };
-               1C3114001E508C8800D4DD76 /* BWQuincyUI.h in Sources */ = {isa = PBXBuildFile; fileRef = 7D3F652818805297005776C4 /* BWQuincyUI.h */; };
-               1C3114011E508C8800D4DD76 /* BWQuincyUI.m in Sources */ = {isa = PBXBuildFile; fileRef = 7D3F652918805297005776C4 /* BWQuincyUI.m */; };
                1C3114021E508C8800D4DD76 /* AppleRemote.h in Sources */ = {isa = PBXBuildFile; fileRef = CC6D8D9C0A878DED006F2BBE /* AppleRemote.h */; };
                1C3114031E508C8800D4DD76 /* AppleRemote.m in Sources */ = {isa = PBXBuildFile; fileRef = CC6D8D9D0A878DED006F2BBE /* AppleRemote.m */; };
                1C3114041E508C8800D4DD76 /* SideBarItem.h in Sources */ = {isa = PBXBuildFile; fileRef = CCCDDEEF13E870BB00A35661 /* SideBarItem.h */; };
                1C31140F1E508D1B00D4DD76 /* AddonManager.xib in Sources */ = {isa = PBXBuildFile; fileRef = 6B8223FF1E4D2A9000833BE1 /* AddonManager.xib */; };
                1C3114101E508D1B00D4DD76 /* AudioEffects.xib in Sources */ = {isa = PBXBuildFile; fileRef = 6B8224001E4D2A9000833BE1 /* AudioEffects.xib */; };
                1C3114111E508D1B00D4DD76 /* Bookmarks.xib in Sources */ = {isa = PBXBuildFile; fileRef = 6B8224011E4D2A9000833BE1 /* Bookmarks.xib */; };
-               1C3114121E508D1B00D4DD76 /* BWQuincyMain.xib in Sources */ = {isa = PBXBuildFile; fileRef = 6B8224021E4D2A9000833BE1 /* BWQuincyMain.xib */; };
                1C3114131E508D1B00D4DD76 /* ConvertAndSave.xib in Sources */ = {isa = PBXBuildFile; fileRef = 6B8224031E4D2A9000833BE1 /* ConvertAndSave.xib */; };
                1C3114141E508D1B00D4DD76 /* CoreDialogs.xib in Sources */ = {isa = PBXBuildFile; fileRef = 6B8224041E4D2A9000833BE1 /* CoreDialogs.xib */; };
                1C3114151E508D1B00D4DD76 /* DetachedVideoWindow.xib in Sources */ = {isa = PBXBuildFile; fileRef = 6B8224051E4D2A9000833BE1 /* DetachedVideoWindow.xib */; };
                6B8223FF1E4D2A9000833BE1 /* AddonManager.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = AddonManager.xib; sourceTree = "<group>"; };
                6B8224001E4D2A9000833BE1 /* AudioEffects.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = AudioEffects.xib; sourceTree = "<group>"; };
                6B8224011E4D2A9000833BE1 /* Bookmarks.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = Bookmarks.xib; sourceTree = "<group>"; };
-               6B8224021E4D2A9000833BE1 /* BWQuincyMain.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = BWQuincyMain.xib; sourceTree = "<group>"; };
                6B8224031E4D2A9000833BE1 /* ConvertAndSave.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = ConvertAndSave.xib; sourceTree = "<group>"; };
                6B8224041E4D2A9000833BE1 /* CoreDialogs.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = CoreDialogs.xib; sourceTree = "<group>"; };
                6B8224051E4D2A9000833BE1 /* DetachedVideoWindow.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = DetachedVideoWindow.xib; sourceTree = "<group>"; };
                6BCB59091DA247CD009BCA66 /* VLCFSPanelController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = VLCFSPanelController.h; sourceTree = "<group>"; };
                6BCB590A1DA247CD009BCA66 /* VLCFSPanelController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = VLCFSPanelController.m; sourceTree = "<group>"; };
                6BF557CF1E4E0E2500C03C9D /* VLCPauseTemplate.pdf */ = {isa = PBXFileReference; lastKnownFileType = image.pdf; name = VLCPauseTemplate.pdf; path = "Button-Icons/VLCPauseTemplate.pdf"; sourceTree = "<group>"; };
-               7D3F652618805297005776C4 /* BWQuincyManager.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = BWQuincyManager.h; sourceTree = "<group>"; };
-               7D3F652718805297005776C4 /* BWQuincyManager.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = BWQuincyManager.m; sourceTree = "<group>"; };
-               7D3F652818805297005776C4 /* BWQuincyUI.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = BWQuincyUI.h; sourceTree = "<group>"; };
-               7D3F652918805297005776C4 /* BWQuincyUI.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = BWQuincyUI.m; sourceTree = "<group>"; };
                7D5678EB1D5BA1DC002698F3 /* VLCApplication.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = VLCApplication.h; sourceTree = "<group>"; };
                7D5678EC1D5BA1DC002698F3 /* VLCApplication.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = VLCApplication.m; sourceTree = "<group>"; };
                7D5678EE1D5BA397002698F3 /* VLCMainWindowControlsBar.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = VLCMainWindowControlsBar.h; sourceTree = "<group>"; };
                        name = Renderers;
                        sourceTree = "<group>";
                };
-               7D3F652A1880529C005776C4 /* QuincyKit */ = {
-                       isa = PBXGroup;
-                       children = (
-                               7D3F652618805297005776C4 /* BWQuincyManager.h */,
-                               7D3F652718805297005776C4 /* BWQuincyManager.m */,
-                               7D3F652818805297005776C4 /* BWQuincyUI.h */,
-                               7D3F652918805297005776C4 /* BWQuincyUI.m */,
-                       );
-                       name = QuincyKit;
-                       sourceTree = "<group>";
-               };
                8E445F86047289E50059A3A7 /* File Icons */ = {
                        isa = PBXGroup;
                        children = (
                CC0CD0E513DE0FC600B0D90D /* Imported Code */ = {
                        isa = PBXGroup;
                        children = (
-                               7D3F652A1880529C005776C4 /* QuincyKit */,
                                6B8223FD1E4D29F100833BE1 /* Apple Remote */,
                                CC0CD0E413DE0EB500B0D90D /* PXSourceList */,
                                CC78DA4A13DE0E0100E9603C /* SPMediaKeyTap */,
                                6B8223FF1E4D2A9000833BE1 /* AddonManager.xib */,
                                6B8224001E4D2A9000833BE1 /* AudioEffects.xib */,
                                6B8224011E4D2A9000833BE1 /* Bookmarks.xib */,
-                               6B8224021E4D2A9000833BE1 /* BWQuincyMain.xib */,
                                6B8224031E4D2A9000833BE1 /* ConvertAndSave.xib */,
                                6B8224041E4D2A9000833BE1 /* CoreDialogs.xib */,
                                6B8224051E4D2A9000833BE1 /* DetachedVideoWindow.xib */,
                                1C31140F1E508D1B00D4DD76 /* AddonManager.xib in Sources */,
                                1C3114101E508D1B00D4DD76 /* AudioEffects.xib in Sources */,
                                1C3114111E508D1B00D4DD76 /* Bookmarks.xib in Sources */,
-                               1C3114121E508D1B00D4DD76 /* BWQuincyMain.xib in Sources */,
                                1C3114131E508D1B00D4DD76 /* ConvertAndSave.xib in Sources */,
                                1C3114141E508D1B00D4DD76 /* CoreDialogs.xib in Sources */,
                                1C3114151E508D1B00D4DD76 /* DetachedVideoWindow.xib in Sources */,
                                1C3114281E508D1B00D4DD76 /* VLCFullScreenPanel.xib in Sources */,
                                1C3114291E508D1B00D4DD76 /* VLCRendererDialog.xib in Sources */,
                                1C31142A1E508D1B00D4DD76 /* VLCStatusBarIconMainMenu.xib in Sources */,
-                               1C3113FE1E508C8800D4DD76 /* BWQuincyManager.h in Sources */,
-                               1C3113FF1E508C8800D4DD76 /* BWQuincyManager.m in Sources */,
-                               1C3114001E508C8800D4DD76 /* BWQuincyUI.h in Sources */,
-                               1C3114011E508C8800D4DD76 /* BWQuincyUI.m in Sources */,
                                1C3114021E508C8800D4DD76 /* AppleRemote.h in Sources */,
                                1C3114031E508C8800D4DD76 /* AppleRemote.m in Sources */,
                                1C3114041E508C8800D4DD76 /* SideBarItem.h in Sources */,
diff --git a/modules/gui/macosx/BWQuincyManager.h b/modules/gui/macosx/BWQuincyManager.h
deleted file mode 100644 (file)
index 87cf15f..0000000
+++ /dev/null
@@ -1,168 +0,0 @@
-/*
- * Author: Andreas Linde <mail@andreaslinde.de>
- *         Kent Sutherland
- *
- * Copyright (c) 2011 Andreas Linde & Kent Sutherland.
- * All rights reserved.
- *
- * Permission is hereby granted, free of charge, to any person
- * obtaining a copy of this software and associated documentation
- * files (the "Software"), to deal in the Software without
- * restriction, including without limitation the rights to use,
- * copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following
- * conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
- * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
- * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- * OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#import <Cocoa/Cocoa.h>
-
-typedef enum CrashAlertType {
-  CrashAlertTypeSend = 0,
-  CrashAlertTypeFeedback = 1,
-} CrashAlertType;
-
-typedef enum CrashReportStatus {
-  // This app version is set to discontinued, no new crash reports accepted by the server
-  CrashReportStatusFailureVersionDiscontinued = -30,
-
-  // XML: Sender ersion string contains not allowed characters, only alphanumberical including space and . are allowed
-  CrashReportStatusFailureXMLSenderVersionNotAllowed = -21,
-
-  // XML: Version string contains not allowed characters, only alphanumberical including space and . are allowed
-  CrashReportStatusFailureXMLVersionNotAllowed = -20,
-
-  // SQL for adding a symoblicate todo entry in the database failed
-  CrashReportStatusFailureSQLAddSymbolicateTodo = -18,
-
-  // SQL for adding crash log in the database failed
-  CrashReportStatusFailureSQLAddCrashlog = -17,
-
-  // SQL for adding a new version in the database failed
-  CrashReportStatusFailureSQLAddVersion = -16,
-
-  // SQL for checking if the version is already added in the database failed
-  CrashReportStatusFailureSQLCheckVersionExists = -15,
-
-  // SQL for creating a new pattern for this bug and set amount of occurrances to 1 in the database failed
-  CrashReportStatusFailureSQLAddPattern = -14,
-
-  // SQL for checking the status of the bugfix version in the database failed
-  CrashReportStatusFailureSQLCheckBugfixStatus = -13,
-
-  // SQL for updating the occurances of this pattern in the database failed
-  CrashReportStatusFailureSQLUpdatePatternOccurances = -12,
-
-  // SQL for getting all the known bug patterns for the current app version in the database failed
-  CrashReportStatusFailureSQLFindKnownPatterns = -11,
-
-  // SQL for finding the bundle identifier in the database failed
-  CrashReportStatusFailureSQLSearchAppName = -10,
-
-  // the post request didn't contain valid data
-  CrashReportStatusFailureInvalidPostData = -3,
-
-  // incoming data may not be added, because e.g. bundle identifier wasn't found
-  CrashReportStatusFailureInvalidIncomingData = -2,
-
-  // database cannot be accessed, check hostname, username, password and database name settings in config.php
-  CrashReportStatusFailureDatabaseNotAvailable = -1,
-
-  CrashReportStatusUnknown = 0,
-
-  CrashReportStatusAssigned = 1,
-
-  CrashReportStatusSubmitted = 2,
-
-  CrashReportStatusAvailable = 3,
-} CrashReportStatus;
-
-
-@class BWQuincyUI;
-
-@protocol BWQuincyManagerDelegate <NSObject>
-
-@optional
-
-// Invoked once the modal sheets are gone
-- (void) showMainApplicationWindow;
-
-// Return the description the crashreport should contain, empty by default. The string will automatically be wrapped into <[DATA[ ]]>, so make sure you don't do that in your string.
--(NSString *) crashReportDescription;
-
-// Return the userid the crashreport should contain, empty by default
--(NSString *) crashReportUserID;
-
-// Return the contact value (e.g. email) the crashreport should contain, empty by default
--(NSString *) crashReportContact;
-@end
-
-
-@interface BWQuincyManager : NSObject 
-#if defined(MAC_OS_X_VERSION_10_6) && (MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_6) 
- <NSXMLParserDelegate> 
-#endif
-{
-  CrashReportStatus _serverResult;
-  NSInteger         _statusCode;
-
-  NSMutableString   *_contentOfProperty;
-
-  id<BWQuincyManagerDelegate> __weak _delegate;
-
-  NSString   *_submissionURL;
-  NSString   *_companyName;
-  NSString   *_appIdentifier;
-  BOOL       _autoSubmitCrashReport;
-
-  NSString   *_crashFile;
-
-  BWQuincyUI *_quincyUI;
-}
-
-- (NSString*) modelVersion;
-
-+ (BWQuincyManager *)sharedQuincyManager;
-
-// submission URL defines where to send the crash reports to (required)
-@property (nonatomic, retain) NSString *submissionURL;
-
-// defines the company name to be shown in the crash reporting dialog
-@property (nonatomic, retain) NSString *companyName;
-
-// delegate is required
-@property (nonatomic, weak) id <BWQuincyManagerDelegate> delegate;
-
-// if YES, the crash report will be submitted without asking the user
-// if NO, the user will be asked if the crash report can be submitted (default)
-@property (nonatomic, assign, getter=isAutoSubmitCrashReport) BOOL autoSubmitCrashReport;
-
-///////////////////////////////////////////////////////////////////////////////////////////////////
-// settings
-
-// If you want to use HockeyApp instead of your own server, this is required
-@property (nonatomic, retain) NSString *appIdentifier;
-
-
-- (void) cancelReport;
-- (void) sendReportCrash:(NSString*)crashContent
-             description:(NSString*)description;
-
-- (NSString *) applicationName;
-- (NSString *) applicationVersionString;
-- (void)setApplicationVersion:(NSString *)appVersion;
-- (NSString *) applicationVersion;
-
-@end
diff --git a/modules/gui/macosx/BWQuincyManager.m b/modules/gui/macosx/BWQuincyManager.m
deleted file mode 100644 (file)
index e43fa8c..0000000
+++ /dev/null
@@ -1,435 +0,0 @@
-/*
- * Author: Andreas Linde <mail@andreaslinde.de>
- *         Kent Sutherland
- *
- * Copyright (c) 2011 Andreas Linde & Kent Sutherland.
- * All rights reserved.
- *
- * Permission is hereby granted, free of charge, to any person
- * obtaining a copy of this software and associated documentation
- * files (the "Software"), to deal in the Software without
- * restriction, including without limitation the rights to use,
- * copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following
- * conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
- * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
- * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- * OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#import "BWQuincyManager.h"
-#import "BWQuincyUI.h"
-#import <sys/sysctl.h>
-
-#define SDK_NAME @"Quincy"
-#define SDK_VERSION @"2.1.6"
-
-@interface BWQuincyManager ()
-{
-    NSString *_customAppVersion;
-}
-
-@end
-
-@interface BWQuincyManager(private)
-
-- (void) startManager;
-
-- (void) _postXML:(NSString*)xml toURL:(NSURL*)url;
-- (void) searchCrashLogFile:(NSString *)path;
-- (BOOL) hasPendingCrashReport;
-- (void) returnToMainApplication;
-@end
-
-
-@implementation BWQuincyManager
-
-+ (BWQuincyManager *)sharedQuincyManager {
-  static BWQuincyManager *quincyManager = nil;
-
-  if (quincyManager == nil) {
-    quincyManager = [[BWQuincyManager alloc] init];
-  }
-
-  return quincyManager;
-}
-
-- (id) init {
-  if ((self = [super init])) {
-    _serverResult = CrashReportStatusFailureDatabaseNotAvailable;
-    _quincyUI = nil;
-
-    _submissionURL = nil;
-    _appIdentifier = nil;
-
-    _crashFile = nil;
-
-    self.delegate = nil;
-    self.companyName = @"";
-  }
-  return self;
-}
-
-- (void)dealloc {
-  _companyName = nil;
-  _delegate = nil;
-  _submissionURL = nil;
-  _appIdentifier = nil;
-}
-
-- (void) searchCrashLogFile:(NSString *)path {
-  NSFileManager* fman = [NSFileManager defaultManager];
-
-  NSError* error;
-  NSMutableArray* filesWithModificationDate = [NSMutableArray array];
-  NSArray* crashLogFiles = [fman contentsOfDirectoryAtPath:path error:&error];
-  NSEnumerator* filesEnumerator = [crashLogFiles objectEnumerator];
-  NSString* crashFile;
-  while((crashFile = [filesEnumerator nextObject])) {
-    NSString* crashLogPath = [path stringByAppendingPathComponent:crashFile];
-    NSDate* modDate = [[[NSFileManager defaultManager] attributesOfItemAtPath:crashLogPath error:&error] fileModificationDate];
-    [filesWithModificationDate addObject:[NSDictionary dictionaryWithObjectsAndKeys:crashFile,@"name",crashLogPath,@"path",modDate,@"modDate",nil]];
-  }
-
-  NSSortDescriptor* dateSortDescriptor = [[NSSortDescriptor alloc] initWithKey:@"modDate" ascending:YES];
-  NSArray* sortedFiles = [filesWithModificationDate sortedArrayUsingDescriptors:[NSArray arrayWithObject:dateSortDescriptor]];
-
-  NSPredicate* filterPredicate = [NSPredicate predicateWithFormat:@"name BEGINSWITH %@", [self applicationName]];
-  NSArray* filteredFiles = [sortedFiles filteredArrayUsingPredicate:filterPredicate];
-
-  _crashFile = [[[filteredFiles valueForKeyPath:@"path"] lastObject] copy];
-}
-
-#pragma mark -
-#pragma mark setter
-- (void)setSubmissionURL:(NSString *)anSubmissionURL {
-  if (_submissionURL != anSubmissionURL) {
-    _submissionURL = [anSubmissionURL copy];
-  }
-
-  [self performSelector:@selector(startManager) withObject:nil afterDelay:0.1f];
-}
-
-- (void)setAppIdentifier:(NSString *)anAppIdentifier {
-  if (_appIdentifier != anAppIdentifier) {
-    _appIdentifier = [anAppIdentifier copy];
-  }
-
-  [self setSubmissionURL:@"https://rink.hockeyapp.net/"];
-}
-
-- (void)storeLastCrashDate:(NSDate *) date {
-  [[NSUserDefaults standardUserDefaults] setValue:date forKey:@"CrashReportSender.lastCrashDate"];
-  [[NSUserDefaults standardUserDefaults] synchronize];
-}
-
-- (NSDate *)loadLastCrashDate {
-  NSDate *date = [[NSUserDefaults standardUserDefaults] valueForKey:@"CrashReportSender.lastCrashDate"];
-  return date ?: [NSDate distantPast];
-}
-
-- (void)storeAppVersion:(NSString *) version {
-  [[NSUserDefaults standardUserDefaults] setValue:version forKey:@"CrashReportSender.appVersion"];
-  [[NSUserDefaults standardUserDefaults] synchronize];
-}
-
-- (NSString *)loadAppVersion {
-  NSString *appVersion = [[NSUserDefaults standardUserDefaults] valueForKey:@"CrashReportSender.appVersion"];
-  return appVersion ?: nil;
-}
-
-#pragma mark -
-#pragma mark GetCrashData
-
-- (BOOL) hasPendingCrashReport {
-  BOOL returnValue = NO;
-
-  NSString *appVersion = [self loadAppVersion];
-  NSDate *lastCrashDate = [self loadLastCrashDate];
-
-  if (!appVersion || ![appVersion isEqualToString:[self applicationVersion]] || [lastCrashDate isEqualToDate:[NSDate distantPast]]) {
-    [self storeAppVersion:[self applicationVersion]];
-    [self storeLastCrashDate:[NSDate date]];
-    return NO;
-  }
-
-  NSArray* libraryDirectories = NSSearchPathForDirectoriesInDomains(NSLibraryDirectory, NSUserDomainMask, TRUE);
-  // Snow Leopard is having the log files in another location
-  [self searchCrashLogFile:[[libraryDirectories lastObject] stringByAppendingPathComponent:@"Logs/DiagnosticReports"]];
-  if (_crashFile == nil) {
-    [self searchCrashLogFile:[[libraryDirectories lastObject] stringByAppendingPathComponent:@"Logs/CrashReporter"]];
-    if (_crashFile == nil) {
-      NSString *sandboxFolder = [NSString stringWithFormat:@"/Containers/%@/Data/Library", [[NSBundle mainBundle] objectForInfoDictionaryKey:@"CFBundleIdentifier"]];
-      if ([[libraryDirectories lastObject] rangeOfString:sandboxFolder].location != NSNotFound) {
-        NSString *libFolderName = [[libraryDirectories lastObject] stringByReplacingOccurrencesOfString:sandboxFolder withString:@""];
-        [self searchCrashLogFile:[libFolderName stringByAppendingPathComponent:@"Logs/DiagnosticReports"]];
-      }
-    }
-    // Search machine diagnostic reports directory
-    if (_crashFile == nil) {
-      NSArray* libraryDirectories = NSSearchPathForDirectoriesInDomains(NSLibraryDirectory, NSLocalDomainMask, TRUE);
-      [self searchCrashLogFile:[[libraryDirectories lastObject] stringByAppendingPathComponent:@"Logs/DiagnosticReports"]];
-      if (_crashFile == nil) {
-          [self searchCrashLogFile:[[libraryDirectories lastObject] stringByAppendingPathComponent:@"Logs/CrashReporter"]];
-      }
-    }
-  }
-
-  if (_crashFile) {
-    NSError* error;
-
-    NSDate *crashLogModificationDate = [[[NSFileManager defaultManager] attributesOfItemAtPath:_crashFile error:&error] fileModificationDate];
-    unsigned long long crashLogFileSize = [[[NSFileManager defaultManager] attributesOfItemAtPath:_crashFile error:&error] fileSize];
-    if ([crashLogModificationDate compare: lastCrashDate] == NSOrderedDescending && crashLogFileSize > 0) {
-      [self storeLastCrashDate:crashLogModificationDate];
-      returnValue = YES;
-    }
-  }
-
-  return returnValue;
-}
-
-- (void) returnToMainApplication {
-  if ( self.delegate != nil && [self.delegate respondsToSelector:@selector(showMainApplicationWindow)])
-    [self.delegate showMainApplicationWindow];
-}
-
-- (void) startManager {
-  if ([self hasPendingCrashReport]) {
-    if (!self.autoSubmitCrashReport) {
-      _quincyUI = [[BWQuincyUI alloc] initWithManager:self crashFile:_crashFile companyName:_companyName applicationName:[self applicationName]];
-      [_quincyUI askCrashReportDetails];
-    } else {
-      NSError* error = nil;
-      NSString *crashLogs = [NSString stringWithContentsOfFile:_crashFile encoding:NSUTF8StringEncoding error:&error];
-      if (!error) {
-        NSString *lastCrash = [[crashLogs componentsSeparatedByString: @"**********\n\n"] lastObject];
-
-        NSString* description = @"";
-
-        if (_delegate && [_delegate respondsToSelector:@selector(crashReportDescription)]) {
-          description = [_delegate crashReportDescription];
-        }
-
-        [self sendReportCrash:lastCrash description:description];
-      } else {
-        [self returnToMainApplication];
-      }
-    }
-  } else {
-    [self returnToMainApplication];
-  }
-}
-
-- (NSString*) modelVersion {
-  NSString * modelString  = nil;
-  int        modelInfo[2] = { CTL_HW, HW_MODEL };
-  size_t     modelSize;
-
-  if (sysctl(modelInfo,
-             2,
-             NULL,
-             &modelSize,
-             NULL, 0) == 0) {
-    void * modelData = malloc(modelSize);
-
-    if (modelData) {
-      if (sysctl(modelInfo,
-                 2,
-                 modelData,
-                 &modelSize,
-                 NULL, 0) == 0) {
-        modelString = [NSString stringWithUTF8String:modelData];
-      }
-
-      free(modelData);
-    }
-  }
-
-  return modelString;
-}
-
-
-
-- (void) cancelReport {
-  [self returnToMainApplication];
-}
-
-
-- (void) sendReportCrash:(NSString*)crashContent
-             description:(NSString*)notes
-{
-  NSString *userid = @"";
-  NSString *contact = @"";
-
-  SInt32 versionMajor, versionMinor, versionBugFix;
-  if (Gestalt(gestaltSystemVersionMajor, &versionMajor) != noErr) versionMajor = 0;
-  if (Gestalt(gestaltSystemVersionMinor, &versionMinor) != noErr)  versionMinor= 0;
-  if (Gestalt(gestaltSystemVersionBugFix, &versionBugFix) != noErr) versionBugFix = 0;
-
-  NSString* xml = [NSString stringWithFormat:@"<crash><applicationname>%s</applicationname><bundleidentifier>%s</bundleidentifier><systemversion>%@</systemversion><senderversion>%@</senderversion><version>%@</version><platform>%@</platform><userid>%@</userid><contact>%@</contact><description><![CDATA[%@]]></description><log><![CDATA[%@]]></log></crash>",
-                   [[self applicationName] UTF8String],
-                   [[[NSBundle mainBundle] objectForInfoDictionaryKey:@"CFBundleIdentifier"] UTF8String],
-                   [NSString stringWithFormat:@"%i.%i.%i", versionMajor, versionMinor, versionBugFix],
-                   [self applicationVersion],
-                   [self applicationVersion],
-                   [self modelVersion],
-                   userid,
-                   contact,
-                   notes,
-                   crashContent
-                   ];
-
-
-    [self returnToMainApplication];
-
-    [self _postXML:[NSString stringWithFormat:@"<crashes>%@</crashes>", xml] toURL:[NSURL URLWithString:self.submissionURL]];
-}
-
-- (void)_postXML:(NSString*)xml toURL:(NSURL*)url {
-  NSMutableURLRequest *request = nil;
-  NSString *boundary = @"----FOO";
-
-  if (self.appIdentifier) {
-    request = [NSMutableURLRequest requestWithURL:
-               [NSURL URLWithString:[NSString stringWithFormat:@"%@api/2/apps/%@/crashes?sdk=%@&sdk_version=%@",
-                                     self.submissionURL,
-                                     [self.appIdentifier stringByAddingPercentEscapesUsingEncoding:NSUTF8StringEncoding],
-                                     SDK_NAME,
-                                     SDK_VERSION
-                                     ]
-                ]];
-  } else {
-    request = [NSMutableURLRequest requestWithURL:url];
-  }
-
-  [request setValue:@"Quincy/Mac" forHTTPHeaderField:@"User-Agent"];
-  [request setValue:@"gzip" forHTTPHeaderField:@"Accept-Encoding"];
-  [request setTimeoutInterval: 15];
-  [request setHTTPMethod:@"POST"];
-  NSString *contentType = [NSString stringWithFormat:@"multipart/form-data; boundary=%@", boundary];
-  [request setValue:contentType forHTTPHeaderField:@"Content-type"];
-
-  NSMutableData *postBody =  [NSMutableData data];
-  [postBody appendData:[[NSString stringWithFormat:@"--%@\r\n", boundary] dataUsingEncoding:NSUTF8StringEncoding]];
-  if (self.appIdentifier) {
-    [postBody appendData:[@"Content-Disposition: form-data; name=\"xml\"; filename=\"crash.xml\"\r\n" dataUsingEncoding:NSUTF8StringEncoding]];
-    [postBody appendData:[[NSString stringWithFormat:@"Content-Type: text/xml\r\n\r\n"] dataUsingEncoding:NSUTF8StringEncoding]];
-  } else {
-    [postBody appendData:[@"Content-Disposition: form-data; name=\"xmlstring\"\r\n\r\n" dataUsingEncoding:NSUTF8StringEncoding]];
-  }
-  [postBody appendData:[xml dataUsingEncoding:NSUTF8StringEncoding]];
-  [postBody appendData:[[NSString stringWithFormat:@"\r\n--%@--\r\n", boundary] dataUsingEncoding:NSUTF8StringEncoding]];
-  [request setHTTPBody:postBody];
-
-  _serverResult = CrashReportStatusUnknown;
-  _statusCode = 200;
-
-  NSHTTPURLResponse *response = nil;
-  NSError *error = nil;
-
-  NSData *responseData = nil;
-  responseData = [NSURLConnection sendSynchronousRequest:request returningResponse:&response error:&error];
-  _statusCode = [response statusCode];
-
-  if (responseData != nil) {
-    if (_statusCode >= 200 && _statusCode < 400) {
-      NSXMLParser *parser = [[NSXMLParser alloc] initWithData:responseData];
-      // Set self as the delegate of the parser so that it will receive the parser delegate methods callbacks.
-      [parser setDelegate:self];
-      // Depending on the XML document you're parsing, you may want to enable these features of NSXMLParser.
-      [parser setShouldProcessNamespaces:NO];
-      [parser setShouldReportNamespacePrefixes:NO];
-      [parser setShouldResolveExternalEntities:NO];
-
-      [parser parse];
-    }
-  }
-}
-
-
-#pragma mark NSXMLParser
-
-- (void)parser:(NSXMLParser *)parser didStartElement:(NSString *)elementName namespaceURI:(NSString *)namespaceURI qualifiedName:(NSString *)qName attributes:(NSDictionary *)attributeDict {
-  if (qName) {
-    elementName = qName;
-  }
-
-  if ([elementName isEqualToString:@"result"]) {
-    _contentOfProperty = [NSMutableString string];
-  }
-}
-
-- (void)parser:(NSXMLParser *)parser didEndElement:(NSString *)elementName namespaceURI:(NSString *)namespaceURI qualifiedName:(NSString *)qName {
-  if (qName) {
-    elementName = qName;
-  }
-
-  if ([elementName isEqualToString:@"result"]) {
-    if ([_contentOfProperty intValue] > _serverResult) {
-      _serverResult = [_contentOfProperty intValue];
-    }
-  }
-}
-
-
-- (void)parser:(NSXMLParser *)parser foundCharacters:(NSString *)string {
-  if (_contentOfProperty) {
-    // If the current element is one whose content we care about, append 'string'
-    // to the property that holds the content of the current element.
-    if (string != nil) {
-      [_contentOfProperty appendString:string];
-    }
-  }
-}
-
-
-#pragma mark GetterSetter
-
-- (NSString *) applicationName {
-  NSString *applicationName = [[[NSBundle mainBundle] localizedInfoDictionary] valueForKey: @"CFBundleExecutable"];
-
-  if (!applicationName)
-    applicationName = [[[NSBundle mainBundle] infoDictionary] valueForKey: @"CFBundleExecutable"];
-
-  return applicationName;
-}
-
-
-- (NSString*) applicationVersionString {
-  NSString* string = [[[NSBundle mainBundle] localizedInfoDictionary] valueForKey: @"CFBundleShortVersionString"];
-
-  if (!string)
-    string = [[[NSBundle mainBundle] infoDictionary] valueForKey: @"CFBundleShortVersionString"];
-
-  return string;
-}
-
-- (void)setApplicationVersion:(NSString *)appVersion
-{
-    _customAppVersion = appVersion;
-}
-
-- (NSString *) applicationVersion {
-    if (_customAppVersion)
-        return _customAppVersion;
-
-  NSString* string = [[[NSBundle mainBundle] localizedInfoDictionary] valueForKey: @"CFBundleVersion"];
-
-  if (!string)
-    string = [[[NSBundle mainBundle] infoDictionary] valueForKey: @"CFBundleVersion"];
-
-  return string;
-}
-
-@end
diff --git a/modules/gui/macosx/BWQuincyUI.h b/modules/gui/macosx/BWQuincyUI.h
deleted file mode 100644 (file)
index 68465f1..0000000
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- * Author: Andreas Linde <mail@andreaslinde.de>
- *         Kent Sutherland
- *
- * Copyright (c) 2011 Andreas Linde & Kent Sutherland.
- * All rights reserved.
- *
- * Permission is hereby granted, free of charge, to any person
- * obtaining a copy of this software and associated documentation
- * files (the "Software"), to deal in the Software without
- * restriction, including without limitation the rights to use,
- * copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following
- * conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
- * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
- * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- * OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#import <Cocoa/Cocoa.h>
-
-@class BWQuincyManager;
-
-@interface BWQuincyUI : NSWindowController {
-  IBOutlet NSTextField  *descriptionTextField;
-  IBOutlet NSTextView   *crashLogTextView;
-
-    IBOutlet NSTextField  *noteText;
-    IBOutlet NSTextField  *titleText;
-    IBOutlet NSTextField  *commentsText;
-    IBOutlet NSTextField  *detailsText;
-
-    IBOutlet NSButton   *showButton;
-    IBOutlet NSButton   *hideButton;
-    IBOutlet NSButton   *cancelButton;
-    IBOutlet NSButton   *submitButton;
-
-  BWQuincyManager   *_quincyManager;
-
-  NSString      *_xml;
-
-  NSString      *_crashFile;
-  NSString      *_companyName;
-  NSString      *_applicationName;
-
-  NSMutableString   *_consoleContent;
-  NSString      *_crashLogContent;
-
-  BOOL showComments;
-  BOOL showDetails;
-}
-
-- (id)initWithManager:(BWQuincyManager *)quincyManager crashFile:(NSString *)crashFile companyName:(NSString *)companyName applicationName:(NSString *)applicationName;
-
-- (void) askCrashReportDetails;
-
-- (IBAction) cancelReport:(id)sender;
-- (IBAction) submitReport:(id)sender;
-- (IBAction) showDetails:(id)sender;
-- (IBAction) hideDetails:(id)sender;
-- (IBAction) showComments:(id)sender;
-
-- (BOOL)showComments;
-- (void)setShowComments:(BOOL)value;
-
-- (BOOL)showDetails;
-- (void)setShowDetails:(BOOL)value;
-
-@end
\ No newline at end of file
diff --git a/modules/gui/macosx/BWQuincyUI.m b/modules/gui/macosx/BWQuincyUI.m
deleted file mode 100644 (file)
index 07abd16..0000000
+++ /dev/null
@@ -1,247 +0,0 @@
-/*
- * Author: Andreas Linde <mail@andreaslinde.de>
- *         Kent Sutherland
- *
- * Copyright (c) 2011 Andreas Linde & Kent Sutherland.
- * All rights reserved.
- *
- * Permission is hereby granted, free of charge, to any person
- * obtaining a copy of this software and associated documentation
- * files (the "Software"), to deal in the Software without
- * restriction, including without limitation the rights to use,
- * copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following
- * conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
- * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
- * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- * OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#import "VLCMain.h"
-#import "BWQuincyUI.h"
-#import "BWQuincyManager.h"
-#import <sys/sysctl.h>
-
-#define CRASHREPORTSENDER_MAX_CONSOLE_SIZE 50000
-
-@interface BWQuincyUI(private)
-- (void) askCrashReportDetails;
-- (void) endCrashReporter;
-@end
-
-const CGFloat kCommentsHeight = 105;
-const CGFloat kDetailsHeight = 285;
-
-@implementation BWQuincyUI
-
-- (id)initWithManager:(BWQuincyManager *)quincyManager crashFile:(NSString *)crashFile companyName:(NSString *)companyName applicationName:(NSString *)applicationName {
-
-  self = [super initWithWindowNibName: @"BWQuincyMain"];
-
-  if ( self != nil) {
-    _xml = nil;
-    _quincyManager = quincyManager;
-    _crashFile = crashFile;
-    _companyName = companyName;
-    _applicationName = applicationName;
-    [self setShowComments: YES];
-    [self setShowDetails: NO];
-
-    NSRect windowFrame = [[self window] frame];
-    windowFrame.size = NSMakeSize(windowFrame.size.width, windowFrame.size.height - kDetailsHeight);
-    windowFrame.origin.y -= kDetailsHeight;
-    [[self window] setFrame: windowFrame
-                    display: YES
-                    animate: NO];
-
-  }
-  return self;
-}
-
-
-- (void)awakeFromNib
-{
-       crashLogTextView.editable = NO;
-       crashLogTextView.selectable = NO;
-       crashLogTextView.automaticSpellingCorrectionEnabled = NO;
-
-    [showButton setTitle:_NS("Show Details")];
-    [hideButton setTitle:_NS("Hide Details")];
-    [cancelButton setTitle:_NS("Cancel")];
-    [submitButton setTitle:_NS("Send")];
-    [titleText setStringValue:[NSString stringWithFormat:_NS("%@ unexpectedly quit the last time it was run. Would you like to send a crash report to %@?"), _applicationName, _companyName]];
-    [commentsText setStringValue:_NS("Comments")];
-    [detailsText setStringValue:_NS("Problem details and system configuration")];
-}
-
-
-- (void) endCrashReporter {
-  [self close];
-}
-
-
-- (IBAction) showComments: (id) sender {
-  NSRect windowFrame = [[self window] frame];
-
-  if ([sender intValue]) {
-    [self setShowComments: NO];
-
-    windowFrame.size = NSMakeSize(windowFrame.size.width, windowFrame.size.height + kCommentsHeight);
-    windowFrame.origin.y -= kCommentsHeight;
-    [[self window] setFrame: windowFrame
-                    display: YES
-                    animate: YES];
-
-    [self setShowComments: YES];
-  } else {
-    [self setShowComments: NO];
-
-    windowFrame.size = NSMakeSize(windowFrame.size.width, windowFrame.size.height - kCommentsHeight);
-    windowFrame.origin.y += kCommentsHeight;
-    [[self window] setFrame: windowFrame
-                    display: YES
-                    animate: YES];
-  }
-}
-
-
-- (IBAction) showDetails:(id)sender {
-  NSRect windowFrame = [[self window] frame];
-
-  windowFrame.size = NSMakeSize(windowFrame.size.width, windowFrame.size.height + kDetailsHeight);
-  windowFrame.origin.y -= kDetailsHeight;
-  [[self window] setFrame: windowFrame
-                  display: YES
-                  animate: YES];
-
-  [self setShowDetails:YES];
-
-}
-
-
-- (IBAction) hideDetails:(id)sender {
-  NSRect windowFrame = [[self window] frame];
-
-  [self setShowDetails:NO];
-
-  windowFrame.size = NSMakeSize(windowFrame.size.width, windowFrame.size.height - kDetailsHeight);
-  windowFrame.origin.y += kDetailsHeight;
-  [[self window] setFrame: windowFrame
-                  display: YES
-                  animate: YES];
-}
-
-
-- (IBAction) cancelReport:(id)sender {
-  [self endCrashReporter];
-  [NSApp stopModal];
-
-  [_quincyManager cancelReport];
-}
-
-- (void) _sendReportAfterDelay {
-  NSString *notes = [NSString stringWithFormat:@"Comments:\n%@\n\nConsole:\n%@", [descriptionTextField stringValue], _consoleContent];
-
-  [_quincyManager sendReportCrash:_crashLogContent description:notes];
-  _crashLogContent = nil;
-}
-
-- (IBAction) submitReport:(id)sender {
-  [submitButton setEnabled:NO];
-
-  [[self window] makeFirstResponder: nil];
-
-  [self performSelector:@selector(_sendReportAfterDelay) withObject:nil afterDelay:0.01];
-
-  [self endCrashReporter];
-  [NSApp stopModal];
-}
-
-
-- (void) askCrashReportDetails {
-  NSError *error;
-
-   [[self window] setTitle:[NSString stringWithFormat:_NS("Problem Report for %@"), _applicationName]];
-
-   [[descriptionTextField cell] setPlaceholderString:_NS("Please describe any steps needed to trigger the problem")];
-   [noteText setStringValue:_NS("No personal information will be sent with this report.")];
-
-  // get the crash log
-  NSString *crashLogs = [NSString stringWithContentsOfFile:_crashFile encoding:NSUTF8StringEncoding error:&error];
-  NSString *lastCrash = [[crashLogs componentsSeparatedByString: @"**********\n\n"] lastObject];
-
-  _crashLogContent = lastCrash;
-
-  // get the console log
-  NSEnumerator *theEnum = [[[NSString stringWithContentsOfFile:@"/private/var/log/system.log" encoding:NSUTF8StringEncoding error:&error] componentsSeparatedByString: @"\n"] objectEnumerator];
-  NSString* currentObject;
-  NSMutableArray* applicationStrings = [NSMutableArray array];
-
-  NSString* searchString = [_applicationName stringByAppendingString:@"["];
-  while ( (currentObject = [theEnum nextObject]) ) {
-    if ([currentObject rangeOfString:searchString].location != NSNotFound)
-      [applicationStrings addObject: currentObject];
-  }
-
-  _consoleContent = [[NSMutableString alloc] initWithString:@""];
-
-  NSInteger i;
-  for(i = ((NSInteger)[applicationStrings count])-1; (i>=0 && i>((NSInteger)[applicationStrings count])-100); i--) {
-    [_consoleContent appendString:[applicationStrings objectAtIndex:i]];
-    [_consoleContent appendString:@"\n"];
-  }
-
-  // Now limit the content to CRASHREPORTSENDER_MAX_CONSOLE_SIZE (default: 50kByte)
-  if ([_consoleContent length] > CRASHREPORTSENDER_MAX_CONSOLE_SIZE) {
-    _consoleContent = (NSMutableString *)[_consoleContent substringWithRange:NSMakeRange([_consoleContent length]-CRASHREPORTSENDER_MAX_CONSOLE_SIZE-1, CRASHREPORTSENDER_MAX_CONSOLE_SIZE)]; 
-  }
-
-  [crashLogTextView setString:[NSString stringWithFormat:@"%@\n\n%@", _crashLogContent, _consoleContent]];
-
-  [NSApp runModalForWindow:[self window]];
-}
-
-- (BOOL)showComments {
-  return showComments;
-}
-
-
-- (void)setShowComments:(BOOL)value {
-  showComments = value;
-}
-
-
-- (BOOL)showDetails {
-  return showDetails;
-}
-
-
-- (void)setShowDetails:(BOOL)value {
-  showDetails = value;
-}
-
-#pragma mark NSTextField Delegate
-
-- (BOOL)control:(NSControl *)control textView:(NSTextView *)textView doCommandBySelector:(SEL)commandSelector {
-  BOOL commandHandled = NO;
-
-  if (commandSelector == @selector(insertNewline:)) {
-    [textView insertNewlineIgnoringFieldEditor:self];
-    commandHandled = YES;
-  }
-
-  return commandHandled;
-}
-
-@end
-
index 15569bb..42df1cf 100644 (file)
@@ -26,8 +26,6 @@ libmacosx_plugin_la_SOURCES = \
        VLCAddonsWindowController.h VLCAddonsWindowController.m \
        applescript.h applescript.m \
        AppleRemote.h AppleRemote.m \
-       BWQuincyManager.h BWQuincyManager.m \
-       BWQuincyUI.h BWQuincyUI.m \
        CompatibilityFixes.h \
        VLCControlsBarCommon.m VLCControlsBarCommon.h \
        VLCDocumentController.m VLCDocumentController.h \
@@ -101,7 +99,6 @@ nobase_libmacosx_plugin_la_DATA = \
        UI/AddonManager.nib \
        UI/AudioEffects.nib \
        UI/Bookmarks.nib \
-       UI/BWQuincyMain.nib \
        UI/ConvertAndSave.nib \
        UI/CoreDialogs.nib \
        UI/DetachedVideoWindow.nib \
@@ -132,7 +129,6 @@ libmacosx_plugin_la_SOURCES += \
        UI/AddonManager.xib \
        UI/AudioEffects.xib \
        UI/Bookmarks.xib \
-       UI/BWQuincyMain.xib \
        UI/ConvertAndSave.xib \
        UI/CoreDialogs.xib \
        UI/DetachedVideoWindow.xib \
diff --git a/modules/gui/macosx/UI/BWQuincyMain.xib b/modules/gui/macosx/UI/BWQuincyMain.xib
deleted file mode 100644 (file)
index 8c727f7..0000000
+++ /dev/null
@@ -1,238 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="10102" systemVersion="15D21" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none">
-    <dependencies>
-        <deployment identifier="macosx"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="10102"/>
-        <capability name="box content view" minToolsVersion="7.0"/>
-    </dependencies>
-    <objects>
-        <customObject id="-2" userLabel="File's Owner" customClass="BWQuincyUI">
-            <connections>
-                <outlet property="cancelButton" destination="368" id="406"/>
-                <outlet property="commentsText" destination="366" id="489"/>
-                <outlet property="crashLogTextView" destination="391" id="408"/>
-                <outlet property="descriptionTextField" destination="455" id="458"/>
-                <outlet property="detailsText" destination="377" id="488"/>
-                <outlet property="hideButton" destination="411" id="413"/>
-                <outlet property="noteText" destination="477" id="479"/>
-                <outlet property="showButton" destination="396" id="414"/>
-                <outlet property="submitButton" destination="369" id="402"/>
-                <outlet property="titleText" destination="370" id="487"/>
-                <outlet property="window" destination="361" id="490"/>
-            </connections>
-        </customObject>
-        <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
-        <customObject id="-3" userLabel="Application"/>
-        <window title="Crash Reporter" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" releasedWhenClosed="NO" visibleAtLaunch="NO" animationBehavior="default" id="361" userLabel="Window">
-            <windowStyleMask key="styleMask" titled="YES"/>
-            <windowPositionMask key="initialPositionMask" leftStrut="YES" rightStrut="YES" topStrut="YES" bottomStrut="YES"/>
-            <rect key="contentRect" x="602" y="592" width="571" height="587"/>
-            <rect key="screenRect" x="0.0" y="0.0" width="1680" height="1027"/>
-            <value key="minSize" type="size" width="213" height="107"/>
-            <view key="contentView" id="362">
-                <rect key="frame" x="0.0" y="0.0" width="571" height="587"/>
-                <autoresizingMask key="autoresizingMask"/>
-                <subviews>
-                    <box title="Title" boxType="oldStyle" borderType="none" titlePosition="noTitle" id="364">
-                        <rect key="frame" x="112" y="75" width="439" height="285"/>
-                        <autoresizingMask key="autoresizingMask" flexibleMaxY="YES"/>
-                        <view key="contentView" id="8Ju-PM-NhK">
-                            <rect key="frame" x="0.0" y="0.0" width="439" height="285"/>
-                            <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                            <subviews>
-                                <textField verticalHuggingPriority="750" id="377">
-                                    <rect key="frame" x="0.0" y="263" width="442" height="24"/>
-                                    <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
-                                    <textFieldCell key="cell" sendsActionOnEndEditing="YES" title="Problem details and system configuration" id="394">
-                                        <font key="font" metaFont="system"/>
-                                        <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
-                                        <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
-                                    </textFieldCell>
-                                </textField>
-                                <scrollView autohidesScrollers="YES" horizontalLineScroll="10" horizontalPageScroll="10" verticalLineScroll="10" verticalPageScroll="10" hasHorizontalScroller="NO" usesPredominantAxisScrolling="NO" id="378">
-                                    <rect key="frame" x="0.0" y="8" width="439" height="255"/>
-                                    <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
-                                    <clipView key="contentView" id="krq-M4-fbX">
-                                        <rect key="frame" x="1" y="1" width="437" height="253"/>
-                                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                                        <subviews>
-                                            <textView toolTip="Please describe any steps needed to trigger the problem" importsGraphics="NO" richText="NO" continuousSpellChecking="YES" allowsUndo="YES" usesRuler="YES" usesFontPanel="YES" verticallyResizable="YES" spellingCorrection="YES" smartInsertDelete="YES" id="391">
-                                                <rect key="frame" x="0.0" y="0.0" width="437" height="253"/>
-                                                <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                                                <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
-                                                <size key="minSize" width="437" height="253"/>
-                                                <size key="maxSize" width="876" height="10000000"/>
-                                                <color key="insertionPointColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
-                                                <size key="minSize" width="437" height="253"/>
-                                                <size key="maxSize" width="876" height="10000000"/>
-                                                <accessibility description="Please describe any steps needed to trigger the problem" help="Please describe any steps needed to trigger the problem"/>
-                                                <connections>
-                                                    <binding destination="-2" name="value" keyPath="self" id="419"/>
-                                                </connections>
-                                            </textView>
-                                        </subviews>
-                                        <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
-                                    </clipView>
-                                    <scroller key="horizontalScroller" hidden="YES" verticalHuggingPriority="750" doubleValue="1" horizontal="YES" id="393">
-                                        <rect key="frame" x="-100" y="-100" width="87" height="18"/>
-                                        <autoresizingMask key="autoresizingMask"/>
-                                    </scroller>
-                                    <scroller key="verticalScroller" hidden="YES" verticalHuggingPriority="750" doubleValue="1" horizontal="NO" id="392">
-                                        <rect key="frame" x="-30" y="1" width="15" height="90"/>
-                                        <autoresizingMask key="autoresizingMask"/>
-                                    </scroller>
-                                </scrollView>
-                            </subviews>
-                        </view>
-                        <color key="borderColor" white="0.0" alpha="0.41999999999999998" colorSpace="calibratedWhite"/>
-                        <color key="fillColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
-                        <connections>
-                            <binding destination="-2" name="hidden" keyPath="showDetails" id="444">
-                                <dictionary key="options">
-                                    <string key="NSValueTransformerName">NSNegateBoolean</string>
-                                </dictionary>
-                            </binding>
-                        </connections>
-                    </box>
-                    <textField verticalHuggingPriority="750" id="455">
-                        <rect key="frame" x="112" y="368" width="439" height="105"/>
-                        <autoresizingMask key="autoresizingMask" flexibleMinY="YES"/>
-                        <textFieldCell key="cell" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" placeholderString="Placeholder" drawsBackground="YES" id="456">
-                            <font key="font" metaFont="system"/>
-                            <color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
-                            <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
-                        </textFieldCell>
-                        <connections>
-                            <binding destination="-2" name="hidden" keyPath="showComments" id="485">
-                                <dictionary key="options">
-                                    <string key="NSValueTransformerName">NSNegateBoolean</string>
-                                </dictionary>
-                            </binding>
-                            <outlet property="delegate" destination="-2" id="486"/>
-                        </connections>
-                    </textField>
-                    <textField verticalHuggingPriority="750" id="370">
-                        <rect key="frame" x="109" y="508" width="445" height="59"/>
-                        <autoresizingMask key="autoresizingMask" flexibleMinY="YES"/>
-                        <textFieldCell key="cell" sendsActionOnEndEditing="YES" title="%@ unexpectedly quit the last time it was run. Would you like to send a crash report to %@?" id="371">
-                            <font key="font" metaFont="system"/>
-                            <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
-                            <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
-                        </textFieldCell>
-                        <connections>
-                            <binding destination="-2" name="displayPatternValue1" keyPath="applicationName" id="480">
-                                <dictionary key="options">
-                                    <string key="NSDisplayPattern">%{value1}@ has unexpectedly quit last time it was run. Would you like to send a crash report to %{value2}@?</string>
-                                </dictionary>
-                            </binding>
-                            <binding destination="-2" name="displayPatternValue2" keyPath="companyName" previousBinding="480" id="481">
-                                <dictionary key="options">
-                                    <string key="NSDisplayPattern">%{value1}@ has unexpectedly quit last time it was run. Would you like to send a crash report to %{value2}@?</string>
-                                </dictionary>
-                            </binding>
-                        </connections>
-                    </textField>
-                    <button verticalHuggingPriority="750" id="396">
-                        <rect key="frame" x="106" y="35" width="150" height="32"/>
-                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                        <buttonCell key="cell" type="push" title="Show Details" bezelStyle="rounded" alignment="center" borderStyle="border" inset="2" id="397">
-                            <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
-                            <font key="font" metaFont="system"/>
-                        </buttonCell>
-                        <connections>
-                            <action selector="showDetails:" target="-2" id="416"/>
-                            <binding destination="-2" name="hidden" keyPath="showDetails" id="453"/>
-                        </connections>
-                    </button>
-                    <button hidden="YES" verticalHuggingPriority="750" id="411">
-                        <rect key="frame" x="106" y="35" width="150" height="32"/>
-                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                        <buttonCell key="cell" type="push" title="Hide Details" bezelStyle="rounded" alignment="center" borderStyle="border" inset="2" id="412">
-                            <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
-                            <font key="font" metaFont="system"/>
-                        </buttonCell>
-                        <connections>
-                            <action selector="hideDetails:" target="-2" id="415"/>
-                            <binding destination="-2" name="hidden" keyPath="showDetails" id="452">
-                                <dictionary key="options">
-                                    <string key="NSValueTransformerName">NSNegateBoolean</string>
-                                </dictionary>
-                            </binding>
-                        </connections>
-                    </button>
-                    <button verticalHuggingPriority="750" id="368">
-                        <rect key="frame" x="320" y="35" width="111" height="32"/>
-                        <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxY="YES"/>
-                        <buttonCell key="cell" type="push" title="Cancel" bezelStyle="rounded" alignment="center" borderStyle="border" inset="2" id="373">
-                            <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
-                            <font key="font" metaFont="system"/>
-                            <string key="keyEquivalent" base64-UTF8="YES">
-Gw
-</string>
-                        </buttonCell>
-                        <connections>
-                            <action selector="cancelReport:" target="-2" id="454"/>
-                        </connections>
-                    </button>
-                    <button verticalHuggingPriority="750" id="369">
-                        <rect key="frame" x="432" y="35" width="125" height="32"/>
-                        <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxY="YES"/>
-                        <buttonCell key="cell" type="push" title="Send" bezelStyle="rounded" alignment="center" borderStyle="border" inset="2" id="372">
-                            <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
-                            <font key="font" metaFont="system"/>
-                            <string key="keyEquivalent" base64-UTF8="YES">
-DQ
-</string>
-                        </buttonCell>
-                        <connections>
-                            <action selector="submitReport:" target="-2" id="398"/>
-                        </connections>
-                    </button>
-                    <button horizontalHuggingPriority="750" verticalHuggingPriority="750" id="367">
-                        <rect key="frame" x="112" y="481" width="13" height="13"/>
-                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
-                        <buttonCell key="cell" type="disclosureTriangle" bezelStyle="disclosure" imagePosition="above" alignment="left" borderStyle="border" inset="2" id="374">
-                            <behavior key="behavior" pushIn="YES" changeBackground="YES" changeGray="YES" lightByContents="YES"/>
-                            <font key="font" metaFont="system"/>
-                        </buttonCell>
-                        <connections>
-                            <action selector="showComments:" target="-2" id="417"/>
-                            <binding destination="-2" name="value" keyPath="showComments" id="438"/>
-                        </connections>
-                    </button>
-                    <textField verticalHuggingPriority="750" id="366">
-                        <rect key="frame" x="130" y="479" width="230" height="18"/>
-                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
-                        <textFieldCell key="cell" sendsActionOnEndEditing="YES" title="Comments" id="375">
-                            <font key="font" metaFont="system"/>
-                            <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
-                            <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
-                        </textFieldCell>
-                    </textField>
-                    <imageView id="365">
-                        <rect key="frame" x="20" y="503" width="64" height="64"/>
-                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
-                        <imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="proportionallyDown" image="NSApplicationIcon" id="376"/>
-                    </imageView>
-                    <textField verticalHuggingPriority="750" id="477">
-                        <rect key="frame" x="109" y="20" width="445" height="11"/>
-                        <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
-                        <textFieldCell key="cell" selectable="YES" enabled="NO" sendsActionOnEndEditing="YES" state="on" placeholderString="Note" id="478">
-                            <font key="font" metaFont="miniSystem"/>
-                            <color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
-                            <color key="backgroundColor" white="1" alpha="1" colorSpace="deviceWhite"/>
-                        </textFieldCell>
-                    </textField>
-                </subviews>
-            </view>
-            <connections>
-                <outlet property="delegate" destination="-2" id="399"/>
-                <outlet property="initialFirstResponder" destination="369" id="395"/>
-            </connections>
-        </window>
-        <userDefaultsController representsSharedInstance="YES" id="440"/>
-    </objects>
-    <resources>
-        <image name="NSApplicationIcon" width="128" height="128"/>
-    </resources>
-</document>
index 038003a..6bed31f 100644 (file)
@@ -57,7 +57,6 @@
 #import "VLCCoreInteraction.h"
 #import "VLCTrackSynchronizationWindowController.h"
 #import "VLCExtensionsManager.h"
-#import "BWQuincyManager.h"
 #import "VLCResumeDialogController.h"
 #import "VLCDebugMessageWindowController.h"
 #import "VLCConvertAndSaveWindowController.h"
@@ -153,11 +152,10 @@ static int ShowController(vlc_object_t *p_this, const char *psz_variable,
 #pragma mark -
 #pragma mark Private
 
-@interface VLCMain () <BWQuincyManagerDelegate
+@interface VLCMain ()
 #ifdef HAVE_SPARKLE
-    , SUUpdaterDelegate
+    <SUUpdaterDelegate>
 #endif
->
 {
     intf_thread_t *p_intf;
     BOOL launched;
@@ -290,17 +288,6 @@ static VLCMain *sharedInstance = nil;
     if (!p_intf)
         return;
 
-    NSString *appVersion = [[[NSBundle mainBundle] infoDictionary] valueForKey: @"CFBundleVersion"];
-    NSRange endRande = [appVersion rangeOfString:@"-"];
-    if (endRande.location != NSNotFound)
-        appVersion = [appVersion substringToIndex:endRande.location];
-
-    BWQuincyManager *quincyManager = [BWQuincyManager sharedQuincyManager];
-    [quincyManager setApplicationVersion:appVersion];
-    [quincyManager setSubmissionURL:@"http://crash.videolan.org/crash_v200.php"];
-    [quincyManager setDelegate:self];
-    [quincyManager setCompanyName:@"VideoLAN"];
-
     [_coreinteraction updateCurrentlyUsedHotkeys];
 
     [self removeOldPreferences];