set current language

tootal · tootal · commit c0759488f045 · 2020-04-01T13:29:26.000+08:00
diff --git a/settingsdialog.cpp b/settingsdialog.cpp
@@ -3,6 +3,8 @@
 #include "util.h"
 #include "configmanager.h"
 
+#include <QDebug>
+
 extern ConfigManager *g_config;
 
 SettingsDialog::SettingsDialog(QWidget *parent) :
@@ -11,9 +13,16 @@ SettingsDialog::SettingsDialog(QWidget *parent) :
 {
     ui->setupUi(this);
     ui->comboBox->addItem(tr("System"), "System");
+    
     foreach(const auto &lang, Util::availableLanguages()) {
         ui->comboBox->addItem(lang.second, lang.first);
     }
+    
+    for(int i = 0; i < ui->comboBox->count(); ++i) {
+        if(ui->comboBox->itemData(i).toString() == g_config->value("language")) {
+            ui->comboBox->setCurrentIndex(i);
+        }
+    }
 }
 
 SettingsDialog::~SettingsDialog()
@@ -26,7 +35,7 @@ void SettingsDialog::on_pushButton_clicked()
     close();
 }
 
-void SettingsDialog::on_comboBox_currentIndexChanged(int)
+void SettingsDialog::on_comboBox_activated(int index)
 {
-    g_config->setValue("language", ui->comboBox->currentData().toString());
+    g_config->setValue("language", ui->comboBox->itemData(index).toString());
 }
diff --git a/settingsdialog.h b/settingsdialog.h
@@ -18,7 +18,7 @@ class SettingsDialog : public QDialog
 private slots:
     void on_pushButton_clicked();
     
-    void on_comboBox_currentIndexChanged(int index);
+    void on_comboBox_activated(int index);
     
 private:
     Ui::SettingsDialog *ui;
diff --git a/settingsdialog.ui b/settingsdialog.ui
@@ -11,7 +11,7 @@
    </rect>
   </property>
   <property name="windowTitle">
-   <string>Dialog</string>
+   <string>Settings</string>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
    <item>
diff --git a/translations/DBLParse_zh_CN.qm b/translations/DBLParse_zh_CN.qm
diff --git a/translations/DBLParse_zh_CN.ts b/translations/DBLParse_zh_CN.ts
@@ -68,93 +68,96 @@
         <translation>文件 (&amp;F)</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="54"/>
+        <location filename="../mainwindow.ui" line="55"/>
         <source>&amp;View</source>
         <translation>查看 (&amp;V)</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="61"/>
+        <location filename="../mainwindow.ui" line="62"/>
         <source>&amp;Tools</source>
         <translation>工具 (&amp;T)</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="74"/>
+        <location filename="../mainwindow.ui" line="75"/>
         <source>About &amp;Qt</source>
         <translation>关于Qt （&amp;Q)</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="79"/>
+        <location filename="../mainwindow.ui" line="80"/>
         <source>&amp;About DBLParse</source>
         <translation>关于DBLParse (&amp;A)</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="84"/>
+        <location filename="../mainwindow.ui" line="85"/>
         <source>About &amp;DBLP</source>
         <translation>关于DBLP (&amp;D)</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="89"/>
+        <location filename="../mainwindow.ui" line="90"/>
         <source>E&amp;xit</source>
         <translation>退出 (&amp;X)</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="94"/>
+        <location filename="../mainwindow.ui" line="95"/>
         <source>&amp;Open</source>
         <translation>打开 (&amp;O)</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="99"/>
+        <location filename="../mainwindow.ui" line="100"/>
         <source>&amp;Status</source>
         <translation>状态 (&amp;S)</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="104"/>
+        <location filename="../mainwindow.ui" line="105"/>
         <source>&amp;Clear Index</source>
         <translation>清除索引 (&amp;C)</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="109"/>
+        <location filename="../mainwindow.ui" line="110"/>
         <source>&amp;Open Index Folder</source>
         <translation>打开索引文件夹 (&amp;O)</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="114"/>
+        <location filename="../mainwindow.ui" line="115"/>
         <source>AuthorStac</source>
         <translation>作者统计</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="119"/>
+        <location filename="../mainwindow.ui" line="120"/>
         <source>View &amp;Log</source>
         <translation>查看日志 (&amp;L)</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="43"/>
