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

42 Commits

Author SHA1 Message Date
Lipu Fei
9bc748ffa1 Fix scrolling with configurations 
CURA-6125
 2019-01-22 11:48:41 +01:00
Diego Prado Gesto
e706020639 Improve the text when there is no configuration available 
It can happen that the list is empty because the data is still coming or because the connection has been lost.

There are also some improvements in the link to the compatibility chart. Now the two external links in Cura have the same behaviour.

Contributes to CURA-6011.
 2019-01-11 14:44:49 +01:00
Jaime van Kessel
df23097a99 Changed the label for when no remote configurations are loaded yet 2019-01-02 11:36:07 +01:00
Jaime van Kessel
8091b2810c
Apply suggestions from code review 
Change some margins for the corresponding absolute values instead of adding formulas.

Contributes to CURA-5876.

Co-Authored-By: diegopradogesto <d.pradogesto@ultimaker.com>
 2018-12-13 14:36:58 +01:00
Diego Prado Gesto
17173aba06 Add a component to show when no configurations are available because lack of connection. 
Contributes to CURA-5876.
 2018-12-12 17:04:17 +01:00
Diego Prado Gesto
4ba448077e Add an empty state, when there are no configurations, showing a label indicating that the list is empty 
Contributes to CURA-5876.
 2018-12-12 13:33:46 +01:00
Diego Prado Gesto
a6a16a682d Fix some alignments 
Also modify a bit the code in the ConfigurationItem, trying to get rid of a binding loop, but I couldn't (so weird)

Contributes to CURA-5876.
 2018-12-12 11:17:44 +01:00
Diego Prado Gesto
1cd0d26db4 Change margins 
Instead of using multiplications and divisions, just use the corresponding margins.

Contributes to CURA-5876.
 2018-12-10 15:34:48 +01:00
Ghostkeeper
43a06fdc3d
Add more margin above printer type labels 
A bit of Gestalt.

Contributes to issue CURA-5876.
 2018-12-07 13:49:32 +01:00
Ghostkeeper
f1fec2f280
Theme the scroll bar 
We need to make this a reusable component at some point, I think. This is the first time we're using the QtQuick2 version of ScrollView.

Contributes to issue CURA-5876.
 2018-12-06 12:07:03 +01:00
Ghostkeeper
48e15daf64
Fix height of scroll view and make scrollable 
Contributes to issue CURA-5876.
 2018-12-06 11:16:42 +01:00
Ghostkeeper
7cc1f021c1
Fix right-alignment of configuration items in list 
The scrollbar will go on top of it now, but it looks nicer if you don't scroll. Maybe we have to make it adaptable?

Contributes to issue CURA-5876.
 2018-12-04 14:25:58 +01:00
Ghostkeeper
6012ea0b9e
Don't use QtQuick imports from Qt 5.11 
Our build system uses 5.10.

Contributes to issue CURA-5876.
 2018-12-03 11:15:11 +01:00
Ghostkeeper
3ad2e4f62a
Re-use PrinterTypeLabel component and use abbreviated name 
Contributes to issue CURA-5876.
 2018-11-27 15:24:58 +01:00
Ghostkeeper
289399825b
Merge branch 'ui_rework_4_0' into CURA-5876-Configuration_dropdown 
Conflicts:
	plugins/PrepareStage/PrepareMenu.qml: Git was wrong, this was not really a conflict.
	resources/qml/ActionButton.qml: With iconSource being modified on ui_rework_4_0 and me modifying the icon to be able to display it on the left hand side.
	resources/qml/ActionPanel/OutputProcessWidget.qml: Git was wrong, not really a conflict.
	resources/qml/ActionPanel/SliceProcessWidget.qml: Git was wrong, not really a conflict.
	resources/qml/ExpandableComponent.qml: Both ui_rework_4_0 and me implemented a border around popups.
	resources/qml/MainWindow/MainWindowHeader.qml: Git was wrong, not really a conflict.
	resources/themes/cura-light/theme.json: Theme item was added in a place where I added whitespace.
 2018-11-27 15:01:48 +01:00
Ghostkeeper
b15c272d23
Fix applying configuration when clicking 
Also no longer use that signal for it. It was completely unnecessary.

Contributes to issue CURA-5876.
 2018-11-27 13:24:13 +01:00
Ghostkeeper
a2b1f53979
Use normal text colour instead of specialised configuration item text 
They were the same anyway, and they should always be the same.

Contributes to issue CURA-5876.
 2018-11-27 11:53:17 +01:00
Ghostkeeper
c489f911fb
Use QtQuick 2.0 and simplify ConfigurationItem 
It now uses a ButtonGroup (from QtQuick2). Also, all the mess with when the border and background colours are updated and force-updated and such is now cleaned up.

Contributes to issue CURA-5876.
 2018-11-27 11:04:41 +01:00
