GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-23 04:59:26 +08:00
Code Issues Packages Projects Releases Wiki Activity
12,148 Commits 290 Branches 263 Tags
Commit Graph

5457 Commits

Author SHA1 Message Date
ChrisTerBeke
af9181287a Merge branch 'master' into qtquick-controls-2.0 2018-01-04 11:17:50 +01:00
Jack Ha
d19015e85f CURA-4523 solved merge conflict 2018-01-04 10:47:24 +01:00
Jack Ha
a5d9aac91b CURA-4525 placed view menu items in Build Plate submenu 2018-01-04 10:32:54 +01:00
Jack Ha
8854a28d56 CURA-4525 solved merge conflict 2018-01-04 10:24:30 +01:00
ChrisTerBeke
46827b9295 Fix tevo blackwidow json file 2018-01-04 10:14:55 +01:00
ChrisTerBeke
0c504560fa
Merge pull request #3057 from thetobby/master 
Adding printer definition for Anycubic i3 Mega & Tevo Black Widow
 2018-01-04 09:57:31 +01:00
Jack Ha
8c7a0d4a8e CURA-4525 created CuraSceneController and took out logic from ObjectsModel and BuildPlateModel 2018-01-04 09:26:15 +01:00
ChrisTerBeke
4e10d6ee87
Merge pull request #3030 from TheAssassin/patch-1 
Reduce amount of movements after print for Tevo Tarantula
 2018-01-03 17:49:50 +01:00
Ghostkeeper
e18b3b3669
Remove duplicate setting 
Some merge conflict, I think.

Contributes to issue CURA-4523.
 2018-01-03 17:29:49 +01:00
Aleksei S
49ae078396 Adjust 3d view and add Camera View to the menu bar 
CURA-4642
 2018-01-03 16:45:26 +01:00
ChrisTerBeke
5a9e3a8efd Fix front view button rotation, cleanup view buttons onClicked 2018-01-03 16:18:31 +01:00
Lipu Fei
392be23281 Fix SettingView stakc ID binding 
CURA-4708
 2018-01-03 15:58:30 +01:00
Jack Ha
62487e8ea2 CURA-4525 cleanups and change comment and added new-lines 2018-01-03 15:41:08 +01:00
Jack Ha
2f965cc053 CURA-4525 switch locations of build plates and objects list 2018-01-03 14:18:40 +01:00
ChrisTerBeke
7eb507484b hide sidebar header when in monitoring mode 2018-01-03 14:12:45 +01:00
ChrisTerBeke
1686f951c9 Finish styling mode switch buttons 2018-01-03 14:02:35 +01:00
Jack Ha
bfa33c721c CURA-4525 solved merge conflicts 2018-01-03 13:52:55 +01:00
ChrisTerBeke
4f77b2ea6d More layout and font fixes 2018-01-03 13:50:06 +01:00
ChrisTerBeke
1476e95adc Fix mode switching buttons functionality 2018-01-03 13:45:18 +01:00
ChrisTerBeke
b7aadbe3c3 Fix extruder dropdown text model 2018-01-03 13:08:20 +01:00
ChrisTerBeke
1fa3031486 Fix text color for extruder comboboxes 2018-01-03 12:52:40 +01:00
Jack Ha
cb1484ee63 CURA-4525 update size and margins of objects list 2018-01-03 12:52:32 +01:00
ChrisTerBeke
3a2b2d3333 Also fix combobox list item heights for extruder dropdowns 2018-01-03 12:48:33 +01:00
Jack Ha
c8243a0ddd CURA-4525 fix convex hull, changed size of object list 2018-01-03 12:47:09 +01:00
ChrisTerBeke
1fe653b231 Fix combobox dropdown item height 2018-01-03 12:47:08 +01:00
ChrisTerBeke
77c8ac3950 Layout fixes for controls 2.0 2018-01-03 11:46:20 +01:00
Lipu Fei
f6168c07f0 Fix material_diameter bindings for metarial menu and page 
CURA-4708
 2018-01-03 11:27:30 +01:00
ChrisTerBeke
27ca743e58 Merge branch 'master' into qtquick-controls-2.0 2018-01-03 11:03:17 +01:00
Aleksei S
43db2ee2f9 Added ElideRight for the text which is out of boundaries 
CURA-4692
 2018-01-03 10:34:23 +01:00
Lipu Fei
2e4ffc83b5 Add material_diameter to fdmextruder definition 
CURA-4708
 2018-01-02 10:50:06 +01:00
