GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-04-30 07:44:22 +08:00
Code Issues Packages Projects Releases Wiki Activity
20,545 Commits 289 Branches 260 Tags
Commit Graph

46 Commits

Author SHA1 Message Date
Lipu Fei
28172c9ad2 Merge remote-tracking branch 'origin/master' into feature_model_list 2019-05-16 15:17:46 +02:00
Lipu Fei
602258bb4a Fix machine name 
CURA-6510
 2019-05-09 09:45:30 +02:00
Diego Prado Gesto
9e5e57e6c5 Merge branch 'master' into feature_model_list 2019-05-07 11:57:31 +02:00
Jaime van Kessel
c3a373e2a2 Remove usages of deprecated activeMachineName 2019-05-03 13:38:06 +02:00
Satish
18630fa2f1 Added several ids to be used in integration tests: 
-Marketplace, printer pref, add/manage printer from main mnu, print settings
 2019-05-03 09:35:17 +02:00
Lipu Fei
4f5aee6298 Merge remote-tracking branch 'origin/fix_long_button_text' 2019-03-28 11:11:49 +01:00
Diego Prado Gesto
742329a170 Document where the magic numbers come from 
For the maximumSize of a button.

Contributes to CURA-6412.
 2019-03-28 09:29:31 +01:00
Satish
85a7d814d8 Added id to machine selector for integration tests 2019-03-25 14:34:00 +01:00
Diego Prado Gesto
a793a06b60 Add a maximumWidth to the ActionButton 
In case the text is too long, it can exceed the limits of the container. This is an optional flag that will work only in case it's set up.

Contributes to CURA-6412.
 2019-03-22 17:10:42 +01:00
Diego Prado Gesto
86c7d3e5ab Add a object list panel instead of the open file button 2019-02-15 17:56:03 +01:00
Ian Paschal
3c2791fefe Improve cloud connection or not checking 
Contributes to CL-1165
 2019-02-12 12:12:59 +01:00
ChrisTerBeke
f2922e2405 Merge branch '4.0' into STAR-322_cloud-connection 2019-01-14 14:16:35 +01:00
Jaime van Kessel
b1b61fa466 Add missing return 2019-01-14 14:14:47 +01:00
fieldOfView
d03ec22dee Hide empty abbreviated machinename 
Connected printers that are not Cura Connect printers may not have a connect_group_name.
 2019-01-11 17:55:06 +01:00
ChrisTerBeke
3c10cca0de Fixed all codestyle and nitpicks from review 2019-01-11 16:33:49 +01:00
ChrisTerBeke
a6114d39e4 Fix merge conflicts with 4.0 2019-01-08 11:49:36 +01:00
Jaime van Kessel
8dbebaa23c Ensure that the machine selector list scales properly 
The old implementation directly listend to the height (instead of childrenRect).
This caused issues, since other things apart from adding / removing machines could
influence the height.

CURA-6060
 2018-12-31 13:14:08 +01:00
ChrisTerBeke
af2061cd52 Simplify some checks for connection types and group size 2018-12-20 14:26:30 +01:00
ChrisTerBeke
2f92f6ef50 Simplify checking if cloud or network printer, small fixes 2018-12-20 13:45:59 +01:00
ChrisTerBeke
1b356a3219 Move cloud connection check logic to Python 2018-12-19 11:41:22 +01:00
ChrisTerBeke
4bf24671a2 Use the (not final) cloud icon when cloud connected 2018-12-18 16:33:39 +01:00
ChrisTerBeke
0588c54035 Start work on cloud icon 2018-12-18 16:29:13 +01:00
Diego Prado Gesto
b5d8db6a77 Merge branch '4.0' into CURA-6011_connection_types 2018-12-17 15:44:02 +01:00
Jaime van Kessel
938287095f Use connection type instead of um_network_key to see if a printer has a network connection 
CURA-6011
 2018-12-17 10:47:14 +01:00
Jaime van Kessel
226d052468 Move the machines from machinelist into their own model 
CURA-6011
 2018-12-14 17:10:58 +01:00
Jaime van Kessel
5e4e52e6fc Fix blue square being shown in selector if no icon is set 
CURA-5876
 2018-12-14 11:09:48 +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
3b8b70bddf Merge branch 'ui_rework_4_0' into CURA-5941_restyle_setting_dropdown 2018-12-06 16:35:07 +01:00
Diego Prado Gesto
26a41c3726 Adjust the color of the printer in the printer selector 
For that I needed to get rid of the IconLabel component, since in this case the color of the icon and the text is the same (and it makes sense)
 2018-12-06 11:45:14 +01:00
Diego Prado Gesto
07d58c3aef Merge branch 'ui_rework_4_0' into CURA-5941_restyle_setting_dropdown 2018-12-05 13:56:21 +01:00
Diego Prado Gesto
cdb8020029 Add another expandable component 
Use one of them if the drop-panel has to act as a Popup and the other if it has to act as a standard component.

Contributes to CURA-5941.
 2018-12-05 09:39:04 +01:00
Ghostkeeper
4d87c46423
Remove sourceSize.width: width from all RecolorImages 
It is now the default in Uranium.

Contributes to issue CURA-5876.
 2018-12-04 15:04:51 +01:00
Diego Prado Gesto
47ff95b1f3 Set contentType to the different expandable components. 
Also add a color for the active state when the contentType is 'Fixed'.

Contributes to CURA-5941.
 2018-12-04 13:53:11 +01:00
Diego Prado Gesto
4dcce7616b Fix some leftover renamings 
Contributes to CURA-5941
 2018-12-04 13:21:26 +01:00
Diego Prado Gesto
e159cbdb1a Rename all the references from 'popup' to 'content' 
Contributes to CURA-5941.
 2018-12-04 13:14:12 +01:00
Diego Prado Gesto
e2f85fcdc4 Add extra space to printer button. 
Contributes to CURA-5942.
 2018-11-27 11:25:43 +01:00
Diego Prado Gesto
0a1c0e18d1 Reuse the component SecondaryButton in the printer selector. 
Contributes to CURA-5942.
 2018-11-26 14:38:43 +01:00
Diego Prado Gesto
63fab9f038 Use theme sizes. 
Contributes to CURA-5942.
 2018-11-26 10:49:43 +01:00
Diego Prado Gesto
5b940b5242 Use thick margin and change some anchors. 
Contributes to CURA-5942.
 2018-11-26 10:28:36 +01:00
Diego Prado Gesto
c5d0ed2651 Define the look and feel of the view selector button. Adjust the sizes. 2018-11-25 20:13:56 +01:00
Diego Prado Gesto
f3bf20ca1b Separate the view selector into a different file. 2018-11-25 18:24:21 +01:00
Diego Prado Gesto
a3bcdaf3b6 Make the popup in the printer selector resizable depending on the 
contents. Also there is a maximum height that will fit 9 printers.

Contributes to CURA-5942.
 2018-11-23 16:58:57 +01:00
Diego Prado Gesto
67dc415b58 Add the connected icon to the printer selector that shows a blue icon 
when the printer is connected. If not connected then there is no icon.

Contributes to CURA-5942.
 2018-11-23 10:46:55 +01:00
Diego Prado Gesto
1d84bd7356 Improve the machine selector header to show an icon in case it is a 
network printer.

Contributes to CURA-5942.
 2018-11-22 17:37:10 +01:00
Diego Prado Gesto
0211122b12 Add a proper component with a label and a rectangle in the background 
that shows the type of printer.

Contributes to CURA-5942.
 2018-11-22 14:46:13 +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