GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-04-30 07:44:22 +08:00
Code Issues Packages Projects Releases Wiki Activity
27,158 Commits 289 Branches 260 Tags
Commit Graph

221 Commits

Author SHA1 Message Date
Ghostkeeper
70a79c9b5c
Use custom scroll bar for settings list 
This is necessary to get the same design working in Controls 2.

Contributes to issue CURA-8686.
 2022-01-17 17:14:31 +01:00
Jaime van Kessel
3130ea0f74 Use Cura.MenuItem instead of UM.MenuItem 
I didn't realise that Cura already had a menu item. To prevent
Confusion, i've changed Cura.MenuItem to use UM.MenuItem and let all
other menus use Cura.MenuItem
 2022-01-14 13:46:05 +01:00
Jaime van Kessel
313c10801d Codestyle fixes 2022-01-13 09:23:13 +01:00
Jaime van Kessel
13af43b76c Fix context menu visibility for settingview 
CURA-8683
 2022-01-13 09:19:47 +01:00
Jaime van Kessel
722f928d12 Remove style from settingview 2022-01-04 10:30:07 +01:00
Jaime van Kessel
e1d6c89cf2 Replace toolbutton with simplebutton 2021-11-16 14:45:44 +01:00
Jaime van Kessel
9ca5a52659 Also speed up the expression for the value of a setting item 2021-10-08 18:35:02 +02:00
luz paz
d68f375e38 Fix various typos 
Found via `codespell -q 3 -S *.po,*.pot -L childs,initialy,lod,ned,te,slicable,sur,tutoriels,wont`
 2021-09-07 11:33:54 -04:00
jelle Spijker
5ba1e8eda8 Settings search field uses italic style 
Restored italic font style for the search field.
To not break look and feel with the old TextField
behaviour
 2021-08-30 14:20:09 +02:00
Jaime van Kessel
a1378f9a06 Replace the textfield with cura.Textfield 
This way we don't have to use the html in the setting item and we
dont have to re-do the whole hover logic in the search text field.

THis also makes the search magnifier themed, so it looks a lot better
in the dark theme

CURA-8498
 2021-08-30 13:28:00 +02:00
Jaime van Kessel
f11079adcf
Fix width & height of setting visibility button 
The widht & height were not set correctly, which made the mouse
area smaller than the icon of the button.

CURA-8438
 2021-07-27 11:20:07 +02:00
Konstantinos Karmas
a996b631bb Increase the size of the hamburger menu 
CURA-8202
 2021-07-01 09:49:48 +02:00
Konstantinos Karmas
0a2407e6ed Reduce the size of the magnifier in the setting search 
CURA-8202
 2021-07-01 09:46:24 +02:00
Ghostkeeper
0a75c772ed
Unrevert new icon set for all of Cura's interface 
We created a new set of icons for Cura. These icons had to be reverted though because they weren't working out in the interface for the last release yet.
This unreverts them, basically adding them back hoping that we'll get them fixed in time for the next release.

Contributes to issue CURA-8342.

Revert "Revert "Fix merge conflict""

This reverts commit bb20e3307f43edc1ff53cb154d2351ddfe39e158.

Revert "Revert "Merge pull request #9716 from Ultimaker/CURA-8010_new_icons""

This reverts commit 70e4e9640e561e18a12870f30c905203ce8ccee7.

Revert "Revert "Fix typo in icon name""

This reverts commit 38ce22ba7c3f40b971bc6e1e0a8e776ca9d51512.

Revert "Revert "Add list for deprecated icons""

This reverts commit 119a957e7f978dbf1ddbcb3b0005bf38e8fed943.

Revert "Revert "Add Function icon""

This reverts commit 760726cf0bb953bb1b0fc277b448f419d4bd2544.

Revert "Revert "Switch out inherit icon""

This reverts commit 26afff609381e2004d194c280f504b6226859bd3.

Revert "Revert "Merge branch 'CURA-8205_Introduce_new_icons_in_Cura' of github.com:Ultimaker/Cura""

This reverts commit 6483db3d47ee052c1a966cdee3af7190577a5769.

Revert "Fix incorrect icons"

This reverts commit 02a4ade2a50a943ff36fd4895bdc9261cf2133eb.
 2021-06-28 17:16:56 +02:00
Jaime van Kessel
6fc1088cdb
Merge branch 'fix_visibilitymenu_style' of https://github.com/fieldOfView/Cura 2021-06-01 16:33:10 +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
fieldOfView
63a2085379 Fix positioning of setting visibility preset menu popup 2021-05-20 12:24:51 +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
Remco Burema
e0e77327b5
Dropdown menu wasn't closing on MacOS. 
CURA-8172
 2021-04-13 13:38:58 +02:00
Kostas Karmas
2027309863 Fix tab button not switching to the next print setting field 
The signal `setActiveFocusToNextSetting` has an argument which wasn't being passed in the
`onSetActiveFocusToNextSetting()` function, which was causing the broken behavior.

CURA-8166
 2021-04-09 15:19:38 +02:00
