Revision: 12970
http://bibdesk.svn.sourceforge.net/bibdesk/?rev=12970&view=rev
Author: hofman
Date: 2008-03-05 03:21:38 -0800 (Wed, 05 Mar 2008)
Log Message:
-----------
Change enum and image names.
Modified Paths:
--------------
trunk/bibdesk/BDSKAppController.m
trunk/bibdesk/BibDocument+Menus.m
trunk/bibdesk/BibDocument.h
trunk/bibdesk/BibDocument.m
trunk/bibdesk/BibDocument_Actions.m
trunk/bibdesk/English.lproj/BibDocument.nib/info.nib
trunk/bibdesk/English.lproj/BibDocument.nib/keyedobjects.nib
trunk/bibdesk/English.lproj/MainMenu.nib/keyedobjects.nib
trunk/bibdesk/NSImage_BDSKExtensions.m
Modified: trunk/bibdesk/BDSKAppController.m
===================================================================
--- trunk/bibdesk/BDSKAppController.m 2008-03-05 10:45:36 UTC (rev 12969)
+++ trunk/bibdesk/BDSKAppController.m 2008-03-05 11:21:38 UTC (rev 12970)
@@ -646,7 +646,7 @@
SEL action = [menu isEqual:previewDisplayMenu] ?
@selector(changePreviewDisplay:) : @selector(changeSidePreviewDisplay:);
while (style = [styleEnum nextObject]) {
item = [menu addItemWithTitle:style action:action
keyEquivalent:@""];
- [item setTag:BDSKPreviewDisplayTemplate];
+ [item setTag:BDSKPreviewDisplayText];
[item setRepresentedObject:style];
}
Modified: trunk/bibdesk/BibDocument+Menus.m
===================================================================
--- trunk/bibdesk/BibDocument+Menus.m 2008-03-05 10:45:36 UTC (rev 12969)
+++ trunk/bibdesk/BibDocument+Menus.m 2008-03-05 11:21:38 UTC (rev 12970)
@@ -532,9 +532,9 @@
- (BOOL)validateChangePreviewDisplayMenuItem:(NSMenuItem *)menuItem {
int tag = [menuItem tag], state = NSOffState;
NSString *style = [menuItem representedObject];
- if (tag == previewDisplay && tag != BDSKPreviewDisplayTemplate) {
+ if (tag == previewDisplay && tag != BDSKPreviewDisplayText) {
state = NSOnState;
- } else if (tag == BDSKPreviewDisplayTemplate && [style
isEqualToString:previewDisplayTemplate]) {
+ } else if (tag == BDSKPreviewDisplayText && [style
isEqualToString:previewDisplayTemplate]) {
if (tag == previewDisplay || [menuItem menu] == templatePreviewMenu)
state = NSOnState;
}
@@ -545,9 +545,9 @@
- (BOOL)validateChangeSidePreviewDisplayMenuItem:(NSMenuItem *)menuItem {
int tag = [menuItem tag], state = NSOffState;
NSString *style = [menuItem representedObject];
- if (tag == sidePreviewDisplay && tag != BDSKPreviewDisplayTemplate) {
+ if (tag == sidePreviewDisplay && tag != BDSKPreviewDisplayText) {
state = NSOnState;
- } else if (tag == BDSKPreviewDisplayTemplate && [style
isEqualToString:sidePreviewDisplayTemplate]) {
+ } else if (tag == BDSKPreviewDisplayText && [style
isEqualToString:sidePreviewDisplayTemplate]) {
if (tag == sidePreviewDisplay || [menuItem menu] ==
sideTemplatePreviewMenu)
state = NSOnState;
}
Modified: trunk/bibdesk/BibDocument.h
===================================================================
--- trunk/bibdesk/BibDocument.h 2008-03-05 10:45:36 UTC (rev 12969)
+++ trunk/bibdesk/BibDocument.h 2008-03-05 11:21:38 UTC (rev 12970)
@@ -83,7 +83,7 @@
};
enum {
- BDSKPreviewDisplayTemplate = 0,
+ BDSKPreviewDisplayText = 0,
BDSKPreviewDisplayFiles = 1,
BDSKPreviewDisplayTeX = 2
};
Modified: trunk/bibdesk/BibDocument.m
===================================================================
--- trunk/bibdesk/BibDocument.m 2008-03-05 10:45:36 UTC (rev 12969)
+++ trunk/bibdesk/BibDocument.m 2008-03-05 11:21:38 UTC (rev 12970)
@@ -225,7 +225,7 @@
pboardHelper = [[BDSKItemPasteboardHelper alloc] init];
[pboardHelper setDelegate:self];
- previewDisplay = BDSKPreviewDisplayTemplate;
+ previewDisplay = BDSKPreviewDisplayText;
previewDisplayTemplate = [[[OFPreferenceWrapper
sharedPreferenceWrapper] stringForKey:BDSKPreviewTemplateStyleKey] retain];
sidePreviewDisplay = BDSKPreviewDisplayFiles;
sidePreviewDisplayTemplate = [[[OFPreferenceWrapper
sharedPreferenceWrapper] stringForKey:BDSKPreviewTemplateStyleKey] retain];
@@ -3803,7 +3803,7 @@
while (style = [styleEnum nextObject]) {
item = [menu addItemWithTitle:style action:action
keyEquivalent:@""];
[item setTarget:self];
- [item setTag:BDSKPreviewDisplayTemplate];
+ [item setTag:BDSKPreviewDisplayText];
[item setRepresentedObject:style];
}
}
@@ -3826,10 +3826,10 @@
if(previewDisplay == BDSKPreviewDisplayTeX){
// we don't reach this, we let the pdfView do the printing
printableView = [previewer pdfView];
- }else if(previewDisplay == BDSKPreviewDisplayTemplate ||
sidePreviewDisplay == BDSKPreviewDisplayTemplate){
+ }else if(previewDisplay == BDSKPreviewDisplayText || sidePreviewDisplay ==
BDSKPreviewDisplayText){
printableView = [[[BDSKPrintableView alloc] initForScreenDisplay:NO]
autorelease];
NSTextStorage *ts = nil;
- if (previewDisplay == BDSKPreviewDisplayTemplate)
+ if (previewDisplay == BDSKPreviewDisplayText)
ts = [previewTextView textStorage];
else
ts = [sidePreviewTextView textStorage];
Modified: trunk/bibdesk/BibDocument_Actions.m
===================================================================
--- trunk/bibdesk/BibDocument_Actions.m 2008-03-05 10:45:36 UTC (rev 12969)
+++ trunk/bibdesk/BibDocument_Actions.m 2008-03-05 11:21:38 UTC (rev 12970)
@@ -1091,7 +1091,7 @@
previewDisplay = tag;
changed = YES;
}
- if (tag == BDSKPreviewDisplayTemplate && style && NO == [style
isEqualToString:previewDisplayTemplate]) {
+ if (tag == BDSKPreviewDisplayText && style && NO == [style
isEqualToString:previewDisplayTemplate]) {
[previewDisplayTemplate release];
previewDisplayTemplate = [style retain];
changed = YES;
@@ -1112,7 +1112,7 @@
sidePreviewDisplay = tag;
changed = YES;
}
- if (tag == BDSKPreviewDisplayTemplate && style && NO == [style
isEqualToString:sidePreviewDisplayTemplate]) {
+ if (tag == BDSKPreviewDisplayText && style && NO == [style
isEqualToString:sidePreviewDisplayTemplate]) {
[sidePreviewDisplayTemplate release];
sidePreviewDisplayTemplate = [style retain];
changed = YES;
Modified: trunk/bibdesk/English.lproj/BibDocument.nib/info.nib
===================================================================
--- trunk/bibdesk/English.lproj/BibDocument.nib/info.nib 2008-03-05
10:45:36 UTC (rev 12969)
+++ trunk/bibdesk/English.lproj/BibDocument.nib/info.nib 2008-03-05
11:21:38 UTC (rev 12970)
@@ -19,8 +19,8 @@
<integer>5</integer>
<key>IBOpenObjects</key>
<array>
+ <integer>433</integer>
<integer>819</integer>
- <integer>433</integer>
<integer>5</integer>
</array>
<key>IBSystem Version</key>
Modified: trunk/bibdesk/English.lproj/BibDocument.nib/keyedobjects.nib
===================================================================
(Binary files differ)
Modified: trunk/bibdesk/English.lproj/MainMenu.nib/keyedobjects.nib
===================================================================
(Binary files differ)
Modified: trunk/bibdesk/NSImage_BDSKExtensions.m
===================================================================
--- trunk/bibdesk/NSImage_BDSKExtensions.m 2008-03-05 10:45:36 UTC (rev
12969)
+++ trunk/bibdesk/NSImage_BDSKExtensions.m 2008-03-05 11:21:38 UTC (rev
12970)
@@ -44,15 +44,15 @@
@implementation NSImage (BDSKExtensions)
+ (void)makePreviewDisplayImages {
- static NSImage *previewTemplateDisplayImage = nil;
- static NSImage *previewIconDisplayImage = nil;
- static NSImage *previewTeXDisplayImage = nil;
+ static NSImage *previewDisplayTextImage = nil;
+ static NSImage *previewDisplayFilesImage = nil;
+ static NSImage *previewDisplayTeXImage = nil;
- if (previewTemplateDisplayImage == nil) {
+ if (previewDisplayTextImage == nil) {
NSBezierPath *path;
- previewTemplateDisplayImage = [[NSImage alloc]
initWithSize:NSMakeSize(11.0, 10.0)];
- [previewTemplateDisplayImage lockFocus];
+ previewDisplayTextImage = [[NSImage alloc]
initWithSize:NSMakeSize(11.0, 10.0)];
+ [previewDisplayTextImage lockFocus];
path = [NSBezierPath bezierPath];
[path moveToPoint:NSMakePoint(0.0, 0.5)];
[path lineToPoint:NSMakePoint(11.0, 0.5)];
@@ -63,22 +63,22 @@
[path moveToPoint:NSMakePoint(0.0, 9.5)];
[path lineToPoint:NSMakePoint(11.0, 9.5)];
[path stroke];
- [previewTemplateDisplayImage unlockFocus];
- [previewTemplateDisplayImage setName:@"BDSKPreviewTemplateDisplay"];
+ [previewDisplayTextImage unlockFocus];
+ [previewDisplayTextImage setName:@"BDSKPreviewDisplayText"];
- previewIconDisplayImage = [[NSImage alloc]
initWithSize:NSMakeSize(11.0, 10.0)];
- [previewIconDisplayImage lockFocus];
+ previewDisplayFilesImage = [[NSImage alloc]
initWithSize:NSMakeSize(11.0, 10.0)];
+ [previewDisplayFilesImage lockFocus];
path = [NSBezierPath bezierPath];
[path appendBezierPathWithRect:NSMakeRect(0.5, 0.5, 3.0, 3.0)];
[path appendBezierPathWithRect:NSMakeRect(7.5, 0.5, 3.0, 3.0)];
[path appendBezierPathWithRect:NSMakeRect(0.5, 6.5, 3.0, 3.0)];
[path appendBezierPathWithRect:NSMakeRect(7.5, 6.5, 3.0, 3.0)];
[path stroke];
- [previewIconDisplayImage unlockFocus];
- [previewIconDisplayImage setName:@"BDSKPreviewIconDisplay"];
+ [previewDisplayFilesImage unlockFocus];
+ [previewDisplayFilesImage setName:@"BDSKPreviewDisplayFiles"];
- previewTeXDisplayImage = [[NSImage alloc]
initWithSize:NSMakeSize(11.0, 10.0)];
- [previewTeXDisplayImage lockFocus];
+ previewDisplayTeXImage = [[NSImage alloc]
initWithSize:NSMakeSize(11.0, 10.0)];
+ [previewDisplayTeXImage lockFocus];
path = [NSBezierPath bezierPath];
[path appendBezierPathWithOvalInRect:NSMakeRect(1.5, 1.5, 3.0, 3.0)];
[path appendBezierPathWithOvalInRect:NSMakeRect(6.5, 1.5, 3.0, 3.0)];
@@ -91,8 +91,8 @@
[path lineToPoint:NSMakePoint(10.5, 3.0)];
[path appendBezierPathWithArcFromPoint:NSMakePoint(8.5, 10.0)
toPoint:NSMakePoint(6.5, 8.0) radius:1.0];
[path stroke];
- [previewTeXDisplayImage unlockFocus];
- [previewTeXDisplayImage setName:@"BDSKPreviewTeXDisplay"];
+ [previewDisplayTeXImage unlockFocus];
+ [previewDisplayTeXImage setName:@"BDSKPreviewDisplayTeX"];
}
}
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
