GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-04-23 14:19:37 +08:00
Code Issues Packages Projects Releases Wiki Activity
22,028 Commits 288 Branches 260 Tags
Commit Graph

91 Commits

Author SHA1 Message Date
Diego Prado Gesto
898fd25ddb Remove the component IconLabel since we have a similar one in IconWithText 
Contributes to CURA-5941.
 2018-12-07 11:43:41 +01:00
Diego Prado Gesto
da052fbe81 Not show a tooltip in the output device selector when the popup shows up 2018-12-07 11:21:25 +01:00
Diego Prado Gesto
4b79770d58 Align the buttons in the output process widget 
The menu in the output device selector has now a rounded corner.
 2018-12-06 13:42:29 +01:00
Ghostkeeper
b5bb3232f3
Merge branch 'ui_rework_4_0' into CURA-5876-Configuration_dropdown 
Conflicts:
	resources/qml/ActionPanel/OutputProcessWidget.qml -> Due to removed theme entry.
 2018-12-04 15:21:36 +01:00
Ghostkeeper
4d87c46423
Remove sourceSize.width: width from all RecolorImages 
It is now the default in Uranium.

Contributes to issue CURA-5876.
 2018-12-04 15:04:51 +01:00
Jaime van Kessel
5b4fad3c08 When toggling auto-slice, force a re-slice 
CURA-5997
 2018-12-04 14:54:15 +01:00
Diego Prado Gesto
e9f8757fac Change the info button in the action panel according to the designs 
Adjust the padding in the preview shortcut.
 2018-12-04 09:12:57 +01:00
Ghostkeeper
6af1e72ea3
Show progress bar while autoslice is preparing 
Previously it would say 'preparing to slice'. Now it just says 'auto slicing' but with an indeterminate progress bar. Only the indeterminate progress bar just appears empty right now...

Contributes to issue CURA-5997.
 2018-12-04 07:51:48 +01:00
Ghostkeeper
65d3aa4480
Fix broken sizes due to merged theme entry 
Merge conflict went wrong, I think.

Contributes to issue CURA-5876.
 2018-12-03 11:59:03 +01:00
Ghostkeeper
7df4c01814
Merge branch 'ui_rework_4_0' into CURA-5876-Configuration_dropdown 
Conflicts:
	cura/Settings/MachineManager.py -> rowCount vs. count
	resources/qml/ExtruderIcon.qml -> Someone changed stuff that I had overwritten.
	resources/qml/Menus/ConfigurationMenu/PrintCoreConfiguration.qml -> Someone changed stuff that I had removed.
	resources/qml/Toolbar.qml -> Git was wrong, not a conflict.
	resources/themes/cura-light/theme.json -> Git was wrong, not a conflict.
 2018-12-03 11:45:05 +01:00
Ghostkeeper
39411222da
Use normal font size for Auto slicing... message 
It should've been the normal font size anyway. This is not small!

Contributes to issue CURA-5876.
 2018-12-03 11:37:22 +01:00
Jaime van Kessel
6ab2ce7690 Decrease padding between time & material specification headers 2018-11-30 16:44:55 +01:00
Ghostkeeper
289399825b
Merge branch 'ui_rework_4_0' into CURA-5876-Configuration_dropdown 
Conflicts:
	plugins/PrepareStage/PrepareMenu.qml: Git was wrong, this was not really a conflict.
	resources/qml/ActionButton.qml: With iconSource being modified on ui_rework_4_0 and me modifying the icon to be able to display it on the left hand side.
	resources/qml/ActionPanel/OutputProcessWidget.qml: Git was wrong, not really a conflict.
	resources/qml/ActionPanel/SliceProcessWidget.qml: Git was wrong, not really a conflict.
	resources/qml/ExpandableComponent.qml: Both ui_rework_4_0 and me implemented a border around popups.
	resources/qml/MainWindow/MainWindowHeader.qml: Git was wrong, not really a conflict.
	resources/themes/cura-light/theme.json: Theme item was added in a place where I added whitespace.
 2018-11-27 15:01:48 +01:00
Diego Prado Gesto
92d0717096 Hide the toolbar and don't show time and material information when loading a gcode 
Contributes to CURA-5979.
 2018-11-27 15:00:50 +01:00
