2830 Commits

Author SHA1 Message Date
Ghostkeeper
161b200a67
Fix typo in label ID 2018-11-09 11:41:43 +01:00
Diego Prado Gesto
b6e35df030
Merge pull request #4709 from fieldOfView/fix_add_printer_layout
Add Printer dialog codestyle and readability
2018-11-02 15:29:32 +01:00
Ghostkeeper
bd97aed1c7
Merge branch '3.6' 2018-11-01 14:43:47 +01:00
Ghostkeeper
4dc248a631
Rename Open Marketplace to just Marketplace
Because Open Marketplace has to be translated (the 'open' part) but the Marketplace can just be called marketplace.

Contributes to issue 5870.
2018-11-01 14:43:22 +01:00
fieldOfView
e61a6e7a5c Fix codestyle 2018-11-01 14:41:33 +01:00
Diego Prado Gesto
9215bb11f0 Merge branch '3.6' 2018-11-01 09:11:20 +01:00
Diego Prado Gesto
e884605cc3 Fix typo. 2018-11-01 08:47:44 +01:00
Jaime van Kessel
6256e3f24b Merge branch 'feature_add_printer_layout' of https://github.com/fieldOfView/Cura 2018-10-31 14:23:42 +01:00
Ghostkeeper
a5c2a73487
Fix adhesion type checkbox if default is skirt
The remove-unused-values feature doesn't work with settings that are resolved, because we try to remove them at the appropriate position in the stack but then we check at that position in the stack if the value is not the same as what it was, but with this check the resolve function is no longer evaluated. It's complex, but hard to solve because we can't try to remove it at this location and predict that this will change the actual final value after the resolve function has done its thing.

Contributes to issue CURA-5877.
2018-10-31 13:09:15 +01:00
Remco Burema
e963fd2d85
Merge pull request #4445 from fieldOfView/fix_setting_float_precision
Reduce the maximum precision of floats in SettingTextField inputs
2018-10-31 12:26:34 +01:00
Lipu Fei
50d92df8a8 Merge remote-tracking branch 'origin/3.6' 2018-10-31 11:01:16 +01:00
Diego Prado Gesto
33da50df26 Rename other entries of the Toolbox to Marketplace.
Add a line in the Changelog indicating that the Toolbox was renamed.

Contributes to CURA-5874.
2018-10-31 09:45:29 +01:00
Ghostkeeper
c736bfffb5
Add hotkeys for managing profiles and materials
These are unused on all platforms. We can't use Ctrl+M (multiply selection), Ctrl+P (print) or Ctrl+Q (quit) sadly.

Fixes #4250.
2018-10-30 10:54:14 +01:00
Mark
fda0f59c70 Rename user visible entries of ToolBox to Marketplace
CURA-5874
2018-10-30 10:27:22 +01:00
Ghostkeeper
ebbb7ad88f
Code style 2018-10-25 10:55:10 +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
Jaime van Kessel
4c5bf3297c Merge branch 'master' of github.com:Ultimaker/Cura into CURA-5734-rework-and-unit-test-setting-visibility-preset 2018-10-17 10:49:29 +02:00
Jaime van Kessel
d086e6fa86 Fix review comments
CURA-5734
2018-10-17 10:47:34 +02:00
Diego Prado Gesto
4a0808378b Allow whitespaces in the job name.
Fixes #4530.
2018-10-16 13:23:35 +02:00
Ghostkeeper
9e4fcd820e
Update outputDevice when the global container changed
And directly link the active printer name to it, so that that also gets updated. With the property var it just gets evaluated upon creating the rectangle.

