提交: 3b2a85ae7ae52189cefb86b4528d4b2fc75b3f8c - FFU-Eng (git)

Commit MetaInfo

• 修订版: 3b2a85ae7ae52189cefb86b4528d4b2fc75b3f8c (tree)
• 时间: 2018-12-25 23:18:05
• 作者: kdrama_fansub <kdrama_fansub@yaho...>
• Commiter: kdrama_fansub

Log Message

FFU-Eng 初版

更改概述

• modified: customizedialog.cpp
• modified: customizedialog.h
• modified: downloadthread.cpp
• modified: downloadthread.h
• modified: main.cpp
• modified: mainwindow.cpp
• modified: mainwindow.h
• modified: mainwindow.ui
• modified: messagewindow.cpp
• modified: messagewindow.h
• modified: messagewindow.ui
• modified: scrambledialog.cpp
• modified: scrambledialog.h
• modified: scrambledialog.ui

差异

--- a/customizedialog.cpp
+++ b/customizedialog.cpp
@@ -39,27 +39,28 @@ QStringList CustomizeDialog::courses = QStringList()
 		<< QString::fromUtf8( "基礎英語1" ) << QString::fromUtf8( "基礎英語2" )
 		<< QString::fromUtf8( "基礎英語3" ) << QString::fromUtf8( "英会話タイムトライアル" )
 		<< QString::fromUtf8( "ラジオ英会話" ) << QString::fromUtf8( "入門ビジネス英語" )
-		<< QString::fromUtf8( "実践ビジネス英語" ) << QString::fromUtf8( "まいにちロシア語" )
-		<< QString::fromUtf8( "英語で読む村上春樹" ) << QString::fromUtf8( "エンジョイ・シンプル・イングリッシュ" )
+		<< QString::fromUtf8( "実践ビジネス英語" ) << QString::fromUtf8( "ボキャブライダー" )
+		<< QString::fromUtf8( "遠山顕の英会話楽習" ) << QString::fromUtf8( "エンジョイ・シンプル・イングリッシュ" )
 		<< QString::fromUtf8( "まいにち中国語" ) << QString::fromUtf8( "まいにちフランス語" )
 		<< QString::fromUtf8( "まいにちイタリア語" ) << QString::fromUtf8( "まいにちハングル講座" )
 		<< QString::fromUtf8( "まいにちドイツ語" ) << QString::fromUtf8( "まいにちスペイン語" )
 		<< QString::fromUtf8( "レベルアップ中国語" ) << QString::fromUtf8( "レベルアップハングル講座" )
-		<< QString::fromUtf8( "攻略！英語リスニング" );
+		<< QString::fromUtf8( "高校生からはじめる「現代英語」" ) << QString::fromUtf8( "まいにちロシア語" )
+		<< QString::fromUtf8( "おもてなしの中国語" ) ;
 QStringList CustomizeDialog::titleKeys = QStringList()
 		<< "basic1_title" << "basic2_title" << "basic3_title" << "timetrial_title"
-		<< "kaiwa_title" << "business1_title" << "business2_title" << "russian_title"
-		<< "yomu_title" << "enjoy_title"
+		<< "kaiwa_title" << "business1_title" << "business2_title" << "vr-radio_title"
+		<< "gakusyu_title" << "enjoy_title"
 		<< "chinese_title" << "french_title" << "italian_title" << "hangeul_title"
 		<< "german_title" << "spanish_title" << "levelup-chinese_title" << "levelup-hangeul_title"
-		<< "kouryaku_title";
+		<< "gendai_title" << "russian_title" << "omotenashi_title";
 QStringList CustomizeDialog::fileNameKeys = QStringList()
 		<< "basic1_file_name" << "basic2_file_name" << "basic3_file_name" << "timetrial_file_name"
-		<< "kaiwa_file_name" << "business1_file_name" << "business2_file_name" << "russian_file_name"
-		<< "yomu_file_name" << "enjoy_file_name"
+		<< "kaiwa_file_name" << "business1_file_name" << "business2_file_name" << "vr-radio_file_name"
+		<< "gakusyu_file_name" << "enjoy_file_name"
 		<< "chinese_file_name" << "french_file_name" << "italian_file_name" << "hangeul_file_name"
 		<< "german_file_name" << "spanish_file_name" << "levelup-chinese_file_name" << "levelup-hangeul_file_name"
