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

44 Commits

Author SHA1 Message Date
Ghostkeeper
d353776fe8
Fix showing extruder names in USB printing monitor 
It was using a deprecated function. Apparently deprectated pyqtSlots don't work because it breaks the PyQt binding for some reason. That has to be fixed. But for now I'll make this use the non-deprecated function.
 2019-07-25 15:17:13 +02:00
Ghostkeeper
350dd5db3c
Correct positioning of tooltip for g-code text area 2019-05-10 11:32:40 +02:00
Diego Prado Gesto
ef2fb53790 Merge branch '4.0' into unify_font_types 2018-12-19 11:56:22 +01:00
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
Diego Prado Gesto
f99c788eb6 Change some colors for the arrows in some setting selectors 
Contributes to CURA-5876.
 2018-12-11 16:35:59 +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
Jaime van Kessel
59a81be65c Fixed some leftover graphical issues 
CURA-5943
 2018-11-30 14:10:42 +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
6bed1c1390 Move monitor_checkable_button_style out to styles.qml 
CURA-5943
 2018-11-26 13:21:55 +01:00
Lipu Fei
6bb010e74a Move MonitorButtonStyle to styles.qml 
CURA-5943
 2018-11-26 13:14:26 +01:00
Lipu Fei
d8c3078d78 Add connectedPrinter to HeatedBedBox 
CURA-5943
 2018-11-22 14:10:41 +01:00
Lipu Fei
8eb0f66df3 Add connectedPrinter to ExtruderBox 
CURA-5943
 2018-11-22 14:08:50 +01:00
Lipu Fei
e65f2d66a6 Add connectedPrinter to MonitorItem 
CURA-5943
 2018-11-22 14:06:43 +01:00
Lipu Fei
5a16918391 Update ManualPrinterControl 
CURA-5943
 2018-11-22 14:03:03 +01:00
Lipu Fei
cf0994037c Move MonitorButtonSytle to a separate QML file 
CURA-5943
 2018-11-22 14:03:03 +01:00
Lipu Fei
45d4f2ad3d Update MonitorSection 
CURA-5943
 2018-11-22 14:03:03 +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
Ghostkeeper
9e4fcd820e
Update outputDevice when the global container changed 
And directly link the active printer name to it, so that that also gets updated. With the property var it just gets evaluated upon creating the rectangle.

Contributes to issue CURA-5749.
 2018-10-12 14:56:27 +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
Jaime van Kessel
1180fad62f Fix binding loop 2018-08-09 11:33:04 +02:00
Ghostkeeper
877032584e
Correct documentation 
This code was obviously copied from the pre-heat functionality. Let's fix the code duplication next as far as possible.

Contributes to issue CURA-4879.
 2018-03-20 13:22:18 +01:00
ChrisTerBeke
d4d9a58d04 Fix merge conflicts, add can_send_raw_gcode ability, rename to sendRawCommand, small fixes 2018-03-15 16:51:25 +01:00
ChrisTerBeke
bd46515382
Make custom commands functional, fix UI layout, typos 2018-01-26 22:10:44 +01:00
ChrisTerBeke
866e99bcbb
More QML for sending custom commands, not styled or tested yet 2018-01-25 23:02:46 +01:00
ChrisTerBeke
d7254ff8d0
Start UI elements for custom command input 2018-01-25 22:56:46 +01: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
99de75a3fd Fixed connection label state 
CL-541
 2018-01-08 13:44:20 +01:00
ChrisTerBeke
39921795ce Properly align printer not connected label from top 2018-01-05 14:46:16 +01:00
Jaime van Kessel
b6ebb804ba OutputDevice header now shows name of active printer 
CL-541
 2018-01-04 10:13:55 +01:00
Jaime van Kessel
89004b8df5 Fixed some QML warnings 
CL-541
 2017-12-19 17:19:04 +01:00
Jaime van Kessel
1719a7b2fe Fixed preheating for Legacy UM3 
CL-541
 2017-12-08 17:16:59 +01:00
Jaime van Kessel
00eeb835ac ManualPrinterControl uses correct functions again 
CL-541
 2017-11-27 10:22:30 +01:00
Jaime van Kessel
5036eccd32 Moved multiple components to their own files 
CL-541
 2017-11-27 10:15:28 +01:00
Jaime van Kessel
f987e6d977 Functionality properties (canPause, canPreHeatBed, etc) are now in the Controller. 
It's actually up to the controller to say something about this, so this location makes more sense

CL-541
 2017-11-21 16:59:17 +01:00
Jaime van Kessel
0fe91db636 Moved HeatedBedBox to own qml file 
CL-541
 2017-11-21 16:52:37 +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