83 Commits

Author SHA1 Message Date
c.lamboo
0afab9f9e9 Add label-string to translations 2022-07-18 10:40:41 +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
c.lamboo
2f22002fd5 Add header and footer components to Dialog
This provides control over how the header (the header is newly introduced in this commit) and footer components are rendered. The footer is the area where the `leftButtoons` and `rightButtons` are rendered. Having control over how this is rendered introduces for instance the possibility to render the buttons within a warning area (an example of this can bee seen in the WorkspaceDialog).

CURA-6990
2022-06-06 21:45:48 +02:00
c.lamboo
34004df7af Un-capitalise materials
CURA-6990
2022-06-03 16:25:43 +02:00
c.lamboo
fccfcb0e2b Add scroll bar to the WorkSpaceDialog
The warning message took out some space from the dialog. Added a scroll bar to make sure the content can still be read.

CURA-6990
2022-06-02 16:58:41 +02:00
c.lamboo
812b728636 Show warning when opening file without installing missing materials
CURA-6990
2022-06-02 15:36:53 +02:00
j.delarago
0df21e6073 Refactor missing packages dialog into model (MissingPackageList) and controller (InstallMissingPackagesDialog.qml)
Rename classes and files to have unified naming.

CURA-6990
2022-06-01 16:50:53 +02:00
c.lamboo
cd18bfb893 Set warning only if there are missing materials
CURA-6990
2022-06-01 10:09:23 +02:00
c.lamboo
84f19458c5 Display error when opening 3mf files
CURA-6990
2022-05-31 16:49:47 +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
c.lamboo
45bc498c7f Replace RecolorImage with ColorImage
CURA-8640
2022-04-08 15:55:34 +02:00
Jaime van Kessel
f043750f70 Fix errors in workspace dialog 2022-03-25 10:29:36 +01:00
casper
f31b8051df Fix darkmode issues in the Workspace dialog
CURA-8688
2022-02-28 15:59:56 +01:00
casper
26470440f0 Update buttons in work space dialog
Use Cura-styled buttons
Use dialog accecpt-reject handlers

CURA-8688
2022-02-18 14:21:37 +01:00
Ghostkeeper
0a75c772ed
Unrevert new icon set for all of Cura's interface
We created a new set of icons for Cura. These icons had to be reverted though because they weren't working out in the interface for the last release yet.
This unreverts them, basically adding them back hoping that we'll get them fixed in time for the next release.

Contributes to issue CURA-8342.

Revert "Revert "Fix merge conflict""

This reverts commit bb20e3307f43edc1ff53cb154d2351ddfe39e158.

Revert "Revert "Merge pull request #9716 from Ultimaker/CURA-8010_new_icons""

This reverts commit 70e4e9640e561e18a12870f30c905203ce8ccee7.

Revert "Revert "Fix typo in icon name""

This reverts commit 38ce22ba7c3f40b971bc6e1e0a8e776ca9d51512.

Revert "Revert "Add list for deprecated icons""

This reverts commit 119a957e7f978dbf1ddbcb3b0005bf38e8fed943.

Revert "Revert "Add Function icon""

This reverts commit 760726cf0bb953bb1b0fc277b448f419d4bd2544.

Revert "Revert "Switch out inherit icon""

This reverts commit 26afff609381e2004d194c280f504b6226859bd3.

Revert "Revert "Merge branch 'CURA-8205_Introduce_new_icons_in_Cura' of github.com:Ultimaker/Cura""

This reverts commit 6483db3d47ee052c1a966cdee3af7190577a5769.

Revert "Fix incorrect icons"

This reverts commit 02a4ade2a50a943ff36fd4895bdc9261cf2133eb.
2021-06-28 17:16:56 +02:00
Jaime van Kessel
70e4e9640e
Revert "Merge pull request #9716 from Ultimaker/CURA-8010_new_icons"
This reverts commit 6120d8a054b8c04bf90b8b3d3cb219d691bece2f, reversing
changes made to 95652556fef90f70adbf25bfa9bd3b8af7220d4a.
2021-05-27 16:06:20 +02:00
jelle Spijker
2bd6f28f3a
Update Icons
Subdivided the new icons in 3 size categories. As requested by UX
Used the company naming scheme for uniformity and easy recognition.

Known issues:
- Top/Bottom category wasn't taken into account by UX at the time. Since
 this is a recent addition. Both the Walls and Top/Bottom will be updated.
- Cloud/Network connection icons 12px don't render correctly. Due to the
 theme-ing.
- Extruder Icons do not render correctly.

CURA-8010_new_icons
2021-04-26 19:42:17 +02:00
Ghostkeeper
558a789289
Use Cura's own ComboBox element for combo boxes
This one displays a tooltip if the text is too long and gets elided, so that you can still read the printer or profile name.

Fixes #8773.
2020-11-17 10:56:12 +01:00
Kostas Karmas
4e87f37791 Fix visual issues with long labels in the open project dialog
The following issues are fixed:
 * Printer/Quality/Material names will be wrapped if they are too long
 * The width of the window is determined based on the content of the dialog.
	With that there will not longer be overlap between the dialog content and the buttons.