-		<< "kouryaku_file_name";
+		<< "gendai_file_name" << "russian_file_name" << "omotenashi_file_name";
 
 void CustomizeDialog::formats( QString course, QString& titleFormat, QString& fileNameFormat ) {
 	int index = courses.indexOf( course );
@@ -93,7 +94,7 @@ void CustomizeDialog::settings( bool write ) {
 		ui.lineEdit_17, ui.lineEdit_19,
 		ui.lineEdit_9, ui.lineEdit_10, ui.lineEdit_11, ui.lineEdit_12,
 		ui.lineEdit_13, ui.lineEdit_14, ui.lineEdit_15, ui.lineEdit_16,
-		ui.lineEdit_18,
+		ui.lineEdit_18, ui.lineEdit_20, ui.lineEdit_21,
 		NULL
 	};
 

--- a/downloadthread.cpp
+++ b/downloadthread.cpp
@@ -68,19 +68,31 @@ QString DownloadThread::suffix = "listdataflv.xml";
 QString DownloadThread::flv_host = "flv.nhk.or.jp";
 QString DownloadThread::flv_app = "ondemand/";
 QString DownloadThread::flv_service_prefix = "mp4:flv/gogaku/streaming/mp4/";
+QString DownloadThread::kouza1 = "/kouza";
+QString DownloadThread::kouza2 = "/kouza2";
 
 QString DownloadThread::flvstreamer;
 QString DownloadThread::ffmpeg;
 QString DownloadThread::scramble;
+QString DownloadThread::optional1;
+QString DownloadThread::optional2;
+QString DownloadThread::optional3;
+QString DownloadThread::optional4;
+
 QStringList DownloadThread::malformed = (QStringList() << "3g2" << "3gp" << "m4a" << "mov");
 
+QString DownloadThread::english_3month = QString::fromUtf8( "短期集中！3か月英会話" );
+QString DownloadThread::english_vr = QString::fromUtf8( "ボキャブライダー" );
+
 QHash<QString, QString> DownloadThread::ffmpegHash;
+QHash<QString, QString> DownloadThread::ffmpegHash1;
 QHash<QProcess::ProcessError, QString> DownloadThread::processError;
 
 //--------------------------------------------------------------------------------
 
 DownloadThread::DownloadThread( Ui::MainWindowClass* ui ) : isCanceled(false), failed1935(false) {
 	this->ui = ui;
+
 	if ( ffmpegHash.empty() ) {
 		ffmpegHash["3g2"] = "\"%1\" -y -i https://nhk-vh.akamaihd.net/i/gogaku-stream/mp4/%2/master.m3u8 -vn -bsf aac_adtstoasc -acodec copy \"%3\"";
 		ffmpegHash["3gp"] = "\"%1\" -y -i https://nhk-vh.akamaihd.net/i/gogaku-stream/mp4/%2/master.m3u8 -vn -bsf aac_adtstoasc -acodec copy \"%3\"";
@@ -93,6 +105,21 @@ DownloadThread::DownloadThread( Ui::MainWindowClass* ui ) : isCanceled(false), f
 		ffmpegHash["mp3"] = "\"%1\" -y -i https://nhk-vh.akamaihd.net/i/gogaku-stream/mp4/%2/master.m3u8 -id3v2_version 3 -metadata title=\"%4\" -metadata artist=\"NHK\" -metadata album=\"%5\" -metadata date=\"%6\" -metadata genre=\"Speech\" -vn -acodec libmp3lame \"%3\"";
 		ffmpegHash["ts"] = "\"%1\" -y -i https://nhk-vh.akamaihd.net/i/gogaku-stream/mp4/%2/master.m3u8 -vn -acodec copy \"%3\"";
 	}
+
+	if ( ffmpegHash1.empty() ) {
+		ffmpegHash1["3g2"] = "\"%1\" -y -i https://nhk-vh.akamaihd.net/i/gogaku-stream/r/%2/master.m3u8 -vn -bsf aac_adtstoasc -acodec copy \"%3\"";
+		ffmpegHash1["3gp"] = "\"%1\" -y -i https://nhk-vh.akamaihd.net/i/gogaku-stream/r/%2/master.m3u8 -vn -bsf aac_adtstoasc -acodec copy \"%3\"";
+		ffmpegHash1["aac"] = "\"%1\" -y -i https://nhk-vh.akamaihd.net/i/gogaku-stream/r/%2/master.m3u8 -vn -acodec copy \"%3\"";
+		ffmpegHash1["avi"] = "\"%1\" -y -i https://nhk-vh.akamaihd.net/i/gogaku-stream/r/%2/master.m3u8 -id3v2_version 3 -metadata title=\"%4\" -metadata artist=\"NHK\" -metadata album=\"%5\" -metadata date=\"%6\" -metadata genre=\"Speech\" -vn -acodec copy \"%3\"";
+		ffmpegHash1["m4a"] = "\"%1\" -y -i https://nhk-vh.akamaihd.net/i/gogaku-stream/r/%2/master.m3u8 -id3v2_version 3 -metadata title=\"%4\" -metadata artist=\"NHK\" -metadata album=\"%5\" -metadata date=\"%6\" -metadata genre=\"Speech\" -vn -bsf aac_adtstoasc -acodec copy \"%3\"";
+		ffmpegHash1["mka"] = "\"%1\" -y -i https://nhk-vh.akamaihd.net/i/gogaku-stream/r/%2/master.m3u8 -id3v2_version 3 -metadata title=\"%4\" -metadata artist=\"NHK\" -metadata album=\"%5\" -metadata date=\"%6\" -metadata genre=\"Speech\" -vn -acodec copy \"%3\"";
+		ffmpegHash1["mkv"] = "\"%1\" -y -i https://nhk-vh.akamaihd.net/i/gogaku-stream/r/%2/master.m3u8 -id3v2_version 3 -metadata title=\"%4\" -metadata artist=\"NHK\" -metadata album=\"%5\" -metadata date=\"%6\" -metadata genre=\"Speech\" -vn -acodec copy \"%3\"";
+		ffmpegHash1["mov"] = "\"%1\" -y -i https://nhk-vh.akamaihd.net/i/gogaku-stream/r/%2/master.m3u8 -id3v2_version 3 -metadata title=\"%4\" -metadata artist=\"NHK\" -metadata album=\"%5\" -metadata date=\"%6\" -metadata genre=\"Speech\" -vn -bsf aac_adtstoasc -acodec copy \"%3\"";
+		ffmpegHash1["mp3"] = "\"%1\" -y -i https://nhk-vh.akamaihd.net/i/gogaku-stream/r/%2/master.m3u8 -id3v2_version 3 -metadata title=\"%4\" -metadata artist=\"NHK\" -metadata album=\"%5\" -metadata date=\"%6\" -metadata genre=\"Speech\" -vn -acodec libmp3lame \"%3\"";
+		ffmpegHash1["ts"] = "\"%1\" -y -i https://nhk-vh.akamaihd.net/i/gogaku-stream/r/%2/master.m3u8 -vn -acodec copy \"%3\"";
+	}
+
+
 	if ( processError.empty() ) {
 		processError[QProcess::FailedToStart] = "FailedToStart";
 		processError[QProcess::Crashed] = "Crashed";
@@ -457,7 +484,8 @@ QString DownloadThread::formatName( QString format, QString kouza, QString hdate
 	int month = hdate.left( 2 ).toInt();
 	int year = 2000 + file.left( 2 ).toInt();
 	if ( month <= 4 && QDate::currentDate().year() > year )
-		year += 1;
+		if ( !QString::compare(  kouza , english_vr ) == 0 ) year += 1;
+		if ( QString::compare(  kouza , english_vr ) == 0 && month < 4 ) year += 1;
 	int day = hdate.mid( 3, 2 ).toInt();
 
 	if ( file.right( 4 ) == ".flv" )
@@ -528,18 +556,51 @@ bool DownloadThread::captureStream( QString kouza, QString hdate, QString file )
 
 	int month = hdate.left( 2 ).toInt();
 	int year = 2000 + file.left( 2 ).toInt();
+	int year1 = 2000 + file.left( 2 ).toInt();
 	if ( month <= 4 && QDate::currentDate().year() > year )
-		year += 1;
+		if ( !QString::compare(  kouza , english_vr ) == 0 ) year += 1;
+		if ( QString::compare(  kouza , english_vr ) == 0 && month < 4 ) year += 1;
 	int day = hdate.mid( 3, 2 ).toInt();
 	QDate onair( year, month, day );
 	QString yyyymmdd = onair.toString( "yyyy_MM_dd" );
-	
+
+
+	if ( QString::compare(  kouza , english_vr ) ==0 ){
+	QDate d1;
+	d1.setDate(QDate::currentDate().year(),QDate::currentDate().month(),QDate::currentDate().day());
+	int d2 = d1.dayOfWeek();
+
+	if ( !ui->toolButton_vrradio1->isChecked() ){
+		if ( d2 > 3 ) {
+		if ( onair.daysTo(QDate::currentDate())-d2 > 0 ) return false;
+		if ( onair.daysTo(QDate::currentDate())-d2 < -14 ) return false;
+		} else {
+		if ( onair.daysTo(QDate::currentDate())-d2 > 0 ) return false;
+		if ( onair.daysTo(QDate::currentDate())-d2 < -7 ) return false;
+		}
+//		if ( onair.daysTo(QDate::currentDate())-d2 > 7 ) return false;
+//		if ( onair.daysTo(QDate::currentDate())-d2 < 0 ) return false;
+	} else {
+		if ( ui->toolButton_vrradio2->isChecked() ){
+			if ( QDate::currentDate().year() > year1 ) return false;
+		}
+		if ( d2 > 3 ) {
+		if ( onair.daysTo(QDate::currentDate())-d2 < -14 ) return false;
+		} else {
+		if ( onair.daysTo(QDate::currentDate())-d2 < -7 ) return false;
+	}}
+	}
+
+
 	if ( ui->toolButton_skip->isChecked() && QFile::exists( outputDir + outFileName ) ) {
 		emit current( QString::fromUtf8( "スキップ：　　　　　" ) + kouza + QString::fromUtf8( "　" ) + yyyymmdd );
 		return true;
 	}
 	emit current( QString::fromUtf8( "ダウンロード中：　　" ) + kouza + QString::fromUtf8( "　" ) + yyyymmdd );
 	
+	if ( QString::compare(  kouza, english_3month ) == 0 )
+	Q_ASSERT( ffmpegHash1.contains( extension ) );
+	else 
 	Q_ASSERT( ffmpegHash.contains( extension ) );
 	QString dstPath;
 #ifdef QT4_QT5_WIN
@@ -558,10 +619,16 @@ bool DownloadThread::captureStream( QString kouza, QString hdate, QString file )
 #endif
 	QString commandFfmpeg = ffmpegHash[extension]
 			.arg( ffmpeg, file, dstPath, id3tagTitle, kouza, QString::number( year ) );
+	if ( QString::compare(  kouza, english_3month ) == 0 )
+	commandFfmpeg = ffmpegHash1[extension]
+			.arg( ffmpeg, file, dstPath, id3tagTitle, kouza, QString::number( year ) );
+
+	
 	//qDebug() << commandFfmpeg;
 	//DebugLog( commandFfmpeg );
 	QProcess process;
 	process.start( commandFfmpeg );
+	
 	if ( !process.waitForStarted( -1 ) ) {
 		emit critical( QString::fromUtf8( "ffmpeg起動エラー(%3)：　%1　　%2" )
 				.arg( kouza, yyyymmdd,  processError[process.error()] ) );
@@ -601,24 +668,21 @@ bool DownloadThread::captureStream( QString kouza, QString hdate, QString file )
 }
 
 QString DownloadThread::paths[] = {
-	"english/basic1", "english/basic2", "english/basic3",
+	"english/basic0", "english/basic1", "english/basic2", "english/basic3",
 	"english/timetrial", "english/kaiwa", "english/business1",
-	"english/business2", "english/kouryaku", "english/yomu",
-	"english/enjoy",
-	"chinese/kouza", "chinese/levelup", "french/kouza",
-	"italian/kouza", "hangeul/kouza","hangeul/levelup",
-	"german/kouza", "spanish/kouza","russian/kouza"
+	"english/business2", "english/gendai", "english/gakusyu",
+	"english/enjoy", "english/vr-radio",
+	"optional1", "optional2", "optional3", "optional4",	
 };
 
 void DownloadThread::run() {
 	QAbstractButton* checkbox[] = {
-		ui->toolButton_basic1, ui->toolButton_basic2, ui->toolButton_basic3,
+		ui->toolButton_basic0, ui->toolButton_basic1, ui->toolButton_basic2, ui->toolButton_basic3,
 		ui->toolButton_timetrial, ui->toolButton_kaiwa, ui->toolButton_business1,
-		ui->toolButton_business2, ui->toolButton_kouryaku, ui->toolButton_yomu,
-		ui->toolButton_enjoy,
-		ui->toolButton_chinese, ui->toolButton_levelup_chinese, ui->toolButton_french,
-		ui->toolButton_italian, ui->toolButton_hangeul, ui->toolButton_levelup_hangeul,
-		ui->toolButton_german, ui->toolButton_spanish, ui->toolButton_russian,
+		ui->toolButton_business2, ui->toolButton_gendai, ui->toolButton_gakusyu,
+		ui->toolButton_enjoy, ui->toolButton_vrradio,
+		ui->toolButton_optional1, ui->toolButton_optional2, 
+		ui->toolButton_optional3, ui->toolButton_optional4, 
 		NULL
 	};
 
@@ -630,6 +694,16 @@ void DownloadThread::run() {
 	//emit information( QString::fromUtf8( "----------------------------------------" ) );
 
 	for ( int i = 0; checkbox[i] && !isCanceled; i++ ) {
+
+		QString optional1 = MainWindow::optional1;
+		QString optional2 = MainWindow::optional2;
+		QString optional3 = MainWindow::optional3;
+		QString optional4 = MainWindow::optional4;
+		if ( paths[i].startsWith("optional1") ) paths[i] = optional1;
+		if ( paths[i].startsWith("optional2") ) paths[i] = optional2;
+		if ( paths[i].startsWith("optional3") ) paths[i] = optional3;
+		if ( paths[i].startsWith("optional4") ) paths[i] = optional4;
+
 		if ( checkbox[i]->isChecked() ) {
 			QStringList fileList = getAttribute( prefix + paths[i] + "/" + suffix, "@file" );
 			QStringList kouzaList = getAttribute( prefix + paths[i] + "/" + suffix, "@kouza" );

--- a/downloadthread.h
+++ b/downloadthread.h
@@ -69,13 +69,23 @@ private:
 	static QString flv_host;
 	static QString flv_app;
 	static QString flv_service_prefix;
+	static QString kouza1;
+	static QString kouza2;
 
 	static QString flvstreamer;
 	static QString ffmpeg;
 	static QString scramble;
 	static QStringList malformed;
+	static QString optional1;
+	static QString optional2;
+	static QString optional3;
+	static QString optional4;
+
+	static QString english_3month;
+	static QString english_vr;
 
 	static QHash<QString, QString> ffmpegHash;
+	static QHash<QString, QString> ffmpegHash1;
 	static QHash<QProcess::ProcessError, QString>processError;
 
 };

--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -50,6 +50,23 @@
 #define SETTING_SCRAMBLE_URL2 "scramble_url2"
 #define SCRAMBLE_URL1 "http://www47.atwiki.jp/jakago/pub/scramble.xml"
 #define SCRAMBLE_URL2 "http://cdn47.atwikiimg.com/jakago/pub/scramble.xml"
+#define SETTING_OPTIONAL1 "optional1"
+#define SETTING_OPTIONAL2 "optional2"
+#define SETTING_OPTIONAL3 "optional3"
+#define SETTING_OPTIONAL4 "optional4"
+#define SETTING_OPT_TITLE1 "opt_title1"
+#define SETTING_OPT_TITLE2 "opt_title2"
+#define SETTING_OPT_TITLE3 "opt_title3"
+#define SETTING_OPT_TITLE4 "opt_title4"
+#define OPTIONAL1 "french/kouza"
+#define OPTIONAL2 "german/kouza"
+#define OPTIONAL3 "chinese/kouza"
+#define OPTIONAL4 "hangeul/kouza"
+#define OPT_TITLE1 "任意講座１"
+#define OPT_TITLE2 "任意講座２"
+#define OPT_TITLE3 "任意講座３"
+#define OPT_TITLE4 "任意講座４"
+
 #define X11_WINDOW_VERTICAL_INCREMENT 5
 
 #ifdef QT4_QT5_WIN
@@ -86,6 +103,14 @@ QString MainWindow::outputDir;
 QString MainWindow::scramble;
 QString MainWindow::scrambleUrl1;
 QString MainWindow::scrambleUrl2;
+QString MainWindow::optional1;
+QString MainWindow::optional2;
+QString MainWindow::optional3;
+QString MainWindow::optional4;
+QString MainWindow::opt_title1;
+QString MainWindow::opt_title2;
+QString MainWindow::opt_title3;
+QString MainWindow::opt_title4;
 
 MainWindow::MainWindow( QWidget *parent )
 		: QMainWindow( parent ), ui( new Ui::MainWindowClass ), downloadThread( NULL ) {
@@ -130,6 +155,10 @@ MainWindow::MainWindow( QWidget *parent )
 	connect( action, SIGNAL( triggered() ), this, SLOT( customizeSaveFolder() ) );
 	customizeMenu->addAction( action );
 
+	action = new QAction( QString::fromUtf8( "任意講座設定" ), this );
+	connect( action, SIGNAL( triggered() ), this, SLOT( customizeScramble() ) );
+	customizeMenu->addAction( action );
+
 	//action = new QAction( QString::fromUtf8( "スクランブル文字列..." ), this );
 	//connect( action, SIGNAL( triggered() ), this, SLOT( customizeScramble() ) );
 	//customizeMenu->addAction( action );
@@ -178,8 +207,9 @@ void MainWindow::settings( enum ReadWriteMode mode ) {
 		QVariant fileNameFormat;
 	} CheckBox;
 #define DefaultTitle "%k_%Y_%M_%D"
-#define DefaultFileName "%k_%Y_%M_%D.mp3"
+#define DefaultFileName "%k_%Y_%M_%D.m4a"
 	CheckBox checkBoxes[] = {
+		{ ui->toolButton_basic0, "basic0", false, "basic0_title", DefaultTitle, "basic0_file_name", DefaultFileName },
 		{ ui->toolButton_basic1, "basic1", false, "basic1_title", DefaultTitle, "basic1_file_name", DefaultFileName },
 		{ ui->toolButton_basic2, "basic2", false, "basic2_title", DefaultTitle, "basic2_file_name", DefaultFileName },
 		{ ui->toolButton_basic3, "basic3", false, "basic3_title", DefaultTitle, "basic3_file_name", DefaultFileName },
@@ -187,28 +217,17 @@ void MainWindow::settings( enum ReadWriteMode mode ) {
 		{ ui->toolButton_kaiwa, "kaiwa", false, "kaiwa_title", DefaultTitle, "kaiwa_file_name", DefaultFileName },
 		{ ui->toolButton_business1, "business1", false, "business1_title", DefaultTitle, "business1_file_name", DefaultFileName },
 		{ ui->toolButton_business2, "business2", false, "business2_title", DefaultTitle, "business2_file_name", DefaultFileName },
-		{ ui->toolButton_chinese, "chinese", false, "chinese_title", DefaultTitle, "chinese_file_name", DefaultFileName },
-		{ ui->toolButton_french, "french", false, "french_title", DefaultTitle, "french_file_name", DefaultFileName },
-		{ ui->toolButton_italian, "italian", false, "italian_title", DefaultTitle, "italian_file_name", DefaultFileName },
-		{ ui->toolButton_hangeul, "hangeul", false, "hangeul_title", DefaultTitle, "hangeul_file_name", DefaultFileName },
-		{ ui->toolButton_german, "german", false, "german_title", DefaultTitle, "german_file_name", DefaultFileName },
-		{ ui->toolButton_spanish, "spanish", false, "spanish_title", DefaultTitle, "spanish_file_name", DefaultFileName },
-		{ ui->checkBox_13, "charo", false, "charo_title", DefaultTitle, "charo_file_name", DefaultFileName },
-		{ ui->checkBox_14, "e-news", false, "e-news_title", DefaultTitle, "e-news_file_name", DefaultFileName },
-		{ ui->checkBox_15, "e-news-reread", false, "e-news-reread_title", DefaultTitle, "e-news-reread_file_name", DefaultFileName },
-		{ ui->toolButton_levelup_chinese, "levelup-chinese", false, "levelup-chinese_title", DefaultTitle, "levelup-chinese_file_name", DefaultFileName },
-		{ ui->toolButton_levelup_hangeul, "levelup-hangeul", false, "levelup-hangeul_title", DefaultTitle, "levelup-hangeul_file_name", DefaultFileName },
-		{ ui->toolButton_russian, "russian", false, "russian_title", DefaultTitle, "russian_file_name", DefaultFileName },
-		{ ui->checkBox_shower, "shower", false, "shower_title", DefaultTitle, "shower_file_name", DefaultFileName },
-		{ ui->toolButton_kouryaku, "kouryaku", false, "kouryaku_title", DefaultTitle, "kouryaku_file_name", DefaultFileName },
-		{ ui->toolButton_yomu, "yomu", false, "yomu_title", DefaultTitle, "yomu_file_name", DefaultFileName },
+		{ ui->toolButton_vrradio, "vr-radio", false, "vr-radio_title", DefaultTitle, "vr-radio_file_name", DefaultFileName },
+		{ ui->toolButton_vrradio1, "vr-radio_all", false,  "", "", "", "" },
+		{ ui->toolButton_vrradio2, "vr-radio_year", false,  "", "", "", "" },
+		{ ui->toolButton_gendai, "gendai", false, "gendai_title", DefaultTitle, "gendai_file_name", DefaultFileName },
+		{ ui->toolButton_gakusyu, "gakusyu", false, "gakusyu_title", DefaultTitle, "gakusyu_file_name", DefaultFileName },
 		{ ui->toolButton_enjoy, "enjoy", false, "enjoy_title", DefaultTitle, "enjoy_file_name", DefaultFileName },
+		{ ui->toolButton_optional1, "optional_1", false, "optional1_title", DefaultTitle, "optional1_file_name", DefaultFileName },
+		{ ui->toolButton_optional2, "optional_2", false, "optional2_title", DefaultTitle, "optional2_file_name", DefaultFileName },
+		{ ui->toolButton_optional3, "optional_3", false, "optional3_title", DefaultTitle, "optional3_file_name", DefaultFileName },
+		{ ui->toolButton_optional4, "optional_4", false, "optional4_title", DefaultTitle, "optional4_file_name", DefaultFileName },
 		{ ui->toolButton_skip, "skip", true, "", "", "", "" },
-		{ ui->checkBox_keep_on_error, "keep_on_error", false, "", "", "", "" },
-		{ ui->checkBox_this_week, "this_week", true, "", "", "", "" },
-		{ ui->checkBox_next_week, "next_week", false, "", "", "", "" },
-		{ ui->checkBox_past_week, "past_week", false, "", "", "", "" },
-		{ ui->toolButton_detailed_message, "detailed_message", false, "", "", "", "" },
 		{ NULL, NULL, false, "", "", "", "" }
 	};
 	typedef struct ComboBox {
@@ -216,13 +235,8 @@ void MainWindow::settings( enum ReadWriteMode mode ) {
 		QString key;
 		QVariant defaultValue;
 	} ComboBox;
-	ComboBox comboBoxes[] = {
-		{ ui->comboBox_enews, "e-news-index", ENewsSaveBoth },
-		{ ui->comboBox_shower, "shower_index", ENewsSaveBoth },
-		{ NULL, NULL, false }
-	};
 	ComboBox textComboBoxes[] = {
-		{ ui->comboBox_extension, "audio_extension", "mp3" },
+		{ ui->comboBox_extension, "audio_extension", "m4a" },
 		{ NULL, NULL, false }
 	};
 
@@ -254,11 +268,32 @@ void MainWindow::settings( enum ReadWriteMode mode ) {
 		saved = settings.value( SETTING_SCRAMBLE_URL2 );
 		scrambleUrl2 = saved.type() == QVariant::Invalid ? SCRAMBLE_URL2 : saved.toString();
 
+		saved = settings.value( SETTING_OPTIONAL1 );
+		optional1 = saved.type() == QVariant::Invalid ? OPTIONAL1 : saved.toString();
+		saved = settings.value( SETTING_OPTIONAL2 );
+		optional2 = saved.type() == QVariant::Invalid ? OPTIONAL2 : saved.toString();
+		saved = settings.value( SETTING_OPTIONAL3 );
+		optional3 = saved.type() == QVariant::Invalid ? OPTIONAL3 : saved.toString();
+		saved = settings.value( SETTING_OPTIONAL4 );
+		optional4 = saved.type() == QVariant::Invalid ? OPTIONAL4 : saved.toString();
+
+		saved = settings.value( SETTING_OPT_TITLE1 );
+		opt_title1 = saved.type() == QVariant::Invalid ? QString::fromUtf8( OPT_TITLE1 ) : saved.toString();
+		saved = settings.value( SETTING_OPT_TITLE2 );
+		opt_title2 = saved.type() == QVariant::Invalid ? QString::fromUtf8( OPT_TITLE2 ) : saved.toString();
+		saved = settings.value( SETTING_OPT_TITLE3 );
+		opt_title3 = saved.type() == QVariant::Invalid ? QString::fromUtf8( OPT_TITLE3 ) : saved.toString();
+		saved = settings.value( SETTING_OPT_TITLE4 );
+		opt_title4 = saved.type() == QVariant::Invalid ? QString::fromUtf8( OPT_TITLE4 ) : saved.toString();
+
+		ui->toolButton_optional1->setText( QString( opt_title1 ) );
+		ui->toolButton_optional2->setText( QString( opt_title2 ) );
+		ui->toolButton_optional3->setText( QString( opt_title3 ) );
+		ui->toolButton_optional4->setText( QString( opt_title4 ) );
+
 		for ( int i = 0; checkBoxes[i].checkBox != NULL; i++ ) {
 			checkBoxes[i].checkBox->setChecked( settings.value( checkBoxes[i].key, checkBoxes[i].defaultValue ).toBool() );
 		}
-		for ( int i = 0; comboBoxes[i].comboBox != NULL; i++ )
-			comboBoxes[i].comboBox->setCurrentIndex( settings.value( comboBoxes[i].key, comboBoxes[i].defaultValue ).toInt() );
 		for ( int i = 0; textComboBoxes[i].comboBox != NULL; i++ ) {
 			QString extension = settings.value( textComboBoxes[i].key, textComboBoxes[i].defaultValue ).toString();
 			textComboBoxes[i].comboBox->setCurrentIndex( textComboBoxes[i].comboBox->findText( extension ) );
@@ -272,11 +307,18 @@ void MainWindow::settings( enum ReadWriteMode mode ) {
 		settings.setValue( SETTING_SCRAMBLE, scramble );
 		settings.setValue( SETTING_SCRAMBLE_URL1, scrambleUrl1 );
 		settings.setValue( SETTING_SCRAMBLE_URL2, scrambleUrl2 );
+		settings.setValue( SETTING_OPTIONAL1, optional1 );
+		settings.setValue( SETTING_OPTIONAL2, optional2 );
+		settings.setValue( SETTING_OPTIONAL3, optional3 );
+		settings.setValue( SETTING_OPTIONAL4, optional4 );
+		settings.setValue( SETTING_OPT_TITLE1, opt_title1 );
+		settings.setValue( SETTING_OPT_TITLE2, opt_title2 );
+		settings.setValue( SETTING_OPT_TITLE3, opt_title3 );
+		settings.setValue( SETTING_OPT_TITLE4, opt_title4 );
+
 		for ( int i = 0; checkBoxes[i].checkBox != NULL; i++ ) {
 			settings.setValue( checkBoxes[i].key, checkBoxes[i].checkBox->isChecked() );
 		}
-		for ( int i = 0; comboBoxes[i].comboBox != NULL; i++ )
-			settings.setValue( comboBoxes[i].key, comboBoxes[i].comboBox->currentIndex() );
 		for ( int i = 0; textComboBoxes[i].comboBox != NULL; i++ )
 			settings.setValue( textComboBoxes[i].key, textComboBoxes[i].comboBox->currentText() );
 	}
@@ -304,9 +346,32 @@ void MainWindow::customizeSaveFolder() {
 }
 
 void MainWindow::customizeScramble() {
-	ScrambleDialog dialog( scramble );
+	ScrambleDialog dialog( opt_title1, opt_title2, opt_title3, opt_title4, optional1, optional2 , optional3, optional4 );
 	dialog.exec();
-	scramble = dialog.scramble();
+	opt_title1 = dialog.scramble();
+	opt_title2 = dialog.scramble2();
+	opt_title3 = dialog.scramble3();
+	opt_title4 = dialog.scramble4();
+	optional1 = dialog.scramble5();
+	optional2 = dialog.scramble6();
+	optional3 = dialog.scramble7();
+	optional4 = dialog.scramble8();
+
+//	ui->toolButton_optional1->setText( QString( opt_title1 ) );
+//	ui->toolButton_optional2->setText( QString( opt_title2 ) );
+//	ui->toolButton_optional3->setText( QString( opt_title3 ) );
+//	ui->toolButton_optional4->setText( QString( opt_title4 ) );
+
+
+//	if ( QString::compare( opt_title1, "" ) == true ) opt_title1 = OPT_TITLE1;
+//	if ( QString::compare( opt_title2, "" ) == true ) opt_title2 = OPT_TITLE2;
+//	if ( QString::compare( opt_title3, "" ) == true ) opt_title3 = OPT_TITLE3;
+//	if ( QString::compare( opt_title4, "" ) == true ) opt_title4 = OPT_TITLE4;
+
+//	if ( optional1.isNull() == true ) opt_title1 = OPTIONAL1;
+//	if ( optional2.isNull() == true ) opt_title2 = OPTIONAL2;
+//	if ( optional3.isNull() == true ) opt_title3 = OPTIONAL3;
+//	if ( optional4.isNull() == true ) opt_title4 = OPTIONAL4;
 }
 
 void MainWindow::download() {	//「ダウンロード」または「キャンセル」ボタンが押されると呼び出される

--- a/mainwindow.h
+++ b/mainwindow.h
@@ -54,6 +54,14 @@ public:
 	static QString scramble;
 	static QString scrambleUrl1;
 	static QString scrambleUrl2;
+	static QString optional1;
+	static QString optional2;
+	static QString optional3;
+	static QString optional4;
+	static QString opt_title1;
+	static QString opt_title2;
+	static QString opt_title3;
+	static QString opt_title4;
 
 protected:
 	virtual void closeEvent( QCloseEvent *event );

--- a/mainwindow.ui
+++ b/mainwindow.ui
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>540</width>
-    <height>500</height>
+    <height>462</height>
    </rect>
   </property>
   <property name="sizePolicy">
@@ -19,13 +19,13 @@
   <property name="minimumSize">
    <size>
     <width>540</width>
-    <height>500</height>
+    <height>462</height>
    </size>
   </property>
   <property name="maximumSize">
    <size>
     <width>540</width>
-    <height>500</height>
+    <height>462</height>
    </size>
   </property>
   <property name="font">
@@ -34,7 +34,7 @@
    </font>
   </property>
   <property name="windowTitle">
-   <string>語学講座ダウンローダ</string>
+   <string>語学講座ダウンローダ(FFU-Eng)</string>
   </property>
   <widget class="QWidget" name="centralWidget">
    <property name="sizePolicy">
@@ -49,14 +49,14 @@
       <x>10</x>
       <y>10</y>
       <width>521</width>
-      <height>437</height>
+      <height>400</height>
      </rect>
     </property>
     <layout class="QGridLayout" name="gridLayout_3" rowstretch="0,0,0,0,0,0,0,0,0,0,0,0,0,0">
-     <item row="4" column="0">
-      <layout class="QHBoxLayout" name="horizontalLayout_18">
+     <item row="0" column="0">
+      <layout class="QHBoxLayout" name="horizontalLayout_14_0">
        <item>
-        <widget class="QToolButton" name="toolButton_kaiwa">
+        <widget class="QToolButton" name="toolButton_basic0">
          <property name="sizePolicy">
           <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
            <horstretch>0</horstretch>
@@ -69,7 +69,7 @@
           </font>
          </property>
          <property name="text">
-          <string>ラジオ英会話</string>
+          <string>基礎英語0</string>
          </property>
          <property name="checkable">
           <bool>true</bool>
@@ -78,10 +78,10 @@
        </item>
       </layout>
      </item>
-     <item row="8" column="1">
-      <layout class="QHBoxLayout" name="horizontalLayout_13">
+     <item row="0" column="1">
+      <layout class="QHBoxLayout" name="horizontalLayout_14_1">
        <item>
-        <widget class="QToolButton" name="toolButton_russian">
+        <widget class="QToolButton" name="toolButton_basic1">
          <property name="sizePolicy">
           <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
            <horstretch>0</horstretch>
@@ -94,7 +94,7 @@
           </font>
          </property>
          <property name="text">
-          <string>まいにちロシア語</string>
+          <string>基礎英語1</string>
          </property>
          <property name="checkable">
           <bool>true</bool>
@@ -103,10 +103,10 @@
        </item>
       </layout>
      </item>
-     <item row="5" column="0">
-      <layout class="QHBoxLayout" name="horizontalLayout_19">
+     <item row="1" column="0">
+      <layout class="QHBoxLayout" name="horizontalLayout_15">
        <item>
-        <widget class="QToolButton" name="toolButton_business1">
+        <widget class="QToolButton" name="toolButton_basic2">
          <property name="sizePolicy">
           <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
            <horstretch>0</horstretch>
@@ -119,7 +119,7 @@
           </font>
          </property>
          <property name="text">
-          <string>入門ビジネス英語</string>
+          <string>基礎英語2</string>
          </property>
          <property name="checkable">
           <bool>true</bool>
@@ -128,20 +128,10 @@
        </item>
       </layout>
      </item>
-     <item row="10" column="0">
-      <widget class="Line" name="line_2">
-       <property name="lineWidth">
-        <number>2</number>
-       </property>
-       <property name="orientation">
-        <enum>Qt::Horizontal</enum>
-       </property>
-      </widget>
-     </item>
-     <item row="7" column="1">
-      <layout class="QHBoxLayout" name="horizontalLayout_7">
+     <item row="1" column="1">
+      <layout class="QHBoxLayout" name="horizontalLayout_16">
        <item>
-        <widget class="QToolButton" name="toolButton_spanish">
+        <widget class="QToolButton" name="toolButton_basic3">
          <property name="sizePolicy">
           <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
            <horstretch>0</horstretch>
@@ -154,7 +144,7 @@
           </font>
          </property>
          <property name="text">
-          <string>まいにちスペイン語</string>
+          <string>基礎英語3</string>
          </property>
          <property name="checkable">
           <bool>true</bool>
@@ -163,10 +153,10 @@
        </item>
       </layout>
      </item>
-     <item row="11" column="0">
-      <layout class="QHBoxLayout" name="horizontalLayout_22">
+     <item row="2" column="0">
+      <layout class="QHBoxLayout" name="horizontalLayout_17">
        <item>
-        <widget class="QToolButton" name="toolButton_skip">
+        <widget class="QToolButton" name="toolButton_timetrial">
          <property name="sizePolicy">
           <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
            <horstretch>0</horstretch>
@@ -179,22 +169,19 @@
           </font>
          </property>
          <property name="text">
-          <string>既存のファイルはスキップ</string>
+          <string>英会話タイムトライアル</string>
          </property>
          <property name="checkable">
           <bool>true</bool>
          </property>
-         <property name="checked">
-          <bool>false</bool>
-         </property>
         </widget>
        </item>
       </layout>
      </item>
-     <item row="7" column="0">
+     <item row="2" column="1">
       <layout class="QHBoxLayout" name="horizontalLayout_21">
        <item>
-        <widget class="QToolButton" name="toolButton_kouryaku">
+        <widget class="QToolButton" name="toolButton_gendai">
          <property name="sizePolicy">
           <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
            <horstretch>0</horstretch>
@@ -207,7 +194,7 @@
           </font>
          </property>
          <property name="text">
-          <string>攻略英語リスニング</string>
+          <string>高校生からはじめる「現代英語」</string>
          </property>
          <property name="checkable">
           <bool>true</bool>
@@ -216,13 +203,10 @@
        </item>
       </layout>
      </item>
-     <item row="13" column="0">
-      <layout class="QHBoxLayout" name="horizontalLayout_28"/>
-     </item>
-     <item row="13" column="1">
-      <layout class="QHBoxLayout" name="horizontalLayout_25">
+     <item row="3" column="0">
+      <layout class="QHBoxLayout" name="horizontalLayout_18">
        <item>
-        <widget class="QPushButton" name="downloadButton">
+        <widget class="QToolButton" name="toolButton_kaiwa">
          <property name="sizePolicy">
           <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
            <horstretch>0</horstretch>
@@ -235,16 +219,19 @@
           </font>
          </property>
          <property name="text">
-          <string>ダウンロード</string>
+          <string>ラジオ英会話</string>
+         </property>
+         <property name="checkable">
+          <bool>true</bool>
          </property>
         </widget>
        </item>
       </layout>
      </item>
-     <item row="11" column="1">
-      <layout class="QHBoxLayout" name="horizontalLayout_26">
+     <item row="3" column="1">
+      <layout class="QHBoxLayout" name="horizontalLayout_27">
        <item>
-        <widget class="QLabel" name="label">
+        <widget class="QToolButton" name="toolButton_gakusyu">
          <property name="sizePolicy">
           <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
            <horstretch>0</horstretch>
@@ -256,88 +243,20 @@
            <pointsize>11</pointsize>
           </font>
          </property>
-         <property name="layoutDirection">
-          <enum>Qt::LeftToRight</enum>
-         </property>
          <property name="text">
-          <string>　　　　          拡張子：</string>
-         </property>
-         <property name="alignment">
-          <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
+          <string>遠山顕の英会話楽習</string>
          </property>
-        </widget>
-       </item>
-       <item>
-        <widget class="QComboBox" name="comboBox_extension">
-         <property name="sizePolicy">
-          <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
-           <horstretch>0</horstretch>
-           <verstretch>0</verstretch>
-          </sizepolicy>
-         </property>
-         <property name="font">
-          <font>
-           <pointsize>11</pointsize>
-          </font>
+         <property name="checkable">
+          <bool>true</bool>
          </property>
-         <item>
-          <property name="text">
-           <string>3g2</string>
-          </property>
-         </item>
-         <item>
-          <property name="text">
-           <string>3gp</string>
-          </property>
-         </item>
-         <item>
-          <property name="text">
-           <string>aac</string>
-          </property>
-         </item>
-         <item>
-          <property name="text">
-           <string>avi</string>
-          </property>
-         </item>
-         <item>
-          <property name="text">
-           <string>m4a</string>
-          </property>
-         </item>
-         <item>
-          <property name="text">
-           <string>mka</string>
-          </property>
-         </item>
-         <item>
-          <property name="text">
-           <string>mkv</string>
-          </property>
-         </item>
-         <item>
-          <property name="text">
-           <string>mov</string>
-          </property>
-         </item>
-         <item>
-          <property name="text">
-           <string>mp3</string>
-          </property>
-         </item>
-         <item>
-          <property name="text">
-           <string>ts</string>
-          </property>
-         </item>
         </widget>
        </item>
       </layout>
      </item>
-     <item row="8" column="0">
-      <layout class="QHBoxLayout" name="horizontalLayout_27">
+     <item row="4" column="0">
+      <layout class="QHBoxLayout" name="horizontalLayout_19">
        <item>
-        <widget class="QToolButton" name="toolButton_yomu">
+        <widget class="QToolButton" name="toolButton_business1">
          <property name="sizePolicy">
           <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
            <horstretch>0</horstretch>
@@ -350,7 +269,7 @@
           </font>
          </property>
          <property name="text">
-          <string>英語で読む村上春樹</string>
+          <string>入門ビジネス英語</string>
          </property>
          <property name="checkable">
           <bool>true</bool>
@@ -359,10 +278,10 @@
        </item>
       </layout>
      </item>
-     <item row="6" column="1">
-      <layout class="QHBoxLayout" name="horizontalLayout_6">
+     <item row="4" column="1">
+      <layout class="QHBoxLayout" name="horizontalLayout_20">
        <item>
-        <widget class="QToolButton" name="toolButton_german">
+        <widget class="QToolButton" name="toolButton_business2">
          <property name="sizePolicy">
           <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
            <horstretch>0</horstretch>
@@ -375,7 +294,7 @@
           </font>
          </property>
          <property name="text">
-          <string>まいにちドイツ語</string>
+          <string>実践ビジネス英語</string>
          </property>
          <property name="checkable">
           <bool>true</bool>
@@ -384,10 +303,10 @@
        </item>
       </layout>
      </item>
-     <item row="0" column="1">
-      <layout class="QHBoxLayout" name="horizontalLayout_2">
+     <item row="5" column="0">
+      <layout class="QHBoxLayout" name="horizontalLayout_29">
        <item>
-        <widget class="QToolButton" name="toolButton_chinese">
+        <widget class="QToolButton" name="toolButton_enjoy">
          <property name="sizePolicy">
           <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
            <horstretch>0</horstretch>
@@ -400,7 +319,7 @@
           </font>
          </property>
          <property name="text">
-          <string>まいにち中国語</string>
+          <string>エンジョイ・シンプル・イングリッシュ</string>
          </property>
          <property name="checkable">
           <bool>true</bool>
@@ -409,10 +328,10 @@
        </item>
       </layout>
      </item>
-     <item row="0" column="0">
+     <item row="5" column="1">
       <layout class="QHBoxLayout" name="horizontalLayout_14">
        <item>
-        <widget class="QToolButton" name="toolButton_basic1">
+        <widget class="QToolButton" name="toolButton_vrradio">
          <property name="sizePolicy">
           <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
            <horstretch>0</horstretch>
@@ -425,7 +344,7 @@
           </font>
          </property>
          <property name="text">
-          <string>基礎英語1</string>
+          <string>ボキャブライダー</string>
          </property>
          <property name="checkable">
           <bool>true</bool>
@@ -434,12 +353,22 @@
        </item>
       </layout>
      </item>
-     <item row="10" column="1">
-      <layout class="QHBoxLayout" name="horizontalLayout_10">
+     <item row="6" column="0">
+      <widget class="Line" name="line_2_12">
+       <property name="lineWidth">
+        <number>1</number>
+       </property>
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+      </widget>
+     </item>
+     <item row="6" column="1">
+      <layout class="QHBoxLayout" name="horizontalLayout_10_12">
        <item>
-        <widget class="Line" name="line">
+        <widget class="Line" name="line_1_02">
          <property name="lineWidth">
-          <number>2</number>
+          <number>1</number>
          </property>
          <property name="orientation">
           <enum>Qt::Horizontal</enum>
@@ -448,10 +377,10 @@
        </item>
       </layout>
      </item>
-     <item row="3" column="0">
-      <layout class="QHBoxLayout" name="horizontalLayout_17">
+     <item row="7" column="0">
+      <layout class="QHBoxLayout" name="horizontalLayout_142">
        <item>
-        <widget class="QToolButton" name="toolButton_timetrial">
+        <widget class="QToolButton" name="toolButton_vrradio1">
          <property name="sizePolicy">
           <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
            <horstretch>0</horstretch>
@@ -464,7 +393,7 @@
           </font>
          </property>
          <property name="text">
-          <string>英会話タイムトライアル</string>
+          <string>ボキャブライダー(過去)</string>
          </property>
          <property name="checkable">
           <bool>true</bool>
@@ -473,10 +402,10 @@
        </item>
       </layout>
      </item>
-     <item row="1" column="0">
-      <layout class="QHBoxLayout" name="horizontalLayout_15">
+     <item row="7" column="1">
+      <layout class="QHBoxLayout" name="horizontalLayout_144">
        <item>
-        <widget class="QToolButton" name="toolButton_basic2">
+        <widget class="QToolButton" name="toolButton_vrradio2">
          <property name="sizePolicy">
           <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
            <horstretch>0</horstretch>
@@ -489,7 +418,7 @@
           </font>
          </property>
          <property name="text">
-          <string>基礎英語2</string>
+          <string>ボキャブライダー(今年度)</string>
          </property>
          <property name="checkable">
           <bool>true</bool>
@@ -498,10 +427,34 @@
        </item>
       </layout>
      </item>
-     <item row="2" column="0">
-      <layout class="QHBoxLayout" name="horizontalLayout_16">
+     <item row="8" column="0">
+      <widget class="Line" name="line_2_1">
+       <property name="lineWidth">
+        <number>2</number>
+       </property>
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+      </widget>
+     </item>
+     <item row="8" column="1">
+      <layout class="QHBoxLayout" name="horizontalLayout_10_1">
        <item>
-        <widget class="QToolButton" name="toolButton_basic3">
+        <widget class="Line" name="line_1_0">
+         <property name="lineWidth">
+          <number>2</number>
+         </property>
+         <property name="orientation">
+          <enum>Qt::Horizontal</enum>
+         </property>
+        </widget>
+       </item>
+      </layout>
+     </item>
+     <item row="9" column="0">
+      <layout class="QHBoxLayout" name="horizontalLayout_411">
+       <item>
+        <widget class="QToolButton" name="toolButton_optional1">
          <property name="sizePolicy">
           <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
            <horstretch>0</horstretch>
@@ -514,7 +467,7 @@
           </font>
          </property>
          <property name="text">
-          <string>基礎英語3</string>
+          <string>任意講座１</string>
          </property>
          <property name="checkable">
           <bool>true</bool>
@@ -523,10 +476,10 @@
        </item>
       </layout>
      </item>
-     <item row="5" column="1">
-      <layout class="QHBoxLayout" name="horizontalLayout_11">
+     <item row="9" column="1">
+      <layout class="QHBoxLayout" name="horizontalLayout_422">
        <item>
-        <widget class="QToolButton" name="toolButton_levelup_hangeul">
+        <widget class="QToolButton" name="toolButton_optional2">
          <property name="sizePolicy">
           <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
            <horstretch>0</horstretch>
@@ -539,7 +492,7 @@
           </font>
          </property>
          <property name="text">
-          <string>レベルアップハングル講座</string>
+          <string>任意講座2</string>
          </property>
          <property name="checkable">
           <bool>true</bool>
@@ -548,10 +501,10 @@
        </item>
       </layout>
      </item>
-     <item row="1" column="1">
-      <layout class="QHBoxLayout" name="horizontalLayout_9">
+     <item row="10" column="0">
+      <layout class="QHBoxLayout" name="horizontalLayout_421">
        <item>
-        <widget class="QToolButton" name="toolButton_levelup_chinese">
+        <widget class="QToolButton" name="toolButton_optional3">
          <property name="sizePolicy">
           <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
            <horstretch>0</horstretch>
@@ -564,7 +517,7 @@
           </font>
          </property>
          <property name="text">
-          <string>レベルアップ中国語</string>
+          <string>任意講座3</string>
          </property>
          <property name="checkable">
           <bool>true</bool>
@@ -573,10 +526,10 @@
        </item>
       </layout>
      </item>
-     <item row="3" column="1">
-      <layout class="QHBoxLayout" name="horizontalLayout_4">
+     <item row="10" column="1">
+      <layout class="QHBoxLayout" name="horizontalLayout_432">
        <item>
-        <widget class="QToolButton" name="toolButton_italian">
+        <widget class="QToolButton" name="toolButton_optional4">
          <property name="sizePolicy">
           <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
            <horstretch>0</horstretch>
@@ -589,7 +542,7 @@
           </font>
          </property>
          <property name="text">
-          <string>まいにちイタリア語</string>
+          <string>任意講座4</string>
          </property>
          <property name="checkable">
           <bool>true</bool>
@@ -598,10 +551,34 @@
        </item>
       </layout>
      </item>
-     <item row="2" column="1">
-      <layout class="QHBoxLayout" name="horizontalLayout_3">
+     <item row="14" column="0">
+      <widget class="Line" name="line_2_2">
+       <property name="lineWidth">
+        <number>1</number>
+       </property>
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+      </widget>
+     </item>
+     <item row="14" column="1">
+      <layout class="QHBoxLayout" name="horizontalLayout_10_2">
+       <item>
+        <widget class="Line" name="line_1_2">
+         <property name="lineWidth">
+          <number>1</number>
+         </property>
+         <property name="orientation">
+          <enum>Qt::Horizontal</enum>
+         </property>
+        </widget>
+       </item>
+      </layout>
+     </item>
+     <item row="17" column="0">
+      <layout class="QHBoxLayout" name="horizontalLayout_22">
        <item>
-        <widget class="QToolButton" name="toolButton_french">
+        <widget class="QToolButton" name="toolButton_skip">
          <property name="sizePolicy">
           <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
            <horstretch>0</horstretch>
@@ -614,19 +591,22 @@
           </font>
          </property>
          <property name="text">
-          <string>まいにちフランス語</string>
+          <string>既存のファイルはスキップ</string>
          </property>
          <property name="checkable">
           <bool>true</bool>
          </property>
+         <property name="checked">
+          <bool>false</bool>
+         </property>
         </widget>
        </item>
       </layout>
      </item>
-     <item row="4" column="1">
-      <layout class="QHBoxLayout" name="horizontalLayout_5">
+     <item row="18" column="1">
+      <layout class="QHBoxLayout" name="horizontalLayout_25">
        <item>
-        <widget class="QToolButton" name="toolButton_hangeul">
+        <widget class="QPushButton" name="downloadButton">
          <property name="sizePolicy">
           <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
            <horstretch>0</horstretch>
@@ -635,23 +615,20 @@
          </property>
          <property name="font">
           <font>
-           <pointsize>11</pointsize>
+           <pointsize>10</pointsize>
           </font>
          </property>
          <property name="text">
-          <string>まいにちハングル講座</string>
-         </property>
-         <property name="checkable">
-          <bool>true</bool>
+          <string>ダウンロード</string>
          </property>
         </widget>
        </item>
       </layout>
      </item>
-     <item row="9" column="0">
-      <layout class="QHBoxLayout" name="horizontalLayout_29">
+     <item row="17" column="1">
+      <layout class="QHBoxLayout" name="horizontalLayout_26">
        <item>
-        <widget class="QToolButton" name="toolButton_enjoy">
+        <widget class="QLabel" name="label_ext">
          <property name="sizePolicy">
           <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
            <horstretch>0</horstretch>
@@ -663,22 +640,21 @@
            <pointsize>11</pointsize>
           </font>
          </property>
+         <property name="layoutDirection">
+          <enum>Qt::LeftToRight</enum>
+         </property>
          <property name="text">
-          <string>エンジョイ・シンプル・イングリッシュ</string>
+          <string>　　　　          拡張子：</string>
          </property>
-         <property name="checkable">
-          <bool>true</bool>
+         <property name="alignment">
+          <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
          </property>
         </widget>
        </item>
-      </layout>
-     </item>
-     <item row="6" column="0">
-      <layout class="QHBoxLayout" name="horizontalLayout_20">
        <item>
-        <widget class="QToolButton" name="toolButton_business2">
+        <widget class="QComboBox" name="comboBox_extension">
          <property name="sizePolicy">
-          <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+          <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
            <horstretch>0</horstretch>
            <verstretch>0</verstretch>
           </sizepolicy>
@@ -688,254 +664,62 @@
            <pointsize>11</pointsize>
           </font>
          </property>
-         <property name="text">
-          <string>実践ビジネス英語</string>
-         </property>
-         <property name="checkable">
-          <bool>true</bool>
-         </property>
+         <item> 
+          <property name="text">
+           <string>3g2</string>
+          </property>
+         </item>
+         <item>
+          <property name="text">
+           <string>3gp</string>
+          </property>
+         </item>
+         <item>
+          <property name="text">
+           <string>aac</string>
+          </property>
+         </item>
+         <item>
+          <property name="text">
+           <string>avi</string>
+          </property>
+         </item>
+         <item>
+          <property name="text">
+           <string>m4a</string>
+          </property>
+         </item>
+         <item>
+          <property name="text">
+           <string>mka</string>
+          </property>
+         </item>
+         <item>
+          <property name="text">
+           <string>mkv</string>
+          </property>
+         </item>
+         <item>
+          <property name="text">
+           <string>mov</string>
+          </property>
+         </item>
+         <item>
+          <property name="text">
+           <string>mp3</string>
+          </property>
+         </item>
+         <item>
+          <property name="text">
+           <string>ts</string>
+          </property>
+         </item>
         </widget>
        </item>
       </layout>
      </item>
     </layout>
    </widget>
-   <widget class="QCheckBox" name="checkBox_this_week">
-    <property name="enabled">
-     <bool>false</bool>
-    </property>
-    <property name="geometry">
-     <rect>
-      <x>10</x>
-      <y>720</y>
-      <width>257</width>
-      <height>20</height>
-     </rect>
-    </property>
-    <property name="text">
-     <string>公開中のストリーミング</string>
-    </property>
-    <property name="checked">
-     <bool>true</bool>
-    </property>
-   </widget>
-   <widget class="QCheckBox" name="checkBox_next_week">
-    <property name="enabled">
-     <bool>false</bool>
-    </property>
-    <property name="geometry">
-     <rect>
-      <x>281</x>
-      <y>712</y>
-      <width>257</width>
-      <height>20</height>
-     </rect>
-    </property>
-    <property name="text">
-     <string>次週のストリーミング</string>
-    </property>
-    <property name="checked">
-     <bool>false</bool>
-    </property>
-   </widget>
-   <widget class="QLabel" name="label_2">
-    <property name="geometry">
-     <rect>
-      <x>491</x>
-      <y>742</y>
-      <width>45</width>
-      <height>16</height>
-     </rect>
-    </property>
-    <property name="sizePolicy">
-     <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
-      <horstretch>0</horstretch>
-      <verstretch>0</verstretch>
-     </sizepolicy>
-    </property>
-    <property name="text">
-     <string>日分</string>
-    </property>
-   </widget>
-   <widget class="QLineEdit" name="past_days">
-    <property name="enabled">
-     <bool>false</bool>
-    </property>
-    <property name="geometry">
-     <rect>
-      <x>436</x>
-      <y>739</y>
-      <width>45</width>
-      <height>22</height>
-     </rect>
-    </property>
-    <property name="sizePolicy">
-     <sizepolicy hsizetype="Ignored" vsizetype="Fixed">
-      <horstretch>0</horstretch>
-      <verstretch>0</verstretch>
-     </sizepolicy>
-    </property>
-    <property name="text">
-     <string>5</string>
-    </property>
-    <property name="alignment">
-     <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-    </property>
-   </widget>
-   <widget class="QCheckBox" name="checkBox_past_week">
-    <property name="enabled">
-     <bool>false</bool>
-    </property>
-    <property name="geometry">
-     <rect>
-      <x>280</x>
-      <y>740</y>
-      <width>155</width>
-      <height>20</height>
-     </rect>
-    </property>
-    <property name="text">
-     <string>過去のストリーミング</string>
-    </property>
-    <property name="checked">
-     <bool>false</bool>
-    </property>
-   </widget>
-   <widget class="QCheckBox" name="checkBox_13">
-    <property name="enabled">
-     <bool>false</bool>
-    </property>
-    <property name="geometry">
-     <rect>
-      <x>10</x>
-      <y>690</y>
-      <width>247</width>
-      <height>20</height>
-     </rect>
-    </property>
-    <property name="text">
-     <string>リトル・チャロ2</string>
-    </property>
-    <property name="checkable">
-     <bool>true</bool>
-    </property>
-   </widget>
-   <widget class="QWidget" name="layoutWidget">
-    <property name="geometry">
-     <rect>
-      <x>10</x>
-      <y>610</y>
-      <width>268</width>
-      <height>27</height>
-     </rect>
-    </property>
-    <layout class="QHBoxLayout" name="horizontalLayout">
-     <item>
-      <widget class="QCheckBox" name="checkBox_14">
-       <property name="enabled">
-        <bool>false</bool>
-       </property>
-       <property name="text">
-        <string>ニュースで英会話　</string>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QComboBox" name="comboBox_enews">
-       <property name="enabled">
-        <bool>false</bool>
-       </property>
-       <property name="frame">
-        <bool>true</bool>
-       </property>
-       <item>
-        <property name="text">
-         <string>音声と動画</string>
-        </property>
-       </item>
-       <item>
-        <property name="text">
-         <string>音声のみ</string>
-        </property>
-       </item>
-       <item>
-        <property name="text">
-         <string>動画のみ</string>
-        </property>
-       </item>
-      </widget>
-     </item>
-    </layout>
-   </widget>
-   <widget class="QWidget" name="layoutWidget">
-    <property name="geometry">
-     <rect>
-      <x>10</x>
-      <y>650</y>
-      <width>268</width>
-      <height>20</height>
-     </rect>
-    </property>
-    <layout class="QHBoxLayout" name="horizontalLayout_8">
-     <item>
-      <widget class="QCheckBox" name="checkBox_15">
-       <property name="enabled">
-        <bool>false</bool>
-       </property>
-       <property name="text">
-        <string>ニュースで英会話（読み直し音声）</string>
-       </property>
-      </widget>
-     </item>
-    </layout>
-   </widget>
-   <widget class="QWidget" name="layoutWidget">
-    <property name="geometry">
-     <rect>
-      <x>300</x>
-      <y>610</y>
-      <width>270</width>
-      <height>27</height>
-     </rect>
-    </property>
-    <layout class="QHBoxLayout" name="horizontalLayout_12">
-     <item>
-      <widget class="QCheckBox" name="checkBox_shower">
-       <property name="enabled">
-        <bool>false</bool>
-       </property>
-       <property name="text">
-        <string>ABCニュースシャワー</string>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QComboBox" name="comboBox_shower">
-       <property name="enabled">
-        <bool>false</bool>
-       </property>
-       <property name="frame">
-        <bool>true</bool>
-       </property>
-       <item>
-        <property name="text">
-         <string>音声と動画</string>
-        </property>
-       </item>
-       <item>
-        <property name="text">
-         <string>音声のみ</string>
-        </property>
-       </item>
-       <item>
-        <property name="text">
-         <string>動画のみ</string>
-        </property>
-       </item>
-      </widget>
-     </item>
-    </layout>
-   </widget>
    <widget class="QLabel" name="label_3">
     <property name="enabled">
      <bool>false</bool>
@@ -958,89 +742,6 @@
      <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
     </property>
    </widget>
-   <widget class="QWidget" name="layoutWidget">
-    <property name="geometry">
-     <rect>
-      <x>300</x>
-      <y>650</y>
-      <width>269</width>
-      <height>26</height>
-     </rect>
-    </property>
-    <layout class="QHBoxLayout" name="horizontalLayout_24">
-     <item>
-      <widget class="QCheckBox" name="checkBox_enews_past">
-       <property name="enabled">
-        <bool>false</bool>
-       </property>
-       <property name="text">
-        <string>「ニュースで英会話」過去分</string>
-       </property>
-       <property name="checked">
-        <bool>false</bool>
-       </property>
-      </widget>
-     </item>
-    </layout>
-   </widget>
-   <widget class="QWidget" name="layoutWidget">
-    <property name="geometry">
-     <rect>
-      <x>20</x>
-      <y>750</y>
-      <width>209</width>
-      <height>32</height>
-     </rect>
-    </property>
-    <layout class="QHBoxLayout" name="horizontalLayout_23">
-     <item>
-      <widget class="QCheckBox" name="checkBox_keep_on_error">
-       <property name="enabled">
-        <bool>false</bool>
-       </property>
-       <property name="text">
-        <string>ダウンロード未完でも変換</string>
-       </property>
-       <property name="checked">
-        <bool>false</bool>
-       </property>
-      </widget>
-     </item>
-    </layout>
-   </widget>
-   <widget class="QToolButton" name="toolButton_detailed_message">
-    <property name="enabled">
-     <bool>false</bool>
-    </property>
-    <property name="geometry">
-     <rect>
-      <x>10</x>
-      <y>570</y>
-      <width>252</width>
-      <height>30</height>
-     </rect>
-    </property>
-    <property name="sizePolicy">
-     <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
-      <horstretch>0</horstretch>
-      <verstretch>0</verstretch>
-     </sizepolicy>
-    </property>
-    <property name="font">
-     <font>
-      <pointsize>12</pointsize>
-     </font>
-    </property>
-    <property name="text">
-     <string>詳細なメッセージ</string>
-    </property>
-    <property name="checkable">
-     <bool>true</bool>
-    </property>
-    <property name="checked">
-     <bool>false</bool>
-    </property>
-   </widget>
   </widget>
   <widget class="QMenuBar" name="menuBar">
    <property name="geometry">
@@ -1060,40 +761,27 @@
  </widget>
  <layoutdefault spacing="6" margin="11"/>
  <tabstops>
+  <tabstop>toolButton_basic0</tabstop>
   <tabstop>toolButton_basic1</tabstop>
   <tabstop>toolButton_basic2</tabstop>
   <tabstop>toolButton_basic3</tabstop>
   <tabstop>toolButton_timetrial</tabstop>
+  <tabstop>toolButton_gendai</tabstop>
   <tabstop>toolButton_kaiwa</tabstop>
+  <tabstop>toolButton_gakusyu</tabstop>
   <tabstop>toolButton_business1</tabstop>
   <tabstop>toolButton_business2</tabstop>
-  <tabstop>toolButton_kouryaku</tabstop>
-  <tabstop>toolButton_yomu</tabstop>
   <tabstop>toolButton_enjoy</tabstop>
-  <tabstop>toolButton_chinese</tabstop>
-  <tabstop>toolButton_levelup_chinese</tabstop>
-  <tabstop>toolButton_french</tabstop>
-  <tabstop>toolButton_italian</tabstop>
-  <tabstop>toolButton_hangeul</tabstop>
-  <tabstop>toolButton_levelup_hangeul</tabstop>
-  <tabstop>toolButton_german</tabstop>
-  <tabstop>toolButton_spanish</tabstop>
-  <tabstop>toolButton_russian</tabstop>
+  <tabstop>toolButton_vrradio</tabstop>
+  <tabstop>toolButton_vrradio1</tabstop>
+  <tabstop>toolButton_vrradio2</tabstop>
+  <tabstop>toolButton_optional1</tabstop>
+  <tabstop>toolButton_optional2</tabstop>
+  <tabstop>toolButton_optional3</tabstop>
+  <tabstop>toolButton_optional4</tabstop>
   <tabstop>toolButton_skip</tabstop>
   <tabstop>comboBox_extension</tabstop>
   <tabstop>downloadButton</tabstop>
-  <tabstop>past_days</tabstop>
-  <tabstop>comboBox_enews</tabstop>
-  <tabstop>checkBox_next_week</tabstop>
-  <tabstop>checkBox_15</tabstop>
-  <tabstop>checkBox_14</tabstop>
-  <tabstop>checkBox_this_week</tabstop>
-  <tabstop>checkBox_13</tabstop>
-  <tabstop>checkBox_shower</tabstop>
-  <tabstop>comboBox_shower</tabstop>
-  <tabstop>checkBox_enews_past</tabstop>
-  <tabstop>checkBox_keep_on_error</tabstop>
-  <tabstop>checkBox_past_week</tabstop>
  </tabstops>
  <resources/>
  <connections>
@@ -1114,6 +802,22 @@
    </hints>
   </connection>
   <connection>
+   <sender>toolButton_basic0</sender>
+   <signal>toggled(bool)</signal>
+   <receiver>MainWindowClass</receiver>
+   <slot>toggled(bool)</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>20</x>
+     <y>47</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>92</x>
+     <y>503</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
    <sender>toolButton_basic1</sender>
    <signal>toggled(bool)</signal>
    <receiver>MainWindowClass</receiver>
@@ -1226,7 +930,7 @@
    </hints>
   </connection>
   <connection>
-   <sender>toolButton_kouryaku</sender>
+   <sender>toolButton_gendai</sender>
    <signal>toggled(bool)</signal>
    <receiver>MainWindowClass</receiver>
    <slot>toggled(bool)</slot>
@@ -1242,7 +946,7 @@
    </hints>
   </connection>
   <connection>
-   <sender>toolButton_yomu</sender>
+   <sender>toolButton_gakusyu</sender>
    <signal>toggled(bool)</signal>
    <receiver>MainWindowClass</receiver>
    <slot>toggled(bool)</slot>
@@ -1274,6 +978,118 @@
    </hints>
   </connection>
   <connection>
+   <sender>toolButton_vrradio</sender>
+   <signal>toggled(bool)</signal>
+   <receiver>MainWindowClass</receiver>
+   <slot>toggled(bool)</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>232</x>
+     <y>378</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>211</x>
+     <y>602</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>toolButton_vrradio1</sender>
+   <signal>toggled(bool)</signal>
+   <receiver>MainWindowClass</receiver>
+   <slot>toggled(bool)</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>232</x>
+     <y>378</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>211</x>
+     <y>602</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>toolButton_vrradio2</sender>
+   <signal>toggled(bool)</signal>
+   <receiver>MainWindowClass</receiver>
+   <slot>toggled(bool)</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>232</x>
+     <y>378</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>211</x>
+     <y>602</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>toolButton_optional1</sender>
+   <signal>toggled(bool)</signal>
+   <receiver>MainWindowClass</receiver>
+   <slot>toggled(bool)</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>314</x>
+     <y>194</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>387</x>
+     <y>587</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>toolButton_optional2</sender>
+   <signal>toggled(bool)</signal>
+   <receiver>MainWindowClass</receiver>
+   <slot>toggled(bool)</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>314</x>
+     <y>194</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>387</x>
+     <y>587</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>toolButton_optional3</sender>
+   <signal>toggled(bool)</signal>
+   <receiver>MainWindowClass</receiver>
+   <slot>toggled(bool)</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>314</x>
+     <y>194</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>387</x>
+     <y>587</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>toolButton_optional4</sender>
+   <signal>toggled(bool)</signal>
+   <receiver>MainWindowClass</receiver>
+   <slot>toggled(bool)</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>314</x>
+     <y>194</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>387</x>
+     <y>587</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
    <sender>toolButton_skip</sender>
    <signal>toggled(bool)</signal>
    <receiver>MainWindowClass</receiver>
@@ -1338,6 +1154,22 @@
    </hints>
   </connection>
   <connection>
+   <sender>toolButton_omotenashino_chinese</sender>
+   <signal>toggled(bool)</signal>
+   <receiver>MainWindowClass</receiver>
+   <slot>toggled(bool)</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>282</x>
+     <y>77</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>324</x>
+     <y>533</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
    <sender>toolButton_french</sender>
    <signal>toggled(bool)</signal>
    <receiver>MainWindowClass</receiver>
@@ -1449,6 +1281,38 @@
     </hint>
    </hints>
   </connection>
+  <connection>
+   <sender>toolButton_ouyou1</sender>
+   <signal>toggled(bool)</signal>
+   <receiver>MainWindowClass</receiver>
+   <slot>toggled(bool)</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>395</x>
+     <y>339</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>460</x>
+     <y>520</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>toolButton_ouyou2</sender>
+   <signal>toggled(bool)</signal>
+   <receiver>MainWindowClass</receiver>
+   <slot>toggled(bool)</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>395</x>
+     <y>339</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>460</x>
+     <y>520</y>
+    </hint>
+   </hints>
+  </connection>
  </connections>
  <slots>
   <slot>download()</slot>

--- a/scrambledialog.cpp
+++ b/scrambledialog.cpp
@@ -21,10 +21,45 @@
 #include "scrambledialog.h"
 #include "ui_scrambledialog.h"
 
-ScrambleDialog::ScrambleDialog( QString scramble, QWidget *parent )
+#define OPTIONAL1 "english/basic1"
+#define OPTIONAL2 "english/basic2"
+#define OPTIONAL3 "english/basic3"
+#define OPTIONAL4 "english/enjoy"
+#define OPT_TITLE1 "任意講座１"
+#define OPT_TITLE2 "任意講座２"
+#define OPT_TITLE3 "任意講座３"
+#define OPT_TITLE4 "任意講座４"
+
+QString ScrambleDialog::optional1;
+QString ScrambleDialog::optional2;
+QString ScrambleDialog::optional3;
+QString ScrambleDialog::optional4;
+QString ScrambleDialog::opt_title1;
+QString ScrambleDialog::opt_title2;
+QString ScrambleDialog::opt_title3;
+QString ScrambleDialog::opt_title4;
+
+//QString optional1 = MainWindow::optional1;
+//QString optional2 = MainWindow::optional2;
+//QString optional3 = MainWindow::optional3;
+//QString optional4 = MainWindow::optional4;
+//QString opt_title1 = MainWindow::opt_title1;
+//QString opt_title2 = MainWindow::opt_title2;
+//QString opt_title3 = MainWindow::opt_title3;
+//QString opt_title4 = MainWindow::opt_title4;
+
+
+ScrambleDialog::ScrambleDialog( QString opt_title1, QString opt_title2, QString opt_title3, QString opt_title4, QString optional1, QString optional2 , QString optional3, QString optional4, QWidget *parent )
 		: QDialog(parent), ui(new Ui::ScrambleDialog) {
     ui->setupUi(this);
-	ui->scramble->setText( scramble );
+	ui->opt_title1->setText( opt_title1 ),
+	ui->opt_title2->setText( opt_title2 ),
+	ui->opt_title3->setText( opt_title3 ),
+	ui->opt_title4->setText( opt_title4 ),
+	ui->optional1->setText( optional1 ),
+	ui->optional2->setText( optional2 ),
+	ui->optional3->setText( optional3 ),
+	ui->optional4->setText( optional4 );
 }
 
 ScrambleDialog::~ScrambleDialog() {
@@ -32,5 +67,34 @@ ScrambleDialog::~ScrambleDialog() {
 }
 
 QString ScrambleDialog::scramble() {
-	return ui->scramble->text();
+	return ui->opt_title1->text();
+}
+
+QString ScrambleDialog::scramble2() {
+	return ui->opt_title2->text();
+}
+
+QString ScrambleDialog::scramble3() {
+	return ui->opt_title3->text();
+}
+
+QString ScrambleDialog::scramble4() {
+	return ui->opt_title4->text();
 }
+
+QString ScrambleDialog::scramble5() {
+	return ui->optional1->text();
+}
+
+QString ScrambleDialog::scramble6() {
+	return ui->optional2->text();
+}
+
+QString ScrambleDialog::scramble7() {
+	return ui->optional3->text();
+}
+
+QString ScrambleDialog::scramble8() {
+	return ui->optional4->text();
+}
+

--- a/scrambledialog.h
+++ b/scrambledialog.h
@@ -31,9 +31,26 @@ class ScrambleDialog : public QDialog {
     Q_OBJECT
 
 public:
-	explicit ScrambleDialog( QString scramble, QWidget *parent = 0 );
+	explicit ScrambleDialog( QString opt_title1, QString opt_title2, QString opt_title3, QString opt_title4, QString optional1, QString optional2 , QString optional3, QString optional4, QWidget *parent = 0 );
     ~ScrambleDialog();
 	QString scramble();
+	QString scramble2();
+	QString scramble3();
+	QString scramble4();
+	QString scramble5();
+	QString scramble6();
+	QString scramble7();
+	QString scramble8();
+
+	static QString optional1;
+	static QString optional2;
+	static QString optional3;
+	static QString optional4;
+	static QString opt_title1;
+	static QString opt_title2;
+	static QString opt_title3;
+	static QString opt_title4;
+
 
 private:
     Ui::ScrambleDialog *ui;

--- a/scrambledialog.ui
+++ b/scrambledialog.ui
@@ -7,17 +7,17 @@
     <x>0</x>
     <y>0</y>
     <width>320</width>
-    <height>129</height>
+    <height>329</height>
    </rect>
   </property>
   <property name="windowTitle">
-   <string>Dialog</string>
+   <string>任意講座ボタン名称／URL設定</string>
   </property>
   <widget class="QDialogButtonBox" name="buttonBox">
    <property name="geometry">
     <rect>
      <x>10</x>
-     <y>90</y>
+     <y>290</y>
      <width>301</width>
      <height>32</height>
     </rect>
@@ -29,7 +29,7 @@
     <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
    </property>
   </widget>
-  <widget class="QLineEdit" name="scramble">
+  <widget class="QLineEdit" name="opt_title1">
    <property name="geometry">
     <rect>
      <x>30</x>
@@ -39,6 +39,36 @@
     </rect>
    </property>
   </widget>
+  <widget class="QLineEdit" name="opt_title2">
+   <property name="geometry">
+    <rect>
+     <x>30</x>
+     <y>70</y>
+     <width>231</width>
+     <height>22</height>
+    </rect>
+   </property>
+  </widget>
+  <widget class="QLineEdit" name="opt_title3">
+   <property name="geometry">
+    <rect>
+     <x>30</x>
+     <y>90</y>
+     <width>231</width>
+     <height>22</height>
+    </rect>
+   </property>
+  </widget>
+  <widget class="QLineEdit" name="opt_title4">
+   <property name="geometry">
+    <rect>
+     <x>30</x>
+     <y>110</y>
+     <width>231</width>
+     <height>22</height>
+    </rect>
+   </property>
+  </widget>
   <widget class="QLabel" name="label">
    <property name="geometry">
     <rect>
@@ -49,7 +79,60 @@
     </rect>
    </property>
    <property name="text">
-    <string>スクランブル文字列を入力してください。</string>
+    <string>任意講座ボタン名称</string>
+   </property>
+  </widget>
+  <widget class="QLineEdit" name="optional1">
+   <property name="geometry">
+    <rect>
+     <x>30</x>
+     <y>180</y>
+     <width>231</width>
+     <height>22</height>
+    </rect>
+   </property>
+  </widget>
+  <widget class="QLineEdit" name="optional2">
+   <property name="geometry">
+    <rect>
+     <x>30</x>
+     <y>200</y>
+     <width>231</width>
+     <height>22</height>
+    </rect>
+   </property>
+  </widget>
+  <widget class="QLineEdit" name="optional3">
+   <property name="geometry">
+    <rect>
+     <x>30</x>
+     <y>220</y>
+     <width>231</width>
+     <height>22</height>
+    </rect>
+   </property>
+  </widget>
+  <widget class="QLineEdit" name="optional4">
+   <property name="geometry">
+    <rect>
+     <x>30</x>
+     <y>240</y>
+     <width>231</width>
+     <height>22</height>
+    </rect>
+   </property>
+  </widget>
+  <widget class="QLabel" name="label">
+   <property name="geometry">
+    <rect>
+     <x>20</x>
+     <y>150</y>
+     <width>246</width>
+     <height>16</height>
+    </rect>
+   </property>
+   <property name="text">
+    <string>任意講座URL</string>
    </property>
   </widget>
  </widget>