diff --git a/third/3rd_qcustomplot/3rd_qcustomplot.pri b/third/3rd_qcustomplot/3rd_qcustomplot.pri index dbeebc1..9eaba9e 100644 --- a/third/3rd_qcustomplot/3rd_qcustomplot.pri +++ b/third/3rd_qcustomplot/3rd_qcustomplot.pri @@ -4,16 +4,12 @@ greaterThan(QT_MAJOR_VERSION, 4): CONFIG += c++11 !contains(DEFINES, qcustomplot_v1_3) { !contains(DEFINES, qcustomplot_v2_0) { -!contains(DEFINES, qcustomplot_v2_1) { -DEFINES += qcustomplot_v2_0 -}}} - !contains(DEFINES, qcustomplot_v2_1) { greaterThan(QT_MAJOR_VERSION, 4) { -DEFINES -= qcustomplot_v1_3 -DEFINES -= qcustomplot_v2_0 DEFINES += qcustomplot_v2_1 -}} +} else { +DEFINES += qcustomplot_v2_0 +}}}} contains(DEFINES, qcustomplot_v1_3) { INCLUDEPATH += $$PWD/v1_3 diff --git a/third/qcustomplotdemo/readme.md b/third/qcustomplotdemo/readme.md index e3c4486..d540e99 100644 --- a/third/qcustomplotdemo/readme.md +++ b/third/qcustomplotdemo/readme.md @@ -1,4 +1,4 @@ -按照国际惯例，先吹吹牛，QCustomPlot这个开源图表组件，作者绝对是全宇宙Qt领域的天花板，设计的极其巧妙和精美，各种情况都考虑到了，将每个功能细分到不同的类，又极具拓展性，当时阅读完代码的时候，我直接跪了8个小时，膝盖现在还是红的。 +按照国际惯例，先吹吹牛，QCustomPlot这个开源图表组件，作者绝对是全宇宙Qt领域的天花板，设计的极其巧妙和精美，各种情况都考虑到了，将每个功能细分到不同的类，每个类负责管理自己的绘制和各种属性参数等，虽然代码量不多但是又极具拓展性，当时阅读完代码的时候，我直接跪了8个小时，膝盖现在还是红的。作者的实力至少是八星斗圣级别，只要一个巴掌就能把斗宗干趴下。 ## 一、功能特点 1. 同时支持多个版本，比如1.3、2.0、2.1。 2. 官方提供的最新的2.1不支持Qt4，也不支持Qt6.2，所以这里通过define判断Qt套件的版本来加载不同的版本。 diff --git a/ui/core_qss/qss.qrc b/ui/core_qss/qss.qrc index ef80ad9..c5219ef 100644 --- a/ui/core_qss/qss.qrc +++ b/ui/core_qss/qss.qrc @@ -1,23 +1,28 @@ - qss/psblack.css - qss/psblack/add_bottom.png - qss/psblack/add_left.png - qss/psblack/add_right.png - qss/psblack/add_top.png - qss/psblack/branch_close.png - qss/psblack/branch_open.png - qss/psblack/calendar_nextmonth.png - qss/psblack/calendar_prevmonth.png - qss/psblack/checkbox_checked.png - qss/psblack/checkbox_checked_disable.png - qss/psblack/checkbox_parcial.png - qss/psblack/checkbox_parcial_disable.png - qss/psblack/checkbox_unchecked.png - qss/psblack/checkbox_unchecked_disable.png - qss/psblack/radiobutton_checked.png - qss/psblack/radiobutton_checked_disable.png - qss/psblack/radiobutton_unchecked.png - qss/psblack/radiobutton_unchecked_disable.png + qss/blacksoft.css + qss/blacksoft/add_bottom.png + qss/blacksoft/add_left.png + qss/blacksoft/add_right.png + qss/blacksoft/add_top.png + qss/blacksoft/arrow_bottom.png + qss/blacksoft/arrow_left.png + qss/blacksoft/arrow_right.png + qss/blacksoft/arrow_top.png + qss/blacksoft/branch_close.png + qss/blacksoft/branch_open.png + qss/blacksoft/calendar_nextmonth.png + qss/blacksoft/calendar_prevmonth.png + qss/blacksoft/checkbox_checked.png + qss/blacksoft/checkbox_checked_disable.png + qss/blacksoft/checkbox_parcial.png + qss/blacksoft/checkbox_parcial_disable.png + qss/blacksoft/checkbox_unchecked.png + qss/blacksoft/checkbox_unchecked_disable.png + qss/blacksoft/menu_checked.png + qss/blacksoft/radiobutton_checked.png + qss/blacksoft/radiobutton_checked_disable.png + qss/blacksoft/radiobutton_unchecked.png + qss/blacksoft/radiobutton_unchecked_disable.png diff --git a/ui/core_qss/qss/psblack.css b/ui/core_qss/qss/blacksoft.css similarity index 93% rename from ui/core_qss/qss/psblack.css rename to ui/core_qss/qss/blacksoft.css index f09436d..57cb010 100644 --- a/ui/core_qss/qss/psblack.css +++ b/ui/core_qss/qss/blacksoft.css @@ -155,19 +155,19 @@ height:15px; } QRadioButton::indicator::unchecked{ -image:url(:/qss/psblack/radiobutton_unchecked.png); +image:url(:/qss/blacksoft/radiobutton_unchecked.png); } QRadioButton::indicator::unchecked:disabled{ -image:url(:/qss/psblack/radiobutton_unchecked_disable.png); +image:url(:/qss/blacksoft/radiobutton_unchecked_disable.png); } QRadioButton::indicator::checked{ -image:url(:/qss/psblack/radiobutton_checked.png); +image:url(:/qss/blacksoft/radiobutton_checked.png); } QRadioButton::indicator::checked:disabled{ -image:url(:/qss/psblack/radiobutton_checked_disable.png); +image:url(:/qss/blacksoft/radiobutton_checked_disable.png); } QGroupBox::indicator,QTreeView::indicator,QListView::indicator,QTableView::indicator{ @@ -180,38 +180,38 @@ height:13px; } QCheckBox::indicator:unchecked,QGroupBox::indicator:unchecked,QTreeView::indicator:unchecked,QListView::indicator:unchecked,QTableView::indicator:unchecked{ -image:url(:/qss/psblack/checkbox_unchecked.png); +image:url(:/qss/blacksoft/checkbox_unchecked.png); } QCheckBox::indicator:unchecked:disabled,QGroupBox::indicator:unchecked:disabled,QTreeView::indicator:unchecked:disabled,QListView::indicator:unchecked:disabled,QTableView::indicator:unchecked:disabled{ -image:url(:/qss/psblack/checkbox_unchecked_disable.png); +image:url(:/qss/blacksoft/checkbox_unchecked_disable.png); } QCheckBox::indicator:checked,QGroupBox::indicator:checked,QTreeView::indicator:checked,QListView::indicator:checked,QTableView::indicator:checked{ -image:url(:/qss/psblack/checkbox_checked.png); +image:url(:/qss/blacksoft/checkbox_checked.png); } QCheckBox::indicator:checked:disabled,QGroupBox::indicator:checked:disabled,QTreeView::indicator:checked:disabled,QListView::indicator:checked:disabled,QTableView::indicator:checked:disabled{ -image:url(:/qss/psblack/checkbox_checked_disable.png); +image:url(:/qss/blacksoft/checkbox_checked_disable.png); } QCheckBox::indicator:indeterminate,QGroupBox::indicator:indeterminate,QTreeView::indicator:indeterminate,QListView::indicator:indeterminate,QTableView::indicator:indeterminate{ -image:url(:/qss/psblack/checkbox_parcial.png); +image:url(:/qss/blacksoft/checkbox_parcial.png); } QCheckBox::indicator:indeterminate:disabled,QGroupBox::indicator:indeterminate:disabled,QTreeView::indicator:indeterminate:disabled,QListView::indicator:indeterminate:disabled,QTableView::indicator:indeterminate:disabled{ -image:url(:/qss/psblack/checkbox_parcial_disable.png); +image:url(:/qss/blacksoft/checkbox_parcial_disable.png); } QTimeEdit::up-button,QDateEdit::up-button,QDateTimeEdit::up-button,QDoubleSpinBox::up-button,QSpinBox::up-button{ -image:url(:/qss/psblack/add_top.png); +image:url(:/qss/blacksoft/add_top.png); width:10px; height:10px; padding:2px 5px 0px 0px; } QTimeEdit::down-button,QDateEdit::down-button,QDateTimeEdit::down-button,QDoubleSpinBox::down-button,QSpinBox::down-button{ -image:url(:/qss/psblack/add_bottom.png); +image:url(:/qss/blacksoft/add_bottom.png); width:10px; height:10px; padding:0px 5px 2px 0px; @@ -226,7 +226,7 @@ bottom:-2px; } QComboBox::down-arrow,QDateEdit[calendarPopup="true"]::down-arrow,QTimeEdit[calendarPopup="true"]::down-arrow,QDateTimeEdit[calendarPopup="true"]::down-arrow{ -image:url(:/qss/psblack/add_bottom.png); +image:url(:/qss/blacksoft/add_bottom.png); width:10px; height:10px; right:2px; @@ -271,11 +271,11 @@ height:13px; } QMenu::indicator::checked{ -image:url(:/qss/psblack/menu_checked.png); +image:url(:/qss/blacksoft/menu_checked.png); } QMenu::right-arrow{ -image:url(:/qss/psblack/arrow_right.png); +image:url(:/qss/blacksoft/arrow_right.png); width:13px; height:13px; padding:0px 3px 0px 0px; @@ -445,12 +445,12 @@ gridline-color:#242424; QTreeView::branch:closed:has-children{ margin:4px; -border-image:url(:/qss/psblack/branch_open.png); +border-image:url(:/qss/blacksoft/branch_open.png); } QTreeView::branch:open:has-children{ margin:4px; -border-image:url(:/qss/psblack/branch_close.png); +border-image:url(:/qss/blacksoft/branch_close.png); } QTreeView,QListView,QTableView,QSplitter::handle,QTreeView::branch{ @@ -578,13 +578,13 @@ min-width:80px; QToolButton#qt_calendar_prevmonth{ icon-size:0px; min-width:20px; -image:url(:/qss/psblack/calendar_prevmonth.png); +image:url(:/qss/blacksoft/calendar_prevmonth.png); } QToolButton#qt_calendar_nextmonth{ icon-size:0px; min-width:20px; -image:url(:/qss/psblack/calendar_nextmonth.png); +image:url(:/qss/blacksoft/calendar_nextmonth.png); } QToolButton#qt_calendar_prevmonth,QToolButton#qt_calendar_nextmonth,QToolButton#qt_calendar_monthbutton,QToolButton#qt_calendar_yearbutton{ diff --git a/ui/core_qss/qss/psblack/add_bottom.png b/ui/core_qss/qss/blacksoft/add_bottom.png similarity index 100% rename from ui/core_qss/qss/psblack/add_bottom.png rename to ui/core_qss/qss/blacksoft/add_bottom.png diff --git a/ui/core_qss/qss/psblack/add_left.png b/ui/core_qss/qss/blacksoft/add_left.png similarity index 100% rename from ui/core_qss/qss/psblack/add_left.png rename to ui/core_qss/qss/blacksoft/add_left.png diff --git a/ui/core_qss/qss/psblack/add_right.png b/ui/core_qss/qss/blacksoft/add_right.png similarity index 100% rename from ui/core_qss/qss/psblack/add_right.png rename to ui/core_qss/qss/blacksoft/add_right.png diff --git a/ui/core_qss/qss/psblack/add_top.png b/ui/core_qss/qss/blacksoft/add_top.png similarity index 100% rename from ui/core_qss/qss/psblack/add_top.png rename to ui/core_qss/qss/blacksoft/add_top.png diff --git a/ui/core_qss/qss/psblack/arrow_bottom.png b/ui/core_qss/qss/blacksoft/arrow_bottom.png similarity index 100% rename from ui/core_qss/qss/psblack/arrow_bottom.png rename to ui/core_qss/qss/blacksoft/arrow_bottom.png diff --git a/ui/core_qss/qss/psblack/arrow_left.png b/ui/core_qss/qss/blacksoft/arrow_left.png similarity index 100% rename from ui/core_qss/qss/psblack/arrow_left.png rename to ui/core_qss/qss/blacksoft/arrow_left.png diff --git a/ui/core_qss/qss/psblack/arrow_right.png b/ui/core_qss/qss/blacksoft/arrow_right.png similarity index 100% rename from ui/core_qss/qss/psblack/arrow_right.png rename to ui/core_qss/qss/blacksoft/arrow_right.png diff --git a/ui/core_qss/qss/psblack/arrow_top.png b/ui/core_qss/qss/blacksoft/arrow_top.png similarity index 100% rename from ui/core_qss/qss/psblack/arrow_top.png rename to ui/core_qss/qss/blacksoft/arrow_top.png diff --git a/ui/core_qss/qss/psblack/branch_close.png b/ui/core_qss/qss/blacksoft/branch_close.png similarity index 100% rename from ui/core_qss/qss/psblack/branch_close.png rename to ui/core_qss/qss/blacksoft/branch_close.png diff --git a/ui/core_qss/qss/psblack/branch_open.png b/ui/core_qss/qss/blacksoft/branch_open.png similarity index 100% rename from ui/core_qss/qss/psblack/branch_open.png rename to ui/core_qss/qss/blacksoft/branch_open.png diff --git a/ui/core_qss/qss/psblack/calendar_nextmonth.png b/ui/core_qss/qss/blacksoft/calendar_nextmonth.png similarity index 100% rename from ui/core_qss/qss/psblack/calendar_nextmonth.png rename to ui/core_qss/qss/blacksoft/calendar_nextmonth.png diff --git a/ui/core_qss/qss/psblack/calendar_prevmonth.png b/ui/core_qss/qss/blacksoft/calendar_prevmonth.png similarity index 100% rename from ui/core_qss/qss/psblack/calendar_prevmonth.png rename to ui/core_qss/qss/blacksoft/calendar_prevmonth.png diff --git a/ui/core_qss/qss/psblack/checkbox_checked.png b/ui/core_qss/qss/blacksoft/checkbox_checked.png similarity index 100% rename from ui/core_qss/qss/psblack/checkbox_checked.png rename to ui/core_qss/qss/blacksoft/checkbox_checked.png diff --git a/ui/core_qss/qss/psblack/checkbox_checked_disable.png b/ui/core_qss/qss/blacksoft/checkbox_checked_disable.png similarity index 100% rename from ui/core_qss/qss/psblack/checkbox_checked_disable.png rename to ui/core_qss/qss/blacksoft/checkbox_checked_disable.png diff --git a/ui/core_qss/qss/psblack/checkbox_parcial.png b/ui/core_qss/qss/blacksoft/checkbox_parcial.png similarity index 100% rename from ui/core_qss/qss/psblack/checkbox_parcial.png rename to ui/core_qss/qss/blacksoft/checkbox_parcial.png diff --git a/ui/core_qss/qss/psblack/checkbox_parcial_disable.png b/ui/core_qss/qss/blacksoft/checkbox_parcial_disable.png similarity index 100% rename from ui/core_qss/qss/psblack/checkbox_parcial_disable.png rename to ui/core_qss/qss/blacksoft/checkbox_parcial_disable.png diff --git a/ui/core_qss/qss/psblack/checkbox_unchecked.png b/ui/core_qss/qss/blacksoft/checkbox_unchecked.png similarity index 100% rename from ui/core_qss/qss/psblack/checkbox_unchecked.png rename to ui/core_qss/qss/blacksoft/checkbox_unchecked.png diff --git a/ui/core_qss/qss/psblack/checkbox_unchecked_disable.png b/ui/core_qss/qss/blacksoft/checkbox_unchecked_disable.png similarity index 100% rename from ui/core_qss/qss/psblack/checkbox_unchecked_disable.png rename to ui/core_qss/qss/blacksoft/checkbox_unchecked_disable.png diff --git a/ui/core_qss/qss/psblack/menu_checked.png b/ui/core_qss/qss/blacksoft/menu_checked.png similarity index 100% rename from ui/core_qss/qss/psblack/menu_checked.png rename to ui/core_qss/qss/blacksoft/menu_checked.png diff --git a/ui/core_qss/qss/psblack/radiobutton_checked.png b/ui/core_qss/qss/blacksoft/radiobutton_checked.png similarity index 100% rename from ui/core_qss/qss/psblack/radiobutton_checked.png rename to ui/core_qss/qss/blacksoft/radiobutton_checked.png diff --git a/ui/core_qss/qss/psblack/radiobutton_checked_disable.png b/ui/core_qss/qss/blacksoft/radiobutton_checked_disable.png similarity index 100% rename from ui/core_qss/qss/psblack/radiobutton_checked_disable.png rename to ui/core_qss/qss/blacksoft/radiobutton_checked_disable.png diff --git a/ui/core_qss/qss/psblack/radiobutton_unchecked.png b/ui/core_qss/qss/blacksoft/radiobutton_unchecked.png similarity index 100% rename from ui/core_qss/qss/psblack/radiobutton_unchecked.png rename to ui/core_qss/qss/blacksoft/radiobutton_unchecked.png diff --git a/ui/core_qss/qss/psblack/radiobutton_unchecked_disable.png b/ui/core_qss/qss/blacksoft/radiobutton_unchecked_disable.png similarity index 100% rename from ui/core_qss/qss/psblack/radiobutton_unchecked_disable.png rename to ui/core_qss/qss/blacksoft/radiobutton_unchecked_disable.png diff --git a/ui/styledemo/frmmain.cpp b/ui/styledemo/frmmain.cpp index 3cbc266..9aa4385 100644 --- a/ui/styledemo/frmmain.cpp +++ b/ui/styledemo/frmmain.cpp @@ -74,10 +74,10 @@ void frmMain::on_btnStyle1_clicked() void frmMain::on_btnStyle2_clicked() { - loadStyle(":/qss/flatwhite.css"); + loadStyle(":/qss/flatgray.css"); } void frmMain::on_btnStyle3_clicked() { - loadStyle(":/qss/psblack.css"); + loadStyle(":/qss/blacksoft.css"); } diff --git a/ui/styledemo/frmmain.ui b/ui/styledemo/frmmain.ui index 27556fb..a63ec76 100644 --- a/ui/styledemo/frmmain.ui +++ b/ui/styledemo/frmmain.ui @@ -6,8 +6,8 @@ 0 0 - 800 - 600 + 817 + 616 @@ -129,7 +129,7 @@ - PS黑色 + 软件黑 @@ -254,7 +254,7 @@ - 淡蓝色 + 浅蓝色 @@ -324,7 +324,7 @@ - 扁平白色 + 扁平灰 @@ -765,7 +765,7 @@ p, li { white-space: pre-wrap; } 0 0 - 800 + 817 26 diff --git a/ui/styledemo/qrc/qss.qrc b/ui/styledemo/qrc/qss.qrc index 66814da..acc88b7 100644 --- a/ui/styledemo/qrc/qss.qrc +++ b/ui/styledemo/qrc/qss.qrc @@ -1,31 +1,30 @@ - qss/flatwhite.css + qss/flatgray.css qss/lightblue.css - qss/psblack.css - qss/flatwhite/add_bottom.png - qss/flatwhite/add_left.png - qss/flatwhite/add_right.png - qss/flatwhite/add_top.png - qss/flatwhite/arrow_bottom.png - qss/flatwhite/arrow_left.png - qss/flatwhite/arrow_right.png - qss/flatwhite/arrow_top.png - qss/flatwhite/branch_close.png - qss/flatwhite/branch_open.png - qss/flatwhite/calendar_nextmonth.png - qss/flatwhite/calendar_prevmonth.png - qss/flatwhite/checkbox_checked.png - qss/flatwhite/checkbox_checked_disable.png - qss/flatwhite/checkbox_parcial.png - qss/flatwhite/checkbox_parcial_disable.png - qss/flatwhite/checkbox_unchecked.png - qss/flatwhite/checkbox_unchecked_disable.png - qss/flatwhite/menu_checked.png - qss/flatwhite/radiobutton_checked.png - qss/flatwhite/radiobutton_checked_disable.png - qss/flatwhite/radiobutton_unchecked.png - qss/flatwhite/radiobutton_unchecked_disable.png + qss/flatgray/add_bottom.png + qss/flatgray/add_left.png + qss/flatgray/add_right.png + qss/flatgray/add_top.png + qss/flatgray/arrow_bottom.png + qss/flatgray/arrow_left.png + qss/flatgray/arrow_right.png + qss/flatgray/arrow_top.png + qss/flatgray/branch_close.png + qss/flatgray/branch_open.png + qss/flatgray/calendar_nextmonth.png + qss/flatgray/calendar_prevmonth.png + qss/flatgray/checkbox_checked.png + qss/flatgray/checkbox_checked_disable.png + qss/flatgray/checkbox_parcial.png + qss/flatgray/checkbox_parcial_disable.png + qss/flatgray/checkbox_unchecked.png + qss/flatgray/checkbox_unchecked_disable.png + qss/flatgray/menu_checked.png + qss/flatgray/radiobutton_checked.png + qss/flatgray/radiobutton_checked_disable.png + qss/flatgray/radiobutton_unchecked.png + qss/flatgray/radiobutton_unchecked_disable.png qss/lightblue/add_bottom.png qss/lightblue/add_left.png qss/lightblue/add_right.png @@ -49,28 +48,29 @@ qss/lightblue/radiobutton_checked_disable.png qss/lightblue/radiobutton_unchecked.png qss/lightblue/radiobutton_unchecked_disable.png - qss/psblack/add_bottom.png - qss/psblack/add_left.png - qss/psblack/add_right.png - qss/psblack/add_top.png - qss/psblack/arrow_bottom.png - qss/psblack/arrow_left.png - qss/psblack/arrow_right.png - qss/psblack/arrow_top.png - qss/psblack/branch_close.png - qss/psblack/branch_open.png - qss/psblack/calendar_nextmonth.png - qss/psblack/calendar_prevmonth.png - qss/psblack/checkbox_checked.png - qss/psblack/checkbox_checked_disable.png - qss/psblack/checkbox_parcial.png - qss/psblack/checkbox_parcial_disable.png - qss/psblack/checkbox_unchecked.png - qss/psblack/checkbox_unchecked_disable.png - qss/psblack/menu_checked.png - qss/psblack/radiobutton_checked.png - qss/psblack/radiobutton_checked_disable.png - qss/psblack/radiobutton_unchecked.png - qss/psblack/radiobutton_unchecked_disable.png + qss/blacksoft.css + qss/blacksoft/add_bottom.png + qss/blacksoft/add_left.png + qss/blacksoft/add_right.png + qss/blacksoft/add_top.png + qss/blacksoft/arrow_bottom.png + qss/blacksoft/arrow_left.png + qss/blacksoft/arrow_right.png + qss/blacksoft/arrow_top.png + qss/blacksoft/branch_close.png + qss/blacksoft/branch_open.png + qss/blacksoft/calendar_nextmonth.png + qss/blacksoft/calendar_prevmonth.png + qss/blacksoft/checkbox_checked.png + qss/blacksoft/checkbox_checked_disable.png + qss/blacksoft/checkbox_parcial.png + qss/blacksoft/checkbox_parcial_disable.png + qss/blacksoft/checkbox_unchecked.png + qss/blacksoft/checkbox_unchecked_disable.png + qss/blacksoft/menu_checked.png + qss/blacksoft/radiobutton_checked.png + qss/blacksoft/radiobutton_checked_disable.png + qss/blacksoft/radiobutton_unchecked.png + qss/blacksoft/radiobutton_unchecked_disable.png diff --git a/ui/styledemo/qrc/qss/psblack.css b/ui/styledemo/qrc/qss/blacksoft.css similarity index 93% rename from ui/styledemo/qrc/qss/psblack.css rename to ui/styledemo/qrc/qss/blacksoft.css index f09436d..57cb010 100644 --- a/ui/styledemo/qrc/qss/psblack.css +++ b/ui/styledemo/qrc/qss/blacksoft.css @@ -155,19 +155,19 @@ height:15px; } QRadioButton::indicator::unchecked{ -image:url(:/qss/psblack/radiobutton_unchecked.png); +image:url(:/qss/blacksoft/radiobutton_unchecked.png); } QRadioButton::indicator::unchecked:disabled{ -image:url(:/qss/psblack/radiobutton_unchecked_disable.png); +image:url(:/qss/blacksoft/radiobutton_unchecked_disable.png); } QRadioButton::indicator::checked{ -image:url(:/qss/psblack/radiobutton_checked.png); +image:url(:/qss/blacksoft/radiobutton_checked.png); } QRadioButton::indicator::checked:disabled{ -image:url(:/qss/psblack/radiobutton_checked_disable.png); +image:url(:/qss/blacksoft/radiobutton_checked_disable.png); } QGroupBox::indicator,QTreeView::indicator,QListView::indicator,QTableView::indicator{ @@ -180,38 +180,38 @@ height:13px; } QCheckBox::indicator:unchecked,QGroupBox::indicator:unchecked,QTreeView::indicator:unchecked,QListView::indicator:unchecked,QTableView::indicator:unchecked{ -image:url(:/qss/psblack/checkbox_unchecked.png); +image:url(:/qss/blacksoft/checkbox_unchecked.png); } QCheckBox::indicator:unchecked:disabled,QGroupBox::indicator:unchecked:disabled,QTreeView::indicator:unchecked:disabled,QListView::indicator:unchecked:disabled,QTableView::indicator:unchecked:disabled{ -image:url(:/qss/psblack/checkbox_unchecked_disable.png); +image:url(:/qss/blacksoft/checkbox_unchecked_disable.png); } QCheckBox::indicator:checked,QGroupBox::indicator:checked,QTreeView::indicator:checked,QListView::indicator:checked,QTableView::indicator:checked{ -image:url(:/qss/psblack/checkbox_checked.png); +image:url(:/qss/blacksoft/checkbox_checked.png); } QCheckBox::indicator:checked:disabled,QGroupBox::indicator:checked:disabled,QTreeView::indicator:checked:disabled,QListView::indicator:checked:disabled,QTableView::indicator:checked:disabled{ -image:url(:/qss/psblack/checkbox_checked_disable.png); +image:url(:/qss/blacksoft/checkbox_checked_disable.png); } QCheckBox::indicator:indeterminate,QGroupBox::indicator:indeterminate,QTreeView::indicator:indeterminate,QListView::indicator:indeterminate,QTableView::indicator:indeterminate{ -image:url(:/qss/psblack/checkbox_parcial.png); +image:url(:/qss/blacksoft/checkbox_parcial.png); } QCheckBox::indicator:indeterminate:disabled,QGroupBox::indicator:indeterminate:disabled,QTreeView::indicator:indeterminate:disabled,QListView::indicator:indeterminate:disabled,QTableView::indicator:indeterminate:disabled{ -image:url(:/qss/psblack/checkbox_parcial_disable.png); +image:url(:/qss/blacksoft/checkbox_parcial_disable.png); } QTimeEdit::up-button,QDateEdit::up-button,QDateTimeEdit::up-button,QDoubleSpinBox::up-button,QSpinBox::up-button{ -image:url(:/qss/psblack/add_top.png); +image:url(:/qss/blacksoft/add_top.png); width:10px; height:10px; padding:2px 5px 0px 0px; } QTimeEdit::down-button,QDateEdit::down-button,QDateTimeEdit::down-button,QDoubleSpinBox::down-button,QSpinBox::down-button{ -image:url(:/qss/psblack/add_bottom.png); +image:url(:/qss/blacksoft/add_bottom.png); width:10px; height:10px; padding:0px 5px 2px 0px; @@ -226,7 +226,7 @@ bottom:-2px; } QComboBox::down-arrow,QDateEdit[calendarPopup="true"]::down-arrow,QTimeEdit[calendarPopup="true"]::down-arrow,QDateTimeEdit[calendarPopup="true"]::down-arrow{ -image:url(:/qss/psblack/add_bottom.png); +image:url(:/qss/blacksoft/add_bottom.png); width:10px; height:10px; right:2px; @@ -271,11 +271,11 @@ height:13px; } QMenu::indicator::checked{ -image:url(:/qss/psblack/menu_checked.png); +image:url(:/qss/blacksoft/menu_checked.png); } QMenu::right-arrow{ -image:url(:/qss/psblack/arrow_right.png); +image:url(:/qss/blacksoft/arrow_right.png); width:13px; height:13px; padding:0px 3px 0px 0px; @@ -445,12 +445,12 @@ gridline-color:#242424; QTreeView::branch:closed:has-children{ margin:4px; -border-image:url(:/qss/psblack/branch_open.png); +border-image:url(:/qss/blacksoft/branch_open.png); } QTreeView::branch:open:has-children{ margin:4px; -border-image:url(:/qss/psblack/branch_close.png); +border-image:url(:/qss/blacksoft/branch_close.png); } QTreeView,QListView,QTableView,QSplitter::handle,QTreeView::branch{ @@ -578,13 +578,13 @@ min-width:80px; QToolButton#qt_calendar_prevmonth{ icon-size:0px; min-width:20px; -image:url(:/qss/psblack/calendar_prevmonth.png); +image:url(:/qss/blacksoft/calendar_prevmonth.png); } QToolButton#qt_calendar_nextmonth{ icon-size:0px; min-width:20px; -image:url(:/qss/psblack/calendar_nextmonth.png); +image:url(:/qss/blacksoft/calendar_nextmonth.png); } QToolButton#qt_calendar_prevmonth,QToolButton#qt_calendar_nextmonth,QToolButton#qt_calendar_monthbutton,QToolButton#qt_calendar_yearbutton{ diff --git a/ui/styledemo/qrc/qss/psblack/add_bottom.png b/ui/styledemo/qrc/qss/blacksoft/add_bottom.png similarity index 100% rename from ui/styledemo/qrc/qss/psblack/add_bottom.png rename to ui/styledemo/qrc/qss/blacksoft/add_bottom.png diff --git a/ui/styledemo/qrc/qss/psblack/add_left.png b/ui/styledemo/qrc/qss/blacksoft/add_left.png similarity index 100% rename from ui/styledemo/qrc/qss/psblack/add_left.png rename to ui/styledemo/qrc/qss/blacksoft/add_left.png diff --git a/ui/styledemo/qrc/qss/psblack/add_right.png b/ui/styledemo/qrc/qss/blacksoft/add_right.png similarity index 100% rename from ui/styledemo/qrc/qss/psblack/add_right.png rename to ui/styledemo/qrc/qss/blacksoft/add_right.png diff --git a/ui/styledemo/qrc/qss/psblack/add_top.png b/ui/styledemo/qrc/qss/blacksoft/add_top.png similarity index 100% rename from ui/styledemo/qrc/qss/psblack/add_top.png rename to ui/styledemo/qrc/qss/blacksoft/add_top.png diff --git a/ui/styledemo/qrc/qss/psblack/arrow_bottom.png b/ui/styledemo/qrc/qss/blacksoft/arrow_bottom.png similarity index 100% rename from ui/styledemo/qrc/qss/psblack/arrow_bottom.png rename to ui/styledemo/qrc/qss/blacksoft/arrow_bottom.png diff --git a/ui/styledemo/qrc/qss/psblack/arrow_left.png b/ui/styledemo/qrc/qss/blacksoft/arrow_left.png similarity index 100% rename from ui/styledemo/qrc/qss/psblack/arrow_left.png rename to ui/styledemo/qrc/qss/blacksoft/arrow_left.png diff --git a/ui/styledemo/qrc/qss/psblack/arrow_right.png b/ui/styledemo/qrc/qss/blacksoft/arrow_right.png similarity index 100% rename from ui/styledemo/qrc/qss/psblack/arrow_right.png rename to ui/styledemo/qrc/qss/blacksoft/arrow_right.png diff --git a/ui/styledemo/qrc/qss/psblack/arrow_top.png b/ui/styledemo/qrc/qss/blacksoft/arrow_top.png similarity index 100% rename from ui/styledemo/qrc/qss/psblack/arrow_top.png rename to ui/styledemo/qrc/qss/blacksoft/arrow_top.png diff --git a/ui/styledemo/qrc/qss/psblack/branch_close.png b/ui/styledemo/qrc/qss/blacksoft/branch_close.png similarity index 100% rename from ui/styledemo/qrc/qss/psblack/branch_close.png rename to ui/styledemo/qrc/qss/blacksoft/branch_close.png diff --git a/ui/styledemo/qrc/qss/psblack/branch_open.png b/ui/styledemo/qrc/qss/blacksoft/branch_open.png similarity index 100% rename from ui/styledemo/qrc/qss/psblack/branch_open.png rename to ui/styledemo/qrc/qss/blacksoft/branch_open.png diff --git a/ui/styledemo/qrc/qss/psblack/calendar_nextmonth.png b/ui/styledemo/qrc/qss/blacksoft/calendar_nextmonth.png similarity index 100% rename from ui/styledemo/qrc/qss/psblack/calendar_nextmonth.png rename to ui/styledemo/qrc/qss/blacksoft/calendar_nextmonth.png diff --git a/ui/styledemo/qrc/qss/psblack/calendar_prevmonth.png b/ui/styledemo/qrc/qss/blacksoft/calendar_prevmonth.png similarity index 100% rename from ui/styledemo/qrc/qss/psblack/calendar_prevmonth.png rename to ui/styledemo/qrc/qss/blacksoft/calendar_prevmonth.png diff --git a/ui/styledemo/qrc/qss/psblack/checkbox_checked.png b/ui/styledemo/qrc/qss/blacksoft/checkbox_checked.png similarity index 100% rename from ui/styledemo/qrc/qss/psblack/checkbox_checked.png rename to ui/styledemo/qrc/qss/blacksoft/checkbox_checked.png diff --git a/ui/styledemo/qrc/qss/psblack/checkbox_checked_disable.png b/ui/styledemo/qrc/qss/blacksoft/checkbox_checked_disable.png similarity index 100% rename from ui/styledemo/qrc/qss/psblack/checkbox_checked_disable.png rename to ui/styledemo/qrc/qss/blacksoft/checkbox_checked_disable.png diff --git a/ui/styledemo/qrc/qss/psblack/checkbox_parcial.png b/ui/styledemo/qrc/qss/blacksoft/checkbox_parcial.png similarity index 100% rename from ui/styledemo/qrc/qss/psblack/checkbox_parcial.png rename to ui/styledemo/qrc/qss/blacksoft/checkbox_parcial.png diff --git a/ui/styledemo/qrc/qss/psblack/checkbox_parcial_disable.png b/ui/styledemo/qrc/qss/blacksoft/checkbox_parcial_disable.png similarity index 100% rename from ui/styledemo/qrc/qss/psblack/checkbox_parcial_disable.png rename to ui/styledemo/qrc/qss/blacksoft/checkbox_parcial_disable.png diff --git a/ui/styledemo/qrc/qss/psblack/checkbox_unchecked.png b/ui/styledemo/qrc/qss/blacksoft/checkbox_unchecked.png similarity index 100% rename from ui/styledemo/qrc/qss/psblack/checkbox_unchecked.png rename to ui/styledemo/qrc/qss/blacksoft/checkbox_unchecked.png diff --git a/ui/styledemo/qrc/qss/psblack/checkbox_unchecked_disable.png b/ui/styledemo/qrc/qss/blacksoft/checkbox_unchecked_disable.png similarity index 100% rename from ui/styledemo/qrc/qss/psblack/checkbox_unchecked_disable.png rename to ui/styledemo/qrc/qss/blacksoft/checkbox_unchecked_disable.png diff --git a/ui/styledemo/qrc/qss/psblack/menu_checked.png b/ui/styledemo/qrc/qss/blacksoft/menu_checked.png similarity index 100% rename from ui/styledemo/qrc/qss/psblack/menu_checked.png rename to ui/styledemo/qrc/qss/blacksoft/menu_checked.png diff --git a/ui/styledemo/qrc/qss/psblack/radiobutton_checked.png b/ui/styledemo/qrc/qss/blacksoft/radiobutton_checked.png similarity index 100% rename from ui/styledemo/qrc/qss/psblack/radiobutton_checked.png rename to ui/styledemo/qrc/qss/blacksoft/radiobutton_checked.png diff --git a/ui/styledemo/qrc/qss/psblack/radiobutton_checked_disable.png b/ui/styledemo/qrc/qss/blacksoft/radiobutton_checked_disable.png similarity index 100% rename from ui/styledemo/qrc/qss/psblack/radiobutton_checked_disable.png rename to ui/styledemo/qrc/qss/blacksoft/radiobutton_checked_disable.png diff --git a/ui/styledemo/qrc/qss/psblack/radiobutton_unchecked.png b/ui/styledemo/qrc/qss/blacksoft/radiobutton_unchecked.png similarity index 100% rename from ui/styledemo/qrc/qss/psblack/radiobutton_unchecked.png rename to ui/styledemo/qrc/qss/blacksoft/radiobutton_unchecked.png diff --git a/ui/styledemo/qrc/qss/psblack/radiobutton_unchecked_disable.png b/ui/styledemo/qrc/qss/blacksoft/radiobutton_unchecked_disable.png similarity index 100% rename from ui/styledemo/qrc/qss/psblack/radiobutton_unchecked_disable.png rename to ui/styledemo/qrc/qss/blacksoft/radiobutton_unchecked_disable.png diff --git a/ui/styledemo/qrc/qss/flatwhite.css b/ui/styledemo/qrc/qss/flatgray.css similarity index 93% rename from ui/styledemo/qrc/qss/flatwhite.css rename to ui/styledemo/qrc/qss/flatgray.css index 2c2d565..d4da4e0 100644 --- a/ui/styledemo/qrc/qss/flatwhite.css +++ b/ui/styledemo/qrc/qss/flatgray.css @@ -155,19 +155,19 @@ height:15px; } QRadioButton::indicator::unchecked{ -image:url(:/qss/flatwhite/radiobutton_unchecked.png); +image:url(:/qss/flatgray/radiobutton_unchecked.png); } QRadioButton::indicator::unchecked:disabled{ -image:url(:/qss/flatwhite/radiobutton_unchecked_disable.png); +image:url(:/qss/flatgray/radiobutton_unchecked_disable.png); } QRadioButton::indicator::checked{ -image:url(:/qss/flatwhite/radiobutton_checked.png); +image:url(:/qss/flatgray/radiobutton_checked.png); } QRadioButton::indicator::checked:disabled{ -image:url(:/qss/flatwhite/radiobutton_checked_disable.png); +image:url(:/qss/flatgray/radiobutton_checked_disable.png); } QGroupBox::indicator,QTreeView::indicator,QListView::indicator,QTableView::indicator{ @@ -180,38 +180,38 @@ height:13px; } QCheckBox::indicator:unchecked,QGroupBox::indicator:unchecked,QTreeView::indicator:unchecked,QListView::indicator:unchecked,QTableView::indicator:unchecked{ -image:url(:/qss/flatwhite/checkbox_unchecked.png); +image:url(:/qss/flatgray/checkbox_unchecked.png); } QCheckBox::indicator:unchecked:disabled,QGroupBox::indicator:unchecked:disabled,QTreeView::indicator:unchecked:disabled,QListView::indicator:unchecked:disabled,QTableView::indicator:unchecked:disabled{ -image:url(:/qss/flatwhite/checkbox_unchecked_disable.png); +image:url(:/qss/flatgray/checkbox_unchecked_disable.png); } QCheckBox::indicator:checked,QGroupBox::indicator:checked,QTreeView::indicator:checked,QListView::indicator:checked,QTableView::indicator:checked{ -image:url(:/qss/flatwhite/checkbox_checked.png); +image:url(:/qss/flatgray/checkbox_checked.png); } QCheckBox::indicator:checked:disabled,QGroupBox::indicator:checked:disabled,QTreeView::indicator:checked:disabled,QListView::indicator:checked:disabled,QTableView::indicator:checked:disabled{ -image:url(:/qss/flatwhite/checkbox_checked_disable.png); +image:url(:/qss/flatgray/checkbox_checked_disable.png); } QCheckBox::indicator:indeterminate,QGroupBox::indicator:indeterminate,QTreeView::indicator:indeterminate,QListView::indicator:indeterminate,QTableView::indicator:indeterminate{ -image:url(:/qss/flatwhite/checkbox_parcial.png); +image:url(:/qss/flatgray/checkbox_parcial.png); } QCheckBox::indicator:indeterminate:disabled,QGroupBox::indicator:indeterminate:disabled,QTreeView::indicator:indeterminate:disabled,QListView::indicator:indeterminate:disabled,QTableView::indicator:indeterminate:disabled{ -image:url(:/qss/flatwhite/checkbox_parcial_disable.png); +image:url(:/qss/flatgray/checkbox_parcial_disable.png); } QTimeEdit::up-button,QDateEdit::up-button,QDateTimeEdit::up-button,QDoubleSpinBox::up-button,QSpinBox::up-button{ -image:url(:/qss/flatwhite/add_top.png); +image:url(:/qss/flatgray/add_top.png); width:10px; height:10px; padding:2px 5px 0px 0px; } QTimeEdit::down-button,QDateEdit::down-button,QDateTimeEdit::down-button,QDoubleSpinBox::down-button,QSpinBox::down-button{ -image:url(:/qss/flatwhite/add_bottom.png); +image:url(:/qss/flatgray/add_bottom.png); width:10px; height:10px; padding:0px 5px 2px 0px; @@ -226,7 +226,7 @@ bottom:-2px; } QComboBox::down-arrow,QDateEdit[calendarPopup="true"]::down-arrow,QTimeEdit[calendarPopup="true"]::down-arrow,QDateTimeEdit[calendarPopup="true"]::down-arrow{ -image:url(:/qss/flatwhite/add_bottom.png); +image:url(:/qss/flatgray/add_bottom.png); width:10px; height:10px; right:2px; @@ -271,11 +271,11 @@ height:13px; } QMenu::indicator::checked{ -image:url(:/qss/flatwhite/menu_checked.png); +image:url(:/qss/flatgray/menu_checked.png); } QMenu::right-arrow{ -image:url(:/qss/flatwhite/arrow_right.png); +image:url(:/qss/flatgray/arrow_right.png); width:13px; height:13px; padding:0px 3px 0px 0px; @@ -445,12 +445,12 @@ gridline-color:#B6B6B6; QTreeView::branch:closed:has-children{ margin:4px; -border-image:url(:/qss/flatwhite/branch_open.png); +border-image:url(:/qss/flatgray/branch_open.png); } QTreeView::branch:open:has-children{ margin:4px; -border-image:url(:/qss/flatwhite/branch_close.png); +border-image:url(:/qss/flatgray/branch_close.png); } QTreeView,QListView,QTableView,QSplitter::handle,QTreeView::branch{ @@ -578,13 +578,13 @@ min-width:80px; QToolButton#qt_calendar_prevmonth{ icon-size:0px; min-width:20px; -image:url(:/qss/flatwhite/calendar_prevmonth.png); +image:url(:/qss/flatgray/calendar_prevmonth.png); } QToolButton#qt_calendar_nextmonth{ icon-size:0px; min-width:20px; -image:url(:/qss/flatwhite/calendar_nextmonth.png); +image:url(:/qss/flatgray/calendar_nextmonth.png); } QToolButton#qt_calendar_prevmonth,QToolButton#qt_calendar_nextmonth,QToolButton#qt_calendar_monthbutton,QToolButton#qt_calendar_yearbutton{ diff --git a/ui/styledemo/qrc/qss/flatwhite/add_bottom.png b/ui/styledemo/qrc/qss/flatgray/add_bottom.png similarity index 100% rename from ui/styledemo/qrc/qss/flatwhite/add_bottom.png rename to ui/styledemo/qrc/qss/flatgray/add_bottom.png diff --git a/ui/styledemo/qrc/qss/flatwhite/add_left.png b/ui/styledemo/qrc/qss/flatgray/add_left.png similarity index 100% rename from ui/styledemo/qrc/qss/flatwhite/add_left.png rename to ui/styledemo/qrc/qss/flatgray/add_left.png diff --git a/ui/styledemo/qrc/qss/flatwhite/add_right.png b/ui/styledemo/qrc/qss/flatgray/add_right.png similarity index 100% rename from ui/styledemo/qrc/qss/flatwhite/add_right.png rename to ui/styledemo/qrc/qss/flatgray/add_right.png diff --git a/ui/styledemo/qrc/qss/flatwhite/add_top.png b/ui/styledemo/qrc/qss/flatgray/add_top.png similarity index 100% rename from ui/styledemo/qrc/qss/flatwhite/add_top.png rename to ui/styledemo/qrc/qss/flatgray/add_top.png diff --git a/ui/styledemo/qrc/qss/flatwhite/arrow_bottom.png b/ui/styledemo/qrc/qss/flatgray/arrow_bottom.png similarity index 100% rename from ui/styledemo/qrc/qss/flatwhite/arrow_bottom.png rename to ui/styledemo/qrc/qss/flatgray/arrow_bottom.png diff --git a/ui/styledemo/qrc/qss/flatwhite/arrow_left.png b/ui/styledemo/qrc/qss/flatgray/arrow_left.png similarity index 100% rename from ui/styledemo/qrc/qss/flatwhite/arrow_left.png rename to ui/styledemo/qrc/qss/flatgray/arrow_left.png diff --git a/ui/styledemo/qrc/qss/flatwhite/arrow_right.png b/ui/styledemo/qrc/qss/flatgray/arrow_right.png similarity index 100% rename from ui/styledemo/qrc/qss/flatwhite/arrow_right.png rename to ui/styledemo/qrc/qss/flatgray/arrow_right.png diff --git a/ui/styledemo/qrc/qss/flatwhite/arrow_top.png b/ui/styledemo/qrc/qss/flatgray/arrow_top.png similarity index 100% rename from ui/styledemo/qrc/qss/flatwhite/arrow_top.png rename to ui/styledemo/qrc/qss/flatgray/arrow_top.png diff --git a/ui/styledemo/qrc/qss/flatwhite/branch_close.png b/ui/styledemo/qrc/qss/flatgray/branch_close.png similarity index 100% rename from ui/styledemo/qrc/qss/flatwhite/branch_close.png rename to ui/styledemo/qrc/qss/flatgray/branch_close.png diff --git a/ui/styledemo/qrc/qss/flatwhite/branch_open.png b/ui/styledemo/qrc/qss/flatgray/branch_open.png similarity index 100% rename from ui/styledemo/qrc/qss/flatwhite/branch_open.png rename to ui/styledemo/qrc/qss/flatgray/branch_open.png diff --git a/ui/styledemo/qrc/qss/flatwhite/calendar_nextmonth.png b/ui/styledemo/qrc/qss/flatgray/calendar_nextmonth.png similarity index 100% rename from ui/styledemo/qrc/qss/flatwhite/calendar_nextmonth.png rename to ui/styledemo/qrc/qss/flatgray/calendar_nextmonth.png diff --git a/ui/styledemo/qrc/qss/flatwhite/calendar_prevmonth.png b/ui/styledemo/qrc/qss/flatgray/calendar_prevmonth.png similarity index 100% rename from ui/styledemo/qrc/qss/flatwhite/calendar_prevmonth.png rename to ui/styledemo/qrc/qss/flatgray/calendar_prevmonth.png diff --git a/ui/styledemo/qrc/qss/flatwhite/checkbox_checked.png b/ui/styledemo/qrc/qss/flatgray/checkbox_checked.png similarity index 100% rename from ui/styledemo/qrc/qss/flatwhite/checkbox_checked.png rename to ui/styledemo/qrc/qss/flatgray/checkbox_checked.png diff --git a/ui/styledemo/qrc/qss/flatwhite/checkbox_checked_disable.png b/ui/styledemo/qrc/qss/flatgray/checkbox_checked_disable.png similarity index 100% rename from ui/styledemo/qrc/qss/flatwhite/checkbox_checked_disable.png rename to ui/styledemo/qrc/qss/flatgray/checkbox_checked_disable.png diff --git a/ui/styledemo/qrc/qss/flatwhite/checkbox_parcial.png b/ui/styledemo/qrc/qss/flatgray/checkbox_parcial.png similarity index 100% rename from ui/styledemo/qrc/qss/flatwhite/checkbox_parcial.png rename to ui/styledemo/qrc/qss/flatgray/checkbox_parcial.png diff --git a/ui/styledemo/qrc/qss/flatwhite/checkbox_parcial_disable.png b/ui/styledemo/qrc/qss/flatgray/checkbox_parcial_disable.png similarity index 100% rename from ui/styledemo/qrc/qss/flatwhite/checkbox_parcial_disable.png rename to ui/styledemo/qrc/qss/flatgray/checkbox_parcial_disable.png diff --git a/ui/styledemo/qrc/qss/flatwhite/checkbox_unchecked.png b/ui/styledemo/qrc/qss/flatgray/checkbox_unchecked.png similarity index 100% rename from ui/styledemo/qrc/qss/flatwhite/checkbox_unchecked.png rename to ui/styledemo/qrc/qss/flatgray/checkbox_unchecked.png diff --git a/ui/styledemo/qrc/qss/flatwhite/checkbox_unchecked_disable.png b/ui/styledemo/qrc/qss/flatgray/checkbox_unchecked_disable.png similarity index 100% rename from ui/styledemo/qrc/qss/flatwhite/checkbox_unchecked_disable.png rename to ui/styledemo/qrc/qss/flatgray/checkbox_unchecked_disable.png diff --git a/ui/styledemo/qrc/qss/flatwhite/menu_checked.png b/ui/styledemo/qrc/qss/flatgray/menu_checked.png similarity index 100% rename from ui/styledemo/qrc/qss/flatwhite/menu_checked.png rename to ui/styledemo/qrc/qss/flatgray/menu_checked.png diff --git a/ui/styledemo/qrc/qss/flatwhite/radiobutton_checked.png b/ui/styledemo/qrc/qss/flatgray/radiobutton_checked.png similarity index 100% rename from ui/styledemo/qrc/qss/flatwhite/radiobutton_checked.png rename to ui/styledemo/qrc/qss/flatgray/radiobutton_checked.png diff --git a/ui/styledemo/qrc/qss/flatwhite/radiobutton_checked_disable.png b/ui/styledemo/qrc/qss/flatgray/radiobutton_checked_disable.png similarity index 100% rename from ui/styledemo/qrc/qss/flatwhite/radiobutton_checked_disable.png rename to ui/styledemo/qrc/qss/flatgray/radiobutton_checked_disable.png diff --git a/ui/styledemo/qrc/qss/flatwhite/radiobutton_unchecked.png b/ui/styledemo/qrc/qss/flatgray/radiobutton_unchecked.png similarity index 100% rename from ui/styledemo/qrc/qss/flatwhite/radiobutton_unchecked.png rename to ui/styledemo/qrc/qss/flatgray/radiobutton_unchecked.png diff --git a/ui/styledemo/qrc/qss/flatwhite/radiobutton_unchecked_disable.png b/ui/styledemo/qrc/qss/flatgray/radiobutton_unchecked_disable.png similarity index 100% rename from ui/styledemo/qrc/qss/flatwhite/radiobutton_unchecked_disable.png rename to ui/styledemo/qrc/qss/flatgray/radiobutton_unchecked_disable.png diff --git a/ui/uidemo01/main.cpp b/ui/uidemo01/main.cpp index 160a960..7da7e26 100644 --- a/ui/uidemo01/main.cpp +++ b/ui/uidemo01/main.cpp @@ -16,7 +16,7 @@ int main(int argc, char *argv[]) QUIHelper::setCode(); //加载样式表 - QFile file(":/qss/psblack.css"); + QFile file(":/qss/blacksoft.css"); if (file.open(QFile::ReadOnly)) { QString qss = QLatin1String(file.readAll()); QString paletteColor = qss.mid(20, 7); diff --git a/ui/uidemo01/snap.png b/ui/uidemo01/snap.png new file mode 100644 index 0000000..c707dd1 Binary files /dev/null and b/ui/uidemo01/snap.png differ diff --git a/ui/uidemo08/form/frmmain.cpp b/ui/uidemo08/form/frmmain.cpp index 3e81a07..0d84e2a 100644 --- a/ui/uidemo08/form/frmmain.cpp +++ b/ui/uidemo08/form/frmmain.cpp @@ -98,7 +98,7 @@ void frmMain::initStyle() { //加载样式表 QString qss; - QFile file(":/qss/psblack.css"); + QFile file(":/qss/blacksoft.css"); if (file.open(QFile::ReadOnly)) { qss = QLatin1String(file.readAll()); QString paletteColor = qss.mid(20, 7); diff --git a/ui/uidemo09/form/frmmain.cpp b/ui/uidemo09/form/frmmain.cpp index 54a6278..9d557f1 100644 --- a/ui/uidemo09/form/frmmain.cpp +++ b/ui/uidemo09/form/frmmain.cpp @@ -16,6 +16,8 @@ frmMain::~frmMain() void frmMain::initForm() { + this->setWindowTitle("九宫格主界面"); + bg = "main2.jpg"; QList btns = this->findChildren(); diff --git a/ui/uidemo09/main.cpp b/ui/uidemo09/main.cpp index e9122ce..83e86df 100644 --- a/ui/uidemo09/main.cpp +++ b/ui/uidemo09/main.cpp @@ -16,7 +16,7 @@ int main(int argc, char *argv[]) QUIHelper::setCode(); //加载样式表 - QFile file(":/qss/psblack.css"); + QFile file(":/qss/blacksoft.css"); if (file.open(QFile::ReadOnly)) { QString qss = QLatin1String(file.readAll()); QString paletteColor = qss.mid(20, 7); @@ -26,7 +26,6 @@ int main(int argc, char *argv[]) } frmMain w; - w.setWindowTitle("九宫格主界面 (QQ: 517216493 WX: feiyangqingyun)"); QUIHelper::setFormInCenter(&w); w.show(); diff --git a/ui/uidemo09/snap.png b/ui/uidemo09/snap.png new file mode 100644 index 0000000..2bbff8e Binary files /dev/null and b/ui/uidemo09/snap.png differ diff --git a/ui/uidemo10/snap.png b/ui/uidemo10/snap.png new file mode 100644 index 0000000..687709b Binary files /dev/null and b/ui/uidemo10/snap.png differ