GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-07-09 03:01:49 +08:00
Code Issues Packages Projects Releases Wiki Activity
19,026 Commits 295 Branches 268 Tags
Commit Graph

19026 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jaime van Kessel
856c1dcb20 Also disconnect the signal for the old parent of printSetupSelector 2018-12-13 17:21:07 +01:00
Diego Prado Gesto
473160a102 Add a check for null to avoid warnings in the logs. 2018-12-13 17:02:13 +01:00
Ghostkeeper
bb45680b98
Merge branch '4.0' 2018-12-13 16:49:57 +01:00
Ghostkeeper
3d4da94b36
Remove obsolete description detail about old Cura versions 
This setting had a detail in the description about how the setting used to behave in old Cura versions. Let's remove it since it is not relevant any more.

Fixes #4536.
 2018-12-13 16:49:45 +01:00
Diego Prado Gesto
d435f21193
Merge pull request #4986 from Ultimaker/CURA-6028_preview_stage_doesnt_switch 
Cura 6028 preview stage doesnt switch
 2018-12-13 16:47:22 +01:00
Diego Prado Gesto
012ee0c02a Use the MouseArea trick to assure that the binding still works for the 
checked property of the button.

Contributes to CURA-6028.
 2018-12-13 16:44:49 +01:00
Jaime van Kessel
bd565bf4cf Merge branch '4.0' of github.com:Ultimaker/Cura into 4.0 2018-12-13 16:33:46 +01:00
Ghostkeeper
3f3cd5e334
Remove broken load of PrepareSidebar.qml 
This file no longer exists. Loading it gives a warning.
 2018-12-13 16:32:49 +01:00
Jaime van Kessel
d48e89e224 Prevent the parent of printSetupSelector from being set to null 
If it's parent gets set to null it will break the focus, which we need for the binding updates.

CURA-5941
 2018-12-13 16:32:48 +01:00
alekseisasin
70e60e5313
Merge pull request #4981 from Ultimaker/fix_output_device_selector 
Change the behaviour of the output device selector
 2018-12-13 16:21:49 +01:00
Aleksei S
973970a895 Every print ouput device should define its connection type(usb, network, cluster and etc) 
CURA-6011
 2018-12-13 16:00:12 +01:00
Jaime van Kessel
1b3cb32334 Fix the simulation view not being selected as default 
CURA-6028
 2018-12-13 15:59:15 +01:00
Lipu Fei
3225512851 Fix typing 
CURA-6013
 2018-12-13 15:48:06 +01:00
Diego Prado Gesto
b48eedfb80 Modify color for the progress bar in the messages. 2018-12-13 15:15:22 +01:00
Lipu Fei
17c93dea80 Fix merge conflicts with 4.0 2018-12-13 14:39:28 +01:00
Diego Prado Gesto
0d780e61ff
Merge branch '4.0' into CURA-5876_fixes 2018-12-13 14:39:11 +01:00
Jaime van Kessel
8091b2810c
Apply suggestions from code review 
Change some margins for the corresponding absolute values instead of adding formulas.

Contributes to CURA-5876.

Co-Authored-By: diegopradogesto <d.pradogesto@ultimaker.com>
 2018-12-13 14:36:58 +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
c4700b2752 Also update the model if the data changed 
CURA-6028
 2018-12-13 14:30:00 +01:00
Jaime van Kessel
a1a9b058f5 Let header listen to activeStageId instead of the model 
CURA-6028
 2018-12-13 14:28:32 +01:00
Lipu Fei
8021c8e449 Fix errors in SettingOptionalExtruder.qml 
CURA-6015
 2018-12-13 14:12:51 +01:00
Lipu Fei
d879cab91a Add all fields for optional extruder in ExtruderModel 
CURA-6015
 2018-12-13 14:12:44 +01:00
Lipu Fei
df0b1c6c77 Fix ExtruderManager creation in MachineManager 
CURA-6015
 2018-12-13 14:12:38 +01:00
Lipu Fei
935f7a2512 Remove unused imports 
CURA-6015
 2018-12-13 14:12:31 +01:00
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
ChrisTerBeke
518d7fac51 Fix merge conflict 2018-12-13 13:44:33 +01:00
Jaime van Kessel
b7ea075fa9 Merge branch 'fix_toolbutton_style' of github.com:Ultimaker/Cura into 4.0 2018-12-13 13:26:35 +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
Jaime van Kessel
0a6c1a7c14 Fix CLIENT_ID (again) 
It got messed up in a merge again. Ugh.
 2018-12-13 13:12:57 +01:00
ChrisTerBeke
819f8531a2 Use CuraConstants for Cloud printing API root 2018-12-13 11:54:10 +01:00
ChrisTerBeke
36f5150d94 Fix merge conflict 2018-12-13 11:48:35 +01:00
ChrisTerBeke
f72b58386b Also use CuraConstants for account API root 2018-12-13 11:46:11 +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
Diego Prado Gesto
e7fe7571aa Change the behaviour of the output device selector 
Now the behavior is the following:
- The active output device is the one that shows up in the button (same as before)
- The list of the output devices don't show the active device
- When clicking in one item of the list, it becomes the active output and automatically it performs the action.

Contributes to CURA-6026.
 2018-12-13 09:02:14 +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
Jaime van Kessel
880526749e Merge branch '4.0' of github.com:Ultimaker/Cura 2018-12-12 17:39:57 +01:00
Daniel Schiavini
fed779d0d2 STAR-322: Implementing multi-part upload (doesnt always work) 2018-12-12 17:31:08 +01:00
Diego Prado Gesto
a1d7fa893d Change the style for the toolbuttons that appear in the popup panel of some tools 
Contributes to CURA-6024
 2018-12-12 17:26:13 +01:00
Diego Prado Gesto
f38f140430 Merge branch '4.0' into CURA-5876_fixes 2018-12-12 17:06:59 +01:00
Diego Prado Gesto
17173aba06 Add a component to show when no configurations are available because lack of connection. 
Contributes to CURA-5876.
 2018-12-12 17:04:17 +01:00
Diego Prado Gesto
1d3da3244f Remember the previous selected method in the configuration 
The current behavior now is to open the configuration panel in the previous state, in case it was manually selected. That means that after selecting a printer, the manual state is reset so it will open the auto configuration if it is a connected printer. It will open the custom state in case it's not connected or the printer has no connection.

Contributes to CURA-5876.
 2018-12-12 14:09:15 +01:00
ChrisTerBeke
6150bd665a Merge branch 'master' into STAR-322_cloud-connection 2018-12-12 14:04:59 +01:00
Diego Prado Gesto
4ba448077e Add an empty state, when there are no configurations, showing a label indicating that the list is empty 
Contributes to CURA-5876.
 2018-12-12 13:33:46 +01:00
Lipu Fei
b6ea61612e Fix merge conflicts 2018-12-12 13:26:01 +01:00
Jaime van Kessel
901c19e270 Prevent QML warning 
CURA-6013
 2018-12-12 11:52:04 +01:00
Jaime van Kessel
e30ca20c54 Merge branch '4.0' of github.com:Ultimaker/Cura into CURA-6013-rate-packages 2018-12-12 11:50:26 +01:00
Jaime van Kessel
dbf91fca7f Re-added hover on showcase tiles 
CURA-6013
 2018-12-12 11:40:51 +01:00