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

调整字体大小

Browse Source
This commit is contained in:
hm
2022-01-23 18:37:17 +08:00
parent 3111cfb36f
commit 3c0e4ea5b7
13 changed files with 92 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files
App/HealthUI/HealthUI.qss
+1 -1
View File
@@ -25,7 +25,7 @@
}
.QLabel {
font: 12px "黑体";
font: 14px "黑体";
}
.QLabel[state="0"] {
App/HealthUI/HealthUI.ui
+1 -1
View File
@@ -7,7 +7,7 @@
<x>0</x>
<y>0</y>
<width>390</width>
<height>238</height>
<height>217</height>
</rect>
</property>
<property name="windowTitle">
App/StatusUI/StatusUI.qss
+6 -6
View File
@@ -22,37 +22,37 @@
.QLabel#label_mode{
font: 15px "黑体";
font: 20px "黑体";
font-weight:bold;
font-italic:true;
}
.QLabel#label_base{
font: 15px "黑体";
font: 20px "黑体";
font-weight:bold;
font-italic:true;
}
.QLabel#label_servo{
font: 15px "黑体";
font: 20px "黑体";
font-weight:bold;
font-italic:true;
}
.QLabel#label_engine{
font: 15px "黑体";
font: 20px "黑体";
font-weight:bold;
font-italic:true;
}
.QLabel#label_battery{
font: 15px "黑体";
font: 20px "黑体";
font-weight:bold;
font-italic:true;
}
.QLabel#label_dlink{
font: 15px "黑体";
font: 20px "黑体";
font-weight:bold;
font-italic:true;
}
App/StatusUI/StatusUI.ui
+5 -2
View File
@@ -6,8 +6,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>455</width>
<height>665</height>
<width>469</width>
<height>811</height>
</rect>
</property>
<property name="windowTitle">
@@ -16,6 +16,9 @@
<layout class="QGridLayout" name="gridLayout_2">
<item row="0" column="0">
<layout class="QGridLayout" name="gridLayout">
<property name="verticalSpacing">
<number>9</number>
</property>
<item row="31" column="1">
<widget class="QLabel" name="label_temp_up">
<property name="styleSheet">
App/ToolsUI/PowerSystem/PowerSystem.qss
+3
View File
@@ -20,6 +20,9 @@
stop: 0 #dadbde, stop: 1 #f6f7fa);
}
.Chart {
font :15px "黑体";
}
App/ToolsUI/Senser/Senser.qss
+3 -3
View File
@@ -12,7 +12,7 @@
border-style: solid;
border-radius: 5;
padding: 3px;
font: 20px "黑体";
font: 18px "黑体";
}
.QPushButton:pressed {
@@ -29,7 +29,7 @@
}
.QLabel {
font: 20px "黑体";
font: 18px "黑体";
}
.QLabel[state="0"] {
@@ -51,7 +51,7 @@
.QComboBox {
background-color: #FFFFFF;
font: 20px "黑体";
font: 18px "黑体";
}
.QCheckBox{
App/ToolsUI/Senser/Senser.ui
+8 -2
View File
@@ -186,9 +186,12 @@
<property name="bottomMargin">
<number>6</number>
</property>
<property name="spacing">
<property name="horizontalSpacing">
<number>6</number>
</property>
<property name="verticalSpacing">
<number>8</number>
</property>
<item row="1" column="1">
<widget class="QLabel" name="label_1_rel_alt">
<property name="minimumSize">
@@ -494,9 +497,12 @@
<property name="bottomMargin">
<number>6</number>
</property>
<property name="spacing">
<property name="horizontalSpacing">
<number>6</number>
</property>
<property name="verticalSpacing">
<number>8</number>
</property>
<item row="0" column="1">
<widget class="QLabel" name="label_2">
<property name="text">
App/ToolsUI/ServoSystem/ServoSystem.cpp
+4 -3
View File
@@ -258,10 +258,10 @@ void ServoSystem::setCheckState(uint32_t pos,QVariant value)
setColor(ui->checkBox_4525D,(value.toBool())?(state::success):(state::failure));
break;
case 10:
setColor(ui->checkBox_atteck,(value.toBool())?(state::success):(state::failure));
//setColor(ui->checkBox_atteck,(value.toBool())?(state::success):(state::failure));
break;
case 11:
setColor(ui->checkBox_slide,(value.toBool())?(state::success):(state::failure));
//setColor(ui->checkBox_slide,(value.toBool())?(state::success):(state::failure));
break;
@@ -999,7 +999,7 @@ void ServoSystem::on_pushButton_setFuel_clicked()
value,0,0,0,0,0,0,20009,0);
}
/*
void ServoSystem::on_pushButton_AngleZero_clicked()//动压归零
{
on_commandClicked(tr("设定 %1").arg(ui->pushButton_AngleZero->text()),
@@ -1012,6 +1012,7 @@ void ServoSystem::on_pushButton_ZeroComplete_clicked()
on_commandClicked(tr("设定 %1").arg(ui->pushButton_ZeroComplete->text()),
0,0,0,0,0,0,0,20005,0);
}
*/
void ServoSystem::on_pushButton_HeatOn1_clicked()
App/ToolsUI/ServoSystem/ServoSystem.h
+2 -2
View File
@@ -89,7 +89,7 @@ private slots:
void on_pushButton_setFuel_clicked();
void on_pushButton_AngleZero_clicked();
//void on_pushButton_AngleZero_clicked();
void on_pushButton_HeatOn1_clicked();
@@ -116,7 +116,7 @@ private slots:
void on_pushButton_HeatOff_clicked();
void on_pushButton_ZeroComplete_clicked();
//void on_pushButton_ZeroComplete_clicked();
signals:
void showMessage(const QString &message,int TimeOut = 0);
App/ToolsUI/ServoSystem/ServoSystem.qss
+26 -7
View File
@@ -12,7 +12,7 @@
border-style: solid;
border-radius: 5;
padding: 3px;
font: 15px "黑体";
font: 20px "黑体";
}
.QPushButton:pressed {
@@ -20,8 +20,27 @@
stop: 0 #dadbde, stop: 1 #f6f7fa);
}
.QPushButton#pushButton_SendCommand{
background-color: #55FF7F;
}
.QPushButton#pushButton_Cancel{
background-color: #FF8C8E;
}
.QPushButton#pushButton_stop{
background-color: #FF8C8E;
}
.QPushButton#pushButton_EmergencyStop{
background-color: #FF8C8E;
}
.QLabel {
font: 15px "黑体";
font: 20px "黑体";
}
.QLabel[state="0"] {
@@ -36,27 +55,27 @@
.QComboBox {
background-color: #FFFFFF;
font: 15px "黑体";
font: 20px "黑体";
}
.QDoubleSpinBox {
font: 15px "黑体";
font: 20px "黑体";
}
.QGroupBox {
font: 15px "黑体";
font: 20px "黑体";
}
.QCheckBox{
width: 25px;
height: 25px;
font: 15px "黑体";
font: 20px "黑体";
}
.QCheckBox::indicator {
width: 15px;
height: 15px;
font: 15px "黑体";
font: 20px "黑体";
}
.QCheckBox::indicator[state="0"] {
App/ToolsUI/ServoSystem/ServoSystem.ui
+15 -43
View File
@@ -333,51 +333,37 @@
<item row="3" column="0">
<widget class="QGroupBox" name="groupBox_Servo">
<property name="title">
<string>大气机</string>
<string>空速管加热</string>
</property>
<layout class="QGridLayout" name="gridLayout_10">
<property name="spacing">
<number>12</number>
</property>
<item row="2" column="2">
<widget class="QPushButton" name="pushButton_HeatOn2">
<property name="text">
<string>加热2开</string>
</property>
</widget>
</item>
<item row="2" column="1">
<widget class="QPushButton" name="pushButton_HeatOn1">
<property name="text">
<string>加热1开</string>
</property>
</widget>
</item>
<item row="2" column="0">
<widget class="QPushButton" name="pushButton_AirHeatOn">
<property name="text">
<string>加热打开</string>
</property>
</widget>
</item>
<item row="2" column="3">
<item row="1" column="3">
<widget class="QPushButton" name="pushButton_HeatOff">
<property name="text">
<string>加热关闭</string>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QPushButton" name="pushButton_ZeroComplete">
<item row="1" column="1">
<widget class="QPushButton" name="pushButton_HeatOn1">
<property name="text">
<string>动压捕零完成</string>
<string>加热1开</string>
</property>
</widget>
</item>
<item row="0" column="0">
<widget class="QPushButton" name="pushButton_AngleZero">
<item row="1" column="0">
<widget class="QPushButton" name="pushButton_AirHeatOn">
<property name="text">
<string>动压捕零</string>
<string>加热打开</string>
</property>
</widget>
</item>
<item row="1" column="2">
<widget class="QPushButton" name="pushButton_HeatOn2">
<property name="text">
<string>加热2开</string>
</property>
</widget>
</item>
@@ -1604,13 +1590,6 @@
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
</property>
<layout class="QGridLayout" name="gridLayout_4">
<item row="4" column="2">
<widget class="QCheckBox" name="checkBox_atteck">
<property name="text">
<string>攻角</string>
</property>
</widget>
</item>
<item row="2" column="2">
<widget class="QCheckBox" name="checkBox_5607A">
<property name="text">
@@ -1681,13 +1660,6 @@
</property>
</widget>
</item>
<item row="5" column="2">
<widget class="QCheckBox" name="checkBox_slide">
<property name="text">
<string>侧滑角</string>
</property>
</widget>
</item>
<item row="6" column="0" colspan="3">
<spacer name="verticalSpacer_2">
<property name="orientation">
Cockpit/Cockpit.cpp
+16 -16
View File
@@ -829,7 +829,7 @@ void Cockpit::paintEvent(QPaintEvent *)
//全局设置字体
QFont font;
font.setWeight(QFont::ExtraLight);
font.setFamily("Arial");//非衬线
font.setFamily(font_family);//非衬线
painter.setFont(font);
setPalette(QPalette(Qt::black)); //设置背景颜色
@@ -898,7 +898,7 @@ void Cockpit::drawPitch(QPainter *painter)
ePen.setWidth(8);
//font.setPointSize(50);
font.setPixelSize(80);
font.setFamily("Arial");//非衬线
font.setFamily(font_family);//非衬线
painter->setPen(ePen);
painter->setFont(font);
@@ -1133,7 +1133,7 @@ void Cockpit::drawLeftScale(QPainter *painter)
//font.setPointSize(70);
font.setPixelSize(100);
font.setWeight(QFont::Bold);
font.setFamily("Arial");//非衬线
font.setFamily(font_family);//非衬线
painter->setPen(ePen);
painter->setFont(font);
@@ -1246,7 +1246,7 @@ void Cockpit::drawLeftScale(QPainter *painter)
font.setPixelSize(120);
font.setWeight(QFont::Bold);
font.setFamily("Arial");//非衬线
font.setFamily(font_family);//非衬线
painter->setPen(ePen);
painter->setFont(font);
@@ -1296,7 +1296,7 @@ void Cockpit::drawLeftScale(QPainter *painter)
ePen.setColor(m_Color.CentreLineColor);
ePen.setWidth(15);
font.setPixelSize(120);
font.setFamily("Arial");//非衬线
font.setFamily(font_family);//非衬线
painter->setPen(ePen);
painter->setFont(font);
@@ -1458,7 +1458,7 @@ void Cockpit::drawLeftScale(QPainter *painter)
ePen.setColor(m_Color.TargetColor);
ePen.setWidth(15);
font.setPixelSize(120);
font.setFamily("Arial");//非衬线
font.setFamily(font_family);//非衬线
font.setWeight(QFont::Bold);
@@ -1476,7 +1476,7 @@ void Cockpit::drawLeftScale(QPainter *painter)
ePen.setColor(m_Color.CurrentColor);
ePen.setWidth(10);
font.setPixelSize(80);
font.setFamily("Arial");//非衬线
font.setFamily(font_family);//非衬线
painter->setPen(ePen);
painter->setFont(font);
@@ -1529,7 +1529,7 @@ void Cockpit::drawRightScale(QPainter *painter)
font.setPixelSize(90);
font.setWeight(QFont::Bold);
font.setFamily("Arial");//非衬线
font.setFamily(font_family);//非衬线
painter->setPen(ePen);
painter->setFont(font);
@@ -1593,7 +1593,7 @@ void Cockpit::drawRightScale(QPainter *painter)
font.setPixelSize(120);
font.setWeight(QFont::Bold);
font.setFamily("Arial");//非衬线
font.setFamily(font_family);//非衬线
painter->setPen(ePen);
painter->setFont(font);
@@ -1612,7 +1612,7 @@ void Cockpit::drawRightScale(QPainter *painter)
font.setPixelSize(120);
font.setWeight(QFont::Bold);
font.setFamily("Arial");//非衬线
font.setFamily(font_family);//非衬线
painter->setPen(ePen);
painter->setFont(font);
@@ -1646,7 +1646,7 @@ void Cockpit::drawRightScale(QPainter *painter)
font.setPixelSize(90);
font.setWeight(QFont::Bold);
font.setFamily("Arial");//非衬线
font.setFamily(font_family);//非衬线
painter->setPen(ePen);
painter->setFont(font);
@@ -1903,7 +1903,7 @@ void Cockpit::drawVRate(QPainter *painter)
ePen.setColor(Qt::white);
font.setPixelSize(80);
font.setWeight(QFont::Bold);
font.setFamily("Arial");//非衬线
font.setFamily(font_family);//非衬线
painter->setPen(ePen);
painter->setFont(font);
@@ -1995,7 +1995,7 @@ void Cockpit::drawVRate(QPainter *painter)
ePen.setColor(m_Color.TargetColor);
font.setPixelSize(110);
font.setWeight(QFont::Bold);
font.setFamily("Arial");//非衬线
font.setFamily(font_family);//非衬线
painter->setPen(ePen);
painter->setFont(font);
@@ -2014,7 +2014,7 @@ void Cockpit::drawVRate(QPainter *painter)
ePen.setColor(m_Color.CurrentColor);
font.setPixelSize(110);
font.setWeight(QFont::Bold);
font.setFamily("Arial");//非衬线
font.setFamily(font_family);//非衬线
painter->setPen(ePen);
painter->setFont(font);
@@ -2040,7 +2040,7 @@ void Cockpit::drawYawScale(QPainter *painter)
//平移坐标
font.setWeight(QFont::ExtraLight);
font.setFamily("Arial");//非衬线
font.setFamily(font_family);//非衬线
painter->translate(0,1050);
painter->save();
@@ -2352,7 +2352,7 @@ void Cockpit::drawTopStatuts(QPainter *painter)
ePen.setWidth(12);
font.setPixelSize(90);
font.setWeight(QFont::Bold);
font.setFamily("Arial");//非衬线
font.setFamily(font_family);//非衬线
painter->setPen(ePen);
painter->setFont(font);
Cockpit/Cockpit.h
+2
View File
@@ -243,6 +243,8 @@ private:
//uint8_t speedSelect = 0;
QString font_family = "黑体";
};