GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-03 01:04:35 +08:00
Code Issues Packages Projects Releases Wiki Activity
20,907 Commits 289 Branches 260 Tags
Commit Graph

392 Commits

Author SHA1 Message Date
Ghostkeeper
1f7c653368
Capitalise the S 
We need to seize this opportunity and capitalise on that sort of market opportunity.
 2019-09-19 10:47:16 +02:00
Jaime van Kessel
867a881de9 Ensure bool and enum settings get control highlighted on hover 2019-08-27 13:38:55 +02:00
Lipu Fei
960a20652a Add warning state for prime blob and CheckBox 
CURA-6414
 2019-06-06 12:30:27 +02:00
Jaime van Kessel
499e02579e Fix hiding settings that were not visible by default 
CURA-6556
 2019-06-05 16:36:30 +02:00
Remco Burema
7aa17da536
Merge pull request #5791 from Ultimaker/CURA-6490_fix_ppa_attempt2 
CURA-6490 Fix settings attempt 2
 2019-06-05 13:07:47 +02:00
Remco Burema
fc908cdf9b Revert "Settings-GUI: Max decimal places to 4 (from 3)." 
This reverts commit 020bedcfeea844a3a785fc12d5a590cef4b8e0a8.
 2019-05-28 11:33:17 +02:00
Remco Burema
020bedcfee Settings-GUI: Max decimal places to 4 (from 3). 2019-05-28 11:07:18 +02:00
Lipu Fei
f9af9754c8 Make reset button and revert stack levels configurable 
CURA-6490
 2019-05-28 10:33:26 +02:00
Lipu Fei
a14eb50fec Handle the case that resolve is undefined 
CURA-6490
 2019-05-28 10:33:26 +02:00
Ghostkeeper
19cc267726
Merge branch '4.1' 2019-05-20 13:42:38 +02:00
Jaime van Kessel
f5e31060a6 Fixed unknown reference in qml 2019-05-16 16:44:29 +02:00
Jaime van Kessel
ff0a18603b Remove a few more usages of deprecated functions 2019-05-16 15:20:38 +02:00
Jaime van Kessel
a0c705e900 Remove usage of some deprecated functions 2019-05-16 14:49:53 +02:00
Ghostkeeper
350dd5db3c
Correct positioning of tooltip for g-code text area 2019-05-10 11:32:40 +02:00
Lipu Fei
2054413952 Add handling for ValidatorState.Invalid 
CURA-6497

ValidatorState.Invalid is set if a string setting has allow_empty =
False and its value is empty.
 2019-05-09 12:07:16 +02:00
Ghostkeeper
bd1712cb10
Spelling fix: Overriden -> Overridden 
I think some of us got the spelling of this word wrong in their heads.
 2019-04-04 14:39:01 +02:00
Lipu Fei
9575c6b3b3 Fix merge conflicts 2019-04-01 13:28:42 +02:00
Jaime van Kessel
64523c7baf Add some extra info to the tooltip if a setting is not used due to the value of it's children 
The behavior might make sense to us, but that's probably because we know what the behavior is. The
extra info in the tooltip should make it easier to understand

Fixes #5525
 2019-04-01 10:41:35 +02:00
Lipu Fei
3911c3d73d WIP: Cleanup and unify MachineAction styles 2019-03-19 15:40:44 +01:00
Lipu Fei
752a48cacd WIP: Refactor and create reusable CuraComboBox 2019-03-14 13:44:15 +01:00
Jaime van Kessel
dee739db8b Merge branch '4.0' of github.com:Ultimaker/Cura 2019-02-21 20:19:30 +01:00
Jaime van Kessel
8409d7d645 Remove another unneeded catalog 2019-02-21 18:42:06 +01:00
Jaime van Kessel
1b36a8e12c Fix some more bindings for SettingItem 2019-02-21 16:17:25 +01:00
Jaime van Kessel
c2d783bf7a Removed unused plugins model 2019-02-21 15:05:40 +01:00
Jaime van Kessel
b07086dee4 Remove catalog creation from setting item 
This pretty much doubles the speed by which setting items are created.
 2019-02-21 14:49:25 +01:00
Ghostkeeper
73524deb8d
Add settingKey property for Squish to find things easier 2019-02-15 11:52:16 +01:00
Ghostkeeper
9a0a084339
Code style 2019-01-23 11:11:40 +01:00
Diego Prado Gesto
ef2fb53790 Merge branch '4.0' into unify_font_types 2018-12-19 11:56:22 +01:00
Jaime van Kessel
d395c38436 Removed collapse / expand all 
I don't think it ever worked.
 2018-12-17 17:47:33 +01:00