2020-08-21 14:50:00 +02:00
Ghostkeeper
9ea418c0a1
Revert "Revert "Merge branch '4.7' of github.com:Ultimaker/Cura into 4.7""
This reverts commit 28f4d8513db7efce17bfd8b80fa7c8b237fd1c18.
The original revert was to revert an accidental merge from master to 4.7. This now reverts the revert on Master, so that we still have those changes on Master.
2020-08-20 16:35:52 +02:00
Ghostkeeper
28f4d8513d
Revert "Merge branch '4.7' of github.com:Ultimaker/Cura into 4.7"
This reverts commit 7f47f12bf0a9cf305542b6c21600ce9b804c1dfd, reversing
changes made to dd42c87da762d2030ee2220bc6f0a3e44cf85c28.
2020-08-20 16:01:46 +02:00
Kostas Karmas
4e20c7dddc Rework the open project dialog to contain only 1 dropdown
With the caveat that the qtQuickControls had to be updated to 2.3, due to a qt bug in 1.x that did
not update the dropdown popup list according to the ListModel.
This leads to a different look in the dropdowns and in the buttons of the open project dialog,
compaired to the rest of the application.

CURA-7609
2020-08-04 16:33:11 +02:00
Kostas Karmas
6c59616e39 Process feedback comments
Comments https://github.com/Ultimaker/Cura/pull/8142#discussion_r464309980 and https://github.com/Ultimaker/Cura/pull/8142#discussion_r464310281

CURA-7609
2020-08-03 17:30:21 +02:00
Kostas Karmas
db857c8c20 Add extra spacing between categories in the open project dialog
CURA-7609
2020-08-03 09:21:16 +02:00
Kostas Karmas
ff4e4ccf55 Change text in the combobox
Since it was anyway truncated

CURA-7609
2020-08-03 09:07:20 +02:00
Kostas Karmas
52ea3e8fcc Change variable names (available -> updatable)
CURA-7609
2020-07-29 17:19:24 +02:00
Kostas Karmas
98cc87d1cf Allow picking any printer of the same type when opening project file
A ComboBox was added under the "Update existing" combobox which will display all the available
printers that are of the same type with the printer in the project file. With this feature, the
user will be able to select any same-type preexisting printer in Cura to be updated, instead of
always create a new one when the project file's printer is not in Cura.

CURA-7609
2020-07-29 13:02:34 +02:00
Jaime van Kessel
c6f42766c7
Remove hardcoded sizes from dialogs & popups
Contributes to #6670
2019-11-19 13:00:39 +01:00
Lipu Fei
94e89ad4ac Fix merge conflicts with master 2019-09-24 14:26:43 +02:00
Ghostkeeper
699e601de8
Improve context of override and new translation items
Contributes to issue CURA-6768.
2019-09-23 14:20:43 +02:00
Lipu Fei
8d77726089 Add intent logic for project loading
CURA-6800
2019-09-23 13:05:36 +02:00
Lipu Fei
6d21a6bddb Show printer group and which machine to update in project loading
CURA-5125
2018-03-20 16:23:23 +01:00
Lipu Fei
e0c69eb675 Pressing enter on project overview will load the project file
CURA-4735
2018-01-19 12:51:09 +01:00
Lipu Fei
245eec9314 Hide settings visibility row if it is not in preferences
CURA-4344

Hide the row which shows the number of settings that are visible on the
project file loading dialog if this information is not available.
2017-10-10 11:31:37 +02:00
ChrisTerBeke
641b3c21f7 fix merge conflicts 2017-10-10 09:21:31 +02:00
Lipu Fei
b14ef41056 Increase the minimumHeight of the workspace summary dialog
CURA-4428
2017-10-10 08:30:18 +02:00
Lipu Fei
8a25605413 Fix lock issue with workspace dialog
CURA-4405

- Add try-except around lock release
- Fix closing the dialog with ESC
2017-10-09 15:17:56 +02:00
Lipu Fei
185c350a19 Merge remote-tracking branch 'upstream/3.0' 2017-10-05 15:49:18 +02:00
Lipu Fei
8a27b2e97b Fix typo in WorkspaceDialog.qml 2017-10-05 15:48:38 +02:00
Ghostkeeper
d458fcde5c
Revert "Revert "Merge branch 'fix_garbled_fonts_macos' into 3.0""
This reverts commit e07e7bc9e714843cf853f0a255ee5a8432696886.

Contributes to issue CURA-4414.
2017-10-05 10:58:49 +02:00
Ghostkeeper
e07e7bc9e7
Revert "Merge branch 'fix_garbled_fonts_macos' into 3.0"
This reverts commit b62c19206f5e494fa27eb0b877197556c559e449, reversing
changes made to 104926c6ed1648ec20b4308fdacad4e99c14c8b3.

Contributes to issue CURA-4414.
2017-10-05 10:28:54 +02:00
Mark
b4154b8cc0 Merge branch '3.0' 2017-09-28 13:01:10 +02:00
Mark
9a193ad5c5 Changing AGPLv3 to LGPLv3 2017-09-28 13:00:43 +02:00
Ghostkeeper
68b4dfd3c3
Fix spelling mistake
Contributes to issue CURA-4341.
2017-09-27 17:29:30 +02:00
fieldOfView
7394a0c6ef Fix typo 2017-09-26 11:05:46 +02:00
fieldOfView
c5fd0e6c80 Use screenScaleFactor to consistently adapt sizes to display pixel ratio 2017-09-25 22:07:12 +02:00
fieldOfView
b5d7ec5bd2 Round fractional widths and heights in system-themed qml 2017-07-14 12:58:07 +02:00
Mark
7bc715a9bd fixed too big dialogs and hidden checkboxes 2017-05-31 12:46:07 +02:00