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

19507 commits

This branch
This branch
All branches
Author SHA1 Message Date
Ghostkeeper
0be2453daf
Update style of border of configuration items 
Contributes to issue CURA-5876.
 2018-11-27 12:55:07 +01:00
Ghostkeeper
e58409b1ef
Correct colours for the selected configuration 
This should always be the same as the ExpandableComponent's background, so white when it's not active and light blue when it's active, regardless of theme.
The naming of this theme entry is a bit weird because the ActionButton theme is used for ExpandableComponent and now for ConfigurationItem as well, but that's why we should NEVER name these theme entries to something specific to one item. Oh well, I'm not about to refactor that now with all the branches going on everywhere.

Contributes to issue CURA-5876.
 2018-11-27 12:51:52 +01:00
Jaime van Kessel
1a6822436d Add missing HoverEnabled property 
Some systems, like mine, don't have the hoverEnabled default set to true.
 2018-11-27 12:01:43 +01:00
Jaime van Kessel
e04f14b50c Also add shadow to openFile button 2018-11-27 12:01:05 +01:00
Jaime van Kessel
44c415ff78 Add shadow to ExpandableComponent 2018-11-27 11:58:32 +01:00
Ghostkeeper
a2b1f53979
Use normal text colour instead of specialised configuration item text 
They were the same anyway, and they should always be the same.

Contributes to issue CURA-5876.
 2018-11-27 11:53:17 +01:00
Ghostkeeper
6876c12106
Remove weird padding from button 
I don't know why the default Button has padding everywhere, but I don't want it.

Contributes to issue CURA-5876.
 2018-11-27 11:43:32 +01:00
Diego Prado Gesto
75b827d373 Modify the hover behavior by removing the mouse area. 
Contributes to CURA-5942.
 2018-11-27 11:26:20 +01:00
Diego Prado Gesto
e2f85fcdc4 Add extra space to printer button. 
Contributes to CURA-5942.
 2018-11-27 11:25:43 +01:00
Aleksei S
e6c2238fd5 Added popup spacing by Y coordinate 
CURA-5941
 2018-11-27 11:24:09 +01:00
Ian Paschal
fd723e1084 Improve camera icon 
Contributes to CL-1150
 2018-11-27 11:19:45 +01:00
Ian Paschal
a3f0630ee9 Rename printer images 
Contributes to CL-1150
 2018-11-27 11:19:30 +01:00
Ghostkeeper
e05566865a
Use ExtruderIcon component to display extruder icon 
Since we already have that component pre-designed, let's use it.

Contributes to issue CURA-5876.
 2018-11-27 11:19:03 +01:00
Diego Prado Gesto
a01ff9419d Merge branch 'ui_rework_4_0' into CURA-5942_printer_selector 2018-11-27 11:13:34 +01:00
Diego Prado Gesto
729d37cabb Merge branch 'master' into ui_rework_4_0 2018-11-27 11:12:48 +01:00
Ghostkeeper
c489f911fb
Use QtQuick 2.0 and simplify ConfigurationItem 
It now uses a ButtonGroup (from QtQuick2). Also, all the mess with when the border and background colours are updated and force-updated and such is now cleaned up.

Contributes to issue CURA-5876.
 2018-11-27 11:04:41 +01:00
Ian Paschal
475a94d10d Add printer images 
Commit to CL-1150
 2018-11-27 10:55:08 +01:00
Ian Paschal
8965695a59 Update MonitorPrintJobProgressBar.qml 
Contributes to CL-1150
 2018-11-27 10:54:46 +01:00
Ian Paschal
616ec13457 Change context menu button size 
Contributes to CL-1150
 2018-11-27 10:54:26 +01:00
Ian Paschal
7340b6dbc4 Update CameraButton.qml 
Contributes to CL-1150
 2018-11-27 10:53:00 +01:00
Ian Paschal
0cd9c8e087 Add machine images 
Contributes to CL-1150
 2018-11-27 10:52:49 +01:00
Lipu Fei
edf8460619 Return empty material model for empty material 
CURA-5982
 2018-11-27 10:35:19 +01:00
Lipu Fei
a99c1f4f73
Merge pull request #4885 from Ultimaker/CURA-5961-NaN_infill_before_adding_printer 
Ensure that no weird data is set in the printSetupSelector on first start
 2018-11-27 10:23:58 +01:00
Diego Prado Gesto
f91dbd356d Merge branch 'master' of github.com:Ultimaker/Cura 2018-11-27 09:51:00 +01:00
Diego Prado Gesto
48853d0d06 Merge branch 'pinchies-add-a-u20' 2018-11-27 09:50:43 +01:00
Diego Prado Gesto
39e1cfd6bc Fix indentation. 
Contributes to CURA-5902.
 2018-11-27 09:50:01 +01:00
