Commit graph

4475 commits

Author SHA1 Message Date
Aleksei S
36dbc70813 Remove unnecessary code for taking snapshot for UFP file
CURA-5373
2018-05-18 14:01:31 +02:00
Aleksei S
1f149b2821 Do not show not printed models on snapshot for UFP files
CURA-5373
2018-05-18 10:50:54 +02:00
ChrisTerBeke
a20de3581a Add info message when failed because of version mismatch 2018-05-18 10:08:00 +02:00
ChrisTerBeke
a0d3dae920 Do not allow restore different version 2018-05-18 10:07:20 +02:00
ChrisTerBeke
7b3f334678 Fix ignored files for Windows 2018-05-17 15:07:28 +02:00
Diego Prado Gesto
8eea60bada CURA-5358 Fix typos 2018-05-17 14:28:10 +02:00
Diego Prado Gesto
aa07de45ed Start fixing restore on Windows 2018-05-17 12:13:01 +02:00
ChrisTerBeke
9410f93dbf Remove unused import 2018-05-17 10:16:13 +02:00
ChrisTerBeke
8b0346e11b For now just ignore locked files on windows 2018-05-17 10:15:11 +02:00
ChrisTerBeke
f00459e4cc revert 2018-05-17 09:32:18 +02:00
ChrisTerBeke
fb40ea13cc Try onerror 2018-05-17 09:25:03 +02:00
ChrisTerBeke
eb436a8b0e Ignore permission error on Windows when trying to remove log file 2018-05-17 09:13:55 +02:00
ChrisTerBeke
21889130b4
Code cleanup 2018-05-16 19:25:19 +02:00
ChrisTerBeke
82207e2f6a
Merge branch 'master' into feature-backup-manager
* master:
  Do not load material when no GUID is present instead of crashing Cura
2018-05-16 19:19:18 +02:00
ChrisTerBeke
c13b77d8a1
Do not load material when no GUID is present instead of crashing Cura 2018-05-16 19:18:09 +02:00
ChrisTerBeke
da94a5afb1 Merge branch 'master' into feature-backup-manager 2018-05-16 17:55:56 +02:00
Diego Prado Gesto
1bec6d7aa5 CURA-5164 Fix types 2018-05-16 17:26:56 +02:00
Diego Prado Gesto
e38b31c0eb Merge branch 'master' into WIP_improve_initialization 2018-05-16 16:57:51 +02:00
Ian Paschal
1d8a405e86 CURA-5357 Search for license files
The old code had the problem that by definition it skipped the `files/` folder and any other dir which of course is where the licenses are.

