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

27183 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
casper
b51c787f62 Re-use Cura.ToolbarButton in per object settings menu 
CURA-8684
 2022-01-26 08:56:33 +01:00
Casper Lamboo
26bd68d891
Update resources/qml/Preferences/MachinesPage.qml 
Co-authored-by: Jaime van Kessel <nallath@gmail.com>
 2022-01-25 22:38:02 +01:00
Casper Lamboo
95c79e7921
Update resources/qml/Preferences/MachinesPage.qml 
Co-authored-by: Jaime van Kessel <nallath@gmail.com>
 2022-01-25 22:37:39 +01:00
Casper Lamboo
a3edf9e3e3
Update resources/qml/Preferences/MachinesPage.qml 
Co-authored-by: Jaime van Kessel <nallath@gmail.com>
 2022-01-25 22:33:51 +01:00
casper
24a8e8b761 Merge remote-tracking branch 'origin/CURA-8684_QtControls_replacement_Buttons,_Actions_&_'Exclusivity'' into CURA-8684_QtControls_replacement_Buttons,_Actions_&_'Exclusivity' 2022-01-25 16:06:05 +01:00
casper
ad3832791c Use Button in tool bar button component 
CURA-8684
 2022-01-25 16:05:49 +01:00
Casper Lamboo
ea60fdeacd
Update resources/qml/Preferences/MachinesPage.qml 
Co-authored-by: Jaime van Kessel <nallath@gmail.com>
 2022-01-25 15:59:17 +01:00
Casper Lamboo
f834e63413
Update plugins/PerObjectSettingsTool/ToolBarButton.qml 
Co-authored-by: Jaime van Kessel <nallath@gmail.com>
 2022-01-25 15:54:33 +01:00
casper
d3f01034a2 Highight default action and listen to keyboard actions in image dialog 
CURA-8684
 2022-01-25 10:54:09 +01:00
casper
c63b94375d Update materials slot preference menu to QtControls 2 
CURA-8684
 2022-01-24 23:34:38 +01:00
casper
b47c7c9395 Update materials view preference menu to QtControls 2 
CURA-8684
 2022-01-24 23:28:25 +01:00
casper
6dc535063b Update profiles preferences page to QtControls 2 
CURA-8684
 2022-01-24 22:37:39 +01:00
casper
b6e375a3be Update machines preferences page to QtControls 2 
CURA-8684
 2022-01-24 22:34:14 +01:00
casper
3e98282871 Update material preferences page to QtControls 2 
CURA-8684
 2022-01-24 22:31:36 +01:00
casper
b45707af54 Update ask open project or models dialog to QtControls 2 
CURA-8684
 2022-01-24 21:58:23 +01:00
casper
4c0ee058e4 Update discard keep or discard changes dialog to QtControls 2 
CURA-8684
 2022-01-24 18:21:52 +01:00
casper
9e5fd998f4 Update open files dialog to QtControls 2 
CURA-8684
 2022-01-24 14:11:02 +01:00
casper
582e4fcbd0 Update print action hotkey listener to QtControls 2 
CURA-8684
 2022-01-24 10:31:17 +01:00
casper
8cc1604b2f Update Buttons to QtControls 2.0 in the simulation view expend menu bar 
CURA-8684
 2022-01-21 14:07:41 +01:00
casper
09793854ef Update Buttons to QtControls 2.0 in per model settings dialog 
CURA-8684
 2022-01-21 13:38:58 +01:00
casper
092936ae3a Update Buttons to QtControls 2.0 in general preferences page 
CURA-8684
 2022-01-21 13:06:51 +01:00
casper
ee38c9c05b Update QtControls to v2.0 in image reader plugin 
CURA-8684
 2022-01-21 12:24:40 +01:00
casper
bcd1689680 Update buttons in per object settings plugin to QtControls 2 
CURA-8684
 2022-01-20 22:58:43 +01:00
casper
07095a5802 Update Material selection and variant selection buttons to QtControls 2 
CURA-8684
 2022-01-20 22:38:00 +01:00
