56 Commits

Author SHA1 Message Date
c.lamboo
d5c0fde7f2 Render labels using Text.QtRendering on OSX
Fonts were looking a bit to thick on when using `Text.NativeRendering`, so using `Text.QtRendering` instead. After this the font weight looks identical to figma (as far as I can see).

In this commit I also changed all `Label`'s to `UM.Label`'s and removed default properties where I could.

CURA-9154
2022-05-10 15:40:09 +02:00
c.lamboo
35f5c3f959 Revert "Render labels using Text.QtRendering on OSX"
This reverts commit f0e3c19a34d1fde3b7ec4fd95677fbefa2028b26.
2022-05-10 15:39:02 +02:00
c.lamboo
f0e3c19a34 Render labels using Text.QtRendering on OSX
Fonts were looking a bit to thick on when using `Text.NativeRendering`, so using `Text.QtRendering` instead. After this the font weight looks identical to figma (as far as I can see).

In this commit I also changed all `Label`'s to `UM.Label`'s and removed default properties where I could.

CURA-9154
2022-05-10 15:36:50 +02:00
Jaime van Kessel
a6db27dd55 Prevent tootltip from showing during "processing" of slice button
CURA-9150
2022-04-13 16:29:25 +02:00
casper
582e4fcbd0 Update print action hotkey listener to QtControls 2
CURA-8684
2022-01-24 10:31:17 +01:00
Konstantinos Karmas
83fe65b8eb Use the StatusIcon qml component for the warning icons
CURA-8349
2021-07-28 18:17:54 +02:00
Konstantinos Karmas
d41d68e6fa Replace warning icon in the unable to slice message
With the new warning icon that has a solid background, similar to the warning icon used in the messages.

CURA-8439
2021-07-28 16:57:15 +02:00
Ghostkeeper
0a75c772ed
Unrevert new icon set for all of Cura's interface
We created a new set of icons for Cura. These icons had to be reverted though because they weren't working out in the interface for the last release yet.
This unreverts them, basically adding them back hoping that we'll get them fixed in time for the next release.

Contributes to issue CURA-8342.

Revert "Revert "Fix merge conflict""

This reverts commit bb20e3307f43edc1ff53cb154d2351ddfe39e158.

Revert "Revert "Merge pull request #9716 from Ultimaker/CURA-8010_new_icons""

This reverts commit 70e4e9640e561e18a12870f30c905203ce8ccee7.

Revert "Revert "Fix typo in icon name""

This reverts commit 38ce22ba7c3f40b971bc6e1e0a8e776ca9d51512.

Revert "Revert "Add list for deprecated icons""

This reverts commit 119a957e7f978dbf1ddbcb3b0005bf38e8fed943.

Revert "Revert "Add Function icon""

This reverts commit 760726cf0bb953bb1b0fc277b448f419d4bd2544.

Revert "Revert "Switch out inherit icon""

This reverts commit 26afff609381e2004d194c280f504b6226859bd3.

Revert "Revert "Merge branch 'CURA-8205_Introduce_new_icons_in_Cura' of github.com:Ultimaker/Cura""

This reverts commit 6483db3d47ee052c1a966cdee3af7190577a5769.

Revert "Fix incorrect icons"

This reverts commit 02a4ade2a50a943ff36fd4895bdc9261cf2133eb.
2021-06-28 17:16:56 +02:00
Jaime van Kessel
70e4e9640e
Revert "Merge pull request #9716 from Ultimaker/CURA-8010_new_icons"
This reverts commit 6120d8a054b8c04bf90b8b3d3cb219d691bece2f, reversing
changes made to 95652556fef90f70adbf25bfa9bd3b8af7220d4a.
2021-05-27 16:06:20 +02:00
jelle Spijker
2bd6f28f3a
Update Icons
Subdivided the new icons in 3 size categories. As requested by UX
Used the company naming scheme for uniformity and easy recognition.

Known issues:
- Top/Bottom category wasn't taken into account by UX at the time. Since
 this is a recent addition. Both the Walls and Top/Bottom will be updated.
- Cloud/Network connection icons 12px don't render correctly. Due to the
 theme-ing.
- Extruder Icons do not render correctly.

CURA-8010_new_icons
2021-04-26 19:42:17 +02:00
Konstantinos Karmas
504f6dbe70
Revert "Cura 7813 qml modules version bump" 2021-03-30 09:48:28 +02:00
Konstantinos Karmas
180732788b
Merge pull request #9472 from Ultimaker/CURA-7813_QML_warnings
Cura 7813 qml modules version bump
2021-03-30 09:42:59 +02:00
Kostas Karmas
7827b36ab7 Fix QML warnings due to depricated on<signal> calls in Connections
As of 5.12, the signals used in connections should not be declared as on<signal>, but as
function on<signal>(arguments).
2021-03-30 09:02:48 +02:00
jelle Spijker
9da321ffb9
Update Layouts, Control.Styles and Dialogs
CURA-7813
2021-03-29 18:04:47 +02:00
jelle Spijker
2986d50745
Update QtQuick and QtQuick.Controls
CURA-7813
2021-03-29 17:55:19 +02:00
Jaime van Kessel
27f60a6d5d Directly show feedback when pressing the slice button
CURA-6034
2019-05-29 16:32:43 +02:00
Ghostkeeper
df32f3e263
Move Cura.ProgressBar to Uranium
It is not specific to 3D printing.

Contributes to issue CURA-6057.
2019-04-03 11:51:57 +02:00
Lipu Fei
11252ce0f7 Merge remote-tracking branch 'origin/WIP_onboarding' into WIP_onboarding_machine_action 2019-03-21 15:00:15 +01:00
Lipu Fei
4e5d08f320 Fix merge conflicts with master 2019-03-21 14:59:53 +01:00
Lipu Fei
3911c3d73d WIP: Cleanup and unify MachineAction styles 2019-03-19 15:40:44 +01:00
Ghostkeeper
cb44223eca
Consistent capitalisation 2019-03-18 15:16:49 +01:00
Lipu Fei
51c773fd80 WIP: Make reusable widget CuraProgressBar 2019-02-28 08:06:28 +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
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
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
Diego Prado Gesto
17cddac024 Merge branch '4.0' into CURA-6004_missing_tooltips 2018-12-19 09:03:31 +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
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
Jaime van Kessel
5b4fad3c08 When toggling auto-slice, force a re-slice
CURA-5997
2018-12-04 14:54:15 +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
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
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
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
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