Misc

add config file to resource system
move language folder

src/ui/mainwindow.cpp

@@ -2,6 +2,7 @@
 #include "ui_mainwindow.h"
 
 #include <QJsonDocument>
+#include <QDirIterator>
 
 MainWindow::MainWindow(QWidget *parent):
     QMainWindow(parent)
@@ -79,7 +80,11 @@ MainWindow::~MainWindow()
 
 void MainWindow::loadConfig()
 {
-    QFile configList(ui->Set_Client_configPathEdit->text());
+    QString filename = ui->Set_Client_configFileBox->currentData().toString();
+    if(filename == "(ext)")
+        filename = ui->Set_Client_configPathEdit->text();
+    qDebug() << "config file:" << filename;
+    QFile configList(filename);
     if(!configList.open(QFile::ReadOnly | QFile::Text))
     {
         QMessageBox::information(this, tr("Info"), tr("Failed to load config file"));
@@ -1106,11 +1111,27 @@ void MainWindow::uiInit()
     ui->Set_Client_keepClientActiveBox->setChecked(keepClientActive);
     settings->endGroup();
 
+    QDirIterator configFiles(":/config/");
+    ui->Set_Client_configFileBox->blockSignals(true);
+    while(configFiles.hasNext())
+    {
+        configFiles.next();
+        ui->Set_Client_configFileBox->addItem(configFiles.fileName(), configFiles.filePath());
+    }
+    ui->Set_Client_configFileBox->addItem(tr("External file"), "(ext)");
+
+    int configId = -1;
     settings->beginGroup("Client_Env");
     ui->Set_Client_envScriptEdit->setText(settings->value("scriptPath").toString());
     ui->Set_Client_workingDirEdit->setText(settings->value("workingDir", "../data").toString());
-    ui->Set_Client_configPathEdit->setText(settings->value("configPath", "config.json").toString());
+    configId = ui->Set_Client_configFileBox->findData(settings->value("configFile"));
+    ui->Set_Client_configPathEdit->setText(settings->value("extConfigFilePath", "config.json").toString());
     settings->endGroup();
+    if(configId != -1)
+        ui->Set_Client_configFileBox->setCurrentIndex(configId);
+    ui->Set_Client_configFileBox->blockSignals(false);
+    on_Set_Client_configFileBox_currentIndexChanged(ui->Set_Client_configFileBox->currentIndex());
+
 
     ui->MF_RW_keyTypeBox->addItem("A", Mifare::KEY_A);
     ui->MF_RW_keyTypeBox->addItem("B", Mifare::KEY_B);
@@ -1314,7 +1335,7 @@ void MainWindow::on_Set_Client_workingDirEdit_editingFinished()
 void MainWindow::on_Set_Client_configPathEdit_editingFinished()
 {
     settings->beginGroup("Client_Env");
-    settings->setValue("configPath", ui->Set_Client_configPathEdit->text());
+    settings->setValue("extConfigFilePath", ui->Set_Client_configPathEdit->text());
     settings->endGroup();
 }
 
@@ -1452,3 +1473,11 @@ void MainWindow::on_LF_LFConf_resetButton_clicked()
     setState(true);
 }
 
+void MainWindow::on_Set_Client_configFileBox_currentIndexChanged(int index)
+{
+    ui->Set_Client_configPathEdit->setVisible(ui->Set_Client_configFileBox->itemData(index).toString() == "(ext)");
+    settings->beginGroup("Client_Env");
+    settings->setValue("configFile", ui->Set_Client_configFileBox->currentData());
+    settings->endGroup();
+}
+

src/ui/mainwindow.h

@@ -51,7 +51,7 @@ public:
     ~MainWindow();
 
     void initUI();
-    bool eventFilter(QObject *watched, QEvent *event);
+    bool eventFilter(QObject *watched, QEvent *event) override;
 public slots:
     void refreshOutput(const QString& output);
     void refreshCMD(const QString& cmd);
@@ -209,6 +209,9 @@ private slots:
     void on_Set_Client_configPathEdit_editingFinished();
 
     void setState(bool st);
+
+    void on_Set_Client_configFileBox_currentIndexChanged(int index);
+
 private:
     Ui::MainWindow* ui;
     QButtonGroup* MFCardTypeBtnGroup;

src/ui/mainwindow.ui

@@ -2763,10 +2763,34 @@ or the communication between a tag and a reader.</string>
              <item>
               <widget class="QLabel" name="label_63">
                <property name="text">
-                <string>Config file path(Reconnect to apply):</string>
+                <string>Config file(Reconnect to apply):</string>
                </property>
               </widget>
              </item>
+             <item>
+              <layout class="QHBoxLayout" name="horizontalLayout_15">
+               <item>
+                <widget class="QComboBox" name="Set_Client_configFileBox">
+                 <property name="sizeAdjustPolicy">
+                  <enum>QComboBox::AdjustToContents</enum>
+                 </property>
+                </widget>
+               </item>
+               <item>
+                <spacer name="horizontalSpacer_13">
+                 <property name="orientation">
+                  <enum>Qt::Horizontal</enum>
+                 </property>
+                 <property name="sizeHint" stdset="0">
+                  <size>
+                   <width>40</width>
+                   <height>20</height>
+                  </size>
+                 </property>
+                </spacer>
+               </item>
+              </layout>
+             </item>
              <item>
               <widget class="QLineEdit" name="Set_Client_configPathEdit">
                <property name="text">