GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-28 17:18:39 +08:00
Code Issues Packages Projects Releases Wiki Activity
25,634 Commits 293 Branches 266 Tags
Commit Graph

829 Commits

Author SHA1 Message Date
jelle Spijker
abc76e593a Increased the height of the welcome wizard screen. 
Discussed with UX what the best approach would be.
Both came to the conclusion that this is the simplest
and more aesthetic approach.

The extra white space at the bottom and height of the
first screen is still acceptable according to UX.

Contributes to CURA-8290_whats_new_text
 2021-06-17 14:41:56 +02:00
Ghostkeeper
bb20e3307f
Revert "Fix merge conflict" 
This reverts commit 7f1e61b7b8b6c6bb76ac5b99be8c762e1b01cd5e.

These icons were renamed, but the original icons are now restored so those changes need to be reverted.

Contributes to issue CURA-8267.
 2021-06-03 17:27:35 +02:00
Jaime van Kessel
02a4ade2a5
Fix incorrect icons 
CURA-8267
 2021-06-01 16:07:05 +02:00
Jaime van Kessel
70e4e9640e
Revert "Merge pull request #9716 from Ultimaker/CURA-8010_new_icons" 
This reverts commit 6120d8a054b8c04bf90b8b3d3cb219d691bece2f, reversing
changes made to 95652556fef90f70adbf25bfa9bd3b8af7220d4a.
 2021-05-27 16:06:20 +02:00
Jaime van Kessel
119a957e7f
Revert "Add list for deprecated icons" 
This reverts commit 34f75839c4811eeae946c2fb1c122569c1e75d7a.
 2021-05-27 16:03:03 +02:00
Jaime van Kessel
760726cf0b
Revert "Add Function icon" 
This reverts commit 5ad9cd4845ba286687e2bf0e74e947f219b384b9.
 2021-05-27 16:02:53 +02:00
Jaime van Kessel
26afff6093
Revert "Switch out inherit icon" 
This reverts commit 672d6c89cf6b12b01fe27c28622806310b063968.
 2021-05-27 16:02:46 +02:00
Jaime van Kessel
6483db3d47
Revert "Merge branch 'CURA-8205_Introduce_new_icons_in_Cura' of github.com:Ultimaker/Cura" 
This reverts commit 90eb2bfbdcc66fdbf82b0e1dac6bcf1a536845b0, reversing
changes made to 91c4d8b5f2cf3c18df2f75a0161f727eeae1bf41.
 2021-05-27 16:01:17 +02:00
Kostas Karmas
b5a3bfbf50 Remove old "MeshTypeExclude" icon 
It was used by the "Don't support overlaps" tool in the "Per Model settings" but it is now replaced
by the icon "BlockSupportOverlaps"

CURA-8205
 2021-05-14 10:10:56 +02:00
Kostas Karmas
7feba68847 Add new icon for block support overlaps 
CURA-8205
 2021-05-14 09:16:43 +02:00
Kostas Karmas
8014f11d6b Add missing entry to the deprecated_icons dict 
CURA-8205
 2021-05-14 09:11:27 +02:00
Jaime van Kessel
672d6c89cf
Switch out inherit icon 
CURA-8010
 2021-05-05 15:58:42 +02:00
Jaime van Kessel
5ad9cd4845
Add Function icon 
CURA-8010
 2021-05-05 15:57:03 +02:00
Jaime van Kessel
34f75839c4
Add list for deprecated icons 
We changed a bunch of names, but we still want to keep it intact for a bit longer.
If we don't, a whole bunch of plugins look ugly AF

CURA-8010
 2021-05-05 15:41:26 +02:00
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
247412b16a
Implemeted new icons in on-boarding dialog 
CURA-8010_new_icons
 2021-04-28 16:54:26 +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
845289f708
Removed old theme specific Icons for cloud connect 
This is already taken care of in QML

CURA-8010_new_icons
 2021-04-28 11:17:29 +02:00
jelle Spijker
913369ee41
Removed auto generated text 
CURA-8010_new_icons
 2021-04-28 11:08:27 +02:00
jelle Spijker
886f41603a
Updated Connectivity icons so they can follow theming 
CURA-8010_new_icons
 2021-04-28 11:02:18 +02:00