Now, so long as the license is always just called `LICENSE` (which is the convention in open source software), it can be located anywhere.
2018-05-16 15:16:16 +02:00
ChrisTerBeke
c866009df2 Merge branch 'master' into feature-backup-manager 2018-05-16 13:16:37 +02:00
Diego Prado Gesto
67ce55049b CURA-5164 Fix a bug when open the discard or keep dialog. It was using
a non-existing variable.
2018-05-16 10:26:13 +02:00
Ghostkeeper
eab150d7ee
Only look for user package management path in storage dirs
If we happen to find it in the installation (or some other place we can't write to) then it's going to crash. So don't do that.

Contributes to issue CURA-5364.
2018-05-16 09:29:03 +02:00
ChrisTerBeke
d27ac3cf31 Merge branch 'master' into feature-backup-manager 2018-05-15 16:50:25 +02:00
Diego Prado Gesto
ed6b63b41b Merge branch 'master' of github.com:Ultimaker/Cura 2018-05-15 16:47:42 +02:00
Diego Prado Gesto
bc965bacfc CURA-5358 Not use the prefix for installing packages and so no need to
rename directories for the packaged files
2018-05-15 16:46:07 +02:00
Jack Ha
9281c23555 Fix uninstallable user package which was also bundled; make update package somewhat better by not trying to uninstall builtin package 2018-05-15 16:23:54 +02:00
Diego Prado Gesto
5345bc2867 CURA-5358 Fill the dictionaries also if it's a custom material. But
making difference between those materials that depend on a built-in
material and those that don't depend on others.
2018-05-15 16:08:19 +02:00
Diego Prado Gesto
70ca053832 CURA-5358 Add the quality folder to the scope of the VersionUpgrade 2018-05-15 15:32:02 +02:00
ChrisTerBeke
82a1c95d98 Merge branch 'master' into feature-backup-manager 2018-05-15 12:56:19 +02:00
Aleksei S
50dabdbac8 Merge branch 'bugfix-toolbox-update' 2018-05-15 11:51:45 +02:00
Jack Ha
ed1ba41aa6 Undo setting wrong name in PrintInformation. CURA-5323 2018-05-15 11:42:17 +02:00
Ghostkeeper
0aa1aaf11b
Fix loading packages.json when file doesn't exist yet
Contributes to issue CURA-5364.
2018-05-15 11:23:26 +02:00
Ghostkeeper
0a9f389396
Search for bundled packages file in all search paths
For this we need to rename bundled_packages to disambiguate between that and the other packages.json file for user-installed packages.

Contributes to issue CURA-5364.
2018-05-15 11:14:17 +02:00
ChrisTerBeke
95c9062913 Merge branch 'master' into feature-backup-manager 2018-05-15 11:05:07 +02:00
Jack Ha
49c4f66d95 Ugly fix for uninstalling installed packages, but not uninstalling bundled packages. 2018-05-15 10:50:33 +02:00
Jack Ha
c54957540b Merge branch 'master' into bugfix-toolbox-update 2018-05-15 09:45:14 +02:00
Maxim Kulkin
9cb3960690 Add travel_avoid_supports setting support 2018-05-14 23:43:05 -07:00
alekseisasin
d433c54a0a If the file type is not registered still show it's name in project field CURA-5323 2018-05-14 17:42:54 +02:00
ChrisTerBeke
e14f57892a Merge branch 'master' into feature-backup-manager 2018-05-14 17:16:36 +02:00
Jack Ha
1f088aabc4 Cleanup and simplify toolbox plugin update 2018-05-14 16:11:44 +02:00
Jack Ha
0f0b6a9712 Fix/Implement update in toolbox 2018-05-14 16:01:59 +02:00
Diego Prado Gesto
8ad409ff55
Merge branch 'master' into WIP_improve_initialization 2018-05-14 15:15:02 +02:00
Aleksei S
8718ee34c9 Merge branch 'master' of github.com:Ultimaker/cura 2018-05-14 15:04:54 +02:00
Aleksei S
d946733357 Project update after undo click
CURA-5323
2018-05-14 15:04:01 +02:00
Ian Paschal
dd14a8e685 CURA-5296 Better finding for packages.json 2018-05-14 14:44:40 +02:00
Ghostkeeper
757824ae93
Move deleteAll to Uranium
Because it's used by WorkspaceFileHandler.

Contributes to issue CURA-5330.
2018-05-14 13:52:31 +02:00
Diego Prado Gesto
04534936c3 CURA-5358 Change the name in the dict to search for the 'qualities' that
are inside a curapackage.
2018-05-14 11:36:19 +02:00
ChrisTerBeke
2ed4b1b014 Fixes for restoring preferences on Linux 2018-05-14 10:16:14 +02:00
ChrisTerBeke
30d66fb8de Copy preferences under Linux to add them to backup, notification messages 2018-05-14 09:47:44 +02:00
ChrisTerBeke
aa73b88975
Merge branch 'master' into feature-backup-manager
* master:
  Fix an issue that kept the plugins in the "installed" list despite of already being removed from the data folder.
  Fix some crashes and issues in the Toolbox when working with no internet connection.
  Use the application language for the dates
  Small fixes and change the "plugins" text to "packages"
  Change layout of the installed plugins tab. - There were some alignment problems when there were more than 2 buttons in a column (disable, uninstall and update) - Now the progress bar shows on top of the "Update" button.
  Don't correct bed origin any more
  Clean up the package manager a bit: - Remove an unused method. - Safely check if the plugin info exist
  Improve translation of short time format
  Adding some love
  Updating changelog about engine icon
2018-05-13 01:21:20 +02:00