README

From: yuki Date: Fri, 27 May 2011 18:44:06 +0000 (+0000) Subject: Merging revisions 378-423 of 20100515_frontend_testing X-Git-Tag: rel20100722_ver1.4.4 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=refs%2Fremotes%2Fgit-svn;p=coroid%2Finqubus.git Merging revisions 378-423 of 20100515_frontend_testing git-svn-id: http://192.168.11.7/svn/saccubus/trunk@424 c066991c-cf13-ec4a-a49a-846e61667af5 --- diff --git a/frontend/README.html b/frontend/README.html index cad72e1..be68b32 100644 --- a/frontend/README.html +++ b/frontend/README.html @@ -1,16 +1,10 @@ - - - - README - - -

+ + + README +

æ¬ããã°ã©ã ã«ã¤ãã¦

æ¹æ£èä½æ¨©æ³ã«é¢ãã¦çæäºé
@@ -26,8 +20,7 @@
æç¨¿èã³ã¡ã³ãã®ãã¦ã³ãã¼ããåç»ã¸ã®ä»ä¸ã

å¬å¼åç»(soã§å§ã¾ãåç»)ã®ã³ã¡ã³ããã¦ã³ãã¼ããå¤æã

-
ãã ããURLã®å¥åã«ã¯æªå¯¾å¿ãhttp://www.nicovideo.jp/watch/so8900221 +
ãã ããURLã®å¥åã«ã¯æªå¯¾å¿ãhttp://www.nicovideo.jp/watch/so8900221 ã§ãªã http://www.nicovideo.jp/watch/1259333700 ã¨å¥åããå¿è¦ãããã

@@ -55,8 +48,7 @@
ã¾ããLinuxã§åä½ãããå ´åã«ã¯ãä¸è¨ä»¥å¤ã«SDL, SDL_ttf, SDL_gfxã®å°å¥ãå¿è¦ã§ãã

NicoBrowseræ¡å¼µæ©è½ãä½¿ç¨ããå ´åãNicoBrowser ver.0.1.1ä»¥éãã»ããã¢ããããã¦ããå¿è¦ãããã¾ãã
-
Windows VistaãWindows7ã§ã¯DEPæ©è½ã«ãã£ã¦ffmpegãæ£å¸¸ã«åä½ããªãããã§ãããã®å ´åã¯ãã +
Windows VistaãWindows7ã§ã¯DEPæ©è½ã«ãã£ã¦ffmpegãæ£å¸¸ã«åä½ããªãããã§ãããã®å ´åã¯ãã ã¡ããåèã«ãã¦ãbinãã£ã¬ã¯ããªã«ããffmpeg.exeãDEPå¯¾è±¡ããå¤ãã¦ä¸ããã

æ¬ããã°ã©ã ã®å°å¥æ¹æ³
@@ -69,25 +61,29 @@

æ¡å¼µæ©è½ã®ä½¿ãæ¹
-

+

ãããã°ããèµ·åããä¸å³æ åã®ã©ã¸ãªãã¿ã³ãNicoBrowserãã¦ã³ãã¼ããã¡ã¤ã«ãç¨ããããã¯ãªãã¯ããããã¹ã ãã£ã¼ã«ãã«ãã¡ã¤ã«ããã©ãã°&ããããããããã¯ç´æ¥å¥åããã

æ³¨æç¹

-
ipumãNicoBrowser +
ipumãNicoBrowser ã¨ã®åæèµ·åã¯è¡ããªãã

Windows Vistaã7ã§ã¯ãããã°ãã®å¤æå¦çãé²ã¾ãªãå ´åãããããããå¯¾å¦æ¹æ³ã¯åè¿°ãåä½ç°å¢ããåç§ã

-
æ´æ°å±¥æ´
+
æ´æ°å±¥æ´
+
2010/06/05 ver.1.4.4
+ã³ã³ãã£ã°ãã¼ãæãå¥åã³ã¡ã³ããã¿ãã®ãã³ã¡ã³ãåå¾æ°ã¯èªåã§èª¿æ´ããããã§ãã¯ããã¯ã¹ã¨ãã©ã«ã/ãã¡ã¤ã«ä¿åé¸æã©ã¸ãªãã¿ã³ã®å¤ãèª¤ã£ã¦èªã¿è¾¼ãã§ããåé¡ãä¿®æ£ã
+éå»ãã°åå¾URLå¤æ´ã«å¯¾å¿(ver.1.4.2ã¨åæ§)ã +
+
2010/05/29 ver.1.4.3
+æç¨¿èã³ã¡ã³ããå¤æå¾åé¤ãããªãã·ã§ã³ãä¿åã§ãã¦ããªãã£ãåé¡ã®ä¿®æ£ã
+ãã¡ã¤ã«ãã¥ã¼ã¶ãã¤ã¢ãã°ã§ãã¡ã¤ã«é¸æå¾ã1éå±¤ä¸ã®ãã£ã¬ã¯ããªãé¸æããã¦ãã¾ãåé¡ã®ä¿®æ£ã
+å¥åæç¨¿èã³ã¡ã³ãã¿ãçã®ãã¿ã³ãæ©è½ãã¦ããªãã£ãåé¡ã®ä¿®æ£ã
+åå¥åãã¡ã¤ã«(åç»ãã³ã¡ã³ããæç¨¿èã³ã¡ã³ã)ãèªåå½åã§åä¸ãã£ã¬ã¯ããªã«ä¿åããããã«è¨å®ãã¦ããå ´åãæ£ãããã¡ã¤ã«å½åã§ããªãã£ãåé¡ãä¿®æ£ãããã«ä¼´ããæç¨¿èã³ã¡ã³ããã¡ã¤ã«ã®æ¡å¼µåã.txmlã«ããã(ã³ã¡ã³ããã¡ã¤ã«ã¨åºå¥ã§ããããã«) +

2010/05/13 ver.1.4.2
ãµã¼ãã¹ã®ã¢ã¯ã»ã¹URLå¤æ´ã«å¯¾å¿ã

@@ -140,5 +136,4 @@ UIã®è¦ç´ãã

2009/12/03 ver.0.0.0
åç

