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

3111 Commits

Author SHA1 Message Date
Ian Paschal
5854ae544f Indicate when "Prepare" button has already been clicked 
Contributes to CURA-5551
 2018-07-27 15:32:51 +02:00
Ian Paschal
8e1c116b5d Revert "Show Preparing text after clicking Prepare button" 
This reverts commit 812816de112bf8b5b7c04a96244e153e53ca4a28.
 2018-07-27 13:58:17 +02:00
Aleksei S
40c51249f5 Merge branch 'custom_menuitems_in_sidebar' into CURA-5595_add_custom_button_to_menu 2018-07-26 13:51:07 +02:00
Aleksei S
812816de11 Show Preparing text after clicking Prepare button 
CURA-5551
 2018-07-26 12:53:12 +02:00
Aleksei S
f90f5f5180 Update available configuration button 2018-07-19 12:18:53 +02:00
Lipu Fei
636d145d08
Merge pull request #4089 from Ultimaker/disable_extruder_swith_to_default 
Switch to default extruder if disable the active one
 2018-07-17 10:28:16 +02:00
Lipu Fei
28eaf50bac Fix exit application 
Typo...
 2018-07-17 10:26:14 +02:00
Diego Prado Gesto
c17c440248
Merge pull request #4057 from fieldOfView/fix_jobname_ignored 
Fix setting jobname before saving
 2018-07-17 08:38:14 +02:00
Diego Prado Gesto
51c499b08c When the extruder is being disabled and it is the currently selected 
one, then switch to the default extruder. Also do not allow users to
click in a disabled extruder, only if they want to enable it again.
 2018-07-16 16:26:55 +02:00
Diego Prado Gesto
6850ad4c9d Align the dropdown panel in the combobox with the parent and get rid of 
binding loop messages.
 2018-07-16 14:54:44 +02:00
Diego Prado Gesto
543128e28c Modify the suggestion message when a material is not compatible with the 
buildplate to only use glue but not adhesion sheets.
 2018-07-16 13:44:24 +02:00
Lipu Fei
e3a193d6a6 Fix invisible texts in setting dropdown menu on Linux 2018-07-16 09:59:45 +02:00
alekseisasin
31891e631c
Merge pull request #4070 from Ultimaker/CURA-5384_confirm_upon_exit 
CURA-5384 confirm upon exit
 2018-07-13 11:54:14 +02:00
Lipu Fei
6d34d77b6b Reset confirm exit dialog text upon close 
CURA-5384
 2018-07-13 11:10:40 +02:00
Ghostkeeper
5e4ccf004d
Make default job name translateable 
Contributes to issue CURA-5367.
 2018-07-13 09:59:32 +02:00
Lipu Fei
c0b7e40b0d Add on-exit callback management and check for active USB printing 
CURA-5384
 2018-07-13 09:16:11 +02:00
Lipu Fei
ac3d3bc5c0 Revert "Added signal to prevent window closing if USB printer is printing" 
This reverts commit 596a7b7169b9c7e41cd4751f99eea656f67ed2b7.
 2018-07-13 08:08:56 +02:00
Lipu Fei
a0c3767184
Merge pull request #4048 from Ultimaker/CURA-5408-material-profiles 
CURA-5408 weight for materials + bug fixes
 2018-07-13 07:54:58 +02:00
Jack Ha
abbbdb17e6 Fix if you randomly click around in the materials then some spool_weights of 0 gets mixed up. The cause was that base.containerId was not updated at the same time as properties.guid. CURA-5408 2018-07-12 15:17:46 +02:00
Diego Prado Gesto
395c5d3a8b CURA-5458 Add three dots in the options that will open a new window. 
Add the Save option together with the New and Open, and then separate it
from the Export options.
 2018-07-12 15:16:01 +02:00
Mark
e53e62ccab CURA-5458 Use Save and Export 2018-07-12 14:54:10 +02:00
Jack Ha
56d5fc8a62 Merge branch 'master' into CURA-5408-material-profiles 2018-07-12 14:43:33 +02:00
Aleksei S
596a7b7169 Added signal to prevent window closing if USB printer is printing 
CURA-5384
 2018-07-11 13:23:30 +02:00
fieldOfView
aa259cfb06 Enforce focus on save button to ensure edits to jobname happen before saving 
Fixes #4007
 2018-07-11 09:28:40 +02:00
