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

5575 Commits

Author SHA1 Message Date
Jaime van Kessel
8e55dda3cc Switch old checkbox over to styled variant 
CURA-8949
 2022-02-21 10:03:44 +01:00
Jaime van Kessel
af99b87bef Remove close button 
No idea why it was there in the first place. The dialog itself can be closed...

CURA-8949
 2022-02-18 16:28:10 +01:00
Jaime van Kessel
d6b2b951f2 Hide background if no item is selected 
CURA-8949
 2022-02-18 16:15:43 +01:00
Jaime van Kessel
3a1d5a29fa Add background to profiles page 
CURA-8949
 2022-02-18 16:12:23 +01:00
j.delarago
7c9038b43c Merge remote-tracking branch 'origin/CURA-8688_qt6_cleanup' into CURA-8688_qt6_cleanup 2022-02-18 16:11:34 +01:00
casper
84fe432239 Use cura-styled button in machines page 
CURA-8688
 2022-02-18 16:11:25 +01:00
j.delarago
2ed1894a27 Set Dialog margin as it was in 4.13 
CURA-8688
 2022-02-18 16:11:18 +01:00
casper
ec186f140b Use cura-styled button in about page 
CURA-8688
 2022-02-18 16:01:51 +01:00
Jaime van Kessel
a458155258 Update look of the profilesPage 
CURA-8949
 2022-02-18 15:09:57 +01:00
Jaime van Kessel
9df7ccd5cc Let profiles page use ManagementPage 
No idea why it didn't in the first place. This caused a lot of code duplication.

CURA-8949
 2022-02-18 14:20:16 +01:00
Jaime van Kessel
742f0b7dbb Add defaults button to setting visibility page 
CURA-8949
 2022-02-18 12:49:59 +01:00
Jaime van Kessel
5aed6bb3c8 Move reset to defaults button for general page 
CURA-8949
 2022-02-18 12:33:07 +01:00
Jaime van Kessel
2d0ce01ff5 Add menu to react on the hamburger menu 
CURA-8949
 2022-02-18 12:28:03 +01:00
Jaime van Kessel
8feaa32769 Codestyle cleanups 
Mostly just removing ;'s from QML

CURA-8949
 2022-02-18 11:28:40 +01:00
Jaime van Kessel
46e7217646 Layout tweaks for general page 
CURA-8949
 2022-02-18 11:22:19 +01:00
Jaime van Kessel
2b220c627f Disable wordwrap in combobox 
CURA-8949
 2022-02-18 11:06:33 +01:00
Jaime van Kessel
3e5a51503e Change font of the headings in general page 
CURA-8949
 2022-02-18 10:59:23 +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
Jaime van Kessel
ee7bcc3f5f Use UM checkbox 
CURA-8949
 2022-02-18 10:27:08 +01:00
Jaime van Kessel
48fa6cddf0 Merge branch 'replace_controls_1_for_controls_2' of github.com:Ultimaker/Cura into CURA-8949_preferences_styling 2022-02-18 10:24:06 +01:00
Jaime van Kessel
6e5e5152be Change machine actions buttons to secondaryButtons 
CURA-8949
 2022-02-18 10:14:47 +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
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
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
casper
0786ff2c6b Change variable names 
"swatch" is a more descriptive variable name for this usecase

CURA-8938
 2022-02-17 09:50:38 +01:00
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
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
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
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