GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-28 09:09:30 +08:00
Code Issues Packages Projects Releases Wiki Activity
17,658 Commits 292 Branches 265 Tags
Commit Graph

3432 Commits

Author SHA1 Message Date
Aleksei S
6956a732a0 Use tapbar component from UM, change the print_setup_widget width 2018-11-27 13:49:04 +01:00
Diego Prado Gesto
e863c34f68 Align the text to the center of the button 
Contributes to CURA-5942.
 2018-11-27 13:33:35 +01:00
Ghostkeeper
cf8d88054d
Use proper colour for material in configuration item 
No idea this would be so easy.

Contributes to issue CURA-5876.
 2018-11-27 13:29:57 +01:00
Ghostkeeper
b15c272d23
Fix applying configuration when clicking 
Also no longer use that signal for it. It was completely unnecessary.

Contributes to issue CURA-5876.
 2018-11-27 13:24:13 +01:00
Ghostkeeper
89126c7323
Use background instead of contentItem 
This way the padding and such doesn't matter any more. And the original background disappears, which was unthemed and still behind the original contentItem.

Contributes to issue CURA-5876.
 2018-11-27 13:08:41 +01:00
Ghostkeeper
c6a9aca346
Switch checked and hovered themes 
I misunderstood the theme as it was in the screenshots.

Contributes to issue CURA-5876.
 2018-11-27 13:05:32 +01:00
Ghostkeeper
81cadf702c
Give configuration items a rounded radius 
Contributes to issue CURA-5876.
 2018-11-27 13:00:51 +01:00
Jaime van Kessel
fb84b344ec Add gradient to header bar 2018-11-27 12:58:06 +01:00
Ghostkeeper
0be2453daf
Update style of border of configuration items 
Contributes to issue CURA-5876.
 2018-11-27 12:55:07 +01:00
Ghostkeeper
e58409b1ef
Correct colours for the selected configuration 
This should always be the same as the ExpandableComponent's background, so white when it's not active and light blue when it's active, regardless of theme.
The naming of this theme entry is a bit weird because the ActionButton theme is used for ExpandableComponent and now for ConfigurationItem as well, but that's why we should NEVER name these theme entries to something specific to one item. Oh well, I'm not about to refactor that now with all the branches going on everywhere.

Contributes to issue CURA-5876.
 2018-11-27 12:51:52 +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
Ghostkeeper
6876c12106
Remove weird padding from button 
I don't know why the default Button has padding everywhere, but I don't want it.

Contributes to issue CURA-5876.
 2018-11-27 11:43:32 +01:00
Diego Prado Gesto
75b827d373 Modify the hover behavior by removing the mouse area. 
Contributes to CURA-5942.
 2018-11-27 11:26:20 +01:00
Diego Prado Gesto
e2f85fcdc4 Add extra space to printer button. 
Contributes to CURA-5942.
 2018-11-27 11:25:43 +01:00
Aleksei S
e6c2238fd5 Added popup spacing by Y coordinate 
CURA-5941
 2018-11-27 11:24:09 +01:00
Ghostkeeper
e05566865a
Use ExtruderIcon component to display extruder icon 
Since we already have that component pre-designed, let's use it.

Contributes to issue CURA-5876.
 2018-11-27 11:19:03 +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
Ghostkeeper
c489f911fb
Use QtQuick 2.0 and simplify ConfigurationItem 
It now uses a ButtonGroup (from QtQuick2). Also, all the mess with when the border and background colours are updated and force-updated and such is now cleaned up.

Contributes to issue CURA-5876.
 2018-11-27 11:04:41 +01:00
Lipu Fei
a99c1f4f73
Merge pull request #4885 from Ultimaker/CURA-5961-NaN_infill_before_adding_printer 
Ensure that no weird data is set in the printSetupSelector on first start
 2018-11-27 10:23:58 +01:00
Ghostkeeper
4be8af7cb2
Restyle printer type headers 
It's now a grey box with the printer type name inside and some padding and such.

Contributes to issue CURA-5876.
 2018-11-27 09:38:32 +01:00