Contributes to issue CURA-5749.
2018-10-12 14:56:27 +02:00
Ghostkeeper
b37252f124
Minor code style fixes
Contributes to issue CURA-5734.
2018-10-10 14:18:37 +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
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
fieldOfView
4e083c7c29 Fix QML typo 2018-10-05 21:51:08 +02:00
fieldOfView
2fb7d8a253 Make the Add Printer dialog less spartan 2018-10-05 21:41:35 +02:00
fieldOfView
94164c5865 Add Charon, Shapely, Trimesh and NetworkX to credits 2018-10-05 15:29:52 +02:00
Diego Prado Gesto
6abd43f690 Add Polish to the list of available languages. Forgotten by mistake. 2018-10-04 17:37:28 +02:00
Jaime van Kessel
dabe747ec0 Merge branch 'CURA-5744-move-oauth-login' of github.com:Ultimaker/Cura 2018-10-03 13:25:09 +02:00
Aleksei S
51e7b6c388 Change font style for active material in preferences
CURA-5747
2018-10-03 10:30:48 +02:00
Jaime van Kessel
fc9f05fc8b Moved SettingVisibilityPreset loading to it's own class
Since there was so much debate regarding the unit testing of the visiblity presets, i had another look at it.
The old version was almost untestable because all functionalities were mushed together into a single class.

CURA-5734
2018-10-01 11:32:55 +02:00
Aleksei S
98c3f497d8 Merge branch 'master' of github.com:Ultimaker/Cura 2018-10-01 11:32:39 +02:00
Aleksei S
3f8b7fb6af Fix: Switches to 'Prepare' always go through 'Recomended' mode
CURA-5731
2018-10-01 11:30:21 +02:00
Diego Prado Gesto
046fca5d0f Align the "Enable Gradual" text with the corresponding checkbox. 2018-10-01 10:46:45 +02:00
fieldOfView
53b481ff5d Reduce the maximum precision of floats in SettingTextField inputs
No settings in Cura require more than 3 digits of precision. Many settings are in mm, and CuraEngine does its calculations in while microns. Having more precision in the frontend than in the backend apparently thoroughly confuses some people. Fixes #4368
2018-09-29 08:16:11 +02:00
Jaime van Kessel
c2f0a33b42
Merge branch 'master' into full_screen_test 2018-09-28 11:24:22 +02:00
ChrisTerBeke
185a1707b2 Merge branch 'master' into CURA-5744-move-oauth-login 2018-09-27 09:40:44 +02:00
Diego Prado Gesto
987ae73078 Remove call to undefined function. 2018-09-25 13:15:26 +02:00
Lipu Fei
51f2386db1 Merge remote-tracking branch 'origin/3.5' 2018-09-25 11:56:12 +02:00
Lipu Fei
8837ffc06d Fix mateial management QML reference
CURA-5682
2018-09-25 11:52:53 +02:00
Diego Prado Gesto
e31f35ec95 Merge branch '3.5' 2018-09-25 09:36:08 +02:00
Aleksei S
b44fb7ca24 Select correct material according to the active extruder
CURA-5682
2018-09-21 17:35:46 +02:00
Jaime van Kessel
081b2a28fe Expose Account API to QML
This is done by adding the API as an SingletonType to Cura.

CURA-5744
2018-09-21 17:23:30 +02:00
Aleksei S
86d8f8517d In material page was not defined the used extruder nr, for generic materials
CURA-5682
2018-09-21 13:48:46 +02:00
Jaime van Kessel
054a49c63d Fix issue with inheritance manager button
Removed one of the special detection cases, since it incorrectly removed a value from a stored profile

CURA=5646
2018-09-21 09:33:25 +02:00
Jaime van Kessel
2dbaa304a0 Set textFormat for the setting items to PlainText
Based on the Qt guide on making qml run much faster, it seems that the default of textFormatting (auto)
is quite expensive. As we make a *lot* of settingItems, which we don't want to format, it's better to set it to plain.
I haven't checked how much faster it actually is, but i didn't see visual changes, so it's at least a safe step.
2018-09-20 15:22:35 +02:00
Ghostkeeper
f6b56a6506
Merge branch '3.5' 2018-09-19 17:16:14 +02:00
Ghostkeeper
ac4ee8c428
Fix context of pause, resume and abort labels
More in line with what we have in the rest of our code base.

Discovered during work on CL-1053 and CURA-5729.
2018-09-18 11:25:35 +02:00
Lipu Fei
6929d96119 Merge remote-tracking branch 'origin/3.5' 2018-09-17 16:14:49 +02:00