Commit: 29e0e0454d3e205732c2a95533c33696517608fe - TinyBannavi (git)

タイニー番組ナビゲータ本体

Commit MetaInfo

• Revision: 29e0e0454d3e205732c2a95533c33696517608fe (tree)
• Time: 2021-01-15 22:02:03
• Author: Masahiko Kimura <mkimura@u01....>
• Commiter: Masahiko Kimura

Log Message

Ver.1.12.18 (2021/1/15)
1.［ツールバー］検索設定画面の追加（検索ボタン右の▼ボタンをクリックするか、Ctrl+Shift+K）
2.［予約ダイアログ］レコーダを切り替えた時もジャンル別あるいはデフォルトの画質設定を取得し直す
3.［新聞形式］ツリービューの選択が外れていても、ヘッダーのダブルクリックで日付別と放送局別を切り替えられる
4.［その他］番組表データの不要なフラグをログに出力しないようにする

Change Summary

• modified: TinyBannavi/src/tainavi/AbsPaperView.java
• modified: TinyBannavi/src/tainavi/AbsToolBar.java
• modified: TinyBannavi/src/tainavi/RecSettingEditorPanel.java
• add: TinyBannavi/src/tainavi/VWSearchWordDialog.java
• modified: TinyBannavi/src/tainavi/VersionInfo.java
• modified: TinyBannavi/src/tainavi/Viewer.java
• modified: TinyBannavi/src/tainavi/plugintv/PlugIn_CSPTVKingdom110.java
• modified: TinyBannavi/src/tainavi/plugintv/PlugIn_TVPDimora.java
• modified: TinyBannavi/src/tainavi/plugintv/PlugIn_TVPTVKingdom.java

Incremental Difference

--- a/TinyBannavi/src/tainavi/AbsPaperView.java
+++ b/TinyBannavi/src/tainavi/AbsPaperView.java
@@ -111,7 +111,7 @@ public abstract class AbsPaperView extends JPanel implements TickTimerListener,H
 	 * マウス右クリックメニューを表示する
 	 */
 	protected abstract void showPopupMenu(
-			final JComponent comp,	final ProgDetailList tvd, final int x, final int y);
+			final JComponent comp,	final ProgDetailList tvd, final int x, final int y, final String clickedDateTime);
 
 	/**
 	 * 予約マーク・予約枠を更新してほしい
@@ -632,11 +632,9 @@ public abstract class AbsPaperView extends JPanel implements TickTimerListener,H
 	 */
 	public void redrawByPager() {
 		Point vp = vport.getViewPosition();
-//		Dimension vs = vport.getSize();
 
 		redrawByCurrentSelection();
 
-//		jLayeredPane_space_main_view.scrollRectToVisible(new Rectangle(vp, vs));
 		vport.setViewPosition(vp);
 	}
 
