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

5780 Commits

Author SHA1 Message Date
Remco Burema
7dfcac7bbe
Merge pull request #11663 from Ultimaker/CURA-9007_burger_menu 
[CURA-9007] Update Burger Menus
 2022-03-16 15:59:32 +01:00
Remco Burema
f4e57b82f8
Merge pull request #11664 from Ultimaker/CURA-8921 
[CURA-8921] Workaround for windows not giving dialogs the correct width.
 2022-03-16 15:29:32 +01:00
j.delarago
84d7443c18 Change OnYChanged out for OnPositionChanged inside scrollbar. Makes a bit more sense logically and this can be reused in ScrollViews as well. 
Added OnPositionChanged to General Page
CURA-8979
 2022-03-16 13:59:22 +01:00
Jaime van Kessel
d8f6173dd9
Merge pull request #11660 from Ultimaker/CURA-8890_combobox_width 
[CURA-8890] combobox width
 2022-03-15 16:51:02 +01:00
Jaime van Kessel
74e46c6009 Merge branch 'CURA-8945_spinbox_behaviour' of github.com:Ultimaker/Cura 2022-03-15 16:44:57 +01:00
j.delarago
4b853b89bd Fix typo 
CURA-8979
 2022-03-15 16:23:18 +01:00
j.delarago
9dbc497fcb Move TabRow below so it renders over the top lining of content rectangles. 
Update Tab styles to match designs

CURA-8979
 2022-03-15 16:19:33 +01:00
j.delarago
b33a5d7b84 Add space, so content isn't bellow scrollbar 
CURA-8979
 2022-03-15 15:54:50 +01:00
j.delarago
99f9918db5 Remove Italics 
CURA-8979
 2022-03-15 15:05:26 +01:00
j.delarago
bf784dbba0 show star on hover 
CURA-8979
 2022-03-15 15:03:49 +01:00
j.delarago
59b7d20f75 Update ReadOnlyTextArea import 
Update ReadOnlyTextArea style (It's not really read only 🤔)

CURA-8979
 2022-03-15 14:50:02 +01:00
Jaime van Kessel
7148ca5d06 Fix poup rescaling the burgermenu weirdly 
CURA-9007
 2022-03-15 14:42:53 +01:00
Jaime van Kessel
f9814520f7 Merge branch 'master' of github.com:Ultimaker/Cura into CURA-8979_Materials_Preference_Page 2022-03-15 11:07:44 +01:00
Jaime van Kessel
97124bf5a9 Fix various QML warnings 
CURA-8979
 2022-03-15 10:32:44 +01:00
Jaime van Kessel
f760ca146d Fix sizing of materialBrandSelection 
This also cleans up some stuff from the theme. Huzzah

CURA-8979
 2022-03-15 10:25:56 +01:00
Jaime van Kessel
93405bdb93 Add identation for the materials preferences page 
CURA-8979
 2022-03-15 10:19:34 +01:00
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