Jack Ha bfabf8d11a Merge, fix qml files. Contributes to CURA-2007. ...

Merge branch 'feature_quality_changes' into cura-2007

Conflicts:
	resources/qml/Settings/SettingItem.qml
	resources/qml/Settings/SettingView.qml

2016-08-04 18:22:36 +02:00

..

Menus

Show quality_changes instance containers for custom containers in the profile menu

2016-08-04 17:35:33 +02:00

Preferences

Tweak general preference page spacing

2016-08-03 22:14:39 +02:00

Settings

Merge, fix qml files. Contributes to CURA-2007.

2016-08-04 18:22:36 +02:00

AboutDialog.qml

Add width, height in addition to minimumWidth, minumumHeight to fix retina issue on OSX

2016-04-12 10:23:43 +02:00

Actions.qml

Call the new clearUserContainers/updateQualityChanges from the relevant actions

2016-08-04 02:13:24 +02:00

AddMachineDialog.qml

Move sorting of DefinitionContainerModel out of qml

2016-08-01 19:18:56 +02:00

Cura.qml

Use ContainerManager::createQualityChanges when creating a quality from current settings

2016-08-04 17:38:19 +02:00

EngineLog.qml

Code style & switch to translation catalog

2015-08-27 16:04:02 +02:00

JobSpecs.qml

Show weights as well as lengths

2016-07-22 13:44:45 +02:00

MachineAction.qml

Allow machine actions to reference the dialog they are shown in

2016-08-01 15:21:12 +02:00

MonitorButton.qml

Add "offline" styling to sidebar/monitor

2016-07-28 18:14:38 +02:00

PrintMonitor.qml

Remove (non-functional) layer number from print monitor

2016-07-25 17:39:43 +02:00

SaveButton.qml

Add a reusable mechanism for plugins to add controls to designated areas in the GUI

2016-07-26 11:58:25 +02:00

Sidebar.qml

Add "offline" styling to sidebar/monitor

2016-07-28 18:14:38 +02:00

SidebarAdvanced.qml

Code cleanup

2016-07-25 14:58:12 +02:00

SidebarContents.qml

Sidebar stuff is now properly done in a loader (and in seperate files)

2016-07-07 17:02:29 +02:00

SidebarHeader.qml

Remove global tab

2016-07-21 15:35:20 +02:00

SidebarSimple.qml

Remove stray debug code

2016-07-21 15:12:26 +02:00

SidebarTooltip.qml

Improve positioning of tooltips in advanced mode

2016-05-11 17:19:31 +02:00

Toolbar.qml

Instantiate models instead of using the Models object

2016-05-11 17:19:31 +02:00