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

4495 Commits

Author SHA1 Message Date
Lipu Fei
9ced5e9205 Fix QObject segfaults in QML 
CURA-6599
 2019-09-25 14:38:38 +02:00
Lipu Fei
f395c92732 Fix custom profile menu 
CURA-6599
 2019-09-25 08:28:24 +02:00
Lipu Fei
f2e518da6b Fix code style and typing 2019-09-25 08:23:57 +02:00
Lipu Fei
07269e4988 Merge remote-tracking branch 'origin/master' into feature_intent 2019-09-25 08:03:37 +02:00
Lipu Fei
94e89ad4ac Fix merge conflicts with master 2019-09-24 14:26:43 +02:00
Ghostkeeper
0b4a3039e5
Remove multi-buildplate option 
It doesn't work any more.
 2019-09-24 14:24:57 +02:00
Lipu Fei
79f938a39c Add intent for project saving summary 
CURA-6800
 2019-09-23 11:44:11 +02:00
Ghostkeeper
5ec833c15e
Remove extraenous space 
This space triggers PoEdit to give a warning that the translation doesn't have the space there. That's okay, since it's a column and the space doesn't influence spacing then.
 2019-09-23 11:43:24 +02:00
Ghostkeeper
4bf8ea9332
Merge branch '4.3' 2019-09-23 11:25:31 +02:00
Jaime van Kessel
08ffafa475
Merge branch 'feature_intent' of github.com:Ultimaker/Cura into feature_intent 2019-09-23 11:19:19 +02:00
Jaime van Kessel
a4ed51342c
Fix favorite not being checked properly in MaterialMenu 
CURA-6804
 2019-09-23 11:18:47 +02:00
fieldOfView
c9e281f52e Add preference for general/restore_window_geometry 
See https://github.com/Ultimaker/Uranium/pull/523
 2019-09-20 14:51:37 +02:00
Ghostkeeper
4a68e7ec95
Fix favorite materials without material manager 
We just track it via the preference value itself rather than duplicating that in any other data structure. It's simple enough.

Contributes to issue CURA-6776.
 2019-09-20 09:57:36 +02:00
Remco Burema
37aca7d361 Menu items should be removed by index, not by object. 
part of CURA-6791
 2019-09-19 17:00:16 +02:00
Lipu Fei
c661f82756 Recreate bindings for the text fields 
CURA-6690
 2019-09-19 15:33:10 +02:00
Nino van Hooff
c43cdb5c63 Implement allowPositive for printhead settings 
CURA-6690
 2019-09-19 14:49:18 +02:00
Nino van Hooff
17a832f52f Do not transform negative printhead min max values to positive while 
displaying

CURA-6690
 2019-09-19 13:56:37 +02:00
Ghostkeeper
1f7c653368
Capitalise the S 
We need to seize this opportunity and capitalise on that sort of market opportunity.
 2019-09-19 10:47:16 +02:00
Jaime van Kessel
cc65bc8213
Fix scrollbar for object selector 2019-09-18 17:05:00 +02:00
Jaime van Kessel
84e5114566
Fix minor review comments 
CURA-6598
 2019-09-18 14:17:26 +02:00
Jaime van Kessel
fade8d3644
No longer make border width hardcoded 
CURA-6598
 2019-09-18 14:10:52 +02:00
Jaime van Kessel
75c7a6fa62
Change default font for numericTextfield to default instead of medium 2019-09-18 10:55:18 +02:00
Diego Prado Gesto
b9ed619c9a Reuse the Cura ToolTip while showing long object item 
It will only show the tooltip when the text is longer than the elided text.

Contributes to CURA-6666.
 2019-09-17 13:52:37 +02:00
Ghostkeeper
b34895703b
Merge branch '4.3' 2019-09-17 13:08:49 +02:00
Ghostkeeper
cd4f6ff3f4
Add tooltip to object list 
Contributes to issue CURA-6666.
 2019-09-17 10:42:36 +02:00
