OSDN -- Open-Source-Software-Entwicklung und Downloads
Übersetzungsstatus von Deutsch translation status for de
  • R/O
  • HTTP
  • SSH
  • HTTPS
Fork

Commit

Frequently used words (click to add to your profile)

javac++androidlinuxc#windowsobjective-ccocoa誰得qtpythonphprubygameguibathyscaphec計画中(planning stage)翻訳omegatframeworktwitterdomtestvb.netdirectxゲームエンジンbtronarduinopreviewer

Commit MetaInfo

Revision95813a8c28ca199ddf0b0bc723d9e15135903f72 (tree)
Zeit2014-04-07 14:19:55
Autorjakago <jakago777@gmai...>
Commiterjakago

Log Message

エンジョイ・シンプル・イングリッシュ対応

Ändern Zusammenfassung

Diff

--- a/customizedialog.cpp
+++ b/customizedialog.cpp
@@ -27,7 +27,7 @@
2727
2828 #define SETTING_GROUP "CustomizeDialog"
2929 #define DefaultTitle "%k_%Y_%M_%D"
30-#define DefaultFileName "%k_%Y_%M_%D.mp3"
30+#define DefaultFileName "%k_%Y_%M_%D"
3131
3232 typedef struct LineEdit {
3333 QLineEdit* lineEdit;
@@ -40,7 +40,7 @@ QStringList CustomizeDialog::courses = QStringList()
4040 << QString::fromUtf8( "基礎英語3" ) << QString::fromUtf8( "英会話タイムトライアル" )
4141 << QString::fromUtf8( "ラジオ英会話" ) << QString::fromUtf8( "入門ビジネス英語" )
4242 << QString::fromUtf8( "実践ビジネス英語" ) << QString::fromUtf8( "まいにちロシア語" )
43- << QString::fromUtf8( "英語で読む村上春樹" )
43+ << QString::fromUtf8( "英語で読む村上春樹" ) << QString::fromUtf8( "エンジョイ・シンプル・イングリッシュ" )
4444 << QString::fromUtf8( "まいにち中国語" ) << QString::fromUtf8( "まいにちフランス語" )
4545 << QString::fromUtf8( "まいにちイタリア語" ) << QString::fromUtf8( "まいにちハングル講座" )
4646 << QString::fromUtf8( "まいにちドイツ語" ) << QString::fromUtf8( "まいにちスペイン語" )
@@ -49,14 +49,14 @@ QStringList CustomizeDialog::courses = QStringList()
4949 QStringList CustomizeDialog::titleKeys = QStringList()
5050 << "basic1_title" << "basic2_title" << "basic3_title" << "timetrial_title"
5151 << "kaiwa_title" << "business1_title" << "business2_title" << "russian_title"
52- << "yomu_title"
52+ << "yomu_title" << "enjoy_title"
5353 << "chinese_title" << "french_title" << "italian_title" << "hangeul_title"
5454 << "german_title" << "spanish_title" << "levelup-chinese_title" << "levelup-hangeul_title"
5555 << "kouryaku_title";
5656 QStringList CustomizeDialog::fileNameKeys = QStringList()
5757 << "basic1_file_name" << "basic2_file_name" << "basic3_file_name" << "timetrial_file_name"
5858 << "kaiwa_file_name" << "business1_file_name" << "business2_file_name" << "russian_file_name"
59- << "yomu_file_name"
59+ << "yomu_file_name" << "enjoy_file_name"
6060 << "chinese_file_name" << "french_file_name" << "italian_file_name" << "hangeul_file_name"
6161 << "german_file_name" << "spanish_file_name" << "levelup-chinese_file_name" << "levelup-hangeul_file_name"
6262 << "kouryaku_file_name";
@@ -90,7 +90,7 @@ void CustomizeDialog::settings( bool write ) {
9090 QLineEdit* lineEdits[] = {
9191 ui.lineEdit, ui.lineEdit_2, ui.lineEdit_3, ui.lineEdit_4,
9292 ui.lineEdit_5, ui.lineEdit_6, ui.lineEdit_7, ui.lineEdit_8,
93- ui.lineEdit_17,
93+ ui.lineEdit_17, ui.lineEdit_19,
9494 ui.lineEdit_9, ui.lineEdit_10, ui.lineEdit_11, ui.lineEdit_12,
9595 ui.lineEdit_13, ui.lineEdit_14, ui.lineEdit_15, ui.lineEdit_16,
9696 ui.lineEdit_18,
--- a/customizedialog.ui
+++ b/customizedialog.ui
@@ -10,19 +10,19 @@
1010 <x>0</x>
1111 <y>0</y>
1212 <width>552</width>
13- <height>578</height>
13+ <height>608</height>
1414 </rect>
1515 </property>
1616 <property name="minimumSize">
1717 <size>
1818 <width>552</width>
19- <height>578</height>
19+ <height>608</height>
2020 </size>
2121 </property>
2222 <property name="maximumSize">
2323 <size>
2424 <width>552</width>
25- <height>578</height>
25+ <height>608</height>
2626 </size>
2727 </property>
2828 <property name="windowTitle">
@@ -32,7 +32,7 @@
3232 <property name="geometry">
3333 <rect>
3434 <x>200</x>
35- <y>540</y>
35+ <y>570</y>
3636 <width>341</width>
3737 <height>32</height>
3838 </rect>
@@ -50,7 +50,7 @@
5050 <x>10</x>
5151 <y>253</y>
5252 <width>527</width>
53- <height>281</height>
53+ <height>311</height>
5454 </rect>
5555 </property>
5656 <layout class="QGridLayout" name="gridLayout">
@@ -158,6 +158,16 @@
158158 </property>
159159 </widget>
160160 </item>
161+ <item row="0" column="0">
162+ <widget class="QLabel" name="label">
163+ <property name="text">
164+ <string>基礎英語1:</string>
165+ </property>
166+ <property name="alignment">
167+ <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
168+ </property>
169+ </widget>
170+ </item>
161171 <item row="3" column="1">
162172 <widget class="QLineEdit" name="lineEdit_4">
163173 <property name="text">
@@ -175,13 +185,6 @@
175185 </property>
176186 </widget>
177187 </item>
178- <item row="0" column="4">
179- <widget class="QLineEdit" name="lineEdit_9">
180- <property name="text">
181- <string>%k_%Y_%M_%D</string>
182- </property>
183- </widget>
184- </item>
185188 <item row="0" column="1">
186189 <widget class="QLineEdit" name="lineEdit">
187190 <property name="toolTip">
@@ -192,6 +195,13 @@
192195 </property>
193196 </widget>
194197 </item>
198+ <item row="0" column="4">
199+ <widget class="QLineEdit" name="lineEdit_9">
200+ <property name="text">
201+ <string>%k_%Y_%M_%D</string>
202+ </property>
203+ </widget>
204+ </item>
195205 <item row="3" column="2">
196206 <widget class="QLabel" name="label_17">
197207 <property name="text">
@@ -233,29 +243,29 @@
233243 </property>
234244 </widget>
235245 </item>
236- <item row="4" column="1">
237- <widget class="QLineEdit" name="lineEdit_5">
246+ <item row="4" column="4">
247+ <widget class="QLineEdit" name="lineEdit_13">
238248 <property name="text">
239249 <string>%k_%Y_%M_%D</string>
240250 </property>
241251 </widget>
242252 </item>
243- <item row="3" column="4">
244- <widget class="QLineEdit" name="lineEdit_12">
253+ <item row="4" column="1">
254+ <widget class="QLineEdit" name="lineEdit_5">
245255 <property name="text">
246256 <string>%k_%Y_%M_%D</string>
247257 </property>
248258 </widget>
249259 </item>
250- <item row="4" column="4">
251- <widget class="QLineEdit" name="lineEdit_13">
260+ <item row="1" column="1">
261+ <widget class="QLineEdit" name="lineEdit_2">
252262 <property name="text">
253263 <string>%k_%Y_%M_%D</string>
254264 </property>
255265 </widget>
256266 </item>
257- <item row="1" column="1">
258- <widget class="QLineEdit" name="lineEdit_2">
267+ <item row="3" column="4">
268+ <widget class="QLineEdit" name="lineEdit_12">
259269 <property name="text">
260270 <string>%k_%Y_%M_%D</string>
261271 </property>
@@ -288,30 +298,30 @@
288298 </property>
289299 </widget>
290300 </item>
291- <item row="0" column="3">
292- <widget class="QLabel" name="label_9">
301+ <item row="1" column="3">
302+ <widget class="QLabel" name="label_10">
293303 <property name="text">
294- <string>中国語:</string>
304+ <string>フランス語:</string>
295305 </property>
296306 <property name="alignment">
297307 <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
298308 </property>
299309 </widget>
300310 </item>
301- <item row="1" column="3">
302- <widget class="QLabel" name="label_10">
311+ <item row="0" column="3">
312+ <widget class="QLabel" name="label_9">
303313 <property name="text">
304- <string>フランス語:</string>
314+ <string>中国語:</string>
305315 </property>
306316 <property name="alignment">
307317 <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
308318 </property>
309319 </widget>
310320 </item>
311- <item row="0" column="0">
312- <widget class="QLabel" name="label">
321+ <item row="4" column="3">
322+ <widget class="QLabel" name="label_13">
313323 <property name="text">
314- <string>基礎英語1:</string>
324+ <string>ドイツ語:</string>
315325 </property>
316326 <property name="alignment">
317327 <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
@@ -331,36 +341,39 @@
331341 </property>
332342 </widget>
333343 </item>
334- <item row="4" column="3">
335- <widget class="QLabel" name="label_13">
344+ <item row="6" column="3">
345+ <widget class="QLabel" name="label_15">
346+ <property name="enabled">
347+ <bool>true</bool>
348+ </property>
336349 <property name="text">
337- <string>ドイツ語:</string>
350+ <string>レベルアップ中国語:</string>
338351 </property>
339352 <property name="alignment">
340353 <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
341354 </property>
342355 </widget>
343356 </item>
344- <item row="6" column="3">
345- <widget class="QLabel" name="label_15">
357+ <item row="8" column="0">
358+ <widget class="QLabel" name="label_21">
346359 <property name="enabled">
347360 <bool>true</bool>
348361 </property>
349362 <property name="text">
350- <string>レベルアップ中国語:</string>
363+ <string>村上春樹</string>
351364 </property>
352365 <property name="alignment">
353366 <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
354367 </property>
355368 </widget>
356369 </item>
357- <item row="8" column="0">
358- <widget class="QLabel" name="label_21">
370+ <item row="8" column="3">
371+ <widget class="QLabel" name="label_22">
359372 <property name="enabled">
360373 <bool>true</bool>
361374 </property>
362375 <property name="text">
363- <string>村上春樹</string>
376+ <string>攻略英語リスニング</string>
364377 </property>
365378 <property name="alignment">
366379 <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
@@ -377,21 +390,31 @@
377390 </property>
378391 </widget>
379392 </item>
380- <item row="8" column="3">
381- <widget class="QLabel" name="label_22">
393+ <item row="8" column="4">
394+ <widget class="QLineEdit" name="lineEdit_18">
382395 <property name="enabled">
383396 <bool>true</bool>
384397 </property>
385398 <property name="text">
386- <string>攻略英語リスニング</string>
399+ <string>%k_%Y_%M_%D</string>
400+ </property>
401+ </widget>
402+ </item>
403+ <item row="9" column="0">
404+ <widget class="QLabel" name="label_32">
405+ <property name="enabled">
406+ <bool>true</bool>
407+ </property>
408+ <property name="text">
409+ <string>エンジョイ</string>
387410 </property>
388411 <property name="alignment">
389412 <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
390413 </property>
391414 </widget>
392415 </item>
393- <item row="8" column="4">
394- <widget class="QLineEdit" name="lineEdit_18">
416+ <item row="9" column="1">
417+ <widget class="QLineEdit" name="lineEdit_19">
395418 <property name="enabled">
396419 <bool>true</bool>
397420 </property>
--- a/downloadthread.cpp
+++ b/downloadthread.cpp
@@ -601,19 +601,25 @@ bool DownloadThread::captureStream( QString kouza, QString hdate, QString file )
601601 }
602602
603603 QString DownloadThread::paths[] = {
604- "english/basic1", "english/basic2", "english/basic3", "english/timetrial",
605- "english/kaiwa", "english/business1", "english/business2",
606- "chinese/kouza", "french/kouza", "italian/kouza", "hangeul/kouza",
607- "german/kouza", "spanish/kouza", "english/kouryaku", "english/yomu",
608- "chinese/levelup", "hangeul/levelup", "russian/kouza"
604+ "english/basic1", "english/basic2", "english/basic3",
605+ "english/timetrial", "english/kaiwa", "english/business1",
606+ "english/business2", "english/kouryaku", "english/yomu",
607+ "english/enjoy",
608+ "chinese/kouza", "chinese/levelup", "french/kouza",
609+ "italian/kouza", "hangeul/kouza","hangeul/levelup",
610+ "german/kouza", "spanish/kouza","russian/kouza"
609611 };
610612
611613 void DownloadThread::run() {
612614 QCheckBox* checkbox[] = {
613- ui->checkBox_0, ui->checkBox_1, ui->checkBox_2, ui->checkBox_3, ui->checkBox_4,
614- ui->checkBox_5, ui->checkBox_6, ui->checkBox_7, ui->checkBox_8, ui->checkBox_9,
615- ui->checkBox_10, ui->checkBox_11, ui->checkBox_12, ui->checkBox_kouryaku, ui->checkBox_yomu,
616- ui->checkBox_16, ui->checkBox_17, ui->checkBox_18, NULL
615+ ui->checkBox_basic1, ui->checkBox_basic2, ui->checkBox_basic3,
616+ ui->checkBox_timetrial, ui->checkBox_kaiwa, ui->checkBox_business1,
617+ ui->checkBox_business2, ui->checkBox_kouryaku, ui->checkBox_yomu,
618+ ui->checkBox_enjoy,
619+ ui->checkBox_chinese, ui->checkBox_levelup_chinese, ui->checkBox_french,
620+ ui->checkBox_italian, ui->checkBox_hangeul, ui->checkBox_levelup_hangeul,
621+ ui->checkBox_german, ui->checkBox_spanish, ui->checkBox_russian,
622+ NULL
617623 };
618624
619625 if ( !isFfmpegAvailable( ffmpeg ) )
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -158,28 +158,29 @@ void MainWindow::settings( enum ReadWriteMode mode ) {
158158 #define DefaultTitle "%k_%Y_%M_%D"
159159 #define DefaultFileName "%k_%Y_%M_%D.mp3"
160160 CheckBox checkBoxes[] = {
161- { ui->checkBox_0, "basic1", false, "basic1_title", DefaultTitle, "basic1_file_name", DefaultFileName },
162- { ui->checkBox_1, "basic2", false, "basic2_title", DefaultTitle, "basic2_file_name", DefaultFileName },
163- { ui->checkBox_2, "basic3", false, "basic3_title", DefaultTitle, "basic3_file_name", DefaultFileName },
164- { ui->checkBox_3, "timetrial", false, "timetrial_title", DefaultTitle, "timetrial_file_name", DefaultFileName },
165- { ui->checkBox_4, "kaiwa", false, "kaiwa_title", DefaultTitle, "kaiwa_file_name", DefaultFileName },
166- { ui->checkBox_5, "business1", false, "business1_title", DefaultTitle, "business1_file_name", DefaultFileName },
167- { ui->checkBox_6, "business2", false, "business2_title", DefaultTitle, "business2_file_name", DefaultFileName },
168- { ui->checkBox_7, "chinese", false, "chinese_title", DefaultTitle, "chinese_file_name", DefaultFileName },
169- { ui->checkBox_8, "french", false, "french_title", DefaultTitle, "french_file_name", DefaultFileName },
170- { ui->checkBox_9, "italian", false, "italian_title", DefaultTitle, "italian_file_name", DefaultFileName },
171- { ui->checkBox_10, "hangeul", false, "hangeul_title", DefaultTitle, "hangeul_file_name", DefaultFileName },
172- { ui->checkBox_11, "german", false, "german_title", DefaultTitle, "german_file_name", DefaultFileName },
173- { ui->checkBox_12, "spanish", false, "spanish_title", DefaultTitle, "spanish_file_name", DefaultFileName },
161+ { ui->checkBox_basic1, "basic1", false, "basic1_title", DefaultTitle, "basic1_file_name", DefaultFileName },
162+ { ui->checkBox_basic2, "basic2", false, "basic2_title", DefaultTitle, "basic2_file_name", DefaultFileName },
163+ { ui->checkBox_basic3, "basic3", false, "basic3_title", DefaultTitle, "basic3_file_name", DefaultFileName },
164+ { ui->checkBox_timetrial, "timetrial", false, "timetrial_title", DefaultTitle, "timetrial_file_name", DefaultFileName },
165+ { ui->checkBox_kaiwa, "kaiwa", false, "kaiwa_title", DefaultTitle, "kaiwa_file_name", DefaultFileName },
166+ { ui->checkBox_business1, "business1", false, "business1_title", DefaultTitle, "business1_file_name", DefaultFileName },
167+ { ui->checkBox_business2, "business2", false, "business2_title", DefaultTitle, "business2_file_name", DefaultFileName },
168+ { ui->checkBox_chinese, "chinese", false, "chinese_title", DefaultTitle, "chinese_file_name", DefaultFileName },
169+ { ui->checkBox_french, "french", false, "french_title", DefaultTitle, "french_file_name", DefaultFileName },
170+ { ui->checkBox_italian, "italian", false, "italian_title", DefaultTitle, "italian_file_name", DefaultFileName },
171+ { ui->checkBox_hangeul, "hangeul", false, "hangeul_title", DefaultTitle, "hangeul_file_name", DefaultFileName },
172+ { ui->checkBox_german, "german", false, "german_title", DefaultTitle, "german_file_name", DefaultFileName },
173+ { ui->checkBox_spanish, "spanish", false, "spanish_title", DefaultTitle, "spanish_file_name", DefaultFileName },
174174 { ui->checkBox_13, "charo", false, "charo_title", DefaultTitle, "charo_file_name", DefaultFileName },
175175 { ui->checkBox_14, "e-news", false, "e-news_title", DefaultTitle, "e-news_file_name", DefaultFileName },
176176 { ui->checkBox_15, "e-news-reread", false, "e-news-reread_title", DefaultTitle, "e-news-reread_file_name", DefaultFileName },
177- { ui->checkBox_16, "levelup-chinese", false, "levelup-chinese_title", DefaultTitle, "levelup-chinese_file_name", DefaultFileName },
178- { ui->checkBox_17, "levelup-hangeul", false, "levelup-hangeul_title", DefaultTitle, "levelup-hangeul_file_name", DefaultFileName },
179- { ui->checkBox_18, "russian", false, "russian_title", DefaultTitle, "russian_file_name", DefaultFileName },
177+ { ui->checkBox_levelup_chinese, "levelup-chinese", false, "levelup-chinese_title", DefaultTitle, "levelup-chinese_file_name", DefaultFileName },
178+ { ui->checkBox_levelup_hangeul, "levelup-hangeul", false, "levelup-hangeul_title", DefaultTitle, "levelup-hangeul_file_name", DefaultFileName },
179+ { ui->checkBox_russian, "russian", false, "russian_title", DefaultTitle, "russian_file_name", DefaultFileName },
180180 { ui->checkBox_shower, "shower", false, "shower_title", DefaultTitle, "shower_file_name", DefaultFileName },
181181 { ui->checkBox_kouryaku, "kouryaku", false, "kouryaku_title", DefaultTitle, "kouryaku_file_name", DefaultFileName },
182182 { ui->checkBox_yomu, "yomu", false, "yomu_title", DefaultTitle, "yomu_file_name", DefaultFileName },
183+ { ui->checkBox_enjoy, "enjoy", false, "enjoy_title", DefaultTitle, "enjoy_file_name", DefaultFileName },
183184 { ui->checkBox_skip, "skip", true, "", "", "", "" },
184185 { ui->checkBox_keep_on_error, "keep_on_error", false, "", "", "", "" },
185186 { ui->checkBox_this_week, "this_week", true, "", "", "", "" },
--- a/mainwindow.ui
+++ b/mainwindow.ui
@@ -6,8 +6,8 @@
66 <rect>
77 <x>0</x>
88 <y>0</y>
9- <width>448</width>
10- <height>414</height>
9+ <width>498</width>
10+ <height>442</height>
1111 </rect>
1212 </property>
1313 <property name="sizePolicy">
@@ -18,14 +18,14 @@
1818 </property>
1919 <property name="minimumSize">
2020 <size>
21- <width>448</width>
22- <height>414</height>
21+ <width>498</width>
22+ <height>442</height>
2323 </size>
2424 </property>
2525 <property name="maximumSize">
2626 <size>
27- <width>448</width>
28- <height>414</height>
27+ <width>498</width>
28+ <height>442</height>
2929 </size>
3030 </property>
3131 <property name="windowTitle">
@@ -43,22 +43,12 @@
4343 <rect>
4444 <x>9</x>
4545 <y>9</y>
46- <width>431</width>
47- <height>361</height>
46+ <width>481</width>
47+ <height>387</height>
4848 </rect>
4949 </property>
50- <layout class="QGridLayout" name="gridLayout_3" rowstretch="0,0,0,0,0,0,0,0,0,0,0,0,0">
51- <item row="9" column="0">
52- <widget class="Line" name="line_2">
53- <property name="lineWidth">
54- <number>2</number>
55- </property>
56- <property name="orientation">
57- <enum>Qt::Horizontal</enum>
58- </property>
59- </widget>
60- </item>
61- <item row="9" column="1">
50+ <layout class="QGridLayout" name="gridLayout_3" rowstretch="0,0,0,0,0,0,0,0,0,0,0,0,0,0">
51+ <item row="10" column="1">
6252 <layout class="QHBoxLayout" name="horizontalLayout_10">
6353 <item>
6454 <widget class="Line" name="line">
@@ -72,10 +62,20 @@
7262 </item>
7363 </layout>
7464 </item>
65+ <item row="10" column="0">
66+ <widget class="Line" name="line_2">
67+ <property name="lineWidth">
68+ <number>2</number>
69+ </property>
70+ <property name="orientation">
71+ <enum>Qt::Horizontal</enum>
72+ </property>
73+ </widget>
74+ </item>
7575 <item row="0" column="0">
7676 <layout class="QHBoxLayout" name="horizontalLayout_14">
7777 <item>
78- <widget class="QCheckBox" name="checkBox_0">
78+ <widget class="QCheckBox" name="checkBox_basic1">
7979 <property name="text">
8080 <string>基礎英語1</string>
8181 </property>
@@ -83,10 +83,21 @@
8383 </item>
8484 </layout>
8585 </item>
86+ <item row="0" column="1">
87+ <layout class="QHBoxLayout" name="horizontalLayout_2">
88+ <item>
89+ <widget class="QCheckBox" name="checkBox_chinese">
90+ <property name="text">
91+ <string>まいにち中国語</string>
92+ </property>
93+ </widget>
94+ </item>
95+ </layout>
96+ </item>
8697 <item row="8" column="1">
8798 <layout class="QHBoxLayout" name="horizontalLayout_13">
8899 <item>
89- <widget class="QCheckBox" name="checkBox_18">
100+ <widget class="QCheckBox" name="checkBox_russian">
90101 <property name="text">
91102 <string>まいにちロシア語</string>
92103 </property>
@@ -94,18 +105,151 @@
94105 </item>
95106 </layout>
96107 </item>
97- <item row="0" column="1">
98- <layout class="QHBoxLayout" name="horizontalLayout_2">
108+ <item row="7" column="1">
109+ <layout class="QHBoxLayout" name="horizontalLayout_7">
99110 <item>
100- <widget class="QCheckBox" name="checkBox_7">
111+ <widget class="QCheckBox" name="checkBox_spanish">
101112 <property name="text">
102- <string>まいにち中国語</string>
113+ <string>まいにちスペイン語</string>
103114 </property>
104115 </widget>
105116 </item>
106117 </layout>
107118 </item>
108- <item row="10" column="0">
119+ <item row="6" column="1">
120+ <layout class="QHBoxLayout" name="horizontalLayout_6">
121+ <item>
122+ <widget class="QCheckBox" name="checkBox_german">
123+ <property name="text">
124+ <string>まいにちドイツ語</string>
125+ </property>
126+ </widget>
127+ </item>
128+ </layout>
129+ </item>
130+ <item row="8" column="0">
131+ <layout class="QHBoxLayout" name="horizontalLayout_27">
132+ <item>
133+ <widget class="QCheckBox" name="checkBox_yomu">
134+ <property name="text">
135+ <string>英語で読む村上春樹</string>
136+ </property>
137+ </widget>
138+ </item>
139+ </layout>
140+ </item>
141+ <item row="11" column="1">
142+ <layout class="QHBoxLayout" name="horizontalLayout_26">
143+ <item>
144+ <widget class="QLabel" name="label">
145+ <property name="sizePolicy">
146+ <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
147+ <horstretch>0</horstretch>
148+ <verstretch>0</verstretch>
149+ </sizepolicy>
150+ </property>
151+ <property name="layoutDirection">
152+ <enum>Qt::LeftToRight</enum>
153+ </property>
154+ <property name="text">
155+ <string>　　　　　拡張子：</string>
156+ </property>
157+ <property name="alignment">
158+ <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
159+ </property>
160+ </widget>
161+ </item>
162+ <item>
163+ <widget class="QComboBox" name="comboBox_extension">
164+ <property name="sizePolicy">
165+ <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
166+ <horstretch>0</horstretch>
167+ <verstretch>0</verstretch>
168+ </sizepolicy>
169+ </property>
170+ <item>
171+ <property name="text">
172+ <string>3g2</string>
173+ </property>
174+ </item>
175+ <item>
176+ <property name="text">
177+ <string>3gp</string>
178+ </property>
179+ </item>
180+ <item>
181+ <property name="text">
182+ <string>aac</string>
183+ </property>
184+ </item>
185+ <item>
186+ <property name="text">
187+ <string>avi</string>
188+ </property>
189+ </item>
190+ <item>
191+ <property name="text">
192+ <string>m4a</string>
193+ </property>
194+ </item>
195+ <item>
196+ <property name="text">
197+ <string>mka</string>
198+ </property>
199+ </item>
200+ <item>
201+ <property name="text">
202+ <string>mkv</string>
203+ </property>
204+ </item>
205+ <item>
206+ <property name="text">
207+ <string>mov</string>
208+ </property>
209+ </item>
210+ <item>
211+ <property name="text">
212+ <string>mp3</string>
213+ </property>
214+ </item>
215+ <item>
216+ <property name="text">
217+ <string>ts</string>
218+ </property>
219+ </item>
220+ </widget>
221+ </item>
222+ </layout>
223+ </item>
224+ <item row="13" column="1">
225+ <layout class="QHBoxLayout" name="horizontalLayout_25">
226+ <item>
227+ <widget class="QPushButton" name="downloadButton">
228+ <property name="text">
229+ <string>ダウンロード</string>
230+ </property>
231+ </widget>
232+ </item>
233+ </layout>
234+ </item>
235+ <item row="13" column="0">
236+ <layout class="QHBoxLayout" name="horizontalLayout_28">
237+ <item>
238+ <widget class="QCheckBox" name="checkBox_detailed_message">
239+ <property name="enabled">
240+ <bool>false</bool>
241+ </property>
242+ <property name="text">
243+ <string>詳細なメッセージ</string>
244+ </property>
245+ <property name="checked">
246+ <bool>false</bool>
247+ </property>
248+ </widget>
249+ </item>
250+ </layout>
251+ </item>
252+ <item row="11" column="0">
109253 <layout class="QHBoxLayout" name="horizontalLayout_22">
110254 <item>
111255 <widget class="QCheckBox" name="checkBox_skip">
@@ -133,7 +277,7 @@
133277 <item row="5" column="0">
134278 <layout class="QHBoxLayout" name="horizontalLayout_19">
135279 <item>
136- <widget class="QCheckBox" name="checkBox_5">
280+ <widget class="QCheckBox" name="checkBox_business1">
137281 <property name="text">
138282 <string>入門ビジネス英語</string>
139283 </property>
@@ -144,7 +288,7 @@
144288 <item row="6" column="0">
145289 <layout class="QHBoxLayout" name="horizontalLayout_20">
146290 <item>
147- <widget class="QCheckBox" name="checkBox_6">
291+ <widget class="QCheckBox" name="checkBox_business2">
148292 <property name="text">
149293 <string>実践ビジネス英語</string>
150294 </property>
@@ -155,7 +299,7 @@
155299 <item row="4" column="0">
156300 <layout class="QHBoxLayout" name="horizontalLayout_18">
157301 <item>
158- <widget class="QCheckBox" name="checkBox_4">
302+ <widget class="QCheckBox" name="checkBox_kaiwa">
159303 <property name="text">
160304 <string>ラジオ英会話</string>
161305 </property>
@@ -166,7 +310,7 @@
166310 <item row="3" column="0">
167311 <layout class="QHBoxLayout" name="horizontalLayout_17">
168312 <item>
169- <widget class="QCheckBox" name="checkBox_3">
313+ <widget class="QCheckBox" name="checkBox_timetrial">
170314 <property name="text">
171315 <string>英会話タイムトライアル</string>
172316 </property>
@@ -177,7 +321,7 @@
177321 <item row="1" column="0">
178322 <layout class="QHBoxLayout" name="horizontalLayout_15">
179323 <item>
180- <widget class="QCheckBox" name="checkBox_1">
324+ <widget class="QCheckBox" name="checkBox_basic2">
181325 <property name="text">
182326 <string>基礎英語2</string>
183327 </property>
@@ -188,7 +332,7 @@
188332 <item row="2" column="0">
189333 <layout class="QHBoxLayout" name="horizontalLayout_16">
190334 <item>
191- <widget class="QCheckBox" name="checkBox_2">
335+ <widget class="QCheckBox" name="checkBox_basic3">
192336 <property name="text">
193337 <string>基礎英語3</string>
194338 </property>
@@ -199,7 +343,7 @@
199343 <item row="5" column="1">
200344 <layout class="QHBoxLayout" name="horizontalLayout_11">
201345 <item>
202- <widget class="QCheckBox" name="checkBox_17">
346+ <widget class="QCheckBox" name="checkBox_levelup_hangeul">
203347 <property name="text">
204348 <string>レベルアップハングル講座</string>
205349 </property>
@@ -210,7 +354,7 @@
210354 <item row="1" column="1">
211355 <layout class="QHBoxLayout" name="horizontalLayout_9">
212356 <item>
213- <widget class="QCheckBox" name="checkBox_16">
357+ <widget class="QCheckBox" name="checkBox_levelup_chinese">
214358 <property name="text">
215359 <string>レベルアップ中国語</string>
216360 </property>
@@ -221,7 +365,7 @@
221365 <item row="3" column="1">
222366 <layout class="QHBoxLayout" name="horizontalLayout_4">
223367 <item>
224- <widget class="QCheckBox" name="checkBox_9">
368+ <widget class="QCheckBox" name="checkBox_italian">
225369 <property name="text">
226370 <string>まいにちイタリア語</string>
227371 </property>
@@ -232,7 +376,7 @@
232376 <item row="2" column="1">
233377 <layout class="QHBoxLayout" name="horizontalLayout_3">
234378 <item>
235- <widget class="QCheckBox" name="checkBox_8">
379+ <widget class="QCheckBox" name="checkBox_french">
236380 <property name="text">
237381 <string>まいにちフランス語</string>
238382 </property>
@@ -243,7 +387,7 @@
243387 <item row="4" column="1">
244388 <layout class="QHBoxLayout" name="horizontalLayout_5">
245389 <item>
246- <widget class="QCheckBox" name="checkBox_10">
390+ <widget class="QCheckBox" name="checkBox_hangeul">
247391 <property name="text">
248392 <string>まいにちハングル講座</string>
249393 </property>
@@ -251,145 +395,12 @@
251395 </item>
252396 </layout>
253397 </item>
254- <item row="7" column="1">
255- <layout class="QHBoxLayout" name="horizontalLayout_7">
256- <item>
257- <widget class="QCheckBox" name="checkBox_12">
258- <property name="text">
259- <string>まいにちスペイン語</string>
260- </property>
261- </widget>
262- </item>
263- </layout>
264- </item>
265- <item row="6" column="1">
266- <layout class="QHBoxLayout" name="horizontalLayout_6">
267- <item>
268- <widget class="QCheckBox" name="checkBox_11">
269- <property name="text">
270- <string>まいにちドイツ語</string>
271- </property>
272- </widget>
273- </item>
274- </layout>
275- </item>
276- <item row="8" column="0">
277- <layout class="QHBoxLayout" name="horizontalLayout_27">
278- <item>
279- <widget class="QCheckBox" name="checkBox_yomu">
280- <property name="text">
281- <string>英語で読む村上春樹</string>
282- </property>
283- </widget>
284- </item>
285- </layout>
286- </item>
287- <item row="10" column="1">
288- <layout class="QHBoxLayout" name="horizontalLayout_26">
289- <item>
290- <widget class="QLabel" name="label">
291- <property name="sizePolicy">
292- <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
293- <horstretch>0</horstretch>
294- <verstretch>0</verstretch>
295- </sizepolicy>
296- </property>
297- <property name="layoutDirection">
298- <enum>Qt::LeftToRight</enum>
299- </property>
300- <property name="text">
301- <string>　　　　　拡張子：</string>
302- </property>
303- <property name="alignment">
304- <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
305- </property>
306- </widget>
307- </item>
308- <item>
309- <widget class="QComboBox" name="comboBox_extension">
310- <property name="sizePolicy">
311- <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
312- <horstretch>0</horstretch>
313- <verstretch>0</verstretch>
314- </sizepolicy>
315- </property>
316- <item>
317- <property name="text">
318- <string>3g2</string>
319- </property>
320- </item>
321- <item>
322- <property name="text">
323- <string>3gp</string>
324- </property>
325- </item>
326- <item>
327- <property name="text">
328- <string>aac</string>
329- </property>
330- </item>
331- <item>
332- <property name="text">
333- <string>avi</string>
334- </property>
335- </item>
336- <item>
337- <property name="text">
338- <string>m4a</string>
339- </property>
340- </item>
341- <item>
342- <property name="text">
343- <string>mka</string>
344- </property>
345- </item>
346- <item>
347- <property name="text">
348- <string>mkv</string>
349- </property>
350- </item>
351- <item>
352- <property name="text">
353- <string>mov</string>
354- </property>
355- </item>
356- <item>
357- <property name="text">
358- <string>mp3</string>
359- </property>
360- </item>
361- <item>
362- <property name="text">
363- <string>ts</string>
364- </property>
365- </item>
366- </widget>
367- </item>
368- </layout>
369- </item>
370- <item row="12" column="1">
371- <layout class="QHBoxLayout" name="horizontalLayout_25">
372- <item>
373- <widget class="QPushButton" name="downloadButton">
374- <property name="text">
375- <string>ダウンロード</string>
376- </property>
377- </widget>
378- </item>
379- </layout>
380- </item>
381- <item row="12" column="0">
382- <layout class="QHBoxLayout" name="horizontalLayout_28">
398+ <item row="9" column="0">
399+ <layout class="QHBoxLayout" name="horizontalLayout_29">
383400 <item>
384- <widget class="QCheckBox" name="checkBox_detailed_message">
385- <property name="enabled">
386- <bool>false</bool>
387- </property>
401+ <widget class="QCheckBox" name="checkBox_enjoy">
388402 <property name="text">
389- <string>詳細なメッセージ</string>
390- </property>
391- <property name="checked">
392- <bool>false</bool>
403+ <string>エンジョイ・シンプル・イングリッシュ</string>
393404 </property>
394405 </widget>
395406 </item>
@@ -711,7 +722,7 @@
711722 <rect>
712723 <x>0</x>
713724 <y>0</y>
714- <width>448</width>
725+ <width>498</width>
715726 <height>22</height>
716727 </rect>
717728 </property>
@@ -724,26 +735,26 @@
724735 </widget>
725736 <layoutdefault spacing="6" margin="11"/>
726737 <tabstops>
727- <tabstop>checkBox_0</tabstop>
728- <tabstop>checkBox_1</tabstop>
729- <tabstop>checkBox_2</tabstop>
730- <tabstop>checkBox_3</tabstop>
731- <tabstop>checkBox_4</tabstop>
732- <tabstop>checkBox_5</tabstop>
733- <tabstop>checkBox_6</tabstop>
738+ <tabstop>checkBox_basic1</tabstop>
739+ <tabstop>checkBox_basic2</tabstop>
740+ <tabstop>checkBox_basic3</tabstop>
741+ <tabstop>checkBox_timetrial</tabstop>
742+ <tabstop>checkBox_kaiwa</tabstop>
743+ <tabstop>checkBox_business1</tabstop>
744+ <tabstop>checkBox_business2</tabstop>
734745 <tabstop>checkBox_kouryaku</tabstop>
735746 <tabstop>checkBox_yomu</tabstop>
736- <tabstop>checkBox_7</tabstop>
737- <tabstop>checkBox_16</tabstop>
738- <tabstop>checkBox_8</tabstop>
739- <tabstop>checkBox_9</tabstop>
740- <tabstop>checkBox_10</tabstop>
741- <tabstop>checkBox_17</tabstop>
742- <tabstop>checkBox_11</tabstop>
743- <tabstop>checkBox_12</tabstop>
744- <tabstop>checkBox_18</tabstop>
747+ <tabstop>checkBox_enjoy</tabstop>
748+ <tabstop>checkBox_chinese</tabstop>
749+ <tabstop>checkBox_levelup_chinese</tabstop>
750+ <tabstop>checkBox_french</tabstop>
751+ <tabstop>checkBox_italian</tabstop>
752+ <tabstop>checkBox_hangeul</tabstop>
753+ <tabstop>checkBox_levelup_hangeul</tabstop>
754+ <tabstop>checkBox_german</tabstop>
755+ <tabstop>checkBox_spanish</tabstop>
756+ <tabstop>checkBox_russian</tabstop>
745757 <tabstop>checkBox_skip</tabstop>
746- <tabstop>checkBox_detailed_message</tabstop>
747758 <tabstop>comboBox_extension</tabstop>
748759 <tabstop>downloadButton</tabstop>
749760 <tabstop>past_days</tabstop>
@@ -758,6 +769,7 @@
758769 <tabstop>checkBox_enews_past</tabstop>
759770 <tabstop>checkBox_keep_on_error</tabstop>
760771 <tabstop>checkBox_past_week</tabstop>
772+ <tabstop>checkBox_detailed_message</tabstop>
761773 </tabstops>
762774 <resources/>
763775 <connections>
--- a/messagewindow.cpp
+++ b/messagewindow.cpp
@@ -32,7 +32,7 @@
3232 namespace {
3333 const QString SETTING_GROUP( "MessageWindow" );
3434 const QString SETTING_GEOMETRY( "geometry" );
35- const int DEFAULT_WIDTH = 448;
35+ const int DEFAULT_WIDTH = 500;
3636 const int DEFAULT_HEIGHT = 300;
3737 }
3838
--- a/messagewindow.ui
+++ b/messagewindow.ui
@@ -6,7 +6,7 @@
66 <rect>
77 <x>0</x>
88 <y>0</y>
9- <width>400</width>
9+ <width>500</width>
1010 <height>300</height>
1111 </rect>
1212 </property>
@@ -18,7 +18,7 @@
1818 <rect>
1919 <x>20</x>
2020 <y>20</y>
21- <width>361</width>
21+ <width>461</width>
2222 <height>261</height>
2323 </rect>
2424 </property>