diff --git a/Logo-Spark.png b/Logo-Spark.png index 3e9b5b2..941a4a6 100644 Binary files a/Logo-Spark.png and b/Logo-Spark.png differ diff --git a/main.cpp b/main.cpp index 2ec314b..6f07b1a 100644 --- a/main.cpp +++ b/main.cpp @@ -3,32 +3,21 @@ #include <QDesktopWidget> #include <widget.h> #include <QTranslator> +#include <DAboutDialog> DWIDGET_USE_NAMESPACE int main(int argc, char *argv[]) { DApplication::loadDXcbPlugin(); //让bar处在标题栏中 DApplication a(argc, argv); - //DAboutDialog dialog; + DAboutDialog dialog; a.setAttribute(Qt::AA_UseHighDpiPixmaps); a.loadTranslator();//载入翻译 - - a.setOrganizationName("spark-union"); - a.setApplicationVersion(DApplication::buildVersion("2.0.2.4")); - a.setApplicationAcknowledgementPage("https://gitee.com/deepin-community-store/spark-store"); - a.setProductIcon(QIcon::fromTheme("spark-store")); //设置Logo - - a.setProductName(QLabel::tr("Spark Store")); - a.setApplicationDescription(QObject::tr("<span style=' font-size:10pt;font-weight:60;'>An appstore powered by deepin community</span><br/>""<a href='https://www.spark-app.store/'>https://www.spark-app.store</a><br/>""<span style=' font-size:12pt;'>Spark developers</span><br/>We publish this program under GPL V3")); - a.setApplicationName("Spark应用商店"); //只有在这儿修改窗口标题才有效 - Widget w; - QDesktopWidget *s=DApplication::desktop(); -/* - a.setAboutDialog(&dialog); + a.setAboutDialog(&dialog); dialog.setLicense(QObject::tr("We publish this program under GPL V3")); - dialog.setVersion(DApplication::buildVersion("Version 2.0.2.3")); + dialog.setVersion(DApplication::buildVersion("Version 2.0.2.5")); dialog.setAcknowledgementVisible(true); dialog.setAcknowledgementLink(QObject::tr("https://gitee.com/deepin-community-store/spark-store")); - //a.setApplicationAcknowledgementPage(QObject::tr("https://gitee.com/deepin-community-store/spark-store")); + a.setApplicationAcknowledgementPage(QObject::tr("https://gitee.com/deepin-community-store/spark-store")); dialog.setProductIcon(QIcon::fromTheme("spark-store")); //设置Logo dialog.setProductName(QLabel::tr("Spark Store")); //dialog.setDescription(QLabel::tr("An appstore powered by deepin community\n We born for change")); @@ -45,8 +34,7 @@ int main(int argc, char *argv[]) Widget w; QDesktopWidget *s=DApplication::desktop(); - */ - int d_w=s->width(); + int d_w=s->width(); int d_h=s->height(); if(d_w<=1366){ w.setMinimumWidth(925); @@ -80,3 +68,4 @@ int main(int argc, char *argv[]) return a.exec(); } + diff --git a/widget.cpp b/widget.cpp index 2d0c759..15ae78a 100644 --- a/widget.cpp +++ b/widget.cpp @@ -28,7 +28,7 @@ #include <QClipboard> #include <DApplication> #include <DGuiApplicationHelper> -#include <DPushButton> +#include <QPushButton> DWIDGET_USE_NAMESPACE Widget::Widget(DBlurEffectWidget *parent) : @@ -42,20 +42,20 @@ Widget::Widget(DBlurEffectWidget *parent) : m_loadweb=ui->progressload; m_loadweb->show(); - connect(ui->menu_main,&DPushButton::clicked,[=](){Widget::chooseLeftMenu(0);}); - connect(ui->menu_network,&DPushButton::clicked,[=](){Widget::chooseLeftMenu(1);}); - connect(ui->menu_chat,&DPushButton::clicked,[=](){Widget::chooseLeftMenu(2);}); - connect(ui->menu_music,&DPushButton::clicked,[=](){Widget::chooseLeftMenu(3);}); - connect(ui->menu_video,&DPushButton::clicked,[=](){Widget::chooseLeftMenu(4);}); - connect(ui->menu_photo,&DPushButton::clicked,[=](){Widget::chooseLeftMenu(5);}); - connect(ui->menu_game,&DPushButton::clicked,[=](){Widget::chooseLeftMenu(6);}); - connect(ui->menu_office,&DPushButton::clicked,[=](){Widget::chooseLeftMenu(7);}); - connect(ui->menu_read,&DPushButton::clicked,[=](){Widget::chooseLeftMenu(8);}); - connect(ui->menu_dev,&DPushButton::clicked,[=](){Widget::chooseLeftMenu(9);}); - connect(ui->menu_system,&DPushButton::clicked,[=](){Widget::chooseLeftMenu(10);}); - connect(ui->menu_theme,&DPushButton::clicked,[=](){Widget::chooseLeftMenu(11);}); - connect(ui->menu_other,&DPushButton::clicked,[=](){Widget::chooseLeftMenu(12);}); - connect(ui->menu_download,&DPushButton::clicked,[=](){Widget::chooseLeftMenu(13);}); + connect(ui->menu_main,&QPushButton::clicked,[=](){Widget::chooseLeftMenu(0);}); + connect(ui->menu_network,&QPushButton::clicked,[=](){Widget::chooseLeftMenu(1);}); + connect(ui->menu_chat,&QPushButton::clicked,[=](){Widget::chooseLeftMenu(2);}); + connect(ui->menu_music,&QPushButton::clicked,[=](){Widget::chooseLeftMenu(3);}); + connect(ui->menu_video,&QPushButton::clicked,[=](){Widget::chooseLeftMenu(4);}); + connect(ui->menu_photo,&QPushButton::clicked,[=](){Widget::chooseLeftMenu(5);}); + connect(ui->menu_game,&QPushButton::clicked,[=](){Widget::chooseLeftMenu(6);}); + connect(ui->menu_office,&QPushButton::clicked,[=](){Widget::chooseLeftMenu(7);}); + connect(ui->menu_read,&QPushButton::clicked,[=](){Widget::chooseLeftMenu(8);}); + connect(ui->menu_dev,&QPushButton::clicked,[=](){Widget::chooseLeftMenu(9);}); + connect(ui->menu_system,&QPushButton::clicked,[=](){Widget::chooseLeftMenu(10);}); + connect(ui->menu_theme,&QPushButton::clicked,[=](){Widget::chooseLeftMenu(11);}); + connect(ui->menu_other,&QPushButton::clicked,[=](){Widget::chooseLeftMenu(12);}); + connect(ui->menu_download,&QPushButton::clicked,[=](){Widget::chooseLeftMenu(13);}); // connect((ui->titlebar)) connect(&appinfoLoadThread, SIGNAL(requestResetUi()), this, SLOT(sltAppinfoResetUi()), Qt::ConnectionType::BlockingQueuedConnection); diff --git a/widget.ui b/widget.ui index 40a2ca1..0122e1c 100644 --- a/widget.ui +++ b/widget.ui @@ -211,7 +211,7 @@ <item row="2" column="0" colspan="6"> <widget class="QPushButton" name="menu_main"> <property name="styleSheet"> - <string notr="true"/> + <string notr="true">font: 11pt "Zeniq";</string> </property> <property name="text"> <string>Home </string>