GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-09-22 20:13:11 +08:00
Code Issues Packages Projects Releases Wiki Activity
29,960 Commits 295 Branches 268 Tags
Commit Graph

13410 Commits

Author SHA1 Message Date
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
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
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
Ghostkeeper
4b897ffd67
Fix width of content in tabbed content 
Contributes to issue CURA-5876.
 2018-11-26 16:03:40 +01:00
Mark
7019afe21f
Merge pull request #4717 from forkineye/fix-wanhao_profiles 
Fix Wanhao profiles to use speed_travel macro
 2018-11-26 16:03:25 +01:00
Diego Prado Gesto
3d1157522a Reuse the RoundedRectangle component and indicate that only the bottom part of the popup should be rounded. 
Contributes to CURA-5942.
 2018-11-26 15:51:36 +01:00
Mark
39f123f8e0
Merge pull request #4670 from pinchies/add-cc-mm-2 
Add Cocoon Create ModelMaker
 2018-11-26 15:49:21 +01:00
Ghostkeeper
ac5f79ba2c
Add tab style to tabbed content 
It now gets a proper background colour, lining and radius.

Contributes to issue CURA-5876.
 2018-11-26 15:47:32 +01:00
Mark
88cedd25cf
Merge pull request #4664 from pinchies/master 
Add JGAurora Z-603S
 2018-11-26 15:47:28 +01:00
Mark
037bf8863e
Merge pull request #4666 from pinchies/add-jg-a5 
Add JGAurora A5
 2018-11-26 15:43:41 +01:00
Mark
734a8882b1
Merge pull request #4667 from pinchies/add-jg-a1 
Add JGAurora A1
 2018-11-26 15:41:30 +01:00
Diego Prado Gesto
67cba50e9b Merge branch 'ui_rework_4_0' into CURA-5942_printer_selector 2018-11-26 15:41:05 +01:00
Mark
30c585f298
Merge pull request #4834 from mcmidget/master 
Add BIBO2 printer (dual and single extruder settings)
 2018-11-26 15:39:39 +01:00
Diego Prado Gesto
9afc5748a8 Add copyright header. 2018-11-26 15:39:34 +01:00
Jaime van Kessel
9732099250 Add border to rounded rectangle. 
It's designed so that it works in exactly the same way as rectangle.
 2018-11-26 15:14:32 +01:00
Diego Prado Gesto
0a1c0e18d1 Reuse the component SecondaryButton in the printer selector. 
Contributes to CURA-5942.
 2018-11-26 14:38:43 +01:00
Diego Prado Gesto
52b916d45c Merge branch 'ui_rework_4_0' into CURA-5942_printer_selector 2018-11-26 14:33:41 +01:00
Diego Prado Gesto
12f78fa21a Remove border of the popup selector for the output devices. 
Contributes to CURA-5959.
 2018-11-26 14:29:42 +01:00
Ghostkeeper
90a73f351d
Fix positioning of tabs in custom menu 
The label's bottom side is at its top, so we must add its height so that it gets positioned correctly.

Contributes to issue CURA-5876.
 2018-11-26 14:12:34 +01:00
Diego Prado Gesto
b63c4f7a74 Add header in new files. Remove unused imports. 
Contributes to CURA-5959.
 2018-11-26 14:06:34 +01:00
Jaime van Kessel
a654499752 Re-enable hover for marketplace button 
CURA-5959
 2018-11-26 13:47:22 +01:00
Ghostkeeper
826044da7e
Merge branch 'ui_rework_4_0' into CURA-5876-Configuration_dropdown 
Conflicts:
	plugins/PrepareStage/PrepareMenu.qml: Some indentation change caused it to misalign the diffs, thinking it couldn't merge two of the same lines which actually weren't the same lines.
	resources/qml/Menus/ConfigurationMenu/QuickConfigurationSelector.qml: This file was deleted in my branch. I'm holding for the new version.
 2018-11-26 13:43:20 +01:00
Jaime van Kessel
3c86c0ae6c Fix spacing 
CURA-5959
 2018-11-26 13:36:45 +01:00
Jaime van Kessel
1fe6501358 Removed unused entries from theme 2018-11-26 13:35:41 +01:00
Jaime van Kessel
098714254d Remove unused code 
CURA-5959
 2018-11-26 13:35:02 +01:00
Jaime van Kessel
eea6490e75 Hover of output device now spans the popup 
CURA-5959
 2018-11-26 13:27:26 +01:00
Lipu Fei
6bed1c1390 Move monitor_checkable_button_style out to styles.qml 
CURA-5943
 2018-11-26 13:21:55 +01:00
Lipu Fei
d6614941dc Update QtQuick import versions in styles.qml 
CURA-5943
 2018-11-26 13:15:25 +01:00
Lipu Fei
6bb010e74a Move MonitorButtonStyle to styles.qml 
CURA-5943
 2018-11-26 13:14:26 +01:00
Diego Prado Gesto
5397cda2b4 Add a label to the action panel when auto slice is ON, indicating that the process runs automatically. 
Contributes to CURA-5942.
 2018-11-26 12:00:06 +01:00
Diego Prado Gesto
72d972c8b4 Remove PrinterStatusIcon that is not used anymore. 
Contributes to CURA-5942.
 2018-11-26 11:03:58 +01:00
Diego Prado Gesto
21bfa6e4c2 Fix code style. Add brackets in new line. 
Contributes to CURA-5942.
 2018-11-26 10:58:38 +01:00
Diego Prado Gesto
fa1ef5c45c Rename function name to be more clear to what it does. 
Contributes to CURA-5942.
 2018-11-26 10:51:08 +01:00
Diego Prado Gesto
63fab9f038 Use theme sizes. 
Contributes to CURA-5942.
 2018-11-26 10:49:43 +01:00
Diego Prado Gesto
5b940b5242 Use thick margin and change some anchors. 
Contributes to CURA-5942.
 2018-11-26 10:28:36 +01:00
Jaime van Kessel
c8e065d7a7
Fix code-style 
Contributes to CURA-5942.

Co-Authored-By: diegopradogesto <d.pradogesto@ultimaker.com>
 2018-11-26 10:21:15 +01:00