Skip to content

Commit

Permalink
chore(build): deprecate growl notifications
Browse files Browse the repository at this point in the history
  • Loading branch information
lotem committed Sep 22, 2017
1 parent c350c08 commit 2160d71
Show file tree
Hide file tree
Showing 20 changed files with 180 additions and 2,471 deletions.
535 changes: 58 additions & 477 deletions English.lproj/MainMenu.xib

Large diffs are not rendered by default.

16 changes: 0 additions & 16 deletions Growl Registration Ticket.growlRegDict

This file was deleted.

1 change: 0 additions & 1 deletion Growl.framework/Growl

This file was deleted.

1 change: 0 additions & 1 deletion Growl.framework/Headers

This file was deleted.

1 change: 0 additions & 1 deletion Growl.framework/Resources

This file was deleted.

Binary file removed Growl.framework/Versions/A/Growl
Binary file not shown.
5 changes: 0 additions & 5 deletions Growl.framework/Versions/A/Headers/Growl.h

This file was deleted.

551 changes: 0 additions & 551 deletions Growl.framework/Versions/A/Headers/GrowlApplicationBridge.h

This file was deleted.

341 changes: 0 additions & 341 deletions Growl.framework/Versions/A/Headers/GrowlDefines.h

This file was deleted.

40 changes: 0 additions & 40 deletions Growl.framework/Versions/A/Resources/Info.plist

This file was deleted.

34 changes: 0 additions & 34 deletions Growl.framework/Versions/A/_CodeSignature/CodeResources

This file was deleted.

1 change: 0 additions & 1 deletion Growl.framework/Versions/Current

This file was deleted.

