[Pkg-privacy-commits] [tails-installer] 09/210: Accommodate most of the changes in the design
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 fee07ed60cf42ab503f8cfbdbbc713406fd71977
Author: Martin Briza <mbriza at redhat.com>
Date: Tue Feb 10 14:25:54 2015 +0100
Accommodate most of the changes in the design
---
liveusb/components/AdwaitaButton.qml | 15 +-
liveusb/components/AdwaitaComboBox.qml | 6 +
liveusb/components/AdwaitaRectangle.qml | 2 +-
liveusb/components/BackButton.qml | 15 +-
liveusb/components/DownloadDialog.qml | 21 ++-
liveusb/components/ImageDetails.qml | 114 ++++++++----
liveusb/components/ImageList.qml | 304 +++++++++++++++++++++++---------
liveusb/liveusb.qml | 52 +++---
liveusb/liveusb.qmlproject.user | 2 +-
9 files changed, 382 insertions(+), 149 deletions(-)
diff --git a/liveusb/components/AdwaitaButton.qml b/liveusb/components/AdwaitaButton.qml
index 3c2e254..8d09cdc 100644
--- a/liveusb/components/AdwaitaButton.qml
+++ b/liveusb/components/AdwaitaButton.qml
@@ -9,7 +9,20 @@ Button {
style: ButtonStyle {
background: AdwaitaRectangle {
-
+ color: root.color
+ Component.onCompleted: {
+ if (root.color != palette.button)
+ gradient = emptyGrad
+ }
+ Gradient {
+ id: emptyGrad
+ }
+ }
+ label: Text {
+ color: root.textColor
+ verticalAlignment: Text.AlignVCenter
+ horizontalAlignment: Text.AlignHCenter
+ text: control.text
}
}
}
diff --git a/liveusb/components/AdwaitaComboBox.qml b/liveusb/components/AdwaitaComboBox.qml
index 2b3aa67..61f6c7a 100644
--- a/liveusb/components/AdwaitaComboBox.qml
+++ b/liveusb/components/AdwaitaComboBox.qml
@@ -14,6 +14,12 @@ ComboBox {
scale: 1.3
}
}
+ label: Text {
+ x: 4
+ verticalAlignment: Text.AlignVCenter
+ horizontalAlignment: Text.AlignLeft
+ text: control.currentText
+ }
}
}
diff --git a/liveusb/components/AdwaitaRectangle.qml b/liveusb/components/AdwaitaRectangle.qml
index 41cf900..7f4c59f 100644
--- a/liveusb/components/AdwaitaRectangle.qml
+++ b/liveusb/components/AdwaitaRectangle.qml
@@ -24,7 +24,7 @@ Rectangle {
//color: control.clicked ? Qt.lighter(root.color, 1.0) : root.color
border {
width: 1
- color: "#888"
+ color: "#b2b2b2"
}
SystemPalette {
diff --git a/liveusb/components/BackButton.qml b/liveusb/components/BackButton.qml
index 1051014..5848a54 100644
--- a/liveusb/components/BackButton.qml
+++ b/liveusb/components/BackButton.qml
@@ -2,8 +2,12 @@ import QtQuick 2.0
import QtQuick.Controls 1.2
AdwaitaButton {
+ width: arrow.width + text.width + 28
Item {
- anchors.centerIn: parent
+ id: arrow
+ anchors.left: parent.left
+ anchors.leftMargin: 12
+ anchors.verticalCenter: parent.verticalCenter
rotation: -45
transformOrigin: Item.Center
width: 10
@@ -25,4 +29,13 @@ AdwaitaButton {
color: "#444444"
}
}
+ Text {
+ id: text
+ text: "Back"
+ anchors {
+ left: arrow.left
+ leftMargin: 16
+ verticalCenter: parent.verticalCenter
+ }
+ }
}
diff --git a/liveusb/components/DownloadDialog.qml b/liveusb/components/DownloadDialog.qml
index d481b11..355e882 100644
--- a/liveusb/components/DownloadDialog.qml
+++ b/liveusb/components/DownloadDialog.qml
@@ -9,13 +9,19 @@ Dialog {
title: "Write Fedora Workstation to USB"
contentItem: Rectangle {
- ToolBar {
+ Item {
id: dialogToolBar
- height: 48
+ height: 42
+ anchors {
+ left: parent.left
+ right: parent.right
+ bottom: parent.bottom
+ }
AdwaitaButton {
+ id: cancelButton
anchors {
- left: parent.left
+ right: acceptButton.left
top: parent.top
bottom: parent.bottom
margins: 6
@@ -24,11 +30,8 @@ Dialog {
text: "Cancel"
onClicked: root.close()
}
- Text {
- anchors.centerIn: parent
- text: "Write Fedora Workstation to USB"
- }
AdwaitaButton {
+ id: acceptButton
anchors {
right: parent.right
top: parent.top
@@ -47,10 +50,10 @@ Dialog {
id: layout
spacing: 24
anchors {
- top: dialogToolBar.bottom
+ top: parent.top
left: parent.left
right: parent.right
- bottom: parent.bottom
+ bottom: dialogToolBar.top
topMargin: 48
leftMargin: 64
rightMargin: anchors.leftMargin
diff --git a/liveusb/components/ImageDetails.qml b/liveusb/components/ImageDetails.qml
index 8c7d89d..385a1b4 100644
--- a/liveusb/components/ImageDetails.qml
+++ b/liveusb/components/ImageDetails.qml
@@ -1,5 +1,6 @@
import QtQuick 2.0
import QtQuick.Controls 1.2
+import QtQuick.Controls.Styles 1.2
import QtQuick.Layouts 1.1
Item {
@@ -7,6 +8,53 @@ Item {
signal stepForward
+ Rectangle {
+ z: 2
+ gradient: Gradient {
+ GradientStop { position: 0.0; color: palette.window }
+ GradientStop { position: 0.1; color: palette.window }
+ GradientStop { position: 0.2; color: Qt.tint(palette.window, "transparent") }
+ GradientStop { position: 1.0; color: "transparent" }
+ }
+ id: tools
+ anchors {
+ top: parent.top
+ left: parent.left
+ right: parent.right
+ leftMargin: 64
+ rightMargin: anchors.leftMargin
+ }
+ height: 64
+ BackButton {
+ id: backButton
+ anchors {
+ left: parent.left
+ top: parent.top
+ bottom: parent.bottom
+ topMargin: 16
+ bottomMargin: 16
+ }
+ onClicked: {
+ canGoBack = false
+ contentList.currentIndex--
+ }
+ }
+ AdwaitaButton {
+ text: "Write to USB disk"
+ color: "#729FCF"
+ textColor: "white"
+ width: implicitWidth + 16
+ onClicked: dialog.visible = true
+ anchors {
+ right: parent.right
+ top: parent.top
+ bottom: parent.bottom
+ topMargin: 16
+ bottomMargin: 16
+ }
+ }
+ }
+
ScrollView {
anchors {
fill: parent
@@ -14,7 +62,7 @@ Item {
}
contentItem: Item {
- y: 48
+ y: 72
x: 64
width: root.width - 2 * 64
height: childrenRect.height + 64 + 32
@@ -38,15 +86,11 @@ Item {
ColumnLayout {
Layout.alignment: Qt.AlignLeft
spacing: 8
- Text {
- text: "Fedora Workstation 21"
- }
RowLayout {
Text {
Layout.fillWidth: true
anchors.left: parent.left
- text: "64bit"
- color: "gray"
+ text: "Fedora Workstation 21"
}
Text {
anchors.right: parent.right
@@ -54,40 +98,23 @@ Item {
color: "gray"
}
}
- }
- }
- Text {
- Layout.fillWidth: true
- width: Layout.width
- wrapMode: Text.WordWrap
- text: "Lorem ipsum, quia dolor sit, amet, consectetur, adipisci velit, sed quia non numquam eius modi tempora incidunt, ut labore et dolore magnam aliquam quaerat voluptatem. Ut enim ad minima veniam, quis nostrum exercitationem ullam corporis suscipit laboriosam, nisi ut aliquid ex ea commodi consequatur? Quis autem vel eum iure reprehenderit, qui in ea voluptate velit esse, quam nihil molestiae consequatur, vel illum, qui dolorem eum fugiat, quo voluptas nulla pariatur?"
- font.pointSize: 9
- }
- RowLayout {
- spacing: 16
- ColumnLayout {
- Layout.fillWidth: true
Text {
- Layout.fillWidth: true
- text: "ISO format image for Intel-compatible PCs (64-bit)"
- font.pointSize: 8
+ text: "64bit"
color: "gray"
}
Text {
- Layout.fillWidth: true
text: "Released on December 21st 2014"
font.pointSize: 8
color: "gray"
}
}
- AdwaitaButton {
- text: "Write to USB disk"
- onClicked: dialog.visible = true
- }
- AdwaitaButton {
- enabled: false
- text: "Boot with Boxes"
- }
+ }
+ Text {
+ Layout.fillWidth: true
+ width: Layout.width
+ wrapMode: Text.WordWrap
+ text: "Lorem ipsum, quia dolor sit, amet, consectetur, adipisci velit, sed quia non numquam eius modi tempora incidunt, ut labore et dolore magnam aliquam quaerat voluptatem. Ut enim ad minima veniam, quis nostrum exercitationem ullam corporis suscipit laboriosam, nisi ut aliquid ex ea commodi consequatur? Quis autem vel eum iure reprehenderit, qui in ea voluptate velit esse, quam nihil molestiae consequatur, vel illum, qui dolorem eum fugiat, quo voluptas nulla pariatur?"
+ font.pointSize: 9
}
IndicatedImage {
Layout.fillWidth: true
@@ -97,6 +124,31 @@ Item {
}
}
}
+
+ style: ScrollViewStyle {
+ incrementControl: Item {}
+ decrementControl: Item {}
+ corner: Item {
+ implicitWidth: 11
+ implicitHeight: 11
+ }
+ scrollBarBackground: Rectangle {
+ color: "#dddddd"
+ implicitWidth: 11
+ implicitHeight: 11
+ }
+ handle: Rectangle {
+ color: "#b3b5b6"
+ x: 2
+ y: 2
+ implicitWidth: 7
+ implicitHeight: 7
+ radius: 4
+ }
+ transientScrollBars: true
+ handleOverlap: 1
+ minimumHandleLength: 10
+ }
}
DownloadDialog {
id: dialog
diff --git a/liveusb/components/ImageList.qml b/liveusb/components/ImageList.qml
index 25df18b..1255fd5 100644
--- a/liveusb/components/ImageList.qml
+++ b/liveusb/components/ImageList.qml
@@ -1,111 +1,247 @@
import QtQuick 2.4
+import QtQuick.Controls 1.3
+import QtQuick.Controls.Styles 1.3
-Rectangle {
+Item {
id: root
property alias currentIndex: osListView.currentIndex
signal stepForward(int index)
- anchors {
- fill: parent
- bottomMargin: 48
- rightMargin: 64
- topMargin: anchors.bottomMargin
- leftMargin: anchors.rightMargin
+ anchors.fill: parent
+ clip: true
+
+ Rectangle {
+ id: searchBox
+ border {
+ color: "#c3c3c3"
+ width: 1
+ }
+ radius: 6
+ color: "white"
+ anchors {
+ top: parent.top
+ left: parent.left
+ right: archSelect.left
+ topMargin: 12
+ leftMargin: 64
+ rightMargin: 4
+ }
+ height: 36
+
+ Item {
+ id: magnifyingGlass
+ anchors {
+ left: parent.left
+ leftMargin: (parent.height - height) / 2
+ verticalCenter: parent.verticalCenter
+ }
+ height: childrenRect.height + 3
+ width: childrenRect.width + 2
+
+ Rectangle {
+ height: 11
+ antialiasing: true
+ width: height
+ radius: height / 2
+ color: "black"
+ Rectangle {
+ height: 7
+ antialiasing: true
+ width: height
+ radius: height / 2
+ color: "white"
+ anchors.centerIn: parent
+ }
+ Rectangle {
+ height: 2
+ width: 6
+ radius: 2
+ x: 8
+ y: 11
+ rotation: 45
+ color: "black"
+ }
+ }
+ }
+ TextInput {
+ anchors {
+ left: magnifyingGlass.right
+ top: parent.top
+ bottom: parent.bottom
+ right: parent.right
+ margins: 8
+ }
+ Text {
+ anchors.fill: parent
+ color: "light gray"
+ text: "find an operating system image"
+ visible: !parent.focus
+ verticalAlignment: Text.AlignVCenter
+ }
+ verticalAlignment: TextInput.AlignVCenter
+
+ clip: true
+ }
}
- clip: true
- border {
- color: "#c3c3c3"
- width: 1
+ AdwaitaComboBox {
+ id: archSelect
+ anchors {
+ right: parent.right
+ top: parent.top
+ rightMargin: 64
+ topMargin: 12
+ }
+ height: 36
+ width: 148
+ model: ["64bit (detected)", "32bit"]
+ }
+
+ Rectangle {
+ z: -1
+ anchors {
+ top: parent.top
+ left: parent.left
+ right: parent.right
+ topMargin: 54
+ rightMargin: 64
+ leftMargin: anchors.rightMargin
+ }
+ border {
+ color: "#c3c3c3"
+ width: 1
+ }
+ height: parent.height - 54 + 4
+
+ radius: 6
+ color: "white"
}
- radius: 6
- color: "white"
- ListView {
- id: osListView
- clip: true
+
+ ScrollView {
anchors.fill: parent
- model: osList
- delegate: imageDelegate
+ ListView {
+ id: osListView
+ clip: true
+ anchors {
+ fill: parent
+ topMargin: 54
+ bottomMargin: -54
+ }
+ footer: Item {
+ height: 54
+ }
+
+ model: osList
+ delegate: imageDelegate
+ }
+ style: ScrollViewStyle {
+ incrementControl: Item {}
+ decrementControl: Item {}
+ corner: Item {
+ implicitWidth: 11
+ implicitHeight: 11
+ }
+ scrollBarBackground: Rectangle {
+ color: "#dddddd"
+ implicitWidth: 11
+ implicitHeight: 11
+ }
+ handle: Rectangle {
+ color: "#b3b5b6"
+ x: 2
+ y: 2
+ implicitWidth: 7
+ implicitHeight: 7
+ radius: 4
+ }
+ transientScrollBars: true
+ handleOverlap: 1
+ minimumHandleLength: 10
+ }
}
+
Component {
id: imageDelegate
- Rectangle {
- width: parent.width - 2
+ Item {
+ width: parent.width
height: 84
- x: 1
- y: 1
- color: "transparent"
- IndicatedImage {
- id: iconRect
- anchors {
- top: parent.top
- left: parent.left
- bottom: parent.bottom
- leftMargin: 32
- topMargin: 16
- bottomMargin: anchors.topMargin
- }
- width: height
- smooth: true
-
- source: icon
- }
- Item {
- id: textRect
- anchors {
- verticalCenter: parent.verticalCenter
- left: iconRect.right
- leftMargin: 28
- }
- Text {
- text: name
+ Rectangle {
+ width: parent.width - 2 - 128
+ height: parent.height
+ x: 64 + 1
+ color: "transparent"
+ IndicatedImage {
+ id: iconRect
anchors {
- bottom: parent.verticalCenter
+ top: parent.top
left: parent.left
- bottomMargin: 2
+ bottom: parent.bottom
+ leftMargin: 32
+ topMargin: 16
+ bottomMargin: anchors.topMargin
}
- // font.weight: Font.Bold
+ width: height
+ smooth: true
+
+ source: icon
}
- Text {
- text: description
+ Item {
+ id: textRect
anchors {
- top: parent.verticalCenter
- left: parent.right
- topMargin: 2
+ verticalCenter: parent.verticalCenter
+ left: iconRect.right
+ leftMargin: 28
+ }
+ Text {
+ text: name
+ anchors {
+ bottom: parent.verticalCenter
+ left: parent.left
+ bottomMargin: 2
+ }
+ // font.weight: Font.Bold
+ }
+ Text {
+ text: description
+ anchors {
+ top: parent.verticalCenter
+ left: parent.right
+ topMargin: 2
+ }
+ color: "#a1a1a1"
+ // font.weight: Font.Bold
}
- color: "#a1a1a1"
- // font.weight: Font.Bold
- }
- }
- Arrow {
- visible: hasDetails
- anchors {
- verticalCenter: parent.verticalCenter
- right: parent.right
- rightMargin: 20
- }
- }
- Rectangle {
- height: 1
- color: "#c3c3c3"
- width: parent.width
- anchors.bottom: parent.bottom
- }
- MouseArea {
- anchors.fill: parent
- onClicked: {
- root.currentIndex = index
- root.stepForward(index)
}
- onPressed: {
- parent.color = "#ededed"
+ Arrow {
+ visible: hasDetails
+ anchors {
+ verticalCenter: parent.verticalCenter
+ right: parent.right
+ rightMargin: 20
+ }
}
- onReleased: {
- parent.color = "transparent"
+ Rectangle {
+ height: 1
+ color: "#c3c3c3"
+ width: parent.width
+ anchors.bottom: parent.bottom
}
- onCanceled: {
- parent.color = "transparent"
+ MouseArea {
+ anchors.fill: parent
+ onClicked: {
+ root.currentIndex = index
+ root.stepForward(index)
+ }
+ onPressed: {
+ parent.color = "#ededed"
+ }
+ onReleased: {
+ parent.color = "transparent"
+ }
+ onCanceled: {
+ parent.color = "transparent"
+ }
}
}
}
diff --git a/liveusb/liveusb.qml b/liveusb/liveusb.qml
index b96d03a..83b3aea 100644
--- a/liveusb/liveusb.qml
+++ b/liveusb/liveusb.qml
@@ -65,6 +65,30 @@ ApplicationWindow {
icon: "http://logonoid.com/images/ubuntu-logo.png"
hasDetails: true
}
+ ListElement {
+ name: "Fedora Workstation"
+ description: "Fedora Workstation 21 64bit"
+ icon: "http://upload.wikimedia.org/wikipedia/commons/3/3f/Fedora_logo.svg"
+ hasDetails: true
+ }
+ ListElement {
+ name: "Fedora Workstation"
+ description: "Fedora Workstation 20 64bit"
+ icon: "http://upload.wikimedia.org/wikipedia/commons/3/3f/Fedora_logo.svg"
+ hasDetails: true
+ }
+ ListElement {
+ name: "Ubuntu Desktop"
+ description: "Ubuntu 14.04.1 LTS 64bit"
+ icon: "http://logonoid.com/images/ubuntu-logo.png"
+ hasDetails: true
+ }
+ ListElement {
+ name: "Ubuntu Desktop"
+ description: "Ubuntu 14.10 64bit"
+ icon: "http://logonoid.com/images/ubuntu-logo.png"
+ hasDetails: true
+ }
}
Rectangle {
@@ -72,11 +96,7 @@ ApplicationWindow {
color: palette.window
//radius: 8
clip: true
- border {
- width: 1
- color: "#a1a1a1"
- }
-
+/*
Rectangle {
id: toolBar
height: 48
@@ -128,22 +148,12 @@ ApplicationWindow {
contentList.currentIndex--
}
}
-/*
+
Text {
text: "OS Boot Imager"
anchors.centerIn: parent
}
-*/
- AdwaitaComboBox {
- anchors {
- right: menuButton.left
- top: parent.top
- bottom: parent.bottom
- margins: 6
- }
- width: 148
- model: ["64bit (detected)", "32bit"]
- }
+
MenuButton {
id: menuButton
@@ -156,7 +166,7 @@ ApplicationWindow {
margins: 6
}
}
-/*
+
Rectangle {
id: spacer
width: 1
@@ -181,13 +191,13 @@ ApplicationWindow {
width: height
onClicked: mainWindow.close()
}
-*/
- }
+
+ }*/
ListView {
id: contentList
anchors{
- top: toolBar.bottom
+ top: parent.top
bottom: parent.bottom
left: parent.left
right: parent.right
diff --git a/liveusb/liveusb.qmlproject.user b/liveusb/liveusb.qmlproject.user
index f52439c..1c1434b 100644
--- a/liveusb/liveusb.qmlproject.user
+++ b/liveusb/liveusb.qmlproject.user
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE QtCreatorProject>
-<!-- Written by QtCreator 3.3.0, 2015-02-08T17:07:55. -->
+<!-- Written by QtCreator 3.3.0, 2015-02-10T13:34:17. -->
<qtcreator>
<data>
<variable>EnvironmentId</variable>
--
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