Ghostkeeper
78a5f95c43
Merge branch 'CURA-5876_fixes' into 4.0 2018-12-14 16:28:04 +01:00
Lipu Fei
8021c8e449 Fix errors in SettingOptionalExtruder.qml 
CURA-6015
 2018-12-13 14:12:51 +01:00
Lipu Fei
620790ae3d Reduce the creations of ExtrudersModels 
CURA-6015
 2018-12-13 14:12:23 +01:00
Diego Prado Gesto
77ede1ae6b Unify the fonts to only have 8 instead of 13. 
Contributes to CURA-6025.
 2018-12-12 17:50:21 +01:00
Diego Prado Gesto
f99c788eb6 Change some colors for the arrows in some setting selectors 
Contributes to CURA-5876.
 2018-12-11 16:35:59 +01:00
Diego Prado Gesto
12522c9293 Change hover colors of the small buttons. 
Contributes to CURA-5941
 2018-12-10 11:19:44 +01:00
Diego Prado Gesto
8cfb9350bc Add a mouse area to gather the scroll events in the settings panel 
Contributes to CURA-5941.
 2018-12-10 10:36:55 +01:00
Diego Prado Gesto
07d58c3aef Merge branch 'ui_rework_4_0' into CURA-5941_restyle_setting_dropdown 2018-12-05 13:56:21 +01:00
Ghostkeeper
4d87c46423
Remove sourceSize.width: width from all RecolorImages 
It is now the default in Uranium.

Contributes to issue CURA-5876.
 2018-12-04 15:04:51 +01:00
Diego Prado Gesto
004405e5f9 Change the colors to match the designs. 
Contributes to CURA-5941.
 2018-12-03 17:25:07 +01:00
Diego Prado Gesto
15415dc3b9 Fix position of the tooltips for the settings 
Contributes to CURA-5941
 2018-12-03 16:53:52 +01:00
Diego Prado Gesto
d3b5b2717d Add rounded corners to the settings 
Contributes to CURA-5941
 2018-12-03 15:56:21 +01:00
Diego Prado Gesto
4e9c595bdd Restyle the settings list 
Be sure that the alignments and the margins are corrects according to the designs.

Contributes to CURA-5941.
 2018-12-03 15:34:33 +01:00
Diego Prado Gesto
ce6a0676dd Add a rectangle surrounding the settings listview 
Contributes to CURA-5941.
 2018-12-03 14:43:35 +01:00
Diego Prado Gesto
4c468831f0 Add tabs for select the extruder in the custom print setup. 
Align some elements beneath the tabs.

Contributes to CURA-5941.
 2018-12-03 13:58:13 +01:00
Ghostkeeper
7df4c01814
Merge branch 'ui_rework_4_0' into CURA-5876-Configuration_dropdown 
Conflicts:
	cura/Settings/MachineManager.py -> rowCount vs. count
	resources/qml/ExtruderIcon.qml -> Someone changed stuff that I had overwritten.
	resources/qml/Menus/ConfigurationMenu/PrintCoreConfiguration.qml -> Someone changed stuff that I had removed.
	resources/qml/Toolbar.qml -> Git was wrong, not a conflict.
	resources/themes/cura-light/theme.json -> Git was wrong, not a conflict.
 2018-12-03 11:45:05 +01:00
Ghostkeeper
f3af5a72ad
Use ListModel.count instead of rowCount 
The .count property properly updates when the model is changed.

Contributes to issue CURA-5876.
 2018-12-03 11:13:26 +01:00
Aleksei S
d5cc55409f Merge branch 'CURA-5941_restyle_setting_dropdown' of github.com:Ultimaker/cura into CURA-5941_restyle_setting_dropdown 2018-12-03 09:57:20 +01:00
Diego Prado Gesto
7dc3320b06 Remove all the signal propagation for the tooltip and allow only Cura.qml to handle them 
Contributes to CURA-5941.
 2018-12-02 20:32:55 +01:00
Aleksei S
29b7f42e0e Chaged settings visibility icon 
CURA-5941
 2018-11-30 18:33:53 +01:00
Aleksei S
73568d7473 Added icon to the search field which filters settings 
CURA-5941
 2018-11-30 14:51:55 +01:00