GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-04-23 22:29:41 +08:00
Code Issues Packages Projects Releases Wiki Activity
9,764 Commits 286 Branches 260 Tags
Commit Graph

1636 Commits

Author SHA1 Message Date
Jaime van Kessel
7e07482dec Added topbar to Cura 
CURA-3964
 2017-07-03 15:44:42 +02:00
Ghostkeeper
b8b23055ba
Fix getting new material diameter 
Same problem, it's not been updated yet at this point.

Contributes to issue CURA-2822.
 2017-06-29 16:50:15 +02:00
Ghostkeeper
27bcb11dc9
Store old approximate diameter in variable 
Shorter line, easier to read.

Contributes to issue CURA-2822.
 2017-06-29 16:41:24 +02:00
Ghostkeeper
b3e49f0c12
Fix getting the old approximate diameter 
The properties.approximate_diameter gets updated later via signals, so at this point it's not correct yet.

Contributes to issue CURA-2822.
 2017-06-29 16:28:01 +02:00
Jaime van Kessel
4370e3a13c Added zoom to mouse preference 
https://github.com/Ultimaker/Cura/issues/1572
 2017-06-27 15:41:17 +02:00
Jaime van Kessel
c36ab386fa Merge branch 'feature_tab_navigation' of https://github.com/fieldOfView/Cura 2017-06-26 14:39:12 +02:00
fieldOfView
0f9cfa0304 Fix tab order after expanding categories or using search 
This reimplements the behavior of pressing tab/backtab to force the correct order of items in the listview.
 2017-06-26 14:35:37 +02:00
fieldOfView
8917762ed5 Animate scrolling focussed item into view 2017-06-26 13:03:28 +02:00
fieldOfView
edee53b0b1 Scroll setting with active focus into view 2017-06-26 13:00:59 +02:00
Ghostkeeper
6088617453
Merge branch '2.6' 2017-06-26 10:34:58 +02:00
Ghostkeeper
8c9d051479
Re-enable Korean translations 
They are complete now, as far as we agreed on (only the setting descriptions). They may now be re-enabled.

Contributes to issue CURA-3950.
 2017-06-23 16:42:47 +02:00
Jaime van Kessel
ccb3f225ff Preheat now shows error color like all other input fields 2017-06-23 15:49:46 +02:00
Jaime van Kessel
78141cf330 Merge branch 'fix_layerview_small_windows' of https://github.com/fieldOfView/Cura 2017-06-23 15:11:57 +02:00
Lipu Fei
dbf0cf347c Default to 0 if we cannot find the theme 
CURA-3873
 2017-06-23 13:59:05 +02:00
fieldOfView
b324e90ba5 Show hover state on active focus 2017-06-22 18:33:30 +02:00
Ghostkeeper
bc219a06fe
Add MaterialsModel to make material list update upon metadata change 
This new model inherits from InstanceContainersModel. The only change is that it updates when the metadata of a material container changes. This is needed to make the list of materials update when the material diameter changes.

Contributes to issue CURA-2822.
 2017-06-22 18:17:16 +02:00
Ghostkeeper
0e23930bfe
Fix checking whether the old material diameter was the same 
Getting the old material diameter wasn't working properly.

Contributes to issue CURA-2822.
 2017-06-22 18:17:16 +02:00
Ghostkeeper
1d048f39db
Fix getting old material diameter 
This diameter works. I still don't know why the properties/diameter one didn't work, but this is good too since they are now equal.

Contributes to issue CURA-2822.
 2017-06-22 18:17:15 +02:00
Ghostkeeper
b37fa6f718
Implement warning message when you change material diameter 
The undo functionality currently gives an error though. Investigating...

Contributes to issue CURA-2822.
 2017-06-22 18:17:15 +02:00
fieldOfView
8a887915ac Add tab navigation to sidebar 2017-06-22 18:07:34 +02:00
fieldOfView
48efcdf6e4 Use a PointingRectangle for the LayerView pane 2017-06-22 14:59:15 +02:00
fieldOfView
29e152582f Make layerview panel hug the bottom of small windows 
Fixes https://github.com/Ultimaker/Cura/issues/2013
 2017-06-22 14:30:26 +02:00
