59 Commits

Author SHA1 Message Date
Ghostkeeper
0a75c772ed
Unrevert new icon set for all of Cura's interface
We created a new set of icons for Cura. These icons had to be reverted though because they weren't working out in the interface for the last release yet.
This unreverts them, basically adding them back hoping that we'll get them fixed in time for the next release.

Contributes to issue CURA-8342.

Revert "Revert "Fix merge conflict""

This reverts commit bb20e3307f43edc1ff53cb154d2351ddfe39e158.

Revert "Revert "Merge pull request #9716 from Ultimaker/CURA-8010_new_icons""

This reverts commit 70e4e9640e561e18a12870f30c905203ce8ccee7.

Revert "Revert "Fix typo in icon name""

This reverts commit 38ce22ba7c3f40b971bc6e1e0a8e776ca9d51512.

Revert "Revert "Add list for deprecated icons""

This reverts commit 119a957e7f978dbf1ddbcb3b0005bf38e8fed943.

Revert "Revert "Add Function icon""

This reverts commit 760726cf0bb953bb1b0fc277b448f419d4bd2544.

Revert "Revert "Switch out inherit icon""

This reverts commit 26afff609381e2004d194c280f504b6226859bd3.

Revert "Revert "Merge branch 'CURA-8205_Introduce_new_icons_in_Cura' of github.com:Ultimaker/Cura""

This reverts commit 6483db3d47ee052c1a966cdee3af7190577a5769.

Revert "Fix incorrect icons"

This reverts commit 02a4ade2a50a943ff36fd4895bdc9261cf2133eb.
2021-06-28 17:16:56 +02:00
Jaime van Kessel
70e4e9640e
Revert "Merge pull request #9716 from Ultimaker/CURA-8010_new_icons"
This reverts commit 6120d8a054b8c04bf90b8b3d3cb219d691bece2f, reversing
changes made to 95652556fef90f70adbf25bfa9bd3b8af7220d4a.
2021-05-27 16:06:20 +02:00
jelle Spijker
2bd6f28f3a
Update Icons
Subdivided the new icons in 3 size categories. As requested by UX
Used the company naming scheme for uniformity and easy recognition.

Known issues:
- Top/Bottom category wasn't taken into account by UX at the time. Since
 this is a recent addition. Both the Walls and Top/Bottom will be updated.
- Cloud/Network connection icons 12px don't render correctly. Due to the
 theme-ing.
- Extruder Icons do not render correctly.

CURA-8010_new_icons
2021-04-26 19:42:17 +02:00
Konstantinos Karmas
504f6dbe70
Revert "Cura 7813 qml modules version bump" 2021-03-30 09:48:28 +02:00
Konstantinos Karmas
180732788b
Merge pull request #9472 from Ultimaker/CURA-7813_QML_warnings
Cura 7813 qml modules version bump
2021-03-30 09:42:59 +02:00
Kostas Karmas
7827b36ab7 Fix QML warnings due to depricated on<signal> calls in Connections
As of 5.12, the signals used in connections should not be declared as on<signal>, but as
function on<signal>(arguments).
2021-03-30 09:02:48 +02:00
jelle Spijker
2986d50745
Update QtQuick and QtQuick.Controls
CURA-7813
2021-03-29 17:55:19 +02:00
Lipu Fei
65e1314538 Fix QML null warnings 2020-02-13 12:26:49 +01:00
Lipu Fei
15f4d1231b Fix QML null warnings 2020-02-13 12:11:25 +01:00
Jaime van Kessel
b6f5dd8f94 Fix display of long names in sync configuration menu 2019-02-05 13:31:50 +01:00
Diego Prado Gesto
551111bd60 Close the configuration panel when the user syncs with a configuration 2019-01-23 11:24:28 +01:00
Lipu Fei
d97b812ccd
Merge branch '4.0' into unify_font_types 2019-01-03 10:46:49 +01:00
Ghostkeeper
9e0a423f28
Disable visibility of glass buildplate configuration in sync menu
Because the build plate swapping is not implemented yet.
2019-01-02 13:30:29 +01:00
Jaime van Kessel
a16e406507 Properly display the full type + brand of unknown material
CURA-6033
2018-12-31 11:01:30 +01:00
Ghostkeeper
2277a3d316
Prevent syncing with invalid configurations
Contributes to issue CURA-6033.
2018-12-21 16:43:45 +01:00
Ghostkeeper
a720cca5b6
Fix background colour for dark theme
The default colour for Rectangle is white. So this Rectangle, not defining a colour, became white. Instead we should use an Item, which cannot have a background colour and thus becomes transparent, making the background colour the same as the button below, which was intended. It's also slightly faster to render.

