From: <ho...@us...> - 2012-11-24 18:08:09
|
Revision: 18936 http://bibdesk.svn.sourceforge.net/bibdesk/?rev=18936&view=rev Author: hofman Date: 2012-11-24 18:08:01 +0000 (Sat, 24 Nov 2012) Log Message: ----------- don't set value that's set by binding Modified Paths: -------------- trunk/bibdesk/BDSKFieldSheetController.m Modified: trunk/bibdesk/BDSKFieldSheetController.m =================================================================== --- trunk/bibdesk/BDSKFieldSheetController.m 2012-11-24 17:18:47 UTC (rev 18935) +++ trunk/bibdesk/BDSKFieldSheetController.m 2012-11-24 18:08:01 UTC (rev 18936) @@ -96,7 +96,6 @@ - (void)prepare{ NSRect fieldsFrame = [fieldsControl frame]; NSRect oldPromptFrame = [promptField frame]; - [promptField setStringValue:(prompt)? prompt : @""]; [promptField sizeToFit]; NSRect newPromptFrame = [promptField frame]; CGFloat dw = NSWidth(newPromptFrame) - NSWidth(oldPromptFrame); @@ -228,9 +227,7 @@ NSRect oldPromptFrame = [promptField frame]; NSRect replaceFieldsFrame = [replaceFieldsComboBox frame]; NSRect oldReplacePromptFrame = [replacePromptField frame]; - [promptField setStringValue:(prompt)? prompt : @""]; [promptField sizeToFit]; - [replacePromptField setStringValue:replacePrompt ?: @""]; [replacePromptField sizeToFit]; NSRect newPromptFrame = [promptField frame]; NSRect newReplacePromptFrame = [replacePromptField frame]; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ho...@us...> - 2013-02-21 14:02:38
|
Revision: 19107 http://bibdesk.svn.sourceforge.net/bibdesk/?rev=19107&view=rev Author: hofman Date: 2013-02-21 14:02:27 +0000 (Thu, 21 Feb 2013) Log Message: ----------- use windowDidLoad instead of awakeFromNib Modified Paths: -------------- trunk/bibdesk/BDSKFieldSheetController.m Modified: trunk/bibdesk/BDSKFieldSheetController.m =================================================================== --- trunk/bibdesk/BDSKFieldSheetController.m 2013-02-20 16:28:00 UTC (rev 19106) +++ trunk/bibdesk/BDSKFieldSheetController.m 2013-02-21 14:02:27 UTC (rev 19107) @@ -121,7 +121,7 @@ @implementation BDSKAddFieldSheetController -- (void)awakeFromNib{ +- (void)windowDidLoad{ BDSKFieldNameFormatter *formatter = [[[BDSKFieldNameFormatter alloc] init] autorelease]; [formatter setKnownFieldNames:[self fieldsArray]]; [fieldsControl setFormatter:formatter]; @@ -178,7 +178,7 @@ [super dealloc]; } -- (void)awakeFromNib{ +- (void)windowDidLoad{ BDSKFieldNameFormatter *formatter = [[[BDSKFieldNameFormatter alloc] init] autorelease]; [formatter setKnownFieldNames:[self replaceFieldsArray]]; [replaceFieldsComboBox setFormatter:formatter]; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ho...@us...> - 2013-03-14 17:49:09
|
Revision: 19145 http://bibdesk.svn.sourceforge.net/bibdesk/?rev=19145&view=rev Author: hofman Date: 2013-03-14 17:49:00 +0000 (Thu, 14 Mar 2013) Log Message: ----------- fix button sizes in change field sheet Modified Paths: -------------- trunk/bibdesk/BDSKFieldSheetController.m Modified: trunk/bibdesk/BDSKFieldSheetController.m =================================================================== --- trunk/bibdesk/BDSKFieldSheetController.m 2013-03-14 16:05:00 UTC (rev 19144) +++ trunk/bibdesk/BDSKFieldSheetController.m 2013-03-14 17:49:00 UTC (rev 19145) @@ -304,6 +304,16 @@ replaceFieldsFrame.origin.x += dw; [fieldsControl setFrame:fieldsFrame]; [replaceFieldsComboBox setFrame:replaceFieldsFrame]; + + CGFloat buttonX = NSMaxX([okButton frame]); + for (NSButton *button in [NSArray arrayWithObjects:okButton, cancelButton, nil]) { + [button sizeToFit]; + NSRect buttonFrame = [button frame]; + buttonFrame.size.width = fmin(MAX_BUTTON_WIDTH, fmax(MIN_BUTTON_WIDTH, NSWidth(buttonFrame) + EXTRA_BUTTON_WIDTH)); + buttonX -= NSWidth(buttonFrame); + buttonFrame.origin.x = buttonX; + [button setFrame:buttonFrame]; + } } @end This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |