[Pkg-privacy-commits] [tails-installer] 10/210: A bunch of visual tweaks
Intrigeri
intrigeri at moszumanska.debian.org
Wed May 24 15:26:23 UTC 2017
This is an automated email from the git hooks/post-receive script.
intrigeri pushed a commit to tag 3.90.0
in repository tails-installer.
commit df1ec43ed5035a35b5154995f87a5d35d03f441d
Author: Martin Briza <mbriza at redhat.com>
Date: Wed Feb 11 16:27:05 2015 +0100
A bunch of visual tweaks
---
liveusb/components/AdwaitaButton.qml | 12 ++---
liveusb/components/AdwaitaComboBox.qml | 4 ++
liveusb/components/AdwaitaProgressBar.qml | 1 +
liveusb/components/AdwaitaRectangle.qml | 20 ++++----
liveusb/components/DownloadDialog.qml | 81 ++++++++++++++++---------------
liveusb/components/ImageDetails.qml | 3 +-
6 files changed, 60 insertions(+), 61 deletions(-)
diff --git a/liveusb/components/AdwaitaButton.qml b/liveusb/components/AdwaitaButton.qml
index 8d09cdc..eef3213 100644
--- a/liveusb/components/AdwaitaButton.qml
+++ b/liveusb/components/AdwaitaButton.qml
@@ -9,17 +9,11 @@ Button {
style: ButtonStyle {
background: AdwaitaRectangle {
- color: root.color
- Component.onCompleted: {
- if (root.color != palette.button)
- gradient = emptyGrad
- }
- Gradient {
- id: emptyGrad
- }
+ tint: control.enabled ? (root.color == palette.button) ? "transparent" : root.color : "white"
+ border.color: control.enabled ? "#777777" : "#c2c2c2"
}
label: Text {
- color: root.textColor
+ color: control.enabled ? root.textColor : "gray"
verticalAlignment: Text.AlignVCenter
horizontalAlignment: Text.AlignHCenter
text: control.text
diff --git a/liveusb/components/AdwaitaComboBox.qml b/liveusb/components/AdwaitaComboBox.qml
index 61f6c7a..723628c 100644
--- a/liveusb/components/AdwaitaComboBox.qml
+++ b/liveusb/components/AdwaitaComboBox.qml
@@ -4,8 +4,11 @@ import QtQuick.Controls.Styles 1.2
import QtQuick.Controls.Private 1.0
ComboBox {
+ implicitWidth: 128
+ implicitHeight: 32
style: ComboBoxStyle {
background: AdwaitaRectangle {
+ width: control.width
Arrow {
anchors.right: parent.right
anchors.verticalCenter: parent.verticalCenter
@@ -15,6 +18,7 @@ ComboBox {
}
}
label: Text {
+ width: control.width
x: 4
verticalAlignment: Text.AlignVCenter
horizontalAlignment: Text.AlignLeft
diff --git a/liveusb/components/AdwaitaProgressBar.qml b/liveusb/components/AdwaitaProgressBar.qml
index a14b03f..9aaf410 100644
--- a/liveusb/components/AdwaitaProgressBar.qml
+++ b/liveusb/components/AdwaitaProgressBar.qml
@@ -13,6 +13,7 @@ ProgressBar {
width: 1
}
radius: 3
+ clip: true
gradient: Gradient {
GradientStop { position: 0.0; color: "#b2b2b2" }
GradientStop { position: 1.0; color: "#d4d4d4" }
diff --git a/liveusb/components/AdwaitaRectangle.qml b/liveusb/components/AdwaitaRectangle.qml
index 7f4c59f..689958d 100644
--- a/liveusb/components/AdwaitaRectangle.qml
+++ b/liveusb/components/AdwaitaRectangle.qml
@@ -2,29 +2,27 @@ import QtQuick 2.0
Rectangle {
id: rect
+ property color tint: "transparent"
property real tintFactor: !control.pressed ? control.hovered ? 0.0 : 0.1 : -0.2
implicitHeight: 36
implicitWidth: 36
- radius: 4
+ radius: 3
+ color: "red"
gradient: Gradient {
GradientStop { position: 0.0; color: Qt.lighter(palette.button, 1.08 - (control.pressed ? 0.2 : 0)) }
GradientStop { position: 1.0; color: Qt.lighter(palette.button, 0.92 + (!control.pressed && control.hovered ? 0.1 : 0)) }
}
-/*
Rectangle {
- anchors.fill: parent
+ radius: parent.radius - 1
anchors.margins: 1
- radius: 3
- gradient: Gradient {
- GradientStop { position: 0.0; color: "#22000000" }
- GradientStop { position: 0.3; color: "#00000000" }
- }
+ anchors.fill: parent
+ color: parent.tint
+ opacity: 0.66
}
-*/
- //color: control.clicked ? Qt.lighter(root.color, 1.0) : root.color
+
border {
width: 1
- color: "#b2b2b2"
+ color: "#a1a1a1"
}
SystemPalette {
diff --git a/liveusb/components/DownloadDialog.qml b/liveusb/components/DownloadDialog.qml
index 355e882..20203b8 100644
--- a/liveusb/components/DownloadDialog.qml
+++ b/liveusb/components/DownloadDialog.qml
@@ -9,40 +9,6 @@ Dialog {
title: "Write Fedora Workstation to USB"
contentItem: Rectangle {
- Item {
- id: dialogToolBar
- height: 42
- anchors {
- left: parent.left
- right: parent.right
- bottom: parent.bottom
- }
-
- AdwaitaButton {
- id: cancelButton
- anchors {
- right: acceptButton.left
- top: parent.top
- bottom: parent.bottom
- margins: 6
- }
- width: implicitWidth * 1.2
- text: "Cancel"
- onClicked: root.close()
- }
- AdwaitaButton {
- id: acceptButton
- anchors {
- right: parent.right
- top: parent.top
- bottom: parent.bottom
- margins: 6
- }
- width: implicitWidth * 1.2
- enabled: false
- text: "Write to disk"
- }
- }
color: palette.window
implicitWidth: 600
implicitHeight: 300
@@ -50,14 +16,11 @@ Dialog {
id: layout
spacing: 24
anchors {
- top: parent.top
- left: parent.left
- right: parent.right
- bottom: dialogToolBar.top
+ fill: parent
topMargin: 48
leftMargin: 64
rightMargin: anchors.leftMargin
- bottomMargin: anchors.topMargin
+ bottomMargin: anchors.topMargin * 2
}
Text {
@@ -92,7 +55,7 @@ Dialog {
Arrow {
}
- ComboBox {
+ AdwaitaComboBox {
Layout.preferredWidth: implicitWidth * 2
model: ListModel {
ListElement { text: "SanDisk Cruzer 2.0 GB Drive"; device:"sdj1" }
@@ -100,5 +63,43 @@ Dialog {
}
}
}
+ Item {
+ id: dialogToolBar
+ height: 32
+ anchors {
+ left: parent.left
+ right: parent.right
+ bottom: parent.bottom
+ bottomMargin: 24
+ leftMargin: 16
+ rightMargin: anchors.leftMargin
+ }
+
+ AdwaitaButton {
+ id: cancelButton
+ anchors {
+ right: acceptButton.left
+ top: parent.top
+ bottom: parent.bottom
+ rightMargin: 6
+ }
+ width: implicitWidth * 1.2
+ text: "Cancel"
+ onClicked: root.close()
+ }
+ AdwaitaButton {
+ id: acceptButton
+ anchors {
+ right: parent.right
+ top: parent.top
+ bottom: parent.bottom
+ }
+ color: "red"
+ textColor: enabled ? "white" : palette.text
+ width: implicitWidth * 1.2
+ enabled: false
+ text: "Write to disk"
+ }
+ }
}
}
diff --git a/liveusb/components/ImageDetails.qml b/liveusb/components/ImageDetails.qml
index 385a1b4..5fec631 100644
--- a/liveusb/components/ImageDetails.qml
+++ b/liveusb/components/ImageDetails.qml
@@ -41,7 +41,8 @@ Item {
}
AdwaitaButton {
text: "Write to USB disk"
- color: "#729FCF"
+ //color: "#729FCF"
+ color: Qt.darker("#729fcf", 1.25)
textColor: "white"
width: implicitWidth + 16
onClicked: dialog.visible = true
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-privacy/packages/tails-installer.git
More information about the Pkg-privacy-commits
mailing list