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

2664 Commits

Author SHA1 Message Date
Aleksei S
160a59191b Show Tooltip for the unavailable slider's area 
CURA-5044
 2018-03-14 11:45:00 +01:00
Diego Prado Gesto
c69987b824 CURA-4870 Reintroduce the "Check compatibility" link in the sidebar 2018-03-14 11:26:22 +01:00
Lipu Fei
f5f8bf19ec Fix QML warnings 2018-03-14 11:05:32 +01:00
Lipu Fei
4cc2d882d3 Fix merge conflicts 
CURA-4879
 2018-03-14 10:53:10 +01:00
Lipu Fei
d2eb01d137 Fix material name update on sidebar 
CURA-5084
 2018-03-13 17:41:15 +01:00
Ian Paschal
4478989332
Merge pull request #3463 from Ultimaker/feature_sync_button 
[Feature] Sync Button
 2018-03-13 16:52:39 +01:00
Lipu Fei
e91b955f1e
Merge pull request #3485 from Ultimaker/CURA-5059_reset_icon_visibility 
Cura 5059 reset icon visibility
 2018-03-13 16:11:58 +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
2bf6d071d1 Merge branch 'master' into feature_sync_button 2018-03-13 13:54:22 +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
516772e1f7 Merge branch 'master' of https://github.com/Ultimaker/Cura 2018-03-13 13:29:03 +01:00
Ian Paschal
d10f0f7781 CURA-5071 Added brackets 2018-03-13 13:29:00 +01:00
Jack Ha
d6979bc89a CURA-4400 using an intermediate variable prevents an empty popup that occured now and then 2018-03-13 13:14:33 +01:00
Guillem
1bb5b8ff3e add Copy all values to all extruders 
context menu option
 2018-03-13 12:31:03 +01:00
Aleksei S
73517cd176 The infill denstiy was updated twice, first in Custom view and then in Recomended view 
CURA-5071
 2018-03-13 11:41:48 +01:00
Diego Prado Gesto
d807ce57a5 CURA-4870 Disable rename button in MachinesPage when the selected item 
is a network printer since the name is the name of the host printer (or
group)
 2018-03-13 10:49:29 +01:00
Lipu Fei
40d3e09d90 Merge remote-tracking branch 'origin/master' into CURA-5059_reset_icon_visibility 2018-03-13 10:25:01 +01:00
Ghostkeeper
b4a40915bb
Code style: Brackets on new line 
Contributes to issue CURA-4606.
 2018-03-13 09:28:01 +01:00
Ghostkeeper
d904f677bc
Store extruder position of quality groups as int 
Instead of as a string with a number in it.
For the actual global stack's extruders we still need to convert to string, sadly. I could go refactor that too, but then I won't be going home until 23 o'clock or something.

Contributes to issue CURA-4606.
 2018-03-12 17:08:13 +01:00
Mark
981c47ed87 Put the support extruder dropdown behind the checkbox to prevent scrolling 2018-03-12 17:03:10 +01:00
Aleksei S
7574ab0883 Connect infill Lines checkbox did not work 2018-03-12 15:52:16 +01:00
Aleksei S
c3b659c5d4 Fix: reset icon dissapears for default values 
CURA-5059
 2018-03-12 15:15:19 +01:00
Diego Prado Gesto
96fcfd9e2f Merge branch 'feature_sync_button' of github.com:Ultimaker/Cura into feature_sync_button 2018-03-12 15:11:11 +01:00
Ian Paschal
a5ba4799f0 CURA-4870 Final icon changes from Luke 2018-03-12 14:48:39 +01:00
Diego Prado Gesto
cc009a94ee CURA-4870 Remove "check compatibility" message. 
Move the buildplate information to the bottom, below the extruders.
 2018-03-12 14:19:06 +01:00
Diego Prado Gesto
ec2201b57c CURA-4870 Move the printer type and the buildplate selector to the top 
of the sidebar and set them separate from the extruder related
selectors.
 2018-03-12 11:57:53 +01:00
Jack Ha
552618fcd4 CURA-4400 added function to find model index by extruder position in SettingExtruder 2018-03-12 09:56:08 +01:00
Jack Ha
d70cc072e9 Merge branch 'master' into feature_enable_disable_extruder 2018-03-12 09:06:24 +01:00
Diego Prado Gesto
85d6919ce6 Merge branch 'master' into feature_sync_button 2018-03-09 16:59:18 +01:00
fieldOfView
7123441db8 Fix keeping settings visible when showing all settings 2018-03-09 16:51:46 +01:00
fieldOfView
711d60e8c7 Allow switching back to the "Custom" set 2018-03-09 16:44:27 +01:00
Diego Prado Gesto
472ae8e044 CURA-4870 Create a custom model for the machines in order to show the 
printers grouped by local or networked.
 2018-03-09 16:35:23 +01:00
fieldOfView
4c66c935af Merge branch 'master' into feature_setting_visibility_profiles 2018-03-09 15:45:24 +01:00
Diego Prado Gesto
8a48503104 Merge branch 'feature_sync_button' of github.com:Ultimaker/Cura into feature_sync_button 
Fix some conflicts
 2018-03-09 15:16:21 +01:00
Diego Prado Gesto
16a5b652f4 CURA-4870 Make the machine selection toolbutton react to changes in the 
output devices
 2018-03-09 15:08:51 +01:00
Ian Paschal
ae2a286e3f Improved Icons & Styling 2018-03-09 14:07:29 +01:00
Mark
af89209cde Changed rounding of prettyTime by accident 2018-03-09 14:02:04 +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
Lipu Fei
3550ef80e0 Fix quality management page QML 
CURA-5063
 2018-03-09 11:00:39 +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
Jack Ha
53764a8274 CURA-4400 use extrudersEnabledCount for recommended mode's extruder number visibility 2018-03-08 15:39:23 +01:00
Jack Ha
5135a972a2 CURA-4400 code style 2018-03-08 14:32:10 +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
1a57e9323b Improved status icon size 2018-03-08 12:54:59 +01:00
Ian Paschal
ffccdd99c0 Added status icon 2018-03-08 10:55:29 +01:00
Jack Ha
961b868424 CURA-4400 fix updating quality slider 2018-03-08 09:47:22 +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
86103b4a0f CURA-4870 Change text size of the selected printer 2018-03-07 22:54:03 +01:00
Diego Prado Gesto
ae5f1c3408 CURA-4870 Add line separator between machine selector and sync button 2018-03-07 22:49:27 +01:00