大幅修改UI设计

image_show.cpp

@@ -32,14 +32,6 @@ void image_show::setImage(QPixmap image)
     }else {
         m_image=image;
     }
-    //防止图片尺寸过大导致窗口覆盖整个屏幕
-//    if(screen0.width()>1024 || screen0.height()>768){
-//        re_screen1=screen0.scaled(QSize(1024,768),Qt::KeepAspectRatio,Qt::SmoothTransformation);
-//    }else {
-//        re_screen1=screen0;
-
-//    }
-//    m_image=QPixmap::fromImage(re_screen1);
 
     m_label->setPixmap(QPixmap::fromImage(re_screen0));
 }

main.cpp

@@ -1,7 +1,7 @@
-#include "mainwindow.h"
 #include <DApplication>
 #include <DWidgetUtil>  //Dtk::Widget::moveToCenter(&w); 要调用它，就得引用DWidgetUtil
 #include <QDesktopWidget>
+#include <widget.h>
 DWIDGET_USE_NAMESPACE
 int main(int argc, char *argv[])
 {
@@ -10,14 +10,14 @@ int main(int argc, char *argv[])
     a.setAttribute(Qt::AA_UseHighDpiPixmaps);
     a.loadTranslator();
     a.setOrganizationName("spark-union");
-    a.setApplicationVersion(DApplication::buildVersion("1.0-beta5.6"));
+    a.setApplicationVersion(DApplication::buildVersion("1.0-beta6.1"));
     a.setApplicationAcknowledgementPage("https://gitee.com/deepin-community-store/spark-store");
     a.setProductIcon(QIcon::fromTheme("spark-store"));  //设置Logo
 
     a.setProductName("Spark应用商店");
     a.setApplicationDescription("深度社区驱动的一款为deepin打造的第三方商店");
     a.setApplicationName("Spark应用商店"); //只有在这儿修改窗口标题才有效
-    MainWindow w;
+    Widget w;
     QDesktopWidget *s=DApplication::desktop();
     int d_w=s->width();
     int d_h=s->height();

mainwindow.cpp

@@ -7,20 +7,30 @@
 #include <QDebug>
 #include <DFileServices>
 #include <DApplicationHelper>
+#include <QVBoxLayout>
 DWIDGET_USE_NAMESPACE
 
-MainWindow::MainWindow(QWidget *parent)
+MainWindow::MainWindow(DBlurEffectWidget *parent)
-    : DMainWindow(parent)
+    : DBlurEffectWidget(parent)
 {
     w = new Widget;
 
+    QVBoxLayout *layout=new QVBoxLayout;
+//    layout->addWidget(titlebar);
+//    titlebar->show();
+    titlebar=w->getTitlebar();
+    layout->addWidget(w);
+    w->show();
+    setLayout(layout);
+    layout->setMargin(0);
+    layout->setSpacing(0);
     resize(w->size()); //设置窗口大小
-    setCentralWidget(w);
+//    setCentralWidget(w);
 
     //添加搜索框
-    DMainWindow::titlebar()->addWidget(searchEdit);
+    titlebar->addWidget(searchEdit);
-    DMainWindow::titlebar()->setIcon(QIcon::fromTheme("spark-store"));
+//    titlebar->setIcon(QIcon::fromTheme("spark-store"));
-    DMainWindow::titlebar()->setTitle("星火应用商店");
+    titlebar->setTitle("星火应用商店");
     searchEdit->setPlaceholderText("搜索或打开链接");
     searchEdit->setMaximumWidth(300);
 
@@ -28,13 +38,10 @@ MainWindow::MainWindow(QWidget *parent)
     QAction *setting=new QAction("设置");
     QMenu *menu=new QMenu;
     menu->addAction(setting);
-    DMainWindow::titlebar()->setMenu(menu);
+    titlebar->setMenu(menu);
 
 
 
-//    connect(DGuiApplicationHelper::instance(),&DGuiApplicationHelper::instance()->applicationPalette().highlight().color()::)
-
-
     //链接信号和槽
 
     //设置活动颜色和明暗模式
@@ -49,6 +56,8 @@ MainWindow::MainWindow(QWidget *parent)
             w->setTheme(false,main_color);
         }
     });