Ghostkeeper
4be8af7cb2
Restyle printer type headers 
It's now a grey box with the printer type name inside and some padding and such.

Contributes to issue CURA-5876.
 2018-11-27 09:38:32 +01:00
Ghostkeeper
a3fe9839ba
Change all uses of 'small' and 'very small' fonts to default 
These two fonts are exactly the same, but I want to use the 'small' font to be something a bit smaller. I'm 'removing' the superfluous font but will be re-using it immediately to look a bit smaller.

Contributes to issue CURA-5876.
 2018-11-26 17:33:37 +01:00
Ghostkeeper
a03e1be601
Simplify sectionHeading element 
No need to define that component in a higher location, just define it where you need it. Also, no need to use a Rectangle for this if it has no colour, just use an Item, but the Item itself is also not necessary if you just need the padding.

Contributes to issue CURA-5876.
 2018-11-26 17:19:32 +01:00
Ghostkeeper
3b219e3ac3
Remove padding 
The padding is already done by the enveloping Column and its parent popupItem.

Contributes to issue CURA-5876.
 2018-11-26 17:13:25 +01:00
Ghostkeeper
a268c95559
Remove double header 
This header is no longer necessary since the AutoConfiguration item provides its own header that doesn't scroll along.

Contributes to issue CURA-5876.
 2018-11-26 17:10:56 +01:00
Diego Prado Gesto
9720512f50 Add a new printer selector button that is connected to the output 
devices and shows labels containing the type of printers that are in the
same group.

Contributes to CURA-5942.
 2018-11-22 13:54:10 +01:00
Ghostkeeper
3eb50cf37e
Only list configurations if we're still connected 
Otherwise there are no available configurations, so no syncing.
 2018-03-22 17:30:15 +01:00
Diego Prado Gesto
42b40a713d CURA-4870 Adapt the colors of the configuration list for the Ultimaker dark theme. 2018-03-21 10:34:25 +01:00
Diego Prado Gesto
311b5ac791 CURA-4870 Force update the list model also when the output device 
changes.
 2018-03-19 18:00:48 +01:00
Diego Prado Gesto
61ce0c3154 CURA-4870 Make the configuration pop-up open and close with one click. 
Before it was the case in which sometimes the user needs two clicks for
that.
Also collapse the dropdown when the configuration is applied.
 2018-03-14 15:15:43 +01:00
Lipu Fei
b8c32eb166 Fix typo in ConfigurationListView.qml 2018-03-14 12:59:48 +01:00
Diego Prado Gesto
9196802e83 CURA-4870 Clean the error messages from qml by not rendering components 
if there is no outputDevice defined.
 2018-03-13 13:40:31 +01:00
Ian Paschal
a2773ca897 Animated popup 2018-03-08 16:30:05 +01:00
Diego Prado Gesto
3629c3959e CURA-4870 Match the printer type in the dropdown with one of the 
available printer types in the group
 2018-03-07 22:33:15 +01:00
Diego Prado Gesto
6abbe7381a CURA-4870 Adjust a little bit the maximum size so three printers of two 
different types can fit
 2018-03-07 11:26:50 +01:00
Diego Prado Gesto
bb3d706c92 CURA-4870 Adapt the size of the sync dropdown to the height of the 
contents or a maximum size defined manually.
Create sections in the list view depending on the machine types that are
in the group.
 2018-03-07 11:24:02 +01:00
Diego Prado Gesto
f625fa8a90 CURA-4870 Add function to set the configuration from the printer back to 
Cura.
Change the hash function to compare by GUID instead of type.
Show the material name instead of type in the list.
 2018-03-06 16:08:50 +01:00
Diego Prado Gesto
d11d850f7c CURA-4870 Add spacing to the list of configurations 2018-03-06 10:42:24 +01:00
Diego Prado Gesto
731a1092c5 CURA-4870 Add callback function to apply remote configuration 2018-03-06 10:18:54 +01:00
Diego Prado Gesto
d02d845d1b CURA-4870 Update the selected configuration in the UI when the 
configuration in the printer changes.
Modify again the hash function.
 2018-03-06 09:24:42 +01:00
Diego Prado Gesto
51686943e6 CURA-4870 Create an extruder configuration model to store the extruder configuration. 
Connect the signals coming from the printer to correctly update the UI
 2018-03-05 17:15:09 +01:00
Diego Prado Gesto
871f0a130e CURA-4870 Frontend formatting to show the configurations 2018-03-05 11:44:26 +01:00
Diego Prado Gesto
49fcf35d9b CURA-4870 Prepare the UI to show the list of configurations 2018-03-04 17:26:37 +01:00
Diego Prado Gesto
135208bfee CURA-4870 Modify the dropdown look and feel 2018-03-02 13:26:04 +01:00