GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-21 12:09:13 +08:00
Code Issues Packages Projects Releases Wiki Activity
28,045 Commits 290 Branches 260 Tags
Commit Graph

28045 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
casper
ec186f140b Use cura-styled button in about page 
CURA-8688
 2022-02-18 16:01:51 +01:00
casper
7be54a47ec Use cura-styled button in settings pick dialog 
CURA-8688
 2022-02-18 16:00:03 +01:00
casper
26470440f0 Update buttons in work space dialog 
Use Cura-styled buttons
Use dialog accecpt-reject handlers

CURA-8688
 2022-02-18 14:21:37 +01:00
casper
67c80e8a37 Update image loader dialog 
- Changed the slider to a Cura.Spinbox
- Use Cura-styled buttons

CURA-8688
 2022-02-18 14:02:09 +01:00
casper
5134a071b1 Merge branch 'replace_controls_1_for_controls_2' into CURA-8688_qt6_cleanup 2022-02-18 10:55:09 +01:00
casper
d88f7d4267 Replace Cura.Checkbox with UM.CheckBox 2022-02-18 10:54:11 +01:00
j.delarago
e60b8ac30c Merge remote-tracking branch 'origin/CURA-8688_qt6_cleanup' into CURA-8688_qt6_cleanup 2022-02-18 10:32:21 +01:00
j.delarago
9b05dbdb85 MenuItem height has to be set to 0 when visible: false otherwise there is white space in place of the MenuItem. 
This functionality is included in UM and was being overwritten in Cura.MenuItem.

CURA-8688
 2022-02-18 10:29:55 +01:00
casper
ab17df15b5 Merge branch 'replace_controls_1_for_controls_2' into CURA-8688_qt6_cleanup 2022-02-18 10:08:12 +01:00
Casper Lamboo
9285256ac7
Merge pull request #11492 from Ultimaker/CURA-8685-replace_text_and_progress_bars 
Replace text and progress bars
 2022-02-18 09:08:31 +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
j.delarago
e990e970be Revert background to Rectangle as it was in previous versions of this file. 
This gives the bar a white background, instead of a transparent background.

CURA-8688
 2022-02-17 15:42:25 +01:00
j.delarago
b2811b1125 Merge branch 'replace_controls_1_for_controls_2' into CURA-8688_qt6_cleanup 2022-02-17 15:21:19 +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
58e6cde6e8 Remove incorrect refferents to btnOk 2022-02-17 15:10:18 +01:00
Jaime van Kessel
266214d651 Merge branch 'Ip_adress_dialog' of github.com:Ultimaker/Cura into replace_controls_1_for_controls_2 2022-02-17 15:08:02 +01:00
Jaime van Kessel
b5136ba70c Fix merge conflics 2022-02-17 15:07:48 +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
Jaime van Kessel
c528616d12 Set selection color of textfields 
CURA-8947
 2022-02-17 14:39:11 +01:00
Jaime van Kessel
e66628e2da Merge branch 'CURA-8031_modifier_meshes_in_one_at_a_time_mode' of github.com:Ultimaker/Cura 2022-02-17 14:18:54 +01:00
Jaime van Kessel
614fe6fd4f
Merge pull request #11023 from NilsRo/master 
Update anycubic_i3_mega_s.def.json

CURA-8971
 2022-02-17 09:48:25 +01:00
Jaime van Kessel
bed290e968
Merge pull request #11486 from Ultimaker/origin-visualization-improvements 
Origin visualization improvements
 2022-02-17 09:27:05 +01:00
j.delarago
61ba4426ad Add check for build plate number to modifier mesh list. 
CURA-8031
 2022-02-16 16:05:43 +01:00
j.delarago
a9a533b61d Duplicate modifier meshes for all objects in one at a time mode. 
CURA-8031
 2022-02-16 15:15:31 +01:00
Ghostkeeper
5fc89b6053
Merge branch 'patch-1' of https://github.com/inigoml/Cura into inigoml-patch-1 2022-02-16 12:46:47 +01:00
Jaime van Kessel
5f3b35b30d Use UM label for firmwareUpdater 
CURA-8685
 2022-02-15 17:17: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
40f835ed13 Replace labels for UM.Label in DiscoverUM3Action 
CURA-8685
 2022-02-15 15:51:07 +01:00
Jaime van Kessel
713a5cb4e5 Ensure that settingPickDialog uses the themed controls 
CURA-8685
 2022-02-15 15:38:08 +01:00
Jaime van Kessel
b45b3faa3c Replace textField in JobSpecs 
CURA-8685
 2022-02-15 15:32:29 +01:00
Jaime van Kessel
77b46868a6 Replace imagereader controls with styled variants 
CURA-8685
 2022-02-15 15:24:30 +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
casper
aeb433b2a1 Keep showing ip enter dialog after wrongly entered ip address 
In component discover um 3 dialog. After a "complete" action the
dialog will immediately close. This was undesired behaviour as we want
to keep the dialog active if an IP address is wrongly added.

Additionally, it is no longer necessary to close/hide the dialog after
a reject/accept as this is done by default.

CURA-8955
 2022-02-15 09:29:32 +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
Evangelos Trantos
84d9d5bec4
Embed more sizes in the ico file so that it looks better 2022-02-14 11:15:19 +02:00
Jaime van Kessel
9b23d3ac9a
Add drawing of how per object stacks work 2022-02-14 09:30:27 +01:00
Jaime van Kessel
b9feac9816
Merge pull request #11460 from Ultimaker/CURA-8687_dialogs 
Replace Dialogs in preparation for Qt 6.x upgrade
 2022-02-11 15:04:01 +01:00