Commit: 53f4fbf7b6a08f04f498044b94fe687079517602 - TinyBannavi (git)

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

Commit MetaInfo

• Revision: 53f4fbf7b6a08f04f498044b94fe687079517602 (tree)
• Time: 2021-04-30 12:44:45
• Author: Masahiko Kimura <mkimura@u01....>
• Commiter: Masahiko Kimura

Log Message

Ver.1.12.23 (2021/4/30)
1.［リスト形式］検索ボックスが空の状態で「キーワードリストに登録」ボタンをクリックすると異常終了する問題の対応
2.［各種設定］フォント変更後確定すると異常終了することがある問題の対応
3.［リスト形式］［新聞形式］サービスが終了したCHAN-TORUで予約するメニューを削除する
4.［予約ダイアログ］サービスが終了した番組ID取得のボタンを削除する

Change Summary

• modified: TinyBannavi/src/tainavi/AbsKeywordDialog.java
• modified: TinyBannavi/src/tainavi/AbsReserveDialog.java
• modified: TinyBannavi/src/tainavi/AbsSettingView.java
• modified: TinyBannavi/src/tainavi/AbsToolBar.java
• modified: TinyBannavi/src/tainavi/Env.java
• modified: TinyBannavi/src/tainavi/TitleEditorPanel.java
• modified: TinyBannavi/src/tainavi/VersionInfo.java
• modified: TinyBannavi/src/tainavi/Viewer.java
• modified: TinyBannavi/src/tainavi/pluginrec/PlugIn_RecDBR_T2007.java

Incremental Difference