casper
f2ee58a08b Update PerObjectCategory to QtQuick.Controls 2.1 
CURA-8684
 2022-01-20 22:15:22 +01:00
casper
204d965df2 Use SecondaryButton in the usb print panel inplace of tye style prop 
The Jog buttons are not changed yet as these button make use of the
`checked` property this is not yet implemented for Cura's `Action` and
by extension Cura's `Secondary` button.

CURA-8684
 2022-01-20 22:15:22 +01:00
Jaime van Kessel
3e4c171603 Simplify the OpenFilesMenu 
CURA-8683
 2022-01-17 11:09:42 +01:00
Jaime van Kessel
d7d6918ab7 Use CuraMenu so that custom styling is used 
CURA-8683
 2022-01-14 15:01:48 +01:00
Jaime van Kessel
4db8878317 Fix ordering of material menu selection 
CURA-8683
 2022-01-14 14:33:46 +01:00
Jaime van Kessel
babf3043f8 Use Cura.Menu instead of UM.Menu 
Same as the previous commit. Use the specialised variant provided by Cura instead
of the generic one of UM

CURA-8683
 2022-01-14 13:50:44 +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
bab9311284 Fix opening of marketplace button 
CURA-8684
 2022-01-14 13:14:15 +01:00
Jaime van Kessel
38e20fd90b Fix menuItem not hiding correctly 
CURA-8693
 2022-01-14 13:09:59 +01:00
Jaime van Kessel
b614cabae6 Put back import 2022-01-14 13:05:07 +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
97bf50d56c
Merge pull request #11236 from Ultimaker/CURA-8683_replace_controls_windows_and_menus 
Switch out the file, view and edit menu for controls 2
 2022-01-13 09:08:37 +01:00
Jaime van Kessel
94c006009b Remove debug code 
CURA-8683
 2022-01-13 09:06:22 +01:00
Jaime van Kessel
bf65f77310 Merge branch 'CURA-8683_replace_controls_windows_and_menus' of github.com:Ultimaker/Cura into CURA-8683_replace_controls_windows_and_menus 2022-01-12 16:01:19 +01:00
Jaime van Kessel
94c71704db Add clarifying comment about why something is added at index 5> 
CURA-8683
 2022-01-12 16:00:32 +01:00
Jaime van Kessel
f44d4d341f
Apply suggestions from code review 
Minor codestyle issues

CURA-8683

Co-authored-by: Casper Lamboo <c.lamboo@ultimaker.com>
 2022-01-12 15:57:20 +01:00
Jaime van Kessel
59479ee223 Fix checked property for materials menu 
CURA-8683
 2022-01-11 12:09:24 +01:00
Jaime van Kessel
6644bff2be Fix some QML warnings on closing Cura 
CURA-8683
 2022-01-11 11:52:43 +01:00
Jaime van Kessel
3d0e71fe7e Remove unused import 2022-01-11 11:44:59 +01:00
Jaime van Kessel
f8906597e5 Update menu for PrinterType button 
CURA-8683
 2022-01-11 11:43:01 +01:00
Jaime van Kessel
b30ad58f91 Update context menu to controls 2 
CURA-8683
 2022-01-11 11:36:34 +01:00
Jaime van Kessel
70209aa728 Use the regular menu for extensions 
It seems that the extra logic doesn't play well with a menu bar.

Since we don't need to make this menu invisible ever, there is no need for the
extra logic to hide it. As such we can just use the regular menu

CURA-8683
 2022-01-11 11:26:26 +01:00
Jaime van Kessel
0bd0f09437 Remove unused component 
CURA-8683
 2022-01-11 11:26:05 +01:00
Jaime van Kessel
29c9322fc8 Add background to application menu 
CURA-8683
 2022-01-11 11:16:40 +01:00
Jaime van Kessel
6cde2d028b Convert preferences & help menu to controls 2 
CURA-8683
 2022-01-11 11:10:12 +01:00