diff --git a/.travis.yml b/.travis.yml index 1f3b193a..082a05ea 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,7 +4,7 @@ language: generic install: - sudo add-apt-repository -y ppa:beineri/opt-qt551-trusty - - sudo add-apt-repository -y ppa:beineri/opt-qt56-trusty + - sudo add-apt-repository -y ppa:beineri/opt-qt561-trusty - sudo apt-get update - sudo apt-get -y install pep8 pyflakes python python-pip npm nodejs nodejs-legacy - sudo apt-get -y install qt55declarative qt55quickcontrols qt55graphicaleffects qt55tools qt55svg diff --git a/demo/demo.qrc b/demo/demo.qrc index 69946138..e475bc03 100644 --- a/demo/demo.qrc +++ b/demo/demo.qrc @@ -1,49 +1,45 @@ - - - - - BottomSheetDemo.qml - ButtonDemo.qml - CheckBoxDemo.qml - ColorPaletteDemo.qml - CustomIconsDemo.qml - DatePickerDemo.qml - DialogDemo.qml - FormsDemo.qml - ListItemsDemo.qml - PageStackDemo.qml - ProgressBarDemo.qml - RadioButtonDemo.qml - SidebarPage.qml - SliderDemo.qml - SubPage.qml - SwitchDemo.qml - TextFieldDemo.qml - TimePickerDemo.qml - TypographyDemo.qml - icons/action_account_circle.svg - icons/action_autorenew.svg - icons/action_delete.svg - icons/action_language.svg - icons/action_settings.svg - icons/alert_warning.svg - icons/communication_email.svg - icons/content_add.svg - icons/content_create.svg - icons/content_forward.svg - icons/device_access_alarm.svg - icons/file_file_download.svg - icons/image_color_lens.svg - icons/maps_place.svg - icons/navigation_arrow_drop_down.svg - icons/navigation_menu.svg - icons/social_share.svg - images/balloon.jpg - images/go-last.color.svg - images/list-add.color.svg - images/weather-pouring.svg - images/weather-sunset.svg - main.qml - - + + + BottomSheetDemo.qml + ButtonDemo.qml + CheckBoxDemo.qml + ColorPaletteDemo.qml + CustomIconsDemo.qml + DatePickerDemo.qml + DialogDemo.qml + FormsDemo.qml + ListItemsDemo.qml + PageStackDemo.qml + ProgressBarDemo.qml + RadioButtonDemo.qml + SidebarPage.qml + SliderDemo.qml + SubPage.qml + SwitchDemo.qml + TextFieldDemo.qml + TimePickerDemo.qml + TypographyDemo.qml + icons/action_account_circle.svg + icons/action_autorenew.svg + icons/action_delete.svg + icons/action_language.svg + icons/action_settings.svg + icons/alert_warning.svg + icons/communication_email.svg + icons/content_add.svg + icons/content_create.svg + icons/content_forward.svg + icons/device_access_alarm.svg + icons/file_file_download.svg + icons/image_color_lens.svg + icons/maps_place.svg + icons/navigation_arrow_drop_down.svg + icons/social_share.svg + images/balloon.jpg + images/go-last.color.svg + images/list-add.color.svg + images/weather-pouring.svg + images/weather-sunset.svg + main.qml + diff --git a/src/components/DatePicker.qml b/src/components/DatePicker.qml index 02b87ab1..5f0891c4 100644 --- a/src/components/DatePicker.qml +++ b/src/components/DatePicker.qml @@ -67,7 +67,7 @@ Controls.Calendar { Label { id: dayTitle font.weight: Font.DemiBold - font.pixelSize: 36 * Units.dp + font.pointSize: 36 Layout.fillWidth: true lineHeight: 0.9 wrapMode: Text.Wrap diff --git a/src/controls/Label.qml b/src/controls/Label.qml index ad2cc8d3..5fb30cf5 100644 --- a/src/controls/Label.qml +++ b/src/controls/Label.qml @@ -101,8 +101,8 @@ Text { property var fontInfo: fontStyles[style] - font.pixelSize: (!Device.isMobile && fontInfo.size_desktop - ? fontInfo.size_desktop : fontInfo.size) * Units.dp + font.pointSize: (!Device.isMobile && fontInfo.size_desktop + ? fontInfo.size_desktop : fontInfo.size) font.family: "Roboto" font.weight: { var weight = fontInfo.font diff --git a/src/core/AwesomeIcon.qml b/src/core/AwesomeIcon.qml index 26de8849..9f5073ed 100644 --- a/src/core/AwesomeIcon.qml +++ b/src/core/AwesomeIcon.qml @@ -54,7 +54,7 @@ Item { color: Theme.light.iconColor style: shadow ? Text.Raised : Text.Normal styleColor: Qt.rgba(0,0,0,0.5) - font.pixelSize: widget.size + font.pixelSize : widget.size Behavior on color { ColorAnimation { duration: 200 } diff --git a/src/core/UnitsHelper.qml b/src/core/UnitsHelper.qml index 3f0b17d2..9b900863 100644 --- a/src/core/UnitsHelper.qml +++ b/src/core/UnitsHelper.qml @@ -32,7 +32,7 @@ import QtQuick 2.4 Label { text:"A" - font.pixelSize: dp(50) + font.pointSize: 50 } } \endqml diff --git a/src/extras/extras.qrc b/src/extras/extras.qrc index 503a55a5..ea6996ae 100644 --- a/src/extras/extras.qrc +++ b/src/extras/extras.qrc @@ -1,14 +1,10 @@ - - - - - AutomaticGrid.qml - CircleImage.qml - CircleMask.qml - ColumnFlow.qml - Image.qml - circle.png - qmldir - - + + + AutomaticGrid.qml + CircleImage.qml + CircleMask.qml + ColumnFlow.qml + Image.qml + qmldir + diff --git a/src/listitems/Subheader.qml b/src/listitems/Subheader.qml index 5e692a00..2f604f10 100644 --- a/src/listitems/Subheader.qml +++ b/src/listitems/Subheader.qml @@ -40,7 +40,7 @@ View { Label { id: label - font.pixelSize: 14 * Units.dp + font.pointSize: 14 font.family: "Roboto" font.weight: Font.DemiBold diff --git a/src/popups/MenuField.qml b/src/popups/MenuField.qml index f396ed18..864eaabe 100644 --- a/src/popups/MenuField.qml +++ b/src/popups/MenuField.qml @@ -157,7 +157,7 @@ Item { text: field.placeholderText visible: floatingLabel - font.pixelSize: 12 * Units.dp + font.pointSize: 12 anchors.bottom: spinBox.top anchors.bottomMargin: 8 * Units.dp @@ -199,7 +199,7 @@ Item { } visible: hasHelperText - font.pixelSize: 12 * Units.dp + font.pointSize: 12 color: field.hasError ? field.errorColor : Qt.darker(Theme.light.hintColor) Behavior on color { diff --git a/src/styles/SliderStyle.qml b/src/styles/SliderStyle.qml index e5ccf016..b09dc5c7 100644 --- a/src/styles/SliderStyle.qml +++ b/src/styles/SliderStyle.qml @@ -52,8 +52,8 @@ SliderStyle { verticalAlignment: Qt.AlignVCenter text: knobLabel fontSizeMode: Text.Fit - font.pixelSize: knobDiameter - 19 * Units.dp - minimumPixelSize: 6 * Units.dp + font.pointSize: knobDiameter - 19 + minimumPointSize : 6 wrapMode: Text.WordWrap color: Theme.lightDark(styleColor, Theme.light.textColor, diff --git a/src/styles/TextFieldStyle.qml b/src/styles/TextFieldStyle.qml index b9c5fa14..e57370f6 100644 --- a/src/styles/TextFieldStyle.qml +++ b/src/styles/TextFieldStyle.qml @@ -26,7 +26,7 @@ TextFieldStyle { font { family: echoMode == TextInput.Password ? "Default" : "Roboto" - pixelSize: 16 * Units.dp + pointSize: 16 } renderType: Text.QtRendering @@ -78,7 +78,7 @@ TextFieldStyle { anchors.verticalCenter: parent.verticalCenter text: control.placeholderText - font.pixelSize: 16 * Units.dp + font.pointSize: 16 anchors.margins: -12 * Units.dp color: background.hasError ? background.errorColor : control.activeFocus && control.text !== "" @@ -95,7 +95,7 @@ TextFieldStyle { } PropertyChanges { target: fieldPlaceholder - font.pixelSize: 12 * Units.dp + font.pointSize: 12 } }, State { @@ -117,7 +117,7 @@ TextFieldStyle { } NumberAnimation { duration: 200 - property: "font.pixelSize" + property: "font.pointSize" } } ] @@ -137,7 +137,7 @@ TextFieldStyle { id: helperTextLabel visible: background.helperText && background.showBorder text: background.helperText - font.pixelSize: 12 * Units.dp + font.pointSize: 12 color: background.hasError ? background.errorColor : Qt.darker(Theme.light.hintColor) @@ -154,7 +154,7 @@ TextFieldStyle { Layout.alignment: Qt.AlignVCenter | Qt.AlignRight visible: background.characterLimit && background.showBorder text: control.length + " / " + background.characterLimit - font.pixelSize: 12 * Units.dp + font.pointSize: 12 color: background.hasError ? background.errorColor : Theme.light.hintColor horizontalAlignment: Text.AlignLeft