- - + \ No newline at end of file diff --git a/frontend/fest-swing_mapping.txt b/frontend/fest-swing_mapping.txt new file mode 100644 index 0000000..31f0697 --- /dev/null +++ b/frontend/fest-swing_mapping.txt @@ -0,0 +1,32 @@ +-, MINUS, NO_MASK +^, CIRCUMFLEX, NO_MASK +@, AT, NO_MASK +[, OPEN_BRACKET, NO_MASK +;, SEMICOLON, NO_MASK +:, COLON, NO_MASK +], CLOSE_BRACKET, NO_MASK +COMMA, COMMA, NO_MASK +., PERIOD, NO_MASK +/, SLASH, NO_MASK +\, BACK_SLASH, NO_MASK +!, 1, SHIFT_MASK +", 2, SHIFT_MASK +#, 3, SHIFT_MASK +$, 4, SHIFT_MASK +%, 5, SHIFT_MASK +&, 6, SHIFT_MASK +', 7, SHIFT_MASK +(, 8, SHIFT_MASK +), 9, SHIFT_MASK +=, MINUS, SHIFT_MASK +~, CIRCUMFLEX, SHIFT_MASK +|, BACK_SLASH, SHIFT_MASK +`, AT, SHIFT_MASK +{, OPEN_BRACKET, SHIFT_MASK ++, SEMICOLON, SHIFT_MASK +, COLON, SHIFT_MASK +}, CLOSE_BRACKET, SHIFT_MASK +<, COMMA, SHIFT_MASK +>, PERIOD, SHIFT_MASK +?, SLASH, SHIFT_MASK +_, BACK_SLASH, SHIFT_MASK diff --git a/frontend/nbproject/project.properties b/frontend/nbproject/project.properties index 0dbde39..b7821c2 100644 --- a/frontend/nbproject/project.properties +++ b/frontend/nbproject/project.properties @@ -22,6 +22,7 @@ dist.jar=${dist.dir}/Saccubus.jar dist.javadoc.dir=${dist.dir}/javadoc endorsed.classpath= excludes= +file.reference.jmockit.jar=F:\\data\\java\\jmockit-0.998\\jmockit.jar includes= jar.compress=false javac.classpath=\ @@ -44,7 +45,9 @@ javac.target=1.5 javac.test.classpath=\ ${javac.classpath}:\ ${build.classes.dir}:\ - ${libs.junit_4.classpath} + ${libs.junit_4.classpath}:\ + ${libs.FEST-Swing.classpath}:\ + ${file.reference.jmockit.jar} javadoc.additionalparam= javadoc.author=false javadoc.encoding=${source.encoding} diff --git a/frontend/src/saccubus/MainFrame.java b/frontend/src/saccubus/MainFrame.java index aff93ff..5ba3343 100644 --- a/frontend/src/saccubus/MainFrame.java +++ b/frontend/src/saccubus/MainFrame.java @@ -77,7 +77,7 @@ import yukihane.nicovideo.NicoDBFinder; public class MainFrame extends JFrame { private static final long serialVersionUID = 2564486741331062989L; - public static final String VERSION = "1.22r NicoBrowserg£ 1.4.2"; + public static final String VERSION = "1.22r NicoBrowserg£ 1.4.4"; public static final Image WinIcon = Toolkit.getDefaultToolkit().createImage(saccubus.MainFrame.class.getResource( "icon32.png")); // TODO GUIª³¢½ßtB[hÉÛ. @@ -90,7 +90,7 @@ public class MainFrame extends JFrame { JMenu jMenuHelp = new JMenu(); JMenuItem jMenuHelpAbout = new JMenuItem(); JLabel statusBar = new JLabel(); - JTabbedPane MainTabbedPane = new JTabbedPane(); + JTabbedPane mainTabbedPane = new JTabbedPane(); JPanel SavingInfoTabPanel = new JPanel(); JPanel FFMpegTabPanel = new JPanel(); JPanel VideoInfoPanel = new JPanel(); @@ -101,16 +101,37 @@ public class MainFrame extends JFrame { public static final String DoButtonWaitString = "Ò@"; JPanel UserInfoPanel = new JPanel(); GridBagLayout gridBagLayout3 = new GridBagLayout(); - JLabel MailAddrLabel = new JLabel(); - JTextField MailAddrField = new JTextField(); - JLabel PasswordLabel = new JLabel(); - JPasswordField PasswordField = new JPasswordField(); + // [UÝè + JLabel mailAddressLabel = new JLabel(); + JTextField mailAddressField = new JTextField(); + JLabel passwordLabel = new JLabel(); + JPasswordField passwordField = new JPasswordField(); GridBagLayout gridBagLayout4 = new GridBagLayout(); GridBagLayout gridBagLayout6 = new GridBagLayout(); ButtonGroup CommentSaveButtonGroup = new ButtonGroup(); ButtonGroup ConvSaveButtonGroup = new ButtonGroup(); + private void setNames() { + mainTabbedPane.setName("mainTabbedPane"); + + mailAddressField.setName("mailAddressField"); + passwordField.setName("passwordField"); + + ffmpegPathField.setName("ffmpegPathField"); + vhookPathField.setName("vhookPathField"); + + mainOptionField.setName("mainOptionField"); + inputOptionField.setName("inputOptionField"); + outputOptionField.setName("outputOptionField"); + + fontPathField.setName("fontPathField"); + fontIndexField.setName("fontIndexField"); + showConvVideoCheckBox.setName("showConvVideoCheckBox"); + } + public MainFrame() { + setNames(); + videoSaveInfoPanel = savePanel.getVideoSaveInfoPanel(); try { @@ -368,8 +389,8 @@ public class MainFrame extends JFrame { SavingInfoTabPanel.setLayout(new GridLayout()); UserInfoPanel.setBorder(BorderFactory.createTitledBorder(BorderFactory.createEtchedBorder(), "[UÝè")); UserInfoPanel.setLayout(gridBagLayout3); - MailAddrLabel.setText("[AhX"); - PasswordLabel.setText("pX[h"); + mailAddressLabel.setText("[AhX"); + passwordLabel.setText("pX[h"); setListenerToSavePanelButton(); @@ -395,10 +416,10 @@ public class MainFrame extends JFrame { SettingFontPathButton.setText("QÆ"); SettingFontPathButton.addActionListener(new MainFrame_SettingFontPathButton_actionAdapter( this)); - ShowConvVideoCheckBox.setText("Ï·Ìæð\¦·é"); - InLabel.setText("üÍIvV"); - OutLabel.setText("oÍIvV"); - MainOptionLabel.setText("CIvV"); + showConvVideoCheckBox.setText("Ï·Ìæð\¦·é"); + inputOptionLabel.setText("üÍIvV"); + outputOptionLabel.setText("oÍIvV"); + mainOptionLabel.setText("CIvV"); FontIndexLabel.setText("tHgÔ"); VideoID_Label.setText("URL/ID"); WayBackLabel.setText("ßO"); @@ -412,40 +433,40 @@ public class MainFrame extends JFrame { setJMenuBar(jMenuBar1); contentPane.add(statusBar, BorderLayout.SOUTH); - contentPane.add(MainTabbedPane, java.awt.BorderLayout.CENTER); + contentPane.add(mainTabbedPane, java.awt.BorderLayout.CENTER); contentPane.add(VideoInfoPanel, java.awt.BorderLayout.NORTH); - UserInfoPanel.add(PasswordField, new GridBagConstraints(1, 1, 1, 1, + UserInfoPanel.add(passwordField, new GridBagConstraints(1, 1, 1, 1, 1.0, 0.0, GridBagConstraints.CENTER, GridBagConstraints.BOTH, new Insets(0, 5, 5, 5), 0, 0)); - UserInfoPanel.add(MailAddrField, new GridBagConstraints(1, 0, 1, 1, + UserInfoPanel.add(mailAddressField, new GridBagConstraints(1, 0, 1, 1, 1.0, 0.0, GridBagConstraints.CENTER, GridBagConstraints.BOTH, new Insets(0, 5, 5, 5), 0, 0)); - UserInfoPanel.add(PasswordLabel, new GridBagConstraints(0, 1, 1, 1, + UserInfoPanel.add(passwordLabel, new GridBagConstraints(0, 1, 1, 1, 0.0, 0.0, GridBagConstraints.EAST, GridBagConstraints.NONE, new Insets(0, 5, 5, 0), 0, 0)); - UserInfoPanel.add(MailAddrLabel, new GridBagConstraints(0, 0, 1, 1, + UserInfoPanel.add(mailAddressLabel, new GridBagConstraints(0, 0, 1, 1, 0.0, 0.0, GridBagConstraints.EAST, GridBagConstraints.NONE, new Insets(0, 5, 5, 0), 0, 0)); - PathSettingPanel.add(FFmpegPathField, new GridBagConstraints(0, 1, 1, + PathSettingPanel.add(ffmpegPathField, new GridBagConstraints(0, 1, 1, 1, 1.0, 0.0, GridBagConstraints.CENTER, GridBagConstraints.BOTH, new Insets(0, 5, 0, 5), 0, 0)); PathSettingPanel.add(SettingFFmpegPathButton, gridBagConstraints74); PathSettingPanel.add(FFmpegPathLabel, new GridBagConstraints(0, 0, 2, 1, 1.0, 0.0, GridBagConstraints.WEST, GridBagConstraints.NONE, new Insets(0, 5, 5, 5), 0, 0)); - PathSettingPanel.add(VhookPathField, new GridBagConstraints(0, 3, 1, 1, + PathSettingPanel.add(vhookPathField, new GridBagConstraints(0, 3, 1, 1, 1.0, 0.0, GridBagConstraints.CENTER, GridBagConstraints.BOTH, new Insets(0, 5, 5, 5), 0, 0)); PathSettingPanel.add(SettingVhookPathButton, new GridBagConstraints(1, 3, 1, 1, 0.0, 0.0, GridBagConstraints.CENTER, GridBagConstraints.BOTH, new Insets(0, 0, 5, 5), 0, 0)); PathSettingPanel.add(VhookPathLabel, gridBagConstraints54); - FFmpegSettingPanel.add(CommandLineOutOptionField, gridBagConstraints53); - FFmpegSettingPanel.add(CommandLineInOptionField, gridBagConstraints52); - FFmpegSettingPanel.add(MainOptionField, gridBagConstraints51); - FFmpegSettingPanel.add(MainOptionLabel, gridBagConstraints48); - FFmpegSettingPanel.add(InLabel, gridBagConstraints49); - FFmpegSettingPanel.add(OutLabel, gridBagConstraints50); + FFmpegSettingPanel.add(outputOptionField, gridBagConstraints53); + FFmpegSettingPanel.add(inputOptionField, gridBagConstraints52); + FFmpegSettingPanel.add(mainOptionField, gridBagConstraints51); + FFmpegSettingPanel.add(mainOptionLabel, gridBagConstraints48); + FFmpegSettingPanel.add(inputOptionLabel, gridBagConstraints49); + FFmpegSettingPanel.add(outputOptionLabel, gridBagConstraints50); FFmpegSettingPanel.add(getFFmpegOptionComboBoxPanel(), gridBagConstraints55); FFmpegSettingPanel.add(ExtOptionLabel, gridBagConstraints56); @@ -459,17 +480,17 @@ public class MainFrame extends JFrame { OpPanel.add(WayBackLabel, gridBagConstraints69); OpPanel.add(WayBackField, gridBagConstraints70); - MainTabbedPane.add(BasicInfoTabPanel, "î{Ýè"); - MainTabbedPane.add(SavingInfoTabPanel, "Û¶Ýè"); - MainTabbedPane.add(FFMpegTabPanel, "®æÝè"); - MainTabbedPane.addTab("Ï·Ýè", null, getConvertingSettingPanel(), null); + mainTabbedPane.add(BasicInfoTabPanel, "î{Ýè"); + mainTabbedPane.add(SavingInfoTabPanel, "Û¶Ýè"); + mainTabbedPane.add(FFMpegTabPanel, "®æÝè"); + mainTabbedPane.addTab("Ï·Ýè", null, getConvertingSettingPanel(), null); SavingInfoTabPanel.add(savePanel); BasicInfoTabPanel.add(UserInfoPanel, gridBagConstraints7); BasicInfoTabPanel.add(getProxyInfoPanel(), gridBagConstraints6); VhookSettingPanel.add(FontPathLabel, gridBagConstraints59); - VhookSettingPanel.add(ShowConvVideoCheckBox, gridBagConstraints63); - VhookSettingPanel.add(FontPathField, gridBagConstraints60); - VhookSettingPanel.add(FontIndexField, gridBagConstraints62); + VhookSettingPanel.add(showConvVideoCheckBox, gridBagConstraints63); + VhookSettingPanel.add(fontPathField, gridBagConstraints60); + VhookSettingPanel.add(fontIndexField, gridBagConstraints62); VhookSettingPanel.add(FontIndexLabel, gridBagConstraints61); VhookSettingPanel.add(SettingFontPathButton, gridBagConstraints64); VhookSettingPanel.add(getFixFontSizeCheckBox(), gridBagConstraints14); @@ -511,12 +532,12 @@ public class MainFrame extends JFrame { } private void setPopup() { - MainOptionField.addMouseListener(new PopupRightClick( - this.MainOptionField)); - CommandLineInOptionField.addMouseListener(new PopupRightClick( - this.CommandLineInOptionField)); - CommandLineOutOptionField.addMouseListener(new PopupRightClick( - this.CommandLineOutOptionField)); + mainOptionField.addMouseListener(new PopupRightClick( + this.mainOptionField)); + inputOptionField.addMouseListener(new PopupRightClick( + this.inputOptionField)); + outputOptionField.addMouseListener(new PopupRightClick( + this.outputOptionField)); savePanel.getCommentNumField().addMouseListener(new PopupRightClick( savePanel.getCommentNumField())); @@ -537,27 +558,27 @@ public class MainFrame extends JFrame { videoSaveInfoPanel.getNibrFileField().addMouseListener( new PopupRightClick(videoSaveInfoPanel.getNibrFileField())); - FFmpegPathField.addMouseListener(new PopupRightClick( - this.FFmpegPathField)); - VhookPathField.addMouseListener(new PopupRightClick(this.VhookPathField)); + ffmpegPathField.addMouseListener(new PopupRightClick( + this.ffmpegPathField)); + vhookPathField.addMouseListener(new PopupRightClick(this.vhookPathField)); VideoID_TextField.addMouseListener(new PopupRightClick( this.VideoID_TextField)); - ViewCommentField.addMouseListener(new PopupRightClick( - this.ViewCommentField)); - FontPathField.addMouseListener(new PopupRightClick(this.FontPathField)); - MailAddrField.addMouseListener(new PopupRightClick(this.MailAddrField)); - PasswordField.addMouseListener(new PopupRightClick(this.PasswordField)); + viewCommentField.addMouseListener(new PopupRightClick( + this.viewCommentField)); + fontPathField.addMouseListener(new PopupRightClick(this.fontPathField)); + mailAddressField.addMouseListener(new PopupRightClick(this.mailAddressField)); + passwordField.addMouseListener(new PopupRightClick(this.passwordField)); WayBackField.addMouseListener(new PopupRightClick(this.WayBackField)); - ProxyTextField.addMouseListener(new PopupRightClick(this.ProxyTextField)); - ProxyPortTextField.addMouseListener(new PopupRightClick( - this.ProxyPortTextField)); + proxyTextField.addMouseListener(new PopupRightClick(this.proxyTextField)); + proxyPortTextField.addMouseListener(new PopupRightClick( + this.proxyPortTextField)); - FontIndexField.addMouseListener(new PopupRightClick(this.FontIndexField)); + fontIndexField.addMouseListener(new PopupRightClick(this.fontIndexField)); - NGWordTextField.addMouseListener(new PopupRightClick( - this.NGWordTextField)); - NGIDTextField.addMouseListener(new PopupRightClick(this.NGIDTextField)); + ngWordTextField.addMouseListener(new PopupRightClick( + this.ngWordTextField)); + ngIdTextField.addMouseListener(new PopupRightClick(this.ngIdTextField)); } private void setDropTarget() { @@ -571,9 +592,9 @@ public class MainFrame extends JFrame { addTarget(savePanel.getConvertedVideoSavedFileField(), false); addTarget(savePanel.getConvertedVideoSavedFolderField(), true); - addTarget(FFmpegPathField, false); - addTarget(VhookPathField, false); - addTarget(FontPathField, false); + addTarget(ffmpegPathField, false); + addTarget(vhookPathField, false); + addTarget(fontPathField, false); } @@ -588,23 +609,22 @@ public class MainFrame extends JFrame { c, isDir), true); } private File CurrentDir = new File("."); - JPanel PathSettingPanel = new JPanel(); - JLabel FFmpegPathLabel = new JLabel(); - GridBagLayout gridBagLayout7 = new GridBagLayout(); - JTextField FFmpegPathField = new JTextField(); - JButton SettingFFmpegPathButton = new JButton(); - JLabel VhookPathLabel = new JLabel(); - JTextField VhookPathField = new JTextField(); - JButton SettingVhookPathButton = new JButton(); - JPanel VhookSettingPanel = new JPanel(); - GridBagLayout gridBagLayout8 = new GridBagLayout(); - JPanel FFmpegSettingPanel = new JPanel(); - GridBagLayout gridBagLayout9 = new GridBagLayout(); - JLabel FontPathLabel = new JLabel(); - JTextField FontPathField = new JTextField(); - JButton SettingFontPathButton = new JButton(); - JCheckBox ShowConvVideoCheckBox = new JCheckBox(); - JTextField CommandLineOutOptionField = new JTextField(); + private JPanel PathSettingPanel = new JPanel(); + private JLabel FFmpegPathLabel = new JLabel(); + private GridBagLayout gridBagLayout7 = new GridBagLayout(); + private JTextField ffmpegPathField = new JTextField(); + private JButton SettingFFmpegPathButton = new JButton(); + private JLabel VhookPathLabel = new JLabel(); + private JTextField vhookPathField = new JTextField(); + private JButton SettingVhookPathButton = new JButton(); + private JPanel VhookSettingPanel = new JPanel(); + private GridBagLayout gridBagLayout8 = new GridBagLayout(); + private JPanel FFmpegSettingPanel = new JPanel(); + private GridBagLayout gridBagLayout9 = new GridBagLayout(); + private JLabel FontPathLabel = new JLabel(); + private JTextField fontPathField = new JTextField(); + private JButton SettingFontPathButton = new JButton(); + private JCheckBox showConvVideoCheckBox = new JCheckBox(); private void showSaveDialog(String title, JTextField field, boolean isSave, boolean isDir) { @@ -621,7 +641,7 @@ public class MainFrame extends JFrame { } if (code == JFileChooser.APPROVE_OPTION) { if (isDir) { - CurrentDir = chooser.getCurrentDirectory(); + CurrentDir = chooser.getSelectedFile(); field.setText(CurrentDir.getAbsolutePath()); } else { File selected = chooser.getSelectedFile(); @@ -651,16 +671,16 @@ public class MainFrame extends JFrame { // î{Ýè final BasicSetting basic = setting.getBasicSetting(); tempDir = basic.getTempDir(); - MailAddrField.setText(basic.getUser().getMail()); - PasswordField.setText(basic.getUser().getPassword()); + mailAddressField.setText(basic.getUser().getMail()); + passwordField.setText(basic.getUser().getPassword()); // vLVÖA - UseProxyCheckBox.setSelected(basic.isProxyUse()); - ProxyTextField.setText(basic.getProxyHost()); + useProxyCheckBox.setSelected(basic.isProxyUse()); + proxyTextField.setText(basic.getProxyHost()); int proxy_port = basic.getProxyPort(); if (proxy_port >= 0 && proxy_port <= 65535) { - ProxyPortTextField.setText(Integer.toString(proxy_port)); + proxyPortTextField.setText(Integer.toString(proxy_port)); } else { - ProxyPortTextField.setText(""); + proxyPortTextField.setText(""); } // Û¶Ýè - üÍ®æ @@ -722,26 +742,26 @@ public class MainFrame extends JFrame { // ®æÝè final MovieSetting movie = setting.getMovieSetting(); - FFmpegPathField.setText(movie.getFfmpeg().toString()); - VhookPathField.setText(movie.getVhook().toString()); - ExtOptionField.setText(movie.getFfmpegOption().getExtOption()); - MainOptionField.setText(movie.getFfmpegOption().getMainOption()); - CommandLineOutOptionField.setText(movie.getFfmpegOption().getOutOption()); - CommandLineInOptionField.setText(movie.getFfmpegOption().getInOption()); + ffmpegPathField.setText(movie.getFfmpeg().toString()); + vhookPathField.setText(movie.getVhook().toString()); + extOptionField.setText(movie.getFfmpegOption().getExtOption()); + mainOptionField.setText(movie.getFfmpegOption().getMainOption()); + outputOptionField.setText(movie.getFfmpegOption().getOutOption()); + inputOptionField.setText(movie.getFfmpegOption().getInOption()); FFmpegOptionModel.reload(movie.getOptionFile()); // Ï·Ýè final ConvertSetting conv = setting.getConvertSetting(); - NotUseVhookCheckBox.setSelected(conv.isVhookDisabled()); - ViewCommentField.setText(Integer.toString(conv.getMaxNumOfComment())); - FontPathField.setText(conv.getFont().toString()); - FontIndexField.setText(Integer.toString(conv.getFontIndex())); - ShadowComboBox.setSelectedIndex(conv.getShadowIndex()); - ShowConvVideoCheckBox.setSelected(conv.isShowConverting()); - FixFontSizeCheckBox.setSelected(conv.isSelfAdjustFontSize()); - OpaqueCommentCheckBox.setSelected(conv.isCommentOpaque()); - NGWordTextField.setText(conv.getNgSetting().getWord()); - NGIDTextField.setText(conv.getNgSetting().getId()); + disableVhookCheckBox.setSelected(conv.isVhookDisabled()); + viewCommentField.setText(Integer.toString(conv.getMaxNumOfComment())); + fontPathField.setText(conv.getFont().toString()); + fontIndexField.setText(Integer.toString(conv.getFontIndex())); + shadowComboBox.setSelectedIndex(conv.getShadowIndex()); + showConvVideoCheckBox.setSelected(conv.isShowConverting()); + fixFontSizeCheckBox.setSelected(conv.isSelfAdjustFontSize()); + opaqueCommentCheckBox.setSelected(conv.isCommentOpaque()); + ngWordTextField.setText(conv.getNgSetting().getWord()); + ngIdTextField.setText(conv.getNgSetting().getId()); } / @@ -770,38 +790,38 @@ public class MainFrame extends JFrame { } / Ï·EÛ¶·é / - Converter Converter = null; - JTextField CommandLineInOptionField = new JTextField(); - JLabel InLabel = new JLabel(); - JLabel OutLabel = new JLabel(); - JLabel MainOptionLabel = new JLabel(); - JTextField MainOptionField = new JTextField(); - JLabel FontIndexLabel = new JLabel(); - JTextField FontIndexField = new JTextField(); - JLabel VideoID_Label = new JLabel(); - JLabel WayBackLabel = new JLabel(); - JTextField WayBackField = new JTextField(); - GridBagLayout gridBagLayout10 = new GridBagLayout(); - GridBagLayout gridBagLayout11 = new GridBagLayout(); - GridBagLayout gridBagLayout1 = new GridBagLayout(); - JPanel OpPanel = new JPanel(); - GridLayout gridLayout1 = new GridLayout(); - JPanel BasicInfoTabPanel = new JPanel(); - GridBagLayout gridBagLayout12 = new GridBagLayout(); + private Converter Converter = null; + private JLabel inputOptionLabel = new JLabel(); + private JTextField inputOptionField = new JTextField(); + private JLabel outputOptionLabel = new JLabel(); + private JTextField outputOptionField = new JTextField(); + private JLabel mainOptionLabel = new JLabel(); + private JTextField mainOptionField = new JTextField(); + private JLabel FontIndexLabel = new JLabel(); + private JTextField fontIndexField = new JTextField(); + private JLabel VideoID_Label = new JLabel(); + private JLabel WayBackLabel = new JLabel(); + private JTextField WayBackField = new JTextField(); + private GridBagLayout gridBagLayout1 = new GridBagLayout(); + private JPanel OpPanel = new JPanel(); + private JPanel BasicInfoTabPanel = new JPanel(); + private GridBagLayout gridBagLayout12 = new GridBagLayout(); private JPanel ConvertingSettingPanel = null; private JPanel NGWordSettingPanel = null; private JLabel NGWordLavel = null; - private JTextField NGWordTextField = null; + private JTextField ngWordTextField = null; private JLabel NGIDLabel = null; - private JTextField NGIDTextField = null; + private JTextField ngIdTextField = null; + // vLVÝè private JPanel ProxyInfoPanel = null; - private JLabel ProxyLabel = null; - private JTextField ProxyTextField = null; - private JLabel ProxyPortLabel = null; - private JTextField ProxyPortTextField = null; - private JCheckBox UseProxyCheckBox = null; - private JCheckBox FixFontSizeCheckBox = null; - private JCheckBox OpaqueCommentCheckBox = null; + private JCheckBox useProxyCheckBox = null; + private JLabel proxyLabel = null; + private JTextField proxyTextField = null; + private JLabel proxyPortLabel = null; + private JTextField proxyPortTextField = null; + // + private JCheckBox fixFontSizeCheckBox = null; + private JCheckBox opaqueCommentCheckBox = null; private final SavePanel savePanel = new SavePanel(); private final VideoSaveInfoPanel videoSaveInfoPanel; private JComboBox FFmpegOptionComboBox = null; @@ -889,15 +909,15 @@ public class MainFrame extends JFrame { / FFmpegÖÌpX / public void SettingFFmpegPathButton_actionPerformed(ActionEvent e) { - showSaveDialog("FFmpegÖÌpX", FFmpegPathField, false, false); + showSaveDialog("FFmpegÖÌpX", ffmpegPathField, false, false); } public void SettingVhookPathButton_actionPerformed(ActionEvent e) { - showSaveDialog("g£vhookCuÖÌpX", VhookPathField, false, false); + showSaveDialog("g£vhookCuÖÌpX", vhookPathField, false, false); } public void SettingFontPathButton_actionPerformed(ActionEvent e) { - showSaveDialog("tHgÖÌpX", FontPathField, false, false); + showSaveDialog("tHgÖÌpX", fontPathField, false, false); } public void this_windowClosing(WindowEvent e) { @@ -985,10 +1005,11 @@ public class MainFrame extends JFrame { @return javax.swing.JTextField */ private JTextField getNGWordTextField() { - if (NGWordTextField == null) { - NGWordTextField = new JTextField(); + if (ngWordTextField == null) { + ngWordTextField = new JTextField(); + ngWordTextField.setName("ngWordTextField"); } - return NGWordTextField; + return ngWordTextField; } /** @@ -997,10 +1018,11 @@ public class MainFrame extends JFrame { * @return javax.swing.JTextField */ private JTextField getNGIDTextField() { - if (NGIDTextField == null) { - NGIDTextField = new JTextField(); + if (ngIdTextField == null) { + ngIdTextField = new JTextField(); + ngIdTextField.setName("ngIdTextField"); } - return NGIDTextField; + return ngIdTextField; } /** @@ -1027,8 +1049,8 @@ public class MainFrame extends JFrame { gridBagConstraints10.gridx = 0; gridBagConstraints10.insets = new Insets(5, 5, 5, 5); gridBagConstraints10.gridy = 2; - ProxyPortLabel = new JLabel(); - ProxyPortLabel.setText("|[gÔ"); + proxyPortLabel = new JLabel(); + proxyPortLabel.setText("|[gÔ"); GridBagConstraints gridBagConstraints9 = new GridBagConstraints(); gridBagConstraints9.fill = GridBagConstraints.BOTH; gridBagConstraints9.gridy = 1; @@ -1041,15 +1063,15 @@ public class MainFrame extends JFrame { gridBagConstraints8.fill = GridBagConstraints.NONE; gridBagConstraints8.anchor = GridBagConstraints.EAST; gridBagConstraints8.gridy = 1; - ProxyLabel = new JLabel(); - ProxyLabel.setText("vLV"); + proxyLabel = new JLabel(); + proxyLabel.setText("vLV"); ProxyInfoPanel = new JPanel(); ProxyInfoPanel.setLayout(new GridBagLayout()); ProxyInfoPanel.setBorder(BorderFactory.createTitledBorder(null, "vLVÝè")); - ProxyInfoPanel.add(ProxyLabel, gridBagConstraints8); + ProxyInfoPanel.add(proxyLabel, gridBagConstraints8); ProxyInfoPanel.add(getProxyTextField(), gridBagConstraints9); - ProxyInfoPanel.add(ProxyPortLabel, gridBagConstraints10); + ProxyInfoPanel.add(proxyPortLabel, gridBagConstraints10); ProxyInfoPanel.add(getProxyPortTextField(), gridBagConstraints12); ProxyInfoPanel.add(getUseProxyCheckBox(), gridBagConstraints13); } @@ -1062,10 +1084,11 @@ public class MainFrame extends JFrame { * @return javax.swing.JTextField */ private JTextField getProxyTextField() { - if (ProxyTextField == null) { - ProxyTextField = new JTextField(); + if (proxyTextField == null) { + proxyTextField = new JTextField(); + proxyTextField.setName("proxyTextField"); } - return ProxyTextField; + return proxyTextField; } /** @@ -1074,10 +1097,11 @@ public class MainFrame extends JFrame { * @return javax.swing.JTextField */ private JTextField getProxyPortTextField() { - if (ProxyPortTextField == null) { - ProxyPortTextField = new JTextField(); + if (proxyPortTextField == null) { + proxyPortTextField = new JTextField(); + proxyPortTextField.setName("proxyPortTextField"); } - return ProxyPortTextField; + return proxyPortTextField; } /** @@ -1086,11 +1110,12 @@ public class MainFrame extends JFrame { * @return javax.swing.JCheckBox */ private JCheckBox getUseProxyCheckBox() { - if (UseProxyCheckBox == null) { - UseProxyCheckBox = new JCheckBox(); - UseProxyCheckBox.setText("vLVðg¤"); + if (useProxyCheckBox == null) { + useProxyCheckBox = new JCheckBox(); + useProxyCheckBox.setText("vLVðg¤"); + useProxyCheckBox.setName("useProxyCheckBox"); } - return UseProxyCheckBox; + return useProxyCheckBox; } /** @@ -1099,11 +1124,12 @@ public class MainFrame extends JFrame { * @return javax.swing.JCheckBox */ private JCheckBox getFixFontSizeCheckBox() { - if (FixFontSizeCheckBox == null) { - FixFontSizeCheckBox = new JCheckBox(); - FixFontSizeCheckBox.setText("tHgTCYðæÊÉ í¹Ä©®²®·é"); + if (fixFontSizeCheckBox == null) { + fixFontSizeCheckBox = new JCheckBox(); + fixFontSizeCheckBox.setText("tHgTCYðæÊÉ í¹Ä©®²®·é"); + fixFontSizeCheckBox.setName("fixFontSizeCheckBox"); } - return FixFontSizeCheckBox; + return fixFontSizeCheckBox; } /** @@ -1112,11 +1138,12 @@ public class MainFrame extends JFrame { * @return javax.swing.JCheckBox */ private JCheckBox getOpaqueCommentCheckBox() { - if (OpaqueCommentCheckBox == null) { - OpaqueCommentCheckBox = new JCheckBox(); - OpaqueCommentCheckBox.setText("SÄÌRgðs§¾É·é"); + if (opaqueCommentCheckBox == null) { + opaqueCommentCheckBox = new JCheckBox(); + opaqueCommentCheckBox.setText("SÄÌRgðs§¾É·é"); + opaqueCommentCheckBox.setName("opaqueCommentCheckBox"); } - return OpaqueCommentCheckBox; + return opaqueCommentCheckBox; } /** * This method initializes FFmpegOptionComboBox @@ -1125,12 +1152,12 @@ public class MainFrame extends JFrame { / private final OptionComboBoxModel FFmpegOptionModel = new OptionComboBoxModel(); private JLabel ExtOptionLabel = null; - private JTextField ExtOptionField = null; - private JCheckBox NotUseVhookCheckBox = null; - private JTextField ViewCommentField = null; + private JTextField extOptionField = null; + private JCheckBox disableVhookCheckBox = null; + private JTextField viewCommentField = null; private JLabel ViewCommentLabel = null; private JLabel ShadowKindLabel = null; - private JComboBox ShadowComboBox = null; + private JComboBox shadowComboBox = null; private JComboBox getFFmpegOptionComboBox() { if (FFmpegOptionComboBox == null) { @@ -1139,15 +1166,15 @@ public class MainFrame extends JFrame { public void actionPerformed(java.awt.event.ActionEvent e) { if (FFmpegOptionModel.isFile()) {// t@C - ExtOptionField.setEnabled(false); - MainOptionField.setEnabled(false); - CommandLineInOptionField.setEnabled(false); - CommandLineOutOptionField.setEnabled(false); + extOptionField.setEnabled(false); + mainOptionField.setEnabled(false); + inputOptionField.setEnabled(false); + outputOptionField.setEnabled(false); } else {// t@CÅÈ¢ - ExtOptionField.setEnabled(true); - MainOptionField.setEnabled(true); - CommandLineInOptionField.setEnabled(true); - CommandLineOutOptionField.setEnabled(true); + extOptionField.setEnabled(true); + mainOptionField.setEnabled(true); + inputOptionField.setEnabled(true); + outputOptionField.setEnabled(true); } } }); @@ -1209,10 +1236,11 @@ public class MainFrame extends JFrame { @return javax.swing.JTextField */ private JTextField getExtOptionField() { - if (ExtOptionField == null) { - ExtOptionField = new JTextField(); + if (extOptionField == null) { + extOptionField = new JTextField(); + extOptionField.setName("extOptionField"); } - return ExtOptionField; + return extOptionField; } /** @@ -1221,11 +1249,12 @@ public class MainFrame extends JFrame { * @return javax.swing.JCheckBox */ private JCheckBox getNotUseVhookCheckBox() { - if (NotUseVhookCheckBox == null) { - NotUseVhookCheckBox = new JCheckBox(); - NotUseVhookCheckBox.setText("g£vhookCuð³øÉ·éifobOpj"); + if (disableVhookCheckBox == null) { + disableVhookCheckBox = new JCheckBox(); + disableVhookCheckBox.setText("g£vhookCuð³øÉ·éifobOpj"); + disableVhookCheckBox.setName("disableVhookCheckBox"); } - return NotUseVhookCheckBox; + return disableVhookCheckBox; } /** @@ -1234,10 +1263,11 @@ public class MainFrame extends JFrame { * @return javax.swing.JTextField */ private JTextField getViewCommentField() { - if (ViewCommentField == null) { - ViewCommentField = new JTextField(); + if (viewCommentField == null) { + viewCommentField = new JTextField(); + viewCommentField.setName("viewCommentField"); } - return ViewCommentField; + return viewCommentField; } /** @@ -1246,20 +1276,21 @@ public class MainFrame extends JFrame { * @return javax.swing.JComboBox / private JComboBox getShadowComboBox() { - if (ShadowComboBox == null) { - ShadowComboBox = new JComboBox(SProperties.ShadowKindArray); + if (shadowComboBox == null) { + shadowComboBox = new JComboBox(SProperties.ShadowKindArray); + shadowComboBox.setName("shadowComboBox"); } - return ShadowComboBox; + return shadowComboBox; } private BasicSetting getBasicSetting() { - String mail = MailAddrField.getText(); - String pass = String.valueOf(PasswordField.getPassword()); - boolean proxyUse = UseProxyCheckBox.isSelected(); - String proxyHost = ProxyTextField.getText(); + String mail = mailAddressField.getText(); + String pass = String.valueOf(passwordField.getPassword()); + boolean proxyUse = useProxyCheckBox.isSelected(); + String proxyHost = proxyTextField.getText(); int proxyPort; try { - proxyPort = Integer.parseInt(ProxyPortTextField.getText()); + proxyPort = Integer.parseInt(proxyPortTextField.getText()); } catch (NumberFormatException e) { proxyPort = -1; } @@ -1330,12 +1361,12 @@ public class MainFrame extends JFrame { } private MovieSetting getMovieSetting() { - String ffmpeg = FFmpegPathField.getText(); - String vhook = VhookPathField.getText(); - String ext = ExtOptionField.getText(); - String main = MainOptionField.getText(); - String in = CommandLineInOptionField.getText(); - String out = CommandLineOutOptionField.getText(); + String ffmpeg = ffmpegPathField.getText(); + String vhook = vhookPathField.getText(); + String ext = extOptionField.getText(); + String main = mainOptionField.getText(); + String in = inputOptionField.getText(); + String out = outputOptionField.getText(); File optionFile = FFmpegOptionModel.getSelectedFile(); FfmpegOption opt = new FfmpegOption(ext, main, in, out); @@ -1343,19 +1374,19 @@ public class MainFrame extends JFrame { } private ConvertSetting getConvertSetting() { - boolean vhookDisabled = NotUseVhookCheckBox.isSelected(); + boolean vhookDisabled = disableVhookCheckBox.isSelected(); int maxComment = 30; try { - maxComment = Integer.parseInt(ViewCommentField.getText()); + maxComment = Integer.parseInt(viewCommentField.getText()); } catch (NumberFormatException ex) { } - File font = new File(FontPathField.getText()); - int fontIndex = Integer.parseInt(FontIndexField.getText()); - int shadowIndex = ShadowComboBox.getSelectedIndex(); - boolean showConv = ShowConvVideoCheckBox.isSelected(); - boolean adjustFont = FixFontSizeCheckBox.isSelected(); - boolean commentOpaque = OpaqueCommentCheckBox.isSelected(); - NgSetting ngSetting = new NgSetting(NGWordTextField.getText(), NGIDTextField.getText()); + File font = new File(fontPathField.getText()); + int fontIndex = Integer.parseInt(fontIndexField.getText()); + int shadowIndex = shadowComboBox.getSelectedIndex(); + boolean showConv = showConvVideoCheckBox.isSelected(); + boolean adjustFont = fixFontSizeCheckBox.isSelected(); + boolean commentOpaque = opaqueCommentCheckBox.isSelected(); + NgSetting ngSetting = new NgSetting(ngWordTextField.getText(), ngIdTextField.getText()); return new ConvertSetting(vhookDisabled, maxComment, font, fontIndex, shadowIndex, showConv, adjustFont, commentOpaque, ngSetting); @@ -1406,7 +1437,7 @@ public class MainFrame extends JFrame { field = savePanel.getCommentSavedFolderField(); isSave = true; isDir = true; - } else if (source == savePanel.getShowSavingCommentFolderDialogButton()) { + } else if (source == savePanel.getShowSavingCommentFileDialogButton()) { title = "RgÌÛ¶æ(t@C)"; field = savePanel.getCommentSavedFileField(); isSave = true; diff --git a/frontend/src/saccubus/SavePanel.form b/frontend/src/saccubus/SavePanel.form index 0753911..c973b44 100644 --- a/frontend/src/saccubus/SavePanel.form +++ b/frontend/src/saccubus/SavePanel.form @@ -9,9 +9,6 @@ - - - @@ -27,17 +24,20 @@ - + - + - + + + + @@ -87,7 +87,7 @@ - + @@ -131,6 +131,7 @@ + @@ -153,8 +154,8 @@ - - + + @@ -202,11 +203,13 @@ + + @@ -215,6 +218,9 @@ + + + @@ -222,13 +228,18 @@ + + + + + @@ -237,13 +248,18 @@ + + + + + @@ -276,7 +292,7 @@ - + @@ -320,6 +336,7 @@ + @@ -331,27 +348,22 @@ + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - @@ -382,6 +394,7 @@ + @@ -390,14 +403,22 @@ + + + + + + + + @@ -405,14 +426,22 @@ + + + + + + + + @@ -435,7 +464,7 @@ - + @@ -444,7 +473,7 @@ - + @@ -489,6 +518,7 @@ + @@ -555,11 +585,13 @@ + + @@ -568,14 +600,19 @@ + + + + + @@ -588,9 +625,13 @@ + + + + diff --git a/frontend/src/saccubus/SavePanel.java b/frontend/src/saccubus/SavePanel.java index 5c93209..a9386e7 100644 --- a/frontend/src/saccubus/SavePanel.java +++ b/frontend/src/saccubus/SavePanel.java @@ -11,8 +11,10 @@ package saccubus; import java.awt.GridLayout; +import java.io.File; import javax.swing.JButton; import javax.swing.JCheckBox; +import javax.swing.JFileChooser; import javax.swing.JRadioButton; import javax.swing.JTextField; @@ -43,7 +45,7 @@ public class SavePanel extends javax.swing.JPanel { inputCommentSaveGroup = new javax.swing.ButtonGroup(); outputVideoSaveGroup = new javax.swing.ButtonGroup(); inputTcommentSaveGroup = new javax.swing.ButtonGroup(); - jTabbedPane1 = new javax.swing.JTabbedPane(); + saveTabbedPane = new javax.swing.JTabbedPane(); inputVideoTab = new javax.swing.JPanel(); inputCommentTab = new javax.swing.JPanel(); commentSaveInfoPanel = new javax.swing.JPanel(); @@ -84,6 +86,8 @@ public class SavePanel extends javax.swing.JPanel { convertedVideoSavedFileField = new javax.swing.JTextField(); showSavingConvertedVideoFileDialogButton = new javax.swing.JButton(); + saveTabbedPane.setName("saveTabbedPane"); // NOI18N + javax.swing.GroupLayout inputVideoTabLayout = new javax.swing.GroupLayout(inputVideoTab); inputVideoTab.setLayout(inputVideoTabLayout); inputVideoTabLayout.setHorizontalGroup( @@ -95,27 +99,40 @@ public class SavePanel extends javax.swing.JPanel { .addGap(0, 270, Short.MAX_VALUE) ); - jTabbedPane1.addTab("üÍ®æ", inputVideoTab); + saveTabbedPane.addTab("üÍ®æ", inputVideoTab); commentSaveInfoPanel.setBorder(javax.swing.BorderFactory.createTitledBorder("RgÛ¶Ýè")); savingCommentCheckBox.setText("Rgð_E[h·é"); + savingCommentCheckBox.setName("savingCommentCheckBox"); // NOI18N delCommentCheckBox.setText("Ï·ãÉRgt@Cðí·é"); + delCommentCheckBox.setName("delCommentCheckBox"); // NOI18N fixCommentNumCheckBox.setText("Rgæ¾Í©®Å²®·é"); + fixCommentNumCheckBox.setName("fixCommentNumCheckBox"); // NOI18N jLabel1.setText("æ¾Rg"); + commentNumField.setName("commentNumField"); // NOI18N + inputCommentSaveGroup.add(commentSaveFolderRadioButton); commentSaveFolderRadioButton.setText("Û¶·étH_ðwèµAt@C¼Í©®Åè·é"); + commentSaveFolderRadioButton.setName("commentSaveFolderRadioButton"); // NOI18N + + commentSavedFolderField.setName("commentSavedFolderField"); // NOI18N showSavingCommentFolderDialogButton.setText("QÆ..."); + showSavingCommentFolderDialogButton.setName("showSavingCommentFolderDialogButton"); // NOI18N inputCommentSaveGroup.add(commentSaveFileRadioButton); commentSaveFileRadioButton.setText("Û¶·ét@C¼ðwè·é"); + commentSaveFileRadioButton.setName("commentSaveFileRadioButton"); // NOI18N + + commentSavedFileField.setName("commentSavedFileField"); // NOI18N showSavingCommentFileDialogButton.setText("QÆ..."); + showSavingCommentFileDialogButton.setName("showSavingCommentFileDialogButton"); // NOI18N javax.swing.GroupLayout jPanel7Layout = new javax.swing.GroupLayout(jPanel7); jPanel7.setLayout(jPanel7Layout); @@ -135,8 +152,8 @@ public class SavePanel extends javax.swing.JPanel { .addGroup(jPanel7Layout.createSequentialGroup() .addGap(21, 21, 21) .addGroup(jPanel7Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addComponent(commentSavedFileField, javax.swing.GroupLayout.DEFAULT_SIZE, 194, Short.MAX_VALUE) - .addComponent(commentSavedFolderField, javax.swing.GroupLayout.DEFAULT_SIZE, 194, Short.MAX_VALUE)) + .addComponent(commentSavedFileField, javax.swing.GroupLayout.DEFAULT_SIZE, 197, Short.MAX_VALUE) + .addComponent(commentSavedFolderField, javax.swing.GroupLayout.DEFAULT_SIZE, 197, Short.MAX_VALUE)) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addGroup(jPanel7Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING) .addComponent(showSavingCommentFolderDialogButton) @@ -204,26 +221,46 @@ public class SavePanel extends javax.swing.JPanel { .addGroup(inputCommentTabLayout.createSequentialGroup() .addContainerGap() .addComponent(commentSaveInfoPanel, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) - .addContainerGap(27, Short.MAX_VALUE)) + .addContainerGap(30, Short.MAX_VALUE)) ); - jTabbedPane1.addTab("üÍRg", inputCommentTab); + saveTabbedPane.addTab("üÍRg", inputCommentTab); tcommentSaveInfoPanel.setBorder(javax.swing.BorderFactory.createTitledBorder("eÒRgÛ¶Ýè")); needDownloadTcomment.setText("Rgð_E[h·é"); + needDownloadTcomment.setName("needDownloadTcomment"); // NOI18N delTcomment.setText("Ï·ãÉRgt@Cðí·é"); + delTcomment.setName("delTcomment"); // NOI18N inputTcommentSaveGroup.add(tcommentSaveInFolder); tcommentSaveInFolder.setText("Û¶·étH_ðwèµAt@C¼Í©®Åè·é"); + tcommentSaveInFolder.setName("tcommentSaveInFolder"); // NOI18N + + tcommentFolder.setName("tcommentFolder"); // NOI18N tcoomentFolderChooserButton.setText("QÆ..."); + tcoomentFolderChooserButton.setName("tcoomentFolderChooserButton"); // NOI18N + tcoomentFolderChooserButton.addActionListener(new java.awt.event.ActionListener() { + public void actionPerformed(java.awt.event.ActionEvent evt) { + tcoomentFolderChooserButtonActionPerformed(evt); + } + }); inputTcommentSaveGroup.add(tcommentSaveToFile); tcommentSaveToFile.setText("Û¶·ét@C¼ðwè·é"); + tcommentSaveToFile.setName("tcommentSaveToFile"); // NOI18N + + tcommentFile.setName("tcommentFile"); // NOI18N tcommentFileChooserButton.setText("QÆ..."); + tcommentFileChooserButton.setName("tcommentFileChooserButton"); // NOI18N + tcommentFileChooserButton.addActionListener(new java.awt.event.ActionListener() { + public void actionPerformed(java.awt.event.ActionEvent evt) { + tcommentFileChooserButtonActionPerformed(evt); + } + }); javax.swing.GroupLayout jPanel8Layout = new javax.swing.GroupLayout(jPanel8); jPanel8.setLayout(jPanel8Layout); @@ -232,22 +269,18 @@ public class SavePanel extends javax.swing.JPanel { .addGroup(jPanel8Layout.createSequentialGroup() .addGroup(jPanel8Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) .addComponent(delTcomment) - .addComponent(tcommentSaveInFolder)) - .addContainerGap()) - .addGroup(jPanel8Layout.createSequentialGroup() - .addContainerGap() - .addComponent(tcommentFolder, javax.swing.GroupLayout.DEFAULT_SIZE, 202, Short.MAX_VALUE) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addComponent(tcoomentFolderChooserButton) - .addContainerGap()) - .addGroup(jPanel8Layout.createSequentialGroup() - .addComponent(tcommentSaveToFile) - .addContainerGap()) - .addGroup(jPanel8Layout.createSequentialGroup() - .addContainerGap() - .addComponent(tcommentFile, javax.swing.GroupLayout.DEFAULT_SIZE, 202, Short.MAX_VALUE) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addComponent(tcommentFileChooserButton) + .addComponent(tcommentSaveInFolder) + .addGroup(jPanel8Layout.createSequentialGroup() + .addContainerGap() + .addComponent(tcommentFolder, javax.swing.GroupLayout.DEFAULT_SIZE, 206, Short.MAX_VALUE) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) + .addComponent(tcoomentFolderChooserButton)) + .addComponent(tcommentSaveToFile) + .addGroup(jPanel8Layout.createSequentialGroup() + .addContainerGap() + .addComponent(tcommentFile, javax.swing.GroupLayout.DEFAULT_SIZE, 206, Short.MAX_VALUE) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) + .addComponent(tcommentFileChooserButton))) .addContainerGap()) ); jPanel8Layout.setVerticalGroup( @@ -305,28 +338,38 @@ public class SavePanel extends javax.swing.JPanel { .addGroup(inputTcommentTabLayout.createSequentialGroup() .addContainerGap() .addComponent(tcommentSaveInfoPanel, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) - .addContainerGap(71, Short.MAX_VALUE)) + .addContainerGap(74, Short.MAX_VALUE)) ); - jTabbedPane1.addTab("üÍeÒRg", inputTcommentTab); + saveTabbedPane.addTab("üÍeÒRg", inputTcommentTab); jPanel3.setBorder(javax.swing.BorderFactory.createTitledBorder("Rgt«®æÛ¶Ýè")); savingConvertedVideoCheckBox.setText("®æðÏ··é"); + savingConvertedVideoCheckBox.setName("savingConvertedVideoCheckBox"); // NOI18N addComment.setText("RgðÂ¯é"); + addComment.setName("addComment"); // NOI18N addTcomment.setText("eÒRgðÂ¯é"); + addTcomment.setName("addTcomment"); // NOI18N outputVideoSaveGroup.add(convSaveFolderRadioButton); convSaveFolderRadioButton.setText("Û¶·étH_ðwèµAt@C¼Í©®Åè·é"); + convSaveFolderRadioButton.setName("convSaveFolderRadioButton"); // NOI18N notAddVideoIdConvVideoCheckBox.setText("t@C¼É®æIDðtÁµÈ¢"); + notAddVideoIdConvVideoCheckBox.setName("notAddVideoIdConvVideoCheckBox"); // NOI18N + + convertedVideoSavedFolderField.setName("convertedVideoSavedFolderField"); // NOI18N showSavingConvertedVideoFolderDialogButton.setText("QÆ..."); outputVideoSaveGroup.add(convSaveFileRadioButton); convSaveFileRadioButton.setText("Û¶·ét@C¼ðwè·é"); + convSaveFileRadioButton.setName("convSaveFileRadioButton"); // NOI18N + + convertedVideoSavedFileField.setName("convertedVideoSavedFileField"); // NOI18N showSavingConvertedVideoFileDialogButton.setText("QÆ..."); @@ -406,29 +449,37 @@ public class SavePanel extends javax.swing.JPanel { .addGroup(outputVideoTabLayout.createSequentialGroup() .addContainerGap() .addComponent(jPanel3, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) - .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)) + .addContainerGap(15, Short.MAX_VALUE)) ); outputVideoTabLayout.setVerticalGroup( outputVideoTabLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) .addGroup(outputVideoTabLayout.createSequentialGroup() .addContainerGap() .addComponent(jPanel3, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) - .addContainerGap(35, Short.MAX_VALUE)) + .addContainerGap(38, Short.MAX_VALUE)) ); - jTabbedPane1.addTab("oÍRgt«®æ", outputVideoTab); + saveTabbedPane.addTab("oÍRgt«®æ", outputVideoTab); javax.swing.GroupLayout layout = new javax.swing.GroupLayout(this); this.setLayout(layout); layout.setHorizontalGroup( layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addComponent(jTabbedPane1, javax.swing.GroupLayout.DEFAULT_SIZE, 374, Short.MAX_VALUE) + .addComponent(saveTabbedPane, javax.swing.GroupLayout.DEFAULT_SIZE, 374, Short.MAX_VALUE) ); layout.setVerticalGroup( layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addComponent(jTabbedPane1, javax.swing.GroupLayout.DEFAULT_SIZE, 297, Short.MAX_VALUE) + .addComponent(saveTabbedPane, javax.swing.GroupLayout.DEFAULT_SIZE, 297, Short.MAX_VALUE) ); }// //GEN-END:initComponents + + private void tcoomentFolderChooserButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_tcoomentFolderChooserButtonActionPerformed + showSaveDialog("eÒRgÌÛ¶æ(tH_)", tcommentFolder, true, true); + }//GEN-LAST:event_tcoomentFolderChooserButtonActionPerformed + + private void tcommentFileChooserButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_tcommentFileChooserButtonActionPerformed + showSaveDialog("eÒRgÌÛ¶æ(t@C)", tcommentFile, true, false); + }//GEN-LAST:event_tcommentFileChooserButtonActionPerformed // Variables declaration - do not modify//GEN-BEGIN:variables private javax.swing.JCheckBox addComment; private javax.swing.JCheckBox addTcomment; @@ -455,11 +506,11 @@ public class SavePanel extends javax.swing.JPanel { private javax.swing.JPanel jPanel5; private javax.swing.JPanel jPanel7; private javax.swing.JPanel jPanel8; - private javax.swing.JTabbedPane jTabbedPane1; private javax.swing.JCheckBox needDownloadTcomment; private javax.swing.JCheckBox notAddVideoIdConvVideoCheckBox; private javax.swing.ButtonGroup outputVideoSaveGroup; private javax.swing.JPanel outputVideoTab; + private javax.swing.JTabbedPane saveTabbedPane; private javax.swing.JCheckBox savingCommentCheckBox; private javax.swing.JCheckBox savingConvertedVideoCheckBox; private javax.swing.JButton showSavingCommentFileDialogButton; @@ -629,4 +680,23 @@ public class SavePanel extends javax.swing.JPanel { void setTcommentFileName(String t) { tcommentFile.setText(t); } + + private void showSaveDialog(String title, JTextField field, boolean isSave, + boolean isDir) { + File current = new File(field.getText()); + JFileChooser chooser = new JFileChooser(current); + chooser.setDialogTitle(title); + int code = 0; + if (isDir) { + chooser.setFileSelectionMode(JFileChooser.DIRECTORIES_ONLY); + } + if (isSave) { + code = chooser.showSaveDialog(this); + } else { + code = chooser.showOpenDialog(this); + } + if (code == JFileChooser.APPROVE_OPTION) { + field.setText(chooser.getSelectedFile().getAbsolutePath()); + } + } } diff --git a/frontend/src/saccubus/VideoSaveInfoPanel.form b/frontend/src/saccubus/VideoSaveInfoPanel.form index aed7741..31027d8 100644 --- a/frontend/src/saccubus/VideoSaveInfoPanel.form +++ b/frontend/src/saccubus/VideoSaveInfoPanel.form @@ -14,9 +14,6 @@ - - - @@ -76,6 +73,7 @@ + @@ -84,6 +82,7 @@ + @@ -140,6 +139,7 @@ + @@ -148,13 +148,18 @@ + + + + + @@ -163,13 +168,18 @@ + + + + + @@ -180,6 +190,7 @@ + @@ -206,6 +217,9 @@ + + + diff --git a/frontend/src/saccubus/VideoSaveInfoPanel.java b/frontend/src/saccubus/VideoSaveInfoPanel.java index 4a4cc66..dae7291 100644 --- a/frontend/src/saccubus/VideoSaveInfoPanel.java +++ b/frontend/src/saccubus/VideoSaveInfoPanel.java @@ -50,21 +50,32 @@ class VideoSaveInfoPanel extends javax.swing.JPanel { videoSavingGroup.add(videoNoSaveButton); videoNoSaveButton.setText("®æð_E[hµÈ¢"); + videoNoSaveButton.setName("videoNoSaveButton"); // NOI18N videoSavingGroup.add(videoSaveButton); videoSaveButton.setText("®æð_E[h·é"); + videoSaveButton.setName("videoSaveButton"); // NOI18N delVideoCheckBox.setText("Ï·ãÉ®æt@Cðí·é"); + delVideoCheckBox.setName("delVideoCheckBox"); // NOI18N videoNamingGroup.add(saveFolderRadioButton); saveFolderRadioButton.setText("Û¶·étH_ðwèµAt@C¼Í©®Åè·é"); + saveFolderRadioButton.setName("saveFolderRadioButton"); // NOI18N + + videoSavedFolderField.setName("videoSavedFolderField"); // NOI18N showSavingVideoFolderDialogButton.setText("QÆ..."); + showSavingVideoFolderDialogButton.setName("showSavingVideoFolderDialogButton"); // NOI18N videoNamingGroup.add(saveFileRadioButton); saveFileRadioButton.setText("Û¶·ét@C¼ðwè·é"); + saveFileRadioButton.setName("saveFileRadioButton"); // NOI18N + + videoSavedFileField.setName("videoSavedFileField"); // NOI18N showSavingVideoFileDialogButton.setText("QÆ..."); + showSavingVideoFileDialogButton.setName("showSavingVideoFileDialogButton"); // NOI18N javax.swing.GroupLayout basicSettingLayout = new javax.swing.GroupLayout(basicSetting); basicSetting.setLayout(basicSettingLayout); @@ -108,6 +119,9 @@ class VideoSaveInfoPanel extends javax.swing.JPanel { videoSavingGroup.add(videoUseNiBrButton); videoUseNiBrButton.setText("NicoBrowser_E[ht@Cðp¢é"); + videoUseNiBrButton.setName("videoUseNiBrButton"); // NOI18N + + nibrFileField.setName("nibrFileField"); // NOI18N nibrFileChooserButton.setText("QÆ..."); diff --git a/frontend/src/saccubus/converter/filegetter/FileInstanciator.java b/frontend/src/saccubus/converter/filegetter/FileInstanciator.java index 043c4e6..ed33d21 100644 --- a/frontend/src/saccubus/converter/filegetter/FileInstanciator.java +++ b/frontend/src/saccubus/converter/filegetter/FileInstanciator.java @@ -105,7 +105,7 @@ public class FileInstanciator { / public final File getVideoFile(TextProgressListener listener) throws IOException { File file = new FileLocator(videoType.isAutoFileName(), videoType.getInitFile(), getVideoIdWithBracket(), - getVideoTitle(), ".flv").getFile(); + getVideoTitle(), ".flv", ".mp4", ".swf").getFile(); file = videoFileGetter.get(file, listener); return file; } @@ -131,7 +131,7 @@ public class FileInstanciator { */ public final File getTcommFile(TextProgressListener listener) throws IOException { File file = new FileLocator(tcommType.isAutoFileName(), tcommType.getInitFile(), getVideoIdWithBracket(), - getVideoTitle(), ".xml").getFile(); + getVideoTitle(), ".txml").getFile(); file = tcommFileGetter.get(file, listener); return file; } diff --git a/frontend/src/saccubus/converter/filegetter/FileLocator.java b/frontend/src/saccubus/converter/filegetter/FileLocator.java index 03676a0..b668e63 100644 --- a/frontend/src/saccubus/converter/filegetter/FileLocator.java +++ b/frontend/src/saccubus/converter/filegetter/FileLocator.java @@ -3,6 +3,7 @@ package saccubus.converter.filegetter; import java.io.File; import java.io.FilenameFilter; +import org.apache.commons.io.FilenameUtils; /** * @@ -14,22 +15,23 @@ class FileLocator { private final File initFile; private final String prefix; private final String title; - private final String suffix; + private final String[] suffixes; - FileLocator(boolean autoFileName, File initFile, String prefix, String title, String suffix) { + FileLocator(boolean autoFileName, File initFile, String prefix, String title, String... suffixes) { this.autoFileName = autoFileName; this.initFile = initFile; this.prefix = prefix; this.title = title; - this.suffix = suffix; + this.suffixes = suffixes; } /** * RXgN^Åwèµ½ðÅt@Cðõ·éB * autoFileNameªfalseÌêA¼Ú¼OwèÅ é½ßwè³ê½t@Cð»ÌÜÜÔ·B - * autoFileNameªtrueÌêAinitFilefBNgÉprefixÅnÜét@Cª¶Ý·é©õµ + * autoFileNameªtrueÌêAinitFilefBNgÉprefixÅnÜèsuffixÅIíét@Cª¶Ý·é©õµ * êÎ»êðÔ·B * ±Ìt@Cà³¢êAwè³ê½p[^É]Á½t@C¼ðÔ·B + * ±ÌÆ«g£q(suffixes)ª¡wè³êÄ¢½êÍÅÌàÌðÔ·B * @return ]Ìt@CBt@CÍ¶Ý·éêà èA¶ÝµÈ¢êà é±ÆÉÓB / File getFile() { @@ -40,7 +42,7 @@ class FileLocator { if (res != null) { return res; } - return new File(initFile, prefix + title + suffix); + return new File(initFile, prefix + title + suffixes[0]); } } @@ -48,13 +50,23 @@ class FileLocator { FilenameFilter filter = new FilenameFilter() { public boolean accept(File dir, String name) { - return (name.startsWith(prefix)) ? true : false; + if (name.startsWith(prefix)) { + for (String suffix : suffixes) { + if (name.endsWith(suffix)) { + return true; + } + } + } + return false; } }; File[] res = initFile.listFiles(filter); if (res == null || res.length == 0) { return null; } + if (res.length > 1) { + System.out.println("¡Ìóât@CªqbgµÜµ½. Ó}µÈ¢t@CªIð³êÄ¢éÂ\«ª èÜ·:" + res[0]); + } return res[0]; } diff --git a/frontend/src/saccubus/net/NicoClient.java b/frontend/src/saccubus/net/NicoClient.java index e6ab428..bc04f94 100644 --- a/frontend/src/saccubus/net/NicoClient.java +++ b/frontend/src/saccubus/net/NicoClient.java @@ -337,7 +337,7 @@ public class NicoClient { } private OfficialOption getOfficialOption(String threadId) throws IOException { - String url = "http://www.nicovideo.jp/api/getthreadkey?thread="+threadId; + String url = "http://flapi.nicovideo.jp/api/getthreadkey?thread="+threadId; Map map = new NicoApiRequest(url).get(); return new OfficialOption(map.get("threadkey"), map.get("force_184")); } @@ -375,7 +375,7 @@ public class NicoClient { } } System.out.print("Getting wayback key..."); - String url = "http://www.nicovideo.jp/api/getwaybackkey?thread=" + String url = "http://flapi.nicovideo.jp/api/getwaybackkey?thread=" + vi.getThreadId(); String ret = ""; try { diff --git a/frontend/src/saccubus/properties/InputCommentSetting.java b/frontend/src/saccubus/properties/InputCommentSetting.java index d6b1e01..410d233 100644 --- a/frontend/src/saccubus/properties/InputCommentSetting.java +++ b/frontend/src/saccubus/properties/InputCommentSetting.java @@ -10,13 +10,20 @@ import java.util.Properties; / public class InputCommentSetting extends InputFileSetting { - private static final String PROP_COMMENT_FILE = "CommentFile"; - private static final String PROP_BACK_COMMENT = "BackComment"; + /** Rgð_E[h·é. */ + private static final String PROP_SAVE_COMMENT = "SaveCommentFile"; + /** Ï·ãÉRgt@Cðí·é. */ private static final String PROP_DEL_COMMENT_AFTER_CONV = "DeleteCommentAfterConv"; - private static final String PROP_COMMENT_FIX_FILE_NAME = "CommentFixFileName"; - private static final String PROP_COMMENT_FIX_FILE_NAME_FOLDER = "CommentFixFileNameFolder"; + /** Rgæ¾Í©®Å²®·é. */ private static final String PROP_FIX_COMMENT_NUM = "FixCommentSize"; - private static final String PROP_SAVE_COMMENT = "SaveCommentFile"; + /** æ¾Rg. */ + private static final String PROP_BACK_COMMENT = "BackComment"; + /** tH_/t@CÛ¶IðWI{^. */ + private static final String PROP_COMMENT_FIX_FILE_NAME = "CommentFixFileName"; + /** tH_¼. */ + private static final String PROP_COMMENT_FOLDER = "CommentFixFileNameFolder"; + /** t@C¼. / + private static final String PROP_COMMENT_FILE = "CommentFile"; private final boolean selfAdjustNumOfComment; private final int numOfComment; @@ -28,25 +35,24 @@ public class InputCommentSetting extends InputFileSetting { } public void save(Properties prop) { - prop.setProperty(PROP_COMMENT_FILE, getFile().getPath()); - prop.setProperty(PROP_BACK_COMMENT, Integer.toString(getNumOfComment())); + prop.setProperty(PROP_SAVE_COMMENT, getProcessKind().toString()); prop.setProperty(PROP_DEL_COMMENT_AFTER_CONV, Boolean.toString(isDeleteAfterConvert())); - prop.setProperty(PROP_COMMENT_FIX_FILE_NAME, Boolean.toString(isAutoNaming())); - prop.setProperty(PROP_COMMENT_FIX_FILE_NAME_FOLDER, getFolder().getPath()); prop.setProperty(PROP_FIX_COMMENT_NUM, Boolean.toString(isSelfAdjustNumOfComment())); - prop.setProperty(PROP_SAVE_COMMENT, getProcessKind().toString()); + prop.setProperty(PROP_BACK_COMMENT, Integer.toString(getNumOfComment())); + prop.setProperty(PROP_COMMENT_FIX_FILE_NAME, Boolean.toString(isAutoNaming())); + prop.setProperty(PROP_COMMENT_FOLDER, getFolder().getPath()); + prop.setProperty(PROP_COMMENT_FILE, getFile().getPath()); } public static InputCommentSetting load(Properties prop) { - - String file = prop.getProperty(PROP_COMMENT_FILE, "comment.xml"); - String numOfComment = prop.getProperty(PROP_BACK_COMMENT, "500"); - boolean delete = Boolean.parseBoolean(prop.getProperty(PROP_DEL_COMMENT_AFTER_CONV, "false")); - boolean adjustNumOfComment = Boolean.parseBoolean(prop.getProperty(PROP_COMMENT_FIX_FILE_NAME, "true")); - String folder = prop.getProperty(PROP_COMMENT_FIX_FILE_NAME_FOLDER, "[out]comment"); - boolean autoNaming = Boolean.parseBoolean(prop.getProperty(PROP_FIX_COMMENT_NUM, "true")); boolean download = Boolean.parseBoolean(prop.getProperty(PROP_SAVE_COMMENT, "true")); + boolean delete = Boolean.parseBoolean(prop.getProperty(PROP_DEL_COMMENT_AFTER_CONV, "false")); + boolean adjustNumOfComment = Boolean.parseBoolean(prop.getProperty(PROP_FIX_COMMENT_NUM, "true")); + String numOfComment = prop.getProperty(PROP_BACK_COMMENT, "500"); + boolean autoNaming = Boolean.parseBoolean(prop.getProperty(PROP_COMMENT_FIX_FILE_NAME, "true")); + String folder = prop.getProperty(PROP_COMMENT_FOLDER, "[out]comment"); + String file = prop.getProperty(PROP_COMMENT_FILE, "comment.xml"); return new InputCommentSetting(download, autoNaming, new File(folder), new File(file), delete, adjustNumOfComment, diff --git a/frontend/src/saccubus/properties/InputTcommentSetting.java b/frontend/src/saccubus/properties/InputTcommentSetting.java index 305ec77..210b714 100644 --- a/frontend/src/saccubus/properties/InputTcommentSetting.java +++ b/frontend/src/saccubus/properties/InputTcommentSetting.java @@ -37,7 +37,7 @@ public class InputTcommentSetting extends InputFileSetting { public void save(Properties prop) { prop.setProperty(PROP_DOWNLOAD, getProcessKind().toString()); - prop.setProperty(PROP_DELETE, getProcessKind().toString()); + prop.setProperty(PROP_DELETE, Boolean.toString(isDeleteAfterConvert())); prop.setProperty(PROP_AUTOFILENAME, Boolean.toString(isAutoNaming())); prop.setProperty(PROP_DIRECTORYNAME, getFolder().toString()); prop.setProperty(PROP_FILENAME, getFile().toString()); diff --git a/frontend/test/saccubus/SaccubusTest.java b/frontend/test/saccubus/SaccubusTest.java new file mode 100644 index 0000000..f110081 --- /dev/null +++ b/frontend/test/saccubus/SaccubusTest.java @@ -0,0 +1,643 @@ +/$Id$/ +package saccubus; + +import java.io.File; +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.OutputStream; +import java.util.HashMap; +import java.util.Map; +import java.util.Properties; +import javax.swing.JFrame; +import mockit.Mock; +import mockit.MockClass; +import mockit.Mockit; +import mockit.integration.junit4.JMockit; +import static org.fest.assertions.Assertions.; +import org.fest.reflect.core.Reflection; +import org.fest.swing.fixture.JFileChooserFixture; +import org.fest.swing.keystroke.KeyStrokeMappingProvider; +import static org.fest.swing.launcher.ApplicationLauncher.application; +import org.fest.swing.core.BasicRobot; +import org.fest.swing.core.Robot; +import org.fest.swing.finder.JFileChooserFinder; +import org.fest.swing.finder.WindowFinder; +import org.fest.swing.fixture.FrameFixture; +import org.fest.swing.keystroke.KeyStrokeMap; +import org.fest.swing.keystroke.KeyStrokeMappingsParser; +import org.junit.After; +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.RunWith; +import saccubus.properties.SProperties; +import static org.junit.Assert.*; + +/** + * + * @author yuki + */ +@RunWith(JMockit.class) +public class SaccubusTest { + + private static Robot robot; + private static FrameFixture window; + + @Before + public void setUp() throws IOException { + KeyStrokeMappingsParser parser = new KeyStrokeMappingsParser(); + KeyStrokeMappingProvider provider = parser.parse("fest-swing_mapping.txt"); + KeyStrokeMap.addKeyStrokesFrom(provider); + + robot = BasicRobot.robotWithNewAwtHierarchy(); + application(saccubus.Saccubus.class).start(); + window = WindowFinder.findFrame(JFrame.class).using(robot); + } + + @After + public void tearDown() { + robot.cleanUp(); + } + + private SProperties getProperties() { + return Reflection.method("getSetting").withReturnType(SProperties.class).in(window.component()).invoke(); + } + + @Test + public void testConfigSave() throws Exception { + Mockit.setUpMocks(new MockProperties(), new MockFileOutputStream()); + + SProperties.saveSetting(getProperties()); + } + + @Test + public void testMailAddress() { + Mockit.setUpMocks(new MockProperties(), new MockFileOutputStream()); + + window.tabbedPane("mainTabbedPane").selectTab("î{Ýè"); + window.textBox("mailAddressField").enterText("mail@example.com"); + SProperties.saveSetting(getProperties()); + } + + @Test + public void testPassword() { + Mockit.setUpMocks(new MockProperties(), new MockFileOutputStream()); + + window.tabbedPane("mainTabbedPane").selectTab("î{Ýè"); + window.textBox("passwordField").enterText("pass word input"); + SProperties.saveSetting(getProperties()); + } + + @Test + public void testUseProxy() { + Mockit.setUpMocks(new MockProperties(), new MockFileOutputStream()); + + window.tabbedPane("mainTabbedPane").selectTab("î{Ýè"); + window.checkBox("useProxyCheckBox").check(); + SProperties.saveSetting(getProperties()); + + window.tabbedPane("mainTabbedPane").selectTab("î{Ýè"); + window.checkBox("useProxyCheckBox").uncheck(); + SProperties.saveSetting(getProperties()); + } + + @Test + public void testProxyHost() { + Mockit.setUpMocks(new MockProperties(), new MockFileOutputStream()); + + window.tabbedPane("mainTabbedPane").selectTab("î{Ýè"); + window.textBox("proxyTextField").enterText("proxy.example.com"); + SProperties.saveSetting(getProperties()); + } + + @Test + public void testProxyPort() { + Mockit.setUpMocks(new MockProperties(), new MockFileOutputStream()); + + window.tabbedPane("mainTabbedPane").selectTab("î{Ýè"); + window.textBox("proxyPortTextField").enterText("8090"); + SProperties.saveSetting(getProperties()); + } + + @Test + public void testMovieSouce() { + Mockit.setUpMocks(new MockProperties(), new MockFileOutputStream()); + + window.tabbedPane("mainTabbedPane").selectTab("Û¶Ýè"); + window.tabbedPane("saveTabbedPane").selectTab("üÍ®æ"); + window.radioButton("videoUseNiBrButton").check(); + window.textBox("nibrFileField").enterText("nibr_file.mp4"); + window.radioButton("videoNoSaveButton").check(); + window.checkBox("delVideoCheckBox").click(); + window.textBox("videoSavedFolderField").selectAll().enterText("C:\\works\\"); + window.textBox("videoSavedFileField").selectAll().enterText("C:\\movie_file.flv"); + SProperties.saveSetting(getProperties()); + + window.tabbedPane("mainTabbedPane").selectTab("Û¶Ýè"); + window.tabbedPane("saveTabbedPane").selectTab("üÍ®æ"); + window.radioButton("videoSaveButton").check(); + window.checkBox("delVideoCheckBox").click(); + window.textBox("videoSavedFolderField").selectAll().enterText("C:\\works\\movie"); + window.textBox("videoSavedFileField").selectAll().enterText("C:\\movie_file\\file.flv"); + SProperties.saveSetting(getProperties()); + + window.tabbedPane("mainTabbedPane").selectTab("Û¶Ýè"); + window.tabbedPane("saveTabbedPane").selectTab("üÍ®æ"); + window.checkBox("delVideoCheckBox").click(); + window.textBox("videoSavedFolderField").deleteText(); + window.textBox("videoSavedFileField").deleteText(); + window.radioButton("videoUseNiBrButton").check(); + SProperties.saveSetting(getProperties()); + } + + @Test + public void testMovieSouce2() { + Mockit.setUpMocks(new MockProperties(), new MockFileOutputStream()); + + window.tabbedPane("mainTabbedPane").selectTab("Û¶Ýè"); + window.tabbedPane("saveTabbedPane").selectTab("üÍ®æ"); + window.radioButton("saveFolderRadioButton").check(); + window.textBox("videoSavedFolderField").selectAll().enterText("folder\\"); + window.textBox("videoSavedFileField").selectAll().enterText("file.flv"); + SProperties.saveSetting(getProperties()); + + window.tabbedPane("mainTabbedPane").selectTab("Û¶Ýè"); + window.tabbedPane("saveTabbedPane").selectTab("üÍ®æ"); + window.radioButton("saveFileRadioButton").check(); + window.textBox("videoSavedFolderField").selectAll().enterText("folder1\\folder2\\"); + window.textBox("videoSavedFileField").selectAll().enterText("folder\\file.flv"); + SProperties.saveSetting(getProperties()); + } + + @Test + public void testMovieSourceFolderButton() { + Mockit.setUpMocks(new MockProperties(), new MockFileOutputStream()); + + window.tabbedPane("mainTabbedPane").selectTab("Û¶Ýè"); + window.tabbedPane("saveTabbedPane").selectTab("üÍ®æ"); + window.button("showSavingVideoFolderDialogButton").click(); + JFileChooserFixture chooser = JFileChooserFinder.findFileChooser().using(robot); + File folder = new File("F:\\docs\\NetBeansProjects"); + chooser.selectFile(folder).approve(); + assertThat(folder.getAbsolutePath()).isEqualTo(window.textBox("videoSavedFolderField").text()); + } + + @Test + public void testMovieSourceFileButton() { + Mockit.setUpMocks(new MockProperties(), new MockFileOutputStream()); + + window.tabbedPane("mainTabbedPane").selectTab("Û¶Ýè"); + window.tabbedPane("saveTabbedPane").selectTab("üÍ®æ"); + window.button("showSavingVideoFileDialogButton").click(); + JFileChooserFixture chooser = JFileChooserFinder.findFileChooser().using(robot); + File folder = new File("F:\\docs\\NetBeansProjects\\saccubus_frontend\\[out]video\\aa.flv"); + chooser.selectFile(folder).approve(); + assertThat(folder.getAbsolutePath()).isEqualTo(window.textBox("videoSavedFileField").text()); + } + + @Test + public void testDownloadComment() { + Mockit.setUpMocks(new MockProperties(), new MockFileOutputStream()); + + window.tabbedPane("mainTabbedPane").selectTab("Û¶Ýè"); + window.tabbedPane("saveTabbedPane").selectTab("üÍRg"); + window.checkBox("savingCommentCheckBox").check(); + SProperties.saveSetting(getProperties()); + + window.tabbedPane("mainTabbedPane").selectTab("Û¶Ýè"); + window.tabbedPane("saveTabbedPane").selectTab("üÍRg"); + window.checkBox("savingCommentCheckBox").uncheck(); + SProperties.saveSetting(getProperties()); + } + + @Test + public void testDeleteComment() { + Mockit.setUpMocks(new MockProperties(), new MockFileOutputStream()); + + window.tabbedPane("mainTabbedPane").selectTab("Û¶Ýè"); + window.tabbedPane("saveTabbedPane").selectTab("üÍRg"); + window.checkBox("delCommentCheckBox").check(); + SProperties.saveSetting(getProperties()); + + window.tabbedPane("mainTabbedPane").selectTab("Û¶Ýè"); + window.tabbedPane("saveTabbedPane").selectTab("üÍRg"); + window.checkBox("delCommentCheckBox").uncheck(); + SProperties.saveSetting(getProperties()); + } + + @Test + public void testCommentDownloadNum() { + Mockit.setUpMocks(new MockProperties(), new MockFileOutputStream()); + + window.tabbedPane("mainTabbedPane").selectTab("Û¶Ýè"); + window.tabbedPane("saveTabbedPane").selectTab("üÍRg"); + window.checkBox("fixCommentNumCheckBox").check(); + window.textBox("commentNumField").selectAll().enterText("100"); + SProperties.saveSetting(getProperties()); + + window.tabbedPane("mainTabbedPane").selectTab("Û¶Ýè"); + window.tabbedPane("saveTabbedPane").selectTab("üÍRg"); + window.checkBox("fixCommentNumCheckBox").uncheck(); + window.radioButton("commentSaveFolderRadioButton").check(); + window.textBox("commentNumField").deleteText(); + SProperties.saveSetting(getProperties()); + + } + + @Test + public void testCommentDownloadFolder() { + Mockit.setUpMocks(new MockProperties(), new MockFileOutputStream()); + + window.tabbedPane("mainTabbedPane").selectTab("Û¶Ýè"); + window.tabbedPane("saveTabbedPane").selectTab("üÍRg"); + window.radioButton("commentSaveFolderRadioButton").check(); + window.textBox("commentSavedFolderField").selectAll().enterText("c:\\comment\\"); + window.textBox("commentSavedFileField").selectAll().enterText("c:\\comment\\file.xml"); + SProperties.saveSetting(getProperties()); + + window.tabbedPane("mainTabbedPane").selectTab("Û¶Ýè"); + window.tabbedPane("saveTabbedPane").selectTab("üÍRg"); + window.radioButton("commentSaveFileRadioButton").check(); + window.textBox("commentSavedFolderField").selectAll().enterText("comment"); + window.textBox("commentSavedFileField").selectAll().enterText("file.xml"); + SProperties.saveSetting(getProperties()); + + } + + @Test + public void testCommentFolderButton() { + Mockit.setUpMocks(new MockProperties(), new MockFileOutputStream()); + + window.tabbedPane("mainTabbedPane").selectTab("Û¶Ýè"); + window.tabbedPane("saveTabbedPane").selectTab("üÍRg"); + window.button("showSavingCommentFolderDialogButton").click(); + JFileChooserFixture chooser = JFileChooserFinder.findFileChooser().using(robot); + File folder = new File("F:\\docs\\NetBeansProjects"); + chooser.selectFile(folder).approve(); + assertThat(folder.getAbsolutePath()).isEqualTo(window.textBox("commentSavedFolderField").text()); + } + + @Test + public void testCommentFileButton() { + Mockit.setUpMocks(new MockProperties(), new MockFileOutputStream()); + + window.tabbedPane("mainTabbedPane").selectTab("Û¶Ýè"); + window.tabbedPane("saveTabbedPane").selectTab("üÍRg"); + window.button("showSavingCommentFileDialogButton").click(); + JFileChooserFixture chooser = JFileChooserFinder.findFileChooser().using(robot); + File folder = new File("F:\\docs\\NetBeansProjects\\comment.xml"); + chooser.selectFile(folder).approve(); + assertThat(folder.getAbsolutePath()).isEqualTo(window.textBox("commentSavedFileField").text()); + } + + @Test + public void testDownloadTcomment() { + Mockit.setUpMocks(new MockProperties(), new MockFileOutputStream()); + + window.tabbedPane("mainTabbedPane").selectTab("Û¶Ýè"); + window.tabbedPane("saveTabbedPane").selectTab("üÍeÒRg"); + window.checkBox("needDownloadTcomment").check(); + SProperties.saveSetting(getProperties()); + + window.tabbedPane("mainTabbedPane").selectTab("Û¶Ýè"); + window.tabbedPane("saveTabbedPane").selectTab("üÍeÒRg"); + window.checkBox("needDownloadTcomment").uncheck(); + SProperties.saveSetting(getProperties()); + } + + @Test + public void testDeleteTcomment() { + Mockit.setUpMocks(new MockProperties(), new MockFileOutputStream()); + + window.tabbedPane("mainTabbedPane").selectTab("Û¶Ýè"); + window.tabbedPane("saveTabbedPane").selectTab("üÍeÒRg"); + window.checkBox("delTcomment").check(); + SProperties.saveSetting(getProperties()); + + window.tabbedPane("mainTabbedPane").selectTab("Û¶Ýè"); + window.tabbedPane("saveTabbedPane").selectTab("üÍeÒRg"); + window.checkBox("delTcomment").uncheck(); + SProperties.saveSetting(getProperties()); + } + + @Test + public void testTcommentDownloadFolder() { + Mockit.setUpMocks(new MockProperties(), new MockFileOutputStream()); + + window.tabbedPane("mainTabbedPane").selectTab("Û¶Ýè"); + window.tabbedPane("saveTabbedPane").selectTab("üÍeÒRg"); + window.radioButton("tcommentSaveInFolder").check(); + window.textBox("tcommentFolder").selectAll().enterText("c:\\comment\\"); + window.textBox("tcommentFile").selectAll().enterText("c:\\comment\\file.xml"); + SProperties.saveSetting(getProperties()); + + window.tabbedPane("mainTabbedPane").selectTab("Û¶Ýè"); + window.tabbedPane("saveTabbedPane").selectTab("üÍeÒRg"); + window.radioButton("tcommentSaveToFile").check(); + window.textBox("tcommentFolder").selectAll().enterText("comment"); + window.textBox("tcommentFile").selectAll().enterText("file.xml"); + SProperties.saveSetting(getProperties()); + + } + + @Test + public void testTcommentFolderButton() { + Mockit.setUpMocks(new MockProperties(), new MockFileOutputStream()); + + window.tabbedPane("mainTabbedPane").selectTab("Û¶Ýè"); + window.tabbedPane("saveTabbedPane").selectTab("üÍeÒRg"); + window.button("tcoomentFolderChooserButton").click(); + JFileChooserFixture chooser = JFileChooserFinder.findFileChooser().using(robot); + File folder = new File("F:\\docs\\NetBeansProjects\\saccubus_frontend\\src"); + chooser.selectFile(folder).approve(); + assertThat(folder.getAbsolutePath()).isEqualTo(window.textBox("tcommentFolder").text()); + } + + @Test + public void testTcommentFileButton() { + Mockit.setUpMocks(new MockProperties(), new MockFileOutputStream()); + + window.tabbedPane("mainTabbedPane").selectTab("Û¶Ýè"); + window.tabbedPane("saveTabbedPane").selectTab("üÍeÒRg"); + window.button("tcommentFileChooserButton").click(); + JFileChooserFixture chooser = JFileChooserFinder.findFileChooser().using(robot); + File folder = new File("F:\\docs\\NetBeansProjects\\tcomment.xml"); + chooser.selectFile(folder).approve(); + assertThat(folder.getAbsolutePath()).isEqualTo(window.textBox("tcommentFile").text()); + } + + @Test + public void testConvertVideo() { + Mockit.setUpMocks(new MockProperties(), new MockFileOutputStream()); + + window.tabbedPane("mainTabbedPane").selectTab("Û¶Ýè"); + window.tabbedPane("saveTabbedPane").selectTab("oÍRgt«®æ"); + window.checkBox("savingConvertedVideoCheckBox").uncheck(); + SProperties.saveSetting(getProperties()); + + window.tabbedPane("mainTabbedPane").selectTab("Û¶Ýè"); + window.tabbedPane("saveTabbedPane").selectTab("oÍRgt«®æ"); + window.checkBox("savingConvertedVideoCheckBox").check(); + SProperties.saveSetting(getProperties()); + } + + @Test + public void testAddComment() { + Mockit.setUpMocks(new MockProperties(), new MockFileOutputStream()); + + window.tabbedPane("mainTabbedPane").selectTab("Û¶Ýè"); + window.tabbedPane("saveTabbedPane").selectTab("oÍRgt«®æ"); + window.checkBox("addComment").uncheck(); + SProperties.saveSetting(getProperties()); + + window.tabbedPane("mainTabbedPane").selectTab("Û¶Ýè"); + window.tabbedPane("saveTabbedPane").selectTab("oÍRgt«®æ"); + window.checkBox("addComment").check(); + SProperties.saveSetting(getProperties()); + } + + @Test + public void testAddTcomment() { + Mockit.setUpMocks(new MockProperties(), new MockFileOutputStream()); + + window.tabbedPane("mainTabbedPane").selectTab("Û¶Ýè"); + window.tabbedPane("saveTabbedPane").selectTab("oÍRgt«®æ"); + window.checkBox("addTcomment").uncheck(); + SProperties.saveSetting(getProperties()); + + window.tabbedPane("mainTabbedPane").selectTab("Û¶Ýè"); + window.tabbedPane("saveTabbedPane").selectTab("oÍRgt«®æ"); + window.checkBox("addTcomment").check(); + SProperties.saveSetting(getProperties()); + } + + @Test + public void testNoAddId() { + Mockit.setUpMocks(new MockProperties(), new MockFileOutputStream()); + + window.tabbedPane("mainTabbedPane").selectTab("Û¶Ýè"); + window.tabbedPane("saveTabbedPane").selectTab("oÍRgt«®æ"); + window.checkBox("notAddVideoIdConvVideoCheckBox").uncheck(); + SProperties.saveSetting(getProperties()); + + window.tabbedPane("mainTabbedPane").selectTab("Û¶Ýè"); + window.tabbedPane("saveTabbedPane").selectTab("oÍRgt«®æ"); + window.checkBox("notAddVideoIdConvVideoCheckBox").check(); + SProperties.saveSetting(getProperties()); + } + + @Test + public void testConvertedVideoSavePlace() { + Mockit.setUpMocks(new MockProperties(), new MockFileOutputStream()); + + window.tabbedPane("mainTabbedPane").selectTab("Û¶Ýè"); + window.tabbedPane("saveTabbedPane").selectTab("oÍRgt«®æ"); + window.radioButton("convSaveFolderRadioButton").check(); + window.textBox("convertedVideoSavedFolderField").setText("folder"); + window.textBox("convertedVideoSavedFileField").setText("converted.avi"); + SProperties.saveSetting(getProperties()); + + window.tabbedPane("mainTabbedPane").selectTab("Û¶Ýè"); + window.tabbedPane("saveTabbedPane").selectTab("oÍRgt«®æ"); + window.radioButton("convSaveFileRadioButton").check(); + window.textBox("convertedVideoSavedFolderField").setText("folder\\folder2"); + window.textBox("convertedVideoSavedFileField").setText("folder\\converted.avi"); + SProperties.saveSetting(getProperties()); + } + + @MockClass(realClass = FileOutputStream.class) + public static class MockFileOutputStream { + + public MockFileOutputStream() { + } + + @Mock + public MockFileOutputStream(String name) { + System.out.println("FileOutputStream constructor mocked."); + } + } + + @MockClass(realClass = Properties.class) + public static class MockProperties { + + private Map map = new HashMap(); + + @Mock + public void storeToXML(OutputStream os, String comment) { + System.out.println("storeToXML mocked."); + + // î{Ýè + window.tabbedPane("mainTabbedPane").selectTab("î{Ýè"); + // [UÝè + assertThat(map.get("MailAddress")).isEqualTo(window.textBox("mailAddressField").text()); + assertThat(map.get("Password")).isEqualTo(window.textBox("passwordField").text()); + // vLVÝè + assertThat(Boolean.parseBoolean(map.get("UseProxy"))).isEqualTo(window.checkBox("useProxyCheckBox"). + component().isSelected()); + assertThat(map.get("Proxy")).isEqualTo(window.textBox("proxyTextField").text()); + final String port = window.textBox("proxyPortTextField").text(); + if (!"".equals(port)) { + assertThat(map.get("ProxyPort")).isEqualTo(port); + } else { + assertThat(map.get("ProxyPort")).as("|[gªóÌêÉÍ-1(³øÈÔ)ðÝè·é").isEqualTo("-1"); + } + + // Û¶Ýè - üÍ®æ + window.tabbedPane("mainTabbedPane").selectTab("Û¶Ýè"); + window.tabbedPane("saveTabbedPane").selectTab("üÍ®æ"); + + final VideoSaveKind saveVideo = VideoSaveKind.valueOf(map.get("SaveVideoFile")); + switch (saveVideo) { + case NO_SAVE: + window.radioButton("videoNoSaveButton").requireSelected(); + window.radioButton("videoSaveButton").requireNotSelected(); + window.radioButton("videoUseNiBrButton").requireNotSelected(); + break; + case SAVE: + window.radioButton("videoNoSaveButton").requireNotSelected(); + window.radioButton("videoSaveButton").requireSelected(); + window.radioButton("videoUseNiBrButton").requireNotSelected(); + break; + case NICOBROWSER: + window.radioButton("videoNoSaveButton").requireNotSelected(); + window.radioButton("videoSaveButton").requireNotSelected(); + window.radioButton("videoUseNiBrButton").requireSelected(); + break; + default: + fail(); + } + + final boolean videoAutoNaming = Boolean.parseBoolean(map.get("VideoFixFileName")); + if (videoAutoNaming) { + window.radioButton("saveFolderRadioButton").requireSelected(); + window.radioButton("saveFileRadioButton").requireNotSelected(); + } else { + window.radioButton("saveFolderRadioButton").requireNotSelected(); + window.radioButton("saveFileRadioButton").requireSelected(); + } + + assertThat(Boolean.parseBoolean(map.get("DeleteVideoAfterConv"))).isEqualTo(window.checkBox( + "delVideoCheckBox").component().isSelected()); + assertThat(map.get("VideoFixFileNameFolder")).isEqualTo(new File(window.textBox("videoSavedFolderField"). + text()).getPath()); + assertThat(map.get("VideoFile")).isEqualTo(window.textBox("videoSavedFileField").text()); + + assertThat(map.get("NicoBrowserFileName")).isEqualTo(window.textBox("nibrFileField").text()); + + + // Û¶Ýè - üÍRg + window.tabbedPane("saveTabbedPane").selectTab("üÍRg"); + + assertThat(Boolean.parseBoolean(map.get("SaveCommentFile"))).isEqualTo(window.checkBox( + "savingCommentCheckBox").component().isSelected()); + assertThat(Boolean.parseBoolean(map.get("DeleteCommentAfterConv"))).isEqualTo(window.checkBox( + "delCommentCheckBox").component().isSelected()); + assertThat(Boolean.parseBoolean(map.get("FixCommentSize"))).isEqualTo(window.checkBox( + "fixCommentNumCheckBox").component().isSelected()); + // ó¾Á½çftHgl500ðÝè·é + String backComment = (window.textBox("commentNumField").text().isEmpty()) ? "500" : window.textBox( + "commentNumField").text(); + assertThat(map.get("BackComment")).isEqualTo(backComment); + + final boolean commentAutoNaming = Boolean.parseBoolean(map.get("CommentFixFileName")); + if (commentAutoNaming) { + window.radioButton("commentSaveFolderRadioButton").requireSelected(); + window.radioButton("commentSaveFileRadioButton").requireNotSelected(); + } else { + window.radioButton("commentSaveFolderRadioButton").requireNotSelected(); + window.radioButton("commentSaveFileRadioButton").requireSelected(); + } + + assertThat(map.get("CommentFixFileNameFolder")).isEqualTo(new File(window.textBox("commentSavedFolderField"). + text()).getPath()); + assertThat(map.get("CommentFile")).isEqualTo(window.textBox("commentSavedFileField").text()); + + + // Û¶Ýè - üÍeÒRg + window.tabbedPane("saveTabbedPane").selectTab("üÍeÒRg"); + + assertThat(Boolean.parseBoolean(map.get("TCDownload"))).isEqualTo(window.checkBox("needDownloadTcomment"). + component().isSelected()); + assertThat(Boolean.parseBoolean(map.get("TCDelete"))).isEqualTo(window.checkBox("delTcomment").component(). + isSelected()); + + final boolean tcommAutoNaming = Boolean.parseBoolean(map.get("TCAutoNaming")); + if (tcommAutoNaming) { + window.radioButton("tcommentSaveInFolder").requireSelected(); + window.radioButton("tcommentSaveToFile").requireNotSelected(); + } else { + window.radioButton("tcommentSaveInFolder").requireNotSelected(); + window.radioButton("tcommentSaveToFile").requireSelected(); + } + + assertThat(map.get("TCDirectory")).isEqualTo(window.textBox("tcommentFolder").text()); + assertThat(map.get("TCFileName")).isEqualTo(window.textBox("tcommentFile").text()); + + + // Û¶Ýè - oÍRgt«®æ + window.tabbedPane("saveTabbedPane").selectTab("oÍRgt«®æ"); + + assertThat(Boolean.parseBoolean(map.get("SaveConvertedFile"))).isEqualTo(window.checkBox( + "savingConvertedVideoCheckBox").component().isSelected()); + assertThat(Boolean.parseBoolean(map.get("AddComment"))).isEqualTo(window.checkBox("addComment").component(). + isSelected()); + assertThat(Boolean.parseBoolean(map.get("AddTcomment"))).isEqualTo(window.checkBox("addTcomment").component(). + isSelected()); + + final boolean convertedAutoNaming = Boolean.parseBoolean(map.get("ConvFixFileName")); + if (convertedAutoNaming) { + window.radioButton("convSaveFolderRadioButton").requireSelected(); + window.radioButton("convSaveFileRadioButton").requireNotSelected(); + } else { + window.radioButton("convSaveFolderRadioButton").requireNotSelected(); + window.radioButton("convSaveFileRadioButton").requireSelected(); + } + + assertThat(Boolean.parseBoolean(map.get("NotAddVideoIDtoConverted"))).isEqualTo(window.checkBox( + "notAddVideoIdConvVideoCheckBox").component().isSelected()); + assertThat(map.get("ConvFixFileNameFolder")).isEqualTo( + window.textBox("convertedVideoSavedFolderField").text()); + assertThat(map.get("ConvertedFile")).isEqualTo(window.textBox("convertedVideoSavedFileField").text()); + + + // î{Ýè + window.tabbedPane("mainTabbedPane").selectTab("®æÝè"); + + assertThat(map.get("FFnpegPath")).isEqualTo(window.textBox("ffmpegPathField").text()); + assertThat(map.get("VhookPath")).isEqualTo(window.textBox("vhookPathField").text()); + + assertThat(map.get("CMD_EXT")).isEqualTo(window.textBox("extOptionField").text()); + assertThat(map.get("CMD_MAIN")).isEqualTo(window.textBox("mainOptionField").text()); + assertThat(map.get("CMD_IN")).isEqualTo(window.textBox("inputOptionField").text()); + assertThat(map.get("CMD_OUT")).isEqualTo(window.textBox("outputOptionField").text()); + + + // Ï·Ýè + window.tabbedPane("mainTabbedPane").selectTab("Ï·Ýè"); + assertThat(Boolean.parseBoolean(map.get("VhookDisabled"))).isEqualTo(window.checkBox("disableVhookCheckBox"). + component().isSelected()); + assertThat(map.get("ShowCommentNum")).isEqualTo(window.textBox("viewCommentField").text()); + assertThat(map.get("FontPath")).isEqualTo(window.textBox("fontPathField").text()); + assertThat(map.get("FontIndex")).isEqualTo(window.textBox("fontIndexField").text()); + window.comboBox("shadowComboBox").requireSelection(Integer.parseInt(map.get("ShadowIndex"))); + assertThat(Boolean.parseBoolean(map.get("ShowVideo"))).isEqualTo(window.checkBox("showConvVideoCheckBox"). + component().isSelected()); + assertThat(Boolean.parseBoolean(map.get("FixFontSize"))).isEqualTo(window.checkBox("fixFontSizeCheckBox"). + component().isSelected()); + assertThat(Boolean.parseBoolean(map.get("OpaqueComment"))).isEqualTo(window.checkBox("opaqueCommentCheckBox"). + component().isSelected()); + + assertThat(map.get("NG_Word")).isEqualTo(window.textBox("ngWordTextField").text()); + assertThat(map.get("NG_ID")).isEqualTo(window.textBox("ngIdTextField").text()); + + +//assertThat(map.get("TempDir")).isEqualTo(window. + } + + @Mock + public Object setProperty(String key, String value) { + String prev = map.put(key, value); +// assertNull(prev); + return prev; + } + } +}

æ¬ãã­ã°ã©ã ã«ã¤ãã¦

æ¬ãã­ã°ã©ã ã®å°å ¥æ¹æ³

æ¡å¼µæ©è½ã®ä½¿ãæ¹

æ³¨æç¹

æ´æ°å±¥æ­´

æ´æ°å±¥æ­´

æ¬ããã°ã©ã ã«ã¤ãã¦

æ¬ããã°ã©ã ã®å°å¥æ¹æ³

æ¡å¼µæ©è½ã®ä½¿ãæ¹

æ³¨æç¹

æ´æ°å±¥æ´

æ´æ°å±¥æ´