3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-08-09 06:45:09 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
16306 commits 313 branches 275 tags 719 MiB
Commit graph

16306 commits

This branch
This branch
All branches
Author SHA1 Message Date
Jaime van Kessel
f773030218 Add main stage to previewStage so that SimulationView can use it 
CURA-5829
 2018-10-31 09:37:21 +01:00
Jaime van Kessel
0a3803d665 Add CuraView, which does something similar to CuraStage 
So instead of relying on strange activeViewProxy, it's up to the CuraView to provide a set of components.
These can subsequently be used by the active stage again.

CURA-5829
 2018-10-29 16:21:16 +01:00
Jaime van Kessel
d8dd9bf363 Set SolidView to invisible. 
Since we don't have a selector in the prepare stage anymore, solidview must be invisible

CURA-5829
 2018-10-29 14:54:42 +01:00
Jaime van Kessel
cfa962311b Fixed typing 
CURA-5829
 2018-10-29 13:54:20 +01:00
Jaime van Kessel
fc6ad4f623 Put back the view menu, since it did more than just show the views 
CURA-5829
 2018-10-29 13:41:46 +01:00
Jaime van Kessel
ebe533bdc8 Move active view panel to previewStage 
CURA-5829
 2018-10-29 13:39:00 +01:00
Jaime van Kessel
9cc7a7ca23 Moved view selection to previewStage 
CURA-5829
 2018-10-29 13:27:47 +01:00
Jaime van Kessel
3248a05819 Add PreviewStagePlugin stubs 
Since we are going to move all the views into a seperate stage, we need to add another stage to do that.

CURA-5829
 2018-10-29 11:28:08 +01:00
Diego Prado Gesto
90e8a05aab Remove all the entries in the theme that make reference to the sidebar, 
because there is no sidebar anymore.

Several different margins and linings were created depending on the
side, not depending on where it belongs.

Contributes to CURA-5784.
 2018-10-26 17:51:28 +02:00
Diego Prado Gesto
c8bdf7321c Move the visible check within the component. 
Contributes to CURA-5772.
 2018-10-26 16:31:03 +02:00
Diego Prado Gesto
5a5adb71cd Make the height of the Print setup selector themable. 
Contributes to CURA-5772.
 2018-10-26 16:16:33 +02:00
Diego Prado Gesto
3eb71021e2 Change the way the string for the tooltip is formatted. 
Contributes to CURA-5772.
 2018-10-26 15:53:20 +02:00
Diego Prado Gesto
a277bd9f3b Don't use the hand cursor in the action buttons by default. 
Contributes to CURA-5784.
 2018-10-26 11:29:05 +02:00
Diego Prado Gesto
54518bdc82 Change the minimum window size to be 1280x800. 
Contributes to CURA-5784.
 2018-10-26 11:14:39 +02:00
Diego Prado Gesto
a8531a335d Fix the alignments for the sliders in the simulation view. 
Contributes to CURA-5772.
 2018-10-26 09:52:02 +02:00
Diego Prado Gesto
e64698209c Adjust the minimum size to be something around 1280x1024. 
Also adjust some colors color for the dark theme.

Contributes to CURA-5772.
 2018-10-25 17:41:35 +02:00
Diego Prado Gesto
e85b5febe1 Add pointing hand cursor shape when hovering the AccountWidget. 
Contributes to CURA-5784.
 2018-10-24 11:28:52 +02:00
Diego Prado Gesto
bf1c23243e Modify the styles to match the requirements. 
Contributes to CURA-5784.
 2018-10-24 09:55:51 +02:00
Diego Prado Gesto
dbb62f2490 Add default icons for the avatar. 
Contributes to CURA-5784.
 2018-10-22 11:31:19 +02:00
Diego Prado Gesto
69fc1e5bfb Reuse ActionButton component to create the toolbox shortcut. 
Contributes to CURA-5784.
 2018-10-22 10:30:06 +02:00
Diego Prado Gesto
fe216a7387 Merge branch 'cura4.0_header' of github.com:Ultimaker/Cura into cura4.0_header 2018-10-22 09:53:29 +02:00
Diego Prado Gesto
17732b1169 Make the spacing between the orientation controls be dependent on the 
theme.

Contributes to CURA-5772.
 2018-10-19 17:04:40 +02:00
Diego Prado Gesto
17b77c58ef Make the spacing between the orientation controls be dependent on the 
theme.
 2018-10-19 17:03:48 +02:00
Diego Prado Gesto
15b35da612 Change the TopHeader name to MainWindowHeader, since there is nothing 
more on the top than the header.

Contributes to CURA-5784.
 2018-10-19 16:40:21 +02:00
Diego Prado Gesto
6f12197cea Don't use an image to create a mask but a circle. 
Contributes to CURA-5772.
 2018-10-19 13:41:32 +02:00