Contributes to issue CURA-6033.
2018-12-21 16:40:24 +01:00
Ghostkeeper
5e98544541
Don't change the model depending on isValidMaterial
That would cause a circular dependency in a way.

Contributes to issue CURA-6033.
2018-12-21 16:33:16 +01:00
Ghostkeeper
e8ea742cf6
Retain binding with isValidMaterial on hover
So that if a material becomes valid, it updates this property.

Contributes to issue CURA-6033.
2018-12-21 16:27:38 +01:00
Aleksei S
c8994102da Use short for each javascript function
CURA-6033
2018-12-21 14:44:25 +01:00
Aleksei S
01783e7f68 Check material name instead of material brand
CURA-6033
2018-12-21 13:54:01 +01:00
Aleksei S
9430c421eb Code refactor
CURA-6033
2018-12-20 18:19:59 +01:00
Aleksei S
7cfb29e337 If a connected printer has a selected material which is unknown
for Cura then show a message for  downloading it from Marketplace
CURA-6033
2018-12-20 18:12:40 +01:00
Diego Prado Gesto
ef2fb53790 Merge branch '4.0' into unify_font_types 2018-12-19 11:56:22 +01:00
Diego Prado Gesto
382286509f Change the buildplate information to use a reusable component
Boy scouting.

Contributes to CURA-6025.
2018-12-19 09:49:12 +01:00
Jaime van Kessel
8091b2810c
Apply suggestions from code review
Change some margins for the corresponding absolute values instead of adding formulas.

Contributes to CURA-5876.

Co-Authored-By: diegopradogesto <d.pradogesto@ultimaker.com>
2018-12-13 14:36:58 +01:00
Diego Prado Gesto
a6a16a682d Fix some alignments
Also modify a bit the code in the ConfigurationItem, trying to get rid of a binding loop, but I couldn't (so weird)

Contributes to CURA-5876.
2018-12-12 11:17:44 +01:00
Diego Prado Gesto
f99c788eb6 Change some colors for the arrows in some setting selectors
Contributes to CURA-5876.
2018-12-11 16:35:59 +01:00
Diego Prado Gesto
1cd0d26db4 Change margins
Instead of using multiplications and divisions, just use the corresponding margins.

Contributes to CURA-5876.
2018-12-10 15:34:48 +01:00
Ghostkeeper
8e2c130416
Use default lining style as separator for buildplate
Normal colour, normal thickness.

Contributes to issue CURA-5876.
2018-12-07 14:31:06 +01:00
Ghostkeeper
48e15daf64
Fix height of scroll view and make scrollable
Contributes to issue CURA-5876.
2018-12-06 11:16:42 +01:00
Ghostkeeper
1544ab6cf0
Explicitly enable hover on ConfigurationItem
Apparently the default for this depends on some system setting. In Nallath's computer that system setting makes it false by default for some reason.

Contributes to issue CURA-5876.
2018-12-04 17:07:59 +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
Ghostkeeper
759b5b5847
Use anchors rather than a calculation with padding
It's supposed to be slightly more efficient.

Contributes to issue CURA-5876.
2018-12-04 14:23:41 +01:00
Ghostkeeper
0a71a9dd3e
Increase margins around configuration item
As per the design.

Contributes to issue CURA-5876.
2018-11-27 14:47:18 +01:00
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
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
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
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
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
Diego Prado Gesto
90e8a05aab Remove all the entries in the theme that make reference to the sidebar,
because there is no sidebar anymore.

Several different margins and linings were created depending on the
side, not depending on where it belongs.

Contributes to CURA-5784.
2018-10-26 17:51:28 +02:00
Diego Prado Gesto
15b35da612 Change the TopHeader name to MainWindowHeader, since there is nothing
more on the top than the header.

Contributes to CURA-5784.
2018-10-19 16:40:21 +02:00
Diego Prado Gesto
075a9a161f Create a component for the Views selector. This component contains the
list of the views and also the shortcuts for the camera position.

The theme colors, sizes and the styles have been updated.

Contributes to CURA-5784.
2018-10-08 12:57:16 +02:00
Aleksei S
f90f5f5180 Update available configuration button 2018-07-19 12:18:53 +02:00
fieldOfView
87555a38c4 Fix text rendering in the ConfigurationMenu 2018-05-25 21:40:30 +02:00