3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-24 23:23:57 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 9
28118 commits 307 branches 272 tags 787 MiB
Commit graph

8848 commits

Author SHA1 Message Date
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
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
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
Jaime van Kessel
80f99b0a59 Fix positioning of marketplace searchbar 
CURA-8762
 2022-02-22 15:03:57 +01:00
Jaime van Kessel
2c6ba3cd5d Update some USB printing items to controls 2 2022-02-22 11:58:14 +01:00
Jaime van Kessel
f347c6aedf Remove number of unused styles imports 2022-02-22 11:42:41 +01:00
casper
5a2e26eff6 Merge branch 'replace_controls_1_for_controls_2' into CURA-8685-replace_text_and_progress_bars 
# Conflicts:
#	plugins/PerObjectSettingsTool/PerObjectItem.qml
#	plugins/PerObjectSettingsTool/SettingPickDialog.qml
 2022-02-18 09:07:25 +01:00
Jaime van Kessel
58e6cde6e8 Remove incorrect refferents to btnOk 2022-02-17 15:10:18 +01:00
Jaime van Kessel
266214d651 Merge branch 'Ip_adress_dialog' of github.com:Ultimaker/Cura into replace_controls_1_for_controls_2 2022-02-17 15:08:02 +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
Jaime van Kessel
e66628e2da Merge branch 'CURA-8031_modifier_meshes_in_one_at_a_time_mode' of github.com:Ultimaker/Cura 2022-02-17 14:18:54 +01:00
j.delarago
61ba4426ad Add check for build plate number to modifier mesh list. 
CURA-8031
 2022-02-16 16:05:43 +01:00
j.delarago
a9a533b61d Duplicate modifier meshes for all objects in one at a time mode. 
CURA-8031
 2022-02-16 15:15:31 +01:00
Ghostkeeper
5fc89b6053
Merge branch 'patch-1' of https://github.com/inigoml/Cura into inigoml-patch-1 2022-02-16 12:46:47 +01:00
Jaime van Kessel
5f3b35b30d Use UM label for firmwareUpdater 
CURA-8685
 2022-02-15 17:17:54 +01:00
Jaime van Kessel
821581bc65 Remove ProgressBar style and use UM.ProgressBar instead 
CURA-8685
 2022-02-15 17:07:22 +01:00
Jaime van Kessel
40f835ed13 Replace labels for UM.Label in DiscoverUM3Action 
CURA-8685
 2022-02-15 15:51:07 +01:00
Jaime van Kessel
713a5cb4e5 Ensure that settingPickDialog uses the themed controls 
CURA-8685
 2022-02-15 15:38:08 +01:00
Jaime van Kessel
b45b3faa3c Replace textField in JobSpecs 
CURA-8685
 2022-02-15 15:32:29 +01:00
Jaime van Kessel
77b46868a6 Replace imagereader controls with styled variants 
CURA-8685
 2022-02-15 15:24:30 +01:00
casper
aeb433b2a1 Keep showing ip enter dialog after wrongly entered ip address 
In component discover um 3 dialog. After a "complete" action the
dialog will immediately close. This was undesired behaviour as we want
to keep the dialog active if an IP address is wrongly added.

Additionally, it is no longer necessary to close/hide the dialog after
a reject/accept as this is done by default.

CURA-8955
 2022-02-15 09:29:32 +01:00
casper
3f658a4914 Change UM.Dialog to Controls.Dialog in connect to printer by ip window 
As `UM.Dialog` is opened using in a new window, the error-confirmation
that was displayed in a `UM.Dialog` was displayed _behind_ the window
object.

CURA 8687
 2022-02-11 14:37:32 +01:00
Jaime van Kessel
cfb0604067 Clarify some documentation in the PerObjectSettingVisibilityHandler 
We often used shorthands for stack / instance / definition, but this made it
harder for people that are very familiar with the code to understand what is
going on.

Contributes to #11455
 2022-02-11 13:40:21 +01:00
casper
1c711129e2 Merge branch 'replace_controls_1_for_controls_2' into CURA-8687_dialogs 
# Conflicts:
#	resources/qml/Account/SyncState.qml
#	resources/qml/Preferences/ReadOnlySpinBox.qml
 2022-02-11 10:44:52 +01:00
Jaime van Kessel
7abe62a8ec Fix weird wrapping in monitor page 2022-02-10 11:29:14 +01:00
j.delarago
6f154ea444 Add new icon styles 
Change backup image name from icon to backup

Cura-8681
 2022-02-09 16:55:28 +01:00
casper
84ecc8d168 Remove unused imports 
CURA 8687
 2022-02-09 15:50:05 +01:00
j.delarago
1375b1c657 Remove unused QtQuick.Dialogs imports 
Cura-8687
 2022-02-09 14:56:06 +01:00
j.delarago
c57220f33c Fix search icon having no left padding in DF search bar. 2022-02-07 13:20:45 +01:00
j.delarago
85973f4a1a Center Align Checkbox in per model settings visibilty menu 2022-02-07 11:55:03 +01:00
Ghostkeeper
2606a3b847
Change remaining MessageDialogs to our version 
Contributes to issue CURA-8687.
 2022-02-04 15:49:06 +01:00
Evangelos Trantos
d7c3495509
Merge pull request #11328 from Ultimaker/CURA-8378_improve_checkbox_visibility 
Cura 8378 improve checkbox visibility
 2022-02-02 19:54:34 +02:00
Ghostkeeper
06bbeff21a
Merge branch 'marketplace_redesign' 2022-02-02 15:39:21 +01:00
Jaime van Kessel
56c25db83a Ignore the type of certifi 2022-02-01 13:47:14 +01:00