GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-10-10 06:46:32 +08:00
Code Issues Packages Projects Releases Wiki Activity
13,169 Commits 295 Branches 268 Tags
Commit Graph

5863 Commits

Author SHA1 Message Date
Diego Prado Gesto
5280d21c26 Merge branch 'master' into feature_sync_button 2018-03-06 16:10:44 +01:00
Diego Prado Gesto
f625fa8a90 CURA-4870 Add function to set the configuration from the printer back to 
Cura.
Change the hash function to compare by GUID instead of type.
Show the material name instead of type in the list.
 2018-03-06 16:08:50 +01:00
Lipu Fei
eb84e6aa3e Disable not supported custom profiles 
CURA-5051
 2018-03-06 15:47:49 +01:00
Lipu Fei
31b7374689 Fix material settings saving upon dialog close 
CURA-4606

Force to trigger a lose focus on all editing fields so their
onEditingFinished callback will get triggered.
 2018-03-06 13:40:32 +01:00
Lipu Fei
ff0d694e72 Select the activated material when material management page shows up 
CURA-4606
 2018-03-06 11:55:24 +01:00
Diego Prado Gesto
d11d850f7c CURA-4870 Add spacing to the list of configurations 2018-03-06 10:42:24 +01:00
Diego Prado Gesto
13e18c9d54 Merge branch 'master' into feature_sync_button 2018-03-06 10:24:11 +01:00
Diego Prado Gesto
731a1092c5 CURA-4870 Add callback function to apply remote configuration 2018-03-06 10:18:54 +01:00
Diego Prado Gesto
d02d845d1b CURA-4870 Update the selected configuration in the UI when the 
configuration in the printer changes.
Modify again the hash function.
 2018-03-06 09:24:42 +01:00
Diego Prado Gesto
51686943e6 CURA-4870 Create an extruder configuration model to store the extruder configuration. 
Connect the signals coming from the printer to correctly update the UI
 2018-03-05 17:15:09 +01:00
Jaime van Kessel
2de587a8c6 Made some changes so the code also works with lower versions of Qt & pyQt 2018-03-05 15:32:46 +01:00
Diego Prado Gesto
a992487589 CURA-4870 Check wether the current configuration matches one of the unique configurations available on the printer output device. 
Improve some elements in the UI
 2018-03-05 14:39:49 +01:00
Lipu Fei
3004b146ad Fix: move createQualityChanges() to QualityManager 
CURA-4606
 2018-03-05 13:36:13 +01:00
Lipu Fei
6199e8e15a Fix merge conflicts with master 2018-03-05 13:27:00 +01:00
Ghostkeeper
08f114ee6e
Don't make print estimates translateable 
This was very very confusing for our translators. And all of the translators basically came down to the same translation: Leave it untranslated. So let's make it a bit easier on them and don't allow this to be translated.
If we really want the currency to be translated to the correct position, Qt has currency printing in its locale as an option too.
 2018-03-05 13:02:11 +01:00
Diego Prado Gesto
f779a20a6e CURA-4870 Cleanup UI and add buildplate icon 2018-03-05 12:13:46 +01:00
Diego Prado Gesto
871f0a130e CURA-4870 Frontend formatting to show the configurations 2018-03-05 11:44:26 +01:00
Lipu Fei
a29a6122f1 Merge remote-tracking branch 'origin/master' into refactoring_machine_manager 2018-03-05 11:29:21 +01:00
Lipu Fei
072c85bacf Put authors back for 3rd party variants 2018-03-05 11:16:47 +01:00
Ian Paschal
1c7fdfd871 CURA-5032 Incorporated additional feedback 2018-03-05 11:13:38 +01:00
Lipu Fei
c99fca0890 Put adhesion_type back to imade3d profiles 2018-03-05 11:09:54 +01:00
Lipu Fei
6d97fd8dc2 Revert "WIP: Fix quality profiles for abax_pri3" 
This reverts commit c338e1b7d69c252ae80d9590700823108a37f320.
 2018-03-05 11:01:52 +01:00
