GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-03 09:14:24 +08:00
Code Issues Packages Projects Releases Wiki Activity
29,052 Commits 289 Branches 260 Tags
Commit Graph

1319 Commits

Author SHA1 Message Date
Ghostkeeper
5b8ed91b04
Create new MaterialManagementModel and move canMaterialBeRemoved 
Just like the QualityManagementModel, this class is intended to be used as proxy for the material management page in the preferences. I'm intending to move all relevant pyqtSlots from the material manager into this one. The advantage of this switch is that the material manager had no well-bounded scope and so tended to become a big mess of all sorts of functions. This one has a clear scope: serve as a proxy for the buttons you can press in the preferences screen for materials.

Contributes to issue CURA-6600.
 2019-08-27 15:47:40 +02:00
Lipu Fei
79f11286a6 Fix typing 
CURA-6643
 2019-08-27 14:42:31 +02:00
Lipu Fei
946b2b943e F5 reloads gcode file 
CURA-6643
 2019-08-27 14:42:31 +02:00
Ghostkeeper
6a8e1557c3
Merge branch 'feature_intent' into feature_intent_container_tree 
Conflicts:
	.gitlab-ci.yml
	cura/Machines/MaterialManager.py
	cura/Machines/VariantManager.py
	cura/Settings/ContainerManager.py
	cura/Settings/MachineManager.py
	tests/TestMachineManager.py
 2019-08-13 14:59:05 +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
Ghostkeeper
bd714f947a
Register container tree to be built once all metadata is in 
So if we ever change the order of initialisation this stays working.

Contributes to issue CURA-6600.
 2019-08-09 13:40:11 +02:00
Ghostkeeper
e106692165
Make ContainerTree singleton but construct in run() of application 
We want to make sure that this tree is constructed during start-up after all containers have been registered, so we call getInstance() there once. If you need the tree before that, the tree will not yet have been filled and you won't get complete information, so you'd need to listen for updates.
The singleton is there so you don't need to go via CuraApplication.

Contributes to issue CURA-6600.
 2019-08-08 17:30:24 +02:00
Ghostkeeper
65360c31ef
Let Quality/Material/Variant Managers be a proper singleton 
Rather than a singleton contained within the CuraApplication class.

Contributes to issue CURA-6600.
 2019-08-08 17:04:53 +02:00
Lipu Fei
9f18ceda51 Merge remote-tracking branch 'origin/master' into add_42_43_version_upgrader 2019-07-25 14:56:27 +02:00
Jaime van Kessel
d8ddcba091 Fix typing ignore for breath frist iterator 2019-07-23 13:40:40 +02:00
Jaime van Kessel
827ccd5a13 Fix mypy issues caused by scenenode iterator being correctly typed 2019-07-23 13:19:42 +02:00
Jaime van Kessel
9ceb9ce18b Fix typing issues 
They were caused by upgrading to a higher mypy version, which found more mistakes
 2019-07-23 12:58:46 +02:00
Jaime van Kessel
e56e355e79 Added upgrader for 4.3 2019-07-23 11:15:13 +02:00
Ghostkeeper
8cea9c5b87
Register IntentManager in QML 
This way we can change the intent from the interface.

Contributes to issue CURA-6597.
 2019-07-05 13:03:20 +02:00
Ghostkeeper
49a6161ee8
Register IntentCategoryModel to be used in QML 
We want to be able to repeat on this model.

Contributes to issue CURA-6597.
 2019-07-04 11:02:49 +02:00
Ghostkeeper
5ab1881a21
Merge branch 'master' into feature_intent 
Conflicts:
	plugins/VersionUpgrade/VersionUpgrade41to42/VersionUpgrade41to42.py -> There is a new version upgrade in master, so the old one is sort of obsolete. We may have to move this part to a new version upgrade for 4.3.
	plugins/VersionUpgrade/VersionUpgrade41to42/__init__.py
 2019-06-19 13:10:36 +02:00
pkuiper-ultimaker
9236f21d67
Merge pull request #5888 from Ultimaker/rename_minimum_diameter 
Rename Minimum Diameter to Maximum Tower-Supported Diameter
 2019-06-17 15:39:44 +02:00
Ghostkeeper
a38984dcec
Increment setting_version to 8 
This is required for the version upgrade.

Contributes to issue CURA-6311.
 2019-06-12 09:09:41 +02:00