Aleksei S
ec63e6c130 Added icons 
CURA-5941
 2018-11-27 09:27:25 +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
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
a3b45ff203 Simplify the viewOrientation controls 2018-11-26 17:35:23 +01:00
Ghostkeeper
a3fe9839ba
Change all uses of 'small' and 'very small' fonts to default 
These two fonts are exactly the same, but I want to use the 'small' font to be something a bit smaller. I'm 'removing' the superfluous font but will be re-using it immediately to look a bit smaller.

Contributes to issue CURA-5876.
 2018-11-26 17:33:37 +01:00
Ghostkeeper
a03e1be601
Simplify sectionHeading element 
No need to define that component in a higher location, just define it where you need it. Also, no need to use a Rectangle for this if it has no colour, just use an Item, but the Item itself is also not necessary if you just need the padding.

Contributes to issue CURA-5876.
 2018-11-26 17:19:32 +01:00
Ghostkeeper
3b219e3ac3
Remove padding 
The padding is already done by the enveloping Column and its parent popupItem.

Contributes to issue CURA-5876.
 2018-11-26 17:13:25 +01:00
Ghostkeeper
a268c95559
Remove double header 
This header is no longer necessary since the AutoConfiguration item provides its own header that doesn't scroll along.

Contributes to issue CURA-5876.
 2018-11-26 17:10:56 +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
Ghostkeeper
87a0dc65e1
Add list of available configurations to AutoConfiguration 
This is the main item it needs to display.

Contributes to issue CURA-5876.
 2018-11-26 17:09:36 +01:00
Jaime van Kessel
d85aee1c53 Ensure that no weird data is set in the printSetupSelector on first start 
CURA-5961
 2018-11-26 16:40:29 +01:00
Ghostkeeper
4b897ffd67
Fix width of content in tabbed content 
Contributes to issue CURA-5876.
 2018-11-26 16:03:40 +01:00
Diego Prado Gesto
3d1157522a Reuse the RoundedRectangle component and indicate that only the bottom part of the popup should be rounded. 
Contributes to CURA-5942.
 2018-11-26 15:51:36 +01:00
Ghostkeeper
ac5f79ba2c
Add tab style to tabbed content 
It now gets a proper background colour, lining and radius.

Contributes to issue CURA-5876.
 2018-11-26 15:47:32 +01:00
Diego Prado Gesto
67cba50e9b Merge branch 'ui_rework_4_0' into CURA-5942_printer_selector 2018-11-26 15:41:05 +01:00
Diego Prado Gesto
9afc5748a8 Add copyright header. 2018-11-26 15:39:34 +01:00
Jaime van Kessel
9732099250 Add border to rounded rectangle. 
It's designed so that it works in exactly the same way as rectangle.
 2018-11-26 15:14:32 +01:00
Diego Prado Gesto
0a1c0e18d1 Reuse the component SecondaryButton in the printer selector. 
Contributes to CURA-5942.
 2018-11-26 14:38:43 +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
Diego Prado Gesto
12f78fa21a Remove border of the popup selector for the output devices. 
Contributes to CURA-5959.
 2018-11-26 14:29:42 +01:00
Ghostkeeper
90a73f351d
Fix positioning of tabs in custom menu 
The label's bottom side is at its top, so we must add its height so that it gets positioned correctly.

Contributes to issue CURA-5876.
 2018-11-26 14:12:34 +01:00
Diego Prado Gesto
b63c4f7a74 Add header in new files. Remove unused imports. 
Contributes to CURA-5959.
 2018-11-26 14:06:34 +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
098714254d Remove unused code 
CURA-5959
 2018-11-26 13:35:02 +01:00
Jaime van Kessel
eea6490e75 Hover of output device now spans the popup 
CURA-5959
 2018-11-26 13:27:26 +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
6bb010e74a Move MonitorButtonStyle to styles.qml 
CURA-5943
 2018-11-26 13:14:26 +01:00
Diego Prado Gesto
5397cda2b4 Add a label to the action panel when auto slice is ON, indicating that the process runs automatically. 
Contributes to CURA-5942.
 2018-11-26 12:00:06 +01:00