Changeset 336


Ignore:
Timestamp:
08/13/07 01:08:40 (17 years ago)
Author:
Nicholas Riley
Message:

VERSION: Starting with 1.4.4b1, should be close to final.

ICeCoffEEServicePrefController.m: Display correct key equivalents, backported from [319].

ICeCoffEEWebKit.m: Fix Safari 3 beta compatibility; better comment WebKit interfaces.

Info-APE Module.plist: Update version to 1.4.4b1.

ICeCoffEE.xcodeproj: Remove obsolete WebKit header.

English.lproj/APEInfo.rtfd: Backported updates from [320]; release notes.

English.lproj/InfoPlist.strings: Update version to 1.4.4b1.

English.lproj/Localizable.strings: Fix an "APE Manager" reference I didn't catch before.

ape_install: Updated to APE 2.0.3.

ui.plist: Update version to 1.4.4b1.

Info-APEManagerPrefPane.plist: Update version to 1.4.4b1.

Location:
releases/ICeCoffEE/1.4.4b1/ICeCoffEE
Files:
11 edited

Legend:

Unmodified
Added
Removed
  • releases/ICeCoffEE/1.4.4b1/ICeCoffEE/English.lproj/Localizable.strings

    r139 r336  
    4444/* Session disable alert */
    4545"DisableAlertTitle" = "Disable ICeCoffEE";
    46 "DisableAlertMessage%@" = "If you believe ICeCoffEE is interfering with the normal functioning of the application “%@”, you can turn it off in this application until the application has quit.\n\nIf this is the first time you have experienced this problem, please email icecoffee@sabi.net with the details of the conflict.\n\nTo disable ICeCoffEE permanently, use the APE Manager pane of System Preferences.";
     46"DisableAlertMessage%@" = "If you believe ICeCoffEE is interfering with the normal functioning of the application “%@”, you can turn it off in this application until the application has quit.\n\nIf this is the first time you have experienced this problem, please email icecoffee@sabi.net with the details of the conflict.\n\nTo disable ICeCoffEE permanently, use the Application Enhancer pane of System Preferences.";
    4747"DisableAlertDisableButton" = "Disable";
    4848"DisableAlertDontDisableButton" = "Don’t Disable";
  • releases/ICeCoffEE/1.4.4b1/ICeCoffEE/ICeCoffEE.xcodeproj/project.pbxproj

    r272 r336  
    223223                E1ABAED40812F4B2007C5427 /* Info-APEManagerPrefPane.plist */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = "Info-APEManagerPrefPane.plist"; sourceTree = "<group>"; };
    224224                E1ABAED50812F4B2007C5427 /* APEManagerPrefPane.plugin */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = APEManagerPrefPane.plugin; sourceTree = BUILT_PRODUCTS_DIR; };
    225                 E1ABAEDF0812F4B2007C5427 /* ICFindFilesToRemove */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = ICFindFilesToRemove; sourceTree = BUILT_PRODUCTS_DIR; };
     225                E1ABAEDF0812F4B2007C5427 /* ICFindFilesToRemove */ = {isa = PBXFileReference; includeInIndex = 0; lastKnownFileType = "compiled.mach-o.executable"; path = ICFindFilesToRemove; sourceTree = BUILT_PRODUCTS_DIR; };
    226226                E1ABAEF00812F4B3007C5427 /* Info-ICeCoffEE Installer.plist */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = "Info-ICeCoffEE Installer.plist"; sourceTree = "<group>"; };
    227227                E1BB268F03DB74B700050002 /* ICeCoffEEMenuOnly.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ICeCoffEEMenuOnly.h; sourceTree = "<group>"; };
     
    232232                E1BF15A403DBAA5600050002 /* KillPrefpanesCache.sh */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.script.sh; path = KillPrefpanesCache.sh; sourceTree = "<group>"; };
    233233                E1BF15A503DBAA5600050002 /* ui.plist */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.plist; path = ui.plist; sourceTree = "<group>"; };
    234                 E1BF15BD03DBBD3E00050002 /* package-ICeCoffEE.sh */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.script.sh; name = "package-ICeCoffEE.sh"; path = "/Users/nicholas/Documents/Development/ICeCoffEE/package-ICeCoffEE.sh"; sourceTree = "<absolute>"; };
     234                E1BF15BD03DBBD3E00050002 /* package-ICeCoffEE.sh */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.script.sh; name = "package-ICeCoffEE.sh"; path = "../package-ICeCoffEE.sh"; sourceTree = SOURCE_ROOT; };
    235235                E1BF15BF03DBBE8900050002 /* VERSION */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = VERSION; sourceTree = "<group>"; };
    236236                E1BF166A03DBE27000050002 /* ICeCoffEEWebKit.m */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.objc; path = ICeCoffEEWebKit.m; sourceTree = "<group>"; tabWidth = 8; usesTabs = 1; };
     
    238238                E1BF166C03DBE27000050002 /* ICeCoffEEWebKitSuper.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = ICeCoffEEWebKitSuper.m; sourceTree = "<group>"; };
    239239                E1BF166D03DBE27000050002 /* ICeCoffEEWebKit.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = ICeCoffEEWebKit.h; sourceTree = "<group>"; };
    240                 E1BF167203DBEAA000050002 /* WebCoreBridge.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = WebCoreBridge.h; sourceTree = "<group>"; };
    241240                E1BF4A4D0487C77C00C20906 /* German */ = {isa = PBXFileReference; lastKnownFileType = wrapper.rtfd; name = German; path = German.lproj/APEInfo.rtfd; sourceTree = "<group>"; };
    242241                E1BF4A500487C7B300C20906 /* German */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = German; path = "German.lproj/APE Manager plugin.nib"; sourceTree = "<group>"; };
     
    438437                                E1BB269303DB74C200050002 /* ICeCoffEEMenuSuper.h */,
    439438                                E1BB269403DB74C200050002 /* ICeCoffEEMenuSuper.m */,
    440                                 E1BF167203DBEAA000050002 /* WebCoreBridge.h */,
    441439                                E1BF166D03DBE27000050002 /* ICeCoffEEWebKit.h */,
    442440                                E1BF166A03DBE27000050002 /* ICeCoffEEWebKit.m */,
  • releases/ICeCoffEE/1.4.4b1/ICeCoffEE/ICeCoffEEServicePrefController.m

    r182 r336  
    257257        return (state == nil) ? ICCF_SERVICE_SHOWN : state;
    258258    } else if ([[tableColumn identifier] isEqualToString: @"key"]) {
    259         [item setKeyEquivalent: @"#"];
    260259        NSString *equivalent = [item keyEquivalent];
    261260        if (equivalent == nil || [equivalent length] != 1) return nil;
  • releases/ICeCoffEE/1.4.4b1/ICeCoffEE/ICeCoffEEWebKit.m

    r216 r336  
    1010#import <unistd.h>
    1111
    12 // from WebCoreBridge.h
     12// WebCoreBridge, from WebCoreBridge.h (Safari 2)
     13// Web(Core)FrameBridge, from WebCoreFrameBridge.h (Safari 3)
    1314@interface WebCoreBridge : NSObject
    1415
    15 - (NSString *)selectedString;
    16 - (NSRect)selectionRect;
     16- (NSString *)selectedString; // public
    1717
    18 - (void)selectNSRange:(NSRange)range;
    19 - (void)deselectAll;
     18- (void)selectNSRange:(NSRange)range; // private, Safari 2 & 3
    2019
    2120@end
     
    2423@interface WebHTMLView : NSObject
    2524
    26 - (WebCoreBridge *)_bridge;
     25- (WebCoreBridge *)_bridge; // private, in Safari 2 & 3; WebFrameBridge in Safari 3 (see above)
    2726
    28 - (NSRange)selectedRange;
     27- (NSRange)selectedRange; // WebNSTextInputSupport, Safari 2 & 3
    2928
    30 - (NSDictionary *)elementAtPoint:(NSPoint)point;
     29- (NSRect)selectionRect; // Safari 3 only
     30- (NSRect)_selectionRect; // Safari 2, supported in Safari 3 only for use with Mail
     31// (see <http://trac.webkit.org/projects/webkit/browser/trunk/WebKit/WebView/WebHTMLView.mm?rev=25024#L1430>)
     32
     33- (void)drawSingleRect:(NSRect)rect;
     34
     35- (void)deselectAll; // Safari 2 & 3
     36
     37- (NSDictionary *)elementAtPoint:(NSPoint)point; // private, Safari 2 & 3
    3138
    3239@end
     
    9198            if (ICCF_LaunchURL(selectedString, ICCF_KeyboardAction(downEvent)) && ICCF_prefs.textBlinkEnabled && canSetSelection) {
    9299                int i;
    93                 NSRect selectionRect = [bridge selectionRect];
     100                NSRect selectionRect;
     101                if ([self respondsToSelector: @selector(selectionRect)])
     102                    selectionRect = [(WebHTMLView *)self selectionRect];
     103                else if ([self respondsToSelector: @selector(_selectionRect)])
     104                    selectionRect = [(WebHTMLView *)self _selectionRect];
    94105                ICLog(@"selectedRange %@ selectionRect %@ textBlinkCount %d", NSStringFromRange(selectedRange), NSStringFromRect(selectionRect), ICCF_prefs.textBlinkCount);
    95106                for (i = 0 ; i < ICCF_prefs.textBlinkCount ; i++) {
    96                     [bridge deselectAll];
     107                    [(WebHTMLView *)self deselectAll];
    97108                    [self setNeedsDisplayInRect: selectionRect];
    98109                    [self display];
  • releases/ICeCoffEE/1.4.4b1/ICeCoffEE/Info-APE Module.plist

    r279 r336  
    3333        <string>ICCF</string>
    3434        <key>CFBundleVersion</key>
    35         <string>1.4.3</string>
     35        <string>1.4.4b1</string>
    3636</dict>
    3737</plist>
  • releases/ICeCoffEE/1.4.4b1/ICeCoffEE/Info-APEManagerPrefPane.plist

    r279 r336  
    2424        <string>????</string>
    2525        <key>CFBundleVersion</key>
    26         <string>1.4.3</string>
     26        <string>1.4.4b1</string>
    2727        <key>NSMainNibFile</key>
    2828        <string>APE Manager plugin</string>
  • releases/ICeCoffEE/1.4.4b1/ICeCoffEE/Installer components/ui/ui.plist

    r279 r336  
    3939        <string>ICeCoffEE</string>
    4040        <key>ProductNumVersion</key>
    41         <integer>21200896</integer>
     41        <integer>21258241</integer>
    4242        <key>ProductType</key>
    4343        <string>Preference Pane</string>
    4444        <key>ProductVersion</key>
    45         <string>1.4.3</string>
     45        <string>1.4.4b1</string>
    4646        <key>UIPlugin</key>
    4747        <string>UI_SCRInstall.plugin</string>
  • releases/ICeCoffEE/1.4.4b1/ICeCoffEE/VERSION

    r279 r336  
    1 1.4.3
     11.4.4b1
Note: See TracChangeset for help on using the changeset viewer.