ChrisTerBeke
ae6b1a9f15
CURA-4182 better variable names
2017-09-22 11:14:13 +02:00
ChrisTerBeke
7f909df84a
CURA-4182 refactor quality slider to use model for updating
2017-09-22 11:04:46 +02:00
Aleksei Sasin
879b3df816
On Windows platform the qualitys slider is properly aligned CURA-4182
2017-09-21 21:20:54 +02:00
ChrisTerBeke
ecafa24888
code cleanup
2017-09-21 17:35:12 +02:00
ChrisTerBeke
a74a6a59fc
CURA-4182 fix merge conflicts with 3.0 branch
2017-09-21 15:33:00 +02:00
alekseisasin
bd6bb872b7
Changed Quality slider
...
CURA-4182
2017-09-21 15:24:40 +02:00
Jaime van Kessel
c6e589e7d9
Merge branch '3.0' of github.com:Ultimaker/Cura into 3.0
2017-09-21 15:19:35 +02:00
Jaime van Kessel
78987ba666
When tool icon can not be found in theme, try to find it in the plugin folder
...
CURA-4345
2017-09-21 15:19:00 +02:00
ChrisTerBeke
cdc1b9ba66
CURA-4303 infill slider icon color, border, alignment
2017-09-21 14:28:22 +02:00
Jaime van Kessel
3cdf3f6097
Merge branch '3.0' of github.com:Ultimaker/Cura
2017-09-20 10:43:06 +02:00
Jaime van Kessel
5d4b23e72a
Merge branch 'feature_home_camera' of https://github.com/fieldOfView/Cura
2017-09-19 16:47:40 +02:00
Ghostkeeper
8a1b5d3cda
Update translation templates again
...
Last minute changes...
Contributes to issue CURA-4341.
2017-09-19 13:36:56 +02:00
Ghostkeeper
d47bc710bf
Last minute string changes
...
Some new message that still needed to be in...
Contributes to issue CURA-4341.
2017-09-19 13:36:56 +02:00
Ghostkeeper
19222a3221
Update translation templates for 3.0
...
These are the files that should be translated by our translators for the 3.0 release.
Contributes to issue CURA-4341.
2017-09-19 13:36:56 +02:00
Ghostkeeper
f231c73072
Add translation texts for future features
...
These texts are meant to be included in the final release, but the features aren't ready yet.
Contributes to issue CURA-4341.
2017-09-19 13:36:56 +02:00
Ghostkeeper
b94bcdfa91
Remove duplicate entry
...
This happens because the last bits are obtained separately from plug-in JSON files that are manually tacked on the end by a script. The script doesn't check for duplicates.
Contributes to issue CURA-4341.
2017-09-19 13:36:56 +02:00
Ghostkeeper
8cfe65787f
Update translation templates for 3.0 release
...
These are generated by calling 'make extract-messages' and then modifying the headers a bit.
Contributes to issue CURA-4341.
2017-09-19 13:36:50 +02:00
Mark
03a159e423
Add some margin for the helper boxes, not perfect yet
...
CURA-4303
2017-09-19 11:36:05 +02:00
Mark
db072eae8e
Add some margin for the helper boxes, not perfect yet
...
CURA-4303
2017-09-19 10:11:41 +02:00
ChrisTerBeke
3be1b8ddf9
CURA-4303 fixes after comments on 1st commit
2017-09-18 17:39:14 +02:00
ChrisTerBeke
18dd63a710
Merge branch 'master' of https://github.com/Ultimaker/Cura
2017-09-18 15:16:19 +02:00
ChrisTerBeke
9553235b42
CURA-4303 finish infill slider, images, gradual checkbox, bindings
2017-09-18 15:15:59 +02:00
Jaime van Kessel
ec57176864
Merge pull request #2441 from pieterbos/master
...
Improve Prusa i3 MK2 start GCode
2017-09-18 14:51:42 +02:00
alekseisasin
245796eb08
Merge pull request #2398 from Ghostkeeper/feature_ironing_only_highest_layer
...
Add setting to only iron the highest layer of a mesh
2017-09-18 14:28:24 +02:00
Ghostkeeper
6c2bd10a20
Remove redundant feedrate override
...
The default in ultimaker.def.json is also 45, so this is not necessary.
2017-09-18 11:18:50 +02:00
ChrisTerBeke
e8df185261
Merge branch 'master' into WIP_feature_infill_slider
2017-09-18 11:02:30 +02:00
ChrisTerBeke
86e5a1ed97
CURA-4182 tweak slider height to fix text cut off
2017-09-18 09:39:08 +02:00
Pieter Bos
ff17b7c417
Improve Prusa MK2 start GCode
2017-09-17 00:04:50 +02:00
fieldOfView
3f903d2c76
Add menu item to reset the camera
2017-09-16 10:05:45 +02:00
Mark
2502038f76
Revert "CURA-4321 make sidebar a tad smaller"
...
This reverts commit 4aa8d38bd3f7b6582d6fac72d29d71e6a88aa8c6.
2017-09-15 16:51:38 +02:00
Mark
74c24652e9
Revert "Tweak sidbar size so text is not cut off"
...
This reverts commit b39fece86a3919aff0872137ad0b8315e6f42ac5.
2017-09-15 16:50:48 +02:00
Mark
1f3fa49ceb
Merge branch 'master' of github.com:Ultimaker/Cura
2017-09-15 16:48:58 +02:00
Mark
854c915502
Tweaked margins and cleanup
...
CURA-4182
2017-09-15 16:48:49 +02:00
alekseisasin
a82fc6f361
Merge branch 'master' of github.com:Ultimaker/cura
2017-09-15 16:39:19 +02:00
alekseisasin
37869a8b14
Removed unused code. Shifted the last print quality number a bit to the left
...
CURA-4182
2017-09-15 16:36:00 +02:00
Mark
b39fece86a
Tweak sidbar size so text is not cut off
...
CURA-4321
2017-09-15 15:53:20 +02:00
alekseisasin
cdde6da792
Merge branch 'master' of github.com:Ultimaker/cura
2017-09-15 13:28:29 +02:00
alekseisasin
83e5c5c053
Removed unused tags from cura-light theme.json
...
CURA-4321
2017-09-15 13:27:09 +02:00
Diego Prado Gesto
0e1b9d8c5d
Changed the way in which print times are shown in Sidebar - CURA-4232
2017-09-15 10:46:01 +02:00
alekseisasin
aa0ade2e74
Merge branch 'master' of github.com:Ultimaker/cura
2017-09-14 18:05:28 +02:00
alekseisasin
98ab571483
Removed 14bitVoid code accord to a new LGPL license
...
CURA-4232
2017-09-14 18:03:31 +02:00
ChrisTerBeke
a4ebedee83
CURA-4321 make print button blue when available, slight color changes on hover and pressed
2017-09-14 17:40:44 +02:00
Lipu Fei
3188156da3
WIP: infill slider
...
CURA-4303
2017-09-14 17:19:43 +02:00
ChrisTerBeke
4aa8d38bd3
CURA-4321 make sidebar a tad smaller
2017-09-14 17:06:26 +02:00
ChrisTerBeke
05170155e8
CURA-4318 small fixes for dark design
2017-09-14 16:49:09 +02:00
ChrisTerBeke
fb4b797335
fix duplicate dark theme entries
2017-09-14 16:43:42 +02:00
ChrisTerBeke
4839c922a6
Merge branch 'master' of https://github.com/Ultimaker/Cura
2017-09-14 16:09:38 +02:00
Lipu Fei
1e5b032cff
Make canvas use a one-time Timer to update
...
CURA-4182
The canvas approach has a drawback on the UI update: when a printcore
or a material is changed, calling requestPaint() to the canvas doesn't
trigger an immediate update. The solution is to have a built-in Timer in
the Canvas and to use that to update. Somehow this just works. The
problem with this approach is that the Timer constantly updates the
canvas which eats a lot of CPU power. To solve this, I changed the timer
to be a one-time timer and it will be started when there is a
material/print core update.
2017-09-14 15:59:12 +02:00
Lipu Fei
241a7a4fb2
Make the robot bigger
...
CURA-4215
2017-09-14 14:56:45 +02:00
ChrisTerBeke
a37c2a5d74
Merge branch 'master' of https://github.com/Ultimaker/Cura
2017-09-14 14:55:06 +02:00
