GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-02 16:54:23 +08:00
Code Issues Packages Projects Releases Wiki Activity
6,456 Commits 291 Branches 260 Tags
Commit Graph

1127 Commits

Author SHA1 Message Date
Jaime van Kessel
433db40e9c Merge branch 'master' of github.com:Ultimaker/Cura 2016-08-09 17:11:23 +02:00
Jaime van Kessel
c381b82ac1 Extruder nr is now sent as string 
CURA-2071
 2016-08-09 17:09:48 +02:00
Jack Ha
223b8f28bb Update print monitor button labels and enabled. CURA-2060 2016-08-09 16:20:40 +02:00
Jack Ha
2d723cbb57 Comments CURA-2064 2016-08-09 14:54:09 +02:00
Jack Ha
fc462cdf6f Merge branch 'master' of github.com:Ultimaker/Cura 2016-08-09 10:57:42 +02:00
Jack Ha
f60ba6ddf0 Enable Abort Print button while in pre_print. 2016-08-09 10:57:28 +02:00
fieldOfView
c7a120edd5 Merge branch 'master' of https://github.com/Ultimaker/Cura 2016-08-09 09:56:40 +02:00
fieldOfView
f817d30abc Change colour to color for consistency 2016-08-09 09:56:23 +02:00
Jack Ha
6d52319ee4 Adjusted visibility of printer monitor progress bar + percentage. 
CURA-2064
 2016-08-08 17:08:01 +02:00
Jack Ha
1bd0d65e0a Added user feedback after pressing Pause / Resume in network printer. 
The button displays Pausing... or Resuming... until a new status update.

CURA-2060
 2016-08-08 16:25:01 +02:00
Jack Ha
97f9bcacf1 Tooltip for bed temperature displays values where it resolves from. CURA-2007 2016-08-08 13:39:54 +02:00
fieldOfView
78848567e0 Add printer when pressing enter in Add Printer page instead of closing page 
CURA-1354
 2016-08-05 16:04:51 +02:00
fieldOfView
2edda68021 Improve validator for numeric fields 
Do not accept fractional input for "int" settings
Also only accept a "-" as the first character
 2016-08-05 15:12:13 +02:00
Jack Ha
c0dd19ce08 Seems to work, except for the tooltip (shows global value). CURA-2007 2016-08-04 19:23:23 +02:00
Jack Ha
bfabf8d11a Merge, fix qml files. Contributes to CURA-2007. 
Merge branch 'feature_quality_changes' into cura-2007

Conflicts:
	resources/qml/Settings/SettingItem.qml
	resources/qml/Settings/SettingView.qml
 2016-08-04 18:22:36 +02:00
fieldOfView
6cf8536404 Rename pause button to pause/resume button for clarity 
CURA-1851
 2016-08-04 18:22:35 +02:00
Arjen Hiemstra
6d49fb87af Use ContainerManager::createQualityChanges when creating a quality from current settings 
Contributes to CURA-2006
 2016-08-04 17:38:19 +02:00
Arjen Hiemstra
70dee38c95 Show quality_changes instance containers for custom containers in the profile menu 
Contributes to CURA-2006
 2016-08-04 17:35:33 +02:00
Arjen Hiemstra
9d0acf5b03 Properly send global settings to the global stack 
Contributes to CURA-2006
 2016-08-04 17:35:01 +02:00
Arjen Hiemstra
7613274686 Properly hide link icon if setting is not settable per extruder 
Contributes to CURA-2006
 2016-08-04 17:34:41 +02:00
fieldOfView
cf06df8b07 Add a sidebar state for when a printer is not accepting commands 
CURA-1851
 2016-08-04 16:39:46 +02:00
fieldOfView
5f3c051ec6 Code cleanup 
CURA-1990
 2016-08-04 16:02:05 +02:00
fieldOfView
ed669925ad Disable print monitor if the printer is not (yet) ready to receive commands 
CURA-1851
 2016-08-04 15:06:22 +02:00
Jack Ha
2402ba3d0e Bed temperature is now either a resolved value or a global value. 
Contributes to CURA-2007
 2016-08-04 14:30:48 +02:00
fieldOfView
a74d5dd8cb Show error text in print monitor 
CURA-1990
 2016-08-04 13:25:28 +02:00
