GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-04-30 15:54:32 +08:00
Code Issues Packages Projects Releases Wiki Activity
18,808 Commits 290 Branches 260 Tags
Commit Graph

79 Commits

Author SHA1 Message Date
Lipu Fei
51c773fd80 WIP: Make reusable widget CuraProgressBar 2019-02-28 08:06:28 +01:00
Jaime van Kessel
6ff1f49c34 Ensure the layout gets the right width & height for the output devices popup 
CURA-6222
 2019-02-14 17:21:54 +01:00
Remco Burema
5c54cb740a Fix dark-theme material-estimates-panel (and layout-issues). [CURA-6174] 2019-02-05 13:24:28 +01:00
Ghostkeeper
a831cfa558
Configure whether preview shortcut is visible from ActionPanelWidget property 
This way it's more dynamic: You don't need to hardcode the plug-in name in the widget to see whether or not it's visible.

Contributes to issue CURA-6086.
 2019-02-04 15:19:09 +01:00
Ghostkeeper
5992e66ed6
Move action panel into each stage 
They can then decide if it needs to be there. For instance, the monitor stage doesn't want to have this panel. Also each stage can position it where they like, and in the near future I'll make a feature to let it decide whether or not to show the preview button.

Contributes to issue CURA-6086.
 2019-02-04 15:08:59 +01:00
Jaime van Kessel
e6f722b29c Move additional component loader into ActionPanelWidget 2019-01-31 17:13:32 +01:00
Lipu Fei
1f21eed14f Add Text.NativeRendering for Labels 
CURA-6141
 2019-01-28 09:05:43 +01:00
Lipu Fei
c6ff8149f6 Remove colon according to design 
CURA-6141
 2019-01-28 09:04:08 +01:00
Lipu Fei
71b2787d0d Use Label 
CURA-6141
 2019-01-28 08:48:02 +01:00
Remco Burema
3d413ceb2c MaterialInfo: Tweak text-alignment/layout. [CURA-6141] 2019-01-26 11:43:15 +01:00
Remco Burema
e7ff70870f MaterialInfo: Also replace HTML-text with QML-elements for 'by line-type'. [CURA-6141] 2019-01-26 11:25:38 +01:00
Remco Burema
7fdbb11f49 MaterialInfo: Put height and fonts by QML-elements for 'by material-type'. [CURA-6141] 2019-01-24 21:56:57 +01:00
Remco Burema
654cd8e645 MaterialInfo: Begin replace HTML-text with QML-elements for 'by material-type'. [CURA-6141] 2019-01-24 18:08:02 +01:00
Remco Burema
f057c9a7df Prevent spurious updates to 'onPreferenceChanged's if the preference doesn't match. 2019-01-15 17:15:12 +01:00
Jaime van Kessel
cbeadb2343 Set the font of the time estimation to medium bold 
This way it will also fit when a very long time is used in german.
If we don't do this, 14 Tages 12 Stunden 33 Minuten didn't fit.

CURA-6097
 2019-01-11 14:47:59 +01:00
Jaime van Kessel
ff79e91686 Move the additional components for the save button out of the action panel 
CURA-6097
 2019-01-10 16:32:43 +01:00
Diego Prado Gesto
03b4121d22 Fix broken shortcut for slice or stop slicing. 2019-01-10 13:59:22 +01:00
Lipu Fei
d97b812ccd
Merge branch '4.0' into unify_font_types 2019-01-03 10:46:49 +01:00
Jaime van Kessel
3505eb321f Also add space for the savebutton additional components with the output widget 
CURA-6043
 2019-01-03 09:42:22 +01:00
Jaime van Kessel
71632fd098 Add the postProcessing button back next to the slice button 
CURA-6043
 2019-01-02 13:53:35 +01:00
Ghostkeeper
6092402a87
Fix 'Slicing...' message when not autoslicing 
Also changes the 'auto slicing' text to just 'slicing', because that's more what the user expects.
Discussed with UX.

Contributes to issue CURA-6025.
 2018-12-31 15:44:09 +01:00
Ghostkeeper
66aeb2d1dd
Give print time estimate a large font 
Contributes to issue CURA-6025.
 2018-12-31 14:28:51 +01:00
Jaime van Kessel
f9e76aa6c9 Merge branch 'feature_resize_settings_panel' of github.com:Ultimaker/Cura into 4.0 2018-12-31 10:09:33 +01:00
Jaime van Kessel
52d97dfbd2 Change back the behavior of the output device selector to the old way 
Although the new way was discussed with our UXers, we got a number of reports that it was confusing.
I also accidentally started a print while using it
 2018-12-31 09:32:16 +01:00
Ghostkeeper
b7a23399f5
Move action panel in front of settings panel 
The settings panel can now be so long that they overlap (if the user so chooses). This causes the action panel to be hidden behind the settings. We'd prefer to show the action panel in front, always.

Contributes to issue CURA-6054.
 2018-12-24 15:37:48 +01:00
alekseisasin
facf1428d6
Merge pull request #5020 from Ultimaker/CURA-6004_missing_tooltips 
Cura 6004 missing tooltips
 2018-12-21 14:57:06 +01:00
Jaime van Kessel
3f599bd06f Ensure that the tooltip text is translated 
CURA-6004
 2018-12-20 16:31:57 +01:00
Jaime van Kessel
dc473dc78d Add missing typing for setting visibility preset model 2018-12-20 11:09:02 +01:00
Jaime van Kessel
8bff0d17e8 Prevent the backend attempting to reslice everytime a preference changed 2018-12-20 09:43:01 +01:00
Aleksei S
3953c7bb3a Added Tooltip alignment 
CURA-6004
 2018-12-19 14:24:02 +01:00
Diego Prado Gesto
17cddac024 Merge branch '4.0' into CURA-6004_missing_tooltips 2018-12-19 09:03:31 +01:00
Diego Prado Gesto
cbd8e72bd5 Add fixed width to the preview button 
Doing that, the elide will work. Also increase the size of the panel a bit so it will fit better in other languages. Adding also the tooltip in case the text is too long in other languages.
 2018-12-17 10:42:52 +01:00
Ghostkeeper
78a5f95c43
Merge branch 'CURA-5876_fixes' into 4.0 2018-12-14 16:28:04 +01:00
Ghostkeeper
8a4a1c9d49
Don't let print info take space if invisible 
This way there is a little bit more space for the text 'No time estimation available', which was previously abbreviated to 'No time estimation availa...'.
 2018-12-14 13:21:00 +01:00
Jaime van Kessel
6a3ac99551 Ensure that all icons use the same color from theme. 
Also added some fixes for the dark theme
 2018-12-14 11:59:22 +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
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
2bf641efcf Add a Cura Tooltip to show in some buttons 
Contributes to CURA-6004.
 2018-12-10 09:09:58 +01:00
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