GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-04-29 15:25:02 +08:00
Code Issues Packages Projects Releases Wiki Activity
31,753 Commits 288 Branches 260 Tags
Commit Graph

71 Commits

Author SHA1 Message Date
Jaime van Kessel
f13ec6526b Disable the running property of the action button by default 
This would cause scene updates to be drawn all the time, causing
constant cpu drain.
 2022-05-03 13:45:56 +02:00
c.lamboo
45bc498c7f Replace RecolorImage with ColorImage 
CURA-8640
 2022-04-08 15:55:34 +02:00
j.delarago
62c1e37e04 Fix button heights 
CURA-8640
 2022-04-05 17:25:19 +02:00
Jaime van Kessel
f436c97abd Roughly strip out the GraphicalEffects 
For some reason qt6 that we built still didn't like it.

Since we wanna know if the rest works, yeeting that stuff out for now
 2022-03-28 16:11:28 +02:00
j.spijker@ultimaker.com
ff21c93f9b
Qt6 dropped QtGraphicalEffects 
https://doc.qt.io/qt-6/qtgraphicaleffects5-index.html

Contributes to CURA-8640
 2022-03-28 15:33:43 +02:00
Jaime van Kessel
58a63aed02 Remove "cornerSide", "shadowColor" and "shadowEnabled" from ActionButton 
CURA-7810
 2022-03-24 13:56:14 +01:00
j.delarago
3c7498feed Move ToolbarButton and ToolTip from Cura into Uranium. This makes it possible to use new styled ToolbarButton in plugins/Tools for the rotate tool. 
Removed the ContentAlignment enum in ToolTip in favour of using the Text.ContentAlignment enum. For some reason references to this enum fail everywhere when ToolTip is moved into Uranium. There is some evil time-wasting magic cast on this component!

CURA-8943
 2022-03-03 15:53:30 +01:00
Jaime van Kessel
f682f56923 Merge branch 'master' of github.com:Ultimaker/Cura into replace_controls_1_for_controls_2 2022-02-17 15:02:03 +01:00
Ghostkeeper
efcd00e2f3
Merge branch 'master' into marketplace_redesign 
Conflicts:
	plugins/DigitalLibrary/resources/qml/SelectProjectPage.qml -> Some things were probably accidentally committed here and then later also changed in master.
 2022-01-20 15:57:28 +01:00
Ghostkeeper
e0a6cb3383
Merge branch 'master' into replace_controls_1_for_controls_2 
Conflicts:
	resources/qml/Actions.qml -> Translation fixes on master, while the QML elements were changed here for Controls2.
 2022-01-18 17:17:10 +01:00
Ghostkeeper
348abad6eb
Fix maximumWidth properties on ActionButtons 
Turns out this wasn't really functional. We didn't use it. Now we use it for the MessageStack.

Contributes to issue CURA-8682.
 2022-01-14 19:43:44 +01:00
Ghostkeeper
c117b61503
Also use proper icon size for left icon 
Almost forgot!

Contributes to issue CURA-8565.
 2021-11-29 12:03:03 +01:00
Ghostkeeper
0337c1c776
Allow changing the icon size 
But use the same default as what was previously hard-coded. Now we can have buttons with non-standard icon sizes then, e.g. if the button size itself is also non-standard.

Contributes to issue CURA-8565.
 2021-11-29 11:57:12 +01:00
Jaime van Kessel
83be495414 Replace usage of controls label with our custom label 
This prevents copy pasting a bunch of parameters that we set by default
 2021-11-10 16:37:26 +01:00
luz paz
d68f375e38 Fix various typos 
Found via `codespell -q 3 -S *.po,*.pot -L childs,initialy,lod,ned,te,slicable,sur,tutoriels,wont`
 2021-09-07 11:33:54 -04:00
Konstantinos Karmas
f643f19af6 Fix tooltip not shown when the tooltip text is too long 
When the tooltip text is too long and the tooltip width ends up being longer than the window it is supposed to be drawn into, the tooltip is not drawn at all. This commit fixed that by allowing the tooltip width of the ActionButton to be changed within QML, limiting it to a certain size that fits the purpose.

CURA-8112
 2021-07-13 17:30:30 +02:00
Remco Burema
e4710dd921
ActionButton is a RoundedRectangle once more. 
We want to deprecate the API, not break it (yet).

part of CURA-8012
 2021-07-06 09:06:47 +02:00
Remco Burema
e3dc5bc460
Adjust color-scheme for button restyle. 
Also changed ligh theme.

part of CURA-8012
 2021-07-02 09:39:33 +02:00
Remco Burema
e5d77a46d6
Remove 'roundedness' and 'shadow' from action-buttons. 
Per the new UI design. Keep them as deprecated properties, so we may not need a major API/SDK increase just yet.

contributes to CURA-8012
 2021-06-30 17:04:55 +02:00
