GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-16 17:56:44 +08:00
Code Issues Packages Projects Releases Wiki Activity
26,073 Commits 290 Branches 260 Tags
Commit Graph

4814 Commits

Author SHA1 Message Date
Jaime van Kessel
4793c77380
Merge branch 'feature_intent' of github.com:Ultimaker/Cura into feature_intent 2019-10-04 09:39:47 +02:00
Jaime van Kessel
f8951e4140
Add scrollbar to profile dropdown 
CURA-6843
 2019-10-04 09:39:26 +02:00
Lipu Fei
877bb1efdb Diable local printer ListView buffer to force redraw 
CURA-6793
 2019-10-03 15:56:00 +02:00
Lipu Fei
bd84c4d98d Show quality and intent a custom profile is based on 
CURA-6846
 2019-10-03 14:18:51 +02:00
Lipu Fei
26b523f190 Fix quality profile menu size 
CURA-6838
 2019-10-03 12:37:11 +02:00
Lipu Fei
ba805b9da3 Fix QML errors 
CURA-6849
 2019-10-03 12:28:07 +02:00
Lipu Fei
2d59271a69 Remove hard-coded height 2019-10-03 12:28:07 +02:00
Jaime van Kessel
8beeac7fca
Make the radio button in the checkbar look consistent. 
The drake meme and CURA-6845 told me that it should look like that.
 2019-10-02 16:57:04 +02:00
Jaime van Kessel
ff3837bac5
Only show "Custom Profile" header if there are custom profiles 
CURA-6844
 2019-10-02 16:48:57 +02:00
Jaime van Kessel
c6850b4f73
Set right text color if menubutton is disbled 
CURA-6848
 2019-10-02 16:39:50 +02:00
Nino van Hooff
2df0d96923 Consider user preference when opening project files from cli. 
The logic using just a "skip_project_file_check" boolean was too obscure
imho, so used a string value with more explicit values
to improve readability

CURA-6824
 2019-10-01 11:54:53 +02:00
Lipu Fei
96a9bcccbb Merge remote-tracking branch 'origin/master' into feature_intent 2019-10-01 09:41:05 +02:00
Thomas Karl Pietrowski
cfc296de37
Update ActionPanelWidget.qml 
Find this whitespace strange. Shouldn't this normally give an error? Or is this allowed due to the syntax?
 2019-09-28 10:36:05 +02:00
Remco Burema
7a1850a87b Actually fix QML nullptr warnings for real. 2019-09-27 12:53:32 +02:00
Remco Burema
31434ebde8 Fix QML nullptr warnings. 2019-09-27 11:51:50 +02:00
Lipu Fei
e5d94fd2e4 Change to "name" property 
CURA-6599
 2019-09-26 17:19:15 +02:00
Jaime van Kessel
b19e7cd027
Add warning icon when not all extruders have same intent 
CURA-6601
 2019-09-26 16:26:55 +02:00
Jaime van Kessel
b7b34eb6f7
Re-add the reset custom settings button to recommended panel 
CURA-6810
 2019-09-26 13:39:16 +02:00
Jaime van Kessel
b72b542d21
Add missing font & color 
CURA-6810
 2019-09-26 12:55:14 +02:00
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