Cura/resources/qml
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
..
Menus Merge branch '3.2' 2018-01-31 09:13:29 +01:00
Preferences Merge branch '3.2' 2018-02-12 13:10:24 +01:00
PrinterOutput Fixed connection label state 2018-01-08 13:44:20 +01:00
Settings Merge branch '3.2' 2018-02-12 13:10:24 +01:00
AboutDialog.qml Updated Noto Sans in Cura About info 2018-02-08 17:24:41 +01:00
Actions.qml CURA-4525 solved merge conflict 2018-01-04 10:24:30 +01:00
AddMachineDialog.qml If there is no added printer, disallow closing the window 2017-12-29 14:32:43 +01:00
AskOpenAsProjectOrModelsDialog.qml Hitting enter on project loading dialog now loads the project instead of just closing the dialog - CURA-4735 2018-01-19 11:32:55 +01:00
Cura.qml Merge branch '3.2' 2018-02-12 13:10:24 +01:00
DiscardOrKeepProfileChangesDialog.qml Changing AGPLv3 to LGPLv3 2017-09-28 13:00:43 +02:00
EngineLog.qml Changing AGPLv3 to LGPLv3 2017-09-28 13:00:43 +02:00
ExtruderButton.qml resolve conflict 2018-02-09 13:01:56 +01:00
JobSpecs.qml Checked all divisions (again..) and multiplications on rounding errors 2018-02-10 12:45:36 +01:00
MachineAction.qml T466: Revert the previous commit since it messed up the file rights. 2016-12-23 15:53:15 -05:00
MachineSelection.qml CURA-4234 splitted MachineSelection into a separate file and add it to PrintMonitor as well, because now it's part of the sidebar 2017-12-14 14:49:18 +01:00
MonitorButton.qml resolve conflict 2018-02-09 13:01:56 +01:00
ObjectsList.qml Default objectlist to collapsed CURA-4525 2018-01-18 16:28:46 +01:00
OpenFilesIncludingProjectsDialog.qml Force use and update the job name with the loaded project file 2017-10-12 07:59:43 +02:00
PrintMonitor.qml Don't show "active print" header if no printer is connected 2018-01-08 11:44:30 +01:00
SaveButton.qml Merge branch '3.2' 2018-02-12 13:10:24 +01:00
Sidebar.qml Merge branch '3.2' 2018-02-12 13:10:24 +01:00
SidebarAdvanced.qml Merge branch 'master' of github.com:Ultimaker/Cura into network_rewrite 2018-01-08 10:56:12 +01:00
SidebarContents.qml Changing AGPLv3 to LGPLv3 2017-09-28 13:00:43 +02:00
SidebarHeader.qml Merge branch '3.2' 2018-02-12 13:10:24 +01:00
SidebarSimple.qml Merge branch '3.2' 2018-02-12 13:10:24 +01:00
SidebarTooltip.qml resolve conflict 2018-02-09 13:01:56 +01:00
Toolbar.qml resolve conflict 2018-02-09 13:01:56 +01:00
Topbar.qml Merge branch '3.2' 2018-02-12 13:10:24 +01:00
WorkspaceSummaryDialog.qml Changing AGPLv3 to LGPLv3 2017-09-28 13:00:43 +02:00