3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-08 07:27:29 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
28475 commits 302 branches 270 tags 769 MiB
Commit graph

234 commits

Author SHA1 Message Date
j.spijker@ultimaker.com
55cb86ebbd
use namespace AlignmentFlag 
Contributes to CURA-8640
 2022-03-24 11:58:42 +01:00
Jelle Spijker
3f8907d02a
Merge branch 'master' into CURA-8640_PyQt6 
# Conflicts:
#	cura/CuraApplication.py
#	resources/qml/Preferences/Materials/MaterialsSyncDialog.qml
#	resources/qml/Preferences/Materials/MaterialsView.qml
 2022-03-24 11:53:44 +01:00
Jaime van Kessel
43da68c898 Merge branch 'fix_scrollview_scrollbars' of https://github.com/fieldOfView/Cura 2022-03-22 16:13:46 +01:00
fieldOfView
09c3ae628e Fix "double"/non-functional scrollbars on ScrollViews 2022-03-22 14:46:14 +01:00
casper
5d3b22f45a Don't check on type equality to check if material is set 
As suggested by code review

CURA-9044
 2022-03-22 13:46:31 +01:00
casper
1e15197d44 Show active material in italics 
behaviour is not perfect; only one (of the possible multiple if you have
multiple materials) active material is shown in italics. However, this
behavior is similar as the behavior in cura v4.13

see
https://github.com/Ultimaker/Cura/pull/11668/files#diff-ba2e4797d4d21e847be25e2c272d6a7a45e3bab97def420bed7643d762be8cfaL54

CURA-9044
 2022-03-22 12:00:56 +01:00
casper
adccc5fd19 Use correct font and line height for the category btn in materials list 
CURA-8979
 2022-03-21 13:50:10 +01:00
casper
10339555f4 Simplify materials preference page by wrapping scroll items in ListView 
CURA-8979
 2022-03-21 13:20:41 +01:00
j.delarago
c10865b179 Fixes this error 
QML Column: ScrollBar must be attached to a Flickable or ScrollView

by wrapping the Column in a ScrollView the same way that is done for the information page.

CURA-8979
 2022-03-18 14:45:03 +01:00
j.delarago
bd91078e6e Accept click events on materials items in materials list 
CURA-8979
 2022-03-18 14:08:20 +01:00
j.delarago
c6bd020dec Anchor material name to star icon so text doesn't display under star icon. 
CURA-8979
 2022-03-18 13:58:41 +01:00
j.delarago
c7bb97aa6c Add tooltip to materials list itmes. 
CURA-8979
 2022-03-18 13:56:19 +01: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
4b853b89bd Fix typo 
CURA-8979
 2022-03-15 16:23:18 +01:00
j.delarago
9dbc497fcb Move TabRow below so it renders over the top lining of content rectangles. 
Update Tab styles to match designs

CURA-8979
 2022-03-15 16:19:33 +01:00
j.delarago
b33a5d7b84 Add space, so content isn't bellow scrollbar 
CURA-8979
 2022-03-15 15:54:50 +01:00
j.delarago
99f9918db5 Remove Italics 
CURA-8979
 2022-03-15 15:05:26 +01:00
j.delarago
bf784dbba0 show star on hover 
CURA-8979
 2022-03-15 15:03:49 +01:00
