diff --git a/main.cpp b/main.cpp index f66023d..170e8eb 100644 --- a/main.cpp +++ b/main.cpp @@ -11,7 +11,7 @@ int main(int argc, char *argv[]) a.loadTranslator(); a.setOrganizationName("spark-union"); - a.setApplicationVersion(DApplication::buildVersion("1.0-beta7")); + a.setApplicationVersion(DApplication::buildVersion("2.0")); a.setApplicationAcknowledgementPage("https://gitee.com/deepin-community-store/spark-store"); a.setProductIcon(QIcon::fromTheme("spark-store")); //设置Logo diff --git a/spark-store.pro.user b/spark-store.pro.user deleted file mode 100644 index f471315..0000000 --- a/spark-store.pro.user +++ /dev/null @@ -1,382 +0,0 @@ - - - - - - EnvironmentId - {7600ac7d-ab76-4dd5-ada5-a4a4eaa5cfc3} - - - 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 - - 桌面 - 桌面 - {99ca2d7b-96a0-4fec-a494-f333a0a6720d} - 0 - 0 - 1 - - /home/maicss/Git/SparkStore/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/SparkStore/build-spark-store-unknown-Release - - - true - qmake - - QtProjectManager.QMakeBuildStep - false - - 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 - - Release - Release - Qt4ProjectManager.Qt4BuildConfiguration - 0 - true - - - /home/maicss/Git/SparkStore/build-spark-store-unknown-Profile - - - true - qmake - - QtProjectManager.QMakeBuildStep - true - - false - true - 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 - - 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 - - /home/maicss/Git/SparkStore/build-spark-store-unknown-Debug/spark-store - Custom Executable - - ProjectExplorer.CustomExecutableRunConfiguration - - 3768 - false - true - false - false - true - - - - - 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/SparkStore/spark-store/spark-store.pro - spark-store.pro - - 3768 - false - true - true - false - false - true - - /home/maicss/Git/SparkStore/build-spark-store-unknown-Debug - - 2 - - - - ProjectExplorer.Project.TargetCount - 1 - - - ProjectExplorer.Project.Updater.FileVersion - 20 - - - Version - 20 - - diff --git a/spark-store.pro.user.2b2d2f1 b/spark-store.pro.user.2b2d2f1 deleted file mode 100644 index 325cb8c..0000000 --- a/spark-store.pro.user.2b2d2f1 +++ /dev/null @@ -1,326 +0,0 @@ - - - - - - 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 04536c1..a82482c 100644 --- a/widget.cpp +++ b/widget.cpp @@ -254,7 +254,7 @@ void Widget::setTheme(bool isDark,QColor color) ui->btn_openDir->setStyleSheet("color:#8B91A1;background-color:#2E2F30;border:0px"); ui->webfoot->setStyleSheet("background-color:#252525"); ui->label->setStyleSheet("background-color:#252525"); - ui->scrollArea->setStyleSheet("#scrollArea{background-color:#252525}"); +// ui->scrollArea->setStyleSheet("background-color:#252525"); ui->label_show->setStyleSheet("background-color:#252525"); ui->pushButton_return->setIcon(QIcon(":/icons/icons/category_active_dark.svg")); }else { @@ -264,7 +264,7 @@ void Widget::setTheme(bool isDark,QColor color) ui->webfoot->setStyleSheet("background-color:#FFFFFF"); ui->btn_openDir->setStyleSheet("color:#505050;background-color:#FBFBFB;border:0px"); ui->label->setStyleSheet("background-color:#FFFFFF"); - ui->scrollArea->setStyleSheet("#scrollArea{background-color:#F8F8F8}"); +// ui->scrollArea->setStyleSheet("background-color:#F8F8F8"); ui->label_show->setStyleSheet("background-color:#F8F8F8"); ui->pushButton_return->setIcon(QIcon(":/icons/icons/category_active.svg")); } diff --git a/widget.ui b/widget.ui index aa8b704..560fcab 100644 --- a/widget.ui +++ b/widget.ui @@ -404,13 +404,19 @@ 0 - 10 + 0 + + QFrame::NoFrame + + + QFrame::Raised + 0 @@ -422,8 +428,8 @@ 0 0 - 901 - 849 + 889 + 854 @@ -438,6 +444,9 @@ 350 + + true + @@ -718,8 +727,8 @@ 0 0 - 867 - 325 + 851 + 323 @@ -848,8 +857,8 @@ 0 0 - 687 - 830 + 889 + 906