コミット: f83c61de4ec4dac07f7ba38cd9a2bb757f94fbb7 - TinyBannavi (git)

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

コミットメタ情報

• リビジョン: f83c61de4ec4dac07f7ba38cd9a2bb757f94fbb7 (tree)
• 日時: 2023-04-07 22:55:56
• 作者: Masahiko Kimura <mkimura@u01....>
• コミッター: Masahiko Kimura

ログメッセージ

Ver.1.13.7 (2023/4/7)
1. ［新聞形式］ページャーのツールチップでページ内の放送局を一覧表示する
2. ［新聞形式］ヘッダーの右クリックメニューで放送局別表示と放送局表示（１週おき）を切り替えられるようにする
3. ［新聞形式］同じく放送局別表示（１週おき）で曜日を前後に切り替えられるようにする
4. ［全般］テキストボックスの右クリックメニューに「Googleで検索」「Syobocalで検索」を追加する

変更サマリ

• modified: TinyBannavi/src/tainavi/AbsPaperView.java
• modified: TinyBannavi/src/tainavi/AbsToolBar.java
• modified: TinyBannavi/src/tainavi/CommonUtils.java
• modified: TinyBannavi/src/tainavi/TextEditPopupMenu.java
• modified: TinyBannavi/src/tainavi/VWFolderDialog.java
• modified: TinyBannavi/src/tainavi/VersionInfo.java
• modified: TinyBannavi/src/tainavi/Viewer.java

差分

