GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-08-12 07:38:58 +08:00
Code Issues Packages Projects Releases Wiki Activity
15,892 Commits 295 Branches 268 Tags
Commit Graph

15892 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Diego Prado Gesto
bafc2b98c9 Reuse MaterialBrandSection component for Favorites, Generic and branded 
materials.

This component will show different children depending on the
hasMaterialTypes flag.

Adjust some small UI issues.

Contributes to CURA-5682.
 2018-09-17 12:08:41 +02:00
Lipu Fei
3ac5a316d3 Check package upgradable using PM first, old plugins later 
CURA-5718

For package upgradable, we need to check if a package is installed
local. For that, we first check in the package manager, if nothing, then
we fall back to check the old plugins.
 2018-09-17 12:05:10 +02:00
Lipu Fei
1064d837ed Exclude bundled plugins in the old plugins list 2018-09-17 12:05:10 +02:00
Jaime van Kessel
58c7524164 Also rename dagoma_neva_magis profiles to dagoma_magis 2018-09-17 11:38:51 +02:00
Orel
093c5487bf - Rename Dagoma Magis profile. 
- Remove machine_gcode_flavor definition as the default value fits the
needs.
 2018-09-17 11:30:00 +02:00
Ghostkeeper
8a94042a1f
Fix icon name role 
The icons were not displaying in the context menu of the settings.
 2018-09-17 10:51:56 +02:00
Ghostkeeper
ade2b565bc
Add 3.5 change log 
Contributes to issue CURA-5710.
 2018-09-17 10:30:08 +02:00
Diego Prado Gesto
f871a89825 Clean up the code by removing duplicate code. Also try to unify the 
MaterialsBrandSection to use the same component for favorites, generic
and branded materials.

Contributes to CURA-5682.
 2018-09-17 09:09:14 +02:00
Jaime van Kessel
4c460b6fa5 Prevent crash if sdk_version is "dev" 2018-09-14 16:15:56 +02:00
Remco Burema
5c73921943 [CURA-5725] Revert "Set simulation path to 0 after updating layer" 
This reverts commit 3da6e3c4535db85a921bf5770903bd1a729946e1.
 2018-09-14 14:35:10 +02:00
fieldOfView
66aeb95e28 Fix opening port after baudrate detection 2018-09-14 14:06:55 +02:00
Ghostkeeper
fb9c21e914
Fix imports 2018-09-14 12:41:03 +02:00
Ghostkeeper
e9cdd47a03
Fix types of getGlobalContainerStack call results 
We know in these places that there must be a global stack at this point. So to hide the type error we'll cast it here.
Of course, the danger in this is that someone might call this function that doesn't know about this requirement and calls it when there is potentially no global stack yet. Hopefully they'll discover this crash when that happens then.
 2018-09-14 12:38:16 +02:00
Ghostkeeper
f8da8c14e5
Fix running tests with PyQt 5.11 
This was causing the test runner to crash.
 2018-09-14 11:38:14 +02:00
Ghostkeeper
2e6401b7dc
Don't depend on the name of resource folders not changing 
If we choose to rename the resource folders, then this plug-in should still look in the old resource folders. So hard-code these resource folders in the state that they were in at version 2.5 so that we can freely change them in a modern version.
 2018-09-14 11:36:31 +02:00
Ghostkeeper
572afb052e
Remove unused import 
This import was actually causing the test to fail on my computer due to a dependency on the order of importing libArcus vs. PyQt.
 2018-09-14 11:30:25 +02:00
Diego Prado Gesto
972f0bef43 WIP Fix an error in which the current selected material was not 
correctly selected when there is more than one brand (stupid mistake).
Also fix problems when the user changes some material information.

Contributes to CURA-5682.
 2018-09-14 10:54:07 +02:00
Ian Paschal
942d20a8d8 Monitor Tab - Fix pause button 
Contributes to CL-1050
 2018-09-13 16:31:07 +02:00
Ghostkeeper
c840680e68
Merge branch '3.5' of ssh://github.com/Ultimaker/Cura into 3.5 2018-09-13 16:26:48 +02:00
Jaime van Kessel
9627f216b2 Actually ensure that walls don't get slower than 1 mm/s 
CURA-5724
 2018-09-13 16:22:36 +02:00
Ian Paschal
f93413d3a3 Monitor Tab - Context menu improvements 
Fixed:
- In the Queued jobs area, the context menu doesn't close when clicking on the right half of the card.
- Context menu trigger button should be more in the corner for both the print job tiles and the printer tiles
- Context menu text should not be centered
- Context menu should be closer to the context menu trigger button
- Context menu should be aligned further right in relation to the context menu trigger button
- Context menu options that are not available should not be shown.
- Context button dots should be grey.

Contributes to CL-1050
 2018-09-13 14:52:52 +02:00
Lipu Fei
b39d6c7d87 Package upgrade should also check SDK version 2018-09-13 13:42:53 +02:00
Lipu Fei
7a3e61e8f1 chmod a+x check_shortcut_keys.py 
CURA-5642
 2018-09-13 10:56:31 +02:00
Lipu Fei
e629ea89ff Improve shortcut check script 
CURA-5642

