Commit graph

6967 commits

Author SHA1 Message Date
ChrisTerBeke
4ca5987ca8 CURA-4269 added a flag to determine wether auto drop should be executed or not 2017-09-18 10:50:52 +02:00
Ghostkeeper
2901b832a5
Sync setting visibility with XmlMaterialProfile
This is why we shouldn't do double-data.
2017-09-18 09:00:39 +02:00
fieldOfView
3f903d2c76 Add menu item to reset the camera 2017-09-16 10:05:45 +02:00
Diego Prado Gesto
f139bbe3f1 Fixed some missed references to the previous variables - CURA-4232 2017-09-15 16:05:24 +02:00
alekseisasin
aa0ade2e74 Merge branch 'master' of github.com:Ultimaker/cura 2017-09-14 18:05:28 +02:00
alekseisasin
98ab571483 Removed 14bitVoid code accord to a new LGPL license
CURA-4232
2017-09-14 18:03:31 +02:00
ChrisTerBeke
51e257eda6 remove unused Logger import 2017-09-14 16:15:14 +02:00
ChrisTerBeke
11ebdf7303 CURA-4269 disable auto-drop for first time loaded models from project files 2017-09-14 16:06:51 +02:00
Lipu Fei
b9b273b1aa Update splash window
CURA-4215
2017-09-14 14:52:03 +02:00
Lipu Fei
9683dcae72 Remose useless code
CURA-4215
2017-09-14 11:44:09 +02:00
Lipu Fei
7144720d78 Redesign splash window
CURA-4215

- Rectangle splash window
- Fix for splash window crash
- Enable antialias
- Fix for longer loading text in some languages
2017-09-14 11:36:27 +02:00
Lipu Fei
84ad9c6ad1 Add "available" flag for quality profiles
CURA-4182

Add "available" flag for quality profile model so the slider can use it
to show available and unavailable profiles.
2017-09-13 16:40:59 +02:00
alekseisasin
d0997f7f7e Merge branch 'master' of github.com:Ultimaker/cura 2017-09-13 13:58:39 +02:00
alekseisasin
204019702d Added Title for messages
CURA-4203
2017-09-13 13:58:08 +02:00
Diego Prado Gesto
fd1c76ac80 Merged branch - CURA-4270 2017-09-13 13:25:00 +02:00
alekseisasin
6a9c7539c4 Merge branch 'feature_new_splash_window'
CURA-4215
2017-09-12 16:06:22 +02:00
Lipu Fei
a28264acae Adjust text positions and sizes
CURA-4215
2017-09-12 16:01:57 +02:00
alekseisasin
48cda42ece Adjusted scale factor
CURA-4215
2017-09-12 15:49:00 +02:00
fieldOfView
65a339ed3d Merge branch 'master' into feature_plate_shader
# Conflicts:
#	resources/themes/cura/theme.json
2017-09-12 15:09:57 +02:00
fieldOfView
4c9028b3d0 Remove z-fighting kludge
This was actually introducing z-fighting artefacts with the new shader and no added geometry.
2017-09-12 15:06:06 +02:00
Eloi Pardo
1aa46045af add ConvexHullDecorator when grouping 2017-09-12 08:42:17 +02:00
fieldOfView
ec6fa19d4e Updated copyright date 2017-09-11 23:49:16 +02:00
fieldOfView
6658e1a9ae Draw grid lines using shader 2017-09-11 23:41:10 +02:00
fieldOfView
a4aa134f25 Revert "Merge branch 'feature_grid_lines'"
This reverts commit a0b7a2d165, reversing
changes made to db640c6f3d.

# Conflicts:
#	cura/BuildVolume.py
2017-09-11 22:43:55 +02:00
Lipu Fei
88e971ea92 Add new splash window
CURA-4215

