3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-12 17:27:51 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Update Layouts, Control.Styles and Dialogs

Browse source 
CURA-7813
This commit is contained in:
jelle Spijker 2021-03-29 18:04:47 +02:00 • committed by Jelle Spijker
parent 2986d50745
commit 9da321ffb9
No known key found for this signature in database
GPG key ID: 6662DC033BE6B99A
49 changed files with 71 additions and 71 deletions
Download patch file Download diff file Expand all files Collapse all files

2
resources/qml/ActionPanel/ActionPanelWidget.qml
View file

@ -3,7 +3,7 @@
import QtQuick 2.15 import QtQuick 2.15
import QtQuick.Controls 2.15 import QtQuick.Controls 2.15
import QtQuick.Layouts 1.3 import QtQuick.Layouts 1.15
import UM 1.2 as UM import UM 1.2 as UM
import Cura 1.0 as Cura import Cura 1.0 as Cura

2
resources/qml/ActionPanel/OutputDevicesActionButton.qml
View file

@ -3,7 +3,7 @@
import QtQuick 2.15 import QtQuick 2.15
import QtQuick.Controls 2.15 import QtQuick.Controls 2.15
import QtQuick.Layouts 1.3 import QtQuick.Layouts 1.15
import UM 1.1 as UM import UM 1.1 as UM
import Cura 1.0 as Cura import Cura 1.0 as Cura

2
resources/qml/ActionPanel/OutputProcessWidget.qml
View file

@ -3,7 +3,7 @@
import QtQuick 2.15 import QtQuick 2.15
import QtQuick.Controls 2.15 import QtQuick.Controls 2.15
import QtQuick.Layouts 1.3 import QtQuick.Layouts 1.15
import UM 1.1 as UM import UM 1.1 as UM
import Cura 1.0 as Cura import Cura 1.0 as Cura

2
resources/qml/ActionPanel/SliceProcessWidget.qml
View file

@ -3,7 +3,7 @@
import QtQuick 2.15 import QtQuick 2.15
import QtQuick.Controls 2.15 import QtQuick.Controls 2.15
import QtQuick.Layouts 1.3 import QtQuick.Layouts 1.15
import QtQuick.Controls 1.4 as Controls1 import QtQuick.Controls 1.4 as Controls1
import UM 1.3 as UM import UM 1.3 as UM

4
resources/qml/Cura.qml
View file

@ -4,8 +4,8 @@
import QtQuick 2.15 import QtQuick 2.15
import QtQuick.Controls 1.4 import QtQuick.Controls 1.4
import QtQuick.Controls.Styles 1.4 import QtQuick.Controls.Styles 1.4
import QtQuick.Layouts 1.1 import QtQuick.Layouts 1.15
import QtQuick.Dialogs 1.2 import QtQuick.Dialogs 1.3
import QtGraphicalEffects 1.0 import QtGraphicalEffects 1.0
import UM 1.3 as UM import UM 1.3 as UM

6
resources/qml/Dialogs/AskOpenAsProjectOrModelsDialog.qml
View file

@ -3,9 +3,9 @@
import QtQuick 2.15 import QtQuick 2.15
import QtQuick.Controls 1.4 import QtQuick.Controls 1.4
import QtQuick.Controls.Styles 1.1 import QtQuick.Controls.Styles 1.4
import QtQuick.Layouts 1.1 import QtQuick.Layouts 1.15
import QtQuick.Dialogs 1.1 import QtQuick.Dialogs 1.3
import QtQuick.Window 2.1 import QtQuick.Window 2.1
import UM 1.3 as UM import UM 1.3 as UM

2
resources/qml/Dialogs/DiscardOrKeepProfileChangesDialog.qml
View file

@ -3,7 +3,7 @@
import QtQuick 2.15 import QtQuick 2.15
import QtQuick.Controls 1.4 import QtQuick.Controls 1.4
import QtQuick.Dialogs 1.2 import QtQuick.Dialogs 1.3
import QtQuick.Window 2.1 import QtQuick.Window 2.1
import UM 1.2 as UM import UM 1.2 as UM

6
resources/qml/Dialogs/OpenFilesIncludingProjectsDialog.qml
View file

