GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-28 17:18:39 +08:00
Code Issues Packages Projects Releases Wiki Activity
17,410 Commits 293 Branches 266 Tags
Commit Graph

17410 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Diego Prado Gesto
692686597c Fix an issues that didn't calculate the correct height of the popup when the custom mode was selected from previous runs. 
Contributes to CURA-5941.
 2018-12-04 12:07:31 +01:00
Ian Paschal
96b9c7f3ea Fix multi-argument i18n string 
Contributes to CL-1153
 2018-12-04 11:40:56 +01:00
Lipu Fei
0d086008ae Merge remote-tracking branch 'origin/master' into ui_rework_4_0 2018-12-04 11:38:47 +01:00
Ian Paschal
249a90199b Improve printer status handling 
Contributes to CL-1153
 2018-12-04 11:08:01 +01:00
Lipu Fei
9ec7428620 Fix setting visiblity current index 
CURA-5981
 2018-12-04 10:55: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
0363c1257c Improve exposed progress prop 
Contributes to CL-1153
 2018-12-04 10:18:09 +01:00
Diego Prado Gesto
a66bb4fab1 Merge branch 'ui_rework_4_0' into CURA-5941_restyle_setting_dropdown 2018-12-04 09:23:00 +01:00
Diego Prado Gesto
57a852a15a Don't show the background if there are less than 2 extruders to show in the Toolbar 
It caused a very tiny rectangle if the printer has only 1 extruder.

Contributes to CURA-5984.
 2018-12-04 09:19:08 +01:00
Diego Prado Gesto
c1f5c00a7e Forgot to add the icon 2018-12-04 09:18:45 +01:00
Diego Prado Gesto
e9f8757fac Change the info button in the action panel according to the designs 
Adjust the padding in the preview shortcut.
 2018-12-04 09:12:57 +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
THeijmans
98ec6c66f2 CC06 profile fix 
removed line adding 10degrees to many profiles
 2018-12-04 08:25:05 +01:00
Ghostkeeper
6af1e72ea3
Show progress bar while autoslice is preparing 
Previously it would say 'preparing to slice'. Now it just says 'auto slicing' but with an indeterminate progress bar. Only the indeterminate progress bar just appears empty right now...

Contributes to issue CURA-5997.
 2018-12-04 07:51:48 +01:00
Jaime van Kessel
9b8b91b6a4
More specific variable type for is_connected 
Contributes to issue CURA-5876.

Co-Authored-By: Ghostkeeper <Ghostkeeper@users.noreply.github.com>
 2018-12-03 17:34:08 +01:00
Diego Prado Gesto
004405e5f9 Change the colors to match the designs. 
Contributes to CURA-5941.
 2018-12-03 17:25:07 +01:00
Ghostkeeper
f320000ce5
Change default profile of Aurora and Alfawise printers 
Instead of the default layer height, we should change the default quality profile.
This is necessary because the 'normal' quality profile doesn't define a layer height, so that should inherit from the 0.1mm default layer height. But if the printer turned the default into a 0.15mm layer height then that is wrong.
Maybe we should let the normal quality profile overwrite it to 0.1mm, always?

Contributes to issue CURA-5902.
 2018-12-03 17:23:44 +01:00
Diego Prado Gesto
15415dc3b9 Fix position of the tooltips for the settings 
Contributes to CURA-5941
 2018-12-03 16:53:52 +01:00
Diego Prado Gesto
d3b5b2717d Add rounded corners to the settings 
Contributes to CURA-5941
 2018-12-03 15:56:21 +01:00
Diego Prado Gesto
4e9c595bdd Restyle the settings list 
Be sure that the alignments and the margins are corrects according to the designs.

Contributes to CURA-5941.
 2018-12-03 15:34:33 +01:00
Ian Paschal
95400282b9 Simplify logic slightly 
Contributes to CL-1153
 2018-12-03 14:44:15 +01:00
Diego Prado Gesto
ce6a0676dd Add a rectangle surrounding the settings listview 
Contributes to CURA-5941.
 2018-12-03 14:43:35 +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
Diego Prado Gesto
4c468831f0 Add tabs for select the extruder in the custom print setup. 
Align some elements beneath the tabs.

Contributes to CURA-5941.
 2018-12-03 13:58:13 +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
Aleksei S
d5cc55409f Merge branch 'CURA-5941_restyle_setting_dropdown' of github.com:Ultimaker/cura into CURA-5941_restyle_setting_dropdown 2018-12-03 09:57:20 +01:00
Diego Prado Gesto
90281c455b Add global profile selector to the custom print setup panel 
Also modify some styles to adjust to the designs.

Contributes to CURA-5941.
 2018-12-03 09:45:49 +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
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
Diego Prado Gesto
adabb833e0 Add row for the adhesion setting in the recommended mode 
Contributes to CURA-5941.
 2018-12-02 19:14:34 +01:00
Diego Prado Gesto
1cea36b08a Add the row for the support selection in the recommended mode 
Contributes to CURA-5941.
 2018-12-02 19:01:54 +01:00
Diego Prado Gesto
1caccfb577 Add a binding to react when the infill density changes in the custom panel 
Also make the icon dinamic, that will change when the infill density changes.

Contributes to CURA-5941.
 2018-12-02 13:40:41 +01:00
Diego Prado Gesto
4154ec2fe8 Add enable gradual checkbox to the infill panel 
Contributes to CURA-5941.
 2018-12-02 12:39:52 +01:00
Diego Prado Gesto
5c5d99c548 Merge branch 'CURA-5941_restyle_setting_dropdown' of github.com:Ultimaker/Cura into CURA-5941_restyle_setting_dropdown 2018-12-02 12:21:03 +01:00
Diego Prado Gesto
260c0a04ca Merge branch 'ui_rework_4_0' into CURA-5941_restyle_setting_dropdown 2018-12-02 12:13:28 +01:00
Diego Prado Gesto
e73a91e746 Merge branch 'master' into ui_rework_4_0 2018-12-02 12:11:12 +01:00
Diego Prado Gesto
1238aa7304 Format the slider for the infill in the recommended mode 
Contributes to CURA-5941
 2018-12-02 12:03:58 +01:00
Aleksei S
29b7f42e0e Chaged settings visibility icon 
CURA-5941
 2018-11-30 18:33:53 +01:00