Lipu Fei
73f598ff9f Fix code style 
CURA-3712
 2017-06-22 08:54:04 +02:00
Ghostkeeper
1d23d659f0
Merge branch '2.6' 2017-06-21 12:29:23 +02:00
Ghostkeeper
e7d5618148
Re-enable Japanese translation 
Note that this only includes the setting descriptions.

Contributes to issue CURA-3950.
 2017-06-21 11:30:16 +02:00
Ghostkeeper
24b19fa0a5
Convert tab to spaces 
We indent with spaces, not tab. This one was mixed.
 2017-06-21 11:29:35 +02:00
Ghostkeeper
9acaef8ecc
Merge branch 'feature_lsit_themes' of https://github.com/fieldOfView/Cura into fieldOfView-feature_lsit_themes 2017-06-19 11:05:20 +02:00
Ghostkeeper
29b90d26b8
Re-enable centre camera on selection 
With Qt 5.8 it works again on Windows.
 2017-06-15 16:16:56 +02:00
Ghostkeeper
66f5b236d6
Merge branch '2.6' 2017-06-15 09:54:19 +02:00
Ghostkeeper
4c8d65a2f4
Re-enable Brazillian Portuguese translation 
It's complete again. Thanks Patola.

Contributes to issue CURA-3885.
 2017-06-15 09:42:30 +02:00
Ghostkeeper
8bce6e060c
Merge branch '2.6' 2017-06-14 10:58:11 +02:00
fieldOfView
49f2fb2cea
Fix filtering maerials after editing materials 
NB: previously the "approximate_diameter" metadata was stored as a number. This caused some issues passing arguments from QML to Python. Now "approximate_diameter" is stored as a string.
 2017-06-14 10:42:04 +02:00
fieldOfView
ed6f4d851c
Update documentation 2017-06-14 10:41:39 +02:00
fieldOfView
1f49a87acb
Update material_diameter when editing the material in MaterialView.qml 2017-06-14 10:41:02 +02:00
Ghostkeeper
baef713f50
Disable incomplete languages 
These translations are incomplete for the 2.6 release.

Contributes to issue CURA-3885.
 2017-06-14 09:37:55 +02:00
Mark
8ab5c7e4cd Merge pull request #1910 from Ultimaker/fix_dialog_sizes 
Fix dialog sizes.
Tested on different OSes and screens, all looked good.
 2017-06-13 13:14:44 +02:00
Mark
9f66bc8090 Merge pull request #1910 from Ultimaker/fix_dialog_sizes 
Fix dialog sizes.
Tested on different OSes and screens, all looked good.
 2017-06-08 11:08:56 +02:00
Ghostkeeper
3d8c932bcc
Clarify context of Print Selected Model With button description 2017-06-01 16:20:40 +02:00
Ghostkeeper
2fb7821972
Merge branch '2.6' 2017-05-31 17:17:32 +02:00
Jaime van Kessel
ccec148243 Plugins can now also be installed by dropping them onto the application 
CURA-3712
 2017-05-31 14:40:17 +02:00
Mark
4398960264 Give text in labels specific width so icons stay aligned 2017-05-31 12:46:07 +02:00
Mark
a66f0d4781 resize the rename-dialog 2017-05-31 12:46:07 +02:00
Mark
7bc715a9bd fixed too big dialogs and hidden checkboxes 2017-05-31 12:46:07 +02:00
Mark
4e03eeca8e Anchor the i-button to materialVariantContainer 
CURA-3810
 2017-05-31 12:00:44 +02:00
Mark
3177d99bcf Anchor the i-button to materialVariantContainer 
CURA-3810
 2017-05-31 11:59:05 +02:00
Mark
4fe4c759bd Anchor the i-button to materialVariantContainer 
CURA-3810
 2017-05-31 11:57:48 +02:00
Mark
a934cc4182 Make the icon a litle bit smaller 
CURA-3810
 2017-05-31 10:50:49 +02:00
Mark
6311563909 Realign the selectboxes 
CURA-3810
 2017-05-31 10:50:49 +02:00
Mark
7676975fcb Make the icon a litle bit smaller 
CURA-3810
 2017-05-31 09:37:20 +02:00
Mark
4c88b82b99 Realign the selectboxes 
CURA-3810
 2017-05-31 09:35:22 +02:00