Menu
▾
▴
[Bibdesk-commit] bibdesk BibPref_AutoFile.h,1.9.2.6,1.9.2.7 BibPref_AutoFile.m,1.28.2.18,1.28.2.19 BibPref_CiteKey.h,1.8.2.4,1.8.2.5 BibPref_CiteKey.m,1.27.2.17,1.27.2.18
|
From: Christiaan H. <ho...@us...> - 2005-11-30 15:53:11
|
Update of /cvsroot/bibdesk/bibdesk In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20906 Modified Files: Tag: BR_1x BibPref_AutoFile.h BibPref_AutoFile.m BibPref_CiteKey.h BibPref_CiteKey.m Log Message: Show parsed format string in main view Index: BibPref_CiteKey.h =================================================================== RCS file: /cvsroot/bibdesk/bibdesk/BibPref_CiteKey.h,v retrieving revision 1.8.2.4 retrieving revision 1.8.2.5 diff -C2 -d -r1.8.2.4 -r1.8.2.5 *** BibPref_CiteKey.h 28 Aug 2005 14:31:15 -0000 1.8.2.4 --- BibPref_CiteKey.h 30 Nov 2005 15:53:02 -0000 1.8.2.5 *************** *** 46,49 **** --- 46,50 ---- IBOutlet NSTextField *citeKeyLine; IBOutlet NSTextField *formatField; + IBOutlet NSTextField *formatSheetField; IBOutlet NSPopUpButton *formatPresetPopUp; IBOutlet NSPopUpButton *formatPresetSheetPopUp; Index: BibPref_AutoFile.h =================================================================== RCS file: /cvsroot/bibdesk/bibdesk/BibPref_AutoFile.h,v retrieving revision 1.9.2.6 retrieving revision 1.9.2.7 diff -C2 -d -r1.9.2.6 -r1.9.2.7 *** BibPref_AutoFile.h 28 Nov 2005 16:12:07 -0000 1.9.2.6 --- BibPref_AutoFile.h 30 Nov 2005 15:53:02 -0000 1.9.2.7 *************** *** 49,52 **** --- 49,53 ---- IBOutlet NSButton* filePapersAutomaticallyCheckButton; IBOutlet NSTextField *formatField; + IBOutlet NSTextField *formatSheetField; IBOutlet NSPopUpButton *formatPresetPopUp; IBOutlet NSPopUpButton *formatPresetSheetPopUp; Index: BibPref_CiteKey.m =================================================================== RCS file: /cvsroot/bibdesk/bibdesk/BibPref_CiteKey.m,v retrieving revision 1.27.2.17 retrieving revision 1.27.2.18 diff -C2 -d -r1.27.2.17 -r1.27.2.18 *** BibPref_CiteKey.m 27 Nov 2005 01:49:57 -0000 1.27.2.17 --- BibPref_CiteKey.m 30 Nov 2005 15:53:02 -0000 1.27.2.18 *************** *** 44,47 **** --- 44,48 ---- #define MAX_PREVIEW_WIDTH 481 + #define MAX_FORMAT_WIDTH 266 @implementation BibPref_CiteKey *************** *** 80,83 **** --- 81,85 ---- BOOL custom = (citeKeyPresetChoice == 0); NSString *error = nil; + NSRect frame; // update the UI elements *************** *** 91,95 **** [citeKeyLine setStringValue:[previewItem suggestedCiteKey]]; [citeKeyLine sizeToFit]; ! NSRect frame = [citeKeyLine frame]; if (frame.size.width > MAX_PREVIEW_WIDTH) { frame.size.width = MAX_PREVIEW_WIDTH; --- 93,97 ---- [citeKeyLine setStringValue:[previewItem suggestedCiteKey]]; [citeKeyLine sizeToFit]; ! frame = [citeKeyLine frame]; if (frame.size.width > MAX_PREVIEW_WIDTH) { frame.size.width = MAX_PREVIEW_WIDTH; *************** *** 106,110 **** [formatPresetSheetPopUp selectItemAtIndex:[formatPresetPopUp indexOfItemWithTag:citeKeyPresetChoice]]; [formatField setAttributedStringValue:attrFormat]; ! [formatField setEnabled:custom]; if([formatRepositoryPopUp respondsToSelector:@selector(setHidden:)]) [formatRepositoryPopUp setHidden:!custom]; --- 108,119 ---- [formatPresetSheetPopUp selectItemAtIndex:[formatPresetPopUp indexOfItemWithTag:citeKeyPresetChoice]]; [formatField setAttributedStringValue:attrFormat]; ! [formatField sizeToFit]; ! frame = [formatField frame]; ! if (frame.size.width > MAX_FORMAT_WIDTH) { ! frame.size.width = MAX_FORMAT_WIDTH; ! [formatField setFrame:frame]; ! } ! [formatSheetField setAttributedStringValue:attrFormat]; ! [formatSheetField setEnabled:custom]; if([formatRepositoryPopUp respondsToSelector:@selector(setHidden:)]) [formatRepositoryPopUp setHidden:!custom]; *************** *** 137,141 **** int index = [formatRepositoryPopUp indexOfSelectedItem]; NSString *newSpecifier = repositorySpecifierStrings[index]; ! NSText *fieldEditor = [formatField currentEditor]; NSRange selRange; --- 146,150 ---- int index = [formatRepositoryPopUp indexOfSelectedItem]; NSString *newSpecifier = repositorySpecifierStrings[index]; ! NSText *fieldEditor = [formatSheetField currentEditor]; NSRange selRange; *************** *** 147,153 **** [fieldEditor insertText:newSpecifier]; } else { ! NSString *formatString = [formatField stringValue]; selRange = NSMakeRange([formatString length] + 2, [newSpecifier length] - 2); ! [formatField setStringValue:[formatString stringByAppendingString:newSpecifier]]; } --- 156,162 ---- [fieldEditor insertText:newSpecifier]; } else { ! NSString *formatString = [formatSheetField stringValue]; selRange = NSMakeRange([formatString length] + 2, [newSpecifier length] - 2); ! [formatSheetField setStringValue:[formatString stringByAppendingString:newSpecifier]]; } *************** *** 164,169 **** selRange.length = 0; } ! [formatField selectText:self]; ! [[formatField currentEditor] setSelectedRange:selRange]; } --- 173,178 ---- selRange.length = 0; } ! [formatSheetField selectText:self]; ! [[formatSheetField currentEditor] setSelectedRange:selRange]; } *************** *** 180,184 **** formatString = presetFormatStrings[presetChoice - 1]; } else if (presetChoice == 0) { ! formatString = [formatField stringValue]; if (sender == formatPresetPopUp) [self showFormatSheet:self]; --- 189,193 ---- formatString = presetFormatStrings[presetChoice - 1]; } else if (presetChoice == 0) { ! formatString = [formatSheetField stringValue]; if (sender == formatPresetPopUp) [self showFormatSheet:self]; *************** *** 192,196 **** NSString *error = nil; NSAttributedString *attrFormat = nil; ! formatString = [formatField stringValue]; //if ([formatString isEqualToString:[defaults stringForKey:BDSKCiteKeyFormatKey]]) return; // nothing changed if ([BDSKFormatParser validateFormat:&formatString attributedFormat:&attrFormat forField:BDSKCiteKeyString inFileType:BDSKBibtexString error:&error]) { --- 201,205 ---- NSString *error = nil; NSAttributedString *attrFormat = nil; ! formatString = [formatSheetField stringValue]; //if ([formatString isEqualToString:[defaults stringForKey:BDSKCiteKeyFormatKey]]) return; // nothing changed if ([BDSKFormatParser validateFormat:&formatString attributedFormat:&attrFormat forField:BDSKCiteKeyString inFileType:BDSKBibtexString error:&error]) { *************** *** 199,203 **** else { [self setCiteKeyFormatInvalidWarning:YES message:error]; ! [formatField setAttributedStringValue:attrFormat]; return; } --- 208,212 ---- else { [self setCiteKeyFormatInvalidWarning:YES message:error]; ! [formatSheetField setAttributedStringValue:attrFormat]; return; } *************** *** 219,223 **** - (BOOL)canCloseFormatSheet{ ! NSString *formatString = [formatField stringValue]; NSString *error = nil; NSString *otherButton = nil; --- 228,232 ---- - (BOOL)canCloseFormatSheet{ ! NSString *formatString = [formatSheetField stringValue]; NSString *error = nil; NSString *otherButton = nil; *************** *** 247,251 **** if (rv == NSAlertDefaultReturn){ ! [formatField selectText:self]; return NO; } else if (rv == NSAlertAlternateReturn){ --- 256,260 ---- if (rv == NSAlertDefaultReturn){ ! [formatSheetField selectText:self]; return NO; } else if (rv == NSAlertAlternateReturn){ *************** *** 294,298 **** } [formatWarningButton setEnabled:set]; ! [formatField setTextColor:(set ? [NSColor redColor] : [NSColor blackColor])]; // overdone? } --- 303,307 ---- } [formatWarningButton setEnabled:set]; ! [formatSheetField setTextColor:(set ? [NSColor redColor] : [NSColor blackColor])]; // overdone? } Index: BibPref_AutoFile.m =================================================================== RCS file: /cvsroot/bibdesk/bibdesk/BibPref_AutoFile.m,v retrieving revision 1.28.2.18 retrieving revision 1.28.2.19 diff -C2 -d -r1.28.2.18 -r1.28.2.19 *** BibPref_AutoFile.m 28 Nov 2005 16:12:07 -0000 1.28.2.18 --- BibPref_AutoFile.m 30 Nov 2005 15:53:02 -0000 1.28.2.19 *************** *** 44,47 **** --- 44,48 ---- #define MAX_PREVIEW_WIDTH 501.0 + #define MAX_FORMAT_WIDTH 288.0 @implementation BibPref_AutoFile *************** *** 82,85 **** --- 83,87 ---- NSString * error; NSString *papersFolder = [[defaults objectForKey:BDSKPapersFolderPathKey] stringByAbbreviatingWithTildeInPath]; + NSRect frame; [filePapersAutomaticallyCheckButton setState:[defaults boolForKey:BDSKFilePapersAutomaticallyKey] ? NSOnState : NSOffState]; *************** *** 106,110 **** [previewTextField setStringValue:[[[NSURL URLWithString:[previewItem suggestedLocalUrl]] path] stringByAbbreviatingWithTildeInPath]]; [previewTextField sizeToFit]; ! NSRect frame = [previewTextField frame]; if (frame.size.width > MAX_PREVIEW_WIDTH) { frame.size.width = MAX_PREVIEW_WIDTH; --- 108,112 ---- [previewTextField setStringValue:[[[NSURL URLWithString:[previewItem suggestedLocalUrl]] path] stringByAbbreviatingWithTildeInPath]]; [previewTextField sizeToFit]; ! frame = [previewTextField frame]; if (frame.size.width > MAX_PREVIEW_WIDTH) { frame.size.width = MAX_PREVIEW_WIDTH; *************** *** 121,125 **** [formatPresetSheetPopUp selectItemAtIndex:[formatPresetPopUp indexOfItemWithTag:formatPresetChoice]]; [formatField setAttributedStringValue:attrFormat]; ! [formatField setEnabled:custom]; if([formatRepositoryPopUp respondsToSelector:@selector(setHidden:)]) [formatRepositoryPopUp setHidden:!custom]; --- 123,134 ---- [formatPresetSheetPopUp selectItemAtIndex:[formatPresetPopUp indexOfItemWithTag:formatPresetChoice]]; [formatField setAttributedStringValue:attrFormat]; ! [formatField sizeToFit]; ! frame = [formatField frame]; ! if (frame.size.width > MAX_FORMAT_WIDTH) { ! frame.size.width = MAX_FORMAT_WIDTH; ! [formatField setFrame:frame]; ! } ! [formatSheetField setAttributedStringValue:attrFormat]; ! [formatSheetField setEnabled:custom]; if([formatRepositoryPopUp respondsToSelector:@selector(setHidden:)]) [formatRepositoryPopUp setHidden:!custom]; *************** *** 181,185 **** int index = [formatRepositoryPopUp indexOfSelectedItem]; NSString *newSpecifier = repositorySpecifierStrings[index]; ! NSText *fieldEditor = [formatField currentEditor]; NSRange selRange; --- 190,194 ---- int index = [formatRepositoryPopUp indexOfSelectedItem]; NSString *newSpecifier = repositorySpecifierStrings[index]; ! NSText *fieldEditor = [formatSheetField currentEditor]; NSRange selRange; *************** *** 191,197 **** [fieldEditor insertText:newSpecifier]; } else { ! NSString *formatString = [formatField stringValue]; selRange = NSMakeRange([formatString length] + 2, [newSpecifier length] - 2); ! [formatField setStringValue:[formatString stringByAppendingString:newSpecifier]]; } --- 200,206 ---- [fieldEditor insertText:newSpecifier]; } else { ! NSString *formatString = [formatSheetField stringValue]; selRange = NSMakeRange([formatString length] + 2, [newSpecifier length] - 2); ! [formatSheetField setStringValue:[formatString stringByAppendingString:newSpecifier]]; } *************** *** 212,217 **** selRange.length = 0; } ! [formatField selectText:self]; ! [[formatField currentEditor] setSelectedRange:selRange]; } --- 221,226 ---- selRange.length = 0; } ! [formatSheetField selectText:self]; ! [[formatSheetField currentEditor] setSelectedRange:selRange]; } *************** *** 228,232 **** formatString = presetFormatStrings[presetChoice - 1]; } else if (presetChoice == 0) { ! formatString = [formatField stringValue]; if (sender == formatPresetPopUp) [self showFormatSheet:self]; --- 237,241 ---- formatString = presetFormatStrings[presetChoice - 1]; } else if (presetChoice == 0) { ! formatString = [formatSheetField stringValue]; if (sender == formatPresetPopUp) [self showFormatSheet:self]; *************** *** 240,244 **** NSString *error = nil; NSAttributedString *attrFormat = nil; ! formatString = [formatField stringValue]; //if ([formatString isEqualToString:[defaults stringForKey:BDSKLocalUrlFormatKey]]) return; // nothing changed if ([BDSKFormatParser validateFormat:&formatString attributedFormat:&attrFormat forField:BDSKLocalUrlString inFileType:BDSKBibtexString error:&error]) { --- 249,253 ---- NSString *error = nil; NSAttributedString *attrFormat = nil; ! formatString = [formatSheetField stringValue]; //if ([formatString isEqualToString:[defaults stringForKey:BDSKLocalUrlFormatKey]]) return; // nothing changed if ([BDSKFormatParser validateFormat:&formatString attributedFormat:&attrFormat forField:BDSKLocalUrlString inFileType:BDSKBibtexString error:&error]) { *************** *** 247,251 **** else { [self setLocalUrlFormatInvalidWarning:YES message:error]; ! [formatField setAttributedStringValue:attrFormat]; return; } --- 256,260 ---- else { [self setLocalUrlFormatInvalidWarning:YES message:error]; ! [formatSheetField setAttributedStringValue:attrFormat]; return; } *************** *** 267,271 **** - (BOOL)canCloseFormatSheet{ ! NSString *formatString = [formatField stringValue]; NSString *error = nil; NSString *otherButton = nil; --- 276,280 ---- - (BOOL)canCloseFormatSheet{ ! NSString *formatString = [formatSheetField stringValue]; NSString *error = nil; NSString *otherButton = nil; *************** *** 295,299 **** if (rv == NSAlertDefaultReturn){ ! [formatField selectText:self]; return NO; } else if (rv == NSAlertAlternateReturn){ --- 304,308 ---- if (rv == NSAlertDefaultReturn){ ! [formatSheetField selectText:self]; return NO; } else if (rv == NSAlertAlternateReturn){ *************** *** 342,346 **** } [formatWarningButton setEnabled:set]; ! [formatField setTextColor:(set ? [NSColor redColor] : [NSColor blackColor])]; // overdone? } --- 351,355 ---- } [formatWarningButton setEnabled:set]; ! [formatSheetField setTextColor:(set ? [NSColor redColor] : [NSColor blackColor])]; // overdone? } |