Arjen Hiemstra
4eb4a90ded Call the new clearUserContainers/updateQualityChanges from the relevant actions 
Contributes to CURA-2006
 2016-08-04 02:13:24 +02:00
Arjen Hiemstra
6eed25f145 Only write property changes to extruder stack if we actually should 
Now global settings are once again stored in the global stack

Contributes to CURA-2006
 2016-08-04 02:09:02 +02:00
Arjen Hiemstra
4de4053490 Properly implement "set as active extruder" menu entry 
Contributes to CURA-2006
 2016-08-04 02:08:06 +02:00
fieldOfView
16e9c1b2bd Tweak general preference page spacing 2016-08-03 22:14:39 +02:00
fieldOfView
7d48ad7872 Fix qml warning in Printers page after adding a printer 2016-08-03 18:15:06 +02:00
fieldOfView
95b06f317a Fix "create" button on profiles page 
CURA-2036
 2016-08-02 16:13:17 +02:00
Arjen Hiemstra
4f9fab9418 Set the right default extruder for the main property provider 
Fixes CURA-2024
 2016-08-02 14:49:57 +02:00
fieldOfView
7d65e0d62b Add title to machine action window 2016-08-02 09:51:58 +02:00
fieldOfView
42fc25ab09 Move sorting of DefinitionContainerModel out of qml 
Add printer dialog now has sections by a configurable metadata property. A prefered section is set to always show on top.
Add weights to the Ultimaker printer definitions to create a sensible list (newest on top).

CURA-1593
 2016-08-01 19:18:56 +02:00
fieldOfView
0d9d4b88ce Hide "Type" label when no printer is selected on the manager printers page 2016-08-01 16:56:56 +02:00
fieldOfView
1808c44d02 Change behavior of the "Close" button on a machineaction dialog 
Pressing close now "rejects" the action, similar to pressing "cancel" in the add machine wizard (instead of accepting, like pressing "ok").

CURA-2019
 2016-08-01 15:36:43 +02:00
fieldOfView
0c8d0a11a9 Fix a couple of qml casting errors 2016-08-01 15:22:21 +02:00
fieldOfView
a9ed562a58 Allow machine actions to reference the dialog they are shown in 
This way they can respond to the onAccepted and onRejected actions of the dialog
Contributes to CURA-2019
 2016-08-01 15:21:12 +02:00
fieldOfView
1e46ab9eea Remove stale AddMachineWizard file 2016-08-01 13:45:24 +02:00
fieldOfView
e01c8a4f10 Add Select All functionality 2016-07-29 19:25:40 +02:00
fieldOfView
ed1d12d21d Hide linked settings icon for single extrusion printers 
CURA-2020
 2016-07-29 17:43:38 +02:00
fieldOfView
34840d42bd Sort printers by category instead of by manufacturer 
Always show Ultimaker on top. CURA-1593
 2016-07-29 16:38:27 +02:00
Jaime van Kessel
b9a1d50e05 Added option to only display top layers in layerview 2016-07-29 13:17:41 +02:00
fieldOfView
57a37cfb8f Merge branch 'master' of https://github.com/Ultimaker/Cura 2016-07-29 11:27:18 +02:00
fieldOfView
f584b49af2 Add "Close" button to (single) machine actions dialog 
CURA-2019
 2016-07-29 11:27:03 +02:00
Jaime van Kessel
1ed0503e02 Backspace now triggers same action as delete 
CURA-1891
 2016-07-29 10:37:03 +02:00
fieldOfView
9d7ce210b3 Merge branch 'master' of https://github.com/Ultimaker/Cura 2016-07-28 18:15:23 +02:00
fieldOfView
8fb6c9939a Add "offline" styling to sidebar/monitor 
CURA-1851
 2016-07-28 18:14:38 +02:00
Arjen Hiemstra
570a67556a Fix exporting and importing materials on OSX 
OSX's file dialog is stupid and does not understand extensions with
a . in them. So instead just use everything after the last .

Fixes CURA-1987
 2016-07-28 18:08:17 +02:00
fieldOfView
5d2033722a Merge branch 'master' of https://github.com/Ultimaker/Cura 2016-07-28 13:45:27 +02:00