GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-06-29 21:45:10 +08:00
Code Issues Packages Projects Releases Wiki Activity
Cura/resources/qml
History
Ghostkeeper e0a6cb3383
Merge branch 'master' into replace_controls_1_for_controls_2 
Conflicts:
	resources/qml/Actions.qml -> Translation fixes on master, while the QML elements were changed here for Controls2.
2022-01-18 17:17:10 +01:00
..
Account
Replace usage of controls label with our custom label
2021-11-10 16:37:26 +01:00
ActionPanel
Use the StatusIcon qml component for the warning icons
2021-07-28 18:17:54 +02:00
ApplicationSwitcher
Replace usage of controls label with our custom label
2021-11-10 16:37:26 +01:00
Dialogs
Merge branch 'master' into replace_controls_1_for_controls_2
2022-01-18 17:17:10 +01:00
MachineSettings
Replace usage of controls label with our custom label
2021-11-10 16:37:26 +01:00
MainWindow
Fix opening of marketplace button
2022-01-14 13:14:15 +01:00
Menus
Disable menuItems if they aren't visible
2022-01-17 15:32:27 +01:00
Preferences
Merge branch 'master' into replace_controls_1_for_controls_2
2022-01-18 17:17:10 +01:00
PrinterOutput
Replace usage of controls label with our custom label
2021-11-10 16:37:26 +01:00
PrinterSelector
Replace usage of controls label with our custom label
2021-11-10 16:37:26 +01:00
PrintSetupSelector
Remove unneded styles import
2022-01-04 09:48:02 +01:00
Settings
Use Cura.MenuItem instead of UM.MenuItem
2022-01-14 13:46:05 +01:00
WelcomePages
Merge branch 'master' into replace_controls_1_for_controls_2
2022-01-18 17:17:10 +01:00
Widgets
Use CuraMenu so that custom styling is used
2022-01-14 15:01:48 +01:00
ActionButton.qml
Merge branch 'master' into replace_controls_1_for_controls_2
2022-01-18 17:17:10 +01:00
Actions.qml
Merge branch 'master' into replace_controls_1_for_controls_2
2022-01-18 17:17:10 +01:00
BorderGroup.qml
Revert "Cura 7813 qml modules version bump"
2021-03-30 09:48:28 +02:00
CheckBoxWithTooltip.qml
Replace usage of controls label with our custom label
2021-11-10 16:37:26 +01:00
Cura.qml
Switch out the file, view and edit menu for controls 2
2022-01-10 16:55:28 +01:00
EmptyViewMenuComponent.qml
Revert "Cura 7813 qml modules version bump"
2021-03-30 09:48:28 +02:00
ExpandableComponent.qml
Replace usage of controls label with our custom label
2021-11-10 16:37:26 +01:00
ExpandableComponentHeader.qml
Replace usage of controls label with our custom label
2021-11-10 16:37:26 +01:00
ExpandablePopup.qml
Replace usage of controls label with our custom label
2021-11-10 16:37:26 +01:00
ExtruderButton.qml
Fix ExtruderColor and Extruder icons bleeding into each other
2021-07-02 12:11:04 +02:00
ExtruderIcon.qml
Replace usage of controls label with our custom label
2021-11-10 16:37:26 +01:00
FPSItem.qml
Revert "Cura 7813 qml modules version bump"
2021-03-30 09:48:28 +02:00
IconWithText.qml
Replace usage of controls label with our custom label
2021-11-10 16:37:26 +01:00
JobSpecs.qml
Replace button with reusable simple button
2021-11-10 16:46:24 +01:00
LabelBar.qml
Replace more instances of label with UM.Label
2021-11-10 17:42:23 +01:00
MachineAction.qml
Revert "Cura 7813 qml modules version bump"
2021-03-30 09:48:28 +02:00
MonitorButton.qml
Fix various typos
2021-09-07 11:33:54 -04:00
ObjectItemButton.qml
Merge branch 'master' of github.com:Ultimaker/Cura into replace_controls_1_for_controls_2
2022-01-03 15:32:58 +01:00
ObjectSelector.qml
Replace usage of controls label with our custom label
2021-11-10 16:37:26 +01:00
PrimaryButton.qml
Remove 'roundedness' and 'shadow' from action-buttons.
2021-06-30 17:04:55 +02:00
PrinterTypeLabel.qml
Revert "Cura 7813 qml modules version bump"
2021-03-30 09:48:28 +02:00
PrintMonitor.qml
Removed unused imports in print monitor
2021-11-16 15:07:33 +01:00
PrintSetupTooltip.qml
Replace usage of controls label with our custom label
2021-11-10 16:37:26 +01:00
qmldir
Add Cura-styled Menu, MenuItem and MenuSeparator controls
2021-05-20 12:20:19 +02:00
RadioCheckbar.qml
Fix various typos
2021-09-07 11:33:54 -04:00
RoundedRectangle.qml
Revert "Cura 7813 qml modules version bump"
2021-03-30 09:48:28 +02:00
SecondaryButton.qml
Adjust color-scheme for button restyle.
2021-07-02 09:39:33 +02:00
TableView.qml
Replace usage of controls label with our custom label
2021-11-10 16:37:26 +01:00
TertiaryButton.qml
Revert Tertiary button to its previous style
2021-07-06 13:45:24 +02:00
Toolbar.qml
Fix various typos
2021-09-07 11:33:54 -04:00
ToolbarButton.qml
Change the color of a circle around the toolbar button
2021-06-28 14:56:26 +02:00
ToolTip.qml
Replace usage of controls label with our custom label
2021-11-10 16:37:26 +01:00
ViewOrientationButton.qml
Remove the margin from the ViewOrientation buttons
2021-07-02 09:38:12 +02:00
ViewOrientationControls.qml
Unrevert new icon set for all of Cura's interface
2021-06-28 17:16:56 +02:00
ViewsSelector.qml
Replace usage of controls label with our custom label
2021-11-10 16:37:26 +01:00