GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-24 13:39:05 +08:00
Code Issues Packages Projects Releases Wiki Activity
15,160 Commits 291 Branches 265 Tags
Commit Graph

2681 Commits

Author SHA1 Message Date
Jack Ha
1dba5629f7 Merge branch 'master' of github.com:Ultimaker/Cura 2018-03-15 15:00:22 +01:00
Jack Ha
05cd937df3 CURA-4400 optional_extruders cannot be set to disabled extruders anymore 2018-03-15 15:00:13 +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
fieldOfView
dbabf3bda9 Merge branch 'master' into feature_preheat_extruder 
# Conflicts:
#	cura/PrinterOutput/ExtruderOutputModel.py
#	cura/PrinterOutput/PrinterOutputModel.py
 2018-03-15 11:21:37 +01:00
Diego Prado Gesto
50bf61d823 Merge branch 'master' of github.com:Ultimaker/Cura 2018-03-15 10:34:09 +01:00
Diego Prado Gesto
0155a20994 CURA-4870 Fix visibility in the status icon 2018-03-15 10:33:06 +01:00
jack
f3f4be5334
Merge pull request #3496 from fieldOfView/fix_textfield_select 
Only select all text when tabbing to fields, not when clicking a field
 2018-03-15 10:28:47 +01:00
Diego Prado Gesto
1cf832653c CURA-4870 Make the configuration selector only available for network 
printers.
Show the connection icon also for printers connected via USB or
Octoprint.
 2018-03-14 17:00:39 +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
d6b270954a Fix the case when no quality is available 
CURA-5044

The tooltip should also show up if there is no quality available.
 2018-03-14 13:11:24 +01:00
Lipu Fei
fcd50b0cf2 Fix code style 
CURA-5044
 2018-03-14 13:10:58 +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
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