ピックアップ表示の問題修正ほか

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

diff --git a/TinyBannavi/src/tainavi/AbsSettingView.java b/TinyBannavi/src/tainavi/AbsSettingView.java
index ae29b2e..b3bdf51 100644 (file)
--- a/TinyBannavi/src/tainavi/AbsSettingView.java
+++ b/TinyBannavi/src/tainavi/AbsSettingView.java
@@ -159,6 +159,7 @@ public abstract class AbsSettingView extends JScrollPane {
        private JCheckBoxPanel jCBP_syoboFilterByCenters = null;\r
        private JCheckBoxPanel jCBP_displayPassedEntry = null;\r
        private JCheckBoxPanel jCBP_showRsvPickup = null;\r
+       private JCheckBoxPanel jCBP_showRsvDup = null;\r
        private JCheckBoxPanel jCBP_showRsvUra = null;\r
        private JCheckBoxPanel jCBP_rsvdLineEnhance = null;\r
        private JLabel jLabel_rsvdLineColor = null;\r
@@ -415,7 +416,12 @@ public abstract class AbsSettingView extends JScrollPane {
                        // RELOADリスナー不要\r
 \r
                        y+=(PARTS_HEIGHT+SEP_HEIGHT);\r
-                       CommonSwingUtils.putComponentOn(jPanel_setting, jCBP_showRsvUra = new JCheckBoxPanel("裏番組予約マーク(■)を表示する",LABEL_WIDTH), PARTS_WIDTH, PARTS_HEIGHT, SEP_WIDTH, y);\r
+                       CommonSwingUtils.putComponentOn(jPanel_setting, jCBP_showRsvDup = new JCheckBoxPanel("時間重複マーク(■)を表示する",LABEL_WIDTH), PARTS_WIDTH, PARTS_HEIGHT, SEP_WIDTH, y);\r
+                       jCBP_showRsvDup.setSelected(env.getShowRsvDup());\r
+                       // RELOADリスナー不要\r
+\r
+                       y+=(PARTS_HEIGHT+SEP_HEIGHT);\r
+                       CommonSwingUtils.putComponentOn(jPanel_setting, jCBP_showRsvUra = new JCheckBoxPanel("裏番組予約マーク(裏)を表示する",LABEL_WIDTH), PARTS_WIDTH, PARTS_HEIGHT, SEP_WIDTH, y);\r
                        jCBP_showRsvUra.setSelected(env.getShowRsvUra());\r
                        // RELOADリスナー不要\r
 \r
@@ -1082,6 +1088,7 @@ public abstract class AbsSettingView extends JScrollPane {
                                env.setSyoboFilterByCenters(jCBP_syoboFilterByCenters.isSelected());\r
                                env.setDisplayPassedEntry(jCBP_displayPassedEntry.isSelected());\r
                                env.setShowRsvPickup(jCBP_showRsvPickup.isSelected());\r
+                               env.setShowRsvDup(jCBP_showRsvDup.isSelected());\r
                                env.setShowRsvUra(jCBP_showRsvUra.isSelected());\r
                                env.setRsvdLineEnhance(jCBP_rsvdLineEnhance.isSelected());\r
                                env.setRsvdLineColor(jCCL_rsvdLineColor.getChoosed());\r