jelle Spijker
13cd2d677c
Added new icon for Top/Bottom 
CURA-8010_new_icons
 2021-04-28 11:00:52 +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
Ghostkeeper
7f353d72a7
Remove now unused image of printers 
Contributes to issue CURA-8107.
 2021-04-01 19:36:00 +02:00
Ghostkeeper
3e4098cffa
Clean up unreadable mess of SVG code 
It's now documented and written down in human terms. Since it doesn't involve encoding contours as 0-width paths any more, the rendering should also be a bit faster.

Contributes to issue CURA-8107.
 2021-04-01 19:09:55 +02:00
Ghostkeeper
6b41f3a5cd
Make the welcome screen a re-usable image 
It's not good to name a resource after where it's used if it could be necessary in multiple places.

Contributes to issue CURA-8107.
 2021-04-01 18:19:18 +02:00
Kostas Karmas
0488887780 Add image sizes for welcome dialog 
CURA-8094
 2021-03-25 08:57:15 +01:00
Kostas Karmas
c38b6f0522 Change SVG icon names 
CURA-8094
 2021-03-25 08:56:15 +01:00
Kostas Karmas
b21a21c0f2 Add missing style 
Without it the svgs are rendered as completely black.

CURA-8094
 2021-03-24 16:47:40 +01:00
Jelle Spijker
91c71e1c8a
Added missing 48px icons 
These are the new icons. Specifically for 48px.

CURA-8094 Cura onboarding flow
 2021-03-23 11:22:20 +01:00
Jelle Spijker
c727fe5e0c
Updated Sign in screen first run 
CURA-8094 Cura onboarding flow
 2021-03-23 11:20:38 +01:00
Jelle Spijker
ccf18a7443
Updated Welcome screen first run 
CURA-8094 Cura onboarding flow
 2021-03-23 11:18:25 +01:00
Ghostkeeper
79ec71ca4c
Move top/bottom settings to separate category 
Implements CURA-8006.
 2021-02-05 14:59:38 +01:00
Jaime van Kessel
b219f57b22
Merge branch 'dev' of https://github.com/BasF0/Cura 2021-01-27 10:56:35 +01:00
bas
1033133355 undo irrelevant change 2021-01-20 21:56:33 +01:00
Kostas Karmas
606ec587fe Change the row height in the table view 
CURA-7868
 2021-01-06 11:51:29 +01:00
BasF0
d8440edd4d
Merge branch 'master' into dev 2020-11-11 13:57:13 +01:00
bas
f6badcaeca Added starts color to theme, and support in shader / simulationpass 2020-11-11 13:44:21 +01:00
Ghostkeeper
81217880fd
Merge branch 'CURA-7745-fix-montior-page-hacks' 2020-10-15 09:57:34 +02:00
Jaime van Kessel
3e67d20890
Remove monitor_text_primary 
It's so close to the text one that it really doesn't make sense to keep it.
Boyscouting the code a bit here

CURA-7745
 2020-10-08 17:31:19 +02:00
Remco Burema
24f95a9cab
Fix confusing nozzle-node 'ghost' in simulation-view. 
part of a 30-min fix
 2020-10-07 16:22:22 +02:00
Remco Burema
b394be3583
Remove superfluous theme entry. 
It was messing with the dark side. Theme. I mean theme.
part of CURA-7627
 2020-08-05 08:16:10 +02:00
Jaime van Kessel
b2ca6a9224
Add removed theme entries again 
Some plugins were using them.
 2020-08-03 10:38:33 +02:00
Jaime van Kessel
8b7b8b0118
Simplify the SettingCategory 2020-07-10 14:50:44 +02:00
Jaime van Kessel
e633b6408e
Use pre-calculated control height 
It's way faster to not re-compute every single time
 2020-07-10 14:34:02 +02:00
Jaime van Kessel
5055b53063
Lower the saturation of colors in the layerview 
Fixes #7992
 2020-06-30 10:38:01 +02:00
Kostas Karmas
78bd5520bd Add theme color for sync state icon 
CURA-7418
 2020-06-16 14:41:23 +02:00