GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-21 01:59:09 +08:00
Code Issues Packages Projects Releases Wiki Activity
28,303 Commits 290 Branches 260 Tags
Commit Graph

8887 Commits

Author SHA1 Message Date
casper
fd3ef23784 Swap buttons in MonitorConfigOverrideDialog for cura buttons 
CURA-8975
 2022-03-09 12:23:21 +01:00
casper
70f66648f4 Recolor placeholder icon for packages/plugins correctly in dark-mode 
As we don't want to recolor the icon if the package has a custom icon
a `Image` or `UM.RecolorImage` is shown conditionally.

CURA-8975
 2022-03-09 12:10:49 +01:00
j.delarago
f58411d086 Merge branch 'master' into CURA-8943_tool_panel_icon_size 
# Conflicts:
#	resources/qml/ToolTip.qml
 2022-03-07 12:46:36 +01:00
j.delarago
e1068fb3bc Replace Text.Align with custom enum alignment 
CURA-8943
 2022-03-04 14:12:11 +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
78331d8e2a Merge branch 'feature-gcodereader-filament-diameter' of https://github.com/Wikunia/Cura 2022-03-03 15:08:31 +01:00
Jaime van Kessel
fcdc43fc71
Merge pull request #10788 from Ultimaker/replace_controls_1_for_controls_2 
Convert QtQuick.Controls 1 to QtQuick.Controls 2
 2022-03-03 12:52:13 +01:00
Ole Kröger
893da1ed38
Update plugins/GCodeReader/FlavorParser.py 
Co-authored-by: Jaime van Kessel <nallath@gmail.com>
 2022-03-03 11:03:33 +01:00
Ole Kröger
0ff94c6150
Update plugins/GCodeReader/FlavorParser.py 
Co-authored-by: Jaime van Kessel <nallath@gmail.com>
 2022-03-03 11:03:28 +01:00
Ole Kroeger
812bf2f4aa use current filament diameter 2022-03-02 14:25:05 +01:00
j.delarago
30083c13d3 Swap implicit width/height for preferredWidth/Height to avoid binding loop error 
CURA-8688
 2022-03-02 11:34:03 +01:00
j.delarago
50ac2eacc4 Fix property binding loop for height which was causing crashes when moving list items quickly up and down the list. 
CURA-8688
 2022-03-02 10:26:09 +01:00
j.delarago
b2bed4efdd Fix setting visibility styling working in one theme and not the other. 
CURA-8688
 2022-03-02 09:06:47 +01:00
casper
071ddfb2b1 Fix text elide/word wrap issue in monitor page 
The print job name wasn't elided causing the text to overflow the
progress bar card.

CURA-8688
 2022-03-01 12:38:54 +01:00
casper
862525bc90 Remove obsolete uses of system palette 
CURA-8688
 2022-03-01 12:29:09 +01:00
j.delarago
330b3f8119 Update settings visibility pages to have correct background color on categories 
CURA-8688
 2022-03-01 10:26:59 +01:00
casper
b60c82aa92 Merge remote-tracking branch 'origin/CURA-8688_qt6_cleanup' into CURA-8688_qt6_cleanup 2022-02-28 16:03:17 +01:00
casper
f31b8051df Fix darkmode issues in the Workspace dialog 
CURA-8688
 2022-02-28 15:59:56 +01:00
Jaime van Kessel
c6e2561dbb Fix styling for Machine Settings 
CURA-8688
 2022-02-28 13:19:56 +01:00
casper
6159ccbdc7 Fix darkmode issues in the DiscoverUM3Actions dialog 
CURA-8688
 2022-02-28 12:20:46 +01:00
casper
7f859651dd Merge remote-tracking branch 'origin/CURA-8688_qt6_cleanup' into CURA-8688_qt6_cleanup 2022-02-28 11:50:08 +01:00
casper
0a214b2c47 Fix dark mode issues Post processing plugin 
Also revamped the post-processing list a bit.

CURA-8688
 2022-02-28 11:41:21 +01:00
Jaime van Kessel
7fd6601b1a Apply theming to perObjectCategory 
CURA-8688
 2022-02-28 11:37:51 +01:00
j.delarago
e2fe50baf1 Merge branch 'replace_controls_1_for_controls_2' into CURA-8688_qt6_cleanup 
# Conflicts:
#	resources/qml/Widgets/Menu.qml
#	resources/qml/Widgets/MenuItem.qml
#	resources/themes/cura-dark/theme.json
#	resources/themes/cura-light/theme.json
 2022-02-28 08:51:42 +01:00
