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

51 Commits

Author SHA1 Message Date
Jaime van Kessel
91b6ceb951 Fix spacing for menu 
CURA-9012
 2022-03-09 14:01:54 +01:00
casper
4ea93c5939 Fix text rendering issue in the menu bar 
To denote the hotkey assigned with each menu item an ampersand is used
in the configuration. This ampersand was previously rendered directly
to the screen due to the `UM.Label`. This is now correctly replaced by
an underline.

CURA-8688
 2022-03-01 13:12:35 +01:00
casper
a3a5b613ae Style menu bar according to theme 
CURA-8688
 2022-03-01 12:09:27 +01:00
casper
8dde0f4fd2 remove debugging code 
beepboop

CURA-8688
 2022-02-28 16:51:34 +01:00
Jaime van Kessel
f82c0fe525 Merge branch 'replace_controls_1_for_controls_2' of github.com:Ultimaker/Cura into CURA-8688_qt6_cleanup 2022-02-28 11:26:47 +01:00
Jaime van Kessel
26262e3cac Fix marketplace opening 2022-02-28 11:26:18 +01:00
casper
e03176a1fa Replace UM.MessageDialog with newly added Cura.MessageDialog 
This dialog is different from the `UM.MessageDialog` in that it

CURA-8688
 2022-02-23 14:09:38 +01:00
j.delarago
e990e970be Revert background to Rectangle as it was in previous versions of this file. 
This gives the bar a white background, instead of a transparent background.

CURA-8688
 2022-02-17 15:42:25 +01:00
j.delarago
b2811b1125 Merge branch 'replace_controls_1_for_controls_2' into CURA-8688_qt6_cleanup 2022-02-17 15:21:19 +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
e552383863
Consistently use Cura.Menu and Cura.MenuItem 
Some of these were using the built-in Menu and MenuItem, causing the menus to appear in different sizes.

Contributes to issue CURA-8688.
 2022-02-15 16:19:39 +01:00
casper
2e1f2a37a3 Fix centering of MessageDialog 
Instead of centering in the parent the dialog is now center within the
`Overlay.overlay`. This is the window container.

CURA 8687
 2022-02-09 16:45:34 +01:00
casper
84ecc8d168 Remove unused imports 
CURA 8687
 2022-02-09 15:50:05 +01:00
casper
6b85423948 Update WorkSpaceSummaryDialog 
CURA 8687
 2022-02-09 12:31:26 +01:00
Ghostkeeper
2606a3b847
Change remaining MessageDialogs to our version 
Contributes to issue CURA-8687.
 2022-02-04 15:49:06 +01:00
Jaime van Kessel
bab9311284 Fix opening of marketplace button 
CURA-8684
 2022-01-14 13:14:15 +01:00
Jaime van Kessel
0bd0f09437 Remove unused component 
CURA-8683
 2022-01-11 11:26:05 +01:00
Jaime van Kessel
29c9322fc8 Add background to application menu 
CURA-8683
 2022-01-11 11:16:40 +01:00
Jaime van Kessel
6cde2d028b Convert preferences & help menu to controls 2 
CURA-8683
 2022-01-11 11:10:12 +01:00
Jaime van Kessel
d1461c5d7f Add extension menu to application menu 
CURA-8683
 2022-01-11 11:07:12 +01:00
Jaime van Kessel
2bad5c5cd3 Update the settings menu to controls 2 
CURA-8683
 2022-01-11 10:31:39 +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
Jaime van Kessel
2aa931cbca Remove unneded styles import 2022-01-04 09:48:02 +01:00
Remco Burema
1cdeaffab7
Make new Marktetplace react to 'get more materials'. 
part of CURA-8588
 2021-12-30 11:53:42 +01:00
Remco Burema
b794ad6ed2
Delete old 'Toolbox' in favour of new Marketplace. 
part of CURA-8588
 2021-12-30 11:51:54 +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
Ghostkeeper
8beac74417
Let Marketplace button open Marketplace instead of Toolbox 
This hijacks the button to open something else. The old Toolbox is no longer accessible now.

Contributes to issue CURA-8556.
 2021-10-19 13:46:21 +02:00
Ghostkeeper
109fce5211
Theoretical fix for MacOS not moving Preferences option any more 
Perhaps this ampersand was messing with it.

Contributes to issue CURA-8245.
 2021-07-20 15:22:44 +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
Konstantinos Karmas
504f6dbe70
Revert "Cura 7813 qml modules version bump" 2021-03-30 09:48:28 +02:00
Konstantinos Karmas
180732788b
Merge pull request #9472 from Ultimaker/CURA-7813_QML_warnings 
Cura 7813 qml modules version bump
 2021-03-30 09:42:59 +02:00
Kostas Karmas
7827b36ab7 Fix QML warnings due to depricated on<signal> calls in Connections 
As of 5.12, the signals used in connections should not be declared as on<signal>, but as
function on<signal>(arguments).
 2021-03-30 09:02:48 +02:00
jelle Spijker
9da321ffb9
Update Layouts, Control.Styles and Dialogs 
CURA-7813
 2021-03-29 18:04:47 +02:00
jelle Spijker
2986d50745
Update QtQuick and QtQuick.Controls 
CURA-7813
 2021-03-29 17:55:19 +02:00
Nino van Hooff
f35ca0eb7d Add Multiply Objects to Edit menu 
CURA-7524
 2020-06-23 15:03:25 +02:00
fieldOfView
fa091a48b9 Allow spaces in separator name 2020-03-23 08:12:29 +01:00
fieldOfView
18263220ff Add method to add separators to extension menus 2020-03-22 22:07:50 +01:00
Ghostkeeper
a3825c1f14
Merge branch 'master' into CURA-6627_Store_extra_data_project_files 2020-01-21 15:14:45 +01:00
ninovanhooff
8bf7666493
Merge pull request #6986 from Ultimaker/CURA-7027_Add_more_materials_from_Marketplace_button 
Cura 7027 add more materials from marketplace button
 2020-01-16 16:26:38 +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
Jaime van Kessel
414b696b32
Use the resetWorkspace for new project 
This makes it a bit cleaner as we don't have to copy functionality

CURA-6627
 2020-01-14 11:04:42 +01:00
Nino van Hooff
028aece644 Fix extensions not being unique in ExtensionModel 
CURA-6983
 2020-01-10 11:42:48 +01:00
Nino van Hooff
3d352b3585 Show welcome page in marketplace window when not logged in 
TODO: marketplace logo

CURA-6569
 2019-11-04 15:44:04 +01:00
Jaime van Kessel
41d1ef5f93
Switch to prepare stage when starting a new project 
Fixes #6596
 2019-11-04 10:44:10 +01:00
Lipu Fei
9494173f43 Remove hack in WelcomePagesModel and add WhatsNewPagesModel 
CURA-6447
 2019-04-12 12:11:09 +02:00
Jaime van Kessel
0942bebaf8 Move troubleshoot link to help menu 2019-01-22 16:19:29 +01:00
Jaime van Kessel
9be1f8aa7b Removed marketplace menu item from top menu 
It was a bit double since we had the marketplace button in the top bar
 2019-01-02 11:33:49 +01:00
Diego Prado Gesto
69daa0d91a Rename Toolbox menu to Marketplace. It was remove by mistake in a merge conflict. 
Contributes to CURA-5784.
 2018-11-11 12:44:56 +01:00
Diego Prado Gesto
bf6817ce7a Reduce the size of the ApplicationMenu.qml file by moving some 
components out to different files.

Contributes to CURA-5772.
 2018-10-18 17:38:23 +02: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