250 Commits

Author	SHA1	Message	Date
Jaime van Kessel	2de587a8c6	Made some changes so the code also works with lower versions of Qt & pyQt	2018-03-05 15:32:46 +01:00
Lipu Fei	e87077802f	Change to layer_height and layer_height_unit	2018-03-01 15:55:44 +01:00
Lipu Fei	06ec16d627	Rename quality drop down menu models	2018-03-01 15:37:48 +01:00
Lipu Fei	6b0095014a	Fix merge conflicts from master	2018-02-28 12:52:45 +01:00
Lipu Fei	7f5bb70bee	Remove redundant setProperties ... CURA-4916	2018-02-28 12:46:00 +01:00
Aleksei S	e533c4604c	Update infill scroll bar if setting is changed in custom mode ... CURA-4916	2018-02-28 10:52:46 +01:00
Jack Ha	01071da4c1	CURA-4606 corrected slider bar, it now updates correctly from 0 available qualities to 1 available quality	2018-02-27 16:33:37 +01:00
Lipu Fei	495fc8bbd7	WIP: Refactor BuildPlateModel and split MultiBuildPlateModel	2018-02-17 22:24:05 +01:00
Lipu Fei	236bd09d08	WIP: Refactor quality model files	2018-02-17 14:58:56 +01:00
Lipu Fei	1a19175b35	WIP: Fix quality sliderbar	2018-02-17 13:36:25 +01:00
Ghostkeeper	ee9de1f11b	Merge branch '3.2' ... Lots of conflicts due to rounding vs. flooring of text element positions for weirdness with the font aliasing.	2018-02-14 10:53:51 +01:00
Mark	b531c0550d	Change Math.floor to Math.round as a last try to fix garbled fonts ... CURA-4941	2018-02-14 09:28:47 +01:00
Ghostkeeper	03b4213e92	Merge branch '3.2' ... Conflicts in Cura.qml and SaveButton.qml from people fixing positioning rounding at the same time...	2018-02-12 13:10:24 +01:00
Ian Paschal	72788445ab	Added one more floor	2018-02-12 11:49:14 +01:00
Mark	461da709ff	Checked all divisions (again..) and multiplications on rounding errors ... CURA-4941	2018-02-10 12:45:36 +01:00
Mark	b52bf6decf	resolve conflict	2018-02-09 13:01:56 +01:00
Mark	8fca183a5e	Fix rounding errors for garbled text ... CURA-4941	2018-02-09 11:30:56 +01:00
ChrisTerBeke	b2d3d15011	Fix conflicts	2018-01-11 09:06:59 +01:00
Jaime van Kessel	ed9634ebe0	Merge branch 'master' of github.com:Ultimaker/Cura into network_rewrite	2018-01-08 10:56:12 +01:00
Tyler Gibson	203fc37c7c	Merge branch 'master' into malyan_m200 ... # Conflicts: # resources/qml/SidebarSimple.qml Resolving with updated 2 digit truncation	2018-01-07 22:54:56 -08:00
Lipu Fei	8c98ab027a	Fix code style ... CURA-4758	2018-01-05 11:55:18 +01:00
Lipu Fei	223d9b6025	Update QtQuick import versions ... CURA-4758	2018-01-05 11:55:18 +01:00
Lipu Fei	65e8762546	Fix layer height slider update issue ... CURA-4758	2018-01-05 11:55:17 +01:00
Aleksei S	43db2ee2f9	Added ElideRight for the text which is out of boundaries ... CURA-4692	2018-01-03 10:34:23 +01:00
Ghostkeeper	93a3054af0	Round layer heights to 2 decimals ... More difficult than I expected actually... Contributes to issue CURA-4655.	2017-12-28 09:11:41 -08:00
ChrisTerBeke	9702ffb794	Small fixes to sidebar layout after refactoring	2017-12-06 18:09:02 +01:00
ChrisTerBeke	ee643610e5	Fix sidebar loading and unloading depending on active stage	2017-12-06 17:46:18 +01:00
Lipu Fei	fa1d1ee3ad	Fix layer height slider auto switching ... CURA-4617	2017-11-28 14:35:44 +01:00
ChrisTerBeke	657a91c525	Merge pull request #2685 from Ultimaker/container_stack_improvements ... Container stack improvements	2017-11-20 17:42:26 +01:00
Aleksei S	f1db8ed001	Show message (hover slieder) if user selected custom quality profile in recomended mode ... CURA-4466	2017-10-31 11:07:45 +01:00
ChrisTerBeke	ff732720ca	Set quality slider active index to -1 for user created profile, fix for CURA-4466	2017-10-23 12:45:07 +02:00
Diego Prado Gesto	eb0b08a813	CURA-4470 Hide quality slider handle when quality profile doesn't exist	2017-10-22 18:35:05 +02:00
Diego Prado Gesto	d2d28fbdfb	CURA-4470 Fix quality slider not selecting correct quality profile ... Compare selected quality by quality_type instead of id when loading a project file from older versions of Cura.	2017-10-19 20:49:11 +02:00
ChrisTerBeke	30281f17f3	Add simple mode settings flag for user created profile - CURA-4466	2017-10-19 17:03:31 +02:00
ChrisTerBeke	b2dbefc823	Update helper text for custom changes in recommended settings - CURA-4333	2017-10-18 15:44:02 +02:00
Lipu Fei	fae65d7b83	Minor fixes for customized profile in simple mode ... CURA-4333 - Update comments - Disable the quality slider when there is a customized profile	2017-10-16 13:26:28 +02:00
Lipu Fei	9b8dc9bf55	Move simple-mode settings customization check into a separate file ... CURA-4333 Simple-mode is a special mode so it makes more sense to put those code in a separate file instead of in the more generic MachineManager.	2017-10-16 13:18:11 +02:00
Lipu Fei	e1234a09aa	Add the missing parseInt()s back ... CURA-4333	2017-10-16 11:42:13 +02:00
Lipu Fei	94a624e105	Merge branch 'master' into CURA-4333_Notification_icon_for_recommended_mode	2017-10-16 11:37:55 +02:00
A.Sasin	7f5aed7ead	User pyqtProperty instead of puqtSlot ... CURA-4333	2017-10-13 16:34:49 +02:00
A.Sasin	16bd4430e4	Added a pyQtProperty to validate user settings (Might be wrong approach) ... CURA-4333	2017-10-12 21:23:17 +02:00
Ghostkeeper	e4a53da763	Merge branch '3.0' ... Contributes to issue CL-508.	2017-10-12 14:56:30 +02:00
Lipu Fei	39891551e3	Fix custom profile handling for quality slider ... CURA-4333	2017-10-12 12:42:18 +02:00
A.Sasin	a3b8642a4e	Added text.elideRight on SidebarSimple	2017-10-12 11:45:25 +02:00
A.Sasin	a7e0d5147e	Merge branch 'master' of github.com:Ultimaker/cura	2017-10-12 10:40:50 +02:00
Lipu Fei	0383cea816	Fix code style ... CURA-4333	2017-10-12 10:31:13 +02:00
Lipu Fei	b59b245bff	Merge branch 'master' into CURA-4333_Notification_icon_for_recommended_mode	2017-10-12 10:20:35 +02:00
A.Sasin	b318dc7087	Added notification icon in recomended mode. The notification icon is only ... active if one of custom settings is changed CURA-4333	2017-10-12 08:57:26 +02:00
Mark	3a7fbdb173	Changed parseInt to Math.floor	2017-10-11 17:06:13 +02:00
Mark	eaa7b75f0e	Changed parseInt to Math.floor	2017-10-11 16:47:40 +02:00