j.delarago
59b7d20f75 Update ReadOnlyTextArea import 
Update ReadOnlyTextArea style (It's not really read only 🤔)

CURA-8979
 2022-03-15 14:50:02 +01:00
Jaime van Kessel
97124bf5a9 Fix various QML warnings 
CURA-8979
 2022-03-15 10:32:44 +01:00
Jaime van Kessel
f760ca146d Fix sizing of materialBrandSelection 
This also cleans up some stuff from the theme. Huzzah

CURA-8979
 2022-03-15 10:25:56 +01:00
Jaime van Kessel
93405bdb93 Add identation for the materials preferences page 
CURA-8979
 2022-03-15 10:19:34 +01:00
casper
5136838f56 Update materials list in materials preference page 
Main improvement of this commit is that the reusable category button
component is used as the collapsable header component for the material
brands/types.

CURA-8979
 2022-03-11 16:42:11 +01:00
casper
e2c9e0a461 Elide text in materials slot 
CURA-8979
 2022-03-11 16:29:37 +01:00
casper
c6b8abd53e Update materials slot 
CURA-8979
 2022-03-11 13:22:45 +01:00
casper
2dd440cc0c Fix print settings tab in materials view 
CURA-8979
 2022-03-10 22:13:32 +01:00
casper
9ba44f1d30 Move details plane caption to management page 
This way the caption can be correctly aligned with the hamburger menu
button

CURA-8979
 2022-03-10 10:15:31 +01:00
casper
418f88a4da boy scouting 
CURA-8975
 2022-03-09 15:59:21 +01:00
casper
f9a5cb33fd Implement basic styling of material management page 
CURA-8979
 2022-03-09 15:26:55 +01:00
Jaime van Kessel
5725f3d57f Fix height of syncMaterialCards 
CURA-8688
 2022-02-28 15:46:04 +01:00
j.delarago
e2fe50baf1 Merge branch 'replace_controls_1_for_controls_2' into CURA-8688_qt6_cleanup 
# Conflicts:
#	resources/qml/Widgets/Menu.qml
#	resources/qml/Widgets/MenuItem.qml
#	resources/themes/cura-dark/theme.json
#	resources/themes/cura-light/theme.json
 2022-02-28 08:51:42 +01:00
casper
e03176a1fa Replace UM.MessageDialog with newly added Cura.MessageDialog 
This dialog is different from the `UM.MessageDialog` in that it

CURA-8688
 2022-02-23 14:09:38 +01:00
Jaime van Kessel
f347c6aedf Remove number of unused styles imports 2022-02-22 11:42:41 +01:00
casper
5a2e26eff6 Merge branch 'replace_controls_1_for_controls_2' into CURA-8685-replace_text_and_progress_bars 
# Conflicts:
#	plugins/PerObjectSettingsTool/PerObjectItem.qml
#	plugins/PerObjectSettingsTool/SettingPickDialog.qml
 2022-02-18 09:07:25 +01:00
casper
9f7581d4e8 Remove ReadOnlyTextField 
and use a
```
UM.TextField
{
   enabled: false
}
```
instead

CURA-8688
 2022-02-18 08:57:38 +01:00
Jaime van Kessel
5f9e916f29 Merge branch 'Ok_button_dialog' of github.com:Ultimaker/Cura into replace_controls_1_for_controls_2 2022-02-17 15:21:15 +01:00
Jaime van Kessel
f7dc2fc2d1 Merge branch 'materials_sync' of github.com:Ultimaker/Cura into replace_controls_1_for_controls_2 2022-02-17 15:13:15 +01:00
Jaime van Kessel
a20dac4c9b Update ReadOnlyTextArea to controls 2 
CURA-8685
 2022-02-15 15:08:06 +01:00
casper
99478d6a15 Add "Ok" button in export/import materials popup dialog 
Proposed solution takes a different approach compared to the previous
solution. Previously there was one message dialog that was hidden by
default. When the import/export material confirm dialog was triggered
the text and body of this message dialog would change.

I did deviate from this pattern as this might introduce hard to debug
issues when a property would be set on this dialog. As this dialog is
used for various instances every instance should update the same
properties. If one property is missed then the popup might show unwanted
information.

I propose a different solution instead. Here a popup is created
dynamically. This way the properties used for each instance is clear.
This might add a delay when showing the popup as the whole component
needs to be created when called.

CURA-8959
 2022-02-15 11:18:02 +01:00
casper
2edd634909 Provide a title with the color picker 
CURA 8687
 2022-02-11 13:27:41 +01:00
casper
46fac4263b Fix styling issues in the material sync dialog 
CURA 8939
 2022-02-11 13:10:24 +01:00
Casper Lamboo
8c0b0ddc5b
Remove superfluous semicolumn 
Co-authored-by: Jaime van Kessel <nallath@gmail.com>
 2022-02-11 11:32:03 +01:00
casper
91c95a0ed6 Remove duplicate function 
CURA 8687
 2022-02-11 10:47:37 +01:00
casper
1c711129e2 Merge branch 'replace_controls_1_for_controls_2' into CURA-8687_dialogs 
# Conflicts:
#	resources/qml/Account/SyncState.qml
#	resources/qml/Preferences/ReadOnlySpinBox.qml
 2022-02-11 10:44:52 +01:00
casper
1eabf251f4 Remove unused function 
CURA 8687
 2022-02-10 18:07:42 +01:00
casper
fca6ef29ae Move ColorDialog to Cura repo 
Move component to the Cura repo as `Cura.SecondaryButton` and
`Cura.PrimaryButton` are used.

CURA 8687
 2022-02-10 18:06:43 +01:00
j.delarago
9bad66b6ce Add custom ColorDialog.qml with simple hex value selector. 
Cura-8681
 2022-02-10 17:28:29 +01:00
casper
2e1f2a37a3 Fix centering of MessageDialog 
Instead of centering in the parent the dialog is now center within the
`Overlay.overlay`. This is the window container.

CURA 8687
 2022-02-09 16:45:34 +01:00
casper
84ecc8d168 Remove unused imports 
CURA 8687
 2022-02-09 15:50:05 +01:00
j.delarago
1375b1c657 Remove unused QtQuick.Dialogs imports 
Cura-8687
 2022-02-09 14:56:06 +01:00