diff --git a/share/qtcreator/qmldesigner/propertyeditor/Qt/applybutton.css b/share/qtcreator/qmldesigner/propertyeditor/Qt/applybutton.css
new file mode 100644
index 0000000000000000000000000000000000000000..d7680978b361d6efcf6761166ce138ebbed8bf21
--- /dev/null
+++ b/share/qtcreator/qmldesigner/propertyeditor/Qt/applybutton.css
@@ -0,0 +1,8 @@
+QPushButton {
+ border-image: url(:/qmldesigner/images/apply.png) 3;
+ border-width: 3;
+ }
+
+ QPushButton:hover {
+ border-image: url(:/qmldesigner/images/applybright.png) 3;
+ }
diff --git a/share/qtcreator/qmldesigner/propertyeditor/Qt/cancelbutton.css b/share/qtcreator/qmldesigner/propertyeditor/Qt/cancelbutton.css
new file mode 100644
index 0000000000000000000000000000000000000000..2078aa0d341da6004926a0180f929f95c4a74d08
--- /dev/null
+++ b/share/qtcreator/qmldesigner/propertyeditor/Qt/cancelbutton.css
@@ -0,0 +1,8 @@
+QPushButton {
+ border-image: url(:/qmldesigner/images/cancel.png) 3;
+ border-width: 3;
+ }
+
+ QPushButton:hover {
+ border-image: url(:/qmldesigner/images/cancelbright.png) 3;
+ }
diff --git a/share/qtcreator/qmldesigner/propertyeditor/Qt/propertyEditor.css b/share/qtcreator/qmldesigner/propertyeditor/Qt/propertyEditor.css
index 8312bd6a00e2b3c31847b4777b6bd72efb6ffd9a..5d8ecfb2e02ba760e1a695bcaffde681a0af74da 100644
--- a/share/qtcreator/qmldesigner/propertyeditor/Qt/propertyEditor.css
+++ b/share/qtcreator/qmldesigner/propertyeditor/Qt/propertyEditor.css
@@ -30,7 +30,7 @@ QLabel {
QScrollArea {
border: 0px;
border-radius: 0px;
- background-color: #707070;
+ background-color: #4a4a4a;
}
QGroupBox
@@ -38,7 +38,6 @@ QGroupBox
background-color: qlineargradient(x1: 0, y1: 0, x2: 1, y2: 0,
stop: 0 #4a4a4a, stop: 1 #4f4f4f);
border: 1px solid #4F4F4F;
- border-radius: 5px;
color: white;
font: bold
}
@@ -49,55 +48,63 @@ QLineEdit
border: 2px solid #0F0F0F;
border-radius: 6px;
border-width: 1;
+ max-height: 16px;
+ min-height: 16px;
background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,
stop: 0 #2c2c2c, stop: 1 #333333);
}
QTextEdit
{
- border: 2px solid #8F8F8F;
- border-radius: 10px;
- padding: 0 8px;
- background-color: white;
- selection-background-color: darkgray;
+ border: 2px solid #0F0F0F;
+ border-radius: 6px;
+ color: white;
+ padding: 8 8px;
+ background-color: white;
+ selection-background-color: lightgray;
+ background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,
+ stop: 0 #2c2c2c, stop: 1 #333333);
}
QSpinBox
{
font-size: 11px;
color: white;
- padding-right: 20px; /* make room for the arrows */
- padding-top: 2px; /* make room for the arrows */
- padding-bottom: 2px; /* make room for the arrows */
+ padding-right: 4px;
+ padding-top: 2px;
+ padding-bottom: 2px;
+ padding-left: 20px;
border: 2px solid #0F0F0F;
border-radius: 6px;
border-width: 1;
background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,
stop: 0 #2c2c2c, stop: 1 #333333);
- min-height: 14px;
- max-height: 14px;
+
+ max-height: 16px;
+ min-height: 16px;
}
QDoubleSpinBox
{
font-size: 11px;
color: white;
- padding-right: 20px; /* make room for the arrows */
- padding-top: 2px; /* make room for the arrows */
- padding-bottom: 2px; /* make room for the arrows */
+ padding-right: 4px;
+ padding-top: 2px;
+ padding-bottom: 2px;
+ padding-left: 20px;
border: 2px solid #0F0F0F;
border-radius: 6px;
border-width: 1;
background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,
stop: 0 #2c2c2c, stop: 1 #333333);
- max-height: 14px;
- min-height: 14px;
+ max-height: 16px;
+ min-height: 16px;
}
QSpinBox::down-button {
subcontrol-origin: border;
- subcontrol-position: bottom right; /* position at bottom right corner */
+ subcontrol-position: bottom right;
border-image: url(:/qmldesigner/images/spindown.png) 1;
width: 16px;
@@ -134,7 +141,7 @@ QSpinBox::up-button:pressed {
QDoubleSpinBox::down-button {
subcontrol-origin: border;
- subcontrol-position: bottom right; /* position at bottom right corner */
+ subcontrol-position: bottom right;
border-image: url(:/qmldesigner/images/spindown.png) 1;
width: 16px;
@@ -151,7 +158,7 @@ QDoubleSpinBox::down-button:pressed {
QDoubleSpinBox::up-button {
subcontrol-origin: border;
- subcontrol-position: top right; /* position at bottom right corner */
+ subcontrol-position: top right;
border-image: url(:/qmldesigner/images/spinup.png) 1;
width: 16px;
@@ -209,17 +216,16 @@ QComboBox[editable="true"]::drop-down:on, QMenuBar::item:on {
border-width: 3;
}
-/* Customize read-only comboboxes. */
-
QComboBox
{
font-size: 11px;
color: white;
+ min-width: 20px;
}
QComboBox[editable="false"] {
padding-left: 3px;
- padding-right: 20px; /* space for the arrow */
+ padding-right: 10px;
}
QComboBox[editable="false"]::drop-down {
@@ -228,25 +234,22 @@ QComboBox[editable="false"]::drop-down {
width: 15px;
border-left-style: solid;
border-left-color: black;
- border-left-width: 1px;
+ border-left-width: 0px;
}
QComboBox[editable="false"]::down-arrow {
subcontrol-origin: content;
subcontrol-position: center;
position: relative;
- left: 1px; /* 1 pixel dropdown border */
+ left: 1px;
}
-/* The combobox arrow is on when the popup is open. */
QComboBox[editable="false"]::down-arrow:on {
position: relative;
top: 1px;
left: 2px;
}
-/* Customize editable comboboxes. */
-
QComboBox[editable="true"] {
padding-right: 16px;
}
@@ -264,11 +267,10 @@ QComboBox[editable="true"]::drop-down {
QComboBox[editable="true"]::drop-down,
QComboBox[editable="true"]::drop-down:hover,
QComboBox[editable="true"]::drop-down:on {
- border-width: 0px;
- border-left-width: 3px; /* we need only left and center part */
+ border-width: 0px;
+ border-left-width: 3px;
}
-/* Shift the arrow when it's open. */
QComboBox[editable="true"]::down-arrow:on {
position: relative;
top: 1px;
@@ -308,33 +310,26 @@ QRadioButton::indicator:checked:pressed {
image: url(:/qmldesigner/images/radiobutton_checked_pressed.png);
}
-/* Customize arrows. */
-
-*::down-arrow, *::menu-indicator {
+QSpinBox::down-arrow, QSpinBox::menu-indicator, QDoubleSpinBox::down-arrow, QDoubleSpinBox::menu-indicator , QComboBox::menu-indicator, QComboBox::down-arrow {
image: url(:/qmldesigner/images/down_arrow.png);
width: 7px;
height: 7px;
}
-*::down-arrow:disabled, *::down-arrow:off {
+QSpinBox::down-arrow:disabled, QSpinBox::down-arrow:off, QDoubleSpinBox::down-arrow:disabled, QDoubleSpinBox::down-arrow:off {
image: url(:/qmldesigner/images/down_arrow_disabled.png);
}
-*::up-arrow {
+QSpinBox::up-arrow, QDoubleSpinBox::up-arrow {
image: url(:/qmldesigner/images/up_arrow.png);
width: 7px;
height: 7px;
}
-*::up-arrow:disabled, *::up-arrow:off {
+QSpinBox::up-arrow:disabled, QSpinBox::up-arrow:off, QDoubleSpinBox::up-arrow:disabled, QDoubleSpinBox::up-arrow:off {
image: url(:/qmldesigner/images/up_arrow_disabled.png);
}
-/* Customize push buttons and comboboxes. Our read-only combobox
- is very similar to a push button, so they share the same border image. */
-
-
-/* Customize check boxes. */
QCheckBox {
spacing: 8px;
font-size: 11px
@@ -370,25 +365,23 @@ QCheckBox::indicator:checked:pressed {
}
QMenu {
- background-color: #494949; /* sets background of the menu */
+ background-color: #494949;
border: 1px solid black;
- margin: 0px; /* some spacing around the menu */
+ margin: 0px;
color: #cacaca;
}
QMenu::item {
- /* sets background of menu item. set this to something non-transparent
- if you want menu color and menu item color to be different */
background-color: transparent;
padding: 2px 25px 2px 20px;
}
- QMenu::item:selected { /* when user selects item using mouse or keyboard */
+ QMenu::item:selected {
background-color: #d2d2d2;
padding: 2px;
color: #404040;
border-radius: 4px;
- padding: 2px 25px 2px 20px;
+ padding: 2px 25px 2px 20px;
}
QMenu::separator {
height: 1px;
@@ -398,13 +391,13 @@ QMenu::separator {
}
QComboBox QAbstractItemView {
- show-decoration-selected: 1; /* make the selection span the entire width of the view */
- background-color: #494949; /* sets background of the menu */
+ show-decoration-selected: 1;
+ background-color: #494949;
border: 1px solid black;
- margin: 0px; /* some spacing around the menu */
+ margin: 0px;
color: #cacaca;
- selection-background-color: #d2d2d2;
- selection-color: #404040;
+ selection-background-color: #d2d2d2;
+ selection-color: #404040;
}
QSlider::groove:horizontal {
diff --git a/share/qtcreator/qmldesigner/propertyeditor/Qt/specialCheckBox.css b/share/qtcreator/qmldesigner/propertyeditor/Qt/specialCheckBox.css
index cebde2bb5bb878911f52e630a7bf17aaa191a110..bce5640267e866269667b80ff150582c08272837 100644
--- a/share/qtcreator/qmldesigner/propertyeditor/Qt/specialCheckBox.css
+++ b/share/qtcreator/qmldesigner/propertyeditor/Qt/specialCheckBox.css
@@ -8,6 +8,7 @@ QCheckBox {
QToolButton {
color: white;
font: bold;
+ background: #5f5f5f;
}
QCheckBox::indicator {
diff --git a/share/qtcreator/qmldesigner/propertyeditor/Qt/switch.css b/share/qtcreator/qmldesigner/propertyeditor/Qt/switch.css
index b4fc0a3080ea916a4b44b94013eb9f46bacdceed..b23b3a7a2bbd462562476056a424951f2fcb0ec3 100644
--- a/share/qtcreator/qmldesigner/propertyeditor/Qt/switch.css
+++ b/share/qtcreator/qmldesigner/propertyeditor/Qt/switch.css
@@ -1,21 +1,42 @@
QPushButton {
- border: 0px solid #6f6f61;
- border-image: url(:/images/button2_normal.png) 2 2 2 2;
- border-radius: 1px;
- min-width: 20px;
+ border-image: none;
+ min-width: 40px;
min-height: 20px;
- margin: 0px 0 2px 0;
+ margin: 0px 0 0px 0;
+ border: 1px solid #0F0F0F;
+ background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,
+ stop: 0 #3c3c3c, stop: 1 #444444);
+
+ color: #EEEEEE;
+ font: bold;
+ }
+
+ QPushButton:hover {
+ border: none; /* no border for a flat push button */
+
+ background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,
+ stop: 0 #3c3c3c, stop: 1 #666666);
}
QPushButton::checked
{
- border-image: url(:/images/button2_pressed.png) 2 2 2 2;
- border: 1px solid #4f4f41;
+ border: none; /* no border for a flat push button */
+ background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,
+ stop: 0 #EFEFEF, stop: 1 #EEEEEE);
+ color: #3c3c3c;
+ }
+
+ QPushButton::checked :hover
+ {
+ border: none; /* no border for a flat push button */
+ background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,
+ stop: 0 #FFFFFF, stop: 1 #FEFEFE);
}
- QPushButton:pressed {
- border-image: url(:/images/button2_pressed.png) 2 2 2 2;
+ QPushButton:pressed {
+ background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,
+ stop: 0 #EFEFEF, stop: 1 #EEEEEE);
}
QPushButton:flat {
@@ -23,10 +44,10 @@ QPushButton {
}
QPushButton:default {
- border-image: url(:/images/button2_normal.png) 2 2 2 2;
+
+ background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,
+ stop: 0 #2c2c2c, stop: 1 #333333);
}
- QPushButton:hover {
- border-image: url(:/images/button2_hovered.png) 2 2 2 2;
- }
+
\ No newline at end of file
diff --git a/share/qtcreator/qmldesigner/propertyeditor/Qt/typeLabel.css b/share/qtcreator/qmldesigner/propertyeditor/Qt/typeLabel.css
index 8df9e606dbf7e47c497de07eacd8b0fa2cdc8c1c..b332ad7b645adccbaf5b6be601e1cebe964a9d80 100644
--- a/share/qtcreator/qmldesigner/propertyeditor/Qt/typeLabel.css
+++ b/share/qtcreator/qmldesigner/propertyeditor/Qt/typeLabel.css
@@ -5,4 +5,6 @@ QLineEdit {
border-width: 2;
background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,
stop: 0 #2c2c2c, stop: 1 #333333);
+ max-height: 16px;
+ min-height: 16px;
}
\ No newline at end of file