@ -3,9 +3,9 @@
import QtQuick 2.15 import QtQuick 2.15
import QtQuick.Controls 1.4 import QtQuick.Controls 1.4
import QtQuick.Controls.Styles 1.1 import QtQuick.Controls.Styles 1.4
import QtQuick.Layouts 1.1 import QtQuick.Layouts 1.15
import QtQuick.Dialogs 1.1 import QtQuick.Dialogs 1.3
import QtQuick.Window 2.1 import QtQuick.Window 2.1
import UM 1.3 as UM import UM 1.3 as UM

2
resources/qml/Dialogs/WorkspaceSummaryDialog.qml
View file

@ -3,7 +3,7 @@
import QtQuick 2.15 import QtQuick 2.15
import QtQuick.Controls 1.4 import QtQuick.Controls 1.4
import QtQuick.Layouts 1.3 import QtQuick.Layouts 1.15
import QtQuick.Window 2.2 import QtQuick.Window 2.2
import UM 1.2 as UM import UM 1.2 as UM

2
resources/qml/IconWithText.qml
View file

@ -3,7 +3,7 @@
import QtQuick 2.15 import QtQuick 2.15
import QtQuick.Controls 2.15 import QtQuick.Controls 2.15
import QtQuick.Layouts 1.3 import QtQuick.Layouts 1.15
import UM 1.2 as UM import UM 1.2 as UM
import Cura 1.0 as Cura import Cura 1.0 as Cura

4
resources/qml/JobSpecs.qml
View file

@ -3,8 +3,8 @@
import QtQuick 2.15 import QtQuick 2.15
import QtQuick.Controls 1.4 import QtQuick.Controls 1.4
import QtQuick.Controls.Styles 1.1 import QtQuick.Controls.Styles 1.4
import QtQuick.Layouts 1.1 import QtQuick.Layouts 1.15
import UM 1.1 as UM import UM 1.1 as UM
import Cura 1.0 as Cura import Cura 1.0 as Cura

2
resources/qml/LabelBar.qml
View file

@ -3,7 +3,7 @@
import QtQuick 2.15 import QtQuick 2.15
import QtQuick.Controls 2.15 import QtQuick.Controls 2.15
import QtQuick.Layouts 1.3 import QtQuick.Layouts 1.15
import UM 1.2 as UM import UM 1.2 as UM

2
resources/qml/MachineSettings/ComboBoxWithOptions.qml
View file

@ -3,7 +3,7 @@
import QtQuick 2.15 import QtQuick 2.15
import QtQuick.Controls 2.15 import QtQuick.Controls 2.15
import QtQuick.Layouts 1.3 import QtQuick.Layouts 1.15
import UM 1.3 as UM import UM 1.3 as UM
import Cura 1.1 as Cura import Cura 1.1 as Cura

2
resources/qml/MachineSettings/GcodeTextArea.qml
View file

@ -3,7 +3,7 @@
import QtQuick 2.15 import QtQuick 2.15
import QtQuick.Controls 2.15 import QtQuick.Controls 2.15
import QtQuick.Layouts 1.3 import QtQuick.Layouts 1.15
import UM 1.3 as UM import UM 1.3 as UM
import Cura 1.1 as Cura import Cura 1.1 as Cura

2
resources/qml/MachineSettings/SimpleCheckBox.qml
View file

@ -3,7 +3,7 @@
import QtQuick 2.15 import QtQuick 2.15
import QtQuick.Controls 2.15 import QtQuick.Controls 2.15
import QtQuick.Layouts 1.3 import QtQuick.Layouts 1.15
import UM 1.3 as UM import UM 1.3 as UM
import Cura 1.1 as Cura import Cura 1.1 as Cura

4
resources/qml/MainWindow/ApplicationMenu.qml
View file

@ -4,8 +4,8 @@
import QtQuick 2.15 import QtQuick 2.15
import QtQuick.Controls 1.4 import QtQuick.Controls 1.4
import QtQuick.Controls.Styles 1.4 import QtQuick.Controls.Styles 1.4
import QtQuick.Layouts 1.1 import QtQuick.Layouts 1.15
import QtQuick.Dialogs 1.2 import QtQuick.Dialogs 1.3
import UM 1.3 as UM import UM 1.3 as UM
import Cura 1.1 as Cura import Cura 1.1 as Cura

