From 36270c4a824452a9e5f82b4c426b6e4de7acbfc2 Mon Sep 17 00:00:00 2001
From: yuki <kimaira7@gmail.com>
Date: Wed, 25 Dec 2013 17:01:06 +0900
Subject: [PATCH] =?utf8?q?=E3=82=AD=E3=83=BC=E3=83=AF=E3=83=BC=E3=83=89?=
 =?utf8?q?=E6=A4=9C=E7=B4=A2=E3=81=AE=E6=A4=9C=E7=B4=A2=E7=AF=84=E5=9B=B2?=
 =?utf8?q?=E3=82=92=E8=A8=AD=E5=AE=9A=E3=83=95=E3=82=A1=E3=82=A4=E3=83=AB?=
 =?utf8?q?=E3=81=AB=E4=BF=9D=E6=8C=81=E3=81=99=E3=82=8B=E3=82=88=E3=81=86?=
 =?utf8?q?=E3=81=AB=E3=81=97=E3=81=9F=E3=80=82=E3=82=AD=E3=83=BC=E3=83=AF?=
 =?utf8?q?=E3=83=BC=E3=83=89=E6=A4=9C=E7=B4=A2=E5=85=A5=E5=8A=9B=E6=AC=84?=
 =?utf8?q?=E3=81=AE=E3=82=B5=E3=82=A4=E3=82=BA=E8=A8=AD=E5=AE=9A=E3=82=92?=
 =?utf8?q?=E5=A4=89=E6=9B=B4=E3=81=97=E3=81=9F=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 src/cx/fbn/nevernote/Global.java         | 24 ++++++++++++++++++++++++
 src/cx/fbn/nevernote/NeverNote.java      |  4 +++-
 src/cx/fbn/nevernote/gui/SearchEdit.java | 15 ++++++++++++---
 3 files changed, 39 insertions(+), 4 deletions(-)

diff --git a/src/cx/fbn/nevernote/Global.java b/src/cx/fbn/nevernote/Global.java
index 3873d54..7a6658c 100644
--- a/src/cx/fbn/nevernote/Global.java
+++ b/src/cx/fbn/nevernote/Global.java
@@ -52,6 +52,7 @@ import cx.fbn.nevernote.config.InitializationException;
 import cx.fbn.nevernote.config.StartupConfig;
 import cx.fbn.nevernote.gui.ContainsAttributeFilterTable;
 import cx.fbn.nevernote.gui.DateAttributeFilterTable;
+import cx.fbn.nevernote.gui.SearchEdit.SearchTarget;
 import cx.fbn.nevernote.gui.ShortcutKeys;
 import cx.fbn.nevernote.sql.DatabaseConnection;
 import cx.fbn.nevernote.sql.driver.NSqlQuery;
@@ -2621,5 +2622,28 @@ public class Global {
 		settings.setValue("toolBarNewAction", value);
 		settings.endGroup();	
 	}
+	
+	// 全文検索の範囲
+	public static SearchTarget searchTarget() {
+		settings.beginGroup("General");
+		try {
+			String text = (String)settings.value("searchTarget", "0");
+			settings.endGroup();
+			int ordinal = Integer.parseInt(text);
+			SearchTarget target = fromOrdinal(SearchTarget.class, ordinal);
+			return target;
+		} catch (java.lang.ClassCastException e) {
+			int value = (Integer) settings.value("searchTarget", 0);
+			settings.endGroup();;
+			SearchTarget target = fromOrdinal(SearchTarget.class, value);
+			return target;
+		}
+	}
+	
+	public static void setSearchTarget(SearchTarget target) {
+		settings.beginGroup("General");
+		settings.setValue("searchTarget", target.ordinal());
+		settings.endGroup();
+	}
 }
 
diff --git a/src/cx/fbn/nevernote/NeverNote.java b/src/cx/fbn/nevernote/NeverNote.java
index 4c8a78b..f09b5a3 100644
--- a/src/cx/fbn/nevernote/NeverNote.java
+++ b/src/cx/fbn/nevernote/NeverNote.java
@@ -3305,7 +3305,9 @@ public class NeverNote extends QMainWindow{
         searchField.setObjectName("searchField");
     	searchField.returnPressed.connect(this, "searchFieldChanged()");
     	searchField.textChanged.connect(this,"searchFieldTextChanged(String)");
-    	searchField.setFixedWidth(300);
+    	searchField.setMaximumWidth(400);
+    	searchField.setMinimumWidth(80);
+    	searchField.setSizePolicy(QSizePolicy.Policy.Expanding, QSizePolicy.Policy.Fixed);
     	searchShortcut = new QShortcut(this);
     	setupShortcut(searchShortcut, "Focus_Search");
     	searchShortcut.activated.connect(this, "focusSearch()");
diff --git a/src/cx/fbn/nevernote/gui/SearchEdit.java b/src/cx/fbn/nevernote/gui/SearchEdit.java
index 419d884..e90a04f 100644
--- a/src/cx/fbn/nevernote/gui/SearchEdit.java
+++ b/src/cx/fbn/nevernote/gui/SearchEdit.java
@@ -37,6 +37,7 @@ import com.trolltech.qt.gui.QResizeEvent;
 import com.trolltech.qt.gui.QStyle.PixelMetric;
 import com.trolltech.qt.gui.QToolButton;
 
+import cx.fbn.nevernote.Global;
 import cx.fbn.nevernote.sql.DatabaseConnection;
 
 public class SearchEdit extends QLineEdit {
@@ -94,16 +95,24 @@ public class SearchEdit extends QLineEdit {
 		targetMenu.addAction(currentContextAction);
 		targetGroup.triggered.connect(this, "toggleSearchTarget(QAction)");
 		
-		// 初期状態として「すべてのノートを検索」を選択
-		allNotesAction.setChecked(true);
-		toggleSearchTarget(allNotesAction);
+		// 検索対象を初期状態をiniファイルから取得して設定
+		final SearchTarget target = Global.searchTarget();
+		if (target == SearchTarget.AllNotes) {
+			allNotesAction.setChecked(true);
+			toggleSearchTarget(allNotesAction);
+		} else if (target == SearchTarget.CurrentContext) {
+			currentContextAction.setChecked(true);
+			toggleSearchTarget(currentContextAction);
+		}
 	}
 	
 	private void toggleSearchTarget(QAction action) {
 		if (action == allNotesAction) {
 			defaultText = new String(tr("Search All Notes"));
+			Global.setSearchTarget(SearchTarget.AllNotes);
 		} else if (action == currentContextAction) {
 			defaultText = new String(tr("Search Current Context"));
+			Global.setSearchTarget(SearchTarget.CurrentContext);
 		}
     	setDefaultText();
     	this.clearFocus();
-- 
2.11.0