Tomotaka SUWA
t-suw****@users*****
2006年 4月 1日 (土) 09:32:55 JST
Index: AquaSKK/AquaSKKServer.h diff -u AquaSKK/AquaSKKServer.h:1.1.2.2 AquaSKK/AquaSKKServer.h:1.1.2.3 --- AquaSKK/AquaSKKServer.h:1.1.2.2 Sun Feb 19 13:50:54 2006 +++ AquaSKK/AquaSKKServer.h Sat Apr 1 09:32:54 2006 @@ -1,5 +1,5 @@ /* - $Id: AquaSKKServer.h,v 1.1.2.2 2006/02/19 04:50:54 t-suwa Exp $ + $Id: AquaSKKServer.h,v 1.1.2.3 2006/04/01 00:32:54 t-suwa Exp $ MacOS X implementation of the SKK input method. @@ -26,7 +26,6 @@ @interface AquaSKKServer: NSObject { } -+ (void)initialize; - (void)applicationDidFinishLaunching:(NSNotification*)aNotification; - (NSApplicationTerminateReply)applicationShouldTerminate:(NSApplication*)sender; @end Index: AquaSKK/AquaSKKServer.mm diff -u AquaSKK/AquaSKKServer.mm:1.1.2.4 AquaSKK/AquaSKKServer.mm:1.1.2.5 --- AquaSKK/AquaSKKServer.mm:1.1.2.4 Sat Feb 25 16:27:32 2006 +++ AquaSKK/AquaSKKServer.mm Sat Apr 1 09:32:54 2006 @@ -1,5 +1,5 @@ /* -*- objc -*- - $Id: AquaSKKServer.mm,v 1.1.2.4 2006/02/25 07:27:32 t-suwa Exp $ + $Id: AquaSKKServer.mm,v 1.1.2.5 2006/04/01 00:32:54 t-suwa Exp $ MacOS X implementation of the SKK input method. @@ -31,7 +31,7 @@ @implementation AquaSKKServer -+ (void)initialize { +- (void)setupEnvironment { NSString* defaultsPlist; NSDictionary* userDefaults; @@ -46,11 +46,19 @@ [[NSUserDefaultsController sharedUserDefaultsController] setInitialValues:userDefaults]; // ~/Library/AquaSKK/ ð쬷é - [[NSFileManager defaultManager] - createDirectoryAtPath:[[PreferencesController sharedController] pathForLibrary] attributes:nil]; + NSFileManager* fileManager = [NSFileManager defaultManager]; + [fileManager createDirectoryAtPath:[PreferencesController pathForLibrary] attributes:nil]; + + // ~/Library/AquaSKK/DictionarySet.plist ðú»·é + if([fileManager fileExistsAtPath:[PreferencesController pathForDictionarySetPlist]] != YES) { + NSString* dictionarySet = [[NSBundle mainBundle] pathForResource:@"DictionarySet" ofType:@"plist"]; + [fileManager copyPath:dictionarySet toPath:[PreferencesController pathForDictionarySetPlist] handler:nil]; + } } - (void)applicationDidFinishLaunching:(NSNotification*)aNotification { + [self setupEnvironment]; + NSUserDefaults* defaults = [NSUserDefaults standardUserDefaults]; // «Ìzñð[h·é Index: AquaSKK/ChangeLog diff -u AquaSKK/ChangeLog:1.20.2.19 AquaSKK/ChangeLog:1.20.2.20 --- AquaSKK/ChangeLog:1.20.2.19 Wed Mar 29 01:26:03 2006 +++ AquaSKK/ChangeLog Sat Apr 1 09:32:54 2006 @@ -1,3 +1,20 @@ +2006-04-01 Tomotaka SUWA <t.suw****@mac*****> + + * PreferencesController.*: pathFor* ðNX\bhÉÏ·B + + * AquaSKKServer.*: initialize NX\bhðµA + setupEnvironment CX^X\bhÉ@\Ú]B + DictionarySet.plist ª¶ÝµÈ¢êÍA\[X©çú»·é + ðÇÁB + + * Resources/DictionarySet.plist: VKÇÁB«ZbgÌev[gB + + * Resources/: VKÇÁB\[XÖAði[·éfBNgBÈºÌ + t@Cð top fBNg©çÚ® + + UserDefaults.plist, kana-rule-list, okuri-list, translation-to-*, + tut-* + 2006-03-29 Taiichi HASHIMOTO <taiic****@mac*****> * BIMInputEvents.cpp: Ï·¶ñÌvpeBð±Æ¦èƯ¶ÉÈé Index: AquaSKK/PreferencesController.h diff -u AquaSKK/PreferencesController.h:1.6.2.7 AquaSKK/PreferencesController.h:1.6.2.8 --- AquaSKK/PreferencesController.h:1.6.2.7 Sat Feb 25 16:27:32 2006 +++ AquaSKK/PreferencesController.h Sat Apr 1 09:32:54 2006 @@ -1,5 +1,5 @@ /* -*- objc -*- - $Id: PreferencesController.h,v 1.6.2.7 2006/02/25 07:27:32 t-suwa Exp $ + $Id: PreferencesController.h,v 1.6.2.8 2006/04/01 00:32:54 t-suwa Exp $ MacOS X implementation of the SKK input method. @@ -35,12 +35,12 @@ } + (PreferencesController*)sharedController; ++ (NSString*)pathForLibrary; ++ (NSString*)pathForDictionarySetPlist; - (IBAction)showFontPanel:(id)sender; - (void)changeFont:(id)sender; - (void)setFontButtonTitle:(NSFont*)aFont; -- (NSString*)pathForLibrary; -- (NSString*)pathForDictionarySetPlist; - (NSArray*)contentForDictionarySet; @end Index: AquaSKK/PreferencesController.mm diff -u AquaSKK/PreferencesController.mm:1.6.2.13 AquaSKK/PreferencesController.mm:1.6.2.14 --- AquaSKK/PreferencesController.mm:1.6.2.13 Sat Mar 25 00:10:22 2006 +++ AquaSKK/PreferencesController.mm Sat Apr 1 09:32:54 2006 @@ -1,5 +1,5 @@ /* -*- objc -*- - $Id: PreferencesController.mm,v 1.6.2.13 2006/03/24 15:10:22 t-suwa Exp $ + $Id: PreferencesController.mm,v 1.6.2.14 2006/04/01 00:32:54 t-suwa Exp $ MacOS X implementation of the SKK input method. @@ -129,7 +129,7 @@ - (void)initDictArrayController { // «Ìzñð[h·é NSString* error; - NSData* plist = [NSData dataWithContentsOfFile:[self pathForDictionarySetPlist]]; + NSData* plist = [NSData dataWithContentsOfFile:[PreferencesController pathForDictionarySetPlist]]; NSMutableArray* content = [NSPropertyListSerialization propertyListFromData:plist mutabilityOption:NSPropertyListMutableContainersAndLeaves format:nil errorDescription:&error]; @@ -169,6 +169,14 @@ return _shared_instance; } ++ (NSString*)pathForLibrary { + return [NSHomeDirectory() stringByAppendingPathComponent:path_for_library]; +} + ++ (NSString*)pathForDictionarySetPlist { + return [[PreferencesController pathForLibrary] stringByAppendingPathComponent:path_for_dictionary_set]; +} + - (IBAction)showWindow:(id)sender { [self initDictArrayController]; @@ -190,7 +198,7 @@ NSData* plist = [NSPropertyListSerialization dataFromPropertyList:[self contentForDictionarySet] format:NSPropertyListXMLFormat_v1_0 errorDescription:&error]; if(plist) { - [plist writeToFile:[self pathForDictionarySetPlist] atomically:YES]; + [plist writeToFile:[PreferencesController pathForDictionarySetPlist] atomically:YES]; } else { NSLog(@"saving plist failed: %@\n", error); [error release]; @@ -235,14 +243,6 @@ [fontButton setTitle:[NSString stringWithFormat:@"%@ - %2.1f", [aFont displayName], [aFont pointSize]]]; } -- (NSString*)pathForLibrary { - return [NSHomeDirectory() stringByAppendingPathComponent:path_for_library]; -} - -- (NSString*)pathForDictionarySetPlist { - return [[self pathForLibrary] stringByAppendingPathComponent:path_for_dictionary_set]; -} - - (NSArray*)contentForDictionarySet { return [dictArray content]; } Index: AquaSKK/UserDefaults.plist diff -u AquaSKK/UserDefaults.plist:1.1.2.6 AquaSKK/UserDefaults.plist:removed --- AquaSKK/UserDefaults.plist:1.1.2.6 Sun Mar 26 23:39:11 2006 +++ AquaSKK/UserDefaults.plist Sat Apr 1 09:32:55 2006 @@ -1,36 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> -<plist version="1.0"> -<dict> - <key>candidates_count</key> - <integer>7</integer> - <key>candidates_font_name</key> - <string>LucidaGrande</string> - <key>candidates_font_size</key> - <integer>18</integer> - <key>candidates_window_alpha</key> - <real>1</real> - <key>candidates_window_color</key> - <data> - BAt0eXBlZHN0cmVhbYED6IQBQISEhAdOU0NvbG9yAISECE5TT2JqZWN0AIWEAWMGhANA - QECEhIQITlNTdHJpbmcBlIQBKwZTeXN0ZW2GhJaYDGNvbnRyb2xDb2xvcoaEk5UDhAJm - ZoM/KqqrAYaG - </data> - <key>candidates_window_show_after_nth_cand</key> - <integer>5</integer> - <key>egg_like_new_line</key> - <false/> - <key>force_ascii_mode_startup</key> - <false/> - <key>keyboard_layout_id</key> - <integer>0</integer> - <key>numkeypad_use_halfwidth</key> - <false/> - <key>skkserv_enabled</key> - <false/> - <key>skkserv_localonly</key> - <true/> - <key>skkserv_port</key> - <integer>1178</integer> -</dict> -</plist>