Lipu Fei
eb5ce04229 Fix code style in materialspage 2018-03-05 10:59:10 +01:00
Lipu Fei
caca5e5021 Fix code style in materialspage 2018-03-05 10:57:36 +01:00
Mark
17920bcf87
Merge pull request #3207 from FABtotum/master 
TPU FAbtotum's profiles
 2018-03-05 09:54:21 +01:00
Diego Prado Gesto
49fcf35d9b CURA-4870 Prepare the UI to show the list of configurations 2018-03-04 17:26:37 +01:00
Diego Prado Gesto
6e35fc5035 CURA-4870 Modify printer menu visibility of the items. Show local or network submenu only when there is local or network printers respectively 2018-03-04 12:53:16 +01:00
Lipu Fei
6a14e39610 Remove outdated TODOs in ProfilesPage 2018-03-03 16:34:31 +01:00
Lipu Fei
730048d2b2 Simplify code in MaterialsPage.qml 2018-03-03 16:32:29 +01:00
Lipu Fei
86b75ae3b6 Remove outdated TODO 2018-03-03 16:29:31 +01:00
Lipu Fei
0e5aff84e9 Remove outdated comment in MaterialsPage.qml 2018-03-03 16:26:03 +01:00
Lipu Fei
575f38e63e Fix code style in MaterialView.qml 2018-03-03 16:25:09 +01:00
Lipu Fei
d24bc0b41b Fix code style in MaterialView.qml 2018-03-03 16:23:54 +01:00
Lipu Fei
c93643bc2f Move createMaterial() to MaterialManager 2018-03-02 17:30:19 +01:00
Lipu Fei
5f0bb3a283 Move removeMaterial() to MaterialManager 2018-03-02 17:20:26 +01:00
Lipu Fei
7642afb9fe Move duplicateMaterial() to MaterialManager 2018-03-02 17:16:35 +01:00
Lipu Fei
ca785c9df3 Move duplicateQualityChanges() to QualityManager 2018-03-02 17:08:58 +01:00
Lipu Fei
355b8cbac3 Move renameQualityChangesGroup() into QualityManager 2018-03-02 16:58:50 +01:00
Lipu Fei
8324f4f44e Move removeQualityChangesGroup() into QualityManager 2018-03-02 16:47:25 +01:00
Lipu Fei
c6128ef5ba Move setMaterialName() into MaterialManager 2018-03-02 16:22:22 +01:00
Ghostkeeper
7b809becd9
Merge branch 'M&P-Setting-Optimization' 2018-03-02 15:22:54 +01:00
THeijmans
75d106368e Retraction minimum travel fix 
Retraction minimum travel distance set to two times the line width for all 0.4 and 0.8 mm TPU profiles.
 2018-03-02 15:15:23 +01:00
THeijmans
0305ad1ea2 Zig_zaggifying the infills 
Connected infill lines in all our profiles, for increased strenght and print quality.
 2018-03-02 15:11:26 +01:00
THeijmans
e080ff2db0 Revert "Combing to "No Skin"" 
This reverts commit ca83089eff9f9ed3b8a37b1d593993662cb27e0c.
 2018-03-02 15:04:33 +01:00
Ghostkeeper
acbc6893f5
Also allow backspace to delete models 
See the documentation in the code as to why. Macintosh keyboards...

Fixes #3257.
 2018-03-02 14:51:13 +01:00
Diego Prado Gesto
135208bfee CURA-4870 Modify the dropdown look and feel 2018-03-02 13:26:04 +01:00
Lipu Fei
93190dde9b Merge remote-tracking branch 'origin/master' into refactoring_machine_manager 2018-03-02 09:55:14 +01:00
Lipu Fei
c82b2f2f6c Fix gcode flave RepRap for dagoma neva 
CURA-4988
 2018-03-02 09:29:38 +01:00
Lipu Fei
5351ce7d23 Fix dagoma discoeasy200 travel speed 100 
CURA-4988
 2018-03-02 09:29:03 +01:00
Diego Prado Gesto
ae57e23eec Create a mouse area around the sidebar to avoid propagating mouse wheel events. 
Contributes to CURA-4495
 2018-03-01 19:48:41 +01:00