More information in the output.
 2018-09-13 10:55:37 +02:00
Lipu Fei
7ec62315e0 Remove shortcut for About 
CURA-5642

It has conflict with "&Add Printer".
 2018-09-13 10:54:46 +02:00
Ian Paschal
7226bc45b5 Monitor Tab - Queued header is properly aligned 
Contributes to CL-1052
 2018-09-13 10:35:31 +02:00
Diego Prado Gesto
6dc53cc60a Select the next selected material when it is activated or removed. 
Contributes to CURA-5682.
 2018-09-12 18:39:19 +02:00
Diego Prado Gesto
7e1a833e9c Merge branch '3.5' into CURA-5682_material_manager_leftovers 2018-09-12 17:12:40 +02:00
Lipu Fei
efdec50614 Fix typo 2018-09-12 17:08:58 +02:00
Ian Paschal
0b66bf0448 Monitor Tab - Use camera button on camera stream 
- Fixes: Video feed close button is always out of sight
- Makes improvement to camera icon

Contributes to CL-1049
 2018-09-12 17:07:10 +02:00
Lipu Fei
d1301d16a9 Skip the do-not-handle URLs instead of returning 
CURA-5718

The request-url dict is not ordered so you cannot garuantee the ordering
when you use .items(). This can cause a problem that if a do-not-handle
item occurs first then nothing will be handled at all.
 2018-09-12 16:58:22 +02:00
Diego Prado Gesto
3368428dbb Fix text field alignment. 
The color text field was too short in many cases, when the color name is
long.

Contributes to CURA-5682.
 2018-09-12 16:57:43 +02:00
Aleksei S
3da6e3c453 Set simulation path to 0 after updating layer 
CURA-5677
 2018-09-12 16:56:54 +02:00
Ian Paschal
08d5e48407 Monitor Tab - Create reusable button 
Contributes to CL-1049
 2018-09-12 16:52:26 +02:00
Ian Paschal
dccc95f817 Monitor Tab - Camera button toggles 
Contributes to CL-1049
 2018-09-12 16:46:18 +02:00
Diego Prado Gesto
e3f67f1147 Fix code style. 
Contributes to CURA-5682.
 2018-09-12 16:37:16 +02:00
Diego Prado Gesto
6183a07d76 Activate the material right after it was created or duplicated. 
Contributes to CURA-5682.
 2018-09-12 16:35:01 +02:00
Ian Paschal
0a01e7c25b Monitor Tab - Improved camera icon 
- Fixed: Camera icon is too small, and the icon does not look centred
- Fixed: No hover effect for the camera button

Contributes to CL-1049
 2018-09-12 16:31:59 +02:00
Diego Prado Gesto
921b11974c Improve the way the categories are highlighted. 
When a material is selected, but the brand or the type is collapsed,
those components are also highlighted to indicate the path to the
material.

Reuse the MaterialBrandSection also for the generic materials, that
allow us to only mantain one component.

Contributes to CURA-5682.
 2018-09-12 15:42:02 +02:00
Jaime van Kessel
ecc66fe05b Merge branch 'CURA-5672_fix_s5_extruder_start_end_locations' of github.com:Ultimaker/Cura into 3.5 2018-09-12 14:17:45 +02:00
Diego Prado Gesto
56dcc2dded Highlight the material that is currently selected. 
Contributes to CURA-5682.
 2018-09-12 14:09:29 +02:00
Lipu Fei
b27e5a1f77 Fix getActiveExtruderStacks() 
CURA-5719

The dict values can be a random list. We need to fetch the first N
extruders starting from position 0.
 2018-09-12 14:00:36 +02:00
Remco Burema
f9585b5fae [CURA-5708] Hide the Materials-tab in ToolBox (v3.5 only) 2018-09-12 13:38:15 +02:00
Lipu Fei
e069e0db99 Fix S5 extruder start and end locations 
CURA-5672

X coordinate 310 is not at the rightmost position, and this causes the
prime tower to start printing from somewhere in the middle.
 2018-09-12 13:18:43 +02:00
Ian Paschal
e51089a880 Mointor Tab - CL-1046 Make fonts bold 2018-09-12 13:03:12 +02:00
Diego Prado Gesto
6d2492e5cb Remove spurious signal, it does the same as materialsUpdated. 
Contributes to CURA-5682.
 2018-09-12 12:59:13 +02:00
Diego Prado Gesto
f298d37134 WIP: Moving current selected material to the material list instead of 
the page.

Change all the previous references to the currentItem in the page.
Automatically and correctly select the element that is selected in the
extruder.

Contributes to CURA-5682.
 2018-09-11 22:12:54 +02:00
Diego Prado Gesto
9ba4c723f7 Fix the linked materials button. 
Contributes to CURA-5682.
 2018-09-11 22:07:14 +02:00
Diego Prado Gesto
a909c8f029 Don't emit signal if the favorite list didn't change. 
Contributes to CURA-5682.
 2018-09-11 22:05:39 +02:00
Ian Paschal
e7704ede3c Monitor Tab - Fix queue/manage queue alignment 
Contributes to CL-1052
 2018-09-11 17:01:26 +02:00