Mark Burton
f82753b766 Move optimize_wall_printing_order from experimental section to shell. 
Still not enabled by default yet but perhaps in the future after it has been tested more it will be.
 2018-01-02 09:39:20 +00:00
Torbjørn
5104a48bcc Added 3D model for Tevo Black Widow + small fix 
Roel Versteeg (Rovex) has kindly agreed to let us use his model of the printer, https://www.thingiverse.com/thing:1933864
Since the model is a bit to detailed for our use I have spoken with Jon MC (security0051) that had already modified for better fit in editor. https://www.thingiverse.com/thing:2592417. He has also agreed to let us use his version.
 2017-12-31 23:15:00 +01:00
Torbjørn
948497c9a8 Major update of Quality profiles and definitions 
Removed has_materials, quality over quantity
 2017-12-31 03:23:19 +01:00
Ruben D
689a18ee57
Rename sidebar_collapsed and code style 
sidebar_collapsed is more consistent with other options and setting names we use. Better change it before the next release rolls out otherwise we'd have to do a version upgrade.
Also changed some code style things to be in line with our guidelines.

Contributes to issue CURA-4234.
 2017-12-30 19:35:46 +01:00
Torbjørn
391adbdfb3 Remove ID from definition files 2017-12-30 02:24:23 +01:00
Torbjørn
5690aef3d5 Added 3D Platform for Anycubic i3 Mega 2017-12-30 01:58:22 +01:00
Torbjørn
04589596f0
Reverted back to use of RepRap (Marlin/Sprinter) 2017-12-30 00:18:15 +01:00
Torbjørn
7aaedff8af
Reverted back to use of RepRap (Marlin/Sprinter) 2017-12-30 00:17:36 +01:00
Torbjørn
6e35936ab9
Merge pull request #3 from Ultimaker/master 
test
 2017-12-30 00:15:48 +01:00
Torbjørn
b782b532fc Update to new machine_gcode_flavor definition 2017-12-29 23:27:39 +01:00
Torbjørn
8a308ef0db Added Quality profiles for Anycubic i3 Mega 2017-12-29 19:59:04 +01:00
Ghostkeeper
1bcdc0357e
If there is no added printer, disallow closing the window 
The state of having no printer added is very weird to the user. Let's prevent that from happening by accident.

Contributes to issue CURA-4736.
 2017-12-29 14:32:43 +01:00
Ghostkeeper
8b504c8acc
Fix scroll position after collapsing category not in focus 
When collapsing a category, the height of the category is briefly set to 0 and then animated there properly. If the setting list becomes so small then that the scroll bar disappears, the view should automatically get scrolled up. But because the focus changed at the same time it would move the scrollbar such that the category header was in view. This clashed, causing the scroll position to end up not completely at the top even though the scroll bar did disappear. Setting the focus after collapsing the scroll bar prevents this.

Contributes to issue CURA-4732 and fixes #2935.
 2017-12-29 14:07:34 +01:00
Ghostkeeper
c786f7a69b
Add Portuguese to language drop-down 
So that we can select it.

Contributes to issue CURA-4692.
 2017-12-29 11:53:58 +01:00
Ghostkeeper
ac8f3a31be
Include period in translation source text 
I suspect that this was originally done this way to prevent breaking a string freeze. I'm now correcting it so that languages that don't use this period will also be able to properly end their sentence (such as Japanese or Chinese).

Contributes to issue CURA-4692.
 2017-12-29 11:51:28 +01:00
Ghostkeeper
da4372beef
Corrections for Portuguese translation 
Without really knowing the language, I was able to make these corrections.

Contributes to issue CURA-4692.
 2017-12-29 11:49:04 +01:00
Ghostkeeper
5b47c58e80
Add European Portuguese translation 
This is a new translation from Bothof.

Contributes to issue CURA-4692.
 2017-12-29 11:22:55 +01:00
Torbjørn
c1dea6e9d4 Adding support Tevo Black Widow 
Definition for _Tevo Black Widow_ from the user manual.
 2017-12-29 01:56:46 +01:00
Torbjørn
b733c587f4 Adding support Anycubic i3 Mega 
Definition for _Anycubic i3 Mega_ from the user manual.
 2017-12-29 01:33:12 +01:00
Ghostkeeper
93a3054af0 Round layer heights to 2 decimals 
More difficult than I expected actually...

Contributes to issue CURA-4655.
 2017-12-28 09:11:41 -08:00