GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-23 21:19:58 +08:00
Code Issues Packages Projects Releases Wiki Activity
24,783 Commits 290 Branches 265 Tags
Commit Graph

4586 Commits

Author SHA1 Message Date
Jaime van Kessel
07a20e131a
Prevent changing material / variant of disabled extruder 
It is disabled, so changing it's material / variant doesn't make that much sense...

CURA-6872
 2019-10-10 13:03:39 +02:00
Remco Burema
25db711adc Fix tooltips absorbed mouseclicks for view-buttons. 2019-10-10 12:57:27 +02:00
Remco Burema
902b9f278e Add tooltips for view orientation buttons. 2019-10-09 15:32:39 +02:00
Jaime van Kessel
cadc145008
Prevent infinite recursion in material page if it could not be found 2019-10-08 16:49:54 +02:00
Lipu Fei
fb368a4788 Remove MachineManager.activeVariantNames 
CURA-6865
 2019-10-08 15:16:27 +02:00
Lipu Fei
570dfdab4b Fix project saving summary 
CURA-6865
 2019-10-08 15:15:13 +02:00
Lipu Fei
28466f7345 Elide long quality name 
CURA-6862
 2019-10-08 14:33:16 +02:00
Ghostkeeper
cf14fa6820
Merge branch 'feature_intent' 
Here we go!

Contributes to issue CURA-6864.
 2019-10-08 13:17:54 +02:00
Ghostkeeper
f8449796c9
Reset the camera origin when uninverting zoom direction 
If zoom-to-cursor has been activated the camera origin will end up behind the camera. This resets it.

Fixes #6490.
 2019-10-08 13:06:23 +02:00
Jaime van Kessel
e6d19d9244
Merge branch 'feature_intent' of github.com:Ultimaker/Cura into feature_intent 2019-10-08 10:37:40 +02:00
Jaime van Kessel
cfd577f235
Remove buildplate info from workspace save dialog 2019-10-08 10:37:19 +02:00
Lipu Fei
8940097265 Separate black and grey text for quality menu 
CURA-6846
 2019-10-07 21:35:31 +02:00
Lipu Fei
32747d2abe Merge remote-tracking branch 'origin/master' into feature_intent 2019-10-07 21:20:54 +02:00
Lipu Fei
01345650e7 Use more meaning ID 
CURA-6834
 2019-10-07 21:14:05 +02:00
Lipu Fei
497648ffe7 Fix min/max X/Y QML value bindings 
CURA-6834
 2019-10-07 14:06:21 +02:00
Nino van Hooff
11d0462c7a Fix recent files python function calls 2019-10-07 10:44:30 +02:00
Lipu Fei
c42feae11c Make intents work on quality management page 
CURA-6706
 2019-10-07 09:22:47 +02:00
Ghostkeeper
e5c0812acc
Fix scrolling through profiles on Qt5.12+ 
Contributes to issue CURA-6843.
 2019-10-04 16:22:34 +02:00
Lipu Fei
c528000268 Add activeQualityDisplayName to remove code duplication 
CURA-6846
 2019-10-04 14:26:20 +02:00
Ghostkeeper
618cbffaa7
Apply screenScaleFactor to implicitWidth (and cleanup) 2019-10-04 12:58:40 +02:00
Jaime van Kessel
5bd5875a20
Also add intent warning to custom print setup 
CURA-6601
 2019-10-04 10:39:02 +02:00
Lipu Fei
61a1b61756 Remove unnecessary activeQualityName property 
CURA-6846
 2019-10-04 10:27:39 +02:00
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