diff --git a/progressload.cpp b/progressload.cpp
index c0b6231..3595165 100644
--- a/progressload.cpp
+++ b/progressload.cpp
@@ -2,15 +2,18 @@
ProgressLoad::ProgressLoad(QWidget *parent) : QWidget(parent)
{
- m_progess=new QWidget;
+ m_progess=new QWidget(this);
m_progess->setStyleSheet("background-color:#999999");
+ setStyleSheet("background-color:#000000");
m_progess->move(0,0);
+ m_progess->show();
timer=new QTimer;
value=0;
- timer->setInterval(100);
+ timer->setInterval(10);
timer->start();
connect(timer,&QTimer::timeout,[=](){
m_progess->setFixedWidth(width()/100*value);
+ m_progess->setFixedHeight(height());
});
}
diff --git a/spark-store.pro.user b/spark-store.pro.user
new file mode 100644
index 0000000..e7baacd
--- /dev/null
+++ b/spark-store.pro.user
@@ -0,0 +1,325 @@
+
+
+
+
+
+ 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
+
+
+ Custom Executable
+
+ ProjectExplorer.CustomExecutableRunConfiguration
+
+ 3768
+ false
+ true
+ false
+ false
+ true
+
+
+
+ 1
+
+
+
+ ProjectExplorer.Project.TargetCount
+ 1
+
+
+ ProjectExplorer.Project.Updater.FileVersion
+ 20
+
+
+ Version
+ 20
+
+
diff --git a/widget.cpp b/widget.cpp
index 0ed4363..197c920 100644
--- a/widget.cpp
+++ b/widget.cpp
@@ -36,12 +36,11 @@ Widget::Widget(DBlurEffectWidget *parent) :
ui->setupUi(this);
initUI();
initConfig();
-<<<<<<< HEAD
manager = new QNetworkAccessManager(this);//下载管理
m_loadweb=ui->progressload;
-=======
- manager = new QNetworkAccessManager(this); // 下载管理
->>>>>>> 7af2af64d86d0940fc60b7061485e44e2b2b4f59
+// m_loadweb->setParent(nullptr);
+ m_loadweb->show();
+ m_loadweb->setValue(50);
connect(ui->menu_main,&QPushButton::clicked,[=](){Widget::chooseLeftMenu(0);});
connect(ui->menu_network,&QPushButton::clicked,[=](){Widget::chooseLeftMenu(1);});
@@ -106,9 +105,6 @@ Widget::Widget(DBlurEffectWidget *parent) :
});
- //
- m_loadweb->show();
- m_loadweb->setValue(50);
}
Widget::~Widget()
@@ -177,7 +173,6 @@ void Widget::initUI()
left_list[12]=ui->menu_other;
left_list[13]=ui->menu_download;
-<<<<<<< HEAD
//初始化web加载动画
// QHBoxLayout *m_weblayout=new QHBoxLayout;
@@ -195,23 +190,7 @@ void Widget::initUI()
// ui->webEngineView->setLayout(m_weblayout);
// ui->stackedWidget->setLayout(m_weblayout);
-=======
- // 初始化web加载动画
- QHBoxLayout *m_weblayout=new QHBoxLayout;
- m_weblayout->addWidget(m_loadweb);
- m_weblayout->addWidget(m_loaderror);
- m_loadweb->hide();
- m_loaderror->hide();
- m_loadweb->start();
- m_loadweb->setMaximumSize(50,50);
- m_loadweb->setMinimumSize(50,50);
- m_loadweb->setTextVisible(false);
- m_loaderror->setPixmap(QIcon::fromTheme("dialog-error").pixmap(50,50));
- m_loaderror->setAlignment(Qt::AlignCenter);
- ui->webView->setLayout(m_weblayout);
- // ui->stackedWidget->setLayout(m_weblayout);
->>>>>>> 7af2af64d86d0940fc60b7061485e44e2b2b4f59
ui->label_show->hide();
}
@@ -255,7 +234,6 @@ void Widget::initConfig()
menuUrl[11]=serverUrl + "store/#/themes";
menuUrl[12]=serverUrl + "store/#/others";
-<<<<<<< HEAD
//web控件初始化
// ui->webView->page()->setLinkDelegationPolicy(QWebPage::DelegateAllLinks); //用来激活接受linkClicked信号
@@ -265,16 +243,6 @@ void Widget::initConfig()
//初始化首页
ui->webEngineView->setUrl(menuUrl[0]);
// ui->webEngineView->setUrl(menuUrl[1]);
-=======
- // web控件初始化
- ui->webView->page()->setLinkDelegationPolicy(QWebPage::DelegateAllLinks); //用来激活接受linkClicked信号
- ui->webView->page()->settings()->setAttribute(QWebSettings::JavascriptEnabled,true);
- ui->webfoot->hide();
-
- // 初始化首页
- ui->webView->setUrl(menuUrl[0]);
->>>>>>> 7af2af64d86d0940fc60b7061485e44e2b2b4f59
- chooseLeftMenu(0);
//给下载列表赋值到数组，方便调用
for (int i =0; ititlebar;
}
-<<<<<<< HEAD
-=======
-void Widget::on_webView_loadStarted()
-{
- m_loadweb->setValue(0);
- m_loadweb->show();
- m_loaderror->hide();
- ui->label_show->hide();
-
- // 分析出服务器中的分类名称
- QUrl arg1=ui->webView->page()->mainFrame()->requestedUrl().toString();
- QStringList url_=arg1.path().split("/");
- if(url_.size()>3){
- type_name=url_[2];
- }
- // 如果是app.json就打开详情页
- if(arg1.path().right(8)=="app.json"){
- load.cancel(); // 打开并发加载线程前关闭正在执行的线程
-
- ui->label_more->setText(""); // 清空详情介绍
- ui->label_info->setText("");
- ui->label_appname->setText("");
- ui->pushButton_download->setEnabled(false);
- ui->stackedWidget->setCurrentIndex(2);
- load.cancel(); // 打开并发加载线程前关闭正在执行的线程
- load = QtConcurrent::run([=](){
- loadappinfo(arg1);
- });
- }
-}
-
->>>>>>> 7af2af64d86d0940fc60b7061485e44e2b2b4f59
void Widget::updateUI()
{
if(themeIsDark){
@@ -459,11 +395,6 @@ void Widget::updateUI()
void Widget::chooseLeftMenu(int index)
{
nowMenu=index;
-<<<<<<< HEAD
-=======
- // setfoot();
- // updatefoot();
->>>>>>> 7af2af64d86d0940fc60b7061485e44e2b2b4f59
updateUI();
left_list[index]->setStyleSheet("color:#FFFFFF;background-color:"+main_color.name()+";border-radius:8;border:0px");
@@ -917,28 +848,6 @@ void Widget::on_pushButton_website_clicked()
QDesktopServices::openUrl(QUrl(appweb));
}
-<<<<<<< HEAD
-=======
-void Widget::on_webView_loadFinished(bool arg1)
-{
- if(arg1){
- m_loadweb->hide();
- }else {
- m_loadweb->hide();
- m_loaderror->show();
- }
-
-}
-
-void Widget::on_webView_loadProgress(int progress)
-{
- m_loadweb->setValue(progress);
- if(progress>=90){
- m_loadweb->hide();
- }
-}
->>>>>>> 7af2af64d86d0940fc60b7061485e44e2b2b4f59
-
void Widget::on_pushButton_clicked()
{
QString share_url;
@@ -993,27 +902,27 @@ void Widget::on_webEngineView_urlChanged(const QUrl &arg1)
void Widget::on_webEngineView_loadStarted()
{
-// m_loadweb->setValue(0);
-// m_loadweb->show();
-// m_loaderror->hide();
-// ui->label_show->hide();
+ m_loadweb->setValue(0);
+ m_loadweb->show();
+ m_loaderror->hide();
+ ui->label_show->hide();
}
void Widget::on_webEngineView_loadProgress(int progress)
{
-// m_loadweb->setValue(progress);
-// if(progress>=90){
-// m_loadweb->hide();
-// }
+ m_loadweb->setValue(progress);
+ if(progress>=90){
+ m_loadweb->hide();
+ }
}
void Widget::on_webEngineView_loadFinished(bool arg1)
{
-// if(arg1){
-// m_loadweb->hide();
-// }else {
-// m_loadweb->hide();
-// m_loaderror->show();
-// }
+ if(arg1){
+ m_loadweb->hide();
+ }else {
+ m_loadweb->hide();
+ m_loaderror->show();
+ }
}
diff --git a/widget.ui b/widget.ui
index aa3dad4..dc8ee7d 100644
--- a/widget.ui
+++ b/widget.ui
@@ -421,13 +421,6 @@
0
-<<<<<<< HEAD
- -228
- 901
-=======
- 0
- 404
->>>>>>> 7af2af64d86d0940fc60b7061485e44e2b2b4f59
849