• R/O
  • SSH
  • HTTPS

bathyscaphe: Commit


Commit MetaInfo

Revision1807 (tree)
Zeit2015-02-22 01:53:48
Autortsawada2

Log Message

Addboard sheet update

Ändern Zusammenfassung

Diff

--- bathyscaphe/trunk/application/source/browser/AddBoardSheetController.h (revision 1806)
+++ bathyscaphe/trunk/application/source/browser/AddBoardSheetController.h (revision 1807)
@@ -1,9 +1,9 @@
11 //
2-// $Id: AddBoardSheetController.h,v 1.7 2007-12-19 13:20:40 tsawada2 Exp $
2+// AddBoardSheetController.h
33 // BathyScaphe
44 //
55 // Created by Tsutomu Sawada on 05/10/12.
6-// Copyright 2005-2006 BathyScaphe Project. All rights reserved.
6+// Copyright 2005-2015 BathyScaphe Project. All rights reserved.
77 //
88
99 #import <Cocoa/Cocoa.h>
@@ -51,6 +51,9 @@
5151 - (IBAction) close : (id) sender;
5252 - (IBAction) doAddAndClose : (id) sender;
5353
54+- (IBAction)syncDefaultList:(id)sender;
55+- (IBAction)openAdvancedPref:(id)sender;
56+
5457 - (BOOL) addToUserListFromOLView : (id) sender;
5558 - (BOOL) addToUserListFromForm : (id) sender;
5659
--- bathyscaphe/trunk/application/source/browser/AddBoardSheetController.m (revision 1806)
+++ bathyscaphe/trunk/application/source/browser/AddBoardSheetController.m (revision 1807)
@@ -3,7 +3,7 @@
33 // BathyScaphe
44 //
55 // Created by Tsutomu Sawada on 05/10/12.
6-// Copyright 2005-2013 BathyScaphe Project. All rights reserved.
6+// Copyright 2005-2015 BathyScaphe Project. All rights reserved.
77 // encoding="UTF-8"
88 //
99
@@ -12,6 +12,8 @@
1212 #import "SmartBoardList.h"
1313 #import "BoardManager.h"
1414 #import "DatabaseManager.h"
15+#import "BoardWarrior.h"
16+#import "AppDefaults.h"
1517
1618
1719 static NSString *const kABSNibFileNameKey = @"AddBoardSheet";
@@ -112,6 +114,28 @@
112114 [[NSHelpManager sharedHelpManager] openHelpAnchor:[self localizedString:@"Boards list"] inBook:[NSBundle applicationHelpBookName]];
113115 }
114116
117+- (IBAction)syncDefaultList:(id)sender;
118+{
119+ [[BoardWarrior warrior] setDelegate:self];
120+ [[BoardWarrior warrior] syncBoardLists];
121+}
122+
123+- (IBAction)openAdvancedPref:(id)sender;
124+{
125+ [[CMRPref sharedPreferencesPane] showPreferencesPaneWithIdentifier:PPAdvancedPreferencesIdentifier];
126+}
127+
128+- (void)warriorDidFinishSyncing:(BoardWarrior *)warrior
129+{
130+ [[self defaultListOLView] reloadData];
131+ [warrior setDelegate:nil];
132+}
133+
134+- (void)warrior:(BoardWarrior *)warrior didFailSync:(NSError *)error
135+{
136+ [warrior setDelegate:nil];
137+}
138+
115139 - (IBAction) close : (id) sender
116140 {
117141 [NSApp endSheet : [self window]
--- bathyscaphe/trunk/application/source/preferences/AppDefaults-BoardWarrior.m (revision 1806)
+++ bathyscaphe/trunk/application/source/preferences/AppDefaults-BoardWarrior.m (revision 1807)
@@ -3,7 +3,7 @@
33 // BathyScaphe
44 //
55 // Created by Tsutomu Sawada on 11/06/06.
6-// Copyright 2011 BathyScaphe Project. All rights reserved.
6+// Copyright 2011-2015 BathyScaphe Project. All rights reserved.
77 // encoding="UTF-8"
88 //
99
@@ -12,7 +12,7 @@
1212
1313 static NSString *const AppDefaultsBWSettingsKey = @"Preferences - BoardWarrior";
1414
15-//static NSString *const kBWBBSMenuURLKey = @"BoardWarrior:bbsmenu URL";
15+static NSString *const kBWBBSMenuURLKey = @"BoardWarrior:bbsmenu html URL";
1616 static NSString *const kBWAutoSyncBoardListKey = @"BoardWarrior:Auto Sync";
1717 //static NSString *const kBWAutoSyncIntervalKey = @"BoardWarrior:Auto Sync Interval";
1818 static NSString *const kBWLastSyncDateKey = @"BoardWarrior:Last Sync Date";
@@ -35,12 +35,17 @@
3535
3636 - (NSURL *)BBSMenuURL
3737 {
38- return [NSURL URLWithString:DEFAULT_BW_BBSMENU_URL];
38+ NSString *urlString = [[self boardWarriorSettingsDictionary] objectForKey:kBWBBSMenuURLKey defaultObject:DEFAULT_BW_BBSMENU_URL];
39+ return [NSURL URLWithString:urlString];
3940 }
4041
4142 - (void)setBBSMenuURL:(NSURL *)anURL
4243 {
43- [self doesNotRecognizeSelector:_cmd];
44+ NSString *urlString = [anURL absoluteString];
45+ if (!urlString) {
46+ ;
47+ }
48+ [[self boardWarriorSettingsDictionary] setObject:urlString forKey:kBWBBSMenuURLKey];
4449 }
4550
4651 - (BOOL)autoSyncBoardList
--- bathyscaphe/trunk/application/source/preferences/AppDefaults.h (revision 1806)
+++ bathyscaphe/trunk/application/source/preferences/AppDefaults.h (revision 1807)
@@ -563,7 +563,7 @@
563563 /* MeteorSweeper Additions */
564564 @interface AppDefaults(BoardWarriorSupport)
565565 - (NSURL *)BBSMenuURL;
566-//- (void)setBBSMenuURL:(NSURL *)anURL;
566+- (void)setBBSMenuURL:(NSURL *)anURL;
567567
568568 - (BOOL)autoSyncBoardList;
569569 - (void)setAutoSyncBoardList:(BOOL)autoSync;
--- bathyscaphe/trunk/application/Info-preferences.plist (revision 1806)
+++ bathyscaphe/trunk/application/Info-preferences.plist (revision 1807)
@@ -17,11 +17,11 @@
1717 <key>CFBundlePackageType</key>
1818 <string>BNDL</string>
1919 <key>CFBundleShortVersionString</key>
20- <string>2.4.3</string>
20+ <string>2.4.4</string>
2121 <key>CFBundleSignature</key>
2222 <string>????</string>
2323 <key>CFBundleVersion</key>
24- <string>118</string>
24+ <string>120</string>
2525 <key>NSHumanReadableCopyright</key>
2626 <string>© 2005-2015 tsawada2 &amp; BathyScaphe Project</string>
2727 <key>NSMainNibFile</key>
--- bathyscaphe/trunk/application/subproj/preference/AdvancedPrefController.h (revision 1806)
+++ bathyscaphe/trunk/application/subproj/preference/AdvancedPrefController.h (revision 1807)
@@ -3,7 +3,7 @@
33 // BathyScaphe
44 //
55 // Created by tsawada2 on 05/05/22.
6-// Copyright 2005-2007 BathyScaphe Project. All rights reserved.
6+// Copyright 2005-2015 BathyScaphe Project. All rights reserved.
77 // encoding="UTF-8"
88 //
99
@@ -10,10 +10,10 @@
1010 #import "PreferencesController.h"
1111
1212 @interface AdvancedPrefController : PreferencesController {
13-// IBOutlet NSComboBox *m_bbsMenuURLChooser;
13+ IBOutlet NSComboBox *m_bbsMenuURLChooser;
1414 }
1515
16-//- (NSComboBox *)bbsMenuURLChooser;
16+- (NSComboBox *)bbsMenuURLChooser;
1717
18-//- (IBAction)didChooseBbsMenuURL:(id)sender;
18+- (IBAction)didChooseBbsMenuURL:(id)sender;
1919 @end
--- bathyscaphe/trunk/application/subproj/preference/AdvancedPrefController.m (revision 1806)
+++ bathyscaphe/trunk/application/subproj/preference/AdvancedPrefController.m (revision 1807)
@@ -3,7 +3,7 @@
33 // BathyScaphe
44 //
55 // Created by Tsutomu Sawada on 05/05/22.
6-// Copyright 2005-2010 BathyScaphe Project. All rights reserved.
6+// Copyright 2005-2015 BathyScaphe Project. All rights reserved.
77 // encoding="UTF-8"
88 //
99
@@ -21,14 +21,14 @@
2121 return @"AdvancedPreferences";
2222 }
2323
24-/*- (NSComboBox *)bbsMenuURLChooser
24+- (NSComboBox *)bbsMenuURLChooser
2525 {
2626 return m_bbsMenuURLChooser;
27-}*/
27+}
2828
2929 - (void)updateUIComponents
3030 {
31-// [[self bbsMenuURLChooser] setStringValue:[[[self preferences] BBSMenuURL] absoluteString]];
31+ [[self bbsMenuURLChooser] setStringValue:[[[self preferences] BBSMenuURL] absoluteString]];
3232 }
3333
3434 - (void)setupUIComponents
@@ -39,7 +39,7 @@
3939 [self updateUIComponents];
4040 }
4141
42-/*- (IBAction)didChooseBbsMenuURL:(id)sender
42+- (IBAction)didChooseBbsMenuURL:(id)sender
4343 {
4444 NSString *typedText = [sender stringValue];
4545 NSString *currentURLStr = [[[self preferences] BBSMenuURL] absoluteString];
@@ -54,7 +54,7 @@
5454 }
5555
5656 [[self preferences] setBBSMenuURL:[NSURL URLWithString:typedText]];
57-}*/
57+}
5858 @end
5959
6060
--- bathyscaphe/trunk/application/Info-bathyscaphe.plist (revision 1806)
+++ bathyscaphe/trunk/application/Info-bathyscaphe.plist (revision 1807)
@@ -87,7 +87,7 @@
8787 </dict>
8888 </array>
8989 <key>CFBundleVersion</key>
90- <string>768</string>
90+ <string>770</string>
9191 <key>LSMinimumSystemVersion</key>
9292 <string>10.7.5</string>
9393 <key>NSAppleScriptEnabled</key>
--- bathyscaphe/trunk/changelog.txt (revision 1806)
+++ bathyscaphe/trunk/changelog.txt (revision 1807)
@@ -1,3 +1,13 @@
1+2015-02-22 tsawada2 <tsawada2@users.sourceforge.jp>
2+ * application/Resources/ja.lproj/AddBoardSheet.xib
3+ * application/source/browser/AddBoardSheetController.m
4+ * application/source/preferences/AppDefaults-BoardWarrior.m
5+ * application/source/preferences/AppDefaults.h
6+ 掲示板の追加シートから、「掲示板リストの同期」と「掲示板リストの同期先の設定」(「詳細」環境設定を開く)を
7+ 行えるようにした。
8+ * application/subproj/preference/AdvancedPrefController.m
9+ * application/subproj/preference/ja.lproj/AdvancedPreferences.xib
10+ 「詳細」環境設定に「掲示板リストの同期先」設定を追加(正確には、復活)。プリセットは3種類。
111 2015-02-21 tsawada2 <tsawada2@users.sourceforge.jp>
212 * application/source/manager/DatabaseManager-DatabaseAccess.m
313 一部のデータベース操作時のエラー発生時に、-[SQLiteDB lastErrorID] がコンソールログに出力されていなかったのを改善し
Show on old repository browser