GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-04-29 15:25:02 +08:00
Code Issues Packages Projects Releases Wiki Activity
32,175 Commits 288 Branches 260 Tags
Commit Graph

144 Commits

Author SHA1 Message Date
c.lamboo
62812393b0 Fix typos in translations 
CURA-10369
 2023-03-07 10:29:37 +01:00
c.lamboo
16c64014b2 Resolve formula in Keep or Discard dialog 
CURA-10111
 2023-01-04 13:17:56 +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
9fe261ff58
Apply suggestions from code review. 
part of CURA-9347

Co-authored-by: Joey de l'Arago <joeydelarago@gmail.com>
 2022-12-02 19:07:41 +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
Casper Lamboo
1672cd639f
Merge pull request #13914 from Ultimaker/CURA-9808_UltiMaker 
CURA 9808 UltiMaker
 2022-11-29 16:36:07 +01:00
c.lamboo
be40920042 Fix cura crashing 
`activeQualityDisplayNameMap` no longer returned a dict and could thus not be a pyqt property

Cura-9773
 2022-11-28 13:14:47 +01:00
jspijker
61623720ca Update copyright using UltiMaker 
Contributes to CURA-9808
 2022-11-28 10:48:38 +01:00
jspijker
ebd91623d0 Change company name in about dialog to UltiMaker 
Contributes to CURA-9808
 2022-11-28 08:41:04 +01:00
c.lamboo
61065ce46d Add a circle to the background of the refresh button 
Be more consistent with rest of UI.

CURA-9677
 2022-09-26 11:23:17 +02:00
Jaime van Kessel
1dc42cb69a
Fix refresh of ChoosePrinterDialog not working 
CURA-9278
 2022-09-16 14:39:36 +02:00
Remco Burema
6adf05bbf0 Complete interface for selecting cloud printer. 
CURA-9278
 2022-09-09 11:05:05 +02:00
Remco Burema
04cd76cb3b Get extruder configs to frontend. 
When choosing the printer, all possible (single) extruder configs need to be shown for that printer.

CURA-9278
 2022-09-08 13:36:42 +02:00
Joey de l'Arago
7f98ef70f0 Add printer cards 
CURA-9278
 2022-09-05 17:38:21 +02:00
Remco Burema
a56a21cf93 W.I.P.: Press print on abstract cloud printer. User should see dialog. 
Start of implementation. When printing on an abstract printer, a user should see a dialog with the matching concrete cloud printers to pick from to actually print. Names are not final. Very much a work in progress. Very not finished also.

start of implementation for CURA-9278
 2022-09-02 17:49:39 +02:00
jspijker
f9d4628b95 Merge branch 'main' into CURA-9365 
# Conflicts:
#	.github/workflows/ci.yml
#	.github/workflows/cura-installer.yml
#	.github/workflows/requirements-conan-package.txt
#	resources/definitions/Mark2_for_Ultimaker2.def.json
#	resources/definitions/elegoo_neptune_2.def.json
#	resources/definitions/elegoo_neptune_2D.def.json
 2022-07-08 12:37:32 +02:00
joeydelarago
5d5c83ec11
Add missing background color to WorkspaceSummaryDialog.qml 
CURA-9402
 2022-07-07 15:06:53 +02:00
Remco Burema
7ae1b2a074
Merge pull request #12635 from Ultimaker/CURA-9270_discard_or_keep_changes_not_updating 
Add the "clear" hack to the tableModel for discardOrkeepchanges
 2022-07-01 14:44:23 +02:00
Remco Burema
ca36b4f2ef Set proper background color for open project dialogs. 
part of CURA-9402
 2022-07-01 14:22:27 +02:00
Jaime van Kessel
a8a2fd8007 Add the "clear" hack to the tableModel for discardOrkeepchanges 
It's the same hack that we already use for the other instances where we use the tableModel.
For some reason it wasn't done here, so we also had the not updating bug

CURA-9270
 2022-06-29 13:34:41 +02:00
Jaime van Kessel
2335322381 Properly set background for AboutDialog 
CURA-9402
 2022-06-29 10:57:11 +02:00
Ghostkeeper
03398f3275
Add more extensive descriptions for about page entries 
The translators had lots of questions about these. So I'm adding more extensive descriptions for them for any future translators.
 2022-06-29 10:31:35 +02:00
Ghostkeeper
fc4585e098
Merge branch '5.0' 
Conflicts:
	plugins/Marketplace/resources/qml/PackageCardHeader.qml -> An improvement for future translations was made at the same time as a change to the label here.
 2022-05-16 15:11:39 +02:00
