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

Merge branch '15.10'

Browse source 
* 15.10:
  Properly clear stored layer data
  Render SupportInfillType so support is rendered correctly again.
  Fix issues with crash handler and log file creation on Windows
  Bump version
  Make the UMO upgrade selection page work properly
  Update preference dialog to the changed API
  Disable crash handler if debug mode is not enabled
  Prevent crashes when centering an object
  Also disable output device selection when main save button is disabled
  Fix name of Low Quality profile
  Fix stdout/stderr output location so we do not output to UM but to cura
This commit is contained in:
Arjen Hiemstra 2015-10-06 12:21:09 +02:00
commit ae3705514f
10 changed files with 70 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

17
resources/qml/Cura.qml
View file

@ -465,14 +465,27 @@ UM.MainWindow
{
//; Remove & re-add the general page as we want to use our own instead of uranium standard.
removePage(0);
insertPage(0, catalog.i18nc("@title:tab","General") , "" , Qt.resolvedUrl("./GeneralPage.qml"));
insertPage(0, catalog.i18nc("@title:tab","General"), generalPage);
//: View preferences page title
insertPage(1, catalog.i18nc("@title:tab","View"), "view-preview", Qt.resolvedUrl("./ViewPage.qml"));
insertPage(1, catalog.i18nc("@title:tab","View"), viewPage);
//Force refresh
setPage(0)
}
Item {
visible: false
GeneralPage
{
id: generalPage
}
ViewPage
{
id: viewPage
}
}
}
Actions

12
resources/qml/SaveButton.qml
View file

@ -245,12 +245,22 @@ Rectangle {
anchors.rightMargin: UM.Theme.sizes.default_margin.width
width: UM.Theme.sizes.save_button_save_to_button.height
height: UM.Theme.sizes.save_button_save_to_button.height
enabled: base.progress > 0.99 && base.activity == true
//iconSource: UM.Theme.icons[UM.OutputDeviceManager.activeDeviceIconName];
style: ButtonStyle {
background: Rectangle {
id: deviceSelectionIcon
color: control.hovered ? UM.Theme.colors.load_save_button_hover : UM.Theme.colors.load_save_button
color: {
if(!control.enabled){
return UM.Theme.colors.button;
}
else if(control.enabled && control.hovered) {
return UM.Theme.colors.load_save_button_hover
} else {
return UM.Theme.colors.load_save_button
}
}
Behavior on color { ColorAnimation { duration: 50; } }
anchors.left: parent.left
anchors.leftMargin: UM.Theme.sizes.save_button_text_margin.width / 2;

6
resources/qml/WizardPages/SelectUpgradedParts.qml
View file

@ -46,21 +46,25 @@ Item
id: checkBox
text: catalog.i18nc("@option:check","Extruder driver ugrades")
checked: true
onClicked: UM.MachineManager.setMachineSettingValue("machine_extruder_drive_upgrade", true);
}
CheckBox
{
text: catalog.i18nc("@option:check","Heated printer bed (standard kit)")
y: checkBox.height * 1
onClicked: UM.MachineManager.setMachineSettingValue("machine_heated_bed", true)
}
CheckBox
{
text: catalog.i18nc("@option:check","Heated printer bed (self built)")
y: checkBox.height * 2
onClicked: UM.MachineManager.setMachineSettingValue("machine_heated_bed", true)
}
CheckBox
{
text: catalog.i18nc("@option:check","Dual extrusion (experimental)")
y: checkBox.height * 3
enabled: false;
}
}
@ -74,4 +78,4 @@ Item
}
ExclusiveGroup { id: printerGroup; }
}
}