software/x-tools
1
0
Fork 0
mirror of https://github.com/x-tools-author/x-tools.git synced 2025-09-15 15:28:40 +08:00
Code Issues Actions 7 Packages Projects Releases Wiki Activity

chore: update files of project

Browse Source
This commit is contained in:
x-tools-author 2024-03-30 17:03:49 +08:00
parent e92449807b
commit f4787b7fe4
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Source/Assistants/FileMerge/Source/xToolsFileMergeAssistant.cpp
View File

@ -12,8 +12,7 @@
#include <QDataStream>
#include <QFileDialog>
#include <QMessageBox>
#include "xToolsApplication.h"
#include <QStandardPaths>
xToolsFileMergeAssistant::xToolsFileMergeAssistant(QWidget *parent)
: QWidget(parent)
@ -22,6 +21,7 @@ xToolsFileMergeAssistant::xToolsFileMergeAssistant(QWidget *parent)
ui->setupUi(this);
ui->listWidget->setAlternatingRowColors(true);
ui->progressBar->hide();
m_desktopPath = QStandardPaths::writableLocation(QStandardPaths::DesktopLocation);
connect(ui->pushButtonImport,
&QPushButton::clicked,
@ -56,10 +56,9 @@ xToolsFileMergeAssistant::~xToolsFileMergeAssistant()
void xToolsFileMergeAssistant::onImportPushButtonClicked()
{
QString path = xToolsApplication::desktopPath();
auto files = QFileDialog::getOpenFileNames(this,
tr("Import Files"),
path,
m_desktopPath,
tr("Bin file(*.bin);;All file(*)"));
if (files.isEmpty()) {
return;
@ -86,10 +85,9 @@ void xToolsFileMergeAssistant::onMergePushButtonClicked()
return;
}
QString path = xToolsApplication::desktopPath();
auto fileName = QFileDialog::getSaveFileName(this,
tr("Save Files"),
path,
m_desktopPath,
tr("Bin file(*.bin);;All file(*)"));
if (fileName.isEmpty()) {
return;

1
Source/Assistants/FileMerge/Source/xToolsFileMergeAssistant.h
View File

@ -24,6 +24,7 @@ public:
private:
Ui::xToolsFileMergeAssistant *ui;
QString m_desktopPath;
private:
void onImportPushButtonClicked();