Commit graph

5880 commits

Author SHA1 Message Date
Jaime van Kessel
8e66686d6f Change "waiting" lable to "available"
Cl-896
2018-09-05 14:06:18 +02:00
Jaime van Kessel
23cd46824f Ensure that printer icon has disabled color if the printer is disabled
CL-896
2018-09-05 13:52:41 +02:00
Jaime van Kessel
5be65688a0 Change label to action required
In some cases it's not a configuration change that's required, so this is a more correct label

CL-896
2018-09-05 13:48:47 +02:00
Jaime van Kessel
7096c7382b Add width to labels in printcore qml object.
This ensures that the elide works correctly

CL-896
2018-09-05 13:43:24 +02:00
Jaime van Kessel
cd6832544b Fix for compatible_machine_families breaking for older firmwares
Older firmwares didn't have the compatible_machine_families field yet.

Cl-894
2018-09-05 13:17:33 +02:00
Jaime van Kessel
882cc000ac Move to top is now disabled for the first job
CL-896
2018-09-05 13:15:09 +02:00
Lipu Fei
ef5107e025 Update modified setting keys 2018-09-05 11:42:49 +02:00
Lipu Fei
082b9a4076 Merge remote-tracking branch 'origin/master' into CURA-5095_collect_user_modified_settings 2018-09-05 11:31:21 +02:00
Jaime van Kessel
1b9deb2790 Add unreachable label if a printer can not be reached inside a cluster
CL-896
2018-09-05 10:25:20 +02:00
Jaime van Kessel
7ad2e67074 Fix margins for active print job name in printer tile for cluster
CL-896
2018-09-05 10:09:44 +02:00
Jaime van Kessel
a0302684d6 Add handling for cluster print jobs that are in error state
CL-896
2018-09-05 10:06:37 +02:00
Jaime van Kessel
be4357c635 Show different state when printer is disabled
CL-896
2018-09-04 13:45:16 +02:00
Jaime van Kessel
132366fa61 Revert "Add enabled state to printer, so that it can be displayed."
This reverts commit dd778f0450.
2018-09-04 13:42:24 +02:00
Jaime van Kessel
dd778f0450 Add enabled state to printer, so that it can be displayed.
This ensures that if a printer is set to "Not available", that the interface can correctly show it

