GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-29 17:45:45 +08:00
Code Issues Packages Projects Releases Wiki Activity
16,570 Commits 294 Branches 267 Tags
Commit Graph

88 Commits

Author SHA1 Message Date
Ian Paschal
7340b6dbc4 Update CameraButton.qml 
Contributes to CL-1150
 2018-11-27 10:53:00 +01:00
Ian Paschal
9f1ce72b9e Add Cura 4.0 printer cards 
Contributes to CL-1150
 2018-11-23 10:03:08 +01:00
Ian Paschal
963b8aa974 Fix QML warnings 
Contributes to CL-1148
 2018-11-22 13:56:01 +01:00
Ian Paschal
55554c62a9 Use array for extruder configurations 
Contributes to CL-1148
 2018-11-22 13:55:43 +01:00
Ian Paschal
da834d6a1f Silence binding loop 
Contributes to CL-1148
 2018-11-22 13:55:22 +01:00
Ian Paschal
1de21c1d94 Remove unnecessary "else" 
Contributes to CL-1148
 2018-11-22 13:13:06 +01:00
Ian Paschal
3c3343a407 Use bool for expanded or collapsed state 
Contributes to CL-1148
 2018-11-22 13:11:59 +01:00
Ian Paschal
ba7863c9d9 Fix type error for hovering manage queue link 
Contributes to CL-1148
 2018-11-22 11:09:35 +01:00
Ian Paschal
2f84339f5c Finalize queue 
Contributes to CL-1148
 2018-11-20 15:58:09 +01:00
Ian Paschal
fb3cb67da0 Add printer configuration components 
Contributes to CL-1148
 2018-11-20 13:46:41 +01:00
Ian Paschal
421a64c7b0 Replace queued print job cards with new design 
Contributes to CL-1148
 2018-11-19 16:42:36 +01:00
Ian Paschal
aa6ec9e44b Make text black 
Contributes to CL-1040
 2018-11-08 11:48:22 +01:00
Ian Paschal
35ed234991 Show print time in monitor tab 
Contributes to CL-1040
 2018-11-08 10:49:22 +01:00
Simon Edwards
7ecffdef3d Merge branch 'CL-1126_monitor_tab_context_menu_improvements' into 3.6 2018-11-06 17:06:04 +01:00
Ian Paschal
4c831de06c Remove console logs 
Contributes to CL-1126
 2018-11-06 16:41:59 +01:00
Ian Paschal
dc4b69c386 Show context menu at the right times 
Contributes to CL-1126
 2018-11-06 16:37:47 +01:00
Ian Paschal
c84aa9cf21 Use default font for configuration override 
Contributes to CL-1124
 2018-11-05 17:19:22 +01:00
Ian Paschal
1abd0b3499 Show "Pausing...", "Aborting...", and "Resuming..." texts 
Contributes to CL-1126
 2018-11-05 15:45:17 +01:00
Ian Paschal
4f10b7809a Configuration override improvements 
Contributes to CL-1124
 2018-11-05 12:15:17 +01:00
Ian Paschal
1ba8eff7fa Don't show camera icon unless printer details are expanded 
Contributes to CL-1063
 2018-10-31 13:52:31 +01:00
Ian Paschal
7960772ac8 Do show "delete" on print jobs waiting for configuration change 
Contributes to CL-1118
 2018-10-31 11:46:19 +01:00
Ian Paschal
ac7a566ae1 Do not show "move to top" on print jobs waiting for configuration change 
Contributes to CL-1118
 2018-10-31 11:45:30 +01:00
Ian Paschal
903054190d Fixing some spacing issues with camera button 
Contributes to CL-1063
 2018-10-31 11:23:57 +01:00
Simon Edwards
03dd26e6e2
Merge pull request #4692 from Ultimaker/monitor_tab_spacing_improvements 
Monitor tab spacing improvements
 2018-10-30 14:57:18 +01:00
Ian Paschal
30c7a2cbe5 Monitor tab spacing improvements 
Fixing CL-1063 (adding camera button at all times) introduced a few small spacing issues. This PR fixes them.
 2018-10-30 13:58:42 +01:00