+
+
     //设置菜单
     connect(setting,&QAction::triggered,w,&Widget::opensetting);
     //搜索事件
@@ -64,6 +73,7 @@ MainWindow::MainWindow(QWidget *parent)
 
 
 
+
 }
 
 MainWindow::~MainWindow()

mainwindow.h

@@ -9,16 +9,16 @@
 #include <DTitlebar>
 DWIDGET_USE_NAMESPACE
 
-class MainWindow : public DMainWindow
+class MainWindow : public DBlurEffectWidget
 {
     Q_OBJECT
 
 
 public:
-    MainWindow(QWidget *parent = nullptr);
+    MainWindow(DBlurEffectWidget *parent = nullptr);
     ~MainWindow();
     DSearchEdit *searchEdit=new DSearchEdit;
-    DTitlebar *titlebar=new DTitlebar;
+    DTitlebar *titlebar;
     void openUrl(QUrl);
 
 private:

spark-store.pro

@@ -24,13 +24,12 @@ DEFINES += QT_DEPRECATED_WARNINGS
 
 
 SOURCES += main.cpp\
-        mainwindow.cpp \
     widget.cpp \
     downloadlist.cpp \
     image_show.cpp \
     big_image.cpp
 
-HEADERS  += mainwindow.h \
+HEADERS  += \
     widget.h \
     downloadlist.h \
     image_show.h \

widget.cpp

@@ -25,11 +25,12 @@
 #include "image_show.h"
 #include <DBlurEffectWidget>
 #include <QClipboard>
+#include <DApplication>
 #include <DGuiApplicationHelper>
 DWIDGET_USE_NAMESPACE
 
-Widget::Widget(QWidget *parent) :
+Widget::Widget(DBlurEffectWidget *parent) :
-    QWidget(parent),
+    DBlurEffectWidget(parent),
     ui(new Ui::Widget)
 {
     ui->setupUi(this);
@@ -51,6 +52,30 @@ Widget::Widget(QWidget *parent) :
     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(searchEdit,&DSearchEdit::editingFinished,this,[=](){
+        QString searchtext=searchEdit->text();
+        if(searchtext!=""){
+            qDebug()<<searchEdit->text();
+            searchApp(searchtext);
+        }
+        searchEdit->clearEdit();
+
+    });
+    connect(DGuiApplicationHelper::instance(), &DGuiApplicationHelper::themeTypeChanged, this, [=](DGuiApplicationHelper::ColorType themeType) {
+        QColor main_color;
+        main_color=DGuiApplicationHelper::instance()->applicationPalette().highlight().color();
+        if(themeType==DGuiApplicationHelper::DarkType){
+            qDebug()<<"Dark";
+            setTheme(true,main_color);
+        }else {
+            qDebug()<<"White";
+            setTheme(false,main_color);
+        }
+    });
 
     //计算显示下载速度
     download_speed.setInterval(1000);
@@ -80,29 +105,46 @@ Widget::Widget(QWidget *parent) :
 Widget::~Widget()
 {
     delete ui;
+    qDebug()<<"exit";
+    DApplication::quit();
 }
 void Widget::initUI()
 {
     //ui初始化
-
+    setMaskAlpha(230);
+    ui->webfoot->setFixedHeight(0);
     ui->stackedWidget->setCurrentIndex(0);
     ui->listWidget->hide();
     ui->label_setting1->hide();
     ui->pushButton_uninstall->hide();
     ui->line1_widget->setStyleSheet("background-color:#808080");
-    ui->line2_widget->setStyleSheet("background-color:#808080");
+    ui->icon->setPixmap(QIcon::fromTheme("spark-store").pixmap(36,36));
+
 
 
     //初始化分界线
     QGraphicsOpacityEffect *opacityEffect_1=new QGraphicsOpacityEffect;
-    QGraphicsOpacityEffect *opacityEffect_2=new QGraphicsOpacityEffect;
     opacityEffect_1->setOpacity(0.1);
-    opacityEffect_2->setOpacity(0.1);
     ui->line1_widget->setGraphicsEffect(opacityEffect_1);
-    ui->line2_widget->setGraphicsEffect(opacityEffect_2);
 
 
 
+    //搜索框
+    titlebar=ui->titlebar;
+    titlebar->addWidget(searchEdit);
+//    titlebar->setIcon(QIcon::fromTheme("spark-store"));
+    titlebar->setTitle("星火应用商店");
+    searchEdit->setPlaceholderText("搜索或打开链接");
+    searchEdit->setMaximumWidth(300);
+    titlebar->setSeparatorVisible(true);
+//    titlebar->setAutoHideOnFullscreen(true);
+
+    //添加菜单项
+    QAction *setting=new QAction("设置");
+    QMenu *menu=new QMenu;
+    menu->addAction(setting);
+    titlebar->setMenu(menu);
+    connect(setting,&QAction::triggered,this,&Widget::opensetting);
 
     //初始化菜单数组
     left_list[0]=ui->menu_main;
@@ -163,8 +205,6 @@ void Widget::initConfig()
         serverUrl="http://store.jerrywang.top/";//默认URL
     }
     configCanSave=true;   //防止出发保存配置信号
-//    ui->
-//    menuUrl[0]="https://mp.weixin.qq.com/s/1OmCgJ13yVDSRebdgtW9fg";
     menuUrl[0]=serverUrl + "store/#/";
     menuUrl[1]=serverUrl + "store/#/network";
     menuUrl[2]=serverUrl + "store/#/relations";
@@ -183,7 +223,7 @@ void Widget::initConfig()
     //web控件初始化
     ui->webView->page()->setLinkDelegationPolicy(QWebPage::DelegateAllLinks);   //用来激活接受linkClicked信号
     ui->webView->page()->settings()->setAttribute(QWebSettings::JavascriptEnabled,true);
-
+    ui->webfoot->hide();
 
     //初始化首页
     ui->webView->setUrl(menuUrl[0]);
@@ -213,20 +253,33 @@ void Widget::setTheme(bool isDark,QColor color)
     if(isDark){
         //黑色模式
         themeIsDark=true;
-        ui->widget_menuList->setStyleSheet("background-color:#282828");
         ui->webView->setStyleSheet("background-color:#282828");
         ui->btn_openDir->setStyleSheet("color:#8B91A1;background-color:#2E2F30;border:0px");
-//        ui->webView->page()->;
+        ui->webfoot->setStyleSheet("background-color:#252525");
+        ui->label->setStyleSheet("background-color:#252525");
+        ui->scrollArea->setStyleSheet("#scrollArea{background-color:#252525}");
+        ui->label_show->setStyleSheet("background-color:#252525");
     }else {
         //亮色模式
         themeIsDark=false;
-        ui->widget_menuList->setStyleSheet("background-color:#FFFFFF");
         ui->webView->setStyleSheet("background-color:#FFFFFF");
+        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->label_show->setStyleSheet("background-color:#F8F8F8");
     }
     main_color=color;
 //    left_list[nowMenu]->setStyleSheet("color:#FFFFFF;background-color:"+main_color.name()+";border-radius:8;border:0px");
+    if(ui->stackedWidget->currentIndex()==0){
         chooseLeftMenu(nowMenu);
+    }
+
+}
+
+DTitlebar* Widget::getTitlebar()
+{
+    return ui->titlebar;
 }
 
 void Widget::on_webView_loadStarted()
@@ -276,10 +329,12 @@ void Widget::chooseLeftMenu(int index)
 {
 
     nowMenu=index;
+//    setfoot();
+//    updatefoot();
     for (int i=0;i<14;i++) {
         left_list[i]->setStyleSheet("border:0px");
         left_list[i]->setFont(QFont("",11));
-        left_list[i]->setMinimumHeight(30);
+        left_list[i]->setFixedHeight(38);
     }
     left_list[index]->setStyleSheet("color:#FFFFFF;background-color:"+main_color.name()+";border-radius:8;border:0px");
     if(index<=12){
@@ -302,6 +357,17 @@ void Widget::chooseLeftMenu(int index)
     }
 
 }
+
+void Widget::setfoot(int h)
+{
+    foot=h;
+}
+
+void Widget::updatefoot()
+{
+    int allh=ui->stackedWidget->height();
+    ui->webfoot->setFixedHeight(allh-foot);
+}
 void Widget::loadappinfo(QUrl arg1)
 {
     //置UI状态
@@ -534,8 +600,21 @@ void Widget::httpFinished() //完成下载
 
 void Widget::on_pushButton_return_clicked()
 {
-    ui->webView->setUrl(menuUrl[nowMenu]);
     ui->stackedWidget->setCurrentIndex(0);
+
+    if(themeIsDark){
+        QString darkurl=menuUrl[nowMenu].toString();
+        QStringList tmp=darkurl.split("/");
+        darkurl.clear();
+        for (int i=0;i<tmp.size()-1;i++) {
+            darkurl+=tmp[i]+"/";
+        }
+        darkurl+="dark"+tmp[tmp.size()-1];
+        ui->webView->setUrl(darkurl);
+        qDebug()<<darkurl;
+    }else {
+        ui->webView->setUrl(menuUrl[nowMenu]);
+    }
 }
 
 void Widget::on_comboBox_server_currentIndexChanged(const QString &arg1)

widget.h

@@ -17,6 +17,8 @@
 #include <DSpinner>
 #include <DWaterProgress>
 #include <QLabel>
+#include <DTitlebar>
+#include <DSearchEdit>
 #define LIST_MAX 99 //一次最多下载数量
 #define TMP_PATH "/tmp/spark-store"
 
@@ -27,12 +29,12 @@ class Widget;
 
 
 
-class Widget : public QWidget
+class Widget : public DBlurEffectWidget
 {
 
     Q_OBJECT
 public:
-    explicit Widget(QWidget *parent = nullptr);
+    explicit Widget(DBlurEffectWidget *parent = nullptr);
     ~Widget();
     void startRequest(QUrl url);
     void searchApp(QString);
@@ -42,6 +44,7 @@ public:
     void opensetting(); //打开设置页面
     void openUrl(QUrl);
     void setTheme(bool,QColor);
+    DTitlebar* getTitlebar();
 
 private slots:
 
@@ -80,11 +83,16 @@ public:
     QString appweb;
     bool themeIsDark;
 
+
+
 private:
     void initUI();
     void initConfig();
     void loadappinfo(QUrl);
     void chooseLeftMenu(int index);
+    void setfoot(int);
+    void updatefoot();
+
     quint64 dirFileSize(const QString &path);
 
 private:
@@ -104,6 +112,9 @@ private:
     QTimer download_speed;
     QString type_name;
     QColor main_color;
+    int foot;
+    DSearchEdit *searchEdit=new DSearchEdit;
+    DTitlebar *titlebar;
 
 };
 

widget.ui

@@ -29,7 +29,213 @@
    <property name="spacing">
     <number>0</number>
    </property>
-   <item row="0" column="2">
+   <item row="0" column="0" rowspan="3">
+    <widget class="QWidget" name="widget_menuList" native="true">
+     <property name="minimumSize">
+      <size>
+       <width>150</width>
+       <height>0</height>
+      </size>
+     </property>
+     <property name="maximumSize">
+      <size>
+       <width>150</width>
+       <height>16777215</height>
+      </size>
+     </property>
+     <property name="font">
+      <font>
+       <pointsize>11</pointsize>
+      </font>
+     </property>
+     <property name="accessibleDescription">
+      <string>background-color:#FFFFFF</string>
+     </property>
+     <property name="styleSheet">
+      <string notr="true"/>
+     </property>
+     <layout class="QVBoxLayout" name="verticalLayout_24">
+      <property name="spacing">
+       <number>2</number>
+      </property>
+      <property name="leftMargin">
+       <number>5</number>
+      </property>
+      <property name="rightMargin">
+       <number>5</number>
+      </property>
+      <item>
+       <widget class="QLabel" name="icon">
+        <property name="minimumSize">
+         <size>
+          <width>0</width>
+          <height>36</height>
+         </size>
+        </property>
+        <property name="maximumSize">
+         <size>
+          <width>16777215</width>
+          <height>36</height>
+         </size>
+        </property>
+        <property name="text">
+         <string>icon</string>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <spacer name="verticalSpacer_7">
+        <property name="orientation">
+         <enum>Qt::Vertical</enum>
+        </property>
+        <property name="sizeType">
+         <enum>QSizePolicy::Fixed</enum>
+        </property>
+        <property name="sizeHint" stdset="0">
+         <size>
+          <width>20</width>
+          <height>20</height>
+         </size>
+        </property>
+       </spacer>
+      </item>
+      <item>
+       <widget class="QPushButton" name="menu_main">
+        <property name="styleSheet">
+         <string notr="true"/>
+        </property>
+        <property name="text">
+         <string>商店首页</string>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <widget class="QPushButton" name="menu_network">
+        <property name="text">
+         <string>网络应用</string>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <widget class="QPushButton" name="menu_chat">
+        <property name="text">
+         <string>社交沟通</string>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <widget class="QPushButton" name="menu_music">
+        <property name="text">
+         <string>音乐欣赏</string>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <widget class="QPushButton" name="menu_video">
+        <property name="text">
+         <string>视频播放</string>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <widget class="QPushButton" name="menu_photo">
+        <property name="text">
+         <string>图形图像</string>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <widget class="QPushButton" name="menu_game">
+        <property name="text">
+         <string>游戏娱乐</string>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <widget class="QPushButton" name="menu_office">
+        <property name="text">
+         <string>办公学习</string>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <widget class="QPushButton" name="menu_read">
+        <property name="text">
+         <string>阅读翻译</string>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <widget class="QPushButton" name="menu_dev">
+        <property name="text">
+         <string>编程开发</string>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <widget class="QPushButton" name="menu_system">
+        <property name="text">
+         <string>系统工具</string>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <widget class="QPushButton" name="menu_theme">
+        <property name="text">
+         <string>主题美化</string>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <widget class="QPushButton" name="menu_other">
+        <property name="text">
+         <string>其他应用</string>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <widget class="QWidget" name="line1_widget" native="true">
+        <property name="minimumSize">
+         <size>
+          <width>0</width>
+          <height>1</height>
+         </size>
+        </property>
+        <property name="maximumSize">
+         <size>
+          <width>16777215</width>
+          <height>4</height>
+         </size>
+        </property>
+        <property name="styleSheet">
+         <string notr="true">background-color:#808080</string>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <widget class="QPushButton" name="menu_download">
+        <property name="text">
+         <string>下载列表</string>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <spacer name="verticalSpacer">
+        <property name="orientation">
+         <enum>Qt::Vertical</enum>
+        </property>
+        <property name="sizeHint" stdset="0">
+         <size>
+          <width>20</width>
+          <height>40</height>
+         </size>
+        </property>
+       </spacer>
+      </item>
+     </layout>
+    </widget>
+   </item>
+   <item row="1" column="1">
     <widget class="QStackedWidget" name="stackedWidget">
      <property name="styleSheet">
       <string notr="true"/>
@@ -38,10 +244,13 @@
       <number>0</number>
      </property>
      <property name="currentIndex">
-      <number>1</number>
+      <number>2</number>
      </property>
      <widget class="QWidget" name="page">
       <layout class="QVBoxLayout" name="verticalLayout_4">
+       <property name="spacing">
+        <number>0</number>
+       </property>
        <property name="leftMargin">
         <number>0</number>
        </property>
@@ -56,6 +265,259 @@
        </property>
        <item>
         <widget class="QWebView" name="webView">
+         <property name="palette">
+          <palette>
+           <active>
+            <colorrole role="WindowText">
+             <brush brushstyle="SolidPattern">
+              <color alpha="255">
+               <red>65</red>
+               <green>77</green>
+               <blue>104</blue>
+              </color>
+             </brush>
+            </colorrole>
+            <colorrole role="Light">
+             <brush brushstyle="SolidPattern">
+              <color alpha="255">
+               <red>3</red>
+               <green>3</green>
+               <blue>3</blue>
+              </color>
+             </brush>
+            </colorrole>
+            <colorrole role="Dark">
+             <brush brushstyle="SolidPattern">
+              <color alpha="255">
+               <red>46</red>
+               <green>46</green>
+               <blue>46</blue>
+              </color>
+             </brush>
+            </colorrole>
+            <colorrole role="Text">
+             <brush brushstyle="SolidPattern">
+              <color alpha="255">
+               <red>65</red>
+               <green>77</green>
+               <blue>104</blue>
+              </color>
+             </brush>
+            </colorrole>
+            <colorrole role="ButtonText">
+             <brush brushstyle="SolidPattern">
+              <color alpha="255">
+               <red>65</red>
+               <green>77</green>
+               <blue>104</blue>
+              </color>
+             </brush>
+            </colorrole>
+            <colorrole role="Base">
+             <brush brushstyle="SolidPattern">
+              <color alpha="255">
+               <red>0</red>
+               <green>0</green>
+               <blue>0</blue>
+              </color>
+             </brush>
+            </colorrole>
+            <colorrole role="Window">
+             <brush brushstyle="SolidPattern">
+              <color alpha="255">
+               <red>0</red>
+               <green>0</green>
+               <blue>0</blue>
+              </color>
+             </brush>
+            </colorrole>
+            <colorrole role="HighlightedText">
+             <brush brushstyle="SolidPattern">
+              <color alpha="255">
+               <red>28</red>
+               <green>28</green>
+               <blue>28</blue>
+              </color>
+             </brush>
+            </colorrole>
+            <colorrole role="NoRole">
+             <brush brushstyle="SolidPattern">
+              <color alpha="255">
+               <red>0</red>
+               <green>0</green>
+               <blue>0</blue>
+              </color>
+             </brush>
+            </colorrole>
+           </active>
+           <inactive>
+            <colorrole role="WindowText">
+             <brush brushstyle="SolidPattern">
+              <color alpha="255">
+               <red>138</red>
+               <green>145</green>
+               <blue>161</blue>
+              </color>
+             </brush>
+            </colorrole>
+            <colorrole role="Light">
+             <brush brushstyle="SolidPattern">
+              <color alpha="255">
+               <red>3</red>
+               <green>3</green>
+               <blue>3</blue>
+              </color>
+             </brush>
+            </colorrole>
+            <colorrole role="Dark">
+             <brush brushstyle="SolidPattern">
+              <color alpha="255">
+               <red>46</red>
+               <green>46</green>
+               <blue>46</blue>
+              </color>
+             </brush>
+            </colorrole>
+            <colorrole role="Text">
+             <brush brushstyle="SolidPattern">
+              <color alpha="255">
+               <red>138</red>
+               <green>145</green>
+               <blue>161</blue>
+              </color>
+             </brush>
+            </colorrole>
+            <colorrole role="ButtonText">
+             <brush brushstyle="SolidPattern">
+              <color alpha="255">
+               <red>138</red>
+               <green>145</green>
+               <blue>161</blue>
+              </color>
+             </brush>
+            </colorrole>
+            <colorrole role="Base">
+             <brush brushstyle="SolidPattern">
+              <color alpha="255">
+               <red>0</red>
+               <green>0</green>
+               <blue>0</blue>
+              </color>
+             </brush>
+            </colorrole>
+            <colorrole role="Window">
+             <brush brushstyle="SolidPattern">
+              <color alpha="255">
+               <red>0</red>
+               <green>0</green>
+               <blue>0</blue>
+              </color>
+             </brush>
+            </colorrole>
+            <colorrole role="HighlightedText">
+             <brush brushstyle="SolidPattern">
+              <color alpha="255">
+               <red>28</red>
+               <green>28</green>
+               <blue>28</blue>
+              </color>
+             </brush>
+            </colorrole>
+            <colorrole role="NoRole">
+             <brush brushstyle="SolidPattern">
+              <color alpha="255">
+               <red>0</red>
+               <green>0</green>
+               <blue>0</blue>
+              </color>
+             </brush>
+            </colorrole>
+           </inactive>
+           <disabled>
+            <colorrole role="WindowText">
+             <brush brushstyle="SolidPattern">
+              <color alpha="255">
+               <red>46</red>
+               <green>46</green>
+               <blue>46</blue>
+              </color>
+             </brush>
+            </colorrole>
+            <colorrole role="Light">
+             <brush brushstyle="SolidPattern">
+              <color alpha="255">
+               <red>3</red>
+               <green>3</green>
+               <blue>3</blue>
+              </color>
+             </brush>
+            </colorrole>
+            <colorrole role="Dark">
+             <brush brushstyle="SolidPattern">
+              <color alpha="255">
+               <red>46</red>
+               <green>46</green>
+               <blue>46</blue>
+              </color>
+             </brush>
+            </colorrole>
+            <colorrole role="Text">
+             <brush brushstyle="SolidPattern">
+              <color alpha="255">
+               <red>46</red>
+               <green>46</green>
+               <blue>46</blue>
+              </color>
+             </brush>
+            </colorrole>
+            <colorrole role="ButtonText">
+             <brush brushstyle="SolidPattern">
+              <color alpha="255">
+               <red>46</red>
+               <green>46</green>
+               <blue>46</blue>
+              </color>
+             </brush>
+            </colorrole>
+            <colorrole role="Base">
+             <brush brushstyle="SolidPattern">
+              <color alpha="255">
+               <red>0</red>
+               <green>0</green>
+               <blue>0</blue>
+              </color>
+             </brush>
+            </colorrole>
+            <colorrole role="Window">
+             <brush brushstyle="SolidPattern">
+              <color alpha="255">
+               <red>0</red>
+               <green>0</green>
+               <blue>0</blue>
+              </color>
+             </brush>
+            </colorrole>
+            <colorrole role="HighlightedText">
+             <brush brushstyle="SolidPattern">
+              <color alpha="255">
+               <red>28</red>
+               <green>28</green>
+               <blue>28</blue>
+              </color>
+             </brush>
+            </colorrole>
+            <colorrole role="NoRole">
+             <brush brushstyle="SolidPattern">
+              <color alpha="255">
+               <red>0</red>
+               <green>0</green>
+               <blue>0</blue>
+              </color>
+             </brush>
+            </colorrole>
+           </disabled>
+          </palette>
+         </property>
          <property name="url">
           <url>
            <string>http://0.0.0.1/</string>
@@ -63,6 +525,9 @@
          </property>
         </widget>
        </item>
+       <item>
+        <widget class="QWidget" name="webfoot" native="true"/>
+       </item>
       </layout>
      </widget>
      <widget class="QWidget" name="page_2">
@@ -99,6 +564,9 @@
          <property name="styleSheet">
           <string notr="true"/>
          </property>
+         <property name="lineWidth">
+          <number>0</number>
+         </property>
          <property name="text">
           <string>当前下载列表为空</string>
          </property>
@@ -127,6 +595,9 @@
      </widget>
      <widget class="QWidget" name="page_3">
       <layout class="QVBoxLayout" name="verticalLayout_16">
+       <property name="spacing">
+        <number>0</number>
+       </property>
        <property name="leftMargin">
         <number>0</number>
        </property>
@@ -155,7 +626,7 @@
            <rect>
             <x>0</x>
             <y>0</y>
-            <width>891</width>
+            <width>901</width>
             <height>864</height>
            </rect>
           </property>
@@ -461,7 +932,7 @@
                   <rect>
                    <x>0</x>
                    <y>0</y>
-                   <width>857</width>
+                   <width>867</width>
                    <height>325</height>
                   </rect>
                  </property>
@@ -588,7 +1059,7 @@
            <rect>
             <x>0</x>
             <y>0</y>
-            <width>891</width>
+            <width>901</width>
             <height>786</height>
            </rect>
           </property>
@@ -862,194 +1333,14 @@
      </widget>
     </widget>
    </item>
-   <item row="0" column="1" rowspan="2">
+   <item row="0" column="1">
-    <widget class="QWidget" name="line2_widget" native="true">
+    <widget class="DTitlebar" name="titlebar" native="true">
-     <property name="minimumSize">
-      <size>
-       <width>1</width>
-       <height>0</height>
-      </size>
-     </property>
-     <property name="maximumSize">
-      <size>
-       <width>4</width>
-       <height>16777215</height>
-      </size>
-     </property>
-     <property name="styleSheet">
-      <string notr="true">background-color:#808080</string>
-     </property>
-    </widget>
-   </item>
-   <item row="0" column="0" rowspan="2">
-    <widget class="QWidget" name="widget_menuList" native="true">
-     <property name="minimumSize">
-      <size>
-       <width>150</width>
-       <height>0</height>
-      </size>
-     </property>
-     <property name="maximumSize">
-      <size>
-       <width>150</width>
-       <height>16777215</height>
-      </size>
-     </property>
-     <property name="font">
-      <font>
-       <pointsize>11</pointsize>
-      </font>
-     </property>
-     <property name="accessibleDescription">
-      <string>background-color:#FFFFFF</string>
-     </property>
-     <property name="styleSheet">
-      <string notr="true"/>
-     </property>
-     <layout class="QVBoxLayout" name="verticalLayout_24">
-      <property name="spacing">
-       <number>2</number>
-      </property>
-      <property name="leftMargin">
-       <number>5</number>
-      </property>
-      <property name="rightMargin">
-       <number>5</number>
-      </property>
-      <item>
-       <widget class="QPushButton" name="menu_main">
-        <property name="styleSheet">
-         <string notr="true"/>
-        </property>
-        <property name="text">
-         <string>商店首页</string>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <widget class="QPushButton" name="menu_network">
-        <property name="text">
-         <string>网络应用</string>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <widget class="QPushButton" name="menu_chat">
-        <property name="text">
-         <string>社交沟通</string>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <widget class="QPushButton" name="menu_music">
-        <property name="text">
-         <string>音乐欣赏</string>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <widget class="QPushButton" name="menu_video">
-        <property name="text">
-         <string>视频播放</string>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <widget class="QPushButton" name="menu_photo">
-        <property name="text">
-         <string>图形图像</string>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <widget class="QPushButton" name="menu_game">
-        <property name="text">
-         <string>游戏娱乐</string>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <widget class="QPushButton" name="menu_office">
-        <property name="text">
-         <string>办公学习</string>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <widget class="QPushButton" name="menu_read">
-        <property name="text">
-         <string>阅读翻译</string>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <widget class="QPushButton" name="menu_dev">
-        <property name="text">
-         <string>编程开发</string>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <widget class="QPushButton" name="menu_system">
-        <property name="text">
-         <string>系统工具</string>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <widget class="QPushButton" name="menu_theme">
-        <property name="text">
-         <string>主题美化</string>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <widget class="QPushButton" name="menu_other">
-        <property name="text">
-         <string>其他应用</string>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <widget class="QWidget" name="line1_widget" native="true">
      <property name="minimumSize">
       <size>
        <width>0</width>
-          <height>1</height>
+       <height>20</height>
       </size>
      </property>
-        <property name="maximumSize">
-         <size>
-          <width>16777215</width>
-          <height>4</height>
-         </size>
-        </property>
-        <property name="styleSheet">
-         <string notr="true">background-color:#808080</string>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <widget class="QPushButton" name="menu_download">
-        <property name="text">
-         <string>下载列表</string>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <spacer name="verticalSpacer">
-        <property name="orientation">
-         <enum>Qt::Vertical</enum>
-        </property>
-        <property name="sizeHint" stdset="0">
-         <size>
-          <width>20</width>
-          <height>219</height>
-         </size>
-        </property>
-       </spacer>
-      </item>
-     </layout>
     </widget>
    </item>
   </layout>
@@ -1066,6 +1357,12 @@
    <header location="global">image_show.h</header>
    <container>1</container>
   </customwidget>
+  <customwidget>
+   <class>DTitlebar</class>
+   <extends>QWidget</extends>
+   <header location="global">dtitlebar.h</header>
+   <container>1</container>
+  </customwidget>
  </customwidgets>
  <resources/>
  <connections/>