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

2979 Commits

Author SHA1 Message Date
Jaime van Kessel
2bb7b352ef Hide settings when pre-sliced g-code is loaded 
CURA-5772
 2018-11-05 13:25:47 +01:00
Diego Prado Gesto
6f2e8d726d Remove functions that are only used once. 
Contributes to CURA-5786.
 2018-11-02 16:52:17 +01:00
Diego Prado Gesto
2dfd354b25 Remove function and property that are only used once. 
Contributes to CURA-5786.
 2018-11-02 16:49:31 +01:00
Diego Prado Gesto
059e681de5 Remove unused code. 
Contributes to CURA-5786.
 2018-11-02 16:44:50 +01:00
Diego Prado Gesto
dba31c3af4 Add documentation. 
Contributes to CURA-5786.
 2018-11-02 16:20:04 +01:00
Diego Prado Gesto
b6e35df030
Merge pull request #4709 from fieldOfView/fix_add_printer_layout 
Add Printer dialog codestyle and readability
 2018-11-02 15:29:32 +01:00
Diego Prado Gesto
c08a90faac Merge branch 'cura4.0_header' into cura4.0_action_panel 2018-11-02 13:37:27 +01:00
Diego Prado Gesto
53872f9a5b Merge branch 'ui_rework_4_0' into cura4.0_header 2018-11-02 13:36:47 +01:00
Diego Prado Gesto
ef7ac3b089 Create the new component that gathers all the printjob information 
(times and material usage) in a popup that is shown when the "i" icon is
pressed.

Contributes to CURA-5786.
 2018-11-02 13:29:55 +01:00
Diego Prado Gesto
c862e72514 Add the print panel information as a popup that shows when the "i" icon 
is clicked.

Contributes to CURA-5786.
 2018-11-02 11:10:23 +01:00
Diego Prado Gesto
310539cb6d In the main action panel, only show the total amount of material weight 
and length (addition of all extruders). The information panel will show
each cost separately.

Contributes to CURA-5786.
 2018-11-02 09:58:35 +01:00
Diego Prado Gesto
b03695dec6 Add print time information and material costs to the action panel. 
Contributes to CURA-5786.
 2018-11-02 09:33:27 +01:00
Ghostkeeper
bd97aed1c7
Merge branch '3.6' 2018-11-01 14:43:47 +01:00
Ghostkeeper
4dc248a631
Rename Open Marketplace to just Marketplace 
Because Open Marketplace has to be translated (the 'open' part) but the Marketplace can just be called marketplace.

Contributes to issue 5870.
 2018-11-01 14:43:22 +01:00
fieldOfView
e61a6e7a5c Fix codestyle 2018-11-01 14:41:33 +01:00
Diego Prado Gesto
dcad95aab9 Rename Toolbox button to Marketplace. 
Contributes to CURA-5784.
 2018-11-01 12:44:14 +01:00
Diego Prado Gesto
a85fa6b9ad Merge branch 'cura4.0_header' into CURA-5829-Add-preview-stage 2018-11-01 09:24:05 +01:00
Diego Prado Gesto
ef0ba81564 Merge branch 'ui_rework_4_0' into cura4.0_header 2018-11-01 09:21:33 +01:00
Diego Prado Gesto
9215bb11f0 Merge branch '3.6' 2018-11-01 09:11:20 +01:00
Diego Prado Gesto
e884605cc3 Fix typo. 2018-11-01 08:47:44 +01:00
Diego Prado Gesto
3a7ae58563 Small changes in the buttons to fit with the designs. 
Contributes to CURA-5786.
 2018-10-31 17:23:38 +01:00
Diego Prado Gesto
ec0d9f09b7 Create a component for selecting the output device before output the 
file.

Contributes to CURA-5786.
 2018-10-31 17:03:09 +01:00
Jaime van Kessel
6256e3f24b Merge branch 'feature_add_printer_layout' of https://github.com/fieldOfView/Cura 2018-10-31 14:23:42 +01:00
Jaime van Kessel
6083eda3fa Merge branch 'cura4.0_header' of github.com:Ultimaker/Cura into CURA-5829-Add-preview-stage 2018-10-31 13:45:03 +01:00
Ghostkeeper
a5c2a73487
Fix adhesion type checkbox if default is skirt 
The remove-unused-values feature doesn't work with settings that are resolved, because we try to remove them at the appropriate position in the stack but then we check at that position in the stack if the value is not the same as what it was, but with this check the resolve function is no longer evaluated. It's complex, but hard to solve because we can't try to remove it at this location and predict that this will change the actual final value after the resolve function has done its thing.

Contributes to issue CURA-5877.
 2018-10-31 13:09:15 +01:00
Remco Burema
e963fd2d85
Merge pull request #4445 from fieldOfView/fix_setting_float_precision 
Reduce the maximum precision of floats in SettingTextField inputs
 2018-10-31 12:26:34 +01:00
