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

16424 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Diego Prado Gesto
b6ea0e6385 Make the height of the stage buttons themable. Now the height has to be 
28px as indicated by the UXers.

Contributes to CURA-5784.
 2018-10-30 10:38:53 +01:00
Diego Prado Gesto
aa75b64b5b Use the lining color to the default ouline color for the account widget. 
Contributes to CURA-5784.
 2018-10-30 09:48:56 +01:00
Diego Prado Gesto
5de367bcc4 Merge branch 'ui_rework_4_0' into cura4.0_header 
Conflicts:
plugins/UM3NetworkPrinting/resources/qml/UM3InfoComponents.qml
resources/qml/Menus/ViewMenu.qml
resources/themes/cura-dark/theme.json
resources/themes/cura-light/theme.json
 2018-10-29 11:10:25 +01:00
Lipu Fei
261a3976d7 Merge remote-tracking branch 'origin/3.6' 2018-10-29 08:13:23 +01:00
Diego Prado Gesto
90e8a05aab Remove all the entries in the theme that make reference to the sidebar, 
because there is no sidebar anymore.

Several different margins and linings were created depending on the
side, not depending on where it belongs.

Contributes to CURA-5784.
 2018-10-26 17:51:28 +02:00
Remco Burema
5133b6300a
Merge pull request #4650 from Ultimaker/CURA-5857_fix_machine_settings_set_diameter 
[3.6] [CURA-5857] Fix setting extruder material diameter in Machine Settings dialog
 2018-10-26 17:35:50 +02:00
Diego Prado Gesto
c8bdf7321c Move the visible check within the component. 
Contributes to CURA-5772.
 2018-10-26 16:31:03 +02:00
Diego Prado Gesto
5a5adb71cd Make the height of the Print setup selector themable. 
Contributes to CURA-5772.
 2018-10-26 16:16:33 +02:00
Diego Prado Gesto
3eb71021e2 Change the way the string for the tooltip is formatted. 
Contributes to CURA-5772.
 2018-10-26 15:53:20 +02:00
Remco Burema
de680f4aac
Merge pull request #4669 from Ultimaker/CURA-5821_fix_camera_memory_leak 
Cura 5821 fix camera memory leak
 2018-10-26 15:00:03 +02:00
Diego Prado Gesto
a277bd9f3b Don't use the hand cursor in the action buttons by default. 
Contributes to CURA-5784.
 2018-10-26 11:29:05 +02:00
Diego Prado Gesto
54518bdc82 Change the minimum window size to be 1280x800. 
Contributes to CURA-5784.
 2018-10-26 11:14:39 +02:00
Diego Prado Gesto
a8531a335d Fix the alignments for the sliders in the simulation view. 
Contributes to CURA-5772.
 2018-10-26 09:52:02 +02:00
Diego Prado Gesto
e64698209c Adjust the minimum size to be something around 1280x1024. 
Also adjust some colors color for the dark theme.

Contributes to CURA-5772.
 2018-10-25 17:41:35 +02:00
Ian Paschal
75e351304c
Merge pull request #4652 from Ultimaker/CL-1119_monitor_tab_printer_names_clipped_too_short 
CL-1119 Use shorter machine name for skeleton and longer for text (Fix for 3.6)
 2018-10-25 16:52:50 +02:00
Ian Paschal
94d48101d9 Use different lengths for loading skeleton and printer name 
Contributes to CL-1119
 2018-10-25 16:45:49 +02:00
Diego Prado Gesto
f1d94d921c The MachineManager doesn't have the extruder stacks but the active 
machine does, so use it when setting the compatible material diameter to
the current extruder.

Contributes to CURA-5857.
 2018-10-25 16:27:16 +02:00
Diego Prado Gesto
197bf057cc Merge branch '3.6' into CURA-5857_fix_machine_settings_set_diameter 2018-10-25 15:57:26 +02:00
Jason Scurtu
2227c1debf recheck 2018-10-25 15:52:48 +02:00
Jason Scurtu
2c43294472 use "material_print_temperature" in material profile 2018-10-25 15:52:39 +02:00
Jason Scurtu
2b70613345 fix and improve 4max profile 2018-10-25 15:52:25 +02:00
Jason Scurtu
9532cc70b8 Disable has_machine_quality for now.. 
Needs more adjustment
 2018-10-25 15:52:12 +02:00
