diff --git a/examples/gallery/content/Controls.qml b/examples/gallery/content/Controls.qml
index 7650cab10f059772627df4df6078c0e67b2cad1f..abcebbebcb7a9b13f2075ae8d34ed6263998c14a 100644
--- a/examples/gallery/content/Controls.qml
+++ b/examples/gallery/content/Controls.qml
@@ -110,6 +110,7 @@ Item {
Slider {
id: slider
value: 0.5
+ width: 200
tickmarksEnabled: tickmarkCheck.checked
}
}
diff --git a/src/controls/ComboBox.qml b/src/controls/ComboBox.qml
index eca285b22cf7a0f318f108c132243c3fbf1976a3..74c2a196c30b7a2871b26a7e7592720574825617 100644
--- a/src/controls/ComboBox.qml
+++ b/src/controls/ComboBox.qml
@@ -125,7 +125,7 @@ Control {
property string textRole: ""
property bool ready: false
- property bool isPopup: comboBox.__panel.popup
+ property bool isPopup: __panel ? __panel.popup : false
property int x: 0
property int y: isPopup ? (comboBox.__panel.height - comboBox.__panel.implicitHeight) / 2.0 : comboBox.__panel.height
diff --git a/src/controls/TableView.qml b/src/controls/TableView.qml
index 22e7e052ea736119e49fa003bf90c4acc75b4ad0..f8ec997bb95c3f9b50e4b08d6d34f5dd376e90c8 100644
--- a/src/controls/TableView.qml
+++ b/src/controls/TableView.qml
@@ -449,8 +449,6 @@ ScrollView {
height: headerVisible ? headerrow.height : 0
- Behavior on height { NumberAnimation{ duration: 80 } }
-
Row {
id: headerrow
x: -listView.contentX
diff --git a/src/private/qquickcontrolsettings.cpp b/src/private/qquickcontrolsettings.cpp
index 3b3744fccfab43a24fa837d2106c5fe38b33ce00..3b7d5506b536d36cd4c9b9a033d913161bf0081c 100644
--- a/src/private/qquickcontrolsettings.cpp
+++ b/src/private/qquickcontrolsettings.cpp
@@ -56,9 +56,11 @@ QString QQuickControlSettings::theme()
if (currentTheme.isEmpty()) {
currentTheme = QLatin1String("Styles");
#ifndef QT_NO_WIDGETS
- // Only enable QStyle support when we are using QApplication
- if (QCoreApplication::instance()->inherits("QApplication"))
- currentTheme = QLatin1String("Styles/Desktop");
+ //Only enable QStyle support when we are using QApplication
+ if (QCoreApplication::instance()->inherits("QApplication")) {
+ if (qgetenv("QT_QUICK_CONTROLS_NO_WIDGETS").toInt() < 1)
+ currentTheme = QLatin1String("Styles/Desktop");
+ }
#endif
}
return currentTheme;
diff --git a/src/styles/ButtonStyle.qml b/src/styles/ButtonStyle.qml
index 6cd165e6b26429752ab162141428d6da28c8c266..d20fdf9f6dc7ab374334935f7f7a292e4973db97 100644
--- a/src/styles/ButtonStyle.qml
+++ b/src/styles/ButtonStyle.qml
@@ -64,18 +64,17 @@ Style {
}
}
- property Component background: Rectangle {
- implicitWidth: 80
- implicitHeight: 21
- gradient: Gradient {
- GradientStop {color: control.pressed ? Qt.lighter(buttonstyle.backgroundColor, 1.1) :
- Qt.lighter(buttonstyle.backgroundColor, 1.8) ; position: 0}
- GradientStop {color: control.pressed ? Qt.lighter(buttonstyle.backgroundColor, 1.1) :
- buttonstyle.backgroundColor ; position: 1.4}
+ property Component background: Item {
+ implicitWidth: 100
+ implicitHeight: 25
+ BorderImage {
+ anchors.fill: parent
+ source: control.pressed ? "images/button_down.png" : "images/button.png"
+ border.top: 6
+ border.bottom: 6
+ border.left: 6
+ border.right: 6
}
- border.color: Qt.darker(buttonstyle.backgroundColor, 1.4)
- radius: 3
- antialiasing: true
}
property Component panel: Item {
diff --git a/src/styles/CheckBoxStyle.qml b/src/styles/CheckBoxStyle.qml
index 3c12789340d49b279aa6212a89459d7986226bd1..e56062986f42808f6f88209459cee66e38e7e821 100644
--- a/src/styles/CheckBoxStyle.qml
+++ b/src/styles/CheckBoxStyle.qml
@@ -50,26 +50,35 @@ Style {
property int labelSpacing: 6
- property Component indicator: Rectangle {
- height: 20
- width: 20
- antialiasing: true
- gradient: Gradient {
- GradientStop{color: control.pressed ? "lightgray" : "white" ; position: 0}
- GradientStop{color: control.pressed ? "lightgray" : "lightgray" ; position: 1}
+ property Component indicator: Item {
+ implicitWidth: 18
+ implicitHeight: 18
+ BorderImage {
+ anchors.fill: parent
+ source: "images/editbox.png"
+ border.top: 6
+ border.bottom: 6
+ border.left: 6
+ border.right: 6
}
- radius: 2
- border.color: "#aaa"
Rectangle {
- height: 20
- width: 20
+ height: 16
+ width: 16
antialiasing: true
visible: control.checked
- color: "#444"
+ color: "#666"
radius: 1
- anchors.margins: 5
+ anchors.margins: 4
anchors.fill: parent
- border.color: "black"
+ anchors.topMargin: 3
+ anchors.bottomMargin: 5
+ border.color: "#222"
+ Rectangle {
+ anchors.fill: parent
+ anchors.margins: 1
+ color: "transparent"
+ border.color: "#33ffffff"
+ }
}
}
@@ -79,7 +88,7 @@ Style {
}
property Component panel: Item {
- implicitWidth: row.width + 4
+ implicitWidth: Math.round(row.width + 4)
implicitHeight: row.height
property var _cref: control
diff --git a/src/styles/ComboBoxStyle.qml b/src/styles/ComboBoxStyle.qml
index e0cae7194386d50c0adda23b5156bb32a0a95c93..770e66c7dd00ee72ec6ba8d9a5c65846a7920189 100644
--- a/src/styles/ComboBoxStyle.qml
+++ b/src/styles/ComboBoxStyle.qml
@@ -47,26 +47,34 @@ import QtQuick.Controls.Styles 1.0
*/
Style {
- property Component panel: Rectangle {
- property int popup: 0
- property font font: textitem.font
+ property Component panel: Item {
+ implicitWidth: 100
+ implicitHeight: 24
+ property bool popup: false
+ property alias font: textitem.font
- implicitWidth: 200
- implicitHeight: 20
+ BorderImage {
+ anchors.fill: parent
+ source: control.__pressed ? "images/button_down.png" : "images/button.png"
+ border.top: 6
+ border.bottom: 6
+ border.left: 6
+ border.right: 6
+ Text {
+ id: textitem
+ anchors.centerIn: parent
+ text: control.currentText
+ renderType: Text.NativeRendering
+ }
+ Image {
+ source: "images/arrow-down.png"
+ anchors.verticalCenter: parent.verticalCenter
+ anchors.right: parent.right
+ anchors.rightMargin: 8
+ opacity: 0.7
+ }
- gradient: Gradient{
- GradientStop{color: control.__pressed ? "lightgray" : "white" ; position: 0}
- GradientStop{color: control.__pressed ? "lightgray" : "lightgray" ; position: 1}
- }
-
- radius:4
- border.color: "#aaa"
-
- Text {
- id: textitem
- anchors.centerIn: parent
- text: control.currentText
}
}
diff --git a/src/styles/GroupBoxStyle.qml b/src/styles/GroupBoxStyle.qml
index 7e12791dd55884f1852dfda94ae4559f7ca5d6bc..5a46aed15abf2bb9ed973f5cd3599578739c936c 100644
--- a/src/styles/GroupBoxStyle.qml
+++ b/src/styles/GroupBoxStyle.qml
@@ -47,21 +47,27 @@ import QtQuick.Controls.Styles 1.0
\inqmlmodule QtQuick.Controls.Styles 1.0
*/
Style {
- property int margin: 8
+ property int margin: 9
- property Component panel: Rectangle {
+ property Component panel:
+ Item {
implicitWidth: control.contentWidth + 2 * margin
- implicitHeight: control.contentHeight + 2 * margin + 16
-
+ implicitHeight: control.contentHeight + 2 * margin + 12
Text {
anchors.top: parent.top
anchors.left: parent.left
anchors.margins: 4
text: control.title
+ renderType: Text.NativeRendering
+ }
+ BorderImage {
+ anchors.fill: parent
+ anchors.topMargin: 20
+ source: "images/groupbox.png"
+ border.left: 8
+ border.right: 8
+ border.top: 8
+ border.bottom: 8
}
- border.color: "#999"
- border.width: 1
- color: "transparent"
- radius: 4
}
}
diff --git a/src/styles/ProgressBarStyle.qml b/src/styles/ProgressBarStyle.qml
index 799cb67641e1b2ee2f8435223fd3f978df3472c7..bbdd6d0d6b065796b1b989eac6468916d3540009 100644
--- a/src/styles/ProgressBarStyle.qml
+++ b/src/styles/ProgressBarStyle.qml
@@ -50,31 +50,27 @@ import QtQuick.Controls 1.0
Style {
property color backgroundColor: "darkgrey"
- property color progressColor: "#47f"
+ property color progressColor: "#49d"
- property Component background: Rectangle {
- id: styleitem
- anchors.fill: parent
+ property Component background: Item {
implicitWidth: 200
- implicitHeight: 20
- clip: true
- radius: 2
- antialiasing: true
- border.color: "#aaa"
-
- gradient: Gradient {
- GradientStop {color: Qt.lighter(backgroundColor, 1.6) ; position: 0}
- GradientStop {color: backgroundColor ; position: 1.55}
+ implicitHeight: 24
+ BorderImage {
+ anchors.fill: parent
+ source: "images/editbox.png"
+ border.left: 4
+ border.right: 4
+ border.top: 4
+ border.bottom: 4
}
-
Rectangle {
id: progressItem
implicitWidth: parent.width * control.value / control.maximumValue
radius: 2
antialiasing: true
- implicitHeight: 20
+ height: parent.height - 2
gradient: Gradient {
- GradientStop {color: Qt.lighter(progressColor, 1.6) ; position: 0}
+ GradientStop {color: Qt.lighter(progressColor, 1.3) ; position: 0}
GradientStop {color: progressColor ; position: 1.4}
}
border.width: 1
@@ -85,7 +81,7 @@ Style {
antialiasing: true
anchors.fill: parent
anchors.margins: 1
- border.color: Qt.rgba(1,1,1,0.2)
+ border.color: Qt.rgba(1,1,1,0.3)
}
}
}
diff --git a/src/styles/RadioButtonStyle.qml b/src/styles/RadioButtonStyle.qml
index 764e306f805d21df99eb19fdc227845455d9a117..d41074660583afc5274031f9395249d83cea7429 100644
--- a/src/styles/RadioButtonStyle.qml
+++ b/src/styles/RadioButtonStyle.qml
@@ -51,9 +51,9 @@ Style {
property int labelSpacing: 6
property Component indicator: Rectangle {
- width: 20
- height: 20
- color: "#f0f0f0"
+ width: 17
+ height: 17
+ color: "white"
border.color: "gray"
antialiasing: true
radius: height/2
@@ -61,10 +61,10 @@ Style {
Rectangle {
anchors.centerIn: parent
visible: control.checked
- width: 10
- height: 10
- color: "#444"
- border.color: "black"
+ width: 9
+ height: 9
+ color: "#666"
+ border.color: "#222"
antialiasing: true
radius: height/2
}
diff --git a/src/styles/ScrollBarStyle.qml b/src/styles/ScrollBarStyle.qml
index 4fed597d22e47d3ab6dd048a009d756d10d6b579..00c4bea8d7608b2ca6fba4614b95085cc0301318 100644
--- a/src/styles/ScrollBarStyle.qml
+++ b/src/styles/ScrollBarStyle.qml
@@ -50,37 +50,68 @@ Rectangle {
id: styleitem
readonly property bool horizontal: control.orientation === Qt.Horizontal
+ property bool scrollToClickPosition: true
+ property int minimumHandleLength: 30
+ property int handleOverlap: 1
implicitWidth: horizontal ? 200 : bg.implicitWidth
implicitHeight: horizontal ? bg.implicitHeight : 200
- property Component background: Rectangle {
+ property Component background: Item {
implicitWidth: 16
implicitHeight: 16
- color: "gray"
+ Rectangle {
+ anchors.fill: parent
+ color: "#ddd"
+ border.color: "#aaa"
+ anchors.rightMargin: horizontal ? -2 : 0
+ anchors.leftMargin: horizontal ? -2 : 0
+ anchors.topMargin: horizontal ? 0 : -2
+ anchors.bottomMargin: horizontal ? 0 : -2
+ }
}
property Component handle: Rectangle {
implicitWidth: 16
implicitHeight: 16
- color: "lightgray"
+ color: mouseOver ? "#ddd" : "lightgray"
border.color: "#aaa"
+
+ Rectangle {
+ anchors.fill: parent
+ anchors.margins: 1
+ color: "transparent"
+ border.color: "#66ffffff"
+
+ }
}
property Component incrementControl: Rectangle {
implicitWidth: 16
implicitHeight: 16
+ border.color: "#aaa"
+ Image {
+ source: "images/arrow-down.png"
+ rotation: horizontal ? -90 : 0
+ anchors.centerIn: parent
+ opacity: 0.7
+ }
gradient: Gradient {
GradientStop {color: control.downPressed ? "lightgray" : "white" ; position: 0}
GradientStop {color: control.downPressed ? "lightgray" : "lightgray" ; position: 1}
}
- border.color: "#aaa"
}
property Component decrementControl: Rectangle {
implicitWidth: 16
implicitHeight: 16
color: "lightgray"
+ Image {
+ source: "images/arrow-up.png"
+ rotation: horizontal ? -90 : 0
+ anchors.centerIn: parent
+ opacity: 0.7
+ }
gradient: Gradient {
GradientStop {color: control.upPressed ? "lightgray" : "white" ; position: 0}
GradientStop {color: control.upPressed ? "lightgray" : "lightgray" ; position: 1}
@@ -88,10 +119,6 @@ Rectangle {
border.color: "#aaa"
}
- property bool scrollToClickPosition: true
- property int minimumHandleLength: 30
- property int handleOverlap: 1
-
property string activeControl: ""
function pixelMetric(arg) {
if (arg === "scrollbarExtent")
@@ -175,14 +202,14 @@ Rectangle {
Loader{
id: handleControl
property int totalextent: horizontal ? bg.width : bg.height
- property int extent: Math.max(minimumHandleLength, 100 * totalextent / (control.maximumValue - control.minimumValue) + 2 * handleOverlap)
+ property int extent: Math.min (totalextent, Math.max(minimumHandleLength, 100 * totalextent / (control.maximumValue - control.minimumValue)))
property bool mouseOver: activeControl === "handle"
height: horizontal ? implicitHeight : extent
width: horizontal ? extent : implicitWidth
anchors.top: bg.top
anchors.left: bg.left
- anchors.topMargin: horizontal ? 0 : -handleOverlap + (control.value / control.maximumValue) * (bg.height + 2 * handleOverlap- height)
+ anchors.topMargin: horizontal ? 0 : -1 -handleOverlap + (control.value / control.maximumValue) * (bg.height + 2 * handleOverlap- height)
anchors.leftMargin: horizontal ? -handleOverlap + (control.value / control.maximumValue) * (bg.width + 2 * handleOverlap - width) : 0
sourceComponent: handle
}
diff --git a/src/styles/ScrollViewStyle.qml b/src/styles/ScrollViewStyle.qml
index b64fe16f85aebf1dc6c36625bde5796d33c31c54..b015be4f4925a697848a924a3971af7c6ea5c34f 100644
--- a/src/styles/ScrollViewStyle.qml
+++ b/src/styles/ScrollViewStyle.qml
@@ -47,8 +47,16 @@ Style {
property bool frameOnlyAroundContents: false
property int scrollBarSpacing: 4
- property int defaultFrameWidth: 1
+ property int defaultFrameWidth: 3
- property Component frame: Rectangle { visible: frameVisible }
- property Component corner: Rectangle { color: "red" }
+ property Component frame: BorderImage {
+ source: "images/editbox.png"
+ border.left: 4
+ border.right: 4
+ border.top: 4
+ border.bottom: 4
+ visible: frameVisible
+ }
+
+ property Component corner: Rectangle { color: "lightgray" }
}
diff --git a/src/styles/SliderStyle.qml b/src/styles/SliderStyle.qml
index bebe9e90ffbdb108ec99dabfd9a593ae0d46475c..19ec336624b6673ce572a3f137f2ecdfaf78e0ec 100644
--- a/src/styles/SliderStyle.qml
+++ b/src/styles/SliderStyle.qml
@@ -54,30 +54,31 @@ Style {
property color backgroundColor: "lightgray"
- property Component handle: Rectangle {
- implicitWidth: 12
- implicitHeight: 14
- gradient: Gradient {
- GradientStop {color: backgroundColor ; position: 0}
- GradientStop {color: Qt.darker(backgroundColor, 1.2) ; position: 1}
+ property Component handle: Item {
+ implicitWidth: 20
+ implicitHeight: 18
+ BorderImage {
+ anchors.fill: parent
+ source: "images/button.png"
+ border.top: 6
+ border.bottom: 6
+ border.left: 6
+ border.right: 6
}
- antialiasing: true
- radius: height/2
- border.color: Qt.darker(backgroundColor, 1.8)
}
- property Component background: Rectangle {
- anchors.verticalCenter: parent.verticalCenter
- implicitWidth: 200
- implicitHeight: 6
-
- gradient: Gradient {
- GradientStop {color: Qt.darker(backgroundColor, 1.2) ; position: 0}
- GradientStop {color: Qt.darker(backgroundColor, 1.5) ; position: 1}
- }
- antialiasing: true
- radius: height / 2.0
- border.color: Qt.darker(backgroundColor, 1.8)
+ property Component background: Item {
+ anchors.verticalCenter: parent.verticalCenter
+ implicitWidth: 100
+ implicitHeight: 8
+ BorderImage {
+ anchors.fill: parent
+ source: "images/button_down.png"
+ border.top: 3
+ border.bottom: 3
+ border.left: 6
+ border.right: 6
+ }
}
property Component panel: Item {
@@ -92,6 +93,8 @@ Style {
Loader {
id: backgroundControl
sourceComponent: background
+ anchors.left: parent.left
+ anchors.right: parent.right
property Control control: __cref
property Item handle: handleLoader.item
}
@@ -100,7 +103,7 @@ Style {
id: handleLoader
sourceComponent: handle
anchors.verticalCenter: backgroundControl.verticalCenter
- x: leftMargin + control.value / control.maximumValue * (root.width - leftMargin - rightMargin - width/2)
+ x: Math.round(leftMargin + control.value / control.maximumValue * (root.width - leftMargin - rightMargin - width/2))
property Control control: __cref
}
}
diff --git a/src/styles/SpinBoxStyle.qml b/src/styles/SpinBoxStyle.qml
index 1da81309858c59f0fdd6195c663fb9968e4a02d2..c17b1b1a3047dd4cc19de8cd98b29c7b489cb921 100644
--- a/src/styles/SpinBoxStyle.qml
+++ b/src/styles/SpinBoxStyle.qml
@@ -65,7 +65,6 @@ Style {
}
property Component upControl: Rectangle {
- anchors.centerIn: parent
implicitWidth: 12
gradient: Gradient {
GradientStop {color: control.__upPressed ? "lightgray" : "white" ; position: 0}
@@ -75,6 +74,7 @@ Style {
Image {
source: "images/arrow-up.png"
anchors.centerIn: parent
+ opacity: 0.7
}
}
@@ -88,25 +88,26 @@ Style {
Image {
source: "images/arrow-down.png"
anchors.centerIn: parent
+ opacity: 0.7
}
}
- property Component background: Rectangle {
- anchors.fill: parent
- gradient: Gradient {
- GradientStop{color: Qt.darker(backgroundColor, 1.1) ; position: 0}
- GradientStop{color: Qt.lighter(backgroundColor, 1.2) ; position: 1}
+ property Component background: Item {
+ BorderImage {
+ anchors.fill: parent
+ source: "images/editbox.png"
+ border.left: 4
+ border.right: 4
+ border.top: 4
+ border.bottom: 4
+ anchors.bottomMargin: -2
}
- radius: 3
- antialiasing: true
- border.color: Qt.darker(backgroundColor, 2)
}
-
property Component panel: Item {
id: styleitem
implicitWidth: control.__contentWidth + 26
- implicitHeight: 21
+ implicitHeight: 23
property color foregroundColor: spinboxStyle.foregroundColor
property color backgroundColor: spinboxStyle.backgroundColor
diff --git a/src/styles/StatusBarStyle.qml b/src/styles/StatusBarStyle.qml
index 02ef32aff261f9441fa0bc68a100d64606902c56..308b9debd33945af97d2c24f69cd7a4f567fecce 100644
--- a/src/styles/StatusBarStyle.qml
+++ b/src/styles/StatusBarStyle.qml
@@ -60,7 +60,7 @@ Item {
}
Rectangle {
- anchors.bottom: parent.bottom
+ anchors.top: parent.top
width: parent.width
height: 1
color: "#999"
diff --git a/src/styles/TabViewStyle.qml b/src/styles/TabViewStyle.qml
index 9f4c0bd995c7cc25886e31378702fbe23a7259f2..0adbe6b0c504bf893afbde3d890c018f7ab774f1 100644
--- a/src/styles/TabViewStyle.qml
+++ b/src/styles/TabViewStyle.qml
@@ -68,34 +68,46 @@ Style {
/*! This property holds the amount of overlap there are between
individual tab buttons. The default value is 0
*/
- property int tabOverlap: 0
+ property int tabOverlap: 3
property int tabvshift : 0
- property int tabBaseOverlap: 0
+ property int tabBaseOverlap: 2
property Component frame: Item {
Rectangle {
anchors.fill: parent
- anchors.topMargin: -10
- color: "lightgray"
- border.color: "gray"
+ anchors.topMargin: -tabBaseOverlap
+ color: "#dcdcdc"
+ border.color: "#aaa"
+
+ Rectangle {
+ anchors.fill: parent
+ color: "transparent"
+ border.color: "#66ffffff"
+ anchors.margins: 1
+ }
}
}
property Component tab: Item {
- implicitWidth: textitem.implicitWidth + 20
- implicitHeight: textitem.implicitHeight + 4
-
- Rectangle {
+ scale: control.tabPosition === Qt.TopEdge ? 1 : -1
+ implicitWidth: Math.round(textitem.implicitWidth + 20)
+ implicitHeight: Math.round(textitem.implicitHeight + 10)
+ clip: true
+ Item {
anchors.fill: parent
- gradient: Gradient{
- GradientStop { color: tab.selected ? "lightgray" : "white" ; position: 0}
- GradientStop { color: tab.selected ? "lightgray" : "lightgray" ; position: 1}
+ anchors.bottomMargin: tab.selected ? 0 : 2
+ clip: true
+ BorderImage {
+ anchors.fill: parent
+ source: tab.selected ? "images/tab_selected.png" : "images/tab.png"
+ border.top: 6
+ border.bottom: 6
+ border.left: 6
+ border.right: 6
+ anchors.topMargin: control.tabPosition === Qt.TopEdge ? (tab.selected ? 0 : 1) : 0
}
- border.color: "#aaa"
-
}
-
Text {
id: textitem
anchors.centerIn: parent
@@ -103,5 +115,4 @@ Style {
renderType: Text.NativeRendering
}
}
-
}
diff --git a/src/styles/TableViewStyle.qml b/src/styles/TableViewStyle.qml
index 20352bd232170aab7a7223259e51a3a57cf4fd12..495475e818a93890e28bd2e6bb3ab19b0180ac11 100644
--- a/src/styles/TableViewStyle.qml
+++ b/src/styles/TableViewStyle.qml
@@ -49,7 +49,11 @@ ScrollViewStyle {
property color highlightedTextColor: "white"
property Component headerDelegate: Rectangle {
- color: "white"
+ gradient: Gradient {
+ GradientStop {position: 0 ; color: "#eee"}
+ GradientStop {position: 1 ; color: "#ddd"}
+ }
+
implicitHeight: 16
implicitWidth: 80
Text {
@@ -66,6 +70,14 @@ ScrollViewStyle {
height: 1
color: "#bbb"
}
+ Rectangle {
+ anchors.right: parent.right
+ anchors.top: parent.top
+ anchors.bottom: parent.bottom
+ anchors.bottomMargin: 2
+ width: 1
+ color: "#ccc"
+ }
}
property Component rowDelegate: Rectangle {
diff --git a/src/styles/TextFieldStyle.qml b/src/styles/TextFieldStyle.qml
index c2467ee8ffc7b139921ad6312be01e3fade67713..f50ba691001e0e5926c076fe975f9e346d54fe4d 100644
--- a/src/styles/TextFieldStyle.qml
+++ b/src/styles/TextFieldStyle.qml
@@ -51,8 +51,8 @@ Style {
id: style
property int topMargin: 4
- property int leftMargin: 8
- property int rightMargin: 8
+ property int leftMargin: 6
+ property int rightMargin: 6
property int bottomMargin: 4
property color foregroundColor: "black"
@@ -62,15 +62,17 @@ Style {
property font font
- property Component background: Rectangle {
- id: styleitem
- border.color: Qt.darker(backgroundColor, 2)
- gradient: Gradient {
- GradientStop{color: Qt.darker(backgroundColor, 1.1) ; position: 0}
- GradientStop{color: Qt.lighter(backgroundColor, 1.2) ; position: 1}
+ property Component background: Item {
+ implicitWidth: 100
+ implicitHeight: 25
+ BorderImage {
+ anchors.fill: parent
+ source: "images/editbox.png"
+ border.left: 4
+ border.right: 4
+ border.top: 4
+ border.bottom: 4
}
- radius: 3
- antialiasing: true
}
property Component panel: Item {
@@ -97,5 +99,16 @@ Style {
sourceComponent: background
anchors.fill: parent
}
+ BorderImage {
+ property int margin: 0
+ anchors.fill: parent
+ anchors.topMargin: -1
+ source: "images/focusframe.png"
+ visible: control.activeFocus
+ border.left: 4
+ border.right: 4
+ border.top: 4
+ border.bottom: 4
+ }
}
}
diff --git a/src/styles/images/button.png b/src/styles/images/button.png
new file mode 100644
index 0000000000000000000000000000000000000000..9ee7d8ee0af9433fbe9401f7e1a42490b0799fe8
Binary files /dev/null and b/src/styles/images/button.png differ
diff --git a/src/styles/images/button_down.png b/src/styles/images/button_down.png
new file mode 100644
index 0000000000000000000000000000000000000000..088ed20d53b202ffd49b9cdbe82ea213a80b77a5
Binary files /dev/null and b/src/styles/images/button_down.png differ
diff --git a/src/styles/images/editbox.png b/src/styles/images/editbox.png
new file mode 100644
index 0000000000000000000000000000000000000000..1f25e70d9bf37a08ae2205c08511bca7ea45427e
Binary files /dev/null and b/src/styles/images/editbox.png differ
diff --git a/src/styles/images/groupbox.png b/src/styles/images/groupbox.png
new file mode 100644
index 0000000000000000000000000000000000000000..98585ee8c71015b309d94bde67524ce1d7e5c5aa
Binary files /dev/null and b/src/styles/images/groupbox.png differ
diff --git a/src/styles/images/tab.png b/src/styles/images/tab.png
new file mode 100644
index 0000000000000000000000000000000000000000..ae686c4ce0219ab01531c940969acd69359e879b
Binary files /dev/null and b/src/styles/images/tab.png differ
diff --git a/src/styles/images/tab_selected.png b/src/styles/images/tab_selected.png
new file mode 100644
index 0000000000000000000000000000000000000000..369de2e49159f290239b421da1e07a55d06c5757
Binary files /dev/null and b/src/styles/images/tab_selected.png differ
diff --git a/src/styles/styles.pro b/src/styles/styles.pro
index 402a8db7b4a6e15d54b40b813fa77ef894e998a8..506d042e4f5220c273f09b23659c274fb2f90f87 100644
--- a/src/styles/styles.pro
+++ b/src/styles/styles.pro
@@ -46,6 +46,12 @@ QML_FILES += \
# Images
QML_FILES += \
+ images/button.png \
+ images/button_down.png \
+ images/tab.png \
+ images/groupbox.png \
+ images/tab_selected.png \
+ images/editbox.png \
images/arrow-up.png \
images/arrow-down.png