3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-08-06 13:34:01 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 10
28323 commits 313 branches 275 tags 718 MiB
Commit graph

28323 commits

This branch
This branch
All branches
Author SHA1 Message Date
Mehmet Sutaş
43cc971835 Update rigid3d_base.def.json 2022-03-10 20:07:22 +03:00
Mehmet Sutaş
1e55652bd6 Update rigid3d_base.def.json 2022-03-10 18:39:08 +03:00
Mehmet Sutaş
3ef3c3c9ec Merge branch 'Rigid3D' of https://github.com/mehmetsutas/Cura into Rigid3D 2022-03-10 18:10:49 +03:00
Mehmet Sutaş
b4157b24c9 Zero3 Definitions 2022-03-10 18:10:45 +03:00
Mehmet Sutaş
2f30c8724c
Merge branch 'Ultimaker:master' into Rigid3D 2022-03-10 18:09:16 +03: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
Mehmet Sutaş
96c3c48b00 Merge branch 'master' into Rigid3D 2022-03-09 20:22:20 +03:00
Mehmet Sutaş
d2903d2171 Update rigid3d mucit2 and base definition 2022-03-09 20:19:24 +03: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
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
fd3ef23784 Swap buttons in MonitorConfigOverrideDialog for cura buttons 
CURA-8975
 2022-03-09 12:23:21 +01:00
casper
70f66648f4 Recolor placeholder icon for packages/plugins correctly in dark-mode 
As we don't want to recolor the icon if the package has a custom icon
a `Image` or `UM.RecolorImage` is shown conditionally.

CURA-8975
 2022-03-09 12:10:49 +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
61554a70c8
Merge pull request #11626 from Ultimaker/CURA-9008_reduce_profile_column_width 
[CURA-9008] Reduce width of preferences dialog page selection buttons.
 2022-03-08 10:16:07 +01:00
casper
912db08b23 Let height of preferences_page_list themes value set height of list item 
CURA-9008
 2022-03-08 09:11:49 +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
j.delarago
37a4986406 Reduce width of preferences dialog page selection buttons. 
Reduce width of profiles list and printers list.

CURA-9008
 2022-03-07 16:17:03 +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
Casper Lamboo
6cf7fae607
Merge pull request #11596 from Ultimaker/CURA-8982_Profile_tab_fixes 
Profile tab fixes (preferences)
 2022-03-07 13:28:55 +01:00
Casper Lamboo
da9f33f93f
Merge pull request #11599 from Ultimaker/CURA-8943_tool_panel_icon_size 
[CURA-8943] Update Tool Panel Icons style
 2022-03-07 12:58:25 +01:00
j.delarago
f58411d086 Merge branch 'master' into CURA-8943_tool_panel_icon_size 
# Conflicts:
#	resources/qml/ToolTip.qml
 2022-03-07 12:46:36 +01:00
Casper Lamboo
64e3e8b31d
Use template literals to format string 2022-03-07 11:31:24 +01:00
Casper Lamboo
24fc1ae2a2
Merge pull request #11595 from Ultimaker/CURA-8928_menu_visual_fixes 
Leftover menu fixes
 2022-03-07 10:53:24 +01:00
Casper Lamboo
11d7afe505
Formatting of inline if statement 2022-03-07 10:44:24 +01:00
Casper Lamboo
58ca09e1c6
Remove unused id 2022-03-07 10:43:46 +01:00
Jaime van Kessel
0d2ebcb802
Merge pull request #11606 from Ultimaker/CURA-8991_align_input_compontent_styling 
[CURA-8991] Align input component styling
 2022-03-07 10:40:39 +01:00
Jaime van Kessel
4c61768104
Merge pull request #11605 from Ultimaker/CURA-7887_fuzzy_spider 
[CURA-7887] Manually revert fuzzy skin disable.
 2022-03-04 16:42:34 +01:00
j.delarago
7b0e954f12 Change machine setting page text box text highlight color to match designs. 
CURA-8991
 2022-03-04 15:20:46 +01:00
j.delarago
719257bb63 Update validation colors to match new designs 
CURA-8991
 2022-03-04 15:05:30 +01:00
Ghostkeeper
45fa33584b
Restore loadProjectFile function 
It is being used when you want to load a project file. Pretty important!

Discovered while testing CURA-7950.
 2022-03-04 15:05:27 +01:00
j.delarago
e1068fb3bc Replace Text.Align with custom enum alignment 
CURA-8943
 2022-03-04 14:12:11 +01:00
j.delarago
1eb16c0ec5 Update SettingTextField to match TextField 
CURA-8991
 2022-03-04 13:53:59 +01:00
j.delarago
7dabcfafb0 Add checkbox square coloring back. 
CURA-8991
 2022-03-04 13:48:01 +01:00