Jaime van Kessel
c356d37e06 Remove monitor_icon_size from theme 2022-02-25 14:32:34 +01:00
Jaime van Kessel
75ec6f508c Remove unneeded fixed line hight properties 
No idea why this was even done, but there just isnt' a reason to use these.
 2022-02-25 14:27:47 +01:00
Jaime van Kessel
3f4f7f0fcf Remove some extra unneeded theme stuff for monitor page 2022-02-25 14:12:25 +01:00
Jaime van Kessel
5f638ed6c6 Generalize the size of the licence window 
No need to have a seperate size of the licence window. Just use
the default modal one
 2022-02-25 13:22:55 +01:00
Jaime van Kessel
2327a71642 Remove monitor margin 
No idea why it was even there as it's own size.
 2022-02-25 13:16:59 +01:00
casper
4a71278d7c Fix monitor page 
CURA-8688
 2022-02-25 10:54:03 +01:00
Ghostkeeper
60c91b5680
Fix crash when visible_settings is missing from pre-4.8 project files 
Found this while testing the new Qt interface.
 2022-02-24 16:31:32 +01:00
Jaime van Kessel
f9e6135fca Merge branch 'master' of github.com:Ultimaker/Cura into replace_controls_1_for_controls_2 2022-02-24 13:44:21 +01:00
Casper Lamboo
9fa6698da3
Merge pull request #11536 from Ultimaker/CURA-8834_marketplace_packages_install_status_in_list 
Show install, uninstall & disable buttons in packages list
 2022-02-24 13:39:49 +01:00
Jaime van Kessel
26c027cbdf Remove unneeded properties from package card 
As per review.

CURA-8762
 2022-02-24 13:30:25 +01:00
Jaime van Kessel
0d2c8777c5 Add clarifying comment to a small hack 
CURA-8762
 2022-02-24 13:28:39 +01:00
Jaime van Kessel
19e43e8b66
Apply suggestions from code review 
CURA-8762

Co-authored-by: Casper Lamboo <c.lamboo@ultimaker.com>
 2022-02-24 13:26:28 +01:00
Jaime van Kessel
095b8dc5dd Show install, uninstall & disable buttons in packages list 
This splits up the single show controls property into three seperate ones
and no longer hides installed packages from the plugin & materials list

CURA-8834
 2022-02-23 16:51:26 +01:00
j.delarago
7a2b609b32 Left Margin for Listview items was doubled. Remove margin to left align text with "Add a script" button. 
Swap default buttons for Cura.Primary/Cura.Secondary Buttons

CURA-8688
 2022-02-23 15:28:38 +01:00
casper
e03176a1fa Replace UM.MessageDialog with newly added Cura.MessageDialog 
This dialog is different from the `UM.MessageDialog` in that it

CURA-8688
 2022-02-23 14:09:38 +01:00
Jaime van Kessel
df9d2d85c4 Add help links to banners 
CURA-8762
 2022-02-23 10:12:21 +01:00
Jaime van Kessel
35f1ad4097 Remove read more button on packagecard 
CURA-8762
 2022-02-23 09:59:12 +01:00
Jaime van Kessel
3b801e9f18 Change top external button to point to marketplace website 
CURA-8762
 2022-02-23 09:57:04 +01:00
Jaime van Kessel
d29b00b4be Let readmore point towards marketplace URL 
CURA-8762
 2022-02-22 16:38:47 +01:00
Jaime van Kessel
7926a2bbdc Add placeholders for material & plugin icons 
CURA-8762
 2022-02-22 16:33:52 +01:00
Jaime van Kessel
0d85b2be7f Ensure that scrollbar is centered 
CURA-8762
 2022-02-22 16:07:11 +01:00
Jaime van Kessel
a36fedabe5 Remove unused fontMetrics objects 
CURA-8762
 2022-02-22 15:53:07 +01:00
Jaime van Kessel
ac6375d17b Don't nest all content in background rect 
This way we don't have an extra identation depth, makes it a bit easier to read

CURA-8726
 2022-02-22 15:47:48 +01:00
Jaime van Kessel
a05650f64c Fix margins for OnboardBanner 
Re-usable components shouldn't really be setting layout themselves.
This should be done by whomever creates them.

The actual fix is that the banner no longe sets all margins, only left & right

CURA-8726
 2022-02-22 15:44:30 +01:00
Jaime van Kessel
0b39fb1c91 Hide download count in manage page 
CURA-8726
 2022-02-22 15:18:49 +01:00
Jaime van Kessel
adfb78e38a Fix spacing 
CURA-8762
 2022-02-22 15:11:11 +01:00