136 Commits

Author SHA1 Message Date
Kostas Karmas
fd3c985440 Fix ambiguous Ctrl+O shortcut not opening the local file dialog
Ctrl+O was assigned as a shortcut in two places:
  1. To the "File->Open File(s)" menu item, which is visible when only the local file
	 provider is enabled (i.e. the DF file provider is disabled)
  2. To the "File->Open File(s)->From Disk" menu item, which is visible when there are
     more than one file providers enabled.

This was creating an ambiguous shortcut, thus never opening the local file dialog.

This is now fixed by disabling the shortcuts when the respective items are not visible.

CURA-7868
2021-01-11 17:50:26 +01:00
Kostas Karmas
96c4d66029 Revert making the open file dialog a separate LocalFileProvider plugin
This reverts commits 00de7497a4c2986cf8fd13be8f598a0f615f3d63 to 5f6b3b52c1848416c98f7d276fe02f08d067f675

CURA-7868
2021-01-07 16:35:40 +01:00
Ghostkeeper
de80461954
Remove open action, fixing ambiguous overload of Ctrl+O
The action was no longer in the menu, but the hotkey still functioned. Then there were two actions for Ctrl+O, which was ambiguous to Qt.

Contributes to issue CURA-7868.
2021-01-04 18:11:00 +01:00
ninovanhooff
4b60da6802
Update resources/qml/Actions.qml
Remove redundant icon from marketplaceMaterialsAction
2020-01-16 16:26:15 +01:00
Kostas Karmas
18e5d76990 Fix button to open in-Cura Marketplace materials
The button was opening the online Marketplace, which was wrong.
This fix changes the behavior to open the in-Cura Marketplace at
the materials tab.

In order to achieve that, the button calls an action called
materialsMarketplace, which in turn is connected through a
Connection in the ApplicationMenu. When the action is triggered,
it first launched the Toolbox and then it sets its category to
the materials tab.

Since the callExtensionMethod does not allow us to provide input
arguments to the called method, a new method had to be created in
the toolbox that changes the view to the materials tab, instead
of immediately calling the setViewCategory("material").

CURA-7027
2020-01-16 15:11:34 +01:00
Kostas Karmas
dbab3c6e8b Add more materials from Marketplace menu button
This commit adds a button "Add more materials from Marketplace" in the
menu that pops up in the material list while configuring the materials
into custom ones. The button redirects the user to the Marketplace
materials page (https://marketplace.ultimaker.com/app/cura/materials)

CURA-7027
2020-01-15 11:50:59 +01:00
Ghostkeeper
bec513aa8a
Alternatively allow backspace to delete selection
I thought we already had this?

Fixes #6475.
2019-12-17 10:35:59 +01:00
Ghostkeeper
365d725e42
Add escape as hotkey to exit full screen
Should be easier to discover.

Fixes #5956.
2019-07-03 10:32:00 +02:00
Jaime van Kessel
c9f07c898c Refactoring the rotateView to setCameraRotation
The new name actualy reflects what it was doing (it sets the rotation, it
doesn't apply a new one to it!)

CURA-5395
2019-05-31 11:32:16 +02:00
Jaime van Kessel
8b7c95da35 ViewOrientationControls now use actions
This prevents code duplication

CURA-5395
2019-05-31 11:23:44 +02:00
Lipu Fei
64cb86217e Remove non-existing icon
CURA-6447
2019-04-17 09:36:03 +02:00
Lipu Fei
9494173f43 Remove hack in WelcomePagesModel and add WhatsNewPagesModel
CURA-6447
2019-04-12 12:11:09 +02:00
Jaime van Kessel
495b24b87b Factor out the scene proxy 2019-04-05 16:41:22 +02:00
Lipu Fei
3a3e65224b Remove debugging shortcut 2019-03-20 11:11:30 +01:00
Lipu Fei
ac012e8f09 WIP: Add Welcome Page and use CTRL+Alt+D to trigger 2019-02-27 12:45:28 +01:00
Lipu Fei
3b63f92d55 WIP: Add base QMLs for WelcomeDialog 2019-02-27 12:45:28 +01:00
Jaime van Kessel
0942bebaf8 Move troubleshoot link to help menu 2019-01-22 16:19:29 +01:00
Diego Prado Gesto
53872f9a5b Merge branch 'ui_rework_4_0' into cura4.0_header 2018-11-02 13:36:47 +01:00
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
Diego Prado Gesto
ef0ba81564 Merge branch 'ui_rework_4_0' into cura4.0_header 2018-11-01 09:21:33 +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
Ghostkeeper
1bcd134f85
Fix code style
Most stuff here was recently changed. Some of it was where I found a pattern in something that was likely copy-pasted from somewhere else, so I did a global search and replace on that.

Contributes to issue CURA-5784.
2018-10-18 14:30:33 +02:00
Jaime van Kessel
1e3a9ff57c Removed the expandSidebar action
Since we don't even have a sidebar anymore, there is no point in expanding it.
2018-10-15 14:23:42 +02:00
Jaime van Kessel
b3fc76092d Removed unused EngineLog 2018-10-10 14:01:34 +02: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