10057 Commits

Author SHA1 Message Date
Lipu Fei
b70a89d0e1 Fix stdout and stderr redirecting file location 2017-09-04 14:08:03 +02:00
Jaime van Kessel
20ffb0cd6d Merge pull request #2369 from vivekanand1101/patch-1
CuraApplication: Minor pep8 fix
2017-09-04 09:53:16 +02:00
Lipu Fei
0358b1fcae Fix User-Agent header in PluginBrowser 2017-09-04 09:23:46 +02:00
Ruben D
3af37d5dbc
Fix token replacement in extruder start and end g-codes
Don't perform the replacement in the global stack for these settings, but in the extruder stacks.

Fixes #2331.
2017-09-03 16:41:02 +02:00
Mark
d18d9223a5 refix the alignmet of the support and adhesion chackboxes
CURA-4148
2017-09-03 08:18:12 +02:00
Vivek Anand
ee1ba30d0e CuraApplication: Minor pep8 fix 2017-09-02 12:01:38 +00:00
alekseisasin
24c9dc9bee Merge branch 'feature_light_colours_icons'
CURA-4148
2017-09-01 19:25:29 +02:00
alekseisasin
a288668bae Adjusted color for the extruder counter number in left toolbox and added
extra margin-right in sidebar_category
CURA-4148
2017-09-01 17:45:50 +02:00
Jaime van Kessel
a652ddbdd8 Reset lastResponseTime when trying to connect
CURA-3869
2017-09-01 14:54:57 +02:00
Jaime van Kessel
be1b5cd83a Cura no longer crashes when writing to full SD drive.
It instead tells warns the user and logs the event. CURA-3909
2017-09-01 14:43:12 +02:00
Jaime van Kessel
98795d8953 Added missing not supported profiles for PP
CURA-3977
2017-09-01 14:36:19 +02:00
Jaime van Kessel
2b54d75453 Merge branch 'mb-more-z-seam-options' of https://github.com/smartavionics/Cura 2017-09-01 13:22:13 +02:00
Jaime van Kessel
6b693c80b5 Merge pull request #2343 from Ultimaker/thopiekar-patch-1-1
Install cura icon on Linux
2017-09-01 13:17:12 +02:00
Jaime van Kessel
ce52ae81ef Merge pull request #2354 from fieldOfView/fix_machine_settings_headpolygon
Fix setting machine head polygon in Machine Settings
2017-09-01 13:14:54 +02:00
Jaime van Kessel
9ec7ef8dba Made print spec invisible when monitoring print 2017-09-01 13:07:00 +02:00
Jaime van Kessel
a6e90270cf Updated margins so low resolution screens can actually have some settings visible 2017-09-01 12:05:20 +02:00
Lipu Fei
ceccca8244 Reduce the width of the license window
CURA-4222
2017-09-01 10:18:27 +02:00
fieldOfView
3c64175948 Fix setting machine head polygon in Machine Settings
This typo was spotted by @McAJBen. Fixes #2347
2017-08-31 22:57:50 +02:00
Ghostkeeper
062957c249
Hide the header if it would be empty
It would be empty if the machine is single extrusion and has no materials or variants.

Contributes to issue CURA-4241.
2017-08-31 15:51:51 +02:00
Ghostkeeper
0fc40d571a
Only make separator visible if the element above and below it are visible
The behaviour should be the same, if it was implemented correctly previously.

Contributes to issue CURA-4241.
2017-08-31 15:47:29 +02:00
alekseisasin
e38ec9d5e8 Renamed "Hotend" to "Extruder"
CURA-4256
2017-08-31 14:19:01 +02:00
alekseisasin
7c637029b6 Merge pull request #2334 from fieldOfView/feature_target_hotend_temperature
Show target hotend temperatures
2017-08-31 13:46:55 +02:00
Ghostkeeper
3951239513
Don't emit devices changed signal if remove wasn't successful
The same could be done for adding but let's keep it at this for now.

Hopefully fixes #2238.
2017-08-31 13:24:40 +02:00
alekseisasin
37eb74e99e Fixed quality file names
CURA-4128
2017-08-31 13:16:08 +02:00
alekseisasin
1c73841fae Merge branch 'master' of github.com:Ultimaker/cura 2017-08-31 13:03:23 +02:00
alekseisasin
d23e9cafe4 Merge pull request #2162 from FABtotum/master
FABtotum Personal Fabricator
2017-08-31 12:56:24 +02:00
Ghostkeeper
18a07b6eee
Change support Z offset to 2*layer_height
The materials team found this to work better.
2017-08-31 11:49:24 +02:00
Ghostkeeper
582a17c6af
Sort all UM2+ profiles
This will make it easier to modify these profiles in the future.
2017-08-31 11:48:41 +02:00
alekseisasin
225a213181 Merge branch 'master' of github.com:Ultimaker/cura 2017-08-31 10:35:08 +02:00
alekseisasin
fa61f5c2ad Merge pull request #2340 from Ultimaker/feature_license_for_plugins
Let user accept/decline a plugin license if present
2017-08-31 10:26:40 +02:00
Ghostkeeper
ed7e204cc0
Fix colour of time estimates text
I'd like it to be the same colour as the text underneath it, so subtext it is.

