diff --git a/README.md b/README.md
index 9c29d76..1182f8d 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-#### 一、特别说明
+#### 一、特别说明
1. 可以选择打开QWidgetDemo.pro一次性编译所有的，也可以到目录下打开pro编译。
2. 如果发现有些子项目没有加载请打开对应目录下的.pro仔细看里面的注释。
3. 编译好的可执行文件在源码同级目录下的bin目录。
diff --git a/tool/0snap/emailtool.jpg b/tool/0snap/emailtool.jpg
index f827297..3f3b873 100644
Binary files a/tool/0snap/emailtool.jpg and b/tool/0snap/emailtool.jpg differ
diff --git a/tool/base64helper/frmbase64helper.cpp b/tool/base64helper/frmbase64helper.cpp
index 9d021fd..864c555 100644
--- a/tool/base64helper/frmbase64helper.cpp
+++ b/tool/base64helper/frmbase64helper.cpp
@@ -54,7 +54,7 @@ void frmBase64Helper::on_btnImageToBase64_clicked()
double elapsed = (double)time.elapsed();
#endif
QString strTime = QString::number(elapsed, 'f', 3);
- qDebug() << QString("用时 %1 毫秒").arg(strTime);
+ ui->labInfo->setText(QString("图片转base64 用时 %1 毫秒").arg(strTime));
}
void frmBase64Helper::on_btnBase64ToImage_clicked()
@@ -77,7 +77,7 @@ void frmBase64Helper::on_btnBase64ToImage_clicked()
double elapsed = (double)time.elapsed();
#endif
QString strTime = QString::number(elapsed, 'f', 3);
- qDebug() << QString("用时 %1 毫秒").arg(strTime);
+ ui->labInfo->setText(QString("base64转图片 用时 %1 毫秒").arg(strTime));
}
void frmBase64Helper::on_btnTextToBase64_clicked()
diff --git a/tool/base64helper/frmbase64helper.ui b/tool/base64helper/frmbase64helper.ui
index a552879..6938d27 100644
--- a/tool/base64helper/frmbase64helper.ui
+++ b/tool/base64helper/frmbase64helper.ui
@@ -14,52 +14,6 @@
Widget
- -
-
-
- E:/myFile/美女图片/2.jpg
-
-
-
- -
-
-
-
- 120
- 0
-
-
-
- 打开文件
-
-
-
- -
-
-
-
- 120
- 0
-
-
-
- 图片转base64
-
-
-
- -
-
-
-
- 120
- 0
-
-
-
- base64转图片
-
-
-
-
@@ -80,33 +34,7 @@
- -
-
-
-
- 120
- 0
-
-
-
- 文字转base64
-
-
-
- -
-
-
-
- 120
- 0
-
-
-
- base64转文字
-
-
-
- -
+
-
@@ -128,12 +56,108 @@
- -
+
-
+
+
+
+ 120
+ 0
+
+
+
+ 图片转base64
+
+
+
+ -
+
+
+
+ 120
+ 0
+
+
+
+ base64转文字
+
+
+
+ -
+
+
+
+ 120
+ 0
+
+
+
+ 打开文件
+
+
+
+ -
+
+
+ E:/myFile/美女图片/2.jpg
+
+
+
+ -
+ -
+
+
+
+ 120
+ 0
+
+
+
+ base64转图片
+
+
+
+ -
+
+
+
+ 120
+ 0
+
+
+
+ 文字转base64
+
+
+
+ -
+
+
+ QFrame::Box
+
+
+ QFrame::Sunken
+
+
+
+
+
+
+
+ txtFile
+ txtText
+ btnOpen
+ btnClear
+ btnImageToBase64
+ btnBase64ToImage
+ btnTextToBase64
+ btnBase64ToText
+ txtBase64
+
diff --git a/tool/emailtool/main.cpp b/tool/emailtool/main.cpp
index 6dbfb60..42b36cf 100644
--- a/tool/emailtool/main.cpp
+++ b/tool/emailtool/main.cpp
@@ -24,7 +24,7 @@ int main(int argc, char *argv[])
#endif
frmEmailTool w;
- w.setWindowTitle("串口调试助手 V2021 (QQ: 517216493 WX: feiyangqingyun)");
+ w.setWindowTitle("邮件发送工具 V2021 (QQ: 517216493 WX: feiyangqingyun)");
w.show();
return a.exec();
diff --git a/ui/core_qss/qss/psblack.css b/ui/core_qss/qss/psblack.css
index 084473d..f09436d 100644
--- a/ui/core_qss/qss/psblack.css
+++ b/ui/core_qss/qss/psblack.css
@@ -459,29 +459,28 @@ background:#444444;
QTableView::item:selected,QListView::item:selected,QTreeView::item:selected{
color:#DCDCDC;
-background:qlineargradient(spread:pad,x1:0,y1:0,x2:0,y2:1,stop:0 #484848,stop:1 #383838);
+background:#383838;
}
-QTableView::item:hover,QListView::item:hover,QTreeView::item:hover,QHeaderView{
+QTableView::item:hover,QListView::item:hover,QTreeView::item:hover,QHeaderView,QHeaderView::section,QTableCornerButton:section{
color:#DCDCDC;
-background:qlineargradient(spread:pad,x1:0,y1:0,x2:0,y2:1,stop:0 #646464,stop:1 #525252);
+background:#525252;
}
QTableView::item,QListView::item,QTreeView::item{
padding:1px;
margin:0px;
+border:0px;
}
QHeaderView::section,QTableCornerButton:section{
padding:3px;
margin:0px;
-color:#DCDCDC;
border:1px solid #242424;
border-left-width:0px;
border-right-width:1px;
border-top-width:0px;
border-bottom-width:1px;
-background:qlineargradient(spread:pad,x1:0,y1:0,x2:0,y2:1,stop:0 #646464,stop:1 #525252);
}
QTabBar::tab{
diff --git a/ui/styledemo/qrc/qss/flatwhite.css b/ui/styledemo/qrc/qss/flatwhite.css
index 1ffce78..2c2d565 100644
--- a/ui/styledemo/qrc/qss/flatwhite.css
+++ b/ui/styledemo/qrc/qss/flatwhite.css
@@ -459,12 +459,12 @@ background:#FFFFFF;
QTableView::item:selected,QListView::item:selected,QTreeView::item:selected{
color:#57595B;
-background:qlineargradient(spread:pad,x1:0,y1:0,x2:0,y2:1,stop:0 #E4E4E4,stop:1 #E4E4E4);
+background:#E4E4E4;
}
-QTableView::item:hover,QListView::item:hover,QTreeView::item:hover,QHeaderView{
+QTableView::item:hover,QListView::item:hover,QTreeView::item:hover,QHeaderView,QHeaderView::section,QTableCornerButton:section{
color:#57595B;
-background:qlineargradient(spread:pad,x1:0,y1:0,x2:0,y2:1,stop:0 #F6F6F6,stop:1 #F6F6F6);
+background:#F6F6F6;
}
QTableView::item,QListView::item,QTreeView::item{
@@ -476,13 +476,11 @@ border:0px;
QHeaderView::section,QTableCornerButton:section{
padding:3px;
margin:0px;
-color:#57595B;
border:1px solid #B6B6B6;
border-left-width:0px;
border-right-width:1px;
border-top-width:0px;
border-bottom-width:1px;
-background:qlineargradient(spread:pad,x1:0,y1:0,x2:0,y2:1,stop:0 #F6F6F6,stop:1 #F6F6F6);
}
QTabBar::tab{
diff --git a/ui/styledemo/qrc/qss/lightblue.css b/ui/styledemo/qrc/qss/lightblue.css
index 8bbeadf..eeb89b5 100644
--- a/ui/styledemo/qrc/qss/lightblue.css
+++ b/ui/styledemo/qrc/qss/lightblue.css
@@ -459,12 +459,12 @@ background:#EAF7FF;
QTableView::item:selected,QListView::item:selected,QTreeView::item:selected{
color:#386487;
-background:qlineargradient(spread:pad,x1:0,y1:0,x2:0,y2:1,stop:0 #DEF0FE,stop:1 #C0DEF6);
+background:#C0DEF6;
}
-QTableView::item:hover,QListView::item:hover,QTreeView::item:hover,QHeaderView{
+QTableView::item:hover,QListView::item:hover,QTreeView::item:hover,QHeaderView,QHeaderView::section,QTableCornerButton:section{
color:#386487;
-background:qlineargradient(spread:pad,x1:0,y1:0,x2:0,y2:1,stop:0 #F2F9FF,stop:1 #DAEFFF);
+background:#DAEFFF;
}
QTableView::item,QListView::item,QTreeView::item{
@@ -476,13 +476,11 @@ border:0px;
QHeaderView::section,QTableCornerButton:section{
padding:3px;
margin:0px;
-color:#386487;
border:1px solid #C0DCF2;
border-left-width:0px;
border-right-width:1px;
border-top-width:0px;
border-bottom-width:1px;
-background:qlineargradient(spread:pad,x1:0,y1:0,x2:0,y2:1,stop:0 #F2F9FF,stop:1 #DAEFFF);
}
QTabBar::tab{
diff --git a/ui/styledemo/qrc/qss/psblack.css b/ui/styledemo/qrc/qss/psblack.css
index 12d42d8..f09436d 100644
--- a/ui/styledemo/qrc/qss/psblack.css
+++ b/ui/styledemo/qrc/qss/psblack.css
@@ -459,12 +459,12 @@ background:#444444;
QTableView::item:selected,QListView::item:selected,QTreeView::item:selected{
color:#DCDCDC;
-background:qlineargradient(spread:pad,x1:0,y1:0,x2:0,y2:1,stop:0 #484848,stop:1 #383838);
+background:#383838;
}
-QTableView::item:hover,QListView::item:hover,QTreeView::item:hover,QHeaderView{
+QTableView::item:hover,QListView::item:hover,QTreeView::item:hover,QHeaderView,QHeaderView::section,QTableCornerButton:section{
color:#DCDCDC;
-background:qlineargradient(spread:pad,x1:0,y1:0,x2:0,y2:1,stop:0 #646464,stop:1 #525252);
+background:#525252;
}
QTableView::item,QListView::item,QTreeView::item{
@@ -476,13 +476,11 @@ border:0px;
QHeaderView::section,QTableCornerButton:section{
padding:3px;
margin:0px;
-color:#DCDCDC;
border:1px solid #242424;
border-left-width:0px;
border-right-width:1px;
border-top-width:0px;
border-bottom-width:1px;
-background:qlineargradient(spread:pad,x1:0,y1:0,x2:0,y2:1,stop:0 #646464,stop:1 #525252);
}
QTabBar::tab{