Jason Scurtu
73c6bdf028 Add Anycubic 4Max profile 2018-10-25 15:51:59 +02:00
Ghostkeeper
83f0213aa5
Merge branch 'master' of ssh://github.com/Ultimaker/Cura 2018-10-25 15:51:51 +02:00
Ghostkeeper
af325238f2
Merge branch 'addVariants' of https://github.com/ValentinPitre/Cura into ValentinPitre-addVariants 2018-10-25 15:48:07 +02:00
Diego Prado Gesto
4fda914dcf
Merge pull request #4472 from jscurtu/master 
Add Anycubic 4Max profile
 2018-10-25 15:26:31 +02:00
Lipu Fei
6fd7b49937 Fix setting extruder material diameter in Machine Settings dialog 
CURA-5857

It should update the value of the selected Extruder TAB, not the active
extruder on the printer.
 2018-10-25 15:11:04 +02:00
Lipu Fei
31bdeb8b73 Merge remote-tracking branch 'origin/3.6' into CURA-5821_fix_camera_memory_leak 2018-10-25 14:53:42 +02:00
Ghostkeeper
c7b146c9fc
Don't make retract distances negative 
People are reporting that the retraction is reversed. We can't test it since we have no firmware that supports the command at all. So we'll just not make the retract distance negative. That seems more logical anyway if you read the documentation of M600 to the letter.

Fixes #4249.
 2018-10-25 13:54:00 +02:00
Lipu Fei
0e1e8d269a Fix the extra setNextStack() 2018-10-25 13:40:34 +02:00
Jason Scurtu
1c5817b5b6 recheck 2018-10-25 13:01:05 +02:00
Jason Scurtu
39749dcaf6 use "material_print_temperature" in material profile 2018-10-25 12:45:01 +02:00
Lipu Fei
0d0384e331 Merge remote-tracking branch 'origin/3.6' 2018-10-25 11:43:06 +02:00
Lipu Fei
5e8dba5266 Remove some duplicate addExtruder() and setNextStack() calls 2018-10-25 11:42:47 +02:00
Diego Prado Gesto
dddda996dc
Merge pull request #4647 from Ultimaker/hotfix_show_printer_selection 
[3.6] CL-1117 Hotfix: Show printer selection
 2018-10-25 11:41:36 +02:00
Ghostkeeper
ebbb7ad88f
Code style 2018-10-25 10:55:10 +02:00
Ian Paschal
1a67660196 Hotfix: Show printer selection 2018-10-25 10:54:59 +02:00
Ghostkeeper
47f820fe69
Don't disable entire view menu when viewing g-code 
Just disable the part about switching views.
Yes, you can still select the view from the actual view selection drop-down in the main window. Well, it's an improvement, not a complete fix. The complete fix is deferred.
 2018-10-25 10:47:21 +02:00
Jason Scurtu
65e3ee6854 fix and improve 4max profile 2018-10-24 19:46:21 +02:00
Ghostkeeper
12eb43b8fd
Merge branch 'CURA-5769_gcode_retraction' 2018-10-24 16:14:05 +02:00
Lipu Fei
9d07409cce WIP: Use CameraView for UM camera feeds 
CURA-5821

The original implementation that refreshes a QImage seems to cause
memory overflow on MacOSX and Windows. This is a different
implementation. It doesn't cause memory overflow, but it does consume a
lot of CPU power.
 2018-10-24 16:00:22 +02:00
Ghostkeeper
9b74dfd5ec
Correct typo 
intented -> intended
 2018-10-24 15:54:45 +02:00
Ghostkeeper
eea340d57a
Add typing 2018-10-24 15:54:14 +02:00
Lipu Fei
b00ea4719a WIP: Add custom CameraView for UM camera feed 
CURA-5821
 2018-10-24 15:44:19 +02:00
Ian Paschal
be5c1c8596
Merge pull request #4436 from Ultimaker/clean_print_job_info_block 
CL-897, CL-1051, CL-1111 Cura 3.6 Monitor Tab
 2018-10-24 12:29:46 +02:00
Diego Prado Gesto
e85b5febe1 Add pointing hand cursor shape when hovering the AccountWidget. 
Contributes to CURA-5784.
 2018-10-24 11:28:52 +02:00
Ian Paschal
d077dcc851 Fix printer card skeleton colors 
Contributes to CL-1051
 2018-10-24 11:13:38 +02:00
Ian Paschal
8662e1a125 Fix override dialog box 
Contributes to CL-897
 2018-10-24 11:13:12 +02:00
Diego Prado Gesto
bf1c23243e Modify the styles to match the requirements. 
Contributes to CURA-5784.
 2018-10-24 09:55:51 +02:00
Ian Paschal
a247fe204f Fix print job context menu height 
Contributes to CL-897, CL-1051, CL-1111
 2018-10-23 16:27:45 +02:00