+        <location filename="../mainwindow.ui" line="125"/>
+        <source>&amp;Settings</source>
+        <translation>设置 (&amp;S)</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cpp" line="47"/>
         <source>Load finished.</source>
         <translation>加载完成。</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="68"/>
+        <location filename="../mainwindow.cpp" line="72"/>
         <source>About Qt</source>
         <translation>关于Qt</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="73"/>
+        <location filename="../mainwindow.cpp" line="77"/>
         <source>DBLParse&lt;br/&gt;&lt;br/&gt;
 DBLParse is an application that bases on dblp computer science bibliography.&lt;br/&gt;&lt;br/&gt;
 Please visit &lt;a href=&quot;https://github.com/tootal/DBLParse&quot;&gt;DBLParse&lt;/a&gt; for more information.</source>
-        <translation>DBLP&lt;br/&gt;&lt;br/&gt;
-&lt;em&gt;DBLP&lt;/em&gt; 计算机科学文献集提供主要的计算机科学期刊和会议的开放数据信息。
-最初由&lt;a href=&quot;https://www.uni-trier.de/&quot;&gt;特里尔大学&lt;/a&gt; 在1993年创建，
-DBLP数据集现在由&lt;a href=&quot;https://www.dagstuhl.de/&quot;&gt;Schloss Dagstuhl&lt;/a&gt;维护。&lt;br/&gt;&lt;br/&gt;
-获取更多信息，请&lt;a href=&quot;https://dblp.uni-trier.de/faq/&quot;&gt;查看F.A.Q.&lt;/a&gt;。</translation>
+        <translation>DBLParse&lt;br/&gt;&lt;br/&gt;
+DBLParse 是一个基于DBLP数据的应用。
+请访问&lt;a href=&quot;https://github.com/tootal/DBLParse&quot;&gt;DBLParse&lt;/a&gt;获取更多信息。</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="76"/>
+        <location filename="../mainwindow.cpp" line="80"/>
         <source>About DBLParse</source>
         <translation>关于DBLParse</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="81"/>
+        <location filename="../mainwindow.cpp" line="85"/>
         <source>DBLP&lt;br/&gt;&lt;br/&gt;
 The &lt;em&gt;dblp computer science bibliography&lt;/em&gt; provides
 open bibliographic information on major computer science journals and proceedings.
@@ -168,47 +171,47 @@ DBLP数据集现在由&lt;a href=&quot;https://www.dagstuhl.de/&quot;&gt;Schloss
 获取更多信息，请&lt;a href=&quot;https://dblp.uni-trier.de/faq/&quot;&gt;查看F.A.Q.&lt;/a&gt;</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="87"/>
+        <location filename="../mainwindow.cpp" line="91"/>
         <source>About DBLP</source>
         <translation>关于DBLP</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="106"/>
+        <location filename="../mainwindow.cpp" line="103"/>
         <source>Select XML file</source>
         <translation>选择XML文件</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="108"/>
+        <location filename="../mainwindow.cpp" line="105"/>
         <source>XML file (*.xml)</source>
         <translation>XML文件 (*.xml)</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="115"/>
+        <location filename="../mainwindow.cpp" line="112"/>
         <source>Parsing the file will last for a while and will take up a lot of memory.</source>
         <translation>解析文件将消耗大量内存并持续一段时间。</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="116"/>
+        <location filename="../mainwindow.cpp" line="113"/>
         <source>Do you want to continue?</source>
         <translation>是否要继续？</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="148"/>
+        <location filename="../mainwindow.cpp" line="145"/>
         <source>Parser: %1 &lt;br&gt;Loader: %2</source>
         <translation>解析器: %1 &lt;br&gt;加载器：%2</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="155"/>
+        <location filename="../mainwindow.cpp" line="152"/>
         <source>Open XML file</source>
         <translation>打开XML文件</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="156"/>
+        <location filename="../mainwindow.cpp" line="153"/>
         <source>Cancel</source>
         <translation>取消</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="169"/>
+        <location filename="../mainwindow.cpp" line="166"/>
         <source>Clear index file successful!</source>
         <translation>成功清除缓存文件！</translation>
     </message>
@@ -259,13 +262,46 @@ DBLP数据集现在由&lt;a href=&quot;https://www.dagstuhl.de/&quot;&gt;Schloss
         <translation>解析完成。用时：%1</translation>
     </message>
 </context>
