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
Diego Prado Gesto
5b9c4e402e
Change the Back button to be a secondary button
...
Change also some texts in the More information dialog and the font type of one of the titles in the first use flow
Contributes to CURA-6483.
2019-05-02 15:38:19 +02:00
Lipu Fei
85822d6e73
Fix add by IP validator regex
...
CURA-6483
2019-05-02 15:30:11 +02:00
Lipu Fei
1e89ce3673
Merge remote-tracking branch 'origin/4.1' into CURA-6483_fix_add_by_ip
2019-05-02 14:06:07 +02:00
Lipu Fei
d0cc2dc8fa
Remove unneeded TODO
...
CURA-6495
2019-05-02 12:47:48 +02:00
Ghostkeeper
038a5b5942
Fix background of g-code text boxes having zero size
2019-05-02 08:46:46 +02:00
Lipu Fei
71e32d94f7
Resolve merge conflicts
...
CURA-6483
2019-05-02 07:45:43 +02:00
Diego Prado Gesto
9500d2d6b8
Modify text in the Send Slice data dialog, according to the experts.
...
Contributes to CURA-6434.
2019-05-01 15:53:54 +02:00
Diego Prado Gesto
5b06efdd19
Merge branch '4.1' of github.com:Ultimaker/Cura into 4.1
2019-05-01 15:51:12 +02:00
Diego Prado Gesto
32c8bbfb3c
Modify small UI things in the Add Printer dialog
2019-05-01 15:50:43 +02:00
Lipu Fei
0575fd283e
Fix manual printer device not up-to-date
...
CURA-6483
2019-05-01 15:12:08 +02:00
Lipu Fei
2b5d78a01a
Do not add unknown or non-host printers in add-by-ip
...
CURA-6483
2019-05-01 14:25:01 +02:00
Ghostkeeper
e750315708
Merge branch 'restyle_send_data' into 4.1
2019-05-01 14:13:25 +02:00
Lipu Fei
383b474bd7
Fix typo
...
CURA-6483
2019-04-30 15:27:29 +02:00
Lipu Fei
0e2815a748
Fix back button on add printer page
...
CURA-6483
2019-04-30 15:27:11 +02:00
Lipu Fei
40d26bbb6e
NetworkingUtil is included in Cura 1.5 QML
...
CURA-6483
2019-04-30 12:49:26 +02:00
