Renamed the product from GrowlITTSW to ITTSW. Added image size customization options...

diff --git a/English.lproj/GrowlITTSWPrefs.nib/classes.nib b/English.lproj/GrowlITTSWPrefs.nib/classes.nib
index 6462c4d..c76a295 100644 (file)
--- a/English.lproj/GrowlITTSWPrefs.nib/classes.nib
+++ b/English.lproj/GrowlITTSWPrefs.nib/classes.nib
@@ -64,6 +64,14 @@
                                <string>id</string>
                                <key>setBackgroundStyle</key>
                                <string>id</string>
+                               <key>setBadgeImageWithAppIcon</key>
+                               <string>id</string>
+                               <key>setImageNoUpscale</key>
+                               <string>id</string>
+                               <key>setImageSize</key>
+                               <string>id</string>
+                               <key>setIndentWrap</key>
+                               <string>id</string>
                                <key>setScreen</key>
                                <string>id</string>
                                <key>setVanishDelay</key>
@@ -74,6 +82,10 @@
                                <string>id</string>
                                <key>setWindowSize</key>
                                <string>id</string>
+                               <key>setWrap</key>
+                               <string>id</string>
+                               <key>setWrapColumns</key>
+                               <string>id</string>
                        </dict>
                        <key>CLASS</key>
                        <string>GrowlITTSWPrefs</string>
@@ -89,6 +101,14 @@
                                <string>NSColorWell</string>
                                <key>backgroundStyleButton</key>
                                <string>NSPopUpButton</string>
+                               <key>badgeImageWithAppIconButton</key>
+                               <string>NSButton</string>
+                               <key>imageNoUpscaleButton</key>
+                               <string>NSButton</string>
+                               <key>imageSizeSlider</key>
+                               <string>NSSlider</string>
+                               <key>indentWrapButton</key>
+                               <string>NSButton</string>
                                <key>screenButton</key>
                                <string>NSPopUpButton</string>
                                <key>slider_opacity</key>
@@ -101,6 +121,10 @@
                                <string>NSSlider</string>
                                <key>windowSizeButton</key>
                                <string>NSPopUpButton</string>
+                               <key>wrapColumnsField</key>
+                               <string>NSTextField</string>
+                               <key>wrapNotificationsButton</key>
+                               <string>NSButton</string>
                        </dict>
                        <key>SUPERCLASS</key>
                        <string>NSPreferencePane</string>

diff --git a/English.lproj/GrowlITTSWPrefs.nib/keyedobjects.nib b/English.lproj/GrowlITTSWPrefs.nib/keyedobjects.nib
index 7a1f10a..50567d2 100644 (file)
Binary files a/English.lproj/GrowlITTSWPrefs.nib/keyedobjects.nib and b/English.lproj/GrowlITTSWPrefs.nib/keyedobjects.nib differ

