114 Commits

Author SHA1 Message Date
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
Lipu Fei
50d92df8a8 Merge remote-tracking branch 'origin/3.6' 2018-10-31 11:01:16 +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
Jaime van Kessel
c2f0a33b42
Merge branch 'master' into full_screen_test 2018-09-28 11:24:22 +02:00
Lipu Fei
7ec62315e0 Remove shortcut for About
CURA-5642

It has conflict with "&Add Printer".
2018-09-13 10:54:46 +02:00
Aleksei S
27c112d4db Fix duplicated shortcut keys in all languages
CURA-5642
2018-09-06 16:06:45 +02:00
Aleksei S
e853cdc04d Removed shortcut from Reset All Model &Transformations
CURA-5642
2018-09-06 16:06:45 +02:00
Aleksei S
3a8d023371 Addded test for checking shortcut keys
CURA-5642
2018-09-06 16:06:45 +02:00
Aleksei S
149a47e5a7 Remove double keys from right click menu, remove backspaceSelectionAction because not used
CURA-5642
2018-09-03 11:15:25 +02:00
KangDroid
9edf2b5b0b
Re-Enable fullscreen shortcut and add menu on ViewMenu 2018-09-03 12:04:54 +09:00
Lipu Fei
6cceebb117 Revert "Remove double shortcut buttons"
CURA-5642

This breaks translations and doesn't fix the shortcut key problem.
2018-08-31 15:14:12 +02:00
Aleksei S
3e3f1cb03d Remove double shortcut buttons
CURA-5642
2018-08-28 09:31:05 +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
Lipu Fei
a29a6122f1 Merge remote-tracking branch 'origin/master' into refactoring_machine_manager 2018-03-05 11:29:21 +01:00
Ghostkeeper
acbc6893f5
Also allow backspace to delete models
See the documentation in the code as to why. Macintosh keyboards...

Fixes #3257.
2018-03-02 14:51:13 +01:00
Lipu Fei
3e23659c79 Merge remote-tracking branch 'origin/master' into refactoring_machine_manager 2018-02-28 15:29:22 +01:00
Ghostkeeper
4757f9dc0c
Remove invalid alias
This alias was referring to something that didn't exist any more and this broke our application menu.

Contributes to issue CURA-5029.
2018-02-28 13:49:11 +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
Lipu Fei
25dd63dc21 WIP: Cleanup MachineManager 2018-02-22 13:45:46 +01:00
Jack Ha
8854a28d56 CURA-4525 solved merge conflict 2018-01-04 10:24:30 +01:00
Aleksei S
49ae078396 Adjust 3d view and add Camera View to the menu bar
CURA-4642
2018-01-03 16:45:26 +01:00
Jack Ha
663ceab069 Undo emit transformationChanges (caused a crash), themed objects in objects list. CURA-4525 2017-12-21 16:53:43 +01:00
Jack Ha
5152b2ae65 Solved merge conflicts. CURA-4525 2017-12-21 10:52:51 +01:00
Aleksei S
6968c089db Add sidebar_collapse to the saved preferences, typos, move back machine selection to the top bar
CURA-4234
2017-12-12 11:26:17 +01:00
Aleksei S
a5cb4cd316 Expand/Collapse sidebar
CURA-4234
2017-12-11 10:53:48 +01:00
Jack Ha
228039545b CURA-4525 send active build plate to legacy UM3 with Print over network 2017-11-16 09:58:53 +01:00
Jack Ha
864f417723 CURA-4525 Fix load and save projects. Not storing build plates or object names yet. 2017-11-15 16:03:32 +01:00
Jack Ha
41d5ec86a3 CURA-4525 updated scene node menu and added multi buildplate arrange 2017-11-08 14:07:40 +01:00
Jaime van Kessel
fbdc9ed223 Added reload qml action 2017-10-27 16:35:09 +02:00
Lipu Fei
946b8ae92d Remove executable bit for non-executable files 2017-10-19 10:28:57 +02:00
ChrisTerBeke
b0fa87231c CURA-4390 add new menu item for plugins 2017-10-03 17:33:24 +02:00
Mark
9a193ad5c5 Changing AGPLv3 to LGPLv3 2017-09-28 13:00:43 +02:00
fieldOfView
3f903d2c76 Add menu item to reset the camera 2017-09-16 10:05:45 +02:00
Jack Ha
0b0011fc88 Multiply dialog now has focus on #, added shortcut Ctrl-M 2017-05-04 16:31:33 +02:00
Arjen Hiemstra
03ccdec861 Call the right methods of CuraActions in Actions.qml
Contributes to CURA-3609
2017-04-20 17:42:06 +02:00
Arjen Hiemstra
dd73c53ece Introduce center and multiply actions that work on the entire selection
Instead of working on a single object.

Contributes to CURA-3609
2017-04-20 17:41:53 +02:00
Jaime van Kessel
ecf905f580 Merge branch 'feature_arrange_cleanup' of github.com:Ultimaker/Cura 2017-04-05 10:45:42 +02:00
Jack Ha
a83b1dd638 Split ShapeArray from Arranger. CURA-3239 2017-04-03 14:48:31 +02:00
Jack Ha
abb5d1e76e Arranger: moved functions, split Arrange into Arrange All and Arrange Selection. CURA-3239 2017-04-03 10:40:04 +02:00
Jaime van Kessel
f82aecb7ca Refactoring; no longer use "Printer" to identify CuraApplication 2017-03-30 20:19:05 +02:00
Jack Ha
bf08d30e7d Added first arrange function and smart placement after loading. CURA-3239 2017-03-28 14:27:22 +02:00
Lipu Fei
e00c68344a CURA-3495 open project/models in one dialog 2017-03-16 13:37:06 +01:00
Jaime van Kessel
66afc2a391 Added new project option
CURA-3494
2017-03-10 11:02:27 +01:00
Ghostkeeper
c0b4d43995
Add hotkey for reload all models
Small change. I can't be bothered to make an issue for this.
2017-03-02 15:42:57 +01:00
Jaime van Kessel
8f023524d2 Small textual changes for project handling
CURA-1263
2016-12-05 11:44:42 +01:00
Jaime van Kessel
5119ee9a93 Use correct descriptor for project open
CURA-1263
2016-12-02 11:13:21 +01:00
Jaime van Kessel
4cf454757f Change import & export back to save & open
CURA-1263
2016-12-02 10:43:02 +01:00