GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-31 18:46:02 +08:00
Code Issues Packages Projects Releases Wiki Activity
28,686 Commits 295 Branches 267 Tags
Commit Graph

346 Commits

Author SHA1 Message Date
c.lamboo
45bc498c7f Replace RecolorImage with ColorImage 
CURA-8640
 2022-04-08 15:55:34 +02:00
j.delarago
2ffcfafc77 Some place RegularExpressionValidator can't be found in QtQuick 2.10 but can be in 2.15 so all files using RegularExpressionValidator have been bumped to latest QtQuick 
CURA-8640
 2022-04-05 16:10:39 +02:00
j.delarago
2f96f7b410 RegularExpressionValidator requires newer version of QtQuick 
CURA-8640
 2022-04-04 10:45:00 +02:00
Jaime van Kessel
4520fc15f9 Fix display of UM monitor page 2022-04-01 13:45:11 +02:00
c.lamboo
3c9e2a1b08 Update RegExpValidator to RegularExpressionValidator 
Due to Qt6 API change

CURA-8640
 2022-03-30 15:10:37 +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
casper
fd3ef23784 Swap buttons in MonitorConfigOverrideDialog for cura buttons 
CURA-8975
 2022-03-09 12:23:21 +01:00
casper
071ddfb2b1 Fix text elide/word wrap issue in monitor page 
The print job name wasn't elided causing the text to overflow the
progress bar card.

CURA-8688
 2022-03-01 12:38:54 +01:00
casper
6159ccbdc7 Fix darkmode issues in the DiscoverUM3Actions dialog 
CURA-8688
 2022-02-28 12:20:46 +01:00
j.delarago
e2fe50baf1 Merge branch 'replace_controls_1_for_controls_2' into CURA-8688_qt6_cleanup 
# Conflicts:
#	resources/qml/Widgets/Menu.qml
#	resources/qml/Widgets/MenuItem.qml
#	resources/themes/cura-dark/theme.json
#	resources/themes/cura-light/theme.json
 2022-02-28 08:51:42 +01:00
Jaime van Kessel
75ec6f508c Remove unneeded fixed line hight properties 
No idea why this was even done, but there just isnt' a reason to use these.
 2022-02-25 14:27:47 +01:00
Jaime van Kessel
3f4f7f0fcf Remove some extra unneeded theme stuff for monitor page 2022-02-25 14:12:25 +01:00
Jaime van Kessel
2327a71642 Remove monitor margin 
No idea why it was even there as it's own size.
 2022-02-25 13:16:59 +01:00
casper
4a71278d7c Fix monitor page 
CURA-8688
 2022-02-25 10:54:03 +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
5a2e26eff6 Merge branch 'replace_controls_1_for_controls_2' into CURA-8685-replace_text_and_progress_bars 
# Conflicts:
#	plugins/PerObjectSettingsTool/PerObjectItem.qml
#	plugins/PerObjectSettingsTool/SettingPickDialog.qml
 2022-02-18 09:07:25 +01:00
Jaime van Kessel
58e6cde6e8 Remove incorrect refferents to btnOk 2022-02-17 15:10:18 +01:00
Jaime van Kessel
40f835ed13 Replace labels for UM.Label in DiscoverUM3Action 
CURA-8685
 2022-02-15 15:51:07 +01:00
casper
aeb433b2a1 Keep showing ip enter dialog after wrongly entered ip address 
In component discover um 3 dialog. After a "complete" action the
dialog will immediately close. This was undesired behaviour as we want
to keep the dialog active if an IP address is wrongly added.

Additionally, it is no longer necessary to close/hide the dialog after
a reject/accept as this is done by default.

CURA-8955
 2022-02-15 09:29:32 +01:00
casper
3f658a4914 Change UM.Dialog to Controls.Dialog in connect to printer by ip window 
As `UM.Dialog` is opened using in a new window, the error-confirmation
that was displayed in a `UM.Dialog` was displayed _behind_ the window
object.

CURA 8687
 2022-02-11 14:37:32 +01:00
casper
1c711129e2 Merge branch 'replace_controls_1_for_controls_2' into CURA-8687_dialogs 
# Conflicts:
#	resources/qml/Account/SyncState.qml
#	resources/qml/Preferences/ReadOnlySpinBox.qml
 2022-02-11 10:44:52 +01:00
Jaime van Kessel
7abe62a8ec Fix weird wrapping in monitor page 2022-02-10 11:29:14 +01:00
casper
84ecc8d168 Remove unused imports 
CURA 8687
 2022-02-09 15:50:05 +01:00
j.delarago
1375b1c657 Remove unused QtQuick.Dialogs imports 
Cura-8687
 2022-02-09 14:56:06 +01:00
Ghostkeeper
2606a3b847
Change remaining MessageDialogs to our version 
Contributes to issue CURA-8687.
 2022-02-04 15:49:06 +01:00