Lipu Fei
50d92df8a8 Merge remote-tracking branch 'origin/3.6' 2018-10-31 11:01:16 +01:00
Diego Prado Gesto
33da50df26 Rename other entries of the Toolbox to Marketplace. 
Add a line in the Changelog indicating that the Toolbox was renamed.

Contributes to CURA-5874.
 2018-10-31 09:45:29 +01:00
Jaime van Kessel
f773030218 Add main stage to previewStage so that SimulationView can use it 
CURA-5829
 2018-10-31 09:37:21 +01:00
Diego Prado Gesto
eabd7c6b5e Start mocking up the panel the user gets after slicing. 
Also the IconLabel component was created with the aim to be reused in
several places.

Contributes to CURA-5786.
 2018-10-30 17:07:07 +01:00
Diego Prado Gesto
027bf204cd Use the BackendState enumeration in QML to not use integers but use the 
enumeration literals.

Contributes to CURA-5786.
 2018-10-30 15:12:03 +01:00
Diego Prado Gesto
00d75cd4d6 Tweak the colors of the disabled state. 
Contributes to CURA-5786.
 2018-10-30 12:28:51 +01:00
Diego Prado Gesto
45af4eec90 Add Shortcut action Ctrl+P to slice or stop slicing. 
Contributes to CURA-5786.
 2018-10-30 12:08:17 +01:00
Diego Prado Gesto
79ed15aee1 Add the label and the icon indicating when Cura is unable to slice. 
Contributes to CURA-5786.
 2018-10-30 11:52:08 +01:00
Ghostkeeper
c736bfffb5
Add hotkeys for managing profiles and materials 
These are unused on all platforms. We can't use Ctrl+M (multiply selection), Ctrl+P (print) or Ctrl+Q (quit) sadly.

Fixes #4250.
 2018-10-30 10:54:14 +01:00
Diego Prado Gesto
8fee8eeb5e Merge branch 'cura4.0_header' into cura4.0_action_panel 2018-10-30 10:45:25 +01:00
Diego Prado Gesto
b6ea0e6385 Make the height of the stage buttons themable. Now the height has to be 
28px as indicated by the UXers.

Contributes to CURA-5784.
 2018-10-30 10:38:53 +01:00
Mark
fda0f59c70 Rename user visible entries of ToolBox to Marketplace 
CURA-5874
 2018-10-30 10:27:22 +01:00
Diego Prado Gesto
aa75b64b5b Use the lining color to the default ouline color for the account widget. 
Contributes to CURA-5784.
 2018-10-30 09:48:56 +01:00
Diego Prado Gesto
bf59097320 Split the action button panel in two different components that are 
loaded in different moments.

The SliceProcessWidget is loaded once there is something to slice and it
also shows the process of slicing. The OutputProcessWidget will show the
print information and the actions to do to output the results, such as
Print over network, Save to file, ...

Contributes to CURA-5786.
 2018-10-29 15:18:34 +01:00
Jaime van Kessel
fc6ad4f623 Put back the view menu, since it did more than just show the views 
CURA-5829
 2018-10-29 13:41:46 +01:00
Jaime van Kessel
ebe533bdc8 Move active view panel to previewStage 
CURA-5829
 2018-10-29 13:39:00 +01:00
Jaime van Kessel
9cc7a7ca23 Moved view selection to previewStage 
CURA-5829
 2018-10-29 13:27:47 +01:00
Diego Prado Gesto
5de367bcc4 Merge branch 'ui_rework_4_0' into cura4.0_header 
Conflicts:
plugins/UM3NetworkPrinting/resources/qml/UM3InfoComponents.qml
resources/qml/Menus/ViewMenu.qml
resources/themes/cura-dark/theme.json
resources/themes/cura-light/theme.json
 2018-10-29 11:10:25 +01:00
Diego Prado Gesto
90e8a05aab Remove all the entries in the theme that make reference to the sidebar, 
because there is no sidebar anymore.

Several different margins and linings were created depending on the
side, not depending on where it belongs.

Contributes to CURA-5784.
 2018-10-26 17:51:28 +02:00
Diego Prado Gesto
c8bdf7321c Move the visible check within the component. 
Contributes to CURA-5772.
 2018-10-26 16:31:03 +02:00
Diego Prado Gesto
5a5adb71cd Make the height of the Print setup selector themable. 
Contributes to CURA-5772.
 2018-10-26 16:16:33 +02:00
Diego Prado Gesto
3eb71021e2 Change the way the string for the tooltip is formatted. 
Contributes to CURA-5772.
 2018-10-26 15:53:20 +02:00
Diego Prado Gesto
a277bd9f3b Don't use the hand cursor in the action buttons by default. 
Contributes to CURA-5784.
 2018-10-26 11:29:05 +02:00
Diego Prado Gesto
e64698209c Adjust the minimum size to be something around 1280x1024. 
Also adjust some colors color for the dark theme.

Contributes to CURA-5772.
 2018-10-25 17:41:35 +02:00