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

69 Commits

Author SHA1 Message Date
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
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
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
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
Ghostkeeper
4b8274d7cb
Add ID to stage selection buttons 
Necessary to switch stages in the Squish tests.

Contributes to issue CURA-6276.
 2019-07-19 12:38:07 +02:00
Lipu Fei
9494173f43 Remove hack in WelcomePagesModel and add WhatsNewPagesModel 
CURA-6447
 2019-04-12 12:11:09 +02:00
Lipu Fei
9ae8d2f88c Use NotificationIcon and simplify code 
CURA-6151
 2019-04-01 11:52:35 +02:00
Lipu Fei
3f9b98bd0c Round size numbers 
CURA-6151
 2019-04-01 10:38:43 +02:00
Jaime van Kessel
56f3226ac1 Add the notification icon for the marketplace. 
This adds an icon to the top right of the marketplace button to indicate that there
are plugins with pending updates.

CURA-6151
 2019-03-27 13:21:56 +01:00
Satish
4a0bb43e39 CURA-6201 - Added an id to stage buttons for the integration tests 2019-02-15 12:08:42 +01:00
Lipu Fei
6aebdade73 Remake: Change to "sign in" button 
CURA-6132
 2019-01-30 15:37:20 +01:00
Jaime van Kessel
9ae08b4aec Moved the old logo back again 
It looks way better, so lets hope it's here to stay!
 2019-01-30 13:36:55 +01:00
Jaime van Kessel
0942bebaf8 Move troubleshoot link to help menu 2019-01-22 16:19:29 +01:00
Lipu Fei
d97b812ccd
Merge branch '4.0' into unify_font_types 2019-01-03 10:46:49 +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
Ghostkeeper
d020a49b75
Assign a font to Marketplace button 
Otherwise the font face may be different, and the theme has no effect on the font.

Contributes to issue CURA-6025.
 2018-12-31 13:26:55 +01:00
Jaime van Kessel
9ffc039254 Fix logo aliasing 
CURA-6044
 2018-12-20 14:01:12 +01:00
Aleksei S
d891d30ab8 The Cura logo in left top corner is not displayed properly. 
CURA-6044
 2018-12-19 15:51:32 +01:00