GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-30 01:55:55 +08:00
Code Issues Packages Projects Releases Wiki Activity
5,084 Commits 294 Branches 267 Tags
Commit Graph

958 Commits

Author SHA1 Message Date
fieldOfView
4bfa0f3bb1 Move sidebar action button style into styles.qml 2016-09-12 16:53:59 +02:00
fieldOfView
0693c0284b Show printer state on Printers preference pane 
CURA-2276
 2016-09-12 16:49:55 +02:00
fieldOfView
aa39a44219 Update i18n context for consistency 2016-09-12 16:41:24 +02:00
Jack Ha
1c1be7d444 Undo material edit update resolve, breaks UM3. Contributes to CURA-2159 2016-09-12 16:16:02 +02:00
Jack Ha
8304f17efd Fix updating resolved values when changing material. Contributes to CURA-2159 2016-09-12 15:48:30 +02:00
Jack Ha
2cde439964 Merge branch 'master' of github.com:Ultimaker/Cura 2016-09-12 14:40:41 +02:00
Jack Ha
d173952a3a Update materialmenu when changing material type. Contributes to CURA-2159 2016-09-12 14:40:32 +02:00
Jaime van Kessel
b17f8b5dd6 Added min width & height to machine action popup. 2016-09-12 14:38:23 +02:00
Jack Ha
1e0394fb48 Cleanup, forgot to remove debugging stuff. Contributes to CURA-2159 2016-09-12 14:22:23 +02:00
Jack Ha
78c119dbde Merge branch 'master' of github.com:Ultimaker/Cura 2016-09-12 13:55:14 +02:00
Jack Ha
fb3f03b446 Fixed XML setMetaDataEntry for changing too much meta data. Contributes to CURA-2159 2016-09-12 13:55:05 +02:00
Jaime van Kessel
31bc3d2575 Added maintenance state to display qml 
CURA-2235
 2016-09-12 13:38:30 +02:00
Ghostkeeper
12b967ddb2
Remove debug code 
Don't know who it was or why or when, but it shouldn't be there.
 2016-09-12 12:58:35 +02:00
fieldOfView
8930eae9cd Allow plugins to add additional components to print monitor buttons 
CURA-2277
 2016-09-12 10:38:09 +02:00
fieldOfView
55c0095b30 Allow plugins to add additional components to Machines detail pane 
CURA-2276
 2016-09-12 10:35:00 +02:00
Jaime van Kessel
c254737e25 Simplified the pause code 
Now always follow the states of the remote (instead of using states that can get out of sync)

CURA-2060
 2016-09-09 14:41:30 +02:00
Jaime van Kessel
ec587eb0dd If a combination material does not like the setup, we now mark it in red. 
CURA-2271
 2016-09-09 11:59:55 +02:00
fieldOfView
40ae75f54f Merge branch '2.3' of https://github.com/Ultimaker/Cura into 2.3 2016-09-08 18:50:53 +02:00
fieldOfView
8b7a8327e8 Allow machinedefinitions to specify another definition to inherit qualities from 
CURA-1780
 2016-09-08 18:49:34 +02:00
Jack Ha
2138a87582 Busy with CURA-2159 2016-09-08 17:37:49 +02:00
Jaime van Kessel
45a841a52b Merge branch '2.3' of github.com:Ultimaker/Cura into 2.3 2016-09-08 14:15:54 +02:00
Jaime van Kessel
8a8b55800b Duplicating materialContainers should now duplicate all related material containers 
CURA-2242
 2016-09-08 14:15:00 +02:00
fieldOfView
be6bfdd4af Add a "linked" icon to settings that have "global_inherits_stack" set 2016-09-08 13:58:13 +02:00
fieldOfView
bb92c0d7fa Fix units for density and diameter 2016-09-08 11:56:11 +02:00
fieldOfView
b921540703 Remove superfluous margin left by hidden settings 
Each setting that was made visible, but was disabled due to the value of another setting, would leave a 1 px margin (eg settings in the support category when support was not enabled). Hidden settings now eat that margin, leaving nothing behind.
 2016-09-08 08:58:40 +02:00
