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
34,378 Commits 289 Branches 260 Tags
Commit Graph

55 Commits

Author SHA1 Message Date
saumya.jain
e66314b2dd ppr setting was added when it should be excluded 
CURA-11480
 2024-01-02 10:48:40 +01:00
j.delarago
ba3913395c Add catalog to files that weren't translating 
CURA-9141
 2022-05-05 16:42:01 +02:00
casper
5701f42d63 Move CategoryButton to cura repo 
CURA-9005
 2022-03-11 13:11:36 +01:00
j.delarago
76d9cf6f4d Remove margins that keep listview items from being under the scrollbar. Instead set width of listView smaller so it doesn't overlap. 
Update per object setting visibility dialog to have same category design as SettingVisibilityCategory.qml and SettingCategory.qml

CURA-9005
 2022-03-07 13:20:05 +01:00
Remco Burema
901dc55733
Merge pull request #11535 from Ultimaker/CURA-8688_qt6_cleanup 
[CURA-8688] QT6 cleanup
 2022-03-02 16:49:53 +01:00
casper
862525bc90 Remove obsolete uses of system palette 
CURA-8688
 2022-03-01 12:29:09 +01:00
Jaime van Kessel
6713056a49 Ensure that setting visibility filter is styled 
CURA-8688
 2022-02-28 13:15:39 +01:00
Jaime van Kessel
14b0f66c99 Remove hardcoded value for visibility preset selector 
CURA-8688
 2022-02-28 13:14:23 +01:00
Jaime van Kessel
93a5c44e6c
Fix codestyle 
CURA-8978

Co-authored-by: Casper Lamboo <c.lamboo@ultimaker.com>
 2022-02-24 17:22:10 +01:00
Jaime van Kessel
6e59cd23bb Fix hide / show all in setting visibility page 
CURA-8978
 2022-02-24 15:32:39 +01:00
Jaime van Kessel
8b987d9537 Remove id left over from copy paste 
CURA-8949
 2022-02-21 10:05:09 +01:00
Jaime van Kessel
8e55dda3cc Switch old checkbox over to styled variant 
CURA-8949
 2022-02-21 10:03:44 +01:00
Jaime van Kessel
742f0b7dbb Add defaults button to setting visibility page 
CURA-8949
 2022-02-18 12:49:59 +01:00
Jaime van Kessel
f682f56923 Merge branch 'master' of github.com:Ultimaker/Cura into replace_controls_1_for_controls_2 2022-02-17 15:02:03 +01:00
Jaime van Kessel
f15f01e32f Fix styling of visibilityPresetCombobox 2022-02-10 11:24:07 +01:00
j.delarago
05d542c8d0 Bump UM version for CheckBox 2022-01-26 09:53:17 +01:00
j.delarago
5788ea8d00 The visibility settings in the preferences is defined in Uranium rather than Cura. The CheckBox has been moved to Uranium so that all parts of the project have access to this default styled component. 2022-01-24 14:03:47 +01:00
j.delarago
4c9c2ad131 "checkedState" is now "checkState" in newer CheckBox 
Remove partiallyCheckedEnabled since Cura.CheckBox manages this itself.
 2022-01-21 18:16:16 +01:00
Ghostkeeper
bb32f25b49
Replace old ScrollView with new ListView 
I also swapped out the old NewControls import to just be the actual Controls, and used OldControls to import the Controls1 module. This is consistent with the rest of the code base as far as I could find.

Contributes to issue CURA-8686.
 2022-01-18 18:43:27 +01:00
Jaime van Kessel
7ace875279
Also search on description when using search in visibility page 2021-07-19 15:47:38 +02:00
Kostas Karmas
be74d4dd3f Fix warning in Setting Visibility Page 2021-05-11 13:45:14 +02:00
Remco Burema
d2007901f7
Also convert visibility-preset dropdown. 
This will make this Qt5.15 control work on mac again. (Since the older controls are deprecated.)

CURA-8127
 2021-04-07 08:31:49 +02:00
