3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-24 23:23:57 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 9
17195 commits 307 branches 272 tags 787 MiB
Commit graph

17195 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Ian Paschal
3d80e28174 Add some typings 
Contributes to CL-1153
 2018-12-03 12:15:38 +01:00
Ian Paschal
665e2d3060 Move isActive and timeRemaining logic from QML to Python 
Contributes to CL-1153
 2018-12-03 12:15:25 +01:00
Ghostkeeper
65d3aa4480
Fix broken sizes due to merged theme entry 
Merge conflict went wrong, I think.

Contributes to issue CURA-5876.
 2018-12-03 11:59:03 +01:00
Ghostkeeper
c8cb3a094a
Re-use SecondaryButton instead of setting colours ourselves 
It has a pre-defined theme.

Contributes to issue CURA-5876.
 2018-12-03 11:52:10 +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
39411222da
Use normal font size for Auto slicing... message 
It should've been the normal font size anyway. This is not small!

Contributes to issue CURA-5876.
 2018-12-03 11:37:22 +01:00
Ghostkeeper
af747ae09c
Don't hide tab bar when disabling all but one extruder 
And make sure the checkbox for enabling also disappears.
We don't want to make this dependent on the number of enabled extruders, but on the total number of extruders. This way you can actually re-enable an extruder again because the tab bar shouldn't disappear.

Contributes to issue CURA-5876.
 2018-12-03 11:19:25 +01:00
Ghostkeeper
6012ea0b9e
Don't use QtQuick imports from Qt 5.11 
Our build system uses 5.10.

Contributes to issue CURA-5876.
 2018-12-03 11:15:11 +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
Ghostkeeper
db05d7853a
Remove background colour from tab window 
The colour is the same as what is behind it anyway.

Contributes to issue CURA-5876.
 2018-12-03 09:04:35 +01:00
Ghostkeeper
82e66eeaa1
Remove tabs and lining with single-extruder printers 
There's no sense in showing tabs if the user can't use them.

Contributes to issue CURA-5876.
 2018-12-03 09:02:41 +01:00
Diego Prado Gesto
e73a91e746 Merge branch 'master' into ui_rework_4_0 2018-12-02 12:11:12 +01:00
Ghostkeeper
0a6e420710
Make active tab white 
Contributes to issue CURA-5876.
 2018-11-30 17:05:25 +01:00
Ghostkeeper
f4950cf92b
Give checkboxes a style if they're disabled 
Contributes to issue CURA-5876.
 2018-11-30 17:04:50 +01:00
Jaime van Kessel
6ab2ce7690 Decrease padding between time & material specification headers 2018-11-30 16:44:55 +01:00
Ghostkeeper
d5d49fcec8
Disable extruder enabled checkbox if it's the last one 
You can't disable the last extruder.

Contributes to issue CURA-5876.
 2018-11-30 16:43:48 +01:00
Ghostkeeper
82d4897ba4
Use MouseArea to catch click instead of onClicked 
This is necessary because when you click it, the 'checked' property no longer depends on the active extruder. So prevent it from being clicked at all and handle the click separately in this MouseArea.

Contributes to issue CURA-5876.
 2018-11-30 16:18:46 +01:00
Jaime van Kessel
36a86adc0f Remove spammy log 2018-11-30 16:08:19 +01:00
Jaime van Kessel
ad26962cb9 Fix setting visibility not working in settingVisibilityPage 
CURA-5981
 2018-11-30 15:49:50 +01:00
Ghostkeeper
ed37e692a3
Don't disable enable checkbox before machine is loaded 
It is unnecessary because you can't see it or click on it before adding a machine.

Contributes to issue CURA-5876.
 2018-11-30 15:45:04 +01:00
Ghostkeeper
ede50ef3ca
Simplify dependencies on activeStack 
The properties, being formulas, were not properly updated when the active stack changed.

Contributes to issue CURA-5876.
 2018-11-30 15:44:15 +01:00
Ghostkeeper
18bb403413
No longer switch away from extruder when disabling 
It feels confusing when this happens.

Contributes to issue CURA-5876.
 2018-11-30 15:42:46 +01:00
Ghostkeeper
1d9a13cac2
Reset tab index when repeater's model is rebuilt 
We can't prevent the model from being rebuilt. At least, not without a major refactor.

Contributes to issue CURA-5876.
 2018-11-30 15:40:59 +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
a4a619370e Fix QML warnings 2018-11-30 15:33:57 +01:00
Jaime van Kessel
205b939b99 Merge branch 'remove_transitions' of github.com:Ultimaker/Cura 2018-11-30 15:30:53 +01:00
Jaime van Kessel
1a79372afd Fixed name of cocoon create 
For some reason it was added as if it was 2 machines at once. Since we already have a wanhao I3, i've changed this one to only be a profile for the Cocoon.
 2018-11-30 15:16:37 +01:00
Ghostkeeper
e93bbf07a4
Fix circular dependency with tab index and active stack 
Only when actually clicking the tab should it change the active extruder index; not when the current index is changed for any other reason.
Next up: Don't change the current index for any other reason.

Contributes to issue CURA-5876.
 2018-11-30 14:53:10 +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
4e2f51e7e8
Use public activeExtruderIndex rather than internal _activeExtruderIndex 
So that this getter still does what it needs to do if we ever decide to add side-effects.

Contributes to issue CURA-5876.
 2018-11-30 11:13:04 +01:00
Ghostkeeper
1c96c81ba9
Remove unnecessary extra setMetaDataEntry 
This is a relic from when you first had to add the metadata entry. Now it does nothing any more because it's being set directly afterwards to the actual value that is desired in the end.

Contributes to issue CURA-5876.
 2018-11-30 11:11:17 +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
Lipu Fei
b44ddec01f Change normal layer height of cocoon to 0.10 
CURA-5902

So it's different from Fine 0.15, otherwise you get duplicates.
 2018-11-29 08:35:40 +01:00
Ian Paschal
1f17896e78
Merge pull request #4899 from Ultimaker/monitor_tab_scroll_tweak 
Improve monitor tab temporary scroll bar
 2018-11-28 13:24:27 +01:00
Ian Paschal
14cee32cec Improve monitor tab temporary scroll bar 2018-11-28 12:20:09 +01:00
Jaime van Kessel
7d42fdf183 Add missing typing 2018-11-28 11:52:30 +01:00
Jaime van Kessel
0baa4d20b3 Gracefully handle the case where machine definition is no in the map 2018-11-28 11:42:54 +01:00
Jaime van Kessel
c0d1c35a2b Removed accidental copy paste 2018-11-28 11:35:48 +01:00
Jaime van Kessel
adf16310c7
Merge pull request #4883 from Ultimaker/CURA-5879_experimental_qualities 
CURA-5879 experimental qualities
 2018-11-28 11:34:21 +01:00