GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-29 09:38:21 +08:00
Code Issues Packages Projects Releases Wiki Activity
17,706 Commits 294 Branches 267 Tags
Commit Graph

20 Commits

Author SHA1 Message Date
Diego Prado Gesto
2bf641efcf Add a Cura Tooltip to show in some buttons 
Contributes to CURA-6004.
 2018-12-10 09:09:58 +01:00
Diego Prado Gesto
898fd25ddb Remove the component IconLabel since we have a similar one in IconWithText 
Contributes to CURA-5941.
 2018-12-07 11:43:41 +01:00
Diego Prado Gesto
07d58c3aef Merge branch 'ui_rework_4_0' into CURA-5941_restyle_setting_dropdown 2018-12-05 13:56:21 +01:00
Ghostkeeper
7df4c01814
Merge branch 'ui_rework_4_0' into CURA-5876-Configuration_dropdown 
Conflicts:
	cura/Settings/MachineManager.py -> rowCount vs. count
	resources/qml/ExtruderIcon.qml -> Someone changed stuff that I had overwritten.
	resources/qml/Menus/ConfigurationMenu/PrintCoreConfiguration.qml -> Someone changed stuff that I had removed.
	resources/qml/Toolbar.qml -> Git was wrong, not a conflict.
	resources/themes/cura-light/theme.json -> Git was wrong, not a conflict.
 2018-12-03 11:45:05 +01:00
Diego Prado Gesto
90281c455b Add global profile selector to the custom print setup panel 
Also modify some styles to adjust to the designs.

Contributes to CURA-5941.
 2018-12-03 09:45:49 +01:00
Diego Prado Gesto
17945c6b16 [WIP] Separate components in different files 
Contributes to CURA-5941
 2018-11-30 11:32:24 +01:00
Diego Prado Gesto
990c653af4 Refactor the code a bit more to better align the components in the 
recommended mode.

Contributes to CURA-5941.
 2018-11-28 17:29:25 +01:00
Diego Prado Gesto
309061ce31 Add a new ToolbarButton 
Now also the Extruder button is a toolbar button since it will show in
the toolbar.
 2018-11-27 17:16:52 +01:00
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
Diego Prado Gesto
f3bf20ca1b Separate the view selector into a different file. 2018-11-25 18:24:21 +01:00
Diego Prado Gesto
5c30df2a68 Create a reusable component for the printer type label. Other parts of 
the UI can just reuse it.

Contributes to CURA-5942.
 2018-11-22 15:00:35 +01:00
Diego Prado Gesto
9720512f50 Add a new printer selector button that is connected to the output 
devices and shows labels containing the type of printers that are in the
same group.

Contributes to CURA-5942.
 2018-11-22 13:54:10 +01:00
Ghostkeeper
16deeb0951
Remove old QuickConfigurationSelector 
It doesn't exist any more.

Contributes to issue CURA-5876.
 2018-11-19 17:10:29 +01:00
Diego Prado Gesto
ec0d9f09b7 Create a component for selecting the output device before output the 
file.

Contributes to CURA-5786.
 2018-10-31 17:03:09 +01:00
Diego Prado Gesto
eabd7c6b5e Start mocking up the panel the user gets after slicing. 
Also the IconLabel component was created with the aim to be reused in
several places.

Contributes to CURA-5786.
 2018-10-30 17:07:07 +01:00
Diego Prado Gesto
e64698209c Adjust the minimum size to be something around 1280x1024. 
Also adjust some colors color for the dark theme.

Contributes to CURA-5772.
 2018-10-25 17:41:35 +02:00
Diego Prado Gesto
176c7bfc22 Small fixes in the CustomConfigurationSelector file 
Contributes to CURA-5772.
 2018-10-18 17:48:03 +02:00
Diego Prado Gesto
93b04190f8 Change name of some components to make them more indicative of what they 
do.

Contributes to CURA-5772.
 2018-10-18 17:13:15 +02:00
Jaime van Kessel
8cac5e1de2 Removed the components qml dir 
We can consider putting components into their own folder, but we first should have a clear definition of what they are / should be.

CURA-5772
 2018-10-15 10:34:19 +02:00
Jaime van Kessel
10de312647 Added QMLDIR so we can specify cura specific QML components for plugins 
This ensures that we can be way more explicit with what QML components we see as re-usable

CURA-5772
 2018-10-12 13:28:08 +02:00