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

392 Commits

Author SHA1 Message Date
ChrisTerBeke
3f7d8997a1 Fix icon positions - CURA-4758 2018-01-04 11:33:12 +01:00
fieldOfView
3f11b8a756 Merge branch 'master' into feature_setting_visibility_profiles 2018-01-04 11:06:51 +01:00
Lipu Fei
392be23281 Fix SettingView stakc ID binding 
CURA-4708
 2018-01-03 15:58:30 +01:00
ChrisTerBeke
4f77b2ea6d More layout and font fixes 2018-01-03 13:50:06 +01:00
ChrisTerBeke
b7aadbe3c3 Fix extruder dropdown text model 2018-01-03 13:08:20 +01:00
ChrisTerBeke
1fa3031486 Fix text color for extruder comboboxes 2018-01-03 12:52:40 +01:00
ChrisTerBeke
3a2b2d3333 Also fix combobox list item heights for extruder dropdowns 2018-01-03 12:48:33 +01:00
ChrisTerBeke
1fe653b231 Fix combobox dropdown item height 2018-01-03 12:47:08 +01:00
ChrisTerBeke
77c8ac3950 Layout fixes for controls 2.0 2018-01-03 11:46:20 +01:00
Lipu Fei
f6168c07f0 Fix material_diameter bindings for metarial menu and page 
CURA-4708
 2018-01-03 11:27:30 +01:00
ChrisTerBeke
27ca743e58 Merge branch 'master' into qtquick-controls-2.0 2018-01-03 11:03:17 +01:00
Ghostkeeper
8b504c8acc
Fix scroll position after collapsing category not in focus 
When collapsing a category, the height of the category is briefly set to 0 and then animated there properly. If the setting list becomes so small then that the scroll bar disappears, the view should automatically get scrolled up. But because the focus changed at the same time it would move the scrollbar such that the category header was in view. This clashed, causing the scroll position to end up not completely at the top even though the scroll bar did disappear. Setting the focus after collapsing the scroll bar prevents this.

Contributes to issue CURA-4732 and fixes #2935.
 2017-12-29 14:07:34 +01:00
Ghostkeeper
ac8f3a31be
Include period in translation source text 
I suspect that this was originally done this way to prevent breaking a string freeze. I'm now correcting it so that languages that don't use this period will also be able to properly end their sentence (such as Japanese or Chinese).

Contributes to issue CURA-4692.
 2017-12-29 11:51:28 +01:00
fieldOfView
57a9b709e7 Select text when gaining focus 2017-12-19 12:14:58 +01:00
Diego Prado Gesto
4a211c6ac6 CURA-4495 Change property name and add default values 2017-12-18 11:58:34 +01:00
Diego Prado Gesto
c3ce3724e5 Fix small issue when resetHandler is not defined 2017-12-18 10:00:08 +01:00
ChrisTerBeke
79028388a2 Add option for custom reset handler in setting item 2017-12-15 11:05:42 +01:00
ChrisTerBeke
b74ebc57b4 Fix per extruder setting value depending on extruder count - CURA-4627 2017-11-27 17:00:57 +01:00
Ruben D
0d0bcb8aea
Clip text that exceeds the width of the text box. 
For #2802.
 2017-11-26 18:48:27 +01:00
Ruben D
8847325cf8
Remove limit on length for integer arrays 
The integer arrays were limited because the text in the text field is not properly clipped. I found a fix for that.

Fixes #2802.
 2017-11-26 18:47:58 +01:00
ChrisTerBeke
657a91c525 Merge pull request #2685 from Ultimaker/container_stack_improvements 
Container stack improvements
 2017-11-20 17:42:26 +01:00
Jaime van Kessel
7d28b26ff2 Merge branch 'master' of github.com:Ultimaker/Cura into qtquick-controls-2.0 2017-11-16 16:48:22 +01:00
fieldOfView
8dfba9a318 Stop SettingTextField from setting values when getting/losing the focus 
Fixes #2694
 2017-10-30 15:31:14 +01:00
fieldOfView
5638ebe8cf Tweak appearance of the menu button 2017-10-26 11:05:59 +02:00
Chris ter Beke
b95ba24530 Remove some changes, debugging - CURA-4451 
WIP - CURA-4451

correctly show not supported when any of the extruders has a not supported profile - CURA-4451

Clean up and add comments - CURA-4451
 2017-10-26 09:23:27 +02:00
