GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-19 04:27:29 +08:00
Code Issues Packages Projects Releases Wiki Activity
17,030 Commits 290 Branches 260 Tags
Commit Graph

7343 Commits

Author SHA1 Message Date
Jaime van Kessel
fe15a0a513 Made width of machineSelector popup depend on size of the element 
CURA-5785
 2018-11-16 15:09:47 +01:00
Jaime van Kessel
5972bfaf03 Add round to minContentWidth 
This prevents text from getting a weird width

CURA-5785
 2018-11-16 15:06:21 +01:00
Jaime van Kessel
320efa443e Merge branch 'CURA-5785-Restyle_stage_menu' of github.com:Ultimaker/Cura into CURA-5785-Restyle_stage_menu 2018-11-16 14:58:47 +01:00
Jaime van Kessel
3fd1cc0e8c Ensure that the added labels are also themable 
CURA-5785
 2018-11-16 14:58:11 +01:00
Ghostkeeper
3ef6d0544a
Fix spelling and indents 
Ant-fuckery, as they say in the low lands.

Contributes to issue CURA-5785.
 2018-11-16 14:11:23 +01:00
Ghostkeeper
514fc13045
Remove redundant documentation 
CURA-5875

Co-Authored-By: nallath <nallath@gmail.com>
 2018-11-16 14:04:33 +01:00
Ghostkeeper
81b6f3ab11
Update unclear qml ID's 
CURA-5785

Co-Authored-By: nallath <nallath@gmail.com>
 2018-11-16 14:03:39 +01:00
Jaime van Kessel
240ac1f06b Clarify some setting descriptions 2018-11-16 13:03:45 +01:00
Ghostkeeper
bee563f01b
Merge branch 'ui_rework_4_0' into CURA-5785-Restyle_stage_menu 2018-11-16 13:02:24 +01:00
Aleksei S
2bf4354fed Removed minimum_value for the setting support_roof_offset and support_bottom_offset 
CURA-5880
 2018-11-15 15:57:34 +01:00
Ghostkeeper
d732a2f953
Merge branch 'master' into ui_rework_4_0 2018-11-15 15:55:08 +01:00
Jaime van Kessel
6dd6f5ecc7 Made the hardcoded values of ExpandableComponent themable 
CURA-5785
 2018-11-15 14:11:46 +01:00
Jaime van Kessel
3629e3b604 Added highlight to ExpandableComponent 
CURA-5785
 2018-11-15 14:04:52 +01:00
Jaime van Kessel
eca9820fc4 Add toggle function to expandable popup 
Also ensures that the machineSelector closes the popup on making a choice

CURA-5785
 2018-11-15 13:55:33 +01:00
Jaime van Kessel
f0b8c1e611 Fix some minor display issues 
CURA-5785
 2018-11-15 09:45:46 +01:00
Jaime van Kessel
c08aa2205c Fix enabled checkbox for extruder selection 
CURA-5785
 2018-11-15 09:37:54 +01:00
Jaime van Kessel
21d7619a45 Added a hover effect to the expandableComponent 
CURA-5785
 2018-11-14 16:57:05 +01:00
Jaime van Kessel
c27f51d944 Make the view selector also use the expandableComponent 
CURA-5785
 2018-11-14 16:44:36 +01:00
Jaime van Kessel
429a49aa2e Make the default size of the expandableComponent icon depend on the height of the element 
This is a way more sensible default.

CURA-5785
 2018-11-14 14:06:55 +01:00
Jaime van Kessel
7ca3490097 Make the collapse arrows consistent with the rest of the UI 
CURA-5785
 2018-11-14 14:00:19 +01:00
Jaime van Kessel
b589920f53 Move a few hardcoded sizes to the theme 
CURA-5785
 2018-11-14 13:55:39 +01:00
Jaime van Kessel
878b743232 Add elide to machine selector label. 
CURA-5785
 2018-11-14 10:39:03 +01:00
Jaime van Kessel
c35b4f1d31 Removed old unusued code 
CURA-5785
 2018-11-14 10:00:44 +01:00
Jaime van Kessel
fb72f9a059 Fixed size of expandableItem not being the correct width 
CURA-5785
 2018-11-14 09:59:56 +01:00
Jaime van Kessel
1569fd7396 Merge branch 'ui_rework_4_0' of github.com:Ultimaker/Cura into CURA-5785-Restyle_stage_menu 2018-11-14 09:34:08 +01:00
Remco Burema
13a9bb7eba Remove enables for min. support area in case of TreeSupport. [CURA-5903] 2018-11-13 17:03:27 +01:00
Remco Burema
6307784a79 Fix some English grammar. [CURA-5903] 2018-11-13 16:50:00 +01:00
Ghostkeeper
4b8d20cad7
Correct the link to create a new account 
Previously this button just took you to the log-in page.

