import java.awt.event.ActionListener;
import java.io.File;
import java.util.List;
-import java.util.logging.Level;
-import java.util.logging.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import javax.swing.BorderFactory;
+import javax.swing.ButtonGroup;
import javax.swing.ComboBoxModel;
import javax.swing.DefaultComboBoxModel;
import javax.swing.GroupLayout;
import javax.swing.JFrame;
import javax.swing.JLabel;
import javax.swing.JPanel;
+import javax.swing.JPasswordField;
+import javax.swing.JRadioButton;
+import javax.swing.JSpinner;
import javax.swing.JTabbedPane;
import javax.swing.JTextField;
import javax.swing.LayoutStyle.ComponentPlacement;
-import javax.swing.UIManager;
-import javax.swing.UnsupportedLookAndFeelException;
+import javax.swing.SpinnerNumberModel;
import javax.swing.WindowConstants;
import org.apache.commons.configuration.ConfigurationException;
-import yukihane.inqubus.Config;
+import yukihane.inqubus.config.Config;
/**
*
*/
public class ConfigDialog extends JDialog {
private static final long serialVersionUID = 1L;
- private static final Logger logger = Logger.getLogger(ConfigDialog.class.getName());
+ private static final Logger logger = LoggerFactory.getLogger(ConfigDialog.class);
+ private static final String NEED_REBOOT = "設定を有効にするにはいんきゅばすの再起動が必要です";
/** Creates new form Properties */
public ConfigDialog() {
final JTabbedPane tabbedPane = new JTabbedPane();
final JPanel pnlNetwork = new JPanel();
final JPanel pnlAccount = new JPanel();
- final JLabel lblMail = new JLabel();
fldMail = new JTextField();
- final JLabel lblPassword = new JLabel();
- fldPassword = new JTextField();
+ fldPassword.setEchoChar('*');
final JPanel pnlProxy = new JPanel();
cbProxyUse = new JCheckBox();
final JLabel lblProxyHost = new JLabel();
final JLabel lblProxyPort = new JLabel();
- fldProxyHost = new JTextField();
- fldProxyPort = new JTextField();
final JPanel pnlFile = new JPanel();
final JPanel pnlFileOutput = new JPanel();
final JLabel lblOutputDir = new JLabel();
final JPanel pnlComment = new JPanel();
final JPanel pnlCommentStandard = new JPanel();
final JLabel lblCommentSize = new JLabel();
- cbCommentSizeAuto = new JCheckBox();
final JLabel lblCommentSizeManual = new JLabel();
- fldCommentSizeManual = new JTextField();
final JLabel lblCommentMinSize = new JLabel();
- cbCommentMinSizeAuto = new JCheckBox();
- fldCommentMinSizeManual = new JTextField();
final JLabel lblCommentMinSizeManual = new JLabel();
final JLabel lblCommentDisplayMax = new JLabel();
- cbCommentDisplaySizeDefault = new JCheckBox();
final JLabel lblCommentDisplayMaxManual = new JLabel();
- fldCommentDisplaySizeManual = new JTextField();
final JPanel pnlCommentAdvanced = new JPanel();
final JLabel lblFontPath = new JLabel();
cbFontSizeArrangeDisable = new JCheckBox();
cbCommentOpaque = new JCheckBox();
fldFontPath = new JTextField();
- btnFontPath = new JButton();
final JLabel lblFontIndex = new JLabel();
final JLabel lblFontShadow = new JLabel();
fldFontIndex = new JTextField();
final JPanel pnlFfmpeg = new JPanel();
- final JPanel jPanel10 = new JPanel();
- final JLabel lblFfmpegPath = new JLabel();
- final JLabel lblFfmpegDllPath = new JLabel();
- fldFfmpegPath = new JTextField();
- fldFfmpegDllPath = new JTextField();
- btnFfmpegPath = new JButton();
- btnFfmpegDllPath = new JButton();
+ final JPanel pnlFfmpegBinPath = new JPanel();
+ final JLabel lblFfmpegPath = new JLabel("ffmpeg");
+ final JLabel lblFfmpegDllPath = new JLabel("拡張ライブラリ");
+ final JLabel lblMediaInfoPath = new JLabel("MediaInfo");
final JPanel pnlNgSetting = new JPanel();
final JPanel pnlSearch = new JPanel();
- final JPanel pnlSearchCache = new JPanel();
- final JLabel lblSearchCache = new JLabel();
- fldSearchCache = new JTextField();
setDefaultCloseOperation(WindowConstants.DISPOSE_ON_CLOSE);
pnlAccount.setBorder(BorderFactory.createTitledBorder("アカウント"));
- lblMail.setText("ID(メールアドレス)");
-
- lblPassword.setText("パスワード");
+ final JRadioButton btnAccount = new JRadioButton("次の情報を使用してログインする");
+ final JLabel lblMail = new JLabel("ID(メールアドレス)");
+ final JLabel lblPassword = new JLabel("パスワード");
GroupLayout gl_pnlAccount = new GroupLayout(pnlAccount);
pnlAccount.setLayout(gl_pnlAccount);
- gl_pnlAccount.setHorizontalGroup(
- gl_pnlAccount.createParallelGroup(GroupLayout.Alignment.LEADING)
+ gl_pnlAccount.setHorizontalGroup(gl_pnlAccount.createParallelGroup(GroupLayout.Alignment.LEADING)
+ .addComponent(btnAccount)
.addGroup(gl_pnlAccount.createSequentialGroup()
.addContainerGap()
+ .addGap(10)
.addGroup(gl_pnlAccount.createParallelGroup(GroupLayout.Alignment.LEADING)
.addComponent(lblMail)
- .addComponent(lblPassword))
+ .addComponent(lblPassword)
+ )
.addPreferredGap(ComponentPlacement.RELATED)
.addGroup(gl_pnlAccount.createParallelGroup(GroupLayout.Alignment.LEADING)
.addComponent(fldPassword, GroupLayout.DEFAULT_SIZE, 306, Short.MAX_VALUE)
- .addComponent(fldMail, GroupLayout.DEFAULT_SIZE, 306, Short.MAX_VALUE))
- .addContainerGap())
+ .addComponent(fldMail, GroupLayout.DEFAULT_SIZE, 306, Short.MAX_VALUE)
+ )
+ .addContainerGap()
+ )
);
gl_pnlAccount.setVerticalGroup(
gl_pnlAccount.createParallelGroup(GroupLayout.Alignment.LEADING)
.addGroup(gl_pnlAccount.createSequentialGroup()
.addContainerGap()
+ .addComponent(btnAccount)
+ .addPreferredGap(ComponentPlacement.RELATED)
.addGroup(gl_pnlAccount.createParallelGroup(GroupLayout.Alignment.BASELINE)
.addComponent(lblMail)
.addComponent(fldMail, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE))
.addContainerGap(GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
);
+
+ final JRadioButton btnLoginCookie = new JRadioButton("ブラウザのログイン情報を使用してアクセスする");
+ final JRadioButton btnCookieIe = new JRadioButton("IE(7以降) (Windows)");
+ final JRadioButton btnCookieFirefox = new JRadioButton("Firefox(4以降) (Windows)");
+ final JRadioButton btnCookieChrome = new JRadioButton("Google Chrome (Windows)");
+ final JRadioButton btnCookieChromium = new JRadioButton("Chrome派生ブラウザ (Windows)");
+ final JRadioButton btnCookieOpera = new JRadioButton("Opera (Windows)");
+ final JRadioButton btnCookieOther = new JRadioButton("上記以外 - cookie保存ディレクトリを次に入力");
+ final JTextField fldCookie = new JTextField();
+ final JButton btnCookie = new JButton("...");
+ btnCookie.addActionListener(new FileChooseActionListener(this, JFileChooser.DIRECTORIES_ONLY, fldCookie));
+
+ final ButtonGroup grpLoginType = new ButtonGroup();
+ grpLoginType.add(btnAccount);
+ grpLoginType.add(btnLoginCookie);
+
+ final ButtonGroup grpCookie = new ButtonGroup();
+ grpCookie.add(btnCookieIe);
+ grpCookie.add(btnCookieFirefox);
+ grpCookie.add(btnCookieChrome);
+ grpCookie.add(btnCookieChromium);
+ grpCookie.add(btnCookieOpera);
+ grpCookie.add(btnCookieOther);
+
+ final JPanel pnlCookie = new JPanel();
+ pnlCookie.setBorder(BorderFactory.createTitledBorder("cookie"));
+ final GroupLayout glCookie = new GroupLayout(pnlCookie);
+ pnlCookie.setLayout(glCookie);
+ glCookie.setAutoCreateContainerGaps(true);
+ glCookie.setAutoCreateGaps(true);
+
+ glCookie.setHorizontalGroup(glCookie.createParallelGroup()
+ .addComponent(btnLoginCookie)
+ .addGroup(glCookie.createSequentialGroup()
+ .addGap(10)
+ .addGroup(glCookie.createParallelGroup()
+ .addComponent(btnCookieIe)
+ .addComponent(btnCookieFirefox)
+ .addComponent(btnCookieChrome)
+ .addComponent(btnCookieChromium)
+ .addComponent(btnCookieOpera)
+ .addComponent(btnCookieOther)
+ .addGroup(glCookie.createSequentialGroup()
+ .addComponent(fldCookie)
+ .addComponent(btnCookie)
+ )
+ )
+ )
+ );
+
+ glCookie.setVerticalGroup(glCookie.createSequentialGroup()
+ .addComponent(btnLoginCookie)
+ .addComponent(btnCookieIe)
+ .addComponent(btnCookieFirefox)
+ .addComponent(btnCookieChrome)
+ .addComponent(btnCookieChromium)
+ .addComponent(btnCookieOpera)
+ .addComponent(btnCookieOther)
+ .addGroup(glCookie.createParallelGroup(Alignment.BASELINE)
+ .addComponent(fldCookie)
+ .addComponent(btnCookie)
+ )
+ );
+
+
pnlProxy.setBorder(BorderFactory.createTitledBorder("プロキシ"));
cbProxyUse.setText("プロキシを使用する");
.addGroup(gl_pnlProxy.createParallelGroup(GroupLayout.Alignment.BASELINE)
.addComponent(lblProxyPort)
.addComponent(fldProxyPort, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE))
- .addContainerGap(39, Short.MAX_VALUE))
+ .addContainerGap())
);
+
GroupLayout gl_pnlNetwork = new GroupLayout(pnlNetwork);
pnlNetwork.setLayout(gl_pnlNetwork);
gl_pnlNetwork.setHorizontalGroup(
.addGroup(GroupLayout.Alignment.TRAILING, gl_pnlNetwork.createSequentialGroup()
.addContainerGap()
.addGroup(gl_pnlNetwork.createParallelGroup(GroupLayout.Alignment.TRAILING)
+ .addComponent(pnlAccount, GroupLayout.Alignment.LEADING, GroupLayout.DEFAULT_SIZE, GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+ .addComponent(pnlCookie, GroupLayout.Alignment.LEADING, GroupLayout.DEFAULT_SIZE, GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
.addComponent(pnlProxy, GroupLayout.Alignment.LEADING, GroupLayout.DEFAULT_SIZE, GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
- .addComponent(pnlAccount, GroupLayout.Alignment.LEADING, GroupLayout.DEFAULT_SIZE, GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
+ )
.addContainerGap())
);
gl_pnlNetwork.setVerticalGroup(
.addContainerGap()
.addComponent(pnlAccount, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE)
.addPreferredGap(ComponentPlacement.RELATED)
+ .addComponent(pnlCookie, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE)
+ .addPreferredGap(ComponentPlacement.RELATED)
.addComponent(pnlProxy, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE)
- .addContainerGap(178, Short.MAX_VALUE))
+ .addContainerGap()
+ )
);
tabbedPane.addTab("ネットワーク", pnlNetwork);
lblOutputFileNamePattern.setText("ファイル名規則");
btnOutputDir.addActionListener(
- new FileChooseAction(ConfigDialog.this, JFileChooser.DIRECTORIES_ONLY, fldOutputDir));
+ new FileChooseActionListener(ConfigDialog.this, JFileChooser.DIRECTORIES_ONLY, fldOutputDir));
cbOutputEnable.setText("変換");
lblCommentSize.setText("再生時間に応じたコメントの取得数");
- cbCommentSizeAuto.setText("自動調整");
-
lblCommentSizeManual.setText("手動取得");
lblCommentMinSize.setText("1分当たりのコメント取得数");
- cbCommentMinSizeAuto.setText("自動調整");
-
lblCommentMinSizeManual.setText("手動取得");
lblCommentDisplayMax.setText("1画面に表示する最大コメント数");
- cbCommentDisplaySizeDefault.setText("標準(30)");
-
lblCommentDisplayMaxManual.setText("手動設定");
GroupLayout gl_pnlCommentStandard = new GroupLayout(pnlCommentStandard);
.addComponent(lblCommentDisplayMax))
.addGroup(gl_pnlCommentStandard.createParallelGroup(GroupLayout.Alignment.LEADING)
.addComponent(cbCommentSizeAuto)
+ .addComponent(cbCommentMinDisable)
.addComponent(cbCommentMinSizeAuto)
.addComponent(cbCommentDisplaySizeDefault))
.addGroup(gl_pnlCommentStandard.createParallelGroup(GroupLayout.Alignment.LEADING)
.addComponent(fldCommentSizeManual))
.addGroup(gl_pnlCommentStandard.createParallelGroup(GroupLayout.Alignment.BASELINE)
.addComponent(lblCommentMinSize)
+ .addComponent(cbCommentMinDisable)
+ )
+ .addGroup(gl_pnlCommentStandard.createParallelGroup(GroupLayout.Alignment.BASELINE)
.addComponent(cbCommentMinSizeAuto)
.addComponent(lblCommentMinSizeManual)
.addComponent(fldCommentMinSizeManual))
cbCommentOpaque.setText("コメント透明化を行わない");
- btnFontPath.setText("...");
+ final JButton btnFontPath = new JButton("...");
+ btnFontPath.addActionListener(
+ new FileChooseActionListener(ConfigDialog.this, JFileChooser.FILES_ONLY, fldFontPath));
lblFontIndex.setText("フォント番号");
tabbedPane.addTab("コメント", pnlComment);
- jPanel10.setBorder(BorderFactory.createTitledBorder("ファイルパス"));
-
- lblFfmpegPath.setText("ffmpeg");
+ pnlFfmpegBinPath.setBorder(BorderFactory.createTitledBorder("ファイルパス"));
- lblFfmpegDllPath.setText("拡張ライブラリ");
+ final JButton btnFfmpegPath = new JButton("...");
+ btnFfmpegPath.addActionListener(
+ new FileChooseActionListener(ConfigDialog.this, JFileChooser.FILES_ONLY, fldFfmpegPath));
- btnFfmpegPath.setText("...");
+ final JButton btnFfmpegDllPath = new JButton("...");
+ btnFfmpegDllPath.addActionListener(
+ new FileChooseActionListener(ConfigDialog.this, JFileChooser.FILES_ONLY, fldFfmpegDllPath));
- btnFfmpegDllPath.setText("...");
+ final JButton btnMediaInfoPath = new JButton("...");
+ btnMediaInfoPath.addActionListener(
+ new FileChooseActionListener(ConfigDialog.this, JFileChooser.FILES_ONLY, fldMediaInfoPath));
- GroupLayout gl_jPanel10 = new GroupLayout(jPanel10);
- jPanel10.setLayout(gl_jPanel10);
+ GroupLayout gl_jPanel10 = new GroupLayout(pnlFfmpegBinPath);
+ pnlFfmpegBinPath.setLayout(gl_jPanel10);
gl_jPanel10.setHorizontalGroup(
gl_jPanel10.createParallelGroup(GroupLayout.Alignment.LEADING)
.addGroup(gl_jPanel10.createSequentialGroup()
.addContainerGap()
.addGroup(gl_jPanel10.createParallelGroup(GroupLayout.Alignment.LEADING)
+ .addComponent(lblFfmpegPath)
.addComponent(lblFfmpegDllPath)
- .addComponent(lblFfmpegPath))
+ .addComponent(lblMediaInfoPath)
+ )
.addPreferredGap(ComponentPlacement.RELATED)
.addGroup(gl_jPanel10.createParallelGroup(GroupLayout.Alignment.LEADING)
.addComponent(fldFfmpegDllPath, GroupLayout.Alignment.TRAILING, GroupLayout.DEFAULT_SIZE, 280, Short.MAX_VALUE)
- .addComponent(fldFfmpegPath, GroupLayout.Alignment.TRAILING, GroupLayout.DEFAULT_SIZE, 280, Short.MAX_VALUE))
+ .addComponent(fldFfmpegPath, GroupLayout.Alignment.TRAILING, GroupLayout.DEFAULT_SIZE, 280, Short.MAX_VALUE)
+ .addComponent(fldMediaInfoPath, GroupLayout.Alignment.TRAILING, GroupLayout.DEFAULT_SIZE, 280, Short.MAX_VALUE)
+ )
.addPreferredGap(ComponentPlacement.RELATED)
.addGroup(gl_jPanel10.createParallelGroup(GroupLayout.Alignment.LEADING)
.addComponent(btnFfmpegPath, GroupLayout.Alignment.TRAILING)
- .addComponent(btnFfmpegDllPath, GroupLayout.Alignment.TRAILING))
+ .addComponent(btnFfmpegDllPath, GroupLayout.Alignment.TRAILING)
+ .addComponent(btnMediaInfoPath, GroupLayout.Alignment.TRAILING)
+ )
.addContainerGap())
);
gl_jPanel10.setVerticalGroup(
.addComponent(lblFfmpegPath)
.addComponent(fldFfmpegPath, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE)
.addComponent(btnFfmpegPath))
- .addPreferredGap(ComponentPlacement.RELATED)
.addGroup(gl_jPanel10.createParallelGroup(GroupLayout.Alignment.BASELINE)
.addComponent(lblFfmpegDllPath)
.addComponent(fldFfmpegDllPath, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE)
.addComponent(btnFfmpegDllPath))
- .addContainerGap(GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
+ .addGroup(gl_jPanel10.createParallelGroup(GroupLayout.Alignment.BASELINE)
+ .addComponent(lblMediaInfoPath)
+ .addComponent(fldMediaInfoPath, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE)
+ .addComponent(btnMediaInfoPath))
+ )
);
pnlFfmpegParam.setBorder(BorderFactory.createTitledBorder("ffmpegパラメータ"));
+ // ffmpeg - その他
+ final JPanel pnlFffmpegEtc = new JPanel();
+ pnlFffmpegEtc.setBorder(BorderFactory.createTitledBorder("その他"));
+ final GroupLayout glFfmpegEtc = new GroupLayout(pnlFffmpegEtc);
+ glFfmpegEtc.setAutoCreateContainerGaps(true);
+ glFfmpegEtc.setAutoCreateGaps(true);
+ pnlFffmpegEtc.setLayout(glFfmpegEtc);
+
+ glFfmpegEtc.setHorizontalGroup(glFfmpegEtc.createParallelGroup()
+ .addComponent(cbDisplayConverting)
+ .addComponent(cbDllDisabled)
+ );
+ glFfmpegEtc.setVerticalGroup(glFfmpegEtc.createSequentialGroup()
+ .addComponent(cbDisplayConverting)
+ .addComponent(cbDllDisabled)
+ );
-
- GroupLayout gl_pnlFfmpeg = new GroupLayout(pnlFfmpeg);
- pnlFfmpeg.setLayout(gl_pnlFfmpeg);
- gl_pnlFfmpeg.setHorizontalGroup(
- gl_pnlFfmpeg.createParallelGroup(GroupLayout.Alignment.LEADING)
- .addGroup(GroupLayout.Alignment.TRAILING, gl_pnlFfmpeg.createSequentialGroup()
- .addContainerGap()
- .addGroup(gl_pnlFfmpeg.createParallelGroup(GroupLayout.Alignment.TRAILING)
- .addComponent(pnlFfmpegParam, GroupLayout.Alignment.LEADING, GroupLayout.DEFAULT_SIZE, GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
- .addComponent(jPanel10, GroupLayout.Alignment.LEADING, GroupLayout.DEFAULT_SIZE, GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
- .addContainerGap())
+ final GroupLayout glFfmpeg = new GroupLayout(pnlFfmpeg);
+ glFfmpeg.setAutoCreateContainerGaps(true);
+ pnlFfmpeg.setLayout(glFfmpeg);
+ glFfmpeg.setHorizontalGroup(glFfmpeg.createParallelGroup(GroupLayout.Alignment.LEADING)
+ .addComponent(pnlFfmpegBinPath)
+ .addComponent(pnlFfmpegParam)
+ .addComponent(pnlFffmpegEtc)
);
- gl_pnlFfmpeg.setVerticalGroup(
- gl_pnlFfmpeg.createParallelGroup(GroupLayout.Alignment.LEADING)
- .addGroup(gl_pnlFfmpeg.createSequentialGroup()
- .addContainerGap()
- .addComponent(jPanel10, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE)
- .addPreferredGap(ComponentPlacement.RELATED)
- .addComponent(pnlFfmpegParam, GroupLayout.DEFAULT_SIZE, GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
- .addContainerGap())
+ glFfmpeg.setVerticalGroup(glFfmpeg.createSequentialGroup()
+ .addComponent(pnlFfmpegBinPath, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE)
+ .addPreferredGap(ComponentPlacement.RELATED)
+ .addComponent(pnlFfmpegParam)
+ .addComponent(pnlFffmpegEtc)
);
tabbedPane.addTab("ffmpeg", pnlFfmpeg);
pnlSearchVideo.setBorder(BorderFactory.createTitledBorder("動画検索対象フォルダ"));
pnlSearchComment.setBorder(BorderFactory.createTitledBorder("コメント検索対象フォルダ"));
- pnlSearchCache.setBorder(BorderFactory.createEtchedBorder());
-
- lblSearchCache.setText("キャッシュ更新(秒)");
-
- GroupLayout gl_pnlSearchCache = new GroupLayout(pnlSearchCache);
- pnlSearchCache.setLayout(gl_pnlSearchCache);
- gl_pnlSearchCache.setHorizontalGroup(
- gl_pnlSearchCache.createParallelGroup(GroupLayout.Alignment.LEADING)
- .addGroup(gl_pnlSearchCache.createSequentialGroup()
- .addContainerGap()
- .addComponent(lblSearchCache)
- .addPreferredGap(ComponentPlacement.RELATED)
- .addComponent(fldSearchCache, GroupLayout.PREFERRED_SIZE, 55, GroupLayout.PREFERRED_SIZE)
- .addContainerGap(269, Short.MAX_VALUE))
- );
- gl_pnlSearchCache.setVerticalGroup(
- gl_pnlSearchCache.createParallelGroup(GroupLayout.Alignment.LEADING)
- .addGroup(gl_pnlSearchCache.createSequentialGroup()
- .addContainerGap()
- .addGroup(gl_pnlSearchCache.createParallelGroup(GroupLayout.Alignment.BASELINE)
- .addComponent(lblSearchCache)
- .addComponent(fldSearchCache, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE))
- .addContainerGap(GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
- );
+ final JLabel lblSearchNeedReboot = new JLabel(NEED_REBOOT);
GroupLayout gl_pnlSearch = new GroupLayout(pnlSearch);
pnlSearch.setLayout(gl_pnlSearch);
.addGroup(GroupLayout.Alignment.TRAILING, gl_pnlSearch.createSequentialGroup()
.addContainerGap()
.addGroup(gl_pnlSearch.createParallelGroup(GroupLayout.Alignment.TRAILING)
- .addComponent(pnlSearchCache, GroupLayout.Alignment.LEADING, GroupLayout.DEFAULT_SIZE, GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+ .addComponent(lblSearchNeedReboot, Alignment.CENTER)
.addComponent(pnlSearchComment, GroupLayout.Alignment.LEADING, GroupLayout.DEFAULT_SIZE, GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
.addComponent(pnlSearchVideo, GroupLayout.Alignment.LEADING, GroupLayout.DEFAULT_SIZE, GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
.addContainerGap())
gl_pnlSearch.createParallelGroup(GroupLayout.Alignment.LEADING)
.addGroup(gl_pnlSearch.createSequentialGroup()
.addContainerGap()
- .addComponent(pnlSearchVideo, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE)
+ .addComponent(lblSearchNeedReboot)
+ .addComponent(pnlSearchVideo, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
.addPreferredGap(ComponentPlacement.RELATED)
- .addComponent(pnlSearchComment, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE)
- .addPreferredGap(ComponentPlacement.RELATED)
- .addComponent(pnlSearchCache, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE)
- .addContainerGap(27, Short.MAX_VALUE))
+ .addComponent(pnlSearchComment, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+ .addContainerGap()
+ )
);
tabbedPane.addTab("検索", pnlSearch);
- final JPanel pnlButton = new JPanel();
- final JButton btnOk = new JButton("OK");
+ final JButton btnOk = new JButton("保存");
btnOk.addActionListener(new ActionListener() {
@Override
dispose();
}
});
- final JButton btnCancel = new JButton("Cancel");
+ final JButton btnCancel = new JButton("取消");
btnCancel.addActionListener(new ActionListener() {
@Override
dispose();
}
});
- pnlButton.add(btnOk);
- pnlButton.add(btnCancel);
+ final JPanel pnlButton = new JPanel();
+
+ final GroupLayout glButton = new GroupLayout(pnlButton);
+ pnlButton.setLayout(glButton);
+ glButton.setHorizontalGroup(glButton.createSequentialGroup()
+ .addPreferredGap(ComponentPlacement.UNRELATED, PREFERRED_SIZE, Short.MAX_VALUE)
+ .addComponent(btnOk)
+ .addPreferredGap(ComponentPlacement.UNRELATED)
+ .addComponent(btnCancel)
+ .addContainerGap()
+ );
+ glButton.setVerticalGroup(glButton.createSequentialGroup()
+ .addGroup(glButton.createParallelGroup(Alignment.BASELINE)
+ .addComponent(btnOk)
+ .addComponent(btnCancel)
+ )
+ );
GroupLayout layout = new GroupLayout(getContentPane());
+ layout.setAutoCreateContainerGaps(true);
getContentPane().setLayout(layout);
layout.setHorizontalGroup(
layout.createParallelGroup(GroupLayout.Alignment.LEADING)
);
layout.setVerticalGroup(
layout.createSequentialGroup()
- .addComponent(tabbedPane,GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE, GroupLayout.PREFERRED_SIZE)
+ .addComponent(tabbedPane,GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE, Short.MAX_VALUE)
.addComponent(pnlButton)
);
final JLabel lblSystemWaitDownload = new JLabel("ダウンロード開始最小間隔(秒)");
final JLabel lblSystemThreadConvert = new JLabel("変換スレッド数");
final JLabel lblSystemTempDir = new JLabel("作業フォルダ");
+ final JButton btnSystemTempDir = new JButton("...");
+ btnSystemTempDir.addActionListener(
+ new FileChooseActionListener(ConfigDialog.this, JFileChooser.DIRECTORIES_ONLY, fldSystemTempDir));
+
+ mdlSystemThreadDownload.setMinimum(1);
+ final JSpinner fldSystemThreadDownload = new JSpinner(mdlSystemThreadDownload);
+ mdlSystemWaitDownload.setMinimum(0);
+ final JSpinner fldSystemWaitDownload = new JSpinner(mdlSystemWaitDownload);
+ mdlSystemThreadConvert.setMinimum(1);
+ final JSpinner fldSystemThreadConvert = new JSpinner(mdlSystemThreadConvert);
final JPanel pnlSystemGeneral = new JPanel();
pnlSystemGeneral.setBorder(BorderFactory.createTitledBorder("システム"));
.addComponent(lblSystemWaitDownload)
.addComponent(lblSystemThreadConvert))
.addGroup(glSystemGenegal.createParallelGroup()
- .addComponent(fldSystemThreadDownload, PREFERRED_SIZE, 40, PREFERRED_SIZE)
- .addComponent(fldSystemWaitDownload, PREFERRED_SIZE, 40, PREFERRED_SIZE)
- .addComponent(fldSystemThreadConvert, PREFERRED_SIZE, 40, PREFERRED_SIZE)
+ .addComponent(fldSystemThreadDownload, PREFERRED_SIZE, 50, PREFERRED_SIZE)
+ .addComponent(fldSystemWaitDownload, PREFERRED_SIZE, 55, PREFERRED_SIZE)
+ .addComponent(fldSystemThreadConvert, PREFERRED_SIZE, 50, PREFERRED_SIZE)
)
)
.addGroup(glSystemGenegal.createSequentialGroup()
.addComponent(lblSystemTempDir)
.addComponent(fldSystemTempDir, DEFAULT_SIZE, 400, Short.MAX_VALUE)
+ .addComponent(btnSystemTempDir)
)
);
.addComponent(fldSystemThreadConvert, DEFAULT_SIZE, PREFERRED_SIZE, PREFERRED_SIZE))
.addGroup(glSystemGenegal.createParallelGroup(Alignment.BASELINE)
.addComponent(lblSystemTempDir)
- .addComponent(fldSystemTempDir, DEFAULT_SIZE, PREFERRED_SIZE, PREFERRED_SIZE)));
+ .addComponent(fldSystemTempDir, DEFAULT_SIZE, PREFERRED_SIZE, PREFERRED_SIZE)
+ .addComponent(btnSystemTempDir)
+ )
+ );
+
+ final JLabel lblSystemNeedReboot = new JLabel("設定を有効にするにはいんきゅばすの再起動が必要です");
final JPanel pnlSystem = new JPanel();
pnlSystem.setBorder(BorderFactory.createEmptyBorder(1, 1, 1, 1));
pnlSystem.setLayout(glSystem);
glSystem.setHorizontalGroup(glSystem.createParallelGroup()
+ .addComponent(lblSystemNeedReboot, Alignment.CENTER)
.addComponent(pnlSystemGeneral));
glSystem.setVerticalGroup(glSystem.createSequentialGroup()
+ .addComponent(lblSystemNeedReboot)
.addComponent(pnlSystemGeneral));
tabbedPane.add("システム", pnlSystem);
pack();
- setResizable(false);
+ setMinimumSize(getSize());
loadConfig();
}
- /**
- * @param args the command line arguments
- */
- public static void main(String args[]) {
- /* Set the Nimbus look and feel */
- /* If Nimbus (introduced in Java SE 6) is not available, stay with the default look and feel.
- * For details see http://download.oracle.com/javase/tutorial/uiswing/lookandfeel/plaf.html
- */
- try {
- for (UIManager.LookAndFeelInfo info : UIManager.getInstalledLookAndFeels()) {
- if ("Nimbus".equals(info.getName())) {
- UIManager.setLookAndFeel(info.getClassName());
- break;
- }
- }
- } catch (ClassNotFoundException | InstantiationException | IllegalAccessException | UnsupportedLookAndFeelException ex) {
- java.util.logging.Logger.getLogger(ConfigDialog.class.getName()).log(java.util.logging.Level.SEVERE, null, ex);
- }
-
- /* Create and display the form */
- java.awt.EventQueue.invokeLater(new Runnable() {
-
- @Override
- public void run() {
- new ConfigDialog().setVisible(true);
- }
- });
- }
- // Variables declaration - do not modify//GEN-BEGIN:variables
-
// ネットワーク
// ネットワーク - アカウント
private final JTextField fldMail;
- private final JTextField fldPassword;
+ private final JPasswordField fldPassword = new JPasswordField();
// ネットワーク - プロキシ
private final JCheckBox cbProxyUse;
- private final JTextField fldProxyHost;
- private final JTextField fldProxyPort;
+ private final JTextField fldProxyHost = new JTextField();
+ private final NumberFormattedTextField fldProxyPort = new NumberFormattedTextField();
// ファイル
// ファイル - 動画
private final DownloadLocationPanel pnlFileVideo = new DownloadLocationPanel();
private final JTextField fldReplaceTo = new JTextField();
// コメント
// コメント
- private final JCheckBox cbCommentSizeAuto;
- private final JTextField fldCommentSizeManual;
- private final JCheckBox cbCommentMinSizeAuto;
- private final JTextField fldCommentMinSizeManual;
- private final JCheckBox cbCommentDisplaySizeDefault;
- private final JTextField fldCommentDisplaySizeManual;
+ private final JCheckBox cbCommentSizeAuto = new JCheckBox("自動調整");
+ private final NumberFormattedTextField fldCommentSizeManual = new NumberFormattedTextField();
+ private final JCheckBox cbCommentMinDisable = new JCheckBox("少コメ");
+ private final JCheckBox cbCommentMinSizeAuto = new JCheckBox("自動調整");
+ private final NumberFormattedTextField fldCommentMinSizeManual = new NumberFormattedTextField();
+ private final JCheckBox cbCommentDisplaySizeDefault = new JCheckBox("標準(30)");
+ private final NumberFormattedTextField fldCommentDisplaySizeManual = new NumberFormattedTextField();
// コメント - 高度な設定
private final JTextField fldFontPath;
- private final JButton btnFontPath;
private final JTextField fldFontIndex;
private final JComboBox<String> cmbFontShadow = new JComboBox<>();
private final JCheckBox cbFontSizeArrangeDisable;
private final JCheckBox cbCommentOpaque;
// ffmpeg
// ffmpeg - ファイルパス
- private final JTextField fldFfmpegPath;
- private final JButton btnFfmpegPath;
- private final JTextField fldFfmpegDllPath;
- private final JButton btnFfmpegDllPath;
+ private final JTextField fldFfmpegPath = new JTextField();
+ private final JTextField fldFfmpegDllPath = new JTextField();
+ private final JTextField fldMediaInfoPath = new JTextField();
// ffmpeg - ffmpegパラメータ
private final FfmpegParamPanel pnlFfmpegParam = new FfmpegParamPanel();
+ // ffmpeg - その他
+ private final JCheckBox cbDisplayConverting = new JCheckBox("変換中動画表示");
+ private final JCheckBox cbDllDisabled = new JCheckBox("拡張DLL無効化(デバッグ用)");
// NG設定
// NG設定 - NGワード
private final NgRegisterPanel pnlNgWord = new NgRegisterPanel();
private final DirectoryRegisterPanel pnlSearchVideo = new DirectoryRegisterPanel();
// 検索 - コメント検索対象フォルダ
private final DirectoryRegisterPanel pnlSearchComment = new DirectoryRegisterPanel();
- // 検索 - キャッシュ更新(秒)
- private final JTextField fldSearchCache;
// システム
- private final JTextField fldSystemThreadDownload = new JTextField();
- private final JTextField fldSystemWaitDownload = new JTextField();
- private final JTextField fldSystemThreadConvert = new JTextField();
+ private final SpinnerNumberModel mdlSystemThreadDownload = new SpinnerNumberModel();
+ private final SpinnerNumberModel mdlSystemWaitDownload = new SpinnerNumberModel();
+ private final SpinnerNumberModel mdlSystemThreadConvert = new SpinnerNumberModel();
private final JTextField fldSystemTempDir = new JTextField();
*/
cbCommentSizeAuto.setSelected(p.getCommentSizeAutosize());
fldCommentSizeManual.setText(p.getCommentSizeManual());
+ cbCommentMinDisable.setSelected(p.getCommentMinDisabled());
cbCommentMinSizeAuto.setSelected(p.getCommentMinSizeAutosize());
fldCommentSizeManual.setText(p.getCommentMinSizeManual());
cbCommentDisplaySizeDefault.setSelected(p.getCommentDisplaySizeDefault());
*/
fldFfmpegPath.setText(p.getFfmpegPath());
fldFfmpegDllPath.setText(p.getFfmpegDllPath());
+ fldMediaInfoPath.setText(p.getMediaInfoPath());
/*
* ffmpeg - ffmpegパラメータ
pnlFfmpegParam.init(p);
/*
+ * ffmpeg - その他
+ */
+ cbDisplayConverting.setSelected(p.getFfmpegDisplayConverting());
+ cbDllDisabled.setSelected(p.getFfmpegDllDisabled());
+
+ /*
* NG 設定
*/
final List<String> ngWords = p.getNgWords();
/*
* システム
*/
- fldSystemThreadDownload.setText(Integer.toString(p.getSystemDownloadThread()));
- fldSystemWaitDownload.setText(Integer.toString(p.getSystemDownloadWait()));
- fldSystemThreadConvert.setText(Integer.toString(p.getSystemConvertThread()));
+ mdlSystemThreadDownload.setValue(p.getSystemDownloadThread());
+ mdlSystemWaitDownload.setValue(p.getSystemDownloadWait());
+ mdlSystemThreadConvert.setValue(p.getSystemConvertThread());
fldSystemTempDir.setText(p.getSystemTempDir());
}
*/
p.setId(fldMail.getText());
- p.setPassword(fldPassword.getText());
+ p.setPassword(String.valueOf(fldPassword.getPassword()));
/*
* ネットワーク - プロキシ
*/
p.setCommentSizeAutosize(cbCommentSizeAuto.isSelected());
p.setCommentSizeManual(fldCommentSizeManual.getText());
+ p.setCommentMinDisabled(cbCommentMinDisable.isSelected());
p.setCommentMinSizeAutosize(cbCommentMinSizeAuto.isSelected());
p.setCommentMinSizeManual(fldCommentSizeManual.getText());
p.setCommentDisplaySizeDefault(cbCommentDisplaySizeDefault.isSelected());
*/
p.setFfmpegPath(fldFfmpegPath.getText());
p.setFfmpegDllPath(fldFfmpegDllPath.getText());
+ p.setMediaInfoPath(fldMediaInfoPath.getText());
/*
* ffmpeg - ffmpegパラメータ
p.setFfmpegKeepAspect(pnlFfmpegParam.cbFfmpegOptionKeepAspect.isSelected());
/*
+ * ffmpeg - その他
+ */
+ p.setFfmpegDisplayConverting(cbDisplayConverting.isSelected());
+ p.setFfmpegDllDisabled(cbDllDisabled.isSelected());
+
+ /*
* NG 設定
*/
p.setNgWords(pnlNgWord.getAllElements());
/*
* システム
*/
- p.setSystemDownloadThread(Integer.parseInt(fldSystemThreadDownload.getText()));
- p.setSystemDownloadWait(Integer.parseInt(fldSystemWaitDownload.getText()));
- p.setSystemConvertThread(Integer.parseInt(fldSystemThreadConvert.getText()));
+ p.setSystemDownloadThread(mdlSystemThreadDownload.getNumber().intValue());
+ p.setSystemDownloadWait(mdlSystemWaitDownload.getNumber().intValue());
+ p.setSystemConvertThread(mdlSystemThreadConvert.getNumber().intValue());
p.setSystemTempDir(fldSystemTempDir.getText());
try {
p.save();
} catch (ConfigurationException ex) {
- logger.log(Level.SEVERE, "コンフィグファイル保存に失敗", ex);
+ logger.error("コンフィグファイル保存に失敗", ex);
}
}
}
class DownloadLocationPanel extends JPanel {
+
+ private static final long serialVersionUID = 1L;
final JTextField fldDir = new JTextField();
final JTextField fldFileNamePattern = new JTextField();
final JCheckBox cbLocal = new JCheckBox("local");
final JButton btnDir = new JButton("...");
btnDir.addActionListener(
- new FileChooseAction(DownloadLocationPanel.this, JFileChooser.DIRECTORIES_ONLY, fldDir));
+ new FileChooseActionListener(DownloadLocationPanel.this, JFileChooser.DIRECTORIES_ONLY, fldDir));
final GroupLayout gl = new GroupLayout(this);
setLayout(gl);
OSDN Git Service