Diego Prado Gesto
54f32a1d82 Merge branch 'ui_rework_4_0' into cura4.0_header 2018-10-18 19:33:39 +02:00
Diego Prado Gesto
405e4c5bbd Correct year, we live now in 2018 (keep it in mind) 
Contributes to CURA-5772.
 2018-10-18 17:52:42 +02:00
Diego Prado Gesto
66147f4172 Remove unused style button. 
Contributes to CURA-5772.
 2018-10-18 17:49:56 +02:00
Diego Prado Gesto
176c7bfc22 Small fixes in the CustomConfigurationSelector file 
Contributes to CURA-5772.
 2018-10-18 17:48:03 +02:00
Diego Prado Gesto
bf6817ce7a Reduce the size of the ApplicationMenu.qml file by moving some 
components out to different files.

Contributes to CURA-5772.
 2018-10-18 17:38:23 +02:00
Ghostkeeper
7b140277d6
Code style: Brackets on new line 2018-10-18 17:27:15 +02:00
Diego Prado Gesto
84adfa14ee Add license to the top of a file 
Contributes to CURA-5772.
 2018-10-18 17:26:10 +02:00
Ghostkeeper
4e54f13145
Move shortcut keys test to CMake 
So that when you run tests locally, you also test this one.
 2018-10-18 17:22:57 +02:00
Ghostkeeper
05c2349411
No longer run setting visibility script 
It no longer exists.

Contributes to issue CURA-5734.
 2018-10-18 17:15:28 +02:00
Diego Prado Gesto
93b04190f8 Change name of some components to make them more indicative of what they 
do.

Contributes to CURA-5772.
 2018-10-18 17:13:15 +02:00
Diego Prado Gesto
8df3eb33d4 Minor changes: remove empty lines, small changes in the anchors, ... 
Contributes to CURA-5772.
 2018-10-18 16:51:32 +02:00
Diego Prado Gesto
1cc7e0e586 Set the height of the stage menu in the theme instead of hardcoded. 
I also adjusted a bit the design to fulfill the requirments from UX/UI
team.

Contributes to CURA-5772.
 2018-10-18 16:33:13 +02:00
Diego Prado Gesto
fdfa81b2b8 Make some items' size dependent on parent's. Also make the ActionButton 
more themable.

Contributes to CURA-5784.
 2018-10-18 16:06:21 +02:00
Diego Prado Gesto
0a07f48375 Fix typo in a theme's key. 
Contributes to CURA-5784.
 2018-10-18 15:38:24 +02:00
Diego Prado Gesto
119638efa1 Adjust outline color for the avatar image. Following the colors in the 
designs.

Contributes to CURA-5784.
 2018-10-18 15:35:21 +02:00
Diego Prado Gesto
b82dacbe19 Merge branch 'cura4.0_header' of github.com:Ultimaker/Cura into cura4.0_header 2018-10-18 15:19:07 +02:00
Diego Prado Gesto
237c360a88 The size of the avatar image is now themed. 
Some other small fixes in the AccountDetails componenent were done.

Contributes to CURA-5784.
 2018-10-18 15:18:00 +02:00
Ghostkeeper
3888d79b34
Merge branch 'CURA-5734-rework-and-unit-test-setting-visibility-preset' 2018-10-18 14:59:41 +02:00
Ghostkeeper
db0da61506
Forbid interpolation in setting visibility preset files 
We might use characters that collide with this.

Contributes to issue CURA-5734.
 2018-10-18 14:54:20 +02:00
Ghostkeeper
1bcd134f85
Fix code style 
Most stuff here was recently changed. Some of it was where I found a pattern in something that was likely copy-pasted from somewhere else, so I did a global search and replace on that.

Contributes to issue CURA-5784.
 2018-10-18 14:30:33 +02:00
Diego Prado Gesto
a4c609d514 Remove email label from the account widget. 
It's not needed and it's not currently public data that is published
with the user token.

Contributes to CURA-5784.
 2018-10-18 14:28:00 +02:00
Diego Prado Gesto
11693aad36 Change the behaviour of the Popup, that now closes when clicking the 
widget if it is open.

Contributes to CURA-5784.
 2018-10-18 09:51:42 +02:00
Diego Prado Gesto
54554bff89 Adjust colors to work with dark theme. 
Contributes to CURA-5784.
 2018-10-18 09:51:04 +02:00
Diego Prado Gesto
7fb72a1a58 Change Skeleton folder name to MainWindow. 
This folder is intended to store the files that construct the main
window. All the parts. The rest of the components are stored in more
specific folders.

Contributes to CURA-5784.
 2018-10-17 16:13:43 +02:00
Diego Prado Gesto
b670cd82c4 Merge branch 'master' into cura4.0_header 2018-10-17 16:10:45 +02:00