--- a/TinyBannavi/src/tainavi/AbsKeywordDialog.java
+++ b/TinyBannavi/src/tainavi/AbsKeywordDialog.java
@@ -272,11 +272,18 @@ abstract class AbsKeywordDialog extends JEscCancelDialog {
 		String [] cs = sK.getContain().split("\t");
 
 		for (int n=0; n<ts.length; n++) {
+			if (n >= cs.length)
+				break;
+
 			KDItem data = new KDItem();
 			data.target = TargetId.getTargetId(ts[n]);
-			data.regex = rs[n];
-			if (data.target == TargetId.LENGTH)
-				data.regex += "分以上である";
+
+			if (n < rs.length){
+				data.regex = rs[n];
+				if (data.target == TargetId.LENGTH)
+					data.regex += "分以上である";
+			}
+
 			data.contain = contain_items.get(Integer.valueOf(cs[n]));
 			data.fireChanged();
 

--- a/TinyBannavi/src/tainavi/AbsReserveDialog.java
+++ b/TinyBannavi/src/tainavi/AbsReserveDialog.java
@@ -562,7 +562,6 @@ HDDRecorderListener,RecordExecutable,RecSettingSelectable,LikeReserveSelectable,
 
 	private TimeVal setTitleItems(HDDRecorder myrec, ProgDetailList tvd, LikeReserveList lrl, boolean atrsvlst) {
 
-		jPane_title.setContentIdValue(tvd.progid, ! atrsvlst);
 		jPane_title.setTitleItems(tvd, lrl, env.getUseAutocomplete());
 		jPane_title.setChItem(myrec, tvd);
 

--- a/TinyBannavi/src/tainavi/AbsSettingView.java
+++ b/TinyBannavi/src/tainavi/AbsSettingView.java
@@ -1397,268 +1397,252 @@ public abstract class AbsSettingView extends JScrollPane {
 
 		TatCount tc = new TatCount();
 
-		StWin.clear();
+		int idx;
 
-		new SwingBackgroundWorker(false) {
+		try{
+			// 全体
+			// 表示対象タブ
+			tabitems.clear();
+			for (int row=0; row<jTable_tabs.getRowCount(); row++) {
+	    		ListColumnInfo cb = new ListColumnInfo();
+	    		if (tab_selected[row])
+		        	cb.setVisible(true);
+	    		else
+	    			cb.setVisible((Boolean)jTable_tabs.getValueAt(row, 0));
+	        	cb.setName((String)jTable_tabs.getValueAt(row, 1));
+	        	cb.setId((Integer)jTable_tabs.getValueAt(row, 2));
+	        	tabitems.add(cb);
+			}
 
-			@Override
-			protected Object doWorks() throws Exception {
-
-				StWin.appendMessage(MSGID+"設定を保存します");
-
-				int idx;
-
-				// 全体
-				// 表示対象タブ
-				tabitems.clear();
-				for (int row=0; row<jTable_tabs.getRowCount(); row++) {
-		    		ListColumnInfo cb = new ListColumnInfo();
-		    		if (tab_selected[row])
-			        	cb.setVisible(true);
-		    		else
-		    			cb.setVisible((Boolean)jTable_tabs.getValueAt(row, 0));
-		        	cb.setName((String)jTable_tabs.getValueAt(row, 1));
-		        	cb.setId((Integer)jTable_tabs.getValueAt(row, 2));
-		        	tabitems.add(cb);
-				}
+			// ツールバーの表示順
+			tbicons.clear();
+			for (int row=0; row<jTable_toolbar.getRowCount(); row++) {
+	    		ListColumnInfo cb = new ListColumnInfo();
+	        	cb.setVisible((Boolean)jTable_toolbar.getValueAt(row, 0));
+	        	cb.setName((String)jTable_toolbar.getValueAt(row, 1));
+	        	cb.setId((Integer)jTable_toolbar.getValueAt(row, 2));
+	        	tbicons.add(cb);
+			}
+			bounds.setSearchBoxAreaWidth(jSP_keywordWidth.getValue());
+			bounds.setPagerComboWidth(jSP_pagerComboWidth.getValue());
+			bounds.setRecorderComboWidth(jSP_recorderComboWidth.getValue());
+			bounds.setDetailRows(jSP_detailRows.getValue());
+			bounds.setStatusRows(jSP_statusRows.getValue());
 
-				// ツールバーの表示順
-				tbicons.clear();
-				for (int row=0; row<jTable_toolbar.getRowCount(); row++) {
-		    		ListColumnInfo cb = new ListColumnInfo();
-		        	cb.setVisible((Boolean)jTable_toolbar.getValueAt(row, 0));
-		        	cb.setName((String)jTable_toolbar.getValueAt(row, 1));
-		        	cb.setId((Integer)jTable_toolbar.getValueAt(row, 2));
-		        	tbicons.add(cb);
-				}
-				bounds.setSearchBoxAreaWidth(jSP_keywordWidth.getValue());
-				bounds.setPagerComboWidth(jSP_pagerComboWidth.getValue());
-				bounds.setRecorderComboWidth(jSP_recorderComboWidth.getValue());
-				bounds.setDetailRows(jSP_detailRows.getValue());
-				bounds.setStatusRows(jSP_statusRows.getValue());
-
-				// リスト形式
-				env.setDisableFazzySearch(jCBP_disableFazzySearch.isSelected());
-				env.setDisableFazzySearchReverse(jCBP_disableFazzySearchReverse.isSelected());
-				env.setDefaultFazzyThreshold(jSP_defaultFazzyThreshold.getValue());
-				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());
-				env.setPickedLineColor(jCCL_pickedLineColor.getChoosed());
-				env.setCurrentLineEnhance(jCBP_currentLineEnhance.isSelected());
-				env.setCurrentLineColor(jCCL_currentLineColor.getChoosed());
-				env.setCurrentAfter(jSP_currentAfter.getValue()*60);
-				env.setCurrentBefore(jSP_currentBefore.getValue()*60);
-				env.setMatchedKeywordColor(jCCL_matchedKeywordColor.getChoosed());
-				env.setShowWarnDialog(jCBP_showWarnDialog.isSelected());
-				env.setSplitMarkAndTitle(jCBP_splitMarkAndTitle.isSelected());
-				env.setShowDetailOnList(jCBP_showDetailOnList.isSelected());
-				env.setRsvTargets(jSP_rsvTargets.getValue());
-				env.setRowHeaderVisible(jCBP_rowHeaderVisible.isSelected());
-				env.setDblClkCmd((DblClkCmd) jCBX_dblClkCmd.getSelectedItem());
-				env.setSearchResultMax(jSP_searchResultMax.getValue());
-				env.setSearchResultBufferMax(jSP_searchResultBufferMax.getValue());
-
-				lvitems.clear();
-				for (int row=0; row<jTable_listed.getRowCount(); row++) {
-		    		ListColumnInfo cb = new ListColumnInfo();
-		        	cb.setVisible((Boolean)jTable_listed.getValueAt(row, 0));
-		        	cb.setName((String)jTable_listed.getValueAt(row, 1));
-		        	cb.setId((Integer)jTable_listed.getValueAt(row, 2));
-		        	lvitems.add(cb);
-				}
+			// リスト形式
+			env.setDisableFazzySearch(jCBP_disableFazzySearch.isSelected());
+			env.setDisableFazzySearchReverse(jCBP_disableFazzySearchReverse.isSelected());
+			env.setDefaultFazzyThreshold(jSP_defaultFazzyThreshold.getValue());
+			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());
+			env.setPickedLineColor(jCCL_pickedLineColor.getChoosed());
+			env.setCurrentLineEnhance(jCBP_currentLineEnhance.isSelected());
+			env.setCurrentLineColor(jCCL_currentLineColor.getChoosed());
+			env.setCurrentAfter(jSP_currentAfter.getValue()*60);
+			env.setCurrentBefore(jSP_currentBefore.getValue()*60);
+			env.setMatchedKeywordColor(jCCL_matchedKeywordColor.getChoosed());
+			env.setShowWarnDialog(jCBP_showWarnDialog.isSelected());
+			env.setSplitMarkAndTitle(jCBP_splitMarkAndTitle.isSelected());
+			env.setShowDetailOnList(jCBP_showDetailOnList.isSelected());
+			env.setRsvTargets(jSP_rsvTargets.getValue());
+			env.setRowHeaderVisible(jCBP_rowHeaderVisible.isSelected());
+			env.setDblClkCmd((DblClkCmd) jCBX_dblClkCmd.getSelectedItem());
+			env.setSearchResultMax(jSP_searchResultMax.getValue());
+			env.setSearchResultBufferMax(jSP_searchResultBufferMax.getValue());
+
+			lvitems.clear();
+			for (int row=0; row<jTable_listed.getRowCount(); row++) {
+	    		ListColumnInfo cb = new ListColumnInfo();
+	        	cb.setVisible((Boolean)jTable_listed.getValueAt(row, 0));
+	        	cb.setName((String)jTable_listed.getValueAt(row, 1));
+	        	cb.setId((Integer)jTable_listed.getValueAt(row, 2));
+	        	lvitems.add(cb);
+			}
 
-				lnitems.clear();
-				for (int row=0; row<jTable_listed_node.getRowCount(); row++) {
-		    		ListColumnInfo cb = new ListColumnInfo();
-		        	cb.setVisible((Boolean)jTable_listed_node.getValueAt(row, 0));
-		        	cb.setName((String)jTable_listed_node.getValueAt(row, 1));
-		        	cb.setId((Integer)jTable_listed_node.getValueAt(row, 2));
-		        	lnitems.add(cb);
-				}
+			lnitems.clear();
+			for (int row=0; row<jTable_listed_node.getRowCount(); row++) {
+	    		ListColumnInfo cb = new ListColumnInfo();
+	        	cb.setVisible((Boolean)jTable_listed_node.getValueAt(row, 0));
+	        	cb.setName((String)jTable_listed_node.getValueAt(row, 1));
+	        	cb.setId((Integer)jTable_listed_node.getValueAt(row, 2));
+	        	lnitems.add(cb);
+			}
 
-				// 新聞形式関連
-				{
-					String selected = jRBP_getPaperRedrawType.getSelectedItem().getText();
-					if ( PARER_REDRAW_PAGER.equals(selected) ) {
-						env.setDrawcacheEnable(false);
-						env.setCenterPerPage(jSP_centerPerPage.getValue());
-					}
-					else if ( PARER_REDRAW_CACHE.equals(selected) ) {
-						env.setDrawcacheEnable(true);
-						env.setCenterPerPage(0);
-					}
-					else if ( PARER_REDRAW_NORMAL.equals(selected) ) {
-						env.setDrawcacheEnable(false);
-						env.setCenterPerPage(0);
-					}
-				}
-				env.setAllPageSnapshot(jCBP_allPageSnapshot.isSelected());
-				env.setTooltipEnable(jCBP_tooltipEnable.isSelected());
-				env.setTooltipInitialDelay(jSP_tooltipInitialDelay.getValue());
-				env.setTooltipDismissDelay(jSP_tooltipDismissDelay.getValue());
-				env.setTimerbarScrollEnable(jCBP_timerbarScrollEnable.isSelected());
-				env.setPassedLogLimit(jSP_passedLogLimit.getValue());
-				env.setDatePerPassedPage(jSP_datePerPage.getValue());
-				env.setEffectComboToPaper(jCBP_effectComboToPaper.isSelected());
-				env.setSnapshotFmt((SnapshotFmt) jCBX_snapshotFmt.getSelectedItem());
-				env.setPrintSnapshot(jCBP_printSnapshot.isSelected());
-				env.setMouseButtonForNodeAutoPaging(jCBP_mouseButtonForNodeAutoPaging.getSelectedIndex());
-				env.setMouseButtonForNodeSwitch(jCBP_mouseButtonForNodeSwitch.getSelectedIndex());
-				env.setMouseButtonForPageSwitch(jCBP_mouseButtonForPageSwitch.getSelectedIndex());
-
-				// リスト・新聞形式共通
-				env.setDisplayOnlyExecOnEntry(jCBP_displayOnlyExecOnEntry.isSelected());
-				env.setDisplayPassedReserve(jCBP_displayPassedReserve.isSelected());
-				env.setShowOnlyNonrepeated(jCBP_showOnlyNonrepeated.isSelected());
-				env.setAdjLateNight(jCBP_adjLateNight.isSelected());
-				env.setRootNodeVisible(jCBP_rootNodeVisible.isSelected());
-				env.setSyncTreeWidth(jCBP_syncTreeWidth.isSelected());
-				env.setShortExtMark(jCBP_shortExtMark.isSelected());
-				for (int row=0; row<jTable_showmarks.getRowCount(); row++) {
-					env.getOptMarks().put((TVProgram.ProgOption) jTable_showmarks.getValueAt(row, 2), (Boolean) jTable_showmarks.getValueAt(row, 0));
+			// 新聞形式関連
+			{
+				String selected = jRBP_getPaperRedrawType.getSelectedItem().getText();
+				if ( PARER_REDRAW_PAGER.equals(selected) ) {
+					env.setDrawcacheEnable(false);
+					env.setCenterPerPage(jSP_centerPerPage.getValue());
 				}
-				for (int row=0; row<jTable_clipboard.getRowCount(); row++) {
-					cbitems.get(row).setB((Boolean)jTable_clipboard.getValueAt(row, 0));
-					cbitems.get(row).setItem((String)jTable_clipboard.getValueAt(row, 1));
-					cbitems.get(row).setId((Integer)jTable_clipboard.getValueAt(row, 2));
+				else if ( PARER_REDRAW_CACHE.equals(selected) ) {
+					env.setDrawcacheEnable(true);
+					env.setCenterPerPage(0);
 				}
-				env.getTvCommand().removeAll(env.getTvCommand());
-				for (int row = 0; row < jTable_mitable.getRowCount(); row++) {
-					TextValueSet tv = new TextValueSet();
-					tv.setText((String) jTable_mitable.getValueAt(row, 0));
-					tv.setValue((String) jTable_mitable.getValueAt(row, 1));
-					env.getTvCommand().add(tv);
+				else if ( PARER_REDRAW_NORMAL.equals(selected) ) {
+					env.setDrawcacheEnable(false);
+					env.setCenterPerPage(0);
 				}
+			}
+			env.setAllPageSnapshot(jCBP_allPageSnapshot.isSelected());
+			env.setTooltipEnable(jCBP_tooltipEnable.isSelected());
+			env.setTooltipInitialDelay(jSP_tooltipInitialDelay.getValue());
+			env.setTooltipDismissDelay(jSP_tooltipDismissDelay.getValue());
+			env.setTimerbarScrollEnable(jCBP_timerbarScrollEnable.isSelected());
+			env.setPassedLogLimit(jSP_passedLogLimit.getValue());
+			env.setDatePerPassedPage(jSP_datePerPage.getValue());
+			env.setEffectComboToPaper(jCBP_effectComboToPaper.isSelected());
+			env.setSnapshotFmt((SnapshotFmt) jCBX_snapshotFmt.getSelectedItem());
+			env.setPrintSnapshot(jCBP_printSnapshot.isSelected());
+			env.setMouseButtonForNodeAutoPaging(jCBP_mouseButtonForNodeAutoPaging.getSelectedIndex());
+			env.setMouseButtonForNodeSwitch(jCBP_mouseButtonForNodeSwitch.getSelectedIndex());
+			env.setMouseButtonForPageSwitch(jCBP_mouseButtonForPageSwitch.getSelectedIndex());
 
-				// 本体予約一覧対応
-				for (int row=0; row<jTable_reserv.getRowCount(); row++) {
-					rlitems.get(row).setVisible((Boolean)jTable_reserv.getValueAt(row, 0));
-					rlitems.get(row).setName((String)jTable_reserv.getValueAt(row, 1));
-					rlitems.get(row).setId((Integer)jTable_reserv.getValueAt(row, 2));
-				}
+			// リスト・新聞形式共通
+			env.setDisplayOnlyExecOnEntry(jCBP_displayOnlyExecOnEntry.isSelected());
+			env.setDisplayPassedReserve(jCBP_displayPassedReserve.isSelected());
+			env.setShowOnlyNonrepeated(jCBP_showOnlyNonrepeated.isSelected());
+			env.setAdjLateNight(jCBP_adjLateNight.isSelected());
+			env.setRootNodeVisible(jCBP_rootNodeVisible.isSelected());
+			env.setSyncTreeWidth(jCBP_syncTreeWidth.isSelected());
+			env.setShortExtMark(jCBP_shortExtMark.isSelected());
+			for (int row=0; row<jTable_showmarks.getRowCount(); row++) {
+				env.getOptMarks().put((TVProgram.ProgOption) jTable_showmarks.getValueAt(row, 2), (Boolean) jTable_showmarks.getValueAt(row, 0));
+			}
+			for (int row=0; row<jTable_clipboard.getRowCount(); row++) {
+				cbitems.get(row).setB((Boolean)jTable_clipboard.getValueAt(row, 0));
+				cbitems.get(row).setItem((String)jTable_clipboard.getValueAt(row, 1));
+				cbitems.get(row).setId((Integer)jTable_clipboard.getValueAt(row, 2));
+			}
+			env.getTvCommand().removeAll(env.getTvCommand());
+			for (int row = 0; row < jTable_mitable.getRowCount(); row++) {
+				TextValueSet tv = new TextValueSet();
+				tv.setText((String) jTable_mitable.getValueAt(row, 0));
+				tv.setValue((String) jTable_mitable.getValueAt(row, 1));
+				env.getTvCommand().add(tv);
+			}
 
-				// タイトル一覧対応
-				for (int row=0; row<jTable_title.getRowCount(); row++) {
-					tlitems.get(row).setVisible((Boolean)jTable_title.getValueAt(row, 0));
-					tlitems.get(row).setName((String)jTable_title.getValueAt(row, 1));
-					tlitems.get(row).setId((Integer)jTable_title.getValueAt(row, 2));
-				}
+			// 本体予約一覧対応
+			for (int row=0; row<jTable_reserv.getRowCount(); row++) {
+				rlitems.get(row).setVisible((Boolean)jTable_reserv.getValueAt(row, 0));
+				rlitems.get(row).setName((String)jTable_reserv.getValueAt(row, 1));
+				rlitems.get(row).setId((Integer)jTable_reserv.getValueAt(row, 2));
+			}
 
-				// Web番組表対応
-				env.setContinueTomorrow(jCBP_continueTomorrow.isSelected());
-				env.setCacheTimeLimit(jSP_cacheTimeLimit.getValue());
-				if ( env.getCacheTimeLimit() == 0 ) {
-					env.setShutdownCmd((String) jCBX_shutdownCmd.getSelectedItem());
-				}
-				else {
-					env.setShutdownCmd("");
-				}
-				env.setExpandTo8(jCBP_expandTo8.isSelected());
-				//env.setUseDetailCache(jCBP_useDetailCache.isSelected());
-				env.setUseDetailCache(false);
-				env.setAutoEventIdComplete(jCBP_autoEventIdComplete.isSelected());
-				env.setSplitEpno(jCBP_splitEpno.isSelected());
-				env.setTraceOnlyTitle(jCBP_traceOnlyTitle.isSelected());
-				env.setFixTitle(jCBP_fixTitle.isSelected());
-				env.setNgword(jTextField_ngword.getText());
-				env.setUserAgent(jTextField_userAgent.getText());
-				env.setUseProxy(jCBP_useProxy.isSelected());
-				env.setProxyAddr((String)jTextField_proxyAddr.getText());
-				env.setProxyPort((String)jTextField_proxyPort.getText());
-				env.setUseSyobocal(jCBP_useSyobocal.isSelected());
-				env.setHistoryOnlyUpdateOnce(jCBP_historyOnlyUpdateOnce.isSelected());
-				env.setUsePassedProgram(jCBP_usePassedProgram.isSelected());
-				env.setPrepPassedProgramCount(jSP_prepPassedProgramCount.getValue());
-				env.setDownloadProgramOnFixedTime(jCBP_downloadProgramOnFixedTime.isSelected());
-				env.setDownloadProgramInBackground(jCBP_downloadProgramInBackground.isSelected());
-				env.setDownloadProgramTimeList(jTextField_downloadProgramTimeList.getText());
-				env.setUseProgCache(jCBP_useProgCache.isSelected());
-
-				// レコーダ対応
-				env.setForceLoadReserveDetails(jRBP_getRdReserveDetails.getSelectedIndex());
-				env.setForceLoadAutoReserves(jRBP_getRdAutoReserves.getSelectedIndex());
-				env.setForceLoadRecorded(jRBP_getRdRecorded.getSelectedIndex());
-				env.setRecordedSaveScope(jCBX_recordedSaveScope.getSelectedIndex());
-
-				// 予約
-				env.setSpoexLength(String.format("%d",jSP_spoex_extend.getValue()));
-				idx = jRBP_overlapUp.getSelectedIndex();
-				switch (idx) {
-				case 1:
-					env.setOverlapUp(true);
-					break;
-				default:
-					env.setOverlapUp(false);
-					break;
-				}
-				idx = jRBP_overlapDown.getSelectedIndex();
-				switch (idx) {
-				case 1:
-					env.setOverlapDown(true);
-					env.setOverlapDown2(false);
-					break;
-				case 2:
-					env.setOverlapDown(false);
-					env.setOverlapDown2(true);
-					break;
-				default:
-					env.setOverlapDown(false);
-					env.setOverlapDown2(false);
-					break;
-				}
-				env.setAutoFolderSelect(jCheckBox_autoFolderSelect.isSelected());
-				env.setEnableCHAVsetting(jCheckBox_enableCHAVsetting.isSelected());
-				env.setRangeLikeRsv(jSP_rangeLikeRsv.getValue());
-				env.setGivePriorityToReserved(jCBP_givePriorityToReserved.isSelected());
-				env.setGivePriorityToReservedTitle(jCBP_givePriorityToReservedTitle.isSelected());
-				env.setAdjoiningNotRepetition(jCBP_adjoiningNotRepetition.isSelected());
-				env.setShowAllIterationItem(jCBP_rsv_showallite.isSelected());
-				env.setIterationItemForeground(jCCL_rsv_itecolor.getChoosed());
-				env.setTunerShortColor(jCCL_rsv_tunshortcolor.getChoosed());
-				env.setRecordedColor(jCCL_rsv_recedcolor.getChoosed());
-				env.setUseAutocomplete(jCBP_useAutocomplete.isSelected());
-				env.setNotifyBeforeProgStart(jCBP_notifyBeforeProgStart.isSelected());
-				env.setNotifyBeforePickProgStart(jCBP_notifyBeforePickProgStart.isSelected());
-				env.setMinsBeforeProgStart(jSP_minsBeforeProgStart.getValue());
-
-				// タイトル一覧関係
-				env.setShowTitleDetail(jCBP_showTitleDetail.isSelected());
-
-				// その他の設定
-				env.setUseHolidayCSV(jCBP_useHolidayCSV.isSelected());
-				env.setHolidayFetchInterval(jSP_holidayCSVFetchInterval.getValue());
-				env.setUpdateMethod((UpdateOn) jCBX_updateMethod.getSelectedItem());
-				env.setDisableBeep(jCBP_disableBeep.isSelected());
-				env.setShowSysTray(jCBP_showSysTray.isSelected());
-				env.setHideToTray(jCBP_hideToTray.isSelected());
-				env.setOnlyOneInstance(jCBP_onlyOneInstance.isSelected());
-				env.setLookAndFeel((String) jComboBox_lookAndFeel.getSelectedItem());
-				env.setFontName((String) jComboBox_font.getSelectedItem());
-				env.setFontSize(Integer.valueOf((String) jComboBox_fontSize.getSelectedItem()));
-				env.setUseGTKRC(jCBP_useGTKRC.isSelected());
-				env.setUseRundll32(jCBP_useRundll32.isSelected());
-				env.setDebug(jCBP_debug.isSelected());
-
-				// 設定保存
-				setEnv(reload_prog_needed);
-				setUpdateButtonEnhanced(false);
-
-				return null;
+			// タイトル一覧対応
+			for (int row=0; row<jTable_title.getRowCount(); row++) {
+				tlitems.get(row).setVisible((Boolean)jTable_title.getValueAt(row, 0));
+				tlitems.get(row).setName((String)jTable_title.getValueAt(row, 1));
+				tlitems.get(row).setId((Integer)jTable_title.getValueAt(row, 2));
 			}
 
-			@Override
-			protected void doFinally() {
-				StWinSetVisible(false);
+			// Web番組表対応
+			env.setContinueTomorrow(jCBP_continueTomorrow.isSelected());
+			env.setCacheTimeLimit(jSP_cacheTimeLimit.getValue());
+			if ( env.getCacheTimeLimit() == 0 ) {
+				env.setShutdownCmd((String) jCBX_shutdownCmd.getSelectedItem());
 			}
-		}.execute();
+			else {
+				env.setShutdownCmd("");
+			}
+			env.setExpandTo8(jCBP_expandTo8.isSelected());
+			//env.setUseDetailCache(jCBP_useDetailCache.isSelected());
+			env.setUseDetailCache(false);
+			env.setAutoEventIdComplete(jCBP_autoEventIdComplete.isSelected());
+			env.setSplitEpno(jCBP_splitEpno.isSelected());
+			env.setTraceOnlyTitle(jCBP_traceOnlyTitle.isSelected());
+			env.setFixTitle(jCBP_fixTitle.isSelected());
+			env.setNgword(jTextField_ngword.getText());
+			env.setUserAgent(jTextField_userAgent.getText());
+			env.setUseProxy(jCBP_useProxy.isSelected());
+			env.setProxyAddr((String)jTextField_proxyAddr.getText());
+			env.setProxyPort((String)jTextField_proxyPort.getText());
+			env.setUseSyobocal(jCBP_useSyobocal.isSelected());
+			env.setHistoryOnlyUpdateOnce(jCBP_historyOnlyUpdateOnce.isSelected());
+			env.setUsePassedProgram(jCBP_usePassedProgram.isSelected());
+			env.setPrepPassedProgramCount(jSP_prepPassedProgramCount.getValue());
+			env.setDownloadProgramOnFixedTime(jCBP_downloadProgramOnFixedTime.isSelected());
+			env.setDownloadProgramInBackground(jCBP_downloadProgramInBackground.isSelected());
+			env.setDownloadProgramTimeList(jTextField_downloadProgramTimeList.getText());
+			env.setUseProgCache(jCBP_useProgCache.isSelected());
+
+			// レコーダ対応
+			env.setForceLoadReserveDetails(jRBP_getRdReserveDetails.getSelectedIndex());
+			env.setForceLoadAutoReserves(jRBP_getRdAutoReserves.getSelectedIndex());
+			env.setForceLoadRecorded(jRBP_getRdRecorded.getSelectedIndex());
+			env.setRecordedSaveScope(jCBX_recordedSaveScope.getSelectedIndex());
 
-		StWinSetLocationCenter(parent);
-		StWinSetVisible(true);
+			// 予約
+			env.setSpoexLength(String.format("%d",jSP_spoex_extend.getValue()));
+			idx = jRBP_overlapUp.getSelectedIndex();
+			switch (idx) {
+			case 1:
+				env.setOverlapUp(true);
+				break;
+			default:
+				env.setOverlapUp(false);
+				break;
+			}
+			idx = jRBP_overlapDown.getSelectedIndex();
+			switch (idx) {
+			case 1:
+				env.setOverlapDown(true);
+				env.setOverlapDown2(false);
+				break;
+			case 2:
+				env.setOverlapDown(false);
+				env.setOverlapDown2(true);
+				break;
+			default:
+				env.setOverlapDown(false);
+				env.setOverlapDown2(false);
+				break;
+			}
+			env.setAutoFolderSelect(jCheckBox_autoFolderSelect.isSelected());
+			env.setEnableCHAVsetting(jCheckBox_enableCHAVsetting.isSelected());
+			env.setRangeLikeRsv(jSP_rangeLikeRsv.getValue());
+			env.setGivePriorityToReserved(jCBP_givePriorityToReserved.isSelected());
+			env.setGivePriorityToReservedTitle(jCBP_givePriorityToReservedTitle.isSelected());
+			env.setAdjoiningNotRepetition(jCBP_adjoiningNotRepetition.isSelected());
+			env.setShowAllIterationItem(jCBP_rsv_showallite.isSelected());
+			env.setIterationItemForeground(jCCL_rsv_itecolor.getChoosed());
+			env.setTunerShortColor(jCCL_rsv_tunshortcolor.getChoosed());
+			env.setRecordedColor(jCCL_rsv_recedcolor.getChoosed());
+			env.setUseAutocomplete(jCBP_useAutocomplete.isSelected());
+			env.setNotifyBeforeProgStart(jCBP_notifyBeforeProgStart.isSelected());
+			env.setNotifyBeforePickProgStart(jCBP_notifyBeforePickProgStart.isSelected());
+			env.setMinsBeforeProgStart(jSP_minsBeforeProgStart.getValue());
+
+			// タイトル一覧関係
+			env.setShowTitleDetail(jCBP_showTitleDetail.isSelected());
+
+			// その他の設定
+			env.setUseHolidayCSV(jCBP_useHolidayCSV.isSelected());
+			env.setHolidayFetchInterval(jSP_holidayCSVFetchInterval.getValue());
+			env.setUpdateMethod((UpdateOn) jCBX_updateMethod.getSelectedItem());
+			env.setDisableBeep(jCBP_disableBeep.isSelected());
+			env.setShowSysTray(jCBP_showSysTray.isSelected());
+			env.setHideToTray(jCBP_hideToTray.isSelected());
+			env.setOnlyOneInstance(jCBP_onlyOneInstance.isSelected());
+			env.setLookAndFeel((String) jComboBox_lookAndFeel.getSelectedItem());
+			env.setFontName((String) jComboBox_font.getSelectedItem());
+			env.setFontSize(Integer.valueOf((String) jComboBox_fontSize.getSelectedItem()));
+			env.setUseGTKRC(jCBP_useGTKRC.isSelected());
+			env.setUseRundll32(jCBP_useRundll32.isSelected());
+			env.setDebug(jCBP_debug.isSelected());
+
+			// 設定保存
+			setEnv(reload_prog_needed);
+			setUpdateButtonEnhanced(false);
+		}
+		catch(Exception e){
+			e.printStackTrace();
+		}
 
 		MWin.appendMessage(String.format(MSGID+"更新が完了しました。所要時間： %.2f秒",tc.end()));
 	}

--- a/TinyBannavi/src/tainavi/AbsToolBar.java
+++ b/TinyBannavi/src/tainavi/AbsToolBar.java
@@ -119,7 +119,7 @@ public abstract class AbsToolBar extends JToolBar implements HDDRecorderSelectab
 	protected abstract void setFullScreen(boolean b);
 	protected abstract boolean isTabSelected(MWinTab tab);
 	// 部品
-	protected abstract boolean addKeywordSearch(SearchKey search);
+	protected abstract boolean addKeywordSearch(String label, SearchKey search);
 	protected abstract boolean doLoadTVProgram(String selected);
 
 	protected abstract boolean doLoadRdRecorder(String selected);
@@ -1423,7 +1423,7 @@ public abstract class AbsToolBar extends JToolBar implements HDDRecorderSelectab
 
 				// 検索キーワードが変更されていたら履歴は無視する
 				if (kStr.equals(swi.getLabel())){
-					kStr = swi.getKeyword();
+//					kStr = swi.getKeyword();
 					search = swi.getSearchKey();
 					if (search != null)
 						new SearchProgram().compile(search);
@@ -1441,7 +1441,7 @@ public abstract class AbsToolBar extends JToolBar implements HDDRecorderSelectab
 
 			jTextField_keyword.setText("");
 
-			addKeywordSearch(search);
+			addKeywordSearch(kStr, search);
 		}
 	};
 

--- a/TinyBannavi/src/tainavi/Env.java
+++ b/TinyBannavi/src/tainavi/Env.java
@@ -1276,6 +1276,14 @@ public class Env {
 			f.delete();
     	}
 
+    	// CHAN-TORUを削除する
+    	if (b){
+    		for (TextValueSet tv : tvCommand) {
+    			if (tv.getValue().contains("tv.so-net.ne.jp/chan-toru"))
+    				tvCommand.remove(tv);
+    		}
+    	}
+
 		return b;
 
 	}

--- a/TinyBannavi/src/tainavi/TitleEditorPanel.java
+++ b/TinyBannavi/src/tainavi/TitleEditorPanel.java
@@ -32,19 +32,16 @@ public class TitleEditorPanel extends JPanel {
 	 * 定数
 	 ******************************************************************************/
 
-	//
-	private static final String ITEM_EVIDNEEDED = "番組ID取得";
-
 	// レイアウト関連
 	private static final int PARTS_HEIGHT = 25;
 	private static final int SEP_WIDTH = 10;
 	private static final int SEP_WIDTH_NARROW = 5;
-	private static final int SEP_HEIGHT = 10;
+//	private static final int SEP_HEIGHT = 10;
 	private static final int SEP_HEIGHT_NALLOW = 5;
 
 	private static final int COMBO_WIDTH = 115;
 	private static final int COMBO_WIDTH_WIDE = 155;
-	private static final int COMBO_HEIGHT = 43;
+//	private static final int COMBO_HEIGHT = 43;
 
 	private static final int TITLE_WIDTH = COMBO_WIDTH_WIDE+COMBO_WIDTH*2+SEP_WIDTH*2;
 	private static final int CHNAME_WIDTH = COMBO_WIDTH*2+SEP_WIDTH;
@@ -64,8 +61,6 @@ public class TitleEditorPanel extends JPanel {
 	 ******************************************************************************/
 
 	private JLabel jLabel_title = null;
-	private JButton jButton_getEventId = null;
-	private JTXTLabel jLabel_eventId = null;
 	private JButton jButton_addDate = null;
 	private JComboBoxWithPopup jComboBox_title = null;
 	private JButton jButton_ch = null;
@@ -153,8 +148,6 @@ public class TitleEditorPanel extends JPanel {
 		CommonSwingUtils.putComponentOn(this, getJLabel_title("予約名"), 50, PARTS_HEIGHT, x, y);
 		CommonSwingUtils.putComponentOn(this, getJComboBox_title(), TITLE_WIDTH, PARTS_HEIGHT, x+SEP_WIDTH_NARROW, y+PARTS_HEIGHT);
 
-		CommonSwingUtils.putComponentOn(this, getJButton_getEventId(ITEM_EVIDNEEDED),	100, PARTS_HEIGHT, x+50, y);
-		CommonSwingUtils.putComponentOn(this, getJLabel_eventId(""),					75,  PARTS_HEIGHT-2, x+50+100+SEP_WIDTH_NARROW, y+1);
 		CommonSwingUtils.putComponentOn(this, getJButton_addDate("日付追加"),			100, PARTS_HEIGHT, x+SEP_WIDTH_NARROW+TITLE_WIDTH-125-SEP_WIDTH, y);
 
 		CommonSwingUtils.putComponentOn(this, getJButton_ch("放送局"), 100, PARTS_HEIGHT, x+TITLE_WIDTH+SEP_WIDTH, y);
@@ -239,47 +232,6 @@ public class TitleEditorPanel extends JPanel {
 	 ******************************************************************************/
 
 	/***************************************
-	 * 番組IDの設定
-	 **************************************/
-
-	/**
-	 * @param enabled 番組IDの取得ができないシチュエーション（予約一覧から開くとか）では取得ボタンをfalseに。
-	 */
-	public boolean setContentIdValue(String content_id, boolean enabled) {
-
-		Integer evid = null;
-		if ( content_id != null ) {
-			if ( ContentIdEDCB.decodeContentId(content_id) ) {
-				evid = ContentIdEDCB.getEvId();
-			}
-			else if ( ContentIdREGZA.decodeContentId(content_id) && ContentIdREGZA.getEvId() != 0x0000 && ContentIdREGZA.getEvId() != 0xFFFF ) {
-				evid = ContentIdREGZA.getEvId();
-			}
-			else if ( ContentIdDIMORA.decodeContentId(content_id) && ContentIdDIMORA.getEvId() != 0x0000 && ContentIdDIMORA.getEvId() != 0xFFFF ) {
-				evid = ContentIdDIMORA.getEvId();
-			}
-		}
-
-		// みつからにゃい
-		if ( evid == null ) {
-			jLabel_eventId.setValue(null);
-			jLabel_eventId.setText(null);
-			jButton_getEventId.setForeground(enabled ? Color.BLUE : Color.GRAY);
-			jButton_getEventId.setEnabled(enabled);
-
-			return false;
-		}
-
-		// みつかったじぇい
-		jLabel_eventId.setValue(content_id);
-		jLabel_eventId.setText(String.format("%04X",evid));
-		jButton_getEventId.setForeground(Color.GRAY);
-		jButton_getEventId.setEnabled(false);
-
-		return true;
-	}
-
-	/***************************************
 	 * まとめて設定
 	 **************************************/
 
@@ -287,9 +239,6 @@ public class TitleEditorPanel extends JPanel {
 	 * まとめて設定：番組情報編（番組ID・タイトル・放送局・番組詳細）
 	 */
 	public void setSelectedValues(ProgDetailList tvd) {
-		// 番組ID
-		setContentIdValue(tvd.progid,true);
-
 		// タイトル
 		{
 			int index = jComboBox_title.indexOf(tvd.title);
@@ -319,9 +268,6 @@ public class TitleEditorPanel extends JPanel {
 	 * まとめて設定：類似予約編
 	 */
 	public void setSelectedValues(ReserveList r) {
-		// 番組ID
-		setContentIdValue(r.getContentId(),true);
-
 		// タイトル
 		{
 			int index = jComboBox_title.indexOf(r.getTitle());
@@ -809,25 +755,6 @@ public class TitleEditorPanel extends JPanel {
 	 * 番組ID取得
 	 **************************************/
 
-	/**
-	 * 番組IDを取得する
-	 */
-	private final ActionListener al_getEventId = new ActionListener() {
-		@Override
-		public void actionPerformed(ActionEvent e) {
-
-			if ( recexec != null ) {
-
-				String content_id = recexec.doGetEventId();
-
-				if ( content_id != null ) {
-					setContentIdValue(content_id, false);
-				}
-			}
-		}
-	};
-
-
 	/*******************************************************************************
 	 * 選択された値を呼び出し元に戻す
 	 ******************************************************************************/
@@ -859,14 +786,6 @@ public class TitleEditorPanel extends JPanel {
 		cal.add(Calendar.MINUTE, getRecMinVal());
 		r.setEndDateTime(CommonUtils.getDateTime(cal));									// PostRdEntry()中で取得するのでここはダミー
 
-		//if ( jLabel_eventId.getText() != null && ! (jLabel_eventId.getText().endsWith("0000") ||jLabel_eventId.getText().endsWith("FFFF")) ) {
-		if ( jLabel_eventId.getText() != null ) {
-			r.setContentId(jLabel_eventId.getValue());
-		}
-		else {
-			r.setContentId("");
-		}
-
 		r.setAutocomplete(jCheckBox_Autocomplete.isSelected());
 
 		return r;
@@ -1003,30 +922,6 @@ public class TitleEditorPanel extends JPanel {
 		return jComboBox_title;
 	}
 
-	/**
-	 * EpgDataCap_BonプラグインのCHコードとを利用してテレビ王国から番組IDを取得します
-	 * @since 3.14.5β
-	 */
-	private JButton getJButton_getEventId(String s) {
-		if (jButton_getEventId == null) {
-			jButton_getEventId = new JButton(s);
-
-			jButton_getEventId.addActionListener(al_getEventId);
-		}
-		return jButton_getEventId;
-	}
-
-	private JTXTLabel getJLabel_eventId(String s) {
-		if ( jLabel_eventId == null ) {
-			jLabel_eventId = new JTXTLabel();
-			jLabel_eventId.setHorizontalAlignment(JLabel.CENTER);
-			jLabel_eventId.setForeground(Color.BLUE);
-
-			jLabel_eventId.setBorder(new LineBorder(Color.LIGHT_GRAY));
-		}
-		return jLabel_eventId;
-	}
-
 	private JButton getJButton_addDate(String s) {
 		if (jButton_addDate == null) {
 			jButton_addDate = new JButton(s);

--- 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.22";
+	private static final String Version = "タイニー番組ナビゲータ for DBR-T2007　3.22.18β+1.12.23";
 
 	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
@@ -2164,14 +2164,14 @@ public class Viewer extends JFrame implements ChangeListener,TickTimerListener,H
 		}
 
 		@Override
-		protected boolean addKeywordSearch(SearchKey search) {
+		protected boolean addKeywordSearch(String label, SearchKey search) {
 
 			timer_now.pause();
 
 			AbsKeywordDialog kD = new VWKeywordDialog();
 			CommonSwingUtils.setLocationCenter(Viewer.this,kD);
 
-			kD.open(search.getLabel(), srKeys, srGrps, search);
+			kD.open(label, srKeys, srGrps, search);
 			kD.setVisible(true);
 
 			if (kD.isRegistered()) {
@@ -2745,6 +2745,7 @@ public class Viewer extends JFrame implements ChangeListener,TickTimerListener,H
 	public void addBrowseMenuToPopup( JPopupMenu pop,	final ProgDetailList tvd ){
 		for (final TextValueSet tv : env.getTvCommand()) {
 			JMenuItem menuItem = new JMenuItem(tv.getText());
+
 			String escepedTitle = "";
 			String escepedChName = "";
 			String escepedDetail = "";

--- a/TinyBannavi/src/tainavi/pluginrec/PlugIn_RecDBR_T2007.java
+++ b/TinyBannavi/src/tainavi/pluginrec/PlugIn_RecDBR_T2007.java
@@ -623,6 +623,13 @@ public class PlugIn_RecDBR_T2007 extends HDDRecorderUtils implements HDDRecorder
 						ta = TitlesFromFile(titleFile);
 				}
 				else{
+					if (ta.isEmpty()){
+						reportProgress("０件だったので念のため再度取得します...");
+						ta = getTitleList(devid, mountedOnly);
+						if (ta == null)
+							return false;
+					}
+
 					// タイトルの詳細情報を取得し、内容を調整する
 					for (TitleInfo entry : ta) {
 						// 放送局名変換
@@ -1693,6 +1700,7 @@ public class PlugIn_RecDBR_T2007 extends HDDRecorderUtils implements HDDRecorder
 	 */
 	protected 	ArrayList<TitleInfo> getTitleList(String device_id, boolean mountedOnly) {
 		String str = "drive=" + device_id + "&org_pl=0";
+
 		String response = "";
 
 		for (int n=0; n<3; n++){