Contributes to issue CURA-4148.
2017-08-31 10:21:28 +02:00
Ghostkeeper
c4910503e4
Correct height of tips text
The contentHeight property seems to indicate the height of only one line, contrary to the documentation...

Contributes to issue CURA-4148.
2017-08-31 10:18:54 +02:00
Ghostkeeper
526a42f7a0
Put sidebar contents inside a scroll view
That means that you can't depend on the parent height and such any more. Luckily I already changed that in the previous commit.

Contributes to issue CURA-4148.
2017-08-31 09:51:19 +02:00
Ghostkeeper
95ba4b9368
Link anchors differently
Once this is in a scroll view, the width of the parent box isn't fixed any more. We'd have a lot of binding loops. So now this linking is not dependent on the parent width any more but rather on the theme sizes.

Contributes to issue CURA-4148.
2017-08-31 09:35:27 +02:00
Mark Burton
0efa2ac168 Tweak z_seam_corner option strings and the descriptive blurb. 2017-08-30 20:14:35 +01:00
Mark Burton
092bc2f916 Revert "Tweak z_seam_corner option strings and the descriptive blurb."
This reverts commit 27967a1531009b52882f3cdd6c094c8e7002b0d3.
2017-08-30 19:20:49 +01:00
Mark Burton
27967a1531 Tweak z_seam_corner option strings and the descriptive blurb. 2017-08-30 19:19:16 +01:00
Thomas Karl Pietrowski
2b78e8abde Install cura icon on Linux
This commit is needed for b9970d57b4
Never tested it, but believing the author of the commit that this change will work.
2017-08-30 19:32:38 +02:00
krios-fabteam
b4ae52b4c3 added 2 more variants
improved quality profiles
2017-08-30 17:17:39 +02:00
alekseisasin
01c7b5307f Merge branch 'feature_license_for_plugins'
CURA-4222
2017-08-30 17:11:27 +02:00
alekseisasin
088092c7bc Added min and max dialog size
CURA-4222
2017-08-30 17:07:43 +02:00
Ghostkeeper
831a91afff
Add test for upgrading preference file
Contributes to issue CURA-4148.
2017-08-30 16:08:50 +02:00
Ghostkeeper
d929359d77
Implement version upgrade 2.7 to 3.0
The theme 'cura' was renamed to 'cura-light', so that needs to be updated in the user's preferences.

Contributes to issue CURA-4148.
2017-08-30 16:08:50 +02:00
Ghostkeeper
5b36869b32
Update background colour of status icons
This outline needs to be the same colour as the background of the top bar.

Contributes to issue CURA-4148.
2017-08-30 16:08:50 +02:00
Ghostkeeper
99cae1469e
Copy status icons to dark theme
We want the dark theme to use these icons, but we want to update these icons for the light theme so I'm back-upping the icons for the dark theme.

Contributes to issue CURA-4148.
2017-08-30 16:08:50 +02:00
Ghostkeeper
a60cf07844
Use black logo for light theme
It's black on white instead of white on black.

Contributes to issue CURA-4148.
2017-08-30 16:08:50 +02:00
Ghostkeeper
c0f7d6aa19
Copy Cura logo from Light theme
We're going to keep this dark theme with the white Cura logo but modify the Light themed one to have a black logo.

Contributes to issue CURA-4148.
2017-08-30 16:08:49 +02:00
Ghostkeeper
b677a81d9b
Change default theme
This new field is now read by Uranium that indicates the default theme to load first before there are any changed preferences.

Contributes to issue CURA-4148.
2017-08-30 16:08:49 +02:00
Ghostkeeper
d4e5e10825
Restore vertical margins
We weren't allowed to change that yet.

Contributes to issue CURA-4148.
2017-08-30 16:08:49 +02:00
Ghostkeeper
f301464987
Update missing colours
And colours that have to change because the behaviour was changed (such as opacities now being themeable.

Contributes to issue CURA-4148.
2017-08-30 16:08:49 +02:00