- New splash window background image
- Rotating loading circle on the splash window
2017-09-11 18:13:12 +02:00
Lipu Fei
4507f6c8e2 Update job name prefix when machine is changed
CURA-4305
2017-09-11 12:39:59 +02:00
Mark
0a5744b74b Tweaked the update setting
CURA-4301
2017-09-11 11:21:31 +02:00
Ruben D
1e3cfc56be
Revert "CuraApplication: Minor pep8 fix"
This reverts commit ee1ba30d0e.
2017-09-10 16:55:24 +02:00
Diego Prado Gesto
c3d6023418 Fixed an issue that doesn't generate the jobname again once the user removes the models. - CURA-4276 2017-09-08 16:22:45 +02:00
Lipu Fei
b0916e4b67 Fix job name mismatching
CURA-4276
2017-09-06 18:09:19 +02:00
alekseisasin
c614f02d0f Fixed settings update. After each change in the settings the build volume was rebuilding
CURA-4271
2017-09-06 16:58:17 +02:00
Lipu Fei
fc7207e77e Remove "Sync" button
CURA-4211
2017-09-06 12:17:40 +02:00
Lipu Fei
e15a96263d Update extruder button styles
CURA-4211
2017-09-06 12:00:53 +02:00
Jaime van Kessel
8472830fb9 Fix adding machine prefix
CURA-4276
2017-09-05 13:30:42 +02:00
Jaime van Kessel
204e1ee834 PrintJobname is now only set when it was empty or if it's set to empty
CURA-4276 fixes #2346
2017-09-05 11:41:30 +02:00
Lipu Fei
e9551d2173 Add upgrade script for 2.7 to 3.0
CURA-4270

Changes for the Skin Pre-shrink settings requires upgrade.
2017-09-04 15:39:10 +02:00
Jaime van Kessel
dd7ea80b68 Also added canPreheatBed option 2017-09-04 15:33:04 +02:00
Jaime van Kessel
8683275d4f Added canAbort & canPause feature to PrinterOutputDevice 2017-09-04 15:16:55 +02:00
Vivek Anand
ee1ba30d0e CuraApplication: Minor pep8 fix 2017-09-02 12:01:38 +00:00
alekseisasin
24c9dc9bee Merge branch 'feature_light_colours_icons'
CURA-4148
2017-09-01 19:25:29 +02:00
Ghostkeeper
b677a81d9b
Change default theme
This new field is now read by Uranium that indicates the default theme to load first before there are any changed preferences.

Contributes to issue CURA-4148.
2017-08-30 16:08:49 +02:00
Lipu Fei
23544ad1fe Only fall back to use fdmprinter when the quality profiles for the current machine cannot be found
CURA-4139

UM2 family don't have machine material, but they do have their dedicated
profiles. When Cura searches for quality profiles, it should only fall
back to use "fdmprinter" as the definition if no quality profile can be
found for the current machine.
2017-08-30 14:59:12 +02:00
Lipu Fei
0eb63637d4 Merge branch 'master' into feature_dark_colours_icons 2017-08-28 16:54:36 +02:00
Ghostkeeper
7a8956fd0e
Merge branch '2.7' 2017-08-28 16:21:40 +02:00
Lipu Fei
b84500f742 Import Application instead of inline import CuraApplication
CURA-4186
2017-08-28 14:35:36 +02:00
Lipu Fei
37414e7bc7 Fix code style: double quotes instead of single quotes
CURA-4186
2017-08-28 14:34:53 +02:00
Lipu Fei
3fbdb27e8e Merge branch 'master' into feature_dark_colours_icons
CURA-4148

Resolve merge conflicts.
2017-08-28 11:13:38 +02:00
Ghostkeeper
585c04dfaa
Also show warning icon when the set-up on other extruders is unsupported
So I added a function that checks the support on all extruders and the global stack.

Contributes to issue CURA-4148.
2017-08-25 14:27:45 +02:00
Lipu Fei
141aad5513 Trigger to re-evaluate default settings in per-object settings when the active stack gets changed.
CURA-4186

Trigger signals to re-evaluate default settings in pre-object settings
when the active stack gets changed. Otherwise the values won't be
updated directly.
2017-08-25 12:48:47 +02:00
Lipu Fei
a320784a6d For a per-object setting, use the user-defined value first
CURA-4186

In a per-object setting, if there is user defined value, use that first.
If the value is default, then evaluate it with the normal routine.
2017-08-25 12:19:05 +02:00