GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-06 19:59:00 +08:00
Code Issues Packages Projects Releases Wiki Activity
20,746 Commits 290 Branches 260 Tags
Commit Graph

454 Commits

Author SHA1 Message Date
Jaime van Kessel
e7609fadf4 Deprecated the allActiveMaterialIds and replaced the single location where it was used 
CURA-6600
 2019-08-21 17:08:35 +02:00
Jaime van Kessel
7979fcd633 Fix warnings in the settings menu 
CURA-6600
 2019-08-21 17:07:58 +02:00
Ghostkeeper
20201c65e6
Merge branch 'master' into feature_intent 
Conflicts:
	resources/bundled_packages/cura.json -> 4.1 to 4.2 upgrade package added simultaneously
	tests/TestMachineManager.py -> Due to changes in conftest.py
	tests/conftest.py -> Simultaneously expanding the magic mocks to have some correct properties
 2019-08-13 14:43:28 +02:00
Jaime van Kessel
7a3f9d621a Add save shortcut to save 
No idea why it wasn't there in the first place.
 2019-08-07 10:46:51 +02:00
Jaime van Kessel
3f8a65d926 Fix the settings menu not reacting to onTriggered signals 2019-08-01 11:51:58 +02:00
Ghostkeeper
846cbe79a3
Rename Orthogonal to Orthographic everywhere 2019-07-30 17:35:40 +02:00
Jaime van Kessel
d1f6076eb2 Fix the enable & disable extruder for the settings menu 
This fixes #6069
 2019-07-29 11:01:31 +02:00
Ghostkeeper
9aeea22c73
Disable intent category headers 
Makes 'em look like headers.

Contributes to issue CURA-6597.
 2019-07-05 12:05:44 +02:00
Ghostkeeper
32c5118ae4
Add intents per category to the intent menu 
They are in the wrong order currently. The section headers all appear at the end and they are not greyed out. This must be fixed. The order might prove difficult... We'll see, but I want this locked in now because it works.

Contributes to issue CURA-6597.
 2019-07-05 11:45:01 +02:00
Jaime van Kessel
0cb83d2c92 Merge branch 'master' of github.com:Ultimaker/Cura into feature_intent 2019-07-02 13:51:52 +02:00
Jaime van Kessel
6544c123a4 Add camera view selector to the view application menu 2019-07-01 11:15:26 +02:00
Jaime van Kessel
35ec70a3cf Add a selector for the intent profile 
CURA-6534
 2019-06-05 11:13:32 +02:00
Jaime van Kessel
a0c705e900 Remove usage of some deprecated functions 2019-05-16 14:49:53 +02:00
Jaime van Kessel
c786770a44 Remove usage of deprecated functions 2019-05-03 13:52:45 +02:00
Jaime van Kessel
d42f446d70 Remove usages of deprecated function 2019-05-03 13:17:10 +02:00
Remco Burema
55dcf31e3c Fix QML binding loop warnings for CustomConfiguration. 2019-04-11 16:24:51 +02:00
Jaime van Kessel
7dd54aefcd Merge branch 'remove_compatibility_chart_link' of github.com:Ultimaker/Cura 2019-04-04 15:05:43 +02:00
Diego Prado Gesto
9594545f2c Remove the link to show the compatibility chart 
Actually it only made sense for ultimaker materials. Now that we can include instruction link in every materials, a specific link for every material can be used instead.

Contributes to CURA-6423.
 2019-04-04 14:46:20 +02:00
Lipu Fei
f810f94b8a WIP: Fix null warning in SettingsMenu.qml 2019-03-20 08:59:45 +01:00
Lipu Fei
4d3211e651 Merge remote-tracking branch 'origin/4.0' 2019-02-22 13:38:29 +01:00
Lipu Fei
2694ef98e0
Merge pull request #5338 from Ultimaker/CURA-6232_config_menu_tab_fix 
Fix tab-bar of config.-menu always on idex 0 on reshow. [CURA-6232]
 2019-02-22 13:37:10 +01:00
