Diego Prado Gesto
|
39aa5fedf5
|
Update some widgets to Qt Controls 2
The ScrollView generated some wobbling text (mainly in macOS)
|
2019-05-07 10:50:59 +02:00 |
|
Diego Prado Gesto
|
3390cca2d9
|
Clean up the ToolboxProgressButton
|
2019-05-07 09:31:56 +02:00 |
|
Diego Prado Gesto
|
5c3a608e1a
|
Small changes in the qml code for the compatibility chart
|
2019-05-07 09:10:28 +02:00 |
|
Diego Prado Gesto
|
c3f3b8dd93
|
Change links and compatibility chart.
|
2019-05-07 08:58:45 +02:00 |
|
Ghostkeeper
|
1736a02d28
|
Merge branch '4.1'
|
2019-05-06 10:27:14 +02:00 |
|
Ghostkeeper
|
15706b7696
|
Fix colour of prime tower
|
2019-05-06 10:26:53 +02:00 |
|
Jaime van Kessel
|
979b29400a
|
Merge branch '4.1' of github.com:Ultimaker/Cura
|
2019-05-03 14:12:07 +02:00 |
|
Jaime van Kessel
|
e363f1af94
|
Remove hardcoded references to Ultimaker machines in QML
We shouldn't hardocode machines in QML in any case. It also created issues
for other monitor / connection flows.
|
2019-05-03 14:10:21 +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
|
5a25f8e050
|
Merge branch '4.1' of github.com:Ultimaker/Cura
|
2019-05-03 13:19:34 +02:00 |
|
Jaime van Kessel
|
2e90078ec7
|
Fix incorrect deprecation message
|
2019-05-03 13:19:17 +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 |
|
Ghostkeeper
|
4910bc006b
|
Move platform mesh a bit down
This way it's outside of the build volume.
Contributes to issue CURA-6505.
|
2019-05-03 10:58:48 +02:00 |
|
Ghostkeeper
|
9463a288d8
|
Merge branch 'master' of https://github.com/markbernard/Cura into markbernard-master
|
2019-05-03 10:53:06 +02:00 |
|
Lipu Fei
|
2601e485da
|
Merge remote-tracking branch 'origin/4.1'
|
2019-05-03 10:47:16 +02:00 |
|
Jaime van Kessel
|
23e5a6090c
|
Merge branch 'CURA-6492_change_prime_tower_resolve' of github.com:Ultimaker/Cura into 4.1
|
2019-05-03 10:40:31 +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
|
f89ba25faa
|
enable prime tower when adhesion is none or skirt
CURA-6492
|
2019-05-03 09:21:54 +02:00 |
|
Lipu Fei
|
7d4c821551
|
Prevent auto selecting an invalid printer
CURA-6483
|
2019-05-03 08:49:39 +02:00 |
|
Mark Bernard
|
7a010ead56
|
Add files via upload
Add Anet A6 platform to Cura printer definitions
|
2019-05-02 12:12:31 -04:00 |
|
Mark Bernard
|
c5b903b2c2
|
Create anet_a6_extruder_0.def.json
Add Anet A6 extruder to Cura printer definitions
|
2019-05-02 12:11:15 -04:00 |
|
Mark Bernard
|
9e45493587
|
Create anet_a6.def.json
Add Anet A6 printer to Cura printer definitions
|
2019-05-02 12:10:25 -04: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 |
|
Lipu Fei
|
5fee82bcb7
|
Fix machine settings page
CURA-6495
|
2019-05-02 09:46:00 +02:00 |
|
Lipu Fei
|
b9d8b89113
|
Fix number of extruders not being updated
|
2019-05-02 09:03:48 +02:00 |
|
Ghostkeeper
|
d4b17735ad
|
Merge branch '4.1'
|
2019-05-02 08:51:22 +02:00 |
|
Ghostkeeper
|
038a5b5942
|
Fix background of g-code text boxes having zero size
|
2019-05-02 08:46:46 +02:00 |
|
Lipu Fei
|
1d4ab98ddc
|
Fix binding loop
CURA-6483
|
2019-05-02 08:25:29 +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 |
|
Ian Paschal
|
7d9b0e0b82
|
Merge pull request #5677 from Ultimaker/fix_rendering_issues
Fix rendering issues in Monitor Page
|
2019-05-01 15:28:16 +02:00 |
|
Lipu Fei
|
0575fd283e
|
Fix manual printer device not up-to-date
CURA-6483
|
2019-05-01 15:12:08 +02:00 |
|
Ghostkeeper
|
b9284e3e83
|
Merge branch '4.1'
|
2019-05-01 14:41:36 +02:00 |
|
Ghostkeeper
|
ab0cef95e8
|
Sort secondarily by printer name
Makes it a bit easier to find printers.
Implements a suggestion from Reddit: https://www.reddit.com/r/ultimaker/comments/bj0txe/any_way_to_have_the_printers_sorted_on/
|
2019-05-01 14:38:55 +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
|
154efdf14d
|
Merge branch '4.1'
|
2019-05-01 14:13:44 +02:00 |
|
Ghostkeeper
|
e750315708
|
Merge branch 'restyle_send_data' into 4.1
|
2019-05-01 14:13:25 +02:00 |
|
Ghostkeeper
|
15fae58d9b
|
Use text wrapping so it's scrollable in Qt 5.12
I don't know if it's really in Qt 5.12 or maybe it's the Ubuntu implementation or whatever. But this works for me now.
Contributes to issue CURA-6434.
|
2019-05-01 14:13:10 +02:00 |
|
Ghostkeeper
|
7258ad8dc2
|
Fix nesting of ULs
A <ul> tag is only allowed to have <li> tags inside it, so the nested <ul> tag needs to be inside the <li> tag.
Contributes to issue CURA-6434.
|
2019-05-01 14:08:53 +02:00 |
|
Ghostkeeper
|
8d6136bcf3
|
Don't crash when materials are not registered
It can't update the nodes structure with the links between materials then.
Contributes to issue CURA-6444.
|
2019-05-01 13:14:40 +02:00 |
|
Lipu Fei
|
c26dbfd934
|
Improve example data HTML
CURA-6434
|
2019-05-01 10:27:16 +02:00 |
|