102 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
9da321ffb9
Update Layouts, Control.Styles and Dialogs
CURA-7813
2021-03-29 18:04:47 +02:00
jelle Spijker
2986d50745
Update QtQuick and QtQuick.Controls
CURA-7813
2021-03-29 17:55:19 +02:00
Jaime van Kessel
464c19f592
Show print weight with single decimal in the details view
Fixes #9176
CURA-7992
2021-01-26 10:29:55 +01:00
Nino van Hooff
6d56b52913 Revert "Fix binding loop in action panel widget"
Fix improper player slider layout which was introduced in 5cfe71e5
2020-04-02 15:15:05 +02:00
Ghostkeeper
5cfe71e516
Fix binding loop in action panel widget
This widget can't set its width to the width of its children, since its children anchor to its right-hand side which depends on the width.
This fixes the following warning in the log:
2020-03-20 14:25:20,351 - WARNING - [MainThread] UM.Qt.QtApplication.__onQmlWarning [406]: file:///home/trin/Gedeeld/Projects/Cura/plugins/PrepareStage/PrepareMain.qml:16:5: QML ActionPanelWidget: Binding loop detected for property width

Done during Turbo Testing and Tooling.
2020-03-20 14:52:33 +01:00
Thomas Karl Pietrowski
cfc296de37
Update ActionPanelWidget.qml
Find this whitespace strange. Shouldn't this normally give an error? Or is this allowed due to the syntax?
2019-09-28 10:36:05 +02:00
Mark Burton
cfea12ab25 Fix dimensions of print job information popup when using Qt 5.13.
Remains compatible with Qt 5.10.
2019-07-24 20:35:39 +01:00
Ghostkeeper
bb49acbb7f
Use correct font for material estimates
Otherwise it uses the system defaults.
2019-07-10 14:42:26 +02:00
Jaime van Kessel
27f60a6d5d Directly show feedback when pressing the slice button
CURA-6034
2019-05-29 16:32:43 +02:00
Ghostkeeper
5b8d2243f7
Change time/material 'specification' into 'estimation'
Because that's what it is and how you should use it.
2019-05-08 10:24:21 +02:00
Ghostkeeper
ae9395aebb
Merge branch 'master' into WIP_onboarding 2019-04-03 11:53:40 +02:00
Ghostkeeper
df32f3e263
Move Cura.ProgressBar to Uranium
It is not specific to 3D printing.

Contributes to issue CURA-6057.
2019-04-03 11:51:57 +02:00
Jaime van Kessel
8ae0c695bd Add total cost to the output overview.
This fixes #5529
2019-04-02 11:09:12 +02:00
Lipu Fei
11252ce0f7 Merge remote-tracking branch 'origin/WIP_onboarding' into WIP_onboarding_machine_action 2019-03-21 15:00:15 +01:00
Lipu Fei
4e5d08f320 Fix merge conflicts with master 2019-03-21 14:59:53 +01:00
Lipu Fei
3911c3d73d WIP: Cleanup and unify MachineAction styles 2019-03-19 15:40:44 +01:00
Ghostkeeper
cb44223eca
Consistent capitalisation 2019-03-18 15:16:49 +01:00
Lipu Fei
51c773fd80 WIP: Make reusable widget CuraProgressBar 2019-02-28 08:06:28 +01:00
Jaime van Kessel
6ff1f49c34 Ensure the layout gets the right width & height for the output devices popup
CURA-6222
2019-02-14 17:21:54 +01:00
Remco Burema
5c54cb740a Fix dark-theme material-estimates-panel (and layout-issues). [CURA-6174] 2019-02-05 13:24:28 +01:00
Ghostkeeper
a831cfa558
Configure whether preview shortcut is visible from ActionPanelWidget property
This way it's more dynamic: You don't need to hardcode the plug-in name in the widget to see whether or not it's visible.

Contributes to issue CURA-6086.
2019-02-04 15:19:09 +01:00
Ghostkeeper
5992e66ed6
Move action panel into each stage
They can then decide if it needs to be there. For instance, the monitor stage doesn't want to have this panel. Also each stage can position it where they like, and in the near future I'll make a feature to let it decide whether or not to show the preview button.

