GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-08-16 10:05:56 +08:00
Code Issues Packages Projects Releases Wiki Activity
28,014 Commits 295 Branches 268 Tags
Commit Graph

28014 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ghostkeeper
a7da4e4ef9
Fix integration with new table view 
Only a single selected item for the moment.

Contributes to issue CURA-8686.
 2022-01-25 18:11:30 +01:00
Ghostkeeper
59494cdace
Implement selection 
Contributes to issue CURA-8686.
 2022-01-25 18:03:45 +01:00
Ghostkeeper
5671b6c61f
Replace TableView with custom implementation 
I intend to copy this implementation to mainline Cura when it's done.

Contributes to issue CURA-8686.
 2022-01-25 17:51:48 +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
ea60fdeacd
Update resources/qml/Preferences/MachinesPage.qml 
Co-authored-by: Jaime van Kessel <nallath@gmail.com>
 2022-01-25 15:59:17 +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
Ghostkeeper
2758957d5c
Use TabRow for material page selection 
The contents of the page is done with a simple page that becomes visible or not. The easiest solution I could think of. No StackLayout necessary here.

Contributes to issue CURA-8686.
 2022-01-25 13:57:47 +01:00
Ghostkeeper
cfafdf878a
Move contents of ProfileTab to ProfileOverview file 
This way it is re-useable, and no longer connected to the concept of a tab view.

We can then display it in the profile manager.

Contributes to issue CURA-8686.
 2022-01-25 13:34:13 +01:00
Ghostkeeper
50960ce5cf
Use UM.TabRow instead of a tab view 
This styles it for us automatically.
However the contents of the tab disappears now. I'll have to restore that, but since that moves a bunch of code I'd rather do that in a separate commit.
I also changed the item to a column so that we don't have to link up the anchors very weirdly/difficulty with all of the buttons and messages that are optional. This just automatically makes space if there need to be extra buttons and messages in between, and even deals with the spacing correctly.

Contributes to issue CURA-8686.
 2022-01-25 12:09:59 +01:00
Ghostkeeper
5f101e8233
Set checked tab for TabRowButton 
We're changing this so that the button doesn't set this by itself. This is necessary so that I can use this TabRowButton also when it's not in a repeater (for the global stack in the profile manager).

Contributes to issue CURA-8686.
 2022-01-25 11:58:44 +01:00
j.delarago
7f81a2aa8c Rename low quality CheckMark.svg -> Check.svg 
Rename low quality Check.svg -> CheckThin.svg
 2022-01-25 11:32:41 +01:00
j.delarago
0f4a49ac6d Remove unused CheckBoxBorder.svg, the checkbox is defined using styling instead of an svg. 2022-01-25 11:09:27 +01:00
j.delarago
a73ae6b655 Replace Cura.CheckBoxWithTooltip with UM.CheckBox. 
Remove Cura.CheckBoxWithTooltip.qml from qmldir module definition.

Remove Cura.CheckBox.qml from qmldir module definition as it has been moved to Uranium
 2022-01-25 11:08:52 +01:00
casper
d3f01034a2 Highight default action and listen to keyboard actions in image dialog 
CURA-8684
 2022-01-25 10:54:09 +01:00
casper
c63b94375d Update materials slot preference menu to QtControls 2 
CURA-8684
 2022-01-24 23:34:38 +01:00
casper
b47c7c9395 Update materials view preference menu to QtControls 2 
CURA-8684
 2022-01-24 23:28:25 +01:00
NilsRo
96e3a1cadf Updated Max. Speed Warning and Retraction 
Sorted some setting and aligned with firmware values
 2022-01-24 23:10:45 +01:00
NilsRo
1a8328d262 Update anycubic_i3_mega_s.def.json 
Increased max. Extruder Feedrate to match newer firmware
 2022-01-24 22:51:29 +01:00
casper
6dc535063b Update profiles preferences page to QtControls 2 
CURA-8684
 2022-01-24 22:37:39 +01:00
casper
b6e375a3be Update machines preferences page to QtControls 2 
CURA-8684
 2022-01-24 22:34:14 +01:00
