GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-04-22 13:49:39 +08:00
Code Issues Packages Projects Releases Wiki Activity
22,028 Commits 287 Branches 260 Tags
Commit Graph

513 Commits

Author SHA1 Message Date
Ian Paschal
c77ea76b21 CURA-5357 Drag & dribble multiple packages like a plugable trickle, yo 
Also improved interfacing with `CuraVersion.py`
 2018-05-29 16:34:36 +02:00
Ghostkeeper
945429195e
Move getCuraPackageManager to Uranium and initialize package manager there 2018-05-24 20:47:09 +02:00
Aleksei S
403129e2d6 Merge branch 'master' of github.com:Ultimaker/cura 2018-05-22 17:33:41 +02:00
Aleksei S
36c2e80121 Adds release notes link in version upgrade messagebox 
CURA-5348
 2018-05-22 17:32:38 +02:00
Lipu Fei
eecbe20830 Enabled drag-n-drop for curapackages 2018-05-22 15:06:27 +02:00
Lipu Fei
9a5fb47a6e Merge master into material marketplace 2018-05-01 11:56:34 +02:00
Diego Prado Gesto
609d51e52e CURA-5250 Remove buildplate menu entry temporary. Add back when the 
whole feature is back again.
 2018-04-23 14:41:43 +02:00
Lipu Fei
7b20ce856e Fix merge conflicts 2018-04-17 11:30:23 +02:00
Lipu Fei
0f966115e6 WIP: Make CuraPackageManager aggregate PluginRegistry data 
CURA-4644
 2018-04-12 15:46:53 +02:00
Lipu Fei
406b64b331 Remove unneeded code 
CURA-4644
 2018-04-12 13:14:58 +02:00
Ian Paschal
94b15b0498 Merge branch 'CURA-4644-package-reader' into feature_material_marketplace 2018-04-11 11:08:18 +02:00
Lipu Fei
cadb2c62b7 Fix open file with Cura 
CURA-5203

When open a file that's associated with Cura, dialogs that need to
pop up may not work because QML is still in the middle of initialization,
so we need to wait for QML to finish before doing anything else such
as opening files.
 2018-04-06 11:55:07 +02:00
Lipu Fei
1737267dfd Accept drag-and-drop for curapackage files 2018-04-05 15:14:15 +02:00
Diego Prado Gesto
89c27ae7f4 CURA-5137 Get the list of packages from the server 2018-03-30 15:13:10 +02:00
Diego Prado Gesto
322fe7d61f CURA-5137 Rename Plugin Browser into Toolbox 2018-03-30 14:15:00 +02:00
Jack Ha
8af82cc3f4 CURA-4400 prevent disabling last enabled extruder 2018-03-15 15:54:44 +01:00
Lipu Fei
984e6ddd08
Merge pull request #3274 from fieldOfView/feature_setting_visibility_profiles 
Setting Visibility Presets sidebar menu
 2018-03-14 13:25:59 +01:00
Jack Ha
5135a972a2 CURA-4400 code style 2018-03-08 14:32:10 +01:00
fieldOfView
97d7354839 Merge branch 'master' into feature_setting_visibility_profiles 2018-03-05 23:09:51 +01:00
Jack Ha
bad637eb14 CURA-4400 fixed merge conflicts 2018-03-05 16:47:40 +01:00
Lipu Fei
93190dde9b Merge remote-tracking branch 'origin/master' into refactoring_machine_manager 2018-03-02 09:55:14 +01:00
Diego Prado Gesto
ae57e23eec Create a mouse area around the sidebar to avoid propagating mouse wheel events. 
Contributes to CURA-4495
 2018-03-01 19:48:41 +01:00
Jack Ha
ac76d6ea52 Merge branch 'refactoring_machine_manager' into feature_enable_disable_extruder 2018-03-01 13:14:10 +01:00
Lipu Fei
3e23659c79 Merge remote-tracking branch 'origin/master' into refactoring_machine_manager 2018-02-28 15:29:22 +01:00
Andreea Scorojitu
356e13c225 Merge branch 'master' of https://github.com/Ultimaker/Cura 2018-02-28 13:34:38 +01:00
Andreea Scorojitu
7881dce638 Remove_installed_plug-ins_submenu_CURA-5029 
The Installed plugins from the Plugins menu is replaced by the browser plugin window.
 2018-02-28 13:33:02 +01:00
