3.22.13β+1.5.12(2014-01-XX)\r
■変更点\r
・(レコーダ対応[TvRock]) 録画／視聴のモード設定の追加\r
+ ・(新聞形式) 予約大気枠表示を、番組追跡とキーワード検索で個別に色を指定できるようにした\r
・(その他) 設定タブの群れをルートからサブにまとめて移動\r
■バグ修正\r
・(Web番組表[しょぼかる]) 「タイトル中のサブタイトルを番組追跡に使わない」を有効にしていると、しょぼかるデータに対して番組追跡が行われない問題を修正\r
+++ /dev/null
-# 2013/03/15 23:19
-"ＮＨＫ総合","地上D 011","011:e"
-"ＮＨＫ Ｅテレ","地上D 021","021:e"
-"日本テレビ","地上D 041","041:e"
-"ＴＢＳテレビ","地上D 061","061:e"
-"フジテレビ","地上D 081","081:e"
-"テレビ朝日","地上D 051","051:e"
-"テレビ東京","地上D 071","071:e"
-"ＴＯＫＹＯ ＭＸ","地上D 091","091:e"
-"ちばテレビ","地上D 031","031:e"
-"ＢＳ日テレ","BS 141","141:4"
-"ＢＳ朝日","BS 151","151:4"
-"ＢＳ-ＴＢＳ","BS 161","161:4"
-"ＢＳジャパン","BS 171","171:4"
-"ＢＳフジ","BS 181","181:4"
-"ＷＯＷＯＷ","BS 191","191:4"
-"BSイレブン","BS 211","211:4"
-"e2)Ch.333 アニメシアターX（AT-X)","CS2 333","333:7"
-"NHK BS1","BS 101","101:4"
-"NHK BSプレミアム","BS 103","103:4"
<void method="add">
<object class="tainavi.TraceKey">
<void property="center">
- <string>日本テレビ</string>
+ <string>ＢＳ日テレ</string>
</void>
<void property="fazzyThreshold">
<int>35</int>
<string>★★★★★</string>
</void>
<void property="title">
- <string>HUNTER×HUNTER</string>
+ <string>GJ部</string>
</void>
</object>
</void>
<void method="add">
<object class="tainavi.TraceKey">
<void property="center">
- <string>テレビ東京</string>
+ <string>日本テレビ</string>
</void>
<void property="fazzyThreshold">
- <int>80</int>
+ <int>35</int>
</void>
<void property="okiniiri">
<string>★★★★★</string>
</void>
<void property="title">
- <string>アイカツ!</string>
+ <string>HUNTER×HUNTER</string>
</void>
</object>
</void>
<void method="add">
<object class="tainavi.TraceKey">
<void property="center">
- <string>ＢＳジャパン</string>
+ <string>テレビ東京</string>
</void>
<void property="fazzyThreshold">
- <int>80</int>
+ <int>35</int>
</void>
<void property="okiniiri">
<string>★★★★★</string>
</void>
<void property="title">
- <string>アイカツ!</string>
+ <string>Wake Up Girls!</string>
</void>
</object>
</void>
<void method="add">
<object class="tainavi.TraceKey">
<void property="center">
- <string>ＢＳジャパン</string>
+ <string>テレビ東京</string>
</void>
<void property="fazzyThreshold">
<int>35</int>
<string>★★★★★</string>
</void>
<void property="title">
- <string>カードファイト!!ヴァンガード リンクジョーカー編</string>
+ <string>Z/X IGNITION</string>
</void>
</object>
</void>
<void method="add">
<object class="tainavi.TraceKey">
<void property="center">
- <string>テレビ東京</string>
+ <string>BSイレブン</string>
</void>
<void property="fazzyThreshold">
<int>35</int>
<string>★★★★★</string>
</void>
<void property="title">
- <string>ã\82«ã\83¼ã\83\89ã\83\95ã\82¡ã\82¤ã\83\88!!ã\83´ã\82¡ã\83³ã\82¬ã\83¼ã\83\89ã\80\80ã\83ªã\83³ã\82¯ã\82¸ã\83§ã\83¼ã\82«ã\83¼ç·¨</string>
+ <string>ã\81\84ã\81ªã\82\8aã\80\81ã\81\93ã\82\93ã\81\93ã\82\93ã\80\81æ\81\8bã\81\84ã\82\8dã\81¯ã\80\82</string>
</void>
</object>
</void>
<void method="add">
<object class="tainavi.TraceKey">
<void property="center">
- <string>ã\83\95ã\82¸ã\83\86ã\83¬ã\83\93</string>
+ <string>ã\83\86ã\83¬ã\83\93æ\9d±äº¬</string>
</void>
<void property="fazzyThreshold">
- <int>90</int>
+ <int>35</int>
</void>
<void property="okiniiri">
<string>★★★★★</string>
</void>
<void property="title">
- <string>ã\83\88ã\83ªã\82³</string>
+ <string>ã\81\86ã\83¼ã\81\95ã\83¼ã\81®ã\81\9dã\81®æ\97¥æ\9a®ã\82\89ã\81\97ã\80\80è¦\9aé\86\92ç·¨</string>
</void>
</object>
</void>
<void method="add">
<object class="tainavi.TraceKey">
<void property="center">
- <string>テレビ東京</string>
+ <string>BSイレブン</string>
</void>
<void property="fazzyThreshold">
- <int>60</int>
+ <int>35</int>
</void>
<void property="okiniiri">
<string>★★★★★</string>
</void>
<void property="title">
- <string>ã\83\97ã\83ªã\83\86ã\82£ã\83¼ã\83ªã\82ºã\83 ã\83»ã\83¬ã\82¤ã\83³ã\83\9cã\83¼ã\83©ã\82¤ã\83\96</string>
+ <string>ã\81\9dã\81«ã\82¢ã\83\8b -SUPER SONICO THE ANIMATION-</string>
</void>
</object>
</void>
<void method="add">
<object class="tainavi.TraceKey">
<void property="center">
- <string>テレビ東京</string>
+ <string>日本テレビ</string>
</void>
<void property="fazzyThreshold">
<int>35</int>
<string>★★★★★</string>
</void>
<void property="title">
- <string>ã\83\9eã\82¤ã\83ªã\83\88ã\83«ã\83\9dã\83\8bã\83¼ã\80\80ï½\9eã\83\88ã\83¢ã\83\80ã\83\81ã\81¯é\94æ³\95ï½\9e</string>
+ <string>ã\81¦ã\81\95ã\81\90ã\82\8c!é\83¨æ´»ã\82\82ã\81®ã\80\80ã\81\82ã\82\93ã\81\93ã\83¼ã\82\8b</string>
</void>
</object>
</void>
<void method="add">
<object class="tainavi.TraceKey">
<void property="center">
- <string>日本テレビ</string>
+ <string>ＢＳ日テレ</string>
</void>
<void property="fazzyThreshold">
- <int>60</int>
+ <int>35</int>
</void>
<void property="okiniiri">
<string>★★★★★</string>
</void>
<void property="title">
- <string>宇宙兄弟</string>
+ <string>とある飛空士への恋歌</string>
</void>
</object>
</void>
<void method="add">
<object class="tainavi.TraceKey">
<void property="center">
- <string>ＴＯＫＹＯ ＭＸ</string>
+ <string>テレビ東京</string>
</void>
<void property="fazzyThreshold">
<int>35</int>
<string>★★★★★</string>
</void>
<void property="title">
- <string>機動戦士ガンダムSEED DESTINY HDリマスター</string>
+ <string>となりの関くん</string>
</void>
</object>
</void>
<void method="add">
<object class="tainavi.TraceKey">
<void property="center">
- <string>ＮＨＫ Ｅテレ</string>
+ <string>BSイレブン</string>
</void>
<void property="fazzyThreshold">
<int>35</int>
<string>★★★★★</string>
</void>
<void property="title">
- <string>黒魔女</string>
+ <string>のうりん</string>
</void>
</object>
</void>
<void method="add">
<object class="tainavi.TraceKey">
<void property="center">
- <string>ＢＳ日テレ</string>
+ <string>日本テレビ</string>
</void>
<void property="fazzyThreshold">
<int>35</int>
<string>★★★★★</string>
</void>
<void property="title">
- <string>ã\81¨ã\81\82ã\82\8bé£\9b空士ã\81¸ã\81®æ\81\8bæ\8c</string>
+ <string>ã\81¯ã\81\98ã\82\81ã\81®ä¸\80æ©ã\80\80Rising</string>
</void>
</object>
</void>
<void method="add">
<object class="tainavi.TraceKey">
<void property="center">
- <string>ＢＳæ\97¥ã\83\86ã\83¬</string>
+ <string>ã\83\86ã\83¬ã\83\93æ\9d±äº¬</string>
</void>
<void property="fazzyThreshold">
- <int>35</int>
+ <int>80</int>
</void>
<void property="okiniiri">
<string>★★★★★</string>
</void>
<void property="title">
- <string>GJ部</string>
+ <string>アイカツ!</string>
</void>
</object>
</void>
<void method="add">
<object class="tainavi.TraceKey">
<void property="center">
- <string>ＢＳ-ＴＢＳ</string>
+ <string>ＢＳã\82¸ã\83£ã\83\91ã\83³</string>
</void>
<void property="fazzyThreshold">
- <int>35</int>
+ <int>80</int>
</void>
<void property="okiniiri">
<string>★★★★★</string>
</void>
<void property="title">
- <string>鬼灯の冷徹</string>
+ <string>アイカツ!</string>
</void>
</object>
</void>
<void method="add">
<object class="tainavi.TraceKey">
<void property="center">
- <string>ＢＳ-ＴＢＳ</string>
+ <string>BSã\82¤ã\83¬ã\83\96ã\83³</string>
</void>
<void property="fazzyThreshold">
<int>35</int>
<string>★★★★★</string>
</void>
<void property="title">
- <string>ã\82ã\83«ã\83©ã\82ル</string>
+ <string>ã\82¦ã\82£ã\82¶ã\83¼ã\83\89ã\83»ã\83\90ã\83ªã\82¹ã\82¿ã\83¼ã\82ºï½\9eå¼\81é\94士ã\82»ã\82·ル</string>
</void>
</object>
</void>
<void method="add">
<object class="tainavi.TraceKey">
<void property="center">
- <string>ＢＳ-ＴＢＳ</string>
+ <string>BSã\82¤ã\83¬ã\83\96ã\83³</string>
</void>
<void property="fazzyThreshold">
<int>35</int>
<string>★★★★★</string>
</void>
<void property="title">
- <string>魔法戦争</string>
+ <string>ウィッチクラフトワークス</string>
</void>
</object>
</void>
<void method="add">
<object class="tainavi.TraceKey">
<void property="center">
- <string>ＢＳ-ＴＢＳ</string>
+ <string>テレビ東京</string>
</void>
<void property="fazzyThreshold">
<int>35</int>
<string>★★★★★</string>
</void>
<void property="title">
- <string>桜Trick</string>
+ <string>カードファイト!!ヴァンガード リンクジョーカー編</string>
</void>
</object>
</void>
<void method="add">
<object class="tainavi.TraceKey">
<void property="center">
- <string>ＢＳã\83\95ã\82¸</string>
+ <string>ＢＳã\82¸ã\83£ã\83\91ã\83³</string>
</void>
<void property="fazzyThreshold">
<int>35</int>
<string>★★★★★</string>
</void>
<void property="title">
- <string>ã\82¹ã\83\9aã\83¼ã\82¹â\98\86ã\83\80ã\83³ã\83\87ã\82£</string>
+ <string>ã\82«ã\83¼ã\83\89ã\83\95ã\82¡ã\82¤ã\83\88!!ã\83´ã\82¡ã\83³ã\82¬ã\83¼ã\83\89ã\80\80ã\83ªã\83³ã\82¯ã\82¸ã\83§ã\83¼ã\82«ã\83¼ç·¨</string>
</void>
</object>
</void>
<string>★★★★★</string>
</void>
<void property="title">
- <string>ã\81®ã\81\86ã\82\8aã\82\93</string>
+ <string>ã\82¬ã\83¼ã\83«ã\82º&ã\83\91ã\83³ã\83\84ã\82¡ã\83¼</string>
</void>
</object>
</void>
<void method="add">
<object class="tainavi.TraceKey">
<void property="center">
- <string>BSã\82¤ã\83¬ã\83\96ã\83³</string>
+ <string>ＢＳ-ＴＢＳ</string>
</void>
<void property="fazzyThreshold">
<int>35</int>
<string>★★★★★</string>
</void>
<void property="title">
- <string>ã\83\90ã\83\87ã\82£ã\83»ã\82³ã\83³ã\83\97ã\83¬ã\83\83ã\82¯ã\82¹</string>
+ <string>ã\82ã\83«ã\83©ã\82ã\83«</string>
</void>
</object>
</void>
<void method="add">
<object class="tainavi.TraceKey">
<void property="center">
- <string>BSイレブン</string>
+ <string>ＴＢＳテレビ</string>
</void>
<void property="fazzyThreshold">
<int>35</int>
<string>★★★★★</string>
</void>
<void property="title">
- <string>東京レイヴンズ</string>
+ <string>キルラキル</string>
</void>
</object>
</void>
<string>★★★★★</string>
</void>
<void property="title">
- <string>ã\82¦ã\82£ã\83\83ã\83\81ã\82¯ã\83©ã\83\95ã\83\88ã\83¯ã\83¼ã\82¯ã\82¹</string>
+ <string>ã\82´ã\83¼ã\83«ã\83\87ã\83³ã\82¿ã\82¤ã\83 </string>
</void>
</object>
</void>
<void method="add">
<object class="tainavi.TraceKey">
<void property="center">
- <string>BSイレブン</string>
+ <string>フジテレビ</string>
</void>
<void property="fazzyThreshold">
<int>35</int>
<string>★★★★★</string>
</void>
<void property="title">
- <string>ã\82¬ã\83¼ã\83«ã\82º&ã\83\91ã\83³ã\83\84ã\82¡ã\83¼</string>
+ <string>ã\82µã\83 ã\83©ã\82¤ã\83\95ã\83©ã\83¡ã\83³ã\82³<ã\83\8eã\82¤ã\82¿ã\83\9fã\83\8a></string>
</void>
</object>
</void>
<string>★★★★★</string>
</void>
<void property="title">
- <string>ã\83\8eã\83\96ã\83\8aã\82¬ã\83³</string>
+ <string>ã\82¹ã\83\88ã\83©ã\82¤ã\82¯ã\83»ã\82¶ã\83»ã\83\96ã\83©ã\83\83ã\83\89</string>
</void>
</object>
</void>
<void method="add">
<object class="tainavi.TraceKey">
<void property="center">
- <string>BSイレブン</string>
+ <string>ＢＳフジ</string>
</void>
<void property="fazzyThreshold">
<int>35</int>
<string>★★★★★</string>
</void>
<void property="title">
- <string>ã\82¦ã\82£ã\82¶ã\83¼ã\83\89ã\83»ã\83\90ã\83ªã\82¹ã\82¿ã\83¼ã\82ºï½\9eå¼\81é\94士ã\82»ã\82·ã\83«</string>
+ <string>ã\82¹ã\83\9aã\83¼ã\82¹â\98\86ã\83\80ã\83³ã\83\87ã\82£</string>
</void>
</object>
</void>
<void method="add">
<object class="tainavi.TraceKey">
<void property="center">
- <string>BSイレブン</string>
+ <string>テレビ東京</string>
</void>
<void property="fazzyThreshold">
<int>35</int>
<string>★★★★★</string>
</void>
<void property="title">
- <string>最近、妹のようすがちょっとおかしいんだが。</string>
+ <string>ディーふらぐ!</string>
</void>
</object>
</void>
<void method="add">
<object class="tainavi.TraceKey">
<void property="center">
- <string>BSイレブン</string>
+ <string>フジテレビ</string>
</void>
<void property="fazzyThreshold">
- <int>35</int>
+ <int>90</int>
</void>
<void property="okiniiri">
<string>★★★★★</string>
</void>
<void property="title">
- <string>ã\81\9dã\81«ã\82¢ã\83\8b -SUPER SONICO THE ANIMATION-</string>
+ <string>ã\83\88ã\83ªã\82³</string>
</void>
</object>
</void>
<string>★★★★★</string>
</void>
<void property="title">
- <string>ã\82´ã\83¼ã\83«ã\83\87ã\83³ã\82¿ã\82¤ã\83 </string>
+ <string>ã\83\8bã\82»ã\82³ã\82¤</string>
</void>
</object>
</void>
<string>★★★★★</string>
</void>
<void property="title">
- <string>生徒会役員共*</string>
+ <string>ノブナガン</string>
</void>
</object>
</void>
<void method="add">
<object class="tainavi.TraceKey">
<void property="center">
- <string>BSイレブン</string>
+ <string>テレビ東京</string>
</void>
<void property="fazzyThreshold">
<int>35</int>
<string>★★★★★</string>
</void>
<void property="title">
- <string>ã\82¹ã\83\88ã\83©ã\82¤ã\82¯ã\83»ã\82¶ã\83»ã\83\96ã\83©ã\83\83ã\83\89</string>
+ <string>ã\83\8eã\83\96ã\83\8aã\82¬ã\83»ã\82¶ã\83»ã\83\95ã\83¼ã\83«</string>
</void>
</object>
</void>
<string>★★★★★</string>
</void>
<void property="title">
- <string>ã\83\9eã\82±ã\83³å§«ã\81£!é\80\9a</string>
+ <string>ã\83\8eã\83©ã\82¬ã\83\9f</string>
</void>
</object>
</void>
<void method="add">
<object class="tainavi.TraceKey">
<void property="center">
- <string>BSイレブン</string>
+ <string>テレビ東京</string>
</void>
<void property="fazzyThreshold">
<int>35</int>
<string>★★★★★</string>
</void>
<void property="title">
- <string>ã\83\8eã\83©ã\82¬ã\83\9f</string>
+ <string>ã\83\8fã\83\9eã\83\88ã\83©</string>
</void>
</object>
</void>
<string>★★★★★</string>
</void>
<void property="title">
- <string>ã\83\8bã\82»ã\82³ã\82¤</string>
+ <string>ã\83\90ã\83\87ã\82£ã\83»ã\82³ã\83³ã\83\97ã\83¬ã\83\83ã\82¯ã\82¹</string>
</void>
</object>
</void>
<void method="add">
<object class="tainavi.TraceKey">
<void property="center">
- <string>BSイレブン</string>
+ <string>テレビ東京</string>
</void>
<void property="fazzyThreshold">
<int>35</int>
<string>★★★★★</string>
</void>
<void property="title">
- <string>世界征服～謀略のズヴィズダー～</string>
+ <string>プピポー!</string>
</void>
</object>
</void>
<void method="add">
<object class="tainavi.TraceKey">
<void property="center">
- <string>BSイレブン</string>
+ <string>テレビ東京</string>
</void>
<void property="fazzyThreshold">
- <int>35</int>
+ <int>60</int>
</void>
<void property="okiniiri">
<string>★★★★★</string>
</void>
<void property="title">
- <string>ã\81\84ã\81ªã\82\8aã\80\81ã\81\93ã\82\93ã\81\93ã\82\93ã\80\81æ\81\8bã\81\84ã\82\8dã\81¯ã\80\82</string>
+ <string>ã\83\97ã\83ªã\83\86ã\82£ã\83¼ã\83ªã\82ºã\83 ã\83»ã\83¬ã\82¤ã\83³ã\83\9cã\83¼ã\83©ã\82¤ã\83\96</string>
</void>
</object>
</void>
<void method="add">
<object class="tainavi.TraceKey">
<void property="center">
- <string>BSイレブン</string>
+ <string>テレビ東京</string>
</void>
<void property="fazzyThreshold">
<int>35</int>
<string>★★★★★</string>
</void>
<void property="title">
- <string>中二病でも恋がしたい!戀</string>
+ <string>マイリトルポニー ～トモダチは魔法～</string>
</void>
</object>
</void>
<string>★★★★★</string>
</void>
<void property="title">
- <string>未確認で進行形</string>
+ <string>マケン姫っ!通</string>
</void>
</object>
</void>
<void method="add">
<object class="tainavi.TraceKey">
<void property="center">
- <string>日本テレビ</string>
+ <string>BSイレブン</string>
</void>
<void property="fazzyThreshold">
<int>35</int>
<string>★★★★★</string>
</void>
<void property="title">
- <string>はじめの一歩 Rising</string>
+ <string>世界征服～謀略のズヴィズダー～</string>
</void>
</object>
</void>
<void method="add">
<object class="tainavi.TraceKey">
<void property="center">
- <string>日本テレビ</string>
+ <string>BSイレブン</string>
</void>
<void property="fazzyThreshold">
<int>35</int>
<string>★★★★★</string>
</void>
<void property="title">
- <string>てさぐれ!部活もの あんこーる</string>
+ <string>中二病でも恋がしたい!戀</string>
</void>
</object>
</void>
<void method="add">
<object class="tainavi.TraceKey">
<void property="center">
- <string>ＴＢＳテレビ</string>
+ <string>テレビ東京</string>
</void>
<void property="fazzyThreshold">
<int>35</int>
<string>★★★★★</string>
</void>
<void property="title">
- <string>魔法戦争</string>
+ <string>咲-Saki-全国編</string>
</void>
</object>
</void>
<void method="add">
<object class="tainavi.TraceKey">
<void property="center">
- <string>ＴＢＳテレビ</string>
+ <string>日本テレビ</string>
</void>
<void property="fazzyThreshold">
- <int>35</int>
+ <int>60</int>
</void>
<void property="okiniiri">
<string>★★★★★</string>
</void>
<void property="title">
- <string>桜Trick</string>
+ <string>宇宙兄弟</string>
</void>
</object>
</void>
<void method="add">
<object class="tainavi.TraceKey">
<void property="center">
- <string>ＴＢＳテレビ</string>
+ <string>テレビ東京</string>
</void>
<void property="fazzyThreshold">
<int>35</int>
<string>★★★★★</string>
</void>
<void property="title">
- <string>鬼灯の冷徹</string>
+ <string>弱虫ペダル</string>
</void>
</object>
</void>
<void method="add">
<object class="tainavi.TraceKey">
<void property="center">
- <string>ＴＢＳテレビ</string>
+ <string>BSイレブン</string>
</void>
<void property="fazzyThreshold">
<int>35</int>
<string>★★★★★</string>
</void>
<void property="title">
- <string>キルラキル</string>
+ <string>最近、妹のようすがちょっとおかしいんだが。</string>
</void>
</object>
</void>
<void method="add">
<object class="tainavi.TraceKey">
<void property="center">
- <string>テレビ東京</string>
+ <string>BSイレブン</string>
</void>
<void property="fazzyThreshold">
<int>35</int>
<string>★★★★★</string>
</void>
<void property="title">
- <string>弱虫ペダル</string>
+ <string>未確認で進行形</string>
</void>
</object>
</void>
<void method="add">
<object class="tainavi.TraceKey">
<void property="center">
- <string>テレビ東京</string>
+ <string>BSイレブン</string>
</void>
<void property="fazzyThreshold">
<int>35</int>
<string>★★★★★</string>
</void>
<void property="title">
- <string>ディーふらぐ!</string>
+ <string>東京レイヴンズ</string>
</void>
</object>
</void>
<void method="add">
<object class="tainavi.TraceKey">
<void property="center">
- <string>テレビ東京</string>
+ <string>ＢＳ-ＴＢＳ</string>
</void>
<void property="fazzyThreshold">
<int>35</int>
<string>★★★★★</string>
</void>
<void property="title">
- <string>うーさーのその日暮らし 覚醒編</string>
+ <string>桜Trick</string>
</void>
</object>
</void>
<void method="add">
<object class="tainavi.TraceKey">
<void property="center">
- <string>テレビ東京</string>
+ <string>ＴＢＳテレビ</string>
</void>
<void property="fazzyThreshold">
<int>35</int>
<string>★★★★★</string>
</void>
<void property="title">
- <string>ハマトラ</string>
+ <string>桜Trick</string>
</void>
</object>
</void>
<void method="add">
<object class="tainavi.TraceKey">
<void property="center">
- <string>テレビ東京</string>
+ <string>ＴＯＫＹＯ ＭＸ</string>
</void>
<void property="fazzyThreshold">
<int>35</int>
<string>★★★★★</string>
</void>
<void property="title">
- <string>Z/X IGNITION</string>
+ <string>機動戦士ガンダムSEED DESTINY HDリマスター</string>
</void>
</object>
</void>
<void method="add">
<object class="tainavi.TraceKey">
<void property="center">
- <string>テレビ東京</string>
+ <string>BSイレブン</string>
</void>
<void property="fazzyThreshold">
<int>35</int>
<string>★★★★★</string>
</void>
<void property="title">
- <string>Wake Up Girls!</string>
+ <string>生徒会役員共*</string>
</void>
</object>
</void>
<void method="add">
<object class="tainavi.TraceKey">
<void property="center">
- <string>ã\83\86ã\83¬ã\83\93æ\9d±äº¬</string>
+ <string>ã\83\95ã\82¸ã\83\86ã\83¬ã\83\93</string>
</void>
<void property="fazzyThreshold">
<int>35</int>
<string>★★★★★</string>
</void>
<void property="title">
- <string>プピポー!</string>
+ <string>銀の匙 Silver Spoon <ノイタミナ></string>
</void>
</object>
</void>
<void method="add">
<object class="tainavi.TraceKey">
<void property="center">
- <string>テレビ東京</string>
+ <string>ＢＳ-ＴＢＳ</string>
</void>
<void property="fazzyThreshold">
<int>35</int>
<string>★★★★★</string>
</void>
<void property="title">
- <string>ノブナガ・ザ・フール</string>
+ <string>鬼灯の冷徹</string>
</void>
</object>
</void>
<void method="add">
<object class="tainavi.TraceKey">
<void property="center">
- <string>テレビ東京</string>
+ <string>ＴＢＳテレビ</string>
</void>
<void property="fazzyThreshold">
<int>35</int>
<string>★★★★★</string>
</void>
<void property="title">
- <string>咲-Saki-全国編</string>
+ <string>鬼灯の冷徹</string>
</void>
</object>
</void>
<void method="add">
<object class="tainavi.TraceKey">
<void property="center">
- <string>テレビ東京</string>
+ <string>ＢＳ-ＴＢＳ</string>
</void>
<void property="fazzyThreshold">
<int>35</int>
<string>★★★★★</string>
</void>
<void property="title">
- <string>となりの関くん</string>
+ <string>魔法戦争</string>
</void>
</object>
</void>
<void method="add">
<object class="tainavi.TraceKey">
<void property="center">
- <string>フジテレビ</string>
+ <string>ＴＢＳテレビ</string>
</void>
<void property="fazzyThreshold">
<int>35</int>
<string>★★★★★</string>
</void>
<void property="title">
- <string>é\8a\80ã\81®å\8c\99ã\80\80Silverã\80\80Spoonã\80\80<ã\83\8eã\82¤ã\82¿ã\83\9fã\83\8a></string>
+ <string>é\94æ³\95æ\88¦äº\89</string>
</void>
</object>
</void>
<void method="add">
<object class="tainavi.TraceKey">
<void property="center">
- <string>フジテレビ</string>
+ <string>ＮＨＫ Ｅテレ</string>
</void>
<void property="fazzyThreshold">
<int>35</int>
<string>★★★★★</string>
</void>
<void property="title">
- <string>サムライフラメンコ<ノイタミナ></string>
+ <string>黒魔女</string>
</void>
</object>
</void>
private JCCLabel jLabel_pickup = null;\r
private JCCLabel jLabel_pickupFont = null;\r
private JCCLabel jLabel_matchedBorderColor = null;\r
+ private JCCLabel jLabel_matchedKeywordBorderColor = null;\r
private JSliderPanel jSP_matchedBorderThickness = null;\r
//private JCheckBoxPanel jCBP_lightProgramView = null;\r
\r
toe.setPickedColor(jLabel_pickup.getChoosed());\r
toe.setPickedFontColor(jLabel_pickupFont.getChoosed());\r
toe.setMatchedBorderColor(jLabel_matchedBorderColor.getChoosed());\r
+ toe.setMatchedKeywordBorderColor(jLabel_matchedKeywordBorderColor.getChoosed());\r
toe.setMatchedBorderThickness(jSP_matchedBorderThickness.getValue());\r
//\r
tob.setShowMatchedBorder(origbnd.getShowMatchedBorder());\r
CommonSwingUtils.putComponentOn(jPanel_bounds, jSP_matchedBorderThickness = new JSliderPanel("太さ",LABEL_WIDTH,1,16,ITEM_WIDTH), LABEL_WIDTH+ITEM_WIDTH, PARTS_HEIGHT, SEP_WIDTH, y);\r
\r
y += (PARTS_HEIGHT+SEP_HEIGHT_NARROW);\r
- CommonSwingUtils.putComponentOn(jPanel_bounds, jLabel_matchedBorderColor = new JCCLabel("予約待機の枠色",origenv.getMatchedBorderColor(),true,this,ccwin), ITEM_WIDTH, PARTS_HEIGHT, SEP_WIDTH+LABEL_WIDTH, y);\r
- \r
+ CommonSwingUtils.putComponentOn(jPanel_bounds, jLabel_matchedBorderColor = new JCCLabel("予約待機枠(番組追跡)",origenv.getMatchedBorderColor(),true,this,ccwin), ITEM_WIDTH, PARTS_HEIGHT, SEP_WIDTH+LABEL_WIDTH, y);\r
+\r
+ y += (PARTS_HEIGHT+SEP_HEIGHT_NARROW);\r
+ CommonSwingUtils.putComponentOn(jPanel_bounds, jLabel_matchedKeywordBorderColor = new JCCLabel("予約待機枠(ｷｰﾜｰﾄﾞ検索)",origenv.getMatchedKeywordBorderColor(),true,this,ccwin), ITEM_WIDTH, PARTS_HEIGHT, SEP_WIDTH+LABEL_WIDTH, y);\r
+\r
y += (PARTS_HEIGHT+SEP_HEIGHT);\r
CommonSwingUtils.putComponentOn(jPanel_bounds, new JTitleLabel("フォントのアンチエイリアス設定"), TITLE_WIDTH, PARTS_HEIGHT, SEP_WIDTH_NARROW, y);\r
\r
jLabel_pickupFont.setChoosed(origenv.getPickedFontColor());\r
jLabel_pickupFont.setBackground(Color.RED);\r
jLabel_matchedBorderColor.setChoosed(origenv.getMatchedBorderColor());\r
+ jLabel_matchedKeywordBorderColor.setChoosed(origenv.getMatchedKeywordBorderColor());\r
jSP_matchedBorderThickness.setValue(origenv.getMatchedBorderThickness());\r
/*\r
if ( ! origenv.getShowStart() && ! origenv.getShowDetail() ) {\r
\r
// 予約待機枠と番組枠\r
private final DashBorder dborder = new DashBorder(Color.RED,env.getMatchedBorderThickness(),DASHBORDER_LENGTH,DASHBORDER_SPACE);\r
+ private final DashBorder dborderK = new DashBorder(Color.MAGENTA,env.getMatchedBorderThickness(),DASHBORDER_LENGTH,DASHBORDER_SPACE);\r
private final LineBorder lborder = new ChippedBorder(Color.BLACK,1);\r
\r
private float paperHeightZoom = 1.0F;\r
for (JTXTButton b : frameUsed ) {\r
ProgDetailList tvd = b.getInfo();\r
if ( tvd.type == ProgType.PROG ) {\r
- if (bounds.getShowMatchedBorder() && b.isStandby()) {\r
- if ( b.getBorder() != dborder )\r
- b.setBorder(dborder);\r
- }\r
- else {\r
- if ( b.getBorder() != lborder )\r
- b.setBorder(lborder);\r
- }\r
+ _updPBorder(bounds, b);\r
}\r
}\r
}\r
// 状態を保存\r
bounds.setShowMatchedBorder( ! bounds.getShowMatchedBorder());\r
\r
- _updPBorders(env, bounds, frameUsed);\r
+ _updPBorderAll(env, bounds, frameUsed);\r
\r
if ( env.getDrawcacheEnable() ) {\r
- _updPBorders(env, bounds, frameUsedByDate);\r
+ _updPBorderAll(env, bounds, frameUsedByDate);\r
}\r
\r
return bounds.getShowMatchedBorder();\r
// 番組の枠表示用\r
dborder.setDashColor(env.getMatchedBorderColor());\r
dborder.setThickness(env.getMatchedBorderThickness());\r
- \r
+ dborderK.setDashColor(env.getMatchedKeywordBorderColor());\r
+ dborderK.setThickness(env.getMatchedBorderThickness());\r
+\r
// 番組表時の共通設定\r
updateFonts(env);\r
\r
JTXTButton.setHeightMultiplier(bounds.getPaperHeightMultiplier() * paperHeightZoom);\r
\r
b2.setBackground(pColors.get(tvd.genre));\r
- if (bounds.getShowMatchedBorder() && b2.isStandby() ) {\r
- b2.setBorder(dborder);\r
- }\r
- else {\r
- b2.setBorder(lborder);\r
- }\r
- \r
+ _updPBorder(bounds, b2);\r
+\r
// 配置を決定する\r
b2.setVBounds(col,row,1,tvd.length);\r
\r
{\r
{\r
_updPBounds(bc, frameUsed);\r
- _updPBorders(ec, bc, frameUsed);\r
+ _updPBorderAll(ec, bc, frameUsed);\r
\r
Dimension d = jLayeredPane_space_main_view.getPreferredSize();\r
d.width = vieww;\r
\r
if ( ec.getDrawcacheEnable() ) {\r
_updPBounds(bc, frameUsedByDate);\r
- _updPBorders(ec, bc, frameUsedByDate);\r
+ _updPBorderAll(ec, bc, frameUsedByDate);\r
\r
for ( JLayeredPane pane : jLayeredPane_space_main_view_byDate ) {\r
Dimension d = pane.getPreferredSize();\r
}\r
}\r
\r
- private void _updPBorders(Env ec, Bounds bc, ArrayList<JTXTButton> fa) {\r
+ private void _updPBorderAll(Env ec, Bounds bc, ArrayList<JTXTButton> fa) {\r
dborder.setDashColor(ec.getMatchedBorderColor());\r
dborder.setThickness(ec.getMatchedBorderThickness());\r
+ dborderK.setDashColor(ec.getMatchedKeywordBorderColor());\r
+ dborderK.setThickness(ec.getMatchedBorderThickness());\r
for ( JTXTButton b2 : fa ) {\r
- if ( bc.getShowMatchedBorder() && b2.isStandby() ) {\r
- if ( b2.getBorder() != dborder )\r
- b2.setBorder(dborder);\r
+ _updPBorder(bc, b2);\r
+ }\r
+ }\r
+\r
+ private void _updPBorder(Bounds bc, JTXTButton b) {\r
+ if ( bc.getShowMatchedBorder() && b.isStandby() ) {\r
+ if ( b.isStandbyByTrace() ) {\r
+ if ( b.getBorder() != dborder )\r
+ b.setBorder(dborder);\r
}\r
else {\r
- if ( b2.getBorder() != lborder )\r
- b2.setBorder(lborder);\r
+ // 番組追跡はキーワード検索に優先する\r
+ if ( b.getBorder() != dborder && b.getBorder() != dborderK )\r
+ b.setBorder(dborderK);\r
}\r
}\r
+ else {\r
+ if ( b.getBorder() != lborder )\r
+ b.setBorder(lborder);\r
+ }\r
}\r
- \r
+\r
private void _updPRepaint(ArrayList<JTXTButton> fa) {\r
for ( JTXTButton b2 : fa ) {\r
b2.forceRepaint();\r
public Color getMatchedBorderColor() { return matchedBorderColor; }\r
public void setMatchedBorderColor(Color c) { matchedBorderColor = c; }\r
private Color matchedBorderColor = MATCHBORDER_COLOR;\r
+ public Color getMatchedKeywordBorderColor() { return matchedKeywordBorderColor; }\r
+ public void setMatchedKeywordBorderColor(Color c) { matchedKeywordBorderColor = c; }\r
+ private Color matchedKeywordBorderColor = MATCHBORDER_COLOR;\r
public int getMatchedBorderThickness() { return matchedBorderThickness; }\r
public void setMatchedBorderThickness(int n) { matchedBorderThickness = n; }\r
private int matchedBorderThickness = 6;\r
\r
// 予約待機枠を表示するかどうかの確認\r
public boolean isStandby() { return tvd.marked && tvd.showinstandby; }\r
- \r
+ public boolean isStandbyByTrace() { return tvd.markedByTrace; }\r
+\r
// 表示スタイル\r
public static void setShowStart(boolean b) {\r
showStart = b;\r
* 参考：てんぷらメモ／JTableのセル幅で文字列を折り返し ( http://terai.xrea.jp/Swing/TableCellRenderer.html )\r
* @param str 描画する文字列\r
* @param width 描画領域の幅\r
- * @param height 描画領域の高さ \r
* @param xstart １行目の描画開始位置\r
- * @param lineCountMax 最大描画行数\r
* @param font 描画フォント\r
* @param lineHeight １行あたりの高さ\r
* @param frc FontRenderContext\r
import java.util.ArrayList;\r
import java.util.Calendar;\r
import java.util.GregorianCalendar;\r
-import java.util.HashMap;\r
import java.util.regex.Matcher;\r
import java.util.regex.Pattern;\r
\r
\r
for ( ProgDateList tvc : tvpl.pdate ) {\r
for ( ProgDetailList tvd : tvc.pdetail ) {\r
- tvd.marked = false;\r
+ tvd.marked = tvd.markedByTrace = false;\r
tvd.nonrepeated = false;\r
tvd.showinstandby = false;\r
}\r
}\r
}\r
\r
- private void buildByKeyword(ArrayList<TVProgram> tvprograms, TraceKey tKey, SearchKey sKye) {\r
+ private void buildByKeyword(ArrayList<TVProgram> tvprograms, TraceKey tKey, SearchKey sKey) {\r
// 検索条件のマッチカウントのクリア\r
- SearchItem item = tKey != null ? tKey : sKye;\r
+ SearchItem item = tKey != null ? tKey : sKey;\r
item.clearMatchedList();\r
\r
//\r
}\r
}\r
}\r
- else if (sKye != null) {\r
- isFind = SearchProgram.isMatchKeyword(sKye, ((sKye.getCaseSensitive()==false)?(centerPop):(tvpl.Center)), tvd);\r
+ else if (sKey != null) {\r
+ isFind = SearchProgram.isMatchKeyword(sKey, ((sKey.getCaseSensitive()==false)?(centerPop):(tvpl.Center)), tvd);\r
if ( isFind ) {\r
matchedString = SearchProgram.getMatchedString();\r
}\r
\r
if (isFind) {\r
tvd.marked = true;\r
- mBuf.add(tvd, tKey, fazScore, sKye, matchedString);\r
+ tvd.markedByTrace = tvd.markedByTrace || tKey != null;\r
+ mBuf.add(tvd, tKey, fazScore, sKey, matchedString);\r
}\r
}\r
}\r
System.out.println(MSGID+"[リピート放送判定] [結果] リピート放送ではないと判断されました： "+d.prog.startDateTime+" 「"+d.prog.title+"("+d.bareTitle+")」 ("+d.storyNo+")");\r
d.prog.nonrepeated = true;\r
}\r
- if ( ! (sKye != null && ! sKye.getShowInStandby()) ) {\r
+ if ( ! (sKey != null && ! sKey.getShowInStandby()) ) {\r
d.prog.showinstandby = true;\r
}\r
this.add(d.prog, d.tKey, d.tScore, d.sKey, d.sStr);\r
if ( tKey != null && tKey.getShowLatestOnly() ) {\r
if ( ! showOnlyNonrepeated ) {\r
// 復活戦\r
- d.prog.marked = true;\r
- if ( sKye != null && sKye.getShowInStandby() ) {\r
+ d.prog.marked = d.prog.markedByTrace = true;\r
+ if ( sKey != null && sKey.getShowInStandby() ) {\r
d.prog.showinstandby = true;\r
}\r
this.add(d.prog, d.tKey, d.tScore, d.sKey, d.sStr);\r
if ( d.bareTitle != null && d.bareTitle.equals(bd.bareTitle) ) {\r
if ( d.storyNo != null && d.storyNo >= bd.storyNo ) {\r
// 同じかより新しいものがすでにあったら自分を捨てる\r
- bd.prog.marked = false;\r
+ bd.prog.marked = bd.prog.markedByTrace = false;\r
System.out.println(MSGID+"[リピート放送判定] [結果] リピート放送と判定されました(すでに新しいものがある)： "+bd.prog.startDateTime+" 「"+bd.prog.title+"("+bd.bareTitle+")」 ("+bd.storyNo+")");\r
}\r
else {\r
// 自分より古いものは捨てる\r
- d.prog.marked = false;\r
+ d.prog.marked = d.prog.markedByTrace = false;\r
System.out.println(MSGID+"[リピート放送判定] [結果] リピート放送と判定されました(より新し番組がみつかった)： "+d.prog.startDateTime+" 「"+d.prog.title+"("+d.bareTitle+")」 ("+d.storyNo+")");\r
}\r
}\r
if ( d.bareTitle != null && d.bareTitle.equals(bd.bareTitle) ) {\r
if ( d.storyNo != null && d.storyNo >= bd.storyNo ) {\r
// 同じかより新しいものがすでにあったら自分を捨てる\r
- bd.prog.marked = false;\r
+ bd.prog.marked = bd.prog.markedByTrace = false;\r
System.out.println(MSGID+"[リピート放送判定] [結果] リピート放送と判定されました(すでに新しいものがある[8日目])： "+bd.prog.startDateTime+" 「"+bd.prog.title+"("+bd.bareTitle+")」 ("+bd.storyNo+")");\r
}\r
else {\r
public String progid = ""; // 番組ID\r
\r
public boolean nosyobo = false; // しょぼのぼっち判定\r
- public boolean marked = false; // 検索に引っかかったマーク \r
+ public boolean marked = false; // 検索に引っかかったマーク\r
+ public boolean markedByTrace = false; // 番組追跡に引っかかったマーク\r
public boolean newarrival = false; // 新着だなぁ\r
public boolean modified = false; // 詳細が更新された\r
public boolean nonrepeated = false; // リピート放送の初回かな？\r
\r
progid = "";\r
nosyobo = false;\r
- marked = false; \r
+ marked = false;\r
+ markedByTrace = false;\r
newarrival = false;\r
modified = false;\r
nonrepeated = false;\r
OSDN Git Service
