hm/gcs-nf
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

更新ui

Browse Source
This commit is contained in:
zhangxusong
2023-02-02 17:30:03 +08:00
parent e7a24e06b4
commit d576b408ec
4 changed files with 33 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
App/MenuBarUI/MenuBarUI.cpp
+1
View File
@@ -53,6 +53,7 @@ MenuBarUI::MenuBarUI(QWidget *parent) :
ui->label_Status->hide();
ui->pushButton_SelfTest->hide();
this->resize(this->width(), 80);
//setArm(true);
}
App/MenuBarUI/MenuBarUI.qss
+1
View File
@@ -3,6 +3,7 @@
QWidget#MenuBarUI {
background-color: #364860;
border: none;
}
.QFrame {
App/MenuBarUI/MenuBarUI.ui
+30 -30
View File
@@ -10,7 +10,7 @@
<x>0</x>
<y>0</y>
<width>1137</width>
<height>100</height>
<height>82</height>
</rect>
</property>
<property name="windowTitle">
@@ -43,8 +43,8 @@
<property name="spacing">
<number>0</number>
</property>
<item row="0" column="2">
<widget class="QPushButton" name="pushButton_Mission">
<item row="0" column="3">
<widget class="QPushButton" name="pushButton_Base">
<property name="minimumSize">
<size>
<width>80</width>
@@ -54,18 +54,18 @@
<property name="maximumSize">
<size>
<width>80</width>
<height>16777215</height>
<height>80</height>
</size>
</property>
<property name="toolTip">
<string>任务</string>
<string>飞行</string>
</property>
<property name="text">
<string/>
</property>
<property name="icon">
<iconset resource="MenuBarUIres.qrc">
<normaloff>:/img/plan.png</normaloff>:/img/plan.png</iconset>
<normaloff>:/img/plane-blue.png</normaloff>:/img/plane-blue.png</iconset>
</property>
<property name="iconSize">
<size>
@@ -75,25 +75,6 @@
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QPushButton" name="pushButton_SelfTest">
<property name="minimumSize">
<size>
<width>80</width>
<height>80</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>80</width>
<height>16777215</height>
</size>
</property>
<property name="text">
<string>SelfTest</string>
</property>
</widget>
</item>
<item row="0" column="4">
<widget class="QPushButton" name="pushButton_Info">
<property name="minimumSize">
@@ -126,8 +107,8 @@
</property>
</widget>
</item>
<item row="0" column="3">
<widget class="QPushButton" name="pushButton_Base">
<item row="0" column="2">
<widget class="QPushButton" name="pushButton_Mission">
<property name="minimumSize">
<size>
<width>80</width>
@@ -137,18 +118,18 @@
<property name="maximumSize">
<size>
<width>80</width>
<height>80</height>
<height>16777215</height>
</size>
</property>
<property name="toolTip">
<string>飞行</string>
<string>任务</string>
</property>
<property name="text">
<string/>
</property>
<property name="icon">
<iconset resource="MenuBarUIres.qrc">
<normaloff>:/img/plane-blue.png</normaloff>:/img/plane-blue.png</iconset>
<normaloff>:/img/plan.png</normaloff>:/img/plan.png</iconset>
</property>
<property name="iconSize">
<size>
@@ -190,6 +171,25 @@
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QPushButton" name="pushButton_SelfTest">
<property name="minimumSize">
<size>
<width>80</width>
<height>80</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>80</width>
<height>16777215</height>
</size>
</property>
<property name="text">
<string>SelfTest</string>
</property>
</widget>
</item>
</layout>
</item>
<item row="0" column="2">
App/mainwindow.cpp
+1 -1
View File
@@ -931,7 +931,7 @@ void MainWindow::resizeEvent(QResizeEvent *event)
{
Q_UNUSED(event)
menuBarUI->setGeometry(0,0,this->width(),100);
menuBarUI->setGeometry(0,0,this->width(), menuBarUI->height() );
//qDebug() << "resize";