Lipu Fei
bd42136712 Fix GcodeStartEndFormatter to use fallback values 
CURA-5901

Use values from the global stack (if exist) as fallback values.
 2018-11-27 09:49:38 +01:00
Diego Prado Gesto
493b37b0fe Merge branch 'add-a-u20' of git://github.com/pinchies/Cura into pinchies-add-a-u20 2018-11-27 09:44:11 +01:00
Jaime van Kessel
8e7e8354e7 Set colors to the correct ones 2018-11-27 09:41:45 +01:00
Ghostkeeper
4be8af7cb2
Restyle printer type headers 
It's now a grey box with the printer type name inside and some padding and such.

Contributes to issue CURA-5876.
 2018-11-27 09:38:32 +01:00
Aleksei S
ec63e6c130 Added icons 
CURA-5941
 2018-11-27 09:27:25 +01:00
Lipu Fei
2e81b97623 Use global_stack.extruders to find extruders 
CURA-5978
 2018-11-27 08:45:45 +01:00
pinchies
47ed9e3f5d
deleting the old wrong file.... 2018-11-27 15:09:36 +11:00
pinchies
519e2a3399
uploaded wrong file... oops 2018-11-27 15:06:54 +11:00
Diego Prado Gesto
fcc6af68af Don't show the current checked version of the firmware if the version number we gather is ZERO. That means that there was a problem getting the right value. 
Contributes to CURA-5980.
 2018-11-26 17:55:25 +01:00
Diego Prado Gesto
ad3fa9548a Add sourceSize to the open file button. 
Contributes to CURA-5942.
 2018-11-26 17:53:38 +01:00
Diego Prado Gesto
6a2bbca7ce Merge branch 'ui_rework_4_0' into CURA-5942_printer_selector 2018-11-26 17:53:24 +01:00
Jaime van Kessel
5ddb3ff909 Factor out superfluous use of small_tool_button style 
The style was overly complicated for what it should do
 2018-11-26 17:40:34 +01:00
Ghostkeeper
7f2f2090da
Make small and very_small fonts actually smaller 
Rather than the same as default_bold and default.
This also makes the extruder_icon font obsolete. Turns out it's actually just a very small font.

Contributes to issue CURA-5876.
 2018-11-26 17:37:50 +01:00
Jaime van Kessel
a3b45ff203 Simplify the viewOrientation controls 2018-11-26 17:35:23 +01:00
Ghostkeeper
a3fe9839ba
Change all uses of 'small' and 'very small' fonts to default 
These two fonts are exactly the same, but I want to use the 'small' font to be something a bit smaller. I'm 'removing' the superfluous font but will be re-using it immediately to look a bit smaller.

Contributes to issue CURA-5876.
 2018-11-26 17:33:37 +01:00
Ghostkeeper
a03e1be601
Simplify sectionHeading element 
No need to define that component in a higher location, just define it where you need it. Also, no need to use a Rectangle for this if it has no colour, just use an Item, but the Item itself is also not necessary if you just need the padding.

Contributes to issue CURA-5876.
 2018-11-26 17:19:32 +01:00
Ghostkeeper
3b219e3ac3
Remove padding 
The padding is already done by the enveloping Column and its parent popupItem.

Contributes to issue CURA-5876.
 2018-11-26 17:13:25 +01:00
Ghostkeeper
a268c95559
Remove double header 
This header is no longer necessary since the AutoConfiguration item provides its own header that doesn't scroll along.

Contributes to issue CURA-5876.
 2018-11-26 17:10:56 +01:00
Jaime van Kessel
a825daea95 Cleanup the Theme.json 
There were a lot of sizes that weren't used
 2018-11-26 17:10:48 +01:00
Ghostkeeper
87a0dc65e1
Add list of available configurations to AutoConfiguration 
This is the main item it needs to display.

Contributes to issue CURA-5876.
 2018-11-26 17:09:36 +01:00
Jaime van Kessel
d85aee1c53 Ensure that no weird data is set in the printSetupSelector on first start 
CURA-5961
 2018-11-26 16:40:29 +01:00
ChrisTerBeke
efd5f3799b Also catch TypeError now that we have explicit arguments 2018-11-26 16:31:32 +01:00
ChrisTerBeke
6506596ece Fix typing syntax 2018-11-26 16:19:01 +01:00
Ghostkeeper
4b897ffd67
Fix width of content in tabbed content 
Contributes to issue CURA-5876.
 2018-11-26 16:03:40 +01:00