fieldOfView
97d7354839
Merge branch 'master' into feature_setting_visibility_profiles
2018-03-05 23:09:51 +01:00
Jack Ha
bad637eb14
CURA-4400 fixed merge conflicts
2018-03-05 16:47:40 +01:00
Lipu Fei
93190dde9b
Merge remote-tracking branch 'origin/master' into refactoring_machine_manager
2018-03-02 09:55:14 +01:00
Diego Prado Gesto
ae57e23eec
Create a mouse area around the sidebar to avoid propagating mouse wheel events.
...
Contributes to CURA-4495
2018-03-01 19:48:41 +01:00
Jack Ha
ac76d6ea52
Merge branch 'refactoring_machine_manager' into feature_enable_disable_extruder
2018-03-01 13:14:10 +01:00
Lipu Fei
3e23659c79
Merge remote-tracking branch 'origin/master' into refactoring_machine_manager
2018-02-28 15:29:22 +01:00
Andreea Scorojitu
356e13c225
Merge branch 'master' of https://github.com/Ultimaker/Cura
2018-02-28 13:34:38 +01:00
Andreea Scorojitu
7881dce638
Remove_installed_plug-ins_submenu_CURA-5029
...
The Installed plugins from the Plugins menu is replaced by the browser plugin window.
2018-02-28 13:33:02 +01:00
Jack Ha
86c13e86c7
CURA-4400 first version that disables extruder and updates available quality profiles
2018-02-28 12:56:00 +01:00
Lipu Fei
881fb0c08c
Merge remote-tracking branch 'origin/master' into refactoring_machine_manager
2018-02-22 15:14:31 +01:00
Ian Paschal
fcff00e9da
Remove plugins from preferences since they're now managed via the plugin browser
2018-02-21 14:42:28 +01:00
Lipu Fei
9dce0afaea
WIP: Fix extruder submenu
2018-02-17 14:44:39 +01:00
Lipu Fei
b449f39cc7
WIP: Do not profiles submenu for each Extruder
...
You cannot change quality for an individual Extruder, so it doesn't make sense
to show that for each Extruder.
2018-02-17 14:39:49 +01:00
fieldOfView
a17160f52d
Merge branch 'master' into feature_setting_visibility_profiles
...
# Conflicts:
# resources/qml/Settings/SettingView.qml
2018-02-15 11:54:45 +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
Mark
461da709ff
Checked all divisions (again..) and multiplications on rounding errors
...
CURA-4941
2018-02-10 12:45:36 +01:00
fieldOfView
74fe281e1d
Sync currently selected preset between visibility-page and -menu
2018-02-09 18:54:04 +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
