Merge branch 'release/3.0.2'

sonoisa · Nov 18, 2018 · 7f7ab1e · 7f7ab1e
2 parents 0b1f21c + 167ea62
commit 7f7ab1e
Show file tree

Hide file tree

Showing 25 changed files with 352 additions and 126 deletions.
diff --git 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
@@ -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
diff --git a/FindPanel/Resources/Base.lproj/OgreAdvancedFindPanel.nib/keyedobjects.nib b/FindPanel/Resources/Base.lproj/OgreAdvancedFindPanel.nib/keyedobjects.nib
diff --git a/FindPanel/Resources/Dutch.lproj/OgreAdvancedFindPanel.nib/designable.nib b/FindPanel/Resources/Dutch.lproj/OgreAdvancedFindPanel.nib/designable.nib
diff --git a/FindPanel/Resources/Dutch.lproj/OgreAdvancedFindPanel.nib/keyedobjects.nib b/FindPanel/Resources/Dutch.lproj/OgreAdvancedFindPanel.nib/keyedobjects.nib
diff --git a/FindPanel/Resources/French.lproj/OgreAdvancedFindPanel.nib/designable.nib b/FindPanel/Resources/French.lproj/OgreAdvancedFindPanel.nib/designable.nib
diff --git a/FindPanel/Resources/French.lproj/OgreAdvancedFindPanel.nib/keyedobjects.nib b/FindPanel/Resources/French.lproj/OgreAdvancedFindPanel.nib/keyedobjects.nib