Lipu Fei
7658ad34e2
Revert "Move "Exclude Materials" metadata to materials" 2018-07-10 16:27:07 +02:00
Jack Ha
5eb2230d82 Fix default value for getMaterialPreferenceValue other than spool_weight, added cleanup code for saving default values. CURA-5408 2018-07-10 15:40:13 +02:00
Ghostkeeper
f712fc0f36
No longer add incompatible materials to materials menus 
This removes the need for the 'compatible' role but I'll keep it in for now in case we want to change the design of this later.

Contributes to issue CURA-5460.
 2018-07-10 15:26:23 +02:00
Ghostkeeper
c0fc0a7eba
Disable material if not compatible 
Similar to how it's displayed in the printer.

Contributes to issue CURA-5460.
 2018-07-10 15:26:23 +02:00
Jack Ha
e7c1d31bee Fixed change material diameter, changed signature of getContainerMetaDataEntry. CURA-5408 2018-07-10 13:14:11 +02:00
Lipu Fei
e5a11c1f7b Fix getContainerMetaDataEntry() 
CURA-5408
 2018-07-09 15:12:53 +02:00
Ian Paschal
a596c5a034 Code-style fixes 
Contributes to CURA-5408
 2018-07-09 14:39:13 +02:00
Aleksei S
77bd6cf749 Read material weight from container 
CURA-5408
 2018-07-09 14:20:51 +02:00
Mark
1f51d83fa7
Merge pull request #3982 from fieldOfView/fix_dark_theme_artefact 
Fix a bright line/gap between the viewport and sidebar due to rounding
 2018-07-02 16:50:56 +02:00
Mark
f3d92ecdbf
Merge pull request #3986 from fieldOfView/fix_always_ask 
Clarify Profile Override preference options
 2018-07-02 16:43:20 +02:00
Diego Prado Gesto
ee2dfffb84
Merge pull request #3977 from fieldOfView/fix_preference_pages 
Fixes for preference pages
 2018-06-29 15:00:39 +02:00
fieldOfView
1f7ef027ec Clarify Profile Override preference options 2018-06-27 10:16:39 +02:00
fieldOfView
756288bbb4 Fix a bright line/gap between the viewport and sidebar due to rounding 2018-06-26 22:34:06 +02:00
fieldOfView
3546af86e8 Select the current profile when showing the profiles page 2018-06-26 12:02:41 +02:00
fieldOfView
05b3654346 Fix color of selected items in Profiles and Materials pages 2018-06-26 11:45:07 +02:00
Aleksei S
c4fa50a8fc Added icon for custom Menu items 2018-06-25 16:51:40 +02:00
Aleksei S
0cf46ca48e Changed SettingView to show custom menu items 2018-06-23 16:14:50 +02:00
Ghostkeeper
b33bbde2bb
Also open data folder when opening Resources folder 
So now it opens two folders. It could be slightly more annoying to some but usually it's much more useful.

Fixes #1490.
 2018-06-20 09:03:18 +02:00
Lipu Fei
cf0efea4c3 Fix reset to formula button and use new icon 
CURA-5407
 2018-06-13 12:26:26 +02:00
Diego Prado Gesto
c31d329657 Remove preference 'arrange models on load' since it was experimental and 
now the arranger makes the job.
 2018-06-12 13:20:20 +02:00
Lipu Fei
a04bf7d814 Merge remote-tracking branch 'origin/3.4' 2018-06-11 11:32:51 +02:00
Ghostkeeper
b55d2eda4f
Remove Polish translation option 
The translator said he won't be maintaining this language any more. Someone else can pick it up now if he wants to, but we'll disable the language until it is complete again.

Contributes to issue CURA-5451.
 2018-06-11 09:14:48 +02:00
Lipu Fei
12a406529e Fix inconsistent curaproject mimetype definition 
CURA-5334

 - In project file writer, it says the mime type is "application/x-curaproject+xml",
   and we decided to use this as THE mime type.
 - Pass preferred_mimetype to save project file dialog so it
   automatically adds the file extension upon open.
 2018-06-07 14:42:36 +02:00
Lipu Fei
3a7a1dbc6d Fix inconsistent curaproject mimetype definition 
CURA-5334

 - In project file writer, it says the mime type is "application/x-curaproject+xml",
   and we decided to use this as THE mime type.
 - Pass preferred_mimetype to save project file dialog so it
   automatically adds the file extension upon open.
 2018-06-07 12:51:54 +02:00
Ghostkeeper
8202b62343
Merge branch '3.4' 2018-06-07 11:38:13 +02:00
Jack Ha
f828c135f8 CURA-5249 replaced the extruder value of -1 by the more explicit defaultExtruderPosition, so now Cura is aware of the actual extruder position being used. Fixes linked icon next to support settings, like support_angle. 2018-06-07 11:35:09 +02:00