67 Commits

Author SHA1 Message Date
c.lamboo
71a0044bf8 Fix extruder number
most important change was changing
```
        currentIndex: function () {
          ...
        }
```
to
        currentIndex: {
          ...
        }
```
This changed the behavior so that the variables inside the code blocked are watched so that `currentIndex` is automatically updated. No longer needed to set the `currentIndex` from any where else anymore.

CURA-10374
2023-03-15 18:18:31 +01:00
c.lamboo
37f4271c9b Fix comboboxes not updating the accosiated value
Was introduced by this commit: 788ab7da1b

CURA-10374
2023-03-14 19:28:01 +01:00
c.lamboo
035a609277 Boyscouting
CURA-10374
2023-03-14 19:27:57 +01:00
Joey de l'Arago
1e6184448c
Apply suggestions from code review
Co-authored-by: Casper Lamboo <c.lamboo@ultimaker.com>
Co-authored-by: Jelle Spijker <j.spijker@ultimaker.com>
2022-12-12 11:44:21 +01:00
Joey de l'Arago
ca0cd5069b Remove leftover print statements
CURA-9793
2022-12-07 17:30:12 +01:00
Joey de l'Arago
0e5ad96207 Fix bad call to keys function on string.
Also fix assigning currentIndex to correct Component.

CURA-9793
2022-12-07 16:15:09 +01:00
Joey de l'Arago
6d474dfe40 Remove comments
CURA-9793
2022-12-05 11:56:22 +01:00
Joey de l'Arago
f24e6b1961 Fix NumericTextFieldWithUnit not validating text
CURA-9793
2022-12-01 17:09:41 +01:00
Joey de l'Arago
788ab7da1b Fix broken combobox
CURA-9793
2022-11-29 16:16:50 +01:00
Ghostkeeper
979c436b6c
Make text area selection use theme colours
Also fix the highlight colour of the border. The highlight colour was changed in a later design but it was not changed here yet.
Without a theme colour it's going to use the system colours for the highlighting of text, which may be a very light grey that matches the background, making it impossible to see what part of the text is selected.

Hopefully fixes issue #12286.
2022-06-03 10:30:17 +02:00
Jaime van Kessel
f05e067f39 Merge branch '9145_fonts_look_ticker' of github.com:Ultimaker/Cura into 5.0 2022-05-10 16:24:40 +02:00
Ghostkeeper
97e2d6a432
Use border only on active state
Contributes to issue CURA-9217.
2022-05-10 16:03:55 +02: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
Jaime van Kessel
4819b2484e Merge branch 'fix_material_print_settings' of https://github.com/fieldOfView/Cura into 5.0 2022-05-10 13:11:05 +02:00
Ghostkeeper
7fda81b678
Show a border around text fields and drop-downs when hovering
And when they are focused.
This applies to the setting text fields, extruder selectors and drop-downs as well as to the machine settings.

Contributes to issue CURA-9217.
2022-05-09 17:48:38 +02:00
fieldOfView
8aa08944f2 Disable "Print Settings" fields for read-only materials 2022-05-06 13:11:49 +02:00
j.delarago
f327c2479b Update Dialog imports to remove version
Update FileDialogs selectExisting -> fileMode and folder -> currentFolder

CURA-8640
2022-04-01 16:08:35 +02:00
c.lamboo
3c9e2a1b08 Update RegExpValidator to RegularExpressionValidator
Due to Qt6 API change

CURA-8640
2022-03-30 15:10:37 +02:00
j.delarago
503f21090e Swap materials page SpinBox for NumericTextFieldWithUnit
This fixes,
filament cost iterating backwards with spinbox ( who knows why it did this )
text not updating when different material selected
value with decimals not saving

Remove margin from NumericTextFieldWithUnit.qml. Not sure why this was present, it made the TextField slightly smaller than the rest.

Remove some parsing str to float/int. Not needed since settings are stored as str

CURA-8979
2022-03-18 13:42:55 +01:00
j.delarago
7b0e954f12 Change machine setting page text box text highlight color to match designs.
CURA-8991
2022-03-04 15:20:46 +01:00
j.delarago
1fc6b8ced6 New designs use dark mode border_main for dark theme.
Remove uses of border_main_light. The only puprose of this color was to give dark mode access to the border_main of the light theme.

CURA-8991
2022-03-04 13:22:55 +01:00
j.delarago
d1a42e4e77 Update gcode text area in machine settings to have new border highlighting style and background color.
Swapped out default Label for UM.Label so it is easier to change styling in the future.

CURA-8943
2022-03-04 09:18:48 +01:00
j.delarago
195278aa55 Make all text fields use updated background and lining style.
CURA-8688
2022-03-01 10:20:39 +01:00
Jaime van Kessel
f682f56923 Merge branch 'master' of github.com:Ultimaker/Cura into replace_controls_1_for_controls_2 2022-02-17 15:02:03 +01:00
j.delarago
05d542c8d0 Bump UM version for CheckBox 2022-01-26 09:53:17 +01:00
j.delarago
5788ea8d00 The visibility settings in the preferences is defined in Uranium rather than Cura. The CheckBox has been moved to Uranium so that all parts of the project have access to this default styled component. 2022-01-24 14:03:47 +01:00
j.delarago
16e4ee58a9 Update Machine Settings Menu checkboxes to new style.
Change height of setting row to be set by TooltipArea instead of Checkbox and center Checkbox within TooltipArea
2022-01-19 18:04:29 +01:00
Ghostkeeper
ae81b5e3e7
Fix flickable with custom scrollbar
A bit of a hassle with the scrollbar overlapping the background here.

Contributes to issue CURA-8686.
2022-01-18 18:13:13 +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
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
fieldOfView
0313b29dcf Fix validator for floats in Machine Settings dialog
The DoubleValidator depends on the system locale, requiring users with certain locales to enter floats with a comma instead of a dot (though confusingly floats are always represented with a decimal a dot). Instead of configuring the DoubleValidator with a locale that only accepts decimal dots, this commit uses a RegExpValidator, like other numeric fields in Cura does.
2020-12-07 16:04:21 +01:00
Jaime van Kessel
8de981f33d
Add left padding to numeric textfield 2020-06-17 09:29:43 +02:00
Mark Burton
2669fbe608 Set padding to 0 to remove vertical shift on Linux builds. 2020-06-05 15:31:57 +01:00
Ghostkeeper
2f3462203c
Fix QML errors due to property providers not being initialised yet
This then updates in a fraction of a millisecond later before things even appear on the screen, so it's not so bad to not have a tooltip or to have it show 0 then.

Done during Turbo Testing and Tooling.
2020-03-20 16:58:18 +01:00
Ghostkeeper
31aee866f4
Check if options are available before matching on them
This prevents a QML warning when the ListModel is created before the property provider is. This QML warning looked like this:
2020-03-20 15:04:30,012 - WARNING - [MainThread] UM.Qt.QtApplication.__onQmlWarning [406]: file:///home/trin/Gedeeld/Projects/Cura/cura/../resources/qml/MachineSettings/ComboBoxWithOptions.qml:74: TypeError: Cannot call method 'match' of undefined

Done during Turbo Testing and Tooling.
2020-03-20 15:09:46 +01:00
Ghostkeeper
c7e6553dbf
Disallow printers larger than 2km
To do this, I'm giving more power to the NumericTextFieldWithUnit QML element, to allow an arbitrary minimum and maximum. Enforcing this minimum and maximum is fairly simple with a JavaScript hook. This hook is necessary because the DoubleValidator allows intermediary values which defeats the purpose, essentially allowing any number as long as it has the correct number of digits.
Printers larger than 2km would start to give overflow errors in its X and Y coordinates. Z is okay up to about 9 billion kilometres in theory, since we don't need to do any squaring math on those coordinates afaik. In practice I'm doing this because at very high values the Arranger also gives errors because Numpy can't handle those extremely big arrays (since the arranger creates a 2mm grid).

Fixes Sentry issue CURA-CB.
2020-03-20 11:16:16 +01:00
Jaime van Kessel
decf96e99e
Set verticalAlignment of numericTextField
Contributes to #7300
2020-03-20 11:04:24 +01:00
Jaime van Kessel
08ca213127
Add extra update for Combobox 2019-11-15 11:35:06 +01:00
Lipu Fei
38ee4bf208 Remove deprecated functions in MachineManager
CURA-6858
2019-10-22 14:11:40 +02:00
Lipu Fei
01345650e7 Use more meaning ID
CURA-6834
2019-10-07 21:14:05 +02:00
Lipu Fei
497648ffe7 Fix min/max X/Y QML value bindings
CURA-6834
2019-10-07 14:06:21 +02:00
Ghostkeeper
4bf8ea9332
Merge branch '4.3' 2019-09-23 11:25:31 +02:00
Lipu Fei
c661f82756 Recreate bindings for the text fields
CURA-6690
2019-09-19 15:33:10 +02:00
Nino van Hooff
c43cdb5c63 Implement allowPositive for printhead settings
CURA-6690
2019-09-19 14:49:18 +02:00