修改软件主题为黑色

include/multiLineHeaderView.h

@@ -6,7 +6,7 @@
 struct HeaderLineStyle
 {
     QFont font = QFont("Microsoft YaHei", 9);
-    QColor color = QColor(26, 26, 26);
+    QColor color = QColor(240, 240, 240);
     Qt::Alignment alignment = Qt::AlignLeft;
 };
 

resource/PowerModeler.qrc

@@ -64,4 +64,12 @@
     <file>images/icon_db_connect.png</file>
     <file>images/icon_db_disconnect.png</file>
   </qresource>
+  <qresource prefix="theme">
+    <file>images/darkstyle/toolbar_separator_horizontal.png</file>
+    <file>images/darkstyle/branch_closed.png</file>
+    <file>images/darkstyle/branch_open.png</file>
+    <file>images/darkstyle/down-arrow.png</file>
+    <file>images/darkstyle/toolbar_separator_vertical.png</file>
+    <file>images/darkstyle/up-arrow.png</file>
+  </qresource>
 </RCC>

source/attributeSelector.cpp

@@ -15,7 +15,7 @@ AttributeSelector::AttributeSelector(const QString& connection, QWidget *parent)
     {
         //Linux下默认的Qt::Dialog即使有父窗口也无法按照子窗口的行为进行展示，并且最大、最小按钮不好关闭，因此需要去掉Dialog属性，随之而来的问题是，模态无法起作用
         setWindowFlags(windowFlags() & ~Qt::Dialog);
-        setStyleSheet("QDialog{border: 1px solid rgb(205,205,205);border-radius:5px;background-color:rgb(245,245,245);}");
+        setStyleSheet("QDialog{border: 1px solid rgb(110,110,110);border-radius:5px;background-color:rgb(30,30,30);}");
 
         m_customBorderContainer = new CustomBorderContainer(this);
         m_customBorderContainer->setOperationOptions(CustomBorderContainer::Movable | CustomBorderContainer::Resizable);

source/attributeTableDelegate.cpp

@@ -140,7 +140,7 @@ void AttributeTableDelegate::paint(QPainter* painter, const QStyleOptionViewItem
     if ((index.row() + 1) % 2 == 0)
     {
         //opt.backgroundBrush = QBrush(QColor(243, 245, 249));
-        painter->fillRect(opt.rect, QColor(240, 248, 255));
+        painter->fillRect(opt.rect, QColor(49, 54, 63));
     }
 
     //处理加粗字体逻辑
@@ -154,9 +154,9 @@ void AttributeTableDelegate::paint(QPainter* painter, const QStyleOptionViewItem
     if(option.state.testFlag(QStyle::State_Selected))
     {
         if(index.column() == 0)
-            painter->fillRect(opt.rect, QColor(70, 130, 180));
+            painter->fillRect(opt.rect, QColor(49, 91, 125));
         else
-            painter->fillRect(opt.rect, QColor(211, 241, 250));
+            painter->fillRect(opt.rect, QColor(65, 122, 166));
     }
 
     //如果行号列(第一列)被选中，做整行处理
@@ -165,7 +165,7 @@ void AttributeTableDelegate::paint(QPainter* painter, const QStyleOptionViewItem
         QModelIndex numberIndex = m_tableView->model()->index(index.row(), 0);
         QItemSelectionModel *selectionModel = m_tableView->selectionModel();
         if(selectionModel->isSelected(numberIndex))
-            painter->fillRect(opt.rect, QColor(211, 241, 250));
+            painter->fillRect(opt.rect, QColor(65, 122, 166));
     }
 
     //先执行默认绘制（包括背景、文本等基础元素）
@@ -270,6 +270,7 @@ QWidget* AttributeTableDelegate::createEditor(QWidget *parent, const QStyleOptio
     else if(dataCol == 3) //数据长度
     {
         QSpinBox* spinBox = new QSpinBox(parent);
+        //spinBox->setStyleSheet("border-radius: 0px;");
         spinBox->setRange(-1, 999);
         spinBox->setValue(0);
         return spinBox;
@@ -277,6 +278,7 @@ QWidget* AttributeTableDelegate::createEditor(QWidget *parent, const QStyleOptio
     else if(dataCol == 5) //可见性
     {
         QComboBox* comboBox = new QComboBox(parent);
+        //comboBox->setStyleSheet("QComboBox{border-radius: 0px;background-color:rgb(67, 73, 87);}");
         comboBox->addItem("1");
         comboBox->addItem("0");
         comboBox->addItem("2");
@@ -384,8 +386,22 @@ void AttributeTableDelegate::updateEditorGeometry(QWidget *editor, const QStyleO
             nY = 0;
         textEditor->setGeometry(nX, nY, editorSize.width(), editorSize.height());
     }
+    // else if(QComboBox* comboBox = qobject_cast<QComboBox*>(editor))
+    // {
+    //     comboBox->setGeometry(option.rect);
+    //     comboBox->setStyleSheet("border-radius: 0px;background-color:rgb(58, 63, 75);");
+    // }
+    else if(QSpinBox* spinBox = qobject_cast<QSpinBox*>(editor))
+    {
+        spinBox->setGeometry(option.rect.adjusted(-3,-3,3,3));
+        spinBox->setStyleSheet("background-color:rgb(58, 63, 75);"); //QSpinBox不能设置和border相关的项，否则up button无法点击，暂时不知道原因
+    }
     else
+    {
         editor->setGeometry(option.rect);
+        editor->setStyleSheet("border-radius: 0px;background-color:rgb(58, 63, 75);");
+    }
+
 }
 
 bool AttributeTableDelegate::isEnumType(const QModelIndex& index) const

source/attributeView.cpp

@@ -31,8 +31,8 @@ AttributeView::AttributeView(const ModelAttributeGroup& modelAttributeGroup, QWi
 
     //自定义表头
     m_multiLinHeader = new MultiLineHeaderView(Qt::Horizontal, this);
-    QColor bg(246, 246, 246);
-    QColor border(228, 228, 228);
+    QColor bg(40, 40, 40);
+    QColor border(30, 30, 30);
     m_multiLinHeader->setBackgroundColor(bg);
     m_multiLinHeader->setBorderColor(border);
     //主标题加粗展示

source/connectionDialog.cpp

@@ -19,7 +19,7 @@ ConnectionDialog::ConnectionDialog(QWidget *parent)
     {
         //Linux下默认的Qt::Dialog即使有父窗口也无法按照子窗口的行为进行展示，并且最大、最小按钮不好关闭，因此需要去掉Dialog属性，随之而来的问题是，模态无法起作用
         setWindowFlags(windowFlags() & ~Qt::Dialog);
-        setStyleSheet("QDialog{border: 1px solid rgb(205,205,205);border-radius:5px;background-color:rgb(245,245,245);}");
+        setStyleSheet("QDialog{border: 1px solid rgb(110,110,110);border-radius:5px;background-color:rgb(30,30,30);}");
 
         m_customBorderContainer = new CustomBorderContainer(this);
         m_customBorderContainer->setOperationOptions(CustomBorderContainer::Movable | CustomBorderContainer::Resizable);

source/groupSelectionDialog.cpp

@@ -21,7 +21,7 @@ GroupSelectionDialog::GroupSelectionDialog(QWidget *parent)
     {
         //Linux下默认的Qt::Dialog即使有父窗口也无法按照子窗口的行为进行展示，并且最大、最小按钮不好关闭，因此需要去掉Dialog属性，随之而来的问题是，模态无法起作用
         setWindowFlags(windowFlags() & ~Qt::Dialog);
-        setStyleSheet("QDialog{border: 1px solid rgb(205,205,205);border-radius:5px;background-color:rgb(250,250,250);}");
+        setStyleSheet("QDialog{border: 1px solid rgb(110,110,110);border-radius:5px;background-color:rgb(30,30,30);}");
 
         m_customBorderContainer = new CustomBorderContainer(this);
         m_customBorderContainer->setOperationOptions(CustomBorderContainer::Movable | CustomBorderContainer::Resizable);

source/main.cpp

@@ -2,11 +2,13 @@
 #include "logger.h"
 
 #include <QApplication>
+#include <QStyleFactory>
 
 int main(int argc, char *argv[])
 {
     qputenv("QT_WAYLAND_DISABLE_WINDOWDECORATION", "0"); // Wayland 下启用装饰
     QApplication a(argc, argv);
+    //a.setStyle(QStyleFactory::create("Fusion"));
     LOG_INFO("Application", "------------------------------------------------Application start------------------------------------------------");
 
     MainWindow w;

source/maskLayer.cpp

@@ -8,7 +8,7 @@ MaskLayer::MaskLayer(QWidget *parent)
     setObjectName("maskLayer");
     setFocusPolicy(Qt::NoFocus);
     setAttribute(Qt::WA_TranslucentBackground); // 启用透明背景
-    setStyleSheet("background:rgba(112,128,144,180);");
+    setStyleSheet("background:rgba(40, 74, 102, 150);");
     hide();
 }
 

source/messageBox.cpp

@@ -13,7 +13,7 @@ MessageBox::MessageBox(QWidget *parent)
     {
         //Linux下默认的Qt::Dialog即使有父窗口也无法按照子窗口的行为进行展示，并且最大、最小按钮不好关闭，因此需要去掉Dialog属性，随之而来的问题是，模态无法起作用
         setWindowFlags(windowFlags() & ~Qt::Dialog);
-        setStyleSheet("QDialog{border: 1px solid rgb(205,205,205);border-radius:5px;background-color:rgb(245,245,245);background-color:rgb(245,245,245);}");
+        setStyleSheet("QDialog{border: 1px solid rgb(110,110,110);border-radius:5px;background-color:rgb(30,30,30);}");
     }
     else
     {

source/messageDialog.cpp

@@ -13,7 +13,7 @@ MessageDialog::MessageDialog(QWidget *parent)
     {
         //Linux下默认的Qt::Dialog即使有父窗口也无法按照子窗口的行为进行展示，并且最大、最小按钮不好关闭，因此需要去掉Dialog属性，随之而来的问题是，模态无法起作用
         setWindowFlags(windowFlags() & ~Qt::Dialog);
-        setStyleSheet("QDialog{border: 1px solid rgb(205,205,205);border-radius:5px;background-color:rgb(245,245,245);background-color:rgb(245,245,245);}");
+        setStyleSheet("QDialog{border: 1px solid rgb(110,110,110);border-radius:5px;background-color:rgb(30,30,30);}");
     }
     else
     {

source/modelInfoEditDialog.cpp

@@ -26,7 +26,7 @@ ModelInfoEditDialog::ModelInfoEditDialog(QWidget *parent)
     {
         //Linux下默认的Qt::Dialog即使有父窗口也无法按照子窗口的行为进行展示，并且最大、最小按钮不好关闭，因此需要去掉Dialog属性，随之而来的问题是，模态无法起作用
         setWindowFlags(windowFlags() & ~Qt::Dialog);
-        setStyleSheet("QDialog{border: 1px solid rgb(205,205,205);border-radius:5px;background-color:rgb(250,250,250);}");
+        setStyleSheet("QDialog{border: 1px solid rgb(110,110,110);border-radius:5px;}");
 
         m_customBorderContainer = new CustomBorderContainer(this);
         m_customBorderContainer->setOperationOptions(CustomBorderContainer::Movable | CustomBorderContainer::Resizable);
@@ -88,6 +88,7 @@ void ModelInfoEditDialog::showEvent(QShowEvent* e)
                 item->setFlags(item->flags() & ~Qt::ItemIsEditable);
                 item->setData(Qt::UserRole + itemRole_groupID, group.id);
                 item->setData(Qt::UserRole + itemRole_isPublic, group.isPublic);
+                item->setForeground(QBrush(QColor(240,240,240)));
                 ui->selectedList->addItem(item);
             }
 
@@ -159,12 +160,13 @@ void ModelInfoEditDialog::refreshGroupList()
             sourceItem->setFlags(sourceItem->flags() & ~Qt::ItemIsEditable);
             sourceItem->setData(Qt::UserRole + itemRole_groupID, group.id);
             sourceItem->setData(Qt::UserRole + itemRole_isPublic, group.isPublic);
+            sourceItem->setForeground(QBrush(QColor(240,240,240)));
             ui->sourceList->addItem(sourceItem);
             if(group.isPublic)
             {
                 QListWidgetItem* selectedItem = new QListWidgetItem(*sourceItem);
                 //selectedItem->setIcon(QIcon(":/img/images/icon_no.png"));
-                selectedItem->setForeground(QBrush(QColor(128,128,128)));
+                selectedItem->setForeground(QBrush(QColor(140,140,140)));
                 ui->selectedList->addItem(selectedItem);
             }
         }

source/multiLineHeaderView.cpp

@@ -73,7 +73,8 @@ void MultiLineHeaderView::paintSection(QPainter* painter, const QRect& rect, int
     QPen pen(m_borderColor, 1);
     painter->setPen(pen);
     QRect adjustRect = rect.adjusted(0, 0, 1, 0);
-    painter->drawLine(adjustRect.topLeft(), adjustRect.bottomLeft());
+    //painter->drawLine(adjustRect.topLeft(), adjustRect.topRight());
+    painter->drawLine(adjustRect.bottomLeft(), adjustRect.bottomRight());
     painter->drawLine(adjustRect.topRight(), adjustRect.bottomRight());
 }
 //自动调整行高

ui/attributeSelector.ui

@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>998</width>
-    <height>492</height>
+    <height>490</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -48,17 +48,7 @@
       </size>
      </property>
      <property name="styleSheet">
-      <string notr="true">QWidget #searchBar
-{
-background-color: rgb(243, 243, 243);
-}
-
-QLineEdit
-{
-border:1px solid rgb(210,210,210);
-border-radius:3px;
-}
-</string>
+      <string notr="true"/>
      </property>
      <widget class="QLineEdit" name="lineEdit_attributeType">
       <property name="geometry">
@@ -220,7 +210,6 @@ border:0px;
      <property name="styleSheet">
       <string notr="true">QWidget #toolBar
 {
-	background-color: rgb(243, 243, 243);
 }
 
 QPushButton
@@ -230,11 +219,11 @@ QPushButton
 }
 QPushButton:hover
 {
-	background-color:rgba(70,130,180,35);
+	background-color:rgb(71, 77, 92);
 }
 QPushButton:pressed
 {
-	background-color:rgba(70,130,180,65);
+	background-color:rgb(67, 73, 87);
 }</string>
      </property>
      <layout class="QHBoxLayout" name="horizontalLayout">
@@ -540,8 +529,7 @@ QPushButton:pressed
           </size>
          </property>
          <property name="styleSheet">
-          <string notr="true">border:0px;
-background-color: rgb(255, 255, 255);</string>
+          <string notr="true"/>
          </property>
          <property name="text">
           <string>1</string>

ui/connectionDialog.ui

@@ -64,8 +64,7 @@ QTableView::item:hover
 }
 QTableView::item:selected
 {
-    color:rgb(0,0,0);
-    background-color:rgb(211, 241, 250);
+	background-color: rgb(49, 91, 125);
 }</string>
          </property>
          <property name="verticalScrollBarPolicy">
@@ -483,15 +482,18 @@ QTableView::item:selected
              <property name="minimumSize">
               <size>
                <width>0</width>
-               <height>26</height>
+               <height>21</height>
               </size>
              </property>
              <property name="maximumSize">
               <size>
                <width>16777215</width>
-               <height>26</height>
+               <height>21</height>
               </size>
              </property>
+             <property name="styleSheet">
+              <string notr="true"/>
+             </property>
              <item>
               <property name="text">
                <string>PostgreSQL</string>

ui/dbBrowser.ui

@@ -45,15 +45,7 @@ QTabBar::close-button:hover {
 QTabBar::close-button:pressed {
     border-image: url(:/img/images/btn_close_pressed.png);
 }
-
-QHeaderView
-{
-background-color: rgb(235, 235, 235);
-}
-
-QHeaderView::section
-{
-}</string>
+</string>
      </property>
      <property name="currentIndex">
       <number>-1</number>
@@ -89,11 +81,11 @@ QPushButton
 }
 QPushButton:hover
 {
-	background-color:rgba(70,130,180,35);
+	background-color:rgb(71, 77, 92);
 }
 QPushButton:pressed
 {
-	background-color:rgba(70,130,180,65);
+	background-color:rgb(67, 73, 87);
 }</string>
      </property>
      <layout class="QHBoxLayout" name="horizontalLayout">
@@ -444,8 +436,7 @@ QPushButton:pressed
           </size>
          </property>
          <property name="styleSheet">
-          <string notr="true">border:0px;
-background-color: rgb(255, 255, 255);</string>
+          <string notr="true"/>
          </property>
          <property name="text">
           <string>1</string>

ui/mainwindow.ui

@@ -18,39 +18,144 @@
     <normaloff>:/img/images/icon_database.png</normaloff>:/img/images/icon_database.png</iconset>
   </property>
   <property name="styleSheet">
-   <string notr="true">QPushButton
+   <string notr="true">QWidget
 {
-	border: 1px solid rgb(205,205,205);
+    color: rgb(240, 240, 240);
+    background-color: rgb(30, 30, 30);
+    background-clip: border;
+    outline:0;
+}
+
+QMenuBar
+{
+    background-color: rgb(30, 30, 30);
+    color: rgb(240, 240, 240);
+    border-bottom: 1px solid rgb(50, 50, 50);
+}
+
+QToolBar
+{
+    border: 1px solid transparent;
+    background:rgb(30, 30, 30);
+    font-weight: bold;
+}
+QToolBar::separator:horizontal 
+{
+	background:transparent;
+}
+
+QToolButton:hover, QToolButton::menu-button:hover 
+{
+	border:0px;
+    background-color:rgb(71, 77, 92);
+}
+QToolButton:checked, QToolButton:pressed,
+        QToolButton::menu-button:pressed
+{
+    border:0px;
+    background-color:rgb(67, 73, 87);
+}
+
+QLineEdit
+{
+    border: 0px;
+    border-radius: 5px;
+	background-color: rgb(45, 45, 45);
+}
+
+QPlainTextEdit
+{
+    border: 0px;
+    border-radius: 5px;
+	background-color: rgb(45, 45, 45);
+}
+
+QPushButton
+{
+	border: 1px solid rgb(110,110,110);
     border-radius:5px;
 }
 QPushButton:hover
 {
-	border-color: rgb(70,130,180);
+	border-color: rgb(65, 122, 166);
 }
 QPushButton:pressed
 {
-	background-color:rgba(70,130,180,50);
+	background-color:rgba(65, 122, 166,50);
 }
 QPushButton:disabled
 {
-	color:rgb(180,180,180);
+	color:rgb(110,110,110);
 }
 
+QComboBox
+{
+    background-color: rgb(45, 45, 45);
+    border: 0px;
+    border-radius: 5px;
+}
+QComboBox::drop-down
+{
+border:0px;
+}
+QComboBox::down-arrow
+{
+margin-right:10px;
+width:14px;
+border-image: url(:/theme/images/darkstyle/down-arrow.png);
+}
 QComboBox QAbstractItemView
 {
-outline: 0px; /* 去除选中虚线框 */
+outline: 0px; /*去除选中虚线框 */
 }
 QComboBox QAbstractItemView::item:hover
 {
-color:rgb(0,0,0);
-background-color: rgb(240, 248, 255);
+background-color:rgba(49, 91, 125, 80);
 }
 QComboBox QAbstractItemView::item:selected
 {
-color:rgb(0,0,0);
-background-color: rgb(211, 241, 250);
+background-color: rgb(49, 91, 125);
 }
 
+/* QSpinBox
+{
+background-color: rgb(45, 45, 45);
+}
+QSpinBox::up-button
+{
+border:0px;
+}
+QSpinBox::up-button:hover
+{
+background-color:rgb(71, 77, 92);
+}
+QSpinBox::up-button:pressed
+{
+background-color:rgb(67, 73, 87);
+}
+QSpinBox::up-arrow
+{
+width:14px;
+border-image: url(:/theme/images/darkstyle/up-arrow.png);
+}
+QSpinBox::down-button
+{
+border:0px;
+}
+QSpinBox::down-button:hover
+{
+background-color:rgb(71, 77, 92);
+}
+QSpinBox::down-button:pressed
+{
+background-color:rgb(67, 73, 87);
+}
+QSpinBox::down-arrow
+{
+width:14px;
+border-image: url(:/theme/images/darkstyle/down-arrow.png);
+}*/
+
 QTabWidget
 {
 
@@ -58,7 +163,7 @@ QTabWidget
 QTabWidget::pane
 {
     border:0px;
-    border-top: 1px solid rgb(225,225,225);;
+    border-top: 1px solid rgb(50,50,50);;
     border-radius: 2px;
     margin-top:-1px;
 }
@@ -69,9 +174,10 @@ QTabWidget::tab-bar
 QTabBar::tab
 {
 	height:26px;
-    border: 0px solid;
+    border: 0px;
     padding-left:10px;
     padding-right:10px;
+	border-bottom: 1px solid rgb(50,50,50);
 }
 QTabBar::tab:selected
 {
@@ -81,7 +187,7 @@ QTabBar::tab:selected
 
 QHeaderView
 {
-	background-color: rgb(250, 250, 250);
+	background-color: rgb(30, 30, 30);
 }
 QHeaderView::section
 {
@@ -90,6 +196,7 @@ QHeaderView::section
 QTableView
 {
 	outline:0px;
+    background-color: rgb(45, 45, 45);
 }
 QTableView::item
 {
@@ -100,10 +207,15 @@ QTableView::item:hover
 {
 	background-color:transparent;
 }
+QTableView::item:selected
+{
+	 color: rgb(240, 240, 240);
+}
 
 QTreeView
 {
 	outline:0px;
+    background-color: rgb(45, 45, 45);
 }
 QTreeView::item
 {
@@ -111,17 +223,27 @@ QTreeView::item
 }
 QTreeView::item:hover
 {
-	background-color: rgb(240, 248, 255);
+	background-color:rgba(49, 91, 125, 80);
 }
 QTreeView::item:selected
 {
-    color:rgb(0,0,0);
-	background-color:rgb(211, 241, 250);
+	background-color: rgb(49, 91, 125);
+}
+QTreeView::branch:has-children:!has-siblings:closed,
+QTreeView::branch:closed:has-children:has-siblings 
+{
+	image: url(:/theme/images/darkstyle/branch_closed.png);
+}
+QTreeView::branch:open:has-children:!has-siblings,
+QTreeView::branch:open:has-children:has-siblings 
+{
+	image: url(:/theme/images/darkstyle/branch_open.png);
 }
 
 QListView
 {
 outline:0px;
+background-color: rgb(45, 45, 45);
 }
 QListView::item
 {
@@ -132,11 +254,11 @@ padding-bottom:1px;
 }
 QListView::item:hover
 {
-background-color: rgb(240, 248, 255);
+background-color:rgba(49, 91, 125, 80);
 }
 QListView::item:selected
 {
-background-color:rgb(211, 241, 250);
+background-color: rgb(49, 91, 125);
 }
 </string>
   </property>
@@ -163,6 +285,9 @@ background-color:rgb(211, 241, 250);
        <enum>Qt::Orientation::Horizontal</enum>
       </property>
       <widget class="QWidget" name="dbStructurePanel" native="true">
+       <property name="styleSheet">
+        <string notr="true"/>
+       </property>
        <layout class="QVBoxLayout" name="layoutDBStructure">
         <property name="leftMargin">
          <number>0</number>

ui/modelInfoEditDialog.ui

@@ -222,11 +222,11 @@
 }
 QPushButton:hover
 {
-	background-color:rgba(70,130,180,35);
+	background-color:rgb(71, 77, 92);
 }
 QPushButton:pressed
 {
-	background-color:rgba(70,130,180,65);
+	background-color:rgb(67, 73, 87);
 }</string>
             </property>
             <property name="text">

ui/textEditWidget.ui

@@ -16,8 +16,6 @@
   <property name="styleSheet">
    <string notr="true">QWidget #TextEditWidget
 {
-border: 1px solid rgb(205,205,205);
-background-color:rgb(255,255,255);
 }</string>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
@@ -41,8 +39,8 @@ background-color:rgb(255,255,255);
      <property name="styleSheet">
       <string notr="true">QWidget #contentWidget
 {
-border: 1px solid rgb(205,205,205);
-background-color:rgb(255,255,255);
+border: 1px solid rgb(67, 73, 87);
+background-color: rgb(58, 63, 75);
 }</string>
      </property>
      <layout class="QVBoxLayout" name="verticalLayout_2">
@@ -50,13 +48,13 @@ background-color:rgb(255,255,255);
        <number>0</number>
       </property>
       <property name="leftMargin">
-       <number>0</number>
+       <number>1</number>
       </property>
       <property name="topMargin">
-       <number>0</number>
+       <number>1</number>
       </property>
       <property name="rightMargin">
-       <number>0</number>
+       <number>1</number>
       </property>
       <property name="bottomMargin">
        <number>5</number>
@@ -67,9 +65,8 @@ background-color:rgb(255,255,255);
          <enum>Qt::FocusPolicy::StrongFocus</enum>
         </property>
         <property name="styleSheet">
-         <string notr="true">background-color: transparent;
-border:0px;
-padding:2px;</string>
+         <string notr="true">border-radius: 0px;
+background-color:transparent;</string>
         </property>
        </widget>
       </item>
@@ -90,8 +87,9 @@ padding:2px;</string>
         <property name="styleSheet">
          <string notr="true">QWidget #bottomWidget
 {
-	background-color: transparent;
-}</string>
+background-color:transparent;
+}
+</string>
         </property>
         <layout class="QHBoxLayout" name="horizontalLayout_2">
          <property name="spacing">
@@ -113,7 +111,8 @@ padding:2px;</string>
           <widget class="QLabel" name="label">
            <property name="styleSheet">
             <string notr="true">color: rgb(255, 0, 0);
-font: 8pt &quot;Microsoft YaHei UI&quot;;</string>
+font: 8pt &quot;Microsoft YaHei UI&quot;;
+background-color:transparent;</string>
            </property>
            <property name="text">
             <string>该类型已存在</string>
@@ -145,17 +144,13 @@ font: 8pt &quot;Microsoft YaHei UI&quot;;</string>
              <property name="styleSheet">
               <string notr="true">QPushButton
 {
-	border: 1px solid rgb(205,205,205);
-    border-radius:5px;
+color: rgb(240, 240, 240);
+font: 10pt;
+border-radius:5px;
+background-color: transparent;
 }
-QPushButton:hover
-{
-	border-color: rgb(70,130,180);
-}
-QPushButton:pressed
-{
-	background-color:rgba(70,130,180,50);
-}</string>
+
+</string>
              </property>
              <property name="text">
               <string>取消</string>
@@ -179,20 +174,21 @@ QPushButton:pressed
              <property name="styleSheet">
               <string notr="true">QPushButton
 {
-color: rgb(250, 250, 250);
+color: rgb(240, 240, 240);
 font: 10pt;
 border:0px;
 border-radius:5px;
-background-color:rgb(67,160,249);
+background-color: rgb(49, 91, 125);
 }
 QPushButton:hover
 {
-background-color:rgb(55,131,204);
+background-color: rgb(65, 122, 166);
 }
 QPushButton:pressed
 {
-background-color:rgb(67,160,249);
-}</string>
+background-color: rgb(49, 91, 125);
+}
+</string>
              </property>
              <property name="text">
               <string>确认</string>