159 Commits

Author SHA1 Message Date
c.lamboo
8ce2af290c Conditionally add ctrl+, hotkey to open settings
Only do this for mac, as it is not customary on other OSes

CURA-9939
2022-11-30 15:10:15 +01:00
jspijker
61623720ca Update copyright using UltiMaker
Contributes to CURA-9808
2022-11-28 10:48:38 +01:00
jspijker
696c0f8547 Update company name to UltiMaker
Contributes to CURA-9808
2022-11-28 09:05:21 +01:00
Ladnessness
dc06ccb698 Update Actions.qml
Add shortcut command to preferences to allow easier access. Similar to MacOS implementation.
2022-09-18 17:11:41 +10:00
Jaime van Kessel
e925f07aad Remove old arranger code
Major vesion upgrade, time to clean some stuff up!

CURA-7810
2022-03-24 13:37:29 +01:00
Jaime van Kessel
d752f34b70 Shorten english string for show troubleshooting
Doesn't solve all of the issues here, but at least fixes it for english.
I feel that the word guide also doesn't actually add any meaningfull info anyway

CURA-9012
2022-03-09 13:30:22 +01:00
Jaime van Kessel
cbbe961a44 Let quality intents menu use checkmark to indicate active profile
CURA-8928
2022-03-03 13:46:38 +01:00
Jaime van Kessel
26262e3cac Fix marketplace opening 2022-02-28 11:26:18 +01:00
Jaime van Kessel
b5136ba70c Fix merge conflics 2022-02-17 15:07:48 +01:00
Jaime van Kessel
f682f56923 Merge branch 'master' of github.com:Ultimaker/Cura into replace_controls_1_for_controls_2 2022-02-17 15:02:03 +01:00
Ghostkeeper
efcd00e2f3
Merge branch 'master' into marketplace_redesign
Conflicts:
	plugins/DigitalLibrary/resources/qml/SelectProjectPage.qml -> Some things were probably accidentally committed here and then later also changed in master.
2022-01-20 15:57:28 +01:00
Ghostkeeper
dbb2bce157
Fix icon name with Controls 2 action
The text above this icon name got changed in master, which led to a minor merge conflict here that wasn't discovered.
2022-01-18 17:19:52 +01:00
Ghostkeeper
e0a6cb3383
Merge branch 'master' into replace_controls_1_for_controls_2
Conflicts:
	resources/qml/Actions.qml -> Translation fixes on master, while the QML elements were changed here for Controls2.
2022-01-18 17:17:10 +01:00
Jaime van Kessel
052898ce21 Switch out the file, view and edit menu for controls 2
CURA-8683
2022-01-10 16:55:28 +01:00
Ghostkeeper
3e7b74954d
Indicate that Marketplace shouldn't get translated 2022-01-10 15:14:40 +01:00
Ghostkeeper
aed52cea74
Split functionality of the two marketplace buttons
One now opens the old one again. One still opens the new one (but with a new name).

Contributes to issue CURA-8556.
2021-10-25 01:11:26 +02:00
Konstantinos Karmas
b37716de58 Add missing campaign tags
CURA-8441
2021-08-09 12:59:29 +02:00
Ghostkeeper
e04a2b5e92
Also don't translate 'configure' keyword on MacOS
Another attempt at finalising CURA-8245.
2021-07-21 13:30:19 +02:00
Ghostkeeper
e591f3db5b
Don't translate certain keywords in the application menu on MacOS
There's a suspicion that this is causing a crash on exit. From the traceback it seems like it's attempting to find a certain property on a deleted item. I'm thinking it might be trying to update properties on an item that was already deleted by the system here because the item got moved to a system-specific menu. Qt doesn't realise that. By not translating that property, it's not necessary to update and hopefully this prevents the need to look up data on the deleted item.
Not translating it is not an issue anyway, since the menu will also be renamed by Qt to some system-specific name, which is then also translated to the user's system-language by MacOS itself.

It's not at all sure if this will fix it. Tests are necessary.

Contributes to issue CURA-8245.
2021-07-19 17:34:44 +02:00
Ghostkeeper
b134405b2c
Add bottom camera angle menu item to view menu
It doesn't really clutter the interface in this menu.

Done as a 5 minute fix for #7609.
2021-05-06 11:39:11 +02:00
Konstantinos Karmas
504f6dbe70
Revert "Cura 7813 qml modules version bump" 2021-03-30 09:48:28 +02:00
jelle Spijker
2986d50745
Update QtQuick and QtQuick.Controls
CURA-7813
2021-03-29 17:55:19 +02:00
Remco Burema
729d3afd32
Workaround discinction model/models/group.
Fixes #9448
2021-03-26 11:26:03 +01:00
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