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

5195 Commits

Author SHA1 Message Date
Lipu Fei
17c93dea80 Fix merge conflicts with 4.0 2018-12-13 14:39:28 +01:00
Diego Prado Gesto
aa2fa371c4 Merge branch '4.0' of github.com:Ultimaker/Cura into 4.0 2018-12-13 14:32:28 +01:00
Diego Prado Gesto
17f0c12858 Make the middle component to have zero width if there is no component to 
fill the gap.

Contributes to CURA-6020.
 2018-12-13 14:31:34 +01:00
Jaime van Kessel
b64882bb1e Merge branch 'quit_cura_button' of github.com:Ultimaker/Cura into 4.0 2018-12-13 13:23:47 +01:00
Diego Prado Gesto
121af7ad60 Reuse the primary button in the toolbox for the "Quit Cura" button 2018-12-13 09:41:07 +01:00
Diego Prado Gesto
635115a879
Merge pull request #4982 from Ultimaker/fix_preview_stage_menu 
Fix preview stage menu
 2018-12-13 09:32:01 +01:00
Lipu Fei
b6ea61612e Fix merge conflicts 2018-12-12 13:26:01 +01:00
alekseisasin
a505adbf40
Merge pull request #4945 from Ultimaker/CURA-6006-login-required 
[4.0] CURA-6006 login required
 2018-12-12 11:31:38 +01:00
Remco Burema
1b2ef91c13 Merge branch 'CURA-6016_Improve_UI_Speed' into 4.0 2018-12-12 10:54:36 +01:00
Lipu Fei
a6663ea0e8 Fix typing issues 
CURA-6005
 2018-12-12 10:51:13 +01:00
Lipu Fei
f302a76d3a Fix typing issue in Toolbox 
CURA-6006
 2018-12-12 10:47:18 +01:00
Lipu Fei
8c07a6e89b Fix typing issues 
CURA-6005
 2018-12-12 10:35:39 +01:00
Diego Prado Gesto
c804610fa6 Make the stage menu in the preview using 85 percent of the total width in order to prevent the print setup panel to be in the middle 2018-12-11 15:19:40 +01:00
Diego Prado Gesto
742fc34e75 Change labels in the layer view legend 2018-12-11 14:31:12 +01:00
Diego Prado Gesto
db56aa028c Change the swatch from a circle to the extruder icon 2018-12-11 13:59:36 +01:00
Diego Prado Gesto
faa3f42acc Modify the header in the simulation view menu component 
This is needed to align with the designs.
 2018-12-11 13:53:05 +01:00
Jaime van Kessel
75ff03f3c8 Use setState instead of emitting the backend state 
CURA-6016
 2018-12-11 13:13:20 +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
Lipu Fei
2275e5c71f Refactor code to use constants in CuraConstants 
CURA-6005
 2018-12-11 12:13:46 +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
Lipu Fei
76b9fa7998 Use "cura" as i18n catalog for CuraDrive 
CURA-6005
 2018-12-11 11:53:52 +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
Lipu Fei
badf2962bc Change CuraDrive version to 1.2.0 
CURA-6005

Because the previously version is 1.1.1
 2018-12-11 10:34:03 +01:00
Ian Paschal
d43ba59b7c
Merge pull request #4959 from Ultimaker/CL-1152_config_change_monitor_tab 
CL-1152 config change monitor tab
 2018-12-10 16:43:57 +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
Lipu Fei
69744282e6 Fix rounding issue in toolbox QML widget size 
CURA-6006
 2018-12-10 14:38:40 +01:00
Lipu Fei
861deaa9f7 Add renderType native for toolbox QML Labels 
CURA-6006
 2018-12-10 14:38:33 +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
Aleksei S
c62cb84c75 Added CuraDirve plugin to Cura build 
CURA-6005
 2018-12-10 14:18:10 +01:00
Diego Prado Gesto
af37f51cf8 Make the expandable content header to be a common header for every expandable component. 
Contributes to CURA-5941.
 2018-12-10 13:36:06 +01:00
Lipu Fei
b745755a7d Remove TODO in ToolboxProgressButton 
CURA-6006

This file has been refactored.
 2018-12-10 13:22:38 +01:00
Lipu Fei
1487af167b Disable async loading for ToolboxDetailTile 
CURA-6006
 2018-12-10 13:20:38 +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
46fa33fda5 Merge branch 'ui_rework_4_0' into place_print_info_back 2018-12-07 13:19:19 +01:00
Diego Prado Gesto
9c873faace Merge branch 'ui_rework_4_0' into place_print_info_back 2018-12-07 13:11:15 +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
Jaime van Kessel
ab8a2a9b2b Merge branch 'ui_rework_4_0' of github.com:Ultimaker/Cura into CURA-6006-login-required 2018-12-07 10:51:48 +01:00
Jaime van Kessel
eaf413997d Changed the installed button to be a secondary button 
CURA-6006
 2018-12-07 09:44:09 +01:00
Jaime van Kessel
9eb09132d6 Fix minor layout issue installed page 
CURA-6006
 2018-12-07 09:38:02 +01:00