diff --git a/ScreenPlay/main.cpp b/ScreenPlay/main.cpp index 411820ef..7d40d37d 100644 --- a/ScreenPlay/main.cpp +++ b/ScreenPlay/main.cpp @@ -141,8 +141,14 @@ int main(int argc, char* argv[]) profileListModel.loadProfiles(); settings.loadActiveProfiles(); + QQmlApplicationEngine mainWindowEngine; + // Instead of setting "renderType: Text.NativeRendering" every time + // we can set it here once :) + auto* window = static_cast(mainWindowEngine.rootObjects().first()); + window->setTextRenderType(QQuickWindow::TextRenderType::NativeTextRendering); + mainWindowEngine.rootContext()->setContextProperty("screenPlay", &screenPlay); mainWindowEngine.rootContext()->setContextProperty("screenPlayCreate", &create); mainWindowEngine.rootContext()->setContextProperty("utility", &qmlUtil); diff --git a/ScreenPlay/qml/Community/Community.qml b/ScreenPlay/qml/Community/Community.qml index 8980d0cc..805dffd6 100644 --- a/ScreenPlay/qml/Community/Community.qml +++ b/ScreenPlay/qml/Community/Community.qml @@ -64,7 +64,7 @@ Item { font.weight: Font.Normal wrapMode: Text.WordWrap horizontalAlignment: Qt.AlignHCenter - renderType: Text.NativeRendering + anchors { top: imgStomt.bottom topMargin: -50 diff --git a/ScreenPlay/qml/Community/XMLNewsfeed.qml b/ScreenPlay/qml/Community/XMLNewsfeed.qml index fe7416d2..281a24f6 100644 --- a/ScreenPlay/qml/Community/XMLNewsfeed.qml +++ b/ScreenPlay/qml/Community/XMLNewsfeed.qml @@ -58,7 +58,7 @@ GridView { text: qsTr("News & Patchnotes") wrapMode: Text.WordWrap color: "#626262" - renderType: Text.NativeRendering + verticalAlignment: Text.AlignVCenter horizontalAlignment: Text.AlignLeft font.pixelSize: 32 @@ -130,7 +130,7 @@ GridView { Text { id: txtTitle text: title - renderType: Text.NativeRendering + anchors { right: parent.right bottom: parent.bottom @@ -158,7 +158,7 @@ GridView { } color: "white" font.family: "Roboto" - renderType: Text.NativeRendering + font.weight: Font.Normal font.pixelSize: 14 wrapMode: Text.WordWrap diff --git a/ScreenPlay/qml/Controls/Slider.qml b/ScreenPlay/qml/Controls/Slider.qml index 4401a00e..5e572bf9 100644 --- a/ScreenPlay/qml/Controls/Slider.qml +++ b/ScreenPlay/qml/Controls/Slider.qml @@ -21,7 +21,7 @@ Item { font.pixelSize: 14 font.family: "Roboto" color: "#5D5D5D" - renderType: Text.NativeRendering + anchors { top: parent.top right: parent.right @@ -61,7 +61,7 @@ Item { color: "#818181" text: Math.round(slider.value * 100) / 100 anchors.verticalCenter: parent.verticalCenter - font.family: "Libre Baskerville" + //font.family: "Libre Baskerville" font.pointSize: 12 font.italic: true verticalAlignment: Text.AlignVCenter diff --git a/ScreenPlay/qml/Create/Create.qml b/ScreenPlay/qml/Create/Create.qml index c02d1718..3c0f2fa7 100644 --- a/ScreenPlay/qml/Create/Create.qml +++ b/ScreenPlay/qml/Create/Create.qml @@ -210,7 +210,7 @@ Item { id: txtDescriptionBottom text: qsTr("Create wallpapers and widgets for local usage or the steam workshop!") font.family: "Roboto" - renderType: Text.NativeRendering + font.pixelSize: 14 color: "white" anchors { diff --git a/ScreenPlay/qml/Create/CreateImportStatus.qml b/ScreenPlay/qml/Create/CreateImportStatus.qml index 57de1a7a..6e61d32c 100644 --- a/ScreenPlay/qml/Create/CreateImportStatus.qml +++ b/ScreenPlay/qml/Create/CreateImportStatus.qml @@ -85,7 +85,7 @@ Item { id: txtStatus height: 80 font.family: "Roboto" - renderType: Text.NativeRendering + font.pixelSize: 24 color: "gray" verticalAlignment: Text.AlignVCenter diff --git a/ScreenPlay/qml/Create/CreateUpload.qml b/ScreenPlay/qml/Create/CreateUpload.qml index e3c28e1c..91eeb4c8 100644 --- a/ScreenPlay/qml/Create/CreateUpload.qml +++ b/ScreenPlay/qml/Create/CreateUpload.qml @@ -316,7 +316,7 @@ Item { topMargin: 20 } font.family: "Roboto" - renderType: Text.NativeRendering + } Text { id: txtUploadStatus @@ -330,7 +330,7 @@ Item { topMargin: 20 } font.family: "Roboto" - renderType: Text.NativeRendering + } ProgressBar { diff --git a/ScreenPlay/qml/Create/CreateWallpaper.qml b/ScreenPlay/qml/Create/CreateWallpaper.qml index a3c7af13..a558839c 100644 --- a/ScreenPlay/qml/Create/CreateWallpaper.qml +++ b/ScreenPlay/qml/Create/CreateWallpaper.qml @@ -30,7 +30,7 @@ Item { color: "white" font.pixelSize: 28 - renderType: Text.NativeRendering + font.family: "Roboto" font.weight: Font.Thin } diff --git a/ScreenPlay/qml/Create/CreateWidget.qml b/ScreenPlay/qml/Create/CreateWidget.qml index 262b822b..975f3aef 100644 --- a/ScreenPlay/qml/Create/CreateWidget.qml +++ b/ScreenPlay/qml/Create/CreateWidget.qml @@ -20,7 +20,7 @@ Item { color: "white" font.pixelSize: 28 - renderType: Text.NativeRendering + font.family: "Roboto" font.weight: Font.Thin } @@ -52,7 +52,7 @@ Item { id: txtExamples text: qsTr("Examples Widgets and Scenes") font.family: "Roboto" - renderType: Text.NativeRendering + font.pixelSize: 18 color: "white" diff --git a/ScreenPlay/qml/Create/CreateWidgetButton.qml b/ScreenPlay/qml/Create/CreateWidgetButton.qml index 30c065c6..4f5e1eba 100644 --- a/ScreenPlay/qml/Create/CreateWidgetButton.qml +++ b/ScreenPlay/qml/Create/CreateWidgetButton.qml @@ -68,7 +68,7 @@ Item { id: name text: btnEmpty.text font.family: "Roboto" - renderType: Text.NativeRendering + font.pixelSize: 18 color: "gray" anchors { @@ -81,7 +81,7 @@ Item { text: ">" font.family: "Roboto" - renderType: Text.NativeRendering + font.pixelSize: 24 color: "#b9b9b9" anchors { diff --git a/ScreenPlay/qml/Create/Wizards/CreateWallpaper/CreateWallpaperError.qml b/ScreenPlay/qml/Create/Wizards/CreateWallpaper/CreateWallpaperError.qml index 7746ade0..2fa0e26f 100644 --- a/ScreenPlay/qml/Create/Wizards/CreateWallpaper/CreateWallpaperError.qml +++ b/ScreenPlay/qml/Create/Wizards/CreateWallpaper/CreateWallpaperError.qml @@ -22,7 +22,7 @@ Item { font.family: "Segoe UI, Roboto" font.weight: Font.Light color: Material.color(Material.Red) - renderType: Text.NativeRendering + font.pixelSize: 32 } @@ -57,7 +57,7 @@ Item { } wrapMode: Text.WordWrap color: "#626262" - renderType: Text.NativeRendering + height: txtFFMPEGDebug.paintedHeight } Connections { diff --git a/ScreenPlay/qml/Create/Wizards/CreateWallpaper/CreateWallpaperSuccess.qml b/ScreenPlay/qml/Create/Wizards/CreateWallpaper/CreateWallpaperSuccess.qml index 4bdff507..a1554743 100644 --- a/ScreenPlay/qml/Create/Wizards/CreateWallpaper/CreateWallpaperSuccess.qml +++ b/ScreenPlay/qml/Create/Wizards/CreateWallpaper/CreateWallpaperSuccess.qml @@ -22,7 +22,7 @@ Item { font.family: "Segoe UI, Roboto" font.weight: Font.Light color: Material.color(Material.Green) - renderType: Text.NativeRendering + font.pixelSize: 32 } diff --git a/ScreenPlay/qml/Create/Wizards/CreateWallpaper/CreateWallpaperVideoImport.qml b/ScreenPlay/qml/Create/Wizards/CreateWallpaper/CreateWallpaperVideoImport.qml index fa5a2c2f..7e40ef6b 100644 --- a/ScreenPlay/qml/Create/Wizards/CreateWallpaper/CreateWallpaperVideoImport.qml +++ b/ScreenPlay/qml/Create/Wizards/CreateWallpaper/CreateWallpaperVideoImport.qml @@ -15,7 +15,7 @@ Item { font.family: "Roboto" font.weight: Font.Light color: "#757575" - renderType: Text.NativeRendering + font.pixelSize: 23 anchors { top: parent.top diff --git a/ScreenPlay/qml/Create/Wizards/CreateWallpaper/CreateWallpaperVideoImportConvert.qml b/ScreenPlay/qml/Create/Wizards/CreateWallpaper/CreateWallpaperVideoImportConvert.qml index e257243b..17cb0df1 100644 --- a/ScreenPlay/qml/Create/Wizards/CreateWallpaper/CreateWallpaperVideoImportConvert.qml +++ b/ScreenPlay/qml/Create/Wizards/CreateWallpaper/CreateWallpaperVideoImportConvert.qml @@ -15,7 +15,7 @@ Item { font.family: "Roboto" font.weight: Font.Light color: "#757575" - renderType: Text.NativeRendering + font.pixelSize: 23 anchors { top: parent.top diff --git a/ScreenPlay/qml/FileDropperSingleFile.qml b/ScreenPlay/qml/FileDropperSingleFile.qml index ba3e4c9c..a7aa825e 100644 --- a/ScreenPlay/qml/FileDropperSingleFile.qml +++ b/ScreenPlay/qml/FileDropperSingleFile.qml @@ -82,7 +82,7 @@ Rectangle { horizontalAlignment: Text.AlignHCenter font.family: "Libre Baskerville" font.italic: true - renderType: Text.NativeRendering + } } Text { @@ -97,7 +97,7 @@ Rectangle { wrapMode: Text.WordWrap font.pointSize: 12 opacity: 0 - renderType: Text.NativeRendering + text: helpText } diff --git a/ScreenPlay/qml/Installed/InstalledNavigation.qml b/ScreenPlay/qml/Installed/InstalledNavigation.qml index d070a79c..4f4e20b4 100644 --- a/ScreenPlay/qml/Installed/InstalledNavigation.qml +++ b/ScreenPlay/qml/Installed/InstalledNavigation.qml @@ -59,7 +59,7 @@ Item { anchors.verticalCenter: parent.verticalCenter font.family: "Roboto" font.weight: Font.Normal - renderType: Text.NativeRendering + } Image { diff --git a/ScreenPlay/qml/Installed/InstalledUserHelper.qml b/ScreenPlay/qml/Installed/InstalledUserHelper.qml index c36adedb..7efa5a9f 100644 --- a/ScreenPlay/qml/Installed/InstalledUserHelper.qml +++ b/ScreenPlay/qml/Installed/InstalledUserHelper.qml @@ -63,7 +63,7 @@ Item { font.family: "Roboto" color: "white" font.weight: Font.Normal - renderType: Text.NativeRendering + } Text { @@ -73,7 +73,7 @@ Item { font.pixelSize: 75 color: "white" font.weight: Font.Normal - renderType: Text.NativeRendering + anchors { horizontalCenter: parent.horizontalCenter top: parent.top diff --git a/ScreenPlay/qml/Installed/ScreenPlayItem.qml b/ScreenPlay/qml/Installed/ScreenPlayItem.qml index ea2d6437..99f8713c 100644 --- a/ScreenPlay/qml/Installed/ScreenPlayItem.qml +++ b/ScreenPlay/qml/Installed/ScreenPlayItem.qml @@ -191,7 +191,6 @@ Item { color: "#2F2F2F" font.pointSize: 9 - renderType: Text.NativeRendering font.family: "Segoe UI, Roboto" } } diff --git a/ScreenPlay/qml/Installed/Sidebar.qml b/ScreenPlay/qml/Installed/Sidebar.qml index 93fee551..cbdec16a 100644 --- a/ScreenPlay/qml/Installed/Sidebar.qml +++ b/ScreenPlay/qml/Installed/Sidebar.qml @@ -161,7 +161,7 @@ Item { id: txtHeadline text: qsTr("Headline") height: 60 - renderType: Text.NativeRendering + font.family: "Roboto" font.weight: Font.Thin verticalAlignment: Text.AlignVCenter @@ -182,7 +182,7 @@ Item { id: txtHeadlineMonitor text: qsTr("Select a Monitor to display the content") height: 50 - renderType: Text.NativeRendering + horizontalAlignment: Qt.AlignHCenter font.family: "Roboto" font.pixelSize: 18 @@ -236,7 +236,7 @@ Item { id: txtSliderVolume text: qsTr("Volume") height: 30 - renderType: Text.NativeRendering + font.family: "Roboto" verticalAlignment: Text.AlignVCenter font.pixelSize: 14 @@ -291,7 +291,7 @@ Item { id: txtComboBoxFillMode text: qsTr("Fill Mode") height: 30 - renderType: Text.NativeRendering + font.family: "Roboto" verticalAlignment: Text.AlignVCenter font.pixelSize: 14 diff --git a/ScreenPlay/qml/MonitorSelectionItem.qml b/ScreenPlay/qml/MonitorSelectionItem.qml index e7862780..a5329fe1 100644 --- a/ScreenPlay/qml/MonitorSelectionItem.qml +++ b/ScreenPlay/qml/MonitorSelectionItem.qml @@ -31,7 +31,7 @@ Item { } Text { - renderType: Text.NativeRendering + text: monitorSize.width + "x" + monitorSize.height anchors{ horizontalCenter: parent.horizontalCenter diff --git a/ScreenPlay/qml/MonitorsProjectSettingItem.qml b/ScreenPlay/qml/MonitorsProjectSettingItem.qml index 74a8d712..26084cba 100644 --- a/ScreenPlay/qml/MonitorsProjectSettingItem.qml +++ b/ScreenPlay/qml/MonitorsProjectSettingItem.qml @@ -25,7 +25,7 @@ Item { anchors.verticalCenter: parent.verticalCenter font.family: "Roboto" font.weight: Font.Normal - renderType: Text.NativeRendering + anchors { left: parent.left } diff --git a/ScreenPlay/qml/NavigationItem.qml b/ScreenPlay/qml/NavigationItem.qml index 9b1b629b..779c6e59 100644 --- a/ScreenPlay/qml/NavigationItem.qml +++ b/ScreenPlay/qml/NavigationItem.qml @@ -66,7 +66,7 @@ Item { anchors.verticalCenter: parent.verticalCenter font.family: "Roboto" font.weight: Font.Normal - renderType: Text.NativeRendering + } Image { diff --git a/ScreenPlay/qml/NavigationWallpaperConfiguration.qml b/ScreenPlay/qml/NavigationWallpaperConfiguration.qml index e1b6178c..f86d2b34 100644 --- a/ScreenPlay/qml/NavigationWallpaperConfiguration.qml +++ b/ScreenPlay/qml/NavigationWallpaperConfiguration.qml @@ -42,7 +42,7 @@ Item { font.pointSize: 10 font.bold: true font.family: "Roboto" - renderType: Text.NativeRendering + anchors { horizontalCenter: parent.horizontalCenter top: parent.top @@ -64,7 +64,7 @@ Item { color: "#626262" font.pointSize: 12 font.family: "Roboto" - renderType: Text.NativeRendering + } MouseArea { id: mouseArea diff --git a/ScreenPlay/qml/Settings/SettingBool.qml b/ScreenPlay/qml/Settings/SettingBool.qml index c009e9ba..aee67300 100644 --- a/ScreenPlay/qml/Settings/SettingBool.qml +++ b/ScreenPlay/qml/Settings/SettingBool.qml @@ -25,7 +25,7 @@ Item { id: txtHeadline color: "#5D5D5D" text: settingsBool.headline - renderType: Text.NativeRendering + verticalAlignment: Text.AlignVCenter horizontalAlignment: Text.AlignLeft anchors{ @@ -45,7 +45,7 @@ Item { text: settingsBool.description wrapMode: Text.WordWrap color: "#B5B5B5" - renderType: Text.NativeRendering + verticalAlignment: Text.AlignVCenter horizontalAlignment: Text.AlignLeft font.pixelSize: 12 diff --git a/ScreenPlay/qml/Settings/Settings.qml b/ScreenPlay/qml/Settings/Settings.qml index bc146e86..7771ef3b 100644 --- a/ScreenPlay/qml/Settings/Settings.qml +++ b/ScreenPlay/qml/Settings/Settings.qml @@ -144,7 +144,6 @@ Item { color: "#B5B5B5" height: 30 width: parent.width - renderType: Text.NativeRendering verticalAlignment: Text.AlignVCenter wrapMode: Text.WordWrap horizontalAlignment: Text.AlignLeft @@ -299,7 +298,6 @@ Item { id: txtHeadline color: "#5D5D5D" text: "Lore Ipsum" - renderType: Text.NativeRendering verticalAlignment: Text.AlignVCenter horizontalAlignment: Text.AlignLeft font.pixelSize: 16 @@ -314,7 +312,6 @@ Item { id: txtDescriptionAbout text: "Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aenean commodo ligula eget dolor. Aenean massa. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Donec quam felis, ultricies nec, pellentesque eu, pretium quis, sem. \n \n Nulla consequat massa quis enim. Donec pede justo, fringilla vel, aliquet nec, vulputate eget, arcu. " color: "#B5B5B5" - renderType: Text.NativeRendering wrapMode: Text.WordWrap verticalAlignment: Text.AlignTop horizontalAlignment: Text.AlignLeft diff --git a/ScreenPlay/qml/Settings/SettingsButton.qml b/ScreenPlay/qml/Settings/SettingsButton.qml index d631a09f..eef3260e 100644 --- a/ScreenPlay/qml/Settings/SettingsButton.qml +++ b/ScreenPlay/qml/Settings/SettingsButton.qml @@ -31,7 +31,7 @@ Item { id: txtHeadline color: "#5D5D5D" text: settingsButton.headline - renderType: Text.NativeRendering + verticalAlignment: Text.AlignVCenter horizontalAlignment: Text.AlignLeft anchors{ @@ -49,7 +49,7 @@ Item { id: txtDescription text: settingsButton.description color: "#B5B5B5" - renderType: Text.NativeRendering + verticalAlignment: Text.AlignVCenter wrapMode: Text.WordWrap horizontalAlignment: Text.AlignLeft diff --git a/ScreenPlay/qml/Settings/SettingsComboBox.qml b/ScreenPlay/qml/Settings/SettingsComboBox.qml index 873c9527..51da1a2a 100644 --- a/ScreenPlay/qml/Settings/SettingsComboBox.qml +++ b/ScreenPlay/qml/Settings/SettingsComboBox.qml @@ -25,7 +25,7 @@ Item { id: txtHeadline color: "#5D5D5D" text: settingsComboBox.headline - renderType: Text.NativeRendering + verticalAlignment: Text.AlignVCenter horizontalAlignment: Text.AlignLeft anchors{ @@ -44,7 +44,7 @@ Item { id: txtDescription text: settingsComboBox.description color: "#B5B5B5" - renderType: Text.NativeRendering + verticalAlignment: Text.AlignVCenter horizontalAlignment: Text.AlignLeft wrapMode: Text.WordWrap diff --git a/ScreenPlay/qml/Settings/SettingsExpander.qml b/ScreenPlay/qml/Settings/SettingsExpander.qml index f495e8f9..ac37851a 100644 --- a/ScreenPlay/qml/Settings/SettingsExpander.qml +++ b/ScreenPlay/qml/Settings/SettingsExpander.qml @@ -29,7 +29,7 @@ Rectangle { margins: 20 } color: "#626262" - renderType: Text.NativeRendering + height: txtExpander.paintedHeight wrapMode: Text.Wrap } diff --git a/ScreenPlay/qml/Settings/SettingsHeader.qml b/ScreenPlay/qml/Settings/SettingsHeader.qml index 511f1e39..89ac8c19 100644 --- a/ScreenPlay/qml/Settings/SettingsHeader.qml +++ b/ScreenPlay/qml/Settings/SettingsHeader.qml @@ -65,7 +65,7 @@ Item { font.pixelSize: 18 color: "white" verticalAlignment: Text.AlignTop - renderType: Text.NativeRendering + font.family: "Roboto" anchors { top: parent.top diff --git a/ScreenPlay/qml/StartupErrorWindow.qml b/ScreenPlay/qml/StartupErrorWindow.qml index 04db2b45..c8b19822 100644 --- a/ScreenPlay/qml/StartupErrorWindow.qml +++ b/ScreenPlay/qml/StartupErrorWindow.qml @@ -147,7 +147,7 @@ ApplicationWindow { text: qsTr("Could not connect to Steam :(") color: "white" font.family: "Roboto" - renderType: Text.NativeRendering + wrapMode: Text.WordWrap font.pixelSize: 25 anchors { @@ -163,7 +163,7 @@ ApplicationWindow { text: qsTr("To use ScreenPlay with all its features you have to have Steam running!") color: "white" font.family: "Roboto" - renderType: Text.NativeRendering + wrapMode: Text.WordWrap horizontalAlignment: Text.AlignHCenter font.pixelSize: 18