Jack Ha
86c13e86c7 CURA-4400 first version that disables extruder and updates available quality profiles 2018-02-28 12:56:00 +01:00
Lipu Fei
881fb0c08c Merge remote-tracking branch 'origin/master' into refactoring_machine_manager 2018-02-22 15:14:31 +01:00
Ian Paschal
fcff00e9da Remove plugins from preferences since they're now managed via the plugin browser 2018-02-21 14:42:28 +01:00
Lipu Fei
9dce0afaea WIP: Fix extruder submenu 2018-02-17 14:44:39 +01:00
Lipu Fei
b449f39cc7 WIP: Do not profiles submenu for each Extruder 
You cannot change quality for an individual Extruder, so it doesn't make sense
to show that for each Extruder.
 2018-02-17 14:39:49 +01:00
fieldOfView
a17160f52d Merge branch 'master' into feature_setting_visibility_profiles 
# Conflicts:
#	resources/qml/Settings/SettingView.qml
 2018-02-15 11:54:45 +01:00
Ghostkeeper
ee9de1f11b
Merge branch '3.2' 
Lots of conflicts due to rounding vs. flooring of text element positions for weirdness with the font aliasing.
 2018-02-14 10:53:51 +01:00
Mark
b531c0550d Change Math.floor to Math.round as a last try to fix garbled fonts 
CURA-4941
 2018-02-14 09:28:47 +01:00
Ghostkeeper
03b4213e92
Merge branch '3.2' 
Conflicts in Cura.qml and SaveButton.qml from people fixing positioning rounding at the same time...
 2018-02-12 13:10:24 +01:00
Mark
461da709ff Checked all divisions (again..) and multiplications on rounding errors 
CURA-4941
 2018-02-10 12:45:36 +01:00
fieldOfView
74fe281e1d Sync currently selected preset between visibility-page and -menu 2018-02-09 18:54:04 +01:00
Mark
b52bf6decf resolve conflict 2018-02-09 13:01:56 +01:00
Mark
8fca183a5e Fix rounding errors for garbled text 
CURA-4941
 2018-02-09 11:30:56 +01:00
Diego Prado Gesto
da4c98b204 Merge branch 'master' into feature_multiple_BP 2018-01-16 09:59:21 +01:00
Diego Prado Gesto
2613b4d1a3 CURA-4461 Add menu item for build plates 2018-01-09 16:08:30 +01:00
Jaime van Kessel
ed9634ebe0 Merge branch 'master' of github.com:Ultimaker/Cura into network_rewrite 2018-01-08 10:56:12 +01:00
Jaime van Kessel
4cb7bc03ad Sidebar tooltips are now visible again 
CL-541
 2018-01-04 10:30:03 +01:00
Jack Ha
bfa33c721c CURA-4525 solved merge conflicts 2018-01-03 13:52:55 +01:00
Jack Ha
cb1484ee63 CURA-4525 update size and margins of objects list 2018-01-03 12:52:32 +01:00
Ruben D
689a18ee57
Rename sidebar_collapsed and code style 
sidebar_collapsed is more consistent with other options and setting names we use. Better change it before the next release rolls out otherwise we'd have to do a version upgrade.
Also changed some code style things to be in line with our guidelines.

Contributes to issue CURA-4234.
 2017-12-30 19:35:46 +01:00
ChrisTerBeke
b29047abd3 Small fixes for disable user data triggering preferences window 2017-12-22 11:38:56 +01:00
Aleksei S
447c6e7e23 Added Disable link style 
CURA-4630
 2017-12-21 16:25:13 +01:00
Jack Ha
a47107448e Moved objects menu to lower left and made it collapsible. CURA-4525 2017-12-21 11:39:37 +01:00
Jack Ha
5152b2ae65 Solved merge conflicts. CURA-4525 2017-12-21 10:52:51 +01:00