3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-11 00:37:50 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 3
19507 commits 302 branches 270 tags 770 MiB
Commit graph

3949 commits

Author SHA1 Message Date
Diego Prado Gesto
027bf204cd Use the BackendState enumeration in QML to not use integers but use the 
enumeration literals.

Contributes to CURA-5786.
 2018-10-30 15:12:03 +01:00
Diego Prado Gesto
00d75cd4d6 Tweak the colors of the disabled state. 
Contributes to CURA-5786.
 2018-10-30 12:28:51 +01:00
Diego Prado Gesto
45af4eec90 Add Shortcut action Ctrl+P to slice or stop slicing. 
Contributes to CURA-5786.
 2018-10-30 12:08:17 +01:00
Diego Prado Gesto
79ed15aee1 Add the label and the icon indicating when Cura is unable to slice. 
Contributes to CURA-5786.
 2018-10-30 11:52:08 +01:00
Ghostkeeper
c736bfffb5
Add hotkeys for managing profiles and materials 
These are unused on all platforms. We can't use Ctrl+M (multiply selection), Ctrl+P (print) or Ctrl+Q (quit) sadly.

Fixes #4250.
 2018-10-30 10:54:14 +01:00
Diego Prado Gesto
8fee8eeb5e Merge branch 'cura4.0_header' into cura4.0_action_panel 2018-10-30 10:45:25 +01:00
Diego Prado Gesto
b6ea0e6385 Make the height of the stage buttons themable. Now the height has to be 
28px as indicated by the UXers.

Contributes to CURA-5784.
 2018-10-30 10:38:53 +01:00
Mark
fda0f59c70 Rename user visible entries of ToolBox to Marketplace 
CURA-5874
 2018-10-30 10:27:22 +01:00
Diego Prado Gesto
aa75b64b5b Use the lining color to the default ouline color for the account widget. 
Contributes to CURA-5784.
 2018-10-30 09:48:56 +01:00
Diego Prado Gesto
bf59097320 Split the action button panel in two different components that are 
loaded in different moments.

The SliceProcessWidget is loaded once there is something to slice and it
also shows the process of slicing. The OutputProcessWidget will show the
print information and the actions to do to output the results, such as
Print over network, Save to file, ...

Contributes to CURA-5786.
 2018-10-29 15:18:34 +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
Diego Prado Gesto
5de367bcc4 Merge branch 'ui_rework_4_0' into cura4.0_header 
Conflicts:
plugins/UM3NetworkPrinting/resources/qml/UM3InfoComponents.qml
resources/qml/Menus/ViewMenu.qml
resources/themes/cura-dark/theme.json
resources/themes/cura-light/theme.json
 2018-10-29 11:10:25 +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
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
Ghostkeeper
ebbb7ad88f
Code style 2018-10-25 10:55:10 +02:00
Ghostkeeper
47f820fe69
Don't disable entire view menu when viewing g-code 
Just disable the part about switching views.
Yes, you can still select the view from the actual view selection drop-down in the main window. Well, it's an improvement, not a complete fix. The complete fix is deferred.
 2018-10-25 10:47:21 +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
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
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
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
Diego Prado Gesto
84adfa14ee Add license to the top of a file 
Contributes to CURA-5772.
 2018-10-18 17:26:10 +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
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
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
Jaime van Kessel
4c5bf3297c Merge branch 'master' of github.com:Ultimaker/Cura into CURA-5734-rework-and-unit-test-setting-visibility-preset 2018-10-17 10:49:29 +02:00
Jaime van Kessel
d086e6fa86 Fix review comments 
CURA-5734
 2018-10-17 10:47:34 +02:00
Jaime van Kessel
304a9e11f3 Moved view selection back into Cura QML 
It didn't make a whole lot of sense for it to be a seperate component, since it's probably going to change in the future

CURA-5772
 2018-10-17 09:50:24 +02:00