GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-06-04 11:14:21 +08:00
Code Issues Packages Projects Releases Wiki Activity
16,865 Commits 295 Branches 268 Tags
Commit Graph

16865 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ghostkeeper
b0e9f23eee
Correct line colour when hovered 
A detail that I almost missed in the design examples.

Contributes to issue CURA-5876.
 2018-11-27 14:06:07 +01:00
Ghostkeeper
1555a1ab17
Make manufacturer and extruder labels lighter 
The proper colour would've been 'detail' but that seems to not be used much at all, and it's too light. In other places, 'inactive' is used in this place more often.

Contributes to issue CURA-5876.
 2018-11-27 14:03:05 +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
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
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
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
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
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
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
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
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
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
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
Ghostkeeper
4b897ffd67
Fix width of content in tabbed content 
Contributes to issue CURA-5876.
 2018-11-26 16:03:40 +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
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
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
Ghostkeeper
4c26262054
Use re-usable TabRow component 
Contributes to issue CURA-5876.
 2018-11-22 17:06:56 +01:00
Diego Prado Gesto
81c776213a Merge branch 'master' into ui_rework_4_0 2018-11-22 16:11:06 +01:00
Simon Edwards
ee7355c2bb
Merge pull request #4841 from Ultimaker/CL-1148_restyling_monitor_queue_tiles 
CL-1148 Re-styling monitor queue tiles
 2018-11-22 15:08:42 +01:00
Ghostkeeper
7f11142d50
Fix height and vertical layout of popup 
Many things were made simpler. This took some time to fix...

Contributes to issue CURA-5876.
 2018-11-22 14:57:55 +01:00
Ian Paschal
963b8aa974 Fix QML warnings 
Contributes to CL-1148
 2018-11-22 13:56:01 +01:00
Ian Paschal
55554c62a9 Use array for extruder configurations 
Contributes to CL-1148
 2018-11-22 13:55:43 +01:00
Ian Paschal
da834d6a1f Silence binding loop 
Contributes to CL-1148
 2018-11-22 13:55:22 +01:00
Ian Paschal
1de21c1d94 Remove unnecessary "else" 
Contributes to CL-1148
 2018-11-22 13:13:06 +01:00
Ian Paschal
3c3343a407 Use bool for expanded or collapsed state 
Contributes to CL-1148
 2018-11-22 13:11:59 +01:00
alekseisasin
b091e3a52c
Merge pull request #4854 from Ultimaker/fix_version_upgrade_returning_none 
Fix version upgrade returning none
 2018-11-22 11:44:36 +01:00
Aleksei S
088b2f6f28 Added an extra import module, did not pass coding style test 
CURA-5936
 2018-11-22 11:36:32 +01:00
Aleksei S
c765615f1a Merge branch 'master' into fix_version_upgrade_returning_none 2018-11-22 11:17:44 +01:00
Ian Paschal
ba7863c9d9 Fix type error for hovering manage queue link 
Contributes to CL-1148
 2018-11-22 11:09:35 +01:00
Jaime van Kessel
bf8a04fa40 Fix some minor display issues for simulation view 
CURA-5785
 2018-11-22 11:08:46 +01:00
Jaime van Kessel
d4e4e50741 Fix typo 2018-11-22 10:55:53 +01:00
Jaime van Kessel
7a8522ce72 Merge branch 'CURA-5785-Restyle_stage_menu' of github.com:Ultimaker/Cura into CURA-5785-Restyle_stage_menu 2018-11-22 09:38:06 +01:00
Jaime van Kessel
a9f0402f63 Made size of viewselector themable 
CURA-5785
 2018-11-22 09:37:36 +01:00
Diego Prado Gesto
cbee18597e Merge branch 'ui_rework_4_0' into CURA-5785-Restyle_stage_menu 2018-11-21 16:59:03 +01:00
Diego Prado Gesto
f866390c7b Fix an issue in the action panel. 
When the panel is created while the user is in the preview stage, the
row has no width.

Contributes to CURA-5786.
 2018-11-21 16:56:25 +01:00
Ghostkeeper
a826dfb156
Fix binding loop in height of view selection bar 
Since these were part of the childrenRect of the bar, and attached to the bottom of the bar, the childrenRect depended on the position of the children and that depends on the childrenRect again. So just attach it to the top, it's logical.

Contributes to issue CURA-5876.
 2018-11-21 16:12:00 +01:00
Ghostkeeper
a052b8ec69
Use Theme.getIcon instead of Theme.icons 
This is better for performance, according to the deprecation warning I got.

Contributes to issue CURA-5876.
 2018-11-21 16:08:29 +01:00
Ghostkeeper
eb056ee17b
Fix display of custom configuration 
Since it had no width, everything was resized to 0.

Contributes to issue CURA-5876.
 2018-11-21 16:06:26 +01:00
Diego Prado Gesto
a1f3ebc25b Fix typo. 
Contributes to CURA-5785.
 2018-11-21 13:58:21 +01:00
Jaime van Kessel
a9672458fd Update extruderIcon to be more in line with the design 
CURA-5785
 2018-11-21 13:46:50 +01:00