c.lamboo
d5c0fde7f2 Render labels using Text.QtRendering on OSX 
Fonts were looking a bit to thick on when using `Text.NativeRendering`, so using `Text.QtRendering` instead. After this the font weight looks identical to figma (as far as I can see).

In this commit I also changed all `Label`'s to `UM.Label`'s and removed default properties where I could.

CURA-9154
 2022-05-10 15:40:09 +02:00
c.lamboo
35f5c3f959 Revert "Render labels using Text.QtRendering on OSX" 
This reverts commit f0e3c19a34d1fde3b7ec4fd95677fbefa2028b26.
 2022-05-10 15:39:02 +02:00
c.lamboo
f0e3c19a34 Render labels using Text.QtRendering on OSX 
Fonts were looking a bit to thick on when using `Text.NativeRendering`, so using `Text.QtRendering` instead. After this the font weight looks identical to figma (as far as I can see).

In this commit I also changed all `Label`'s to `UM.Label`'s and removed default properties where I could.

CURA-9154
 2022-05-10 15:36:50 +02:00
Jaime van Kessel
5c7423e007 Merge branch '5.0' of github.com:Ultimaker/Cura 2022-05-10 13:23:28 +02:00
Jaime van Kessel
44a616addd Fix storing the "dont show this again" of the project saving 2022-05-10 10:26:39 +02:00
Ghostkeeper
5b6a6aa497
Update dependencies used by Cura 
Took a while, but this should be an up-to-date list.

Contributes to issue CURA-9121.
 2022-04-25 12:18:19 +02:00
Ghostkeeper
6ce6412580
Update list of projects that can be updated without string freeze break 
Just this one, I'm afraid.

Contributes to issue CURA-9121.
 2022-04-25 11:14:13 +02:00
Jaime van Kessel
e85420f9fa Fix few more instances of old usage of fileUrl vs selectedFile 2022-04-19 17:12:58 +02:00
j.delarago
fd07de9b11 Update DiscardOrKeepProfileChangesDialog.qml TableModel 
CURA-8640
 2022-04-05 15:53:56 +02:00
c.lamboo
4f70d34631 wip qt changes 2022-03-30 16:55:56 +02:00
fieldOfView
09c3ae628e Fix "double"/non-functional scrollbars on ScrollViews 2022-03-22 14:46:14 +01:00
j.delarago
0ba4dbacc4 Make combobox_wide much wider and swap out existing uses of combobox_wide for combobox. 
CURA-8890
 2022-03-14 13:13:30 +01:00
Jaime van Kessel
01ecc799fa Change background color of Discard or keepchanges dialog 
CURA-8951
 2022-03-09 13:06:28 +01:00
Ghostkeeper
45fa33584b
Restore loadProjectFile function 
It is being used when you want to load a project file. Pretty important!

Discovered while testing CURA-7950.
 2022-03-04 15:05:27 +01:00
Jaime van Kessel
ea588d85fb Remove unneeded anchor from workspace summary dialog 
CURA-8688
 2022-02-28 13:47:27 +01:00
Jaime van Kessel
8d3a5ac7e4 Ensure AskOpenAsProjectOrModel dialog uses cura styling 
CURA-8688
 2022-02-28 11:47:10 +01:00
Jaime van Kessel
78c19559d2 Ensure that Cura styling is applied to the workspace summary dialog 
CURA-8688
 2022-02-28 11:41:56 +01:00
j.delarago
aba025b5b6 Unify dialog background coloring. 
CURA-8988
 2022-02-25 13:32:02 +01:00
casper
2d4a389825 Fix dark mode issues for about dialog 
CURA-8688
 2022-02-25 12:12:57 +01:00
j.delarago
b14e29d214 Make general menu combox wider 
CURA-8688
 2022-02-23 15:13:36 +01:00
casper
6f27199bb9 Merge remote-tracking branch 'origin/CURA-8688_qt6_cleanup' into CURA-8688_qt6_cleanup 2022-02-23 14:09:58 +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
c3abfec535 Combobox height/width was being resized by RowLayout causing it to be squished. Assigned a implicit width/height which is used instead of height/width. 
CURA-8688
 2022-02-23 12:00:11 +01:00
j.delarago
7c9038b43c Merge remote-tracking branch 'origin/CURA-8688_qt6_cleanup' into CURA-8688_qt6_cleanup 2022-02-18 16:11:34 +01:00