Skip to content

Commit 9b3e784

Browse files
committed
Refactor version detection
1 parent 5eaa64d commit 9b3e784

File tree

3 files changed

+13
-17
lines changed

3 files changed

+13
-17
lines changed

resources/qml/PrintSetupSummary.qml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,8 +91,6 @@ Cura.RoundedRectangle
9191

9292
source:
9393
{
94-
var isLE410 = (CuraSDKVersion <= "7.6.0")
95-
var isLE413 = (CuraSDKVersion <= "7.9.0") && UM.Application.version != "master" && UM.Application.version != "dev"
9694
if(isLE410) {
9795
return "ExtruderTabs40.qml";
9896
} else if (isLE413) {

resources/qml/SidebarContents.qml

Lines changed: 9 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -33,20 +33,16 @@ Cura.RoundedRectangle
3333
height: UM.Theme.getSize("setting_control").height + UM.Theme.getSize("default_margin").height
3434
source:
3535
{
36-
var isGE44 = (CuraSDKVersion >= "7.0.0");
37-
var isGE50 = (CuraSDKVersion >= "8.0.0");
38-
var isGE51 = (CuraSDKVersion >= "8.1.0");
39-
var isGE53 = (CuraSDKVersion >= "8.3.0") || UM.Application.version == "master" || UM.Application.version == "dev";
40-
if (isGE53) {
41-
return "ProfileSelector53.qml";
42-
}else if (isGE51) {
43-
return "ProfileSelector51.qml";
44-
} else if(isGE50) {
45-
return "ProfileSelector50.qml";
46-
} else if(isGE44) {
36+
if(isLE43) {
37+
return "ProfileSelector40.qml";
38+
} else if(isLE413) {
4739
return "ProfileSelector44.qml";
40+
} else if(isLE50) {
41+
return "ProfileSelector50.qml";
42+
} else if(isLE52) {
43+
return "ProfileSelector51.qml";
4844
} else {
49-
return "ProfileSelector40.qml";
45+
return "ProfileSelector53.qml";
5046
}
5147
}
5248
}
@@ -89,8 +85,6 @@ Cura.RoundedRectangle
8985

9086
source:
9187
{
92-
var isLE410 = (CuraSDKVersion <= "7.6.0")
93-
var isLE413 = (CuraSDKVersion <= "7.9.0") && UM.Application.version != "master" && UM.Application.version != "dev"
9488
if(isLE410) {
9589
return "ExtruderTabs40.qml";
9690
} else if (isLE413) {
@@ -158,7 +152,7 @@ Cura.RoundedRectangle
158152
Component.onCompleted:
159153
{
160154
configurationMenu.contentItem.children[1].visible = false // separator
161-
if(!isGE50)
155+
if(isLE413)
162156
{
163157
configurationMenu.contentItem.children[0].x = 2 * UM.Theme.getSize("default_margin").width // extruder config
164158
configurationMenu.contentItem.children[2].x = UM.Theme.getSize("default_margin").width // Custom/Configurations

resources/qml/SidebarStageMenu.qml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,12 @@ Item
1212
id: stageMenu
1313

1414
property bool is40
15+
property bool isLE43
1516
property bool isLE44
1617
property bool isLE46
1718
property bool isLE410
1819
property bool isLE413
20+
property bool isLE50
1921
property bool isLE51
2022
property bool isLE52
2123

@@ -31,10 +33,12 @@ Item
3133
Component.onCompleted:
3234
{
3335
is40 = (CuraSDKVersion == "6.0.0")
36+
isLE43 = (CuraSDKVersion <= "6.3.0")
3437
isLE44 = (CuraSDKVersion <= "7.0.0")
3538
isLE46 = (CuraSDKVersion <= "7.2.0")
3639
isLE410 = (CuraSDKVersion <= "7.6.0")
3740
isLE413 = (CuraSDKVersion <= "7.9.0")
41+
isLE50 = (CuraSDKVersion <= "8.0.0")
3842
isLE51 = (CuraSDKVersion <= "8.1.0")
3943
isLE52 = (CuraSDKVersion <= "8.2.0") && UM.Application.version != "master" && UM.Application.version != "dev"
4044
if(is40)

0 commit comments

Comments
 (0)