[Pkg-privacy-commits] [tails-installer] 151/210: Use absolute font sizes
Intrigeri
intrigeri at moszumanska.debian.org
Wed May 24 15:26:40 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 ef009ea77d44c740d6b416f82b1094c773f679f1
Author: Martin Briza <mbriza at redhat.com>
Date: Wed Sep 2 16:41:49 2015 +0200
Use absolute font sizes
---
liveusb/components/AdwaitaButton.qml | 2 +-
liveusb/components/AdwaitaCheckBox.qml | 2 +-
liveusb/components/AdwaitaComboBox.qml | 4 ++--
liveusb/components/AdwaitaRadioButton.qml | 2 +-
liveusb/components/BackButton.qml | 2 +-
liveusb/components/DelegateImage.qml | 4 ++--
liveusb/components/DelegateImageSeparator.qml | 4 ++--
liveusb/components/DownloadDialog.qml | 18 +++++++++---------
liveusb/components/ImageDetails.qml | 10 +++++-----
liveusb/components/ImageList.qml | 4 ++--
10 files changed, 26 insertions(+), 26 deletions(-)
diff --git a/liveusb/components/AdwaitaButton.qml b/liveusb/components/AdwaitaButton.qml
index 038d907..18bf8a1 100644
--- a/liveusb/components/AdwaitaButton.qml
+++ b/liveusb/components/AdwaitaButton.qml
@@ -16,7 +16,7 @@ Button {
implicitWidth: labelText.width + $(16)
Text {
x: $(8)
- font.pointSize: $(9)
+ font.pixelSize: $(12)
id: labelText
color: control.enabled ? root.textColor : "gray"
text: control.text
diff --git a/liveusb/components/AdwaitaCheckBox.qml b/liveusb/components/AdwaitaCheckBox.qml
index ce28a0b..cbf7080 100644
--- a/liveusb/components/AdwaitaCheckBox.qml
+++ b/liveusb/components/AdwaitaCheckBox.qml
@@ -30,7 +30,7 @@ CheckBox {
}
}
label: Text {
- font.pointSize: $(9)
+ font.pixelSize: $(12)
text: control.text
}
spacing: $(8)
diff --git a/liveusb/components/AdwaitaComboBox.qml b/liveusb/components/AdwaitaComboBox.qml
index cf4e46a..083e12a 100644
--- a/liveusb/components/AdwaitaComboBox.qml
+++ b/liveusb/components/AdwaitaComboBox.qml
@@ -17,11 +17,11 @@ ComboBox {
rotation: 90
}
}
- font.pointSize: $(9)
+ font.pixelSize: $(12)
label: Text {
width: control.width
x: $(4)
- font.pointSize: $(9)
+ font.pixelSize: $(12)
verticalAlignment: Text.AlignVCenter
horizontalAlignment: Text.AlignLeft
text: control.currentText
diff --git a/liveusb/components/AdwaitaRadioButton.qml b/liveusb/components/AdwaitaRadioButton.qml
index 0a4170f..366acef 100644
--- a/liveusb/components/AdwaitaRadioButton.qml
+++ b/liveusb/components/AdwaitaRadioButton.qml
@@ -18,7 +18,7 @@ RadioButton {
}
}
label: Text {
- font.pointSize: $(9)
+ font.pixelSize: $(12)
text: control.text
}
spacing: $(8)
diff --git a/liveusb/components/BackButton.qml b/liveusb/components/BackButton.qml
index 9cd3495..28fe5c1 100644
--- a/liveusb/components/BackButton.qml
+++ b/liveusb/components/BackButton.qml
@@ -32,7 +32,7 @@ AdwaitaButton {
Text {
id: text
text: "Back"
- font.pointSize: $(9)
+ font.pixelSize: $(12)
anchors {
left: arrow.left
leftMargin: $(16)
diff --git a/liveusb/components/DelegateImage.qml b/liveusb/components/DelegateImage.qml
index 8e8ddd9..c18b579 100644
--- a/liveusb/components/DelegateImage.qml
+++ b/liveusb/components/DelegateImage.qml
@@ -37,7 +37,7 @@ Item {
rightMargin: $(14)
}
Text {
- font.pointSize: $(9)
+ font.pixelSize: $(12)
text: release.name
anchors {
bottom: parent.verticalCenter
@@ -47,7 +47,7 @@ Item {
// font.weight: Font.Bold
}
Text {
- font.pointSize: $(9)
+ font.pixelSize: $(12)
text: release.summary
anchors {
top: parent.verticalCenter
diff --git a/liveusb/components/DelegateImageSeparator.qml b/liveusb/components/DelegateImageSeparator.qml
index e61ceb8..d34fce7 100644
--- a/liveusb/components/DelegateImageSeparator.qml
+++ b/liveusb/components/DelegateImageSeparator.qml
@@ -19,14 +19,14 @@ Rectangle {
spacing: 12
Text {
Layout.alignment: Qt.AlignVCenter
- font.pointSize: $(9)
+ font.pixelSize: $(12)
text: release.name
}
Text {
Layout.fillWidth: true
Layout.alignment: Qt.AlignVCenter
text: release.summary
- font.pointSize: $(9)
+ font.pixelSize: $(12)
color: "#707070"
Behavior on opacity {
NumberAnimation {
diff --git a/liveusb/components/DownloadDialog.qml b/liveusb/components/DownloadDialog.qml
index 678f5e1..716b630 100644
--- a/liveusb/components/DownloadDialog.qml
+++ b/liveusb/components/DownloadDialog.qml
@@ -73,14 +73,14 @@ Dialog {
verticalAlignment: Text.AlignVCenter
color: "red"
text: "✕"
- font.pointSize: $(14)
+ font.pixelSize: $(16)
}
Text {
Layout.fillHeight: true
Layout.fillWidth: true
verticalAlignment: Text.AlignVCenter
wrapMode: Text.Wrap
- font.pointSize: $(9)
+ font.pixelSize: $(12)
text: liveUSBData.currentImage.error[index]
}
}
@@ -97,14 +97,14 @@ Dialog {
verticalAlignment: Text.AlignVCenter
color: "red"
text: "!"
- font.pointSize: $(14)
+ font.pixelSize: $(20)
}
Text {
Layout.fillHeight: true
Layout.fillWidth: true
verticalAlignment: Text.AlignVCenter
wrapMode: Text.Wrap
- font.pointSize: $(9)
+ font.pixelSize: $(12)
text: liveUSBData.currentImage.warning[index]
}
}
@@ -122,7 +122,7 @@ Dialog {
color: "blue"
text: "!"
rotation: 180
- font.pointSize: $(14)
+ font.pixelSize: $(18)
}
Text {
Layout.fillHeight: true
@@ -147,7 +147,7 @@ Dialog {
Layout.fillWidth: true
Layout.fillHeight: true
horizontalAlignment: Text.AlignHCenter
- font.pointSize: $(9)
+ font.pixelSize: $(12)
property double leftSize: liveUSBData.currentImage.download.maxProgress - liveUSBData.currentImage.download.progress
property string leftStr: leftSize <= 0 ? "" :
(leftSize < 1024) ? (leftSize + " B") :
@@ -245,7 +245,7 @@ Dialog {
verticalAlignment: Text.AlignVCenter
text: qsTranslate("", "There are no portable drives connected")
color: "gray"
- font.pointSize: $(9)
+ font.pixelSize: $(12)
}
}
}
@@ -276,7 +276,7 @@ Dialog {
verticalAlignment: Text.AlignVCenter
text: "+"
font.bold: true
- font.pointSize: $(12)
+ font.pixelSize: $(16)
}
}
@@ -285,7 +285,7 @@ Dialog {
verticalAlignment: Text.AlignVCenter
text: qsTranslate("", "Options")
enabled: optionGroup.enabled
- font.pointSize: $(9)
+ font.pixelSize: $(12)
MouseArea {
anchors.fill: parent
onClicked: optionGroup.checked = !optionGroup.checked
diff --git a/liveusb/components/ImageDetails.qml b/liveusb/components/ImageDetails.qml
index fa6db5e..bacb61f 100644
--- a/liveusb/components/ImageDetails.qml
+++ b/liveusb/components/ImageDetails.qml
@@ -97,12 +97,12 @@ Item {
Text {
Layout.fillWidth: true
anchors.left: parent.left
- font.pointSize: $(13)
+ font.pixelSize: $(17)
text: liveUSBData.currentImage.name
}
Text {
anchors.right: parent.right
- font.pointSize: $(11)
+ font.pixelSize: $(15)
property double size: liveUSBData.currentImage.size
text: size <= 0 ? "" :
(size < 1024) ? (size + " B") :
@@ -149,7 +149,7 @@ Item {
}
}
Text {
- font.pointSize: $(9)
+ font.pixelSize: $(12)
text: qsTranslate("", "Selected file: %1").arg(liveUSBData.currentImage.path ? (((String)(liveUSBData.currentImage.path)).split("/").slice(-1)[0]) : qsTranslate("", "None"))
}
}
@@ -157,7 +157,7 @@ Item {
Text {
// I'm sorry, everyone, I can't find a better way to determine if the date is valid
text: liveUSBData.currentImage.releaseDate.toLocaleDateString().length > 0 ? (qsTranslate("", "Released on %s").arg(liveUSBData.currentImage.releaseDate.toLocaleDateString())) : ""
- font.pointSize: $(8)
+ font.pixelSize: $(11)
color: "gray"
}
}
@@ -168,7 +168,7 @@ Item {
wrapMode: Text.WordWrap
text: liveUSBData.currentImage.description
textFormat: Text.RichText
- font.pointSize: $(9)
+ font.pixelSize: $(12)
}
Repeater {
id: screenshotRepeater
diff --git a/liveusb/components/ImageList.qml b/liveusb/components/ImageList.qml
index cc71b63..8781fa1 100644
--- a/liveusb/components/ImageList.qml
+++ b/liveusb/components/ImageList.qml
@@ -81,7 +81,7 @@ Item {
Text {
anchors.fill: parent
color: "light gray"
- font.pointSize: $(9)
+ font.pixelSize: $(12)
text: qsTranslate("", "Find an operating system image")
visible: !parent.activeFocus && parent.text.length == 0
verticalAlignment: Text.AlignVCenter
@@ -203,7 +203,7 @@ Item {
Text {
id: threeDotText
y: threeDotDots.hidden ? parent.height / 2 - height / 2 : -height
- font.pointSize: $(9)
+ font.pixelSize: $(12)
anchors.horizontalCenter: threeDotDots.horizontalCenter
Behavior on y { NumberAnimation { duration: 60 } }
clip: 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