• R/O
  • HTTP
  • SSH
  • HTTPS

Commit

Frequently used words (click to add to your profile)

javaandroidc++linuxc#objective-ccocoa誰得qtrubypythonwindowsphpgamebathyscapheguic翻訳omegattwitterframeworkbtronvb.net計画中(planning stage)testdomarduinodirectxpreviewerゲームエンジン

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


Commit MetaInfo

Révisionbc2ab710d52e4fa29a33755e89f38554d30dbdc4 (tree)
l'heure2020-01-12 14:31:12
AuteurMasahiko Kimura <mkimura@u01....>
CommiterMasahiko Kimura

Message de Log

Ver.1.12.10 (2020/01/12)

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

Change Summary

Modification

--- a/TinyBannavi/src/tainavi/AbsReserveListView.java
+++ b/TinyBannavi/src/tainavi/AbsReserveListView.java
@@ -1363,9 +1363,16 @@ public abstract class AbsReserveListView extends JPanel implements TickTimerList
13631363 c.encoder + " \0" + c.hide_encodercolor);
13641364
13651365 String detail = getReserveDetail(c);
1366+ String pdetail = getProgramDetail(c);
1367+
13661368 if (detail == null)
1367- detail = getProgramDetail(c);
1368- jTextPane_detail.setText(detail != null ? detail : "");
1369+ detail = "";
1370+ else if (!detail.isEmpty())
1371+ detail += "\r\n";
1372+ if (pdetail != null)
1373+ detail += pdetail;
1374+
1375+ jTextPane_detail.setText(detail);
13691376 }
13701377 else {
13711378 jTextPane_detail.setLabel("","","","");
@@ -1383,15 +1390,8 @@ public abstract class AbsReserveListView extends JPanel implements TickTimerList
13831390 return null;
13841391
13851392 ReserveList res = recs.get(0).getReserveList(c.hide_rsvid);
1386- if (res == null)
1387- return null;
1388-
1389- String detail = res.getDetail();
1390-
1391- if (detail == null || detail.isEmpty())
1392- return null;
13931393
1394- return detail;
1394+ return res != null ? res.getDetail() : null;
13951395 }
13961396
13971397 /*
@@ -1402,7 +1402,7 @@ public abstract class AbsReserveListView extends JPanel implements TickTimerList
14021402 if (pdl == null)
14031403 return null;
14041404
1405- return "【番組情報】\r\n" + pdl.prefix_mark + pdl.title + pdl.postfix_mark + "\r\n" + pdl.detail;
1405+ return "【番組情報】\r\n" + pdl.accurateDate + " " + pdl.start + "~" + pdl.end + " " + pdl.prefix_mark + pdl.newlast_mark + pdl.title + pdl.postfix_mark + "\r\n" + pdl.detail;
14061406 }
14071407
14081408 // 未来分の番組情報から該当番組の情報を取得する
--- a/TinyBannavi/src/tainavi/VersionInfo.java
+++ b/TinyBannavi/src/tainavi/VersionInfo.java
@@ -5,7 +5,7 @@ import java.util.regex.Pattern;
55
66
77 public class VersionInfo {
8- private static final String Version = "タイニー番組ナビゲータ for DBR-T2007 3.22.18β+1.12.9";
8+ private static final String Version = "タイニー番組ナビゲータ for DBR-T2007 3.22.18β+1.12.10";
99
1010 private static final String OSname = System.getProperty("os.name");
1111 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
23922392 }
23932393 }
23942394 }
2395- pop.addSeparator();
2396-
23972395 // 予約実行ON・OFF
23982396 if ( tvd.type != ProgType.PASSED )
23992397 {
@@ -2407,6 +2405,9 @@ public class Viewer extends JFrame implements ChangeListener,TickTimerListener,H
24072405 rsvList = overlapRsvList;
24082406 }
24092407
2408+ if (rsvList.size() > 0)
2409+ pop.addSeparator();
2410+
24102411 for ( LikeReserveItem rsvItem : rsvList ) {
24112412
24122413 final boolean fexec = rsvItem.getRsv().getExec();
@@ -2418,13 +2419,9 @@ public class Viewer extends JFrame implements ChangeListener,TickTimerListener,H
24182419
24192420 pop.add(getExecOnOffMenuItem(fexec,start,title,chnam,rsvId,recId,n));
24202421 }
2421-
2422- pop.addSeparator();
24232422 }
24242423 }
24252424
2426- pop.addSeparator();
2427-
24282425 // 削除する
24292426 if ( tvd.type != ProgType.PASSED ) // 過去ログは処理対象外です
24302427 {
@@ -2438,6 +2435,9 @@ public class Viewer extends JFrame implements ChangeListener,TickTimerListener,H
24382435 rsvList = overlapRsvList;
24392436 }
24402437
2438+ if (rsvList.size() > 0)
2439+ pop.addSeparator();
2440+
24412441 for ( LikeReserveItem rsvItem : rsvList ) {
24422442
24432443 final String start = rsvItem.getRsv().getAhh()+":"+rsvItem.getRsv().getAmm();
@@ -2448,17 +2448,14 @@ public class Viewer extends JFrame implements ChangeListener,TickTimerListener,H
24482448
24492449 pop.add(getRemoveRsvMenuItem(start, title,chnam,rsvId,recId,n));
24502450 }
2451-
2452- pop.addSeparator();
24532451 }
24542452 }
2455- else {
2456- pop.addSeparator();
2457- pop.addSeparator();
2458- }
24592453
24602454 // ジャンプする
24612455 {
2456+ if (pop.getComponentCount() > 0)
2457+ pop.addSeparator();
2458+
24622459 if ( mainWindow.isTabSelected(MWinTab.LISTED) ) {
24632460 pop.add(getJumpMenuItem(tvd.title,tvd.center,tvd.accurateDate+" "+tvd.start));
24642461 }
@@ -2470,10 +2467,10 @@ public class Viewer extends JFrame implements ChangeListener,TickTimerListener,H
24702467 }
24712468 }
24722469
2473- pop.addSeparator();
2474-
24752470 // 番組追跡へ追加する
24762471 {
2472+ pop.addSeparator();
2473+
24772474 final String label = TraceProgram.getNewLabel(tvd.title, tvd.center);
24782475 JMenuItem menuItem = new JMenuItem("番組追跡への追加【"+label+"】");
24792476 menuItem.addActionListener(new ActionListener() {
@@ -2810,9 +2807,10 @@ public class Viewer extends JFrame implements ChangeListener,TickTimerListener,H
28102807 pop.add(menuItem);
28112808 }
28122809
2813- pop.addSeparator();
28142810
28152811 if ( mainWindow.isTabSelected(MWinTab.LISTED) ) {
2812+ pop.addSeparator();
2813+
28162814 {
28172815 JMenuItem menuItem = new JMenuItem("番組情報をCSVでコピー");
28182816 menuItem.addActionListener(new ActionListener() {
@@ -2907,11 +2905,12 @@ public class Viewer extends JFrame implements ChangeListener,TickTimerListener,H
29072905 pop.add(menuItem);
29082906 }
29092907
2910- pop.addSeparator();
29112908
29122909 // 視聴する
29132910 if ( tvd.type == ProgType.PROG && tvd.subtype != ProgSubtype.RADIO) // ラジオは処理対象外です
29142911 {
2912+ boolean hassep = false;
2913+
29152914 for (HDDRecorder recorder : recorders ) {
29162915
29172916 if (recorder.ChangeChannel(null) == false) {
@@ -2940,6 +2939,10 @@ public class Viewer extends JFrame implements ChangeListener,TickTimerListener,H
29402939
29412940 menuItem.setEnabled(recorder.getUseChChange());
29422941
2942+ if (!hassep){
2943+ pop.addSeparator();
2944+ hassep = true;
2945+ }
29432946 pop.add(menuItem);
29442947 }
29452948 }