Diego Prado Gesto
0085660153 Use non-abbreviated names in the configurations list 2019-09-16 15:59:21 +02:00
Diego Prado Gesto
021a04c427 Show the printer types list when we show the label every time or when only show the label for the active printer. 2019-09-16 15:29:34 +02:00
Ellecross
28310e03f2 Revert "Only show printerTypes for active machine" 
This reverts commit 2395567f1eb505a814f3b305e5a59138dfe8c144.
 2019-09-16 15:05:09 +02:00
Jaime van Kessel
2395567f1e
Only show printerTypes for active machine 2019-09-13 10:49:35 +02:00
Ghostkeeper
2d0a122c2d
Display list of custom quality profiles 
If you activate any of them from here though, it'll crash.

Contributes to issue CURA-6598.
 2019-09-12 15:13:02 +02:00
Ghostkeeper
47e1dbe38d
Remove usage of Quality Manager 
This class is deprecated. Constructing it here means that the class gets constructed on the Qt thread and makes it inaccessible for the rest.

Contributes to issue CURA-6600.
 2019-09-10 14:55:32 +02:00
Ghostkeeper
0d68381e61
Code style: brackets on new line 
Contributes to issue CURA-6600.
 2019-09-10 14:52:51 +02:00
Lipu Fei
3f3aac7ce5
Merge pull request #6289 from Ultimaker/feature_intent_interface 
Feature intent interface
 2019-09-09 16:53:37 +02:00
Lipu Fei
13011e375b Fix quality layer label alignment 
CURA-6598
 2019-09-05 09:01:00 +02:00
Jaime van Kessel
423b4ad869
Fix binding loop 
CURA-6598
 2019-09-04 17:16:07 +02:00
Jaime van Kessel
994e0e53cc
Switch the anchors to paddings 
Otherwise the bottomb button would extend from the popup.

CURA-6598
 2019-09-04 16:54:35 +02:00
Jaime van Kessel
7f3b55a286
Remove unknown reference 
CURA-6598
 2019-09-04 16:48:06 +02:00
Jaime van Kessel
53aaaab891
Add a topMargin for the qualities menu 
CURA-6598
 2019-09-04 16:43:59 +02:00
Jaime van Kessel
2dbfbecd12
Ensure that show/hide behavior of the qualities intent menu is correct 
It would previously blink if you pressed the button, as a click outside would hide it
due to close policy, but a mouse release would show it again (as it's hidden and that's what the
on clicked of the button did)

CURA-6598
 2019-09-04 16:37:10 +02:00
Jaime van Kessel
c2225c9afc
Merge branch 'feature_intent_interface' of github.com:Ultimaker/Cura into feature_intent_interface 2019-09-03 11:27:38 +02:00
Jaime van Kessel
ac0c7fd4d6
Remove unused properties 
CURA-6598
 2019-09-03 11:27:11 +02:00
Lipu Fei
39d52556f4 Fix text alignments by using rounding 
CURA-6598
 2019-09-03 11:17:20 +02:00
Lipu Fei
52f3f9b773 Update QML import versions and add headings 
CURA-6598
 2019-09-03 11:17:20 +02:00
Jaime van Kessel
7dc84f14a8
Merge branch 'feature_intent_interface' of github.com:Ultimaker/Cura into feature_intent_interface 2019-09-03 11:14:19 +02:00
Jaime van Kessel
f77ad22fe3
Fix hardcoded entries in radioCheckbar 
CURA-6598
 2019-09-03 11:13:47 +02:00
Lipu Fei
0926c223b2 Add missing renderType: Text.NativeRendering 
CURA-6598
 2019-09-03 10:53:53 +02:00
Ghostkeeper
b5d32a9b70
Move createQualityChanges function to QualityManagementModel 
This function is specific to the management page (for the most part; some things seem to call the _createQualityChanges private function nonetheless).

Contributes to issue CURA-6600.
 2019-09-02 17:07:18 +02:00
Lipu Fei
b358d8ddd0 Fix typo in ComboBox.qml 2019-09-02 13:20:09 +02:00
Jaime van Kessel
b00b8c8c58 Merge branch 'feature_intent_container_tree' of github.com:Ultimaker/Cura into feature_intent_interface 2019-08-29 16:28:26 +02:00
Jaime van Kessel
c80cd9679f Fix RadioCheckbars layout getting out of wack sometimes 
CURA-6598
 2019-08-29 15:15:35 +02:00