GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-14 18:48:02 +08:00
Code Issues Packages Projects Releases Wiki Activity
26,552 Commits 290 Branches 260 Tags
Commit Graph

26552 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Konstantinos Karmas
fe640d42cf Don't crash if a material fails to be written in the zip 
This fixes Sentry issue CURA-2WS.
 2021-09-21 09:33:30 +02:00
Konstantinos Karmas
0d932991d4 Rename ApplicationSwitcher.svg to BlockGrid.svg 
Since it is the original filename in the design.

CURA-8421
 2021-09-20 17:24:06 +02:00
Konstantinos Karmas
fea8ecd55f Rename the qml elements and the theme entries used in AppSwitcher 
To some more sensible names (hopefully).

CURA-8421
 2021-09-20 17:19:37 +02:00
Ghostkeeper
17011e4991
Merge branch 'master' into UMH-2021_ribbed_vaults_infill 2021-09-20 17:13:31 +02:00
Konstantinos Karmas
d844c5f70a Fix alignment of the ApplicationSwitcher button 
The sign in button has a different size when you are logged in, where the account avatar was being drawn in the middle of the Sign In button. This was causing a weird alignment of the ApplicationSwitcher next to it, as it was adding an extra margin.

This is now fixed by making sure that the width of the button that has to do with account adjusts according to whether you are logged in or not. This makes the ApplicationSwitcher icon move when you log in but looks more natural relatively to the account button.

CURA-8421
 2021-09-20 16:57:16 +02:00
Konstantinos Karmas
a9968acd6d Fix misalignment of images if the displayName spans to next line 
When the displayname of the app is long and it spans to the next line, it was pushing the icon up in the column, making it seem like it is misaligned. This is now fixed and the icons should be aligned regardless if the display name has one or two lines.

CURA-8421
 2021-09-20 16:42:22 +02:00
Ghostkeeper
82922fd738
Merge branch 'CURA-8421_Introduce_app_switcher' into CURA-8422_add_platform_links 2021-09-20 16:36:49 +02:00
Ghostkeeper
c518f0de93
Add links to Ultimaker's platform websites 
The links are not final since they will need some campaign tags. For the rest it should be more or less done.

Contributes to issue CURA-8422.
 2021-09-20 16:36:26 +02:00
Konstantinos Karmas
15884a66e8 Warp and elide ApplicationButton display name 
To make sure that it properly fits in the available space.

CURA-8421
 2021-09-20 15:58:53 +02:00
Jaime van Kessel
ee96080540 Only return the path if the folder actually exist 
It seems that the dialog is acting up if the last known folder doesn't
exist anymore (usually when a network drive was unmounted).
 2021-09-20 15:43:04 +02:00
Konstantinos Karmas
570fb3cf93 Introduce the ApplicationSwitcher widget 
It includes only the hardcoded model with the Ultimaker links for now.

CURA-8421
 2021-09-20 15:33:05 +02:00
Konstantinos Karmas
1305abac6f Merge branch 'master' of https://github.com/Ultimaker/Cura 2021-09-20 15:27:32 +02:00
Ghostkeeper
a1ecea020c
Catch errors when backing up the preferences file 
The file may not exist. In fact, that may be the whole reason why people want to restore a back-up. Try it, and give an error if it fails.

Fixes Sentry issue CURA-2QT.
 2021-09-20 15:13:34 +02:00
Ghostkeeper
f50e16d30e
Merge branch 'master' into UMH-2021_ribbed_vaults_infill 2021-09-20 09:55:55 +02:00
Ghostkeeper
efcd83f82f
Merge branch 'CURA-8566_Update_filename_after_saving' 2021-09-17 15:30:52 +02:00
Ghostkeeper
0a080a1def
Increase SDK version to 7.8.0 
We need to check for this new version because of the new functionality needed by the Digital Library plug-in.

Contributes to issue CURA-8566.
 2021-09-17 15:15:25 +02:00
Barnaby Gray
59c8858559 FilamentChange: Fix unload on marlin based printers 
See related #10038. This fixes the issue by referencing the gcode flavor set for the machine.
 2021-09-16 07:14:52 +01:00
Konstantinos Karmas
3e143a012a Change the setting version to 19 
Since the setting version 18 is used in the arachne beta build, we decided to make the the setting version to 19 in the normal releases, so that we make sure that projects made in arachne beta won't use any version upgrade scripts if a user attempts to open them in 4.12.

CURA-8510
 2021-09-15 16:25:04 +02:00
