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

580 Commits

Author SHA1 Message Date
c.lamboo
e490250d9d Clean up code 
Create separate re-usable component for `MaterialBrandSubMenu`

CURA-9522
 2022-12-23 19:40:27 +01:00
c.lamboo
93a51b6da9 Remove unused property 
CURA-9522
 2022-12-23 13:40:20 +01:00
Joey de l'Arago
7174861bba Move popups back on screen after opening them. 
CURA-6867
 2022-12-20 15:26:46 +01:00
Jelle Spijker
e91d5df3a3
Apply suggestions from code review 2022-12-05 10:39:20 +01:00
Remco Burema
c74e7be602 Appease reviewers. 
- Ditch state in favour of enum.
- Comment explaining 'extraInfo'.

part of CURA-9347
 2022-12-02 19:52:37 +01:00
Remco Burema
3bc955fe8f Fix review comments. 
- Text was cutoff instead of wrapped in Save Custom Profile (Rename Dialog).
- Make the placeholder into a proper placeholder text.
- Fix spelling (save -> safe).
- Link didn't work as a link.
- Slightly better tooltips.

part of CURA-9347
 2022-12-01 14:57:05 +01:00
Remco Burema
6f651b922a Profile compare-and-save: Add (more) explanatory text(s). 
part of CURA-9347
 2022-11-30 19:54:41 +01:00
Remco Burema
8f65af61e5 Connect compare-and-safe profile dialog buttons to actions. 
Some rework was needed as to not get the entire Preferences window to show up, which previously came along with the add profile action.

part of CURA-9347
 2022-11-30 18:48:07 +01:00
Remco Burema
c13deba1ea Build correct states for safe profiles flow (except actual safe). 
Re-use Discard Or Keep dialogue, but have different buttons. (Safe to New/Override instead of Keep/Discard.) The actual safa action is still the old one though (for either new button, it still goes to the old 'make a new profile' action). Besides that, some cosmetics have to be done to the texts as well still.

part of CURA-9347
 2022-11-30 12:40:07 +01:00
Jaime van Kessel
bafffa994c Fix toolbar being drawn over monitor page 
CURA-9401
 2022-07-05 13:43:20 +02:00
fieldOfView
d1e52e5b76 Fix toolbar positioning when the toolbar is taller than its parent 
Fixes #11990
 2022-05-02 11:05:56 +02:00
Jaime van Kessel
fc03d6dfd8 No longer inject close argument 
Fixes warning in the log
 2022-04-19 15:08:45 +02:00
Jaime van Kessel
ef6f76fc98 Fix parameter injection deprecation warning 2022-04-06 11:24:17 +02:00
Jaime van Kessel
9812dade44 Fix drag & drop 2022-04-05 16:03:47 +02:00
j.delarago
f327c2479b Update Dialog imports to remove version 
Update FileDialogs selectExisting -> fileMode and folder -> currentFolder

CURA-8640
 2022-04-01 16:08:35 +02:00
Jaime van Kessel
e0ec64ee0e Fix deleting item with backspace 2022-04-01 13:40:29 +02:00
Jaime van Kessel
0ab8f278b2 Add hack to get mouse handling working again 2022-04-01 13:16:14 +02:00
Jaime van Kessel
19d82a770c Fix loading of files 2022-04-01 09:46:20 +02:00
Jaime van Kessel
814b706641 Re-add header background 2022-03-31 16:59:15 +02:00
Jaime van Kessel
1df9ca55c8 Use correct default button for package install dialog 2022-03-31 14:04:49 +02:00
Jaime van Kessel
f176924c2a Renable MainWindow header by disabling account widget 
The account widget is still causing issues, but at least thats less
 2022-03-31 13:34:41 +02:00
Jaime van Kessel
d240feb78a Removing shit until works. 2022-03-30 17:08:59 +02:00
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