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

Update QtGraphicalEffects, Window and Dialogs

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

2
resources/qml/Account/AvatarImage.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 QtGraphicalEffects 1.0 import QtGraphicalEffects 1.12
import UM 1.4 as UM import UM 1.4 as UM

2
resources/qml/ActionButton.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 QtGraphicalEffects 1.0 // For the dropshadow import QtGraphicalEffects 1.12 // For the dropshadow
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/Cura.qml
View file

@ -6,7 +6,7 @@ import QtQuick.Controls 1.4
import QtQuick.Controls.Styles 1.4 import QtQuick.Controls.Styles 1.4
import QtQuick.Layouts 1.15 import QtQuick.Layouts 1.15
import QtQuick.Dialogs 1.3 import QtQuick.Dialogs 1.3
import QtGraphicalEffects 1.0 import QtGraphicalEffects 1.12
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/Dialogs/AboutDialog.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.Window 2.1 import QtQuick.Window 2.15
import UM 1.1 as UM import UM 1.1 as UM

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

@ -6,7 +6,7 @@ import QtQuick.Controls 1.4
import QtQuick.Controls.Styles 1.4 import QtQuick.Controls.Styles 1.4
import QtQuick.Layouts 1.15 import QtQuick.Layouts 1.15
import QtQuick.Dialogs 1.3 import QtQuick.Dialogs 1.3
import QtQuick.Window 2.1 import QtQuick.Window 2.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

2
resources/qml/Dialogs/DiscardOrKeepProfileChangesDialog.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.3 import QtQuick.Dialogs 1.3
import QtQuick.Window 2.1 import QtQuick.Window 2.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/Dialogs/OpenFilesIncludingProjectsDialog.qml
View file

@ -6,7 +6,7 @@ import QtQuick.Controls 1.4
import QtQuick.Controls.Styles 1.4 import QtQuick.Controls.Styles 1.4
import QtQuick.Layouts 1.15 import QtQuick.Layouts 1.15
import QtQuick.Dialogs 1.3 import QtQuick.Dialogs 1.3
import QtQuick.Window 2.1 import QtQuick.Window 2.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

2
resources/qml/Dialogs/WorkspaceSummaryDialog.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.Layouts 1.15 import QtQuick.Layouts 1.15
import QtQuick.Window 2.2 import QtQuick.Window 2.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/EmptyViewMenuComponent.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 QtGraphicalEffects 1.0 // For the dropshadow import QtGraphicalEffects 1.12 // For the dropshadow
import UM 1.2 as UM import UM 1.2 as UM

2
resources/qml/ExpandableComponent.qml
View file

@ -7,7 +7,7 @@ import QtQuick.Controls 2.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
import QtGraphicalEffects 1.0 // For the dropshadow import QtGraphicalEffects 1.12 // For the dropshadow
// The expandable component has 2 major sub components: // The expandable component has 2 major sub components:
// * The headerItem; Always visible and should hold some info about what happens if the component is expanded // * The headerItem; Always visible and should hold some info about what happens if the component is expanded

2
resources/qml/ExpandablePopup.qml
View file

@ -7,7 +7,7 @@ import QtQuick.Controls 2.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
import QtGraphicalEffects 1.0 // For the dropshadow import QtGraphicalEffects 1.12 // For the dropshadow
// The expandable component has 2 major sub components: // The expandable component has 2 major sub components:
// * The headerItem; Always visible and should hold some info about what happens if the component is expanded // * The headerItem; Always visible and should hold some info about what happens if the component is expanded

2
resources/qml/FPSItem.qml
View file

@ -1,5 +1,5 @@
import QtQuick 2.15 import QtQuick 2.15
import QtQuick.Window 2.2 import QtQuick.Window 2.15
import UM 1.3 as UM import UM 1.3 as UM
// This is an QML item that shows the FPS and a running average of the FPS. // This is an QML item that shows the FPS and a running average of the FPS.

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

@ -8,7 +8,7 @@ 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
import QtGraphicalEffects 1.0 import QtGraphicalEffects 1.12
import "../Account" import "../Account"

2
resources/qml/Menus/ContextMenu.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.3 import QtQuick.Dialogs 1.3
import QtQuick.Window 2.1 import QtQuick.Window 2.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/Preferences/MachinesPage.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.Window 2.1 import QtQuick.Window 2.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/WelcomePages/WelcomeDialogItem.qml
View file

@ -3,8 +3,8 @@
import QtQuick 2.15 import QtQuick 2.15
import QtQuick.Controls 2.15 import QtQuick.Controls 2.15
import QtQuick.Window 2.2 import QtQuick.Window 2.15
import QtGraphicalEffects 1.0 // For the DropShadow import QtGraphicalEffects 1.12 // For the DropShadow
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/WelcomePages/WizardDialog.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.Window 2.2 import QtQuick.Window 2.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