Lipu Fei
02e7f90473
Fix module importing in USBPrinting
...
CURA-5943
2018-12-04 15:02:52 +01:00
ChrisTerBeke
a79cfcbe47
Merge branch 'STAR-322_cloud-connection' of https://github.com/Ultimaker/Cura into STAR-322_cloud-connection
2018-12-04 14:22:17 +01:00
ChrisTerBeke
e98f3bff38
Implement test version of showing cloud connected printers in list
2018-12-04 14:09:20 +01:00
Marijn Deé
5d77209cfb
Be more efficient in updating the print jobs
2018-12-04 13:57:41 +01:00
Diego Prado Gesto
47ff95b1f3
Set contentType to the different expandable components.
...
Also add a color for the active state when the contentType is 'Fixed'.
Contributes to CURA-5941.
2018-12-04 13:53:11 +01:00
ChrisTerBeke
97535ffa24
Merge branch 'STAR-322_cloud-connection' of https://github.com/Ultimaker/Cura into STAR-322_cloud-connection
2018-12-04 13:23:38 +01:00
ChrisTerBeke
8e3e0c149e
fixes
2018-12-04 13:23:31 +01:00
Marijn Deé
02963eb9bf
Use a timer for the periodic update of the remote clusters and printjobs
2018-12-04 13:19:12 +01:00
Diego Prado Gesto
e159cbdb1a
Rename all the references from 'popup' to 'content'
...
Contributes to CURA-5941.
2018-12-04 13:14:12 +01:00
Marijn Deé
99bdb9c93f
Merge branch 'STAR-322_cloud-connection' of github.com:Ultimaker/Cura into STAR-322_cloud-connection
2018-12-04 13:06:33 +01:00
Marijn Deé
894c69685a
Periodically update the remote clusters and printjobs
2018-12-04 13:06:27 +01:00
ChrisTerBeke
97607419cf
Start with some fakes for monitor page
2018-12-04 12:14:21 +01:00
Ian Paschal
96b9c7f3ea
Fix multi-argument i18n string
...
Contributes to CL-1153
2018-12-04 11:40:56 +01:00
Ian Paschal
249a90199b
Improve printer status handling
...
Contributes to CL-1153
2018-12-04 11:08:01 +01:00
Ian Paschal
ab245bbff6
Make "finishes at" single translatable string
...
Contributes to CL-1153
2018-12-04 10:23:26 +01:00
ChrisTerBeke
12b3f0088d
Add content type to file upload
2018-12-04 10:07:43 +01:00
Diego Prado Gesto
ca3c639069
Merge branch 'ui_rework_4_0' into CURA-5941_restyle_setting_dropdown
2018-12-04 09:03:13 +01:00
ChrisTerBeke
1bcabc6f42
Fix is_online logic
2018-12-03 23:44:52 +01:00
ChrisTerBeke
b50e942768
Describe TODO for association by hostname, only connect when online
2018-12-03 23:42:41 +01:00
ChrisTerBeke
c40d76f9ee
Fix formatting according to Cura code style
2018-12-03 23:13:24 +01:00
ChrisTerBeke
5fdff17782
Add upload messages for UI feedback, needs some refactoring
2018-12-03 22:12:18 +01:00
ChrisTerBeke
08e1b4691b
Remove TODO
2018-12-03 20:19:16 +01:00
ChrisTerBeke
8d6f109092
Set priority to 2
2018-12-03 20:11:53 +01:00
ChrisTerBeke
0852d2ebef
add one more TODO
2018-12-03 17:42:39 +01:00
ChrisTerBeke
d91efc656a
Add some more todo's for UI messages
2018-12-03 17:38:31 +01:00
ChrisTerBeke
90ec3f6cf9
Add TODO for progress messages
2018-12-03 17:22:21 +01:00
ChrisTerBeke
5db6bd9a9b
Send content type to API when uploading print job
2018-12-03 17:09:04 +01:00
Daniel Schiavini
2b8c9c17bb
Merge branch 'STAR-322_cloud-connection' of github.com:Ultimaker/Cura into STAR-322_cloud-connection
2018-12-03 16:39:24 +01:00
Daniel Schiavini
186c2cf3f5
START-322: Python 3.5 compatibility
2018-12-03 16:35:51 +01:00
ChrisTerBeke
ddf958d39a
Fix typing in CloudOutputDevice
2018-12-03 16:23:44 +01:00
ChrisTerBeke
24b75d781e
Fix merge conflict
2018-12-03 15:58:25 +01:00
Daniel Schiavini
f8f6670cae
STAR-322: Letting models convert sub-models
2018-12-03 15:06:01 +01:00
Ian Paschal
95400282b9
Simplify logic slightly
...
Contributes to CL-1153
2018-12-03 14:44:15 +01:00
Ian Paschal
cced42a55b
Handle idle, unavailable, and unreachable states
...
Contributes to CL-1153
2018-12-03 14:41:45 +01:00
Daniel Schiavini
fc26ccd6fa
STAR-332: Some improvements to get the job in connect
2018-12-03 14:41:36 +01:00
Ian Paschal
c9ed044205
Improve printer status and progress bar
...
Contributes to CL-1153
2018-12-03 14:41:22 +01:00
Ian Paschal
a28cae0a43
Improve date rendering
...
- Use "Mon Dec 3 at 12:39" if 7 days or more away.
- Use "Mon at 12:39" if within 7 days but more than one away.
- Use "tomorrow at 12:39" if one day away.
- Use "today at 12:39" if today.
Contributes to CL-1153
2018-12-03 12:18:33 +01:00
Ghostkeeper
7df4c01814
Merge branch 'ui_rework_4_0' into CURA-5876-Configuration_dropdown
...
Conflicts:
cura/Settings/MachineManager.py -> rowCount vs. count
resources/qml/ExtruderIcon.qml -> Someone changed stuff that I had overwritten.
resources/qml/Menus/ConfigurationMenu/PrintCoreConfiguration.qml -> Someone changed stuff that I had removed.
resources/qml/Toolbar.qml -> Git was wrong, not a conflict.
resources/themes/cura-light/theme.json -> Git was wrong, not a conflict.
2018-12-03 11:45:05 +01:00
Ghostkeeper
f3af5a72ad
Use ListModel.count instead of rowCount
...
The .count property properly updates when the model is changed.
Contributes to issue CURA-5876.
2018-12-03 11:13:26 +01:00
Daniel Schiavini
8066074a2f
STAR-332: Fixing warnings
2018-12-03 11:02:49 +01:00
Lipu Fei
c688f0ea88
Merge pull request #4864 from Ultimaker/CURA-5943_ui_usb_printing
...
Cura 5943 ui usb printing
2018-12-03 10:42:58 +01:00
Diego Prado Gesto
7dc3320b06
Remove all the signal propagation for the tooltip and allow only Cura.qml to handle them
...
Contributes to CURA-5941.
2018-12-02 20:32:55 +01:00
Diego Prado Gesto
260c0a04ca
Merge branch 'ui_rework_4_0' into CURA-5941_restyle_setting_dropdown
2018-12-02 12:13:28 +01:00
Diego Prado Gesto
e73a91e746
Merge branch 'master' into ui_rework_4_0
2018-12-02 12:11:12 +01:00
Jaime van Kessel
36a86adc0f
Remove spammy log
2018-11-30 16:08:19 +01:00
Marijn Deé
8b42b84618
Made a start with uploading jobs to the printer
2018-11-30 16:07:20 +01:00
Jaime van Kessel
384c359db1
Merge branch 'master' of github.com:Ultimaker/Cura into ui_rework_4_0
2018-11-30 15:34:47 +01:00
Diego Prado Gesto
1a778b3078
Fix qualiy slider alignments
...
Contributes to CURA-5941.
2018-11-30 14:18:07 +01:00
Jaime van Kessel
59a81be65c
Fixed some leftover graphical issues
...
CURA-5943
2018-11-30 14:10:42 +01:00
Jaime van Kessel
48bdb735f2
Added MachineSelector to monitor menu
...
CURA-5943
2018-11-30 13:58:44 +01:00