diff --git a/include/multiLineHeaderView.h b/include/multiLineHeaderView.h index 4d41e90..b662324 100644 --- a/include/multiLineHeaderView.h +++ b/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; }; diff --git a/resource/PowerModeler.qrc b/resource/PowerModeler.qrc index 35558b4..fdf2764 100644 --- a/resource/PowerModeler.qrc +++ b/resource/PowerModeler.qrc @@ -64,4 +64,12 @@ images/icon_db_connect.png images/icon_db_disconnect.png + + images/darkstyle/toolbar_separator_horizontal.png + images/darkstyle/branch_closed.png + images/darkstyle/branch_open.png + images/darkstyle/down-arrow.png + images/darkstyle/toolbar_separator_vertical.png + images/darkstyle/up-arrow.png + diff --git a/resource/images/btn_close_default.png b/resource/images/btn_close_default.png index 76de305..0aa446a 100644 Binary files a/resource/images/btn_close_default.png and b/resource/images/btn_close_default.png differ diff --git a/resource/images/darkstyle/branch_closed.png b/resource/images/darkstyle/branch_closed.png new file mode 100644 index 0000000..43d050d Binary files /dev/null and b/resource/images/darkstyle/branch_closed.png differ diff --git a/resource/images/darkstyle/branch_open.png b/resource/images/darkstyle/branch_open.png new file mode 100644 index 0000000..4319f61 Binary files /dev/null and b/resource/images/darkstyle/branch_open.png differ diff --git a/resource/images/darkstyle/down-arrow.png b/resource/images/darkstyle/down-arrow.png new file mode 100644 index 0000000..b0d1c94 Binary files /dev/null and b/resource/images/darkstyle/down-arrow.png differ diff --git a/resource/images/darkstyle/toolbar_separator_horizontal.png b/resource/images/darkstyle/toolbar_separator_horizontal.png new file mode 100644 index 0000000..3c0acbd Binary files /dev/null and b/resource/images/darkstyle/toolbar_separator_horizontal.png differ diff --git a/resource/images/darkstyle/toolbar_separator_vertical.png b/resource/images/darkstyle/toolbar_separator_vertical.png new file mode 100644 index 0000000..4dde3f3 Binary files /dev/null and b/resource/images/darkstyle/toolbar_separator_vertical.png differ diff --git a/resource/images/darkstyle/up-arrow.png b/resource/images/darkstyle/up-arrow.png new file mode 100644 index 0000000..3831252 Binary files /dev/null and b/resource/images/darkstyle/up-arrow.png differ diff --git a/resource/images/icon_close.png b/resource/images/icon_close.png index d27a7ae..9d842f4 100644 Binary files a/resource/images/icon_close.png and b/resource/images/icon_close.png differ diff --git a/resource/images/icon_done.png b/resource/images/icon_done.png index 5a977d1..8c6249e 100644 Binary files a/resource/images/icon_done.png and b/resource/images/icon_done.png differ diff --git a/resource/images/icon_ellipsis.png b/resource/images/icon_ellipsis.png index 118d06c..61f8521 100644 Binary files a/resource/images/icon_ellipsis.png and b/resource/images/icon_ellipsis.png differ diff --git a/resource/images/icon_first.png b/resource/images/icon_first.png index c730010..788d07b 100644 Binary files a/resource/images/icon_first.png and b/resource/images/icon_first.png differ diff --git a/resource/images/icon_last.png b/resource/images/icon_last.png index 85aff0a..69c927b 100644 Binary files a/resource/images/icon_last.png and b/resource/images/icon_last.png differ diff --git a/resource/images/icon_multiple-choice.png b/resource/images/icon_multiple-choice.png index f2c3ae5..24823ee 100644 Binary files a/resource/images/icon_multiple-choice.png and b/resource/images/icon_multiple-choice.png differ diff --git a/resource/images/icon_next.png b/resource/images/icon_next.png index 69fc258..08399cd 100644 Binary files a/resource/images/icon_next.png and b/resource/images/icon_next.png differ diff --git a/resource/images/icon_plus.png b/resource/images/icon_plus.png index eabe77e..492b9a3 100644 Binary files a/resource/images/icon_plus.png and b/resource/images/icon_plus.png differ diff --git a/resource/images/icon_previous.png b/resource/images/icon_previous.png index 7a982c1..da5d3eb 100644 Binary files a/resource/images/icon_previous.png and b/resource/images/icon_previous.png differ diff --git a/resource/images/icon_refresh3.png b/resource/images/icon_refresh3.png index fc8db13..7082f25 100644 Binary files a/resource/images/icon_refresh3.png and b/resource/images/icon_refresh3.png differ diff --git a/resource/images/icon_refresh3_disable.png b/resource/images/icon_refresh3_disable.png index ab91e7e..fb9f0ef 100644 Binary files a/resource/images/icon_refresh3_disable.png and b/resource/images/icon_refresh3_disable.png differ diff --git a/resource/images/icon_subtract.png b/resource/images/icon_subtract.png index 30eb021..b141d03 100644 Binary files a/resource/images/icon_subtract.png and b/resource/images/icon_subtract.png differ diff --git a/source/attributeSelector.cpp b/source/attributeSelector.cpp index 994648a..fb4762a 100644 --- a/source/attributeSelector.cpp +++ b/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); diff --git a/source/attributeTableDelegate.cpp b/source/attributeTableDelegate.cpp index b4a898b..37aa188 100644 --- a/source/attributeTableDelegate.cpp +++ b/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(editor)) + // { + // comboBox->setGeometry(option.rect); + // comboBox->setStyleSheet("border-radius: 0px;background-color:rgb(58, 63, 75);"); + // } + else if(QSpinBox* spinBox = qobject_cast(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 diff --git a/source/attributeView.cpp b/source/attributeView.cpp index 00e2970..20df92a 100644 --- a/source/attributeView.cpp +++ b/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); //主标题加粗展示 diff --git a/source/connectionDialog.cpp b/source/connectionDialog.cpp index c9fd000..c52c03a 100644 --- a/source/connectionDialog.cpp +++ b/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); diff --git a/source/groupSelectionDialog.cpp b/source/groupSelectionDialog.cpp index 30acca1..f777e9a 100644 --- a/source/groupSelectionDialog.cpp +++ b/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); diff --git a/source/main.cpp b/source/main.cpp index 7e01720..96c734c 100644 --- a/source/main.cpp +++ b/source/main.cpp @@ -2,11 +2,13 @@ #include "logger.h" #include +#include 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; diff --git a/source/maskLayer.cpp b/source/maskLayer.cpp index 99beba0..964c39e 100644 --- a/source/maskLayer.cpp +++ b/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(); } diff --git a/source/messageBox.cpp b/source/messageBox.cpp index b172b0f..e6cbbd7 100644 --- a/source/messageBox.cpp +++ b/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 { diff --git a/source/messageDialog.cpp b/source/messageDialog.cpp index f4a4091..dde6d90 100644 --- a/source/messageDialog.cpp +++ b/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 { diff --git a/source/modelInfoEditDialog.cpp b/source/modelInfoEditDialog.cpp index c9b191f..83fe8bf 100644 --- a/source/modelInfoEditDialog.cpp +++ b/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); } } diff --git a/source/multiLineHeaderView.cpp b/source/multiLineHeaderView.cpp index d7c7286..864a235 100644 --- a/source/multiLineHeaderView.cpp +++ b/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()); } //自动调整行高 diff --git a/ui/attributeSelector.ui b/ui/attributeSelector.ui index 21ca380..a4619b8 100644 --- a/ui/attributeSelector.ui +++ b/ui/attributeSelector.ui @@ -7,7 +7,7 @@ 0 0 998 - 492 + 490 @@ -48,17 +48,7 @@ - QWidget #searchBar -{ -background-color: rgb(243, 243, 243); -} - -QLineEdit -{ -border:1px solid rgb(210,210,210); -border-radius:3px; -} - + @@ -220,7 +210,6 @@ border:0px; 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); } @@ -540,8 +529,7 @@ QPushButton:pressed - border:0px; -background-color: rgb(255, 255, 255); + 1 diff --git a/ui/connectionDialog.ui b/ui/connectionDialog.ui index 24dc0af..10a87b2 100644 --- a/ui/connectionDialog.ui +++ b/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); } @@ -483,15 +482,18 @@ QTableView::item:selected 0 - 26 + 21 16777215 - 26 + 21 + + + PostgreSQL diff --git a/ui/dbBrowser.ui b/ui/dbBrowser.ui index f7f58ad..446460d 100644 --- a/ui/dbBrowser.ui +++ b/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 -{ -} + -1 @@ -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); } @@ -444,8 +436,7 @@ QPushButton:pressed - border:0px; -background-color: rgb(255, 255, 255); + 1 diff --git a/ui/mainwindow.ui b/ui/mainwindow.ui index 24b8058..2f1b6ee 100644 --- a/ui/mainwindow.ui +++ b/ui/mainwindow.ui @@ -18,39 +18,144 @@ :/img/images/icon_database.png:/img/images/icon_database.png - QPushButton + 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); } @@ -163,6 +285,9 @@ background-color:rgb(211, 241, 250); Qt::Orientation::Horizontal + + + 0 diff --git a/ui/modelInfoEditDialog.ui b/ui/modelInfoEditDialog.ui index f59520c..0a08b6e 100644 --- a/ui/modelInfoEditDialog.ui +++ b/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); } diff --git a/ui/textEditWidget.ui b/ui/textEditWidget.ui index fc2b9a8..44ffc9a 100644 --- a/ui/textEditWidget.ui +++ b/ui/textEditWidget.ui @@ -16,8 +16,6 @@ QWidget #TextEditWidget { -border: 1px solid rgb(205,205,205); -background-color:rgb(255,255,255); } @@ -41,8 +39,8 @@ background-color:rgb(255,255,255); 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); } @@ -50,13 +48,13 @@ background-color:rgb(255,255,255); 0 - 0 + 1 - 0 + 1 - 0 + 1 5 @@ -67,9 +65,8 @@ background-color:rgb(255,255,255); Qt::FocusPolicy::StrongFocus - background-color: transparent; -border:0px; -padding:2px; + border-radius: 0px; +background-color:transparent; @@ -90,8 +87,9 @@ padding:2px; QWidget #bottomWidget { - background-color: transparent; -} +background-color:transparent; +} + @@ -113,7 +111,8 @@ padding:2px; color: rgb(255, 0, 0); -font: 8pt "Microsoft YaHei UI"; +font: 8pt "Microsoft YaHei UI"; +background-color:transparent; 该类型已存在 @@ -145,17 +144,13 @@ font: 8pt "Microsoft YaHei UI"; 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); -} + + 取消 @@ -179,20 +174,21 @@ QPushButton:pressed 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); -} +background-color: rgb(49, 91, 125); +} + 确认