Revision: 12994
http://bibdesk.svn.sourceforge.net/bibdesk/?rev=12994&view=rev
Author: hofman
Date: 2008-03-07 05:28:17 -0800 (Fri, 07 Mar 2008)
Log Message:
-----------
Remove preview preferences. This is now handled per document, apart from the
max number of items.
Modified Paths:
--------------
trunk/bibdesk/BibPref_Display.h
trunk/bibdesk/BibPref_Display.m
trunk/bibdesk/English.lproj/BibPref_Display.nib/classes.nib
trunk/bibdesk/English.lproj/BibPref_Display.nib/info.nib
trunk/bibdesk/English.lproj/BibPref_Display.nib/keyedobjects.nib
Modified: trunk/bibdesk/BibPref_Display.h
===================================================================
--- trunk/bibdesk/BibPref_Display.h 2008-03-07 13:15:53 UTC (rev 12993)
+++ trunk/bibdesk/BibPref_Display.h 2008-03-07 13:28:17 UTC (rev 12994)
@@ -40,10 +40,7 @@
#import "BDSKStringConstants.h"
@interface BibPref_Display : OAPreferenceClient {
- // display pref radio matrix
- IBOutlet NSMatrix* displayPrefRadioMatrix;
IBOutlet NSComboBox *previewMaxNumberComboBox;
- IBOutlet NSPopUpButton *previewTemplatePopup;
IBOutlet NSPopUpButton *fontElementPopup;
IBOutlet NSButton *fontButton;
@@ -56,11 +53,7 @@
IBOutlet NSMatrix *authorNameMatrix;
}
-- (IBAction)changePreviewDisplay:(id)sender;
- (IBAction)changePreviewMaxNumber:(id)sender;
-- (IBAction)changePreviewTemplate:(id)sender;
-- (void)handlePreviewDisplayChangedNotification:(NSNotification *)notification;
-- (void)handleTemplatePrefsChangedNotification:(NSNotification *)notification;
- (IBAction)addTerm:(id)sender;
- (IBAction)removeSelectedTerm:(id)sender;
Modified: trunk/bibdesk/BibPref_Display.m
===================================================================
--- trunk/bibdesk/BibPref_Display.m 2008-03-07 13:15:53 UTC (rev 12993)
+++ trunk/bibdesk/BibPref_Display.m 2008-03-07 13:28:17 UTC (rev 12994)
@@ -46,32 +46,15 @@
- (void)awakeFromNib{
[super awakeFromNib];
- [OFPreference addObserver:self
-
selector:@selector(handleTemplatePrefsChangedNotification:)
- forPreference:[OFPreference
preferenceForKey:BDSKExportTemplateTree]];
- [OFPreference addObserver:self
-
selector:@selector(handlePreviewDisplayChangedNotification:)
- forPreference:[OFPreference
preferenceForKey:BDSKPreviewDisplayKey]];
- [OFPreference addObserver:self
-
selector:@selector(handlePreviewDisplayChangedNotification:)
- forPreference:[OFPreference
preferenceForKey:BDSKPreviewTemplateStyleKey]];
-
- [self handleTemplatePrefsChangedNotification:nil];
-
[previewMaxNumberComboBox addItemsWithObjectValues:[NSArray
arrayWithObjects:NSLocalizedString(@"All", @"Display all items in preview"),
@"1", @"5", @"10", @"20", nil]];
}
- (void)updatePreviewDisplayUI{
- [displayPrefRadioMatrix selectCellWithTag:[defaults
integerForKey:BDSKPreviewDisplayKey]];
-
int maxNumber = [defaults integerForKey:BDSKPreviewMaxNumberKey];
if (maxNumber == 0)
[previewMaxNumberComboBox
setStringValue:NSLocalizedString(@"All",@"Display all items in preview")];
else
[previewMaxNumberComboBox setIntValue:maxNumber];
-
- [previewTemplatePopup setEnabled:[defaults
integerForKey:BDSKPreviewDisplayKey] == 3];
- [previewTemplatePopup selectItemWithTitle:[defaults
stringForKey:BDSKPreviewTemplateStyleKey]];
}
- (void)updateUI{
@@ -90,38 +73,6 @@
}
}
-- (void)handleTemplatePrefsChangedNotification:(NSNotification *)notification{
- NSString *currentStyle = [defaults
stringForKey:BDSKPreviewTemplateStyleKey];
- NSMutableArray *styles = [NSMutableArray arrayWithArray:[BDSKTemplate
allStyleNamesForFileType:@"rtf"]];
- [styles addObjectsFromArray:[BDSKTemplate
allStyleNamesForFileType:@"rtfd"]];
- [styles addObjectsFromArray:[BDSKTemplate
allStyleNamesForFileType:@"doc"]];
- [styles addObjectsFromArray:[BDSKTemplate
allStyleNamesForFileType:@"html"]];
- [previewTemplatePopup removeAllItems];
- [previewTemplatePopup addItemsWithTitles:styles];
- if ([styles containsObject:currentStyle]) {
- [previewTemplatePopup selectItemWithTitle:currentStyle];
- } else if ([styles count]) {
- [previewTemplatePopup selectItemAtIndex:0];
- [defaults setObject:[styles objectAtIndex:0]
forKey:BDSKPreviewTemplateStyleKey];
- [defaults autoSynchronize];
- if ([defaults integerForKey:BDSKPreviewDisplayKey] == 3)
- [[NSNotificationCenter defaultCenter]
postNotificationName:BDSKPreviewDisplayChangedNotification object:nil];
- }
-}
-
-- (void)handlePreviewDisplayChangedNotification:(NSNotification *)notification{
- [self updatePreviewDisplayUI];
-}
-
-- (IBAction)changePreviewDisplay:(id)sender{
- int tag = [[sender selectedCell] tag];
- if(tag != [defaults integerForKey:BDSKPreviewDisplayKey]){
- [defaults setInteger:tag forKey:BDSKPreviewDisplayKey];
- [defaults autoSynchronize];
- [[NSNotificationCenter defaultCenter]
postNotificationName:BDSKPreviewDisplayChangedNotification object:nil];
- }
-}
-
- (IBAction)changePreviewMaxNumber:(id)sender{
int maxNumber = [[[sender cell] objectValueOfSelectedItem] intValue]; //
returns 0 if not a number (as in @"All")
if(maxNumber != [defaults integerForKey:BDSKPreviewMaxNumberKey]){
@@ -131,15 +82,6 @@
}
}
-- (IBAction)changePreviewTemplate:(id)sender{
- NSString *style = [sender title];
- if ([style isEqualToString:[defaults
stringForKey:BDSKPreviewTemplateStyleKey]] == NO) {
- [defaults setObject:style forKey:BDSKPreviewTemplateStyleKey];
- [defaults autoSynchronize];
- [[NSNotificationCenter defaultCenter]
postNotificationName:BDSKPreviewDisplayChangedNotification object:nil];
- }
-}
-
//
// sorting prefs code
//
Modified: trunk/bibdesk/English.lproj/BibPref_Display.nib/classes.nib
===================================================================
(Binary files differ)
Modified: trunk/bibdesk/English.lproj/BibPref_Display.nib/info.nib
===================================================================
(Binary files differ)
Modified: trunk/bibdesk/English.lproj/BibPref_Display.nib/keyedobjects.nib
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
Bibdesk-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/bibdesk-commit
