 Mark
|
b52bf6decf
resolve conflict
|
6 years ago |
|
Mark
|
8fca183a5e
Fix rounding errors for garbled text
|
6 years ago |
|
Jaime van Kessel
|
ed9634ebe0
Merge branch 'master' of github.com:Ultimaker/Cura into network_rewrite
|
6 years ago |
|
Lipu Fei
|
84adbc5f41
Use the 5.8 versions of QtQuick modules in QMLs
|
6 years ago |
|
ChrisTerBeke
|
27ca743e58
Merge branch 'master' into qtquick-controls-2.0
|
6 years ago |
|
Ghostkeeper
|
ac8f3a31be
Include period in translation source text
|
7 years ago |
|
Diego Prado Gesto
|
4a211c6ac6
CURA-4495 Change property name and add default values
|
7 years ago |
|
Diego Prado Gesto
|
c3ce3724e5
Fix small issue when resetHandler is not defined
|
7 years ago |
|
ChrisTerBeke
|
79028388a2
Add option for custom reset handler in setting item
|
7 years ago |
|
ChrisTerBeke
|
d718e6e36c
Create extruder stack for single extruder machines on start - CURA-4482
|
7 years ago |
|
Jaime van Kessel
|
799d1a5b0c
Updated setting items & sidebar to qtQuick controls 2.0
|
7 years ago |
|
Mark
|
9a193ad5c5
Changing AGPLv3 to LGPLv3
|
7 years ago |
|
Lipu Fei
|
0781848af5
Reduce margin size for settings in recommended and custom mode
|
7 years ago |
|
Lipu Fei
|
0eb63637d4
Merge branch 'master' into feature_dark_colours_icons
|
7 years ago |
|
Lipu Fei
|
f85a76b4bd
Fix per-object settings qml
|
7 years ago |
|
Ghostkeeper
|
11f8204644
Change margins in the side bar
|
7 years ago |
|
fieldOfView
|
0f9cfa0304
Fix tab order after expanding categories or using search
|
7 years ago |
|
fieldOfView
|
edee53b0b1
Scroll setting with active focus into view
|
7 years ago |
|
Lipu Fei
|
64ae8bb595
Use global stack to evaluate limit_to_extruder value
|
7 years ago |
|
fieldOfView
|
4a3329bc6c
Remove background from setting buttons (revert, override notice, linked)
|
7 years ago |
|
Jack Ha
|
a9a9390aa6
Solved (with an ugly fix) that after loading some projects, 'Slicing...' appears without doing anything. CURA-1263
|
8 years ago |
|
Jaime van Kessel
|
9a81a24512
Merge branch 'feature_find_settings' of https://github.com/fieldOfView/Cura
|
8 years ago |
|
Jaime van Kessel
|
716ffe94ff
Don't show inheritance icon for resovled values
|
8 years ago |
|
Jaime van Kessel
|
75e067cab7
No longer select last_entry that isn't in the list
|
8 years ago |
|
Jaime van Kessel
|
9057174691
Resolve is now updated from the base property
|
8 years ago |
|
fieldOfView
|
7fafcef40b
Allow making settings visible from the sidebar
|
8 years ago |
|
Jaime van Kessel
|
4a5d7cbc73
Bindings of inheritance icon now correctly update when switching between machines
|
8 years ago |
|
Arjen Hiemstra
|
b0d6d7034a
Ensure we re-evaluate the inheritance icon binding when it changes
|
8 years ago |
|
Arjen Hiemstra
|
bef3666a88
Still show the inherit button even when the revert is visible
|
8 years ago |
|
Arjen Hiemstra
|
8ce81fec9f
Expand logic for showing the inherit button in SettingItem
|
8 years ago |
|
Ghostkeeper
|
6f412c0825
Improve translation context for some labels
|
8 years ago |
|
Jaime van Kessel
|
faf98e40f8
Inherit button now correctly removes values if needed for multi extrusion machines
|
8 years ago |
|
Jaime van Kessel
|
132ed1d258
Pressing inheritance button for category now makes all inherited children visible
|
8 years ago |
|
Jaime van Kessel
|
e3d78c17ea
SettingItem now uses settingInheritanceManager for visibility check
|
8 years ago |
|
Tim Kuipers
|
479f9ea6d2
refactor: global_inherits_stack ==> limit_to_extruder (CURA-2308)
|
8 years ago |
|
Simon Edwards
|
8086646de1
When reverting a user setting be sure to delete it from all of the stacks, global and extruder.
|
8 years ago |
|
fieldOfView
|
be6bfdd4af
Add a "linked" icon to settings that have "global_inherits_stack" set
|
8 years ago |
|
Jaime van Kessel
|
9d6c60ec60
Setting state is now set to calculated after setting the value
|
8 years ago |
|
Jack Ha
|
0268bf3f56
Cleanup. CURA-2007
|
8 years ago |
|
Jack Ha
|
97f9bcacf1
Tooltip for bed temperature displays values where it resolves from. CURA-2007
|
8 years ago |
|
Jack Ha
|
c0dd19ce08
Seems to work, except for the tooltip (shows global value). CURA-2007
|
8 years ago |
|
Jack Ha
|
bfabf8d11a
Merge, fix qml files. Contributes to CURA-2007.
|
8 years ago |
|
Arjen Hiemstra
|
7613274686
Properly hide link icon if setting is not settable per extruder
|
8 years ago |
|
Jack Ha
|
2402ba3d0e
Bed temperature is now either a resolved value or a global value.
|
8 years ago |
|
fieldOfView
|
ed1d12d21d
Hide linked settings icon for single extrusion printers
|
8 years ago |
|
fieldOfView
|
ac0de58ecb
Merge branch 'master' of https://github.com/Ultimaker/Cura
|
8 years ago |
|
fieldOfView
|
374ec8e577
Don't show user/quality emphasis on Per Object Settings
|
8 years ago |
|
fieldOfView
|
7302baa7da
Add icon to settings that can only be set globally (for all extruders)
|
8 years ago |
|
Jaime van Kessel
|
3e4ff9241e
Moved the BlurSettings signal to cura main window
|
8 years ago |
|
Jaime van Kessel
|
c92b2bc385
Changed order of setting properties
|
8 years ago |
