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

9131 Commits

Author SHA1 Message Date
j.spijker@ultimaker.com
ca430c80be
Change imported namespace pySavitar to Savitar 
Because we had to rename our Python bindings module from Savitar to
pySavitar we also changed our import downstream (Cura and Uranium). But
in order to limit the changes on our existing code we decided during the
review that we should just import pySavitar as Savitar.

Contributes to CURA-7924
 2022-02-28 10:44:16 +01:00
j.spijker@ultimaker.com
47588393e8
Use Arcus as namespace 
Because we had to rename our Python bindings module from Arcus to pyArcus
we also changed our import downstream (Cura and Uranium). But in order
to limit the changes on our existing code we decided during the review
that we should just import pyArcus as Arcus.

Contributes to CURA-7924
 2022-02-28 10:41:24 +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
Remco Burema
7511ac843e Changes needed wrt how we build Savitar with Sip 6. 
part of CURA-7924
 2022-02-25 14:31:51 +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
Remco Burema
08c49c6c13 Changes needed wrt how we build Arcus with Sip 6. 
part of CURA-7924
 2022-02-25 14:27:06 +01:00
Jaime van Kessel
3f4f7f0fcf Remove some extra unneeded theme stuff for monitor page 2022-02-25 14:12:25 +01:00
Remco Burema
99449dbc34 Get rid of some errors first. 
Was using Qt5 still, even though we're dumping that. Need a bit of a level playing field for an update to the way we handle libArcus and libSavitar.

part of CURA-7924
 2022-02-25 13:25:35 +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
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
j.delarago
bc4222c34f Remove comments 
CURA-8688
 2022-02-22 09:16:50 +01:00
j.delarago
0b581c0e32 Update buttons in firmware page. 
CURA-8688
 2022-02-21 16:18:44 +01:00
Ghostkeeper
c7d7dd11d1
Merge branch 'master' into PyQt6_upgrade 
Conflicts:
	cura/PlatformPhysics.py -> Removed shapely on master, while QTimer import got updated to Qt6.
	plugins/Toolbox -> Entire folder is deleted in master, but it was updated to Qt6 here. This can all be removed.
 2022-02-21 11:52:28 +01:00
j.delarago
26434f3db9 SettingPickDialog was very wide due to the screen factor scaling being removed. This gives it a fixed width the same as other dialogs. 
CURA-8688
 2022-02-21 11:19:14 +01:00
j.delarago
c00eb5b432 Align checkbox with category icon in per object visibility settings dialog and preferences visibility settings. 
Move "Information" icon to the right of checkboxes in settings visibilty preferences page. This allows clean aligning of checkboxes with category icon.

CURA-8688
 2022-02-18 18:15:48 +01:00
j.delarago
d333b4639c Align per object settings visibility checkbox with icon 
CURA-8688
 2022-02-18 17:20:49 +01:00
casper
7be54a47ec Use cura-styled button in settings pick dialog 
CURA-8688
 2022-02-18 16:00:03 +01:00
casper
26470440f0 Update buttons in work space dialog 
Use Cura-styled buttons
Use dialog accecpt-reject handlers

CURA-8688
 2022-02-18 14:21:37 +01:00
casper
67c80e8a37 Update image loader dialog 
- Changed the slider to a Cura.Spinbox
- Use Cura-styled buttons

CURA-8688
 2022-02-18 14:02:09 +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