GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-15 09:58:02 +08:00
Code Issues Packages Projects Releases Wiki Activity
29,960 Commits 290 Branches 260 Tags
Commit Graph

357 Commits

Author SHA1 Message Date
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
Ghostkeeper
1bcd134f85
Fix code style 
Most stuff here was recently changed. Some of it was where I found a pattern in something that was likely copy-pasted from somewhere else, so I did a global search and replace on that.

Contributes to issue CURA-5784.
 2018-10-18 14:30:33 +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
Ian Paschal
5ca0c599e9 Review feedback 
Now with unified style as agreed upon by Simon & Ian.

Rules:

- ID before all other props.
- All props before children.
- All props after ID in alphabetical order.
- Empty line between children.
- Semi-colons.

Note: I didn't touch the DiscoverUM3Action because that's it's whole own UI part.
 2018-10-03 10:55:38 +02:00
Ian Paschal
2c5095befb Add copyright headers 2018-10-03 09:43:13 +02:00
Ian Paschal
ae9faadca6 Add i18nc string 
Contributes to CL-1051
 2018-10-01 16:36:22 +02:00
Ian Paschal
00ce3b0083 Review feedback 
Contributes to CL-1051
 2018-10-01 16:32:30 +02:00
Ian Paschal
97fa5094ce Monitor tab refactor + skeleton loading 
Contributes to CL-1051
 2018-10-01 16:24:51 +02:00
Ian Paschal
7c01e632df Rework printer cards (cont) 
Contributes to CL-1051
 2018-09-28 17:00:50 +02:00
Ian Paschal
b5c893c08e Rework printer cards 
Contributes to CL-1051
 2018-09-28 12:15:33 +02:00
Ian Paschal
fc333d53c5 Replaced print job context menu 
Contributes to CL-897, CL-1051
 2018-09-27 14:54:40 +02:00
Ian Paschal
302f9a95b3 Cleaned-up printe job info block 
Contributes to CL-897, CL-1051
 2018-09-27 13:40:46 +02:00
Simon Edwards
e99b376374 Merge remote-tracking branch 'origin/3.5' into cura_connect_improvements_3.5 2018-09-25 16:59:33 +02:00
Ian Paschal
50e07ae2a7 ...and in with the new. 
Contributes to CL-897
 2018-09-20 17:14:19 +02:00
Ian Paschal
a2f5dda564 Out with the old... 
Contributes to CL-897
 2018-09-20 17:13:45 +02:00
Ian Paschal
60ff8aa05f Merge remote-tracking branch 'origin/3.5' into cura_connect_improvements 2018-09-20 10:18:00 +02:00
Simon Edwards
9d85f3ece6 Use the same string as the web front-end 
CL-897
 2018-09-19 17:02:46 +02:00
Simon Edwards
b7673a7438 Show Cura Connect alerts in the monitor tab 
CL-897
 2018-09-19 16:53:18 +02:00
Ghostkeeper
3a096cdb23
Add confirmation dialogue for deleting jobs 
Re-using MessageDialog again.

Contributes to issues CL-1053 and CURA-5729.
 2018-09-18 11:42:34 +02:00
Ghostkeeper
83528ffb48
Add confirmation dialogue for sending prints to top of queue 
Very simple. Just re-use the MessageDialog component.

Contributes to issues CL-1053 and CURA-5729.
 2018-09-18 11:41:51 +02:00
Ghostkeeper
a7a022eca0
Add confirmation dialogue before aborting a print 
It's a destructive operation so we should ask first.

Contributes to issue CL-1053 and CURA-5729.
 2018-09-18 11:24:30 +02:00
Ian Paschal
942d20a8d8 Monitor Tab - Fix pause button 
Contributes to CL-1050
 2018-09-13 16:31:07 +02:00
Ian Paschal
f93413d3a3 Monitor Tab - Context menu improvements 
Fixed:
- In the Queued jobs area, the context menu doesn't close when clicking on the right half of the card.
- Context menu trigger button should be more in the corner for both the print job tiles and the printer tiles
- Context menu text should not be centered
- Context menu should be closer to the context menu trigger button
- Context menu should be aligned further right in relation to the context menu trigger button
- Context menu options that are not available should not be shown.
- Context button dots should be grey.

Contributes to CL-1050
 2018-09-13 14:52:52 +02:00
Ian Paschal
7226bc45b5 Monitor Tab - Queued header is properly aligned 
Contributes to CL-1052
 2018-09-13 10:35:31 +02:00
Ian Paschal
0b66bf0448 Monitor Tab - Use camera button on camera stream 
- Fixes: Video feed close button is always out of sight
- Makes improvement to camera icon

Contributes to CL-1049
 2018-09-12 17:07:10 +02:00
Ian Paschal
08d5e48407 Monitor Tab - Create reusable button 
Contributes to CL-1049
 2018-09-12 16:52:26 +02:00
Ian Paschal
dccc95f817 Monitor Tab - Camera button toggles 
Contributes to CL-1049
 2018-09-12 16:46:18 +02:00
Ian Paschal
0a01e7c25b Monitor Tab - Improved camera icon 
- Fixed: Camera icon is too small, and the icon does not look centred
- Fixed: No hover effect for the camera button

Contributes to CL-1049
 2018-09-12 16:31:59 +02:00
Ian Paschal
e51089a880 Mointor Tab - CL-1046 Make fonts bold 2018-09-12 13:03:12 +02:00
Ian Paschal
e7704ede3c Monitor Tab - Fix queue/manage queue alignment 
Contributes to CL-1052
 2018-09-11 17:01:26 +02:00
Ian Paschal
ac5a038065 Monitor Tab - Fix syntax error 
Contributes to CL-1048
 2018-09-11 10:27:50 +02:00
Ian Paschal
333cea4e6d Some tweaks were not really improvements 
Contributes to CL-1048
 2018-09-10 15:06:19 +02:00
Ian Paschal
1c8b086403 Improve inactive coloring 
Contributes to CL-1048
 2018-09-10 14:35:05 +02:00
Ian Paschal
0d67420601 Monitor Tab - Accordion-style printer blocks 
Includes some unsuccessful attempts at scaling the outer-shadow

Contributes to CL-1048
 2018-09-10 13:38:26 +02:00
Ian Paschal
90426749a2 Change deactiveStates to inactiveStates 
Contributes to CL-1047
 2018-09-10 11:35:58 +02:00