GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-07-03 08:25:14 +08:00
Code Issues Packages Projects Releases Wiki Activity
16,849 Commits 295 Branches 268 Tags
Commit Graph

3030 Commits

Author SHA1 Message Date
Diego Prado Gesto
12f78fa21a Remove border of the popup selector for the output devices. 
Contributes to CURA-5959.
 2018-11-26 14:29:42 +01:00
Diego Prado Gesto
b63c4f7a74 Add header in new files. Remove unused imports. 
Contributes to CURA-5959.
 2018-11-26 14:06:34 +01:00
Jaime van Kessel
a654499752 Re-enable hover for marketplace button 
CURA-5959
 2018-11-26 13:47:22 +01:00
Jaime van Kessel
098714254d Remove unused code 
CURA-5959
 2018-11-26 13:35:02 +01:00
Jaime van Kessel
eea6490e75 Hover of output device now spans the popup 
CURA-5959
 2018-11-26 13:27:26 +01:00
Diego Prado Gesto
5397cda2b4 Add a label to the action panel when auto slice is ON, indicating that the process runs automatically. 
Contributes to CURA-5942.
 2018-11-26 12:00:06 +01:00
Jaime van Kessel
09af7a9435 Slice button will now be disabled on error 
CURA-5959
 2018-11-26 09:34:27 +01:00
Jaime van Kessel
b82ea58bc8 Changed all the action buttons to either use primary or secondary button 
CURA-5959
 2018-11-23 18:07:50 +01:00
Jaime van Kessel
af1ee53578 Fix the hover effect of action button 
CURA-5959
 2018-11-23 17:41:58 +01:00
Jaime van Kessel
e1f3e07f04 Changed Marketplace button to no longer use the action button 
The actionButton is weirdly named and overly used. That being said, the marketplace button is unique, so
there is little sense in re-using it
 2018-11-23 17:11:20 +01:00
Jaime van Kessel
1a8df9e10e Removed blue border if slicing is not possible 
CURA-5959
 2018-11-23 11:46:38 +01:00
Jaime van Kessel
3ba4b9fd81 Add shadows to various used actionbuttons 
CURA-5959
 2018-11-23 11:20:53 +01:00
Jaime van Kessel
3f4d379908 Added shadow to slice button 
CURA-5959
 2018-11-22 15:35:40 +01:00
Jaime van Kessel
a1613c7f81 Set the variable types of the Action button to the right kind. 
Because of boyscouting; these must be colors (and not generic vars)
 2018-11-22 13:53:27 +01:00
Diego Prado Gesto
cbee18597e Merge branch 'ui_rework_4_0' into CURA-5785-Restyle_stage_menu 2018-11-21 16:59:03 +01:00
Diego Prado Gesto
f866390c7b Fix an issue in the action panel. 
When the panel is created while the user is in the preview stage, the
row has no width.

Contributes to CURA-5786.
 2018-11-21 16:56:25 +01:00
Diego Prado Gesto
a1f3ebc25b Fix typo. 
Contributes to CURA-5785.
 2018-11-21 13:58:21 +01:00
Jaime van Kessel
a9672458fd Update extruderIcon to be more in line with the design 
CURA-5785
 2018-11-21 13:46:50 +01:00
Jaime van Kessel
c7dbaa3a00 Add rendertype for labels in quickConfigurationSelector 
CURA-5785
 2018-11-21 13:22:03 +01:00
Jaime van Kessel
bd636e61a0 Minor changes suggested in review 
CURA-5785
 2018-11-21 13:17:36 +01:00
Jaime van Kessel
eef6ad662d Added enum for the roundedCorner property 
This makes it a whole lot easier to read what is being set.

CURA-5785
 2018-11-21 11:50:39 +01:00
Jaime van Kessel
b826a42026 Add the RoundedRectangle as background to the ExpandableComponent 
This way the expandable components can have rounded corners only on one side,
thus preventing the need to do add backgrounds to the rows that they are in.

CURA-5785
 2018-11-21 11:37:58 +01:00
ChrisTerBeke
60ed0ddc24
Revert "Revert "Merge branch 'fix-oauth2-client' into CURA-5785-Restyle_stage_menu"" 
This reverts commit 791929d6897942e971a112a26839c0fa6f94f847.
 2018-11-20 23:49:33 +01:00
ChrisTerBeke
791929d689
Revert "Merge branch 'fix-oauth2-client' into CURA-5785-Restyle_stage_menu" 
This reverts commit 4caf770a62f07b71a646b7f09a08623485b89582, reversing
changes made to 0cdcd61ff2dfe2677e636cc2f1ee993cbd9d641d.
 2018-11-20 23:47:46 +01:00
ChrisTerBeke
4caf770a62
Merge branch 'fix-oauth2-client' into CURA-5785-Restyle_stage_menu 
* fix-oauth2-client:
  Switch Ultimaker Account OAuth2 client
  Fix the title's top margin size in the add machine dialog.
 2018-11-20 20:48:52 +01:00
Diego Prado Gesto
669648d3e1 Improve the toolbar style by modifying the rectangles and the behavior 
to get a rounded rectangle on the right-top and right-bottom.

Contributes to CURA-5962.
 2018-11-20 16:28:21 +01:00
Diego Prado Gesto
76f2aeb43c Fix the title's top margin size in the add machine dialog. 2018-11-20 11:27:45 +01:00
Lipu Fei
b0f3fedc94 Fix import QtQuick versions to suit Qt 5.10 
CURA-5785
 2018-11-19 13:42:22 +01:00
Jaime van Kessel
a490e420f0 Prevent the setting items from being recreated every stage switch 
CURA-5785
 2018-11-19 11:42:04 +01:00
Jaime van Kessel
52b2f4579a Fix a number of QML warnings 
CURA-5785
 2018-11-16 16:13:09 +01:00
Jaime van Kessel
7f99ed1af3 ExtruderIcon will now display that it's disabled correctly 
CURA-5785
 2018-11-16 16:04:11 +01:00
Jaime van Kessel
d661a8e626 Merge branch 'CURA-5785-Restyle_stage_menu' of github.com:Ultimaker/Cura into CURA-5785-Restyle_stage_menu 2018-11-16 15:23:38 +01:00
Jaime van Kessel
42399ecb24 Let headerItem fill entire component if no icon is set 
CURA-5785
 2018-11-16 15:17:34 +01:00
Jaime van Kessel
b72f1bb314 Add missing screenScaleFactor for implicit sizes 
CURA-5785
 2018-11-16 15:15:44 +01:00
Ghostkeeper
816d844258
Use textwidth instead of round 
CURA-5785

Co-Authored-By: nallath <nallath@gmail.com>
 2018-11-16 15:14:08 +01:00
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
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