Lipu Fei
67c11b8cdf
Fix code style
...
CURA-4503
2017-10-31 09:24:32 +01:00
Chris ter Beke
9806ec7374
Resolve merge conflicts with master - CURA-4482
2017-10-31 09:22:03 +01:00
ChrisTerBeke
d718e6e36c
Create extruder stack for single extruder machines on start - CURA-4482
2017-10-31 09:08:20 +01:00
fieldOfView
8dfba9a318
Stop SettingTextField from setting values when getting/losing the focus
...
Fixes #2694
2017-10-30 15:31:14 +01:00
Aleksei S
22aaf64b63
Simplified version for validation need to show user agreement
...
CURA-4501
2017-10-30 14:42:46 +01:00
fieldOfView
2d109090bc
Show material name instead of extruder number
2017-10-30 12:40:41 +01:00
fieldOfView
fc7d1210cf
Fix qml binding loop
2017-10-30 12:31:46 +01:00
fieldOfView
6fa4dd0a97
Fix qml binding loops
2017-10-30 12:26:02 +01:00
fieldOfView
84002a70d0
Remove binding loop by cleaning up tooltipText creation
2017-10-30 11:50:57 +01:00
Ghostkeeper
839c8ccc52
Fix 'Could not get metadata of container <empty string>'
...
Turns out that the side bar header was requesting the metadata before the active material was set. Now I'm just saying that if the active material was not set, it should not be compatible.
Contributes to issue CURA-4243, side-ways.
2017-10-30 11:15:41 +01:00
Lipu Fei
c0f1af94ab
Show Add Machine dialog after User Agreement dialog is closed
...
CURA-4501
2017-10-30 10:33:50 +01:00
fieldOfView
6d4ea381f0
Create cost specification tooltip
2017-10-29 11:47:49 +01:00
fieldOfView
0372475560
Rearrange print specs area
...
* remove superfluous "Print time" label
* format print time tooltip
* add elide to cost spec
* add (empty) cost spec tooltip
2017-10-29 10:09:52 +01:00
fieldOfView
6a0ba43508
Make sure monitor buttons do not extend sidebar
2017-10-29 10:07:42 +01:00
fieldOfView
208d365d51
Make sure saveRow does not extend sidebar
2017-10-29 09:20:59 +01:00
fieldOfView
177295999b
Allow richer markup in tooltips
2017-10-29 09:19:50 +01:00
Jaime van Kessel
fbdc9ed223
Added reload qml action
2017-10-27 16:35:09 +02:00
Mark
334283e893
Found some more margins that wouldnt be fixed numbers and made the code more consistent
2017-10-27 14:12:35 +02:00
Mark
6c04a8be5d
same font for checkbox label and some layout anchors
2017-10-27 13:48:55 +02:00
Aleksei S
ee228155af
Remove unnecessary properties which after update triggered view rendering
...
CURA-4062
2017-10-27 09:24:31 +02:00
Diego Prado Gesto
92ac7c5a15
Merge branch 'CURA-4451_not_support_container'
2017-10-26 16:55:17 +02:00
Aleksei S
938ae5af1d
Added function to catch prepare and monitor button click
...
CURA-4062
2017-10-26 14:36:23 +02:00
fieldOfView
fff9330949
Merge branch 'master' into fix_is_clustersize
...
# Conflicts:
# plugins/UM3NetworkPrinting/UM3InfoComponents.qml
# resources/qml/Menus/MaterialMenu.qml
# resources/qml/Menus/NozzleMenu.qml
2017-10-26 11:09:13 +02:00
ChrisTerBeke
b1a4c3488f
Merge branch 'master' into CURA-4451_not_support_container
2017-10-26 09:48:52 +02:00
Chris ter Beke
b95ba24530
Remove some changes, debugging - CURA-4451
...
WIP - CURA-4451
correctly show not supported when any of the extruders has a not supported profile - CURA-4451
Clean up and add comments - CURA-4451
2017-10-26 09:23:27 +02:00
Lipu Fei
e4fec1f63d
Move SaveButton downwards
...
CURA-4490
Move SaveButton downwards so it doesn't overlay with the estimated print
time in some language.
2017-10-25 16:35:38 +02:00
Diego Prado Gesto
87ba4056ee
CURA-4485 Minor changes
2017-10-25 13:55:30 +02:00
fieldOfView
ff847aa329
Fix qml error when there is no connected printer
...
Also fixes code style
2017-10-25 11:52:43 +02:00
Diego Prado Gesto
0eedfa5c18
CURA-4485 Disabling automatic material and variant when connecting to a
...
printer within a cluster of more than 1 printer.
2017-10-24 15:45:20 +02:00
fieldOfView
7dc4975b36
Tweak layout and texts
2017-10-24 11:33:47 +02:00
fieldOfView
46fc478f9d
Tweak disabled appearance
2017-10-24 11:15:33 +02:00
fieldOfView
a9f2ad7ca3
Hide manual controls for outputdevices that don't support it
2017-10-24 11:03:51 +02:00
ChrisTerBeke
b50f027c83
Add not supported role to profiles model
2017-10-24 10:25:53 +02:00
fieldOfView
6294900bc7
Disable controls when manual control is not available
2017-10-24 10:23:07 +02:00
ChrisTerBeke
35684e0aa4
Move profiles dropdown text generator to separate method
2017-10-24 09:57:48 +02:00
fieldOfView
9cd8869382
Add settable jog distance
2017-10-23 22:27:05 +02:00
fieldOfView
56fa7036b3
Add controls for jogging the head/bed
2017-10-23 21:27:53 +02:00
ChrisTerBeke
3794ae16ae
Dont show layer height text in profiles drop down when there is not layer height set - CURA-4451
2017-10-23 17:41:58 +02:00
ChrisTerBeke
ff732720ca
Set quality slider active index to -1 for user created profile, fix for CURA-4466
2017-10-23 12:45:07 +02:00
Diego Prado Gesto
eb0b08a813
CURA-4470 Hide quality slider handle when quality profile doesn't exist
2017-10-22 18:35:05 +02:00
Diego Prado Gesto
d2d28fbdfb
CURA-4470 Fix quality slider not selecting correct quality profile
...
Compare selected quality by quality_type instead of id when loading a
project file from older versions of Cura.
2017-10-19 20:49:11 +02:00
ChrisTerBeke
30281f17f3
Add simple mode settings flag for user created profile - CURA-4466
2017-10-19 17:03:31 +02:00
Ghostkeeper
5a125aa514
Rename printCoreRow to variantRow
...
Because on only one of our printers it's actually a print core. Internally we've always called it the variant.
2017-10-19 13:38:08 +02:00
Lipu Fei
946b8ae92d
Remove executable bit for non-executable files
2017-10-19 10:28:57 +02:00
ChrisTerBeke
3ddb277477
Remove double sidebar header item, fixes #2605
2017-10-18 16:01:14 +02:00
ChrisTerBeke
b2dbefc823
Update helper text for custom changes in recommended settings - CURA-4333
2017-10-18 15:44:02 +02:00
Lipu Fei
fae65d7b83
Minor fixes for customized profile in simple mode
...
CURA-4333
- Update comments
- Disable the quality slider when there is a customized profile
2017-10-16 13:26:28 +02:00
Lipu Fei
9b8dc9bf55
Move simple-mode settings customization check into a separate file
...
CURA-4333
Simple-mode is a special mode so it makes more sense to put those code
in a separate file instead of in the more generic MachineManager.
2017-10-16 13:18:11 +02:00
Lipu Fei
e1234a09aa
Add the missing parseInt()s back
...
CURA-4333
2017-10-16 11:42:13 +02:00
Lipu Fei
94a624e105
Merge branch 'master' into CURA-4333_Notification_icon_for_recommended_mode
2017-10-16 11:37:55 +02:00
