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

7713 Commits

Author SHA1 Message Date
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
Diego Prado Gesto
b48eedfb80 Modify color for the progress bar in the messages. 2018-12-13 15:15:22 +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
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
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
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
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
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
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
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
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
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
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
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
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
Diego Prado Gesto
4dab33d41b Remove the fancy snowflakes pattern 2018-12-11 10:44:30 +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
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
Diego Prado Gesto
0d55d023a1 Align the message colors with the ones in the designs. 
Contributes to CURA-6018.
 2018-12-10 11:36:03 +01:00
Diego Prado Gesto
12522c9293 Change hover colors of the small buttons. 
Contributes to CURA-5941
 2018-12-10 11:19:44 +01:00
Diego Prado Gesto
8cfb9350bc Add a mouse area to gather the scroll events in the settings panel 
Contributes to CURA-5941.
 2018-12-10 10:36:55 +01:00
Diego Prado Gesto
9e7a52e28b Update the background color for the expandable component when using the close button. 
Contributes to CURA-5941.
 2018-12-10 09:43:50 +01:00