GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-01 00:04:27 +08:00
Code Issues Packages Projects Releases Wiki Activity
17,116 Commits 291 Branches 260 Tags
Commit Graph

5113 Commits

Author SHA1 Message Date
Jaime van Kessel
d4a255c9e5 Also add the login required label at the installed plugin list 
CURA-6006
 2018-12-06 17:35:58 +01:00
Jaime van Kessel
2c9c9d8c96 Handle non-happy path for downloading 
CURA-6006
 2018-12-06 17:23:02 +01:00
Jaime van Kessel
717fb260c1 Change toolbox tabs to controls2 
CURA-6006
 2018-12-06 16:58:40 +01:00
Jaime van Kessel
4b8e3c32cb Also show the login required if an update is needed 
CURA-6006
 2018-12-06 16:37:47 +01:00
Jaime van Kessel
4e2ab163ed Add login fequired link to packages that have the login-required tag 
CURA-6006
 2018-12-06 16:24:12 +01:00
Jaime van Kessel
62c5398933 Change buttons to use either secondary or primary 
CURA-6006
 2018-12-06 14:58:46 +01:00
Jaime van Kessel
a77ad32999 Move all the seperate tiles into loaders instead of the entire page 
Otherwise the details selection didn't work anymore and I didn't want to add more hacks.

CURA-6006
 2018-12-06 14:35:07 +01:00
Jaime van Kessel
54def4edee Revert "Moved qml pages of toolbox to a loader" 
This reverts commit 838949dac74831e38e9f07fe7d628af7807320db.
 2018-12-06 14:12:35 +01:00
Jaime van Kessel
2602d5bf02 Add changed checks to prevent unneeded signals from being fired 
CURA-6006
 2018-12-06 10:46:19 +01:00
Jaime van Kessel
6a466c99b2 Make the progressButton use signals instead of functions 
Although the naming is still a bit off, it's much cleaner to use signals instead of functions. It's
also more in line with how default QML components handle these kind of situations

CURA-6006
 2018-12-06 09:54:32 +01:00
Jaime van Kessel
838949dac7 Moved qml pages of toolbox to a loader 
This dramatically improves the loading of the toolbox dialog

CURA-6006
 2018-12-06 09:45:27 +01:00
Jaime van Kessel
00e95e68eb Removed unneeded Marketplace tag in logging 
The logger does that all by itself already. CURA-6006
 2018-12-05 14:26:47 +01:00
Jaime van Kessel
d6630b6881 Removed some more cases where data was duplicated and re-used for different purposes 
CURA-6006
 2018-12-05 14:09:55 +01:00
Jaime van Kessel
a52f866f81 Move most models out of dictionary 
CURA-6006
 2018-12-05 14:03:32 +01:00
Jaime van Kessel
07d210483c Greatly decrease the bloat / complexity of the toolbox 
There was a lot of stuff going on that didn't need to happen, so I cut those parts out in order
to improve the overview.
 2018-12-05 13:42:13 +01:00
Jaime van Kessel
b1440737e6 Remove a whole bunch of unused code 
CURA-6006
 2018-12-05 13:21:17 +01:00
Jaime van Kessel
abcc621cc6 Added missing typing 2018-12-05 11:29:44 +01:00
Jaime van Kessel
d9135ac72f Fix more codestyle issues 
CURA-6006
 2018-12-05 11:06:14 +01:00
Jaime van Kessel
978a01e4c8 Fix typing & codestyle 
CURA-6006
 2018-12-05 10:51:05 +01:00
Jaime van Kessel
700ae4bebb Removed super spammy logging 
CURA-6006
 2018-12-05 10:48:06 +01:00
Lipu Fei
a13fb4a81e Merge remote-tracking branch 'origin/master' into ui_rework_4_0 2018-12-04 17:12:24 +01:00
Simon Edwards
39c282fabe
Merge pull request #4925 from Ultimaker/CL-1153_printer_states_in_monitor 
CL-1153 printer states in monitor
 2018-12-04 15:30:12 +01:00
Ian Paschal
014a138fda Remove semi-colon 
Contributes to CL-1153
 2018-12-04 15:12:00 +01:00
Ian Paschal
1494daf671 Simplify preview icon logic 
Contributes to CL-1153
 2018-12-04 15:11:31 +01:00
Ian Paschal
ebb31409b8 Always return a string for preview icon 
Contributes to CL-1153
 2018-12-04 15:10:31 +01:00
Lipu Fei
5255bca9dd Merge remote-tracking branch 'origin/master' into ui_rework_4_0 2018-12-04 15:08:50 +01:00
Lipu Fei
43096c1baf Update USBPrinting version to 1.0.1 
CURA-5943
 2018-12-04 15:03:45 +01:00
Lipu Fei
02e7f90473 Fix module importing in USBPrinting 
CURA-5943
 2018-12-04 15:02:52 +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
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
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
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
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
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
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
Jaime van Kessel
6d4a460e58 Move USB sidebar into the main view of the monitorstage 
CURA-5943
 2018-11-30 13:53:53 +01:00
Ghostkeeper
14a7b7b2ce
Merge branch 'update_example_postprocessing_script' 2018-11-29 15:33:03 +01:00
Mark
90aa8c1264 point people to a good example 2018-11-29 15:29:51 +01:00
Lipu Fei
6db52dde46 Fix merge conflicts from ui_rework_40 
CURA-5943
 2018-11-29 15:27:06 +01:00
Lipu Fei
c545d9df77 Add key check before accessing in ƒStartSliceJob 
CURA-5901
 2018-11-29 15:17:43 +01:00
Mark
d88a465737 Increase possible visible description lines in the Marketplace 2018-11-29 14:45:42 +01:00
Lipu Fei
5df7cdde48 Merge remote-tracking branch 'origin/master' into ui_rework_4_0 2018-11-29 08:54:22 +01:00
Lipu Fei
b1b773e464
Merge pull request #4891 from Ultimaker/show_website_as_support_in_marketplace 
Show website for support
 2018-11-29 08:50:32 +01:00
Ian Paschal
14cee32cec Improve monitor tab temporary scroll bar 2018-11-28 12:20:09 +01:00