3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-15 02:37:49 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Update some widgets to Qt Controls 2

Browse source 
The ScrollView generated some wobbling text (mainly in macOS)
This commit is contained in:
Diego Prado Gesto 2019-05-07 10:50:59 +02:00
parent 3390cca2d9
commit 39aa5fedf5
5 changed files with 24 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

12
plugins/Toolbox/resources/qml/Toolbox.qml
View file

@ -48,32 +48,32 @@ Window
ToolboxLoadingPage ToolboxLoadingPage
{ {
id: viewLoading id: viewLoading
visible: toolbox.viewCategory != "installed" && toolbox.viewPage == "loading" visible: toolbox.viewCategory !== "installed" && toolbox.viewPage === "loading"
} }
ToolboxErrorPage ToolboxErrorPage
{ {
id: viewErrored id: viewErrored
visible: toolbox.viewCategory != "installed" && toolbox.viewPage == "errored" visible: toolbox.viewCategory !== "installed" && toolbox.viewPage === "errored"
} }
ToolboxDownloadsPage ToolboxDownloadsPage
{ {
id: viewDownloads id: viewDownloads
visible: toolbox.viewCategory != "installed" && toolbox.viewPage == "overview" visible: toolbox.viewCategory !== "installed" && toolbox.viewPage === "overview"
} }
ToolboxDetailPage ToolboxDetailPage
{ {
id: viewDetail id: viewDetail
visible: toolbox.viewCategory != "installed" && toolbox.viewPage == "detail" visible: toolbox.viewCategory !== "installed" && toolbox.viewPage === "detail"
} }
ToolboxAuthorPage ToolboxAuthorPage
{ {
id: viewAuthor id: viewAuthor
visible: toolbox.viewCategory != "installed" && toolbox.viewPage == "author" visible: toolbox.viewCategory !== "installed" && toolbox.viewPage === "author"
} }
ToolboxInstalledPage ToolboxInstalledPage
{ {
id: installedPluginList id: installedPluginList
visible: toolbox.viewCategory == "installed" visible: toolbox.viewCategory === "installed"
} }
} }

12
plugins/Toolbox/resources/qml/ToolboxDetailList.qml
View file

@ -1,9 +1,8 @@
// Copyright (c) 2018 Ultimaker B.V. // Copyright (c) 2019 Ultimaker B.V.
// Toolbox is released under the terms of the LGPLv3 or higher. // Toolbox is released under the terms of the LGPLv3 or higher.
import QtQuick 2.7 import QtQuick 2.10
import QtQuick.Controls 1.4 import QtQuick.Controls 2.3
import QtQuick.Controls.Styles 1.4
import UM 1.1 as UM import UM 1.1 as UM
Item Item
@ -11,10 +10,9 @@ Item
id: detailList id: detailList
ScrollView ScrollView
{ {
frameVisible: false clip: true
anchors.fill: detailList anchors.fill: detailList
style: UM.Theme.styles.scrollview
flickableItem.flickableDirection: Flickable.VerticalFlick
Column Column
{ {
anchors anchors

6
plugins/Toolbox/resources/qml/ToolboxDetailTile.qml
View file

@ -1,9 +1,9 @@
// Copyright (c) 2018 Ultimaker B.V. // Copyright (c) 2019 Ultimaker B.V.
// Toolbox is released under the terms of the LGPLv3 or higher. // Toolbox is released under the terms of the LGPLv3 or higher.
import QtQuick 2.10 import QtQuick 2.10
import QtQuick.Controls 1.4 import QtQuick.Controls 2.3
import QtQuick.Controls.Styles 1.4
import UM 1.1 as UM import UM 1.1 as UM
Item Item

19
plugins/Toolbox/resources/qml/ToolboxDownloadsPage.qml
View file

@ -1,25 +1,20 @@
// Copyright (c) 2018 Ultimaker B.V. // Copyright (c) 2019 Ultimaker B.V.
// Toolbox is released under the terms of the LGPLv3 or higher. // Toolbox is released under the terms of the LGPLv3 or higher.
import QtQuick 2.7 import QtQuick 2.10
import QtQuick.Controls 1.4 import QtQuick.Controls 2.3
import QtQuick.Controls.Styles 1.4
import UM 1.1 as UM import UM 1.1 as UM
ScrollView ScrollView
{ {
frameVisible: false clip: true
width: parent.width width: parent.width
height: parent.height height: parent.height
style: UM.Theme.styles.scrollview
flickableItem.flickableDirection: Flickable.VerticalFlick
Column Column
{ {
width: base.width width: base.width
spacing: UM.Theme.getSize("default_margin").height spacing: UM.Theme.getSize("default_margin").height
height: childrenRect.height
ToolboxDownloadsShowcase ToolboxDownloadsShowcase
{ {
@ -31,14 +26,14 @@ ScrollView
{ {
id: allPlugins id: allPlugins
width: parent.width width: parent.width
heading: toolbox.viewCategory == "material" ? catalog.i18nc("@label", "Community Contributions") : catalog.i18nc("@label", "Community Plugins") heading: toolbox.viewCategory === "material" ? catalog.i18nc("@label", "Community Contributions") : catalog.i18nc("@label", "Community Plugins")
model: toolbox.viewCategory == "material" ? toolbox.materialsAvailableModel : toolbox.pluginsAvailableModel model: toolbox.viewCategory === "material" ? toolbox.materialsAvailableModel : toolbox.pluginsAvailableModel
} }
ToolboxDownloadsGrid ToolboxDownloadsGrid
{ {
id: genericMaterials id: genericMaterials
visible: toolbox.viewCategory == "material" visible: toolbox.viewCategory === "material"
width: parent.width width: parent.width
heading: catalog.i18nc("@label", "Generic Materials") heading: catalog.i18nc("@label", "Generic Materials")
model: toolbox.materialsGenericModel model: toolbox.materialsGenericModel

11
plugins/Toolbox/resources/qml/ToolboxInstalledPage.qml
View file

@ -1,22 +1,17 @@
// Copyright (c) 2018 Ultimaker B.V. // Copyright (c) 2019 Ultimaker B.V.
// Toolbox is released under the terms of the LGPLv3 or higher. // Toolbox is released under the terms of the LGPLv3 or higher.
import QtQuick 2.10 import QtQuick 2.10
import QtQuick.Dialogs 1.1 import QtQuick.Controls 2.3
import QtQuick.Window 2.2
import QtQuick.Controls 1.4
import QtQuick.Controls.Styles 1.4
import UM 1.1 as UM import UM 1.1 as UM
ScrollView ScrollView
{ {
id: page id: page
frameVisible: false clip: true
width: parent.width width: parent.width
height: parent.height height: parent.height
style: UM.Theme.styles.scrollview
flickableItem.flickableDirection: Flickable.VerticalFlick
Column Column
{ {