Diego Prado Gesto
be81d4c4cc
Merge branch 'master' of github.com:Ultimaker/Cura
2018-05-04 15:01:16 +02:00
Ian Paschal
4a2e36978e
Merge remote-tracking branch 'origin/master' into CURA-5296_bundled_packages
2018-05-04 15:00:40 +02:00
Diego Prado Gesto
8c4dc1cc2b
CURA-5264 Don't need the if statement since the hardware-typeid is the
...
right value to look at and it is in the firmware api.
2018-05-04 14:59:59 +02:00
Ian Paschal
858108920a
Merge pull request #3765 from fieldOfView/fix_toolbox_appearance
...
Fix toolbox appearance
2018-05-04 14:25:01 +02:00
Diego Prado Gesto
a3028e2c7d
Merge branch 'master' of github.com:Ultimaker/Cura
2018-05-04 14:04:13 +02:00
Diego Prado Gesto
b00d51a6eb
CURA-4644 Set the property in the component where is being used.
2018-05-04 14:03:26 +02:00
Ghostkeeper
736f28bdb9
Move platform model slightly further down
...
Otherwise it clips with the build volume. This looks much nicer.
2018-05-04 13:30:28 +02:00
Diego Prado Gesto
6b214d2443
CURA-4644 Change the return type to QObject
2018-05-04 13:05:29 +02:00
fieldOfView
4e305079ec
Simplify
2018-05-04 11:42:45 +02:00
fieldOfView
1f675f505f
Tweak margins
2018-05-04 10:42:03 +02:00
fieldOfView
89322b9db6
Move toolbox button style into theme
2018-05-04 10:41:45 +02:00
Aleksei S
4a26cf0cbd
Merge branch 'master' of github.com:Ultimaker/cura
2018-05-04 10:30:03 +02:00
Aleksei S
dfd9283ed5
Project name after importing
...
CURA-5323
2018-05-04 10:29:09 +02:00
Lipu Fei
051dd7a6e9
WIP: Make application initialization and start up more clear
...
- Create SingleInstance class to handling single instance stuff.
- Instead of calling getInstance() everywhere, initialize each object
explicitly in order when application starts and getInstance()s do not
create instances any more and they merely return the created
instances.
- Only set initial values in construtor functions __init__(). Move the
initialization of context-aware (i.e. things that depend on other
things) to separate functions.
- Split application creation and initialziation into several steps and
them should be called explicitly in the correct order.
2018-05-04 09:57:02 +02:00
Diego Prado Gesto
c8f73d303e
Merge pull request #3699 from Ultimaker/M&P-Setting-Optimization
...
PP formula based temperatures fix
2018-05-04 09:43:30 +02:00
Diego Prado Gesto
61a6a176b9
Merge branch 'master' of github.com:Ultimaker/Cura
2018-05-04 09:09:20 +02:00
Jaime van Kessel
7c80bc203c
Fixed bunch of wrong / missing typing
2018-05-03 21:14:06 +02:00
Jaime van Kessel
7d2257838b
Added missing typing
2018-05-03 20:42:06 +02:00
Jaime van Kessel
34483b4b34
Merge branch 'master' of github.com:Ultimaker/Cura
2018-05-03 20:27:35 +02:00
Jaime van Kessel
21e2fcbcf6
Also added missing context usage of archive
2018-05-03 20:27:02 +02:00
Ruben D
f3be394080
Properly get the application
...
Why are we getting this passed via parent???
2018-05-03 20:26:20 +02:00
Jaime van Kessel
7665f8a7cb
Reading packages from archive now uses With context
2018-05-03 20:22:38 +02:00
Aleksei S
defb22dc07
Keep 'dot' in file name for type *.gcode.gz
...
CURA-5323
2018-05-03 18:11:45 +02:00
Diego Prado Gesto
a1e6792664
Set the LocalContainerProvider as a required plugin.
2018-05-03 18:03:30 +02:00
Aleksei S
c5e9acf664
Fix: Manually added printer by ip address shows proper printer type
...
CURA-5264
2018-05-03 17:14:56 +02:00
Diego Prado Gesto
5b8f426ea2
Merge branch 'master' of github.com:Ultimaker/Cura
2018-05-03 16:14:34 +02:00
Diego Prado Gesto
0d56d72760
CURA-5234 Make use of the function to add wrong containers to the set.
2018-05-03 16:14:08 +02:00
Kristel88
3671296860
Updates PLA 0.8 S5
...
2 mistakes in previous pull request
2018-05-03 14:39:06 +02:00
Mark
ce7f64d8e3
ignore empty directories in plugin folder
2018-05-03 14:36:08 +02:00
ChrisTerBeke
80d7dc18cb
Fix is_dir for Python 3.5
2018-05-03 13:37:33 +02:00
ChrisTerBeke
b62b682570
Make Qt network redirects work in both 5.8 and 5.9+
2018-05-03 13:33:32 +02:00
ChrisTerBeke
9fe72210be
Merge branch 'master' of https://github.com/Ultimaker/Cura
2018-05-03 11:39:11 +02:00
Diego Prado Gesto
7850f5a18e
Merge branch 'master' of github.com:Ultimaker/Cura
2018-05-03 09:30:29 +02:00
Diego Prado Gesto
65a6c751cd
Change attribute of the download request to follow redirects. That makes the download feature of the Toolbox compatible with Qt 5.8.2.
2018-05-03 09:29:04 +02:00
Ian Paschal
45e32e6c05
CURA-5296 Quick hack to test using a list of IDs
2018-05-03 09:12:35 +02:00
fieldOfView
c2c5228eee
Fix plugin details
...
Previous fix for QML warnings broke the details display.
2018-05-02 23:19:13 +02:00
fieldOfView
685b80fc3a
Fix more QML warnings
2018-05-02 21:56:23 +02:00
fieldOfView
0aadaa3c9d
Merge branch 'master' into fix_toolbox_appearance
...
# Conflicts:
# plugins/Toolbox/resources/qml/ToolboxDetailPage.qml
2018-05-02 20:37:33 +02:00
fieldOfView
ca8b7bb1da
Fix QML warnings
2018-05-02 20:34:50 +02:00
fieldOfView
46e7a6665d
Theme link colors
2018-05-02 19:20:52 +02:00
fieldOfView
1f542f176d
Fix some more image rendering occurrences
2018-05-02 19:18:03 +02:00
Ian Paschal
5a194bb6d1
CURA-5035 Removed debug statement
2018-05-02 18:43:57 +02:00
Ian Paschal
0872d499f8
CURA-5035 Add compatibility chart
2018-05-02 18:43:12 +02:00
fieldOfView
d326e91008
Fix dpi scaling
2018-05-02 17:54:48 +02:00
Ruben D
0c51173bed
Disable Connect Infill Lines when using gradual infill
...
Gradual infill causes infill to break up into lots of different areas with different infill densities. Because Connect Infill Lines connects those lines along the border of an infill area, you sometimes get very thin areas with lots of lines going back and forth connecting extremely thin pieces of infill. Sometimes it works fantastically (esp. with mechanical models) but sometimes it really messes up the print.
Contributes to issue CURA-5319.
2018-05-02 17:45:45 +02:00
fieldOfView
ecbfae2f27
Remove minimise button from toolbox dialog
2018-05-02 17:22:00 +02:00
fieldOfView
132a1a1951
Fix binding loop errors
2018-05-02 17:20:15 +02:00
fieldOfView
00875f0330
Merge branch 'master' into fix_toolbox_appearance
2018-05-02 17:18:43 +02:00
Aleksei S
b1c9b04a7a
Fix: filenames cut by first dot, remove only file extension because file might have dot in name
...
CURA-5323
2018-05-02 17:17:45 +02:00
ChrisTerBeke
2a5736737f
Merge branch 'master' of https://github.com/Ultimaker/Cura
2018-05-02 16:52:56 +02:00