GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-07-06 03:25:11 +08:00
Code Issues Packages Projects Releases Wiki Activity
17,119 Commits 295 Branches 268 Tags
Commit Graph

17119 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jaime van Kessel
4743bd8bd5 Merge branch 'cura4.0_header' of github.com:Ultimaker/Cura into cura4.0_header 2018-10-11 10:30:51 +02:00
Jaime van Kessel
85436c1469 Move machine selector to own component & new location 
This also simplifies & cleans up the actually used QML

CURA-5772
 2018-10-11 10:29:59 +02:00
Remco Burema
487ef52c66 Warn on error and continue on encountering 'future-proof' (now) or old (later) version-URLs. 2018-10-10 17:09:54 +02:00
Remco Burema
0ac4f8f521
Merge pull request #4531 from Ultimaker/normal_quality_ender_3 
[3.5] Use 0.1 layer height as normal for Ender 3
 2018-10-10 16:37:16 +02:00
Diego Prado Gesto
d49a4f1179 Merge branch 'cura4.0_header' of github.com:Ultimaker/Cura into cura4.0_header 2018-10-10 16:36:11 +02:00
Diego Prado Gesto
5befc0b256 Restyle the dropdown of the accounts, with information about the user 
and available operations that can be done when the user is logged in or
not.

Contributes to CURA-5784.
 2018-10-10 16:34:55 +02:00
Remco Burema
10b5584ca6 [CURA-5483] Support more than just the UM3(E) for the firmware-update-check (add S5 only for now). 2018-10-10 16:24:13 +02:00
Ghostkeeper
4c6744b6fc
Code style: Space around binary operators 
I just looked for lines with interpolation = None because I was looking for another possible bug, but fixing this in the meanwhile too.
 2018-10-10 14:28:50 +02:00
