diff --git a/Classes/Loading.cpp b/Classes/Loading.cpp index 02206f2..2d161e8 100644 --- a/Classes/Loading.cpp +++ b/Classes/Loading.cpp @@ -14,14 +14,19 @@ Loading::Loading(QWidget *parent) ui.label_2->hide(); ui.progressBar->setValue(0); + QGraphicsOpacityEffect *opacityEffect = new QGraphicsOpacityEffect; + ui.progressBar->setGraphicsEffect(opacityEffect); + opacityEffect->setOpacity(0.9); - // ±³¾°gif - // QMovie *pic = new QMovie("Resources/image/loading.gif"); - // ui.label_4->setMovie(pic); - // pic->start(); + // ±³¾° + QPixmap *pixmap = new QPixmap("Resources/image/loading.png"); + pixmap->scaled(ui.label_4->size(), Qt::KeepAspectRatio); + ui.label_4->setScaledContents(true); + ui.label_4->setPixmap(*pixmap); // todo ¼ÓÔØ + ui.label->hide(); ui.progressBar->setValue(100); ui.label_2->show(); ready2Enter = true; diff --git a/Classes/Loading.h b/Classes/Loading.h index ec253c6..1296365 100644 --- a/Classes/Loading.h +++ b/Classes/Loading.h @@ -4,7 +4,7 @@ #include "ui_Loading.h" #include "Reconstruction.h" #include -#include +#include class Loading : public QWidget { diff --git a/Resources/image/loading.png b/Resources/image/loading.png new file mode 100644 index 0000000..bbd7fd0 Binary files /dev/null and b/Resources/image/loading.png differ diff --git a/Resources/qss/aqua.qss b/Resources/qss/aqua.qss index cce4c77..34ac6c5 100644 --- a/Resources/qss/aqua.qss +++ b/Resources/qss/aqua.qss @@ -127,15 +127,15 @@ QLCDNumber { } QProgressBar { text-align: center; - color: rgb(240, 240, 240); + color: #000000; border-width: 1px; border-radius: 10px; border-color: rgb(230, 230, 230); border-style: solid; - background-color:rgb(207,207,207); + background-color: #ffffff; } QProgressBar::chunk { - background-color: qlineargradient(spread:pad, x1:0.5, y1:1, x2:0.5, y2:0, stop:0 rgba(49, 147, 250, 255), stop:1 rgba(34, 142, 255, 255)); + background-color: qlineargradient(spread:pad, x1:0.5, y1:1, x2:0.5, y2:0, stop:0 #ffee99;, stop:1 #ffee99;); border-radius: 10px; } QMenuBar { diff --git a/UI/Loading.ui b/UI/Loading.ui index c8e7ed1..f15c7ec 100644 --- a/UI/Loading.ui +++ b/UI/Loading.ui @@ -6,8 +6,8 @@ 0 0 - 871 - 494 + 858 + 485 @@ -17,7 +17,7 @@ 360 - 200 + 410 151 41 @@ -28,6 +28,9 @@ 14 + + color: rgb(255, 255, 255); + LOADING... @@ -35,10 +38,10 @@ - 80 + 140 330 - 711 - 23 + 571 + 27 @@ -48,7 +51,7 @@ - 320 + 330 420 181 31 @@ -60,6 +63,9 @@ 18 + + color: rgb(255, 255, 255); + 按任æ„键进入 @@ -68,7 +74,7 @@ 260 - 120 + 40 321 41 @@ -79,6 +85,9 @@ 20 + + color: rgb(255, 255, 255); + 3D RECONSTRUCTION @@ -86,10 +95,10 @@ - 360 - 240 - 151 - 41 + -50 + 0 + 981 + 491 @@ -102,6 +111,11 @@ + label_4 + label + progressBar + label_2 + label_3