3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-18 20:28:01 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 6
Cura/resources/qml
History
Ghostkeeper 266e08fdff
Merge branch 'master' into ui_rework_4_0 
Conflicts:
	plugins/Toolbox/resources/qml/ToolboxCompatibilityChart.qml - The compatibility chart being added in 3.6 which was kind of hacky.
	resources/qml/SidebarHeader.qml - Removed in UI rework, edited on master.
2018-11-13 16:23:36 +01:00
..
Account Add soft animation to the entire popup and not only in the background. 2018-11-11 13:16:38 +01:00
ActionPanel Apply restyle of the toolbar according to the new designs. 2018-11-11 19:15:02 +01:00
Dialogs Merge branch 'ui_rework_4_0' into cura4.0_header 2018-11-06 09:23:15 +01:00
MainWindow Rename Toolbox menu to Marketplace. It was remove by mistake in a merge conflict. 2018-11-11 12:44:56 +01:00
Menus Merge branch 'cura4.0_header' of github.com:Ultimaker/Cura into CURA-5829-Add-preview-stage 2018-10-31 13:45:03 +01:00
Preferences Merge branch 'master' into ui_rework_4_0 2018-11-13 16:23:36 +01:00
PrinterOutput Remove all the entries in the theme that make reference to the sidebar, 2018-10-26 17:51:28 +02:00
Settings Merge branch 'ui_rework_4_0' into cura4.0_header 2018-11-01 09:21:33 +01:00
ActionButton.qml Merge branch 'cura4.0_action_panel' into cura4.0_header 2018-11-08 11:50:14 +01:00
Actions.qml Merge branch 'ui_rework_4_0' into cura4.0_header 2018-11-02 13:36:47 +01:00
Cura.qml Apply restyle of the toolbar according to the new designs. 2018-11-11 19:15:02 +01:00
CustomConfigurationSelector.qml Remove all the entries in the theme that make reference to the sidebar, 2018-10-26 17:51:28 +02:00
ExtruderButton.qml Apply restyle of the toolbar according to the new designs. 2018-11-11 19:15:02 +01:00
ExtruderIcon.qml Add license to the top of a file 2018-10-18 17:26:10 +02:00
IconLabel.qml Modify alignments to avoid binding loop logs. 2018-11-06 11:24:41 +01:00
JobSpecs.qml Fix code style 2018-10-18 14:30:33 +02:00
MachineAction.qml T466: Revert the previous commit since it messed up the file rights. 2016-12-23 15:53:15 -05:00
MachineSelector.qml Remove all the entries in the theme that make reference to the sidebar, 2018-10-26 17:51:28 +02:00
MonitorButton.qml Remove all the entries in the theme that make reference to the sidebar, 2018-10-26 17:51:28 +02:00
MonitorSidebar.qml Remove all the entries in the theme that make reference to the sidebar, 2018-10-26 17:51:28 +02:00
ObjectsList.qml Made some changes so the code also works with lower versions of Qt & pyQt 2018-03-05 15:32:46 +01:00
PrintMonitor.qml Remove all the entries in the theme that make reference to the sidebar, 2018-10-26 17:51:28 +02:00
PrintSetupSelector.qml Hide settings when pre-sliced g-code is loaded 2018-11-05 13:25:47 +01:00
qmldir Create a component for selecting the output device before output the 2018-10-31 17:03:09 +01:00
SaveButton.qml Remove all the entries in the theme that make reference to the sidebar, 2018-10-26 17:51:28 +02:00
SidebarAdvanced.qml Made some changes so the code also works with lower versions of Qt & pyQt 2018-03-05 15:32:46 +01:00
SidebarContents.qml Bumped the required version numbers down again, as they should specifcy a min version number. 2018-02-16 11:13:40 +01:00
SidebarSimple.qml Merge branch 'ui_rework_4_0' into cura4.0_header 2018-11-01 09:21:33 +01:00
SidebarTooltip.qml Fix the tooltips for time estimations 2018-10-15 09:49:08 +02:00
Toolbar.qml Apply restyle of the toolbar according to the new designs. 2018-11-11 19:15:02 +01:00
ViewOrientationControls.qml Make the spacing between the orientation controls be dependent on the 2018-10-19 17:04:40 +02:00