casper
3e98282871 Update material preferences page to QtControls 2 
CURA-8684
 2022-01-24 22:31:36 +01:00
casper
b45707af54 Update ask open project or models dialog to QtControls 2 
CURA-8684
 2022-01-24 21:58:23 +01:00
casper
4c0ee058e4 Update discard keep or discard changes dialog to QtControls 2 
CURA-8684
 2022-01-24 18:21:52 +01:00
j.delarago
4eb61af579 Update colors to match designs 2022-01-24 16:15:41 +01:00
j.delarago
f6c48fdf07 Rename EmptyCheck -> CheckMark 2022-01-24 14:20:28 +01:00
j.delarago
818ef8e614 add dark theme checkbox square color 2022-01-24 14:13:03 +01:00
casper
9e5fd998f4 Update open files dialog to QtControls 2 
CURA-8684
 2022-01-24 14:11:02 +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
17339ba77e Merge branch 'master' into CURA-8378_improve_checkbox_visibility 2022-01-24 13:17:37 +01:00
casper
582e4fcbd0 Update print action hotkey listener to QtControls 2 
CURA-8684
 2022-01-24 10:31:17 +01:00
NilsRo
a970fbcadf Made initial layer speed dynamic 2022-01-23 21:31:15 +01:00
NilsRo
0fe39017b1 Merge remote-tracking branch 'upstream/master' 2022-01-23 21:17:33 +01:00
NilsRo
785d24732d reduced skirt line count as there is also minimum length 2022-01-23 21:16:40 +01:00
NilsRo
873b8445c7 Update anycubic_i3_mega_s.def.json 
Handled PETG better as it sticks to nozzle if to much filament is extruded
 2022-01-23 13:20:18 +01:00
j.delarago
4c9c2ad131 "checkedState" is now "checkState" in newer CheckBox 
Remove partiallyCheckedEnabled since Cura.CheckBox manages this itself.
 2022-01-21 18:16:16 +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
j.delarago
171da643d5 I'm replacing all CheckBox in Cura with this CheckBox except ones that use the old "style" tag (Not in scope). This should make the design consistent everywhere and easier to update. 
Moved set width and height from top level into "indicator" since this was causing the label to be cut off.

Swapped out setting_control_radius for checkbox_radius since these are different now.

Updated the UM.RecolorImage to work with tri state checkboxes so this can replace the Checkbox in SettingVisiblityPage.qml.
 2022-01-21 18:06:31 +01:00
Ghostkeeper
0f61e25a77
Fix anchoring width of network printer view to scrollbar 
You can't anchor to something that's not a parent or sibling, and the scrollbar was an... uncle?

Contributes to issue CURA-8686.
 2022-01-21 17:07:10 +01:00
casper
8cc1604b2f Update Buttons to QtControls 2.0 in the simulation view expend menu bar 
CURA-8684
 2022-01-21 14:07:41 +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
092936ae3a Update Buttons to QtControls 2.0 in general preferences page 
CURA-8684
 2022-01-21 13:06:51 +01:00
casper
ee38c9c05b Update QtControls to v2.0 in image reader plugin 
CURA-8684
 2022-01-21 12:24:40 +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
07095a5802 Update Material selection and variant selection buttons to QtControls 2 
CURA-8684
 2022-01-20 22:38:00 +01:00
casper
f2ee58a08b Update PerObjectCategory to QtQuick.Controls 2.1 
CURA-8684
 2022-01-20 22:15:22 +01:00
casper
204d965df2 Use SecondaryButton in the usb print panel inplace of tye style prop 
The Jog buttons are not changed yet as these button make use of the
`checked` property this is not yet implemented for Cura's `Action` and
by extension Cura's `Secondary` button.

CURA-8684
 2022-01-20 22:15:22 +01:00
Ghostkeeper
7a5db88fd8
Update slider to Controls 2 
Because Controls 1 is going out.
The rest of the controls elements here are left as they were since they need to be styled.

Contributes to issue CURA-8686.
 2022-01-20 17:58:11 +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