GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-04 07:04:18 +08:00
Code Issues Packages Projects Releases Wiki Activity
14,737 Commits 289 Branches 260 Tags
Commit Graph

163 Commits

Author SHA1 Message Date
Jack Ha
96f2e6e1ed CURA-5402 hopefully solved merge conflicts 2018-06-06 14:39:53 +02:00
Jack Ha
702d23ad0e CURA-5357 set showcase to max 3 items per row 2018-06-06 13:48:04 +02:00
Jack Ha
9fd9bd35dc CURA-5357 show showcased items in downloads page 2018-06-06 13:41:53 +02:00
Diego Prado Gesto
753101a988 Uncomment the code that hides the material tab in the toolbox. Just for 
master.<<
 2018-06-05 15:43:36 +02:00
Lipu Fei
4598b7a831 Merge remote-tracking branch 'origin/3.4' 2018-06-05 09:55:57 +02:00
Ian Paschal
71f41b8ada CURA-5442 Final fixes 2018-06-04 17:00:59 +02:00
Ian Paschal
096f0775a8 CURA-5442 Compare plugin registry to package manager 2018-06-04 11:49:42 +02:00
Jack Ha
c6ac344ed5 Merge branch '3.4' 2018-06-04 11:40:03 +02:00
Mark
0e11a165a3 add typing 2018-06-03 18:14:34 +02:00
Mark
30a05e6ba6 make sure old plugins are updatable 2018-06-03 12:57:08 +02:00
Ian Paschal
74ba10444e CURA-5357 Prevent uninstall of plugins that are not-yet-installed 2018-06-01 14:31:52 +02:00
Lipu Fei
61a3668a4f Merge remote-tracking branch 'origin/3.4' 2018-06-01 13:51:00 +02:00
Ian Paschal
cca51cb74b Revert "Revert "CURA-5435 Attempt to fix "wobbly" text"" 
This reverts commit 9b5369a5b1b3b27bd9bdc5b393797980caa2a459.
 2018-06-01 09:39:04 +02:00
Ian Paschal
9b5369a5b1 Revert "CURA-5435 Attempt to fix "wobbly" text" 
This reverts commit bc1fa5c3f9b361ca7f0c764eea5dab7b56fbb9df.
 2018-06-01 09:38:45 +02:00
Ian Paschal
bc1fa5c3f9 CURA-5435 Attempt to fix "wobbly" text 2018-06-01 09:38:37 +02:00
Mark
3fefdad14b Round margins 
CURA-5435
 2018-05-31 15:22:49 +02:00
Mark
a8173344a3 Hidden materials 2018-05-31 14:45:57 +02:00
Lipu Fei
7d8472e588 Merge remote-tracking branch 'origin/3.4' 2018-05-31 12:25:33 +02:00
Lipu Fei
a468fc2cc4 Only load loading.gif when needed 
Toolbox crashes on Mac OS X due to reaching the max limit of file
handlers. This seems to be caused by the loading the "loading.gif"
animation image. Probably because many widgets are created and each of
them has an animation image, and Qt (5.8?) seems to load everything at
the same time.
 2018-05-31 12:21:53 +02:00
Ruben D
33e49bebbe
Don't connect when aborting while the signal is not yet connected 
Do this using try-except so that it is thread safe.
 2018-05-31 10:59:17 +02:00
Ian Paschal
00fe180085 Hide Toolbox Showcase & Materials for 3.4 2018-05-30 16:29:55 +02:00
Lipu Fei
f1bb0e58e7 Do not use CuraVersion data if strings are empty 
CURA-5357
 2018-05-30 09:20:02 +02:00
Ian Paschal
13b3e4afa5 CURA-5357 Drag & dribble multiple packages like a plugable trickle, yo 
Also improved interfacing with `CuraVersion.py`
 2018-05-30 09:11:49 +02:00
fieldOfView
ac1dfcf15d Make headers non-transparent 2018-05-28 22:52:49 +02:00
Ian Paschal
8a35d52ddd Rename "cura_version" to "sdk_version" 2018-05-28 17:21:08 +02:00
Lipu Fei
57ca41291a Fix package upgrade 
CURA-5296

The removal of already installed package is already handled by the
package manager in the package upgrade. Removing the package before the
download starts will make the package to be removed before the new
content is available and its license gets approved by the user.
 2018-05-28 13:10:42 +02:00
Lipu Fei
ad131ab30c Fix downgrade packages to bundled version 
CURA-5296
 2018-05-28 11:18:24 +02:00
Ghostkeeper
945429195e
Move getCuraPackageManager to Uranium and initialize package manager there 2018-05-24 20:47:09 +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
Ian Paschal
7861840886 CURA-5296 Small QML bug fix 2018-05-22 16:04:38 +02:00
Ian Paschal
0b0fb4cd2f CURA-5296 Added "canDowngrade" functionality 
Shows "Downgrade" instead of "Uninstall" for bundled packages with an upgrade installed.
 2018-05-22 14:52:22 +02:00
Ian Paschal
95a4edb8de CURA-5296 Improve button styling 2018-05-22 11:34:41 +02:00
ChrisTerBeke
15ef3d1d10 Merge branch 'master' into feature-backup-manager 2018-05-18 17:27:05 +02:00
Mark
850f6f9b15 Change name to Community materials 2018-05-17 16:46:32 +02:00
ChrisTerBeke
419d521e09 Merge branch 'master' into feature-backup-manager 2018-05-16 13:41:57 +02:00
Ghostkeeper
310aee07ac
Code style: Brackets on new line 
As per our code style regulation.

Contributes to issue CURA-5296.
 2018-05-16 13:39:43 +02:00
ChrisTerBeke
d27ac3cf31 Merge branch 'master' into feature-backup-manager 2018-05-15 16:50:25 +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
Jack Ha
fd73751b91 Make the ToolboxProgressButton labels actually overrideable 2018-05-15 16:10:01 +02:00
ChrisTerBeke
4e90e6c2e3 Merge branch 'master' into feature-backup-manager 2018-05-15 14:05:58 +02:00
ChrisTerBeke
bb94ad904a fix 2018-05-15 14:05:40 +02:00
ChrisTerBeke
b7f26ddcc7 Small code improvements 2018-05-15 13:29:01 +02:00
ChrisTerBeke
c9145c6661 Small code improvements 2018-05-15 13:28:33 +02:00
ChrisTerBeke
82a1c95d98 Merge branch 'master' into feature-backup-manager 2018-05-15 12:56:19 +02:00
Ian Paschal
d30bbd48fb CURA-5296 
- Changed API to not use staging
- Fixed crash when pressing cancel
- Added loading icon
 2018-05-15 12:53:05 +02:00
Aleksei S
50dabdbac8 Merge branch 'bugfix-toolbox-update' 2018-05-15 11:51:45 +02:00
ChrisTerBeke
8707d12bf3 Show package version in installed tab 2018-05-15 11:28:00 +02:00
ChrisTerBeke
abcf7bd187 Show package version in installed tab 2018-05-15 11:25:56 +02:00
ChrisTerBeke
0617a95cd0 Add API root as cura version variable 2018-05-15 11:13:27 +02:00
Jack Ha
c54957540b Merge branch 'master' into bugfix-toolbox-update 2018-05-15 09:45:14 +02:00