X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=TinyBannavi%2Fsrc%2Ftainavi%2FAbsSettingView.java;h=b3bdf517cc0f819e1975382780e455ebdea20d21;hb=cc1aafe1050f1f12692474a226fd9ed161f059ba;hp=ae29b2e4eb4e2c7df863edb08866a31643a0aa46;hpb=95b6719f40f5d80e2276920eca945e111aafa141;p=tainavi%2FTinyBannavi.git

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