fieldOfView
a52bb1422b Suggest unique name when creating/duplicating profiles 
CURA-2161
 2016-09-06 17:46:11 +02:00
fieldOfView
68ddf90d58 Make behavior of Create Profile consistent between prefs and menu 
CURA-2161
 2016-09-06 15:39:44 +02:00
fieldOfView
a40476eb62 Add distinctive titles to profile rename dialogs 
CURA-2161
 2016-09-06 15:38:27 +02:00
fieldOfView
b735d46e90 Show sidebar tooltips above messagestack 2016-09-05 20:35:20 +02:00
fieldOfView
938a2fc691 Update wording 
CURA-2157
 2016-09-05 15:38:56 +02:00
Thomas Karl Pietrowski
df519ed00a CURA-2157: Adding an confirmation dialog 
Tested while starting two prints and aborting them. The buttons for
"Yes" and "No" are translated by Qt5.
 2016-09-05 15:36:28 +02:00
Jaime van Kessel
3227507297 An empty quality container will now give a "not supported" warning 
CURA-2236
 2016-09-05 13:31:36 +02:00
Jaime van Kessel
1a78aee46c fix typo 2016-09-02 11:37:54 +02:00
Jaime van Kessel
266f46ed55 Rename dialog shows again when creating new profile from current settings 
CURA-2220
 2016-09-02 11:37:06 +02:00
Simon Edwards
a2f478f2ad Fix for "Creating two profiles causes the names to become messed up" 
CURA-2220
 2016-09-01 13:49:29 +02:00
Jaime van Kessel
9d6c60ec60 Setting state is now set to calculated after setting the value 
This ensures that the setting of the value does not overide the state

CURA-2221
 2016-09-01 13:00:54 +02:00
Jack Ha
e9d9597caa Commented out duplicate and import, on OS X 'visible' does not work 2016-09-01 11:22:38 +02:00
Jaime van Kessel
6ff258d7e0 Single extrusion machines now show correct values for profiles in tab 
CURA-2214
 2016-08-31 14:52:41 +02:00
Jack Ha
57f13869e6 For the beta release, removed duplicate and import material. 2016-08-31 12:47:21 +02:00
fieldOfView
25fb4d0b27 Show generic materials by display name instead of by material 2016-08-30 18:39:02 +02:00
fieldOfView
42010e34d2 Show material by its displayname instead of its color 2016-08-30 18:30:45 +02:00
fieldOfView
cb7a3de757 Code style 2016-08-30 16:02:08 +02:00
fieldOfView
ac7c1a92a5 Show "Create" only when there are user changes, "Duplicate" otherwise 
CURA-2220
 2016-08-30 15:58:16 +02:00
fieldOfView
b004c53c6d Fix upadting list of materials when switching printers 
CURA-2209
 2016-08-30 14:42:43 +02:00
fieldOfView
7aa44bdd9e Remove commented out code 2016-08-30 13:38:08 +02:00
fieldOfView
00250acb10 Merge branch 'master' of https://github.com/Ultimaker/Cura 2016-08-29 16:35:32 +02:00
fieldOfView
6c16d82736 Add material type as a column in the Material manager 
...and a color swatch for good measure.
 2016-08-29 16:35:10 +02:00
Jaime van Kessel
70af60c5fb Merge branch 'master' of github.com:Ultimaker/Cura 2016-08-29 16:18:46 +02:00
Jaime van Kessel
9a753680e7 Setting pane now uses correct profiles to display setting values 
CURA-2185
 2016-08-29 16:18:15 +02:00
fieldOfView
71a77c1fb7 Decrease number of instances of InstanceContainerModel 
Updates to InstanceContainerModel are becoming expensive because there are so many instances of that model. The MaterialMenu used three, and the MaterialMenu is instantiated three times for a dual extrusion printer.

CURA-2193
 2016-08-29 15:35:14 +02:00