Konstantinos Karmas
504f6dbe70
Revert "Cura 7813 qml modules version bump" 2021-03-30 09:48:28 +02:00
Konstantinos Karmas
180732788b
Merge pull request #9472 from Ultimaker/CURA-7813_QML_warnings 
Cura 7813 qml modules version bump
 2021-03-30 09:42:59 +02:00
jelle Spijker
645dc181bc
Fixed not showing tooltip 
CURA-7813
 2021-03-30 09:26:36 +02:00
Kostas Karmas
7827b36ab7 Fix QML warnings due to depricated on<signal> calls in Connections 
As of 5.12, the signals used in connections should not be declared as on<signal>, but as
function on<signal>(arguments).
 2021-03-30 09:02:48 +02:00
jelle Spijker
9da321ffb9
Update Layouts, Control.Styles and Dialogs 
CURA-7813
 2021-03-29 18:04:47 +02:00
jelle Spijker
2986d50745
Update QtQuick and QtQuick.Controls 
CURA-7813
 2021-03-29 17:55:19 +02:00
Kostas Karmas
e9da3b7e9a Revert "Make all settingitems async" 
This reverts commit d1afc6390258510450e6f061757025f62e257dcb.
It creates a problem in Windows where settings with dropdown menus
do no load anymore.
 2020-07-16 09:34:36 +02:00
Jaime van Kessel
6d120c43b6
Remove unneeded null check 
The check takes ~1.5 ms. It's easily called a few hunderd times
 2020-07-10 15:57:00 +02:00
Jaime van Kessel
d1afc63902
Make all settingitems async 
We're quite a few qt versions ahead now. The issue seems to have been resolved in the meantime!
 2020-07-10 14:28:58 +02:00
Jaime van Kessel
ce3ac604f2
Remove anchient check from the code 
We removed global tabs like 4 years ago, so no need to have the check.
Speeds up the setting loading a bit more again
 2020-07-10 14:05:39 +02:00
Jaime van Kessel
c5d5cd2c59
Precompute delegate height for settingview 
Speed up the rendering of settingitems a bit
 2020-07-10 13:54:16 +02:00
Jaime van Kessel
70254e5585
Let search field also look through the description 
CURA-7122
 2020-06-29 13:11:07 +02:00
Jaime van Kessel
1b1c7b78aa
Remove unneeded rounding 2020-01-03 16:56:13 +01:00
Nino van Hooff
8dbd67f5bd Merge remote-tracking branch 'origin/master' into CURA-6959_collapse_categories 
# Conflicts:
#	resources/qml/Menus/SettingVisibilityPresetsMenu.qml
#	resources/qml/Settings/SettingView.qml
 2020-01-02 15:32:26 +01:00
Nino van Hooff
4097256827 Clear settings search when pressing collapse all. 
CURA-6959
 2020-01-02 15:28:34 +01:00
Jaime van Kessel
8b393317ff
Add "all" as a setting visibility preset 
CURA-7082
 2020-01-02 10:51:40 +01:00
Jaime van Kessel
81c4c22d63
Fix that invisible items would still add spacing 2019-12-31 14:42:10 +01:00
Jaime van Kessel
bf57a61c48
Fix settings overlapping after collapse 
I can't figure out why we ever set the min size to be negative, but
it was ocasonally making the layout stumble
 2019-12-31 11:35:37 +01:00
Nino van Hooff
d780efd76c Add a settings menu option to collapse all categories 
CURA-6959
 2019-12-31 11:14:26 +01:00
Jaime van Kessel
7204deac0c
Rename function to beter reflect what it does 
CURA-6932
 2019-10-28 16:07:35 +01:00
Jaime van Kessel
5f2984b77e
Remove unused catalog 
20ms faster is 20ms faster...
 2019-10-25 15:49:05 +02:00
Jaime van Kessel
624b8d8741
Prevent unneeded re-evaluation of ActiveMachine ID property 2019-10-25 14:28:09 +02:00
Jaime van Kessel
11bf91ae38
Prevent type coercion in qml 
This should speed things up a tiny bit
 2019-10-25 13:52:45 +02:00
Ghostkeeper
1f7c653368
Capitalise the S 
We need to seize this opportunity and capitalise on that sort of market opportunity.
 2019-09-19 10:47:16 +02:00
Jaime van Kessel
499e02579e Fix hiding settings that were not visible by default 
CURA-6556
 2019-06-05 16:36:30 +02:00
Jaime van Kessel
f5e31060a6 Fixed unknown reference in qml 2019-05-16 16:44:29 +02:00
Jaime van Kessel
ff0a18603b Remove a few more usages of deprecated functions 2019-05-16 15:20:38 +02:00
Jaime van Kessel
a0c705e900 Remove usage of some deprecated functions 2019-05-16 14:49:53 +02:00
Ghostkeeper
350dd5db3c
Correct positioning of tooltip for g-code text area 2019-05-10 11:32:40 +02:00
Jaime van Kessel
d395c38436 Removed collapse / expand all 
I don't think it ever worked.
 2018-12-17 17:47:33 +01:00