GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-08 23:49:01 +08:00
Code Issues Packages Projects Releases Wiki Activity
30,337 Commits 290 Branches 260 Tags
Commit Graph

5714 Commits

Author SHA1 Message Date
j.delarago
b04fabb27a Remove focus from SettingItems when scrolling. 
This fixes the issue where you can scroll combobox dropdowns out of the settingView.

CURA-9039
 2022-03-14 17:33:48 +01:00
j.delarago
8a182b1f3f Workaround for windows not giving dialogs the correct width. 
CURA-8921
 2022-03-14 16:41:53 +01:00
j.delarago
ff824b718c Replace burger buttons with generic BurgerButton.qml component. 
Move comment onto newline (Comments on the same line as component names break text folding)

Update burger menu margins in SettingView to match design

CURA-9007
 2022-03-14 16:14:57 +01:00
j.delarago
0b82e9ef31 Remove focus from TextField when incrementing/decrementing using buttons. 
This fixes the issue where the value that was in the textfield before typing would be incremented instead, if the textField had active focus.

CURA-8890
 2022-03-14 14:29:11 +01:00
j.delarago
0ba4dbacc4 Make combobox_wide much wider and swap out existing uses of combobox_wide for combobox. 
CURA-8890
 2022-03-14 13:13:30 +01:00
Jaime van Kessel
c6326eff64 Ensure that "update profile" button in preferences has correct enabled state 
CURA-9023
 2022-03-14 11:56:45 +01:00
Jaime van Kessel
0084001e2f Remove . from button string 
CURA-9023
 2022-03-14 11:47:19 +01:00
Jaime van Kessel
97732336e3 Increase width of dropdown boxes in general page 
CURA-8990
 2022-03-14 11:42:50 +01:00
Jaime van Kessel
ea03236f03 Remove unneeded font assignment 
The default font is, you guessed it, already default.
 2022-03-14 11:40:05 +01:00
Jaime van Kessel
790c2c23c1 Display profile name correctly in dropdown 
CURA-9040
 2022-03-14 11:38:31 +01:00
casper
5136838f56 Update materials list in materials preference page 
Main improvement of this commit is that the reusable category button
component is used as the collapsable header component for the material
brands/types.

CURA-8979
 2022-03-11 16:42:11 +01:00
casper
b2f13cc6c9 Update Category Button 
Put content of category button in a `RowLayout` so individual content
Components can easily be removed by hiding said component while keeping
margins and spacings work as intended.

Additionaly make the icon property optional

CURA-8979
 2022-03-11 16:40:32 +01:00
casper
e2c9e0a461 Elide text in materials slot 
CURA-8979
 2022-03-11 16:29:37 +01:00
Jaime van Kessel
22f9b2a0ec Increase the indentation margin for settings 
CURA-8921
 2022-03-11 15:38:34 +01:00
casper
359cb673bc Merge branch 'master' into CURA-8979_Materials_Preference_Page 2022-03-11 14:02:33 +01:00
casper
2f8f56d762 Merge branch 'master' into CURA-8979_Materials_Preference_Page 
# Conflicts:
#	resources/qml/Preferences/ProfilesPage.qml
 2022-03-11 13:57:30 +01:00
Casper Lamboo
60f7b2dccb
Merge branch 'master' into CURA-9005_restyle_print_setting_category 2022-03-11 13:43:33 +01:00
casper
c6b8abd53e Update materials slot 
CURA-8979
 2022-03-11 13:22:45 +01:00
casper
1b976693dc Remove dangling comment 
CURA-9005
 2022-03-11 13:13:25 +01:00
casper
5701f42d63 Move CategoryButton to cura repo 
CURA-9005
 2022-03-11 13:11:36 +01:00
Casper Lamboo
addc5e36a7
Apply suggestions from code review 
Co-authored-by: Jaime van Kessel <nallath@gmail.com>
 2022-03-11 09:59:20 +01:00
casper
2dd440cc0c Fix print settings tab in materials view 
CURA-8979
 2022-03-10 22:13:32 +01:00
Remco Burema
d2ab7d3d4d
Merge pull request #11633 from Ultimaker/CURA-9012_application_menu_fixes 
Application menu fixes
 2022-03-10 12:55:54 +01:00
Remco Burema
1445419406
Merge pull request #11634 from Ultimaker/CURA-9023_Fix_profile_page_uppdate_create_new 
Profile page fixes
 2022-03-10 12:47:47 +01:00