Ghostkeeper
a3fe9839ba
Change all uses of 'small' and 'very small' fonts to default 
These two fonts are exactly the same, but I want to use the 'small' font to be something a bit smaller. I'm 'removing' the superfluous font but will be re-using it immediately to look a bit smaller.

Contributes to issue CURA-5876.
 2018-11-26 17:33:37 +01:00
Diego Prado Gesto
12f78fa21a Remove border of the popup selector for the output devices. 
Contributes to CURA-5959.
 2018-11-26 14:29:42 +01:00
Ghostkeeper
826044da7e
Merge branch 'ui_rework_4_0' into CURA-5876-Configuration_dropdown 
Conflicts:
	plugins/PrepareStage/PrepareMenu.qml: Some indentation change caused it to misalign the diffs, thinking it couldn't merge two of the same lines which actually weren't the same lines.
	resources/qml/Menus/ConfigurationMenu/QuickConfigurationSelector.qml: This file was deleted in my branch. I'm holding for the new version.
 2018-11-26 13:43:20 +01:00
Jaime van Kessel
eea6490e75 Hover of output device now spans the popup 
CURA-5959
 2018-11-26 13:27:26 +01:00
Diego Prado Gesto
5397cda2b4 Add a label to the action panel when auto slice is ON, indicating that the process runs automatically. 
Contributes to CURA-5942.
 2018-11-26 12:00:06 +01:00
Jaime van Kessel
09af7a9435 Slice button will now be disabled on error 
CURA-5959
 2018-11-26 09:34:27 +01:00
Jaime van Kessel
b82ea58bc8 Changed all the action buttons to either use primary or secondary button 
CURA-5959
 2018-11-23 18:07:50 +01:00
Jaime van Kessel
1a8df9e10e Removed blue border if slicing is not possible 
CURA-5959
 2018-11-23 11:46:38 +01:00
Jaime van Kessel
3ba4b9fd81 Add shadows to various used actionbuttons 
CURA-5959
 2018-11-23 11:20:53 +01:00
Jaime van Kessel
3f4d379908 Added shadow to slice button 
CURA-5959
 2018-11-22 15:35:40 +01:00
Diego Prado Gesto
f866390c7b Fix an issue in the action panel. 
When the panel is created while the user is in the preview stage, the
row has no width.

Contributes to CURA-5786.
 2018-11-21 16:56:25 +01:00
Ghostkeeper
dca286cea5
Give action button a sane default height 
We don't want to give it a default width since that should just adjust to its contents by default, which is fine.

Contributes to issue CURA-5876.
 2018-11-20 14:34:06 +01:00
Ghostkeeper
a1068a3ef2
Rename action_panel_button theme entry to action_button 
Because it's not just used in the save panel.

Contributes to issue CURA-5876.
 2018-11-20 14:24:09 +01:00
Ghostkeeper
42d73836f4
Move default margin by default to Cura's action buttons 
So we don't have to repeat that every time you create a new button.

Contributes to issue CURA-5876.
 2018-11-20 14:19:55 +01:00
Diego Prado Gesto
9bf18031ce Apply restyle of the toolbar according to the new designs. 2018-11-11 19:15:02 +01:00
Diego Prado Gesto
8a63a79896 Add soft animation to the entire popup and not only in the background. 
This prevents the content to show before the background.

Contributes to CURA-5786.
 2018-11-11 13:17:59 +01:00
Diego Prado Gesto
3669a3791d Hide the Preview shortcut in the action panel when the active stage is the PreviewStage. 
Also adjust the size of the output button when the Preview button is not visible.

Contributes to CURA-5786.
 2018-11-11 12:56:30 +01:00
Remco Burema
e66dd2be0b Action-Panel (CURA-5786) can now know about Preview-Stage (CURA-5829). 2018-11-08 15:03:24 +01:00
Diego Prado Gesto
5dddcbd666 Add a new property to the ActionButton to indicate whether the button 
has a fixed width or the width will be dependant on the content.

Contributes to CURA-5786.
 2018-11-06 15:14:27 +01:00
Diego Prado Gesto
b6b60702c0 Make the action panel to have a fixed width. Remove the animations when 
switching states.

Contributes to CURA-5786.
 2018-11-06 14:32:48 +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
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