Konstantinos Karmas
504f6dbe70
Revert "Cura 7813 qml modules version bump" 2021-03-30 09:48:28 +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
Jaime van Kessel
ff0a18603b Remove a few more usages of deprecated functions 2019-05-16 15:20:38 +02:00
Ghostkeeper
024bf409c9
Merge branch 'CURA-5876-Configuration_dropdown' into ui_rework_4_0 2018-12-05 13:29:06 +01:00
Jaime van Kessel
b2238420fb Ensure that reset always correctly gets set to basic 
The old code that simply resetted the preferences was still active, but this could cause a race condition
in some situations. In those cases it would first set it to basic and then clear the preferences (thus
resulting in no settings being visible)

CURA-5981
 2018-12-04 15:46:13 +01:00
Ghostkeeper
b5bb3232f3
Merge branch 'ui_rework_4_0' into CURA-5876-Configuration_dropdown 
Conflicts:
	resources/qml/ActionPanel/OutputProcessWidget.qml -> Due to removed theme entry.
 2018-12-04 15:21:36 +01:00
Lipu Fei
9ec7428620 Fix setting visiblity current index 
CURA-5981
 2018-12-04 10:55:01 +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
Ghostkeeper
f3af5a72ad
Use ListModel.count instead of rowCount 
The .count property properly updates when the model is changed.

Contributes to issue CURA-5876.
 2018-12-03 11:13:26 +01:00
Jaime van Kessel
ad26962cb9 Fix setting visibility not working in settingVisibilityPage 
CURA-5981
 2018-11-30 15:49:50 +01:00
Ghostkeeper
b37252f124
Minor code style fixes 
Contributes to issue CURA-5734.
 2018-10-10 14:18:37 +02:00
Jaime van Kessel
fc9f05fc8b Moved SettingVisibilityPreset loading to it's own class 
Since there was so much debate regarding the unit testing of the visiblity presets, i had another look at it.
The old version was almost untestable because all functionalities were mushed together into a single class.

CURA-5734
 2018-10-01 11:32:55 +02:00
Lipu Fei
f0dc138b37 Fix visibilty preset update 
CURA-5088
 2018-03-19 14:14:22 +01:00
Lipu Fei
2660d15857 Make "show all settings" work 
CURA-5088

"Show All Settings" in setting visibility menu now sets all settings
to be visible.
 2018-03-19 10:58:56 +01:00
Lipu Fei
8e39849aad Refactor setting visibility preset 
CURA-5088
 2018-03-15 14:41:34 +01:00
Lipu Fei
83175b00c2 Change SettingVisibilityPresetsModel to non-singleton 
CURA-5088
 2018-03-15 14:41:34 +01:00
fieldOfView
711d60e8c7 Allow switching back to the "Custom" set 2018-03-09 16:44:27 +01:00
fieldOfView
61bbfcda3a Add back "custom" option to the setting visibility page 2018-02-09 19:28:00 +01:00
fieldOfView
74fe281e1d Sync currently selected preset between visibility-page and -menu 2018-02-09 18:54:04 +01:00
fieldOfView
f79e787f2c Refactor SettingVisibilityProfiles to SettingVisibilityPresets 
This is closer to the current Cura intend
 2018-02-09 09:01:39 +01:00
fieldOfView
080979caeb Move setting visibility presets into a model 
Handling of "Custom" is still under consideration
 2018-02-08 23:07:45 +01:00
Aleksei S
f655b0e033 Set Custom in visible setting preset 
CURA-3710
 2018-02-07 16:22:13 +01:00
Aleksei S
c890472641 Fix: save Custom setting visibility preset 
CURA-3710
 2018-02-07 10:53:17 +01:00
Lipu Fei
367e50669d Refactor code 
CURA-3710
 2018-02-01 13:56:49 +01:00
Aleksei S
f065a08c82 Added visible settings 
CURA-3710
 2018-01-30 15:26:15 +01:00
Aleksei S
54dc63a596 Add missing changes 
CURA-3710
 2018-01-23 11:24:27 +01:00
Mark
9a193ad5c5 Changing AGPLv3 to LGPLv3 2017-09-28 13:00:43 +02:00