Jaime van Kessel
dd59b9167b Merge branch '4.0' of github.com:Ultimaker/Cura 2019-02-22 11:37:58 +01:00
Jaime van Kessel
69d3813f98 No longer disable viewMenu when user loaded presliced g-code 2019-02-22 11:19:16 +01:00
Jaime van Kessel
7221b23457 Add a property to temporarily disable the material models from updating. 
This allows the QMl to stop the updating when it's not even visible
 2019-02-21 20:50:44 +01:00
Jaime van Kessel
41f2a0e222 Add a property to temporarily disable the material models from updating. 
This allows the QMl to stop the updating when it's not even visible
 2019-02-21 20:47:38 +01:00
Jaime van Kessel
7754b8a447 Only instantiate setting menus when it's visible 
This saves a bit of time on booting and prevents unneeded updates (
because it doesn't matter if a setting changes if no-one is watching!)
 2019-02-21 20:20:01 +01:00
Jaime van Kessel
dee739db8b Merge branch '4.0' of github.com:Ultimaker/Cura 2019-02-21 20:19:30 +01:00
Jaime van Kessel
48ed9b6e20 Remove usage of plugin model 2019-02-21 17:16:59 +01:00
Jaime van Kessel
d9c4edf093 Prevent a few expensive conversions from happening in the QML 2019-02-21 16:36:14 +01:00
Jaime van Kessel
27370dd45d Improve the bindings for the material menu 
This way the evaluation is significantly faster.
 2019-02-21 15:26:25 +01:00
Remco Burema
b4e4b7125d Fix tab-bar of config.-menu always on idex 0 on reshow. [CURA-6232] 2019-02-20 13:27:05 +01:00
Remco Burema
a392f50a67 Small fix for glue-warning height in Ext.-config. 2019-02-14 11:21:01 +01:00
Jaime van Kessel
5c94a8223d Added button that is shown when instruction_link is set in the profile 
CURA-5916
 2019-02-07 16:08:50 +01:00
Jaime van Kessel
c15089cd59 Some minor cleanup of the QML 
CURA-5916
 2019-02-07 14:13:00 +01:00
Jaime van Kessel
575f323ea1 Merge branch '4.0' of github.com:Ultimaker/Cura 2019-02-06 13:07:09 +01:00
Jaime van Kessel
c7c57c167c Fix call to non-existing function 2019-02-06 12:37:30 +01:00
Jaime van Kessel
b6f5dd8f94 Fix display of long names in sync configuration menu 2019-02-05 13:31:50 +01:00
Ghostkeeper
ae5d548f02
Merge branch '4.0' 2019-02-04 16:19:14 +01:00
Ghostkeeper
185e9cc726
Fix font size of buildplate warning 
This was most likely copied from an old release but the font in question was deleted.
 2019-02-04 15:24:59 +01:00
Ghostkeeper
61475a79cf
Fix font size of buildplate warning 
This was most likely copied from an old release but the font in question was deleted.
 2019-02-04 15:23:57 +01:00
Ghostkeeper
e7d2400199
Merge branch '4.0' 2019-02-04 13:06:32 +01:00
Remco Burema
954fdb20ad Rename 'connect_group_name' to 'group_name'. [CURA-6153] 2019-01-31 20:21:42 +01:00
Ghostkeeper
a6688b9609
Merge branch '4.0' 2019-01-30 12:59:39 +01:00
Ghostkeeper
430be551d3
Fix link to properties of row 
This fixes a QML warning and probably fixes the visibility of these elements.
 2019-01-30 12:59:27 +01:00
Ghostkeeper
a36aa3f17b
Merge branch '4.0' 2019-01-30 12:53:18 +01:00
Lipu Fei
e2e856a5cd Add adhesion warning message back 
CURA-6070
 2019-01-28 14:41:57 +01:00
Ghostkeeper
33abbd4c89
Merge branch '4.0' 2019-01-25 12:03:38 +01:00
Diego Prado Gesto
551111bd60 Close the configuration panel when the user syncs with a configuration 2019-01-23 11:24:28 +01:00
Jaime van Kessel
aac82a0852 Merge branch '4.0' of github.com:Ultimaker/Cura 2019-01-23 11:18:27 +01:00
Lipu Fei
9bc748ffa1 Fix scrolling with configurations 
CURA-6125
 2019-01-22 11:48:41 +01:00