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

3024 Commits

Author SHA1 Message Date
Aleksei S
e6c2238fd5 Added popup spacing by Y coordinate 
CURA-5941
 2018-11-27 11:24:09 +01:00
Aleksei S
ec63e6c130 Added icons 
CURA-5941
 2018-11-27 09:27:25 +01:00
Aleksei S
2e262dd9d2 Added Icons to SidebarSimple 2018-11-23 17:35:55 +01:00
Aleksei S
c4d0207cc1 Added close button in right top corner 
CURA-5941
 2018-11-23 13:10:48 +01:00
Aleksei S
666ed595e5 Added space 2018-11-23 11:36:31 +01:00
Aleksei S
6d34218012 Merge branch 'ui_rework_4_0' into CURA-5941_restyle_setting_dropdown 2018-11-23 11:34:46 +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
Aleksei S
bfd8e66657 Removed margins and unused arches 
CURA-5941
 2018-11-21 12:50:18 +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
Aleksei S
4bccd2b7b5 Restyle printer settings dropdown 
CURA-5941
 2018-11-20 23:46:03 +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
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
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
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