Jaime van Kessel
11b1998156 Fix single instance 
CURA-7916
Fixes #3116
 2021-09-15 16:22:58 +02:00
Jaime van Kessel
c497e61d9d Merge branch 'feature_single_instance_clear_before_load' of https://github.com/fieldOfView/Cura 2021-09-15 16:18:54 +02:00
Konstantinos Karmas
880eabb558 Add the VersionUpgrade411to412 to the bundled plugins 
Due to its name, it will end up between the VersionUpgrade41to42 and VersionUpgrade42to43 in the list of installed plugins, but that's not really that big of an issue.

CURA-85100
 2021-09-15 16:04:02 +02:00
Konstantinos Karmas
6d9978e8f3 Always set the project name as the one provided by the user 
There was an inconsistent behavior between saving a project file to disk (where the printer short name was readded after saving) and saving to the DigitalLibrary (where the printer short was NOT added again).

This commit fixes that by making sure that whatever the user put as the name of the file, will be the name of the project within Cura.

CURA-8566
 2021-09-15 14:37:53 +02:00
Konstantinos Karmas
52c224c779 Revert "Revert "Only change project name when saving to project files."" 
This reverts commit 9e2b556ce8f28294f9b44a3d8801af42043d3956.
 2021-09-15 12:26:30 +02:00
Konstantinos Karmas
87add2c8de Revert "Revert "Use optional last output (file) name from output-dev to set project name."" 
This reverts commit 24ff3692bd5b73828a1c5a58cdd55400cdddad9c.
 2021-09-15 12:26:18 +02:00
Konstantinos Karmas
98eba28885 Revert "Revert "Set the job name whenever the workspaceLoaded is called"" 
This reverts commit a6a69c249cfc96e19ace64ec01aa7e4fc07a76d1.
 2021-09-15 12:25:13 +02:00
Ghostkeeper
453b666b1d
Increment setting_version to 18 
We now have version 18, where Flsun Super Racer has customised profiles.
Nothing changes in the built-in profiles. It only needs a change in the machine instances.

Contributes to issue CURA-8510.
 2021-09-14 16:32:43 +02:00
Ghostkeeper
cb47c88b2d
Don't override the setting version 
It should get inherited from fdmprinter or fdmextruder.

Found during work on CURA-8510.
 2021-09-14 16:27:17 +02:00
Ghostkeeper
7521e174b0
Add version upgrade for Cura 4.12 
Yep, there's gonna be a 4.12.

Contributes to issue CURA-8510.
 2021-09-14 16:23:38 +02:00
Konstantinos Karmas
395aa58a3f Revert "Merge branch 'master' of https://github.com/Ultimaker/Cura" 
This reverts commit 6caa6576106878e9983b48266201d2e32f40ef18, reversing
changes made to 4e89ee0cccabdef3c0ec8209ad9208466eef0633.
 2021-09-14 16:07:23 +02:00
Konstantinos Karmas
6caa657610 Merge branch 'master' of https://github.com/Ultimaker/Cura 2021-09-14 16:06:42 +02:00
Konstantinos Karmas
4e89ee0ccc Check against the correct SDK version 
Since the `self.setLastOutputName` is available in 4.12 (SDK 7.8.0) onwards.

CURA-8566
 2021-09-14 16:05:04 +02:00
Ghostkeeper
c5ca4850f1
Ignore CuraRemoteSupport 
It's something that all Cura developers should be maintaining.
 2021-09-14 15:42:34 +02:00
Jaime van Kessel
c593f62271 Only set the lastOutputName if the SDK is high enough 
This ensures that the DF plugin is backwards compatible

CURA-8358
 2021-09-14 14:43:10 +02:00
Ghostkeeper
8ed2e7bd44
Increment version number of Digital Library plug-in to 1.1 
Contributes to issue CURA-8551.
 2021-09-10 16:49:14 +02:00
Ghostkeeper
a6a69c249c
Revert "Set the job name whenever the workspaceLoaded is called" 
This reverts commit 6ad358a55db7dfc4825233a7e453bab31931fba0.
 2021-09-10 16:47:20 +02:00
Ghostkeeper
24ff3692bd
Revert "Use optional last output (file) name from output-dev to set project name." 
This reverts commit c2c53d51c1954315324982bd916b8aad5c19946d.
 2021-09-10 16:46:53 +02:00
Ghostkeeper
9e2b556ce8
Revert "Only change project name when saving to project files." 
This reverts commit b97920e5b155caaab6a8b3bb167853a00ae4b604.
 2021-09-10 16:46:39 +02:00