--- a/TinyBannavi/src/tainavi/AbsPaperView.java
+++ b/TinyBannavi/src/tainavi/AbsPaperView.java
@@ -2544,7 +2544,78 @@ public abstract class AbsPaperView extends JPanel implements TickTimerListener,H
 	}
 
 	/*
-	 * 放送局別で前のページに移動する
+	 * 放送局別１週間おき表示で前の日に移動する
+	 */
+	public void moveToPrevDateIndex(){
+		if (!isPrevDateIndexEnabled())
+			return;
+
+		PassedProgram passed = tvprograms.getPassed();
+
+		String date = passed.getPrevDate(startDate, 1);
+		if (date == null)
+			return;
+
+		startDate = date;
+
+		// 表を描画し直す
+		redrawByCurrentSelection();
+	}
+
+	/*
+	 * 放送局別１週間おき表示で前の日に移動可能かを返す
+	 */
+	public boolean isPrevDateIndexEnabled(){
+		PassedProgram passed = tvprograms.getPassed();
+
+		String date = passed.getPrevDate(startDate, 1);
+
+		return date != null;
+	}
+
+	/*
+	 * 放送局別１週間おき表示で次の日に移動する
+	 */
+	public void moveToNextDateIndex(){
+		if (!isNextDateIndexEnabled())
+			return;
+
+		PassedProgram passed = tvprograms.getPassed();
+
+		String date = passed.getNextDate(startDate, 1);
+		if (date == null)
+			date = CommonUtils.getDate529(0, true);
+
+		startDate = date;
+
+		// 表を描画し直す
+		redrawByCurrentSelection();
+	}
+
+	/*
+	 * 放送局別１週間おき表示で次の日に移動可能かを返す
+	 */
+	public boolean isNextDateIndexEnabled(){
+		String today = CommonUtils.getDate529(0, true);
+		if (this.byCenterModeDayInterval == 1){
+			return (startDate.compareTo(today) < 0);
+		}
+
+		GregorianCalendar ct = CommonUtils.getCalendar(today);
+		ct.add(GregorianCalendar.DAY_OF_MONTH, 7);
+		String dateMax = CommonUtils.getDate(ct);
+
+		ct = CommonUtils.getCalendar(startDate);
+		if (ct == null)
+			return false;
+		ct.add(GregorianCalendar.DAY_OF_MONTH, (env.getDatePerPassedPage()-1)*this.byCenterModeDayInterval+1);
+		String date = CommonUtils.getDate(ct);
+
+		return (date.compareTo(dateMax) <= 0);
+	}
+
+	/*
+	 * 放送局別１週間おき表示で前の日に移動する
 	 */
 	public void moveToPrevDatePage(){
 		PassedProgram passed = tvprograms.getPassed();
@@ -3259,7 +3330,7 @@ public abstract class AbsPaperView extends JPanel implements TickTimerListener,H
 				// ポインタの位置
 				Point p = e.getPoint();
 
-				JMenuItem menuItem = new JMenuItem(String.format("放送局別表示【%s】", center));
+				JMenuItem menuItem = new JMenuItem(String.format("放送局別表示へ切り替え【%s】", center));
 				Font f = menuItem.getFont();
 				menuItem.setFont(f.deriveFont(f.getStyle()|Font.BOLD));
 				menuItem.addActionListener(new ActionListener() {
@@ -3278,7 +3349,7 @@ public abstract class AbsPaperView extends JPanel implements TickTimerListener,H
 				});
 				pop.add(menuItem);
 
-				menuItem = new JMenuItem(String.format("放送局別１週おき表示【%s】", center));
+				menuItem = new JMenuItem(String.format("放送局別表示（１週おき）へ切り替え【%s】", center));
 				menuItem.addActionListener(new ActionListener() {
 					public void actionPerformed(ActionEvent e) {
 						byCenterModeDayInterval = 7;
@@ -3340,6 +3411,101 @@ public abstract class AbsPaperView extends JPanel implements TickTimerListener,H
 					redrawByDateWithCenter(center, date);
 				}
 			}
+			else if (e.getButton() == MouseEvent.BUTTON3){
+				JPopupMenu pop = new JPopupMenu();
+				// ポインタの位置
+				Point p = e.getPoint();
+				String date = ((JTXTLabel)e.getSource()).getValue();
+
+				JMenuItem menuItem = new JMenuItem(String.format("日付表示へ切り替え【%s】", date) );
+				Font f = menuItem.getFont();
+				menuItem.setFont(f.deriveFont(f.getStyle()|Font.BOLD));
+				menuItem.addActionListener(new ActionListener() {
+					public void actionPerformed(ActionEvent e) {
+						JTreeLabel.Nodes node = jLabel_tree.getNode();
+						String value = jLabel_tree.getValue();
+						if (node == null || value == null)
+							return;
+
+						String center = value;
+
+						StdAppendMessage(MSGID+"日付表示に切り替え："+date);
+
+						String today = CommonUtils.getDate529(0,  true);
+
+						// 過去日の場合、過去ログの日付を選択する
+						if (date.compareTo(today) < 0){
+							// 指定した日付のノードがツリーになければ作成する
+							addPassedNodeIfNotExist(date);
+						}
+
+						redrawByDateWithCenter(center, date);
+					}
+				});
+				pop.add(menuItem);
+
+				if (byCenterModeDayInterval == 7){
+					menuItem = new JMenuItem(String.format("放送局別表示へ切り替え【%s】", date));
+					menuItem.addActionListener(new ActionListener() {
+						public void actionPerformed(ActionEvent e) {
+							byCenterModeDayInterval = 1;
+
+							GregorianCalendar c = CommonUtils.getCalendar(date);
+							if (c != null)
+								startDate = date;
+							else
+								startDate = CommonUtils.getDate529(0, true);
+
+							reselectTree();
+						}
+					});
+					pop.add(menuItem);
+
+					pop.addSeparator();
+					GregorianCalendar c = CommonUtils.getCalendar(date);
+					c.add(Calendar.DATE, -1);
+
+					menuItem = new JMenuItem(String.format("前の曜日へ【%s】", CommonUtils.getWeekDayString(c.get(Calendar.DAY_OF_WEEK))));
+					menuItem.setEnabled(isPrevDateIndexEnabled());
+					menuItem.addActionListener(new ActionListener() {
+						public void actionPerformed(ActionEvent e) {
+							moveToPrevDateIndex();
+						}
+					});
+					pop.add(menuItem);
+
+					c = CommonUtils.getCalendar(date);
+					c.add(Calendar.DATE, 1);
+
+					menuItem = new JMenuItem(String.format("次の曜日へ【%s】", CommonUtils.getWeekDayString(c.get(Calendar.DAY_OF_WEEK))));
+					menuItem.setEnabled(isNextDateIndexEnabled());
+					menuItem.addActionListener(new ActionListener() {
+						public void actionPerformed(ActionEvent e) {
+							moveToNextDateIndex();
+						}
+					});
+					pop.add(menuItem);
+				}
+				else{
+					menuItem = new JMenuItem(String.format("放送局別表示（１週おき）へ切り替え【%s】", date));
+					menuItem.addActionListener(new ActionListener() {
+						public void actionPerformed(ActionEvent e) {
+							byCenterModeDayInterval = 7;
+
+							GregorianCalendar c = CommonUtils.getCalendar(date);
+							if (c != null)
+								startDate = date;
+							else
+								startDate = CommonUtils.getDate529(0, true);
+
+							reselectTree();
+						}
+					});
+					pop.add(menuItem);
+				}
+
+				pop.show((Component)e.getSource(), p.x, p.y);
+			}
 		}
 	};
 

