Commit graph

34356 commits

Author SHA1 Message Date
Ghostkeeper
9581257df5
Don't bind provider when setting is per mesh
This causes settings which are settable per mesh but not per extruder to be configurable per extruder even though they have a linked icon.

Contributes to issue CURA-2006.
2016-08-23 11:53:57 +02:00
Jaime van Kessel
47d5039c04 Merge branch 'master' of github.com:Ultimaker/Cura 2016-08-23 11:53:43 +02:00
fieldOfView
53ce8bc4c9 Fix typo 2016-08-23 11:50:46 +02:00
Jaime van Kessel
e495534219 Rapid succesion of tool operations no longer freeze interface on Ubuntu
CURA-2158
2016-08-23 11:50:28 +02:00
fieldOfView
4e6756802f Correct position of prime_tower disallowed area
CURA-2155
2016-08-23 11:36:34 +02:00
Jack Ha
090b8d4f50 Solved merge conflict. 2016-08-23 10:35:20 +02:00
fieldOfView
344be2687e Display the appropriate profile settings on Profiles page
CURA-2006
2016-08-22 22:38:13 +02:00
fieldOfView
cfb062718f Fix creating a clone of criteria
CURA-2006
2016-08-22 21:43:32 +02:00
Seva Alekseyev
44cf044395 X3D loading performance: vertex organization for faster transforms 2016-08-22 14:57:28 -04:00
fieldOfView
0f998c6e2e Fix qml warnings
CURA-2006
2016-08-22 19:25:42 +02:00
fieldOfView
08091209f1 Fix profile display for printers without machine-specific material profiles
CURA-2006, CURA-1774
2016-08-22 19:21:44 +02:00
fieldOfView
62e815a3d8 Fix qml warning
CURA-2006
2016-08-22 19:16:59 +02:00
fieldOfView
b9af9dce1f Tweak profile overview layout
CURA-2006
2016-08-22 19:00:49 +02:00
fieldOfView
1c87c17d77 Fix MachineSettingsAction after CURA-2006 2016-08-22 18:45:18 +02:00
fieldOfView
9981cfbf6a Simplify interface of UMOUpgradeSelection 2016-08-22 18:44:46 +02:00
fieldOfView
3671d241d5 Show color + material in menus and Materials page
CURA-2108
2016-08-22 17:34:33 +02:00
fieldOfView
cb6353ba2a Fix machine_has_heated_bed default 2016-08-22 17:16:08 +02:00
fieldOfView
5bf19f9ff2 Fix preferred material for cases when there more than 1 "pla" materials 2016-08-22 17:12:39 +02:00
fieldOfView
756422fc0e Merge branch 'master' of https://github.com/Ultimaker/Cura 2016-08-22 16:41:31 +02:00
fieldOfView
320cddb073 Don't show "nozzle" on Materials page when there are no variants 2016-08-22 16:41:21 +02:00
Seva Alekseyev
eed26d40a2 Code review issues 2016-08-22 10:35:59 -04:00
Jaime van Kessel
2ad907cdd1 Merge branch 'master' of github.com:Ultimaker/Cura 2016-08-22 16:32:18 +02:00
Jaime van Kessel
fc5900c05a Width of the scrollview is now a bit wider, so minus signs don't fall off
CURA-2131
2016-08-22 16:30:56 +02:00
fieldOfView
c32700b7b4 Fix "Set as Active Extruder" menu item 2016-08-22 16:30:34 +02:00
fieldOfView
900f953298 Make sure extruder menus are only shown if there the machine extruders 2016-08-22 16:15:59 +02:00
Ghostkeeper
f91c101b85 Merge branch 'master' of github.com:Ultimaker/Cura 2016-08-22 15:17:31 +02:00
Jaime van Kessel
d61637e7cf Merge branch 'master' of github.com:Ultimaker/Cura 2016-08-22 15:14:52 +02:00
Jaime van Kessel
ea324eadc0 Added scroll bar to per object panel
If there are too many per object settings a scrollbar is now displayed

CURA-2131
2016-08-22 15:14:10 +02:00
Ghostkeeper
bb90c593b9 Merge branch 'feature_quality_changes' 2016-08-22 15:13:27 +02:00
Ghostkeeper
f296b77d2c
Fix check for presence of global_inherits_stack
My mistake.

Contributes to issue CURA-2006.
2016-08-22 14:17:47 +02:00
Jaime van Kessel
0c931424f9 Re-create the network manager every 30 seconds of not being connected
CURA-1851
2016-08-22 14:08:01 +02:00
Ghostkeeper
aefb36d1ec
Update activeValidationState if setting validation changed
This was removed from onGlobalSettingChanged but never re-added anywhere.

I've updated it to check for both the global and the active stack, since some settings modify only the global stack (such as layer height).

Contributes to issue CURA-2006.
2016-08-22 13:42:14 +02:00
Ghostkeeper
42399e82fb
)
Contributes to issue CURA-2006.
2016-08-22 11:36:33 +02:00
Ghostkeeper
1c1bfbe114
Fix providing of global_inherits_stack settings
I've rewritten this part and documented what each case catches. There is a base case which is not required any more since we removed the global tab, but I left it in for defense.

Contributes to issue CURA-2006.
2016-08-22 11:34:17 +02:00
fieldOfView
1003066ce1 Show qualities for the material associated with the currently selected quality
CURA-2095
2016-08-22 11:31:31 +02:00
fieldOfView
52dda935fc Switch to a generic quality profile if a material has no specific qualities
CURA-2095
2016-08-22 11:14:53 +02:00
Jaime van Kessel
7138fd6ef4 Merge branch 'master' of github.com:Ultimaker/Cura 2016-08-22 10:33:18 +02:00
Jaime van Kessel
bfc01827c2 We now always create a new socket on terminate
CURA-2127
2016-08-22 10:32:49 +02:00
Jaime van Kessel
5825793f28 QNetworkManager is now re-created every time we try to connect
CURA-1851
2016-08-22 09:49:57 +02:00
fieldOfView
7efde6b164 Prevent qml warning when no printer is connected 2016-08-20 23:42:51 +02:00
fieldOfView
2f3f57c43d Code-style 2016-08-20 23:40:43 +02:00
fieldOfView
a1c3b8f3a8 Update start- & and gcode and change extruder names
CURA-1774
2016-08-20 17:20:51 +02:00
fieldOfView
9f34e06cb6 Add prime tower and extruder switch position
CURA-1774
2016-08-20 14:31:18 +02:00
fieldOfView
d8d328c491 Code style 2016-08-19 17:22:55 +02:00
Ghostkeeper
eaa7d716f5 Revert "Properly send global settings to the global stack"
This reverts commit 9d0acf5b03.
It was not so proper after all.

Contributes to issue CURA-2006.
2016-08-19 15:48:35 +02:00
Jaime van Kessel
0a08707922 Added logging about network accessible state
CURA-1851
2016-08-19 15:30:34 +02:00
Jaime van Kessel
42bbf2b4c8 ALso abort if the network is not accesible
CURA-1851
2016-08-19 15:26:37 +02:00
Jaime van Kessel
1d6732273c Added local network connectivity detection
CURA-1851
2016-08-19 13:32:17 +02:00
Jaime van Kessel
5c2ac558ea Increased timeout time to 10 seconds
CURA-1851
2016-08-19 13:14:10 +02:00
Jaime van Kessel
edabe9d593 Improved logging a bit more
CURA-1851
2016-08-19 13:13:22 +02:00