GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-19 01:17:29 +08:00
Code Issues Packages Projects Releases Wiki Activity
14,258 Commits 290 Branches 260 Tags
Commit Graph

208 Commits

Author SHA1 Message Date
Lipu Fei
ec9be7a103 Merge remote-tracking branch 'origin/3.3' 2018-04-25 12:55:21 +02:00
Lipu Fei
491e0c83ba Allow to select custom profiles based-on not supported 
CURA-5285
 2018-04-25 12:38:57 +02:00
Lipu Fei
c0db82e7a3 Merge remote-tracking branch 'origin/3.3' 2018-04-17 11:18:27 +02:00
Lipu Fei
a111dda82e Revert "Custom qualities are always checkable" 
CURA-5218

This reverts commit fdd78077697f9e3ff9f0fe654eff8af36a1623d9.
 2018-04-17 11:14:14 +02:00
Lipu Fei
6d2e49c228 Merge remote-tracking branch 'origin/3.3' 2018-04-12 14:04:29 +02:00
Lipu Fei
fdd7807769 Custom qualities are always checkable 
CURA-5218
 2018-04-12 13:58:20 +02:00
Lipu Fei
107c10b860 Merge branch '3.3' 2018-04-10 11:41:13 +02:00
Lipu Fei
95f4515e93 Make it possible to skip project file check in readLocalFile() 
CURA-5203
 2018-04-10 11:40:47 +02:00
Diego Prado Gesto
2ee42dda33 CURA-5158 The printer menu now reacts to the global container changes so 
it is updates even if there is no connection.
 2018-03-27 11:56:08 +02: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
3eb9969d6d CURA-4870 Make the Sync button react when the output device changed, 
otherwise can show a wrong value (not updated).
 2018-03-21 15:08:34 +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
Lipu Fei
6620909f3d Remove non-existing showingAllSettings 
CURA-5088
 2018-03-19 13:47:04 +01:00
Lipu Fei
b13bfaa8e1 Rename setVariantGroup() -> setVariant() 
There is no such thing as VariantGroup.
 2018-03-19 12:27:15 +01:00
Lipu Fei
2660d15857 Make "show all settings" work 
CURA-5088

"Show All Settings" in setting visibility menu now sets all settings
to be visible.
 2018-03-19 10:58:56 +01:00
Diego Prado Gesto
747efda52b CURA-4870 Hide the configuration selector if the connection is lost. 2018-03-16 11:51:52 +01:00
Jack Ha
4b060f297f CURA-4400 grey out disabled extruder in context menu 2018-03-15 15:44:27 +01:00
Lipu Fei
8e39849aad Refactor setting visibility preset 
CURA-5088
 2018-03-15 14:41:34 +01:00
Lipu Fei
83175b00c2 Change SettingVisibilityPresetsModel to non-singleton 
CURA-5088
 2018-03-15 14:41:34 +01:00
Diego Prado Gesto
e6c5bd28b2 CURA-4870 Use the visible property instead of a Qt5.10 existing 'opened' 
property.
This is needed to avoid a crashing for those that are using 5.10 running from
source.
 2018-03-14 16:53:51 +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
Diego Prado Gesto
ff676c98a6 Merge branch 'master' of github.com:Ultimaker/Cura 2018-03-14 13:56:24 +01:00
Lipu Fei
984e6ddd08
Merge pull request #3274 from fieldOfView/feature_setting_visibility_profiles 
Setting Visibility Presets sidebar menu
 2018-03-14 13:25:59 +01:00
Lipu Fei
b8c32eb166 Fix typo in ConfigurationListView.qml 2018-03-14 12:59:48 +01:00
Diego Prado Gesto
23a2b6e0f7 CURA-4870 Don't show the configuration selector if the printer is not a 
network printer (for example don't show if is USB)
 2018-03-14 11:54:10 +01:00
Diego Prado Gesto
855df814d8 CURA-4870 Fix some style with brackets in QML 2018-03-13 16:11:51 +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
a5ba4799f0 CURA-4870 Final icon changes from Luke 2018-03-12 14:48:39 +01:00
fieldOfView
711d60e8c7 Allow switching back to the "Custom" set 2018-03-09 16:44:27 +01:00
fieldOfView
4c66c935af Merge branch 'master' into feature_setting_visibility_profiles 2018-03-09 15:45:24 +01:00
Ian Paschal
ae2a286e3f Improved Icons & Styling 2018-03-09 14:07:29 +01:00
Diego Prado Gesto
260cad36cb CURA-4870 Add name of the group and hidden property to the network 
printers. The printer menu shows the printers grouped by group and the
hidden printers are never listed.
 2018-03-09 12:42:49 +01:00
Diego Prado Gesto
4be4d08d97 CURA-4870 Add the ability in Cura to switch between different types of 
printers. Create a new container stack if it doesn't exist with the same
network connection key.
 2018-03-09 10:47:08 +01:00
Ian Paschal
a2773ca897 Animated popup 2018-03-08 16:30:05 +01:00
Diego Prado Gesto
1bde7a6228 CURA-4870 Set the correct version of the QtQuick.Controls to be 
compliant with v5.8
 2018-03-08 14:01:19 +01:00
Ian Paschal
ffccdd99c0 Added status icon 2018-03-08 10:55:29 +01:00
Diego Prado Gesto
4c7ec3920d CURA-4870 Reduce text size of the Machine selector menu 2018-03-08 09:25:14 +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
2818ff7f31 CURA-4870 Fix binding loop in some components with the height property by changing the vertical alignments 2018-03-07 19:40:44 +01:00
Ian Paschal
a02486e85a Added status icon 2018-03-07 17:15:56 +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
813f4e83e0 CURA-4870 Adjust colors for the selected configuration 
Remove the printer icon since it doesn't look as expected
 2018-03-07 09:56:38 +01:00
Ian Paschal
5b2ff705e7 CURA-4870 Add menu icons 2018-03-06 17:03:44 +01:00
Diego Prado Gesto
987794c515 CURA-4870 Update the Sync Button accordingly to changes both in the 
output device or in the current configuration, in order to check wether
a configuration matches or not.
 2018-03-06 16:59:51 +01:00
Diego Prado Gesto
5280d21c26 Merge branch 'master' into feature_sync_button 2018-03-06 16:10:44 +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
Lipu Fei
eb84e6aa3e Disable not supported custom profiles 
CURA-5051
 2018-03-06 15:47:49 +01:00
Diego Prado Gesto
d11d850f7c CURA-4870 Add spacing to the list of configurations 2018-03-06 10:42:24 +01:00