Contributes to issue CURA-6086.
2019-02-04 15:08:59 +01:00
Jaime van Kessel
e6f722b29c Move additional component loader into ActionPanelWidget 2019-01-31 17:13:32 +01:00
Lipu Fei
1f21eed14f Add Text.NativeRendering for Labels
CURA-6141
2019-01-28 09:05:43 +01:00
Lipu Fei
c6ff8149f6 Remove colon according to design
CURA-6141
2019-01-28 09:04:08 +01:00
Lipu Fei
71b2787d0d Use Label
CURA-6141
2019-01-28 08:48:02 +01:00
Remco Burema
3d413ceb2c MaterialInfo: Tweak text-alignment/layout. [CURA-6141] 2019-01-26 11:43:15 +01:00
Remco Burema
e7ff70870f MaterialInfo: Also replace HTML-text with QML-elements for 'by line-type'. [CURA-6141] 2019-01-26 11:25:38 +01:00
Remco Burema
7fdbb11f49 MaterialInfo: Put height and fonts by QML-elements for 'by material-type'. [CURA-6141] 2019-01-24 21:56:57 +01:00
Remco Burema
654cd8e645 MaterialInfo: Begin replace HTML-text with QML-elements for 'by material-type'. [CURA-6141] 2019-01-24 18:08:02 +01:00
Remco Burema
f057c9a7df Prevent spurious updates to 'onPreferenceChanged's if the preference doesn't match. 2019-01-15 17:15:12 +01:00
Jaime van Kessel
cbeadb2343 Set the font of the time estimation to medium bold
This way it will also fit when a very long time is used in german.
If we don't do this, 14 Tages 12 Stunden 33 Minuten didn't fit.

CURA-6097
2019-01-11 14:47:59 +01:00
Jaime van Kessel
ff79e91686 Move the additional components for the save button out of the action panel
CURA-6097
2019-01-10 16:32:43 +01:00
Diego Prado Gesto
03b4121d22 Fix broken shortcut for slice or stop slicing. 2019-01-10 13:59:22 +01:00
Lipu Fei
d97b812ccd
Merge branch '4.0' into unify_font_types 2019-01-03 10:46:49 +01:00
Jaime van Kessel
3505eb321f Also add space for the savebutton additional components with the output widget
CURA-6043
2019-01-03 09:42:22 +01:00
Jaime van Kessel
71632fd098 Add the postProcessing button back next to the slice button
CURA-6043
2019-01-02 13:53:35 +01:00
Ghostkeeper
6092402a87
Fix 'Slicing...' message when not autoslicing
Also changes the 'auto slicing' text to just 'slicing', because that's more what the user expects.
Discussed with UX.

Contributes to issue CURA-6025.
2018-12-31 15:44:09 +01:00
Ghostkeeper
66aeb2d1dd
Give print time estimate a large font
Contributes to issue CURA-6025.
2018-12-31 14:28:51 +01:00
Jaime van Kessel
f9e76aa6c9 Merge branch 'feature_resize_settings_panel' of github.com:Ultimaker/Cura into 4.0 2018-12-31 10:09:33 +01:00
Jaime van Kessel
52d97dfbd2 Change back the behavior of the output device selector to the old way
Although the new way was discussed with our UXers, we got a number of reports that it was confusing.
I also accidentally started a print while using it
2018-12-31 09:32:16 +01:00
Ghostkeeper
b7a23399f5
Move action panel in front of settings panel
The settings panel can now be so long that they overlap (if the user so chooses). This causes the action panel to be hidden behind the settings. We'd prefer to show the action panel in front, always.

Contributes to issue CURA-6054.
2018-12-24 15:37:48 +01:00
alekseisasin
facf1428d6
Merge pull request #5020 from Ultimaker/CURA-6004_missing_tooltips
Cura 6004 missing tooltips
2018-12-21 14:57:06 +01:00
Jaime van Kessel
3f599bd06f Ensure that the tooltip text is translated
CURA-6004
2018-12-20 16:31:57 +01:00