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

5785 Commits

Author SHA1 Message Date
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
Remco Burema
79629e477d Small stuff: Swap Icons. Tooltips. Remove reduntant entries. 
part of CURA-9347
 2022-11-29 23:39:24 +01:00
Remco Burema
40b7233125 Also add save/reset buttons to custom profile. 
part of CURA-9347
 2022-11-29 23:18:15 +01:00
Remco Burema
0ea2830108 Add the 'safe to profile' button itself. 
Currently only works for creating a new profile from current changes (when on top of a built-in profile). Only does the compare (not the safe yet) in the other circumstance. Also already anticipate the next commits by being able to hide the text and icon (because this will be added to the custom mode view as well).

part of CURA-9347
 2022-11-29 22:54:30 +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
Casper Lamboo
f4edc3a5d6
Update translation string 
Cura-9808
 2022-11-29 15:28:13 +01:00
c.lamboo
b22fafadbe Don't capitalise "M" in "Ultimaker Digital Library" and "Ultimaker Digital Factory" 
because these are brand names.

CURA-9793
 2022-11-29 15:26:51 +01:00
jspijker
f76f711790 Update mentions to UltiMaker 
Contributes to CURA-9808
 2022-11-28 14:11:21 +01:00
jspijker
68f6a0d146 Update mentions to UltiMaker 
Contributes to CURA-9808
 2022-11-28 13:31:35 +01:00
jspijker
73ee6d369e Update disclaimer to mention UltiMaker 
Contributes to CURA-9808
 2022-11-28 13:26:52 +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
c.lamboo
8e8437eab0 Split of getStringParts function 
Spit into `getMainStringParts` and `getTailStringParts` so we can easily differentiate between the two in the front-end.

Cura-9773
 2022-11-28 13:10:52 +01:00
jspijker
61623720ca Update copyright using UltiMaker 
Contributes to CURA-9808
 2022-11-28 10:48:38 +01:00
jspijker
696c0f8547 Update company name to UltiMaker 
Contributes to CURA-9808
 2022-11-28 09:05:21 +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
76564f7bc4 Add dash between main, and suffix part of quality display name 
Cura-9773
 2022-11-25 16:46:21 +01:00
c.lamboo
52ee149edc Unify activeQualityDisplayNameMap string creation 
Generation quality display names in `CustomPrintSetup.qml` and `PrintSetupSelectorHeader.qml` were so similar that I decided to combine the logic.

Cura-9773
 2022-11-25 16:09:55 +01:00
Casper Lamboo
ee75fa02aa
Merge pull request #13848 from Ultimaker/CURA-9424_workspace_dialog_fixes 
[CURA-9424] Workspace dialog fixes
 2022-11-17 17:15:34 +01:00
Joey de l'Arago
ff61097f13
Update resources/qml/RoundedRectangle.qml 
Co-authored-by: Casper Lamboo <c.lamboo@ultimaker.com>
 2022-11-17 16:37:14 +01:00
Joey de l'Arago
da71983891 Make combobox font and padding customizable. 
Style WorkspaceDialog comboboxes similar to MachineSelector

CURA-9424
 2022-11-17 14:41:14 +01:00
c.lamboo
9774349cb7 Make add printer component more responsive 
For some displays/screen resolutions the cut is expended beyond the borders of the window. By making the component more responsive this should be fixed.

CURA-9894
 2022-11-17 13:03:17 +01:00
Joey de l'Arago
a30fbf5a8f Disable connection status icon for drop down in WorkspaceDialog. It is not possible to display the correct status for LAN printers without making them the active printer anyway. 
CURA-9424
 2022-11-15 15:10:44 +01:00
Joey de l'Arago
e4ad9cb48c Move base hovered logic out of ComboBox.qml since base is undefined in most places the component is used. 
CURA-9424
 2022-11-15 14:08:47 +01:00
Joey de l'Arago
90ce031b27 Add default case 
CURA-9424
 2022-11-15 13:49:02 +01:00
Joey de l'Arago
e947959ca9 Merge branch 'main' into CURA-9424_update_loading_projects_design 2022-11-14 12:56:47 +01:00
c.lamboo
06a2886139 Clean up section property logic 
CURA-9424
 2022-11-09 17:11:31 +01:00
