GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-02 16:54:23 +08:00
Code Issues Packages Projects Releases Wiki Activity
17,425 Commits 291 Branches 260 Tags
Commit Graph

448 Commits

Author SHA1 Message Date
Diego Prado Gesto
4dab33d41b Remove the fancy snowflakes pattern 2018-12-11 10:44:30 +01:00
Diego Prado Gesto
46fa33fda5 Merge branch 'ui_rework_4_0' into place_print_info_back 2018-12-07 13:19:19 +01:00
Diego Prado Gesto
9c873faace Merge branch 'ui_rework_4_0' into place_print_info_back 2018-12-07 13:11:15 +01:00
Diego Prado Gesto
1d33fe081f Clean up the code 
Remove all the references to the sidebar and use the term print_setup instead.

Contributes to CURA-5941.
 2018-12-07 12:07:41 +01:00
Diego Prado Gesto
3b8b70bddf Merge branch 'ui_rework_4_0' into CURA-5941_restyle_setting_dropdown 2018-12-06 16:35:07 +01:00
Diego Prado Gesto
9bce373520 Merge branch 'small_ui_fixes' into ui_rework_4_0 2018-12-06 16:08:33 +01:00
Diego Prado Gesto
4b9e6e7708 Add the linear gradient back, that I removed in a previous commit 
Contributes to CURA-6010.
 2018-12-06 16:06:22 +01:00
Diego Prado Gesto
b55ead8c89 Fix typo 
Contributes to CURA-6010.
 2018-12-06 15:18:32 +01:00
Aleksei S
3c517d3fcc The top bar background overlaps settings bar 2018-12-06 14:25:18 +01:00
Diego Prado Gesto
f655e6c43e Add a pattern in the background of the header. 
Adjust some main colors to the ones in the designs.
 2018-12-06 11:30:59 +01:00
Diego Prado Gesto
c757bf128e Adjust colors and alignments in the print info panel 2018-12-06 09:12:43 +01:00
Diego Prado Gesto
218fa3aded Align the print info to the left 2018-12-05 14:22:04 +01:00
Diego Prado Gesto
ca3c639069 Merge branch 'ui_rework_4_0' into CURA-5941_restyle_setting_dropdown 2018-12-04 09:03:13 +01:00
Diego Prado Gesto
7dc3320b06 Remove all the signal propagation for the tooltip and allow only Cura.qml to handle them 
Contributes to CURA-5941.
 2018-12-02 20:32:55 +01:00
Jaime van Kessel
6d4a460e58 Move USB sidebar into the main view of the monitorstage 
CURA-5943
 2018-11-30 13:53:53 +01:00
Diego Prado Gesto
92d0717096 Hide the toolbar and don't show time and material information when loading a gcode 
Contributes to CURA-5979.
 2018-11-27 15:00:50 +01:00
Jaime van Kessel
fb84b344ec Add gradient to header bar 2018-11-27 12:58:06 +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
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
c18b8241f5 Change MachineSelection so that it also uses the ExpandableComponent 
CURA-5785
 2018-11-13 14:00:00 +01:00
Diego Prado Gesto
9bf18031ce Apply restyle of the toolbar according to the new designs. 2018-11-11 19:15:02 +01:00
Remco Burema
215fc4e8ec Merge branch 'CURA-5829-Add-preview-stage' into ui_rework_4_0 2018-11-08 13:23:56 +01:00
Remco Burema
aef5c67652 Merge branch 'cura4.0_action_panel' into cura4.0_header 2018-11-08 11:50:14 +01:00
Diego Prado Gesto
2c59419dbb Merge branch 'cura4.0_header' into CURA-5829-Add-preview-stage 2018-11-06 17:01:18 +01:00
Jaime van Kessel
317447aa54 Fix multi-buildplate panel location 
CURA-5772
 2018-11-06 09:52:01 +01:00
Diego Prado Gesto
059e681de5 Remove unused code. 
Contributes to CURA-5786.
 2018-11-02 16:44:50 +01:00
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
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
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
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
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
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
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
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
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
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
Jaime van Kessel
553e29b9b8 Fix QML warnings 
CURA-5772
 2018-10-15 15:42:17 +02:00
Jaime van Kessel
2455961ac7 Vertically allign the toolbar 
CURA-5772
 2018-10-15 15:16:28 +02:00
Jaime van Kessel
1c70a62df6 Fix typo 
Derp. CURA-5772
 2018-10-15 15:10:50 +02:00
Jaime van Kessel
a7edd893d7 Change the order in which ViewOrientationControls and ProgressAndSaveWidget are drawn. 
This will ensure that if a stage sets a mainComponent that it won't have any other items drawn over it.

CURA-5772
 2018-10-15 15:08:58 +02:00
Jaime van Kessel
a473a46a35 Add a bit more documentation to explain what the elements do 
CURA-5772
 2018-10-15 15:07:46 +02:00
Jaime van Kessel
62c9980438 Move SidebarTooltip so that it's no longer ocluded by other objects 
CURA-5772
 2018-10-15 14:07:01 +02:00
Jaime van Kessel
d2baef97c4 Fix tooltips for settings 
CURA-5772
 2018-10-15 11:07:03 +02:00
Jaime van Kessel
8cac5e1de2 Removed the components qml dir 
We can consider putting components into their own folder, but we first should have a clear definition of what they are / should be.

CURA-5772
 2018-10-15 10:34:19 +02:00
Jaime van Kessel
fc1faf79f5 Cleanup unused code 
CURA-5772
 2018-10-15 09:52:48 +02:00
Jaime van Kessel
11a08d0e47 Move whole bunch of QML components to their new locations 
The tooltips are still not working correctly, it might be that it needs rework

CURA-5772
 2018-10-12 13:32:23 +02:00