Jaime van Kessel
1ed3558b9a Move ViewOrientationControl to lower left corner 
This also renames the component to better reflect what it is (the old name implied that it
had something to do with orientation views, wheres it's actually a set of controls to change orientation)

CURA-5772
 2018-10-10 14:21:09 +02:00
Ghostkeeper
b37252f124
Minor code style fixes 
Contributes to issue CURA-5734.
 2018-10-10 14:18:37 +02:00
Jaime van Kessel
b3fc76092d Removed unused EngineLog 2018-10-10 14:01:34 +02:00
Jaime van Kessel
e3861b0d90 Add few more elide properties to ensure text doesnt' overlap 2018-10-10 12:48:22 +02:00
Lipu Fei
cc34e14215 Use ElideRight for long script names 
CURA-5683
 2018-10-10 11:52:16 +02:00
Diego Prado Gesto
b89c220a4d Add linings between tabs in the top header. 
Contributes to CURA-5784.
 2018-10-10 11:17:09 +02:00
Diego Prado Gesto
0df7fa1a6c Add style to the top header tabs. 
Contributes to CURA-5784.
 2018-10-10 11:04:08 +02:00
Lipu Fei
01d95f51c8 Fix prime blob enabled for S5 
Still need that enabled = true...
 2018-10-10 09:34:30 +02:00
Lipu Fei
4c98ffdffa
Merge pull request #4532 from Ultimaker/M&P-Setting-Optimization 
Fixed prim blob visibility
 2018-10-10 09:32:44 +02:00
Lipu Fei
6d852228e3
Update ultimaker_s5.def.json 2018-10-10 09:29:42 +02:00
THeijmans
d3101b2fd9 Fixed prim blob visibility 
Changed the wrong prime_blob setting, now it should be visible but disabled.
 2018-10-10 09:26:16 +02:00
Lipu Fei
382adf57df Use 0.1 layer height as normal for Ender 3 2018-10-10 07:55:49 +02:00
Diego Prado Gesto
49e96980f1 Store the dialogs in a folder called Dialogs. 
Contributes to CURA-5784.
 2018-10-09 17:11:01 +02:00
fieldOfView
ab7fe3138d Remove unused imports 2018-10-09 17:06:20 +02:00
fieldOfView
a36deea651 Move updateFirmware to PrinterOutputDevice... 
along with codestyle and typing fixes
 2018-10-09 16:26:45 +02:00
Diego Prado Gesto
77a1b08f38 Add the callout panel to the account panel, with the two components that 
will show up when the user is logged in or when not.

Contributes to CURA-5784.
 2018-10-09 15:58:13 +02:00
Lipu Fei
1951391a23 Merge remote-tracking branch 'origin/3.5' 2018-10-09 12:04:53 +02:00
alekseisasin
0b70b9a218
Merge pull request #4521 from Ultimaker/CURA-5799_fix_extruder_settings_to_curaengine 
[3.5] CURA-5799 Fix sending extruder settings to curaengine
 2018-10-09 11:53:46 +02:00
Lipu Fei
18821b6527 Add missing extruder def for Creality Ender 3 
CURA-5806
 2018-10-09 11:43:42 +02:00
Jaime van Kessel
937c2dfa8c Merge branch 'WIP_kill_extruder_manager' of github.com:Ultimaker/Cura 2018-10-09 11:05:21 +02:00
Vlad Gribinchuk
eb310116aa JSON settings for "Support Interface Offset" feature 2018-10-09 10:50:34 +03:00
Diego Prado Gesto
2ffcf03f43 Create an AvatarImage component that will show the profile image of the 
user. Still WIP.
Create an AccountWidget (WIP) that shows the avatar image and the
dropdown menu to manage accounts.

Contributes to CURA-5784.
 2018-10-08 17:35:24 +02:00
Jaime van Kessel
d1a51b26f7 Simplified QML expression 2018-10-08 17:22:04 +02:00
Jaime van Kessel
5f6b267c77 Merge branch 'fix_credits' of https://github.com/fieldOfView/Cura 2018-10-08 17:07:05 +02:00
Jaime van Kessel
d98eafe041 Merge branch '3.5' of github.com:Ultimaker/Cura 2018-10-08 17:03:25 +02:00
Jaime van Kessel
9e5b72c5b6 Merge branch 'fix_unnecessary_imports' of https://github.com/fieldOfView/Cura 2018-10-08 16:41:29 +02:00
Jaime van Kessel
d24437e60c
Merge pull request #4520 from Ultimaker/CURA-5793_fix_setting_value_templates 
[3.5] CURA-5793 fix setting value templates
 2018-10-08 16:04:51 +02:00
Lipu Fei
5ba60de209 Send extruder settings ordered by extruder position 
CURA-5799
 2018-10-08 16:01:51 +02:00
Ghostkeeper
314b966cc9
Improvements to translated strings 
These strings were recently found to have been confusing to the translators. Improvements are:
- Pulling the (untranslated) error message out of the message sentence. We really want the error message to be at the end so we'll force the translators to translate it as a prefix.
- Remove extra spaces at the end.
- Remove Python logic from within the i18nc call, since gettext doesn't understand that.

Contributes to issue CURA-5741.
 2018-10-08 15:03:21 +02:00
Diego Prado Gesto
41add97b13 Add Toolbox shortcut to the TopHeader and align the stage tabs to the 
center.

Contributes to CURA-5784.
 2018-10-08 14:50:13 +02:00
Lipu Fei
3965218501 Fix value templating for gcode 
CURA-5793

Fix GcodeStartEndFormatter to take the correct default_extruder_nr
instead of always using -1.
 2018-10-08 14:42:22 +02:00
Diego Prado Gesto
075a9a161f Create a component for the Views selector. This component contains the 
list of the views and also the shortcuts for the camera position.

The theme colors, sizes and the styles have been updated.

Contributes to CURA-5784.
 2018-10-08 12:57:16 +02:00
alekseisasin
c947e4f432
Merge pull request #4485 from Ultimaker/CURA-5768_layer_view_skip_empty_layers 
Don't skip empty first layers in the layer view
 2018-10-08 11:56:35 +02:00
Diego Prado Gesto
3acfdadd12 Organize the components in a Column. Separate the TopHeader and place it 
below the application menu, using all the width.

Contributes to CURA-5784.
 2018-10-08 11:31:53 +02:00
Diego Prado Gesto
8bdd27183f Move TopBar to the Skeleton folder. 
Clean up the Cura.qml even more by moving some components to the
ApplicationMenu, where they are called.

Contributes to CURA-5784.
 2018-10-08 10:59:46 +02:00
Diego Prado Gesto
193f113851 Clean up Cura.qml: 
- Create a Skeleton folder where the main parts of the application will
be stored.
- Separate the top menus to a different file.

Contributes to CURA-5784.
 2018-10-08 10:33:01 +02:00
Sacha Telgenhof Oude Koehorst
374b0995d3
Changed bed size to 235x235mm (including the STL Mesh). Removed all M commands (M104, M140, M190, M109) from the custom start GCode, and removed all M commands (M104, M140, M106, M107) from the custom end GCode as Cura already generates these. Decreased the height position of the extruder (from 3 to 2mm) upon purging. Increased the height position of the extruder (from 10 to 20mm) after the print has finished. 2018-10-06 19:21:22 +09:00
fieldOfView
4e083c7c29 Fix QML typo 2018-10-05 21:51:08 +02:00
fieldOfView
8e6e749d96 Merge branch 'fix_unused_icon_metadata' into feature_add_printer_layout 2018-10-05 21:42:04 +02:00
fieldOfView
2fb7d8a253 Make the Add Printer dialog less spartan 2018-10-05 21:41:35 +02:00
fieldOfView
7c68829fcd Remove unused and incorrect "icon" metadata from definitions 
The "icon" metadata is not used, and in all cases points to non-existing files anyway.
 2018-10-05 15:57:30 +02:00
fieldOfView
94164c5865 Add Charon, Shapely, Trimesh and NetworkX to credits 2018-10-05 15:29:52 +02:00