c.lamboo
95e0021cce Align dropdown in open project dialog 
CURA-9424
 2022-11-09 15:55:48 +01:00
c.lamboo
dd4e1c66b7 Make MachineSelector more generic by detaching logic from view 
By detaching the logic from the view custom handlers can be added to selecting printers. This was needed as the MachineSelector in the `WorkspaceDialog` needed to do something different from the `PreparMenu`.

CURA-9424
 2022-11-09 14:16:33 +01:00
c.lamboo
efe86c27b0 Merge remote-tracking branch 'origin/CURA-8689_add_first_cloud_printer_tweaks' into CURA-8689_add_first_cloud_printer_tweaks 2022-11-09 14:02:49 +01:00
c.lamboo
f73d192d65 Use Label for each individual step in add UltiMaker printer 
CURA-8689
 2022-11-09 14:02:43 +01:00
jspijker
f1c8d3d9e0 Show busy indicator 
Contributes to CURA-8689
 2022-11-09 13:47:32 +01:00
c.lamboo
7639b0ba19 Center align UltiMaker onboarding wizzard-text 
CURA-8689
 2022-11-09 13:29:33 +01:00
jspijker
92fb7fd1a6 Show the add printer dialog in the browser 
Contributes to CURA-8689
 2022-11-09 11:14:28 +01:00
jspijker
adf2c16360 Fixed printer buttons conform UX design 
Contributes to CURA-8689
 2022-11-09 11:13:40 +01:00
jspijker
f2147bb259 Enumerate steps 
Contributes to CURA-8689
 2022-11-09 10:09:22 +01:00
jspijker
2ef0c3d163 Don't trigger third-party printer dialog when onCloudPrintersDetected changed 
That signal is received basically every minute when you're already signed in
and it will close the dialog when no new cloud printers are found.

Contributes to CURA-8689
 2022-11-09 07:40:44 +01:00
jspijker
e9a1806570 Allign "learn more" left-side 
Contributes to CURA-8689
 2022-11-09 07:28:46 +01:00
jspijker
a3f259d004 Send user to external DF printer page 
Contributes to CURA-8689
 2022-11-08 18:27:09 +01:00
jspijker
f0966b1c57 Don't stretch in height and adhere border to UX design 
Contributes to CURA-8689
 2022-11-08 18:17:41 +01:00
Joey de l'Arago
ccb4d181e6 Allow buttons to be passed in for drop down. 
The change also remove the "Add Printer" and "Manage Printer" buttons from the monitor page drop down.

CURA-9424
 2022-11-04 15:37:57 +01:00
Joey de l'Arago
2019d8f3af Start MachineSelector refactor by allowing list model to be passed in. 
CURA-9424
 2022-11-04 15:11:04 +01:00
c.lamboo
4496f3fef3 Merge remote-tracking branch 'origin/feature/_CURA-8689_Make_it_easier_to_add_your_first_printer_via_cloud' into feature/_CURA-8689_Make_it_easier_to_add_your_first_printer_via_cloud 2022-11-04 13:48:39 +01:00
c.lamboo
c5788be6f7 Add ids with interactable components 
Makes it easier to perform automatic ui testing

contributes to CURA-8689
 2022-11-04 13:48:31 +01:00
Casper Lamboo
81f8939c1f
Update resources/qml/WelcomePages/AddThirdPartyPrinter.qml 
Co-authored-by: Joey de l'Arago <joeydelarago@gmail.com>
 2022-11-04 13:40:49 +01:00
c.lamboo
c892bac27f Use paragraph for in favor of ordered list 
Text indentation became when the text would span multiple lines

contributes to CURA-8689
 2022-11-03 10:45:29 +01:00
c.lamboo
d07c2c2c0d Update copy 
contributes to CURA-8689
 2022-11-03 10:37:02 +01:00
jelle spijker
c8f51a6743 Correctly wrap text body 
to prevent weird alignment in welcome pages

CURA-8689
 2022-11-03 10:08:00 +01:00
Joey de l'Arago
dbba1c4110 patch checking for base parent component of Combobox to check if it exists first. This should be refactored out some time. 
CURA-9424
 2022-11-02 15:14:33 +01:00