From 76d7e65ef0447fe421a77ed2f16c19a83afb17f6 Mon Sep 17 00:00:00 2001 From: bamse16 Date: Fri, 5 Oct 2012 08:49:47 +0000 Subject: Issue 1470: [REQ] Support for bundling default Themes Themes will be copied from Default Themes to ~/Library/Application Support/Sequel Pro/Themes, only if a theme with the same name does not exist in that folder. --- Scripts/build.sh | 8 +++ SharedSupport/Default Themes/Blue Dark.spTheme | 78 ++++++++++++++++++++++++++ Source/SPAppController.m | 53 +++++++++++++++++ 3 files changed, 139 insertions(+) create mode 100644 SharedSupport/Default Themes/Blue Dark.spTheme diff --git a/Scripts/build.sh b/Scripts/build.sh index 9783d9b4..bc5a9d14 100755 --- a/Scripts/build.sh +++ b/Scripts/build.sh @@ -73,6 +73,14 @@ mkdir -p "${BUILD_PRODUCT}/Contents/SharedSupport/Default Bundles" cp -R "${SRCROOT}/SharedSupport/Default Bundles" "${BUILD_PRODUCT}/Contents/SharedSupport" +# Copy all Default Themes to build product +rm -rf "${BUILD_PRODUCT}/Contents/SharedSupport/Default Themes" + +mkdir -p "${BUILD_PRODUCT}/Contents/SharedSupport/Default Themes" + +cp -R "${SRCROOT}/SharedSupport/Default Themes" "${BUILD_PRODUCT}/Contents/SharedSupport" + + # Perform distribution specific tasks if this is a 'Distribution' build if [ "$CONFIGURATION" == 'Distribution' ] then diff --git a/SharedSupport/Default Themes/Blue Dark.spTheme b/SharedSupport/Default Themes/Blue Dark.spTheme new file mode 100644 index 00000000..c7aa2adc --- /dev/null +++ b/SharedSupport/Default Themes/Blue Dark.spTheme @@ -0,0 +1,78 @@ + + + + + settings + + + settings + + background + #111D41 + caret + #82E661 + foreground + #A0E0EE + lineHighlight + #92FFC93A + selection + #EA33545E + + + + name + Comment + settings + + foreground + #A6B6D0 + + + + name + String + settings + + foreground + #83C657 + + + + name + Keyword + settings + + foreground + #9451BD + + + + name + User-defined constant + settings + + foreground + #DCB838 + + + + name + Number + settings + + foreground + #DC5E14 + + + + name + Variable + settings + + foreground + #4FADEC + + + + + diff --git a/Source/SPAppController.m b/Source/SPAppController.m index c993749a..7885e339 100644 --- a/Source/SPAppController.m +++ b/Source/SPAppController.m @@ -146,6 +146,7 @@ YY_BUFFER_STATE yy_scan_string (const char *); [[FRFeedbackReporter sharedReporter] reportIfCrash]; [self reloadBundles:self]; + [self copyDefaultThemes]; // If no documents are open, open one if (![self frontDocument]) { @@ -183,6 +184,58 @@ YY_BUFFER_STATE yy_scan_string (const char *); return YES; } +/** + * Copy default themes, when we start the app. + */ + +- (void)copyDefaultThemes +{ + NSFileManager *fm = [NSFileManager defaultManager]; + NSError *appPathError = nil; + + NSString *defaultThemesPath = [NSString stringWithFormat:@"%@/Contents/SharedSupport/Default Themes", [[NSBundle mainBundle] bundlePath]]; + NSString *appSupportThemesPath = [fm applicationSupportDirectoryForSubDirectory:SPThemesSupportFolder createIfNotExists:YES error:&appPathError]; + + // If ~/Library/Application Path/Sequel Pro/Themes couldn't be created bail + if(appPathError != nil) { + NSAlert *alert = [NSAlert alertWithMessageText:NSLocalizedString(@"Themes Installation Error", @"themes installation error") + defaultButton:NSLocalizedString(@"OK", @"OK button") + alternateButton:nil + otherButton:nil + informativeTextWithFormat:[NSString stringWithFormat:NSLocalizedString(@"Couldn't create Application Support Theme folder!\nError: %@", @"Couldn't create Application Support Theme folder!\nError: %@"), [appPathError localizedDescription]]]; + + [alert runModal]; + return; + } + + NSError *error = nil; + NSError *copyError = nil; + NSArray *defaultThemes = [fm contentsOfDirectoryAtPath:defaultThemesPath error:&error]; + if (defaultThemes && [defaultThemes count] && error == nil) { + for(NSString* defaultTheme in defaultThemes) { + if(![[[defaultTheme pathExtension] lowercaseString] isEqualToString:[SPColorThemeFileExtension lowercaseString]]) continue; + + NSString *defaultThemeFullPath = [NSString stringWithFormat:@"%@/%@", defaultThemesPath, defaultTheme]; + NSString *appSupportThemeFullPath = [NSString stringWithFormat:@"%@/%@", appSupportThemesPath, defaultTheme]; + + if([fm fileExistsAtPath:appSupportThemeFullPath]) continue; + [fm copyItemAtPath:defaultThemeFullPath toPath:appSupportThemeFullPath error:©Error]; + } + } + + // If Themes could not be copied, show error message + if(copyError != nil) { + NSAlert *alert = [NSAlert alertWithMessageText:NSLocalizedString(@"Themes Installation Error", @"themes installation error") + defaultButton:NSLocalizedString(@"OK", @"OK button") + alternateButton:nil + otherButton:nil + informativeTextWithFormat:[NSString stringWithFormat:NSLocalizedString(@"Couldn't copy default themes to Application Support Theme folder!\nError: %@", @"Couldn't copy default themes to Application Support Theme folder!\nError: %@"), [copyError localizedDescription]]]; + + [alert runModal]; + return; + } +} + #pragma mark - #pragma mark Open methods -- cgit v1.2.3