CL-896
2018-09-04 13:27:17 +02:00
Diego Prado Gesto
4098d4d289
Merge pull request #4313 from Ultimaker/CURA-5670_use_tags_to_define_showcase
Build models using reserved tags
2018-09-03 16:11:05 +02:00
Diego Prado Gesto
b638b2274a Count only the material packages by author, not all packages.
Contributes to CURA-5670.
2018-09-03 15:12:52 +02:00
Diego Prado Gesto
bf1d3b964f Skip loading a reply if it's not later handled.
Contributes to CURA-5670.
2018-09-03 14:30:05 +02:00
Jaime van Kessel
3969463758 Remove the old "not setup as group" notification
CL-896
2018-09-03 11:16:17 +02:00
Ghostkeeper
1136033f97
Remove superfluous check for 'ok T:'
This check is never hit because if there is 'ok T:' in the bytes array then it will have hit the first check for 'ok ' and 'T:'.
2018-09-03 10:50:07 +02:00
Jaime van Kessel
b7d7091de8 Add padding around the printer icons
CL-893
2018-09-03 10:26:27 +02:00
Jaime van Kessel
2e5b11af9d Fixed codestyle issue
Switching between codestyles is hard :(
2018-09-03 10:05:20 +02:00
Jaime van Kessel
fb1033ad99 Add the compatible machine families property to printerOutputModel
This is used by the cluster to indicate by which families of printers the job can be displayed

CL-894
2018-09-03 10:03:11 +02:00
fieldOfView
43b4ca3044 Fix code-style 2018-09-02 18:02:33 +02:00
Ian Paschal
988b9059b9 Fix code-style
Contributes to CURA-5670
2018-08-31 16:55:03 +02:00
Jaime van Kessel
98d0ad6c27 Add printer pill type to cluster monitor printer tile
CL-896
2018-08-31 16:47:26 +02:00
Ian Paschal
dec76a19ed Build models using reserved tags
Contributes to CURA-5670
2018-08-31 16:13:01 +02:00
Jaime van Kessel
8aef7216ec Increase the margin between print montior header and tiles
CL-896
2018-08-31 16:11:20 +02:00
Jaime van Kessel
224108c342 Decrease width of popups for cluster monitor
CL-896
2018-08-31 15:55:22 +02:00
Jaime van Kessel
485058c3de Made queue have a max width
CL-896
2018-08-31 15:50:34 +02:00
Jaime van Kessel
3ce9b481a2 Add rabithole links to cluster monitor page
CL-896
2018-08-31 15:01:54 +02:00
Lipu Fei
8a507c34a3
Merge pull request #4312 from Ultimaker/CURA-5676_add_contacts_toolbox
Cura 5676 add contacts toolbox
2018-08-31 13:58:57 +02:00
Lipu Fei
98d8a3f3e3 Fix code style and small cleanup
CURA-5676
2018-08-31 13:49:10 +02:00
Lipu Fei
c4afbe7a67 Convert links to a dict
CURA-5676

Easier to process.
2018-08-31 13:45:04 +02:00
Lipu Fei
9433cf7c45 Change email field to show full email address
CURA-5676
2018-08-31 13:23:41 +02:00
Lipu Fei
e17cf3dfbf Show company website full link as text
CURA-5676
2018-08-31 13:20:42 +02:00
Aleksei S
9258c9a7fc Added links to toolbox
CURA-5676
2018-08-31 11:03:30 +02:00
Diego Prado Gesto
a8cb1e25b4 Merge branch 'master' into fix_layer_number_width 2018-08-31 10:56:23 +02:00
Jaime van Kessel
e2bcf4dfa8 Show correct labels & status icon if print was aborted
CL-896
2018-08-30 17:18:48 +02:00
alekseisasin
0488494537
Merge pull request #4300 from Ultimaker/remove_double_extensions_cura_5650
change .curaproject.3mf to just use .3mf
2018-08-30 13:19:47 +02:00
Jaime van Kessel
49aeb60e7d Merge branch 'master' of github.com:Ultimaker/Cura into cura_connect_UI_rework 2018-08-30 10:35:20 +02:00
Jaime van Kessel
fd1b0a80e7 Fixed alignment of printCoreConfiguration
CL-896
2018-08-30 10:32:37 +02:00
Jaime van Kessel
14f253017b Align printer name & printjob name with center of printer icon
CL-896
2018-08-30 10:21:50 +02:00
Lipu Fei
9f158a995c
Merge pull request #4283 from Ultimaker/CURA-5555_ufp_material_profile
Add materil xml file to UFP file
2018-08-30 09:58:42 +02:00
Amanda de Castilho
7e7f2aab6b
Update DisplayFilenameAndLayerOnLCD.py 2018-08-29 09:48:37 -07:00
Amanda de Castilho
f7fbc685d8
Update DisplayFilenameAndLayerOnLCD.py
changed so that actual filename is displayed (or alternatively user can enter text to display) to LCD during print
2018-08-29 08:43:16 -07:00
Lipu Fei
570d0715ed Add call_on_qt_thread to UFPWriter.write()
CURA-5555
2018-08-29 17:38:36 +02:00
Lipu Fei
8f5aa82bdb Fix adding materials in UFP
CURA-5555

Need to use getContainer() for a MaterialNode.
2018-08-29 17:38:36 +02:00
Lipu Fei
939484bc91 Fix adding materials in UFP
CURA-5555

 - Store materials in virtual path "/Materials"
 - Correct material relationship type
 - Add origin for material relationship
 - Use MaterialManager instead of ContainerRegistry to get materials
 - Other minor changes
2018-08-29 17:25:36 +02:00
Amanda de Castilho
a5baa90086
Rename DisplayFilenameAndLayerOnLCD to DisplayFilenameAndLayerOnLCD.py
added the .py extention
2018-08-29 08:09:57 -07:00
Mark
baef0350cd Cleaned up MIME types 2018-08-29 14:41:38 +02:00