Merge pull request #11 from vmomenv/momen-dev

Momen dev

Author: vmomenv

CMakeLists.txt

@@ -1,7 +1,7 @@
 
 cmake_minimum_required(VERSION 3.5.1)
 
-project(sakura-assistant LANGUAGES CXX VERSION 2.2.2)
+project(sakura-assistant LANGUAGES CXX VERSION 2.2.5)
 
 include(cmake/SparkEnvConfig.cmake)
 include(cmake/SparkMacrosConfig.cmake)

README.md

@@ -17,15 +17,15 @@
 6. qtbase5-dev
 7. qttools5-dev-tools
 
-#### 1.3从源码上构建星火小助手
+#### 1.3从源码上构建樱花助手
 ```bash
 cd SparkAssistant
 mkdir build
 cd build
 qmake qmake ../src/sparkassistant/sparkassistant.pro
 make
 ```
-### 二、开发星火小助手
+### 二、开发樱花助手
 #### 1.1开发之前，你可以先运行一个dtk demo来[熟悉dtk开发](http://www.momen.world:8880/post/63)。
 #### 1.2查看dtk相关文档
 deepin官方提供了三份dtk文档
@@ -269,8 +269,7 @@ void TodoClassManager::delJsonFile()
     file.write(doc.toJson());
 }
 ```
-
-
-
-
+###### 密码本
+   
+![image.png](http://www.momen.world:8880/static/img/3721aed02ba178f625093328e51721d2.image.png)
 

cmake/SparkDesktopMacros.cmake

@@ -40,9 +40,9 @@ spark_desktop_macros(
     # 应用名称: Name=
     ${PROJECT_NAME}
     # 应用名称: Name[zh_CN]=
-    星火小助手
+    樱花助手
     # 应用说明: Comment=
-    星火小助手
+    樱花助手
     # 应用类型: Type=
     Application
     # 执行程序: Exec=

cmake/package-deb.descript

@@ -40,6 +40,6 @@ Homepage: https://github.com:vmomenv/SparkAssistant.git
 # 软件包建议
 Recommends: 
 # 软件包描述信息
-Descrition: 星火小助手
+Descrition: 樱花助手
  本软件主要功能有，系统中软件更新，天气预报，todo清单
 

src/sakuraassistant/aesencrypt.cpp

@@ -157,7 +157,7 @@ void MainWindow::setToDo()
 
     TodoClassManager *todo =new TodoClassManager(this);
     todo->resize(220,238);
-    todo->move(0,80);
+    todo->move(5,80);
 
 }
 

src/sakuraassistant/aesencrypt.h

@@ -1,5 +1,5 @@
 #include "passbook.h"
-#include"aesencrypt.h"
+#include"qaesencryption.h"
 #include<DWidget>
 #include<DTitlebar>
 #include<DMainWindow>
@@ -56,7 +56,14 @@ PassBook::PassBook(QString accountPassword, DWidget *parent): m_accountPassword(
         this->isUpdating=false;
     }
     });
-
+    //创建下方装饰条
+    QWidget *bottomWidget=new QWidget(this);
+    bottomWidget->setFixedSize(861,50);
+    bottomWidget->move(0,440);
+    pal = bottomWidget->palette();//设置widget背景色
+    pal.setColor(QPalette::Background, QColor(49,53,62, 255));
+    bottomWidget->setPalette(pal);
+    bottomWidget->setAutoFillBackground(true);
 
     //创建搜索框widget并且将控件放入该widget
     QWidget *searchWidget = new QWidget(this);
@@ -71,12 +78,13 @@ PassBook::PassBook(QString accountPassword, DWidget *parent): m_accountPassword(
     searchLayout->addWidget(searchEdit);
     searchWidget->setFixedSize(816, 53);
     searchWidget->setStyleSheet("background-color: #C3C9D3;border-radius: 12px;");//设置圆角
+    searchEdit->setPlaceholderText("搜索");
     searchWidget->move(22, 69);
 
     //密码详情
     QWidget *passWidget=new QWidget(this);
     passWidget->move(22,142);
-    passWidget->resize(830,330);
+    passWidget->resize(830,350);
 
 
 
@@ -86,22 +94,22 @@ PassBook::PassBook(QString accountPassword, DWidget *parent): m_accountPassword(
     addPassButton->setIcon(addPixmap);
     addPassButton->setIconSize(QSize(31,31));
     addPassButton->setStyleSheet("border:none; background-color:transparent;");
-    addPassButton->move(0,301);
+    addPassButton->move(0,307);
     //创建导入导出按钮
     QPushButton *importButton =new QPushButton(passWidget);
     QPixmap importPixmap(":/res/passbook/import.png");
     importButton->setIcon(importPixmap);
     importButton->setIconSize(QSize(31,31));
     importButton->setStyleSheet("border:none; background-color:transparent;");
-    importButton->move(739,301);
+    importButton->move(739,307);
     importButton->setToolTip("导入数据");
 
     QPushButton *exportButton =new QPushButton(passWidget);
     QPixmap exportPixmap(":/res/passbook/export.png");
     exportButton->setIcon(exportPixmap);
     exportButton->setIconSize(QSize(31,31));
     exportButton->setStyleSheet("border:none; background-color:transparent;");
-    exportButton->move(787,301);
+    exportButton->move(787,307);
     exportButton->setToolTip("复制数据到桌面");
 
 
@@ -268,6 +276,8 @@ PassBook::PassBook(QString accountPassword, DWidget *parent): m_accountPassword(
             copyButton->move(738, 5);
             copyButton->setIcon(QIcon(":/res/passbook/copy.png"));
             copyButton->setIconSize(QSize(30, 30));
+            copyButton->setToolTip("复制密码");
+            copyButton->setMouseTracking(true);
             copyButton->setStyleSheet("border:none; background-color:transparent;");
             //创建删除按钮
             QPushButton *delButton=new QPushButton(credentialWidget);
@@ -372,6 +382,8 @@ PassBook::PassBook(QString accountPassword, DWidget *parent): m_accountPassword(
         copyButton->move(738, 5);
         copyButton->setIcon(QIcon(":/res/passbook/copy.png"));
         copyButton->setIconSize(QSize(30, 30));
+        copyButton->setToolTip("复制密码");
+        copyButton->setMouseTracking(true);
         copyButton->setStyleSheet("border:none; background-color:transparent;");
         //创建删除按钮
         QPushButton *delButton=new QPushButton(credentialWidget);
@@ -532,6 +544,8 @@ PassBook::PassBook(QString accountPassword, DWidget *parent): m_accountPassword(
                 copyButton->move(738, 5);
                 copyButton->setIcon(QIcon(":/res/passbook/copy.png"));
                 copyButton->setIconSize(QSize(30, 30));
+                copyButton->setToolTip("复制密码");
+                copyButton->setMouseTracking(true);
                 copyButton->setStyleSheet("border:none; background-color:transparent;");
                 //创建删除按钮
                 QPushButton *delButton=new QPushButton(credentialWidget);
@@ -637,6 +651,8 @@ PassBook::PassBook(QString accountPassword, DWidget *parent): m_accountPassword(
             copyButton->move(738, 5);
             copyButton->setIcon(QIcon(":/res/passbook/copy.png"));
             copyButton->setIconSize(QSize(30, 30));
+            copyButton->setToolTip("复制密码");
+            copyButton->setMouseTracking(true);
             copyButton->setStyleSheet("border:none; background-color:transparent;");
             //创建删除按钮
             QPushButton *delButton=new QPushButton(credentialWidget);

src/sakuraassistant/mainwindow.cpp

@@ -20,7 +20,7 @@
 #include<QSpacerItem>
 #include<QDir>
 #include<QVBoxLayout>
-#include "aesencrypt.h"
+#include "qaesencryption.h"
 #include <QCoreApplication>
 #include <QCryptographicHash>
 #include <QVector>

src/sakuraassistant/passbook.cpp

@@ -109,8 +109,7 @@ bool passbookPassword::verifyEncryption()
     }
 }
 
-void passbookPassword::login()
-{
+void passbookPassword::login(){
     QDialog *enterPassDialog=new QDialog;
     enterPassDialog->setWindowTitle("密码本");
     enterPassDialog->setFixedSize(861,490);
@@ -177,9 +176,17 @@ void passbookPassword::login()
         confirmButton->setFixedSize(127, 53);
         confirmButton->move(558,384);
         QLabel *warning=new QLabel(changePasswordWidget);
-        warning->setText("密码用于验证进入密码本并加解密数据，若忘记密码无法找回！");
+        warning->setText("密码用于验证进入密码本并加解密数据，若忘记密码无法找回");
         warning->setFixedSize(400,28);
         warning->move(196,332);
+        QPushButton  *delButton=new QPushButton(changePasswordWidget);
+        delButton->setText("销毁密码");
+        delButton->setFixedSize(127, 53);
+        delButton->move(177,384);
+        QObject::connect(delButton,&QPushButton::clicked,[=]{
+            QMessageBox::warning(enterPassDialog, "警告", "三思而后行，请自行进入~/.config/sakuraassistant目录删除data.json文件!");
+        });
+        
         changePasswordWidget->show();
         QObject::connect(confirmButton, &QPushButton::clicked, [=]{
             QString tmppassword=oldPassword->text();