GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-08-06 02:06:02 +08:00
Code Issues Packages Projects Releases Wiki Activity
18,181 Commits 295 Branches 268 Tags
Commit Graph

7882 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
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
ChrisTerBeke
36f5150d94 Fix merge conflict 2018-12-13 11:48:35 +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
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
e30ca20c54 Merge branch '4.0' of github.com:Ultimaker/Cura into CURA-6013-rate-packages 2018-12-12 11:50:26 +01:00
Diego Prado Gesto
b1244b6bde Remove file MonitorSidebar 
It's not used anymore.

Contributes to CURA-5876.
 2018-12-12 11:22:35 +01:00
alekseisasin
64104e47c6
Merge pull request #4970 from Ultimaker/fix_preview_stage_menu 
Fix preview stage menu
 2018-12-12 11:22:08 +01:00
Diego Prado Gesto
a6a16a682d Fix some alignments 
Also modify a bit the code in the ConfigurationItem, trying to get rid of a binding loop, but I couldn't (so weird)

Contributes to CURA-5876.
 2018-12-12 11:17:44 +01:00
Remco Burema
1b2ef91c13 Merge branch 'CURA-6016_Improve_UI_Speed' into 4.0 2018-12-12 10:54:36 +01:00
Remco Burema
65f1c9a304
Merge pull request #4969 from Ultimaker/CURA-6016_Improve_UI_Speed 
Cura 6016 improve ui speed
 2018-12-11 17:26:15 +01:00
Diego Prado Gesto
ed8292c472 Adjust size and margins of the icon in the action button 
Contributes to CURA-5876.
 2018-12-11 17:00:02 +01:00
Diego Prado Gesto
f99c788eb6 Change some colors for the arrows in some setting selectors 
Contributes to CURA-5876.
 2018-12-11 16:35:59 +01:00
Diego Prado Gesto
b993a7b0d9 Change the header color and font in the configuration popup 
Also fix some alignments with the printer type selector.

Contributes to CURA-5876.
 2018-12-11 16:05:24 +01:00
ChrisTerBeke
21a0517d79 Merge branch 'master' into STAR-322_cloud-connection 2018-12-11 15:22:18 +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
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
Diego Prado Gesto
3593b7f152
Merge pull request #4782 from Ultimaker/M&P-Setting-Optimization 
CPE and CPE+ Comb retractions and ABS first layer temperature.
 2018-12-11 13:24:43 +01:00
ChrisTerBeke
e4939cf005 Remove outdated cloud icon, will be done in another PR 2018-12-11 12:55:49 +01:00
Jaime van Kessel
6c70543d11 Only set the containerID when the dialog is visible 
This prevents unneeded updates

CURA-6016
 2018-12-11 12:46:11 +01:00
ChrisTerBeke
1cfc6d850a Merge branch 'master' into STAR-322_cloud-connection 2018-12-11 12:35:19 +01:00
Diego Prado Gesto
4b6f4af44e Close the expandable panel when it becomes disabled 
It happens when it's open and the user loads a GCode.

Contributes to CURA-5941
 2018-12-11 11:10:45 +01:00
ChrisTerBeke
79430f9faf Merge branch 'ui_rework_4_0' into STAR-322_cloud-connection 2018-12-11 10:56:38 +01:00
Diego Prado Gesto
4dab33d41b Remove the fancy snowflakes pattern 2018-12-11 10:44:30 +01:00
Lipu Fei
9618e8d4e0 Add CuraDrive 1.2.0 to bundled_packages 
CURA-6005
 2018-12-11 10:39:41 +01:00
Diego Prado Gesto
523e744527 Merge branch 'ui_rework_4_0' of github.com:Ultimaker/Cura into ui_rework_4_0 2018-12-11 10:29:29 +01:00
Jaime van Kessel
909f36d28e Let the settingsMenu use the extruders of the active machine instead of the extruderModel 
The extruder model gets updated way to much (for all material changes) but we only need the
number and names of the extruders, since the other menu's do this by themselves
 2018-12-11 09:24:22 +01:00
Arseniy Pavlenko
e7ba4455e0
default is 2650, not 2620, probably typo 2018-12-10 19:42:23 +02:00
Diego Prado Gesto
716fedc782 Use no text by default for the disabled state of the panels 
Contributes to CURA-5941.
 2018-12-10 17:06:51 +01:00
Lipu Fei
4e71af45d3
Merge pull request #4958 from Ultimaker/CURA-6018_fix_messages 
Fix styling of messages
 2018-12-10 15:53:04 +01:00
Diego Prado Gesto
4fc4aecf17 Avoid the overlapping of text when the name is too long 
Normally I happens in other languages other than English.
 2018-12-10 15:48:59 +01:00
Diego Prado Gesto
1cd0d26db4 Change margins 
Instead of using multiplications and divisions, just use the corresponding margins.

Contributes to CURA-5876.
 2018-12-10 15:34:48 +01:00
Diego Prado Gesto
aa376e60da Make the disabled text translatable 
Contributes to CURA-5941.
 2018-12-10 14:45:11 +01:00
Diego Prado Gesto
590e8f5eb1 Wrap the disabled text in case it's too long. 
Contributes to CURA-5941.
 2018-12-10 14:41:15 +01:00
Diego Prado Gesto
437ba3848d Fix typo. Missing parenthesis 
Contributes to CURA-5941.
 2018-12-10 14:26:20 +01:00
Diego Prado Gesto
3f97f83c47 Add a disabled state to the expandable components 
In this case, when the component is disabled, there is an optional message that will show. It works for instance when loading a gcode and the print setup panel has to be disabled.

Contributes to CURA-5941.
 2018-12-10 14:17:56 +01:00
Diego Prado Gesto
90f822f683 Add the component header that I miss in a previous commit 
Contributes to CURA-5941.
 2018-12-10 13:44:50 +01:00
Diego Prado Gesto
154c6c1ff2 Change the color of the setting control button to be the same as for the small buttons 
Contributes to CURA-5941.
 2018-12-10 13:42:33 +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
Diego Prado Gesto
dff364ee30 Change the panel to have also rounded rectangle in the top part 
Contributes to CURA-5941.
 2018-12-10 12:03:29 +01:00