276 Commits

Author SHA1 Message Date
Jaime van Kessel
987ff1737f Remove unused background from PrintSetupSelector
CURA-5785
2018-11-12 11:27:54 +01:00
Jaime van Kessel
88b57518d9 Fix codestyle
CURA-5785
2018-11-12 11:24:11 +01:00
Diego Prado Gesto
ef0ba81564 Merge branch 'ui_rework_4_0' into cura4.0_header 2018-11-01 09:21:33 +01:00
Ghostkeeper
a5c2a73487
Fix adhesion type checkbox if default is skirt
The remove-unused-values feature doesn't work with settings that are resolved, because we try to remove them at the appropriate position in the stack but then we check at that position in the stack if the value is not the same as what it was, but with this check the resolve function is no longer evaluated. It's complex, but hard to solve because we can't try to remove it at this location and predict that this will change the actual final value after the resolve function has done its thing.

Contributes to issue CURA-5877.
2018-10-31 13:09:15 +01:00
Diego Prado Gesto
90e8a05aab Remove all the entries in the theme that make reference to the sidebar,
because there is no sidebar anymore.

Several different margins and linings were created depending on the
side, not depending on where it belongs.

Contributes to CURA-5784.
2018-10-26 17:51:28 +02:00
Diego Prado Gesto
046fca5d0f Align the "Enable Gradual" text with the corresponding checkbox. 2018-10-01 10:46:45 +02:00
Jaime van Kessel
4cde6c05ae Switch most usages of containerStackId to containerStack for settingPropertyProvider
This mostly makes the code a bit more logic and also decreases the number of searches in the registry
2018-09-07 15:23:09 +02:00
Ghostkeeper
02a3067a0c
Reset infill line distance when changing density via recommended mode
Otherwise the change has no effect.

Contributes to issue CURA-5324.
2018-06-04 16:58:13 +02:00
Ghostkeeper
bd145c451b
Brackets on new line
As far as I've seen them when I scrolled through this.

Contributes to issue CURA-5324.
2018-06-04 16:49:49 +02:00
Ghostkeeper
1488f965b7
Scale height of slider hover area with screenScaleFactor
This way it scales along with the high-resolution screen scaling for high-DPI screens.
2018-04-13 11:43:43 +02:00
Ian Paschal
a7b2632739 CURA-4400 Recommended mode shows support extruders 2018-03-20 13:14:48 +01:00
Lipu Fei
518423f25b Fix broken settingsEnabled 2018-03-16 10:14:08 +01:00
Lipu Fei
f14ddb8711 Fix reset to default quality 2018-03-15 17:09:13 +01:00
Lipu Fei
3bb0a481f1 Simplify default quality reset 2018-03-15 17:01:05 +01:00
Aleksei S
b8ab623c80 Fix: Infill slider did not work at first Cura start
CURA-5071
2018-03-15 16:54:39 +01:00
Lipu Fei
d6b270954a Fix the case when no quality is available
CURA-5044

