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

85 Commits

Author SHA1 Message Date
Lipu Fei
38ee4bf208 Remove deprecated functions in MachineManager 
CURA-6858
 2019-10-22 14:11:40 +02:00
Diego Prado Gesto
021a04c427 Show the printer types list when we show the label every time or when only show the label for the active printer. 2019-09-16 15:29:34 +02:00
Ellecross
28310e03f2 Revert "Only show printerTypes for active machine" 
This reverts commit 2395567f1eb505a814f3b305e5a59138dfe8c144.
 2019-09-16 15:05:09 +02:00
Jaime van Kessel
2395567f1e
Only show printerTypes for active machine 2019-09-13 10:49:35 +02:00
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
Lipu Fei
2601e485da Merge remote-tracking branch 'origin/4.1' 2019-05-03 10:47:16 +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
e1766b72ec Only highlight the currently active machine 
CURA-6483
 2019-04-30 12:47:19 +02:00
Lipu Fei
588dd6cd78 Disable printers that are not host of a group 
CURA-6449

 - Group printers into hosts and non-hosts and of unknown type.
 - Show available/connectable printers first in the list.
 - Show sections for connectable and non-connectable printers.
 2019-04-11 11:33:01 +02:00
Lipu Fei
0962481bc1 Fix printer type update in the main printer selection menu 
CURA-6057
 2019-04-08 12:27:31 +02:00
Lipu Fei
e010220432 Fix merge conflicts 2019-03-28 14:46:19 +01: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
Lipu Fei
b3621bae84 WIP: Disable unknown printer type buttons 2019-03-14 11:18:39 +01:00
Lipu Fei
764f7281c2 WIP: Show full name of network printer types 2019-03-13 13:03:41 +01:00
Lipu Fei
de9f6f47bd WIP: Implement add machine from network device 2019-03-13 12:04:52 +01:00
Lipu Fei
f7f5123fea WIP: Fix highlighting of selected network printer 2019-03-13 11:03:23 +01:00
Lipu Fei
940a833e73 WIP: Add printers via network 2019-03-08 13:43:58 +01:00
Lipu Fei
56060b1e64 WIP: Add add printer page, network part 2019-03-05 12:06:51 +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
Simon Edwards
dc9d3ba2a3
Merge pull request #5293 from Ultimaker/CL-1165_missing_cloud_info 
CL-1165 Improve cloud connection or not checking
 2019-02-13 14:23:05 +01:00
Ian Paschal
3c2791fefe Improve cloud connection or not checking 
Contributes to CL-1165
 2019-02-12 12:12:59 +01:00
Remco Burema
954fdb20ad Rename 'connect_group_name' to 'group_name'. [CURA-6153] 2019-01-31 20:21:42 +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
979fd507de Give the section delegates a fixed height 
This fixes the issue where the first printer would be drawn over the section label

CURA-6011
 2019-01-03 10:39:43 +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
Jaime van Kessel
fd9b29fee2 Rename printersModel to GlobalStacksModel 
This is a better description for the model anyway.

CURA-6011
 2018-12-31 11:09:39 +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
ChrisTerBeke
25caf1a087 Fix merge conflicts 2018-12-18 14:44:13 +01:00
Jaime van Kessel
be9d35d45f Fix some minor layout issues 
CURA-6011
 2018-12-18 09:47:51 +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
aad7540366 Fix situation where multiple connect configurations would cause issues 
CURA-6011
 2018-12-17 13:31:38 +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
ChrisTerBeke
0bbd77e0f0 Merge branch '4.0' into STAR-322_cloud-connection 2018-12-14 16:34:52 +01:00
Lipu Fei
4252b95603 Make ConnectionType Enum type accessible to QML 
CURA-6011
 2018-12-14 11:28:21 +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