GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-06-02 15:18:54 +08:00
Code Issues Packages Projects Releases Wiki Activity
29,052 Commits 295 Branches 267 Tags
Commit Graph

13224 Commits

Author SHA1 Message Date
casper
02a6cc6e1d Improve visual appearance of ColorDialog 
According to the figma design

CURA-8938
 2022-02-16 23:43:54 +01:00
Jaime van Kessel
821581bc65 Remove ProgressBar style and use UM.ProgressBar instead 
CURA-8685
 2022-02-15 17:07:22 +01:00
10r3n20
4383f2ddf2 adjusted colors and size of origin gizmo 2022-02-15 16:45:57 +01:00
Jaime van Kessel
13227249b5 Remove catalog from Textfield 
The creation of the catalog is rather slow, so it's better not to create it for every component
 2022-02-15 16:28:29 +01:00
Jaime van Kessel
eb7ab657fe Use Cura.Textfield in readonlyTextfield 
Less code duplication, which is always good

CURA-8685
 2022-02-15 16:26:58 +01:00
10r3n20
a9e3acb623 adjusted buildplate grid color 2022-02-15 16:26:27 +01:00
Ghostkeeper
e552383863
Consistently use Cura.Menu and Cura.MenuItem 
Some of these were using the built-in Menu and MenuItem, causing the menus to appear in different sizes.

Contributes to issue CURA-8688.
 2022-02-15 16:19:39 +01:00
Jaime van Kessel
d7758c0ee9 Swap out the GeneralPage items to use the themed ones 
CURA-8685
 2022-02-15 16:11:06 +01:00
Ghostkeeper
52ff67c1eb
Use separate context menu size for menus 
Instead of re-using the setting controls. It's not a setting.

Contributes to issue CURA-8688.
 2022-02-15 16:09:18 +01:00
Jaime van Kessel
6ea7622a55 Fix reference to property that didn't exist 
CURA-8685
 2022-02-15 15:57:50 +01:00
Jaime van Kessel
b45b3faa3c Replace textField in JobSpecs 
CURA-8685
 2022-02-15 15:32:29 +01:00
Jaime van Kessel
6be75c75f8 Simpify Readonly textarea 
CURA-8685
 2022-02-15 15:18:04 +01:00
Jaime van Kessel
da96cb833c Swap ReadOnlyTextfield to controls 2 
CURA-8685
 2022-02-15 15:16:16 +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
NilsRo
dec31d7f44 Update anycubic_i3_mega_s.def.json 
Deleted travel_compensate_overlapping_wall as property is removed
 2022-02-14 19:22:23 +01:00
Superbrain8
fda6758042
Added Nylon quality presets for the Artillery Printer (#11463) 
* Added Definitions for Nylon

CURA-8952
 2022-02-11 14:09:49 +01:00
casper
ca0d84dcae Always prefix text in ColorDialog with a hashtag 
CURA 8687
 2022-02-11 13:48:57 +01:00
casper
959caece90 Make input field in ColorDialog selectable by mouse 
CURA 8687
 2022-02-11 13:45:03 +01:00
casper
86392ab471 Remove empty file 
CURA 8687
 2022-02-11 13:31:19 +01:00
casper
2edd634909 Provide a title with the color picker 
CURA 8687
 2022-02-11 13:27:41 +01:00
casper
7f95dc98e6 Translate text within the color picker 
CURA 8687
 2022-02-11 13:27:29 +01:00
casper
46fac4263b Fix styling issues in the material sync dialog 
CURA 8939
 2022-02-11 13:10:24 +01:00
Casper Lamboo
5063b84c9a
Remove superfluous semicolumn 
Co-authored-by: Jaime van Kessel <nallath@gmail.com>
 2022-02-11 11:32:12 +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 Lamboo
02f648d40a
Remove superfluous semicolumn 
Co-authored-by: Jaime van Kessel <nallath@gmail.com>
 2022-02-11 11:31:54 +01:00
Casper Lamboo
b2f3b365c9
Remove setting duplicate properties of UM.Label default settings 
Co-authored-by: Jaime van Kessel <nallath@gmail.com>
 2022-02-11 11:31:30 +01:00
Jaime van Kessel
c1d5526537 Add some documentation to ColorDialog 
CURA-8687
 2022-02-11 11:08:11 +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
Jaime van Kessel
f15f01e32f Fix styling of visibilityPresetCombobox 2022-02-10 11:24:07 +01:00
Jaime van Kessel
1b9c86603c Fix layout of multiply object dialog 2022-02-10 10:59:21 +01:00
Jaime van Kessel
78523789e7 Use correct styling in settingmenu 2022-02-10 10:49:18 +01:00
Jaime van Kessel
5615ec82a3 Prevent text in configuration menu from spilling out of the menu 2022-02-10 10:45:51 +01:00
Jaime van Kessel
ddc43446e6 Fix wrapping in sync menu 2022-02-10 10:37:26 +01:00
NilsRo
435e9a7924 Update anycubic_i3_mega_x.def.json 
Corrected JSON error
 2022-02-09 21:01:39 +01:00
j.delarago
6f154ea444 Add new icon styles 
Change backup image name from icon to backup

Cura-8681
 2022-02-09 16:55:28 +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
Jaime van Kessel
5c7e050b32 Merge branch 'master' of https://github.com/baldaaaa/Cura 2022-02-09 15:16:15 +01:00
Jaime van Kessel
80d2665c1a
Merge pull request #10978 from dagoma3d/dagoma-pro430 
Add new Dagoma PRO 430 printer
 2022-02-09 15:13:55 +01:00
j.delarago
1375b1c657 Remove unused QtQuick.Dialogs imports 
Cura-8687
 2022-02-09 14:56:06 +01:00
Jaime van Kessel
8c6d97f20c
Merge pull request #11366 from 64bittuning/master 
Tronxy Profiles 2022 Update
 2022-02-09 14:51:23 +01:00
casper
adcf312de7 Resolve Qt warnings 
CURA 8687
 2022-02-09 13:11:17 +01:00
casper
6ca14ecbae Update DiscardOrKeepProfileChangesDialog 
CURA 8687
 2022-02-09 13:05:48 +01:00
casper
72c038a8b1 Update AskOpenAsProjectOrModelsDialog 
CURA 8687
 2022-02-09 12:36:56 +01:00
casper
f59a23fd82 Update OpenFiles Dialog 
CURA 8687
 2022-02-09 12:36:00 +01:00