The tooltip should also show up if there is no quality available.
2018-03-14 13:11:24 +01:00
Lipu Fei
fcd50b0cf2 Fix code style
CURA-5044
2018-03-14 13:10:58 +01:00
Aleksei S
160a59191b Show Tooltip for the unavailable slider's area
CURA-5044
2018-03-14 11:45:00 +01:00
Ian Paschal
d10f0f7781 CURA-5071 Added brackets 2018-03-13 13:29:00 +01:00
Aleksei S
73517cd176 The infill denstiy was updated twice, first in Custom view and then in Recomended view
CURA-5071
2018-03-13 11:41:48 +01:00
Mark
981c47ed87 Put the support extruder dropdown behind the checkbox to prevent scrolling 2018-03-12 17:03:10 +01:00
Jack Ha
53764a8274 CURA-4400 use extrudersEnabledCount for recommended mode's extruder number visibility 2018-03-08 15:39:23 +01:00
Jack Ha
961b868424 CURA-4400 fix updating quality slider 2018-03-08 09:47:22 +01:00
Jack Ha
bad637eb14 CURA-4400 fixed merge conflicts 2018-03-05 16:47:40 +01:00
Jaime van Kessel
2de587a8c6 Made some changes so the code also works with lower versions of Qt & pyQt 2018-03-05 15:32:46 +01:00
Lipu Fei
e87077802f Change to layer_height and layer_height_unit 2018-03-01 15:55:44 +01:00
Lipu Fei
06ec16d627 Rename quality drop down menu models 2018-03-01 15:37:48 +01:00
Jack Ha
ac76d6ea52 Merge branch 'refactoring_machine_manager' into feature_enable_disable_extruder 2018-03-01 13:14:10 +01:00
Jack Ha
86c13e86c7 CURA-4400 first version that disables extruder and updates available quality profiles 2018-02-28 12:56:00 +01:00
Lipu Fei
6b0095014a Fix merge conflicts from master 2018-02-28 12:52:45 +01:00
Lipu Fei
7f5bb70bee Remove redundant setProperties
CURA-4916
2018-02-28 12:46:00 +01:00
Aleksei S
e533c4604c Update infill scroll bar if setting is changed in custom mode
CURA-4916
2018-02-28 10:52:46 +01:00
Jack Ha
01071da4c1 CURA-4606 corrected slider bar, it now updates correctly from 0 available qualities to 1 available quality 2018-02-27 16:33:37 +01:00
Lipu Fei
495fc8bbd7 WIP: Refactor BuildPlateModel and split MultiBuildPlateModel 2018-02-17 22:24:05 +01:00
Lipu Fei
236bd09d08 WIP: Refactor quality model files 2018-02-17 14:58:56 +01:00
Lipu Fei
1a19175b35 WIP: Fix quality sliderbar 2018-02-17 13:36:25 +01:00
Ghostkeeper
ee9de1f11b
Merge branch '3.2'
Lots of conflicts due to rounding vs. flooring of text element positions for weirdness with the font aliasing.
2018-02-14 10:53:51 +01:00
Mark
b531c0550d Change Math.floor to Math.round as a last try to fix garbled fonts
CURA-4941
2018-02-14 09:28:47 +01:00
Ghostkeeper
03b4213e92
Merge branch '3.2'
Conflicts in Cura.qml and SaveButton.qml from people fixing positioning rounding at the same time...
2018-02-12 13:10:24 +01:00
Ian Paschal
72788445ab Added one more floor 2018-02-12 11:49:14 +01:00
Mark
461da709ff Checked all divisions (again..) and multiplications on rounding errors
CURA-4941
2018-02-10 12:45:36 +01:00
Mark
b52bf6decf resolve conflict 2018-02-09 13:01:56 +01:00
Mark
8fca183a5e Fix rounding errors for garbled text
CURA-4941
2018-02-09 11:30:56 +01:00
ChrisTerBeke
b2d3d15011 Fix conflicts 2018-01-11 09:06:59 +01:00
Jaime van Kessel
ed9634ebe0 Merge branch 'master' of github.com:Ultimaker/Cura into network_rewrite 2018-01-08 10:56:12 +01:00
Tyler Gibson
203fc37c7c Merge branch 'master' into malyan_m200
# Conflicts:
#	resources/qml/SidebarSimple.qml

Resolving with updated 2 digit truncation
2018-01-07 22:54:56 -08:00
Lipu Fei
8c98ab027a Fix code style
CURA-4758
2018-01-05 11:55:18 +01:00
Lipu Fei
223d9b6025 Update QtQuick import versions
CURA-4758
2018-01-05 11:55:18 +01:00
Lipu Fei
65e8762546 Fix layer height slider update issue
CURA-4758
2018-01-05 11:55:17 +01:00
Aleksei S
43db2ee2f9 Added ElideRight for the text which is out of boundaries
CURA-4692
2018-01-03 10:34:23 +01:00