Cura/resources/qml
Ghostkeeper 65d3aa4480
Fix broken sizes due to merged theme entry
Merge conflict went wrong, I think.

Contributes to issue CURA-5876.
2018-12-03 11:59:03 +01:00
..
Account Changed all the action buttons to either use primary or secondary button 2018-11-23 18:07:50 +01:00
ActionPanel Fix broken sizes due to merged theme entry 2018-12-03 11:59:03 +01:00
Dialogs Merge branch 'ui_rework_4_0' into CURA-5876-Configuration_dropdown 2018-12-03 11:45:05 +01:00
MainWindow Align the text to the center of the button 2018-11-27 13:33:35 +01:00
Menus Re-use SecondaryButton instead of setting colours ourselves 2018-12-03 11:52:10 +01:00
Preferences Merge branch 'ui_rework_4_0' into CURA-5876-Configuration_dropdown 2018-12-03 11:45:05 +01:00
PrinterOutput Merge branch 'ui_rework_4_0' into CURA-5876-Configuration_dropdown 2018-12-03 11:45:05 +01:00
PrinterSelector Move PrinterTypeLabel to a more central location 2018-11-27 15:11:13 +01:00
Settings Merge branch 'ui_rework_4_0' into CURA-5876-Configuration_dropdown 2018-12-03 11:45:05 +01:00
ActionButton.qml Merge branch 'ui_rework_4_0' into CURA-5876-Configuration_dropdown 2018-11-27 15:01:48 +01:00
Actions.qml Merge branch 'ui_rework_4_0' into cura4.0_header 2018-11-02 13:36:47 +01:00
BorderGroup.qml Add copyright header. 2018-11-26 15:39:34 +01:00
Cura.qml Move USB sidebar into the main view of the monitorstage 2018-11-30 13:53:53 +01:00
ExpandableComponent.qml Add shadow to ExpandableComponent 2018-11-27 11:58:32 +01:00
ExtruderButton.qml Add a new ToolbarButton 2018-11-27 17:16:52 +01:00
ExtruderIcon.qml Merge branch 'ui_rework_4_0' into CURA-5876-Configuration_dropdown 2018-11-27 15:01:48 +01:00
IconLabel.qml Merge branch 'ui_rework_4_0' into CURA-5876-Configuration_dropdown 2018-11-27 15:01:48 +01:00
IconWithText.qml Add round to minContentWidth 2018-11-16 15:06:21 +01:00
JobSpecs.qml Change all uses of 'small' and 'very small' fonts to default 2018-11-26 17:33:37 +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 Remove all the entries in the theme that make reference to the sidebar, 2018-10-26 17:51:28 +02:00
MonitorSidebar.qml Fix MonitorSidebar due to widget renaming 2018-11-22 14:08:50 +01: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
PrimaryButton.qml Add header in new files. Remove unused imports. 2018-11-26 14:06:34 +01:00
PrinterTypeLabel.qml Use normal font size for shorthand label 2018-11-27 15:12:44 +01:00
PrintMonitor.qml Move USB sidebar into the main view of the monitorstage 2018-11-30 13:53:53 +01:00
PrintSetupSelector.qml Ensure that no weird data is set in the printSetupSelector on first start 2018-11-26 16:40:29 +01:00
qmldir Merge branch 'ui_rework_4_0' into CURA-5876-Configuration_dropdown 2018-12-03 11:45:05 +01: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
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 Use ListModel.count instead of rowCount 2018-12-03 11:13:26 +01:00
SidebarTooltip.qml Fix the tooltips for time estimations 2018-10-15 09:49:08 +02:00
Toolbar.qml Merge branch 'ui_rework_4_0' into CURA-5876-Configuration_dropdown 2018-12-03 11:45:05 +01:00
ToolbarButton.qml Invert visibility of bottom & topsquare 2018-11-28 10:46:07 +01:00
ViewOrientationButton.qml Simplify the viewOrientation controls 2018-11-26 17:35:23 +01:00
ViewOrientationControls.qml Simplify the viewOrientation controls 2018-11-26 17:35:23 +01:00
ViewsSelector.qml Use ListModel.count instead of rowCount 2018-12-03 11:13:26 +01:00