Commit graph

102 commits

Author SHA1 Message Date
c.lamboo
948ac84070 Add create new button
CURA-9424
2022-11-09 15:49:04 +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
Joey de l'Arago
088ea0a768 Swap out UpdatableMachinesModel for MachineListModel.
This has to be instantiated with the WorkspaceDialog but attaching the listeners throws an error because it is done too early. The listeners are not needed anyway, so they have been disabled.

Update WorkspaceDialog.qml to use MachineListModel

CURA-9424
2022-11-04 16:44:04 +01:00
Joey de l'Arago
f8ed660d58 Update icons
CURA-9424
2022-11-03 16:54:56 +01:00
Joey de l'Arago
e954de7f01 Adjust dialog margins.
Move title into full width white square.

CURA-9424

Co-authored-by: Casper Lamboo <casper.lamboo@ultimaker.com>
2022-11-03 16:43:19 +01:00
Joey de l'Arago
6126135adb Adjust dialog margins.
Move title into full width white square.

CURA-9424

Co-authored-by: Casper Lamboo <casper.lamboo@ultimaker.com>
2022-11-03 16:43:01 +01:00
Joey de l'Arago
c987ef5315 Adjust warning label margins
CURA-9424
2022-11-02 18:30:46 +01:00
Joey de l'Arago
8bb6083481 Create custom component for rows in WorkplaceDialog.
CURA-9424
2022-11-02 18:25:05 +01:00
Joey de l'Arago
7171249d3f Adjust margins on dialog to match designs
CURA-9424
2022-11-02 15:33:47 +01:00
Joey de l'Arago
1764c338a0 fix visibility check
CURA-9424
2022-11-02 14:23:36 +01:00
Joey de l'Arago
3a07d14b4b remove comboboxheight
CURA-9424
2022-11-02 14:19:35 +01:00
Joey de l'Arago
cde07b9fe4 move signal function to bottom of file
CURA-9424
2022-11-02 14:18:47 +01:00
Joey de l'Arago
d12b59ec0f Refactor workspace sections into separate qml file.
Refactor an existing hack to force trigger the onIndexChanged functions of the comboboxes.

CURA-9424
2022-11-02 14:17:05 +01:00
Joey de l'Arago
f72c980c20 Add icons to the left of titles
Align title text with values in table

CURA-9424
2022-11-01 18:19:50 +01:00
Joey de l'Arago
b01ff2f57e Add open with above printer drop down.
CURA-9424
2022-11-01 17:10:59 +01:00
Joey de l'Arago
41fd36a038 Adjust margins
CURA-9424
2022-11-01 17:10:24 +01:00
Joey de l'Arago
fa317a9e14 Use unique id for WorkspaceDialog
CURA-9424
2022-11-01 16:31:24 +01:00
Joey de l'Arago
afd3d92c5e Use wide button spacing
CURA-9424
2022-11-01 16:28:23 +01:00
Joey de l'Arago
25a0355cfe Update dialog size
CURA-9424
2022-11-01 16:20:09 +01:00
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 f0e3c19a34.
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 bb20e3307f.

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

This reverts commit 70e4e9640e.

Revert "Revert "Fix typo in icon name""

This reverts commit 38ce22ba7c.

Revert "Revert "Add list for deprecated icons""

This reverts commit 119a957e7f.

Revert "Revert "Add Function icon""

This reverts commit 760726cf0b.

Revert "Revert "Switch out inherit icon""

This reverts commit 26afff6093.

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

This reverts commit 6483db3d47.

Revert "Fix incorrect icons"

This reverts commit 02a4ade2a5.
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 6120d8a054, reversing
changes made to 95652556fe.
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 28f4d8513d.
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 7f47f12bf0, reversing
changes made to dd42c87da7.
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