3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-18 20:28:01 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 5
25644 commits 306 branches 270 tags 779 MiB
Commit graph

829 commits

Author SHA1 Message Date
Ghostkeeper
de78c44461
Fix configuration drop-down for dark theme 
This actually changes the secondary colour to be darker for the dark theme, to be more in line with the general theme then.

Contributes to issue CURA-5876.
 2018-12-04 16:43:13 +01:00
Ghostkeeper
b5bb3232f3
Merge branch 'ui_rework_4_0' into CURA-5876-Configuration_dropdown 
Conflicts:
	resources/qml/ActionPanel/OutputProcessWidget.qml -> Due to removed theme entry.
 2018-12-04 15:21:36 +01:00
Ghostkeeper
4d87c46423
Remove sourceSize.width: width from all RecolorImages 
It is now the default in Uranium.

Contributes to issue CURA-5876.
 2018-12-04 15:04:51 +01:00
Diego Prado Gesto
a66bb4fab1 Merge branch 'ui_rework_4_0' into CURA-5941_restyle_setting_dropdown 2018-12-04 09:23:00 +01:00
Diego Prado Gesto
c1f5c00a7e Forgot to add the icon 2018-12-04 09:18:45 +01:00
Diego Prado Gesto
e9f8757fac Change the info button in the action panel according to the designs 
Adjust the padding in the preview shortcut.
 2018-12-04 09:12:57 +01:00
Diego Prado Gesto
ca3c639069 Merge branch 'ui_rework_4_0' into CURA-5941_restyle_setting_dropdown 2018-12-04 09:03:13 +01:00
Diego Prado Gesto
004405e5f9 Change the colors to match the designs. 
Contributes to CURA-5941.
 2018-12-03 17:25:07 +01:00
Diego Prado Gesto
15415dc3b9 Fix position of the tooltips for the settings 
Contributes to CURA-5941
 2018-12-03 16:53:52 +01:00
Diego Prado Gesto
4e9c595bdd Restyle the settings list 
Be sure that the alignments and the margins are corrects according to the designs.

Contributes to CURA-5941.
 2018-12-03 15:34:33 +01:00
Diego Prado Gesto
ce6a0676dd Add a rectangle surrounding the settings listview 
Contributes to CURA-5941.
 2018-12-03 14:43:35 +01:00
Diego Prado Gesto
4c468831f0 Add tabs for select the extruder in the custom print setup. 
Align some elements beneath the tabs.

Contributes to CURA-5941.
 2018-12-03 13:58:13 +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
1cea36b08a Add the row for the support selection in the recommended mode 
Contributes to CURA-5941.
 2018-12-02 19:01:54 +01:00
Diego Prado Gesto
1caccfb577 Add a binding to react when the infill density changes in the custom panel 
Also make the icon dinamic, that will change when the infill density changes.

Contributes to CURA-5941.
 2018-12-02 13:40:41 +01:00
Ghostkeeper
f4950cf92b
Give checkboxes a style if they're disabled 
Contributes to issue CURA-5876.
 2018-11-30 17:04:50 +01:00
Diego Prado Gesto
a675d6c353 Merge branch 'CURA-5941_restyle_setting_dropdown' of github.com:Ultimaker/Cura into CURA-5941_restyle_setting_dropdown 2018-11-30 15:17:42 +01:00
Aleksei S
73568d7473 Added icon to the search field which filters settings 
CURA-5941
 2018-11-30 14:51:55 +01:00
Diego Prado Gesto
1a778b3078 Fix qualiy slider alignments 
Contributes to CURA-5941.
 2018-11-30 14:18:07 +01:00
Lipu Fei
6db52dde46 Fix merge conflicts from ui_rework_40 
CURA-5943
 2018-11-29 15:27:06 +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
56f20648f5 Merge branch 'ui_rework_4_0' into CURA-5941_restyle_setting_dropdown 2018-11-28 11:58:55 +01:00
Jaime van Kessel
5ed2acadd0 Re-add wizard_progress size 
I was a bit over enthosiastic deleting it as it was still used for the UMO first run wizard
 2018-11-28 11:09:34 +01:00
Diego Prado Gesto
14b460a626 Remove unused styles 2018-11-27 17:25:10 +01:00
Aleksei S
d47806de50 Change style, added close popitem close behaviour 
CURA-5941
 2018-11-27 15:05:35 +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
