From c26e1376db5e10a02d8cd492188ba52390d4d66d Mon Sep 17 00:00:00 2001
From: marcin <z.krzysztoff7@gmail.com>
Date: Thu, 17 Jul 2014 13:14:27 +0200
Subject: [PATCH]
https://trello.com/c/MvCKKjjt/47-remove-radius-from-components
https://trello.com/c/9ux5ftqK/48-hide-hints-functionality
---
components/CheckBox.qml | 4 ++--
components/DatePicker.qml | 6 +++---
components/LineEdit.qml | 4 ++--
components/PrivacyLevel.qml | 6 +++---
components/SearchInput.qml | 4 ++--
components/StandardButton.qml | 4 ++--
components/StandardDropdown.qml | 8 ++++----
components/TableDropdown.qml | 6 +++---
components/TipItem.qml | 2 +-
components/TitleBar.qml | 6 ++++--
10 files changed, 26 insertions(+), 24 deletions(-)
diff --git a/components/CheckBox.qml b/components/CheckBox.qml
index f075e83c..9cfe38b3 100644
--- a/components/CheckBox.qml
+++ b/components/CheckBox.qml
@@ -13,7 +13,7 @@ Item {
anchors.left: parent.left
height: parent.height - 1
width: 25
- radius: 4
+ //radius: 4
y: 0
color: "#DBDBDB"
}
@@ -22,7 +22,7 @@ Item {
anchors.left: parent.left
height: parent.height - 1
width: 25
- radius: 4
+ //radius: 4
y: 1
color: "#FFFFFF"
diff --git a/components/DatePicker.qml b/components/DatePicker.qml
index a41703d2..c60007a0 100644
--- a/components/DatePicker.qml
+++ b/components/DatePicker.qml
@@ -32,7 +32,7 @@ Item {
anchors.left: parent.left
anchors.right: parent.right
height: parent.height - 1
- radius: 4
+ //radius: 4
y: 0
color: "#DBDBDB"
}
@@ -41,7 +41,7 @@ Item {
anchors.left: parent.left
anchors.right: parent.right
height: parent.height - 1
- radius: 4
+ //radius: 4
y: 1
color: "#FFFFFF"
@@ -204,7 +204,7 @@ Item {
color: "#FFFFFF"
height: datePicker.expanded ? calendar.height : 0
clip: true
- radius: 4
+ //radius: 4
Behavior on height {
NumberAnimation { duration: 100; easing.type: Easing.InQuad }
diff --git a/components/LineEdit.qml b/components/LineEdit.qml
index 0e5c7dc5..d0bec01b 100644
--- a/components/LineEdit.qml
+++ b/components/LineEdit.qml
@@ -9,14 +9,14 @@ Item {
anchors.fill: parent
anchors.bottomMargin: 1
color: "#DBDBDB"
- radius: 4
+ //radius: 4
}
Rectangle {
anchors.fill: parent
anchors.topMargin: 1
color: "#FFFFFF"
- radius: 4
+ //radius: 4
}
Input {
diff --git a/components/PrivacyLevel.qml b/components/PrivacyLevel.qml
index f882c24a..ee9e0a50 100644
--- a/components/PrivacyLevel.qml
+++ b/components/PrivacyLevel.qml
@@ -11,7 +11,7 @@ Item {
anchors.right: parent.right
anchors.top: parent.top
height: 24
- radius: 4
+ //radius: 4
color: "#DBDBDB"
}
@@ -22,7 +22,7 @@ Item {
anchors.top: parent.top
anchors.topMargin: 1
height: 24
- radius: 4
+ //radius: 4
color: "#FFFFFF"
Rectangle {
@@ -31,7 +31,7 @@ Item {
anchors.bottom: parent.bottom
anchors.left: parent.left
anchors.margins: 4
- radius: 2
+ //radius: 2
width: row.x
color: {
diff --git a/components/SearchInput.qml b/components/SearchInput.qml
index 26747ca9..f856ded5 100644
--- a/components/SearchInput.qml
+++ b/components/SearchInput.qml
@@ -8,14 +8,14 @@ Item {
Rectangle {
anchors.fill: parent
color: "#DBDBDB"
- radius: 4
+ //radius: 4
}
Rectangle {
anchors.fill: parent
anchors.topMargin: 1
color: "#FFFFFF"
- radius: 4
+ //radius: 4
Item {
anchors.top: parent.top
diff --git a/components/StandardButton.qml b/components/StandardButton.qml
index 28bee9be..b7e452f5 100644
--- a/components/StandardButton.qml
+++ b/components/StandardButton.qml
@@ -16,7 +16,7 @@ Item {
anchors.right: parent.right
height: parent.height - 1
y: buttonArea.pressed ? 0 : 1
- radius: 4
+ //radius: 4
color: buttonArea.pressed ? parent.shadowPressedColor : parent.shadowReleasedColor
}
@@ -26,7 +26,7 @@ Item {
height: parent.height - 1
y: buttonArea.pressed ? 1 : 0
color: buttonArea.pressed ? parent.pressedColor : parent.releasedColor
- radius: 4
+ //radius: 4
}
Text {
diff --git a/components/StandardDropdown.qml b/components/StandardDropdown.qml
index 40926887..a7cb3546 100644
--- a/components/StandardDropdown.qml
+++ b/components/StandardDropdown.qml
@@ -39,7 +39,7 @@ Item {
height: parent.height - 1
y: dropdown.expanded || droplist.height > 0 ? 0 : 1
color: dropdown.expanded || droplist.height > 0 ? dropdown.shadowPressedColor : dropdown.shadowReleasedColor
- radius: 4
+ //radius: 4
}
Rectangle {
@@ -48,7 +48,7 @@ Item {
height: parent.height - 1
y: dropdown.expanded || droplist.height > 0 ? 1 : 0
color: dropdown.expanded || droplist.height > 0 ? dropdown.pressedColor : dropdown.releasedColor
- radius: 4
+ //radius: 4
}
Rectangle {
@@ -135,7 +135,7 @@ Item {
clip: true
height: dropdown.expanded ? column.height : 0
color: dropdown.pressedColor
- radius: 4
+ //radius: 4
Rectangle {
anchors.left: parent.left
@@ -169,7 +169,7 @@ Item {
anchors.left: parent.left
anchors.right: parent.right
height: 30
- radius: index === repeater.count - 1 ? 4 : 0
+ //radius: index === repeater.count - 1 ? 4 : 0
color: itemArea.containsMouse || index === column.currentIndex || itemArea.containsMouse ? dropdown.releasedColor : dropdown.pressedColor
Text {
diff --git a/components/TableDropdown.qml b/components/TableDropdown.qml
index 69728a73..c3152e75 100644
--- a/components/TableDropdown.qml
+++ b/components/TableDropdown.qml
@@ -32,7 +32,7 @@ Item {
anchors.right: parent.right
height: parent.height - 1
y: dropdown.expanded || dropArea.height > 0 ? 0 : 1
- radius: 3
+ //radius: 3
color: dropdown.expanded || dropArea.height > 0 ? "#888888" : "#DBDBDB"
}
@@ -41,7 +41,7 @@ Item {
anchors.right: parent.right
height: parent.height - 1
y: dropdown.expanded || dropArea.height > 0 ? 1 : 0
- radius: 3
+ //radius: 3
color: dropdown.expanded || dropArea.height > 0 ? "#DBDBDB" : "#F0EEEE"
}
@@ -124,7 +124,7 @@ Item {
anchors.right: parent.right
height: 30
color: delegateArea.containsMouse ? "#F0EEEE" : "#DBDBDB"
- radius: index === repeater.count - 1 ? 5 : 0
+ //radius: index === repeater.count - 1 ? 5 : 0
Rectangle {
anchors.left: parent.left
diff --git a/components/TipItem.qml b/components/TipItem.qml
index c8298d1a..f58fd1e6 100644
--- a/components/TipItem.qml
+++ b/components/TipItem.qml
@@ -5,7 +5,7 @@ Rectangle {
width: content.width + 12
height: content.height + 17
color: "#FF6C3C"
- radius: 3
+ //radius: 3
Image {
anchors.top: parent.bottom
diff --git a/components/TitleBar.qml b/components/TitleBar.qml
index c4f2dab5..82d9610e 100644
--- a/components/TitleBar.qml
+++ b/components/TitleBar.qml
@@ -33,7 +33,7 @@ Rectangle {
anchors.top: parent.top
anchors.bottom: parent.bottom
width: height
- color: appWindow.whatIsEnable || containsMouse ? "#6B0072" : "#000000"
+ color: containsMouse ? "#6B0072" : "#000000"
Image {
anchors.centerIn: parent
@@ -43,7 +43,9 @@ Rectangle {
MouseArea {
id: whatIsArea
anchors.fill: parent
- onClicked: appWindow.whatIsEnable = !appWindow.whatIsEnable
+ onClicked: {
+
+ }
}
}