GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-04-23 14:19:37 +08:00
Code Issues Packages Projects Releases Wiki Activity
36,308 Commits 288 Branches 260 Tags
Commit Graph

94 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
79ee9ffc91 Fix warning spam in MainWindowHeader 
CURA-8688
 2022-02-28 13:48:30 +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
Jaime van Kessel
7deeb26e13 Merge branch 'marketplace_redesign' of github.com:Ultimaker/Cura into CURA-8588_replace_toolbox_with_marketplace 2022-01-03 11:32:06 +01:00
Jaime van Kessel
c92fcc8e03 Simplify the notifaction icon logic 
CURA-8658
 2022-01-03 10:14:22 +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
Jaime van Kessel
83be495414 Replace usage of controls label with our custom label 
This prevents copy pasting a bunch of parameters that we set by default
 2021-11-10 16:37:26 +01:00
Jaime van Kessel
e0ff70dc78 Convert stage buttons to controls 2 2021-11-10 13:47:41 +01:00
Ghostkeeper
797ff9c573
Turn new Marketplace button into button with text instead of icon 
The Marketplace icon is apparently confusing to use for the Marketplace in Cura and should only be used for the website version.

Contributes to issue CURA-8556.
 2021-10-25 11:08:14 +02: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
7796abd55b
Revert "Revert "Add new button to open the Marketplace"" 
This reverts commit aa4b7ddb8bce12c4ff2ea8864c1dad63a7a0a7c4.
Apparently it is now in scope again for the button to be there. It's in the requirements and the requirements are holy. Whoopteedoo.

Contributes to issue CURA-8556.
 2021-10-25 00:51: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
aa4b7ddb8b
Revert "Add new button to open the Marketplace" 
This reverts commit 648aa3d84cd11439b6457aa81285ea9a5ac202f0.
Apparently we don't want to retain the old Toolbox alongside, not even during development.

Contributes to issue CURA-8556.
 2021-10-19 13:09:22 +02:00
Ghostkeeper
648aa3d84c
Add new button to open the Marketplace 
For now this button opens the same Marketplace. I must maintain both Marketplaces side-by-side for the moment though.

Contributes to issue CURA-8556.
 2021-10-18 17:49:55 +02:00
Jaime van Kessel
aa905a80fe Add animations to hover effect 
CURA-8421
 2021-09-22 09:48:27 +02:00
Konstantinos Karmas
c91509418e Make all the top right buttons uniform 
Instead of inverting the fill and the text color in those buttons when hovering on those buttons, they will now show a light background fill when hovered.

CURA-8421
 2021-09-21 15:36:31 +02:00
Konstantinos Karmas
d844c5f70a Fix alignment of the ApplicationSwitcher button 
The sign in button has a different size when you are logged in, where the account avatar was being drawn in the middle of the Sign In button. This was causing a weird alignment of the ApplicationSwitcher next to it, as it was adding an extra margin.

This is now fixed by making sure that the width of the button that has to do with account adjusts according to whether you are logged in or not. This makes the ApplicationSwitcher icon move when you log in but looks more natural relatively to the account button.

CURA-8421
 2021-09-20 16:57:16 +02:00
Konstantinos Karmas
570fb3cf93 Introduce the ApplicationSwitcher widget 
It includes only the hardcoded model with the Ultimaker links for now.

CURA-8421
 2021-09-20 15:33:05 +02:00
luz paz
d68f375e38 Fix various typos 
Found via `codespell -q 3 -S *.po,*.pot -L childs,initialy,lod,ned,te,slicable,sur,tutoriels,wont`
 2021-09-07 11:33:54 -04: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
eb2fe5b139 Change the size of the stage buttons to be same size as the marketplace button 
CURA-8202
 2021-06-30 12:30:04 +02:00
Jaime van Kessel
1cece590d7
Remove unneeded qml imports 
Found these while looking at what would be needed to upgrade to qt 6.x
This module is dropped, hence me going over all of the cases where it's used.
 2021-06-25 12:37:05 +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
3baa71fd48
Update QtGraphicalEffects, Window and Dialogs 
CURA-7813
 2021-03-29 18:12:35 +02:00
jelle Spijker
9da321ffb9
Update Layouts, Control.Styles and Dialogs 
CURA-7813
 2021-03-29 18:04:47 +02:00