2
resources/qml/MainWindow/MainWindowHeader.qml
View file

@ -4,7 +4,7 @@
import QtQuick 2.15 import QtQuick 2.15
import QtQuick.Controls 2.15 as Controls2 import QtQuick.Controls 2.15 as Controls2
import QtQuick.Controls 1.4 import QtQuick.Controls 1.4
import QtQuick.Controls.Styles 1.1 import QtQuick.Controls.Styles 1.4
import UM 1.4 as UM import UM 1.4 as UM
import Cura 1.0 as Cura import Cura 1.0 as Cura

2
resources/qml/Menus/ConfigurationMenu/ConfigurationMenu.qml
View file

@ -4,7 +4,7 @@
import QtQuick 2.15 import QtQuick 2.15
import QtQuick.Controls 2.15 import QtQuick.Controls 2.15
import QtQuick.Controls.Styles 1.4 import QtQuick.Controls.Styles 1.4
import QtQuick.Layouts 1.3 import QtQuick.Layouts 1.15
import UM 1.2 as UM import UM 1.2 as UM
import Cura 1.0 as Cura import Cura 1.0 as Cura

2
resources/qml/Menus/ContextMenu.qml
View file

@ -3,7 +3,7 @@
import QtQuick 2.15 import QtQuick 2.15
import QtQuick.Controls 1.4 import QtQuick.Controls 1.4
import QtQuick.Dialogs 1.2 import QtQuick.Dialogs 1.3
import QtQuick.Window 2.1 import QtQuick.Window 2.1
import UM 1.2 as UM import UM 1.2 as UM

6
resources/qml/MonitorButton.qml
View file

@ -3,9 +3,9 @@
import QtQuick 2.15 import QtQuick 2.15
import QtQuick.Controls 1.4 import QtQuick.Controls 1.4
import QtQuick.Controls.Styles 1.1 import QtQuick.Controls.Styles 1.4
import QtQuick.Dialogs 1.1 import QtQuick.Dialogs 1.3
import QtQuick.Layouts 1.1 import QtQuick.Layouts 1.15
import UM 1.1 as UM import UM 1.1 as UM
import Cura 1.0 as Cura import Cura 1.0 as Cura

4
resources/qml/Preferences/GeneralPage.qml
View file

@ -3,8 +3,8 @@
import QtQuick 2.15 import QtQuick 2.15
import QtQuick.Controls 1.4 import QtQuick.Controls 1.4
import QtQuick.Layouts 1.1 import QtQuick.Layouts 1.15
import QtQuick.Controls.Styles 1.1 import QtQuick.Controls.Styles 1.4
import UM 1.1 as UM import UM 1.1 as UM
import Cura 1.0 as Cura import Cura 1.0 as Cura

4
resources/qml/Preferences/Materials/MaterialsBrandSection.qml
View file

@ -4,8 +4,8 @@
import QtQuick 2.15 import QtQuick 2.15
import QtQuick.Controls 1.4 import QtQuick.Controls 1.4
import QtQuick.Controls.Styles 1.4 import QtQuick.Controls.Styles 1.4
import QtQuick.Layouts 1.3 import QtQuick.Layouts 1.15
import QtQuick.Dialogs 1.2 import QtQuick.Dialogs 1.3
import UM 1.2 as UM import UM 1.2 as UM
import Cura 1.0 as Cura import Cura 1.0 as Cura

4
resources/qml/Preferences/Materials/MaterialsDetailsPanel.qml
View file

@ -3,8 +3,8 @@
import QtQuick 2.15 import QtQuick 2.15
import QtQuick.Controls 1.4 import QtQuick.Controls 1.4
import QtQuick.Layouts 1.3 import QtQuick.Layouts 1.15
import QtQuick.Dialogs 1.2 import QtQuick.Dialogs 1.3
import UM 1.2 as UM import UM 1.2 as UM
import Cura 1.0 as Cura import Cura 1.0 as Cura

4
resources/qml/Preferences/Materials/MaterialsList.qml
View file

