Commit 6cf14b61 authored by dogmaphobic's avatar dogmaphobic

Removed numbers from main tool bar buttons.

Reduced size of the main tool bar buttons accordingly.
Connect/Disconnect buttons (and link configuration combobox) now use the default height.
parent e3d7e129
...@@ -144,10 +144,10 @@ Rectangle { ...@@ -144,10 +144,10 @@ Rectangle {
QGCToolBarButton { QGCToolBarButton {
id: setupButton id: setupButton
width: 100 width: 90
height: cellHeight height: cellHeight
exclusiveGroup: mainActionGroup exclusiveGroup: mainActionGroup
text: qsTr("1. Setup") text: qsTr("Setup")
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
checked: (mainToolBar.currentView === MainToolBar.ViewSetup) checked: (mainToolBar.currentView === MainToolBar.ViewSetup)
onClicked: { onClicked: {
...@@ -158,10 +158,10 @@ Rectangle { ...@@ -158,10 +158,10 @@ Rectangle {
QGCToolBarButton { QGCToolBarButton {
id: planButton id: planButton
width: 100 width: 90
height: cellHeight height: cellHeight
exclusiveGroup: mainActionGroup exclusiveGroup: mainActionGroup
text: qsTr("2. Plan") text: qsTr("Plan")
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
checked: (mainToolBar.currentView === MainToolBar.ViewPlan) checked: (mainToolBar.currentView === MainToolBar.ViewPlan)
onClicked: { onClicked: {
...@@ -172,10 +172,10 @@ Rectangle { ...@@ -172,10 +172,10 @@ Rectangle {
QGCToolBarButton { QGCToolBarButton {
id: flyButton id: flyButton
width: 100 width: 90
height: cellHeight height: cellHeight
exclusiveGroup: mainActionGroup exclusiveGroup: mainActionGroup
text: qsTr("3. Fly") text: qsTr("Fly")
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
checked: (mainToolBar.currentView === MainToolBar.ViewFly) checked: (mainToolBar.currentView === MainToolBar.ViewFly)
onClicked: { onClicked: {
...@@ -186,10 +186,10 @@ Rectangle { ...@@ -186,10 +186,10 @@ Rectangle {
QGCToolBarButton { QGCToolBarButton {
id: analyzeButton id: analyzeButton
width: 100 width: 90
height: cellHeight height: cellHeight
exclusiveGroup: mainActionGroup exclusiveGroup: mainActionGroup
text: qsTr("4. Analyze") text: qsTr("Analyze")
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
checked: (mainToolBar.currentView === MainToolBar.ViewAnalyze) checked: (mainToolBar.currentView === MainToolBar.ViewAnalyze)
onClicked: { onClicked: {
...@@ -470,7 +470,6 @@ Rectangle { ...@@ -470,7 +470,6 @@ Rectangle {
QGCComboBox { QGCComboBox {
id: configList id: configList
width: 200 width: 200
height: cellHeight
visible: (mainToolBar.connectionCount === 0 && mainToolBar.configList.length > 0) visible: (mainToolBar.connectionCount === 0 && mainToolBar.configList.length > 0)
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
model: mainToolBar.configList model: mainToolBar.configList
...@@ -489,7 +488,6 @@ Rectangle { ...@@ -489,7 +488,6 @@ Rectangle {
QGCButton { QGCButton {
id: connectButton id: connectButton
width: 100 width: 100
height: cellHeight
visible: (mainToolBar.connectionCount === 0 || mainToolBar.connectionCount === 1) visible: (mainToolBar.connectionCount === 0 || mainToolBar.connectionCount === 1)
text: (mainToolBar.configList.length > 0) ? (mainToolBar.connectionCount === 0) ? qsTr("Connect") : qsTr("Disconnect") : qsTr("Add Link") text: (mainToolBar.configList.length > 0) ? (mainToolBar.connectionCount === 0) ? qsTr("Connect") : qsTr("Disconnect") : qsTr("Add Link")
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
...@@ -516,7 +514,6 @@ Rectangle { ...@@ -516,7 +514,6 @@ Rectangle {
QGCButton { QGCButton {
id: multidisconnectButton id: multidisconnectButton
width: 100 width: 100
height: cellHeight
text: qsTr("Disconnect") text: qsTr("Disconnect")
visible: (mainToolBar.connectionCount > 1) visible: (mainToolBar.connectionCount > 1)
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment