GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-04-23 14:19:37 +08:00
Code Issues Packages Projects Releases Wiki Activity
28,475 Commits 288 Branches 260 Tags
Commit Graph

8923 Commits

Author SHA1 Message Date
Jelle Spijker
12ee57e4ad
Merge branch 'master' into CURA-8640_PyQt6 
# Conflicts:
#	cura/UI/CuraSplashScreen.py
 2022-03-28 15:02:18 +02:00
Jaime van Kessel
f043750f70 Fix errors in workspace dialog 2022-03-25 10:29:36 +01:00
j.spijker@ultimaker.com
55cb86ebbd
use namespace AlignmentFlag 
Contributes to CURA-8640
 2022-03-24 11:58:42 +01:00
Jelle Spijker
3f8907d02a
Merge branch 'master' into CURA-8640_PyQt6 
# Conflicts:
#	cura/CuraApplication.py
#	resources/qml/Preferences/Materials/MaterialsSyncDialog.qml
#	resources/qml/Preferences/Materials/MaterialsView.qml
 2022-03-24 11:53:44 +01:00
c.lamboo
0dda27094e Fix textfield height for entering project name in DL 
from eccb @fvrmr
 2022-03-24 10:31:10 +01:00
j.spijker@ultimaker.com
34d6a2ba29
Credits given where credits due 
The Update copyright feature of Pycharm automatically removed the
mentioning of one of our main contributors in this license header.
Added it manually again, unchecked the Update Copyright check box from
the commit window (on the second attempt) and order is restored to the
universe.

Mea Culpa @fieldOfView, Mea Maxima Culpa
 2022-03-23 16:42:26 +01:00
j.spijker@ultimaker.com
54ccc12649
Drop support for CTM files 
Open CTM has been used 5 times on million of slices
the past year. Since OpenCTM seems to be abounded
since 2012 we have decided to drop support. There
are plenty of conversion tools for this file type
available.

See ultimaker/cura-build-environment#333456c068944ff6b3e7afb2f02a243f0f488371

Contributes to CURA-8640
 2022-03-23 16:28:58 +01:00
Casper Lamboo
d45c70142f
Merge pull request #11695 from Ultimaker/8980_Fix_buttons_in_USB_monitoring_ 
CURA-8980 fix buttons in usb monitoring
 2022-03-21 14:04:41 +01:00
casper
9b19eaf84f Add scroll bar to print monitor if content is overflowing 
Fixes https://github.com/Ultimaker/Cura/issues/11629

CURA-8980
 2022-03-21 11:27:47 +01:00
Ghostkeeper
e715017545
Adjust description of Change Retraction for rel. extrusion 
A patch-up until we have a real solution, as suggested in #11487.
 2022-03-20 19:49:12 +01:00
j.delarago
067cdda401 Add missing UM import 
CURA-9005
 2022-03-15 09:05:38 +01:00
Casper Lamboo
60f7b2dccb
Merge branch 'master' into CURA-9005_restyle_print_setting_category 2022-03-11 13:43:33 +01:00
casper
5701f42d63 Move CategoryButton to cura repo 
CURA-9005
 2022-03-11 13:11:36 +01:00
Ghostkeeper
25e914b1cb
Fix checkbox for automatic plug-in update checking 
The checkbox was still there in the preferences page, but it didn't work at all, for two reasons:
- The preference entry didn't exist. This was causing warnings in the log (which is why I saw it).
- It wasn't checking the preference before making that API call. Could make a bunch of people pretty angry.
 2022-03-11 10:25:31 +01:00
Ghostkeeper
d778b539c2
Parse up to 16 extruders 
CuraEngine supports up to 16, so we should allow at least that.
 2022-03-11 10:13:44 +01:00
Casper Lamboo
addc5e36a7
Apply suggestions from code review 
Co-authored-by: Jaime van Kessel <nallath@gmail.com>
 2022-03-11 09:59:20 +01:00
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
016cc4e48f Merge branch 'master' into CURA-9005_restyle_print_setting_category 2022-03-07 13:37:58 +01:00
j.delarago
eb88316eee Give PerObjectSettingsPanel.qml the same margin between settings as main settings 
CURA-9005
 2022-03-07 13:36:11 +01:00
j.delarago
dc5a1ae120 Remove redundant reference to spacer 
CURA-9005
 2022-03-07 13:26:50 +01:00
j.delarago
76d9cf6f4d Remove margins that keep listview items from being under the scrollbar. Instead set width of listView smaller so it doesn't overlap. 
Update per object setting visibility dialog to have same category design as SettingVisibilityCategory.qml and SettingCategory.qml

CURA-9005
 2022-03-07 13:20:05 +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.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