diff --git a/GrowlITTSW.xcodeproj/project.pbxproj b/GrowlITTSW.xcodeproj/project.pbxproj
index fd93ea2..1b823e0 100644 (file)
--- a/GrowlITTSW.xcodeproj/project.pbxproj
+++ b/GrowlITTSW.xcodeproj/project.pbxproj
@@ -81,7 +81,7 @@
                089C167FFE841241C02AAC07 /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = /System/Library/Frameworks/AppKit.framework; sourceTree = "<absolute>"; };
                1058C7ADFEA557BF11CA2CBB /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = /System/Library/Frameworks/Cocoa.framework; sourceTree = "<absolute>"; };
                32DBCF630370AF2F00C91783 /* GrowlITTSW_Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GrowlITTSW_Prefix.pch; sourceTree = "<group>"; };
-               8D5B49B6048680CD000E48DA /* GrowlITTSW.growlView */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = GrowlITTSW.growlView; sourceTree = BUILT_PRODUCTS_DIR; };
+               8D5B49B6048680CD000E48DA /* ITTSW.growlView */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = ITTSW.growlView; sourceTree = BUILT_PRODUCTS_DIR; };
                8D5B49B7048680CD000E48DA /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
                D2F7E65807B2D6F200F64583 /* CoreData.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreData.framework; path = /System/Library/Frameworks/CoreData.framework; sourceTree = "<absolute>"; };
                FA4A471D0F5A3C2A00F37A2B /* GrowlITTSWDisplay.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GrowlITTSWDisplay.h; sourceTree = "<group>"; };
@@ -194,7 +194,7 @@
                19C28FB8FE9D52D311CA2CBB /* Products */ = {
                        isa = PBXGroup;
                        children = (
-                               8D5B49B6048680CD000E48DA /* GrowlITTSW.growlView */,
+                               8D5B49B6048680CD000E48DA /* ITTSW.growlView */,
                        );
                        name = Products;
                        sourceTree = "<group>";
@@ -235,9 +235,9 @@
 /* End PBXGroup section */
 
 /* Begin PBXNativeTarget section */
-               8D5B49AC048680CD000E48DA /* GrowlITTSW */ = {
+               8D5B49AC048680CD000E48DA /* ITTSW */ = {
                        isa = PBXNativeTarget;
-                       buildConfigurationList = 1DEB913A08733D840010E9CD /* Build configuration list for PBXNativeTarget "GrowlITTSW" */;
+                       buildConfigurationList = 1DEB913A08733D840010E9CD /* Build configuration list for PBXNativeTarget "ITTSW" */;
                        buildPhases = (
                                8D5B49AF048680CD000E48DA /* Resources */,
                                8D5B49B1048680CD000E48DA /* Sources */,
@@ -251,10 +251,10 @@
                                FA4A474A0F5A3CD300F37A2B /* PBXTargetDependency */,
                                FA4A474C0F5A3CD500F37A2B /* PBXTargetDependency */,
                        );
-                       name = GrowlITTSW;
+                       name = ITTSW;
                        productInstallPath = "$(HOME)/Library/Bundles";
                        productName = GrowlITTSW;
-                       productReference = 8D5B49B6048680CD000E48DA /* GrowlITTSW.growlView */;
+                       productReference = 8D5B49B6048680CD000E48DA /* ITTSW.growlView */;
                        productType = "com.apple.product-type.bundle";
                };
 /* End PBXNativeTarget section */
@@ -279,7 +279,7 @@
                        );
                        projectRoot = "";
                        targets = (
-                               8D5B49AC048680CD000E48DA /* GrowlITTSW */,
+                               8D5B49AC048680CD000E48DA /* ITTSW */,
                        );
                };
 /* End PBXProject section */
@@ -402,7 +402,7 @@
                                        "-undefined",
                                        dynamic_lookup,
                                );
-                               PRODUCT_NAME = GrowlITTSW;
+                               PRODUCT_NAME = ITTSW;
                                REZ_RESOURCE_MAP_READ_ONLY = YES;
                                WRAPPER_EXTENSION = growlView;
                        };
@@ -423,7 +423,7 @@
                                        "-undefined",
                                        dynamic_lookup,
                                );
-                               PRODUCT_NAME = GrowlITTSW;
+                               PRODUCT_NAME = ITTSW;
                                REZ_RESOURCE_MAP_READ_ONLY = YES;
                                WRAPPER_EXTENSION = growlView;
                        };
@@ -458,7 +458,7 @@
 /* End XCBuildConfiguration section */
 
 /* Begin XCConfigurationList section */
