Merge branch 'develop'

1 files changed, 9 insertions, 0 deletions

diff --git a/src/ui/dialog/KeyDatabaseEditDialog.cpp b/src/ui/dialog/KeyDatabaseEditDialog.cpp
index cc6e2cf9..bde50f0c 100644
--- a/src/ui/dialog/KeyDatabaseEditDialog.cpp
+++ b/src/ui/dialog/KeyDatabaseEditDialog.cpp
@@ -30,6 +30,7 @@
 
 #include <utility>
 
+#include "core/function/GlobalSettingStation.h"
 #include "core/struct/settings_object/KeyDatabaseItemSO.h"
 #include "core/utils/MemoryUtils.h"
 #include "ui_KeyDatabaseEditDialog.h"
@@ -43,10 +44,13 @@ KeyDatabaseEditDialog::KeyDatabaseEditDialog(
   ui_->setupUi(this);
 
   ui_->keyDBPathShowLabel->setHidden(true);
+  ui_->convert2RelativePathCheckBox->setChecked(
+      GlobalSettingStation::GetInstance().IsProtableMode());
 
   ui_->keyDBNameLabel->setText(tr("Key Database Name"));
   ui_->keyDBPathLabel->setText(tr("Key Database Path"));
   ui_->selectKeyDBButton->setText(tr("Select A Key Database Path"));
+  ui_->convert2RelativePathCheckBox->setText(tr("Convert to Relative Path"));
 
   this->setWindowTitle(tr("Key Database Info"));
 
@@ -96,6 +100,11 @@ void KeyDatabaseEditDialog::slot_button_box_accepted() {
     }
   }
 
+  if (ui_->convert2RelativePathCheckBox->isChecked()) {
+    path_ = QDir(GlobalSettingStation::GetInstance().GetAppDir())
+                .relativeFilePath(path_);
+  }
+
   slot_clear_err_msg();
   emit SignalKeyDatabaseInfoAccepted(name_, path_);
   this->accept();