--- a/TinyBannavi/src/tainavi/AbsToolBar.java
+++ b/TinyBannavi/src/tainavi/AbsToolBar.java
@@ -18,6 +18,7 @@ import java.net.URISyntaxException;
 import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.GregorianCalendar;
+import java.util.StringJoiner;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
@@ -914,6 +915,7 @@ public abstract class AbsToolBar extends JToolBar implements HDDRecorderSelectab
 //		jComboBox_pager.setToolTipText(jComboBox_pager.getSelectedItem().toString());
 
 		updatePagerButtons();
+		updatePagerTooltipText();
 
 		// イベント再開
 		jComboBox_pager.addItemListener(il_pagerSelected);
@@ -942,9 +944,32 @@ public abstract class AbsToolBar extends JToolBar implements HDDRecorderSelectab
 			jComboBox_pager.setSelectedIndex(idx);
 
 			updatePagerButtons();
+			updatePagerTooltipText();
 		}
 	}
 
+	public void updatePagerTooltipText(){
+		StringJoiner sb = new StringJoiner("<BR>");
+		int pno = getSelectedPagerIndex();
+		if (pno >= 0 && pno < getPagerCount()){
+			String text = (String)jComboBox_pager.getItemAt(pno);
+			Matcher ma = Pattern.compile("([1-9]/[1-9]) - (.*)").matcher(text);
+			if (ma.find()){
+				String [] centers = ma.group(2).split("、");
+				int no = 1;
+				for (String center : centers){
+					sb.add(String.valueOf(no++) + ":" + center);
+				}
+
+				String tooltip = "<HTML><B>" + TIPS_PAGER + "(" + ma.group(1) + ")</B><BR>" + sb.toString() + "</HTML>";
+				jComboBox_pager.setToolTipText(tooltip);
+				return;
+			}
+		}
+
+		jComboBox_pager.setToolTipText(TIPS_PAGER);
+	}
+
 	/*
 	 *  前の放送局ページに移動する
 	 */
@@ -1452,6 +1477,7 @@ public abstract class AbsToolBar extends JToolBar implements HDDRecorderSelectab
 			if (e.getStateChange() == ItemEvent.SELECTED) {
 				if (debug) System.out.println(DBGID+"PAGER SELECTED");
 				redrawByPager();
+				updatePagerTooltipText();
 //				jComboBox_pager.setToolTipText(jComboBox_pager.getSelectedItem().toString());
 			}
 		}