2 changes: 1 addition & 1 deletion Info.plist
Expand Up @@ -19,7 +19,7 @@
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>0.9.26.2</string>
<string>0.9.27</string>
<key>ComponentInputModeDict</key>
<dict>
<key>tsInputModeListKey</key>
Expand Down
3 changes: 0 additions & 3 deletions README.md
Expand Up @@ -118,7 +118,6 @@
* darts-clone (New BSD License)
* google-glog (New BSD License)
* Google Test (New BSD License)
* Growl (BSD License)
* LevelDB (New BSD License)
* librime (New BSD License)
* OpenCC / 開放中文轉換 (Apache License 2.0)
Expand All @@ -140,6 +139,4 @@ https://github.com/rime/home/issues
技術交流,歡迎光臨 [Rime 代碼之家](https://github.com/rime/home)
或致信 Rime 開發者 <rimeime@gmail.com>

圍繞 Rime 的用法及相關話題,歡迎來訪 Rime 網站參加 [線上討論](http://rime.im/discuss/)

謝謝
10 changes: 0 additions & 10 deletions Squirrel.xcodeproj/project.pbxproj
Expand Up @@ -9,7 +9,6 @@
/* Begin PBXBuildFile section */
442B5B881570C37200370DEA /* squirrel.yaml in Copy Shared Support Files */ = {isa = PBXBuildFile; fileRef = 442B5B871570C37200370DEA /* squirrel.yaml */; };
4443A83A1828CC5100731305 /* input_source.m in Sources */ = {isa = PBXBuildFile; fileRef = 4443A8391828CC5100731305 /* input_source.m */; };
448CCCDD166B2E0500337E78 /* Growl Registration Ticket.growlRegDict in Resources */ = {isa = PBXBuildFile; fileRef = 448CCCDC166B2E0500337E78 /* Growl Registration Ticket.growlRegDict */; };
4493402B158A4ABC0041A35A /* squirrel-app.icns in Resources */ = {isa = PBXBuildFile; fileRef = 4493402A158A4ABC0041A35A /* squirrel-app.icns */; };
44986A95184B421700B3278D /* LICENSE.txt in Resources */ = {isa = PBXBuildFile; fileRef = 44986A93184B421700B3278D /* LICENSE.txt */; };
44986A96184B421700B3278D /* README.md in Resources */ = {isa = PBXBuildFile; fileRef = 44986A94184B421700B3278D /* README.md */; };
Expand All @@ -19,8 +18,6 @@
44CD7D9F1828D981006E9222 /* rime.pdf in Resources */ = {isa = PBXBuildFile; fileRef = 44CD7D9E1828D981006E9222 /* rime.pdf */; };
44E21A9016A653E700C2B08F /* rime_deployer in CopyFiles */ = {isa = PBXBuildFile; fileRef = 44E21A8E16A653E700C2B08F /* rime_deployer */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; };
44E21A9116A653E700C2B08F /* rime_dict_manager in CopyFiles */ = {isa = PBXBuildFile; fileRef = 44E21A8F16A653E700C2B08F /* rime_dict_manager */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; };
44E8CD99166B8542002C8EE3 /* Growl.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 44E8CD98166B8542002C8EE3 /* Growl.framework */; };
44E8CD9A166B857F002C8EE3 /* Growl.framework in Copy 3rd-party Frameworks */ = {isa = PBXBuildFile; fileRef = 44E8CD98166B8542002C8EE3 /* Growl.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; };
44E98EC314AE1AC900847AD6 /* utf8.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 44E98EC214AE1AC900847AD6 /* utf8.cpp */; };
44F01493152AF6AF00EFDAC3 /* Sparkle.framework in Copy 3rd-party Frameworks */ = {isa = PBXBuildFile; fileRef = 44F01492152AF6AF00EFDAC3 /* Sparkle.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; };
44F01538152B2D9300EFDAC3 /* Sparkle.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 44F01492152AF6AF00EFDAC3 /* Sparkle.framework */; };
Expand Down Expand Up @@ -163,7 +160,6 @@
dstSubfolderSpec = 10;
files = (
44CD640C15E2646B0021234E /* librime.1.dylib in Copy 3rd-party Frameworks */,
44E8CD9A166B857F002C8EE3 /* Growl.framework in Copy 3rd-party Frameworks */,
44F01493152AF6AF00EFDAC3 /* Sparkle.framework in Copy 3rd-party Frameworks */,
);
name = "Copy 3rd-party Frameworks";
Expand All @@ -182,7 +178,6 @@
4443A8391828CC5100731305 /* input_source.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = input_source.m; sourceTree = "<group>"; };
446D18E014F0191200EC3116 /* zh_CN */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = zh_CN; path = zh_CN.lproj/InfoPlist.strings; sourceTree = "<group>"; };
446D18E114F0193100EC3116 /* zh_TW */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = zh_TW; path = zh_TW.lproj/InfoPlist.strings; sourceTree = "<group>"; };
448CCCDC166B2E0500337E78 /* Growl Registration Ticket.growlRegDict */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = "Growl Registration Ticket.growlRegDict"; sourceTree = "<group>"; };
4493402A158A4ABC0041A35A /* squirrel-app.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = "squirrel-app.icns"; sourceTree = "<group>"; };
44986A93184B421700B3278D /* LICENSE.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = LICENSE.txt; sourceTree = "<group>"; };
44986A94184B421700B3278D /* README.md */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = README.md; sourceTree = "<group>"; };
Expand All @@ -196,7 +191,6 @@
44DA191B152B8CBC00FB8EF0 /* zh_TW */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = zh_TW; path = zh_TW.lproj/MainMenu.xib; sourceTree = "<group>"; };
44E21A8E16A653E700C2B08F /* rime_deployer */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.executable"; name = rime_deployer; path = bin/rime_deployer; sourceTree = "<group>"; };
44E21A8F16A653E700C2B08F /* rime_dict_manager */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.executable"; name = rime_dict_manager; path = bin/rime_dict_manager; sourceTree = "<group>"; };
44E8CD98166B8542002C8EE3 /* Growl.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = Growl.framework; sourceTree = "<group>"; };
44E98EA514AE16DD00847AD6 /* checked.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = checked.h; sourceTree = "<group>"; };
44E98EA614AE16DD00847AD6 /* core.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = core.h; sourceTree = "<group>"; };
44E98EA714AE16DD00847AD6 /* unchecked.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = unchecked.h; sourceTree = "<group>"; };
Expand Down Expand Up @@ -272,7 +266,6 @@
E93074B70A5C264700470842 /* InputMethodKit.framework in Frameworks */,
A4B8E1B30F645B870094E08B /* Carbon.framework in Frameworks */,
44F01538152B2D9300EFDAC3 /* Sparkle.framework in Frameworks */,
44E8CD99166B8542002C8EE3 /* Growl.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down Expand Up @@ -307,7 +300,6 @@
children = (
44CD640915E2633D0021234E /* librime.1.dylib */,
1058C7A1FEA54F0111CA2CBB /* Cocoa.framework */,
44E8CD98166B8542002C8EE3 /* Growl.framework */,
44F01492152AF6AF00EFDAC3 /* Sparkle.framework */,
);
name = "Linked Frameworks";
Expand Down Expand Up @@ -360,7 +352,6 @@
8D1107310486CEB800E47090 /* Info.plist */,
089C165CFE840E0CC02AAC07 /* InfoPlist.strings */,
A45578F41146A75200592C6E /* MainMenu.xib */,
448CCCDC166B2E0500337E78 /* Growl Registration Ticket.growlRegDict */,
);
name = Resources;
sourceTree = "<group>";
Expand Down Expand Up @@ -519,7 +510,6 @@
44F7708F152B3334005CF491 /* dsa_pub.pem in Resources */,
44CD7D9F1828D981006E9222 /* rime.pdf in Resources */,
4493402B158A4ABC0041A35A /* squirrel-app.icns in Resources */,
448CCCDD166B2E0500337E78 /* Growl Registration Ticket.growlRegDict in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down
2 changes: 1 addition & 1 deletion SquirrelApplicationDelegate.h
Expand Up @@ -34,4 +34,4 @@
@end

// also used in main.m
extern void (*show_message)(const char* msg_text, const char* msg_id);
extern void show_message(const char* msg_text, const char* msg_id);
30 changes: 1 addition & 29 deletions SquirrelApplicationDelegate.m
@@ -1,6 +1,5 @@
#import "SquirrelApplicationDelegate.h"

#import <Growl/Growl.h>
#import <rime_api.h>
#import "SquirrelConfig.h"
#import "SquirrelPanel.h"
Expand Down Expand Up @@ -33,23 +32,7 @@ -(IBAction)openWiki:(id)sender
[[NSWorkspace sharedWorkspace] openURL:[NSURL URLWithString:kRimeWikiURL]];
}

static void show_message_growl(const char* msg_text, const char* msg_id) {
@autoreleasepool {
[GrowlApplicationBridge
notifyWithTitle:NSLocalizedString(@"Squirrel", nil)
description:NSLocalizedString(@(msg_text), nil)
notificationName:@"Squirrel"
iconData:[NSData
dataWithData:[NSImage imageNamed:@"squirrel-app"]
.TIFFRepresentation]
priority:0
isSticky:NO
clickContext:nil
identifier:@(msg_id)];
}
}

static void show_message_notification_center(const char* msg_text, const char* msg_id) {
void show_message(const char* msg_text, const char* msg_id) {
@autoreleasepool {
id notification = [[NSClassFromString(@"NSUserNotification") alloc] init];
[notification performSelector:@selector(setTitle:)
Expand All @@ -71,8 +54,6 @@ static void show_status_message(const char* msg_text, const char* msg_id) {
}
}

void (*show_message)(const char* msg_text, const char* msg_id) = show_message_growl;

void notification_handler(void* context_object, RimeSessionId session_id,
const char* message_type, const char* message_value) {
if (!strcmp(message_type, "deploy")) {
Expand Down Expand Up @@ -183,15 +164,6 @@ -(void)loadSettings {

_enableNotifications =
![[_config getString:@"show_notifications_when"] isEqualToString:@"never"];
[GrowlApplicationBridge setShouldUseBuiltInNotifications:_enableNotifications];

if ([_config getBool:@"show_notifications_via_notification_center"] &&
OSVersionIsEqualOrAbove(10, 8)) {
show_message = show_message_notification_center;
}
else {
show_message = show_message_growl;
}

[self.panel updateConfig:_config];
}
Expand Down
8 changes: 3 additions & 5 deletions data/squirrel.yaml
@@ -1,7 +1,7 @@
# Squirrel settings
# encoding: utf-8

config_version: "0.24"
config_version: "0.27"

us_keyboard_layout: false

Expand All @@ -11,10 +11,8 @@ chord_duration: 0.1 # seconds
# options: always | never | appropriate
show_notifications_when: appropriate

# Show notifications via Notification Center instead of Growl.
# (Only valid if OS version is at least 10.8 and
# 'show_notifications_when' is NOT set to 'never'.)
show_notifications_via_notification_center: false
# DEPRECATED: since 0.27
#show_notifications_via_notification_center: false

style:
color_scheme: native
Expand Down

0 comments on commit 2160d71

Please sign in to comment.