diff --git a/QtAdb/about.cpp b/QtAdb/about.cpp index f93afd0..2653bbc 100644 --- a/QtAdb/about.cpp +++ b/QtAdb/about.cpp @@ -33,7 +33,7 @@ about::about(QWidget *parent) : ui->btn_money->setGraphicsEffect(shadowEffect_btn_money); QGraphicsDropShadowEffect *shadowEffect_btn_money2 = new QGraphicsDropShadowEffect(this); shadowEffect_btn_money2->setOffset(0,0); - shadowEffect_btn_money2->setColor(Qt::gray); + shadowEffect_btn_money2->setColor(Qt::green); shadowEffect_btn_money2->setBlurRadius(5); ui->btn_money_2->setGraphicsEffect(shadowEffect_btn_money2); QGraphicsDropShadowEffect *shadowEffect_btn_money3 = new QGraphicsDropShadowEffect(this); diff --git a/QtAdb/about.ui b/QtAdb/about.ui index 432884b..874335c 100644 --- a/QtAdb/about.ui +++ b/QtAdb/about.ui @@ -120,7 +120,7 @@ QToolTip{border:1px solid #BDBDBD; background-color: #ffffff; color:rgba(117, 11 - 测试版本:beta-v1.2 + 测试版本:beta-v1.3 @@ -149,7 +149,7 @@ QToolTip{border:1px solid #BDBDBD; background-color: #ffffff; color:rgba(117, 11 PointingHandCursor - 网址 + QPushButton{background-color:rgba(255,255,255,0.9);border-radius:4px;border:0px;} @@ -215,7 +215,7 @@ QPushButton:pressed{background-color:rgba(255,255,255,0.6);} PointingHandCursor - 酷安 + QPushButton{background-color:rgba(255,255,255,0.9);border-radius:4px;border:0px;} @@ -281,7 +281,7 @@ QPushButton:pressed{background-color:rgba(255,255,255,0.6);} PointingHandCursor - Github + QPushButton{background-color:rgba(255,255,255,0.9);border-radius:4px;border:0px;} @@ -438,7 +438,7 @@ QPushButton:pressed{background-color:rgba(255,255,255,0.6);} PointingHandCursor - 请我吃可乐(3元) + QPushButton{background-color:rgba(255,255,255,0.9);border-radius:4px;border:0px;} diff --git a/QtAdb/animationwidget.cpp b/QtAdb/animationwidget.cpp index 2ffc1df..86c2dd4 100644 --- a/QtAdb/animationwidget.cpp +++ b/QtAdb/animationwidget.cpp @@ -49,6 +49,53 @@ void animationWidget::playLoadAnimation(int h) animation->setEasingCurve(QEasingCurve::OutQuart); + this->show(); + animation->start(); + //this->setDisabled(true); + emit animationEnd(); +} + +void animationWidget::playLoadAnimation_sp(int h) +{ + animation->setDuration(500); + //animation->setEndValue(QPoint(301,117)); + qDebug() << "wgtHeight = " << wgtHeight; + if(parent->width() <= 600) + { + animation->setEndValue(QRect(0,0, parent->width(),h)); + } + else + { + animation->setEndValue(QRect(0,0, parent->width(),h)); + } + //animation->setStartValue(QPoint(301 + 50,117)); + animation->setStartValue(QRect(0,-10, parent->width(),h)); + + animation->setEasingCurve(QEasingCurve::OutQuart); + + this->show(); + animation->start(); + emit animationEnd(); +} + +void animationWidget::playLoadAnimation_bp(int h) +{ + animation->setDuration(500); + //animation->setEndValue(QPoint(301,117)); + qDebug() << "wgtHeight = " << wgtHeight; + if(parent->width() <= 600) + { + animation->setEndValue(QRect(301 - 30, 117 - 6 -11, 600,h)); + } + else + { + animation->setEndValue(QRect(301 - 30, 117 - 6 - 11, parent->width(),h)); + } + //animation->setStartValue(QPoint(301 + 50,117)); + animation->setStartValue(QRect(301 - 30, 117 - 6 - 11 + 10, parent->width(),h)); + + animation->setEasingCurve(QEasingCurve::OutQuart); + this->show(); animation->start(); emit animationEnd(); @@ -56,7 +103,7 @@ void animationWidget::playLoadAnimation(int h) void animationWidget::playExitAnimation() { - animation->setDuration(750); + animation->setDuration(300); //animation->setEndValue(QPoint(301,117)); qDebug() << "wgtHeight = " << wgtHeight; if(parent->width() <= 600) @@ -78,6 +125,29 @@ void animationWidget::playExitAnimation() emit animationEnd(); } +void animationWidget::playExitAnimation_sp() +{ + animation->setDuration(500); + //animation->setEndValue(QPoint(301,117)); + qDebug() << "wgtHeight = " << wgtHeight; + if(parent->width() <= 600) + { + animation->setEndValue(QRect(0,-11, parent->width(),wgtHeight)); + } + else + { + animation->setEndValue(QRect(0,-11, parent->width(),wgtHeight)); + } + //animation->setStartValue(QPoint(301 + 50,117)); + animation->setStartValue(QRect(0,0, parent->width(),wgtHeight)); + + animation->setEasingCurve(QEasingCurve::OutQuart); + + this->show(); + animation->start(); + emit animationEnd(); +} + animationWidget::~animationWidget() { playExitAnimation(); diff --git a/QtAdb/animationwidget.h b/QtAdb/animationwidget.h index 63d32bd..78de789 100644 --- a/QtAdb/animationwidget.h +++ b/QtAdb/animationwidget.h @@ -24,7 +24,10 @@ public: void playLoadAnimation(); void playLoadAnimation(int h); + void playLoadAnimation_sp(int h); + void playLoadAnimation_bp(int h); void playExitAnimation(); + void playExitAnimation_sp(); bool isBasePage; QWidget *parent; diff --git a/QtAdb/basepage.cpp b/QtAdb/basepage.cpp index 1a6bd6b..8290332 100644 --- a/QtAdb/basepage.cpp +++ b/QtAdb/basepage.cpp @@ -7,6 +7,7 @@ basePage::basePage(QWidget *parent) : { ui->setupUi(this); SPManager = new sonPageManager; + animation_listHide = new QPropertyAnimation(ui->listWidget,"geometry"); parents = parent; lastPage = NULL; @@ -124,7 +125,7 @@ void basePage::slot_createSonPage(int key) listTimer = new QTimer(this); connect(listTimer, SIGNAL(timeout()), this, SLOT(slot_spgAnimationEnd())); listTimer->setSingleShot(true); - listTimer->start(500); + listTimer->start(300); emit creatingSonPage(); ui->listWidget->setCurrentRow(-1); @@ -136,13 +137,14 @@ void basePage::slot_createSonPage(int key) /**/ //sonPage->setVisible(false); - QPropertyAnimation *animation = new QPropertyAnimation(ui->listWidget,"geometry"); - animation->setDuration(750); - animation->setEndValue(QRect(ui->listWidget->geometry().x(),ui->listWidget->geometry().y() + 50, parent->width(),wgtHeight)); - animation->setStartValue(ui->listWidget->geometry()); - animation->setEasingCurve(QEasingCurve::OutQuart); - animation->start(); + + animation_listHide->setDuration(300); + animation_listHide->setEndValue(QRect(ui->listWidget->geometry().x(),ui->listWidget->geometry().y() + 50, ui->listWidget->width(),ui->listWidget->height())); + animation_listHide->setStartValue(ui->listWidget->geometry()); + animation_listHide->setEasingCurve(QEasingCurve::OutQuart); + animation_listHide->start(); + //sonPage->playLoadAnimation_sp(); //animation->deleteLater(); /* @@ -169,6 +171,15 @@ void basePage::slot_createSonPage(int key) ui->listWidget->setCurrentRow(-1); } +void basePage::spg_return_pushed() +{ + sonPage->playExitAnimation_sp(); + QTimer *animationTimer = new QTimer(this); + animationTimer->setSingleShot(true); + animationTimer->start(300); + connect(animationTimer, SIGNAL(timeout()), this, SLOT(slot_destroySonPage())); +} + void basePage::slot_destroySonPage() { if(sonPage == NULL) @@ -176,8 +187,9 @@ void basePage::slot_destroySonPage() delete sonPage; sonPage = NULL; + ui->listWidget->setVisible(true); - playLoadAnimation(); + playLoadAnimation_bp(this->height()); } QString basePage::whoAmI() @@ -231,5 +243,6 @@ void basePage::slot_spgAnimationEnd() ui->listWidget->setVisible(false); unlock(); ui->mainLayout->addWidget(sonPage); + sonPage->playLoadAnimation_sp(this->height()); //sonPage->setVisible(true); } diff --git a/QtAdb/basepage.h b/QtAdb/basepage.h index 50b93e6..f573bbc 100644 --- a/QtAdb/basepage.h +++ b/QtAdb/basepage.h @@ -29,7 +29,7 @@ public: QWidget *parents; basePage *lastPage; - QWidget *sonPage; + animationWidget *sonPage; QWidget *father; QString myName; sonPageManager *SPManager; @@ -55,6 +55,7 @@ private: bool isEnable(int k); QTimer *listTimer; + QPropertyAnimation *animation_listHide; //QGraphicsOpacityEffect* exitOpacity; @@ -68,6 +69,7 @@ private slots: void slot_destroySonPage(); void unlock(); void slot_spgAnimationEnd(); + void spg_return_pushed(); }; #endif // BASEPAGE_H diff --git a/QtAdb/mainwindow.cpp b/QtAdb/mainwindow.cpp index 885105e..d6c1e17 100644 --- a/QtAdb/mainwindow.cpp +++ b/QtAdb/mainwindow.cpp @@ -358,6 +358,7 @@ void MainWindow::initBasePage(int key) //槽:生成basePages /**/ currentPage = new basePage(this); + //qDebug() << "height in initBasePage()" << ui->widget_height->height(); currentPage->wgtHeight = ui->widget_height->height(); //qDebug() << "height2 in initBasePage()" << currentPage->wgtHeight; @@ -382,7 +383,7 @@ void MainWindow::initBasePage(int key) //槽:生成basePages taiChiTimer = new QTimer(this); connect(taiChiTimer, SIGNAL(timeout()), this, SLOT(slot_taiChi())); taiChiTimer->setSingleShot(true); - taiChiTimer->start(750); + taiChiTimer->start(700); break; } @@ -683,8 +684,8 @@ void MainWindow::on_WSABtn_clicked() //槽:连接WSA QMessageBox * msgBox = new QMessageBox; msgBox->setWindowIcon(QIcon(":/ico/image/ico/link.svg")); msgBox->setStyleSheet("background-color:rgba(255,255,255,1);border:0px; border-radius:0px;"); - msgBox->setWindowTitle("无线调试"); - msgBox->setText("· 已尝试连接,请刷新设备列表并选择WSA"); + msgBox->setWindowTitle("WSA"); + msgBox->setText("· 已尝试连接,请刷新设备列表并选择WSA\n· 请谨慎对WSA使用某些功能"); msgBox->addButton(" ✓ ", QMessageBox::AcceptRole); msgBox->show(); } @@ -709,6 +710,7 @@ void MainWindow::slot_taiChi() if(ui->comboBox->currentIndex() != -1) { this->unlock(); + //currentPage->setDisabled(false); } //this->setEnabled(true); } diff --git a/QtAdb/sonPages/activator/sp_activator.cpp b/QtAdb/sonPages/activator/sp_activator.cpp index ad1f5c9..e278c30 100644 --- a/QtAdb/sonPages/activator/sp_activator.cpp +++ b/QtAdb/sonPages/activator/sp_activator.cpp @@ -2,14 +2,16 @@ #include "ui_sp_activator.h" sp_activator::sp_activator(QWidget *parent) : - QWidget(parent), + animationWidget(parent), ui(new Ui::sp_activator) { ui->setupUi(this); process = new adbProcess; parents = parent; - connect(this->ui->back_to_basePage,SIGNAL(clicked()),parent,SLOT(slot_destroySonPage())); + //spg_return_pushed() + //connect(this->ui->back_to_basePage,SIGNAL(clicked()),parent,SLOT(slot_destroySonPage())); + connect(this->ui->back_to_basePage,SIGNAL(clicked()),parent,SLOT(spg_return_pushed())); QGraphicsDropShadowEffect *shadowEffect_runBtn = new QGraphicsDropShadowEffect(this); QGraphicsDropShadowEffect *shadowEffect_showOutputBtn = new QGraphicsDropShadowEffect(this); @@ -83,6 +85,7 @@ void sp_activator::on_showOutputBtn_clicked(bool checked) if(checked) { page = new standardOutputPage(NULL,process); + page->setWindowTitle("命令行输出"); connect(process,SIGNAL(outputGet(QString)),page,SLOT(update(QString))); /* parents->mapToGlobal(parents->pos()); diff --git a/QtAdb/sonPages/activator/sp_activator.h b/QtAdb/sonPages/activator/sp_activator.h index d51f430..e92880c 100644 --- a/QtAdb/sonPages/activator/sp_activator.h +++ b/QtAdb/sonPages/activator/sp_activator.h @@ -8,12 +8,13 @@ #include "adbprocess.h" #include "../sonpagebase.h" #include "../standardoutputpage.h" +#include "../../animationwidget.h" namespace Ui { class sp_activator; } -class sp_activator : public QWidget +class sp_activator : public animationWidget { Q_OBJECT diff --git a/QtAdb/sonPages/advanced/sp_accounts.cpp b/QtAdb/sonPages/advanced/sp_accounts.cpp index 40f3c24..eebfc6a 100644 --- a/QtAdb/sonPages/advanced/sp_accounts.cpp +++ b/QtAdb/sonPages/advanced/sp_accounts.cpp @@ -2,7 +2,7 @@ #include "ui_sp_accounts.h" sp_accounts::sp_accounts(QWidget *parent) : - QWidget(parent), + animationWidget(parent), ui(new Ui::sp_accounts) { ui->setupUi(this); diff --git a/QtAdb/sonPages/advanced/sp_accounts.h b/QtAdb/sonPages/advanced/sp_accounts.h index bbc476c..d075360 100644 --- a/QtAdb/sonPages/advanced/sp_accounts.h +++ b/QtAdb/sonPages/advanced/sp_accounts.h @@ -8,12 +8,13 @@ #include "../../threads/adbthread.h" #include #include +#include "../../animationwidget.h" namespace Ui { class sp_accounts; } -class sp_accounts : public QWidget +class sp_accounts : public animationWidget { Q_OBJECT diff --git a/QtAdb/sonPages/advanced/sp_captive_portal.cpp b/QtAdb/sonPages/advanced/sp_captive_portal.cpp index 301778b..99a9b73 100644 --- a/QtAdb/sonPages/advanced/sp_captive_portal.cpp +++ b/QtAdb/sonPages/advanced/sp_captive_portal.cpp @@ -2,7 +2,7 @@ #include "ui_sp_captive_portal.h" sp_captive_portal::sp_captive_portal(QWidget *parent) : - QWidget(parent), + animationWidget(parent), ui(new Ui::sp_captive_portal) { ui->setupUi(this); diff --git a/QtAdb/sonPages/advanced/sp_captive_portal.h b/QtAdb/sonPages/advanced/sp_captive_portal.h index 3190df0..2eef599 100644 --- a/QtAdb/sonPages/advanced/sp_captive_portal.h +++ b/QtAdb/sonPages/advanced/sp_captive_portal.h @@ -8,12 +8,13 @@ #include "../../threads/adbthread.h" #include #include +#include "../../animationwidget.h" namespace Ui { class sp_captive_portal; } -class sp_captive_portal : public QWidget +class sp_captive_portal : public animationWidget { Q_OBJECT diff --git a/QtAdb/sonPages/advanced/sp_customize_cmd.cpp b/QtAdb/sonPages/advanced/sp_customize_cmd.cpp index c5449c3..8e5421d 100644 --- a/QtAdb/sonPages/advanced/sp_customize_cmd.cpp +++ b/QtAdb/sonPages/advanced/sp_customize_cmd.cpp @@ -2,7 +2,7 @@ #include "ui_sp_customize_cmd.h" sp_customize_cmd::sp_customize_cmd(QWidget *parent) : - QWidget(parent), + animationWidget(parent), ui(new Ui::sp_customize_cmd) { ui->setupUi(this); @@ -11,16 +11,16 @@ sp_customize_cmd::sp_customize_cmd(QWidget *parent) : connect(this->ui->back_to_basePage,SIGNAL(clicked()),parent,SLOT(slot_destroySonPage())); QGraphicsDropShadowEffect *shadowEffect_runBtn = new QGraphicsDropShadowEffect(this); - QGraphicsDropShadowEffect *shadowEffect_showOutputBtn = new QGraphicsDropShadowEffect(this); + //QGraphicsDropShadowEffect *shadowEffect_showOutputBtn = new QGraphicsDropShadowEffect(this); QGraphicsDropShadowEffect *shadowEffect_back_to_basePage = new QGraphicsDropShadowEffect(this); shadowEffect_runBtn->setOffset(0,0); shadowEffect_runBtn->setColor(Qt::gray); shadowEffect_runBtn->setBlurRadius(5); - +/* shadowEffect_showOutputBtn->setOffset(0,0); shadowEffect_showOutputBtn->setColor(Qt::gray); - shadowEffect_showOutputBtn->setBlurRadius(5); + shadowEffect_showOutputBtn->setBlurRadius(5);*/ shadowEffect_back_to_basePage->setOffset(0,0); shadowEffect_back_to_basePage->setColor(Qt::gray); @@ -28,7 +28,7 @@ sp_customize_cmd::sp_customize_cmd(QWidget *parent) : ui->back_to_basePage->setGraphicsEffect(shadowEffect_back_to_basePage); ui->runBtn->setGraphicsEffect(shadowEffect_runBtn); - ui->showOutputBtn->setGraphicsEffect(shadowEffect_showOutputBtn); + //ui->showOutputBtn->setGraphicsEffect(shadowEffect_showOutputBtn); QGraphicsDropShadowEffect *shadowEffect_textBrowser = new QGraphicsDropShadowEffect(this); shadowEffect_textBrowser->setOffset(0,0); diff --git a/QtAdb/sonPages/advanced/sp_customize_cmd.h b/QtAdb/sonPages/advanced/sp_customize_cmd.h index dc7744e..34a76d8 100644 --- a/QtAdb/sonPages/advanced/sp_customize_cmd.h +++ b/QtAdb/sonPages/advanced/sp_customize_cmd.h @@ -4,12 +4,13 @@ #include #include #include "../../adbprocess.h" +#include "../../animationwidget.h" namespace Ui { class sp_customize_cmd; } -class sp_customize_cmd : public QWidget +class sp_customize_cmd : public animationWidget { Q_OBJECT diff --git a/QtAdb/sonPages/advanced/sp_customize_cmd.ui b/QtAdb/sonPages/advanced/sp_customize_cmd.ui index 6641b81..6c2ab2a 100644 --- a/QtAdb/sonPages/advanced/sp_customize_cmd.ui +++ b/QtAdb/sonPages/advanced/sp_customize_cmd.ui @@ -154,7 +154,7 @@ background-color: rgba(255, 255, 255, 0); background-color:rgba(255,255,255,0.6);border-radius:4px;border:0px; - <html><head/><body><p>暂时仅支持 ADB 命令</p><p>不支持管道符“ | ”</p></body></html> + 其实更推荐点击上方的终端按钮,拉起命令行直接执行 Qt::AlignCenter @@ -260,40 +260,6 @@ QPushButton:pressed{background-color:rgba(255,255,255,0.6);} - - - - - 30 - 30 - - - - - 30 - 30 - - - - QPushButton{background-color:rgba(255,255,255,0.9);border-radius:4px;border:0px;} -QPushButton:hover{background-color:rgba(255,255,255,0.7);} -QPushButton:pressed{background-color:rgba(255,255,255,0.6);} - - - - - - - :/ico/image/ico/terminal-box-line.svg:/ico/image/ico/terminal-box-line.svg - - - - 18 - 18 - - - - diff --git a/QtAdb/sonPages/advanced/sp_scales.cpp b/QtAdb/sonPages/advanced/sp_scales.cpp index a7bd98a..8cbde71 100644 --- a/QtAdb/sonPages/advanced/sp_scales.cpp +++ b/QtAdb/sonPages/advanced/sp_scales.cpp @@ -2,7 +2,7 @@ #include "ui_sp_scales.h" sp_scales::sp_scales(QWidget *parent) : - QWidget(parent), + animationWidget(parent), ui(new Ui::sp_scales) { ui->setupUi(this); diff --git a/QtAdb/sonPages/advanced/sp_scales.h b/QtAdb/sonPages/advanced/sp_scales.h index fdc5c3e..11aef46 100644 --- a/QtAdb/sonPages/advanced/sp_scales.h +++ b/QtAdb/sonPages/advanced/sp_scales.h @@ -7,12 +7,13 @@ //#include #include "../../adbprocess.h" #include "../../threads/adbthread.h" +#include "../../animationwidget.h" namespace Ui { class sp_scales; } -class sp_scales : public QWidget +class sp_scales : public animationWidget { Q_OBJECT diff --git a/QtAdb/sonPages/advanced/sp_status_bar.cpp b/QtAdb/sonPages/advanced/sp_status_bar.cpp index 7df006b..bf7b9c0 100644 --- a/QtAdb/sonPages/advanced/sp_status_bar.cpp +++ b/QtAdb/sonPages/advanced/sp_status_bar.cpp @@ -2,7 +2,7 @@ #include "ui_sp_status_bar.h" sp_status_bar::sp_status_bar(QWidget *parent) : - QWidget(parent), + animationWidget(parent), ui(new Ui::sp_status_bar) { ui->setupUi(this); diff --git a/QtAdb/sonPages/advanced/sp_status_bar.h b/QtAdb/sonPages/advanced/sp_status_bar.h index 1b74460..41c4f70 100644 --- a/QtAdb/sonPages/advanced/sp_status_bar.h +++ b/QtAdb/sonPages/advanced/sp_status_bar.h @@ -4,12 +4,13 @@ #include #include #include "../../adbprocess.h" +#include "../../animationwidget.h" namespace Ui { class sp_status_bar; } -class sp_status_bar : public QWidget +class sp_status_bar : public animationWidget { Q_OBJECT diff --git a/QtAdb/sonPages/apps/sp_features.cpp b/QtAdb/sonPages/apps/sp_features.cpp index 7ddd4a6..9ea3d86 100644 --- a/QtAdb/sonPages/apps/sp_features.cpp +++ b/QtAdb/sonPages/apps/sp_features.cpp @@ -2,7 +2,7 @@ #include "ui_sp_features.h" sp_features::sp_features(QWidget *parent) : - QWidget(parent), + animationWidget(parent), ui(new Ui::sp_features) { ui->setupUi(this); diff --git a/QtAdb/sonPages/apps/sp_features.h b/QtAdb/sonPages/apps/sp_features.h index 65c1efe..e4b7e3c 100644 --- a/QtAdb/sonPages/apps/sp_features.h +++ b/QtAdb/sonPages/apps/sp_features.h @@ -8,12 +8,13 @@ #include //#include #include "../../threads/adbthread.h" +#include "../../animationwidget.h" namespace Ui { class sp_features; } -class sp_features : public QWidget +class sp_features : public animationWidget { Q_OBJECT diff --git a/QtAdb/sonPages/apps/sp_installer.cpp b/QtAdb/sonPages/apps/sp_installer.cpp index f29260b..589145a 100644 --- a/QtAdb/sonPages/apps/sp_installer.cpp +++ b/QtAdb/sonPages/apps/sp_installer.cpp @@ -2,7 +2,7 @@ #include "ui_sp_installer.h" sp_installer::sp_installer(QWidget *parent) : - QWidget(parent), + animationWidget(parent), ui(new Ui::sp_installer) { ui->setupUi(this); @@ -17,9 +17,9 @@ sp_installer::sp_installer(QWidget *parent) : connect(this->ui->back_to_basePage,SIGNAL(clicked()),parent,SLOT(slot_destroySonPage())); QGraphicsDropShadowEffect *shadowEffect_runBtn = new QGraphicsDropShadowEffect(this); - QGraphicsDropShadowEffect *shadowEffect_showOutputBtn = new QGraphicsDropShadowEffect(this); + //QGraphicsDropShadowEffect *shadowEffect_showOutputBtn = new QGraphicsDropShadowEffect(this); QGraphicsDropShadowEffect *shadowEffect_back_to_basePage = new QGraphicsDropShadowEffect(this); - QGraphicsDropShadowEffect *shadowEffect_refreshBtn = new QGraphicsDropShadowEffect(this); + //QGraphicsDropShadowEffect *shadowEffect_refreshBtn = new QGraphicsDropShadowEffect(this); QGraphicsDropShadowEffect *shadowEffect_selectBtn = new QGraphicsDropShadowEffect(this); QGraphicsDropShadowEffect *shadowEffect_tips = new QGraphicsDropShadowEffect(this); @@ -27,17 +27,19 @@ sp_installer::sp_installer(QWidget *parent) : shadowEffect_runBtn->setColor(Qt::gray); shadowEffect_runBtn->setBlurRadius(5); + /* shadowEffect_showOutputBtn->setOffset(0,0); shadowEffect_showOutputBtn->setColor(Qt::gray); - shadowEffect_showOutputBtn->setBlurRadius(5); + shadowEffect_showOutputBtn->setBlurRadius(5);*/ shadowEffect_back_to_basePage->setOffset(0,0); shadowEffect_back_to_basePage->setColor(Qt::gray); shadowEffect_back_to_basePage->setBlurRadius(5); + /* shadowEffect_refreshBtn->setOffset(0,0); shadowEffect_refreshBtn->setColor(Qt::gray); - shadowEffect_refreshBtn->setBlurRadius(5); + shadowEffect_refreshBtn->setBlurRadius(5);*/ shadowEffect_selectBtn->setOffset(0,0); shadowEffect_selectBtn->setColor(Qt::gray); @@ -49,8 +51,8 @@ sp_installer::sp_installer(QWidget *parent) : ui->back_to_basePage->setGraphicsEffect(shadowEffect_back_to_basePage); ui->runBtn->setGraphicsEffect(shadowEffect_runBtn); - ui->showOutputBtn->setGraphicsEffect(shadowEffect_showOutputBtn); - ui->refreshBtn->setGraphicsEffect(shadowEffect_refreshBtn); + //ui->showOutputBtn->setGraphicsEffect(shadowEffect_showOutputBtn); + //ui->refreshBtn->setGraphicsEffect(shadowEffect_refreshBtn); ui->selectBtn->setGraphicsEffect(shadowEffect_selectBtn); ui->tips->setGraphicsEffect(shadowEffect_tips); diff --git a/QtAdb/sonPages/apps/sp_installer.h b/QtAdb/sonPages/apps/sp_installer.h index 690200a..a45549c 100644 --- a/QtAdb/sonPages/apps/sp_installer.h +++ b/QtAdb/sonPages/apps/sp_installer.h @@ -8,12 +8,13 @@ #include "../../threads/adbthread.h" #include #include +#include "../../animationwidget.h" namespace Ui { class sp_installer; } -class sp_installer : public QWidget +class sp_installer : public animationWidget { Q_OBJECT diff --git a/QtAdb/sonPages/apps/sp_installer.ui b/QtAdb/sonPages/apps/sp_installer.ui index c74e4c6..e381fa3 100644 --- a/QtAdb/sonPages/apps/sp_installer.ui +++ b/QtAdb/sonPages/apps/sp_installer.ui @@ -313,74 +313,6 @@ QPushButton:pressed{background-color:rgba(255,255,255,0.6);} - - - - - 30 - 30 - - - - - 30 - 30 - - - - QPushButton{background-color:rgba(255,255,255,0.9);border-radius:4px;border:0px;} -QPushButton:hover{background-color:rgba(255,255,255,0.7);} -QPushButton:pressed{background-color:rgba(255,255,255,0.6);} - - - - - - - :/ico/image/ico/refresh-line.svg:/ico/image/ico/refresh-line.svg - - - - 18 - 18 - - - - - - - - - 30 - 30 - - - - - 30 - 30 - - - - QPushButton{background-color:rgba(255,255,255,0.9);border-radius:4px;border:0px;} -QPushButton:hover{background-color:rgba(255,255,255,0.7);} -QPushButton:pressed{background-color:rgba(255,255,255,0.6);} - - - - - - - :/ico/image/ico/terminal-box-line.svg:/ico/image/ico/terminal-box-line.svg - - - - 18 - 18 - - - - diff --git a/QtAdb/sonPages/apps/sp_libraries.cpp b/QtAdb/sonPages/apps/sp_libraries.cpp index 46f18bd..55e9910 100644 --- a/QtAdb/sonPages/apps/sp_libraries.cpp +++ b/QtAdb/sonPages/apps/sp_libraries.cpp @@ -2,7 +2,7 @@ #include "ui_sp_libraries.h" sp_libraries::sp_libraries(QWidget *parent) : - QWidget(parent), + animationWidget(parent), ui(new Ui::sp_libraries) { ui->setupUi(this); diff --git a/QtAdb/sonPages/apps/sp_libraries.h b/QtAdb/sonPages/apps/sp_libraries.h index 4692f66..118e58f 100644 --- a/QtAdb/sonPages/apps/sp_libraries.h +++ b/QtAdb/sonPages/apps/sp_libraries.h @@ -8,12 +8,13 @@ #include "../../threads/adbthread.h" #include #include +#include "../../animationwidget.h" namespace Ui { class sp_libraries; } -class sp_libraries : public QWidget +class sp_libraries : public animationWidget { Q_OBJECT diff --git a/QtAdb/sonPages/apps/sp_packages.cpp b/QtAdb/sonPages/apps/sp_packages.cpp index 623955f..6e9bcd9 100644 --- a/QtAdb/sonPages/apps/sp_packages.cpp +++ b/QtAdb/sonPages/apps/sp_packages.cpp @@ -2,7 +2,7 @@ #include "ui_sp_packages.h" sp_packages::sp_packages(QWidget *parent) : - QWidget(parent), + animationWidget(parent), ui(new Ui::sp_packages) { ui->setupUi(this); diff --git a/QtAdb/sonPages/apps/sp_packages.h b/QtAdb/sonPages/apps/sp_packages.h index 40f8c7e..47e9401 100644 --- a/QtAdb/sonPages/apps/sp_packages.h +++ b/QtAdb/sonPages/apps/sp_packages.h @@ -11,6 +11,8 @@ #include "tp_packageprofile.h" #include #include +#include "../../animationwidget.h" + /* struct package { @@ -21,7 +23,7 @@ namespace Ui { class sp_packages; } -class sp_packages : public QWidget +class sp_packages : public animationWidget { Q_OBJECT diff --git a/QtAdb/sonPages/apps/sp_permissiongroups.cpp b/QtAdb/sonPages/apps/sp_permissiongroups.cpp index 206a1b4..206eb8c 100644 --- a/QtAdb/sonPages/apps/sp_permissiongroups.cpp +++ b/QtAdb/sonPages/apps/sp_permissiongroups.cpp @@ -2,7 +2,7 @@ #include "ui_sp_permissiongroups.h" sp_permissionGroups::sp_permissionGroups(QWidget *parent) : - QWidget(parent), + animationWidget(parent), ui(new Ui::sp_permissionGroups) { ui->setupUi(this); diff --git a/QtAdb/sonPages/apps/sp_permissiongroups.h b/QtAdb/sonPages/apps/sp_permissiongroups.h index 621ffdd..7c656f6 100644 --- a/QtAdb/sonPages/apps/sp_permissiongroups.h +++ b/QtAdb/sonPages/apps/sp_permissiongroups.h @@ -8,12 +8,13 @@ #include "../../threads/adbthread.h" #include #include +#include "../../animationwidget.h" namespace Ui { class sp_permissionGroups; } -class sp_permissionGroups : public QWidget +class sp_permissionGroups : public animationWidget { Q_OBJECT diff --git a/QtAdb/sonPages/apps/sp_permissions.cpp b/QtAdb/sonPages/apps/sp_permissions.cpp index c38df45..fb62098 100644 --- a/QtAdb/sonPages/apps/sp_permissions.cpp +++ b/QtAdb/sonPages/apps/sp_permissions.cpp @@ -2,7 +2,7 @@ #include "ui_sp_permissions.h" sp_permissions::sp_permissions(QWidget *parent) : - QWidget(parent), + animationWidget(parent), ui(new Ui::sp_permissions) { ui->setupUi(this); diff --git a/QtAdb/sonPages/apps/sp_permissions.h b/QtAdb/sonPages/apps/sp_permissions.h index ff17313..60cbf92 100644 --- a/QtAdb/sonPages/apps/sp_permissions.h +++ b/QtAdb/sonPages/apps/sp_permissions.h @@ -11,12 +11,13 @@ #include "../../threads/adbthread.h" #include #include +#include "../../animationwidget.h" namespace Ui { class sp_permissions; } -class sp_permissions : public QWidget +class sp_permissions : public animationWidget { Q_OBJECT diff --git a/QtAdb/sonPages/apps/sp_users.cpp b/QtAdb/sonPages/apps/sp_users.cpp index 0f02c09..4561053 100644 --- a/QtAdb/sonPages/apps/sp_users.cpp +++ b/QtAdb/sonPages/apps/sp_users.cpp @@ -2,7 +2,7 @@ #include "ui_sp_users.h" sp_users::sp_users(QWidget *parent) : - QWidget(parent), + animationWidget(parent), ui(new Ui::sp_users) { ui->setupUi(this); diff --git a/QtAdb/sonPages/apps/sp_users.h b/QtAdb/sonPages/apps/sp_users.h index 8ec6db7..6d469cd 100644 --- a/QtAdb/sonPages/apps/sp_users.h +++ b/QtAdb/sonPages/apps/sp_users.h @@ -8,12 +8,13 @@ #include "../../threads/adbthread.h" #include #include +#include "../../animationwidget.h" namespace Ui { class sp_users; } -class sp_users : public QWidget +class sp_users : public animationWidget { Q_OBJECT diff --git a/QtAdb/sonPages/apps/tp_packageprofile.cpp b/QtAdb/sonPages/apps/tp_packageprofile.cpp index 354eafb..6120eaa 100644 --- a/QtAdb/sonPages/apps/tp_packageprofile.cpp +++ b/QtAdb/sonPages/apps/tp_packageprofile.cpp @@ -2,7 +2,7 @@ #include "ui_tp_packageprofile.h" tp_packageProfile::tp_packageProfile(QWidget *parent ,QString packageName) : - QWidget(parent), + animationWidget(parent), ui(new Ui::tp_packageProfile) { ui->setupUi(this); diff --git a/QtAdb/sonPages/apps/tp_packageprofile.h b/QtAdb/sonPages/apps/tp_packageprofile.h index ca9d621..94c4e35 100644 --- a/QtAdb/sonPages/apps/tp_packageprofile.h +++ b/QtAdb/sonPages/apps/tp_packageprofile.h @@ -8,12 +8,13 @@ #include "../../textexplainer.h" #include "../../adbprocess.h" #include "../../threads/adbthread.h" +#include "../../animationwidget.h" namespace Ui { class tp_packageProfile; } -class tp_packageProfile : public QWidget +class tp_packageProfile : public animationWidget { Q_OBJECT diff --git a/QtAdb/sonPages/devControl/btnemulator.cpp b/QtAdb/sonPages/devControl/btnemulator.cpp index 36a41d8..fceedd1 100644 --- a/QtAdb/sonPages/devControl/btnemulator.cpp +++ b/QtAdb/sonPages/devControl/btnemulator.cpp @@ -2,7 +2,7 @@ #include "ui_btnemulator.h" btnEmulator::btnEmulator(QWidget *parent) : - QWidget(parent), + animationWidget(parent), ui(new Ui::btnEmulator) { ui->setupUi(this); diff --git a/QtAdb/sonPages/devControl/btnemulator.h b/QtAdb/sonPages/devControl/btnemulator.h index ae3592d..3dfe0e0 100644 --- a/QtAdb/sonPages/devControl/btnemulator.h +++ b/QtAdb/sonPages/devControl/btnemulator.h @@ -5,12 +5,13 @@ #include #include "textexplainer.h" #include "adbprocess.h" +#include "../../animationwidget.h" namespace Ui { class btnEmulator; } -class btnEmulator : public QWidget +class btnEmulator : public animationWidget { Q_OBJECT diff --git a/QtAdb/sonPages/devControl/sp_devcontrol_power.cpp b/QtAdb/sonPages/devControl/sp_devcontrol_power.cpp index 56b3daf..9e88717 100644 --- a/QtAdb/sonPages/devControl/sp_devcontrol_power.cpp +++ b/QtAdb/sonPages/devControl/sp_devcontrol_power.cpp @@ -2,7 +2,7 @@ #include "ui_sp_devcontrol_power.h" sp_devControl_power::sp_devControl_power(QWidget *parent) : - QWidget(parent), + animationWidget(parent), ui(new Ui::sp_devControl_power) { ui->setupUi(this); diff --git a/QtAdb/sonPages/devControl/sp_devcontrol_power.h b/QtAdb/sonPages/devControl/sp_devcontrol_power.h index f9bf9a0..23895a0 100644 --- a/QtAdb/sonPages/devControl/sp_devcontrol_power.h +++ b/QtAdb/sonPages/devControl/sp_devcontrol_power.h @@ -5,12 +5,13 @@ #include #include "textexplainer.h" #include "adbprocess.h" +#include "../../animationwidget.h" namespace Ui { class sp_devControl_power; } -class sp_devControl_power : public QWidget +class sp_devControl_power : public animationWidget { Q_OBJECT diff --git a/QtAdb/sonPages/devInfo/sp_dpichanger.cpp b/QtAdb/sonPages/devInfo/sp_dpichanger.cpp index 415b18f..97f07f3 100644 --- a/QtAdb/sonPages/devInfo/sp_dpichanger.cpp +++ b/QtAdb/sonPages/devInfo/sp_dpichanger.cpp @@ -2,7 +2,7 @@ #include "ui_sp_dpichanger.h" sp_dpiChanger::sp_dpiChanger(QWidget *parent) : - QWidget(parent), + animationWidget(parent), ui(new Ui::sp_dpiChanger) { ui->setupUi(this); @@ -20,12 +20,13 @@ sp_dpiChanger::sp_dpiChanger(QWidget *parent) : ui->runBtn->setStyleSheet("QPushButton{background-color:rgba(255,255,255,0.9);border-radius:4px;border:0px;}" "QPushButton:hover{background-color:rgba(255,255,255,0.7);}" "QPushButton:pressed{background-color:rgba(255,255,255,0.6);}"); + /* ui->showOutputBtn->setStyleSheet("QPushButton{background-color:rgba(255,255,255,0.9);border-radius:4px;border:0px;}" "QPushButton:hover{background-color:rgba(255,255,255,0.7);}" - "QPushButton:pressed{background-color:rgba(255,255,255,0.6);}"); + "QPushButton:pressed{background-color:rgba(255,255,255,0.6);}");*/ QGraphicsDropShadowEffect *shadowEffect_runBtn = new QGraphicsDropShadowEffect(this); - QGraphicsDropShadowEffect *shadowEffect_showOutputBtn = new QGraphicsDropShadowEffect(this); + //QGraphicsDropShadowEffect *shadowEffect_showOutputBtn = new QGraphicsDropShadowEffect(this); QGraphicsDropShadowEffect *shadowEffect_back_to_basePage = new QGraphicsDropShadowEffect(this); QGraphicsDropShadowEffect *shadowEffect_refreshBtn = new QGraphicsDropShadowEffect(this); @@ -37,9 +38,10 @@ sp_dpiChanger::sp_dpiChanger(QWidget *parent) : shadowEffect_runBtn->setColor(Qt::gray); shadowEffect_runBtn->setBlurRadius(5); + /* shadowEffect_showOutputBtn->setOffset(0,0); shadowEffect_showOutputBtn->setColor(Qt::gray); - shadowEffect_showOutputBtn->setBlurRadius(5); + shadowEffect_showOutputBtn->setBlurRadius(5);*/ shadowEffect_back_to_basePage->setOffset(0,0); shadowEffect_back_to_basePage->setColor(Qt::gray); @@ -63,7 +65,7 @@ sp_dpiChanger::sp_dpiChanger(QWidget *parent) : ui->back_to_basePage->setGraphicsEffect(shadowEffect_back_to_basePage); ui->runBtn->setGraphicsEffect(shadowEffect_runBtn); - ui->showOutputBtn->setGraphicsEffect(shadowEffect_showOutputBtn); + //ui->showOutputBtn->setGraphicsEffect(shadowEffect_showOutputBtn); ui->refreshBtn->setGraphicsEffect(shadowEffect_refreshBtn); ui->dpiInfo->setGraphicsEffect(shadowEffect_dpiInfo); ui->currentDpi->setGraphicsEffect(shadowEffect_currentDpi); diff --git a/QtAdb/sonPages/devInfo/sp_dpichanger.h b/QtAdb/sonPages/devInfo/sp_dpichanger.h index 48e493a..3e7d2ec 100644 --- a/QtAdb/sonPages/devInfo/sp_dpichanger.h +++ b/QtAdb/sonPages/devInfo/sp_dpichanger.h @@ -6,12 +6,13 @@ #include "adbprocess.h" #include "textexplainer.h" +#include "../../animationwidget.h" namespace Ui { class sp_dpiChanger; } -class sp_dpiChanger : public QWidget +class sp_dpiChanger : public animationWidget { Q_OBJECT diff --git a/QtAdb/sonPages/devInfo/sp_dpichanger.ui b/QtAdb/sonPages/devInfo/sp_dpichanger.ui index 72e5b1f..ca7df43 100644 --- a/QtAdb/sonPages/devInfo/sp_dpichanger.ui +++ b/QtAdb/sonPages/devInfo/sp_dpichanger.ui @@ -272,7 +272,7 @@ background-color: rgba(255, 255, 255, 0); - 返回 + @@ -367,41 +367,6 @@ QPushButton:pressed{background-color:rgba(255,255,255,0.6);} - - - - - 30 - 30 - - - - - 30 - 30 - - - - - - - - - - - - - - :/ico/image/ico/terminal-box-line.svg:/ico/image/ico/terminal-box-line.svg - - - - 18 - 18 - - - - diff --git a/QtAdb/sonPages/devInfo/sp_wmsize.cpp b/QtAdb/sonPages/devInfo/sp_wmsize.cpp index 2b016b1..587c167 100644 --- a/QtAdb/sonPages/devInfo/sp_wmsize.cpp +++ b/QtAdb/sonPages/devInfo/sp_wmsize.cpp @@ -2,7 +2,7 @@ #include "ui_sp_wmsize.h" sp_wmsize::sp_wmsize(QWidget *parent) : - QWidget(parent), + animationWidget(parent), ui(new Ui::sp_wmsize) { ui->setupUi(this); @@ -20,12 +20,13 @@ sp_wmsize::sp_wmsize(QWidget *parent) : ui->runBtn->setStyleSheet("QPushButton{background-color:rgba(255,255,255,0.9);border-radius:4px;border:0px;}" "QPushButton:hover{background-color:rgba(255,255,255,0.7);}" "QPushButton:pressed{background-color:rgba(255,255,255,0.6);}"); + /* ui->showOutputBtn->setStyleSheet("QPushButton{background-color:rgba(255,255,255,0.9);border-radius:4px;border:0px;}" "QPushButton:hover{background-color:rgba(255,255,255,0.7);}" - "QPushButton:pressed{background-color:rgba(255,255,255,0.6);}"); + "QPushButton:pressed{background-color:rgba(255,255,255,0.6);}");*/ QGraphicsDropShadowEffect *shadowEffect_runBtn = new QGraphicsDropShadowEffect(this); - QGraphicsDropShadowEffect *shadowEffect_showOutputBtn = new QGraphicsDropShadowEffect(this); + //QGraphicsDropShadowEffect *shadowEffect_showOutputBtn = new QGraphicsDropShadowEffect(this); QGraphicsDropShadowEffect *shadowEffect_back_to_basePage = new QGraphicsDropShadowEffect(this); QGraphicsDropShadowEffect *shadowEffect_refreshBtn = new QGraphicsDropShadowEffect(this); @@ -39,9 +40,10 @@ sp_wmsize::sp_wmsize(QWidget *parent) : shadowEffect_runBtn->setColor(Qt::gray); shadowEffect_runBtn->setBlurRadius(5); + /* shadowEffect_showOutputBtn->setOffset(0,0); shadowEffect_showOutputBtn->setColor(Qt::gray); - shadowEffect_showOutputBtn->setBlurRadius(5); + shadowEffect_showOutputBtn->setBlurRadius(5);*/ shadowEffect_back_to_basePage->setOffset(0,0); shadowEffect_back_to_basePage->setColor(Qt::gray); @@ -73,7 +75,7 @@ sp_wmsize::sp_wmsize(QWidget *parent) : ui->back_to_basePage->setGraphicsEffect(shadowEffect_back_to_basePage); ui->runBtn->setGraphicsEffect(shadowEffect_runBtn); - ui->showOutputBtn->setGraphicsEffect(shadowEffect_showOutputBtn); + //ui->showOutputBtn->setGraphicsEffect(shadowEffect_showOutputBtn); ui->refreshBtn->setGraphicsEffect(shadowEffect_refreshBtn); ui->dpiInfo->setGraphicsEffect(shadowEffect_dpiInfo); ui->currentDpi->setGraphicsEffect(shadowEffect_currentDpi); diff --git a/QtAdb/sonPages/devInfo/sp_wmsize.h b/QtAdb/sonPages/devInfo/sp_wmsize.h index 4a1a01c..6b9b46e 100644 --- a/QtAdb/sonPages/devInfo/sp_wmsize.h +++ b/QtAdb/sonPages/devInfo/sp_wmsize.h @@ -6,12 +6,13 @@ #include "adbprocess.h" #include "textexplainer.h" +#include "../../animationwidget.h" namespace Ui { class sp_wmsize; } -class sp_wmsize : public QWidget +class sp_wmsize : public animationWidget { Q_OBJECT diff --git a/QtAdb/sonPages/devInfo/sp_wmsize.ui b/QtAdb/sonPages/devInfo/sp_wmsize.ui index 83faca9..75519ba 100644 --- a/QtAdb/sonPages/devInfo/sp_wmsize.ui +++ b/QtAdb/sonPages/devInfo/sp_wmsize.ui @@ -369,7 +369,7 @@ background-color: rgba(255, 255, 255, 0); - 返回 + @@ -464,41 +464,6 @@ QPushButton:pressed{background-color:rgba(255,255,255,0.6);} - - - - - 30 - 30 - - - - - 30 - 30 - - - - - - - - - - - - - - :/ico/image/ico/terminal-box-line.svg:/ico/image/ico/terminal-box-line.svg - - - - 18 - 18 - - - - diff --git a/QtAdb/sonPages/links.ui b/QtAdb/sonPages/links.ui index f1b3481..ecf3a44 100644 --- a/QtAdb/sonPages/links.ui +++ b/QtAdb/sonPages/links.ui @@ -44,10 +44,13 @@ 0 0 759 - 1969 + 1990 + + 14 + 5 @@ -57,7 +60,7 @@ - background-color:rgba(255,255,255,0.8);border-radius:4px;border:1px solid #BDBDBD; + background-color:rgba(255,255,255,0.9);border-radius:4px;border:1px solid #BDBDBD; @@ -374,7 +377,7 @@ background-color: rgba(255, 255, 255, 0); - background-color:rgba(255,255,255,0.8);border-radius:4px;border:1px solid #BDBDBD; + background-color:rgba(255,255,255,0.9);border-radius:4px;border:1px solid #BDBDBD; @@ -541,7 +544,7 @@ background-color: rgba(255, 255, 255, 0); - background-color:rgba(255,255,255,0.8);border-radius:4px;border:1px solid #BDBDBD; + background-color:rgba(255,255,255,0.9);border-radius:4px;border:1px solid #BDBDBD; @@ -709,7 +712,7 @@ border-radius:4px; - background-color:rgba(255,255,255,0.8);border-radius:4px;border:1px solid #BDBDBD; + background-color:rgba(255,255,255,0.9);border-radius:4px;border:1px solid #BDBDBD; diff --git a/QtAdb/sonPages/recovery/sp_recovery.cpp b/QtAdb/sonPages/recovery/sp_recovery.cpp index 13b37fc..05c9154 100644 --- a/QtAdb/sonPages/recovery/sp_recovery.cpp +++ b/QtAdb/sonPages/recovery/sp_recovery.cpp @@ -2,7 +2,7 @@ #include "ui_sp_recovery.h" sp_recovery::sp_recovery(QWidget *parent) : - QWidget(parent), + animationWidget(parent), ui(new Ui::sp_recovery) { ui->setupUi(this); @@ -14,7 +14,7 @@ sp_recovery::sp_recovery(QWidget *parent) : shadowEffect_runBtn = new QGraphicsDropShadowEffect(this); shadowEffect_showOutputBtn = new QGraphicsDropShadowEffect(this); shadowEffect_back_to_basePage = new QGraphicsDropShadowEffect(this); - shadowEffect_refreshBtn = new QGraphicsDropShadowEffect(this); + //shadowEffect_refreshBtn = new QGraphicsDropShadowEffect(this); shadowEffect_selectBtn = new QGraphicsDropShadowEffect(this); shadowEffect_output = new QGraphicsDropShadowEffect(this); shadowEffect_tips = new QGraphicsDropShadowEffect(this); @@ -31,9 +31,10 @@ sp_recovery::sp_recovery(QWidget *parent) : shadowEffect_back_to_basePage->setColor(Qt::gray); shadowEffect_back_to_basePage->setBlurRadius(5); + /* shadowEffect_refreshBtn->setOffset(0,0); shadowEffect_refreshBtn->setColor(Qt::gray); - shadowEffect_refreshBtn->setBlurRadius(5); + shadowEffect_refreshBtn->setBlurRadius(5);*/ shadowEffect_selectBtn->setOffset(0,0); shadowEffect_selectBtn->setColor(Qt::gray); @@ -50,7 +51,7 @@ sp_recovery::sp_recovery(QWidget *parent) : ui->back_to_basePage->setGraphicsEffect(shadowEffect_back_to_basePage); ui->runBtn->setGraphicsEffect(shadowEffect_runBtn); ui->showOutputBtn->setGraphicsEffect(shadowEffect_showOutputBtn); - ui->refreshBtn->setGraphicsEffect(shadowEffect_refreshBtn); + //ui->refreshBtn->setGraphicsEffect(shadowEffect_refreshBtn); ui->selectBtn->setGraphicsEffect(shadowEffect_selectBtn); ui->output->setGraphicsEffect(shadowEffect_output); ui->tips->setGraphicsEffect(shadowEffect_tips); @@ -132,6 +133,7 @@ void sp_recovery::on_showOutputBtn_clicked(bool checked) if(checked) { page = new standardOutputPage(NULL,process); + page->setWindowTitle("命令行输出"); qDebug() << "1"; connect(process,SIGNAL(outputGet(QString)),page,SLOT(update(QString))); /* diff --git a/QtAdb/sonPages/recovery/sp_recovery.h b/QtAdb/sonPages/recovery/sp_recovery.h index 357d52e..961283a 100644 --- a/QtAdb/sonPages/recovery/sp_recovery.h +++ b/QtAdb/sonPages/recovery/sp_recovery.h @@ -7,12 +7,13 @@ #include "../standardoutputpage.h" #include "../../threads/adbthread.h" #include +#include "../../animationwidget.h" namespace Ui { class sp_recovery; } -class sp_recovery : public QWidget +class sp_recovery : public animationWidget { Q_OBJECT diff --git a/QtAdb/sonPages/recovery/sp_recovery.ui b/QtAdb/sonPages/recovery/sp_recovery.ui index 8012605..1d68cb8 100644 --- a/QtAdb/sonPages/recovery/sp_recovery.ui +++ b/QtAdb/sonPages/recovery/sp_recovery.ui @@ -342,40 +342,6 @@ QPushButton:pressed{background-color:rgba(255,255,255,0.6);} - - - - - 30 - 30 - - - - - 30 - 30 - - - - QPushButton{background-color:rgba(255,255,255,0.9);border-radius:4px;border:0px;} -QPushButton:hover{background-color:rgba(255,255,255,0.7);} -QPushButton:pressed{background-color:rgba(255,255,255,0.6);} - - - - - - - :/ico/image/ico/refresh-line.svg:/ico/image/ico/refresh-line.svg - - - - 18 - 18 - - - - diff --git a/QtAdb/sonPages/sonpagemanager.cpp b/QtAdb/sonPages/sonpagemanager.cpp index f3dfeb3..69b2ad3 100644 --- a/QtAdb/sonPages/sonpagemanager.cpp +++ b/QtAdb/sonPages/sonpagemanager.cpp @@ -12,7 +12,7 @@ sonPageManager::~sonPageManager() //delete explainer; } -QWidget* sonPageManager::selector(QWidget *parent , QString parentName, int key, device dev) +animationWidget* sonPageManager::selector(QWidget *parent , QString parentName, int key, device dev) { if(parentName == "devInfo") { @@ -45,7 +45,7 @@ QWidget* sonPageManager::selector(QWidget *parent , QString parentName, int key, return NULL; } -QWidget* sonPageManager::createSonPageFor_devInfo(QWidget *parent, int key, device dev) +animationWidget* sonPageManager::createSonPageFor_devInfo(QWidget *parent, int key, device dev) { switch(key +1) { @@ -67,7 +67,7 @@ QWidget* sonPageManager::createSonPageFor_devInfo(QWidget *parent, int key, devi return NULL; } -sp_activator* sonPageManager::createSonPageFor_activator(QWidget *parent, int key, device dev) +animationWidget* sonPageManager::createSonPageFor_activator(QWidget *parent, int key, device dev) { //sp_activator *page = new sp_activator(parent); //return page; @@ -319,7 +319,7 @@ sp_activator* sonPageManager::createSonPageFor_activator(QWidget *parent, int ke return NULL; } -QWidget* sonPageManager::createSonPageFor_apps(QWidget *parent, int key, device dev) +animationWidget* sonPageManager::createSonPageFor_apps(QWidget *parent, int key, device dev) { switch(key +1) { @@ -371,7 +371,7 @@ QWidget* sonPageManager::createSonPageFor_apps(QWidget *parent, int key, device return NULL; } -QWidget* sonPageManager::createSonPageFor_devControl(QWidget *parent, int key, device dev) +animationWidget* sonPageManager::createSonPageFor_devControl(QWidget *parent, int key, device dev) { switch(key +1) { @@ -392,7 +392,7 @@ QWidget* sonPageManager::createSonPageFor_devControl(QWidget *parent, int key, d return NULL; } -QWidget* sonPageManager::createSonPageFor_recovery(QWidget *parent, int key, device dev) +animationWidget* sonPageManager::createSonPageFor_recovery(QWidget *parent, int key, device dev) { switch(key +1) { @@ -407,7 +407,7 @@ QWidget* sonPageManager::createSonPageFor_recovery(QWidget *parent, int key, dev return NULL; } -QWidget* sonPageManager::createSonPageFor_advanced(QWidget *parent, int key, device dev) +animationWidget* sonPageManager::createSonPageFor_advanced(QWidget *parent, int key, device dev) { switch(key +1) { diff --git a/QtAdb/sonPages/sonpagemanager.h b/QtAdb/sonPages/sonpagemanager.h index 25377dd..91b8b00 100644 --- a/QtAdb/sonPages/sonpagemanager.h +++ b/QtAdb/sonPages/sonpagemanager.h @@ -34,16 +34,16 @@ public: textExplainer *explainer; - QWidget *selector(QWidget *parent, QString parentName, int key , device dev); + animationWidget *selector(QWidget *parent, QString parentName, int key , device dev); private: - QWidget* createSonPageFor_devInfo(QWidget *parent, int key, device dev); - sp_activator* createSonPageFor_activator(QWidget *parent, int key, device dev); - QWidget* createSonPageFor_apps(QWidget *parent, int key, device dev); - QWidget* createSonPageFor_devControl(QWidget *parent, int key, device dev); - QWidget* createSonPageFor_recovery(QWidget *parent, int key, device dev); - QWidget* createSonPageFor_advanced(QWidget *parent, int key, device dev); + animationWidget* createSonPageFor_devInfo(QWidget *parent, int key, device dev); + animationWidget* createSonPageFor_activator(QWidget *parent, int key, device dev); + animationWidget* createSonPageFor_apps(QWidget *parent, int key, device dev); + animationWidget* createSonPageFor_devControl(QWidget *parent, int key, device dev); + animationWidget* createSonPageFor_recovery(QWidget *parent, int key, device dev); + animationWidget* createSonPageFor_advanced(QWidget *parent, int key, device dev); }; #endif // SONPAGEMANAGER_H diff --git a/QtAdb/sonPages/standardoutputpage.ui b/QtAdb/sonPages/standardoutputpage.ui index 90ce44c..19f1178 100644 --- a/QtAdb/sonPages/standardoutputpage.ui +++ b/QtAdb/sonPages/standardoutputpage.ui @@ -33,7 +33,7 @@ QPushButton:pressed{background-color:rgba(255,255,255,0.6);} QToolTip{border:1px solid #BDBDBD; background-color: #ffffff; color:rgba(117, 117, 117, 0.9);font-family: MiSans Medium; font-size:12px;border-radius:4px;} - refresh + 刷新 @@ -46,7 +46,7 @@ QPushButton:pressed{background-color:rgba(255,255,255,0.6);} QToolTip{border:1px solid #BDBDBD; background-color: #ffffff; color:rgba(117, 117, 117, 0.9);font-family: MiSans Medium; font-size:12px;border-radius:4px;} - clear + 清除 @@ -59,7 +59,7 @@ QPushButton:pressed{background-color:rgba(255,255,255,0.6);} QToolTip{border:1px solid #BDBDBD; background-color: #ffffff; color:rgba(117, 117, 117, 0.9);font-family: MiSans Medium; font-size:12px;border-radius:4px;} - copy + 复制 diff --git a/README.md b/README.md index 41886f2..22aa93e 100644 --- a/README.md +++ b/README.md @@ -131,7 +131,7 @@ Android 系统的可玩性在 adb 的加成下变得更加丰富,由此涌现 - ~~完整的软件包管理器~~ - 跨平台 -- 完善网站 +- ~~完善网站~~ - 文件管理(~~都连上电脑了,为什么不直接用电脑的文件管理~~) - ~~设备插拔检测~~ - 集成scrcpy @@ -229,8 +229,8 @@ Android 系统的可玩性在 adb 的加成下变得更加丰富,由此涌现 ### 字体 -- [Misans](https://web.vip.miui.com/page/info/mio/mio/detail?postId=33935854) -- *没有应用上 Misans 的地方一定是 bug,请进行反馈。* +- [Misans](https://web.vip.miui.com/page/info/mio/mio/detail?postId=33935854)(好像哪里都没有应用上,应该是bug) +- ~~*没有应用上 Misans 的地方一定是 bug,请进行反馈。*~~ diff --git a/新建 文本文档.txt b/新建 文本文档.txt deleted file mode 100644 index 1f21c02..0000000 --- a/新建 文本文档.txt +++ /dev/null @@ -1 +0,0 @@ -git push https://github.com/LapplandSP/QtAdb.git \ No newline at end of file