CURA-5035 Small style tweaks

This commit is contained in:
Ian Paschal 2018-04-20 17:06:16 +02:00
parent 0944bba86b
commit dc0dcac199
4 changed files with 6 additions and 3 deletions

View File

@ -2,7 +2,6 @@
// 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.2 import QtQuick 2.2
import QtQuick.Dialogs 1.1
import QtQuick.Controls 1.4 import QtQuick.Controls 1.4
import QtQuick.Controls.Styles 1.4 import QtQuick.Controls.Styles 1.4
import UM 1.1 as UM import UM 1.1 as UM

View File

@ -2,7 +2,6 @@
// 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.7
import QtQuick.Dialogs 1.1
import QtQuick.Controls 1.4 import QtQuick.Controls 1.4
import QtQuick.Controls.Styles 1.4 import QtQuick.Controls.Styles 1.4
import UM 1.1 as UM import UM 1.1 as UM

View File

@ -30,6 +30,7 @@ ScrollView
height: childrenRect.height + 4 * UM.Theme.getSize("default_margin").height height: childrenRect.height + 4 * UM.Theme.getSize("default_margin").height
Label Label
{ {
visible: toolbox.pluginsInstalledModel.items.length > 0
width: parent.width width: parent.width
text: catalog.i18nc("@title:tab", "Plugins") text: catalog.i18nc("@title:tab", "Plugins")
color: UM.Theme.getColor("text_medium") color: UM.Theme.getColor("text_medium")
@ -37,6 +38,7 @@ ScrollView
} }
Rectangle Rectangle
{ {
visible: toolbox.pluginsInstalledModel.items.length > 0
color: "transparent" color: "transparent"
width: parent.width width: parent.width
height: childrenRect.height + 1 * UM.Theme.getSize("default_lining").width height: childrenRect.height + 1 * UM.Theme.getSize("default_lining").width
@ -65,6 +67,7 @@ ScrollView
} }
Label Label
{ {
visible: toolbox.materialsInstalledModel.items.length > 0
width: base.width width: base.width
text: catalog.i18nc("@title:tab", "Materials") text: catalog.i18nc("@title:tab", "Materials")
color: UM.Theme.getColor("text_medium") color: UM.Theme.getColor("text_medium")
@ -72,6 +75,7 @@ ScrollView
} }
Rectangle Rectangle
{ {
visible: toolbox.materialsInstalledModel.items.length > 0
color: "transparent" color: "transparent"
width: parent.width width: parent.width
height: childrenRect.height + 1 * UM.Theme.getSize("default_lining").width height: childrenRect.height + 1 * UM.Theme.getSize("default_lining").width
@ -79,7 +83,7 @@ ScrollView
border.width: UM.Theme.getSize("default_lining").width border.width: UM.Theme.getSize("default_lining").width
Column Column
{ {
height: childrenRect.height height: Math.max( UM.Theme.getSize("wide_margin").height, childrenRect.height)
anchors anchors
{ {
top: parent.top top: parent.top

View File

@ -62,6 +62,7 @@ Item
{ {
id: authorInfo id: authorInfo
height: parent.height height: parent.height
width: Math.floor(UM.Theme.getSize("toolbox_action_button").width * 1.25)
anchors anchors
{ {
top: parent.top top: parent.top