diff --git a/progressload.cpp b/progressload.cpp index 15890db..3e07fb3 100644 --- a/progressload.cpp +++ b/progressload.cpp @@ -24,9 +24,14 @@ void ProgressLoad::setValue(int v) void ProgressLoad::setTheme(bool dark, QColor color) { if(dark){ - m_progess->setStyleSheet("background-color:282828"); + plt.setColor(QPalette::Background,QColor(28,28,28)); + setAutoFillBackground(true); + setPalette(plt); + }else { - m_progess->setStyleSheet("background-color:FFFFFF"); + plt.setColor(QPalette::Background,QColor(255,255,255)); + setAutoFillBackground(true); + setPalette(plt); } - setStyleSheet("background-color:"+color.name()); + m_progess->setStyleSheet("background-color:"+color.name()); } diff --git a/progressload.h b/progressload.h index 8e3a886..ffa3c7e 100644 --- a/progressload.h +++ b/progressload.h @@ -3,6 +3,7 @@ #include #include +#include class ProgressLoad : public QWidget { Q_OBJECT @@ -17,6 +18,7 @@ private: QWidget *m_progess; int value; QTimer *timer; + QPalette plt; }; #endif // PROGRESSLOAD_H diff --git a/spark-store.pro b/spark-store.pro index 58044a5..b882553 100644 --- a/spark-store.pro +++ b/spark-store.pro @@ -4,7 +4,7 @@ # #------------------------------------------------- -QT += core gui webkitwidgets network concurrent webenginewidgets +QT += core gui network concurrent webenginewidgets greaterThan(QT_MAJOR_VERSION, 4): QT += widgets diff --git a/spark-store.pro.user b/spark-store.pro.user index 325cb8c..aa03479 100644 --- a/spark-store.pro.user +++ b/spark-store.pro.user @@ -1,10 +1,10 @@ - + EnvironmentId - {2b2d2f1a-6483-4add-a570-55e1f0a2e40a} + {7600ac7d-ab76-4dd5-ada5-a4a4eaa5cfc3} ProjectExplorer.Project.ActiveTarget @@ -64,12 +64,12 @@ 桌面 桌面 - {a42d4e65-62ab-4574-9a07-1c933c50ac5d} + {99ca2d7b-96a0-4fec-a494-f333a0a6720d} 0 0 - 0 + 1 - /home/maicss/git/spark/build-spark-store-unknown-Debug + /home/maicss/Git/SparkStore/build-spark-store-unknown-Debug true @@ -125,7 +125,7 @@ true - /home/maicss/git/spark/build-spark-store-unknown-Release + /home/maicss/Git/SparkStore/build-spark-store-unknown-Release true @@ -136,7 +136,7 @@ false false - true + false true @@ -181,7 +181,7 @@ true - /home/maicss/git/spark/build-spark-store-unknown-Profile + /home/maicss/Git/SparkStore/build-spark-store-unknown-Profile true @@ -192,7 +192,7 @@ false true - true + false true @@ -252,6 +252,62 @@ 1 + false + false + 1000 + + true + + false + false + false + false + true + 0.01 + 10 + true + 1 + 25 + + 1 + true + false + true + valgrind + + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + 11 + 12 + 13 + 14 + + 2 + + /home/maicss/Git/SparkStore/build-spark-store-unknown-Debug/spark-store + Custom Executable + + ProjectExplorer.CustomExecutableRunConfiguration + + 3768 + false + true + false + false + true + + + + false false 1000 @@ -295,7 +351,7 @@ spark-store - Qt4ProjectManager.Qt4RunConfiguration:/home/maicss/git/spark/spark-store/spark-store.pro + Qt4ProjectManager.Qt4RunConfiguration:/home/maicss/Git/SparkStore/spark-store/spark-store.pro spark-store.pro 3768 @@ -306,9 +362,9 @@ false true - /home/maicss/git/spark/build-spark-store-unknown-Debug + /home/maicss/Git/SparkStore/build-spark-store-unknown-Debug - 1 + 2 diff --git a/spark-store.pro.user.2b2d2f1 b/spark-store.pro.user.2b2d2f1 new file mode 100644 index 0000000..325cb8c --- /dev/null +++ b/spark-store.pro.user.2b2d2f1 @@ -0,0 +1,326 @@ + + + + + + EnvironmentId + {2b2d2f1a-6483-4add-a570-55e1f0a2e40a} + + + ProjectExplorer.Project.ActiveTarget + 0 + + + ProjectExplorer.Project.EditorSettings + + true + false + true + + Cpp + + CppGlobal + + + + QmlJS + + QmlJSGlobal + + + 2 + UTF-8 + false + 4 + false + 80 + true + true + 1 + true + false + 0 + true + true + 0 + 8 + true + 1 + true + true + true + false + + + + ProjectExplorer.Project.PluginSettings + + + true + + + + ProjectExplorer.Project.Target.0 + + 桌面 + 桌面 + {a42d4e65-62ab-4574-9a07-1c933c50ac5d} + 0 + 0 + 0 + + /home/maicss/git/spark/build-spark-store-unknown-Debug + + + true + qmake + + QtProjectManager.QMakeBuildStep + true + + false + false + false + + + true + Make + + Qt4ProjectManager.MakeStep + + false + + + false + + 2 + Build + + ProjectExplorer.BuildSteps.Build + + + + true + Make + + Qt4ProjectManager.MakeStep + + true + clean + + false + + 1 + Clean + + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Debug + Debug + Qt4ProjectManager.Qt4BuildConfiguration + 2 + true + + + /home/maicss/git/spark/build-spark-store-unknown-Release + + + true + qmake + + QtProjectManager.QMakeBuildStep + false + + false + false + true + + + true + Make + + Qt4ProjectManager.MakeStep + + false + + + false + + 2 + Build + + ProjectExplorer.BuildSteps.Build + + + + true + Make + + Qt4ProjectManager.MakeStep + + true + clean + + false + + 1 + Clean + + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Release + Release + Qt4ProjectManager.Qt4BuildConfiguration + 0 + true + + + /home/maicss/git/spark/build-spark-store-unknown-Profile + + + true + qmake + + QtProjectManager.QMakeBuildStep + true + + false + true + true + + + true + Make + + Qt4ProjectManager.MakeStep + + false + + + false + + 2 + Build + + ProjectExplorer.BuildSteps.Build + + + + true + Make + + Qt4ProjectManager.MakeStep + + true + clean + + false + + 1 + Clean + + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Profile + Profile + Qt4ProjectManager.Qt4BuildConfiguration + 0 + true + + 3 + + + 0 + 部署 + + ProjectExplorer.BuildSteps.Deploy + + 1 + Deploy Configuration + + ProjectExplorer.DefaultDeployConfiguration + + 1 + + + false + false + 1000 + + true + + false + false + false + false + true + 0.01 + 10 + true + 1 + 25 + + 1 + true + false + true + valgrind + + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + 11 + 12 + 13 + 14 + + 2 + + spark-store + + Qt4ProjectManager.Qt4RunConfiguration:/home/maicss/git/spark/spark-store/spark-store.pro + spark-store.pro + + 3768 + false + true + true + false + false + true + + /home/maicss/git/spark/build-spark-store-unknown-Debug + + 1 + + + + ProjectExplorer.Project.TargetCount + 1 + + + ProjectExplorer.Project.Updater.FileVersion + 20 + + + Version + 20 + + diff --git a/widget.cpp b/widget.cpp index fcfd28b..04536c1 100644 --- a/widget.cpp +++ b/widget.cpp @@ -16,7 +16,6 @@ #include // 并发 #include #include -#include #include #include #include @@ -868,7 +867,7 @@ void Widget::on_webEngineView_urlChanged(const QUrl &arg1) //如果是app.json就打开详情页 if(arg1.path().right(8)=="app.json"){ load.cancel();//打开并发加载线程前关闭正在执行的线程 - + m_loadweb->setValue(0); ui->label_more->setText("");//清空详情介绍 ui->label_info->setText(""); ui->label_appname->setText(""); @@ -895,16 +894,16 @@ void Widget::on_webEngineView_loadProgress(int progress) { m_loadweb->setValue(progress); if(progress>=90){ - m_loadweb->hide(); + m_loadweb->setValue(0); } } void Widget::on_webEngineView_loadFinished(bool arg1) { if(arg1){ - m_loadweb->hide(); + m_loadweb->setValue(0); }else { - m_loadweb->hide(); + m_loadweb->setValue(0); m_loaderror->show(); }