958 Commits

Author SHA1 Message Date
fieldOfView
b7906c9ce7 Fix warning about missing color in theme
CURA-1036
2016-07-01 15:26:24 +02:00
fieldOfView
087ebc0768 Automatically show the Print Monitor when starting a print
CURA-1036
2016-07-01 15:06:49 +02:00
fieldOfView
c9b2a1d938 Properly prevent warning when no printer is connected.
CURA-1036
2016-07-01 11:51:46 +02:00
Jaime van Kessel
095dbaaa8d Merge branch 'master' of github.com:Ultimaker/Cura 2016-07-01 11:04:54 +02:00
Jaime van Kessel
91bfd2de27 Force focus instead of requesting it.
Fixes CURA-1778
2016-07-01 11:04:23 +02:00
fieldOfView
58ae1e923c Prevent warning when no printer is connected.
CURA-1036
2016-06-30 19:13:46 +02:00
Arjen Hiemstra
eb48a4e768 Set the new metadata when editing a material
Contributes to CURA-342
2016-06-30 17:32:43 +02:00
fieldOfView
dc2384c92d Disable monitor buttons when there is no job running
CURA-1036
2016-06-30 11:15:32 +02:00
fieldOfView
3ea4983a23 Move message stack "above" the viewport overlay
CURA-1036
2016-06-30 11:02:15 +02:00
fieldOfView
7ec605579e Introduce printing/busy status and make monitor i18n-aware
CURA-1036
2016-06-30 10:20:19 +02:00
fieldOfView
7d962e97c4 Change monitor progress to percentages
CURA-1036
2016-06-30 10:18:10 +02:00
Arjen Hiemstra
419326132f Use ContainerPropertyProvider to provide properties for the materials page
Contributes to CURA-342
2016-06-30 01:54:58 +02:00
Arjen Hiemstra
3798a6e26a Update MaterialsPage with the new way of handling buttons
Contributes to CURA-342
2016-06-30 01:54:25 +02:00
Arjen Hiemstra
f7e4b91569 Update styling of Material management page
Contributes to CURA-342
2016-06-28 17:44:19 +02:00
Arjen Hiemstra
47079dc2dd Start enabling some material management things 2016-06-28 17:43:52 +02:00
Arjen Hiemstra
0270aecdc3 Replace separate machine/profile menus in menubar with a single "Settings" menu
Contributes to CURA-342
2016-06-28 17:43:28 +02:00
Arjen Hiemstra
1a56da464c Introduce a "Manage Materials" action
Contributes to CURA-342
2016-06-28 17:42:47 +02:00
Arjen Hiemstra
842015ea10 Move all the menus to individual QML files to make it easier to reuse them
Contributes to CURA-342
2016-06-28 17:32:50 +02:00
fieldOfView
9ac5b0ecf7 Fix warning about property id of null in Cura.qml
CURA-1585
2016-06-28 17:04:28 +02:00
fieldOfView
540cc55b65 Fix warning about unknown property "index" in SidebarHeader
CURA-333
2016-06-28 16:59:00 +02:00
Arjen Hiemstra
68a8bcb009 Fix width of materials properties tab 2016-06-27 13:33:38 +02:00
fieldOfView
612888c9fb Remove remnant code
CURA-1036
2016-06-27 10:25:02 +02:00
fieldOfView
55af0af755 Merge branch 'master' into feature_print_monitoring
# Conflicts:
#	resources/qml/Cura.qml
2016-06-24 14:55:12 +02:00
fieldOfView
8bc2c6e042 Tweak styling
CURA-1036
2016-06-24 14:41:52 +02:00
fieldOfView
f6e31cd97a Fix updating monitored values
Though the PrintMonitorModel was a nicer solution, it broke the binding of values coming from the PrinterOutputDevices

CURA-1036
2016-06-24 14:35:31 +02:00
fieldOfView
00ad7b23ff Prevent QML warnings when there is no connected printer
CURA-1036
2016-06-24 13:39:24 +02:00
fieldOfView
beff54e5b1 Refactor print monitor as styleable listview
Listview updates when print monitor values becomes available.

CURA-1036
2016-06-24 12:50:39 +02:00
fieldOfView
2143fc14ab Add print job name
CURA-1036
2016-06-23 21:58:45 +02:00
fieldOfView
d613863d83 Tweak colors and icons for print monitor
CURA-1036
2016-06-23 21:50:51 +02:00
fieldOfView
e8743abe68 Set a sensible minimum width for the window 2016-06-23 18:44:06 +02:00
Arjen Hiemstra
b2ef607cb6 Fix the material setting list to use a simple placeholder
Contributes to CURA-342
2016-06-23 17:34:35 +02:00
Arjen Hiemstra
1cb836aea5 Add a ReadOnlySpinBox control that provides a spinBox with a readOnly property
Contributes to CURA-342
2016-06-23 17:33:55 +02:00
Arjen Hiemstra
f71ddc4b9f Start implementing view and edit support in the materials page
Contributes to CURA-342
2016-06-23 17:31:50 +02:00
fieldOfView
fe05aa18cb Resize camera-image with viewport
CURA-338
2016-06-23 17:27:12 +02:00
Jaime van Kessel
85942583b1 Merge branch 'master' of github.com:Ultimaker/Cura 2016-06-23 16:39:09 +02:00
Jaime van Kessel
0b02a5f12b Machine actions are now when selected (instead of active) machine change
CURA-1385
2016-06-23 16:38:04 +02:00
fieldOfView
6d9eb4028e Merge branch 'master' into feature_print_monitoring
# Conflicts:
#	cura/CuraApplication.py
2016-06-23 15:53:53 +02:00
fieldOfView
0faecf9b34 Rearrange MachineActions on Machines page
CURA-1385
2016-06-23 14:15:39 +02:00
Arjen Hiemstra
8c8caa2cac Use the right property for the property provider
Otherwise we get a bunch of errors from the per object settings tool
2016-06-23 13:33:07 +02:00
Arjen Hiemstra
9f9de493f7 Clean up indentation 2016-06-23 13:32:31 +02:00
Arjen Hiemstra
cc027ddf41 Remove unused code 2016-06-23 13:32:20 +02:00
Arjen Hiemstra
de36122531 Use the expanded categories from Cura to expand the proper categories on startup 2016-06-23 13:31:01 +02:00
Aldo Hoeben
488740c60d Merge pull request #819 from Ultimaker/MachineActions
Machine actions
2016-06-23 12:59:03 +02:00
Jaime van Kessel
3f3a93ae8a Refactoring; Renaming firstRunWizard to machineActionsWizard
CURA-1385
2016-06-23 11:12:58 +02:00
fieldOfView
a6bb0c804a Fix minor codereview issues
CURA-333
2016-06-22 17:19:14 +02:00
fieldOfView
cdd38763f6 Tweak sidebar tab bar appearance
CURA-1036
2016-06-22 16:06:11 +02:00
Jaime van Kessel
458749ca4e Removed old wizard pages
CURA-1385
2016-06-22 15:35:44 +02:00
Jaime van Kessel
d5b07d29de Actions are now reset before every run
CURA-1385
2016-06-22 14:39:41 +02:00
fieldOfView
1c83b15290 Tweak viewport overlay
Change color, opacity. Block mouseclicks.
CURA-1036
2016-06-22 14:22:35 +02:00
Jaime van Kessel
8cfc0737ac First run actions are now properly handled
CURA-1385
2016-06-22 11:49:35 +02:00