Merge branch 'master' of gitlab2.kylin.com:kylin-desktop/kylin-backup-tools/kylin-backup-tools-4.0.14

README.md

@@ -1,3 +1,7 @@
 # Kylin Backup Tools 4.0.14
 
-2021-08重构版备份还原工具
+1、对备份还原工具4.0.13版本进行了重构
+2、界面和流程对比4.0.13版本全都发送了变化
+3、适配UKui3.1界面风格
+4、新增了一些功能或对原功能进行了优化
+

kybackup/app.qrc

@@ -1,15 +1,5 @@
 <RCC>
     <qresource prefix="/">
-        <file alias="/images/data_backup.svg">resource/images/data_backup.svg</file>
-        <file alias="/images/data_restore.svg">resource/images/data_restore.svg</file>
-        <file alias="/images/ghost_image.svg">resource/images/ghost_image.svg</file>
-        <file alias="/images/system_restore.svg">resource/images/sysem_restore.svg</file>
-        <file alias="/images/system_backup.svg">resource/images/system_backup.svg</file>
-        <file alias="/images/data_backup_dark.svg">resource/images/data_backup_dark.svg</file>
-        <file alias="/images/data_restore_dark.svg">resource/images/data_restore_dark.svg</file>
-        <file alias="/images/ghost_image_dark.svg">resource/images/ghost_image_dark.svg</file>
-        <file alias="/images/system_restore_dark.svg">resource/images/sysem_restore_dark.svg</file>
-        <file alias="/images/system_backup_dark.svg">resource/images/system_backup_dark.svg</file>
         <file alias="/images/folder.png">resource/images/folder.png</file>
         <file alias="/images/loading.gif">resource/images/loading.gif</file>
         <file alias="/symbos/dialog-error.png">resource/symbos/dialog-error.png</file>
@@ -30,11 +20,21 @@
         <file alias="/symbos/ukui-bf-system-restore-symbolic.png">resource/symbos/ukui-bf-system-restore-symbolic.png</file>
         <file alias="/symbos/ukui-bf-volume-symbolic.png">resource/symbos/ukui-bf-volume-symbolic.png</file>
         <file alias="/symbos/ukui-dialog-success.png">resource/symbos/ukui-dialog-success.png</file>
-        <file alias="/images/empty.png">resource/images/empty.png</file>
-        <file alias="/images/empty_dark.png">resource/images/empty_dark.png</file>
         <file alias="/symbos/document-open-recent-symbolic.png">resource/symbos/document-open-recent-symbolic.png</file>
         <file alias="/language/qt_zh_CN.qm">resource/language/qt_zh_CN.qm</file>
         <file alias="/symbos/window-close-symbolic.png">resource/symbos/window-close-symbolic.png</file>
         <file alias="/symbos/object-select-symbolic.png">resource/symbos/object-select-symbolic.png</file>
+        <file alias="/images/data_backup_dark.png">resource/images/data_backup_dark.png</file>
+        <file alias="/images/data_backup.png">resource/images/data_backup.png</file>
+        <file alias="/images/data_restore_dark.png">resource/images/data_restore_dark.png</file>
+        <file alias="/images/data_restore.png">resource/images/data_restore.png</file>
+        <file alias="/images/ghost_image_dark.png">resource/images/ghost_image_dark.png</file>
+        <file alias="/images/ghost_image.png">resource/images/ghost_image.png</file>
+        <file alias="/images/system_backup.png">resource/images/system_backup.png</file>
+        <file alias="/images/system_backup_dark.png">resource/images/system_backup_dark.png</file>
+        <file alias="/images/system_restore.png">resource/images/sysem_restore.png</file>
+        <file alias="/images/system_restore_dark.png">resource/images/sysem_restore_dark.png</file>
+        <file alias="/images/empty.png">resource/images/empty.png</file>
+        <file alias="/images/empty_dark.png">resource/images/empty_dark.png</file>
     </qresource>
 </RCC>

kybackup/module/databackup.cpp

@@ -65,7 +65,7 @@ void DataBackup::initFirstWidget()
     PixmapLabel *imageBackup_firstPage = new PixmapLabel(first);
     imageBackup_firstPage->setGeometry(421, 120, 300, 326);
     imageBackup_firstPage->setScaledContents(true);
-    imageBackup_firstPage->setLightAndDarkPixmap(":/images/data_backup.svg", ":/images/data_backup_dark.svg");
+    imageBackup_firstPage->setLightAndDarkPixmap(":/images/data_backup.png", ":/images/data_backup_dark.png");
 
     // 系统备份大字提示
     MyLabel *labelBackup_firstPage = new MyLabel(first);

kybackup/module/datarestore.cpp

@@ -52,7 +52,7 @@ void DataRestore::initFirstWidget()
     PixmapLabel *imageRestore_firstPage = new PixmapLabel(first);
     imageRestore_firstPage->setGeometry(421, 120, 300, 326);
     imageRestore_firstPage->setScaledContents(true);
-    imageRestore_firstPage->setLightAndDarkPixmap(":/images/data_restore.svg", ":/images/data_restore_dark.svg");
+    imageRestore_firstPage->setLightAndDarkPixmap(":/images/data_restore.png", ":/images/data_restore_dark.png");
 
     // 数据还原大字提示
     MyLabel *labelRestore_firstPage = new MyLabel(first);

kybackup/module/ghostimage.cpp

@@ -61,7 +61,7 @@ void GhostImage::initFirstWidget()
     PixmapLabel *imageGhost_firstPage = new PixmapLabel(first);
     imageGhost_firstPage->setGeometry(421, 120, 300, 326);
     imageGhost_firstPage->setScaledContents(true);
-    imageGhost_firstPage->setLightAndDarkPixmap(":/images/ghost_image.svg", ":/images/ghost_image_dark.svg");
+    imageGhost_firstPage->setLightAndDarkPixmap(":/images/ghost_image.png", ":/images/ghost_image_dark.png");
 
     // Ghost Image大字提示
     MyLabel *labelGhost_firstPage = new MyLabel(first);

kybackup/module/systembackup.cpp

@@ -62,7 +62,7 @@ void SystemBackup::initFirstWidget()
     PixmapLabel *imageBackup_firstPage = new PixmapLabel(first);
     imageBackup_firstPage->setGeometry(421, 120, 300, 326);
     imageBackup_firstPage->setScaledContents(true);
-    imageBackup_firstPage->setLightAndDarkPixmap(":/images/system_backup.svg", ":/images/system_backup_dark.svg");
+    imageBackup_firstPage->setLightAndDarkPixmap(":/images/system_backup.png", ":/images/system_backup_dark.png");
 
     // 系统备份大字提示
     MyLabel *labelBackup_firstPage = new MyLabel(first);

kybackup/module/systemrestore.cpp

@@ -55,7 +55,7 @@ void SystemRestore::initFirstWidget()
     PixmapLabel *imageRestore_firstPage = new PixmapLabel(first);
     imageRestore_firstPage->setGeometry(421, 120, 300, 326);
     imageRestore_firstPage->setScaledContents(true);
-    imageRestore_firstPage->setLightAndDarkPixmap(":/images/system_restore.svg", ":/images/system_restore_dark.svg");
+    imageRestore_firstPage->setLightAndDarkPixmap(":/images/system_restore.png", ":/images/system_restore_dark.png");
 
     // 系统还原大字提示
     MyLabel *labelRestore_firstPage = new MyLabel(first);