GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-02 08:44:25 +08:00
Code Issues Packages Projects Releases Wiki Activity
28,481 Commits 291 Branches 260 Tags
Commit Graph

558 Commits

Author SHA1 Message Date
c.lamboo
1acf96dfa1 Update file dialog properties 
Due to API change

CURA-8640
 2022-03-30 15:13:34 +02:00
j.delarago
99a3a8d11d QTQuick.Dialogs jumped to using 6.0 in QT6 
Update imports to use correct version number.

CURA-8640
 2022-03-29 16:04:02 +02:00
Jaime van Kessel
f436c97abd Roughly strip out the GraphicalEffects 
For some reason qt6 that we built still didn't like it.

Since we wanna know if the rest works, yeeting that stuff out for now
 2022-03-28 16:11:28 +02:00
j.spijker@ultimaker.com
ff21c93f9b
Qt6 dropped QtGraphicalEffects 
https://doc.qt.io/qt-6/qtgraphicaleffects5-index.html

Contributes to CURA-8640
 2022-03-28 15:33:43 +02:00
Jelle Spijker
3f8907d02a
Merge branch 'master' into CURA-8640_PyQt6 
# Conflicts:
#	cura/CuraApplication.py
#	resources/qml/Preferences/Materials/MaterialsSyncDialog.qml
#	resources/qml/Preferences/Materials/MaterialsView.qml
 2022-03-24 11:53:44 +01:00
casper
82173c5766 Update remaining qt controls 1 imports 
CURA-8688
 2022-03-01 11:48:15 +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
Casper Lamboo
02f648d40a
Remove superfluous semicolumn 
Co-authored-by: Jaime van Kessel <nallath@gmail.com>
 2022-02-11 11:31:54 +01:00
Ghostkeeper
7f8591718d
Remove central messageBox in favour of local box 
The profile import/export was the only place where it was used, in our code base.

Contributes to issue CURA-8687.
 2022-02-04 14:31:27 +01:00
Ghostkeeper
9a3cab1ec2
Change easy dialogs to UM.MessageDialog 
A few fields have changed.
There's also a harder one, a generic one that is re-usable. I want to do that one in a separate commit since it'll need to be checked all over the code for its usage.

Contributes to issue CURA-8687.
 2022-02-04 13:24:14 +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
895488a07b
Qt5->Qt6: Usee key-constants namespace. 
part of CURA-8591
 2021-12-29 09:10:19 +01: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
Konstantinos Karmas
26a17e0603
Code-style improvement 
CURA-8112

Co-authored-by: Ghostkeeper <Ghostkeeper@users.noreply.github.com>
 2021-07-15 10:02:57 +02:00
Konstantinos Karmas
11f66b2a78 Add brackets 
CURA-8112
 2021-07-14 12:54:31 +02:00
Konstantinos Karmas
9ddb3b7713 Fix icon being ignored in message action buttons 
CURA-8112
 2021-07-13 16:53:02 +02:00
Konstantinos Karmas
d4c254dcab Make the Link button in the Messages similar to the Cura Tertiary button 
CURA-8012
 2021-07-06 13:59:05 +02:00
Ghostkeeper
912a65b0f3
Add missing source argument to onTriggered handler 
Otherwise the source variable is always undefined.

Fixes #9621.
 2021-05-07 02:25:05 +02:00
Kostas Karmas
16cb42b3c7 Set the size of the "What's New" dialog equal to the "Welcome" dialog 
CURA-8154
 2021-04-09 11:39:43 +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
Ghostkeeper
593cd516ce
Fix typo in variable name 
Otherwise you can't open any files any more. How did we not see this earlier?

Contributes to issue CURA-7996.
 2021-02-09 14:24:09 +01:00
Kostas Karmas
f8a9e7f2d2 Pass the "add to recent" as an input var to dialogs that open projects 
This way it is clear before to the dialog whether it should add the file to the recent files list,
before the dialog opens.

CURA-7996
 2021-02-08 11:55:28 +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
b266904d76
Replace other references to the open action with the file provider model 
This adds a function 'triggerFirst' to the file provider that triggers the first file provider in the model. That should then be the local file provider, but if the plug-in is disabled for some reason it would use another plug-in.

Contributes to issue CURA-7868.
 2021-01-04 18:12:15 +01:00
Ghostkeeper
00de7497a4
Move open dialogue to separate file provider plug-in 
We can now define plug-ins that specify where to open files from. This is one of the places where you can open files.
This breaks the main button to open files in the interface. It needs to be redirected to trigger the plug-in to show the open file dialogue.

Contributest o issue CURA-7868.
 2021-01-04 18:11:00 +01:00