077b34b433 Fix size of the extruder icon 
Now it should look the same in all places.
 2018-11-27 14:49:01 +01:00
Ghostkeeper
bb9598afd1
Redesign layout of configuration item contents 
This is the new design.

Contributes to issue CURA-5876.
 2018-11-27 13:55:54 +01:00
Aleksei S
6956a732a0 Use tapbar component from UM, change the print_setup_widget width 2018-11-27 13:49:04 +01:00
Jaime van Kessel
fb84b344ec Add gradient to header bar 2018-11-27 12:58:06 +01:00
Ghostkeeper
e751b59b1c
Remove unused configuration item theme entries 
The theme of configuration items is now in sync with the rest of the interface.

Contributes to issue CURA-5876.
 2018-11-27 12:55:58 +01:00
Jaime van Kessel
44c415ff78 Add shadow to ExpandableComponent 2018-11-27 11:58:32 +01:00
Ghostkeeper
a2b1f53979
Use normal text colour instead of specialised configuration item text 
They were the same anyway, and they should always be the same.

Contributes to issue CURA-5876.
 2018-11-27 11:53:17 +01:00
Diego Prado Gesto
a01ff9419d Merge branch 'ui_rework_4_0' into CURA-5942_printer_selector 2018-11-27 11:13:34 +01:00
Jaime van Kessel
8e7e8354e7 Set colors to the correct ones 2018-11-27 09:41:45 +01:00
Diego Prado Gesto
6a2bbca7ce Merge branch 'ui_rework_4_0' into CURA-5942_printer_selector 2018-11-26 17:53:24 +01:00
Jaime van Kessel
5ddb3ff909 Factor out superfluous use of small_tool_button style 
The style was overly complicated for what it should do
 2018-11-26 17:40:34 +01:00
Ghostkeeper
7f2f2090da
Make small and very_small fonts actually smaller 
Rather than the same as default_bold and default.
This also makes the extruder_icon font obsolete. Turns out it's actually just a very small font.

Contributes to issue CURA-5876.
 2018-11-26 17:37:50 +01:00
Jaime van Kessel
a825daea95 Cleanup the Theme.json 
There were a lot of sizes that weren't used
 2018-11-26 17:10:48 +01:00
Diego Prado Gesto
52b916d45c Merge branch 'ui_rework_4_0' into CURA-5942_printer_selector 2018-11-26 14:33:41 +01:00
Jaime van Kessel
a654499752 Re-enable hover for marketplace button 
CURA-5959
 2018-11-26 13:47:22 +01:00
Ghostkeeper
826044da7e
Merge branch 'ui_rework_4_0' into CURA-5876-Configuration_dropdown 
Conflicts:
	plugins/PrepareStage/PrepareMenu.qml: Some indentation change caused it to misalign the diffs, thinking it couldn't merge two of the same lines which actually weren't the same lines.
	resources/qml/Menus/ConfigurationMenu/QuickConfigurationSelector.qml: This file was deleted in my branch. I'm holding for the new version.
 2018-11-26 13:43:20 +01:00
Jaime van Kessel
3c86c0ae6c Fix spacing 
CURA-5959
 2018-11-26 13:36:45 +01:00
Jaime van Kessel
1fe6501358 Removed unused entries from theme 2018-11-26 13:35:41 +01:00
Lipu Fei
6bed1c1390 Move monitor_checkable_button_style out to styles.qml 
CURA-5943
 2018-11-26 13:21:55 +01:00
Lipu Fei
d6614941dc Update QtQuick import versions in styles.qml 
CURA-5943
 2018-11-26 13:15:25 +01:00
Lipu Fei
6bb010e74a Move MonitorButtonStyle to styles.qml 
CURA-5943
 2018-11-26 13:14:26 +01:00
Jaime van Kessel
b82ea58bc8 Changed all the action buttons to either use primary or secondary button 
CURA-5959
 2018-11-23 18:07:50 +01:00
Jaime van Kessel
e1f3e07f04 Changed Marketplace button to no longer use the action button 
The actionButton is weirdly named and overly used. That being said, the marketplace button is unique, so
there is little sense in re-using it
 2018-11-23 17:11:20 +01:00