Commit graph

2271 commits

Author SHA1 Message Date
fieldOfView
29729d2a23 Change renderType for TextInput elements
Unlike Label elements, which are defined to use Text.NativeRendering, TextInput uses Qt text rendering by default. This can lead to differences in font rendering between input fields and other texts.
2017-10-14 11:43:18 +02:00
A.Sasin
7f5aed7ead User pyqtProperty instead of puqtSlot
CURA-4333
2017-10-13 16:34:49 +02:00
Mark
c2515ca7a9 Merge branch '3.0' 2017-10-13 16:21:54 +02:00
Mark
73f6427a88 Change mainwindow name to Ultimaker Cura 2017-10-13 16:21:23 +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
Jaime van Kessel
a7e1017aa2 Added some missing widths en heights
GammaRay complained about some objects not having a size
2017-10-12 19:14:22 +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
8d20f62dc9 Changed back to previous commit 2017-10-12 11:57:02 +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
a6a58c8c84 Merge branch '3.0' of github.com:Ultimaker/cura into 3.0 2017-10-12 09:22:52 +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
Lipu Fei
052ea7d90a Force use and update the job name with the loaded project file
CURA-4348

- If no project is loaded beforehand and then a model file is loaded,
  the job name should be determined with the current machine name and
  the first loaded model name.
- If a project is loaded, the job name should be the same as the project
  name, and it should not change until another project is loaded.
2017-10-12 07:59:43 +02:00
Jaime van Kessel
799d1a5b0c Updated setting items & sidebar to qtQuick controls 2.0 2017-10-11 21:02:27 +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
Mark
00205996da Change Text to Label and cast all sizes to int
CURA-4437
2017-10-11 14:53:46 +02:00
ChrisTerBeke
3db5787d5d Code cleanup for infill slider value binding - CURA-4438 2017-10-11 14:41:13 +02:00
Lipu Fei
bb476752a4 Fix infill density binding in Recommended mode
CURA-4438

Infill density in Recommended mode should be bound to the correct stack
when the infill extruder is/is not set to a specific extruder.
2017-10-11 14:05:56 +02:00
ChrisTerBeke
23d0201f6b Merge branch 'fix_garbled_fonts_part_2' 2017-10-11 13:41:33 +02:00
Lipu Fei
4927a639cd Always update the job name with the loaded project
CURA-4348
2017-10-11 12:49:22 +02:00
Mark
d4a8dbdee7 Change Text to Label and cast all sizes to int
CURA-4437
2017-10-11 12:48:42 +02:00
ChrisTerBeke
30c9ccfb7f Merge branch '3.0' 2017-10-10 16:31:29 +02:00
A.Sasin
5b52ad441b Merge branch '3.0' of github.com:Ultimaker/cura into 3.0 2017-10-10 15:51:19 +02:00
ChrisTerBeke
fc1282773a Merge branch 'thopiekar-remove-cura-under-cura-logo' 2017-10-10 15:43:21 +02:00
Lipu Fei
c7ccc3c1b8 Fix long text display in mode toggle buttons
CURA-4341
2017-10-10 14:47:13 +02:00
Lipu Fei
444204f6a1 Fix "Print Speed" text width for some translations
CURA-4341
2017-10-10 14:35:07 +02:00
Lipu Fei
0e45ec1197 Fix auto-adjust for "Print Setup" text
CURA-4341
2017-10-10 14:26:55 +02:00
A.Sasin
19e9336214 Revert "Adjust column width for Materials "Print Settings" page"
This reverts commit 7b6faf0030.
2017-10-10 09:43:43 +02:00
ChrisTerBeke
641b3c21f7 fix merge conflicts 2017-10-10 09:21:31 +02:00
Lipu Fei
7b6faf0030 Adjust column width for Materials "Print Settings" page
CURA-4428
2017-10-10 08:03:08 +02:00
Ghostkeeper
7e00914e38
Merge branch '3.0' 2017-10-06 10:00:19 +02:00
ChrisTerBeke
ed551cdc2b Merge branch 'gradual_infill' into 3.0 2017-10-05 18:09:17 +02:00
ChrisTerBeke
874b08eb07 Fixes for infill slider gradual reset - CURA-4397 2017-10-05 18:08:52 +02:00
Lipu Fei
185c350a19 Merge remote-tracking branch 'upstream/3.0' 2017-10-05 15:49:18 +02:00
Diego Prado Gesto
17183316db Gradual infill stepping 1 by 1 and remembering previous value - CURA-4397 2017-10-05 15:22:39 +02:00
Lipu Fei
5e970fa5a5 Use more descriptive function name
CURA-4411
2017-10-05 15:08:08 +02:00
ChrisTerBeke
9ef1caff50 Fix view combobox not updating when using view menu item, code cleanup, CURA-4411 2017-10-05 15:01:19 +02:00
Ghostkeeper
d458fcde5c
Revert "Revert "Merge branch 'fix_garbled_fonts_macos' into 3.0""
This reverts commit e07e7bc9e7.

Contributes to issue CURA-4414.
2017-10-05 10:58:49 +02:00
ChrisTerBeke
a8476c30ca
CURA-4414 replace all Text elements for Label, make sure no half pixel anchors exist 2017-10-05 10:58:07 +02:00
Mark
e9a8ae15f3
Move text back to label and remove unused font 2017-10-05 10:57:43 +02:00
Ghostkeeper
e07e7bc9e7
Revert "Merge branch 'fix_garbled_fonts_macos' into 3.0"
This reverts commit b62c19206f, reversing
changes made to 104926c6ed.

Contributes to issue CURA-4414.
2017-10-05 10:28:54 +02:00
Diego Prado Gesto
30be02be14 Keep custom infill density value when disabling gradual infill - CURA-4397 2017-10-05 09:08:52 +02:00
ChrisTerBeke
b62c19206f Merge branch 'fix_garbled_fonts_macos' into 3.0 2017-10-04 14:09:59 +02:00
ChrisTerBeke
3f1ec174ba CURA-4414 replace all Text elements for Label, make sure no half pixel anchors exist 2017-10-04 13:34:24 +02:00
ChrisTerBeke
b0fa87231c CURA-4390 add new menu item for plugins 2017-10-03 17:33:24 +02:00
Mark
dcb630a24e Move text back to label and remove unused font 2017-10-03 14:02:07 +02:00