-               1DEB913A08733D840010E9CD /* Build configuration list for PBXNativeTarget "GrowlITTSW" */ = {
+               1DEB913A08733D840010E9CD /* Build configuration list for PBXNativeTarget "ITTSW" */ = {
                        isa = XCConfigurationList;
                        buildConfigurations = (
                                1DEB913B08733D840010E9CD /* Debug */,

diff --git a/GrowlITTSWController.h b/GrowlITTSWController.h
index 469d6e5..0d6b6b1 100644 (file)
--- a/GrowlITTSWController.h
+++ b/GrowlITTSWController.h
@@ -12,8 +12,12 @@
 
 @interface GrowlITTSWController : ITSharedController {
        GrowlITTSWWindow *_window;
+       float _imageSize;
+       BOOL _imageNoUpscale;
+       BOOL _wrapNotifications;
+       int _wrapColumns;
 }
 
-- (void)showWindowWithText:(NSString *)text image:(NSImage *)image;
+- (void)showWindowWithTitle:(NSString *)title text:(NSString *)text image:(NSImage *)image;
 
 @end

diff --git a/GrowlITTSWController.m b/GrowlITTSWController.m
index 172453a..b5c762b 100644 (file)
--- a/GrowlITTSWController.m
+++ b/GrowlITTSWController.m
@@ -56,6 +56,11 @@
 }
 
 - (void)syncWithPrefs {
+       _imageSize = [GrowlITTSWPrefs imageSize];
+       _imageNoUpscale = [GrowlITTSWPrefs imageNoUpscale];
+       _wrapNotifications = [GrowlITTSWPrefs wrapNotifications];
+       _wrapColumns = [GrowlITTSWPrefs wrapColumns];
+       
        NSScreen *screen = [GrowlITTSWPrefs screen];
        ITHorizontalWindowPosition horizontalPosition = [GrowlITTSWPrefs horizontalPosition];
        ITVerticalWindowPosition verticalPosition = [GrowlITTSWPrefs verticalPosition];
@@ -107,17 +112,31 @@
        }
 }
 
-- (void)showWindowWithText:(NSString *)text image:(NSImage *)image {
+- (void)showWindowWithTitle:(NSString *)title text:(NSString *)text image:(NSImage *)image {
+       if (text && ![text isEqualToString:@""] && ![text isEqualToString:@"\n"]) {
+               text = [title stringByAppendingFormat:@"\n%@", text];
+       }
+       
        NSSize newSize;
        NSSize oldSize = [image size];
+       BOOL wouldUpscale = ((oldSize.width <= _imageSize) && (oldSize.height <= _imageSize));
+       
+       if (!(wouldUpscale && _imageNoUpscale)) {
+               if (oldSize.width > oldSize.height) {
+                       newSize = NSMakeSize(_imageSize, (oldSize.height * (_imageSize / oldSize.width)));
+               } else {
+                       newSize = NSMakeSize((oldSize.width * (_imageSize / oldSize.height)), _imageSize);
+               }
+               
+               image = [[[[NSImage alloc] initWithData:[image TIFFRepresentation]] autorelease] imageScaledSmoothlyToSize:newSize];
+       }
        
-       if (oldSize.width > oldSize.height) {
-               newSize = NSMakeSize(110.0f, (oldSize.height * (110.0f / oldSize.width)));
-       } else {
-               newSize = NSMakeSize((oldSize.width * (110.0f / oldSize.height)), 110.0f);
+       if (_wrapNotifications) {
+               text = [text stringByReplacingOccurrencesOfRegex:[NSString stringWithFormat:@"(.{1,%i})(?: +|$)\\n?|(.{%i})", _wrapColumns, _wrapColumns] withString:@"$1$2\n"];
        }
        
-       image = [[[[NSImage alloc] initWithData:[image TIFFRepresentation]] autorelease] imageScaledSmoothlyToSize:newSize];
+       //trim trailing whitespace
+       text = [text stringByReplacingOccurrencesOfRegex:@"[\\s\\r\\n]+$" withString:@""];
        
        NSArray *gothicChars = [NSArray arrayWithObjects:[NSString stringWithUTF8String:"☆"], [NSString stringWithUTF8String:"★"], nil];
        NSMutableAttributedString *attributedText = [[NSMutableAttributedString alloc] initWithString:text];
@@ -125,7 +144,7 @@
        if (([gothicChars count] > 0) && ([text length] > 0)) {
                NSMutableString *gothicRegex = [[NSMutableString alloc] init];
                
-               [gothicRegex appendString:@"["];
+               [gothicRegex appendString:@"[\\n"];
                for (NSString *gothicChar in gothicChars) {
                        [gothicRegex appendString:gothicChar];
                }

diff --git a/GrowlITTSWDisplay.m b/GrowlITTSWDisplay.m
index b6727e8..ac9a647 100644 (file)
--- a/GrowlITTSWDisplay.m
+++ b/GrowlITTSWDisplay.m
@@ -31,13 +31,7 @@
        NSString *title = [dict objectForKey:GROWL_NOTIFICATION_TITLE];
        NSString *desc = [dict objectForKey:GROWL_NOTIFICATION_DESCRIPTION];
        NSImage *image = [dict objectForKey:GROWL_NOTIFICATION_ICON];
-       NSString *text;
-       if (desc) {
-               text = [title stringByAppendingFormat:@"\n%@", desc];
-       } else {
-               text = title;
-       }
-       [[GrowlITTSWController sharedController] showWindowWithText:text image:image];
+       [[GrowlITTSWController sharedController] showWindowWithTitle:title text:desc image:image];
 }
 
 @end

diff --git a/GrowlITTSWPrefs.h b/GrowlITTSWPrefs.h
index a83d30f..bf3986c 100644 (file)
--- a/GrowlITTSWPrefs.h
+++ b/GrowlITTSWPrefs.h
@@ -14,6 +14,10 @@
        IBOutlet NSPopUpButton *windowSizeButton;
        
        IBOutlet NSPopUpButton *screenButton;
+       IBOutlet NSSlider *imageSizeSlider;
+       IBOutlet NSButton *imageNoUpscaleButton;
+       IBOutlet NSButton *wrapNotificationsButton;
+       IBOutlet NSTextField *wrapColumnsField;
 }
 
 + (Class)appearanceEffect;
@@ -29,6 +33,11 @@
 + (ITHorizontalWindowPosition)horizontalPosition;
 + (ITVerticalWindowPosition)verticalPosition;
 
++ (float)imageSize;
++ (BOOL)imageNoUpscale;
++ (BOOL)wrapNotifications;
++ (int)wrapColumns;
+
 - (IBAction)setAppearanceEffect:(id)sender;
 - (IBAction)setAppearanceSpeed:(id)sender;
 - (IBAction)setVanishEffect:(id)sender;
@@ -40,5 +49,9 @@
 - (IBAction)setWindowSize:(id)sender;
 
 - (IBAction)setScreen:(id)sender;
+- (IBAction)setImageSize:(id)sender;
+- (IBAction)setImageNoUpscale:(id)sender;
+- (IBAction)setWrap:(id)sender;
+- (IBAction)setWrapColumns:(id)sender;
 
 @end

diff --git a/GrowlITTSWPrefs.m b/GrowlITTSWPrefs.m
index df4f7bf..9a6eac2 100644 (file)
--- a/GrowlITTSWPrefs.m
+++ b/GrowlITTSWPrefs.m
@@ -127,6 +127,34 @@
        }
 }
 
++ (float)imageSize {
+       SYNCHRONIZE_GROWL_PREFS();
+       float imageSize = 110.0f;
+       READ_GROWL_PREF_FLOAT(@"imageSize", GrowlITTSWPrefsDomain, &imageSize);
+       return imageSize;
+}
+
++ (BOOL)imageNoUpscale {
+       SYNCHRONIZE_GROWL_PREFS();
+       BOOL imageNoUpscale = NO;
+       READ_GROWL_PREF_BOOL(@"imageNoUpscale", GrowlITTSWPrefsDomain, &imageNoUpscale);
+       return imageNoUpscale;
+}
+
++ (BOOL)wrapNotifications {
+       SYNCHRONIZE_GROWL_PREFS();
+       BOOL wrapNotifications = NO;
+       READ_GROWL_PREF_BOOL(@"wrapNotifications", GrowlITTSWPrefsDomain, &wrapNotifications);
+       return wrapNotifications;
+}
+
++ (int)wrapColumns {
+       SYNCHRONIZE_GROWL_PREFS();
+       int wrapColumns = 64;
+       READ_GROWL_PREF_INT(@"wrapColumns", GrowlITTSWPrefsDomain, &wrapColumns);
+       return wrapColumns;
+}
+
 - (NSString *)mainNibName {
        return @"GrowlITTSWPrefs";
 }
@@ -165,6 +193,13 @@
                [screenButton setEnabled:NO];
        }
        [screenButton selectItemAtIndex:[screenButton indexOfItemWithRepresentedObject:[GrowlITTSWPrefs screen]]];
