diff --git a/backup-daemon/databackupproxy.cpp b/backup-daemon/databackupproxy.cpp index 6ad398b..ce4be3f 100755 --- a/backup-daemon/databackupproxy.cpp +++ b/backup-daemon/databackupproxy.cpp @@ -97,9 +97,11 @@ void DataBackupProxy::cancelEx() void DataBackupProxy::deleteFailedData() { // 1、删除备份目录 + QString destPath = Utils::getSysRootPath() + BACKUP_SNAPSHOTS_PATH + "/" + m_curUuid; + destPath.replace("//", "/"); QStringList args; args << "-rf"; - args << m_destPath; + args << destPath; QProcess::execute("rm", args); // 2、删除xml文件中的备份项 diff --git a/backup-daemon/systembackupproxy.cpp b/backup-daemon/systembackupproxy.cpp index 13b9e44..7033bdd 100755 --- a/backup-daemon/systembackupproxy.cpp +++ b/backup-daemon/systembackupproxy.cpp @@ -98,9 +98,10 @@ void SystemBackupProxy::deleteFailedData() { // 1、删除备份目录 QString destPath = Utils::getSysRootPath() + BACKUP_SNAPSHOTS_PATH + "/" + m_curUuid; + destPath.replace("//", "/"); QStringList args; args << "-rf"; - args << m_destPath; + args << destPath; QProcess::execute("rm", args); // 2、删除xml文件中的备份项 diff --git a/backup-daemon/udiskdatabackupproxy.cpp b/backup-daemon/udiskdatabackupproxy.cpp index 19532c9..88d2f68 100755 --- a/backup-daemon/udiskdatabackupproxy.cpp +++ b/backup-daemon/udiskdatabackupproxy.cpp @@ -103,9 +103,11 @@ void UDiskDataBackupProxy::cancelEx() void UDiskDataBackupProxy::deleteFailedData() { // 1、删除备份目录 + QString destPath = m_backupWrapper.m_prefixDestPath + BACKUP_SNAPSHOTS_PATH + "/" + m_curUuid; + destPath.replace("//", "/"); QStringList args; args << "-rf"; - args << m_destPath; + args << destPath; QProcess::execute("rm", args); // 2、删除xml文件中的备份项 diff --git a/backup-daemon/udisksystembackupproxy.cpp b/backup-daemon/udisksystembackupproxy.cpp index bd35f37..177b28a 100755 --- a/backup-daemon/udisksystembackupproxy.cpp +++ b/backup-daemon/udisksystembackupproxy.cpp @@ -120,13 +120,15 @@ void UDiskSystemBackupProxy::cancelEx() void UDiskSystemBackupProxy::deleteFailedData() { // 1、删除备份目录 + QString destPath = m_backupWrapper.m_prefixDestPath + BACKUP_SNAPSHOTS_PATH + "/" + m_curUuid; + destPath.replace("//", "/"); QStringList args; args << "-rf"; - args << m_destPath; + args << destPath; QProcess::execute("rm", args); // 2、删除xml文件中的备份项 - QString xmlPath = Utils::getSysRootPath() + BACKUP_XML_PATH; + QString xmlPath = m_backupWrapper.m_prefixDestPath + BACKUP_XML_PATH; xmlPath.replace("//", "/"); ParseBackupList parse(xmlPath); parse.deleteItem(m_curUuid); diff --git a/kybackup/module/databackup.cpp b/kybackup/module/databackup.cpp index 67ebeb4..10ef786 100755 --- a/kybackup/module/databackup.cpp +++ b/kybackup/module/databackup.cpp @@ -717,7 +717,7 @@ void DataBackup::initThirdWidget() // 检测中大标题 MyLabel *bigTitle = new MyLabel(centerFont); bigTitle->setFontSize(24); - bigTitle->setMaximumWidth(700); + bigTitle->setMaximumWidth(550); bigTitle->setIsOriginal(true); hlayoutCenterFont1->addWidget(bigTitle); hlayoutCenterFont1->addStretch(); @@ -732,7 +732,7 @@ void DataBackup::initThirdWidget() hlayoutCenterFont2->addSpacing(5); MyLabel *labelCheck1 = new MyLabel(centerFont); labelCheck1->setMinimumWidth(400); - labelCheck1->setMaximumWidth(600); + labelCheck1->setMaximumWidth(500); labelCheck1->setIsOriginal(true); labelCheck1->setWordWrap(true); labelCheck1->adjustSize(); @@ -749,7 +749,7 @@ void DataBackup::initThirdWidget() hlayoutCenterFont3->addSpacing(5); MyLabel *labelCheck2 = new MyLabel(centerFont); labelCheck2->setMinimumWidth(400); - labelCheck2->setMaximumWidth(600); + labelCheck2->setMaximumWidth(500); labelCheck2->setIsOriginal(true); labelCheck2->setWordWrap(true); labelCheck2->adjustSize(); @@ -762,7 +762,8 @@ void DataBackup::initThirdWidget() // 第五行 QHBoxLayout *hlayoutCenterFont5 = new QHBoxLayout; - hlayoutCenterFont5->addStretch(); + // hlayoutCenterFont5->addStretch(); + hlayoutCenterFont5->addSpacing(30); // 上一步按钮 MyPushButton *preStep = new MyPushButton(centerFont); preStep->setFixedSize(97, 36); @@ -849,7 +850,7 @@ void DataBackup::initThirdWidget() resultLogo->setPixmap(icon.pixmap(QSize(20,20))); resultLogo->setVisible(true); // 检测成功 - bigTitle->setDeplayText(tr("Succeeded to check the environment")); + bigTitle->setDeplayText(tr("Check success")); // 备份空间充足 labelCheck1->setDeplayText(tr("The storage for backup is enough")); dot2->setBackgroundColor(COLOR_YELLOW); @@ -868,7 +869,7 @@ void DataBackup::initThirdWidget() resultLogo->setPixmap(icon.pixmap(QSize(20,20))); resultLogo->setVisible(true); // 环境校验失败 - bigTitle->setDeplayText(tr("Failed to check the environment")); + bigTitle->setDeplayText(tr("Check failure")); labelCheck1->setDeplayText(errMsg); labelCheck2->setDeplayText(errTip); if (errMsg.isEmpty()) { @@ -1491,7 +1492,7 @@ void DataBackup::initLastWidget() // 检测中大标题 MyLabel *bigTitle = new MyLabel(centerFont); bigTitle->setFontSize(24); - bigTitle->setMaximumWidth(700); + bigTitle->setMaximumWidth(550); bigTitle->setIsOriginal(true); hlayoutCenterFont1->addWidget(bigTitle); hlayoutCenterFont1->addStretch(); @@ -1506,7 +1507,7 @@ void DataBackup::initLastWidget() hlayoutCenterFont2->addSpacing(5); MyLabel *labelError1 = new MyLabel(centerFont); labelError1->setMinimumWidth(400); - labelError1->setMaximumWidth(600); + labelError1->setMaximumWidth(500); labelError1->setIsOriginal(true); labelError1->setWordWrap(true); labelError1->adjustSize(); @@ -1523,7 +1524,7 @@ void DataBackup::initLastWidget() hlayoutCenterFont3->addSpacing(5); MyLabel *labelError2 = new MyLabel(centerFont); labelError2->setMinimumWidth(400); - labelError2->setMaximumWidth(600); + labelError2->setMaximumWidth(500); labelError2->setIsOriginal(true); labelError2->setWordWrap(true); labelError2->adjustSize(); @@ -1536,7 +1537,8 @@ void DataBackup::initLastWidget() // 第五行 QHBoxLayout *hlayoutCenterFont5 = new QHBoxLayout; - hlayoutCenterFont5->addStretch(); + // hlayoutCenterFont5->addStretch(); + hlayoutCenterFont5->addSpacing(30); // 返回首页 MyPushButton *homePage = new MyPushButton(centerFont); homePage->setFixedSize(97, 36); diff --git a/kybackup/module/datarestore.cpp b/kybackup/module/datarestore.cpp index be4add0..3ee8aed 100755 --- a/kybackup/module/datarestore.cpp +++ b/kybackup/module/datarestore.cpp @@ -270,7 +270,7 @@ void DataRestore::initSecondWidget() // 检测中大标题 MyLabel *bigTitle = new MyLabel(centerFont); bigTitle->setFontSize(24); - bigTitle->setMaximumWidth(700); + bigTitle->setMaximumWidth(550); bigTitle->setIsOriginal(true); hlayoutCenterFont1->addWidget(bigTitle); hlayoutCenterFont1->addStretch(); @@ -285,7 +285,7 @@ void DataRestore::initSecondWidget() hlayoutCenterFont2->addSpacing(5); MyLabel *labelCheck1 = new MyLabel(centerFont); labelCheck1->setMinimumWidth(400); - labelCheck1->setMaximumWidth(600); + labelCheck1->setMaximumWidth(500); labelCheck1->setIsOriginal(true); labelCheck1->setWordWrap(true); labelCheck1->adjustSize(); @@ -302,7 +302,7 @@ void DataRestore::initSecondWidget() hlayoutCenterFont3->addSpacing(5); MyLabel *labelCheck2 = new MyLabel(centerFont); labelCheck2->setMinimumWidth(400); - labelCheck2->setMaximumWidth(600); + labelCheck2->setMaximumWidth(500); labelCheck2->setIsOriginal(true); labelCheck2->setWordWrap(true); labelCheck2->adjustSize(); @@ -315,7 +315,8 @@ void DataRestore::initSecondWidget() // 第五行 QHBoxLayout *hlayoutCenterFont5 = new QHBoxLayout; - hlayoutCenterFont5->addStretch(); + // hlayoutCenterFont5->addStretch(); + hlayoutCenterFont5->addSpacing(30); // 上一步按钮 MyPushButton *preStep = new MyPushButton(centerFont); preStep->setFixedSize(97, 36); @@ -398,7 +399,7 @@ void DataRestore::initSecondWidget() resultLogo->setPixmap(icon.pixmap(QSize(20,20))); resultLogo->setVisible(true); // 检测成功 - bigTitle->setDeplayText(tr("Succeeded to check the environment")); + bigTitle->setDeplayText(tr("Check success")); // 不要使用电脑，以防数据丢失 labelCheck1->setDeplayText(tr("Do not use computer in case of data loss")); dot2->setBackgroundColor(COLOR_YELLOW); @@ -417,7 +418,7 @@ void DataRestore::initSecondWidget() resultLogo->setPixmap(icon.pixmap(QSize(20,20))); resultLogo->setVisible(true); // 环境校验失败 - bigTitle->setDeplayText(tr("Failed to check the environment")); + bigTitle->setDeplayText(tr("Check failure")); labelCheck1->setDeplayText(errMsg); labelCheck2->setDeplayText(errTip); if (errMsg.isEmpty()) { @@ -823,7 +824,7 @@ void DataRestore::initLastWidget() // 检测中大标题 MyLabel *bigTitle = new MyLabel(centerFont); bigTitle->setFontSize(24); - bigTitle->setMaximumWidth(700); + bigTitle->setMaximumWidth(550); bigTitle->setIsOriginal(true); hlayoutCenterFont1->addWidget(bigTitle); hlayoutCenterFont1->addStretch(); @@ -838,7 +839,7 @@ void DataRestore::initLastWidget() hlayoutCenterFont2->addSpacing(5); MyLabel *labelError1 = new MyLabel(centerFont); labelError1->setMinimumWidth(400); - labelError1->setMaximumWidth(600); + labelError1->setMaximumWidth(500); labelError1->setIsOriginal(true); labelError1->setWordWrap(true); labelError1->adjustSize(); @@ -854,8 +855,8 @@ void DataRestore::initLastWidget() hlayoutCenterFont3->addWidget(dot2); hlayoutCenterFont3->addSpacing(5); MyLabel *labelError2 = new MyLabel(centerFont); - //labelError2->setMinimumWidth(400); - //labelError2->setMaximumWidth(600); + labelError2->setMinimumWidth(400); + labelError2->setMaximumWidth(500); labelError2->setIsOriginal(true); labelError2->setWordWrap(true); labelError2->adjustSize(); @@ -868,8 +869,7 @@ void DataRestore::initLastWidget() // 第五行 QHBoxLayout *hlayoutCenterFont5 = new QHBoxLayout; - // hlayoutCenterFont5->addSpacing(100); - hlayoutCenterFont5->addStretch(); + hlayoutCenterFont5->addSpacing(30); // 返回首页 MyPushButton *homePage = new MyPushButton(centerFont); homePage->setFixedSize(97, 36); diff --git a/kybackup/module/ghostimage.cpp b/kybackup/module/ghostimage.cpp index 1750633..9117fbd 100755 --- a/kybackup/module/ghostimage.cpp +++ b/kybackup/module/ghostimage.cpp @@ -309,7 +309,7 @@ void GhostImage::initThirdWidget() // 检测中大标题 MyLabel *bigTitle = new MyLabel(centerFont); bigTitle->setFontSize(24); - bigTitle->setMaximumWidth(700); + bigTitle->setMaximumWidth(550); bigTitle->setIsOriginal(true); hlayoutCenterFont1->addWidget(bigTitle); hlayoutCenterFont1->addStretch(); @@ -324,7 +324,7 @@ void GhostImage::initThirdWidget() hlayoutCenterFont2->addSpacing(5); MyLabel *labelCheck1 = new MyLabel(centerFont); labelCheck1->setMinimumWidth(400); - labelCheck1->setMaximumWidth(600); + labelCheck1->setMaximumWidth(500); labelCheck1->setIsOriginal(true); labelCheck1->setWordWrap(true); labelCheck1->adjustSize(); @@ -341,7 +341,7 @@ void GhostImage::initThirdWidget() hlayoutCenterFont3->addSpacing(5); MyLabel *labelCheck2 = new MyLabel(centerFont); labelCheck2->setMinimumWidth(400); - labelCheck2->setMaximumWidth(600); + labelCheck2->setMaximumWidth(500); labelCheck2->setIsOriginal(true); labelCheck2->setWordWrap(true); labelCheck2->adjustSize(); @@ -354,7 +354,8 @@ void GhostImage::initThirdWidget() // 第五行 QHBoxLayout *hlayoutCenterFont5 = new QHBoxLayout; - hlayoutCenterFont5->addStretch(); + // hlayoutCenterFont5->addStretch(); + hlayoutCenterFont5->addSpacing(30); // 上一步按钮 MyPushButton *preStep = new MyPushButton(centerFont); preStep->setFixedSize(97, 36); @@ -437,7 +438,7 @@ void GhostImage::initThirdWidget() resultLogo->setPixmap(icon.pixmap(QSize(20,20))); resultLogo->setVisible(true); // 检测成功 - bigTitle->setDeplayText(tr("Succeeded to check the environment")); + bigTitle->setDeplayText(tr("Check success")); // 存储空间充足 labelCheck1->setDeplayText(tr("The storage space is enough")); dot2->setBackgroundColor(COLOR_YELLOW); @@ -456,7 +457,7 @@ void GhostImage::initThirdWidget() resultLogo->setPixmap(icon.pixmap(QSize(20,20))); resultLogo->setVisible(true); // 环境校验失败 - bigTitle->setDeplayText(tr("Failed to check the environment")); + bigTitle->setDeplayText(tr("Check failure")); labelCheck1->setDeplayText(errMsg); labelCheck2->setDeplayText(errTip); if (errMsg.isEmpty()) { @@ -996,7 +997,7 @@ void GhostImage::initLastWidget() // 检测中大标题 MyLabel *bigTitle = new MyLabel(centerFont); bigTitle->setFontSize(24); - bigTitle->setMaximumWidth(700); + bigTitle->setMaximumWidth(550); bigTitle->setIsOriginal(true); hlayoutCenterFont1->addWidget(bigTitle); hlayoutCenterFont1->addStretch(); @@ -1011,7 +1012,7 @@ void GhostImage::initLastWidget() hlayoutCenterFont2->addSpacing(5); MyLabel *labelError1 = new MyLabel(centerFont); labelError1->setMinimumWidth(400); - labelError1->setMaximumWidth(600); + labelError1->setMaximumWidth(500); labelError1->setIsOriginal(true); labelError1->setWordWrap(true); labelError1->adjustSize(); @@ -1028,7 +1029,7 @@ void GhostImage::initLastWidget() hlayoutCenterFont3->addSpacing(5); MyLabel *labelError2 = new MyLabel(centerFont); labelError2->setMinimumWidth(400); - labelError2->setMaximumWidth(600); + labelError2->setMaximumWidth(500); labelError2->setIsOriginal(true); labelError2->setWordWrap(true); labelError2->adjustSize(); @@ -1041,7 +1042,8 @@ void GhostImage::initLastWidget() // 第五行 QHBoxLayout *hlayoutCenterFont5 = new QHBoxLayout; - hlayoutCenterFont5->addStretch(); + // hlayoutCenterFont5->addStretch(); + hlayoutCenterFont5->addSpacing(30); // 返回首页 MyPushButton *homePage = new MyPushButton(centerFont); homePage->setFixedSize(97, 36); diff --git a/kybackup/module/systembackup.cpp b/kybackup/module/systembackup.cpp index 85c6e2d..26be318 100755 --- a/kybackup/module/systembackup.cpp +++ b/kybackup/module/systembackup.cpp @@ -353,7 +353,8 @@ void SystemBackup::initThirdWidget() // 第五行 QHBoxLayout *hlayoutCenterFont5 = new QHBoxLayout; - hlayoutCenterFont5->addStretch(); + // hlayoutCenterFont5->addStretch(); + hlayoutCenterFont5->addSpacing(30); // 上一步按钮 MyPushButton *preStep = new MyPushButton(centerFont); preStep->setFixedSize(97, 36); @@ -435,7 +436,7 @@ void SystemBackup::initThirdWidget() resultLogo->setPixmap(icon.pixmap(QSize(20,20))); resultLogo->setVisible(true); // 检测成功 - bigTitle->setDeplayText(tr("Succeeded to check the environment")); + bigTitle->setDeplayText(tr("Check success")); // 备份空间充足 labelCheck1->setDeplayText(tr("The storage for backup is enough")); dot2->setBackgroundColor(COLOR_YELLOW); @@ -454,7 +455,7 @@ void SystemBackup::initThirdWidget() resultLogo->setPixmap(icon.pixmap(QSize(20,20))); resultLogo->setVisible(true); // 环境校验失败 - bigTitle->setDeplayText(tr("Failed to check the environment")); + bigTitle->setDeplayText(tr("Check failure")); labelCheck1->setDeplayText(errMsg); labelCheck2->setDeplayText(errTip); if (errMsg.isEmpty()) { @@ -1122,7 +1123,7 @@ void SystemBackup::initLastWidget() hlayoutCenterFont2->addWidget(dot1); hlayoutCenterFont2->addSpacing(5); MyLabel *labelError1 = new MyLabel(centerFont); - labelError1->setMinimumWidth(400); + labelError1->setMinimumWidth(300); labelError1->setMaximumWidth(500); labelError1->setIsOriginal(true); labelError1->setWordWrap(true); @@ -1139,7 +1140,7 @@ void SystemBackup::initLastWidget() hlayoutCenterFont3->addWidget(dot2); hlayoutCenterFont3->addSpacing(5); MyLabel *labelError2 = new MyLabel(centerFont); - labelError2->setMinimumWidth(400); + labelError2->setMinimumWidth(300); labelError2->setMaximumWidth(500); labelError2->setIsOriginal(true); labelError2->setWordWrap(true); @@ -1153,7 +1154,8 @@ void SystemBackup::initLastWidget() // 第五行 QHBoxLayout *hlayoutCenterFont5 = new QHBoxLayout; - hlayoutCenterFont5->addStretch(); + // hlayoutCenterFont5->addStretch(); + hlayoutCenterFont5->addSpacing(30); // 返回首页 MyPushButton *homePage = new MyPushButton(centerFont); homePage->setFixedSize(97, 36); diff --git a/kybackup/module/systemrestore.cpp b/kybackup/module/systemrestore.cpp index 223676b..d058982 100755 --- a/kybackup/module/systemrestore.cpp +++ b/kybackup/module/systemrestore.cpp @@ -288,7 +288,7 @@ void SystemRestore::initSecondWidget() // 检测中大标题 MyLabel *bigTitle = new MyLabel(centerFont); bigTitle->setFontSize(24); - bigTitle->setMaximumWidth(700); + bigTitle->setMaximumWidth(550); bigTitle->setIsOriginal(true); hlayoutCenterFont1->addWidget(bigTitle); hlayoutCenterFont1->addStretch(); @@ -303,7 +303,7 @@ void SystemRestore::initSecondWidget() hlayoutCenterFont2->addSpacing(5); MyLabel *labelCheck1 = new MyLabel(centerFont); labelCheck1->setMinimumWidth(400); - labelCheck1->setMaximumWidth(600); + labelCheck1->setMaximumWidth(500); labelCheck1->setIsOriginal(true); labelCheck1->setWordWrap(true); labelCheck1->adjustSize(); @@ -320,7 +320,7 @@ void SystemRestore::initSecondWidget() hlayoutCenterFont3->addSpacing(5); MyLabel *labelCheck2 = new MyLabel(centerFont); labelCheck2->setMinimumWidth(400); - labelCheck2->setMaximumWidth(600); + labelCheck2->setMaximumWidth(500); labelCheck2->setIsOriginal(true); labelCheck2->setWordWrap(true); labelCheck2->adjustSize(); @@ -333,7 +333,8 @@ void SystemRestore::initSecondWidget() // 第五行 QHBoxLayout *hlayoutCenterFont5 = new QHBoxLayout; - hlayoutCenterFont5->addStretch(); + // hlayoutCenterFont5->addStretch(); + hlayoutCenterFont5->addSpacing(30); // 上一步按钮 MyPushButton *preStep = new MyPushButton(centerFont); preStep->setFixedSize(97, 36); @@ -416,7 +417,7 @@ void SystemRestore::initSecondWidget() resultLogo->setPixmap(icon.pixmap(QSize(20,20))); resultLogo->setVisible(true); // 检测成功 - bigTitle->setDeplayText(tr("Succeeded to check the environment")); + bigTitle->setDeplayText(tr("Check success")); // 还原完成后将自动重启 labelCheck1->setDeplayText(tr("The system will reboot automatically after the restore is successful")); dot2->setBackgroundColor(COLOR_YELLOW); @@ -435,7 +436,7 @@ void SystemRestore::initSecondWidget() resultLogo->setPixmap(icon.pixmap(QSize(20,20))); resultLogo->setVisible(true); // 环境校验失败 - bigTitle->setDeplayText(tr("Failed to check the environment")); + bigTitle->setDeplayText(tr("Check failure")); labelCheck1->setDeplayText(errMsg); labelCheck2->setDeplayText(errTip); if (errMsg.isEmpty()) { @@ -851,7 +852,7 @@ void SystemRestore::initLastWidget() // 检测中大标题 MyLabel *bigTitle = new MyLabel(centerFont); bigTitle->setFontSize(24); - bigTitle->setMaximumWidth(700); + bigTitle->setMaximumWidth(550); bigTitle->setIsOriginal(true); hlayoutCenterFont1->addWidget(bigTitle); hlayoutCenterFont1->addStretch(); @@ -866,7 +867,7 @@ void SystemRestore::initLastWidget() hlayoutCenterFont2->addSpacing(5); MyLabel *labelError1 = new MyLabel(centerFont); labelError1->setMinimumWidth(400); - labelError1->setMaximumWidth(600); + labelError1->setMaximumWidth(500); labelError1->setIsOriginal(true); labelError1->setWordWrap(true); labelError1->adjustSize(); @@ -882,8 +883,8 @@ void SystemRestore::initLastWidget() hlayoutCenterFont3->addWidget(dot2); hlayoutCenterFont3->addSpacing(5); MyLabel *labelError2 = new MyLabel(centerFont); - //labelError2->setMinimumWidth(400); - //labelError2->setMaximumWidth(600); + labelError2->setMinimumWidth(400); + labelError2->setMaximumWidth(500); labelError2->setIsOriginal(true); labelError2->setWordWrap(true); labelError2->adjustSize(); @@ -896,7 +897,7 @@ void SystemRestore::initLastWidget() // 第五行 QHBoxLayout *hlayoutCenterFont5 = new QHBoxLayout; - hlayoutCenterFont5->addSpacing(100); + hlayoutCenterFont5->addSpacing(30); // 返回首页 MyPushButton *homePage = new MyPushButton(centerFont); homePage->setFixedSize(97, 36);