Konstantinos Karmas
504f6dbe70
Revert "Cura 7813 qml modules version bump" 2021-03-30 09:48:28 +02:00
jelle Spijker
3baa71fd48
Update QtGraphicalEffects, Window and Dialogs 
CURA-7813
 2021-03-29 18:12:35 +02:00
jelle Spijker
2986d50745
Update QtQuick and QtQuick.Controls 
CURA-7813
 2021-03-29 17:55:19 +02:00
Jaime van Kessel
200e3d6ee7
Add tertiary button as a reusable component 
CURA-7418
 2020-06-15 13:19:50 +02:00
Ghostkeeper
9404fe0fb9
Fix getting contentWidth in variable width mode 
Undefined seems to work fine as well though.

Done during Turbo Testing and Tooling to reduce the number of warnings in our log.
 2020-06-05 15:18:10 +02:00
Kostas Karmas
306f58f96e Fix contentWidth reference error in ActionButton 2020-06-05 14:13:36 +02:00
Nino van Hooff
9d9753cb45 Fix: Using onCompleted would break the binding. So Use a Binding instead 2020-04-02 16:31:29 +02: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
fieldOfView
67af1aa19d Fix the positioning of multi-line tooltip anchor-points 2020-02-28 23:00:56 +01:00
fieldOfView
ddbd843d91 Fix showing tooltips for actionbuttons that have a tooltip text set 2020-02-28 22:31:34 +01:00
Ghostkeeper
0190247c5a
Don't show tooltip if it shows the same text as the button 
It's only useful if the text on the button gets elided.
 2019-06-14 14:17:10 +02:00
Diego Prado Gesto
a793a06b60 Add a maximumWidth to the ActionButton 
In case the text is too long, it can exceed the limits of the container. This is an optional flag that will work only in case it's set up.

Contributes to CURA-6412.
 2019-03-22 17:10:42 +01:00
Jaime van Kessel
4151050127 Setting the height of an action button now actually changes it's size 
CURA-6115
 2019-01-29 12:57:05 +01:00
Diego Prado Gesto
c11e0cecc8 Remove loading gif 
Instead of an external gif, use the BusyIndicator that exists in the ActionButton.
 2019-01-13 16:58:38 +01:00
Lipu Fei
f7fb04d4ae Fix merge conflicts with 4.0 2019-01-03 15:25:40 +01:00
Lipu Fei
136317c3c7 Fix code styles 
CURA-6005
 2019-01-03 11:26:14 +01:00
Jaime van Kessel
0965d909c0 Remove the show property from the tooltip 
This was a bit of a weird setup, so i removed it. This way the tooltip can be used
in the same way as the regular tooltip (by simply setting the visibility)

CURA-6004
 2018-12-20 16:41:26 +01:00
Aleksei S
3953c7bb3a Added Tooltip alignment 
CURA-6004
 2018-12-19 14:24:02 +01:00
Diego Prado Gesto
17cddac024 Merge branch '4.0' into CURA-6004_missing_tooltips 2018-12-19 09:03:31 +01:00
Diego Prado Gesto
02825a062f Change the remove and the info buttons 
Contributes to CURA-6005.
 2018-12-17 13:38:41 +01:00
Diego Prado Gesto
b7904d6e05 Unify the CuraDrive plugin with the rest of the items in Cura 
For instance, the buttons were converted to either primary buttons or secondary buttons. A new CheckBox component was created in Cura in order to reuse it in the future.

Contributes to CURA-6005.
 2018-12-17 13:04:23 +01:00
Diego Prado Gesto
ed8292c472 Adjust size and margins of the icon in the action button 
Contributes to CURA-5876.
 2018-12-11 17:00:02 +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
2bf641efcf Add a Cura Tooltip to show in some buttons 
Contributes to CURA-6004.
 2018-12-10 09:09:58 +01:00
Diego Prado Gesto
3b8b70bddf Merge branch 'ui_rework_4_0' into CURA-5941_restyle_setting_dropdown 2018-12-06 16:35:07 +01:00
Diego Prado Gesto
4b79770d58 Align the buttons in the output process widget 
The menu in the output device selector has now a rounded corner.
 2018-12-06 13:42:29 +01:00
Diego Prado Gesto
07d58c3aef Merge branch 'ui_rework_4_0' into CURA-5941_restyle_setting_dropdown 2018-12-05 13:56:21 +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
2fdfdaa00b
Rename iconOnRightSide to isIconOnRightSide 
More accurately represents the type of value that's in this property.

Contributes to issue CURA-5876.
 2018-12-04 14:47:34 +01:00
Ghostkeeper
a1f579a528
Improve wording of iconOnRightSide documentation 
Contributes to issue CURA-5876.
 2018-12-04 14:01:49 +01:00
Diego Prado Gesto
f67c725b2a Merge branch 'CURA-5941_restyle_setting_dropdown' of github.com:Ultimaker/Cura into CURA-5941_restyle_setting_dropdown 2018-11-29 14:03:39 +01:00