diff --git a/.vscode/settings.json b/.vscode/settings.json
index ee88087..4304dc3 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -16,12 +16,12 @@
"args": []
},
"cmake.configureSettings": {
- "CMAKE_PREFIX_PATH": "C:/Qt/Qt5.12.12/5.12.12/msvc2017_64",
+ "CMAKE_PREFIX_PATH": "C:/Qt/Qt6",
},
"cmake.configureArgs": [
"-Wno-dev",
"-DCOMPILE_GUI=ON",
- "-DQT_DEFAULT_MAJOR_VERSION=5"
+ "-DQT_DEFAULT_MAJOR_VERSION=6"
],
"cmake.options.statusBarVisibility": "visible",
"cmake.generator": "Ninja",
diff --git a/Gui/Control/FileControl.cpp b/Gui/Control/FileControl.cpp
index 09cc41e..2c85987 100644
--- a/Gui/Control/FileControl.cpp
+++ b/Gui/Control/FileControl.cpp
@@ -467,7 +467,7 @@ void FileManager::ShowProperties()
info->fileTime_ = ui->tableWidget->item(row, 2)->text();
info->fileType_ = ui->tableWidget->item(row, 3)->text();
info->fileSize_ = ui->tableWidget->item(row, 4)->text();
-
+ info->setWindowTitle(isRemote_ ? tr("远程文件属性") : tr("本地文件属性"));
info->exec();
}
diff --git a/Gui/Form/FileInfoForm.cpp b/Gui/Form/FileInfoForm.cpp
index cec459b..3d78d65 100644
--- a/Gui/Form/FileInfoForm.cpp
+++ b/Gui/Form/FileInfoForm.cpp
@@ -6,7 +6,7 @@ FileInfo::FileInfo(QWidget* parent) : QDialog(parent), ui(new Ui::FileInfo)
{
ui->setupUi(this);
InitControl();
- setWindowTitle(tr("属性"));
+ setFixedSize(minimumSizeHint());
}
FileInfo::~FileInfo()
@@ -28,4 +28,6 @@ void FileInfo::InitControl()
{
ui->pedDir->setReadOnly(true);
ui->pedName->setReadOnly(true);
+
+ connect(ui->btnClose, &QPushButton::clicked, this, &FileInfo::close);
}
diff --git a/Gui/Form/FileInfoForm.ui b/Gui/Form/FileInfoForm.ui
index a1a30bd..2754bcc 100644
--- a/Gui/Form/FileInfoForm.ui
+++ b/Gui/Form/FileInfoForm.ui
@@ -6,8 +6,8 @@
0
0
- 544
- 300
+ 254
+ 242