Jaime van Kessel
dbcf571340 Apply right theme colors for secondary button 
CURA-9014
 2022-03-10 11:54:58 +01:00
Jaime van Kessel
a5098f469b Lower the max flick velocity of settingview 
On my system it was 2500, which made it almost impossible to work with
the trackpad

CURA-9025
 2022-03-10 11:45:39 +01:00
Jaime van Kessel
84a0c732c1 Fix warnings caused by combobox 
Parent wasn't always set, which caused ocasional warnings
 2022-03-10 11:34:11 +01:00
casper
9ba44f1d30 Move details plane caption to management page 
This way the caption can be correctly aligned with the hamburger menu
button

CURA-8979
 2022-03-10 10:15:31 +01:00
Jaime van Kessel
ec1f8f7125 Add extra info label 
CURA-9023
 2022-03-09 16:30:32 +01:00
Jaime van Kessel
84bb4790f8 Fix spacing between update & discard actions 
CURA-9023
 2022-03-09 16:28:26 +01:00
Jaime van Kessel
a285e39799 Set defaultname for create new profile 
CURA-9023
 2022-03-09 16:26:01 +01:00
Jaime van Kessel
cbf995cb85 Add tooltip to create new button 
CURA-9023
 2022-03-09 16:24:49 +01:00
Jaime van Kessel
6aeac2b2a4 Shorten copy of update button 
Added the full text in the tooltip

CURA-9023
 2022-03-09 16:13:41 +01:00
casper
418f88a4da boy scouting 
CURA-8975
 2022-03-09 15:59:21 +01:00
casper
f9a5cb33fd Implement basic styling of material management page 
CURA-8979
 2022-03-09 15:26:55 +01:00
Jaime van Kessel
91b6ceb951 Fix spacing for menu 
CURA-9012
 2022-03-09 14:01:54 +01:00
Jaime van Kessel
d752f34b70 Shorten english string for show troubleshooting 
Doesn't solve all of the issues here, but at least fixes it for english.
I feel that the word guide also doesn't actually add any meaningfull info anyway

CURA-9012
 2022-03-09 13:30:22 +01:00
Jaime van Kessel
dab67d9b38 Ensure that invisible menu seperators have a height of 0 
CURA-9012
 2022-03-09 13:26:16 +01:00
Jaime van Kessel
01ecc799fa Change background color of Discard or keepchanges dialog 
CURA-8951
 2022-03-09 13:06:28 +01:00
casper
0e2848796c Increase text field width to prevent inner text from shifting 
CURA-9010
 2022-03-09 09:46:57 +01:00
Jaime van Kessel
79464106a9 Merge branch 'master' of github.com:Ultimaker/Cura 2022-03-08 14:27:43 +01:00
Jaime van Kessel
a9a0d4280a Fix Jobspecs text alignment 
CURA-9010
 2022-03-08 14:27:00 +01:00
Casper Lamboo
0c58488eb1
Merge pull request #11627 from Ultimaker/CURA-9004_materials_selection_dropdown 
[CURA-9004] materials selection dropdown improvements
 2022-03-08 08:43:00 +01:00
j.delarago
59158db34b Lining at the bottom of UnderlineBackground and at the top of the menu give a double width lining. 
Moved the menu up slightly so lining of UnderlineBackground is hidden.

CURA-9004
 2022-03-07 17:07:14 +01:00
Jaime van Kessel
90bb250d8f Merge branch 'CURA-9007_burger_menu' of github.com:Ultimaker/Cura 2022-03-07 16:58:11 +01:00
j.delarago
a49aa6502c Set material and nozzle selection menus to appear at bottom of button like drop downs. 
CURA-9004
 2022-03-07 16:56:26 +01:00
10r3n20
4f2e7116b7 minor fix to align setting visibility with settings 2022-03-07 16:25:14 +01:00
10r3n20
5499a4cc4c tiny improvements 2022-03-07 16:11:33 +01:00
j.delarago
1eb887010a Swap TextField for Cura.TextField so it has the same styling as the rest of text fields. 
CURA-9010
 2022-03-07 15:00:51 +01:00
j.delarago
aa25e0746c Make burger invisible when no printer is selected in Printer page 
CURA-9007
 2022-03-07 14:35:09 +01:00