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
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
Diego Prado Gesto
da4c98b204
Merge branch 'master' into feature_multiple_BP
2018-01-16 09:59:21 +01:00
Diego Prado Gesto
2613b4d1a3
CURA-4461 Add menu item for build plates
2018-01-09 16:08:30 +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
Jaime van Kessel
4cb7bc03ad
Sidebar tooltips are now visible again
...
CL-541
2018-01-04 10:30:03 +01:00
Jack Ha
bfa33c721c
CURA-4525 solved merge conflicts
2018-01-03 13:52:55 +01:00
Jack Ha
cb1484ee63
CURA-4525 update size and margins of objects list
2018-01-03 12:52:32 +01:00
Ruben D
689a18ee57
Rename sidebar_collapsed and code style
...
sidebar_collapsed is more consistent with other options and setting names we use. Better change it before the next release rolls out otherwise we'd have to do a version upgrade.
Also changed some code style things to be in line with our guidelines.
Contributes to issue CURA-4234.
2017-12-30 19:35:46 +01:00
ChrisTerBeke
b29047abd3
Small fixes for disable user data triggering preferences window
2017-12-22 11:38:56 +01:00
Aleksei S
447c6e7e23
Added Disable link style
...
CURA-4630
2017-12-21 16:25:13 +01:00
Jack Ha
a47107448e
Moved objects menu to lower left and made it collapsible. CURA-4525
2017-12-21 11:39:37 +01:00
Jack Ha
5152b2ae65
Solved merge conflicts. CURA-4525
2017-12-21 10:52:51 +01:00
Jack Ha
4519f9b46a
CURA-4234 rename to cura/sidebar_collapse, fix spelling errors, styling
2017-12-13 14:04:02 +01:00
Aleksei S
3516d01f3d
Move back machine selection
...
CURA-4234
2017-12-12 15:30:19 +01:00
Aleksei S
6968c089db
Add sidebar_collapse to the saved preferences, typos, move back machine selection to the top bar
...
CURA-4234
2017-12-12 11:26:17 +01:00
Aleksei S
00529f37d9
After sidebar expanding the builplate stays in center of the screen
...
CURA-4234
2017-12-11 18:51:53 +01:00
Aleksei S
a5cb4cd316
Expand/Collapse sidebar
...
CURA-4234
2017-12-11 10:53:48 +01:00
ChrisTerBeke
2986a17c1d
Fix for showing printer connect button on component load, use newer CuraApplication as target
2017-12-08 16:02:22 +01:00
ChrisTerBeke
c6e72abfbe
Add switch to monitor support for legacy plugin that emit signal to switch
2017-12-07 12:00:07 +01:00
ChrisTerBeke
acbef72b68
Cleanup
2017-12-07 11:52:15 +01:00
ChrisTerBeke
f91a4db617
Set stage icon for monitor depending on output device state, prevent crash when accessing back-end from unloaded component
2017-12-07 10:38:06 +01:00
ChrisTerBeke
f6b570e299
Back to QUrl, fix monitor view overlay
2017-12-07 09:13:46 +01:00
ChrisTerBeke
ee643610e5
Fix sidebar loading and unloading depending on active stage
2017-12-06 17:46:18 +01:00
ChrisTerBeke
2d044a37ae
Sidebar and main view via loader
2017-12-06 13:33:05 +01:00
ChrisTerBeke
a57a5aab6b
Make sidebar view working for active stage
2017-12-06 12:23:41 +01:00
ChrisTerBeke
030dc74f3f
Fix now showing any sidebar when in monitor mode
2017-12-05 12:19:00 +01:00
ChrisTerBeke
e33288b7c8
Move sidebar target for plugins to only middle section
2017-12-05 10:56:59 +01:00
ChrisTerBeke
5673a834bc
Fix showing default sidebar, cleanup needed
2017-12-04 19:48:42 +01:00
ChrisTerBeke
caf56587fe
Implement switching sidebar views
2017-12-04 19:37:03 +01:00
ChrisTerBeke
3c863fc388
Get default settings view to work as sidebar component
2017-12-04 16:28:35 +01:00
Ghostkeeper
c0e7446f2a
Correct label of Save Project menu item
...
Capital P. Ellipses to indicate that a modal window is coming. Ampersand to enable the hotkey.
2017-12-01 10:44:56 +01:00
ChrisTerBeke
ce88b9ee67
Merge pull request #2692 from Ultimaker/reload_qml
...
Added reload qml action
2017-11-28 15:50:47 +01:00
Jack Ha
e2a663992c
CURA-4525 Added an option to turn on the UI elements of multi build plate
2017-11-15 17:00:19 +01:00
Jack Ha
bd8aa8d989
CURA-4525 automatic build plate menu items using BuildPlateModel
2017-11-14 14:27:46 +01:00
Jack Ha
e21acd1a07
CURA-4525 first multi slice + multi layer data, added filter on build plate, added option arrange on load, visuals like convex hull are now correct
2017-11-09 17:03:20 +01:00
Jack Ha
5050124699
CURA-4525 wip objects menu
2017-11-06 14:03:39 +01:00
ChrisTerBeke
e2c62a4609
Revert "Remove unnecessary properties which after update triggered view rendering"
...
This reverts commit ee228155af
2017-11-01 15:50:23 +01:00
Diego Prado Gesto
7f76749e2c
Merge branch 'CURA-4062_layerview_laggy'
2017-11-01 13:37:44 +01:00
Chris ter Beke
9806ec7374
Resolve merge conflicts with master - CURA-4482
2017-10-31 09:22:03 +01:00
ChrisTerBeke
d718e6e36c
Create extruder stack for single extruder machines on start - CURA-4482
2017-10-31 09:08:20 +01:00
Aleksei S
22aaf64b63
Simplified version for validation need to show user agreement
...
CURA-4501
2017-10-30 14:42:46 +01:00
Lipu Fei
c0f1af94ab
Show Add Machine dialog after User Agreement dialog is closed
...
CURA-4501
2017-10-30 10:33:50 +01:00
Jaime van Kessel
fbdc9ed223
Added reload qml action
2017-10-27 16:35:09 +02:00
Aleksei S
ee228155af
Remove unnecessary properties which after update triggered view rendering
...
CURA-4062
2017-10-27 09:24:31 +02:00
Lipu Fei
946b8ae92d
Remove executable bit for non-executable files
2017-10-19 10:28:57 +02:00