Ghostkeeper
4b375ce2fe
Remove unused hasMesh signal 
This is logic that shouldn't be in QML anyway. It's not used by anything at this point. Let's remove it.

Contributes to issue CURA-7868.
 2021-01-04 18:11:00 +01:00
Ghostkeeper
95f1b11c45
Set initial page through currentPage after initialising 
This has a delayed effect through a signal being emitted. That is necessary because the pagesList itself is also updated delayed, so at this time page 0 doesn't exist yet.

Contributes to issue CURA-7501.
 2020-10-30 17:45:58 +01:00
Ghostkeeper
a2d2043b3c
Don't create DiscardOrKeepProfileChangesDialog on start-up 
Just whenever we need it, please.
This removes a warning from the start-up sequence, but the warning is still there when you open the dialogue. It's complaining that a model has size -13 and another has size -14, but I don't know which model that is. The UserChangesModel seems to be fine at a size of 1 or so.

Contributes to issue CURA-7501.
 2020-10-30 17:45:58 +01:00
Jaime van Kessel
b1cd5960b8
Load a number of dialogs on demand instead of always 
Knocks off 0.4 sec of booting.
 2020-07-10 13:23:30 +02:00
Jaime van Kessel
3c9de0610b
Let welcomeDialog default to invisible 
This speeds up the bootup a bit since it doesn't have to create a number
of the items in the dialog
 2020-06-29 16:58:45 +02:00
Kostas Karmas
20c9be285f Remove unnecessary variable from CuraApplication 
In response to feedback comment https://github.com/Ultimaker/Cura/pull/7904#discussion_r438022415

CURA-7454
 2020-06-10 12:50:03 +02:00
Kostas Karmas
669dcc62dd Add extra "AddPrinterPagesModel" without the cancel button 
This commit adds an additional AddPrinterPagesModel in Cura that does
not have the "Cancel" button in the "Add Printer" page. To achieve
that, the AddPrinterPagesModel is modified so that its initialize
function decides whether or not it will add the cancel button.

If Cura ends up in a state without an active machine, the AddPrinters
dialog will open up using the showAddPrintersUncancellableDialog signal
and display the new "Uncancellable" (is this a word?)
AddPrinterPagesModel, so that the dialog cannot be dismissed.

If Cura is closed at that point, the next time it is initiated, if the
user is logged in and there is no ActiveMachine, then instead of
displaying the entire WelcomePages wizard, it will show the
uncancellable AddPrinterPagesModel, forcing the user to add a printer.

CURA-7454
 2020-06-09 15:20:15 +02:00
Ghostkeeper
c32677d27a
Don't hard-code application name here either 
Seems that there are 30-ish places where this is hard-coded in the rest of our code base too. I'm not going to fix all of those.
 2020-03-06 15:58:41 +01:00
Lipu Fei
65e1314538 Fix QML null warnings 2020-02-13 12:26:49 +01:00
Nino van Hooff
d4eb463f2d Always subscribe to packages after installing them 
Now that we subscribe for all situations where a package is installed,
it makes sense to watch package installs and create a 1:1 relation that
way. Prevents code duplication.

CURA-7099
 2020-01-28 13:08:57 +01:00
Remco Burema
3872e8ffa3
Move 'Toolbar' lower: Toolpanels could be obscured by objects-info. 2020-01-14 12:45:11 +01:00
Ghostkeeper
122b6318fe
Remove dash if print job name is empty 
Otherwise it shows ' - Ultimaker Cura' here which looks a bit weird.
 2020-01-13 12:32:46 +01:00
Dimitriovski
084f55b611 Removed hard-coded name for Ultimaker Cura to use applicationDisplayName 
CURA-6978
 2019-11-27 15:35:09 +01:00
Dimitriovski
9522ce2b78 Added the project name in Window Title 
CURA-6978
 2019-11-27 11:59:19 +01:00
Nino van Hooff
d63499fb24 Remove redundant visibility properties from Items 
CURA-6874
 2019-10-30 10:57:03 +01:00
Nino van Hooff
958a922808 Cleanup debugging things for cura-6874 
CURA-6874
 2019-10-30 10:54:22 +01:00
Nino van Hooff
6bef16bbec Cleanup: make safe areas invisible 
CURA-6874
 2019-10-28 10:28:19 +01:00
Nino van Hooff
9430d05cac WIP: center path slider between view controls and action panel 
CURA-6874
 2019-10-25 15:06:33 +02:00
Jaime van Kessel
cc65bc8213
Fix scrollbar for object selector 2019-09-18 17:05:00 +02:00