Tomotaka SUWA
t-suw****@users*****
2006年 3月 25日 (土) 00:10:23 JST
Index: AquaSKK/AboutBoxController.mm diff -u AquaSKK/AboutBoxController.mm:1.2 AquaSKK/AboutBoxController.mm:1.2.2.1 --- AquaSKK/AboutBoxController.mm:1.2 Thu Nov 3 15:01:54 2005 +++ AquaSKK/AboutBoxController.mm Sat Mar 25 00:10:22 2006 @@ -1,67 +1,61 @@ -/* $Id: AboutBoxController.mm,v 1.2 2005/11/03 06:01:54 xdd Exp $ - - MacOS X implementation of the SKK input method. - Copyright (C) 2002-2004 phonohawk +/* + $Id: AboutBoxController.mm,v 1.2.2.1 2006/03/24 15:10:22 t-suwa Exp $ + + MacOS X implementation of the SKK input method. + + Copyright (C) 2002-2004 phonohawk + Copyright (C) 2006 Tomotaka SUWA <t.suw****@mac*****> - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#import "AboutBoxController.h" +#import "AboutBoxController.h" @implementation AboutBoxController -+ (AboutBoxController*)sharedController -{ - static AboutBoxController* _shared_instance = nil; - if (_shared_instance == nil) - { - _shared_instance = [[AboutBoxController alloc] init]; - } - return _shared_instance; ++ (AboutBoxController*)sharedController { + static AboutBoxController* _shared_instance = nil; + if(_shared_instance == nil) { + _shared_instance = [[AboutBoxController alloc] init]; + } + return _shared_instance; } -- (id)init -{ - NSDictionary *dictionary = [[NSBundle mainBundle] infoDictionary]; - NSString *copyright, *version; - +- (id)init { self = [super initWithWindowNibName:@"AboutBox"]; [self window]; // ãƒãƒ¼ãƒ‰ - [[self window] setLevel:NSFloatingWindowLevel]; - - copyright = [NSString stringWithFormat:@"%@%@" - ,[copyrightField stringValue],[dictionary objectForKey:@"CFBundleGetInfoString"]]; - - [copyrightField setStringValue:copyright]; - - version = [NSString stringWithFormat:@"%@%@ - %@" - ,[versionField stringValue] - ,[dictionary objectForKey:@"CFBundleShortVersionString"] - ,[dictionary objectForKey:@"CFBundleVersion"]]; - [versionField setStringValue:version]; + [[self window] center]; + + NSDictionary *dictionary = [[NSBundle mainBundle] infoDictionary]; + NSString* version = [NSString stringWithFormat:@"%@ %@ (%@)", + [versionField stringValue], + [dictionary objectForKey:@"CFBundleShortVersionString"], + [dictionary objectForKey:@"CFBundleVersion"]]; + [versionField setStringValue:version]; + + [copyrightField setStringValue:[dictionary objectForKey:@"CFBundleGetInfoString"]]; - return self; + return self; } -- (IBAction)showWindow:(id)sender -{ - [NSApp activateIgnoringOtherApps:YES]; - [[self window] makeKeyAndOrderFront:nil]; - - [super showWindow:sender]; +- (IBAction)showWindow:(id)sender { + [NSApp activateIgnoringOtherApps:YES]; + [[self window] makeKeyAndOrderFront:nil]; + + [super showWindow:sender]; } @end Index: AquaSKK/ChangeLog diff -u AquaSKK/ChangeLog:1.20.2.16 AquaSKK/ChangeLog:1.20.2.17 --- AquaSKK/ChangeLog:1.20.2.16 Wed Mar 22 22:34:40 2006 +++ AquaSKK/ChangeLog Sat Mar 25 00:10:22 2006 @@ -1,3 +1,10 @@ +2006-03-25 Tomotaka SUWA <t.suw****@mac*****> + + * Info-*.plist: ƒo[ƒWƒ‡ƒ“‚ðC³B + + * AboutBoxController.mm, PreferencesController.mm: ƒEƒBƒ“ƒhƒE•\Ž¦ˆÊ + ’u‚ðƒZƒ“ƒ^ƒŠƒ“ƒO‚·‚é‚悤‚ÉC³B + 2006-03-22 Tomotaka SUWA <t.suw****@mac*****> * BIM.cpp (BIMPencilMenuEventHandler): ’PŒê“o˜^—p‚̃R[ƒh‚𜋎B Index: AquaSKK/Info-AquaSKKInputMethod.plist diff -u AquaSKK/Info-AquaSKKInputMethod.plist:1.4.2.3 AquaSKK/Info-AquaSKKInputMethod.plist:1.4.2.4 --- AquaSKK/Info-AquaSKKInputMethod.plist:1.4.2.3 Sat Mar 18 02:30:14 2006 +++ AquaSKK/Info-AquaSKKInputMethod.plist Sat Mar 25 00:10:22 2006 @@ -19,11 +19,11 @@ <key>CFBundlePackageType</key> <string>thng</string> <key>CFBundleShortVersionString</key> - <string>3.0RC1</string> + <string>3.0 RC2</string> <key>CFBundleSignature</key> <string>askk</string> <key>CFBundleVersion</key> - <string>2006-03-18</string> + <string>2006-03-25</string> <key>CSResourcesFileMapped</key> <true/> <key>tsInputMethodIconFileKey</key> Index: AquaSKK/Info-AquaSKKServer.plist diff -u AquaSKK/Info-AquaSKKServer.plist:1.4.2.2 AquaSKK/Info-AquaSKKServer.plist:1.4.2.3 --- AquaSKK/Info-AquaSKKServer.plist:1.4.2.2 Sat Mar 18 02:30:14 2006 +++ AquaSKK/Info-AquaSKKServer.plist Sat Mar 25 00:10:22 2006 @@ -19,11 +19,11 @@ <key>CFBundlePackageType</key> <string>APPL</string> <key>CFBundleShortVersionString</key> - <string>3.0RC1</string> + <string>3.0 RC2</string> <key>CFBundleSignature</key> <string>askk</string> <key>CFBundleVersion</key> - <string>2006-03-18</string> + <string>2006-03-25</string> <key>NSMainNibFile</key> <string>Principal</string> <key>NSPrincipalClass</key> Index: AquaSKK/PreferencesController.mm diff -u AquaSKK/PreferencesController.mm:1.6.2.12 AquaSKK/PreferencesController.mm:1.6.2.13 --- AquaSKK/PreferencesController.mm:1.6.2.12 Thu Mar 16 00:33:29 2006 +++ AquaSKK/PreferencesController.mm Sat Mar 25 00:10:22 2006 @@ -1,5 +1,5 @@ /* -*- objc -*- - $Id: PreferencesController.mm,v 1.6.2.12 2006/03/15 15:33:29 t-suwa Exp $ + $Id: PreferencesController.mm,v 1.6.2.13 2006/03/24 15:10:22 t-suwa Exp $ MacOS X implementation of the SKK input method. @@ -147,6 +147,7 @@ NSUserDefaults* defaults = [NSUserDefaults standardUserDefaults]; [self window]; + [[self window] center]; [self initDictArrayController]; [self initKbdLayoutPopUp]; int index = [kbdLayoutPopUp indexOfItemWithTag:[defaults integerForKey:KEY_keyboard_layout_id]];
Fork