3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-12-02 23:31:42 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 11
25466 commits 345 branches 300 tags 757 MiB
Commit graph

92 commits

Author SHA1 Message Date
Ghostkeeper
7f1e61b7b8
Fix merge conflict 
Oopsie.
 2021-05-04 17:08:44 +02:00
Ghostkeeper
08976dcc7e
Merge branch '4.9' 
Conflicts:
	resources/themes/cura-light/styles.qml -> Fixes for QML warnings in this theme file, while on Master the icons were renamed.
 2021-05-04 11:58:50 +02:00
fieldOfView
4974b74109 Update copyright 2021-04-30 14:15:31 +02:00
fieldOfView
04bfd6b820 Use UM.Theme instead of Theme 
This prevents hundreds of QML warning messages logged in some user reports of Cura being slow.

```
2021-04-30 11:42:01,492 - WARNING - [MainThread] UM.Qt.QtApplication.__onQmlWarning [411]: file:///.../cura/../resources/themes/cura-light/styles.qml:335: TypeError: Cannot read property 'getSize' of null
2021-04-30 11:42:01,492 - WARNING - [MainThread] UM.Qt.QtApplication.__onQmlWarning [411]: file:///.../cura/../resources/themes/cura-light/styles.qml:338: TypeError: Cannot read property 'getColor' of null
2021-04-30 11:42:01,500 - WARNING - [MainThread] UM.Qt.QtApplication.__onQmlWarning [411]: file:///.../cura/../resources/themes/cura-light/styles.qml:327: TypeError: Cannot read property 'getSize' of null
2021-04-30 11:42:01,500 - WARNING - [MainThread] UM.Qt.QtApplication.__onQmlWarning [411]: file:///.../cura/../resources/themes/cura-light/styles.qml:329: TypeError: Cannot read property 'getColor' of null
2021-04-30 11:42:01,500 - WARNING - [MainThread] UM.Qt.QtApplication.__onQmlWarning [411]: file:///.../cura/../resources/themes/cura-light/styles.qml:335: TypeError: Cannot read property 'getSize' of null
2021-04-30 11:42:01,500 - WARNING - [MainThread] UM.Qt.QtApplication.__onQmlWarning [411]: file:///.../cura/../resources/themes/cura-light/styles.qml:338: TypeError: Cannot read property 'getColor' of null
2021-04-30 11:42:01,500 - WARNING - [MainThread] UM.Qt.QtApplication.__onQmlWarning [411]: file:///.../cura/../resources/themes/cura-light/styles.qml:327: TypeError: Cannot read property 'getSize' of null
2021-04-30 11:42:01,500 - WARNING - [MainThread] UM.Qt.QtApplication.__onQmlWarning [411]: file:///.../cura/../resources/themes/cura-light/styles.qml:329: TypeError: Cannot read property 'getColor' of null
```
 2021-04-30 12:22:40 +02:00
Kostas Karmas
f887db23f6 Use detail_level to describe the icons (instead of size) 
Previously the icons were organized according to "size" which could prove to be confusing.
This commit fixes that by organizing them according to "detail_level".

CURA-8010
 2021-04-28 18:53:32 +02:00
jelle Spijker
9ea97f7561
SVG are not correlated to pixel size. 
Although this deviates from the UX practices. It tended to confuse the
programmers ;-) The variances in level of detail for the icons are now
placed in the sub-directories. small, default and big.

CURA-8010_new_icons
 2021-04-28 15:45:20 +02:00
jelle Spijker
2bd6f28f3a
Update Icons 
Subdivided the new icons in 3 size categories. As requested by UX
Used the company naming scheme for uniformity and easy recognition.

Known issues:
- Top/Bottom category wasn't taken into account by UX at the time. Since
 this is a recent addition. Both the Walls and Top/Bottom will be updated.
- Cloud/Network connection icons 12px don't render correctly. Due to the
 theme-ing.
- Extruder Icons do not render correctly.

CURA-8010_new_icons
 2021-04-26 19:42:17 +02:00
Nino van Hooff
9fa2b26897 Styling: do not use thick_lining for selected tool icons. 
Affects Per Object Settings and rotate Lay Flat

CURA-6683
 2019-09-18 11:23:10 +02:00
Remco Burema
e5a690e605 Wrap up 'lay flat by face' feature for 4.3-BETA. 
Icon thanks to Yi-An Lai.
part of CURA-6754
 2019-09-10 12:37:59 +02:00
Jaime van Kessel
8b28dfb5e2 Removed unused style 2019-04-01 16:30:31 +02:00
Jaime van Kessel
dc66bdacc6 Simplify the main_window_header_tab style 2019-04-01 16:27:46 +02:00
Remco Burema
980953b00c
Merge pull request #4960 from Ultimaker/CURA-6005_cura_drive_plugin 
[4.0] CURA-6005 Added CuraDrive plugin to Cura build
 2019-01-10 14:58:00 +01:00
Ghostkeeper
6eca0ce69f
Use native rendering for text fields 
Hopefully this fixes the font rendering issue we're seeing on MacOS now.
 2019-01-03 16:04:27 +01:00
