에프에이리눅스 / 1611_0007_prime_oven

Download as
Browse Code »

Commit 748830a16e0d72fe1467fda069606e81c9a153da

Authored by 김태훈
1 parent 92fef61249
Exists in master and in 2 other branches fhd, fhd-demo

키보드 동작 개선 

- '0' 버튼 인식 누락 해결
 - 백스페이스 버튼에 자동 반복 추가
Showing 2 changed files with 6 additions and 0 deletions   Show diff stats
app/gui/oven_control/keyboardwidget.cpp
  Diff comments   View file @748830a
@@ -19,6 +19,7 @@ KeyboardWidget::KeyboardWidget(QWidget *parent) : @@ -19,6 +19,7 @@ KeyboardWidget::KeyboardWidget(QWidget *parent) :
19 m_pSignalMapper->setMapping(ui->pushButton_7, tr("7")); 19 m_pSignalMapper->setMapping(ui->pushButton_7, tr("7"));
20 m_pSignalMapper->setMapping(ui->pushButton_8, tr("8")); 20 m_pSignalMapper->setMapping(ui->pushButton_8, tr("8"));
21 m_pSignalMapper->setMapping(ui->pushButton_9, tr("9")); 21 m_pSignalMapper->setMapping(ui->pushButton_9, tr("9"));
  22 + m_pSignalMapper->setMapping(ui->pushButton_10, tr("0"));
22 m_pSignalMapper->setMapping(ui->pushButton_11, tr("Q")); 23 m_pSignalMapper->setMapping(ui->pushButton_11, tr("Q"));
23 m_pSignalMapper->setMapping(ui->pushButton_12, tr("W")); 24 m_pSignalMapper->setMapping(ui->pushButton_12, tr("W"));
24 m_pSignalMapper->setMapping(ui->pushButton_13, tr("E")); 25 m_pSignalMapper->setMapping(ui->pushButton_13, tr("E"));
@@ -47,6 +48,7 @@ KeyboardWidget::KeyboardWidget(QWidget *parent) : @@ -47,6 +48,7 @@ KeyboardWidget::KeyboardWidget(QWidget *parent) :
47 m_pSignalMapper->setMapping(ui->pushButton_36, tr("M")); 48 m_pSignalMapper->setMapping(ui->pushButton_36, tr("M"));
48 m_pSignalMapper->setMapping(ui->pushButton_37, tr("-")); 49 m_pSignalMapper->setMapping(ui->pushButton_37, tr("-"));
49 m_pSignalMapper->setMapping(ui->pushButton_38, tr(",")); 50 m_pSignalMapper->setMapping(ui->pushButton_38, tr(","));
  51 + m_pSignalMapper->setMapping(ui->pushButton_40, tr(" "));
50 52
51 53
52 connect(ui->pushButton_1,SIGNAL(clicked(bool)),m_pSignalMapper,SLOT(map())); 54 connect(ui->pushButton_1,SIGNAL(clicked(bool)),m_pSignalMapper,SLOT(map()));
@@ -87,6 +89,7 @@ KeyboardWidget::KeyboardWidget(QWidget *parent) : @@ -87,6 +89,7 @@ KeyboardWidget::KeyboardWidget(QWidget *parent) :
87 connect(ui->pushButton_36,SIGNAL(clicked(bool)),m_pSignalMapper,SLOT(map())); 89 connect(ui->pushButton_36,SIGNAL(clicked(bool)),m_pSignalMapper,SLOT(map()));
88 connect(ui->pushButton_37,SIGNAL(clicked(bool)),m_pSignalMapper,SLOT(map())); 90 connect(ui->pushButton_37,SIGNAL(clicked(bool)),m_pSignalMapper,SLOT(map()));
89 connect(ui->pushButton_38,SIGNAL(clicked(bool)),m_pSignalMapper,SLOT(map())); 91 connect(ui->pushButton_38,SIGNAL(clicked(bool)),m_pSignalMapper,SLOT(map()));
  92 + connect(ui->pushButton_40,SIGNAL(clicked(bool)),m_pSignalMapper,SLOT(map()));
90 93
91 connect(m_pSignalMapper,SIGNAL(mapped(QString)), this, SLOT(onKeyboardClicked(QString))); 94 connect(m_pSignalMapper,SIGNAL(mapped(QString)), this, SLOT(onKeyboardClicked(QString)));
92 } 95 }
app/gui/oven_control/keyboardwidget.ui
  Diff comments   View file @748830a
@@ -1108,6 +1108,9 @@ QPushButton:pressed { border-image: url(:/images/keyboard/088_keyboard_a039_ov.p @@ -1108,6 +1108,9 @@ QPushButton:pressed { border-image: url(:/images/keyboard/088_keyboard_a039_ov.p
1108 <property name="text"> 1108 <property name="text">
1109 <string/> 1109 <string/>
1110 </property> 1110 </property>
  1111 + <property name="autoRepeat">
  1112 + <bool>true</bool>
  1113 + </property>
1111 <property name="autoDefault"> 1114 <property name="autoDefault">
1112 <bool>false</bool> 1115 <bool>false</bool>
1113 </property> 1116 </property>