Fixes issue CURA-5921.
 2018-11-13 16:27:19 +01:00
Remco Burema
9181b5a3b9 Merge branch 'feature_minimum_support_area' of https://github.com/DesktopMetal/Cura into DesktopMetal-feature_minimum_support_area 2018-11-13 16:26:36 +01:00
Ghostkeeper
266e08fdff
Merge branch 'master' into ui_rework_4_0 
Conflicts:
	plugins/Toolbox/resources/qml/ToolboxCompatibilityChart.qml - The compatibility chart being added in 3.6 which was kind of hacky.
	resources/qml/SidebarHeader.qml - Removed in UI rework, edited on master.
 2018-11-13 16:23:36 +01:00
Jaime van Kessel
c9389dd9ab Codestyle fixes 2018-11-13 15:58:34 +01:00
Jaime van Kessel
785c2661a2 Make SimulationViewMenuComponent also use the ExpandableComponent 
CURA-5785
 2018-11-13 15:57:00 +01:00
Jaime van Kessel
deb5fd1926 Fix PrintSetupSelector for previewStage 
CURA-5785
 2018-11-13 15:35:05 +01:00
Jaime van Kessel
c18b8241f5 Change MachineSelection so that it also uses the ExpandableComponent 
CURA-5785
 2018-11-13 14:00:00 +01:00
Ghostkeeper
2486a5b5da
Improve generic profiles for fabtotum and zyyx 
These printers had profiles for zyyx_pro and fabtotum material suites, which were specific to those materials, but caused the generic materials to no longer have any profile. Let's use these machine-specific profiles for the generic materials as well. For the specific materials this changes nothing because the same profiles are still matched. For the generic materials this should improve the quality if the quality profile is tuned in any way to the machine.
 2018-11-13 11:48:02 +01:00
Jaime van Kessel
fe4ed46496 Show material name instead of just color 
CURA-5785
 2018-11-12 16:55:42 +01:00
Jaime van Kessel
4c1a45f904 Added sizes to the stage menu 
This isn't themed, but right now it does adhere to the sizes I got from UX

CURA-5785
 2018-11-12 15:53:09 +01:00
Ghostkeeper
bfe5ae6f9c
Merge branch '3.6' 2018-11-12 15:48:22 +01:00
Ghostkeeper
fe66d15b9e
Disable Polish language 
The translation didn't arrive in time for the 3.6 release.

Contributes to issue CURA-5870.
 2018-11-12 15:47:42 +01:00
Jaime van Kessel
783fe9ab73 Updated the look of the extruder buttons 
CURA-5785
 2018-11-12 15:23:58 +01:00
Jaime van Kessel
f14687a749 Merge branch 'ui_rework_4_0' of github.com:Ultimaker/Cura into CURA-5785-Restyle_stage_menu 2018-11-12 14:32:06 +01:00
Jaime van Kessel
4be33031d7 Added icons to ExpandableComponent 
This also makes the entire header react to mouse events instead of just the icon/button

CURA-5785
 2018-11-12 14:30:55 +01:00
Jaime van Kessel
54685c983a Make PrintSetupSelector use layout instead of fixed width 
This makes the components autoscale a bit when needed.

CURA-5785
 2018-11-12 13:29:21 +01:00
Jaime van Kessel
ca63733827 Updated header of the settingbar 
CURA-5785
 2018-11-12 13:06:12 +01:00
Jaime van Kessel
987ff1737f Remove unused background from PrintSetupSelector 
CURA-5785
 2018-11-12 11:27:54 +01:00
Jaime van Kessel
88b57518d9 Fix codestyle 
CURA-5785
 2018-11-12 11:24:11 +01:00
Jaime van Kessel
b60977e435 Convert PrintSetupSelector to an ExpandableComponent 
CURA-5785
 2018-11-12 11:14:39 +01:00
Jaime van Kessel
e641584021 Made strings in ConfigurationSelector translatable. 
CURA-5785
 2018-11-12 09:45:55 +01:00
Diego Prado Gesto
f534885e34 Modify the color behavior of the toolbar buttons. 2018-11-12 09:35:32 +01:00
Diego Prado Gesto
9bf18031ce Apply restyle of the toolbar according to the new designs. 2018-11-11 19:15:02 +01:00