Ian Paschal
0273cd2a0e Don't show the context menu for printed jobs (only active ones and queued ones) 
Contributes to CL-1118
 2018-10-30 13:44:24 +01:00
Ian Paschal
1680548a39 Remove extra empty line 2018-10-30 13:36:52 +01:00
Ian Paschal
adac66b3f7 Always show camera icon in monitor tab 
Contributes to CL-1063
 2018-10-30 10:53:43 +01:00
Lipu Fei
02681a5700 Change camera URL to non-optional QUrl 
Otherwise pyqt property will complain when it tries to convert a None to
a QUrl.
 2018-10-29 13:25:23 +01:00
fieldOfView
e0d6bac37d Fix remaining references to NetworkCamera and OutputDevice.activeCamera 2018-10-29 11:18:54 +01:00
fieldOfView
c187b6a25c Replace NetworkCamera with NetworkMJPGImage 2018-10-29 11:18:39 +01:00
Remco Burema
de680f4aac
Merge pull request #4669 from Ultimaker/CURA-5821_fix_camera_memory_leak 
Cura 5821 fix camera memory leak
 2018-10-26 15:00:03 +02:00
Ian Paschal
94d48101d9 Use different lengths for loading skeleton and printer name 
Contributes to CL-1119
 2018-10-25 16:45:49 +02:00
Lipu Fei
31bdeb8b73 Merge remote-tracking branch 'origin/3.6' into CURA-5821_fix_camera_memory_leak 2018-10-25 14:53:42 +02:00
Ian Paschal
1a67660196 Hotfix: Show printer selection 2018-10-25 10:54:59 +02:00
Lipu Fei
9d07409cce WIP: Use CameraView for UM camera feeds 
CURA-5821

The original implementation that refreshes a QImage seems to cause
memory overflow on MacOSX and Windows. This is a different
implementation. It doesn't cause memory overflow, but it does consume a
lot of CPU power.
 2018-10-24 16:00:22 +02:00
Ian Paschal
d077dcc851 Fix printer card skeleton colors 
Contributes to CL-1051
 2018-10-24 11:13:38 +02:00
Ian Paschal
8662e1a125 Fix override dialog box 
Contributes to CL-897
 2018-10-24 11:13:12 +02:00
Ian Paschal
a247fe204f Fix print job context menu height 
Contributes to CL-897, CL-1051, CL-1111
 2018-10-23 16:27:45 +02:00
Ian Paschal
0045559d01 QML Clean-up 
Contributes to CL-897, CL-1051, CL-1111
 2018-10-23 15:45:44 +02:00
Ian Paschal
f9545a339d QML Clean-up 
Contributes to CL-897, CL-1051, CL-1111
 2018-10-23 15:41:56 +02:00
Ian Paschal
9a16d45be5 Round divisions 
Contributes to CL-1051, CL-897, CL-1111
 2018-10-22 16:02:55 +02:00
Ian Paschal
34abc48a1a Remove binding loops 
Contributes to CL-1051
 2018-10-22 15:31:38 +02:00
Ian Paschal
817899686a Dark mode theme improvements 
Contributes to CL-1111
 2018-10-19 16:23:16 +02:00
Ian Paschal
1ad008f45c Style improvements 
Contributes to CL-897 and CL-1051
 2018-10-17 16:32:30 +02:00
Ian Paschal
6f33c4410c Review tweaks 
Contributes to CL-897 and CL-1051
 2018-10-17 14:39:42 +02:00
Ian Paschal
2dcfc049ba Remove skeleton loading after print jobs received 
Contributes to CL-1051
 2018-10-17 14:28:17 +02:00
Ian Paschal
b99bc06d1c Clean up more errors 
Contributes to CL-1051
 2018-10-16 09:34:50 +02:00
Ian Paschal
1fa7a8880b Clean up some QML warnings 
Contributes to CL-1051
 2018-10-15 17:02:27 +02:00
Ian Paschal
7f370a7574 Clean-up mistakes 
Oops!
 2018-10-03 12:28:35 +02:00