From 7b18b08c864a3898a9daa770f801102ad9fcf524 Mon Sep 17 00:00:00 2001
From: Thomas Hartmann <Thomas.Hartmann@nokia.com>
Date: Wed, 24 Mar 2010 17:08:22 +0100
Subject: [PATCH] QmlDesigner.propertyEditor: adjusting style sheets
---
.../propertyeditor/Qt/alignmenttopbutton.css | 7 +++--
.../propertyeditor/Qt/anchorbottom.css | 9 +++----
.../propertyeditor/Qt/anchorfill.css | 7 +++--
.../propertyeditor/Qt/anchorhorizontal.css | 7 +++--
.../propertyeditor/Qt/anchorleft.css | 7 +++--
.../propertyeditor/Qt/anchorright.css | 7 +++--
.../propertyeditor/Qt/anchorspacer.css | 7 +++--
.../propertyeditor/Qt/anchortop.css | 7 +++--
.../propertyeditor/Qt/anchorvertical.css | 7 +++--
.../propertyeditor/Qt/propertyEditor.css | 27 +++++++++----------
10 files changed, 40 insertions(+), 52 deletions(-)
diff --git a/share/qtcreator/qmldesigner/propertyeditor/Qt/alignmenttopbutton.css b/share/qtcreator/qmldesigner/propertyeditor/Qt/alignmenttopbutton.css
index e95c4aa5f32..9356377536c 100644
--- a/share/qtcreator/qmldesigner/propertyeditor/Qt/alignmenttopbutton.css
+++ b/share/qtcreator/qmldesigner/propertyeditor/Qt/alignmenttopbutton.css
@@ -1,12 +1,11 @@
QPushButton {
- border-image: url(:/qmldesigner/images/button_alignment_top_normal.png) 3;
- border-width: 3;
+ border-image: url(:/qmldesigner/images/button_alignment_top_normal.png);
}
QPushButton:pressed {
- border-image: url(:/qmldesigner/images/button_alignment_top_pressed.png) 3;
+ border-image: url(:/qmldesigner/images/button_alignment_top_pressed.png);
}
QPushButton:checked {
- border-image: url(:/qmldesigner/images/button_alignment_top_pressed.png) 3;
+ border-image: url(:/qmldesigner/images/button_alignment_top_pressed.png);
}
diff --git a/share/qtcreator/qmldesigner/propertyeditor/Qt/anchorbottom.css b/share/qtcreator/qmldesigner/propertyeditor/Qt/anchorbottom.css
index 3f099aa99c8..98ad512dc96 100644
--- a/share/qtcreator/qmldesigner/propertyeditor/Qt/anchorbottom.css
+++ b/share/qtcreator/qmldesigner/propertyeditor/Qt/anchorbottom.css
@@ -1,12 +1,11 @@
QPushButton {
- border-image: url(:/qmldesigner/images/anchor-bottom-normal.png) 3;
- border-width: 3;
+ border-image: url(:/qmldesigner/images/anchor-bottom-normal.png);
}
- QPushButton:pressed {
- border-image: url(:/qmldesigner/images/anchor-bottom-pressed.png) 3;
+QPushButton:pressed {
+ border-image: url(:/qmldesigner/images/anchor-bottom-pressed.png);
}
QPushButton:checked {
- border-image: url(:/qmldesigner/images/anchor-bottom-pressed.png) 3;
+ border-image: url(:/qmldesigner/images/anchor-bottom-pressed.png);
}
diff --git a/share/qtcreator/qmldesigner/propertyeditor/Qt/anchorfill.css b/share/qtcreator/qmldesigner/propertyeditor/Qt/anchorfill.css
index a54050c0b25..c382641d033 100644
--- a/share/qtcreator/qmldesigner/propertyeditor/Qt/anchorfill.css
+++ b/share/qtcreator/qmldesigner/propertyeditor/Qt/anchorfill.css
@@ -1,12 +1,11 @@
QPushButton {
- border-image: url(:/qmldesigner/images/anchor-fill-normal.png) 3;
- border-width: 3;
+ border-image: url(:/qmldesigner/images/anchor-fill-normal.png);
}
QPushButton:pressed {
- border-image: url(:/qmldesigner/images/anchor-fill-pressed.png) 3;
+ border-image: url(:/qmldesigner/images/anchor-fill-pressed.png);
}
QPushButton:checked {
- border-image: url(:/qmldesigner/images/anchor-fill-pressed.png) 3;
+ border-image: url(:/qmldesigner/images/anchor-fill-pressed.png);
}
diff --git a/share/qtcreator/qmldesigner/propertyeditor/Qt/anchorhorizontal.css b/share/qtcreator/qmldesigner/propertyeditor/Qt/anchorhorizontal.css
index 0f516137ea5..28be04e0ead 100644
--- a/share/qtcreator/qmldesigner/propertyeditor/Qt/anchorhorizontal.css
+++ b/share/qtcreator/qmldesigner/propertyeditor/Qt/anchorhorizontal.css
@@ -1,12 +1,11 @@
QPushButton {
- border-image: url(:/qmldesigner/images/anchor-horizontal-normal.png) 3;
- border-width: 3;
+ border-image: url(:/qmldesigner/images/anchor-horizontal-normal.png);
}
QPushButton:pressed {
- border-image: url(:/qmldesigner/images/anchor-horizontal-pressed.png) 3;
+ border-image: url(:/qmldesigner/images/anchor-horizontal-pressed.png);
}
QPushButton:checked {
- border-image: url(:/qmldesigner/images/anchor-horizontal-pressed.png) 3;
+ border-image: url(:/qmldesigner/images/anchor-horizontal-pressed.png);
}
diff --git a/share/qtcreator/qmldesigner/propertyeditor/Qt/anchorleft.css b/share/qtcreator/qmldesigner/propertyeditor/Qt/anchorleft.css
index 579bc31e196..53c9604c0ac 100644
--- a/share/qtcreator/qmldesigner/propertyeditor/Qt/anchorleft.css
+++ b/share/qtcreator/qmldesigner/propertyeditor/Qt/anchorleft.css
@@ -1,12 +1,11 @@
QPushButton {
- border-image: url(:/qmldesigner/images/anchor-left-normal.png) 3;
- border-width: 3;
+ border-image: url(:/qmldesigner/images/anchor-left-normal.png);
}
QPushButton:pressed {
- border-image: url(:/qmldesigner/images/anchor-left-pressed.png) 3;
+ border-image: url(:/qmldesigner/images/anchor-left-pressed.png);
}
QPushButton:checked {
- border-image: url(:/qmldesigner/images/anchor-left-pressed.png) 3;
+ border-image: url(:/qmldesigner/images/anchor-left-pressed.png);
}
diff --git a/share/qtcreator/qmldesigner/propertyeditor/Qt/anchorright.css b/share/qtcreator/qmldesigner/propertyeditor/Qt/anchorright.css
index 7eabfbb3971..ee1690e23c9 100644
--- a/share/qtcreator/qmldesigner/propertyeditor/Qt/anchorright.css
+++ b/share/qtcreator/qmldesigner/propertyeditor/Qt/anchorright.css
@@ -1,12 +1,11 @@
QPushButton {
- border-image: url(:/qmldesigner/images/anchor-right-normal.png) 3;
- border-width: 3;
+ border-image: url(:/qmldesigner/images/anchor-right-normal.png);
}
QPushButton:pressed {
- border-image: url(:/qmldesigner/images/anchor-right-pressed.png) 3;
+ border-image: url(:/qmldesigner/images/anchor-right-pressed.png);
}
QPushButton:checked {
- border-image: url(:/qmldesigner/images/anchor-right-pressed.png) 3;
+ border-image: url(:/qmldesigner/images/anchor-right-pressed.png);
}
diff --git a/share/qtcreator/qmldesigner/propertyeditor/Qt/anchorspacer.css b/share/qtcreator/qmldesigner/propertyeditor/Qt/anchorspacer.css
index 68c908d6ca8..22cfdf85989 100644
--- a/share/qtcreator/qmldesigner/propertyeditor/Qt/anchorspacer.css
+++ b/share/qtcreator/qmldesigner/propertyeditor/Qt/anchorspacer.css
@@ -1,12 +1,11 @@
QPushButton {
- border-image: url(:/qmldesigner/images/anchor-spacer.png) 3;
- border-width: 3;
+ border-image: url(:/qmldesigner/images/anchor-spacer.png);
}
QPushButton:pressed {
- border-image: url(:/qmldesigner/images/anchor-spacer.png) 3;
+ border-image: url(:/qmldesigner/images/anchor-spacer.png);
}
QPushButton:checked {
- border-image: url(:/qmldesigner/images/anchor-spacer.png) 3;
+ border-image: url(:/qmldesigner/images/anchor-spacer.png);
}
diff --git a/share/qtcreator/qmldesigner/propertyeditor/Qt/anchortop.css b/share/qtcreator/qmldesigner/propertyeditor/Qt/anchortop.css
index 57a0842eb55..2310144c1e8 100644
--- a/share/qtcreator/qmldesigner/propertyeditor/Qt/anchortop.css
+++ b/share/qtcreator/qmldesigner/propertyeditor/Qt/anchortop.css
@@ -1,12 +1,11 @@
QPushButton {
- border-image: url(:/qmldesigner/images/anchor-top-normal.png) 3;
- border-width: 3;
+ border-image: url(:/qmldesigner/images/anchor-top-normal.png);
}
QPushButton:pressed {
- border-image: url(:/qmldesigner/images/anchor-top-pressed.png) 3;
+ border-image: url(:/qmldesigner/images/anchor-top-pressed.png);
}
QPushButton:checked {
- border-image: url(:/qmldesigner/images/anchor-top-pressed.png) 3;
+ border-image: url(:/qmldesigner/images/anchor-top-pressed.png);
}
diff --git a/share/qtcreator/qmldesigner/propertyeditor/Qt/anchorvertical.css b/share/qtcreator/qmldesigner/propertyeditor/Qt/anchorvertical.css
index 62a2d779d96..578030e0658 100644
--- a/share/qtcreator/qmldesigner/propertyeditor/Qt/anchorvertical.css
+++ b/share/qtcreator/qmldesigner/propertyeditor/Qt/anchorvertical.css
@@ -1,12 +1,11 @@
QPushButton {
- border-image: url(:/qmldesigner/images/anchor-vertical-normal.png) 3;
- border-width: 3;
+ border-image: url(:/qmldesigner/images/anchor-vertical-normal.png);
}
QPushButton:pressed {
- border-image: url(:/qmldesigner/images/anchor-vertical-pressed.png) 3;
+ border-image: url(:/qmldesigner/images/anchor-vertical-pressed.png);
}
QPushButton:checked {
- border-image: url(:/qmldesigner/images/anchor-vertical-pressed.png) 3;
+ border-image: url(:/qmldesigner/images/anchor-vertical-pressed.png);
}
diff --git a/share/qtcreator/qmldesigner/propertyeditor/Qt/propertyEditor.css b/share/qtcreator/qmldesigner/propertyeditor/Qt/propertyEditor.css
index 68df338f632..0f23858ad58 100644
--- a/share/qtcreator/qmldesigner/propertyeditor/Qt/propertyEditor.css
+++ b/share/qtcreator/qmldesigner/propertyeditor/Qt/propertyEditor.css
@@ -69,10 +69,10 @@ QPlainTextEdit
{
font-size: 11px;
color: white;
- padding-right: 4px;
+ padding-right: 2px;
padding-top: 2px;
padding-bottom: 2px;
- padding-left: 20px;
+ padding-left: 20px;
border: 2px solid #0F0F0F;
border-radius: 6px;
border-width: 1;
@@ -88,10 +88,10 @@ QPlainTextEdit
{
font-size: 11px;
color: white;
- padding-right: 4px;
+ padding-right: 2px;
padding-top: 2px;
padding-bottom: 2px;
- padding-left: 20px;
+ padding-left: 20px;
border: 2px solid #0F0F0F;
border-radius: 6px;
border-width: 1;
@@ -199,19 +199,19 @@ QPushButton {
QPushButton, QComboBox[editable="false"],
QComboBox[editable="true"] {
- border-image: url(:/qmldesigner/images/pushbutton.png) 4;
+ border-image: url(:/qmldesigner/images/combobox-normal.png) 4;
border-width: 3;
}
QPushButton:hover, QComboBox[editable="false"]:hover,
QComboBox[editable="true"]:hover, QMenuBar::item:hover {
- border-image: url(:/qmldesigner/images/pushbutton_hover.png) 4;
+ border-image: url(:/qmldesigner/images/combobox-normal.png) 4;
border-width: 3;
}
QPushButton:pressed, QComboBox[editable="false"]:on,
QComboBox[editable="true"]:on, QMenuBar::item:on {
- border-image: url(:/qmldesigner/images/pushbutton_pressed.png) 4;
+ border-image: url(:/qmldesigner/images/combobox-pressed.png) 4;
border-width: 3;
}
@@ -404,18 +404,15 @@ QMenu::separator {
}
QSlider::groove:horizontal {
- height: 8px;
- border: 2px solid #0F0F0F;
- border-radius: 6px;
- background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,
- stop: 0 #2c2c2c, stop: 1 #333333);
+ height: 2px;
+ border-image: url(:/qmldesigner/images/slider_line.png) 0;
margin: 5px 0;
}
QSlider::handle:horizontal {
- border: 2px solid #1B1B1B;
- border-image: url(:/qmldesigner/images/pushbutton.png) 3;
- width: 6px;
+ image: url(:/qmldesigner/images/slider_indikator.png);
+ width: 8px;
+ height: 8px;
margin: 0px 0;
}
--
GitLab