diff --git a/QtAdb/about.cpp b/QtAdb/about.cpp
index a5dc116..f93afd0 100644
--- a/QtAdb/about.cpp
+++ b/QtAdb/about.cpp
@@ -64,8 +64,8 @@ about::about(QWidget *parent) :
ui->btn_money_3->hide();
ui->btn_money_4->hide();
- this->setStyleSheet("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;}");
-
+ //this->setStyleSheet("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;}");
+ //this->setStyleSheet("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;}");
}
about::~about()
@@ -105,3 +105,9 @@ void about::on_btn_links_clicked()
linksPage->show();
}
+
+void about::on_btn_version_clicked()
+{
+ QDesktopServices::openUrl(QUrl("https://lapplandsp.github.io/QtAdb-Pages/qa/", QUrl::TolerantMode));
+}
+
diff --git a/QtAdb/about.h b/QtAdb/about.h
index 92a3059..57dd9fc 100644
--- a/QtAdb/about.h
+++ b/QtAdb/about.h
@@ -32,6 +32,8 @@ private slots:
void on_btn_links_clicked();
+ void on_btn_version_clicked();
+
private:
Ui::about *ui;
};
diff --git a/QtAdb/about.ui b/QtAdb/about.ui
index 07b9c2b..432884b 100644
--- a/QtAdb/about.ui
+++ b/QtAdb/about.ui
@@ -14,6 +14,12 @@
Form
+
+ 0
+
+
+ 0
+
-
@@ -72,13 +78,17 @@ background-color: rgba(255, 255, 255, 0);
+
+ PointingHandCursor
+
版本号
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);}
+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;}
@@ -135,6 +145,9 @@ QPushButton:pressed{background-color:rgba(255,255,255,0.6);}
+
+ PointingHandCursor
+
网址
@@ -198,6 +211,9 @@ QPushButton:pressed{background-color:rgba(255,255,255,0.6);}
+
+ PointingHandCursor
+
酷安
@@ -261,6 +277,9 @@ QPushButton:pressed{background-color:rgba(255,255,255,0.6);}
+
+ PointingHandCursor
+
Github
@@ -327,6 +346,9 @@ QPushButton:pressed{background-color:rgba(255,255,255,0.6);}
50
+
+ PointingHandCursor
+
QPushButton{background-color:rgba(255,255,255,0.9);border-radius:4px;border:0px;}
QPushButton:hover{background-color:rgba(255,255,255,0.7);}
@@ -412,6 +434,9 @@ QPushButton:pressed{background-color:rgba(255,255,255,0.6);}
+
+ PointingHandCursor
+
请我吃可乐(3元)
diff --git a/QtAdb/animationwidget.cpp b/QtAdb/animationwidget.cpp
index b77d6c5..2ffc1df 100644
--- a/QtAdb/animationwidget.cpp
+++ b/QtAdb/animationwidget.cpp
@@ -56,7 +56,26 @@ void animationWidget::playLoadAnimation(int h)
void animationWidget::playExitAnimation()
{
+ animation->setDuration(750);
+ //animation->setEndValue(QPoint(301,117));
+ qDebug() << "wgtHeight = " << wgtHeight;
+ if(parent->width() <= 600)
+ {
+ animation->setEndValue(QRect(301 - 30, 117 - 6 - 11 + 50, parent->width(),wgtHeight));
+ }
+ else
+ {
+ animation->setEndValue(QRect(301 - 30, 117 - 6 - 11 + 50, parent->width(),wgtHeight));
+ }
+ //animation->setStartValue(QPoint(301 + 50,117));
+ //animation->setStartValue(QRect(301 + 50 - 30, 117 - 6 - 11, parent->width()-50,wgtHeight));
+ animation->setStartValue(QRect(301 - 30, 117 - 6 - 11, parent->width(),wgtHeight));
+ animation->setEasingCurve(QEasingCurve::OutQuart);
+
+ this->show();
+ animation->start();
+ emit animationEnd();
}
animationWidget::~animationWidget()
diff --git a/QtAdb/basepage.cpp b/QtAdb/basepage.cpp
index 994d1a8..1a6bd6b 100644
--- a/QtAdb/basepage.cpp
+++ b/QtAdb/basepage.cpp
@@ -117,23 +117,53 @@ void basePage::setFather(QWidget *parent)
void basePage::slot_createSonPage(int key)
{
- this->setDisabled(true);
-
- listTimer = new QTimer(this);
- connect(listTimer, SIGNAL(timeout()), this, SLOT(unlock()));
- listTimer->setSingleShot(true);
- listTimer->start(500);
-
- emit creatingSonPage();
if(isEnable(key) && key >= 0)
{
+ this->setDisabled(true);
+
+ listTimer = new QTimer(this);
+ connect(listTimer, SIGNAL(timeout()), this, SLOT(slot_spgAnimationEnd()));
+ listTimer->setSingleShot(true);
+ listTimer->start(500);
+ emit creatingSonPage();
+
ui->listWidget->setCurrentRow(-1);
//qDebug() << "dev of basePage = " << dev.addr;
sonPage = SPManager->selector(this,whoAmI(),key,dev);
if(sonPage != NULL)
{
- ui->listWidget->setVisible(false);
- ui->mainLayout->addWidget(sonPage);
+ //ui->listWidget->setVisible(false);
+
+ /**/
+ //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->deleteLater();
+
+ /*
+ qDebug() << "wgtHeight = " << wgtHeight;
+ if(parent->width() <= 600)
+ {
+ animation->setEndValue(QRect(301 - 30, 117 - 6 - 11, 600,wgtHeight));
+ }
+ else
+ {
+ animation->setEndValue(QRect(301 - 30, 117 - 6 - 11, parent->width(),wgtHeight));
+ }
+ //animation->setStartValue(QPoint(301 + 50,117));
+ animation->setStartValue(QRect(301 + 50 - 30, 117 - 6 - 11, parent->width()-50,wgtHeight));
+
+ animation->setEasingCurve(QEasingCurve::OutQuart);
+
+ this->show();
+ animation->start();
+ */
+ /**/
}
}
ui->listWidget->setCurrentRow(-1);
@@ -141,13 +171,13 @@ void basePage::slot_createSonPage(int key)
void basePage::slot_destroySonPage()
{
-
if(sonPage == NULL)
throw "trying to destroy sonPage, but sonPage == NULL;";
delete sonPage;
sonPage = NULL;
ui->listWidget->setVisible(true);
+ playLoadAnimation();
}
QString basePage::whoAmI()
@@ -195,3 +225,11 @@ void basePage::unlock()
{
this->setDisabled(false);
}
+
+void basePage::slot_spgAnimationEnd()
+{
+ ui->listWidget->setVisible(false);
+ unlock();
+ ui->mainLayout->addWidget(sonPage);
+ //sonPage->setVisible(true);
+}
diff --git a/QtAdb/basepage.h b/QtAdb/basepage.h
index 6fb1d6e..50b93e6 100644
--- a/QtAdb/basepage.h
+++ b/QtAdb/basepage.h
@@ -67,6 +67,7 @@ private slots:
void slot_createSonPage(int key);
void slot_destroySonPage();
void unlock();
+ void slot_spgAnimationEnd();
};
#endif // BASEPAGE_H
diff --git a/QtAdb/indexlistitem.ui b/QtAdb/indexlistitem.ui
index 750c103..61813e3 100644
--- a/QtAdb/indexlistitem.ui
+++ b/QtAdb/indexlistitem.ui
@@ -22,6 +22,9 @@
35
+
+ PointingHandCursor
+
Form
@@ -50,14 +53,14 @@ border-color: rgb(152, 152, 152);
- 5
- 20
+ 4
+ 16
- 5
- 25
+ 4
+ 16
@@ -118,13 +121,14 @@ border-radius:4px;*/
MiSans Normal
+ 10
background-color: rgba(255, 255, 255, 0);
- TextLabel
+
diff --git a/QtAdb/mainwindow.cpp b/QtAdb/mainwindow.cpp
index bad8b27..885105e 100644
--- a/QtAdb/mainwindow.cpp
+++ b/QtAdb/mainwindow.cpp
@@ -26,7 +26,7 @@ MainWindow::MainWindow(QWidget *parent)
/*devList 中的当前设备索引*/
current_device = 0;
- ui->comboBox->setPlaceholderText("请先选择设备");
+ ui->comboBox->setPlaceholderText("点击此处选择设备");
/*连接信号与槽*/
connect(this->ui->comboBox,SIGNAL(currentIndexChanged(int)),this,SLOT(setCurrentDevice(int))); //更改当前设备
@@ -352,6 +352,11 @@ void MainWindow::initBasePage(int key) //槽:生成basePages
currentPage = NULL;
}
+ /*动画*/
+ //ui->indexList[key]
+
+ /**/
+
currentPage = new basePage(this);
//qDebug() << "height in initBasePage()" << ui->widget_height->height();
currentPage->wgtHeight = ui->widget_height->height();
@@ -372,6 +377,7 @@ void MainWindow::initBasePage(int key) //槽:生成basePages
ui->verticalLayout_2->addWidget(currentPage);
currentPage->playLoadAnimation(ui->widget_height->height());
+ //currentPage->playExitAnimation();
//currentPage->setVisible(true);
taiChiTimer = new QTimer(this);
connect(taiChiTimer, SIGNAL(timeout()), this, SLOT(slot_taiChi()));
@@ -470,7 +476,7 @@ void MainWindow::setStyles() //方法:设置样式
"QListView::item{height:35px;}"
);
- ui->comboBox->setStyleSheet("QComboBox{color:black;border-bottom:1px solid #BDBDBD;border-radius:0px;background-color:transparent;}"
+ ui->comboBox->setStyleSheet("QComboBox{color:black; border:0px; border-bottom:1px solid #BDBDBD; border-radius:0px; background-color:transparent;}"
"QComboBox::drop-down{border: 0px solid rgba(255,255,255,0);background-color:rgba(255,255,255,0);border-bottom-right-radius: 0px;}"
"QComboBox QAbstractItemView{border:1px solid #BDBDBD;border-radius:0px 0px 0px 0px;outline: 0px;}"
"QComboBox QAbstractItemView::item{height:30px;border:0px solid #BDBDBD;border-radius:0px 0px 0px 0px;}"
@@ -478,9 +484,10 @@ void MainWindow::setStyles() //方法:设置样式
"QComboBox QAbstractItemView::item:selected{height:30px;border:1px solid #BDBDBD;border-radius:0px 0px 0px 0px;color:black}"
);
+ /*
ui->refreshButton->setStyleSheet("QPushButton{background-color:rgba(255,255,255,0.9);border-radius:4px;}"
"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);}");*/
//ui->iconLabel->setStyleSheet("background-color:transparent;");
ui->fakeSpacer->setStyleSheet("background-color:transparent;");
@@ -509,17 +516,18 @@ void MainWindow::setStyles() //方法:设置样式
shadowEffect_cmdBtn->setColor(Qt::gray);
shadowEffect_cmdBtn->setBlurRadius(5);
+ /*
QGraphicsDropShadowEffect *shadowEffect_monitor = new QGraphicsDropShadowEffect(this);
shadowEffect_monitor->setOffset(0,0);
shadowEffect_monitor->setColor(Qt::gray);
- shadowEffect_monitor->setBlurRadius(5);
+ shadowEffect_monitor->setBlurRadius(5);*/
ui->refreshButton->setGraphicsEffect(shadowEffect_refreshButton);
ui->adbKillerBtn->setGraphicsEffect(shadowEffect_killAdbBtn);
ui->WIFIBtn->setGraphicsEffect(shadowEffect_testBtn);
ui->WSABtn->setGraphicsEffect(shadowEffect_WSABtn);
ui->cmdBtn->setGraphicsEffect(shadowEffect_cmdBtn);
- ui->widget_monitor->setGraphicsEffect(shadowEffect_monitor);
+ //ui->widget_monitor->setGraphicsEffect(shadowEffect_monitor);
}
void MainWindow::initSonPage(int key) //槽:生成子页面
diff --git a/QtAdb/mainwindow.ui b/QtAdb/mainwindow.ui
index 650dcb1..d791777 100644
--- a/QtAdb/mainwindow.ui
+++ b/QtAdb/mainwindow.ui
@@ -51,17 +51,17 @@
- background-color:rgba(255,255,255,0.9);border-radius:4px;border:0px;}\nQPushButton:hover{background-color:rgba(255,255,255,0.7);
+ background-color:rgba(255,255,255,0.9);border-radius:4px;border:1px solid #BDBDBD;
- 5
+ 14
5
- 5
+ 14
5
@@ -78,13 +78,13 @@
0
- 30
+ 20
16777215
- 30
+ 20
@@ -93,7 +93,7 @@
- background-color: rgba(255, 255, 255, 0);
+ background-color: rgba(255, 255, 255, 0);border:0px;
CPU
@@ -102,10 +102,16 @@
-
+
+
+ 0
+ 20
+
+
16777215
- 30
+ 20
@@ -114,7 +120,7 @@
- background-color: rgba(255, 255, 255, 0);
+ background-color: rgba(255, 255, 255, 0);border:0px;
RAM
@@ -153,15 +159,15 @@
QProgressBar{
font:9pt;
- border-radius:10px;
+ border-radius:4px;
text-align:center;
/*border:1px solid #E8EDF2;*/
border:0px solid #E8EDF2;
- background-color: rgba(255,255,255,0);
+ background-color: #E0E0E0;
}
QProgressBar:chunk{
- border-radius:10px;
- background-color:qlineargradient(x1:0,y1:1,x1:1,y1:0,stop:0 #11998e, stop:1 #38ef7d);
+ border-radius:4px;
+ background-color:qlineargradient(x1:0,y1:1,x1:1,y1:0,stop:0 #38ef7d, stop:1 #11998e);
}
@@ -198,15 +204,15 @@ QProgressBar:chunk{
QProgressBar{
font:9pt;
- border-radius:10px;
+ border-radius:4px;
text-align:center;
/*border:1px solid #E8EDF2;*/
border:0px solid #E8EDF2;
- background-color: rgba(255,255,255,0);
+ background-color: #E0E0E0;
}
QProgressBar:chunk{
- border-radius:10px;
- background-color:qlineargradient(x1:0,y1:1,x1:1,y1:0,stop:0 #11998e, stop:1 #38ef7d);
+ border-radius:4px;
+ background-color:qlineargradient(x1:0,y1:1,x1:1,y1:0,stop:0 #38ef7d, stop:1 #11998e);
}
@@ -228,7 +234,7 @@ QProgressBar:chunk{
- 210
+ 0
30
@@ -238,6 +244,9 @@ QProgressBar:chunk{
30
+
+ PointingHandCursor
+
-
@@ -254,11 +263,16 @@ QProgressBar:chunk{
30
+
+ PointingHandCursor
+
<html><head/><body><p>刷新设备列表</p></body></html>
-
+ 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);}
@@ -353,6 +367,9 @@ QProgressBar:chunk{
64
+
+ PointingHandCursor
+
无线调试
@@ -393,6 +410,9 @@ QPushButton:pressed{background-color:rgba(255,255,255,0.6);}
+
+ PointingHandCursor
+
杀死ADB进程
@@ -437,7 +457,13 @@ QPushButton:pressed{background-color:rgba(255,255,255,0.6);}
-
+
+ MiSans Medium
+ 10
+
+
+
+ PointingHandCursor
QPushButton{background-color:rgba(255,255,255,0.9);border-radius:4px;border:0px;}
@@ -479,6 +505,9 @@ WSA
+
+ PointingHandCursor
+
QPushButton{background-color:rgba(255,255,255,0.9);border-radius:4px;border:0px;}
QPushButton:hover{background-color:rgba(255,255,255,0.7);}
diff --git a/QtAdb/pagelistitem.cpp b/QtAdb/pagelistitem.cpp
index c29c4f6..8e3da44 100644
--- a/QtAdb/pagelistitem.cpp
+++ b/QtAdb/pagelistitem.cpp
@@ -9,7 +9,8 @@ pageListItem::pageListItem(QWidget *parent) :
ui->enableLight->setVisible(false);
ui->widget->setStyleSheet("QWidget{background-color:transparent; border-radius:4px; border-color:gray;border:0px;}");
- ui->pic->setStyleSheet("QPushButton{background-color:rgba(255,255,255,0.6);border-radius:4px;border:0px;}");
+ ui->pic->setStyleSheet("QPushButton{background-color:rgba(255,255,255,255);border-radius:4px;border:1px solid #BDBDBD;}");
+
setStyles();
}
@@ -56,9 +57,10 @@ void pageListItem::on_copyButton_clicked()
void pageListItem::setSelectable()
{
- //ui->enableLight->setVisible(true);
+ ui->enableLight->setVisible(true);
+ isSelectable = true;
//shadowEffect_icon->setColor(Qt::green);
- ui->pic->setStyleSheet("QPushButton{background-color:rgba(255,255,255,0.9);border-radius:4px;border:0px;}");
+ //ui->pic->setStyleSheet("QPushButton{background-color:rgba(255,255,255,255);border-radius:4px;border:1px solid #BDBDBD;}");
}
void pageListItem::slot_setText(QString t, QString p)
@@ -84,7 +86,7 @@ void pageListItem::setStyles()
shadowEffect->setColor(Qt::gray);
shadowEffect->setBlurRadius(5);
ui->enableLight->setGraphicsEffect(shadowEffect);
-
+/*
QGraphicsOpacityEffect *graphicsOpacityEffect = new QGraphicsOpacityEffect(this);
graphicsOpacityEffect->setOpacity(1.0);
ui->pic->setGraphicsEffect(graphicsOpacityEffect);
@@ -93,7 +95,7 @@ void pageListItem::setStyles()
shadowEffect_icon->setOffset(0,0);
shadowEffect_icon->setColor(Qt::gray);
shadowEffect_icon->setBlurRadius(5);
- ui->pic->setGraphicsEffect(shadowEffect_icon);
+ ui->pic->setGraphicsEffect(shadowEffect_icon);*/
}
void pageListItem::slot_setStyles()
diff --git a/QtAdb/pagelistitem.h b/QtAdb/pagelistitem.h
index e10b7ee..bdd22b8 100644
--- a/QtAdb/pagelistitem.h
+++ b/QtAdb/pagelistitem.h
@@ -30,6 +30,7 @@ public:
void setSelectable();
void setStyles();
+ bool isSelectable = false;
//void emitSignal();
diff --git a/QtAdb/pagelistitem.ui b/QtAdb/pagelistitem.ui
index 9e298df..b2fee3f 100644
--- a/QtAdb/pagelistitem.ui
+++ b/QtAdb/pagelistitem.ui
@@ -30,7 +30,7 @@
0
- 0
+ 11
0
@@ -43,6 +43,9 @@
70
+
+ ArrowCursor
+
border-color: rgb(0, 255, 0);
border-width:1px;
@@ -66,7 +69,7 @@ border-width:1px;
-
- false
+ true
@@ -81,10 +84,12 @@ border-width:1px;
- OpenHandCursor
+ ForbiddenCursor
- QPushButton{background-color:rgba(255,255,255,0.9);border-radius:4px;border:0px;}/*
+ QPushButton{background-color:rgba(255,255,255,1);border-radius:4px;border:1px solid #BDBDBD;}
+/*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);}*/
@@ -119,13 +124,16 @@ QPushButton:pressed{background-color:rgba(255,255,255,0.6);}*/
-
+
+ MiSans Normal
+ 11
+
background-color: rgba(255, 255, 255, 0);
- TextLabel
+
Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft
@@ -145,6 +153,9 @@ QPushButton:pressed{background-color:rgba(255,255,255,0.6);}*/
20
+
+ PointingHandCursor
+
<html><head/><body><p>复制到剪贴板</p></body></html>
diff --git a/QtAdb/sonPages/advanced/sp_captive_portal.cpp b/QtAdb/sonPages/advanced/sp_captive_portal.cpp
index fd37311..301778b 100644
--- a/QtAdb/sonPages/advanced/sp_captive_portal.cpp
+++ b/QtAdb/sonPages/advanced/sp_captive_portal.cpp
@@ -35,6 +35,13 @@ sp_captive_portal::sp_captive_portal(QWidget *parent) :
serverLists.append("dl.google.com/generate_204");
serverLists.append("google.com");
ui->comboBox->addItems(serverLists);
+ ui->comboBox->setStyleSheet("QComboBox{color:black; border:0px; border-bottom:1px solid #BDBDBD; border-radius:0px; background-color:rgba(255,255,255,255);}"
+ "QComboBox::drop-down{border: 0px solid rgba(255,255,255,0);background-color:rgba(255,255,255,0);border-bottom-right-radius: 0px;}"
+ "QComboBox QAbstractItemView{border:1px solid #BDBDBD;border-radius:0px 0px 0px 0px;outline: 0px;}"
+ "QComboBox QAbstractItemView::item{height:30px;border:0px solid #BDBDBD;border-radius:0px 0px 0px 0px;}"
+ "QComboBox QAbstractItemView::item:hover{height:30px;border:0px solid #BDBDBD;border-radius:0px 0px 0px 0px;color:black}"
+ "QComboBox QAbstractItemView::item:selected{height:30px;border:1px solid #BDBDBD;border-radius:0px 0px 0px 0px;color:black}"
+ );
diff --git a/QtAdb/sonPages/advanced/sp_scales.cpp b/QtAdb/sonPages/advanced/sp_scales.cpp
index 538f3ca..a7bd98a 100644
--- a/QtAdb/sonPages/advanced/sp_scales.cpp
+++ b/QtAdb/sonPages/advanced/sp_scales.cpp
@@ -58,9 +58,36 @@ void sp_scales::setShadow(QWidget* wgt)
void sp_scales::refresh()
{
- ui->current_animator->setText("当前:" + process->run("adb shell settings get global animator_duration_scale",dev).simplified());
- ui->current_transition->setText("当前:" + process->run("adb shell settings get global transition_animation_scale",dev).simplified());
- ui->current_window->setText("当前:" + process->run("adb shell settings get global window_animation_scale",dev).simplified());
+ /*
+ pageListItemStruct *screen_resolution = initStruct(devInfo);
+ screen_resolution->item->setText_title("屏幕分辨率");
+ screen_resolution->item->setPic(":/ico/image/ico/fullscreen-line.svg");
+ screen_resolution->thread->initThread("adb shell wm size", dev, ": ");
+ QEventLoop::connect(screen_resolution->thread,SIGNAL(signal_output(QString)),screen_resolution->item,SLOT(slot_setText_profile(QString)));
+ screen_resolution->thread->start();
+ screen_resolution->item->setSelectable();
+ devInfo->addItemsToList(screen_resolution->item);
+ */
+
+
+ adbThread *thread_animator = new adbThread(this);
+ thread_animator->initThread("adb shell settings get global animator_duration_scale", dev);
+ QEventLoop::connect(thread_animator,SIGNAL(signal_output(QString)),this,SLOT(setText_animator(QString)));
+ thread_animator->start();
+
+ adbThread *thread_transition = new adbThread(this);
+ thread_transition->initThread("adb shell settings get global transition_animation_scale", dev);
+ QEventLoop::connect(thread_transition,SIGNAL(signal_output(QString)),this,SLOT(setText_transition(QString)));
+ thread_transition->start();
+
+ adbThread *thread_window = new adbThread(this);
+ thread_window->initThread("adb shell settings get global window_animation_scale", dev);
+ QEventLoop::connect(thread_window,SIGNAL(signal_output(QString)),this,SLOT(setText_window(QString)));
+ thread_window->start();
+
+ //ui->current_animator->setText("当前:" + process->run("adb shell settings get global animator_duration_scale",dev).simplified());
+ //ui->current_transition->setText("当前:" + process->run("adb shell settings get global transition_animation_scale",dev).simplified());
+ //ui->current_window->setText("当前:" + process->run("adb shell settings get global window_animation_scale",dev).simplified());
ui->lineEdit_transition->clear();
ui->lineEdit_window->clear();
ui->lineEdit_animator->clear();
@@ -84,3 +111,18 @@ void sp_scales::on_pushButton_window_clicked()
process->run("adb shell settings put global window_animation_scale " + ui->lineEdit_window->text().simplified(), dev);
refresh();
}
+
+void sp_scales::setText_animator(QString s)
+{
+ ui->current_animator->setText("当前:" + s.simplified());
+}
+
+void sp_scales::setText_transition(QString s)
+{
+ ui->current_transition->setText("当前:" + s.simplified());
+}
+
+void sp_scales::setText_window(QString s)
+{
+ ui->current_window->setText("当前:" + s.simplified());
+}
diff --git a/QtAdb/sonPages/advanced/sp_scales.h b/QtAdb/sonPages/advanced/sp_scales.h
index f87d455..fdc5c3e 100644
--- a/QtAdb/sonPages/advanced/sp_scales.h
+++ b/QtAdb/sonPages/advanced/sp_scales.h
@@ -6,6 +6,7 @@
#include
//#include
#include "../../adbprocess.h"
+#include "../../threads/adbthread.h"
namespace Ui {
class sp_scales;
@@ -37,6 +38,12 @@ private:
void setShadow(QWidget* wgt);
void refresh();
+
+private slots:
+ void setText_animator(QString);
+ void setText_transition(QString);
+ void setText_window(QString);
+
};
#endif // SP_SCALES_H
diff --git a/QtAdb/sonPages/advanced/sp_scales.ui b/QtAdb/sonPages/advanced/sp_scales.ui
index df0471e..8a9e97f 100644
--- a/QtAdb/sonPages/advanced/sp_scales.ui
+++ b/QtAdb/sonPages/advanced/sp_scales.ui
@@ -125,7 +125,7 @@ border:0px solid #BDBDBD;
- 0
+ 100
40
@@ -156,7 +156,7 @@ border:0px solid #BDBDBD;
- 0
+ 100
40
@@ -187,7 +187,7 @@ border:0px solid #BDBDBD;
- 0
+ 100
40
@@ -222,7 +222,7 @@ border:0px solid #BDBDBD;
- 0
+ 100
40
@@ -242,7 +242,7 @@ border:0px solid #BDBDBD;
background-color:rgba(255,255,255,0.6);border-radius:4px;border:0px;
- NULL
+ 未知
Qt::AlignCenter
@@ -253,7 +253,7 @@ border:0px solid #BDBDBD;
- 0
+ 100
40
@@ -273,7 +273,7 @@ border:0px solid #BDBDBD;
background-color:rgba(255,255,255,0.6);border-radius:4px;border:0px;
- NULL
+ 未知
Qt::AlignCenter
@@ -284,7 +284,7 @@ border:0px solid #BDBDBD;
- 0
+ 100
40
@@ -304,7 +304,7 @@ border:0px solid #BDBDBD;
background-color:rgba(255,255,255,0.6);border-radius:4px;border:0px;
- NULL
+ 未知
Qt::AlignCenter
@@ -576,7 +576,7 @@ QPushButton:pressed{background-color:rgba(255,255,255,0.6);}
- QPushButton{background-color:rgba(255,255,255,0.9);border-radius:4px;border:0px;}
+ QPushButton{background-color:rgba(255,255,255,0.6);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);}
diff --git a/QtAdb/sonPages/apps/sp_permissions.cpp b/QtAdb/sonPages/apps/sp_permissions.cpp
index 979e856..c38df45 100644
--- a/QtAdb/sonPages/apps/sp_permissions.cpp
+++ b/QtAdb/sonPages/apps/sp_permissions.cpp
@@ -44,6 +44,11 @@ sp_permissions::sp_permissions(QWidget *parent) :
ui->back_to_basePage_2->setGraphicsEffect(shadowEffect_settingsBtn);
ui->open_another_window->setGraphicsEffect(shadowEffect_openBtn);
+ QFile file("://qss/scrollbar.qss");
+ file.open(QFile::ReadOnly);
+ ui->tableView->verticalScrollBar()->setStyleSheet(file.readAll());
+ ui->tableView->horizontalScrollBar()->setStyleSheet(file.readAll());
+
}
sp_permissions::~sp_permissions()
diff --git a/QtAdb/sonPages/links.cpp b/QtAdb/sonPages/links.cpp
index 0a747bc..d31d298 100644
--- a/QtAdb/sonPages/links.cpp
+++ b/QtAdb/sonPages/links.cpp
@@ -1,4 +1,5 @@
#include "links.h"
+#include "qgraphicseffect.h"
#include "qicon.h"
#include "qscrollbar.h"
#include "ui_links.h"
@@ -17,9 +18,23 @@ links::links(QWidget *parent) :
file.open(QFile::ReadOnly);
ui->scrollArea->verticalScrollBar()->setStyleSheet(file.readAll());
ui->scrollArea->horizontalScrollBar()->setStyleSheet(file.readAll());
+
+ setShadow(ui->widget_11);
+ setShadow(ui->widget_12);
+ setShadow(ui->widget_14);
+ setShadow(ui->widget_15);
}
links::~links()
{
delete ui;
}
+
+void links::setShadow(QWidget* wgt)
+{
+ QGraphicsDropShadowEffect *shadowEffect_widget = new QGraphicsDropShadowEffect(this);
+ shadowEffect_widget->setOffset(0,0);
+ shadowEffect_widget->setColor(Qt::gray);
+ shadowEffect_widget->setBlurRadius(5);
+ wgt->setGraphicsEffect(shadowEffect_widget);
+}
diff --git a/QtAdb/sonPages/links.h b/QtAdb/sonPages/links.h
index 67a8d3c..38f8575 100644
--- a/QtAdb/sonPages/links.h
+++ b/QtAdb/sonPages/links.h
@@ -3,6 +3,7 @@
#include
#include
+#include
namespace Ui {
class links;
@@ -18,6 +19,8 @@ public:
private:
Ui::links *ui;
+
+ void setShadow(QWidget* wgt);
};
#endif // LINKS_H
diff --git a/QtAdb/sonPages/links.ui b/QtAdb/sonPages/links.ui
index 2b6d468..f1b3481 100644
--- a/QtAdb/sonPages/links.ui
+++ b/QtAdb/sonPages/links.ui
@@ -18,6 +18,18 @@
/*background-color: qlineargradient(spread:pad, x1:0, y1:0, x2:1, y2:1, stop:0 rgba(238, 154, 229, 255), stop:1 rgba(89, 97, 249, 255));*/
+
+ 30
+
+
+ 0
+
+
+ 30
+
+
+ 0
+
-
@@ -30,12 +42,18 @@
0
- -1495
- 797
- 1981
+ 0
+ 759
+ 1969
+
+ 5
+
+
+ 5
+
-
@@ -51,7 +69,7 @@
- background-color:rgba(255,255,255,0.8);border-radius:0px;border:0px;border-bottom:1px solid #BDBDBD;
+ background-color:rgba(255,255,255,0);border-radius:0px;border:0px;border-bottom:1px solid #BDBDBD;
ADB
@@ -67,7 +85,7 @@
- background-color:rgba(255,255,255,0.8);border-radius:4px;border:0px solid #BDBDBD;
+ background-color:rgba(255,255,255,0);border-radius:4px;border:0px solid #BDBDBD;
-
@@ -85,7 +103,8 @@
- border:0px;image:url(:/linkIcons/image/webicons/android.png);
+ border:0px;image:url(:/linkIcons/image/webicons/android.png);border-radius:4px;
+background-color: rgba(255, 255, 255, 0);
@@ -138,7 +157,7 @@
- background-color:rgba(255,255,255,0.8);border-radius:4px;border:0px solid #BDBDBD;
+ background-color:rgba(255,255,255,0);border-radius:4px;border:0px solid #BDBDBD;
-
@@ -209,7 +228,7 @@
- background-color:rgba(255,255,255,0.8);border-radius:4px;border:0px solid #BDBDBD;
+ background-color:rgba(255,255,255,0);border-radius:4px;border:0px solid #BDBDBD;
-
@@ -283,7 +302,7 @@
- background-color:rgba(255,255,255,0.8);border-radius:4px;border:0px solid #BDBDBD;
+ background-color:rgba(255,255,255,0);border-radius:4px;border:0px solid #BDBDBD;
-
@@ -301,7 +320,8 @@
- border:0px;image:url(:/linkIcons/image/webicons/jamcz.png);
+ border:0px;image:url(:/linkIcons/image/webicons/jamcz.png);border-radius:4px;
+background-color: rgba(255, 255, 255, 0);
@@ -366,7 +386,7 @@
- background-color:rgba(255,255,255,0.8);border-radius:0px;border:0px;border-bottom:1px solid #BDBDBD;
+ background-color:rgba(255,255,255,0);border-radius:0px;border:0px;border-bottom:1px solid #BDBDBD;
Recovery
@@ -382,7 +402,7 @@
- background-color:rgba(255,255,255,0.8);border-radius:4px;border:0px solid #BDBDBD;
+ background-color:rgba(255,255,255,0);border-radius:4px;border:0px solid #BDBDBD;
-
@@ -453,7 +473,7 @@
- background-color:rgba(255,255,255,0.8);border-radius:4px;border:0px solid #BDBDBD;
+ background-color:rgba(255,255,255,0);border-radius:4px;border:0px solid #BDBDBD;
-
@@ -533,7 +553,7 @@
- background-color:rgba(255,255,255,0.8);border-radius:0px;border:0px;border-bottom:1px solid #BDBDBD;
+ background-color:rgba(255,255,255,0);border-radius:0px;border:0px;border-bottom:1px solid #BDBDBD;
模块
@@ -549,7 +569,7 @@
- background-color:rgba(255,255,255,0.8);border-radius:4px;border:0px solid #BDBDBD;
+ background-color:rgba(255,255,255,0);border-radius:4px;border:0px solid #BDBDBD;
-
@@ -620,7 +640,7 @@
- background-color:rgba(255,255,255,0.8);border-radius:4px;border:0px solid #BDBDBD;
+ background-color:rgba(255,255,255,0);border-radius:4px;border:0px solid #BDBDBD;
-
@@ -701,7 +721,7 @@ border-radius:4px;
- background-color:rgba(255,255,255,0.8);border-radius:0px;border:0px;border-bottom:1px solid #BDBDBD;
+ background-color:rgba(255,255,255,0);border-radius:0px;border:0px;border-bottom:1px solid #BDBDBD;
ROMs
@@ -717,7 +737,7 @@ border-radius:4px;
- background-color:rgba(255,255,255,0.8);border-radius:4px;border:0px solid #BDBDBD;
+ background-color:rgba(255,255,255,0);border-radius:4px;border:0px solid #BDBDBD;
-
@@ -788,7 +808,7 @@ border-radius:4px;
- background-color:rgba(255,255,255,0.8);border-radius:4px;border:0px solid #BDBDBD;
+ background-color:rgba(255,255,255,0);border-radius:4px;border:0px solid #BDBDBD;
-
@@ -859,7 +879,7 @@ border-radius:4px;
- background-color:rgba(255,255,255,0.8);border-radius:4px;border:0px solid #BDBDBD;
+ background-color:rgba(255,255,255,0);border-radius:4px;border:0px solid #BDBDBD;
-
@@ -930,7 +950,7 @@ border-radius:4px;
- background-color:rgba(255,255,255,0.8);border-radius:4px;border:0px solid #BDBDBD;
+ background-color:rgba(255,255,255,0);border-radius:4px;border:0px solid #BDBDBD;
-
@@ -1001,7 +1021,7 @@ border-radius:4px;
- background-color:rgba(255,255,255,0.8);border-radius:4px;border:0px solid #BDBDBD;
+ background-color:rgba(255,255,255,0);border-radius:4px;border:0px solid #BDBDBD;
-
@@ -1072,7 +1092,7 @@ border-radius:4px;
- background-color:rgba(255,255,255,0.8);border-radius:4px;border:0px solid #BDBDBD;
+ background-color:rgba(255,255,255,0);border-radius:4px;border:0px solid #BDBDBD;
-
@@ -1143,7 +1163,7 @@ border-radius:4px;
- background-color:rgba(255,255,255,0.8);border-radius:4px;border:0px solid #BDBDBD;
+ background-color:rgba(255,255,255,0);border-radius:4px;border:0px solid #BDBDBD;
-
@@ -1214,7 +1234,7 @@ border-radius:4px;
- background-color:rgba(255,255,255,0.8);border-radius:4px;border:0px solid #BDBDBD;
+ background-color:rgba(255,255,255,0);border-radius:4px;border:0px solid #BDBDBD;
-
@@ -1285,7 +1305,7 @@ border-radius:4px;
- background-color:rgba(255,255,255,0.8);border-radius:4px;border:0px solid #BDBDBD;
+ background-color:rgba(255,255,255,0);border-radius:4px;border:0px solid #BDBDBD;
-
@@ -1356,7 +1376,7 @@ border-radius:4px;
- background-color:rgba(255,255,255,0.8);border-radius:4px;border:0px solid #BDBDBD;
+ background-color:rgba(255,255,255,0);border-radius:4px;border:0px solid #BDBDBD;
-
@@ -1427,7 +1447,7 @@ border-radius:4px;
- background-color:rgba(255,255,255,0.8);border-radius:4px;border:0px solid #BDBDBD;
+ background-color:rgba(255,255,255,0);border-radius:4px;border:0px solid #BDBDBD;
-
@@ -1498,7 +1518,7 @@ border-radius:4px;
- background-color:rgba(255,255,255,0.8);border-radius:4px;border:0px solid #BDBDBD;
+ background-color:rgba(255,255,255,0);border-radius:4px;border:0px solid #BDBDBD;
-
@@ -1569,7 +1589,7 @@ border-radius:4px;
- background-color:rgba(255,255,255,0.8);border-radius:4px;border:0px solid #BDBDBD;
+ background-color:rgba(255,255,255,0);border-radius:4px;border:0px solid #BDBDBD;
-
@@ -1640,7 +1660,7 @@ border-radius:4px;
- background-color:rgba(255,255,255,0.8);border-radius:4px;border:0px solid #BDBDBD;
+ background-color:rgba(255,255,255,0);border-radius:4px;border:0px solid #BDBDBD;
-
diff --git a/QtAdb/sonPages/sonpagebase.ui b/QtAdb/sonPages/sonpagebase.ui
index a56cdad..22e0889 100644
--- a/QtAdb/sonPages/sonpagebase.ui
+++ b/QtAdb/sonPages/sonpagebase.ui
@@ -26,200 +26,8 @@
30
-
-
-
-
- border-radius: 4px;
-border:1px solid #BDBDBD;
-
-
-
- 11
-
-
- 11
-
-
- 11
-
-
- 11
-
-
-
-
-
-
-
-
-
-
-
-
- 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/arrow-left-line.svg:/ico/image/ico/arrow-left-line.svg
-
-
-
- 18
- 18
-
-
-
-
- -
-
-
- Qt::Horizontal
-
-
-
- 40
- 20
-
-
-
-
- -
-
-
-
- 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
-
-
-
-
-
-
- -
-
-
-
- 50
- 50
-
-
-
-
- 50
- 50
-
-
-
- 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/play-line.svg:/ico/image/ico/play-line.svg
-
-
-
- 30
- 30
-
-
-
-
- -
-
-
- Qt::Vertical
-
-
-
- 20
- 40
-
-
-
-
-
-
-
-
-
-
-
-
+