3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-18 20:28:01 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 5
32881 commits 306 branches 270 tags 779 MiB
Commit graph

303 commits

Author SHA1 Message Date
saumya.jain
c95481f6e7 tab button in per model setting 
CURA-18869
 2023-09-14 16:26:00 +02:00
c.lamboo
eca903430e Fix setting text fields overlapping in per-object-settings 
CURA-10669
 2023-06-13 15:24:59 +02:00
Joey de l'Arago
e4ad9cb48c Move base hovered logic out of ComboBox.qml since base is undefined in most places the component is used. 
CURA-9424
 2022-11-15 14:08:47 +01:00
Jelle Spijker
81df26e4d9
Merge pull request #11833 from Ultimaker/CURA-9149_object_settings_ovelap 
CURA-9149 Fix PerObjectSettings remove button layout
 2022-04-21 12:48:48 +02:00
j.delarago
5a8343ce25 Center remove button in row by giving it the same height as the input. 
Adjust width of rows when scrollbar is present so they don't overlap.

CURA-9149
 2022-04-21 11:56:17 +02:00
Remco Burema
0232b4f639 Upgrade SDK version to 8.0.0 for Cura 5.0 2022-04-20 10:57:38 +02:00
Jaime van Kessel
15b16e3e45 Remove overlap in perobject setting panel 
CURA-9149
 2022-04-19 17:27:38 +02:00
c.lamboo
45bc498c7f Replace RecolorImage with ColorImage 
CURA-8640
 2022-04-08 15:55:34 +02: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
j.delarago
067cdda401 Add missing UM import 
CURA-9005
 2022-03-15 09:05:38 +01:00
casper
5701f42d63 Move CategoryButton to cura repo 
CURA-9005
 2022-03-11 13:11:36 +01:00
Casper Lamboo
addc5e36a7
Apply suggestions from code review 
Co-authored-by: Jaime van Kessel <nallath@gmail.com>
 2022-03-11 09:59:20 +01:00
j.delarago
016cc4e48f Merge branch 'master' into CURA-9005_restyle_print_setting_category 2022-03-07 13:37:58 +01:00
j.delarago
eb88316eee Give PerObjectSettingsPanel.qml the same margin between settings as main settings 
CURA-9005
 2022-03-07 13:36:11 +01:00
j.delarago
dc5a1ae120 Remove redundant reference to spacer 
CURA-9005
 2022-03-07 13:26:50 +01:00
j.delarago
76d9cf6f4d Remove margins that keep listview items from being under the scrollbar. Instead set width of listView smaller so it doesn't overlap. 
Update per object setting visibility dialog to have same category design as SettingVisibilityCategory.qml and SettingCategory.qml

CURA-9005
 2022-03-07 13:20:05 +01:00
j.delarago
3c7498feed Move ToolbarButton and ToolTip from Cura into Uranium. This makes it possible to use new styled ToolbarButton in plugins/Tools for the rotate tool. 
Removed the ContentAlignment enum in ToolTip in favour of using the Text.ContentAlignment enum. For some reason references to this enum fail everywhere when ToolTip is moved into Uranium. There is some evil time-wasting magic cast on this component!

CURA-8943
 2022-03-03 15:53:30 +01:00
j.delarago
b2bed4efdd Fix setting visibility styling working in one theme and not the other. 
CURA-8688
 2022-03-02 09:06:47 +01:00
casper
862525bc90 Remove obsolete uses of system palette 
CURA-8688
 2022-03-01 12:29:09 +01:00
j.delarago
330b3f8119 Update settings visibility pages to have correct background color on categories 
CURA-8688
 2022-03-01 10:26:59 +01:00
Jaime van Kessel
7fd6601b1a Apply theming to perObjectCategory 
CURA-8688
 2022-02-28 11:37:51 +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
Jaime van Kessel
f347c6aedf Remove number of unused styles imports 2022-02-22 11:42:41 +01:00
Ghostkeeper
c7d7dd11d1
Merge branch 'master' into PyQt6_upgrade 
Conflicts:
	cura/PlatformPhysics.py -> Removed shapely on master, while QTimer import got updated to Qt6.
	plugins/Toolbox -> Entire folder is deleted in master, but it was updated to Qt6 here. This can all be removed.
 2022-02-21 11:52:28 +01:00
j.delarago
26434f3db9 SettingPickDialog was very wide due to the screen factor scaling being removed. This gives it a fixed width the same as other dialogs. 
CURA-8688
 2022-02-21 11:19:14 +01:00
j.delarago
c00eb5b432 Align checkbox with category icon in per object visibility settings dialog and preferences visibility settings. 
Move "Information" icon to the right of checkboxes in settings visibilty preferences page. This allows clean aligning of checkboxes with category icon.

CURA-8688
 2022-02-18 18:15:48 +01:00
j.delarago
d333b4639c Align per object settings visibility checkbox with icon 
CURA-8688
 2022-02-18 17:20:49 +01:00
