GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-24 05:29:12 +08:00
Code Issues Packages Projects Releases Wiki Activity
14,633 Commits 291 Branches 265 Tags
Commit Graph

864 Commits

Author SHA1 Message Date
Lipu Fei
bbd019f9e5 Fix job name UI binding 
CURA-5367

UI should always refer to PrintInformation for the job name.
 2018-06-05 08:58:09 +02:00
Lipu Fei
30cbdfed69 Make sure that file extensions are always lowered 
CURA-5367
 2018-05-31 15:37:48 +02:00
Aleksei S
b46a08f566 Add Reft and Right side aligned action buttons to the message box 
CURA-4952
 2018-05-29 18:15:16 +02:00
Ghostkeeper
77feb95191
Don't crash when failing to reload file 
Now it shows a message that it failed to load the file.
 2018-05-29 11:06:07 +02:00
ChrisTerBeke
809cab4ea5
Cleanup for cfd1b7b813ccdac76c623243a03633b2059d9a0e 2018-05-23 19:18:11 +02:00
Jack Ha
260dee54fb CURA-5370 also take into account the machine size when Arranging in readMeshFinished 2018-05-23 16:57:50 +02:00
Ian Paschal
fb307fbbf5
Merge pull request #3846 from Ultimaker/improve-arranger 
CURA-5370 Small refactor for Arranger:
 2018-05-23 16:40:19 +02:00
Jack Ha
a3ac20172b CURA-5370 The minimum offset between objects in the Arranger is now determined by the brim/skirt/... setting 2018-05-23 12:54:18 +02:00
Lipu Fei
44b046e401
Merge pull request #3786 from Ultimaker/feature-backup-manager 
Backup Manager and API
 2018-05-23 11:28:43 +02:00
Lipu Fei
cfd1b7b813 Fix AutoSave conflicts with BackupManager 
- Move AutoSave out of the plugins. It's a built-in module now.
 - Add enable/disable saving data on CuraApplication.
 - Avoid saving data in backup restore
 2018-05-23 11:25:47 +02:00
fieldOfView
6b0045265c Move getting preference out of for loop 2018-05-23 10:07:17 +02:00
fieldOfView
fb8f735566 Make selecting objects on load optional and opt-in 2018-05-23 10:05:08 +02:00
Lipu Fei
92fa725ad6 Application.saveSettings() should save everything 2018-05-23 10:00:21 +02:00
fieldOfView
f67261488f Select models after loading 
Fixes #356
 2018-05-22 22:24:57 +02:00
ChrisTerBeke
a91916cc1d
Merge branch 'master' into feature-backup-manager 
* master:
  Adds release notes link in version upgrade messagebox CURA-5348
  CURA-5385 Project summary should use scroll view
  CURA-5296 Small QML bug fix
  Enabled drag-n-drop for curapackages
  CURA-5296 Added "canDowngrade" functionality
  Fix CURA_PACKAGES_VERSION
  CURA-5254 Keep track of the latest manual entry key, so it is then selected in the list.
  CURA-5296 Improve button styling
  Add CURA_PACKAGES_VERSION to CMakeLists.txt
  Add CuraPackageVersion
  Remove extra "if" statement and unused code
  Fix support blocker on older (legacy) opengl
  Correct the test to hide bed temperature when no heated bed is present.
 2018-05-22 19:03:09 +02:00
Aleksei S
36c2e80121 Adds release notes link in version upgrade messagebox 
CURA-5348
 2018-05-22 17:32:38 +02:00
Jack Ha
f5bed242ed CURA-5370 Small refactor for Arranger: make x and y consistent (numpy arrays start with y first in general), faster, cleanup, more unit tests, take actual build plate size in Arranger instances 2018-05-22 17:13:35 +02:00
ChrisTerBeke
d27ac3cf31 Merge branch 'master' into feature-backup-manager 2018-05-15 16:50:25 +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
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
e14f57892a Merge branch 'master' into feature-backup-manager 2018-05-14 17:16:36 +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
ChrisTerBeke
a7342f4619 Do not safe data after restoring backup 2018-05-11 17:13:40 +02:00
Jack Ha
6b44ec8e4a CURA-5296 undo add version upgrade to required plugins 2018-05-09 14:24:10 +02:00
Jack Ha
cf61059449 CURA-5296 added version upgrades to required plugins 2018-05-09 14:19:30 +02:00
Diego Prado Gesto
a1e6792664 Set the LocalContainerProvider as a required plugin. 2018-05-03 18:03:30 +02:00
Ian Paschal
87e1f98156
Merge pull request #3663 from Ultimaker/feature_material_marketplace 
Feature material toolbox; all changes made
 2018-05-02 12:23:13 +02:00
Diego Prado Gesto
e79324c448 Remove duplicate line 2018-05-01 15:53:16 +02:00
Lipu Fei
9a5fb47a6e Merge master into material marketplace 2018-05-01 11:56:34 +02:00
Diego Prado Gesto
d91dabb087 Merge branch 'master' of github.com:Ultimaker/Cura 2018-04-30 15:16:23 +02:00
Diego Prado Gesto
b582ac7526 CURA-5253 Initialize UI elements right after the qml files were loaded. 2018-04-30 15:09:52 +02:00
Lipu Fei
00dbf2c694 Change a logging line to an error 
CURA-5301
 2018-04-30 10:23:43 +02:00
Diego Prado Gesto
27b1e2cdd6 Fix format and add error message to log. Contributes to CURA-5301 2018-04-26 15:49:18 +02:00
Ian Paschal
679f87ebb3 CURA-5035 Don't show required plugins 
Also renamed folder of UserAgreementPlugin to UserAgreement
 2018-04-26 15:11:32 +02:00
Diego Prado Gesto
4e53f219f0 Merge branch 'master' into CURA-5204_send_anonymous_data 2018-04-20 10:35:52 +02:00
Lipu Fei
db5c18295b Merge remote-tracking branch 'origin/3.3' 2018-04-19 09:20:22 +02:00
Diego Prado Gesto
ee359571c0 CURA-5246 Start the timer for updating the platform activity also when 
the node that changed is a GCode, that has layer data.
 2018-04-18 16:53:33 +02:00
Lipu Fei
35e7be1d41 Use pyqtSlot to show more info dialog 
CURA-5204
 2018-04-17 16:43:41 +02:00
Lipu Fei
7b20ce856e Fix merge conflicts 2018-04-17 11:30:23 +02:00
Mark
f61efb8e20 resolve merge conflict 2018-04-17 10:39:35 +02:00
Lipu Fei
58e18ded18 Remove unneeded code 
CURA-5202
 2018-04-16 15:24:18 +02:00
Ghostkeeper
133f6f43fe
Merge branch '3.3' 2018-04-13 16:14:23 +02:00
Diego Prado Gesto
f23491377f CURA-5197 Add Cura booting time to the logs. 2018-04-12 16:52:09 +02:00
Lipu Fei
0f966115e6 WIP: Make CuraPackageManager aggregate PluginRegistry data 
CURA-4644
 2018-04-12 15:46:53 +02:00
Lipu Fei
596e0be7b6 CuraPackageManager handles packages and plugins 
CURA-4644
 2018-04-12 12:57:58 +02:00
Ian Paschal
94b15b0498 Merge branch 'CURA-4644-package-reader' into feature_material_marketplace 2018-04-11 11:08:18 +02:00