Remco Burema
6f928ad97c Merge branch 'master' into feature_intent 2019-06-07 10:39:52 +02:00
Jaime van Kessel
2d8c19203e Expose intent model to QML 
CURA-6534
 2019-06-05 09:57:42 +02:00
Jaime van Kessel
7cc4ac741c Add version upgrade that adds empty intent profile to the stacks 
CURA-6534
 2019-06-03 11:49:03 +02:00
Jaime van Kessel
a1bbb46555 Add intent to recognised resource types 
CURA-6534
 2019-06-03 11:15:59 +02:00
Jaime van Kessel
a595feb24e Increase the version of the CuraContainer stack 
Since we added a new layer to it, it's version is one level higher (*DING*)

CURA-6534
 2019-06-03 11:10:20 +02:00
Jaime van Kessel
ca8fa9cfac Merge branch 'master' of github.com:Ultimaker/Cura into CURA-5395-orthographic-view 2019-05-21 14:23:24 +02:00
Lipu Fei
80827bdf70 Fix adhesion checkbox in recommended mode 
CURA-6182

Move complex logic to Python.
 2019-05-21 08:10:49 +02:00
Jaime van Kessel
2f5dfb8e65 Remove hardcoded set perspective function 
CURA-5395
 2019-05-20 16:34:24 +02:00
Lipu Fei
be4e05c13f
Merge pull request #5393 from Ultimaker/feature_model_list 
Add an object list/selector
 2019-05-17 07:48:22 +02:00
Lipu Fei
961f6403ad Change preference key to cura/show_list_of_objects 2019-05-16 15:49:08 +02:00
Jaime van Kessel
186eef0b68 Fix backup causing a crash in specific situations 2019-05-16 15:38:44 +02:00
Diego Prado Gesto
9e5e57e6c5 Merge branch 'master' into feature_model_list 2019-05-07 11:57:31 +02:00
Lipu Fei
40d26bbb6e NetworkingUtil is included in Cura 1.5 QML 
CURA-6483
 2019-04-30 12:49:26 +02:00
Lipu Fei
ed8127777c Make a single NetworkingUtil 
CURA-6483
 2019-04-30 09:43:50 +02:00
Lipu Fei
c8872cb4a1 Use a separate function to validate IP address 
CURA-6483
 2019-04-29 15:53:08 +02:00
Ghostkeeper
1fb336ed3d
Merge branch 'CURA-6483_fix_manual_printer_discovery' into 4.1 2019-04-26 14:15:07 +02:00
Remco Burema
ad9fc62ff5 Fix typing. [CURA-6478] 2019-04-25 23:05:52 +02:00
Remco Burema
194f01f840 Add preferences for draggable/expandable-component. [CURA-6478] 2019-04-25 14:50:29 +02:00
Lipu Fei
372e9026e4 Move add by ip device discovery into DiscoveredPrintersModel 
CURA-6483
 2019-04-25 08:44:55 +02:00
Remco Burema
37fddaee5c Limit draggable component to the main window. 2019-04-25 08:43:36 +02:00
Lipu Fei
4876d5af00 Fix data saving before making a backup 
CURA-6471
 2019-04-24 08:21:11 +02:00
Lipu Fei
f5668df127 Add parent to models so QML dont take ownership 2019-04-18 15:54:23 +02:00
Lipu Fei
46fa45768a Simplify shouldShowWelcomeDialog() 
CURA-6447
 2019-04-17 09:35:01 +02:00
Lipu Fei
0fe6555881 Remove debug code 
CURA-6447
 2019-04-15 13:09:44 +02:00
Lipu Fei
9494173f43 Remove hack in WelcomePagesModel and add WhatsNewPagesModel 
CURA-6447
 2019-04-12 12:11:09 +02:00
Lipu Fei
61ee2ec85c Simplify code 
CURA-6447
 2019-04-09 11:45:30 +02:00
Lipu Fei
a18bb9d953 Add AddPrinterPagesModel 
CURA-6435
 2019-04-05 09:09:00 +02:00
Lipu Fei
56a3b2dfa7 Fix merge conflicts 2019-03-26 16:33:13 +01:00
Lipu Fei
1dd48c5728 Show welcome page if no printer 2019-03-26 16:21:07 +01:00
Lipu Fei
1c39d0c015 Fix merge conflicts 2019-03-26 15:55:58 +01:00
Lipu Fei
6843fb1ffb Load change log from file for on-boarding page 2019-03-26 15:49:40 +01:00
Lipu Fei
a85f2ce156 Fix merge conflicts 2019-03-26 09:01:01 +01:00