Commit graph

3049 commits

Author SHA1 Message Date
Jaime van Kessel
7c744044fd Fixed merge issues & updated proto files 2016-02-02 11:25:10 +01:00
Jaime van Kessel
f068f569d3 Merge pull request #612 from thopiekar/2.1-alternative-nvidia-fix
Alternative fix for NVidia graphic cards
2016-02-02 10:53:16 +01:00
Ghostkeeper
2bea12624a Merge pull request #625 from thopiekar/2.1-i18n-de-spelling
i18n: de: Set of (better) translations for german
2016-02-02 10:24:41 +01:00
Elena Filenko
29562090b6 Removed lines fro 2.1 version 2016-02-01 17:38:21 -08:00
Elena Filenko
000390966e Added CmakeLists.txt file for ability to open and search through files in Qtcreator 2016-02-01 13:07:24 -08:00
Thomas-Karl Pietrowski
f9f4c50703 i18n: de: Comma will be overwritten, when value gets overwritten by the UI
As far as I understand the code Cura will replace "%1 Meter" with a string converted from a float.
In german it is correct so say "x,y Meter" where in english regions it would be called "x.y meter".
So what it needs in Cura is something like "[before_comma],[after_comma] Meter" to the character "." can be translated to ",".
As Cura isn't able (correct me if it can) to do this on it's own, so changing it back to "x.y Meter".
2016-02-01 18:48:53 +01:00
Thomas-Karl Pietrowski
d0247f350c i18n: de: Undoing my changes on "%1 Meter" 2016-02-01 18:47:57 +01:00
Thomas-Karl Pietrowski
1ae783897b i18n: de: Calling "Update" -> "Aktualisierung"
In my point of view this sounds better than using "Update" (anglicism)
2016-02-01 18:16:06 +01:00
Thomas-Karl Pietrowski
1e0eddbd32 i18n: de: another set of good translations 2016-02-01 18:14:40 +01:00
Thomas-Karl Pietrowski
5c9b2d81b9 i18n: de: Marking another good set of translations
No more left so say...
2016-02-01 17:58:02 +01:00
Thomas-Karl Pietrowski
9014c0422f i18n: de: Better calling Setup -> "Konfiguration"
The reason why I would rename it, is that you usually do a "Einrichtung" on the first time you run an application.
"Konfiguration" sounds here better, in my point of view, because you configure your slicing process for your loaded (difficult) object.
2016-02-01 17:50:12 +01:00
Thomas-Karl Pietrowski
7ed16b55bf i18n🇩🇪 Removing fuzzy tag from some good translations
Totally agree with these translations. So marked them as "non-fuzzy".
2016-02-01 17:48:03 +01:00
Thomas-Karl Pietrowski
e7769ae0a5 i18n: de: Generally call "removable drive" "Wechseldatenträger"
I don't know the name for "Wechsellaufwerk" in english, but these devices are not meant to be USB-sticks.
Some PC cases have the possibility to remove a CD drive and you can e.g. replace it with a HDD.
Such devices are really called "Wechsellaufwerk", but the meaning here is "Wechseldatenträger".
2016-02-01 17:40:40 +01:00
Thomas-Karl Pietrowski
eb1edd9a28 i18n: de: Revert translation on SI unit
Don't see a reason, why we should translate "m" > "meter" -> "Meter" here.
Additionally the tranlation for "0.0m" is untranslated while "m" is translated as "Meter".
So I reverted this here.
2016-02-01 17:33:48 +01:00
Thomas-Karl Pietrowski
81eccdba45 i18n: de: X-Ray -> Röntgen
Of course most people might now what the meaning of X-Ray is, but I would translate it, because first it sounds more professional than using anglicisms.
2016-02-01 17:28:33 +01:00
Arjen Hiemstra
ffec2484b7 Fix Layer view 2016-02-01 17:15:45 +01:00
Jaime van Kessel
ebc1df1a4c Hull node is no longer added if linked node is deleted while it was calculating
CURA-637
2016-02-01 17:03:53 +01:00
Jaime van Kessel
782c4508c6 Convex hull is also redrawn when machineInstance is changed
CURA-742
2016-02-01 16:03:31 +01:00
Tim Kuipers
fd5d029c4b infill overlap % ==> mm (CURA-786) 2016-02-01 11:53:19 +01:00
Jaime van Kessel
d68e17c9f5 Merge pull request #624 from Ultimaker/fast_advanced_switch
Fast Simple<->Advanced Switch
2016-02-01 10:48:27 +01:00
Jaime van Kessel
e6d7dd1e4e Merge pull request #611 from Ultimaker/feature_delay_cameranimation
Feature delay cameraanimation
2016-02-01 10:30:21 +01:00
Ghostkeeper
d795450c22 Merge pull request #623 from thopiekar/2.1-l10n-critical-fixes
i18n: Revert translations on keywords
2016-02-01 09:59:10 +01:00
Ghostkeeper
a45e55ab4c Reactivate _always_restart
This was deactivated during debugging as a test. Shouldn't have been committed.

