diff --git a/ScreenPlay/Resources.qrc b/ScreenPlay/Resources.qrc
index 8046577f..ecf38fe4 100644
--- a/ScreenPlay/Resources.qrc
+++ b/ScreenPlay/Resources.qrc
@@ -79,8 +79,6 @@
qml/Community/Feedback.qml
qml/Controls/Slider.qml
qml/Create/Create.qml
- qml/Create/CreateImport.qml
- qml/Create/CreateImportStatus.qml
qml/Create/CreateNew.qml
qml/Create/CreateUpload.qml
qml/Create/CreateWallpaper.qml
diff --git a/ScreenPlay/qml/Community/XMLNewsfeed.qml b/ScreenPlay/qml/Community/XMLNewsfeed.qml
index 06627120..4e299914 100644
--- a/ScreenPlay/qml/Community/XMLNewsfeed.qml
+++ b/ScreenPlay/qml/Community/XMLNewsfeed.qml
@@ -61,7 +61,7 @@ GridView {
verticalAlignment: Text.AlignVCenter
horizontalAlignment: Text.AlignLeft
- font.pixelSize: 32
+ font.pointSize: 32
font.family: "Roboto"
anchors {
@@ -140,7 +140,7 @@ GridView {
color: "white"
font.family: "Roboto"
font.weight: Font.Normal
- font.pixelSize: 18
+ font.pointSize: 18
wrapMode: Text.WordWrap
}
Text {
@@ -160,7 +160,7 @@ GridView {
font.family: "Roboto"
font.weight: Font.Normal
- font.pixelSize: 14
+ font.pointSize: 14
wrapMode: Text.WordWrap
}
MouseArea {
diff --git a/ScreenPlay/qml/Controls/Slider.qml b/ScreenPlay/qml/Controls/Slider.qml
index 8ac8cb87..85704598 100644
--- a/ScreenPlay/qml/Controls/Slider.qml
+++ b/ScreenPlay/qml/Controls/Slider.qml
@@ -18,7 +18,7 @@ Item {
id: txtHeadline
text: headline
height: 20
- font.pixelSize: 14
+ font.pointSize: 14
font.family: "Roboto"
color: "#5D5D5D"
diff --git a/ScreenPlay/qml/Create/Create.qml b/ScreenPlay/qml/Create/Create.qml
index 7156d6e6..99904655 100644
--- a/ScreenPlay/qml/Create/Create.qml
+++ b/ScreenPlay/qml/Create/Create.qml
@@ -196,7 +196,7 @@ Item {
text: qsTr("Create wallpapers and widgets for local usage or the steam workshop!")
font.family: "Roboto"
- font.pixelSize: 14
+ font.pointSize: 10
color: "white"
anchors {
horizontalCenter: parent.horizontalCenter
diff --git a/ScreenPlay/qml/Create/CreateImport.qml b/ScreenPlay/qml/Create/CreateImport.qml
deleted file mode 100644
index edb06057..00000000
--- a/ScreenPlay/qml/Create/CreateImport.qml
+++ /dev/null
@@ -1,272 +0,0 @@
-import QtQuick 2.12
-
-import QtGraphicalEffects 1.0
-import QtQuick.Controls 2.3
-import Qt.labs.platform 1.0
-import QtQuick.Controls.Material 2.2
-
-Item {
- id: createImport
- anchors.fill: parent
- state: "out"
- Component.onCompleted: state = "in"
- property bool isVideoPlaying: true
- property url file
- onFileChanged: {
-
- }
-
- RectangularGlow {
- id: effect
- anchors {
- top: videoOutWrapper.top
- left: videoOutWrapper.left
- right: videoOutWrapper.right
- topMargin: 3
- }
-
- height: videoOutWrapper.height
- width: videoOutWrapper.width
- cached: true
- z: 9
- glowRadius: 3
- spread: 0.2
- color: "black"
- opacity: 0.4
- cornerRadius: 15
- }
-
- Rectangle {
- id: videoOutWrapper
- width: 450
- height: 263
- z: 12
- color: "black"
- anchors {
- top: parent.top
- topMargin: 180
- horizontalCenter: parent.horizontalCenter
- }
- }
-
-
- RectangularGlow {
- id: effect2
- anchors {
- top: contentWrapper.top
- left: contentWrapper.left
- right: contentWrapper.right
- topMargin: 3
- }
-
- height: contentWrapper.height
- width: contentWrapper.width
- cached: true
- z: 9
- glowRadius: 3
- spread: 0.2
- color: "black"
- opacity: 0.4
- cornerRadius: 15
- }
-
- Rectangle {
- id: contentWrapper
- width: 800
- height: 300
- z: 10
- radius: 4
- anchors {
- top: parent.top
- topMargin: 300
- horizontalCenter: parent.horizontalCenter
- }
-
- Item {
- id: chooseImageWrapper
- height: 60
- anchors {
- top: parent.top
- topMargin: 50
- right: parent.right
- left: parent.left
- }
-
- FileDialog {
- id: fileDialogOpenPreview
- nameFilters: ["Image files (*.jpg *.png)"]
- onAccepted: {
- imgPreview.source = currentFile
- imgPreview.opacity = 1
- //currentFile
- }
- }
-
- Button {
- id: btnChooseImage
- text: qsTr("Select Image Manually")
- Material.background: Material.Orange
- Material.foreground: "white"
- icon.source: "qrc:/assets/icons/icon_folder_open.svg"
- icon.color: "white"
- icon.width: 16
- icon.height: 16
- anchors.centerIn: parent
- onClicked: fileDialogOpenPreview.open()
- }
- }
-
- Column {
- spacing: 20
- anchors {
- top: chooseImageWrapper.top
- topMargin: 50
- right: parent.right
- rightMargin: 78
- bottom: parent.bottom
- bottomMargin: 50
- left: parent.left
- leftMargin: 78
- }
-
- TextField {
- id: txtTitle
- height: 60
- width: parent.width
- selectByMouse: true
- text: qsTr("Title")
- placeholderText: "Title"
- }
- }
-
- Button {
- text: qsTr("Import Video")
- Material.background: Material.Orange
- Material.foreground: "white"
- icon.source: "qrc:/assets/icons/icon_upload.svg"
- icon.color: "white"
- icon.width: 16
- icon.height: 16
- anchors {
- bottom: parent.bottom
- bottomMargin: 10
- horizontalCenter: parent.horizontalCenter
- }
- onClicked: {
-
- if (txtTitle.text === ""
- || txtTitle.placeholderText === "Text") {
- txtTitle.select(0, 0)
- txtTitle.focus = true
- return
- }
-
- //Check if there are any other characters than space
- if (!(/\S/.test(txtTitle.text))) {
- txtTitle.select(0, 0)
- txtTitle.focus = true
- return
- }
-
- if (fileDialogOpenPreview.currentFile != "") {
- screenPlayCreate.importVideo(
- txtTitle.text.replace(/\s/g, ''), file,
- fileDialogOpenPreview.currentFile,
- player.duration)
- } else {
- screenPlayCreate.importVideo(
- txtTitle.text.replace(/\s/g, ''), file,
- player.position,
- player.duration,
- player.metaData.videoFrameRate)
- }
- player.stop()
- createImport.state = "out"
- }
- }
- }
-
- states: [
- State {
- name: "out"
- PropertyChanges {
- target: createImport
- opacity: 0
- }
- PropertyChanges {
- target: videoOutWrapper
- z: 0
- opacity: 0
- anchors.topMargin: 50
- }
- PropertyChanges {
- target: effect
- opacity: 0
- color: "transparent"
- }
- PropertyChanges {
- target: contentWrapper
- anchors.topMargin: -500
- opacity: 0
- }
- },
- State {
- name: "in"
- PropertyChanges {
- target: createImport
- opacity: 1
- }
-
- PropertyChanges {
- target: contentWrapper
- opacity: 1
- anchors.topMargin: 300
- }
- PropertyChanges {
- target: videoOutWrapper
- z: 12
- opacity: 1
- anchors.topMargin: 70
- }
- }
- ]
-
- transitions: [
- Transition {
- from: "out"
- to: "in"
- reversible: true
-
- SequentialAnimation {
- PauseAnimation {
- duration: 500
- }
- ParallelAnimation {
- PropertyAnimation {
- duration: 300
- target: contentWrapper
- property: "opacity"
- }
- PropertyAnimation {
- duration: 300
- target: contentWrapper
- property: "anchors.topMargin"
- easing.type: Easing.OutQuart
- }
- }
- ParallelAnimation {
- PropertyAnimation {
- duration: 250
- target: videoOutWrapper
- property: "opacity"
- }
- PropertyAnimation {
- duration: 250
- target: effect
- properties: "color, opacity"
- }
- }
- }
- }
- ]
-}
diff --git a/ScreenPlay/qml/Create/CreateImportStatus.qml b/ScreenPlay/qml/Create/CreateImportStatus.qml
deleted file mode 100644
index b14b39cd..00000000
--- a/ScreenPlay/qml/Create/CreateImportStatus.qml
+++ /dev/null
@@ -1,186 +0,0 @@
-import QtQuick 2.12
-import QtGraphicalEffects 1.0
-import QtQuick.Controls 2.3
-
-// Qt Creator does not support Namespaced enums yet
-// https://bugreports.qt.io/browse/QTCREATORBUG-17850
-import LocalWorkshopCreationStatus 1.0
-
-Item {
- id: createImportStatus
- anchors.fill: parent
- state: "out"
-
- signal backToCreate
- signal uploadToSteamWorkshop()
-
- Timer {
- repeat: false
- running: true
- interval: 300
- onTriggered: {
- createImportStatus.state = "in"
- }
- }
-
- Connections {
- target: screenPlayCreate
- onLocalWorkshopCreationStatusChanged: {
- switch (status) {
- case LocalWorkshopCreationStatus.Started:
- txtStatus.text = "Copy video started"
- break
- case LocalWorkshopCreationStatus.CopyVideoFinished:
- txtStatus.text = "Copy Video Finished"
- break
- case LocalWorkshopCreationStatus.CopyImageFinished:
- txtStatus.text = "Copy Image Finished"
- break
- case LocalWorkshopCreationStatus.CopyConfigFinished:
- txtStatus.text = "Copy Config Finished"
- break
- case LocalWorkshopCreationStatus.ErrorCopyConfig:
- txtStatus.text = "Error Copy Config!"
- break
- case LocalWorkshopCreationStatus.Finished:
- txtStatus.text = "Success!"
- busyIndicator.running = false
- break
- default:
- break
- }
- }
- }
-
- RectangularGlow {
- id: effect
- anchors {
- top: wrapper.top
- left: wrapper.left
- right: wrapper.right
- topMargin: 3
- }
-
- height: wrapper.height
- width: wrapper.width
- cached: true
- glowRadius: 3
- spread: 0.2
- color: "black"
- opacity: 0.4
- cornerRadius: 15
- }
- Rectangle {
- id: wrapper
- width: 800
- height: 400
- radius: 4
- anchors {
- top: parent.top
- topMargin: 100
- horizontalCenter: parent.horizontalCenter
- }
-
- Text {
- id: txtStatus
- height: 80
- font.family: "Roboto"
-
- font.pixelSize: 24
- color: "gray"
- verticalAlignment: Text.AlignVCenter
- horizontalAlignment: Text.AlignHCenter
- anchors {
- top: busyIndicator.bottom
- topMargin: 10
- horizontalCenter: parent.horizontalCenter
- }
- }
-
- BusyIndicator {
- id: busyIndicator
- running: true
- anchors {
- top: parent.top
- topMargin: 100
- horizontalCenter: parent.horizontalCenter
- }
- }
-
- Row {
- id: item1
- width: 450
- height: 49
- spacing: 10
- anchors.horizontalCenter: parent.horizontalCenter
- anchors.bottom: parent.bottom
- anchors.bottomMargin: 20
-
- Button {
- id: button
- text: qsTr("Create another Wallpaper")
- onClicked: {
- backToCreate()
- createImportStatus.state = "out"
- }
- }
- Button {
- id: button2
- text: qsTr("Upload Wallpaper to Steam")
- onClicked: {
- uploadToSteamWorkshop()
- createImportStatus.state = "in"
- }
- }
- }
- }
- states: [
- State {
- name: "out"
- PropertyChanges {
- target: wrapper
- anchors.topMargin: 500
- opacity: 0
- }
- PropertyChanges {
- target: effect
- color: "transparent"
- opacity: 0
- }
- },
- State {
- name: "in"
- PropertyChanges {
- target: wrapper
- anchors.topMargin: 100
- opacity: 1
- }
- PropertyChanges {
- target: effect
- color: "black"
- opacity: 0.4
- }
- }
- ]
- transitions: [
- Transition {
- from: "out"
- to: "in"
- reversible: true
- SequentialAnimation {
- NumberAnimation {
- target: wrapper
- properties: "opacity, anchors.topMargin"
- duration: 200
- easing.type: Easing.OutQuart
- }
- NumberAnimation {
- target: effect
- properties: "opacity, color"
- duration: 200
- easing.type: Easing.OutQuart
- }
- }
- }
- ]
-}
diff --git a/ScreenPlay/qml/Create/CreateUpload.qml b/ScreenPlay/qml/Create/CreateUpload.qml
index da93a611..2d6c31f0 100644
--- a/ScreenPlay/qml/Create/CreateUpload.qml
+++ b/ScreenPlay/qml/Create/CreateUpload.qml
@@ -305,7 +305,7 @@ Item {
Text {
id: txtUploadSize
color: "gray"
- font.pixelSize: 16
+ font.pointSize: 14
height: 30
anchors {
horizontalCenter: parent.horizontalCenter
@@ -319,7 +319,7 @@ Item {
id: txtUploadStatus
text: qsTr("Creating Workshop Item")
color: "gray"
- font.pixelSize: 16
+ font.pointSize: 12
height: 30
anchors {
horizontalCenter: parent.horizontalCenter
diff --git a/ScreenPlay/qml/Create/CreateWallpaper.qml b/ScreenPlay/qml/Create/CreateWallpaper.qml
index 252c4d7e..987837d3 100644
--- a/ScreenPlay/qml/Create/CreateWallpaper.qml
+++ b/ScreenPlay/qml/Create/CreateWallpaper.qml
@@ -28,7 +28,7 @@ Item {
}
color: "white"
- font.pixelSize: 28
+ font.pointSize: 21
font.family: "Roboto"
font.weight: Font.Thin
diff --git a/ScreenPlay/qml/Create/CreateWidget.qml b/ScreenPlay/qml/Create/CreateWidget.qml
index 56c75a51..921fbfb6 100644
--- a/ScreenPlay/qml/Create/CreateWidget.qml
+++ b/ScreenPlay/qml/Create/CreateWidget.qml
@@ -19,7 +19,7 @@ Item {
}
color: "white"
- font.pixelSize: 28
+ font.pointSize: 21
font.family: "Roboto"
font.weight: Font.Thin
@@ -53,12 +53,14 @@ Item {
text: qsTr("Examples Widgets and Scenes")
font.family: "Roboto"
- font.pixelSize: 18
+ font.pointSize: 16
color: "white"
anchors {
top: btnCreateEmptyWidget.bottom
topMargin: 30
+ left:parent.left
+ leftMargin: 30
}
}
diff --git a/ScreenPlay/qml/Create/CreateWidgetButton.qml b/ScreenPlay/qml/Create/CreateWidgetButton.qml
index f59bfb20..813af925 100644
--- a/ScreenPlay/qml/Create/CreateWidgetButton.qml
+++ b/ScreenPlay/qml/Create/CreateWidgetButton.qml
@@ -68,8 +68,8 @@ Item {
id: name
text: btnEmpty.text
font.family: "Roboto"
-
- font.pixelSize: 18
+
+ font.pointSize: 14
color: "gray"
anchors {
left: imgIcon.right
@@ -81,8 +81,8 @@ Item {
text: ">"
font.family: "Roboto"
-
- font.pixelSize: 24
+
+ font.pointSize: 18
color: "#b9b9b9"
anchors {
right: parent.right
diff --git a/ScreenPlay/qml/Create/Wizards/CreateWallpaper/CreateWallpaperResult.qml b/ScreenPlay/qml/Create/Wizards/CreateWallpaper/CreateWallpaperResult.qml
index d50ceb77..77792b09 100644
--- a/ScreenPlay/qml/Create/Wizards/CreateWallpaper/CreateWallpaperResult.qml
+++ b/ScreenPlay/qml/Create/Wizards/CreateWallpaper/CreateWallpaperResult.qml
@@ -9,7 +9,7 @@ import net.aimber.create 1.0
Item {
id: wrapperError
opacity: 0
-
+
Text {
id: txtErrorHeadline
text: qsTr("An error occurred!")
@@ -22,10 +22,9 @@ Item {
font.family: "Segoe UI, Roboto"
font.weight: Font.Light
color: Material.color(Material.Red)
-
- font.pixelSize: 32
+ font.pointSize: 32
}
-
+
Rectangle {
id: rectangle1
color: "#eeeeee"
@@ -38,7 +37,7 @@ Item {
margins: 30
bottomMargin: 10
}
-
+
Flickable {
anchors.fill: parent
clip: true
@@ -57,7 +56,7 @@ Item {
}
wrapMode: Text.WordWrap
color: "#626262"
-
+
height: txtFFMPEGDebug.paintedHeight
}
Connections {
@@ -68,7 +67,7 @@ Item {
}
}
}
-
+
Button {
id: btnBack
text: qsTr("Back to create and send an error report!")
diff --git a/ScreenPlay/qml/Create/Wizards/CreateWallpaper/CreateWallpaperVideoImportConvert.qml b/ScreenPlay/qml/Create/Wizards/CreateWallpaper/CreateWallpaperVideoImportConvert.qml
index 544bce85..0deae9ef 100644
--- a/ScreenPlay/qml/Create/Wizards/CreateWallpaper/CreateWallpaperVideoImportConvert.qml
+++ b/ScreenPlay/qml/Create/Wizards/CreateWallpaper/CreateWallpaperVideoImportConvert.qml
@@ -20,7 +20,7 @@ Item {
font.weight: Font.Light
color: "#757575"
- font.pixelSize: 23
+ font.pointSize: 23
anchors {
top: parent.top
left: parent.left
@@ -68,7 +68,7 @@ Item {
id: txtConvertNumber
color: "white"
text: qsTr("")
- font.pixelSize: 21
+ font.pointSize: 21
anchors {
horizontalCenter: parent.horizontalCenter
bottom: parent.bottom
@@ -80,7 +80,7 @@ Item {
id: txtConvert
color: "white"
text: qsTr("Generating preview video...")
- font.pixelSize: 14
+ font.pointSize: 14
anchors {
horizontalCenter: parent.horizontalCenter
bottom: parent.bottom
diff --git a/ScreenPlay/qml/Create/Wizards/CreateWallpaper/CreateWallpaperWizard.qml b/ScreenPlay/qml/Create/Wizards/CreateWallpaper/CreateWallpaperWizard.qml
index 562dd0dc..45c443e5 100644
--- a/ScreenPlay/qml/Create/Wizards/CreateWallpaper/CreateWallpaperWizard.qml
+++ b/ScreenPlay/qml/Create/Wizards/CreateWallpaper/CreateWallpaperWizard.qml
@@ -71,17 +71,15 @@ Item {
Rectangle {
id: wrapper
-
+ width: 910
+ radius: 4
+ height: 460
anchors {
horizontalCenter: parent.horizontalCenter
top: parent.top
topMargin: 0
}
- width: 910
- radius: 4
- height: 460
-
Loader {
id: loader_wrapperContent
anchors.fill: parent
diff --git a/ScreenPlay/qml/FileDropper.qml b/ScreenPlay/qml/FileDropper.qml
index c3d2240e..1dba9d2e 100644
--- a/ScreenPlay/qml/FileDropper.qml
+++ b/ScreenPlay/qml/FileDropper.qml
@@ -62,7 +62,7 @@ DropArea {
Text {
id: text1
text: qsTr("Bad File!!")
- font.pixelSize: 24
+ font.pointSize: 24
opacity: 1
anchors.horizontalCenter: parent.horizontalCenter
anchors.verticalCenter: parent.verticalCenter
diff --git a/ScreenPlay/qml/Installed/Installed.qml b/ScreenPlay/qml/Installed/Installed.qml
index 55e00244..128d4178 100644
--- a/ScreenPlay/qml/Installed/Installed.qml
+++ b/ScreenPlay/qml/Installed/Installed.qml
@@ -102,7 +102,7 @@ Item {
text: qsTr("Pull to refresh!")
anchors.centerIn: parent
color: "gray"
- font.pixelSize: 18
+ font.pointSize: 18
}
}
footer: Item {
diff --git a/ScreenPlay/qml/Installed/InstalledUserHelper.qml b/ScreenPlay/qml/Installed/InstalledUserHelper.qml
index d4d2c8d0..9725664f 100644
--- a/ScreenPlay/qml/Installed/InstalledUserHelper.qml
+++ b/ScreenPlay/qml/Installed/InstalledUserHelper.qml
@@ -70,7 +70,7 @@ Item {
id: txtHeadline2
text: qsTr("DISTINCT")
font.family: "Roboto Mono Thin"
- font.pixelSize: 75
+ font.pointSize: 75
color: "white"
font.weight: Font.Normal
diff --git a/ScreenPlay/qml/Installed/Sidebar.qml b/ScreenPlay/qml/Installed/Sidebar.qml
index 376736bc..6bd9f82a 100644
--- a/ScreenPlay/qml/Installed/Sidebar.qml
+++ b/ScreenPlay/qml/Installed/Sidebar.qml
@@ -165,7 +165,7 @@ Item {
font.family: "Roboto"
font.weight: Font.Thin
verticalAlignment: Text.AlignVCenter
- font.pixelSize: 21
+ font.pointSize: 16
color: "#2F2F2F"
wrapMode: Text.WrapAnywhere
anchors {
@@ -185,7 +185,7 @@ Item {
horizontalAlignment: Qt.AlignHCenter
font.family: "Roboto"
- font.pixelSize: 18
+ font.pointSize: 14
color: "#2F2F2F"
wrapMode: Text.WrapAnywhere
anchors {
@@ -239,7 +239,7 @@ Item {
font.family: "Roboto"
verticalAlignment: Text.AlignVCenter
- font.pixelSize: 14
+ font.pointSize: 10
color: "#626262"
wrapMode: Text.WrapAnywhere
anchors {
@@ -294,7 +294,7 @@ Item {
font.family: "Roboto"
verticalAlignment: Text.AlignVCenter
- font.pixelSize: 14
+ font.pointSize: 10
color: "#626262"
wrapMode: Text.WrapAnywhere
anchors {
diff --git a/ScreenPlay/qml/MonitorSelectionItem.qml b/ScreenPlay/qml/MonitorSelectionItem.qml
index fcf4a811..ec731ad7 100644
--- a/ScreenPlay/qml/MonitorSelectionItem.qml
+++ b/ScreenPlay/qml/MonitorSelectionItem.qml
@@ -14,7 +14,7 @@ Item {
imgPreview.opacity = 1
}
- property int fontSize: 14
+ property int fontSize: 10
property int index
property bool isSelected: false
property bool isWallpaperActive: false
@@ -42,7 +42,7 @@ Item {
horizontalAlignment: Text.AlignHCenter
verticalAlignment: Text.AlignVCenter
//color: "white"
- font.pixelSize: monitorSelectionItem.fontSize
+ font.pointSize: monitorSelectionItem.fontSize
font.family: "Roboto"
wrapMode: Text.WrapAnywhere
}
diff --git a/ScreenPlay/qml/Monitors.qml b/ScreenPlay/qml/Monitors.qml
index 3b7e98e0..9b082c13 100644
--- a/ScreenPlay/qml/Monitors.qml
+++ b/ScreenPlay/qml/Monitors.qml
@@ -59,7 +59,7 @@ Item {
Text {
id: txtHeadline
text: qsTr("Wallpaper Configuration")
- font.pixelSize: 21
+ font.pointSize: 21
color: "#626262"
font.family: "Roboto"
font.weight: Font.Thin
diff --git a/ScreenPlay/qml/MonitorsProjectSettingItem.qml b/ScreenPlay/qml/MonitorsProjectSettingItem.qml
index 67ad0356..7cdaf1c5 100644
--- a/ScreenPlay/qml/MonitorsProjectSettingItem.qml
+++ b/ScreenPlay/qml/MonitorsProjectSettingItem.qml
@@ -21,7 +21,7 @@ Item {
id: txtDescription
text: name
width: 100
- font.pixelSize: isHeadline ? 21 : 14
+ font.pointSize: isHeadline ? 21 : 14
anchors.verticalCenter: parent.verticalCenter
font.family: "Roboto"
font.weight: Font.Normal
diff --git a/ScreenPlay/qml/Settings/SettingBool.qml b/ScreenPlay/qml/Settings/SettingBool.qml
index 9d68c9b9..d4ff1cb2 100644
--- a/ScreenPlay/qml/Settings/SettingBool.qml
+++ b/ScreenPlay/qml/Settings/SettingBool.qml
@@ -1,6 +1,7 @@
import QtQuick 2.12
import QtQuick.Controls 2.3
import QtQuick.Controls.Material 2.2
+
Item {
id: settingsBool
property string headline: "Headline"
@@ -36,7 +37,7 @@ Item {
}
- font.pixelSize: 16
+ font.pointSize: 12
font.family: "Roboto"
}
@@ -48,7 +49,7 @@ Item {
verticalAlignment: Text.AlignVCenter
horizontalAlignment: Text.AlignLeft
- font.pixelSize: 12
+ font.pointSize: 10
font.family: "Roboto"
anchors{
top:txtHeadline.bottom
diff --git a/ScreenPlay/qml/Settings/Settings.qml b/ScreenPlay/qml/Settings/Settings.qml
index 83ab3ed7..5365b83a 100644
--- a/ScreenPlay/qml/Settings/Settings.qml
+++ b/ScreenPlay/qml/Settings/Settings.qml
@@ -147,7 +147,7 @@ Item {
verticalAlignment: Text.AlignVCenter
wrapMode: Text.WordWrap
horizontalAlignment: Text.AlignLeft
- font.pixelSize: 14
+ font.pointSize: 10
font.family: "Roboto"
anchors{
right:parent.right
@@ -345,7 +345,7 @@ Item {
verticalAlignment: Text.AlignVCenter
horizontalAlignment: Text.AlignLeft
- font.pixelSize: 16
+ font.pointSize: 16
anchors {
top: parent.top
topMargin: 6
@@ -361,7 +361,7 @@ Item {
wrapMode: Text.WordWrap
verticalAlignment: Text.AlignTop
horizontalAlignment: Text.AlignLeft
- font.pixelSize: 14
+ font.pointSize: 10
font.family: "Roboto"
width: parent.width * .6
anchors {
diff --git a/ScreenPlay/qml/Settings/SettingsButton.qml b/ScreenPlay/qml/Settings/SettingsButton.qml
index 63466d12..a817db13 100644
--- a/ScreenPlay/qml/Settings/SettingsButton.qml
+++ b/ScreenPlay/qml/Settings/SettingsButton.qml
@@ -42,7 +42,7 @@ Item {
}
- font.pixelSize: 16
+ font.pointSize: 12
}
Text {
@@ -53,7 +53,7 @@ Item {
verticalAlignment: Text.AlignVCenter
wrapMode: Text.WordWrap
horizontalAlignment: Text.AlignLeft
- font.pixelSize: 12
+ font.pointSize: 10
font.family: "Roboto"
anchors{
top:txtHeadline.bottom
diff --git a/ScreenPlay/qml/Settings/SettingsComboBox.qml b/ScreenPlay/qml/Settings/SettingsComboBox.qml
index 9191db5c..16d32db0 100644
--- a/ScreenPlay/qml/Settings/SettingsComboBox.qml
+++ b/ScreenPlay/qml/Settings/SettingsComboBox.qml
@@ -36,7 +36,7 @@ Item {
}
- font.pixelSize: 16
+ font.pointSize: 12
font.family: "Roboto"
}
@@ -48,7 +48,7 @@ Item {
verticalAlignment: Text.AlignVCenter
horizontalAlignment: Text.AlignLeft
wrapMode: Text.WordWrap
- font.pixelSize: 12
+ font.pointSize: 10
font.family: "Roboto"
anchors{
top:txtHeadline.bottom
diff --git a/ScreenPlay/qml/Settings/SettingsHeader.qml b/ScreenPlay/qml/Settings/SettingsHeader.qml
index 3d0c182c..99cd1dcc 100644
--- a/ScreenPlay/qml/Settings/SettingsHeader.qml
+++ b/ScreenPlay/qml/Settings/SettingsHeader.qml
@@ -62,7 +62,7 @@ Item {
Text {
id: txtHeadline
text: settingsHeader.text
- font.pixelSize: 18
+ font.pointSize: 12
color: "white"
verticalAlignment: Text.AlignTop
diff --git a/ScreenPlay/qml/Widgets/Window.qml b/ScreenPlay/qml/Widgets/Window.qml
index eb7125a0..41973dc0 100644
--- a/ScreenPlay/qml/Widgets/Window.qml
+++ b/ScreenPlay/qml/Widgets/Window.qml
@@ -25,7 +25,7 @@ Window {
id: text1
color: "#ffffff"
text: "empty"
- font.pixelSize: 29
+ font.pointSize: 29
}