@@ -644,88 +642,59 @@ public abstract class AbsPaperView extends JPanel implements TickTimerListener,H
 	 * 現在の選択状態で再描画する
 	 */
 	public void redrawByCurrentSelection() {
-		TreePath path = jTree_tree.getSelectionPath();
-		// 何も選択されていない場合
-		if (path == null)
-			return;
-
-		if ( path.getPathCount() == 2 ) {
-			// 親ノードとか触られても…
+		JTreeLabel.Nodes node = jLabel_tree.getNode();
+		String value = jLabel_tree.getValue();
+		if (node == null || value == null)
 			return;
-		}
-
-		if ( path.getPathCount() == 3 ) {
-
-			if (env.getDebug()) System.out.println(DBGID+"SELECTED treeSelListner "+path);
-
-			stopTimer();
 
-			JTreeLabel.Nodes node = JTreeLabel.Nodes.getNode(path.getPathComponent(1).toString());
-			String value = path.getLastPathComponent().toString();
+		stopTimer();
 
-			switch ( node ) {
+		switch ( node ) {
+		case DATE:
+		case TERRA:
+		case BS:
+		case CS:
+			IterationType type = IterationType.ALL;
+			switch( node ){
 			case DATE:
-				if ( JTreeLabel.Nodes.NOW.getLabel().equals(value) ) {
-					// 現在日時に移動する
-					redrawByNow(IterationType.ALL);
-				}
-				else {
-					redrawByDate(value,IterationType.ALL);
-				}
+				type = IterationType.ALL;
 				break;
 			case TERRA:
-				if ( JTreeLabel.Nodes.NOW.getLabel().equals(value) ) {
-					redrawByNow(IterationType.TERRA);
-				}
-				else {
-					redrawByDate(value,IterationType.TERRA);
-				}
+				type = IterationType.TERRA;
 				break;
 			case BS:
-				if ( JTreeLabel.Nodes.NOW.getLabel().equals(value) ) {
-					redrawByNow(IterationType.BS);
-				}
-				else {
-					redrawByDate(path.getLastPathComponent().toString(),IterationType.BS);
-				}
+				type = IterationType.BS;
 				break;
 			case CS:
-				if ( JTreeLabel.Nodes.NOW.getLabel().equals(value) ) {
-					redrawByNow(IterationType.CS);
-				}
-				else {
-					redrawByDate(path.getLastPathComponent().toString(),IterationType.CS);
-				}
-				break;
-			case BCAST:
-				redrawByCenter(value);
-				break;
-			case PASSED:
-				PassedProgram passed = tvprograms.getPassed();
-				if ( passed.loadAllCenters(value) ) {
-					redrawByDate(value, IterationType.PASSED);
-				}
-				else {
-					MWin.appendError(ERRID+"過去ログが存在しません: "+value);
-					ringBeep();
-				}
+				type = IterationType.CS;
 				break;
 			default:
 				break;
 			}
-
-			updatePagerEnabled();
-
-			jLabel_tree.setView(node, value);
-			return;
+			// 現在日時に移動する
+			if ( JTreeLabel.Nodes.NOW.getLabel().equals(value) )
+				redrawByNow(type);
+			else
+				redrawByDate(value, type);
+			break;
+		case BCAST:
+			redrawByCenter(value);
+			break;
+		case PASSED:
+			PassedProgram passed = tvprograms.getPassed();
+			if ( passed.loadAllCenters(value) ) {
+				redrawByDate(value, IterationType.PASSED);
+			}
+			else {
+				MWin.appendError(ERRID+"過去ログが存在しません: "+value);
+				ringBeep();
+			}
+			break;
+		default:
+			break;
 		}
 
-		// なんかおかしいのでデフォルト選択にまわす
-		CommonUtils.printStackTrace();
-		MWin.appendError(DBGID+"デバッグまで仮置き");
-		//redrawByNow(IterationType.ALL);
-		//jLabel_tree.setView(JTreeLabel.Nodes.DATE, JTreeLabel.Nodes.NOW.getLabel());
-
+		updatePagerEnabled();
 	}
 
 	/**
@@ -1382,12 +1351,11 @@ public abstract class AbsPaperView extends JPanel implements TickTimerListener,H
 		if (jLabel_timeline == null | jLabel_timeline_tb == null || vport == null)
 			return;
 
-		// 表示中のパスを取得する
-		TreePath path = jTree_tree.getSelectionPath();
-
 		// 第１階層のノード、第２階層のノード名を取得する
-		JTreeLabel.Nodes node1 = JTreeLabel.Nodes.getNode(path.getPathComponent(1).toString());
-		String node2 = path.getPathCount() > 2 ? path.getPathComponent(2).toString() : "";
+		JTreeLabel.Nodes node1 = jLabel_tree.getNode();
+		String node2 = jLabel_tree.getValue();
+		if (node2 == null)
+			node2 = "";
 
 		// 当日の日付を計算する
 		int correct = 0; // 24:00-28:59迄は前日の日付になる
@@ -2616,13 +2584,14 @@ public abstract class AbsPaperView extends JPanel implements TickTimerListener,H
 
 		if ( timer_now_enabled ) {
 			// 表示中のノード
-			TreePath path = jTree_tree.getSelectionPath();
-			JTreeLabel.Nodes node = JTreeLabel.Nodes.getNode(path.getPathComponent(1).toString());
-			String date = path.getPathCount() > 2 ? path.getPathComponent(2).toString() : "";
+			JTreeLabel.Nodes node = jLabel_tree.getNode();
+			String value = jLabel_tree.getValue();
+			if (node == null || value == null)
+				return;
 
-			boolean now = (node == JTreeLabel.Nodes.DATE || node == JTreeLabel.Nodes.BS ||
-					node == JTreeLabel.Nodes.CS || node == JTreeLabel.Nodes.TERRA) &&
-					dateNode.getChildAt(0).toString().equals(date);
+			boolean byCenter = (node == JTreeLabel.Nodes.DATE || node == JTreeLabel.Nodes.BS ||
+					node == JTreeLabel.Nodes.CS || node == JTreeLabel.Nodes.TERRA);
+			boolean now = byCenter && dateNode.getChildAt(0).toString().equals(value);
 
 			if (prevDT4Now != null && ! prevDT4Now.equals(curDT)){
 				// 日付切り替え
@@ -2640,6 +2609,11 @@ public abstract class AbsPaperView extends JPanel implements TickTimerListener,H
 
 				if (now)
 					redrawByNow(cur_tuner);
+				else if (byCenter && !value.equals("")){
+					c = CommonUtils.getCalendar(value, 3600*24);
+					if (c != null)
+						redrawByDateWithCenter(node.getLabel(), CommonUtils.getDate(c));
+				}
 				else
 					redrawByCurrentSelection();
 			}
@@ -2719,7 +2693,7 @@ public abstract class AbsPaperView extends JPanel implements TickTimerListener,H
 				if (e.getClickCount() == 1) {
 					// 右シングルクリックでメニューの表示
 					String clicked = getClickedDateTime(tvd, e.getY());
-					showPopupMenu(b, tvd, p.x, p.y);
+					showPopupMenu(b, tvd, p.x, p.y, clicked);
 				}
 			}
 			else if (e.getButton() == MouseEvent.BUTTON1) {
@@ -2856,13 +2830,14 @@ public abstract class AbsPaperView extends JPanel implements TickTimerListener,H
 	 */
 	private final TreePath getNextDatePath(boolean next){
 		// 表示中のノード
-		TreePath path = jTree_tree.getSelectionPath();
+		JTreeLabel.Nodes node = jLabel_tree.getNode();
+		String value = jLabel_tree.getValue();
+		if (node == null || value == null)
+			return null;
 
 		DefaultMutableTreeNode pnode = null;
 		int offset = next ? 1 : -1;
 
-		JTreeLabel.Nodes node = JTreeLabel.Nodes.getNode(path.getPathComponent(1).toString());
-
 		switch(node){
 		case DATE:
 			pnode = dateNode;
@@ -2888,10 +2863,7 @@ public abstract class AbsPaperView extends JPanel implements TickTimerListener,H
 			return null;
 		}
 
-		if (path.getPathCount() < 3)
-			return null;
-
-		String date = path.getPathComponent(2).toString();
+		String date = value;
 		String today = JTreeLabel.Nodes.NOW.getLabel();
 
 		// 特殊なケース（今日⇔昨日）
@@ -3022,7 +2994,23 @@ public abstract class AbsPaperView extends JPanel implements TickTimerListener,H
 	private final TreeSelectionListener tsl_nodeselected = new TreeSelectionListener() {
 		@Override
 		public void valueChanged(TreeSelectionEvent e){
+			TreePath path = jTree_tree.getSelectionPath();
+			if (path == null)
+				return;
 
+			if (env.getDebug()) System.out.println(DBGID+"SELECTED treeSelListner "+path);
+
+			// ３層目が選択されていない場合は無視する
+			if (path.getPathCount() != 3)
+				return;
+
+			// ２層目と３層目を取得してラベルにセットする
+			JTreeLabel.Nodes node = JTreeLabel.Nodes.getNode(path.getPathComponent(1).toString());
+			String value = path.getLastPathComponent().toString();
+
+			jLabel_tree.setView(node, value);
+
+			// セットした選択状態で再描画する
 			redrawByCurrentSelection();
 		}
 	};
@@ -3063,13 +3051,14 @@ public abstract class AbsPaperView extends JPanel implements TickTimerListener,H
 		public void mouseClicked(MouseEvent e) {
 			if (e.getButton() == MouseEvent.BUTTON1) {
 				if (e.getClickCount() == 2) {
-					TreePath path = jTree_tree.getSelectionPath();
-					if (path == null || path.getPathCount() != 3)
+					JTreeLabel.Nodes node = jLabel_tree.getNode();
+					String value = jLabel_tree.getValue();
+					if (node == null || value == null)
 						return;
 
 					// 過去ログノードの場合、選択されているノードを開始日とする
-					if (path.getPathComponent(1) == passedNode)
-						startDate = path.getPathComponent(2).toString();
+					if (node == JTreeLabel.Nodes.PASSED)
+						startDate = value;
 					else
 						startDate = CommonUtils.getDate529(0, true);
 
@@ -3102,13 +3091,12 @@ public abstract class AbsPaperView extends JPanel implements TickTimerListener,H
 		public void mouseClicked(MouseEvent e) {
 			if (e.getButton() == MouseEvent.BUTTON1) {
 				if (e.getClickCount() == 2) {
-					// 右ダブルクリックで日付表示に切り替え
-
-					TreePath path = jTree_tree.getSelectionPath();
-					if (path == null || path.getPathCount() != 3)
+					JTreeLabel.Nodes node = jLabel_tree.getNode();
+					String value = jLabel_tree.getValue();
+					if (node == null || value == null)
 						return;
 
-					String center = path.getPathComponent(2).toString();
+					String center = value;
 					String date = ((JTXTLabel)e.getSource()).getValue();
 
 					StdAppendMessage(MSGID+"日付表示に切り替え："+date);

--- a/TinyBannavi/src/tainavi/AbsToolBar.java
+++ b/TinyBannavi/src/tainavi/AbsToolBar.java
@@ -59,7 +59,7 @@ public abstract class AbsToolBar extends JToolBar implements HDDRecorderSelectab
 	public void setDebug(boolean b) {debug = b; }
 	private boolean debug = false;
 
-	private SearchWordList swlist = new SearchWordList();
+	protected SearchWordList swlist = new SearchWordList();
 
 	/*******************************************************************************
 	 * 抽象メソッド
@@ -109,6 +109,7 @@ public abstract class AbsToolBar extends JToolBar implements HDDRecorderSelectab
 	// 共通
 	protected abstract boolean recorderSelectorChanged();
 	protected abstract void takeSnapShot();
+	protected abstract void openSearchDialog(JButton button);
 	// メインウィンドウ
 	/**
 	 * 親から呼ばないでくださいね！
@@ -177,6 +178,7 @@ public abstract class AbsToolBar extends JToolBar implements HDDRecorderSelectab
 
 	private static final String TIPS_KEYWORD			= "<HTML><B>検索ボックスの書式</B><BR>検索：(オプション1) (オプション2) キーワード <BR>過去ログ検索：開始日[(YYYY/)MM/DD] 終了日[(YYYY/)MM/DD] (オプション2) キーワード<BR>過去ログ閲覧：日付[YYYY/MM/DD]<BR>※オプション1：@filter..絞込検索（過去ログは対象外）<BR>※オプション2：#title..番組名一致、#detail..番組詳細一致、なし..番組名＆番組詳細一致<BR><B>Ctrl+D:キーワードをコンボボックスから削除する</B><BR></HTML>";
 	private static final String TIPS_SEARCH				= "キーワード検索 or 過去ログ閲覧";
+	private static final String TIPS_SEARCH_MENU		= "検索設定画面(Ctrl+Shift+K)";
 	private static final String TIPS_ADDKEYWORD			= "キーワードリストに登録(Ctrl+K)";
 	private static final String TIPS_PAGER				= "ページャー";
 	private static final String TIPS_RELOADPROG			= "Webから番組情報を再取得(Ctrl+W)";
@@ -223,8 +225,9 @@ public abstract class AbsToolBar extends JToolBar implements HDDRecorderSelectab
 	// ツールバーのコンポーネント
 
 	private JComboBoxWithPopup jComboBox_keyword = null;
-	private JTextField jTextField_keyword = null;
+	protected JTextField jTextField_keyword = null;
 	private JButton jButton_search = null;
+	private JButton jButton_searchmenu = null;
 	private JButton jButton_addkeyword = null;
 	private JWideComboBox jComboBox_select_recorder = null;
 	private JWideComboBox jComboBox_pager = null;
@@ -284,6 +287,7 @@ public abstract class AbsToolBar extends JToolBar implements HDDRecorderSelectab
 	private void createComponents(){
 		getJComboBox_keyword();
 		getJButton_search("キーワード検索");
+		getJButton_searchmenu("キーワード検索メニュー");
 		getJButton_addkeyword("キーワード一覧に登録");
 
 		getJButton_reloadprogs("番組情報再取得");
@@ -352,6 +356,7 @@ public abstract class AbsToolBar extends JToolBar implements HDDRecorderSelectab
 				break;
 			case SEARCH:
 				this.add(jButton_search);
+				this.add(jButton_searchmenu);
 				break;
 			case ADDKEYWORD:
 				this.add(jButton_addkeyword);
@@ -501,12 +506,20 @@ public abstract class AbsToolBar extends JToolBar implements HDDRecorderSelectab
 	/**
 	 * キーワード検索ボックスからの検索の実行
 	 */
-	private void toolbarSearch() {
+	protected void toolbarSearch(String keywordArg) {
 		// 入力形式による分岐
 		boolean doFilter = false;
 		String sStr = null;
 		String kStr = null;
-		String keywordStr = jTextField_keyword.getText().trim();
+		String keywordStr = keywordArg != null ? keywordArg : jTextField_keyword.getText().trim();
+
+		// 過去ログ閲覧
+		if (keywordStr.matches("^\\d\\d\\d\\d/\\d\\d/\\d\\d$")) {
+			if ( ! jumpToPassed(keywordStr)) {
+				JOptionPane.showConfirmDialog(null, keywordStr+"はみつからなかったでゲソ！", "警告", JOptionPane.CLOSED_OPTION);
+			}
+			return;
+		}
 
 		if (swlist.add(keywordStr)){
 			swlist.save();
@@ -661,6 +674,13 @@ public abstract class AbsToolBar extends JToolBar implements HDDRecorderSelectab
 		jTextField_keyword.requestFocusInWindow();
 	}
 
+	/*
+	 * 「検索設定画面」を表示する
+	 */
+	public void openSearchDialog() {
+		openSearchDialog(jButton_searchmenu);
+	}
+
 	/**
 	 *
 	 */
@@ -1304,14 +1324,17 @@ public abstract class AbsToolBar extends JToolBar implements HDDRecorderSelectab
 	private final ActionListener al_keywordEntered = new ActionListener() {
 		@Override
 		public void actionPerformed(ActionEvent e) {
-			if (jTextField_keyword.getText().matches("^\\d\\d\\d\\d/\\d\\d/\\d\\d$")) {
-				if ( ! jumpToPassed(jTextField_keyword.getText())) {
-					JOptionPane.showConfirmDialog(null, jTextField_keyword.getText()+"はみつからなかったでゲソ！", "警告", JOptionPane.CLOSED_OPTION);
-				}
-			}
-			else {
-				toolbarSearch();
-			}
+			toolbarSearch(null);
+		}
+	};
+
+	/*
+	 *  「キーワード検索メニュー」ボタンが押された
+	 */
+	private final MouseAdapter ma_searchMenu = new MouseAdapter() {
+		@Override
+		public void mousePressed(MouseEvent e) {
+			openSearchDialog();
 		}
 	};
 
@@ -1696,6 +1719,18 @@ public abstract class AbsToolBar extends JToolBar implements HDDRecorderSelectab
 		return jButton_search;
 	}
 
+	// 「検索拡張メニュー」ボタン
+	private JButton getJButton_searchmenu(String s) {
+		if (jButton_searchmenu == null) {
+			ImageIcon arrow = new ImageIcon(ICONFILE_PULLDOWNMENU);
+			jButton_searchmenu = new JButton(arrow);
+			jButton_searchmenu.setToolTipText(TIPS_SEARCH_MENU);
+
+			jButton_searchmenu.addMouseListener(ma_searchMenu);
+		}
+		return jButton_searchmenu;
+	}
+
 	// 「キーワード検索に登録」
 	private JButton getJButton_addkeyword(String s) {
 		if (jButton_addkeyword == null) {

--- a/TinyBannavi/src/tainavi/RecSettingEditorPanel.java
+++ b/TinyBannavi/src/tainavi/RecSettingEditorPanel.java
@@ -1011,6 +1011,8 @@ public class RecSettingEditorPanel extends JPanel {
 
 				recsetsel.doSelectRecorder(getSelectedRecorderId());
 
+				recsetsel.doSetAVSettings();
+
 				setEnabledListenerAll(true);	// 再開
 			}
 		}

--- /dev/null
+++ b/TinyBannavi/src/tainavi/VWSearchWordDialog.java
@@ -0,0 +1,928 @@
+package tainavi;
+
+import java.awt.Color;
+import java.awt.Dimension;
+import java.awt.Font;
+import java.awt.Point;
+import java.awt.Rectangle;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.awt.event.ItemEvent;
+import java.awt.event.ItemListener;
+import java.awt.event.KeyEvent;
+import java.awt.event.KeyListener;
+import java.awt.event.MouseAdapter;
+import java.awt.event.MouseEvent;
+import java.awt.event.WindowEvent;
+import java.awt.event.WindowListener;
+import java.text.SimpleDateFormat;
+import java.time.Instant;
+import java.util.GregorianCalendar;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import javax.swing.AbstractAction;
+import javax.swing.InputMap;
+import javax.swing.JButton;
+import javax.swing.JCheckBox;
+import javax.swing.JComponent;
+import javax.swing.JLabel;
+import javax.swing.JOptionPane;
+import javax.swing.JPanel;
+import javax.swing.JTextField;
+import javax.swing.KeyStroke;
+import javax.swing.SpringLayout;
+import javax.swing.border.LineBorder;
+import javax.swing.event.DocumentEvent;
+import javax.swing.event.DocumentListener;
+
+/*
+ * 検索文字列入力画面
+ *
+ */
+public class VWSearchWordDialog extends JEscCancelDialog {
+
+	private static final long serialVersionUID = 1L;
+
+	/*******************************************************************************
+	 * 定数
+	 ******************************************************************************/
+
+	// レイアウト関連
+
+	private static final int PARTS_HEIGHT = 30;
+	private static final int SEP_WIDTH = 10;
+	private static final int SEP_HEIGHT = 10;
+	private static final int SEARCH_HEIGHT = 45;
+
+	private static final int LABEL_WIDTH = 120;
+
+	private static final int TEXT_WIDTH = 500;
+	private static final int CHECKBOX_WIDTH = 150;
+	private static final int DATE_WIDTH = 120;
+	private static final int AMONG_WIDTH = 30;
+	private static final int NOTE_WIDTH = 600;
+	private static final int NOTE_HEIGHT = PARTS_HEIGHT*2;
+
+	private static final int BUTTON_WIDTH = 120;
+
+	private static final int PANEL_WIDTH = SEP_WIDTH+LABEL_WIDTH+SEP_WIDTH+TEXT_WIDTH+SEP_WIDTH*2+BUTTON_WIDTH+SEP_WIDTH;
+
+	// その他
+	private static final int MAX_SEARCH_WORDS = 32;
+
+	/*******************************************************************************
+	 * 部品
+	 ******************************************************************************/
+
+	private JPanel jPanel = null;
+
+	private JLabel jLabel_swlist = null;
+	private JComboBoxWithPopup jComboBox_swlist = null;
+//	private JTextField jTextField_swlist = null;
+
+	private JLabel jLabel_keyword = null;
+	private JTextField jTextField_keyword = null;
+
+	private JLabel jLabel_options = null;
+	private JCheckBox jCheckBox_title = null;
+	private JCheckBox jCheckBox_detail = null;
+	private JCheckBox jCheckBox_filter = null;
+
+	private JLabel jLabel_period = null;
+	private JTextField jTextField_from = null;
+	private JLabel jLabel_among = null;
+	private JTextField jTextField_to = null;
+	private JButton jButton_same = null;
+
+	private JButton jButton_delete = null;
+	private JButton jButton_search = null;
+//	private JButton jButton_cancel = null;
+	private JButton jButton_clear = null;
+	private JLabel jLabel_note = null;
+
+	private JButton jButton_menu = null;
+	private AbsToolBar jToolbar = null;
+
+	// コンポーネント以外
+	private Instant last_shown = null;
+	private SearchWordList swlist = null;
+	private boolean autoclose_enabled = true;
+
+	/*******************************************************************************
+	 * コンストラクタ
+	 ******************************************************************************/
+
+	public VWSearchWordDialog() {
+
+		super();
+
+//		this.setModal(true);
+//		this.setDefaultCloseOperation(DO_NOTHING_ON_CLOSE);	// 閉じるときはキャンセルボタンを使ってクレ
+		this.addWindowListener(wl_panel);
+		this.setAlwaysOnTop(true);
+		this.setContentPane(getJPanel());
+		this.setUndecorated(true);
+		this.pack();
+		this.setTitle("検索条件の編集");
+		this.setResizable(false);
+	}
+
+	/*******************************************************************************
+	 * 公開メソッド
+	 ******************************************************************************/
+	/*
+	 * ダイアログを表示する
+	 */
+	public void open(AbsToolBar jtoolbar, JButton jbutton, SearchWordList list, String s){
+		jToolbar = jtoolbar;
+		jButton_menu = jbutton;
+		swlist = list;
+
+		Instant now = Instant.now();
+		if (last_shown != null && now.minusMillis(100).isBefore(last_shown))
+			return;
+
+		updateKeywordComboBox();
+		if (s != null){
+			jComboBox_swlist.setSelectedItem(s);
+
+			if (s.isEmpty()){
+				doClear();
+			}
+			else{
+				decodeKeyword(s);
+			}
+		}
+
+		updateControlStatus();
+		setVisible(true);
+	}
+
+	/*
+	 * 表示・非表示を切り替える
+	 *
+	 * @see java.awt.Dialog#setVisible(boolean)
+	 */
+	@Override
+	public void setVisible(boolean b) {
+		if (b){
+			setLocation();
+			jTextField_keyword.requestFocusInWindow();
+		}
+		else{
+			last_shown = Instant.now();
+		}
+
+		super.setVisible(b);
+	}
+
+	/*
+	 * ダイアログを▼ボタンの下、ツールバーの左端に位置決めする
+	 */
+	public void setLocation(){
+		Point pf = jToolbar.getLocationOnScreen();
+//		Rectangle rf = jToolbar.getBounds();
+
+		Point pm = jButton_menu.getLocationOnScreen();
+		Rectangle rm = jButton_menu.getBounds();
+
+		setPosition(pf.x, pm.y + rm.height);
+	}
+
+	/*
+	 * ダイアログを位置決めする
+	 */
+	public void setPosition(int x, int y) {
+		Rectangle r = this.getBounds();
+		r.x = x;
+		r.y = y;
+		this.setBounds(r);
+	}
+
+	/*******************************************************************************
+	 * コンポーネント
+	 ******************************************************************************/
+	/*
+	 * パネル全体
+	 */
+	private JPanel getJPanel() {
+		if (jPanel == null) {
+			jPanel = new JPanel();
+
+			jPanel.setLayout(new SpringLayout());
+
+			// １行目
+			int y = SEP_HEIGHT;
+			int x = SEP_WIDTH;
+			CommonSwingUtils.putComponentOn(jPanel, getJLabel_swlist("検索履歴"), LABEL_WIDTH, PARTS_HEIGHT, x, y);
+			x += LABEL_WIDTH + SEP_WIDTH;
+			CommonSwingUtils.putComponentOn(jPanel, getJComboBox_swlist(), TEXT_WIDTH, PARTS_HEIGHT, x, y);
+			x += TEXT_WIDTH + SEP_WIDTH*2;
+			int xb = x;
+			CommonSwingUtils.putComponentOn(jPanel, getJButton_delete("削除"), BUTTON_WIDTH, PARTS_HEIGHT, xb, y);
+
+			// ２行目
+			y += PARTS_HEIGHT + SEP_HEIGHT;
+			x = SEP_WIDTH;
+			CommonSwingUtils.putComponentOn(jPanel, getJLabel_keyword("キーワード"), LABEL_WIDTH, PARTS_HEIGHT, x, y);
+			x += LABEL_WIDTH + SEP_WIDTH;
+			CommonSwingUtils.putComponentOn(jPanel, getJTextField_keyword(), TEXT_WIDTH, PARTS_HEIGHT, x, y);
+			CommonSwingUtils.putComponentOn(jPanel, getJButton_search("検索"), BUTTON_WIDTH, SEARCH_HEIGHT, xb, y);
+
+			// ３行目
+			y += PARTS_HEIGHT + SEP_HEIGHT;
+			x = SEP_WIDTH;
+			CommonSwingUtils.putComponentOn(jPanel, getJLabel_options("オプション"), LABEL_WIDTH, PARTS_HEIGHT, x, y);
+			x += LABEL_WIDTH + SEP_WIDTH;
+			CommonSwingUtils.putComponentOn(jPanel, getJCheckBox_title("番組名一致"), CHECKBOX_WIDTH, PARTS_HEIGHT, x, y);
+			x += CHECKBOX_WIDTH;
+			CommonSwingUtils.putComponentOn(jPanel, getJCheckBox_detail("番組詳細一致"), CHECKBOX_WIDTH, PARTS_HEIGHT, x, y);
+			x += CHECKBOX_WIDTH;
+			CommonSwingUtils.putComponentOn(jPanel, getJCheckBox_filter("絞り込み"), CHECKBOX_WIDTH, PARTS_HEIGHT, x, y);
+			x += SEP_WIDTH;
+//			int yb2 = y;
+//			CommonSwingUtils.putComponentOn(jPanel, getJButton_cancel("閉じる"), BUTTON_WIDTH, PARTS_HEIGHT, xb, yb2);
+
+			// ４行目
+			y += PARTS_HEIGHT + SEP_HEIGHT;
+			x = SEP_WIDTH;
+			CommonSwingUtils.putComponentOn(jPanel, getJLabel_period("過去ログ期間※"), LABEL_WIDTH, PARTS_HEIGHT, x, y);
+			x += LABEL_WIDTH + SEP_WIDTH;
+			CommonSwingUtils.putComponentOn(jPanel, getJTextField_from(), DATE_WIDTH, PARTS_HEIGHT, x, y);
+			x += DATE_WIDTH;
+			CommonSwingUtils.putComponentOn(jPanel, getJLabel_among("～"), AMONG_WIDTH, PARTS_HEIGHT, x, y);
+			x += AMONG_WIDTH;
+			CommonSwingUtils.putComponentOn(jPanel, getJTextField_to(), DATE_WIDTH, PARTS_HEIGHT, x, y);
+			x += DATE_WIDTH;
+			CommonSwingUtils.putComponentOn(jPanel, getJButton_same("同値"), BUTTON_WIDTH, PARTS_HEIGHT, x, y);
+			x += BUTTON_WIDTH + SEP_WIDTH;
+			CommonSwingUtils.putComponentOn(jPanel, getJButton_clear("クリア"), BUTTON_WIDTH, PARTS_HEIGHT, xb, y);
+
+			// ５行目
+			y += PARTS_HEIGHT-5;
+			x = SEP_WIDTH;
+			CommonSwingUtils.putComponentOn(jPanel, getJLabel_note(), NOTE_WIDTH, NOTE_HEIGHT, x, y);
+			y += NOTE_HEIGHT+SEP_HEIGHT;
+
+
+			jPanel.setPreferredSize(new Dimension(PANEL_WIDTH, y));
+			jPanel.setBorder(new LineBorder(Color.BLACK, 1));
+
+			// ESCキーをショートカットに登録する（が何故か効かない）
+			String ESCKEYACTION = "escape";
+			InputMap imap = getRootPane().getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW);
+			imap.put(KeyStroke.getKeyStroke(KeyEvent.VK_ESCAPE, 0), ESCKEYACTION);
+			getRootPane().getActionMap().put(ESCKEYACTION, new AbstractAction() {
+				private static final long serialVersionUID = 1L;
+				@Override
+				public void actionPerformed(ActionEvent e) {
+					doCancel();
+				}
+			});
+		}
+
+		return jPanel;
+	}
+
+	/*
+	 * 「検索履歴」ラベル
+	 */
+	private JLabel getJLabel_swlist(String s) {
+		if (jLabel_swlist == null) {
+			jLabel_swlist = new JLabel(s);
+		}
+		return(jLabel_swlist);
+	}
+
+	/*
+	 * 「検索履歴」コンボボックス
+	 */
+	private JComboBoxWithPopup getJComboBox_swlist() {
+		if (jComboBox_swlist == null) {
+			jComboBox_swlist = new JComboBoxWithPopup();
+			jComboBox_swlist.setMaximumRowCount(32);
+			jComboBox_swlist.addItemListener(il_swlistSelected);
+
+//			jTextField_swlist = ((JTextField)jComboBox_swlist.getEditor().getEditorComponent());
+		}
+
+		return(jComboBox_swlist);
+	}
+
+	/*
+	 * 「削除」ボタン
+	 */
+	private JButton getJButton_delete(String s) {
+		if (jButton_delete == null) {
+			jButton_delete = new JButton();
+			jButton_delete.setText(s);
+			jButton_delete.setForeground(Color.RED);
+
+			jButton_delete.addMouseListener(new MouseAdapter() {
+				@Override
+				public void mouseClicked(MouseEvent e) {
+					doDelete();
+					jTextField_keyword.requestFocusInWindow();
+					updateControlStatus();
+				}
+			});
+		}
+		return(jButton_delete);
+	}
+
+	/*
+	 * 「キーワード」ラベル
+	 */
+	private JLabel getJLabel_keyword(String s) {
+		if (jLabel_keyword == null) {
+			jLabel_keyword = new JLabel(s);
+		}
+		return(jLabel_keyword);
+	}
+
+	/*
+	 * 「キーワード」テキストフィールド
+	 */
+	private JTextField getJTextField_keyword() {
+		if (jTextField_keyword == null) {
+			jTextField_keyword = new JTextField();
+			jTextField_keyword.addActionListener(al_search);
+			jTextField_keyword.addKeyListener(kl_escape);
+			jTextField_keyword.getDocument().addDocumentListener(dl_documentChanged);
+		}
+
+		return(jTextField_keyword);
+	}
+
+	/*
+	 * 「検索」ボタン
+	 */
+	private JButton getJButton_search(String s) {
+		if (jButton_search == null) {
+			jButton_search = new JButton();
+			jButton_search.setText(s);
+
+			Font f = jButton_search.getFont();
+			jButton_search.setFont(f.deriveFont(f.getStyle() | Font.BOLD, f.getSize()));
+
+			jButton_search.addMouseListener(new MouseAdapter() {
+				@Override
+				public void mouseClicked(MouseEvent e) {
+					doSearch();
+				}
+			});
+		}
+		return(jButton_search);
+	}
+
+	/*
+	 * 「オプション」ラベル
+	 */
+	private JLabel getJLabel_options(String s) {
+		if (jLabel_options == null) {
+			jLabel_options = new JLabel(s);
+		}
+		return(jLabel_options);
+	}
+
+	/*
+	 * 「番組名一致」チェックボックス
+	 */
+	private JCheckBox getJCheckBox_title(String s) {
+		if (jCheckBox_title == null) {
+			jCheckBox_title = new JCheckBox();
+			jCheckBox_title.setText(s);
+			jCheckBox_title.setSelected(true);
+		}
+		return(jCheckBox_title);
+	}
+
+	/*
+	 * 「番組詳細一致」チェックボックス
+	 */
+	private JCheckBox getJCheckBox_detail(String s) {
+		if (jCheckBox_detail == null) {
+			jCheckBox_detail = new JCheckBox();
+			jCheckBox_detail.setText(s);
+			jCheckBox_detail.setSelected(true);
+		}
+		return(jCheckBox_detail);
+	}
+
+	/*
+	 * 「絞り込み」チェックボックス
+	 */
+	private JCheckBox getJCheckBox_filter(String s) {
+		if (jCheckBox_filter == null) {
+			jCheckBox_filter = new JCheckBox();
+			jCheckBox_filter.setText(s);
+		}
+		return(jCheckBox_filter);
+	}
+
+	/*
+	 * 「キャンセル」ボタン
+	 */
+//	private JButton getJButton_cancel(String s) {
+//		if (jButton_cancel == null) {
+//			jButton_cancel = new JButton(s);
+//			jButton_cancel.addMouseListener(new MouseAdapter() {
+//				@Override
+//				public void mouseClicked(MouseEvent e) {
+//					doCancel();
+//				}
+//			});
+//		}
+//
+//		return(jButton_cancel);
+//	}
+
+	/*
+	 * 「過去ログ期間」ラベル
+	 */
+	private JLabel getJLabel_period(String s) {
+		if (jLabel_period == null) {
+			jLabel_period = new JLabel(s);
+		}
+		return(jLabel_period);
+	}
+
+	/*
+	 * 「過去ログ期間開始」テキストフィールド
+	 */
+	private JTextField getJTextField_from() {
+		if (jTextField_from == null) {
+			jTextField_from = new JTextFieldWithPopup();
+
+			jTextField_from.addActionListener(al_search);
+			jTextField_from.addKeyListener(kl_escape);
+			jTextField_from.getDocument().addDocumentListener(dl_documentChanged);
+		}
+
+		return(jTextField_from);
+	}
+
+	/*
+	 * 「～」ラベル
+	 */
+	private JLabel getJLabel_among(String s) {
+		if (jLabel_among == null) {
+			jLabel_among = new JLabel(s);
+			jLabel_among.setHorizontalAlignment(JLabel.CENTER);
+		}
+		return(jLabel_among);
+	}
+
+	/*
+	 * 「過去ログ期間終了」テキストフィールド
+	 */
+	private JTextField getJTextField_to() {
+		if (jTextField_to == null) {
+			jTextField_to = new JTextFieldWithPopup();
+
+			jTextField_to.addActionListener(al_search);
+			jTextField_to.addKeyListener(kl_escape);
+			jTextField_to.getDocument().addDocumentListener(dl_documentChanged);
+		}
+
+		return(jTextField_to);
+	}
+
+	/*
+	 * 「同日」ボタン
+	 */
+	private JButton getJButton_same(String s) {
+		if (jButton_same == null) {
+			jButton_same = new JButton();
+			jButton_same.setText(s);
+
+			jButton_same.addMouseListener(new MouseAdapter() {
+				@Override
+				public void mouseClicked(MouseEvent e) {
+					jTextField_to.setText(jTextField_from.getText());
+				}
+			});
+		}
+		return(jButton_same);
+	}
+
+	/*
+	 * 注釈ラベル
+	 */
+	private JLabel getJLabel_note() {
+		if (jLabel_note == null) {
+			String s = "<html>※YYYY/MM/DDかMM/DDの形式で指定してください。<br>※YYYY/MM/DDで開始日のみ指定するとその日の過去ログが閲覧できます。</html>";
+			jLabel_note = new JLabel(s);
+
+		}
+		return(jLabel_note);
+	}
+
+	/*
+	 * 「クリア」ボタン
+	 */
+	private JButton getJButton_clear(String s) {
+		if (jButton_clear == null) {
+			jButton_clear = new JButton();
+			jButton_clear.setText(s);
+
+			jButton_clear.addMouseListener(new MouseAdapter() {
+				@Override
+				public void mouseClicked(MouseEvent e) {
+					doClear();
+					jComboBox_swlist.setSelectedItem("");
+					jTextField_keyword.requestFocusInWindow();
+				}
+			});
+		}
+		return(jButton_clear);
+	}
+
+	/*******************************************************************************
+	 * アクション
+	 ******************************************************************************/
+	/*
+	 * クリアする
+	 */
+	protected void doClear(){
+		jTextField_keyword.setText("");
+		jTextField_from.setText("");
+		jTextField_to.setText("");
+
+		jCheckBox_title.setSelected(true);
+		jCheckBox_detail.setSelected(true);
+		jCheckBox_filter.setSelected(false);
+	}
+
+	/*
+	 * 履歴を削除する
+	 */
+	protected void doDelete(){
+		int no = jComboBox_swlist.getSelectedIndex();
+		if (no < 1)
+			return;
+
+		swlist.getWordList().remove(no-1);
+		swlist.save();
+		updateKeywordComboBox();
+
+		if (jComboBox_swlist.getItemCount() > no){
+			jComboBox_swlist.setSelectedIndex(no);
+			decodeKeyword((String)jComboBox_swlist.getSelectedItem());
+		}
+		else
+			doClear();
+	}
+
+	/*
+	 * キャンセルする
+	 *
+	 * @see tainavi.JEscCancelDialog#doCancel()
+	 */
+	@Override
+	protected void doCancel() {
+		setVisible(false);
+	}
+
+	/*
+	 * 検索する
+	 */
+	protected boolean doSearch(){
+		StringBuilder sb = new StringBuilder("");
+
+		String keyword = jTextField_keyword.getText();
+
+		String from = jTextField_from.getText();
+		if (from.length() > 0){
+			if (!checkDateFormat(from, true))
+				return false;
+
+			sb.append(from);
+		}
+
+		String to = jTextField_to.getText();
+		if (to.length() > 0){
+			if (!checkDateFormat(to, true))
+				return false;
+
+			if (sb.length() > 0)
+				sb.append(" ");
+			sb.append(to);
+		}
+
+		if (sb.length() == 0 && jCheckBox_filter.isSelected())
+			sb.append("@filter");
+
+		if (keyword.length() > 0){
+			if (jCheckBox_title.isSelected() && jCheckBox_detail.isSelected())
+				;
+			else if (jCheckBox_title.isSelected()){
+				if (sb.length() > 0)
+					sb.append(" ");
+				sb.append("#title");
+			}
+			else if (jCheckBox_detail.isSelected()){
+				if (sb.length() > 0)
+					sb.append(" ");
+				sb.append("#detail");
+			}
+
+			if (sb.length() > 0)
+				sb.append(" ");
+			sb.append(keyword);
+		}
+
+		jToolbar.toolbarSearch(sb.toString());
+
+		setVisible(false);
+
+		return true;
+	}
+
+	/*
+	 * 「検索履歴」コンボボックスを更新する
+	 */
+	protected void updateKeywordComboBox(){
+		String str = (String)jComboBox_swlist.getSelectedItem();
+
+		jComboBox_swlist.removeAllItems();
+
+		jComboBox_swlist.addItem("");
+
+		int num=0;
+		for (SearchWordItem item : swlist.getWordList()){
+			if (num >= MAX_SEARCH_WORDS)
+				break;
+
+			jComboBox_swlist.addItem(item.getKeyword());
+			num++;
+		}
+
+		jComboBox_swlist.setSelectedItem(str);
+	}
+
+	/*
+	 * 部品のステータスを更新する
+	 */
+	protected void updateControlStatus(){
+		String keyword = jTextField_keyword.getText();
+		String from = jTextField_from.getText();
+		String to = jTextField_to.getText();
+		boolean isSelected = jComboBox_swlist.getSelectedIndex() > 0;
+		boolean haskey = keyword.length() > 0;
+		boolean hasrange = from.length() > 0 || to.length() > 0;
+		boolean hasfrom = from.length() == 10 && to.length() == 0;
+		boolean passlog = !haskey && hasfrom;
+		boolean passkey = hasrange;
+
+		jButton_delete.setEnabled(isSelected);
+		jButton_search.setEnabled(haskey || hasfrom);
+		jButton_search.setText(passlog ? "過去ログ閲覧" : passkey ? "過去ログ検索" : "検索");
+		jButton_same.setEnabled(hasrange);
+
+		jCheckBox_filter.setEnabled(!hasrange);
+		jTextField_to.setEnabled(from.length() > 0);
+
+		jTextField_from.setForeground(checkDateFormat(from, false) ? Color.BLACK : Color.RED);
+		jTextField_to.setForeground(checkDateFormat(to, false) ? Color.BLACK : Color.RED);
+	}
+
+	/*
+	 * 過去日の年月日をチェックする
+	 */
+	private boolean checkPassedDate(String syear, String smonth, String sday, boolean msg){
+		int month = Integer.parseInt(smonth);
+		int day = Integer.parseInt(sday);
+
+		if (month < 1 || month > 12 || day < 1 || day > 31)
+			throw new NumberFormatException();
+
+		String today = null;
+		String date = null;
+		GregorianCalendar c = new GregorianCalendar();
+		if (syear == null){
+			today = new SimpleDateFormat("MM/dd").format(c.getTime());
+			date = String.format("%02d/%02d",  month, day);
+		}
+		else{
+			int year = Integer.parseInt(syear);
+			today = new SimpleDateFormat("yyyy/MM/dd").format(c.getTime());
+			date = String.format("%04d/%02d/%02d", year, month, day);
+		}
+
+		if (date.compareTo(today) >= 0){
+			if (msg)
+				showWarnMessage(date + ":過去日を指定してください。");
+			return false;
+		}
+
+		return true;
+	}
+
+	/*
+	 * 日付のフォーマットをチェックする
+	 */
+	private boolean checkDateFormat(String str, boolean msg){
+		if (str.length() == 0)
+			return true;
+
+		Matcher ma = Pattern.compile("^([0-9]{4})/([0-9]{2})/([0-9]{2})$").matcher(str);
+		Matcher mb = Pattern.compile("^([0-9]{2})/([0-9]{2})$").matcher(str);
+
+		try{
+			if (ma.find()){
+				if (!checkPassedDate(ma.group(1), ma.group(2), ma.group(3), msg))
+					return false;
+			}
+			else if (mb.find()){
+				if (!checkPassedDate(null, mb.group(1), mb.group(2), msg))
+					return false;
+			}
+			else{
+				throw new NumberFormatException();
+			}
+		}
+		catch(NumberFormatException e){
+			if (msg){
+				showWarnMessage(str+":不正な日付です！「YYYY/MM/DD」ないし「MM/DD」で指定してください。");
+			}
+			return false;
+		}
+
+		return true;
+	}
+
+	/*
+	 * 警告メッセージを表示する
+	 */
+	private void showWarnMessage(String msg){
+		autoclose_enabled = false;
+		JOptionPane.showConfirmDialog(null, msg, "警告", JOptionPane.CLOSED_OPTION);
+		autoclose_enabled = true;
+	}
+
+	/*
+	 * キーワードをデコードする
+	 */
+	private void decodeKeyword(String str){
+		if (str == null || str.isEmpty())
+			return;
+
+		_decodeKeyword(str);
+		updateControlStatus();
+
+		jPanel.updateUI();
+	}
+
+	/*
+	 * キーワードのデコードを実行する
+	 */
+	private void _decodeKeyword(String str){
+		doClear();
+
+		// 過去ログ閲覧
+		if (str.matches("^\\d\\d\\d\\d/\\d\\d/\\d\\d$")) {
+			jTextField_keyword.setText(str);
+			return;
+		}
+
+		// 過去ログ検索
+		Matcher ma = Pattern.compile("^(\\d\\d\\d\\d/)?(\\d\\d/\\d\\d)([ 　]+((\\d\\d\\d\\d/)?\\d\\d/\\d\\d))?[  　]+(.*)$").matcher(str);
+		if (ma.find()) {
+			String from = (ma.group(1) != null ? ma.group(1) : "") + ma.group(2);
+			String to = ma.group(4);
+			str = ma.group(6);
+
+			jTextField_from.setText(from);
+			jTextField_to.setText(to);
+		}
+
+		// 絞り込みあり
+		Matcher mb = Pattern.compile("^@filter[ 　]+(.*)$").matcher(str);
+		if ( mb.find() ) {
+			str = mb.group(1);
+			jCheckBox_filter.setSelected(true);
+		}
+
+		// オプションあり
+		Matcher	mc = Pattern.compile("^(#title|#detail)?[  　]+(.*)$").matcher(str);
+		if (mc.find()){
+			jCheckBox_title.setSelected(!mc.group(1).equals("#detail"));
+			jCheckBox_detail.setSelected(!mc.group(1).equals("#title"));
+			jTextField_keyword.setText(mc.group(2));
+		}
+		// オプションなし
+		else{
+			jTextField_keyword.setText(str);
+		}
+
+		updateControlStatus();
+		jTextField_keyword.requestFocusInWindow();
+	}
+
+	/*******************************************************************************
+	 * リスナー
+	 ******************************************************************************/
+	/*
+	 * ウインドウのオープン／クローズ等の変化
+	 */
+	private final WindowListener wl_panel = new WindowListener(){
+		@Override
+		public void windowOpened(WindowEvent e) {
+		}
+
+		@Override
+		public void windowClosing(WindowEvent e) {
+		}
+
+		@Override
+		public void windowClosed(WindowEvent e) {
+		}
+
+		@Override
+		public void windowIconified(WindowEvent e) {
+			if (autoclose_enabled)
+				doCancel();
+		}
+
+		@Override
+		public void windowDeiconified(WindowEvent e) {
+		}
+
+		@Override
+		public void windowActivated(WindowEvent e) {
+		}
+
+		@Override
+		public void windowDeactivated(WindowEvent e) {
+			if (autoclose_enabled)
+				doCancel();
+		}
+	};
+
+	/*
+	 * 「検索履歴」コンボボックスの項目変更
+	 */
+	private final ItemListener il_swlistSelected = new ItemListener() {
+
+		@Override
+		public void itemStateChanged(ItemEvent e) {
+            switch (e.getStateChange()) {
+                case ItemEvent.SELECTED:
+                	decodeKeyword((String)jComboBox_swlist.getSelectedItem());
+                    break;
+            }
+		}
+	};
+
+	/*
+	 * テキストフィールドでのEnterキー
+	 */
+	private final ActionListener al_search = new ActionListener() {
+		@Override
+		public void actionPerformed(ActionEvent e) {
+			if (jButton_search.isEnabled())
+				doSearch();
+		}
+	};
+
+	/**
+	 * テキストフィールドでの文書変更
+	 */
+	private final DocumentListener dl_documentChanged = new DocumentListener(){
+		@Override
+		public void insertUpdate(DocumentEvent e) {
+			updateControlStatus();
+		}
+
+		@Override
+		public void removeUpdate(DocumentEvent e) {
+			updateControlStatus();
+		}
+
+		@Override
+		public void changedUpdate(DocumentEvent e) {
+			updateControlStatus();
+		}
+	};
+
+	/*
+	 * テキストフィールドでのESCキー押下
+	 */
+	private final KeyListener kl_escape = new KeyListener(){
+		@Override
+		public void keyTyped(KeyEvent e) {
+		}
+
+		@Override
+		public void keyPressed(KeyEvent e) {
+			if (e.getKeyCode() == KeyEvent.VK_ESCAPE)
+				doCancel();
+		}
+
+		@Override
+		public void keyReleased(KeyEvent e) {
+		}
+	};
+}

--- a/TinyBannavi/src/tainavi/VersionInfo.java
+++ b/TinyBannavi/src/tainavi/VersionInfo.java
@@ -5,7 +5,7 @@ import java.util.regex.Pattern;
 
 
 public class VersionInfo {
-	private static final String Version = "タイニー番組ナビゲータ for DBR-T2007　3.22.18β+1.12.17";
+	private static final String Version = "タイニー番組ナビゲータ for DBR-T2007　3.22.18β+1.12.18";
 
 	private static final String OSname = System.getProperty("os.name");
 	private static final String OSvers = System.getProperty("os.version");

--- a/TinyBannavi/src/tainavi/Viewer.java
+++ b/TinyBannavi/src/tainavi/Viewer.java
@@ -57,6 +57,7 @@ import javax.swing.AbstractAction;
 import javax.swing.Action;
 import javax.swing.ImageIcon;
 import javax.swing.InputMap;
+import javax.swing.JButton;
 import javax.swing.JComponent;
 import javax.swing.JFrame;
 import javax.swing.JLabel;
@@ -372,6 +373,7 @@ public class Viewer extends JFrame implements ChangeListener,TickTimerListener,H
 	private VWChannelConvertView chconvsetting = null;
 	private VWLookAndFeel vwlaf = null;
 	private VWFont vwfont = null;
+	private VWSearchWordDialog swdialog = null;
 
 	private TrayIcon trayicon = null;
 
@@ -475,7 +477,7 @@ public class Viewer extends JFrame implements ChangeListener,TickTimerListener,H
 
 			timer_now.pause();	// 停止
 
-			Viewer.this.showPopupMenuForProgram(comp, tvd, x, y);
+			Viewer.this.showPopupMenuForProgram(comp, tvd, x, y, null);
 
 			timer_now.start();	// 再開
 		}
@@ -623,11 +625,11 @@ public class Viewer extends JFrame implements ChangeListener,TickTimerListener,H
 
 		@Override
 		protected void showPopupMenu(
-				final JComponent comp, final ProgDetailList tvd, final int x, final int y) {
+				final JComponent comp, final ProgDetailList tvd, final int x, final int y, final String clickedDateTime) {
 
 			timer_now.pause();	// 停止
 
-			Viewer.this.showPopupMenuForProgram(comp, tvd, x, y);
+			Viewer.this.showPopupMenuForProgram(comp, tvd, x, y, clickedDateTime);
 
 			timer_now.start();	// 再開
 		}
@@ -1984,6 +1986,27 @@ public class Viewer extends JFrame implements ChangeListener,TickTimerListener,H
 			return true;
 		}
 
+		/*
+		 * 検索ダイアログを表示する
+		 *
+		 * @see tainavi.AbsToolBar#openSearchDialog()
+		 */
+		@Override
+		protected void openSearchDialog(JButton jbutton) {
+			timer_now.pause();
+
+			if (swdialog == null)
+				swdialog = new VWSearchWordDialog();
+
+			if (swdialog.isVisible()){
+				swdialog.setVisible(false);
+			}
+			else
+				swdialog.open(this,  jbutton, swlist, jTextField_keyword.getText());
+
+			timer_now.start();
+		}
+
 		@Override
 		protected boolean doBatchReserve() {
 			timer_now.pause();
@@ -2312,14 +2335,14 @@ public class Viewer extends JFrame implements ChangeListener,TickTimerListener,H
 	 *  番組追跡への追加とgoogle検索
 	 */
 	public void showPopupMenuForProgram(
-			final JComponent comp, 	final ProgDetailList tvd, final int x, final int y)
+			final JComponent comp, 	final ProgDetailList tvd, final int x, final int y, final String clickedDateTime)
 	{
 		JPopupMenu pop = new JPopupMenu();
 
 		String myself = toolBar.getSelectedRecorder();
 
 		// 予約関係のメニューを追加する
-		addReserveMenuToPopup(pop, tvd, myself);
+		addReserveMenuToPopup(pop, tvd, myself, clickedDateTime);
 
 		// ジャンプする
 		if (pop.getComponentCount() > 0)
@@ -2361,7 +2384,7 @@ public class Viewer extends JFrame implements ChangeListener,TickTimerListener,H
 	/*
 	 * 予約メニューを追加する
 	 */
-	public void addReserveMenuToPopup( JPopupMenu pop, final ProgDetailList tvd, final String myself ){
+	public void addReserveMenuToPopup( JPopupMenu pop, final ProgDetailList tvd, final String myself, final String clickedDateTime ){
 		// 類似予約検索
 		LikeReserveList likeRsvList;
 		if ( env.getDisableFazzySearch() ) {
@@ -2372,7 +2395,7 @@ public class Viewer extends JFrame implements ChangeListener,TickTimerListener,H
 		}
 
 		// 重複予約検索
-		LikeReserveList overlapRsvList = recorders.findOverlapReserves(tvd, null, true, env.getOverlapUp());
+		LikeReserveList overlapRsvList = recorders.findOverlapReserves(tvd, clickedDateTime, true, env.getOverlapUp());
 
 		// 類似と重複で被るものを重複から除外
 		for ( LikeReserveItem item : likeRsvList ) {
@@ -5978,6 +6001,7 @@ public class Viewer extends JFrame implements ChangeListener,TickTimerListener,H
 
 		final String BUTTON_ACTION_KEYWORD_ADDED = "keyword_added";
 		final String BUTTON_ACTION_KEYWORD_DELETED = "keyword_deleted";
+		final String BUTTON_ACTION_SEARCH_DIALOG = "search_dialog";
 		final String BUTTON_ACTION_RELOAD_PROGRAM = "reload_program";
 		final String BUTTON_ACTION_SHOW_BORDER = "show_border";
 		final String BUTTON_ACTION_JUMP_TO_NOW = "jump_to_now";
@@ -6062,6 +6086,12 @@ public class Viewer extends JFrame implements ChangeListener,TickTimerListener,H
 				toolBar.doKeywordDeleted();
 			}
 		};
+		final Action sc_search_dialog = new AbstractAction() {
+			@Override
+			public void actionPerformed(ActionEvent e) {
+				toolBar.openSearchDialog();
+			}
+		};
 		final Action sc_reload_program = new AbstractAction() {
 			@Override
 			public void actionPerformed(ActionEvent e) {
@@ -6223,6 +6253,7 @@ public class Viewer extends JFrame implements ChangeListener,TickTimerListener,H
 
 		sca.add(new ShortCut(BUTTON_ACTION_KEYWORD_ADDED, KeyEvent.VK_K, KeyEvent.CTRL_DOWN_MASK, sc_keyword_added));
 		sca.add(new ShortCut(BUTTON_ACTION_KEYWORD_DELETED, KeyEvent.VK_D, KeyEvent.CTRL_DOWN_MASK, sc_keyword_deleted));
+		sca.add(new ShortCut(BUTTON_ACTION_SEARCH_DIALOG, KeyEvent.VK_K, KeyEvent.CTRL_DOWN_MASK + KeyEvent.SHIFT_DOWN_MASK, sc_search_dialog));
 
 		sca.add(new ShortCut(BUTTON_ACTION_RELOAD_PROGRAM, KeyEvent.VK_W, KeyEvent.CTRL_DOWN_MASK, sc_reload_program));
 		sca.add(new ShortCut(BUTTON_ACTION_RELOAD_PROGRAM, KeyEvent.VK_F2, 0, sc_reload_program));

--- a/TinyBannavi/src/tainavi/plugintv/PlugIn_CSPTVKingdom110.java
+++ b/TinyBannavi/src/tainavi/plugintv/PlugIn_CSPTVKingdom110.java
@@ -104,7 +104,7 @@ public class PlugIn_CSPTVKingdom110 extends PlugIn_TVPTVKingdom implements TVPro
 			}
 		}
 
-		debugNF();
+//		debugNF();
 
 		// 古い番組データを置き換える
 		if (pcenter != null)

--- a/TinyBannavi/src/tainavi/plugintv/PlugIn_TVPDimora.java
+++ b/TinyBannavi/src/tainavi/plugintv/PlugIn_TVPDimora.java
@@ -236,12 +236,12 @@ public class PlugIn_TVPDimora extends TVProgramUtils implements TVProgram,Clonea
 		// 古いデータから補完できないかな？
 		CompensatesPrograms(newplist);
 
-		// 解析用
-		{
-			for ( String f : nf.keySet() ) {
-				System.out.println(String.format(DBGID+"未定義のフラグです: [%s]",f));
-			}
-		}
+//		// 解析用
+//		{
+//			for ( String f : nf.keySet() ) {
+//				System.out.println(String.format(DBGID+"未定義のフラグです: [%s]",f));
+//			}
+//		}
 
 		// 古い番組データを置き換える
 		if (pcenter != null)

--- a/TinyBannavi/src/tainavi/plugintv/PlugIn_TVPTVKingdom.java
+++ b/TinyBannavi/src/tainavi/plugintv/PlugIn_TVPTVKingdom.java
@@ -246,7 +246,7 @@ public class PlugIn_TVPTVKingdom extends TVProgramUtils implements TVProgram,Clo
 		}
 
 		// 解析用
-		debugNF();
+//		debugNF();
 
 		// 古い番組データを置き換える
 		if (pcenter != null)