Ghostkeeper
85d0749f5f
Use Controls2 ListView instead of ScrollView for print job list 
No need for a ScrollView in Controls 2. And specialise the scroll bar.
Be sure to also align the right side of the contents with the scroll bar though.

Contributes to issue CURA-8686.
 2022-01-18 17:27:51 +01:00
Ghostkeeper
d87551ac9c
Use Controls2 ListView instead of Controls1 ScrollView to scroll 
Just a listview with a specialised scroll bar.

Contributes to issue CURA-8686.
 2022-01-18 17:01:16 +01:00
Jaime van Kessel
2aa931cbca Remove unneded styles import 2022-01-04 09:48:02 +01:00
Jaime van Kessel
f11d728c6b Merge branch 'master' of github.com:Ultimaker/Cura into replace_controls_1_for_controls_2 2022-01-03 15:32:58 +01:00
Remco Burema
0e3524cddb
Reintroduce hack for waiting state in monitor. 
Some printers don't send the correct state it seems, so we have to have this hack back.

CURA-8764
 2021-12-17 11:50:45 +01:00
casper
6be0d58039 Add handling of missing printJob status cases 
The `printJob` now also contains a status for detecting aborted prints
that were awaiting cleanup, preventing the need for the additional
checks in the `await_cleanup` status.
 2021-11-19 17:22:13 +01:00
Jaime van Kessel
cefffe62cd Remove most of controls 1 references from networking plugin 2021-11-16 15:26:23 +01:00
Jaime van Kessel
980ac986df Let DiscoverUM3Action use controls 2 2021-11-11 15:59:51 +01:00
Jaime van Kessel
8195b9be28 Remove more references to old controls 2021-11-10 17:30:42 +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
Ghostkeeper
db637802bd
First translate, then process replacement keys 
If we first process the replacement keys, the replaced string can't be found in the translation database, so you don't get a translation of the phrase 'Finishes x at y'.

Fixes #10718.
 2021-11-08 13:49:54 +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
Ghostkeeper
34531656d6
Merge branch 'CURA-8520_Fix_missing_icons_in_deprecated_icons_list' into 4.11 2021-08-31 13:35:33 +02:00
jelle Spijker
d97c4e2c94 Don't use new controls for the buttons 2021-08-31 09:34:23 +02:00
jelle Spijker
2548fd8014 Fix greyed out cluster printers 
The PrintWindow still used an old style combobox.
This resulted in a Mac user not being able to specify
which clustered printer he wanted to send a slice to.

Using the new QtQuick.Controls and specifically setting
the currentIndex fixed it for Mac.
 2021-08-30 13:41:55 +02:00
Konstantinos Karmas
3e0b395c72 Add the Buildplate.svg to the Cura icons 
The icon existed only in the UM3NetworkPrinting plugin but it was also used in the ConfigurationItem.qml in Cura, so it had to be moved to the Cura icons.

CURA-8520
 2021-08-30 10:45:45 +02:00
Konstantinos Karmas
ae3362f716 Fix "Manage printer" button pointing to the print job link 
Both the "Manage printer" and the "Manage in browser" button were using the `openPrintJobControlPanel()` function, which was wrong. This is now fixed so that the "Manage printer" will use the `openPrinterControlPanel()` function as it should've in the first place.
 2021-08-19 12:33:46 +02:00
Jaime van Kessel
8b2904ee3b Merge branch 'CURA-8441_campaign_links' of github.com:Ultimaker/Cura 2021-08-09 14:09:27 +02:00
Konstantinos Karmas
e18a840c43 Change troubleshooting link 
CURA-8441
 2021-08-09 13:00:25 +02:00
Jaime van Kessel
57e66a5796 Add campaign links 
CURA-8441
 2021-08-05 15:42:23 +02:00
Remco Burema
1e5ea055aa
Changed cloud-printer message into proposal from growth group. 
CURA-8436
 2021-08-04 13:20:43 +02:00
Konstantinos Karmas
b0702e2312 Remove NativeRendering type in the MonitorInfoBlurb 
Since it makes the letters look weird.

CURA-8436
 2021-08-03 16:56:05 +02:00
Konstantinos Karmas
de9b1f82b9 Enable the tooltip when the camera button is disabled 
CURA-8436
 2021-08-03 16:55:11 +02:00
Ghostkeeper
ba6e79c81f
Rework parts of camera button 
The new button should be consistent with the looks of the tool buttons. I've given it the same size as the inner part of the tool buttons, reworked the background so that it matches. I'm also giving it the 'secondary button' style which is also used for one other button. But that other detail button should get the same style anyway so that's fine too.

I've also turned this icon into an actual button. That way it can get focus when using keyboard navigation and works better with tools for blind and such.

Contributes to issue CURA-8202.
 2021-07-07 11:36:11 +02:00