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

修正字符输入

Browse Source
This commit is contained in:
Company
2020-06-16 20:54:51 +08:00
parent 9e816891f9
commit e60eeaa720
10 changed files with 472 additions and 180 deletions
Download Patch File Download Diff File Expand all files Collapse all files
App/ComponentUI/CharInputter/CharInputter.cpp
+314 -26
View File
@@ -20,6 +20,13 @@ CharInputter::CharInputter(QWidget *parent) :
ui->lineEdit->setReadOnly(true);
ui->pushButton_Caps->setProperty("CapsSelect",false);
ui->pushButton_Caps->style()->unpolish(ui->pushButton_Caps);
ui->pushButton_Caps->style()->polish(ui->pushButton_Caps);
setLower();
}
CharInputter::~CharInputter()
@@ -107,132 +114,314 @@ void CharInputter::on_pushButton_0_clicked()
void CharInputter::on_pushButton_Q_clicked()
{
on_Clicked("q");
if(isCapsLock)
{
on_Clicked("Q");
}
else
{
on_Clicked("q");
}
}
void CharInputter::on_pushButton_W_clicked()
{
on_Clicked("w");
if(isCapsLock)
{
on_Clicked("W");
}
else
{
on_Clicked("w");
}
}
void CharInputter::on_pushButton_E_clicked()
{
on_Clicked("e");
if(isCapsLock)
{
on_Clicked("E");
}
else
{
on_Clicked("e");
}
}
void CharInputter::on_pushButton_R_clicked()
{
on_Clicked("r");
if(isCapsLock)
{
on_Clicked("R");
}
else
{
on_Clicked("r");
}
}
void CharInputter::on_pushButton_T_clicked()
{
on_Clicked("t");
if(isCapsLock)
{
on_Clicked("T");
}
else
{
on_Clicked("t");
}
}
void CharInputter::on_pushButton_Y_clicked()
{
on_Clicked("y");
if(isCapsLock)
{
on_Clicked("Y");
}
else
{
on_Clicked("y");
}
}
void CharInputter::on_pushButton_U_clicked()
{
on_Clicked("u");
if(isCapsLock)
{
on_Clicked("U");
}
else
{
on_Clicked("u");
}
}
void CharInputter::on_pushButton_I_clicked()
{
on_Clicked("i");
if(isCapsLock)
{
on_Clicked("I");
}
else
{
on_Clicked("i");
}
}
void CharInputter::on_pushButton_O_clicked()
{
on_Clicked("o");
if(isCapsLock)
{
on_Clicked("O");
}
else
{
on_Clicked("o");
}
}
void CharInputter::on_pushButton_P_clicked()
{
on_Clicked("p");
if(isCapsLock)
{
on_Clicked("P");
}
else
{
on_Clicked("p");
}
}
void CharInputter::on_pushButton_A_clicked()
{
on_Clicked("a");
if(isCapsLock)
{
on_Clicked("A");
}
else
{
on_Clicked("a");
}
}
void CharInputter::on_pushButton_S_clicked()
{
on_Clicked("s");
if(isCapsLock)
{
on_Clicked("S");
}
else
{
on_Clicked("s");
}
}
void CharInputter::on_pushButton_D_clicked()
{
on_Clicked("d");
if(isCapsLock)
{
on_Clicked("D");
}
else
{
on_Clicked("d");
}
}
void CharInputter::on_pushButton_F_clicked()
{
on_Clicked("f");
if(isCapsLock)
{
on_Clicked("F");
}
else
{
on_Clicked("f");
}
}
void CharInputter::on_pushButton_G_clicked()
{
on_Clicked("g");
if(isCapsLock)
{
on_Clicked("G");
}
else
{
on_Clicked("g");
}
}
void CharInputter::on_pushButton_H_clicked()
{
on_Clicked("h");
if(isCapsLock)
{
on_Clicked("H");
}
else
{
on_Clicked("h");
}
}
void CharInputter::on_pushButton_J_clicked()
{
on_Clicked("j");
if(isCapsLock)
{
on_Clicked("J");
}
else
{
on_Clicked("j");
}
}
void CharInputter::on_pushButton_K_clicked()
{
on_Clicked("k");
if(isCapsLock)
{
on_Clicked("K");
}
else
{
on_Clicked("k");
}
}
void CharInputter::on_pushButton_L_clicked()
{
on_Clicked("l");
if(isCapsLock)
{
on_Clicked("L");
}
else
{
on_Clicked("l");
}
}
void CharInputter::on_pushButton_Z_clicked()
{
on_Clicked("z");
if(isCapsLock)
{
on_Clicked("Z");
}
else
{
on_Clicked("z");
}
}
void CharInputter::on_pushButton_X_clicked()
{
on_Clicked("x");
if(isCapsLock)
{
on_Clicked("X");
}
else
{
on_Clicked("x");
}
}
void CharInputter::on_pushButton_C_clicked()
{
on_Clicked("c");
if(isCapsLock)
{
on_Clicked("C");
}
else
{
on_Clicked("c");
}
}
void CharInputter::on_pushButton_V_clicked()
{
on_Clicked("v");
if(isCapsLock)
{
on_Clicked("V");
}
else
{
on_Clicked("v");
}
}
void CharInputter::on_pushButton_B_clicked()
{
on_Clicked("b");
if(isCapsLock)
{
on_Clicked("B");
}
else
{
on_Clicked("b");
}
}
void CharInputter::on_pushButton_N_clicked()
{
on_Clicked("n");
if(isCapsLock)
{
on_Clicked("N");
}
else
{
on_Clicked("n");
}
}
void CharInputter::on_pushButton_M_clicked()
{
on_Clicked("m");
if(isCapsLock)
{
on_Clicked("M");
}
else
{
on_Clicked("m");
}
}
void CharInputter::on_pushButton_Line_clicked()
@@ -258,3 +447,102 @@ void CharInputter::on_pushButton_Space_clicked()
{
on_Clicked(" ");
}
void CharInputter::on_pushButton_Caps_clicked()
{
isCapsLock = (isCapsLock)?(false):(true);
ui->pushButton_Caps->setProperty("CapsSelect",isCapsLock);
ui->pushButton_Caps->style()->unpolish(ui->pushButton_Caps);
ui->pushButton_Caps->style()->polish(ui->pushButton_Caps);
if(isCapsLock)
{
setUpper();
}
else
{
setLower();
}
}
void CharInputter::setUpper(void)
{
ui->pushButton_A->setText("A");
ui->pushButton_B->setText("B");
ui->pushButton_C->setText("C");
ui->pushButton_D->setText("D");
ui->pushButton_E->setText("E");
ui->pushButton_F->setText("F");
ui->pushButton_G->setText("G");
ui->pushButton_H->setText("H");
ui->pushButton_I->setText("I");
ui->pushButton_J->setText("J");
ui->pushButton_K->setText("K");
ui->pushButton_L->setText("L");
ui->pushButton_M->setText("M");
ui->pushButton_N->setText("N");
ui->pushButton_O->setText("O");
ui->pushButton_P->setText("P");
ui->pushButton_Q->setText("Q");
ui->pushButton_R->setText("R");
ui->pushButton_S->setText("S");
ui->pushButton_T->setText("T");
ui->pushButton_U->setText("U");
ui->pushButton_V->setText("V");
ui->pushButton_W->setText("W");
ui->pushButton_X->setText("X");
ui->pushButton_Y->setText("Y");
ui->pushButton_Z->setText("Z");
}
void CharInputter::setLower(void)
{
ui->pushButton_A->setText("a");
ui->pushButton_B->setText("b");
ui->pushButton_C->setText("c");
ui->pushButton_D->setText("d");
ui->pushButton_E->setText("e");
ui->pushButton_F->setText("f");
ui->pushButton_G->setText("g");
ui->pushButton_H->setText("h");
ui->pushButton_I->setText("i");
ui->pushButton_J->setText("j");
ui->pushButton_K->setText("k");
ui->pushButton_L->setText("l");
ui->pushButton_M->setText("m");
ui->pushButton_N->setText("n");
ui->pushButton_O->setText("o");
ui->pushButton_P->setText("p");
ui->pushButton_Q->setText("q");
ui->pushButton_R->setText("r");
ui->pushButton_S->setText("s");
ui->pushButton_T->setText("t");
ui->pushButton_U->setText("u");
ui->pushButton_V->setText("v");
ui->pushButton_W->setText("w");
ui->pushButton_X->setText("x");
ui->pushButton_Y->setText("y");
ui->pushButton_Z->setText("z");
}
App/ComponentUI/CharInputter/CharInputter.h
+10
View File
@@ -5,6 +5,8 @@
#include "QDebug"
#include "QFile"
#include "QTextStream"
#include <QCommonStyle>
#include "QStyle"
namespace Ui {
class CharInputter;
@@ -35,6 +37,10 @@ protected:
private slots:
void setUpper(void);
void setLower(void);
void on_Clicked(QString str);
void on_pushButton_1_clicked();
@@ -117,9 +123,13 @@ private slots:
void on_pushButton_Space_clicked();
void on_pushButton_Caps_clicked();
private:
Ui::CharInputter *ui;
bool isCapsLock = false;
int inputType = 0;
int DecimalPlaces;
App/ComponentUI/CharInputter/CharInputter.qss
+16
View File
@@ -28,6 +28,22 @@
border-color: navy; /* make the default button prominent */
}
.QPushButton#pushButton_Caps[CapsSelect="true"] {
background-color: #55FF55
}
.QPushButton#pushButton_Caps[CapsSelect="false"] {
background-color: #FFFFFF
}
.QLineEdit {
background-color: #FFFFFF
font: 30px "Arial";
App/ComponentUI/CharInputter/CharInputter.ui
+94 -81
View File
@@ -286,26 +286,7 @@
</property>
</spacer>
</item>
<item row="0" column="1">
<widget class="QPushButton" name="pushButton_A">
<property name="minimumSize">
<size>
<width>80</width>
<height>80</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>16777215</width>
<height>16777215</height>
</size>
</property>
<property name="text">
<string>A</string>
</property>
</widget>
</item>
<item row="0" column="5">
<item row="0" column="6">
<widget class="QPushButton" name="pushButton_G">
<property name="minimumSize">
<size>
@@ -324,26 +305,7 @@
</property>
</widget>
</item>
<item row="0" column="8">
<widget class="QPushButton" name="pushButton_K">
<property name="minimumSize">
<size>
<width>80</width>
<height>80</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>16777215</width>
<height>16777215</height>
</size>
</property>
<property name="text">
<string>K</string>
</property>
</widget>
</item>
<item row="0" column="2">
<item row="0" column="3">
<widget class="QPushButton" name="pushButton_S">
<property name="minimumSize">
<size>
@@ -362,7 +324,26 @@
</property>
</widget>
</item>
<item row="0" column="3">
<item row="0" column="5">
<widget class="QPushButton" name="pushButton_F">
<property name="minimumSize">
<size>
<width>80</width>
<height>80</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>16777215</width>
<height>16777215</height>
</size>
</property>
<property name="text">
<string>F</string>
</property>
</widget>
</item>
<item row="0" column="4">
<widget class="QPushButton" name="pushButton_D">
<property name="minimumSize">
<size>
@@ -382,44 +363,6 @@
</widget>
</item>
<item row="0" column="7">
<widget class="QPushButton" name="pushButton_J">
<property name="minimumSize">
<size>
<width>80</width>
<height>80</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>16777215</width>
<height>16777215</height>
</size>
</property>
<property name="text">
<string>J</string>
</property>
</widget>
</item>
<item row="0" column="4">
<widget class="QPushButton" name="pushButton_F">
<property name="minimumSize">
<size>
<width>80</width>
<height>80</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>16777215</width>
<height>16777215</height>
</size>
</property>
<property name="text">
<string>F</string>
</property>
</widget>
</item>
<item row="0" column="6">
<widget class="QPushButton" name="pushButton_H">
<property name="minimumSize">
<size>
@@ -438,7 +381,7 @@
</property>
</widget>
</item>
<item row="0" column="11">
<item row="0" column="12">
<spacer name="horizontalSpacer_2">
<property name="orientation">
<enum>Qt::Horizontal</enum>
@@ -451,7 +394,45 @@
</property>
</spacer>
</item>
<item row="0" column="9" colspan="2">
<item row="0" column="9">
<widget class="QPushButton" name="pushButton_K">
<property name="minimumSize">
<size>
<width>80</width>
<height>80</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>16777215</width>
<height>16777215</height>
</size>
</property>
<property name="text">
<string>K</string>
</property>
</widget>
</item>
<item row="0" column="2">
<widget class="QPushButton" name="pushButton_A">
<property name="minimumSize">
<size>
<width>80</width>
<height>80</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>16777215</width>
<height>16777215</height>
</size>
</property>
<property name="text">
<string>A</string>
</property>
</widget>
</item>
<item row="0" column="10" colspan="2">
<widget class="QPushButton" name="pushButton_L">
<property name="minimumSize">
<size>
@@ -470,6 +451,38 @@
</property>
</widget>
</item>
<item row="0" column="8">
<widget class="QPushButton" name="pushButton_J">
<property name="minimumSize">
<size>
<width>80</width>
<height>80</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>16777215</width>
<height>16777215</height>
</size>
</property>
<property name="text">
<string>J</string>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QPushButton" name="pushButton_Caps">
<property name="minimumSize">
<size>
<width>80</width>
<height>80</height>
</size>
</property>
<property name="text">
<string>Caps</string>
</property>
</widget>
</item>
</layout>
</item>
<item row="3" column="0" colspan="2">
App/ComponentUI/Inputter/Inputter.ui
+1 -1
View File
@@ -46,7 +46,7 @@
<property name="minimumSize">
<size>
<width>0</width>
<height>0</height>
<height>60</height>
</size>
</property>
<property name="font">
App/MissionUI/propertyui.cpp
+4 -4
View File
@@ -117,17 +117,17 @@ propertyui::propertyui(QWidget *parent) :
rebuildUI("Waypoint");
connect(ui->radioButton_Relative,SIGNAL(clicked(bool)),
this,SLOT(on_radioButton_clicked()));
this,SLOT(radioButton_clicked()));
connect(ui->radioButton_Absolutely,SIGNAL(clicked(bool)),
this,SLOT(on_radioButton_clicked()));
this,SLOT(radioButton_clicked()));
connect(ui->radioButton_AGL,SIGNAL(clicked(bool)),
this,SLOT(on_radioButton_clicked()));
this,SLOT(radioButton_clicked()));
}
//如果combox的index或者string改变，那么也要重新建立参数信息
void propertyui::on_radioButton_clicked()
void propertyui::radioButton_clicked()
{
FrameType::Types type;
if(ui->radioButton_Relative->isChecked())
App/MissionUI/propertyui.h
+1 -1
View File
@@ -265,7 +265,7 @@ private slots:
void setParam6(QVariant value);
void setParam7(QVariant value);
void on_radioButton_clicked();
void radioButton_clicked();
void WayPointPropertyUpdate(void);
App/Setting/Index0/LinkUI/LinkUI.cpp
+1 -3
View File
@@ -15,8 +15,6 @@ LinkUI::LinkUI(QWidget *parent) :
this->setStyleSheet(stylesheet);
file.close();
}
@@ -43,7 +41,7 @@ void LinkUI::on_pushButton_Add_clicked()
connectdialog,SLOT(PortConnected(QVariant,QVariant,QVariant,QVariant,QVariant,QVariant,QVariant,QVariant)));
int index = ui->tabWidget->insertTab(ui->tabWidget->currentIndex(),connectdialog,tr("SerialPort"));
int index = ui->tabWidget->insertTab(ui->tabWidget->currentIndex(),connectdialog,tr("New"));
ui->tabWidget->setCurrentIndex(index);
}
App/Setting/Index0/LinkUI/LinkUI.qss
+12 -48
View File
@@ -1,12 +1,14 @@
$back = #FFFFFF;
$tabColor = #AAFFFF;
$borderColor = #FF0000;
.QFrame {
background-color: #FFFFFF;
QFrame {
background-color: $back;
}
.QPushButton {
background-color: #FFFFFF /*palegoldenrod*/;
QPushButton {
background-color: $back;
border-width: 2px;
border-color: darkkhaki;
border-style: solid;
@@ -15,56 +17,18 @@
font: 30px "Arial";
}
.QPushButton:pressed {
QPushButton:pressed {
background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,
stop: 0 #dadbde, stop: 1 #f6f7fa);
}
QTabWidget {
font: 20px "Arial";
}
QTabWidget::pane {
border-top: 1px solid #E5E5E5;
border-left:1px solid #E5E5E5;
position: absolute;
font-size: 20px;
background-color:#FFFFFF;
font: 20px "Arial";
}
QTabBar::tab {
border-width: 2px;
border-bottom-color: #5F4F4F; /* same as the pane color */
border-top-left-radius: 5px;
border-top-right-radius: 5px;
border-bottom-left-radius: 5px;
border-bottom-right-radius: 5px;
min-width: 10px;
padding: 5px;
font-size: 20px;
background-color:#FF5F6F;
padding: 5px;
font-size: 20px;
background-color:$tabColor;
}
QTabBar::tab:selected, QTabBar::tab:hover {
background-color:#EFEFFF;//选中背景色
}
QTabBar::tab:selected {
color:#2080F7;//选中颜色
border-bottom: 2px solid #2080F7;
font-weight:bold;
background-color:#FFFFFF;
}
QTabWidget::tab-bar {
border-top: 2px solid #E5E5E5;
border-bottom: 2px solid #E5E5E5;
border-left:1px solid #E5E5E5;
alignment: center;//居中显示
font-size: 30px;
background-color:#FFFFFF;
}
App/Setting/Index1/ParameterInspector/ParameterInspector.cpp
+19 -16
View File
@@ -529,24 +529,27 @@ void ParameterInspector::setsystem(QVariant vehicle)
void ParameterInspector::on_pushButton_system_clicked()
{
Selector *selector = new Selector(this);
selector->setGeometry(0,0,this->width(),this->height());
QStringList list;
list.clear();
QMap<int,QMap<int,mavlink_param_value_t>>::iterator ite;
for(ite=vehicles.begin(); ite!=vehicles.end();++ite)//每一个key下面都是一个设备的所有参数
if(!ui->pushButton_system->text().isEmpty())
{
list.append(tr("Vehicle %1").arg(ite.key()));
Selector *selector = new Selector(this);
selector->setGeometry(0,0,this->width(),this->height());
QStringList list;
list.clear();
QMap<int,QMap<int,mavlink_param_value_t>>::iterator ite;
for(ite=vehicles.begin(); ite!=vehicles.end();++ite)//每一个key下面都是一个设备的所有参数
{
list.append(tr("Vehicle %1").arg(ite.key()));
}
selector->setList(list,ui->pushButton_system->text());
connect(selector,SIGNAL(confirmValue(QVariant)),
this,SLOT(setsystem(QVariant)));
selector->show();
}
selector->setList(list,ui->pushButton_system->text());
connect(selector,SIGNAL(confirmValue(QVariant)),
this,SLOT(setsystem(QVariant)));
selector->show();
}