Contributes to issue CURA-427.
2016-01-29 20:57:16 +01:00
Thomas-Karl Pietrowski
a0c564c523 i18n: Revert translations on keywords
* Because these keywords got translated the code can't replace them with values.
* Basicly the idea having these keywords in translation files is just to change the order of them (according to the culture and the region, where another order would be expected).
-> So reverted the translated keywords for german and french.
2016-01-29 19:14:53 +01:00
Arjen Hiemstra
5d136a1da7 ActiveTool.properties now returns a ContainerProxy object 2016-01-29 15:18:19 +01:00
Arjen Hiemstra
edf2802099 Use a StackView and non-dynamic instantation for the sidebar modes
Improves performance at the cost of flexibility.
But we did not use that flexibility anyway.
2016-01-29 14:58:08 +01:00
Ghostkeeper
6271b4039b Merge branch '2.1' of https://github.com/Ultimaker/Cura into 2.1 2016-01-29 11:23:01 +01:00
Ghostkeeper
c53969f1bd Wait for FinishedSlicing message to mark slicing as finished
Instead of waiting until progress is more than 99%, wait for the dedicated FinishedSlicing message.

Contributes to issue CURA-427.
2016-01-29 11:22:04 +01:00
Ghostkeeper
8915da812b Merge pull request #613 from thopiekar/2.1-additional-mime-types
Adding support for additional object files
2016-01-29 10:26:43 +01:00
Arjen Hiemstra
e74d300fb3 Make things work properly using the new Arcus API 2016-01-28 18:07:42 +01:00
Tim Kuipers
319d8197ab fix: bq_hephestos profile syntax error 2016-01-28 15:29:20 +01:00
Tim Kuipers
8a48791a0b Merge branch '2.1' 2016-01-28 15:25:18 +01:00
Arjen Hiemstra
21f70c4123 Add Cura protobuf protocol file
Should find some way of sharing the one in CuraEngine but this works for
now
2016-01-28 03:23:47 +01:00
Arjen Hiemstra
22fb26bae6 Update StartSliceJob to reflect the new Arcus API 2016-01-28 03:23:10 +01:00
Arjen Hiemstra
6930008dd8 Pass the protocol file to Backend's createSocket 2016-01-28 03:22:18 +01:00
Ghostkeeper
c3eb810aa2 Update DE, EN, FI and FR translations
These were given by our translators. They are checked for form errors by me.

Contributes to issue CURA-526.
2016-01-27 13:28:36 +01:00
Tim Kuipers
d6bd59da0e made some settings max value warning instead of impossible 2016-01-27 10:21:34 +01:00
Tim Kuipers
4edc4ece86 Merge branch '2.1' of https://github.com/Ultimaker/Cura into 2.1 2016-01-26 15:55:13 +01:00
Tim Kuipers
7c652ed069 JSON: refactor: moved draft shield options to Cooling category 2016-01-26 15:55:00 +01:00
Ghostkeeper
71e390321c Merge branch '2.1' of https://github.com/Ultimaker/Cura into 2.1 2016-01-26 13:58:16 +01:00
Ghostkeeper
f09b927288 Add check if resulting profile is empty
If it is, a warning is logged.

Contributes to issue CURA-37.
2016-01-26 13:58:00 +01:00
Ghostkeeper
e7b2586d36 Don't add to profile if setting is legacy default
If a setting is equal to the legacy setting's default value, then it doesn't get added to the profile either.

Contributes to issue CURA-37.
2016-01-26 13:50:46 +01:00
Ghostkeeper
c0b5832a59 Remove debug prints
Shouldn't have committed those. Sorry!

Contributes to issue CURA-37.
2016-01-26 13:32:52 +01:00
Ghostkeeper
5374d253e9 Evaluate to old defaults if setting is missing
If the setting is missing from the legacy profile, let it evaluate to the default in the legacy Cura.

Contributes to issue CURA-37.
2016-01-26 13:27:42 +01:00
Thomas-Karl Pietrowski
350466c73e Adding instructions to CMakeLists.txt to install cura.sharedmimeinfo as cura.xml into ${CMAKE_INSTALL_DATADIR}/mime/packages/ 2016-01-25 19:34:33 +01:00
Thomas-Karl Pietrowski
a88191d4c5 Adding cura.sharedmimeinfo
* Originally taken from my own packaging of Cura on launchpad: ppa:thopiekar/cura - https://launchpad.net/~thopiekar/+archive/ubuntu/cura
* It adds mime-types, which are supported by Cura, to the mime-database, so filemanagers can recognize these files.
* This sharemimeinfo includes currently 3MF, STL and OBJ.
2016-01-25 18:47:00 +01:00
Ghostkeeper
c06ed1e56d Merge pull request #610 from thopiekar/2.1-i18n-de-desktop-file
i18n: de: adding german translation to cura.desktop
2016-01-25 10:15:49 +01:00
Thomas-Karl Pietrowski
c6c7ca5d2f Adding support for additional object files:
* 3MF files
* OBJ files
2016-01-23 20:34:25 +01:00
Thomas-Karl Pietrowski
aee89f2f16 Alternative fix for NVidia graphic cards
As I upgraded my computer to a developer version of Ubuntu, I noticed that the OpenGL module, which is needed for our workaround, is currently broken.
So I browsed the web and found the reason why it is needed at all and found a alternative.
The reason for the problem is that Qt5 is dynamicly loading libGL.so instead of libGL.so.1, as the OpenGL module loads libGL.so.1.
So if you install the closed-source nvidia drivers it only creates a link from libGL.so.1 to it's binaries and the result is that PyQt5/Qt5 tries to load Mesa binaries together with NVidia binaries.
By importing the OpenGL module you preload the libGL.so.1, but this can also be done directly by using ctypes.

* Replaced the OpenGL fix with the ctypes fix
* Added a TODO
2016-01-23 19:39:54 +01:00
fieldOfView
e723b78f09 Remove vestigial import 2016-01-23 17:15:42 +01:00