キーワード検索の条件追加ほか

[tainavi/TinyBannavi.git] / TinyBannavi / src / tainavi / AbsKeywordDialog.java

diff --git a/TinyBannavi/src/tainavi/AbsKeywordDialog.java b/TinyBannavi/src/tainavi/AbsKeywordDialog.java
index f4d230d..f91dbbf 100644 (file)
--- a/TinyBannavi/src/tainavi/AbsKeywordDialog.java
+++ b/TinyBannavi/src/tainavi/AbsKeywordDialog.java
@@ -190,7 +190,9 @@ abstract class AbsKeywordDialog extends JDialog {
                // タイトルバーの高さも考慮する必要がある\r
                Dimension d = getJPanel().getPreferredSize();\r
                this.pack();\r
-               this.setPreferredSize(new Dimension(d.width, d.height+this.getInsets().top));\r
+               this.setPreferredSize(new Dimension(\r
+                               d.width+(this.getInsets().left+this.getInsets().right),\r
+                               d.height+(this.getInsets().top+this.getInsets().bottom)));\r
                this.setResizable(false);\r
                //\r
                this.setTitle(windowTitle);\r
@@ -511,63 +513,41 @@ abstract class AbsKeywordDialog extends JDialog {
                        }\r
                        //\r
                        TargetId target = (TargetId) jComboBox_target.getSelectedItem();\r
-                       if (target == TargetId.NEW || target == TargetId.LAST || target == TargetId.REPEAT || target == TargetId.FIRST || target == TargetId.REPEAT || target == TargetId.NOSCRUMBLE) {\r
-                               jComboBox_regex.setEnabled(false);\r
-                               jComboBox_regex.setEditable(false);\r
-                               jComboBox_regex.removeAllItems();\r
-                               jComboBox_regex.addItem("");\r
-                       }\r
-                       else if (target == TargetId.LENGTH) {\r
-                               jComboBox_regex.removeAllItems();\r
-                               jComboBox_regex.setEnabled(true);\r
-                               jComboBox_regex.setEditable(false);\r
+                       \r
+                       jComboBox_regex.setEditable(target.getUseRegexpr());\r
+                       jComboBox_regex.setEnabled(target.getUseKeyword());\r
+                       jComboBox_regex.removeAllItems();\r
+\r
+                       if (target == TargetId.LENGTH) {\r
                                for (int i=1; i <= 120; i++) {\r
                                        jComboBox_regex.addItem(i+" 分以上である");\r
                                }\r
                                jComboBox_regex.setSelectedIndex(29);\r
                        }\r
                        else if (target == TargetId.STARTA) {\r
-                               jComboBox_regex.removeAllItems();\r
-                               jComboBox_regex.setEnabled(true);\r
-                               jComboBox_regex.setEditable(false);\r
                                for (int i=0; i < 24; i++) {\r
                                        jComboBox_regex.addItem(String.format("%02d:00以降である", (i+5)%24));\r
                                }\r
                                jComboBox_regex.setSelectedIndex(18-5);\r
                        }\r
                        else if (target == TargetId.STARTZ) {\r
-                               jComboBox_regex.removeAllItems();\r
-                               jComboBox_regex.setEnabled(true);\r
-                               jComboBox_regex.setEditable(false);\r
                                for (int i=0; i < 24; i++) {\r
                                        jComboBox_regex.addItem(String.format("%02d:00以前である", (i+5)%24));\r
                                }\r
                                jComboBox_regex.setSelectedIndex(23-5);\r
                        }\r
                        else if (target == TargetId.GENRE) {\r
-                               jComboBox_regex.removeAllItems();\r
-                               jComboBox_regex.setEnabled(true);\r
-                               jComboBox_regex.setEditable(false);\r
                                for ( ProgGenre genre : ProgGenre.values()) {\r
                                        jComboBox_regex.addItem(genre.toString());\r
                                }\r
                        }\r
                        else if (target == TargetId.SUBGENRE) {\r
-                               jComboBox_regex.removeAllItems();\r
-                               jComboBox_regex.setEnabled(true);\r
-                               jComboBox_regex.setEditable(false);\r
                                for ( ProgSubgenre subgenre : ProgSubgenre.values()) {\r
                                        jComboBox_regex.addItem(subgenre.toString());\r
                                }\r
                        }\r
                        else {\r
-                               // 番組名・番組詳細・放送局・開始日時\r
-                               jComboBox_regex.setEnabled(true);\r
-                               jComboBox_regex.setEditable(true);\r
-                               if (jComboBox_regex.getItemCount() > 1) {\r
-                                       jComboBox_regex.removeAllItems();\r
-                                       jComboBox_regex.addItem("");\r
-                               }\r
+                               jComboBox_regex.addItem("");\r
                        }\r
                }\r
        };\r
@@ -1067,6 +1047,7 @@ abstract class AbsKeywordDialog extends JDialog {
                add_target_item(TargetId.LIVE);\r
                add_target_item(TargetId.BILINGUAL);\r
                add_target_item(TargetId.STANDIN);\r
+               add_target_item(TargetId.MULTIVOICE);\r
                add_target_item(TargetId.LENGTH);\r
                add_target_item(TargetId.STARTA);\r
                add_target_item(TargetId.STARTZ);\r