--- a/TinyBannavi/src/tainavi/CommonUtils.java
+++ b/TinyBannavi/src/tainavi/CommonUtils.java
@@ -113,6 +113,19 @@ public class CommonUtils {
 	}
 
 	/**
+	 * 曜日のINDEXから名称を取得する
+	 *
+	 * @param n		曜日INDEX
+	 * @return		曜日名称
+	 */
+	public static String getWeekDayString(int n){
+		if (n < 1 || n > 7)
+			return "";
+
+		return WDTPTN[n-1];
+	}
+
+	/**
 	 * 月日に年を補完
 	 */
 	public static String getDateByMD(int m, int d, int wday, boolean addwstr) {

--- a/TinyBannavi/src/tainavi/TextEditPopupMenu.java
+++ b/TinyBannavi/src/tainavi/TextEditPopupMenu.java
@@ -1,8 +1,16 @@
 package tainavi;
 
+import java.awt.Desktop;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
 import java.awt.event.KeyEvent;
 import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.net.URLEncoder;
 
 import javax.swing.Action;
 import javax.swing.ActionMap;
@@ -11,6 +19,7 @@ import javax.swing.JMenuItem;
 import javax.swing.JPopupMenu;
 import javax.swing.KeyStroke;
 import javax.swing.text.DefaultEditorKit;
+import javax.swing.text.JTextComponent;
 
 public class TextEditPopupMenu extends MouseAdapter {
 
@@ -18,24 +27,24 @@ public class TextEditPopupMenu extends MouseAdapter {
 	public void mouseReleased(MouseEvent e) {
 		mousePopup(e);
 	}
-	
+
 	@Override
 	public void mousePressed(MouseEvent e) {
 		mousePopup(e);
 	}
-	
+
 	@Override
 	public void mouseExited(MouseEvent e) {
 	}
-	
+
 	@Override
 	public void mouseEntered(MouseEvent e) {
 	}
-	
+
 	@Override
 	public void mouseClicked(MouseEvent e) {
 	}
-	
+
 	//
 	private void mousePopup(MouseEvent e) {
 		if (e.isPopupTrigger()) {
@@ -44,30 +53,87 @@ public class TextEditPopupMenu extends MouseAdapter {
 			e.consume();
 		}
 	}
-	
+
 	private void showPopup(JComponent c, int x, int y) {
-		
+		JTextComponent tc = (JTextComponent)c;
+		boolean bc = tc.getSelectedText() != null;
+		boolean bp = tc.isEditable();
+
         JPopupMenu pmenu = new JPopupMenu();
-        
+
 		ActionMap am = c.getActionMap();
-		
+
 		Action cut = am.get(DefaultEditorKit.cutAction);
-		addMenu(pmenu, "切り取り(X)", cut, 'X', KeyStroke.getKeyStroke(KeyEvent.VK_X, KeyEvent.CTRL_DOWN_MASK));
+		addMenu(pmenu, "切り取り(X)", cut, 'X', KeyStroke.getKeyStroke(KeyEvent.VK_X, KeyEvent.CTRL_DOWN_MASK), bc && bp);
 
 		Action copy = am.get(DefaultEditorKit.copyAction);
-		addMenu(pmenu, "コピー(C)", copy, 'C', KeyStroke.getKeyStroke(KeyEvent.VK_C, KeyEvent.CTRL_DOWN_MASK));
+		addMenu(pmenu, "コピー(C)", copy, 'C', KeyStroke.getKeyStroke(KeyEvent.VK_C, KeyEvent.CTRL_DOWN_MASK), bc);
 
 		Action paste = am.get(DefaultEditorKit.pasteAction);
-		addMenu(pmenu, "貼り付け(V)", paste, 'V', KeyStroke.getKeyStroke(KeyEvent.VK_V, KeyEvent.CTRL_DOWN_MASK));
+		addMenu(pmenu, "貼り付け(V)", paste, 'V', KeyStroke.getKeyStroke(KeyEvent.VK_V, KeyEvent.CTRL_DOWN_MASK), bp);
 
 		Action all = am.get(DefaultEditorKit.selectAllAction);
-		addMenu(pmenu, "すべて選択(A)", all, 'A', KeyStroke.getKeyStroke(KeyEvent.VK_A, KeyEvent.CTRL_DOWN_MASK));
-        
+		addMenu(pmenu, "すべて選択(A)", all, 'A', KeyStroke.getKeyStroke(KeyEvent.VK_A, KeyEvent.CTRL_DOWN_MASK), true);
+
+		pmenu.addSeparator();
+
+		JMenuItem mi = new JMenuItemWithShortcut("Googleで検索(S)");
+		mi.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_S, KeyEvent.CTRL_DOWN_MASK));
+		mi.addActionListener(new ActionListener() {
+			public void actionPerformed(ActionEvent e) {
+				String value = tc.getSelectedText();
+					;
+				if (value != null && !value.isEmpty()){
+					if (value != null && !value.isEmpty()){
+						try {
+							showURL("http://www.google.co.jp/search?q=" + URLEncoder.encode(value, "UTF-8"));
+						} catch (UnsupportedEncodingException e1) {
+							// TODO 自動生成された catch ブロック
+							e1.printStackTrace();
+						}
+					}
+				}
+			}
+		});
+		mi.setEnabled(bc);
+		pmenu.add(mi);
+
+		JMenuItem mi2 = new JMenuItemWithShortcut("Syobocalで検索(B)");
+		mi2.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_B, KeyEvent.CTRL_DOWN_MASK));
+		mi2.addActionListener(new ActionListener() {
+			public void actionPerformed(ActionEvent e) {
+				String value = tc.getSelectedText();
+				if (value != null && !value.isEmpty()){
+					try {
+						showURL("http://cal.syoboi.jp/find?kw=" + URLEncoder.encode(value, "UTF-8") + "&exec=%E6%A4%9C%E7%B4%A2");
+					} catch (UnsupportedEncodingException e1) {
+						// TODO 自動生成された catch ブロック
+						e1.printStackTrace();
+					}
+				}
+			}
+		});
+		mi2.setEnabled(bc);
+		pmenu.add(mi2);
+
 		c.requestFocusInWindow();
 		pmenu.show(c, x, y);
 	}
