3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-11-02 20:52:20 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
Cura/plugins/Toolbox/resources/qml
History
Ghostkeeper 289399825b
Merge branch 'ui_rework_4_0' into CURA-5876-Configuration_dropdown 
Conflicts:
	plugins/PrepareStage/PrepareMenu.qml: Git was wrong, this was not really a conflict.
	resources/qml/ActionButton.qml: With iconSource being modified on ui_rework_4_0 and me modifying the icon to be able to display it on the left hand side.
	resources/qml/ActionPanel/OutputProcessWidget.qml: Git was wrong, not really a conflict.
	resources/qml/ActionPanel/SliceProcessWidget.qml: Git was wrong, not really a conflict.
	resources/qml/ExpandableComponent.qml: Both ui_rework_4_0 and me implemented a border around popups.
	resources/qml/MainWindow/MainWindowHeader.qml: Git was wrong, not really a conflict.
	resources/themes/cura-light/theme.json: Theme item was added in a place where I added whitespace.
2018-11-27 15:01:48 +01:00
..
Toolbox.qml Merge branch 'ui_rework_4_0' into cura4.0_header 2018-11-01 09:21:33 +01:00
ToolboxActionButtonStyle.qml Cura-5296 Use separate packages.json files in app and user data 2018-05-08 11:54:19 +02:00
ToolboxAuthorPage.qml Change all uses of 'small' and 'very small' fonts to default 2018-11-26 17:33:37 +01:00
ToolboxBackColumn.qml Disable other buttons while toolbox is downloading to avoid crashes. 2018-10-01 17:21:34 +02:00
ToolboxCompatibilityChart.qml Change all uses of 'small' and 'very small' fonts to default 2018-11-26 17:33:37 +01:00
ToolboxConfirmUninstallResetDialog.qml Improvements to translated strings 2018-10-08 15:03:21 +02:00
ToolboxDetailList.qml Fix Toolbox QML null object warnings 2018-09-07 09:29:31 +02:00
ToolboxDetailPage.qml Merge branch 'ui_rework_4_0' into CURA-5876-Configuration_dropdown 2018-11-27 15:01:48 +01:00
ToolboxDetailTile.qml Increase lines shown from 3 to 6 2018-11-12 09:28:48 +01:00
ToolboxDetailTileActions.qml CURA-5442 Final fixes 2018-06-04 17:00:59 +02:00
ToolboxDownloadsGrid.qml Add generic material packages to materials page 2018-07-16 16:13:43 +02:00
ToolboxDownloadsGridTile.qml Change all uses of 'small' and 'very small' fonts to default 2018-11-26 17:33:37 +01:00
ToolboxDownloadsPage.qml Fix Toolbox QML null object warnings 2018-09-07 09:29:31 +02:00
ToolboxDownloadsShowcase.qml CURA-5537 improve styling of toolbox 2018-07-03 15:54:20 +02:00
ToolboxDownloadsShowcaseTile.qml Rename other entries of the Toolbox to Marketplace. 2018-10-31 09:45:29 +01:00
ToolboxErrorPage.qml CURA-5035 No more crash without internet connection 2018-05-02 14:30:31 +02:00
ToolboxFooter.qml Add color to text in toolboxFooter, CURA-5544 2018-07-05 12:44:11 +02:00
ToolboxHeader.qml Merge branch '3.5' 2018-10-02 20:27:18 +02:00
ToolboxInstalledPage.qml Fix Toolbox QML null object warnings 2018-09-07 09:29:31 +02:00
ToolboxInstalledTile.qml Revert "Revert "CURA-5435 Attempt to fix "wobbly" text"" 2018-06-01 09:39:04 +02:00
ToolboxInstalledTileActions.qml Added checkPackageUsageAndUninstall and the package usage check. No confirmation dialog yet 2018-07-05 11:47:06 +02:00
ToolboxLicenseDialog.qml Fix QML warnings 2018-05-02 20:34:50 +02:00
ToolboxLoadingPage.qml CURA-5035 Review feedback 2018-05-02 12:01:29 +02:00
ToolboxProgressButton.qml Only load loading.gif when needed 2018-05-31 12:21:53 +02:00
ToolboxShadow.qml CURA-5035 Improved details pages 2018-04-18 16:35:55 +02:00
ToolboxTabButton.qml Remove all the entries in the theme that make reference to the sidebar, 2018-10-26 17:51:28 +02:00