Jaime van Kessel
fbc4c5fb1e
Merge pull request #5719 from Ultimaker/CURA-6497_fix_empty_material_name
...
CURA-6497 Add validation for empty strings in SettingDefinition
2019-05-20 13:40:39 +02:00
Jaime van Kessel
5ae103964a
Merge branch 'CURA-6497_fix_empty_material_name' of github.com:Ultimaker/Cura into 4.1
2019-05-20 13:38:37 +02:00
Lipu Fei
0c15f69c44
Merge remote-tracking branch 'origin/4.1'
2019-05-17 15:01:40 +02:00
Lipu Fei
0555cbae4e
Fix add machine dialog state
2019-05-17 15:01:18 +02:00
Lipu Fei
33aae24d6d
Merge remote-tracking branch 'origin/4.1'
2019-05-17 14:41:52 +02:00
Lipu Fei
361636af29
Allow WizardDialog to resize
2019-05-17 14:30:18 +02:00
Diego Prado Gesto
a28ca19647
Change the font size
...
To make it consistent with the size of texts in the other Welcome pages.
2019-05-17 11:54:40 +02:00
Lipu Fei
be4e05c13f
Merge pull request #5393 from Ultimaker/feature_model_list
...
Add an object list/selector
2019-05-17 07:48:22 +02:00
Jaime van Kessel
f5e31060a6
Fixed unknown reference in qml
2019-05-16 16:44:29 +02:00
Lipu Fei
961f6403ad
Change preference key to cura/show_list_of_objects
2019-05-16 15:49:08 +02:00
Jaime van Kessel
ff0a18603b
Remove a few more usages of deprecated functions
2019-05-16 15:20:38 +02:00
Lipu Fei
28172c9ad2
Merge remote-tracking branch 'origin/master' into feature_model_list
2019-05-16 15:17:46 +02:00
Jaime van Kessel
a0c705e900
Remove usage of some deprecated functions
2019-05-16 14:49:53 +02:00
Jaime van Kessel
2eb8203c70
Merge branch 'master' of github.com:Ultimaker/Cura
2019-05-16 14:29:24 +02:00
Jaime van Kessel
99e6ec9509
Fix the last material qml warnings
2019-05-16 14:29:05 +02:00
Ghostkeeper
0352553193
Read resolved value for adhesion type
...
We still write to the value property.
We need the resolved value because we want to read from the extruder stacks which may overwrite the adhesion type in a profile.
Contributes to issue CURA-6182.
2019-05-16 14:28:10 +02:00
Ghostkeeper
f3ea522811
Use === to compare strings in JavaScript
2019-05-16 14:28:09 +02:00
Jaime van Kessel
bfe1275d46
Fix a number of QML warnings
2019-05-16 14:23:09 +02:00
Lipu Fei
1bed5c9c11
Merge remote-tracking branch 'origin/4.1' into CURA-6497_fix_empty_material_name
2019-05-15 08:40:45 +02:00
Ghostkeeper
f4dac40f8b
Merge branch '4.1'
...
Conflicts:
resources/i18n/es_ES/cura.po -> Correction to Spanish translations while we generated new templates on 4.1.
2019-05-14 14:50:36 +02:00
Lipu Fei
d1805d34be
Move background to ScrollView for GcodeTextArea
2019-05-14 11:44:14 +02:00
Lipu Fei
7c1d589528
Merge remote-tracking branch 'origin/4.1' into CURA-6497_fix_empty_material_name
2019-05-14 09:42:57 +02:00
Ghostkeeper
03d96f3fb5
Merge branch '4.1'
2019-05-13 17:11:39 +02:00
Diego Prado Gesto
cac4b8b7f1
Remove useless comment line
2019-05-13 13:34:13 +02:00
Diego Prado Gesto
233013c946
Cache a lot of items in the list so there are no glitches
2019-05-13 13:23:10 +02:00
Ghostkeeper
350dd5db3c
Correct positioning of tooltip for g-code text area
2019-05-10 11:32:40 +02:00
Ghostkeeper
67a5490907
Show tooltip on top of control elements
2019-05-10 11:09:56 +02:00
Ellecross
d5de401dfa
Add the ids for the menu buttons to be used in Squish.
2019-05-09 16:38:06 +02:00
Diego Prado Gesto
f0ccb2504f
Merge pull request #5720 from Ultimaker/add_id_for_custom_profiles
...
Added id to the profile page in preferences to identify custom profiles
2019-05-09 16:27:48 +02:00
Jaime van Kessel
4bc348ba49
Merge branch '4.1' of github.com:Ultimaker/Cura
2019-05-09 15:11:37 +02:00
Satish
f4c00c460d
Added id to the profile page in preferences to identify custom profiles
2019-05-09 14:05:04 +02:00
Lipu Fei
2054413952
Add handling for ValidatorState.Invalid
...
CURA-6497
ValidatorState.Invalid is set if a string setting has allow_empty =
False and its value is empty.
2019-05-09 12:07:16 +02:00
Diego Prado Gesto
111430c9c2
Catch scroll events and not propagate them to the main view
2019-05-09 11:37:59 +02:00
Lipu Fei
602258bb4a
Fix machine name
...
CURA-6510
2019-05-09 09:45:30 +02:00
Ghostkeeper
2c676a3643
Merge branch '4.1'
2019-05-08 10:24:39 +02:00
Ghostkeeper
5b8d2243f7
Change time/material 'specification' into 'estimation'
...
Because that's what it is and how you should use it.
2019-05-08 10:24:21 +02:00
Ghostkeeper
dfeb71992a
Remove custom text property in materials brand section
...
It was duplicating the sectionName property.
Contributes to issue CURA-6302.
2019-05-07 14:27:39 +02:00
Satish
3b4e253e98
Added ids to materials for squish tests
...
-Added a text property to MaterialsBrandSection
-Added ids to materials menu buttons
2019-05-07 12:37:42 +02:00
Diego Prado Gesto
9e5e57e6c5
Merge branch 'master' into feature_model_list
2019-05-07 11:57:31 +02:00
Diego Prado Gesto
6708d9da64
Merge branch '4.1'
2019-05-07 11:49:45 +02:00
Lipu Fei
53d595f698
Use loader for machine actions in dialog
...
CURA-6495
2019-05-06 13:06:23 +02:00
Jaime van Kessel
c786770a44
Remove usage of deprecated functions
2019-05-03 13:52:45 +02:00
Jaime van Kessel
c3a373e2a2
Remove usages of deprecated activeMachineName
2019-05-03 13:38:06 +02:00
Jaime van Kessel
08b79a93be
Merge branch 'master' of github.com:Ultimaker/Cura
2019-05-03 13:17:27 +02:00
Jaime van Kessel
d42f446d70
Remove usages of deprecated function
2019-05-03 13:17:10 +02:00
Lipu Fei
2601e485da
Merge remote-tracking branch 'origin/4.1'
2019-05-03 10:47:16 +02:00
Satish
18630fa2f1
Added several ids to be used in integration tests:
...
-Marketplace, printer pref, add/manage printer from main mnu, print settings
2019-05-03 09:35:17 +02:00
Jaime van Kessel
6bbdfbb31d
Merge branch 'CURA-6483_fix_add_by_ip' of github.com:Ultimaker/Cura into 4.1
2019-05-03 09:25:30 +02:00
Lipu Fei
7d4c821551
Prevent auto selecting an invalid printer
...
CURA-6483
2019-05-03 08:49:39 +02:00
Diego Prado Gesto
be3f194aaa
Use a disabled rectangle instead of an empty space in the XRay view
...
To keep consistency with what happens in the prepare page when a printer doesn't have material or variants.
Contributes to CURA-6469.
2019-05-02 16:00:17 +02:00
