3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-23 14:44:13 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Add Toolbox shortcut to the TopHeader and align the stage tabs to the

Browse source 
center.

Contributes to CURA-5784.
This commit is contained in:
Diego Prado Gesto 2018-10-08 14:50:13 +02:00
parent 075a9a161f
commit 41add97b13
4 changed files with 46 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

13
resources/qml/Cura.qml
View file

@ -422,19 +422,6 @@ UM.MainWindow
} }
} }
UM.ExtensionModel {
id: curaExtensions
}
// show the plugin browser dialog
Connections
{
target: Cura.Actions.browsePackages
onTriggered: {
curaExtensions.callExtensionMethod("Toolbox", "browsePackages")
}
}
Timer Timer
{ {
id: createProfileTimer id: createProfileTimer

27
resources/qml/Skeleton/ApplicationMenu.qml
View file

@ -180,7 +180,7 @@ Item
Menu Menu
{ {
id: extension_menu id: extensionMenu
title: catalog.i18nc("@title:menu menubar:toplevel","E&xtensions") title: catalog.i18nc("@title:menu menubar:toplevel","E&xtensions")
Instantiator Instantiator
@ -207,8 +207,8 @@ Item
} }
} }
onObjectAdded: extension_menu.insertItem(index, object) onObjectAdded: extensionMenu.insertItem(index, object)
onObjectRemoved: extension_menu.removeItem(object) onObjectRemoved: extensionMenu.removeItem(object)
} }
} }
@ -241,6 +241,10 @@ Item
} }
} }
// ###############################################################################################
// Definition of other components that are linked to the menus
// ###############################################################################################
WorkspaceSummaryDialog WorkspaceSummaryDialog
{ {
id: saveWorkspaceDialog id: saveWorkspaceDialog
@ -263,6 +267,14 @@ Item
} }
} }
UM.ExtensionModel {
id: curaExtensions
}
// ###############################################################################################
// Definition of all the connections
// ###############################################################################################
Connections Connections
{ {
target: Cura.Actions.newProject target: Cura.Actions.newProject
@ -274,4 +286,13 @@ Item
} }
} }
} }
// show the plugin browser dialog
Connections
{
target: Cura.Actions.browsePackages
onTriggered: {
curaExtensions.callExtensionMethod("Toolbox", "browsePackages")
}
}
} }

26
resources/qml/Skeleton/TopHeader.qml
View file

@ -33,15 +33,19 @@ Rectangle
Row Row
{ {
id: stagesMenuContainer id: stagesListContainer
anchors.left: logo.right
anchors.leftMargin: UM.Theme.getSize("topheader_logo_right_margin").width anchors
{
horizontalCenter: parent.horizontalCenter
leftMargin: UM.Theme.getSize("default_margin").width
}
spacing: UM.Theme.getSize("default_margin").width spacing: UM.Theme.getSize("default_margin").width
// The topheader is dynamically filled with all available stages // The topheader is dynamically filled with all available stages
Repeater Repeater
{ {
id: stagesMenu id: stagesHeader
model: UM.StageModel { } model: UM.StageModel { }
@ -63,4 +67,18 @@ Rectangle
ExclusiveGroup { id: topheaderMenuGroup } ExclusiveGroup { id: topheaderMenuGroup }
} }
// Shortcut button to quick access the Toolbox
Button
{
id: toolboxShortcutButton
text: catalog.i18nc("@action:button", "Toolbox")
anchors
{
right: parent.right
leftMargin: UM.Theme.getSize("default_margin").width
}
style: UM.Theme.styles.topheader_tab
action: Cura.Actions.browsePackages
}
} }

1
resources/themes/cura-light/theme.json
View file

@ -336,7 +336,6 @@
"window_minimum_size": [70, 50], "window_minimum_size": [70, 50],
"topheader": [0.0, 4.0], "topheader": [0.0, 4.0],
"topheader_logo_right_margin": [3, 0],
"topheader_button": [8, 4], "topheader_button": [8, 4],
"topheader_button_icon": [1.2, 1.2], "topheader_button_icon": [1.2, 1.2],