@ -4,8 +4,8 @@
import QtQuick 2.15 import QtQuick 2.15
import QtQuick.Controls 1.4 import QtQuick.Controls 1.4
import QtQuick.Controls.Styles 1.4 import QtQuick.Controls.Styles 1.4
import QtQuick.Layouts 1.3 import QtQuick.Layouts 1.15
import QtQuick.Dialogs 1.2 import QtQuick.Dialogs 1.3
import UM 1.2 as UM import UM 1.2 as UM
import Cura 1.0 as Cura import Cura 1.0 as Cura

4
resources/qml/Preferences/Materials/MaterialsPage.qml
View file

@ -3,8 +3,8 @@
import QtQuick 2.15 import QtQuick 2.15
import QtQuick.Controls 1.4 import QtQuick.Controls 1.4
import QtQuick.Layouts 1.3 import QtQuick.Layouts 1.15
import QtQuick.Dialogs 1.2 import QtQuick.Dialogs 1.3
import UM 1.2 as UM import UM 1.2 as UM
import Cura 1.5 as Cura import Cura 1.5 as Cura

4
resources/qml/Preferences/Materials/MaterialsSlot.qml
View file

@ -4,8 +4,8 @@
import QtQuick 2.15 import QtQuick 2.15
import QtQuick.Controls 1.4 import QtQuick.Controls 1.4
import QtQuick.Controls.Styles 1.4 import QtQuick.Controls.Styles 1.4
import QtQuick.Layouts 1.3 import QtQuick.Layouts 1.15
import QtQuick.Dialogs 1.2 import QtQuick.Dialogs 1.3
import UM 1.2 as UM import UM 1.2 as UM
import Cura 1.0 as Cura import Cura 1.0 as Cura

4
resources/qml/Preferences/Materials/MaterialsTypeSection.qml
View file

@ -4,8 +4,8 @@
import QtQuick 2.15 import QtQuick 2.15
import QtQuick.Controls 1.4 import QtQuick.Controls 1.4
import QtQuick.Controls.Styles 1.4 import QtQuick.Controls.Styles 1.4
import QtQuick.Layouts 1.3 import QtQuick.Layouts 1.15
import QtQuick.Dialogs 1.2 import QtQuick.Dialogs 1.3
import UM 1.2 as UM import UM 1.2 as UM
import Cura 1.0 as Cura import Cura 1.0 as Cura

2
resources/qml/Preferences/Materials/MaterialsView.qml
View file

@ -3,7 +3,7 @@
import QtQuick 2.15 import QtQuick 2.15
import QtQuick.Controls 1.4 import QtQuick.Controls 1.4
import QtQuick.Dialogs 1.2 import QtQuick.Dialogs 1.3
import UM 1.2 as UM import UM 1.2 as UM
import Cura 1.0 as Cura import Cura 1.0 as Cura

4
resources/qml/Preferences/ProfilesPage.qml
View file

@ -3,8 +3,8 @@
import QtQuick 2.15 import QtQuick 2.15
import QtQuick.Controls 1.4 import QtQuick.Controls 1.4
import QtQuick.Layouts 1.3 import QtQuick.Layouts 1.15
import QtQuick.Dialogs 1.2 import QtQuick.Dialogs 1.3
import UM 1.2 as UM import UM 1.2 as UM
import Cura 1.6 as Cura import Cura 1.6 as Cura

2
resources/qml/Preferences/ReadOnlySpinBox.qml
View file