-	
-	private void addMenu(JPopupMenu pmenu, String text, Action action, int mnemonic, KeyStroke ks) {
+
+	private void showURL(String url){
+		Desktop desktop = Desktop.getDesktop();
+		try {
+			desktop.browse(new URI(url));
+		} catch (IOException e1) {
+			// TODO 自動生成された catch ブロック
+			e1.printStackTrace();
+		} catch (URISyntaxException e1) {
+			// TODO 自動生成された catch ブロック
+			e1.printStackTrace();
+		}
+	}
+
+	private void addMenu(JPopupMenu pmenu, String text, Action action, int mnemonic, KeyStroke ks, boolean enable) {
 		if (action != null) {
 			JMenuItem mi = pmenu.add(action);
 			if (text != null) {
@@ -79,6 +145,8 @@ public class TextEditPopupMenu extends MouseAdapter {
 			if (ks != null) {
 				mi.setAccelerator(ks);
 			}
+
+			mi.setEnabled(enable);
 		}
 	}
 }

--- a/TinyBannavi/src/tainavi/VWFolderDialog.java
+++ b/TinyBannavi/src/tainavi/VWFolderDialog.java
@@ -53,7 +53,7 @@ public class VWFolderDialog extends JDialog {
 
 	private JPanel jPanel = null;
 	private JLabel jLabel_folder = null;
-	private JTextField jTextField_folder = null;
+	private JTextFieldWithPopup jTextField_folder = null;
 	private JButton jButton_cancel = null;
 	private JButton jButton_create = null;
 
@@ -272,7 +272,7 @@ public class VWFolderDialog extends JDialog {
 	//
 	private JTextField getJTextField_folder() {
 		if (jTextField_folder == null) {
-			jTextField_folder = new JTextField();
+			jTextField_folder = new JTextFieldWithPopup();
 			jTextField_folder.addActionListener(al_create);
 			jTextField_folder.addKeyListener(kl_cancel);
 			jTextField_folder.getDocument().addDocumentListener(dl_folderChanged);

--- 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.13.6";
+	private static final String Version = "タイニー番組ナビゲータ for DBR-T2007　3.22.18β+1.13.7";
 
 	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
@@ -6078,6 +6078,9 @@ public class Viewer extends JFrame implements ChangeListener,TickTimerListener,H
 		final String BUTTON_ACTION_NEXT_CENTERPAGE = "nextcenterpage";
 		final String BUTTON_ACTION_PREV_CENTERPAGE = "prevcenterpage";
 
+		final String BUTTON_ACTION_NEXT_DATE_INDEX = "nextdateindex";
+		final String BUTTON_ACTION_PREV_DATE_INDEX = "prevdateindex";
+
 		final Action find_action =  new AbstractAction() {
 			@Override
 			public void actionPerformed(ActionEvent e) {
@@ -6293,6 +6296,31 @@ public class Viewer extends JFrame implements ChangeListener,TickTimerListener,H
 			}
 		};
 
+		final Action sc_prev_date_index = new AbstractAction() {
+			@Override
+			public void actionPerformed(ActionEvent e) {
+				switch(mainWindow.getSelectedTab()){
+				case PAPER:
+					paper.moveToPrevDateIndex();
+					break;
+				default:
+					break;
+				}
+			}
+		};
+		final Action sc_next_date_index = new AbstractAction() {
+			@Override
+			public void actionPerformed(ActionEvent e) {
+				switch(mainWindow.getSelectedTab()){
+				case PAPER:
+					paper.moveToNextDateIndex();
+					break;
+				default:
+					break;
+				}
+			}
+		};
+
 		ArrayList<ShortCut> sca = new ArrayList<ShortCut>();
 		sca.add(new ShortCut(FIND_ACTION, KeyEvent.VK_F, KeyEvent.CTRL_DOWN_MASK, find_action));
 		sca.add(new ShortCut(FIND_ACTION, KeyEvent.VK_F1, 0, find_action));
@@ -6355,7 +6383,11 @@ public class Viewer extends JFrame implements ChangeListener,TickTimerListener,H
 
 		sca.add(new ShortCut(BUTTON_ACTION_PREV_CENTERPAGE, KeyEvent.VK_LEFT, KeyEvent.ALT_DOWN_MASK, sc_prev_centerpage));
 		sca.add(new ShortCut(BUTTON_ACTION_NEXT_CENTERPAGE, KeyEvent.VK_RIGHT, KeyEvent.ALT_DOWN_MASK, sc_next_centerpage));
-//		sca.add(new ShortCut(SCROLL_ACTION_PREV_PAGE, KeyEvent.VK_PAGE_UP, 0, sc_prev_page));
+
+		sca.add(new ShortCut(BUTTON_ACTION_PREV_DATE_INDEX, KeyEvent.VK_LEFT, KeyEvent.SHIFT_DOWN_MASK + KeyEvent.ALT_DOWN_MASK, sc_prev_date_index));
+		sca.add(new ShortCut(BUTTON_ACTION_NEXT_DATE_INDEX, KeyEvent.VK_RIGHT,  KeyEvent.SHIFT_DOWN_MASK + KeyEvent.ALT_DOWN_MASK, sc_next_date_index));
+
+		//		sca.add(new ShortCut(SCROLL_ACTION_PREV_PAGE, KeyEvent.VK_PAGE_UP, 0, sc_prev_page));
 //		sca.add(new ShortCut(SCROLL_ACTION_NEXT_PAGE, KeyEvent.VK_PAGE_DOWN, 0, sc_next_page));
 //
 //		sca.add(new ShortCut(SCROLL_ACTION_PREV_PAGE, KeyEvent.VK_PAGE_UP, KeyEvent.SHIFT_DOWN_MASK, sc_prev_page));