diff -r fe7d2bbf5f3f -r 946b21a1fbf6 QTfrontend/res/css/easter.css --- a/QTfrontend/res/css/easter.css Tue Aug 07 13:04:02 2018 +0200 +++ b/QTfrontend/res/css/easter.css Tue Aug 07 16:07:13 2018 +0200 @@ -1,10 +1,10 @@ /****************************************************************************** * - * CSS-like definition of Qt frontend appearance + * CSS definition of Qt frontend appearance. Easter mode. * ****************************************************************************** * - * see http://doc.qt.nokia.com/4.5/stylesheet.html + * see https://doc.qt.io/qt-5/style-reference.html * ****************************************************************************** * @@ -15,10 +15,20 @@ * /css/easter.css * (:/res/css/easter.css) * - *****************************************************************************/ + ****************************************************************************** + * + * This file is based off qt.css with minimal changes. The altered parts are + * marked with “CUSTOM”. + * + ******************************************************************************/ +#infoButton +{ +border: transparent; +background: transparent; +} HWForm,QDialog { -background-image: url(":/res/BackgroundEaster.png"); +background-image: url(":/res/BackgroundEaster.png"); /* CUSTOM */ background-position: bottom center; background-repeat: repeat-x; background-color: #141250; @@ -32,20 +42,40 @@ a { color:#c8c8ff; } -QLineEdit, QListWidget, QListView, QTableView, QTextBrowser, QSpinBox, QComboBox, -QComboBox QAbstractItemView, QPlainTextEdit, QMenu::item { +QLineEdit, QListWidget, QListView, QTableView, QTableWidget, QTextBrowser, QSpinBox, QComboBox, +QComboBox QAbstractItemView, QPlainTextEdit, QMenu::item, #labelLikeLineEdit { background-color: rgba(13, 5, 68, 70%); } +VertScrArea, QGraphicsView { +border-style: solid; border-width: 2px; border-color: #cca300; border-radius: 3px; +} +#gameStatsView { +border-color: #332816; +} + +QSplitter::handle { +background-image: url(":/res/splitter.png"); +background-clip: content; +} +QSplitter::handle:horizontal { +width: 7px; +background-repeat: repeat-y; +} +QSplitter::handle:vertical { +height: 7px; +background-repeat: repeat-x; +} + QComboBox::separator { border: solid; border-width: 3px; border-color: #ffcc00; } -QPushButton, QListWidget, QListView, QTableView, QLineEdit, QHeaderView, +QPushButton, QListWidget, QListView, QTableView, QTableWidget, QLineEdit, QTextBrowser, QSpinBox, QToolBox, QComboBox, QPlainTextEdit, QComboBox QAbstractItemView, IconedGroupBox, -.QGroupBox, GameCFGWidget, TeamSelWidget, SelWeaponWidget, -QTabWidget::pane, QTabBar::tab { +.QGroupBox, #gameStackContainer, TeamSelWidget, SelWeaponWidget, +QTabWidget::pane, QTabBar::tab, #mapPreview, #labelLikeLineEdit { border: solid; border-width: 3px; border-color: #ffcc00; @@ -56,28 +86,67 @@ border-color: yellow; } -QLineEdit, QListWidget, QListView,QTableView, QTextBrowser, -QSpinBox, QToolBox, QPlainTextEdit { +TeamShowWidget QPushButton { +icon-size: 48px; +text-align: left; +background-color: #0d0544; +color: orange; +font: bold; +border-width: 2px; +margin: 6px 0px 6px 0px; +} +TeamShowWidget QPushButton:disabled { +color: #a0a0a0; +} + +QToolButton { +background-color: #11084A; +} + +QToolButton:hover { +background-color: #150A61; +} + +QToolButton:pressed { +background-color: #100744; +} + +QLineEdit, QListWidget, QListView, QTableView, QTableWidget, QTextBrowser, +QSpinBox, QToolBox, QPlainTextEdit, QToolButton, #mapPreview, #labelLikeLineEdit { border-radius: 10px; } +#mapPreview { +background-color: #0d0544; +} +#mapPreview:disabled{ +border-color: #a0a0a0; +background-color: #0d0544; +color: #ffffff; +} + QLineEdit, QLabel, QHeaderView, QListWidget, QListView, QTableView, -QSpinBox, QToolBox::tab, QComboBox, QComboBox QAbstractItemView, -IconedGroupBox, .QGroupBox, GameCFGWidget, TeamSelWidget, -SelWeaponWidget, QCheckBox, QRadioButton, QPushButton, QPlainTextEdit { +QTableWidget, QSpinBox, QToolBox::tab, QComboBox, QComboBox QAbstractItemView, +IconedGroupBox, .QGroupBox, #gameStackContainer, TeamSelWidget, +SelWeaponWidget, QCheckBox, QRadioButton, QPushButton, QPlainTextEdit, +#mapName { font: bold 13px; } +.QLabel{ +background-color: transparent; +} SelWeaponWidget QTabWidget::pane, SelWeaponWidget QTabBar::tab:selected { background-position: bottom center; background-repeat: repeat-x; background-color: #000000; } -.QGroupBox,GameCFGWidget,TeamSelWidget,SelWeaponWidget { +.QGroupBox, #gameStackContainer, TeamSelWidget, SelWeaponWidget { background-position: bottom center; background-repeat: repeat-x; border-radius: 16px; background-color: rgba(13, 5, 68, 70%); padding: 6px; +margin-top: 4px; } /* Experimenting with PaintOnScreen and border-radius on IconedGroupBox children didn't work out well IconedGroupBox QComboBox, IconedGroupBox QPushButton, IconedGroupBox QLineEdit, @@ -89,6 +158,14 @@ background-color: #130f2c; } +QTabWidget::pane { +border-radius: 8px; +border-top-left-radius: 0px; +} + +GameCFGWidget { +border: none; +} QPushButton { border-radius: 8px; @@ -97,7 +174,7 @@ background-color: rgba(18, 42, 5, 70%); } -QPushButton:pressed{ +QPushButton:pressed, QToolButton:pressed { border-color: white; } @@ -105,28 +182,51 @@ outline: none; } +QHeaderView { +background-color: #00351d; +border: solid; +border-bottom-width: 3px; +border-top-width: 0px; +border-left-width: 0px; +border-right-width: 0px; +border-color: #ffcc00; +} +QHeaderView::section { +border-left-width: 1px; +border-right-width: 1px; +border-top-width: 0; +border-bottom-width: 0px; +border-color: #001d10; +border-style: solid; +background-color: #00351d; +padding: 4px; +} +QHeaderView::section:pressed { +background-color: #00250d; +} +QHeaderView::up-arrow { +image: url(":/res/sort_up.png"); +} +QHeaderView::down-arrow{ +image: url(":/res/sort_down.png"); +} -QHeaderView { -border-radius: 0; -border-width: 0; -border-bottom-width: 3px; -background-color: #00351d; -} -QTableView { +QTableView, QTableWidget { alternate-background-color: #2f213a; gridline-color: transparent; } - +QTabWidget::pane { top: -2px; } QTabBar::tab { -border-bottom-width: 0; border-radius: 0; border-top-left-radius: 6px; border-top-right-radius: 6px; padding: 3px; +background-color: #00351d; +color: #ffcc00; } -QTabBar::tab:!selected { -color: #0d0544; -background-color: #ffcc00; +QTabBar::tab:selected { +border-bottom-color: #0d0544; +border-bottom-width: 0; } QSpinBox::up-button{ background: transparent; @@ -137,10 +237,16 @@ QSpinBox::up-arrow { image: url(":/res/spin_up.png"); } +QSpinBox::up-arrow:disabled { +image: url(":/res/spin_up_disabled.png"); +} QSpinBox::down-arrow { image: url(":/res/spin_down.png"); } +QSpinBox::down-arrow:disabled { +image: url(":/res/spin_down_disabled.png"); +} QSpinBox::down-button { background: transparent; @@ -151,6 +257,7 @@ QComboBox { border-radius: 10px; padding: 3px; +height: 18px; } QComboBox:pressed{ border-color: white; @@ -162,6 +269,9 @@ QComboBox::down-arrow { image: url(":/res/dropdown.png"); } +QComboBox::down-arrow:disabled { +image: url(":/res/dropdown_disabled.png"); +} VertScrArea { background-position: bottom center; @@ -178,15 +288,45 @@ subcontrol-position: top left; text-align: left; left: 15px; -top: -4px; } QCheckBox::indicator:checked{ image: url(":/res/checked.png"); } +QCheckBox::indicator:checked:hover{ +image: url(":/res/checkedHover.png"); +} +QCheckBox::indicator:checked:pressed{ +image: url(":/res/checkedPressed.png"); +} QCheckBox::indicator:unchecked{ image: url(":/res/unchecked.png"); } +QCheckBox::indicator:unchecked:hover{ +image: url(":/res/uncheckedHover.png"); +} +QCheckBox::indicator:unchecked:pressed{ +image: url(":/res/uncheckedPressed.png"); +} + +QRadioButton::indicator:checked{ +image: url(":/res/radioButtonChecked.png"); +} +QRadioButton::indicator:checked:hover{ +image: url(":/res/radioButtonCheckedHover.png"); +} +QRadioButton::indicator:checked:pressed{ +image: url(":/res/radioButtonCheckedPressed.png"); +} +QRadioButton::indicator:unchecked{ +image: url(":/res/radioButtonUnchecked.png"); +} +QRadioButton::indicator:unchecked:hover{ +image: url(":/res/radioButtonUncheckedHover.png"); +} +QRadioButton::indicator:unchecked:pressed{ +image: url(":/res/radioButtonUncheckedPressed.png"); +} .QWidget{ background: transparent; @@ -227,6 +367,11 @@ :disabled{ color: #a0a0a0; +border-color: #a0a0a0; +} +QListWidget:item:selected:disabled, QListView:item:selected:disabled{ +color: rgba(13, 5, 68, 70%); +background-color: #a0a0a0; } SquareLabel, ItemNum { background-color: #000000; @@ -237,12 +382,75 @@ margin: 2px 0px; background-color: #ffcc00; } +QSlider::groove::horizontal:disabled { +background-color: #a0a0a0; +} QSlider::handle::horizontal { border: 0px; -margin: -2px 0px; +margin: -8px 0px; +background-color: #ffcc00; +width: 12px; +height: 6px; border-radius: 3px; -background-color: #ffcc00; -width: 8px; +} +QSlider::handle::horizontal:disabled { +background-color: #a0a0a0; +} + +HatButton, ThemeButton { +text-align: left; +} + +#hatList, #hatList:hover, #themeList, #themeList:hover { +border-color: #F6CB1C; +} + +#hatList QScrollBar, #themeList QScrollBar { +background-color: #130F2A; +border-top-right-radius: 10px; +border-bottom-right-radius: 10px; +} + +#hatList, #themeList { +border-color: #F6CB1C; +border-width: 3px; +border-style: solid; +border-radius: 10px; +border-top-left-radius: 0px; } +#hatList::item, #themeList::item { +background-color: #11084A; +padding: 4px; +border-radius: 10px; +color: #ffcc00 !important; +font: 8px; +border-width: 2px; +border-color: #11084A; +} + +#hatList::item:hover, #themeList::item:hover { +background-color: #150A61; +} + +#hatList::item:selected, #themeList::item:selected { +background-color: #150A61; +} + +QDialogButtonBox QPushButton { +padding: 3px 5px; +} + +#gameCfgWidgetTabs { +border-radius: 16px; +border-top-left-radius: 0px; +} + +TeamSelWidget, #gameStackContainer, #GBoxOptions { +border-radius: 10px; +} + +PageMultiplayer TeamSelWidget { +min-height: 500px; +}