Ghostkeeper
daac6faaba
Also use a themeable distance for pop-ups, not just for sticky components 2021-09-10 12:15:18 +02:00
Ghostkeeper
25e2828ed0
Don't hard-code the distance between pop-up and header 
By default in all of our themes this ends up being the same distance at 100% pixel scale, but it now scales according to the pixel scale of the user's screen while still being properly rounded to integer coordinates.
 2021-09-10 12:12:20 +02:00
Remco Burema
b2eae08cc7
Merge pull request #10327 from Ultimaker/CURA-6096_profile_database 
Store metadata in database
 2021-09-09 17:29:40 +02:00
Ghostkeeper
034f62ea2c
Match table name with container type 
The table name is used as the container type in the resulting metadata, so we need to use the container type string as table name correctly, or none of the profiles can be found.

Contributes to issue CURA-6096.
 2021-09-08 16:40:22 +02:00
Ghostkeeper
5d40e8d7cc
Don't use stylised caps 
Contributes to issue CURA-8545.
 2021-09-08 16:20:00 +02:00
Ghostkeeper
9344f88c21
Canonical indentation 
Contributes to issue CURA-8545.
 2021-09-08 16:19:48 +02:00
zhpt
6e2f7845c9
Add AtomStack printer definitions (#10121) 
* Add files via upload

add AtomStack machine definitions

* Add files via upload

add AtomStack machine extruders

* Update resources/definitions/cambiran_maxe175.def.json

Co-authored-by: Konstantinos Karmas <konskarm@gmail.com>

* Update resources/definitions/cambiran_maxe285.def.json

Co-authored-by: Konstantinos Karmas <konskarm@gmail.com>

* Update resources/definitions/cambiran_proe175.def.json

Co-authored-by: Konstantinos Karmas <konskarm@gmail.com>

* Update resources/definitions/cambiran_proe285.def.json

Co-authored-by: Konstantinos Karmas <konskarm@gmail.com>

* Add files via upload

* Add files via upload

* Update atomstack_cambrianmaxe175.def.json

* Update atomstack_cambrianmaxe285.def.json

* Update atomstack_cambrianproe175.def.json

* Update atomstack_cambrianproe285.def.json

* Delete cambiran_maxe175.def.json

* Delete cambiran_maxe285.def.json

* Delete cambiran_proe175.def.json

* Delete cambiran_proe285.def.json

* Delete cambrianmaxe175_extruder_1.def.json

* Delete cambrianmaxe285_extruder_1.def.json

* Delete cambrianproe175_extruder_1.def.json

* Delete cambrianproe285_extruder_1.def.json

* Update atomstack_cambrianmaxe175_extruder_0.def.json

* Update atomstack_cambrianmaxe285_extruder_0.def.json

* Update atomstack_cambrianproe175_extruder_0.def.json

* Update atomstack_cambrianproe285_extruder_0.def.json

* Update atomstack_cambrianmaxe175_extruder_0.def.json

* Create atomstack_cambrianmaxe175.def.json

* Update atomstack_cambrianmaxe285.def.json

* Update atomstack_cambrianproe175.def.json

* Update atomstack_cambrianproe285.def.json

* add file atomstack_cambrian_base.def.json

* Update atomstack_cambrianmaxe175.def.json

* Update atomstack_cambrianmaxe285.def.json

* Update atomstack_cambrianproe175.def.json

* Update atomstack_cambrianproe285.def.json

Co-authored-by: Konstantinos Karmas <konskarm@gmail.com>
 2021-09-08 16:18:55 +02:00
Ghostkeeper
057ba8cdeb
Fix setting container type of subclasses 
This mistake caused all of the container types to end up as either None or the actual instance itself, which was causing crashes.

Contributes to issue CURA-6096.
 2021-09-08 15:46:25 +02:00
Ghostkeeper
adac0af1ec
Revert "Use SQLQueryFactory for container DB" 
This reverts commit 571a051041b7c126ca942055961c7714312a967f.
 2021-09-08 15:10:32 +02:00
Jaime van Kessel
5ea0d927ca Fix typo in file name 
CURA-8544
 2021-09-08 09:39:38 +02:00
luz paz
9b203c834a Fix source typos 2021-09-07 11:34:22 -04: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
p.kuiper
4d121aa74d Minimal jerk of 20mm/s for all profiles. 2021-09-07 16:55:22 +02:00