fieldOfView
078fd074e5 Add initial menu stub 2017-10-26 00:00:07 +02:00
fieldOfView
4bb67fbd82 Add setting visibility profile menu button 2017-10-25 17:04:23 +02:00
ChrisTerBeke
35684e0aa4 Move profiles dropdown text generator to separate method 2017-10-24 09:57:48 +02:00
fieldOfView
29729d2a23 Change renderType for TextInput elements 
Unlike Label elements, which are defined to use Text.NativeRendering, TextInput uses Qt text rendering by default. This can lead to differences in font rendering between input fields and other texts.
 2017-10-14 11:43:18 +02:00
Jaime van Kessel
799d1a5b0c Updated setting items & sidebar to qtQuick controls 2.0 2017-10-11 21:02:27 +02:00
Mark
3a7fbdb173 Changed parseInt to Math.floor 2017-10-11 17:06:13 +02:00
Mark
eaa7b75f0e Changed parseInt to Math.floor 2017-10-11 16:47:40 +02:00
Mark
00205996da Change Text to Label and cast all sizes to int 
CURA-4437
 2017-10-11 14:53:46 +02:00
Mark
d4a8dbdee7 Change Text to Label and cast all sizes to int 
CURA-4437
 2017-10-11 12:48:42 +02:00
Mark
9a193ad5c5 Changing AGPLv3 to LGPLv3 2017-09-28 13:00:43 +02:00
fieldOfView
c5fd0e6c80 Use screenScaleFactor to consistently adapt sizes to display pixel ratio 2017-09-25 22:07:12 +02:00
Lipu Fei
3d6648fc59 Rearrange quality profile slider and dropdown box 
CURA-4182

- Remove the quality profile dropdown box from Recommended mode
- Move the quality profile dropdown box to Custom mode
 2017-09-13 17:12:51 +02:00
Lipu Fei
d0740158b1 Merge branch 'master' into feature_extruder_buttons 
CURA-4211

Resolve merge conflicts.
 2017-09-04 08:29:26 +02:00
Lipu Fei
aad628a46f Change to new design for extruder number settings 
CURA-4211
 2017-08-31 17:49:24 +02:00
Lipu Fei
0781848af5 Reduce margin size for settings in recommended and custom mode 
CURA-4148
 2017-08-28 17:35:03 +02:00
Lipu Fei
0eb63637d4 Merge branch 'master' into feature_dark_colours_icons 2017-08-28 16:54:36 +02:00
Lipu Fei
f85a76b4bd Fix per-object settings qml 2017-08-24 17:38:16 +02:00
Ghostkeeper
09a5cf1de2
Shift sidebar tooltips with the arrow outside of sidebar 
Because now the arrow has the same colour as the sidebar so you won't see it otherwise.

Contributes to issue CURA-4148.
 2017-08-23 17:53:00 +02:00
Ghostkeeper
11f8204644
Change margins in the side bar 
These are more or less all margins in the side bar.

Contributes to issue CURA-4148.
 2017-08-23 16:28:28 +02:00
Ghostkeeper
078b9e8b66
Fix placeholder text colour 
It should use the same colour as the normal text, for now.

Contributes to issue CURA-4148.
 2017-08-23 15:32:42 +02:00
Ghostkeeper
ab444943cb
Rename setting_validation_error/warning and border 
In some places we want to use the bright error or warning colours to display that something is going on. In those places we'd like to refer to the colour setting_validation_error rather than setting_validation_error_border or something, so I'm renaming these four theme items.

Contributes to issue CURA-4148.
 2017-08-23 13:30:25 +02:00
Ghostkeeper
5652bccc58
Change control border colour depending on validation state 
The background colour was already changing, but the border colour was only depending on the hover state.

Contributes to issue CURA-4148.
 2017-08-21 13:56:07 +02:00
Ghostkeeper
4b8152d6fe
Allow fallthrough of switch statement 
Makes it easier to modify.

Contributes to issue CURA-4148.
 2017-08-21 13:21:33 +02:00
Lipu Fei
cf25515b90 Make SettingView update its value upon global stack change 
CURA-4105

Cleaner way to make SettingView update its value when the global stack
gets changed.
 2017-08-01 10:25:50 +02:00
Lipu Fei
96f8e70e40 Update containerStackId for limit_to_extruder settings when active machine has been changed 
CURA-4105
 2017-07-31 17:58:49 +02:00