+       [imageSizeSlider setFloatValue:[GrowlITTSWPrefs imageSize]];
+       [imageNoUpscaleButton setState:([GrowlITTSWPrefs imageNoUpscale] ? NSOnState : NSOffState)];
+       
+       BOOL wrapNotifications = [GrowlITTSWPrefs wrapNotifications];
+       [wrapNotificationsButton setState:(wrapNotifications ? NSOnState : NSOffState)];
+       [wrapColumnsField setIntValue:[GrowlITTSWPrefs wrapColumns]];
+       [wrapColumnsField setEnabled:wrapNotifications];
 }
 
 - (void)awakeFromNib {
@@ -275,4 +310,34 @@
        UPDATE_GROWL_PREFS();
 }
 
+- (IBAction)setImageSize:(id)sender {
+       SYNCHRONIZE_GROWL_PREFS();
+       float imageSize = [imageSizeSlider floatValue];
+       WRITE_GROWL_PREF_FLOAT(@"imageSize", imageSize, GrowlITTSWPrefsDomain);
+       UPDATE_GROWL_PREFS();
+}
+
+- (IBAction)setImageNoUpscale:(id)sender {
+       SYNCHRONIZE_GROWL_PREFS();
+       BOOL imageNoUpscale = ([imageNoUpscaleButton state] == NSOnState) ? YES : NO;
+       WRITE_GROWL_PREF_BOOL(@"imageNoUpscale", imageNoUpscale, GrowlITTSWPrefsDomain);
+       UPDATE_GROWL_PREFS();
+}
+
+- (IBAction)setWrap:(id)sender {
+       SYNCHRONIZE_GROWL_PREFS();
+       BOOL wrapNotifications = ([wrapNotificationsButton state] == NSOnState) ? YES : NO;
+       [wrapColumnsField setEnabled:wrapNotifications];
+       WRITE_GROWL_PREF_BOOL(@"wrapNotifications", wrapNotifications, GrowlITTSWPrefsDomain);
+       UPDATE_GROWL_PREFS();
+}
+
+- (IBAction)setWrapColumns:(id)sender {
+       SYNCHRONIZE_GROWL_PREFS();
+       int wrapColumns = [wrapColumnsField intValue];
+       [wrapColumnsField setIntValue:wrapColumns];
+       WRITE_GROWL_PREF_INT(@"wrapColumns", wrapColumns, GrowlITTSWPrefsDomain);
+       UPDATE_GROWL_PREFS();
+}
+
 @end

diff --git a/Info.plist b/Info.plist
index 7bc2d5d..920e1e1 100644 (file)
--- a/Info.plist
+++ b/Info.plist
@@ -5,13 +5,13 @@
        <key>CFBundleDevelopmentRegion</key>
        <string>English</string>
        <key>CFBundleExecutable</key>
-       <string>GrowlITTSW</string>
+       <string>ITTSW</string>
        <key>CFBundleIdentifier</key>
        <string>com.ithinksw.growl-ittsw</string>
        <key>CFBundleInfoDictionaryVersion</key>
        <string>6.0</string>
        <key>CFBundleName</key>
-       <string>GrowlITTSW</string>
+       <string>ITTSW</string>
        <key>CFBundlePackageType</key>
        <string>DISP</string>
        <key>CFBundleSignature</key>