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

753 Commits

Author SHA1 Message Date
Lipu Fei
620790ae3d Reduce the creations of ExtrudersModels 
CURA-6015
 2018-12-13 14:12:23 +01:00
Lipu Fei
2cf80b4578 Remove unused simpleNames flag 
CURA-6015
 2018-12-13 14:12:04 +01:00
Diego Prado Gesto
1f26b55731
Merge pull request #4966 from Ultimaker/CL-1160_fix_materials_none_type 
CL-1160 Replace fix for 'None' materials
 2018-12-11 12:14:34 +01:00
Diego Prado Gesto
4949f39c34 Add translatable strings to empty and unknown material 
Contributes to CL-1160.
 2018-12-11 12:10:32 +01:00
Diego Prado Gesto
70b0d16fa4 Fix typo 
Missing parenthesis.

Contributes to CL-1160.
 2018-12-11 11:53:26 +01:00
Ian Paschal
1c373b7205 Improve config override text 
Contributes to CL-1152
 2018-12-11 11:51:13 +01:00
Diego Prado Gesto
2b2e8ebb31 Add some safety checks when checking for the guid of the material 
Don't crash if the guid doesn't exist.

Contributes to CL-1160.
 2018-12-11 11:37:01 +01:00
Ian Paschal
0f357e1078 Replace fix for 'None' materials 
This was fixed in 4.0 and accidentally got reverted when merging another branch in.

Contributes to CL-1160
 2018-12-11 10:51:05 +01:00
Ian Paschal
0e19fa731f Codestyle 
Contributes to CL-1152
 2018-12-10 15:47:45 +01:00
Ian Paschal
04af8fbd50 Update MonitorConfigOverrideDialog.qml 
Contributes to CL-1152
 2018-12-10 15:33:16 +01:00
Ian Paschal
028d993bab Format .gcode.gz files too 
Contributes to CL-1152
 2018-12-10 15:27:51 +01:00
Ian Paschal
32f2b7ec1f Fix some warnings 
Contributes to CL-1152
 2018-12-10 15:05:01 +01:00
Ian Paschal
2db5d2b231 Add support for translation plurals 
Contributes to CL-1152
 2018-12-10 14:54:45 +01:00
Ian Paschal
df0ae20dde Let's just get stepped up in here and get some personal space 
Contributes to CL-1152
 2018-12-10 14:39:15 +01:00
Ian Paschal
315bcf50c7 Get some personal space up in this personal space 
Contributes to CL-1152
 2018-12-10 14:31:49 +01:00
Ian Paschal
df4e5c40df Rename ClusterMonitorItem 
Contributes to CL-1152
 2018-12-10 12:19:52 +01:00
Ian Paschal
8a856f13d2 Re-add config changes in monitor tab 
Contributes to CL-1152
 2018-12-10 11:36:51 +01:00
Ian Paschal
ad7dcf6fc0 Delete ClusterControlItem.qml 
Contributes to CL-1152
 2018-12-10 11:36:12 +01:00
Ian Paschal
021c448627 Remove depreciated monitor tab stuff 
Contributes to CL-1152
 2018-12-10 11:31:18 +01:00
Diego Prado Gesto
1d33fe081f Clean up the code 
Remove all the references to the sidebar and use the term print_setup instead.

Contributes to CURA-5941.
 2018-12-07 12:07:41 +01:00
Diego Prado Gesto
3b8b70bddf Merge branch 'ui_rework_4_0' into CURA-5941_restyle_setting_dropdown 2018-12-06 16: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
Diego Prado Gesto
07d58c3aef Merge branch 'ui_rework_4_0' into CURA-5941_restyle_setting_dropdown 2018-12-05 13:56:21 +01:00
Ghostkeeper
024bf409c9
Merge branch 'CURA-5876-Configuration_dropdown' into ui_rework_4_0 2018-12-05 13:29:06 +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
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
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
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
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
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
Jaime van Kessel
36a86adc0f Remove spammy log 2018-11-30 16:08:19 +01:00
Diego Prado Gesto
1a778b3078 Fix qualiy slider alignments 
Contributes to CURA-5941.
 2018-11-30 14:18:07 +01:00
Lipu Fei
5df7cdde48 Merge remote-tracking branch 'origin/master' into ui_rework_4_0 2018-11-29 08:54:22 +01:00
Ian Paschal
14cee32cec Improve monitor tab temporary scroll bar 2018-11-28 12:20:09 +01:00
Simon Edwards
8262c2dfd6
Merge pull request #4889 from Ultimaker/CL-1150_restyle_monitor_printer_tile 
CL-1150 restyle monitor printer tile
 2018-11-28 11:31:11 +01:00
Ian Paschal
9029d10ed0 Remove debug statement 
Contributes to CL-1150
 2018-11-28 10:47:34 +01:00
Ian Paschal
370fa0fd14 Remove old sidebar 
Contributes to CL-1150
 2018-11-28 10:46:22 +01:00