848 Commits

Author SHA1 Message Date
Arjen Hiemstra
2969aafb6d Update profile page with the renamed functions
Contributes to CURA-2006
2016-08-11 17:51:16 +02:00
Arjen Hiemstra
6778020d56 Remove duplicated code
Contributes to CURA-2006
2016-08-11 17:47:30 +02:00
Arjen Hiemstra
e1ddb878ad Fix copyright header
Contributes to CURA-2006
2016-08-11 17:47:15 +02:00
fieldOfView
6075536497 Fix settingtextfield validator in PerObjectSettings
CURA-2115
2016-08-11 14:37:58 +02:00
fieldOfView
71a9f2dd7a Clean up conversion to string
CURA-2071
2016-08-11 11:53:55 +02:00
fieldOfView
6d64d11c2e Change Simple Mode adhesion/support label to "Helper Parts"
UXD-76
2016-08-10 17:57:06 +02:00
fieldOfView
85a58a22cb Change "Bed"/"Platform" to "Build Plate"
UXD-76
2016-08-10 17:57:05 +02:00
fieldOfView
505da1a9a7 Change "Hotend temperature" to the name of the extruder
UXD-79
2016-08-10 17:55:52 +02:00
fieldOfView
2963a64fc2 Change "Bed Temperature" to "Build Plate Temperature"
UXD-80
2016-08-10 17:55:52 +02:00
fieldOfView
7aab8ad397 Change "object" to "model"
UXD-83
2016-08-10 17:55:51 +02:00
fieldOfView
b6bf02e0a0 Update swatch colors when changing materials
CURA-1971
2016-08-10 14:37:59 +02:00
Arjen Hiemstra
be4db899a6 Change the active quality if we remove the active quality
Contributes to CURA-2006
2016-08-10 12:02:11 +02:00
Arjen Hiemstra
5edeaa1c93 Reduce the amount of QML warning showing up
Contributes to CURA-2006
2016-08-10 12:00:03 +02:00
Arjen Hiemstra
7ba49b4f88 Remove code that is obsolete and moved to ContainerManager
Contributes to CURA-2006
2016-08-10 11:58:40 +02:00
Arjen Hiemstra
2a81d25bf9 Fix removing container after rejecting a rename
Contributes to CURA-2006
2016-08-10 11:05:56 +02:00
Arjen Hiemstra
783d395fbc Use containermanager for operations on Quality
Contributes to CURA-2006
2016-08-10 11:04:15 +02:00
Arjen Hiemstra
975a60bec3 Display all the extruder settings and global settings in profile manager
Contributes to CURA-2006
2016-08-10 11:03:00 +02:00
Arjen Hiemstra
03252c69dc List all the qualities and quality changes in the profiles page
Contributes to CURA-2006
2016-08-10 11:01:50 +02:00
Arjen Hiemstra
6de7d0170a Expose quality changes id and quality type and make the profile menu work correctly
Contributes to CURA-2006
2016-08-10 10:58:44 +02:00
Jack Ha
decf998d68 Code style, semicolons 2016-08-10 09:17:10 +02:00
fieldOfView
e551898e04 Add a connection string to the printmonitor
CURA-2091
2016-08-09 18:43:09 +02:00
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