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
18,808 Commits 291 Branches 260 Tags
Commit Graph

16 Commits

Author SHA1 Message Date
Diego Prado Gesto
77ede1ae6b Unify the fonts to only have 8 instead of 13. 
Contributes to CURA-6025.
 2018-12-12 17:50:21 +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
a3fe9839ba
Change all uses of 'small' and 'very small' fonts to default 
These two fonts are exactly the same, but I want to use the 'small' font to be something a bit smaller. I'm 'removing' the superfluous font but will be re-using it immediately to look a bit smaller.

Contributes to issue CURA-5876.
 2018-11-26 17:33:37 +01:00
Lipu Fei
8eb0f66df3 Add connectedPrinter to ExtruderBox 
CURA-5943
 2018-11-22 14:08:50 +01:00
Diego Prado Gesto
90e8a05aab Remove all the entries in the theme that make reference to the sidebar, 
because there is no sidebar anymore.

Several different margins and linings were created depending on the
side, not depending on where it belongs.

Contributes to CURA-5784.
 2018-10-26 17:51:28 +02:00
Jaime van Kessel
4cde6c05ae Switch most usages of containerStackId to containerStack for settingPropertyProvider 
This mostly makes the code a bit more logic and also decreases the number of searches in the registry
 2018-09-07 15:23:09 +02:00
fieldOfView
f135b1675c Fix disabling preheat button when printer is not idle 2018-01-18 10:20:37 +01:00
fieldOfView
7994c95bbe Add unit to preheat temperature boxes 2018-01-17 18:03:01 +01:00
fieldOfView
bc5b5ac283 Implement preheating hotends for USB printing 2018-01-11 15:27:38 +01:00
fieldOfView
70cd6aad53 Remove commented-out code 2018-01-11 15:17:30 +01:00
fieldOfView
d3f94a1137 Get preheat temperatures from the proper stacks 2018-01-10 22:36:52 +01:00
fieldOfView
52412cb1cd Remove commented-out code 2018-01-10 21:59:17 +01:00
fieldOfView
fb9d841c90 Add per-extruder preheat controls 
These are lifted from the bed preheat controls and are not functional at the moment
 2018-01-10 21:41:59 +01:00
fieldOfView
c4aae784ee Improve tooltip text quality 2018-01-10 20:53:58 +01:00
Jaime van Kessel
d8b12be5e4 LegacyUM3 now correctly gets material set 
CL-541
 2017-11-21 16:26:17 +01:00
Jaime van Kessel
e3d07f1806 Moved ExtruderBox and OutputDeviceHeader to their own files. 
This makes it a whole lot easier to get an overview.

CL-541
 2017-11-21 16:06:30 +01:00