提交: bc2ab710d52e4fa29a33755e89f38554d30dbdc4 - TinyBannavi (git)

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

Commit MetaInfo

• 修订版: bc2ab710d52e4fa29a33755e89f38554d30dbdc4 (tree)
• 时间: 2020-01-12 14:31:12
• 作者: Masahiko Kimura <mkimura@u01....>
• Commiter: Masahiko Kimura

Log Message

Ver.1.12.10 (2020/01/12)

1. ［本体予約一覧］詳細情報欄に予約詳細情報に加え同一時刻の番組情報を表示する
   
2. ［リスト形式］［新聞形式］右クリックメニューの余分なセパレータを削除する
   

更改概述

• modified: TinyBannavi/src/tainavi/AbsReserveListView.java
• modified: TinyBannavi/src/tainavi/VersionInfo.java
• modified: TinyBannavi/src/tainavi/Viewer.java

差异

--- a/TinyBannavi/src/tainavi/AbsReserveListView.java
+++ b/TinyBannavi/src/tainavi/AbsReserveListView.java
@@ -1363,9 +1363,16 @@ public abstract class AbsReserveListView extends JPanel implements TickTimerList
 						c.encoder + "　\0" + c.hide_encodercolor);
 
 				String detail = getReserveDetail(c);
+				String pdetail = getProgramDetail(c);
+
 				if (detail == null)
-					detail = getProgramDetail(c);
-				jTextPane_detail.setText(detail != null ? detail : "");
+					detail = "";
+				else if (!detail.isEmpty())
+					detail += "\r\n";
+				if (pdetail != null)
+					detail += pdetail;
+
+				jTextPane_detail.setText(detail);
 			}
 			else {
 				jTextPane_detail.setLabel("","","","");
@@ -1383,15 +1390,8 @@ public abstract class AbsReserveListView extends JPanel implements TickTimerList
 			return null;
 
 		ReserveList res = recs.get(0).getReserveList(c.hide_rsvid);
-		if (res == null)
-			return null;
-
-		String detail = res.getDetail();
-
-		if (detail == null || detail.isEmpty())
-			return null;
 
-		return detail;
+		return res != null ? res.getDetail() : null;
 	}
 
 	/*
@@ -1402,7 +1402,7 @@ public abstract class AbsReserveListView extends JPanel implements TickTimerList
 		if (pdl == null)
 			return null;
 
-		return "【番組情報】\r\n" + pdl.prefix_mark + pdl.title + pdl.postfix_mark + "\r\n" + pdl.detail;
+		return "【番組情報】\r\n" + pdl.accurateDate + " " + pdl.start + "～" + pdl.end + "　" + pdl.prefix_mark + pdl.newlast_mark + pdl.title + pdl.postfix_mark + "\r\n" + pdl.detail;
 	}
 
 	// 未来分の番組情報から該当番組の情報を取得する

--- 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.9";
+	private static final String Version = "タイニー番組ナビゲータ for DBR-T2007　3.22.18β+1.12.10";
 
 	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
@@ -2392,8 +2392,6 @@ public class Viewer extends JFrame implements ChangeListener,TickTimerListener,H
 				}
 			}
 		}
-		pop.addSeparator();
-
 		// 予約実行ON・OFF
 		if ( tvd.type != ProgType.PASSED )
 		{
@@ -2407,6 +2405,9 @@ public class Viewer extends JFrame implements ChangeListener,TickTimerListener,H
 					rsvList = overlapRsvList;
 				}
 
+				if (rsvList.size() > 0)
+					pop.addSeparator();
+
 				for ( LikeReserveItem rsvItem : rsvList ) {
 
 					final boolean fexec = rsvItem.getRsv().getExec();
@@ -2418,13 +2419,9 @@ public class Viewer extends JFrame implements ChangeListener,TickTimerListener,H
 
 					pop.add(getExecOnOffMenuItem(fexec,start,title,chnam,rsvId,recId,n));
 				}
-
-				pop.addSeparator();
 			}
 		}
 
-		pop.addSeparator();
-
 		// 削除する
 		if ( tvd.type != ProgType.PASSED )	// 過去ログは処理対象外です
 		{
@@ -2438,6 +2435,9 @@ public class Viewer extends JFrame implements ChangeListener,TickTimerListener,H
 					rsvList = overlapRsvList;
 				}
 
+				if (rsvList.size() > 0)
+					pop.addSeparator();
+
 				for ( LikeReserveItem rsvItem : rsvList ) {
 
 					final String start = rsvItem.getRsv().getAhh()+":"+rsvItem.getRsv().getAmm();
@@ -2448,17 +2448,14 @@ public class Viewer extends JFrame implements ChangeListener,TickTimerListener,H
 
 					pop.add(getRemoveRsvMenuItem(start, title,chnam,rsvId,recId,n));
 				}
-
-				pop.addSeparator();
 			}
 		}
-		else {
-			pop.addSeparator();
-			pop.addSeparator();
-		}
 
 		// ジャンプする
 		{
+			if (pop.getComponentCount() > 0)
+				pop.addSeparator();
+
 			if ( mainWindow.isTabSelected(MWinTab.LISTED) ) {
 				pop.add(getJumpMenuItem(tvd.title,tvd.center,tvd.accurateDate+" "+tvd.start));
 			}
@@ -2470,10 +2467,10 @@ public class Viewer extends JFrame implements ChangeListener,TickTimerListener,H
 			}
 		}
 
-		pop.addSeparator();
-
 		// 番組追跡へ追加する
 		{
+			pop.addSeparator();
+
 			final String label = TraceProgram.getNewLabel(tvd.title, tvd.center);
 			JMenuItem menuItem = new JMenuItem("番組追跡への追加【"+label+"】");
 			menuItem.addActionListener(new ActionListener() {
@@ -2810,9 +2807,10 @@ public class Viewer extends JFrame implements ChangeListener,TickTimerListener,H
 			pop.add(menuItem);
 		}
 
-		pop.addSeparator();
 
 		if ( mainWindow.isTabSelected(MWinTab.LISTED) ) {
+			pop.addSeparator();
+
 			{
 				JMenuItem menuItem = new JMenuItem("番組情報をCSVでコピー");
 				menuItem.addActionListener(new ActionListener() {
@@ -2907,11 +2905,12 @@ public class Viewer extends JFrame implements ChangeListener,TickTimerListener,H
 			pop.add(menuItem);
 		}
 
-		pop.addSeparator();
 
 		// 視聴する
 		if ( tvd.type == ProgType.PROG && tvd.subtype != ProgSubtype.RADIO)	// ラジオは処理対象外です
 		{
+			boolean hassep = false;
+
 			for (HDDRecorder recorder : recorders ) {
 
 				if (recorder.ChangeChannel(null) == false) {
@@ -2940,6 +2939,10 @@ public class Viewer extends JFrame implements ChangeListener,TickTimerListener,H
 
 				menuItem.setEnabled(recorder.getUseChChange());
 
+				if (!hassep){
+					pop.addSeparator();
+					hassep = true;
+				}
 				pop.add(menuItem);
 			}
 		}