77 Commits

Author SHA1 Message Date
Asteroids
17c020b3cd
Fix decimals on heated bed temperature monitor (HeatedBedBox.qml)
Round heated bed temperature values when printer sends them with decimal digits. 
Same roundings already exist on the extruder temperatures (see ExtruderBox.qml line 50 and 85)
2023-02-04 01:26:00 +01:00
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
j.delarago
2ffcfafc77 Some place RegularExpressionValidator can't be found in QtQuick 2.10 but can be in 2.15 so all files using RegularExpressionValidator have been bumped to latest QtQuick
CURA-8640
2022-04-05 16:10:39 +02:00
j.delarago
2f96f7b410 RegularExpressionValidator requires newer version of QtQuick
CURA-8640
2022-04-04 10:45:00 +02:00
c.lamboo
3c9e2a1b08 Update RegExpValidator to RegularExpressionValidator
Due to Qt6 API change

CURA-8640
2022-03-30 15:10:37 +02:00
casper
eb8fd44e4c Fix launching the usb printing menu
Some imports were incorrect/missing.

CURA-9000
2022-03-03 13:01:42 +01:00
casper
bd1b0fb34c Update usb printing menu to qt controls 2
CURA-8688
2022-03-01 11:36:47 +01:00
j.delarago
61beb963c2 Swap flat buttons for Cura Styled buttons.
These "buttons" function like radiobuttons so a bit of extra styling needed to be added to swap appearance.

Removed fixed width as it breaks centering with Cura buttons

CURA-8980
2022-02-24 14:58:07 +01:00
j.delarago
41e04f2e9d Progress bar causing crash due to incorrect min max value variable names.
Give buttons fixed leftMargin in monitor page so icons are center aligned.

CURA-8980
2022-02-24 11:34:48 +01:00
Jaime van Kessel
2c6ba3cd5d Update some USB printing items to controls 2 2022-02-22 11:58:14 +01:00
Jaime van Kessel
f347c6aedf Remove number of unused styles imports 2022-02-22 11:42:41 +01:00
Jaime van Kessel
53331f4757 Remove unused imports 2022-02-22 11:39:00 +01:00
Jaime van Kessel
b18582e1fb Fix size of USB manual control buttons
CURA-8684
2022-02-02 10:23:00 +01:00
Jaime van Kessel
b8e4baba0e Clean up the manual printer control QML
The QML could be simplified quite a bit to get the same results.

CURA-8684
2022-02-02 10:13:33 +01:00
casper
4ef394fa2d Update manual printer control to QtControls 2
CURA-8684
2022-01-28 09:47:01 +01:00
casper
204d965df2 Use SecondaryButton in the usb print panel inplace of tye style prop
The Jog buttons are not changed yet as these button make use of the
`checked` property this is not yet implemented for Cura's `Action` and
by extension Cura's `Secondary` button.

CURA-8684
2022-01-20 22:15:22 +01:00
Jaime van Kessel
83be495414 Replace usage of controls label with our custom label
This prevents copy pasting a bunch of parameters that we set by default
2021-11-10 16:37:26 +01: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
fc87c6a90c
Merge branch 'master' of github.com:Ultimaker/Cura 2021-06-01 11:41:16 +02:00
Jaime van Kessel
4f49a38168
Fix pre-heat button being ocluded by tooltip
Fixes #9891
2021-06-01 11:40:20 +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
Ghostkeeper
fc6867a4a0
Use extruderList rather than deprecated extruders property
Done during Turbo Testing and Tooling.
2020-05-29 17:56:56 +02:00
Ghostkeeper
b86b6a9449
Merge branch 'fix_jogging_layout' of https://github.com/fieldOfView/Cura into fieldOfView-fix_jogging_layout 2020-04-02 17:07:42 +02:00
fieldOfView
d07649fc59 Fix values in print monitor preheat fields
Contributes to #7172
2020-02-28 12:27:57 +01:00
fieldOfView
ddee0d59e0 Fix the layout of the head jogging controls 2020-02-17 22:13:38 +01:00
Ghostkeeper
d353776fe8
Fix showing extruder names in USB printing monitor
It was using a deprecated function. Apparently deprectated pyqtSlots don't work because it breaks the PyQt binding for some reason. That has to be fixed. But for now I'll make this use the non-deprecated function.
2019-07-25 15:17:13 +02:00
Ghostkeeper
350dd5db3c
Correct positioning of tooltip for g-code text area 2019-05-10 11:32:40 +02:00
Diego Prado Gesto
ef2fb53790 Merge branch '4.0' into unify_font_types 2018-12-19 11:56:22 +01:00
Diego Prado Gesto
77ede1ae6b Unify the fonts to only have 8 instead of 13.
Contributes to CURA-6025.
2018-12-12 17:50:21 +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
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
Jaime van Kessel
59a81be65c Fixed some leftover graphical issues
CURA-5943
2018-11-30 14:10:42 +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
Lipu Fei
6bed1c1390 Move monitor_checkable_button_style out to styles.qml
CURA-5943
2018-11-26 13:21:55 +01:00
Lipu Fei
6bb010e74a Move MonitorButtonStyle to styles.qml
CURA-5943
2018-11-26 13:14:26 +01:00
Lipu Fei
d8c3078d78 Add connectedPrinter to HeatedBedBox
CURA-5943
2018-11-22 14:10:41 +01:00
Lipu Fei
8eb0f66df3 Add connectedPrinter to ExtruderBox
CURA-5943
2018-11-22 14:08:50 +01:00
Lipu Fei
e65f2d66a6 Add connectedPrinter to MonitorItem
CURA-5943
2018-11-22 14:06:43 +01:00
Lipu Fei
5a16918391 Update ManualPrinterControl
CURA-5943
2018-11-22 14:03:03 +01:00
Lipu Fei
cf0994037c Move MonitorButtonSytle to a separate QML file
CURA-5943
2018-11-22 14:03:03 +01:00
Lipu Fei
45d4f2ad3d Update MonitorSection
CURA-5943
2018-11-22 14:03:03 +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