GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-06 20:28:59 +08:00
Code Issues Packages Projects Releases Wiki Activity
17,731 Commits 290 Branches 260 Tags
Commit Graph

5336 Commits

Author SHA1 Message Date
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
Diego Prado Gesto
3ca749cdcb Add a bunch of renderTypes to labels in the DiscoverUM3Action. 2018-12-06 14:31:52 +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
Diego Prado Gesto
76acb13f59 Change the play/pause button colors 2018-12-06 13:50:58 +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
Diego Prado Gesto
b0c3a4e17a Align the additional components to the right of the job specs 
The model checker now shows centered
 2018-12-06 09:25:31 +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
Diego Prado Gesto
07d58c3aef Merge branch 'ui_rework_4_0' into CURA-5941_restyle_setting_dropdown 2018-12-05 13:56:21 +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
Ghostkeeper
024bf409c9
Merge branch 'CURA-5876-Configuration_dropdown' into ui_rework_4_0 2018-12-05 13:29:06 +01:00
Jaime van Kessel
b1440737e6 Remove a whole bunch of unused code 
CURA-6006
 2018-12-05 13:21:17 +01:00
Diego Prado Gesto
909b0f3f7e Merge branch 'ui_rework_4_0' into CURA-5941_restyle_setting_dropdown 2018-12-05 13:10:42 +01:00
Diego Prado Gesto
537929893f Merge branch 'master' into ui_rework_4_0 2018-12-05 13:10:14 +01:00
Ian Paschal
e8a933331c Clean-up printer status label 
Contributes to CL-1153
 2018-12-05 12:14:18 +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
Diego Prado Gesto
cdb8020029 Add another expandable component 
Use one of them if the drop-panel has to act as a Popup and the other if it has to act as a standard component.

Contributes to CURA-5941.
 2018-12-05 09:39:04 +01:00
Lipu Fei
4ff5e43a28 Handle Empty and Unknown material cases 
CURA-5982
 2018-12-04 17:24:51 +01:00
Lipu Fei
fb3c1fc11d Merge remote-tracking branch 'origin/master' into CURA-5982_fix_crash_no_material 2018-12-04 17:15:26 +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
Ghostkeeper
b5bb3232f3
Merge branch 'ui_rework_4_0' into CURA-5876-Configuration_dropdown 
Conflicts:
	resources/qml/ActionPanel/OutputProcessWidget.qml -> Due to removed theme entry.
 2018-12-04 15:21:36 +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
Ghostkeeper
4d87c46423
Remove sourceSize.width: width from all RecolorImages 
It is now the default in Uranium.

Contributes to issue CURA-5876.
 2018-12-04 15:04:51 +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
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
Diego Prado Gesto
e159cbdb1a Rename all the references from 'popup' to 'content' 
Contributes to CURA-5941.
 2018-12-04 13:14:12 +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
Diego Prado Gesto
ca3c639069 Merge branch 'ui_rework_4_0' into CURA-5941_restyle_setting_dropdown 2018-12-04 09:03:13 +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
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
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