+<context>
+    <name>SettingsDialog</name>
+    <message>
+        <location filename="../settingsdialog.ui" line="14"/>
+        <source>Settings</source>
+        <translation>设置</translation>
+    </message>
+    <message>
+        <location filename="../settingsdialog.ui" line="22"/>
+        <source>Language: </source>
+        <translation>语言： </translation>
+    </message>
+    <message>
+        <location filename="../settingsdialog.ui" line="62"/>
+        <source>OK</source>
+        <translation>完成</translation>
+    </message>
+    <message>
+        <location filename="../settingsdialog.cpp" line="13"/>
+        <source>System</source>
+        <translation>系统</translation>
+    </message>
+</context>
 <context>
     <name>Util</name>
     <message>
-        <location filename="../util.cpp" line="16"/>
+        <location filename="../util.cpp" line="21"/>
         <source>s</source>
         <translation>秒</translation>
     </message>
+    <message>
+        <location filename="../util.cpp" line="98"/>
+        <source>English (United States)</source>
+        <translation>英语 （美国）</translation>
+    </message>
+    <message>
+        <location filename="../util.cpp" line="99"/>
+        <source>Chinese (China)</source>
+        <translation>中文 （中国）</translation>
+    </message>
 </context>
 <context>
     <name>WebView</name>
diff --git a/util.cpp b/util.cpp
@@ -77,9 +77,7 @@ QString Util::readFile(const QString &fileName)
 
 QString Util::getXmlFileName()
 {
-    QSettings settings;
-    Q_ASSERT(settings.contains("lastOpenFileName"));
-    return settings.value("lastOpenFileName").toString();
+    return g_config->value("lastOpenFileName");
 }
 
 QString Util::formatUrl(const QString &url)

Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,8 @@`
`3`	`3`	`#include "util.h"`
`4`	`4`	`#include "configmanager.h"`
`5`	`5`
	`6`	`+#include <QDebug>`
	`7`	`+`
`6`	`8`	`extern ConfigManager *g_config;`
`7`	`9`
`8`	`10`	`SettingsDialog::SettingsDialog(QWidget *parent) :`
`@@ -11,9 +13,16 @@ SettingsDialog::SettingsDialog(QWidget *parent) :`
`11`	`13`	`{`
`12`	`14`	`ui->setupUi(this);`
`13`	`15`	`ui->comboBox->addItem(tr("System"), "System");`
	`16`	`+`
`14`	`17`	`foreach(const auto &lang, Util::availableLanguages()) {`
`15`	`18`	`ui->comboBox->addItem(lang.second, lang.first);`
`16`	`19`	`}`
	`20`	`+`
	`21`	`+ for(int i = 0; i < ui->comboBox->count(); ++i) {`
	`22`	`+ if(ui->comboBox->itemData(i).toString() == g_config->value("language")) {`
	`23`	`+ ui->comboBox->setCurrentIndex(i);`
	`24`	`+ }`
	`25`	`+ }`
`17`	`26`	`}`
`18`	`27`
`19`	`28`	`SettingsDialog::~SettingsDialog()`
`@@ -26,7 +35,7 @@ void SettingsDialog::on_pushButton_clicked()`
`26`	`35`	`close();`
`27`	`36`	`}`
`28`	`37`
`29`		`-void SettingsDialog::on_comboBox_currentIndexChanged(int)`
	`38`	`+void SettingsDialog::on_comboBox_activated(int index)`
`30`	`39`	`{`
`31`		`- g_config->setValue("language", ui->comboBox->currentData().toString());`
	`40`	`+ g_config->setValue("language", ui->comboBox->itemData(index).toString());`
`32`	`41`	`}`
Original file line number	Diff line number	Diff line change
`@@ -77,9 +77,7 @@ QString Util::readFile(const QString &fileName)`
`77`	`77`
`78`	`78`	`QString Util::getXmlFileName()`
`79`	`79`	`{`
`80`		`- QSettings settings;`
`81`		`- Q_ASSERT(settings.contains("lastOpenFileName"));`
`82`		`- return settings.value("lastOpenFileName").toString();`
	`80`	`+ return g_config->value("lastOpenFileName");`
`83`	`81`	`}`
`84`	`82`
`85`	`83`	`QString Util::formatUrl(const QString &url)`