diff --git a/FindPanel/Controllers/OgreAdvancedFindPanelController.h b/FindPanel/Controllers/OgreAdvancedFindPanelController.h index d4668f19..4e71ca50 100755 --- a/FindPanel/Controllers/OgreAdvancedFindPanelController.h +++ b/FindPanel/Controllers/OgreAdvancedFindPanelController.h @@ -196,4 +196,6 @@ - (BOOL)inSelectionScopeOption; - (void)setInSelectionScopeOption:(BOOL)inSelectionScopeOption; +- (NSString*)version; + @end diff --git a/FindPanel/Controllers/OgreAdvancedFindPanelController.m b/FindPanel/Controllers/OgreAdvancedFindPanelController.m index 0a79a637..ceb5f094 100755 --- a/FindPanel/Controllers/OgreAdvancedFindPanelController.m +++ b/FindPanel/Controllers/OgreAdvancedFindPanelController.m @@ -327,7 +327,9 @@ - (void)restoreHistory:(NSDictionary*)history if (start == contentsEnd) { [item setTitle:@""]; } else { - [item setAttributedTitle:[attrString attributedSubstringFromRange:NSMakeRange(start, contentsEnd - start)]]; +// [item setAttributedTitle:[attrString attributedSubstringFromRange:NSMakeRange(start, contentsEnd - start)]]; + // スタイルを削除する + [item setTitle:[[attrString string] substringWithRange:NSMakeRange(start, contentsEnd - start)]]; } [item setTarget:self]; [item setAction:@selector(selectReplaceHistory:)]; @@ -375,7 +377,12 @@ - (void)restoreHistory:(NSDictionary*)history if (start == contentsEnd) { [item setTitle:@""]; } else { - [item setAttributedTitle:[attrString attributedSubstringFromRange:NSMakeRange(start, contentsEnd - start)]]; + if ([self replaceWithStylesOption]) { + [item setAttributedTitle:[attrString attributedSubstringFromRange:NSMakeRange(start, contentsEnd - start)]]; + } else { + // スタイルを削除する + [item setTitle:[[attrString string] substringWithRange:NSMakeRange(start, contentsEnd - start)]]; + } } [item setTarget:self]; [item setAction:@selector(selectReplaceHistory:)]; @@ -573,7 +580,9 @@ - (void)addFindHistory:(NSAttributedString*)attrString if (start == contentsEnd) { [item setTitle:@""]; } else { - [item setAttributedTitle:[attrString attributedSubstringFromRange:NSMakeRange(start, contentsEnd - start)]]; +// [item setAttributedTitle:[attrString attributedSubstringFromRange:NSMakeRange(start, contentsEnd - start)]]; + // スタイルは削除する。 + [item setTitle:[string substringWithRange:NSMakeRange(start, contentsEnd - start)]]; } [item setTarget:self]; [item setAction:@selector(selectFindHistory:)]; @@ -612,7 +621,12 @@ - (void)addReplaceHistory:(NSAttributedString*)string if (start == contentsEnd) { [item setTitle:@""]; } else { - [item setAttributedTitle:[string attributedSubstringFromRange:NSMakeRange(start, contentsEnd - start)]]; + if ([self replaceWithStylesOption]) { + [item setAttributedTitle:[string attributedSubstringFromRange:NSMakeRange(start, contentsEnd - start)]]; + } else { + // スタイルを削除する + [item setTitle:[[string string] substringWithRange:NSMakeRange(start, contentsEnd - start)]]; + } } [item setTarget:self]; [item setAction:@selector(selectReplaceHistory:)]; @@ -1676,6 +1690,11 @@ - (void)setInSelectionScopeOption:(BOOL)anInSelectionScopeOption inSelectionScopeOption = anInSelectionScopeOption; } +- (NSString*)version +{ + return [OGRegularExpression version]; +} + /* delegate methods of findTextView/replaceTextView */ - (BOOL)textView:(NSTextView*)aTextView shouldChangeTextInRange:(NSRange)affectedCharRange replacementString:(NSString*)replacementString { diff --git a/FindPanel/Resources/Base.lproj/OgreAdvancedFindPanel.nib/designable.nib b/FindPanel/Resources/Base.lproj/OgreAdvancedFindPanel.nib/designable.nib index 1b2b013e..6b66aeaa 100644 --- a/FindPanel/Resources/Base.lproj/OgreAdvancedFindPanel.nib/designable.nib +++ b/FindPanel/Resources/Base.lproj/OgreAdvancedFindPanel.nib/designable.nib @@ -512,7 +512,7 @@