OSDN Git Service

merge.
authoryuki <yuki@c066991c-cf13-ec4a-a49a-846e61667af5>
Fri, 18 Dec 2009 10:39:51 +0000 (10:39 +0000)
committeryuki <yuki@c066991c-cf13-ec4a-a49a-846e61667af5>
Fri, 18 Dec 2009 10:39:51 +0000 (10:39 +0000)
commitc381858670c21e795b6545d7d9c16f00bb8219be
tree5087bdb91798c1293128b309c2b47515df4ce7dd
parent2514ecfc2bc1464d42117c8e5804bd778bb29656
merge.
20091216_frontend_filename_autocomplete
r224-r300

git-svn-id: http://192.168.11.7/svn/saccubus/trunk@301 c066991c-cf13-ec4a-a49a-846e61667af5
23 files changed:
frontend/src/saccubus/MainFrame.java
frontend/src/saccubus/converter/AbstractCommand.java [new file with mode: 0644]
frontend/src/saccubus/converter/Converter.java
frontend/src/saccubus/converter/FfmpegCommand.java [new file with mode: 0644]
frontend/src/saccubus/converter/Profile.java [deleted file]
frontend/src/saccubus/converter/filegetter/FileInstanciator.java
frontend/src/saccubus/converter/filegetter/LoginInfo.java
frontend/src/saccubus/converter/filegetter/WebFileInstanciator.java
frontend/src/saccubus/converter/profile/CommentGetInfo.java [new file with mode: 0644]
frontend/src/saccubus/converter/profile/Ffmpeg.java [new file with mode: 0644]
frontend/src/saccubus/converter/profile/FfmpegOption.java [moved from frontend/src/saccubus/converter/FfmpegOption.java with 91% similarity]
frontend/src/saccubus/converter/profile/InputFileSetting.java [moved from frontend/src/saccubus/converter/FileSetting.java with 82% similarity]
frontend/src/saccubus/converter/profile/NgSetting.java [new file with mode: 0644]
frontend/src/saccubus/converter/profile/OutputFileSetting.java [new file with mode: 0644]
frontend/src/saccubus/converter/profile/Profile.java [new file with mode: 0644]
frontend/src/saccubus/converter/profile/Proxy.java [moved from frontend/src/saccubus/converter/Proxy.java with 94% similarity]
frontend/src/saccubus/converter/profile/SFile.java [moved from frontend/src/saccubus/converter/SFile.java with 96% similarity]
frontend/src/saccubus/converter/profile/User.java [new file with mode: 0644]
frontend/src/saccubus/properties/BasicSetting.java
frontend/src/saccubus/properties/ConvertSetting.java
frontend/src/saccubus/properties/InputVideoSetting.java
frontend/src/saccubus/properties/MovieSetting.java
frontend/src/saccubus/properties/SProperties.java