@ -3,7 +3,7 @@
import QtQuick 2.15 import QtQuick 2.15
import QtQuick.Controls 1.4 import QtQuick.Controls 1.4
import QtQuick.Dialogs 1.2 import QtQuick.Dialogs 1.3
Item Item
{ {

2
resources/qml/Preferences/ReadOnlyTextField.qml
View file

@ -4,7 +4,7 @@
import QtQuick 2.15 import QtQuick 2.15
import QtQuick.Controls 1.4 import QtQuick.Controls 1.4
import QtQuick.Dialogs 1.2 import QtQuick.Dialogs 1.3
Item Item
{ {

2
resources/qml/Preferences/SettingVisibilityPage.qml
View file

@ -3,7 +3,7 @@
import QtQuick 2.15 import QtQuick 2.15
import QtQuick.Controls 1.4 import QtQuick.Controls 1.4
import QtQuick.Controls.Styles 1.1 import QtQuick.Controls.Styles 1.4
import UM 1.2 as UM import UM 1.2 as UM

4
resources/qml/PrintMonitor.qml
View file

@ -3,8 +3,8 @@
import QtQuick 2.15 import QtQuick 2.15
import QtQuick.Controls 1.4 import QtQuick.Controls 1.4
import QtQuick.Controls.Styles 1.1 import QtQuick.Controls.Styles 1.4
import QtQuick.Layouts 1.1 import QtQuick.Layouts 1.15
import UM 1.2 as UM import UM 1.2 as UM
import Cura 1.0 as Cura import Cura 1.0 as Cura

2
resources/qml/PrintSetupSelector/Custom/CustomPrintSetup.qml
View file

@ -4,7 +4,7 @@
import QtQuick 2.15 import QtQuick 2.15
import QtQuick.Controls 2.15 import QtQuick.Controls 2.15
import QtQuick.Controls 1.4 as OldControls import QtQuick.Controls 1.4 as OldControls
import QtQuick.Layouts 1.3 import QtQuick.Layouts 1.15
import UM 1.3 as UM import UM 1.3 as UM
import Cura 1.6 as Cura import Cura 1.6 as Cura

2
resources/qml/PrintSetupSelector/PrintSetupSelectorHeader.qml
View file

@ -3,7 +3,7 @@
import QtQuick 2.15 import QtQuick 2.15
import QtQuick.Controls 2.15 import QtQuick.Controls 2.15
import QtQuick.Layouts 1.3 import QtQuick.Layouts 1.15
import UM 1.3 as UM import UM 1.3 as UM
import Cura 1.0 as Cura import Cura 1.0 as Cura

4
resources/qml/PrinterOutput/ExtruderBox.qml
View file

@ -3,8 +3,8 @@
import QtQuick 2.15 import QtQuick 2.15
import QtQuick.Controls 1.4 import QtQuick.Controls 1.4
import QtQuick.Controls.Styles 1.1 import QtQuick.Controls.Styles 1.4
import QtQuick.Layouts 1.1 import QtQuick.Layouts 1.15
import UM 1.2 as UM import UM 1.2 as UM
import Cura 1.0 as Cura import Cura 1.0 as Cura

2
resources/qml/PrinterOutput/HeatedBedBox.qml
View file

@ -4,7 +4,7 @@
import QtQuick 2.15 import QtQuick 2.15
import QtQuick.Controls 1.4 import QtQuick.Controls 1.4
import QtQuick.Controls.Styles 1.4 import QtQuick.Controls.Styles 1.4
import QtQuick.Layouts 1.3 import QtQuick.Layouts 1.15
import UM 1.2 as UM import UM 1.2 as UM
import Cura 1.0 as Cura import Cura 1.0 as Cura

2
resources/qml/PrinterOutput/ManualPrinterControl.qml
View file

@ -4,7 +4,7 @@
import QtQuick 2.15 import QtQuick 2.15
import QtQuick.Controls 1.4 import QtQuick.Controls 1.4
import QtQuick.Controls.Styles 1.4 import QtQuick.Controls.Styles 1.4
import QtQuick.Layouts 1.3 import QtQuick.Layouts 1.15
import UM 1.3 as UM import UM 1.3 as UM
import Cura 1.0 as Cura import Cura 1.0 as Cura

4
resources/qml/PrinterOutput/MonitorItem.qml
View file

@ -3,8 +3,8 @@
import QtQuick 2.15 import QtQuick 2.15
import QtQuick.Controls 1.4 import QtQuick.Controls 1.4
import QtQuick.Controls.Styles 1.1 import QtQuick.Controls.Styles 1.4
import QtQuick.Layouts 1.1 import QtQuick.Layouts 1.15
import UM 1.2 as UM import UM 1.2 as UM
import Cura 1.0 as Cura import Cura 1.0 as Cura

2
resources/qml/PrinterOutput/MonitorSection.qml
View file

@ -4,7 +4,7 @@
import QtQuick 2.15 import QtQuick 2.15
import QtQuick.Controls 1.4 import QtQuick.Controls 1.4
import QtQuick.Controls.Styles 1.4 import QtQuick.Controls.Styles 1.4
import QtQuick.Layouts 1.3 import QtQuick.Layouts 1.15
import UM 1.2 as UM import UM 1.2 as UM
import Cura 1.0 as Cura import Cura 1.0 as Cura

4
resources/qml/PrinterOutput/OutputDeviceHeader.qml
View file

@ -1,8 +1,8 @@
import QtQuick 2.15 import QtQuick 2.15
import QtQuick.Controls 1.4 import QtQuick.Controls 1.4
import QtQuick.Controls.Styles 1.1 import QtQuick.Controls.Styles 1.4
import QtQuick.Layouts 1.1 import QtQuick.Layouts 1.15
import UM 1.2 as UM import UM 1.2 as UM
import Cura 1.0 as Cura import Cura 1.0 as Cura

2
resources/qml/RadioCheckbar.qml
View file

@ -3,7 +3,7 @@
import QtQuick 2.15 import QtQuick 2.15
import QtQuick.Controls 2.15 import QtQuick.Controls 2.15
import QtQuick.Layouts 1.3 import QtQuick.Layouts 1.15
import UM 1.1 as UM import UM 1.1 as UM
Item Item

2
resources/qml/Settings/SettingCheckBox.qml
View file

@ -2,7 +2,7 @@
// Uranium is released under the terms of the LGPLv3 or higher. // Uranium is released under the terms of the LGPLv3 or higher.
import QtQuick 2.15 import QtQuick 2.15
import QtQuick.Layouts 1.2 import QtQuick.Layouts 1.15
import QtQuick.Controls 2.15 import QtQuick.Controls 2.15
import UM 1.2 as UM import UM 1.2 as UM

2
resources/qml/Settings/SettingItem.qml
View file

@ -2,7 +2,7 @@
// Cura is released under the terms of the LGPLv3 or higher. // Cura is released under the terms of the LGPLv3 or higher.
import QtQuick 2.15 import QtQuick 2.15
import QtQuick.Layouts 1.2 import QtQuick.Layouts 1.15
import QtQuick.Controls 2.15 import QtQuick.Controls 2.15
import UM 1.1 as UM import UM 1.1 as UM

4
resources/qml/Settings/SettingView.qml
View file

@ -3,8 +3,8 @@
import QtQuick 2.15 import QtQuick 2.15
import QtQuick.Controls 1.4 import QtQuick.Controls 1.4
import QtQuick.Controls.Styles 1.1 import QtQuick.Controls.Styles 1.4
import QtQuick.Layouts 1.2 import QtQuick.Layouts 1.15
import UM 1.2 as UM import UM 1.2 as UM
import Cura 1.0 as Cura import Cura 1.0 as Cura

2
resources/qml/ViewOrientationControls.qml
View file

@ -3,7 +3,7 @@
import QtQuick 2.15 import QtQuick 2.15
import QtQuick.Controls 1.4 import QtQuick.Controls 1.4
import QtQuick.Controls.Styles 1.1 import QtQuick.Controls.Styles 1.4
import UM 1.4 as UM import UM 1.4 as UM
import Cura 1.1 as Cura import Cura 1.1 as Cura

2
resources/qml/WelcomePages/AddCloudPrintersView.qml
View file

@ -3,7 +3,7 @@
import QtQuick 2.15 import QtQuick 2.15
import QtQuick.Controls 2.15 import QtQuick.Controls 2.15
import QtQuick.Layouts 1.3 import QtQuick.Layouts 1.15
import UM 1.3 as UM import UM 1.3 as UM
import Cura 1.7 as Cura import Cura 1.7 as Cura

2
resources/qml/WelcomePages/AddPrinterByIpContent.qml
View file

@ -3,7 +3,7 @@
import QtQuick 2.15 import QtQuick 2.15
import QtQuick.Controls 2.15 import QtQuick.Controls 2.15
import QtQuick.Layouts 1.3 import QtQuick.Layouts 1.15
import UM 1.3 as UM import UM 1.3 as UM
import Cura 1.5 as Cura import Cura 1.5 as Cura

2
resources/qml/WelcomePages/WhatsNewContent.qml
View file

@ -3,7 +3,7 @@
import QtQuick 2.15 import QtQuick 2.15
import QtQuick.Controls 2.15 import QtQuick.Controls 2.15
import QtQuick.Layouts 1.3 import QtQuick.Layouts 1.15
import UM 1.3 as UM import UM 1.3 as UM
import Cura 1.1 as Cura import Cura 1.1 as Cura