オリジナルr54の変更の一部.

クラス名変更 FFmpegComboBoxModel -> OptionComboBoxModel

git-svn-id: http://192.168.11.7/svn/saccubus/trunk@13 c066991c-cf13-ec4a-a49a-846e61667af5

diff --git a/frontend/nbproject/project.properties b/frontend/nbproject/project.properties
index 3eb9d9c..6728896 100644 (file)
--- a/frontend/nbproject/project.properties
+++ b/frontend/nbproject/project.properties
@@ -44,7 +44,7 @@ javadoc.splitindex=true
 javadoc.use=true\r
 javadoc.version=false\r
 javadoc.windowtitle=\r
-main.class=\r
+main.class=saccubus.Saccubus\r
 manifest.file=manifest.mf\r
 meta.inf.dir=${src.dir}/META-INF\r
 platform.active=default_platform\r

diff --git a/frontend/saccubus.xml b/frontend/saccubus.xml
new file mode 100644 (file)
index 0000000..1c1e2f7
--- /dev/null
+++ b/frontend/saccubus.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>\r
+<!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd">\r
+<properties>\r
+<comment>settings</comment>\r
+<entry key="CommentFixFileName">true</entry>\r
+<entry key="FontIndex">1</entry>\r
+<entry key="SaveConvertedFile">true</entry>\r
+<entry key="BackComment">500</entry>\r
+<entry key="ShowVideo">true</entry>\r
+<entry key="ShadowIndex">1</entry>\r
+<entry key="SaveVideoFile">true</entry>\r
+<entry key="ConvFixFileName">true</entry>\r
+<entry key="VideoFile">.\video.flv</entry>\r
+<entry key="Password"/>\r
+<entry key="CommentFixFileNameFolder">.\[out]comment</entry>\r
+<entry key="VideoFixFileNameFolder">.\[out]video</entry>\r
+<entry key="NG_ID"/>\r
+<entry key="FixFontSize">true</entry>\r
+<entry key="NotAddVideoIDtoConverted">false</entry>\r
+<entry key="FontPath">C:\WINDOWS\Fonts\msgothic.ttc</entry>\r
+<entry key="NG_Word"/>\r
+<entry key="SaveCommentFile">true</entry>\r
+<entry key="ShowCommentNum">30</entry>\r
+<entry key="CMD_OUT">-s 512x384 -acodec libmp3lame -ab 128k -ar 44100 -ac 2 -vcodec libxvid -qscale 3 -async 1</entry>\r
+<entry key="VhookDisabled">false</entry>\r
+<entry key="ConvertedFile">.\video.avi</entry>\r
+<entry key="Proxy"/>\r
+<entry key="DeleteVideoAfterConv">false</entry>\r
+<entry key="ProxyPort">-1</entry>\r
+<entry key="UseProxy">false</entry>\r
+<entry key="CMD_EXT">avi</entry>\r
+<entry key="VhookPath">.\bin\nicovideo.dll</entry>\r
+<entry key="MailAddress"/>\r
+<entry key="CMD_IN"/>\r
+<entry key="ConvFixFileNameFolder">.\[out]converted</entry>\r
+<entry key="CommentFile">.\comment.xml</entry>\r
+<entry key="DeleteCommentAfterConv">false</entry>\r
+<entry key="FFnpegPath">.\bin\ffmpeg.exe</entry>\r
+<entry key="OpaqueComment">false</entry>\r
+<entry key="VideoFixFileName">true</entry>\r
+<entry key="FixCommentSize">true</entry>\r
+<entry key="CMD_MAIN"/>\r
+</properties>\r

diff --git a/frontend/src/saccubus/MainFrame.java b/frontend/src/saccubus/MainFrame.java
index 26b282c..95a4a00 100644 (file)
--- a/frontend/src/saccubus/MainFrame.java
+++ b/frontend/src/saccubus/MainFrame.java
@@ -1551,7 +1551,7 @@ public class MainFrame extends JFrame {
         * 
         * @return javax.swing.JComboBox
         */
-       private final FFmpegComboBoxModel FFmpegOptionModel = new FFmpegComboBoxModel();
+       private final OptionComboBoxModel FFmpegOptionModel = new OptionComboBoxModel();
 
        private JLabel ExtOptionLabel = null;
 

diff --git a/frontend/src/saccubus/FFmpegComboBoxModel.java b/frontend/src/saccubus/OptionComboBoxModel.java
similarity index 96%
rename from frontend/src/saccubus/FFmpegComboBoxModel.java
rename to frontend/src/saccubus/OptionComboBoxModel.java
index 687bb2b..8b755d7 100644 (file)
--- a/frontend/src/saccubus/FFmpegComboBoxModel.java
+++ b/frontend/src/saccubus/OptionComboBoxModel.java
@@ -8,11 +8,12 @@ import java.util.ArrayList;
 
 import javax.swing.DefaultComboBoxModel;
 
+
 /**
  * @author Account01
  * 
  */
-public class FFmpegComboBoxModel extends DefaultComboBoxModel {
+public class OptionComboBoxModel extends DefaultComboBoxModel {
        /**
         * 
         */
@@ -25,7 +26,7 @@ public class FFmpegComboBoxModel extends DefaultComboBoxModel {
 
        private int Index = 0;
 
-       public FFmpegComboBoxModel() {
+       public OptionComboBoxModel() {
                reload();
        }
 
@@ -129,7 +130,6 @@ public class FFmpegComboBoxModel extends DefaultComboBoxModel {
        }
 
 }
-
 class FFmpegSelectedItem {
        private final int Index;