Lipu Fei
f7fb04d4ae Fix merge conflicts with 4.0 2019-01-03 15:25:40 +01:00
Lipu Fei
d97b812ccd
Merge branch '4.0' into unify_font_types 2019-01-03 10:46:49 +01:00
Jaime van Kessel
a0031853d3 Fix button color in toolpanel for dark theme 2019-01-02 11:32:49 +01:00
Diego Prado Gesto
ef2fb53790 Merge branch '4.0' into unify_font_types 2018-12-19 11:56:22 +01:00
Diego Prado Gesto
b7904d6e05 Unify the CuraDrive plugin with the rest of the items in Cura 
For instance, the buttons were converted to either primary buttons or secondary buttons. A new CheckBox component was created in Cura in order to reuse it in the future.

Contributes to CURA-6005.
 2018-12-17 13:04:23 +01:00
Diego Prado Gesto
0d780e61ff
Merge branch '4.0' into CURA-5876_fixes 2018-12-13 14:39:11 +01:00
Diego Prado Gesto
77ede1ae6b Unify the fonts to only have 8 instead of 13. 
Contributes to CURA-6025.
 2018-12-12 17:50:21 +01:00
Diego Prado Gesto
a1d7fa893d Change the style for the toolbuttons that appear in the popup panel of some tools 
Contributes to CURA-6024
 2018-12-12 17:26:13 +01:00
Diego Prado Gesto
f99c788eb6 Change some colors for the arrows in some setting selectors 
Contributes to CURA-5876.
 2018-12-11 16:35:59 +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
4b79770d58 Align the buttons in the output process widget 
The menu in the output device selector has now a rounded corner.
 2018-12-06 13:42:29 +01:00
Diego Prado Gesto
07d58c3aef Merge branch 'ui_rework_4_0' into CURA-5941_restyle_setting_dropdown 2018-12-05 13:56:21 +01:00
Ghostkeeper
4d87c46423
Remove sourceSize.width: width from all RecolorImages 
It is now the default in Uranium.

Contributes to issue CURA-5876.
 2018-12-04 15:04:51 +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
004405e5f9 Change the colors to match the designs. 
Contributes to CURA-5941.
 2018-12-03 17:25:07 +01:00
Diego Prado Gesto
ce6a0676dd Add a rectangle surrounding the settings listview 
Contributes to CURA-5941.
 2018-12-03 14:43:35 +01:00
Diego Prado Gesto
4c468831f0 Add tabs for select the extruder in the custom print setup. 
Align some elements beneath the tabs.

Contributes to CURA-5941.
 2018-12-03 13:58:13 +01:00
Ghostkeeper
7df4c01814
Merge branch 'ui_rework_4_0' into CURA-5876-Configuration_dropdown 
Conflicts:
	cura/Settings/MachineManager.py -> rowCount vs. count
	resources/qml/ExtruderIcon.qml -> Someone changed stuff that I had overwritten.
	resources/qml/Menus/ConfigurationMenu/PrintCoreConfiguration.qml -> Someone changed stuff that I had removed.
	resources/qml/Toolbar.qml -> Git was wrong, not a conflict.
	resources/themes/cura-light/theme.json -> Git was wrong, not a conflict.
 2018-12-03 11:45:05 +01:00
Diego Prado Gesto
90281c455b Add global profile selector to the custom print setup panel 
Also modify some styles to adjust to the designs.

Contributes to CURA-5941.
 2018-12-03 09:45:49 +01:00
Diego Prado Gesto
1cea36b08a Add the row for the support selection in the recommended mode 
Contributes to CURA-5941.
 2018-12-02 19:01:54 +01:00
Diego Prado Gesto
1caccfb577 Add a binding to react when the infill density changes in the custom panel 
Also make the icon dinamic, that will change when the infill density changes.

Contributes to CURA-5941.
 2018-12-02 13:40:41 +01:00
Ghostkeeper
f4950cf92b
Give checkboxes a style if they're disabled 
Contributes to issue CURA-5876.
 2018-11-30 17:04:50 +01:00
Lipu Fei
6db52dde46 Fix merge conflicts from ui_rework_40 
CURA-5943
 2018-11-29 15:27:06 +01:00
Diego Prado Gesto
14b460a626 Remove unused styles 2018-11-27 17:25:10 +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
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
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
669648d3e1 Improve the toolbar style by modifying the rectangles and the behavior 
to get a rounded rectangle on the right-top and right-bottom.

Contributes to CURA-5962.
 2018-11-20 16:28:21 +01:00
Diego Prado Gesto
895590c3d0 Change the size of the progress bar control. Also add the rounded 
rectangle.

Contributes to the new Cura UI-Flow.
 2018-11-20 14:28:54 +01:00
Diego Prado Gesto
f534885e34 Modify the color behavior of the toolbar buttons. 2018-11-12 09:35:32 +01:00
Diego Prado Gesto
9bf18031ce Apply restyle of the toolbar according to the new designs. 2018-11-11 19:15:02 +01:00
Diego Prado Gesto
38a80ecae5 Make some tweaks in the UI for the preview stage. 
Clean up the default theme a bit by removing unused entries.

Contributes to CURA-5829.
 2018-11-11 14:06:52 +01:00
Jaime van Kessel
11a3da3068 Removed color animation from stage buttons 
This caused laggy updates and it didn't add that much anyway

CURA-5772
 2018-11-06 11:06:20 +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