Cherubim 0ebb2a35fe Merge branch '4.1' ... Conflicts: resources/i18n/es_ES/cura.po -> Correction being made on master while translations were being done for 4.1.		2019-05-28 11:07:20 +02:00
..
Account	Change the copy of the account benefits	2019-04-26 14:04:46 +02:00
ActionPanel	Change time/material 'specification' into 'estimation'	2019-05-08 10:24:21 +02:00
Dialogs	Remove a few more usages of deprecated functions	2019-05-16 15:20:38 +02:00
MachineSettings	Move background to ScrollView for GcodeTextArea	2019-05-14 11:44:14 +02:00
MainWindow	Remove hack in WelcomePagesModel and add WhatsNewPagesModel	2019-04-12 12:11:09 +02:00
Menus	Remove usage of some deprecated functions	2019-05-16 14:49:53 +02:00
Preferences	Merge branch '4.1'	2019-05-28 11:07:20 +02:00
PrinterOutput	Correct positioning of tooltip for g-code text area	2019-05-10 11:32:40 +02:00
PrinterSelector	Merge remote-tracking branch 'origin/master' into feature_model_list	2019-05-16 15:17:46 +02:00
PrintSetupSelector	Fix adhesion checkbox in recommended mode	2019-05-21 08:10:49 +02:00
Settings	Merge branch '4.1'	2019-05-20 13:42:38 +02:00
WelcomePages	Fix add machine dialog state	2019-05-17 15:01:18 +02:00
Widgets	Fix theming	2019-04-17 09:18:08 +02:00
ActionButton.qml	Add a maximumWidth to the ActionButton	2019-03-22 17:10:42 +01:00
Actions.qml	Remove non-existing icon	2019-04-17 09:36:03 +02:00
BorderGroup.qml	Add copyright header.	2018-11-26 15:39:34 +01:00
CheckBoxWithTooltip.qml	Rename CheckBox.qml to CheckBoxWithTooltip.qml	2019-01-03 11:53:19 +01:00
Cura.qml	Merge remote-tracking branch 'origin/4.1'	2019-05-17 15:01:40 +02:00
EmptyViewMenuComponent.qml	Use a disabled rectangle instead of an empty space in the XRay view	2019-05-02 16:00:17 +02:00
ExpandableComponent.qml	DoubleClick and drag no longer contradict eachother for expandable component	2019-04-29 15:13:01 +02:00
ExpandableComponentHeader.qml	Make expandable component dragable.	2019-04-25 08:43:36 +02:00
ExpandablePopup.qml	Close the expandable panel when it becomes disabled	2018-12-11 11:10:45 +01:00
ExtruderButton.qml	Add a new ToolbarButton	2018-11-27 17:16:52 +01:00
ExtruderIcon.qml	Merge branch '4.0' into unify_font_types	2018-12-19 11:56:22 +01:00
FPSItem.qml	Add a QML item that shows the FPS	2019-04-19 13:58:41 +02:00
IconWithText.qml	Remove duplicate alias definition	2018-12-14 16:41:07 +01:00
JobSpecs.qml	Modify style of the ObjectSelector	2019-03-05 10:33:27 +01:00
MachineAction.qml	T466: Revert the previous commit since it messed up the file rights.	2016-12-23 15:53:15 -05:00
MonitorButton.qml	Unify the fonts to only have 8 instead of 13.	2018-12-12 17:50:21 +01:00
ObjectItemButton.qml	Change preference key to cura/show_list_of_objects	2019-05-16 15:49:08 +02:00
ObjectSelector.qml	Add mouse area to prevent clickthroughs	2019-05-24 12:53:34 +02:00
PrimaryButton.qml	Add header in new files. Remove unused imports.	2018-11-26 14:06:34 +01:00
PrinterTypeLabel.qml	WIP: Show full name of network printer types	2019-03-13 13:03:41 +01:00
PrintMonitor.qml	Show tooltip on top of control elements	2019-05-10 11:09:56 +02:00
PrintSetupTooltip.qml	Show tooltip on the right side if the setting area is to far to the left	2019-04-29 10:33:02 +02:00
qmldir	Merge branch 'master' into CURA-6447_fix_start_onboarding	2019-04-12 16:39:51 +02:00
RoundedRectangle.qml	Add border to rounded rectangle.	2018-11-26 15:14:32 +01:00
SecondaryButton.qml	Add header in new files. Remove unused imports.	2018-11-26 14:06:34 +01:00
Toolbar.qml	Catch scroll events and not propagate them to the main view	2019-05-09 11:37:59 +02:00
ToolbarButton.qml	Remove the show property from the tooltip	2018-12-20 16:41:26 +01:00
ToolTip.qml	Fix fonts of plug-in tiles	2018-12-31 15:14:23 +01:00
ViewOrientationButton.qml	Change the margin in the view orientation buttons to aling the pixels correctly	2018-12-17 11:00:49 +01:00
ViewOrientationControls.qml	Simplify the viewOrientation controls	2018-11-26 17:35:23 +01:00
ViewsSelector.qml	Change text to singular mode	2019-03-08 15:27:17 +01:00