casper
7be54a47ec Use cura-styled button in settings pick dialog 
CURA-8688
 2022-02-18 16:00:03 +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
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
713a5cb4e5 Ensure that settingPickDialog uses the themed controls 
CURA-8685
 2022-02-15 15:38:08 +01:00
Jaime van Kessel
cfb0604067 Clarify some documentation in the PerObjectSettingVisibilityHandler 
We often used shorthands for stack / instance / definition, but this made it
harder for people that are very familiar with the code to understand what is
going on.

Contributes to #11455
 2022-02-11 13:40:21 +01:00
j.delarago
85973f4a1a Center Align Checkbox in per model settings visibilty menu 2022-02-07 11:55:03 +01:00
Ghostkeeper
ee81326d6a
Fix remaining merge conflicts 
- When both branches added Controls1 as OldControls, it's not marked as a merge conflict. But the merge removed the need for OldControls, so the import can be removed.
- There was one instance where I had removed the OldControls for a checkbox but there it should remain since the checkboxes are updated in a separate ticket.

Contributes to issue CURA-8684.
 2022-01-31 17:08:56 +01:00
Ghostkeeper
6db4a55f6e
Merge branch 'replace_controls_1_for_controls_2' into CURA-8684_QtControls_replacement_Buttons,_Actions_&_'Exclusivity' 
Conflicts:
	plugins/ImageReader/ConfigUI.qml
	plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml
	plugins/PerObjectSettingsTool/SettingPickDialog.qml
	resources/qml/Dialogs/DiscardOrKeepProfileChangesDialog.qml
	resources/qml/Menus/ConfigurationMenu/CustomConfiguration.qml
	resources/qml/Preferences/GeneralPage.qml
	resources/qml/Preferences/Materials/MaterialsPage.qml
	resources/qml/Preferences/Materials/MaterialsView.qml
	resources/qml/Preferences/ProfilesPage.qml

These conflicts are all arising from headers/includes being updated at the same time, or from the two branches marking the other one's components as needing OldControls.
This introduced more OldControls markers which don't get marked as merge conflicts by Git. This happens when an element could just be left as the original name but from the new import (e.g. a Button stays a Button in Controls 2, but should be marked as from OldControls on the branch that doesn't update the Button).
 2022-01-31 16:53:45 +01:00
casper
264ce3bdd1 Make texts fields selectable by mouse for various components 
This enables mouse-selectable for
- The image reader dialog
- Layer view text field (in simulation view)
- The TextField with unit component (for instace used to set the scale
 of models)
- Rename dialog(s)
- Currency text field
- The settings filter text field

CURA-8684
 2022-01-31 10:28:00 +01:00
j.delarago
05d542c8d0 Bump UM version for CheckBox 2022-01-26 09:53:17 +01:00
casper
b51c787f62 Re-use Cura.ToolbarButton in per object settings menu 
CURA-8684
 2022-01-26 08:56:33 +01:00
casper
24a8e8b761 Merge remote-tracking branch 'origin/CURA-8684_QtControls_replacement_Buttons,_Actions_&_'Exclusivity'' into CURA-8684_QtControls_replacement_Buttons,_Actions_&_'Exclusivity' 2022-01-25 16:06:05 +01:00
casper
ad3832791c Use Button in tool bar button component 
CURA-8684
 2022-01-25 16:05:49 +01:00
Casper Lamboo
f834e63413
Update plugins/PerObjectSettingsTool/ToolBarButton.qml 
Co-authored-by: Jaime van Kessel <nallath@gmail.com>
 2022-01-25 15:54:33 +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
9b11483428 Cura.Checkbox requires vertical alignment since it no longer takes up the same amount of vertical space. 2022-01-21 18:09:02 +01:00
j.delarago
951e1cb37b Swap CheckBox for styled Cura.CheckBox 2022-01-21 18:07:45 +01:00
casper
09793854ef Update Buttons to QtControls 2.0 in per model settings dialog 
CURA-8684
 2022-01-21 13:38:58 +01:00
casper
bcd1689680 Update buttons in per object settings plugin to QtControls 2 
CURA-8684
 2022-01-20 22:58:43 +01:00
casper
f2ee58a08b Update PerObjectCategory to QtQuick.Controls 2.1 
CURA-8684
 2022-01-20 22:15:22 +01:00
j.delarago
670872f8d1 Specify width and height in Cura.Checkbox 
Update Dialogs to use Cura.CheckBox instead of QtQuick. This will make it easier to update the QtQuick checkbox version.
 2022-01-20 17:31:00 +01:00
Ghostkeeper
4f82137035
Customise scrollbar for extruder selectors 
Contributes to issue CURA-8686.
 2022-01-20 17:26:49 +01:00
Ghostkeeper
954a3cb1db
Replace ScrollView by ListView in settings picking dialogue 
The ScrollView is no longer necessary in Controls2. Just have a ListView with customised scrollbar.

Contributes to issue CURA-8686.
 2022-01-18 14:54:36 +01:00