diff --git a/app/gui/oven_control/adjustmentwindow.cpp b/app/gui/oven_control/adjustmentwindow.cpp index c2d9775..c856e52 100644 --- a/app/gui/oven_control/adjustmentwindow.cpp +++ b/app/gui/oven_control/adjustmentwindow.cpp @@ -44,10 +44,10 @@ void AdjustmentWindow::on_backButton_clicked() void AdjustmentWindow::keyPressEvent(QKeyEvent *event){ switch (event->key()) { - case 0x01000030: // Turn left + case 0x01000032: // Turn left focusPreviousChild(); break; - case 0x01000032: // Turn right + case 0x01000030: // Turn right focusNextChild(); break; } @@ -56,7 +56,7 @@ void AdjustmentWindow::keyPressEvent(QKeyEvent *event){ void AdjustmentWindow::keyReleaseEvent(QKeyEvent *event){ switch (event->key()) { - case 0x01000030: // Turn left + case 0x01000032: // Turn left focusPreviousChild(); break; case 0x01000031: // Push @@ -67,7 +67,7 @@ void AdjustmentWindow::keyReleaseEvent(QKeyEvent *event){ } break; } - case 0x01000032: // Turn right + case 0x01000030: // Turn right focusNextChild(); break; } diff --git a/app/gui/oven_control/autocookcheckconfigwindow.cpp b/app/gui/oven_control/autocookcheckconfigwindow.cpp index fe249fd..4fa8147 100644 --- a/app/gui/oven_control/autocookcheckconfigwindow.cpp +++ b/app/gui/oven_control/autocookcheckconfigwindow.cpp @@ -100,13 +100,13 @@ void AutoCookCheckConfigWindow::keyPressEvent(QKeyEvent *event) { switch (event->key()) { - case 0x01000030: // Turn left + case 0x01000032: // Turn left onEncoderLeft(); break; case 0x01000031: // Push pushed = focusWidget(); break; - case 0x01000032: // Turn right + case 0x01000030: // Turn right onEncoderRight(); break; } @@ -116,7 +116,7 @@ void AutoCookCheckConfigWindow::keyReleaseEvent(QKeyEvent *event) { switch (event->key()) { - case 0x01000030: // Turn left + case 0x01000032: // Turn left onEncoderLeft(); break; case 0x01000031: // Push @@ -125,7 +125,7 @@ void AutoCookCheckConfigWindow::keyReleaseEvent(QKeyEvent *event) pushed = NULL; break; - case 0x01000032: // Turn right + case 0x01000030: // Turn right onEncoderRight(); break; } diff --git a/app/gui/oven_control/autocookcheckwindow.cpp b/app/gui/oven_control/autocookcheckwindow.cpp index 92d1464..001126e 100644 --- a/app/gui/oven_control/autocookcheckwindow.cpp +++ b/app/gui/oven_control/autocookcheckwindow.cpp @@ -67,13 +67,13 @@ void AutoCookCheckWindow::keyPressEvent(QKeyEvent *event) { switch (event->key()) { - case 0x01000030: // Turn left + case 0x01000032: // Turn left onEncoderLeft(); break; case 0x01000031: // Push pushed = focusWidget(); break; - case 0x01000032: // Turn right + case 0x01000030: // Turn right onEncoderRight(); break; } @@ -83,7 +83,7 @@ void AutoCookCheckWindow::keyReleaseEvent(QKeyEvent *event) { switch (event->key()) { - case 0x01000030: // Turn left + case 0x01000032: // Turn left onEncoderLeft(); break; case 0x01000031: // Push @@ -92,7 +92,7 @@ void AutoCookCheckWindow::keyReleaseEvent(QKeyEvent *event) pushed = NULL; break; - case 0x01000032: // Turn right + case 0x01000030: // Turn right onEncoderRight(); break; } diff --git a/app/gui/oven_control/autocookconfigwindow.cpp b/app/gui/oven_control/autocookconfigwindow.cpp index d39a90e..8649fdc 100644 --- a/app/gui/oven_control/autocookconfigwindow.cpp +++ b/app/gui/oven_control/autocookconfigwindow.cpp @@ -115,13 +115,13 @@ void AutoCookConfigWindow::keyPressEvent(QKeyEvent *event) { switch (event->key()) { - case 0x01000030: // Turn left + case 0x01000032: // Turn left onEncoderLeft(); break; case 0x01000031: // Push pushed = focusWidget(); break; - case 0x01000032: // Turn right + case 0x01000030: // Turn right onEncoderRight(); break; } @@ -131,7 +131,7 @@ void AutoCookConfigWindow::keyReleaseEvent(QKeyEvent *event) { switch (event->key()) { - case 0x01000030: // Turn left + case 0x01000032: // Turn left onEncoderLeft(); break; case 0x01000031: // Push @@ -140,7 +140,7 @@ void AutoCookConfigWindow::keyReleaseEvent(QKeyEvent *event) pushed = NULL; break; - case 0x01000032: // Turn right + case 0x01000030: // Turn right onEncoderRight(); break; } diff --git a/app/gui/oven_control/autocookselectionpopup.cpp b/app/gui/oven_control/autocookselectionpopup.cpp index 068acee..2c2d34d 100644 --- a/app/gui/oven_control/autocookselectionpopup.cpp +++ b/app/gui/oven_control/autocookselectionpopup.cpp @@ -50,13 +50,13 @@ void AutoCookSelectionPopup::keyPressEvent(QKeyEvent *event) { switch (event->key()) { - case 0x01000030: // Turn left + case 0x01000032: // Turn left onEncoderLeft(); break; case 0x01000031: // Push pushed = focusWidget(); break; - case 0x01000032: // Turn right + case 0x01000030: // Turn right onEncoderRight(); break; } @@ -66,7 +66,7 @@ void AutoCookSelectionPopup::keyReleaseEvent(QKeyEvent *event) { switch (event->key()) { - case 0x01000030: // Turn left + case 0x01000032: // Turn left onEncoderLeft(); break; case 0x01000031: // Push @@ -75,7 +75,7 @@ void AutoCookSelectionPopup::keyReleaseEvent(QKeyEvent *event) pushed = NULL; break; - case 0x01000032: // Turn right + case 0x01000030: // Turn right onEncoderRight(); break; } diff --git a/app/gui/oven_control/autocookselectionwindow.cpp b/app/gui/oven_control/autocookselectionwindow.cpp index 8d3bab1..cb235b2 100644 --- a/app/gui/oven_control/autocookselectionwindow.cpp +++ b/app/gui/oven_control/autocookselectionwindow.cpp @@ -81,13 +81,13 @@ void AutoCookSelectionWindow::keyPressEvent(QKeyEvent *event) { switch (event->key()) { - case 0x01000030: // Turn left + case 0x01000032: // Turn left onEncoderLeft(); break; case 0x01000031: // Push pushed = focusWidget(); break; - case 0x01000032: // Turn right + case 0x01000030: // Turn right onEncoderRight(); break; } @@ -97,7 +97,7 @@ void AutoCookSelectionWindow::keyReleaseEvent(QKeyEvent *event) { switch (event->key()) { - case 0x01000030: // Turn left + case 0x01000032: // Turn left onEncoderLeft(); break; case 0x01000031: // Push @@ -106,7 +106,7 @@ void AutoCookSelectionWindow::keyReleaseEvent(QKeyEvent *event) pushed = NULL; break; - case 0x01000032: // Turn right + case 0x01000030: // Turn right onEncoderRight(); break; } diff --git a/app/gui/oven_control/autocookwindow.cpp b/app/gui/oven_control/autocookwindow.cpp index 837c83c..c58f771 100644 --- a/app/gui/oven_control/autocookwindow.cpp +++ b/app/gui/oven_control/autocookwindow.cpp @@ -117,13 +117,13 @@ void AutoCookWindow::keyPressEvent(QKeyEvent *event) { switch (event->key()) { - case 0x01000030: // Turn left + case 0x01000032: // Turn left onEncoderLeft(); break; case 0x01000031: // Push pushed = focusWidget(); break; - case 0x01000032: // Turn right + case 0x01000030: // Turn right onEncoderRight(); break; } @@ -133,7 +133,7 @@ void AutoCookWindow::keyReleaseEvent(QKeyEvent *event) { switch (event->key()) { - case 0x01000030: // Turn left + case 0x01000032: // Turn left onEncoderLeft(); break; case 0x01000031: // Push @@ -142,7 +142,7 @@ void AutoCookWindow::keyReleaseEvent(QKeyEvent *event) pushed = NULL; break; - case 0x01000032: // Turn right + case 0x01000030: // Turn right onEncoderRight(); break; } diff --git a/app/gui/oven_control/burnertestwindow.cpp b/app/gui/oven_control/burnertestwindow.cpp index c00826d..6a6b4b4 100644 --- a/app/gui/oven_control/burnertestwindow.cpp +++ b/app/gui/oven_control/burnertestwindow.cpp @@ -47,13 +47,13 @@ void BurnerTestWindow::keyPressEvent(QKeyEvent *event) { switch (event->key()) { - case 0x01000030: // Turn left + case 0x01000032: // Turn left onEncoderLeft(); break; case 0x01000031: // Push pushed = focusWidget(); break; - case 0x01000032: // Turn right + case 0x01000030: // Turn right onEncoderRight(); break; } @@ -63,7 +63,7 @@ void BurnerTestWindow::keyReleaseEvent(QKeyEvent *event) { switch (event->key()) { - case 0x01000030: // Turn left + case 0x01000032: // Turn left onEncoderLeft(); break; case 0x01000031: // Push @@ -72,7 +72,7 @@ void BurnerTestWindow::keyReleaseEvent(QKeyEvent *event) pushed = NULL; break; - case 0x01000032: // Turn right + case 0x01000030: // Turn right onEncoderRight(); break; } diff --git a/app/gui/oven_control/componenttestwindow.cpp b/app/gui/oven_control/componenttestwindow.cpp index 66e8c96..7aba874 100644 --- a/app/gui/oven_control/componenttestwindow.cpp +++ b/app/gui/oven_control/componenttestwindow.cpp @@ -38,13 +38,13 @@ void ComponentTestWindow::keyPressEvent(QKeyEvent *event) { switch (event->key()) { - case 0x01000030: // Turn left + case 0x01000032: // Turn left onEncoderLeft(); break; case 0x01000031: // Push pushed = focusWidget(); break; - case 0x01000032: // Turn right + case 0x01000030: // Turn right onEncoderRight(); break; } @@ -54,7 +54,7 @@ void ComponentTestWindow::keyReleaseEvent(QKeyEvent *event) { switch (event->key()) { - case 0x01000030: // Turn left + case 0x01000032: // Turn left onEncoderLeft(); break; case 0x01000031: // Push @@ -63,7 +63,7 @@ void ComponentTestWindow::keyReleaseEvent(QKeyEvent *event) pushed = NULL; break; - case 0x01000032: // Turn right + case 0x01000030: // Turn right onEncoderRight(); break; } diff --git a/app/gui/oven_control/config1digitsetandenablesetdlg.cpp b/app/gui/oven_control/config1digitsetandenablesetdlg.cpp index 667c81a..ef6e99c 100644 --- a/app/gui/oven_control/config1digitsetandenablesetdlg.cpp +++ b/app/gui/oven_control/config1digitsetandenablesetdlg.cpp @@ -70,14 +70,14 @@ void Config1DigitSetAndEnableSetDlg::keyPressEvent(QKeyEvent *event){ int i = 0; switch (event->key()) { - case 0x01000030: // Turn left + case 0x01000032: // Turn left if(focusWidget() == ui->ctrSpBxValue) ui->ctrBtnCancel->setFocus(); else focusPreviousChild(); break; case 0x01000031: // Push break; - case 0x01000032: // Turn right + case 0x01000030: // Turn right if(focusWidget() == ui->ctrBtnCancel) ui->ctrSpBxValue->setFocus(); else focusNextChild(); @@ -89,7 +89,7 @@ void Config1DigitSetAndEnableSetDlg::keyReleaseEvent(QKeyEvent *event){ int i = 0; switch (event->key()) { - case 0x01000030: // Turn left + case 0x01000032: // Turn left if(focusWidget() == ui->ctrSpBxValue) ui->ctrBtnCancel->setFocus(); else focusPreviousChild(); break; @@ -108,7 +108,7 @@ void Config1DigitSetAndEnableSetDlg::keyReleaseEvent(QKeyEvent *event){ } break; } - case 0x01000032: // Turn right + case 0x01000030: // Turn right if(focusWidget() == ui->ctrBtnCancel) ui->ctrSpBxValue->setFocus(); else focusNextChild(); break; diff --git a/app/gui/oven_control/config1digitsetdlg.cpp b/app/gui/oven_control/config1digitsetdlg.cpp index b0540cd..757ef8f 100644 --- a/app/gui/oven_control/config1digitsetdlg.cpp +++ b/app/gui/oven_control/config1digitsetdlg.cpp @@ -94,14 +94,14 @@ void Config1DigitSetDlg::keyPressEvent(QKeyEvent *event){ int i = 0; switch (event->key()) { - case 0x01000030: // Turn left + case 0x01000032: // Turn left if(focusWidget() == ui->ctrSpBxValue) ui->ctrBtnCancel->setFocus(); else focusPreviousChild(); break; case 0x01000031: // Push break; - case 0x01000032: // Turn right + case 0x01000030: // Turn right if(focusWidget() == ui->ctrBtnCancel) ui->ctrSpBxValue->setFocus(); else focusNextChild(); @@ -113,7 +113,7 @@ void Config1DigitSetDlg::keyReleaseEvent(QKeyEvent *event){ int i = 0; switch (event->key()) { - case 0x01000030: // Turn left + case 0x01000032: // Turn left if(focusWidget() == ui->ctrSpBxValue) ui->ctrBtnCancel->setFocus(); else focusPreviousChild(); break; @@ -133,7 +133,7 @@ void Config1DigitSetDlg::keyReleaseEvent(QKeyEvent *event){ } break; } - case 0x01000032: // Turn right + case 0x01000030: // Turn right if(focusWidget() == ui->ctrBtnCancel) ui->ctrSpBxValue->setFocus(); else focusNextChild(); break; diff --git a/app/gui/oven_control/configbacklightdlg.cpp b/app/gui/oven_control/configbacklightdlg.cpp index 4597570..8700380 100644 --- a/app/gui/oven_control/configbacklightdlg.cpp +++ b/app/gui/oven_control/configbacklightdlg.cpp @@ -90,7 +90,7 @@ void ConfigBackLightDlg::keyPressEvent(QKeyEvent *event){ int i = 0; switch (event->key()) { - case 0x01000030: // Turn left + case 0x01000032: // Turn left for(i = 0; i < m_vectorTabOrder.size();i++){ if(focusWidget() == m_vectorTabOrder[i]) break; } @@ -111,7 +111,7 @@ void ConfigBackLightDlg::keyPressEvent(QKeyEvent *event){ case 0x01000031: // Push break; - case 0x01000032: // Turn right + case 0x01000030: // Turn right for(i = 0; i < m_vectorTabOrder.size();i++){ if(focusWidget() == m_vectorTabOrder[i]) break; } @@ -136,7 +136,7 @@ void ConfigBackLightDlg::keyReleaseEvent(QKeyEvent *event){ int i = 0; switch (event->key()) { - case 0x01000030: // Turn left + case 0x01000032: // Turn left for(i = 0; i < m_vectorTabOrder.size();i++){ if(focusWidget() == m_vectorTabOrder[i]) break; } @@ -162,7 +162,7 @@ void ConfigBackLightDlg::keyReleaseEvent(QKeyEvent *event){ } break; } - case 0x01000032: // Turn right + case 0x01000030: // Turn right for(i = 0; i < m_vectorTabOrder.size();i++){ if(focusWidget() == m_vectorTabOrder[i]) break; } diff --git a/app/gui/oven_control/configdatetimedlg.cpp b/app/gui/oven_control/configdatetimedlg.cpp index d457ec7..6ab5f98 100644 --- a/app/gui/oven_control/configdatetimedlg.cpp +++ b/app/gui/oven_control/configdatetimedlg.cpp @@ -85,14 +85,14 @@ void ConfigDateTimeDlg::keyPressEvent(QKeyEvent *event){ int i = 0; switch (event->key()) { - case 0x01000030: // Turn left + case 0x01000032: // Turn left if(focusWidget() == ui->ctrSpBxYear) ui->ctrBtnCancel->setFocus(); else focusPreviousChild(); break; case 0x01000031: // Push break; - case 0x01000032: // Turn right + case 0x01000030: // Turn right if(focusWidget() == ui->ctrBtnCancel) ui->ctrSpBxYear->setFocus(); else focusNextChild(); @@ -104,7 +104,7 @@ void ConfigDateTimeDlg::keyReleaseEvent(QKeyEvent *event){ int i = 0; switch (event->key()) { - case 0x01000030: // Turn left + case 0x01000032: // Turn left if(focusWidget() == ui->ctrSpBxYear) ui->ctrBtnCancel->setFocus(); else focusPreviousChild(); break; @@ -121,7 +121,7 @@ void ConfigDateTimeDlg::keyReleaseEvent(QKeyEvent *event){ } break; } - case 0x01000032: // Turn right + case 0x01000030: // Turn right if(focusWidget() == ui->ctrBtnCancel) ui->ctrSpBxYear->setFocus(); else focusNextChild(); break; diff --git a/app/gui/oven_control/configdemomodedlg.cpp b/app/gui/oven_control/configdemomodedlg.cpp index cd63a01..c9fba2a 100644 --- a/app/gui/oven_control/configdemomodedlg.cpp +++ b/app/gui/oven_control/configdemomodedlg.cpp @@ -83,7 +83,7 @@ void ConfigDemoModeDlg::keyPressEvent(QKeyEvent *event){ int i = 0; switch (event->key()) { - case 0x01000030: // Turn left + case 0x01000032: // Turn left for(i = 0; i < m_vectorTabOrder.size();i++){ if(focusWidget() == m_vectorTabOrder[i]) break; } @@ -104,7 +104,7 @@ void ConfigDemoModeDlg::keyPressEvent(QKeyEvent *event){ case 0x01000031: // Push break; - case 0x01000032: // Turn right + case 0x01000030: // Turn right for(i = 0; i < m_vectorTabOrder.size();i++){ if(focusWidget() == m_vectorTabOrder[i]) break; } @@ -129,7 +129,7 @@ void ConfigDemoModeDlg::keyReleaseEvent(QKeyEvent *event){ int i = 0; switch (event->key()) { - case 0x01000030: // Turn left + case 0x01000032: // Turn left for(i = 0; i < m_vectorTabOrder.size();i++){ if(focusWidget() == m_vectorTabOrder[i]) break; } @@ -155,7 +155,7 @@ void ConfigDemoModeDlg::keyReleaseEvent(QKeyEvent *event){ } break; } - case 0x01000032: // Turn right + case 0x01000030: // Turn right for(i = 0; i < m_vectorTabOrder.size();i++){ if(focusWidget() == m_vectorTabOrder[i]) break; } diff --git a/app/gui/oven_control/configdoormonitoring.cpp b/app/gui/oven_control/configdoormonitoring.cpp index f487de1..972735a 100644 --- a/app/gui/oven_control/configdoormonitoring.cpp +++ b/app/gui/oven_control/configdoormonitoring.cpp @@ -155,13 +155,13 @@ void ConfigDoorMonitoring::onBtnClicked(const int sel){ void ConfigDoorMonitoring::keyPressEvent(QKeyEvent *event){ switch (event->key()) { - case 0x01000030: // Turn left + case 0x01000032: // Turn left focusPreviousChild(); break; case 0x01000031: // Push break; - case 0x01000032: // Turn right + case 0x01000030: // Turn right focusNextChild(); break; } @@ -170,7 +170,7 @@ void ConfigDoorMonitoring::keyPressEvent(QKeyEvent *event){ void ConfigDoorMonitoring::keyReleaseEvent(QKeyEvent *event){ switch (event->key()) { - case 0x01000030: // Turn left + case 0x01000032: // Turn left focusPreviousChild(); break; case 0x01000031: // Push @@ -181,7 +181,7 @@ void ConfigDoorMonitoring::keyReleaseEvent(QKeyEvent *event){ } break; } - case 0x01000032: // Turn right + case 0x01000030: // Turn right focusNextChild(); break; } diff --git a/app/gui/oven_control/configdutywashdlg.cpp b/app/gui/oven_control/configdutywashdlg.cpp index b44fa0e..77ac2af 100644 --- a/app/gui/oven_control/configdutywashdlg.cpp +++ b/app/gui/oven_control/configdutywashdlg.cpp @@ -72,7 +72,7 @@ void ConfigDutyWashDlg::keyReleaseEvent(QKeyEvent *event) int i = 0; switch (event->key()) { - case 0x01000030: // Turn left + case 0x01000032: // Turn left for(i = 0; i < m_vectorTabOrder.size();i++){ if(focusWidget() == m_vectorTabOrder[i]) break; } @@ -98,7 +98,7 @@ void ConfigDutyWashDlg::keyReleaseEvent(QKeyEvent *event) } break; } - case 0x01000032: // Turn right + case 0x01000030: // Turn right for(i = 0; i < m_vectorTabOrder.size();i++){ if(focusWidget() == m_vectorTabOrder[i]) break; } @@ -124,7 +124,7 @@ void ConfigDutyWashDlg::keyPressEvent(QKeyEvent *event) int i = 0; switch (event->key()) { - case 0x01000030: // Turn left + case 0x01000032: // Turn left for(i = 0; i < m_vectorTabOrder.size();i++){ if(focusWidget() == m_vectorTabOrder[i]) break; } @@ -145,7 +145,7 @@ void ConfigDutyWashDlg::keyPressEvent(QKeyEvent *event) case 0x01000031: // Push break; - case 0x01000032: // Turn right + case 0x01000030: // Turn right for(i = 0; i < m_vectorTabOrder.size();i++){ if(focusWidget() == m_vectorTabOrder[i]) break; } diff --git a/app/gui/oven_control/configfileprocessdlg.cpp b/app/gui/oven_control/configfileprocessdlg.cpp index 618a883..2776fa1 100644 --- a/app/gui/oven_control/configfileprocessdlg.cpp +++ b/app/gui/oven_control/configfileprocessdlg.cpp @@ -60,13 +60,13 @@ void ConfigFileProcessDlg::on_ctrBtnCancel_clicked() void ConfigFileProcessDlg::keyPressEvent(QKeyEvent *event){ switch (event->key()) { - case 0x01000030: // Turn left + case 0x01000032: // Turn left if(focusWidget() == ui->ctrBtnOk) ui->ctrBtnCancel->setFocus(); else ui->ctrBtnOk->setFocus(); break; case 0x01000031: // Push break; - case 0x01000032: // Turn right + case 0x01000030: // Turn right if(focusWidget() == ui->ctrBtnOk) ui->ctrBtnCancel->setFocus(); else ui->ctrBtnOk->setFocus(); break; @@ -76,7 +76,7 @@ void ConfigFileProcessDlg::keyPressEvent(QKeyEvent *event){ void ConfigFileProcessDlg::keyReleaseEvent(QKeyEvent *event){ switch (event->key()) { - case 0x01000030: // Turn left + case 0x01000032: // Turn left if(focusWidget() == ui->ctrBtnOk) ui->ctrBtnCancel->setFocus(); else ui->ctrBtnOk->setFocus(); break; @@ -88,7 +88,7 @@ void ConfigFileProcessDlg::keyReleaseEvent(QKeyEvent *event){ } break; } - case 0x01000032: // Turn right + case 0x01000030: // Turn right if(focusWidget() == ui->ctrBtnOk) ui->ctrBtnCancel->setFocus(); else ui->ctrBtnOk->setFocus(); break; diff --git a/app/gui/oven_control/confighalfenergydlg.cpp b/app/gui/oven_control/confighalfenergydlg.cpp index 05f5b7e..dc33221 100644 --- a/app/gui/oven_control/confighalfenergydlg.cpp +++ b/app/gui/oven_control/confighalfenergydlg.cpp @@ -86,7 +86,7 @@ void ConfigHalfEnergyDlg::keyPressEvent(QKeyEvent *event){ int i = 0; switch (event->key()) { - case 0x01000030: // Turn left + case 0x01000032: // Turn left for(i = 0; i < m_vectorTabOrder.size();i++){ if(focusWidget() == m_vectorTabOrder[i]) break; } @@ -107,7 +107,7 @@ void ConfigHalfEnergyDlg::keyPressEvent(QKeyEvent *event){ case 0x01000031: // Push break; - case 0x01000032: // Turn right + case 0x01000030: // Turn right for(i = 0; i < m_vectorTabOrder.size();i++){ if(focusWidget() == m_vectorTabOrder[i]) break; } @@ -132,7 +132,7 @@ void ConfigHalfEnergyDlg::keyReleaseEvent(QKeyEvent *event){ int i = 0; switch (event->key()) { - case 0x01000030: // Turn left + case 0x01000032: // Turn left for(i = 0; i < m_vectorTabOrder.size();i++){ if(focusWidget() == m_vectorTabOrder[i]) break; } @@ -158,7 +158,7 @@ void ConfigHalfEnergyDlg::keyReleaseEvent(QKeyEvent *event){ } break; } - case 0x01000032: // Turn right + case 0x01000030: // Turn right for(i = 0; i < m_vectorTabOrder.size();i++){ if(focusWidget() == m_vectorTabOrder[i]) break; } diff --git a/app/gui/oven_control/configipdlg.cpp b/app/gui/oven_control/configipdlg.cpp index 06e6abd..c076a02 100644 --- a/app/gui/oven_control/configipdlg.cpp +++ b/app/gui/oven_control/configipdlg.cpp @@ -135,14 +135,14 @@ void ConfigIpDlg::focusInSpinBox(QWidget *widget){ void ConfigIpDlg::keyPressEvent(QKeyEvent *event){ switch (event->key()) { - case 0x01000030: // Turn left + case 0x01000032: // Turn left if(focusWidget() == ui->ctrIp_0) ui->ctrBtnCancel->setFocus(); else focusPreviousChild(); break; case 0x01000031: // Push break; - case 0x01000032: // Turn right + case 0x01000030: // Turn right if(focusWidget() == ui->ctrBtnCancel) ui->ctrIp_0->setFocus(); else focusNextChild(); @@ -153,7 +153,7 @@ void ConfigIpDlg::keyPressEvent(QKeyEvent *event){ void ConfigIpDlg::keyReleaseEvent(QKeyEvent *event){ switch (event->key()) { - case 0x01000030: // Turn left + case 0x01000032: // Turn left if(focusWidget() == ui->ctrIp_0) ui->ctrBtnCancel->setFocus(); else focusPreviousChild(); break; @@ -169,7 +169,7 @@ void ConfigIpDlg::keyReleaseEvent(QKeyEvent *event){ } break; } - case 0x01000032: // Turn right + case 0x01000030: // Turn right if(focusWidget() == ui->ctrBtnCancel) ui->ctrIp_0->setFocus(); else focusNextChild(); break; diff --git a/app/gui/oven_control/configlanguagedlg.cpp b/app/gui/oven_control/configlanguagedlg.cpp index 9da94b5..8eebc85 100644 --- a/app/gui/oven_control/configlanguagedlg.cpp +++ b/app/gui/oven_control/configlanguagedlg.cpp @@ -93,7 +93,7 @@ void ConfigLanguageDlg::keyPressEvent(QKeyEvent *event){ int i = 0; switch (event->key()) { - case 0x01000030: // Turn left + case 0x01000032: // Turn left for(i = 0; i < m_vectorTabOrder.size();i++){ if(focusWidget() == m_vectorTabOrder[i]) break; } @@ -114,7 +114,7 @@ void ConfigLanguageDlg::keyPressEvent(QKeyEvent *event){ case 0x01000031: // Push break; - case 0x01000032: // Turn right + case 0x01000030: // Turn right for(i = 0; i < m_vectorTabOrder.size();i++){ if(focusWidget() == m_vectorTabOrder[i]) break; } @@ -139,7 +139,7 @@ void ConfigLanguageDlg::keyReleaseEvent(QKeyEvent *event){ int i = 0; switch (event->key()) { - case 0x01000030: // Turn left + case 0x01000032: // Turn left for(i = 0; i < m_vectorTabOrder.size();i++){ if(focusWidget() == m_vectorTabOrder[i]) break; } @@ -165,7 +165,7 @@ void ConfigLanguageDlg::keyReleaseEvent(QKeyEvent *event){ } break; } - case 0x01000032: // Turn right + case 0x01000030: // Turn right for(i = 0; i < m_vectorTabOrder.size();i++){ if(focusWidget() == m_vectorTabOrder[i]) break; } diff --git a/app/gui/oven_control/configmastervolumedlg.cpp b/app/gui/oven_control/configmastervolumedlg.cpp index 4e5b5a4..4eef98a 100644 --- a/app/gui/oven_control/configmastervolumedlg.cpp +++ b/app/gui/oven_control/configmastervolumedlg.cpp @@ -87,7 +87,7 @@ void ConfigVolumeDlg::keyPressEvent(QKeyEvent *event){ int i = 0; switch (event->key()) { - case 0x01000030: // Turn left + case 0x01000032: // Turn left for(i = 0; i < m_vectorTabOrder.size();i++){ if(focusWidget() == m_vectorTabOrder[i]) break; } @@ -108,7 +108,7 @@ void ConfigVolumeDlg::keyPressEvent(QKeyEvent *event){ case 0x01000031: // Push break; - case 0x01000032: // Turn right + case 0x01000030: // Turn right for(i = 0; i < m_vectorTabOrder.size();i++){ if(focusWidget() == m_vectorTabOrder[i]) break; } @@ -133,7 +133,7 @@ void ConfigVolumeDlg::keyReleaseEvent(QKeyEvent *event){ int i = 0; switch (event->key()) { - case 0x01000030: // Turn left + case 0x01000032: // Turn left for(i = 0; i < m_vectorTabOrder.size();i++){ if(focusWidget() == m_vectorTabOrder[i]) break; } @@ -159,7 +159,7 @@ void ConfigVolumeDlg::keyReleaseEvent(QKeyEvent *event){ } break; } - case 0x01000032: // Turn right + case 0x01000030: // Turn right for(i = 0; i < m_vectorTabOrder.size();i++){ if(focusWidget() == m_vectorTabOrder[i]) break; } diff --git a/app/gui/oven_control/configresttimeformatdlg.cpp b/app/gui/oven_control/configresttimeformatdlg.cpp index 3bd2033..202b939 100644 --- a/app/gui/oven_control/configresttimeformatdlg.cpp +++ b/app/gui/oven_control/configresttimeformatdlg.cpp @@ -83,7 +83,7 @@ void configResttimeFormatDlg::keyPressEvent(QKeyEvent *event){ int i = 0; switch (event->key()) { - case 0x01000030: // Turn left + case 0x01000032: // Turn left for(i = 0; i < m_vectorTabOrder.size();i++){ if(focusWidget() == m_vectorTabOrder[i]) break; } @@ -104,7 +104,7 @@ void configResttimeFormatDlg::keyPressEvent(QKeyEvent *event){ case 0x01000031: // Push break; - case 0x01000032: // Turn right + case 0x01000030: // Turn right for(i = 0; i < m_vectorTabOrder.size();i++){ if(focusWidget() == m_vectorTabOrder[i]) break; } @@ -129,7 +129,7 @@ void configResttimeFormatDlg::keyReleaseEvent(QKeyEvent *event){ int i = 0; switch (event->key()) { - case 0x01000030: // Turn left + case 0x01000032: // Turn left for(i = 0; i < m_vectorTabOrder.size();i++){ if(focusWidget() == m_vectorTabOrder[i]) break; } @@ -155,7 +155,7 @@ void configResttimeFormatDlg::keyReleaseEvent(QKeyEvent *event){ } break; } - case 0x01000032: // Turn right + case 0x01000030: // Turn right for(i = 0; i < m_vectorTabOrder.size();i++){ if(focusWidget() == m_vectorTabOrder[i]) break; } diff --git a/app/gui/oven_control/configsoundselelectdlg.cpp b/app/gui/oven_control/configsoundselelectdlg.cpp index 04dbd04..96b576e 100644 --- a/app/gui/oven_control/configsoundselelectdlg.cpp +++ b/app/gui/oven_control/configsoundselelectdlg.cpp @@ -154,7 +154,7 @@ void ConfigSoundSelelectDlg::keyPressEvent(QKeyEvent *event){ int i = 0; switch (event->key()) { - case 0x01000030: // Turn left + case 0x01000032: // Turn left for(i = 0; i < m_vectorTabOrder.size();i++){ if(focusWidget() == m_vectorTabOrder[i]) break; } @@ -175,7 +175,7 @@ void ConfigSoundSelelectDlg::keyPressEvent(QKeyEvent *event){ case 0x01000031: // Push break; - case 0x01000032: // Turn right + case 0x01000030: // Turn right for(i = 0; i < m_vectorTabOrder.size();i++){ if(focusWidget() == m_vectorTabOrder[i]) break; } @@ -200,7 +200,7 @@ void ConfigSoundSelelectDlg::keyReleaseEvent(QKeyEvent *event){ int i = 0; switch (event->key()) { - case 0x01000030: // Turn left + case 0x01000032: // Turn left for(i = 0; i < m_vectorTabOrder.size();i++){ if(focusWidget() == m_vectorTabOrder[i]) break; } @@ -226,7 +226,7 @@ void ConfigSoundSelelectDlg::keyReleaseEvent(QKeyEvent *event){ } break; } - case 0x01000032: // Turn right + case 0x01000030: // Turn right for(i = 0; i < m_vectorTabOrder.size();i++){ if(focusWidget() == m_vectorTabOrder[i]) break; } diff --git a/app/gui/oven_control/configtemptypedlg.cpp b/app/gui/oven_control/configtemptypedlg.cpp index 7373c9c..37cd26f 100644 --- a/app/gui/oven_control/configtemptypedlg.cpp +++ b/app/gui/oven_control/configtemptypedlg.cpp @@ -82,7 +82,7 @@ void ConfigTempTypeDlg::keyPressEvent(QKeyEvent *event){ int i = 0; switch (event->key()) { - case 0x01000030: // Turn left + case 0x01000032: // Turn left for(i = 0; i < m_vectorTabOrder.size();i++){ if(focusWidget() == m_vectorTabOrder[i]) break; } @@ -103,7 +103,7 @@ void ConfigTempTypeDlg::keyPressEvent(QKeyEvent *event){ case 0x01000031: // Push break; - case 0x01000032: // Turn right + case 0x01000030: // Turn right for(i = 0; i < m_vectorTabOrder.size();i++){ if(focusWidget() == m_vectorTabOrder[i]) break; } @@ -128,7 +128,7 @@ void ConfigTempTypeDlg::keyReleaseEvent(QKeyEvent *event){ int i = 0; switch (event->key()) { - case 0x01000030: // Turn left + case 0x01000032: // Turn left for(i = 0; i < m_vectorTabOrder.size();i++){ if(focusWidget() == m_vectorTabOrder[i]) break; } @@ -154,7 +154,7 @@ void ConfigTempTypeDlg::keyReleaseEvent(QKeyEvent *event){ } break; } - case 0x01000032: // Turn right + case 0x01000030: // Turn right for(i = 0; i < m_vectorTabOrder.size();i++){ if(focusWidget() == m_vectorTabOrder[i]) break; } diff --git a/app/gui/oven_control/configtimeformatdlg.cpp b/app/gui/oven_control/configtimeformatdlg.cpp index 3082917..511f3e5 100644 --- a/app/gui/oven_control/configtimeformatdlg.cpp +++ b/app/gui/oven_control/configtimeformatdlg.cpp @@ -86,7 +86,7 @@ void ConfigTimeFormatDlg::keyPressEvent(QKeyEvent *event){ int i = 0; switch (event->key()) { - case 0x01000030: // Turn left + case 0x01000032: // Turn left for(i = 0; i < m_vectorTabOrder.size();i++){ if(focusWidget() == m_vectorTabOrder[i]) break; } @@ -107,7 +107,7 @@ void ConfigTimeFormatDlg::keyPressEvent(QKeyEvent *event){ case 0x01000031: // Push break; - case 0x01000032: // Turn right + case 0x01000030: // Turn right for(i = 0; i < m_vectorTabOrder.size();i++){ if(focusWidget() == m_vectorTabOrder[i]) break; } @@ -132,7 +132,7 @@ void ConfigTimeFormatDlg::keyReleaseEvent(QKeyEvent *event){ int i = 0; switch (event->key()) { - case 0x01000030: // Turn left + case 0x01000032: // Turn left for(i = 0; i < m_vectorTabOrder.size();i++){ if(focusWidget() == m_vectorTabOrder[i]) break; } @@ -158,7 +158,7 @@ void ConfigTimeFormatDlg::keyReleaseEvent(QKeyEvent *event){ } break; } - case 0x01000032: // Turn right + case 0x01000030: // Turn right for(i = 0; i < m_vectorTabOrder.size();i++){ if(focusWidget() == m_vectorTabOrder[i]) break; } diff --git a/app/gui/oven_control/configwindow.cpp b/app/gui/oven_control/configwindow.cpp index c30046f..8b18d21 100644 --- a/app/gui/oven_control/configwindow.cpp +++ b/app/gui/oven_control/configwindow.cpp @@ -138,7 +138,7 @@ void ConfigWindow::nextFocus(){ void ConfigWindow::keyReleaseEvent(QKeyEvent *event){ switch (event->key()) { - case 0x01000030: // Turn left + case 0x01000032: // Turn left prevFocus(); ui->scrollArea->ensureWidgetVisible(m_vectorTabOrder[m_nTabIndex]); break; @@ -151,7 +151,7 @@ void ConfigWindow::keyReleaseEvent(QKeyEvent *event){ qDebug() << "pushed "; break; } - case 0x01000032: // Turn right + case 0x01000030: // Turn right nextFocus(); ui->scrollArea->ensureWidgetVisible(focusWidget()); qDebug() << "Turn Right"; @@ -162,7 +162,7 @@ void ConfigWindow::keyReleaseEvent(QKeyEvent *event){ void ConfigWindow::keyPressEvent(QKeyEvent *event){ switch (event->key()) { - case 0x01000030: // Turn left + case 0x01000032: // Turn left prevFocus(); ui->scrollArea->ensureWidgetVisible(focusWidget()); qDebug() << "turn left"; @@ -171,7 +171,7 @@ void ConfigWindow::keyPressEvent(QKeyEvent *event){ qDebug() << "pushed "; break; - case 0x01000032: // Turn right + case 0x01000030: // Turn right nextFocus(); ui->scrollArea->ensureWidgetVisible(focusWidget()); qDebug() << "Turn Right"; diff --git a/app/gui/oven_control/confirmpopup.cpp b/app/gui/oven_control/confirmpopup.cpp index 5b8f513..83e6d30 100644 --- a/app/gui/oven_control/confirmpopup.cpp +++ b/app/gui/oven_control/confirmpopup.cpp @@ -27,13 +27,13 @@ void ConfirmPopup::keyPressEvent(QKeyEvent *event) { switch (event->key()) { - case 0x01000030: // Turn left + case 0x01000032: // Turn left onEncoderLeft(); break; case 0x01000031: // Push pushed = focusWidget(); break; - case 0x01000032: // Turn right + case 0x01000030: // Turn right onEncoderRight(); break; } @@ -43,7 +43,7 @@ void ConfirmPopup::keyReleaseEvent(QKeyEvent *event) { switch (event->key()) { - case 0x01000030: // Turn left + case 0x01000032: // Turn left onEncoderLeft(); break; case 0x01000031: // Push @@ -52,7 +52,7 @@ void ConfirmPopup::keyReleaseEvent(QKeyEvent *event) pushed = NULL; break; - case 0x01000032: // Turn right + case 0x01000030: // Turn right onEncoderRight(); break; } diff --git a/app/gui/oven_control/cookpanelbutton.cpp b/app/gui/oven_control/cookpanelbutton.cpp index d6282c6..3b6725f 100644 --- a/app/gui/oven_control/cookpanelbutton.cpp +++ b/app/gui/oven_control/cookpanelbutton.cpp @@ -105,7 +105,7 @@ void CookPanelButton::keyPressEvent(QKeyEvent *event) { switch (event->key()) { - case 0x01000030: // Turn left + case 0x01000032: // Turn left event->ignore(); break; case 0x01000031: // Push @@ -113,7 +113,7 @@ void CookPanelButton::keyPressEvent(QKeyEvent *event) if (pushed == ui->pushButton) on_pushButton_pressed(); break; - case 0x01000032: // Turn right + case 0x01000030: // Turn right event->ignore(); break; } @@ -123,7 +123,7 @@ void CookPanelButton::keyReleaseEvent(QKeyEvent *event) { switch (event->key()) { - case 0x01000030: // Turn left + case 0x01000032: // Turn left event->ignore(); break; case 0x01000031: // Push @@ -135,7 +135,7 @@ void CookPanelButton::keyReleaseEvent(QKeyEvent *event) pushed = NULL; break; - case 0x01000032: // Turn right + case 0x01000030: // Turn right event->ignore(); break; } diff --git a/app/gui/oven_control/cooldownpopup.cpp b/app/gui/oven_control/cooldownpopup.cpp index b08ca7a..658e124 100644 --- a/app/gui/oven_control/cooldownpopup.cpp +++ b/app/gui/oven_control/cooldownpopup.cpp @@ -78,13 +78,13 @@ void CooldownPopup::keyPressEvent(QKeyEvent *event) { switch (event->key()) { - case 0x01000030: // Turn left + case 0x01000032: // Turn left onEncoderLeft(); break; case 0x01000031: // Push pushed = focusWidget(); break; - case 0x01000032: // Turn right + case 0x01000030: // Turn right onEncoderRight(); break; } @@ -94,7 +94,7 @@ void CooldownPopup::keyReleaseEvent(QKeyEvent *event) { switch (event->key()) { - case 0x01000030: // Turn left + case 0x01000032: // Turn left onEncoderLeft(); break; case 0x01000031: // Push @@ -103,7 +103,7 @@ void CooldownPopup::keyReleaseEvent(QKeyEvent *event) pushed = NULL; break; - case 0x01000032: // Turn right + case 0x01000030: // Turn right onEncoderRight(); break; } diff --git a/app/gui/oven_control/coretempsettingpopup.cpp b/app/gui/oven_control/coretempsettingpopup.cpp index 619ef77..6626ec2 100644 --- a/app/gui/oven_control/coretempsettingpopup.cpp +++ b/app/gui/oven_control/coretempsettingpopup.cpp @@ -98,13 +98,13 @@ void CoreTempSettingPopup::keyPressEvent(QKeyEvent *event) { switch (event->key()) { - case 0x01000030: // Turn left + case 0x01000032: // Turn left onEncoderLeft(); break; case 0x01000031: // Push pushed = focusWidget(); break; - case 0x01000032: // Turn right + case 0x01000030: // Turn right onEncoderRight(); break; } @@ -114,7 +114,7 @@ void CoreTempSettingPopup::keyReleaseEvent(QKeyEvent *event) { switch (event->key()) { - case 0x01000030: // Turn left + case 0x01000032: // Turn left onEncoderLeft(); break; case 0x01000031: // Push @@ -123,7 +123,7 @@ void CoreTempSettingPopup::keyReleaseEvent(QKeyEvent *event) pushed = NULL; break; - case 0x01000032: // Turn right + case 0x01000030: // Turn right onEncoderRight(); break; } diff --git a/app/gui/oven_control/electricmodelsettingwindow.cpp b/app/gui/oven_control/electricmodelsettingwindow.cpp index a6bb6ca..bb7f9d9 100644 --- a/app/gui/oven_control/electricmodelsettingwindow.cpp +++ b/app/gui/oven_control/electricmodelsettingwindow.cpp @@ -108,7 +108,7 @@ void ElectricModelSettingWindow::keyPressEvent(QKeyEvent *event){ int i = 0; switch (event->key()) { - case 0x01000030: // Turn left + case 0x01000032: // Turn left for(i = 0; i < m_vectorTabOrder.size();i++){ if(focusWidget() == m_vectorTabOrder[i]) break; } @@ -129,7 +129,7 @@ void ElectricModelSettingWindow::keyPressEvent(QKeyEvent *event){ case 0x01000031: // Push break; - case 0x01000032: // Turn right + case 0x01000030: // Turn right for(i = 0; i < m_vectorTabOrder.size();i++){ if(focusWidget() == m_vectorTabOrder[i]) break; } @@ -154,7 +154,7 @@ void ElectricModelSettingWindow::keyReleaseEvent(QKeyEvent *event){ int i = 0; switch (event->key()) { - case 0x01000030: // Turn left + case 0x01000032: // Turn left for(i = 0; i < m_vectorTabOrder.size();i++){ if(focusWidget() == m_vectorTabOrder[i]) break; } @@ -180,7 +180,7 @@ void ElectricModelSettingWindow::keyReleaseEvent(QKeyEvent *event){ } break; } - case 0x01000032: // Turn right + case 0x01000030: // Turn right for(i = 0; i < m_vectorTabOrder.size();i++){ if(focusWidget() == m_vectorTabOrder[i]) break; } diff --git a/app/gui/oven_control/engineermenuwindow.cpp b/app/gui/oven_control/engineermenuwindow.cpp index f1b759a..dfe2629 100644 --- a/app/gui/oven_control/engineermenuwindow.cpp +++ b/app/gui/oven_control/engineermenuwindow.cpp @@ -39,13 +39,13 @@ void EngineerMenuWindow::keyPressEvent(QKeyEvent *event) { switch (event->key()) { - case 0x01000030: // Turn left + case 0x01000032: // Turn left onEncoderLeft(); break; case 0x01000031: // Push pushed = focusWidget(); break; - case 0x01000032: // Turn right + case 0x01000030: // Turn right onEncoderRight(); break; } @@ -55,7 +55,7 @@ void EngineerMenuWindow::keyReleaseEvent(QKeyEvent *event) { switch (event->key()) { - case 0x01000030: // Turn left + case 0x01000032: // Turn left onEncoderLeft(); break; case 0x01000031: // Push @@ -64,7 +64,7 @@ void EngineerMenuWindow::keyReleaseEvent(QKeyEvent *event) pushed = NULL; break; - case 0x01000032: // Turn right + case 0x01000030: // Turn right onEncoderRight(); break; } diff --git a/app/gui/oven_control/fantestwindow.cpp b/app/gui/oven_control/fantestwindow.cpp index 0127eab..e45a38a 100644 --- a/app/gui/oven_control/fantestwindow.cpp +++ b/app/gui/oven_control/fantestwindow.cpp @@ -44,13 +44,13 @@ void FanTestWindow::keyPressEvent(QKeyEvent *event) { switch (event->key()) { - case 0x01000030: // Turn left + case 0x01000032: // Turn left onEncoderLeft(); break; case 0x01000031: // Push pushed = focusWidget(); break; - case 0x01000032: // Turn right + case 0x01000030: // Turn right onEncoderRight(); break; } @@ -60,7 +60,7 @@ void FanTestWindow::keyReleaseEvent(QKeyEvent *event) { switch (event->key()) { - case 0x01000030: // Turn left + case 0x01000032: // Turn left onEncoderLeft(); break; case 0x01000031: // Push @@ -69,7 +69,7 @@ void FanTestWindow::keyReleaseEvent(QKeyEvent *event) pushed = NULL; break; - case 0x01000032: // Turn right + case 0x01000030: // Turn right onEncoderRight(); break; } diff --git a/app/gui/oven_control/favoritenamepopup.cpp b/app/gui/oven_control/favoritenamepopup.cpp index 664c84e..133f7fe 100644 --- a/app/gui/oven_control/favoritenamepopup.cpp +++ b/app/gui/oven_control/favoritenamepopup.cpp @@ -61,13 +61,13 @@ void FavoriteNamePopup::keyPressEvent(QKeyEvent *event) { switch (event->key()) { - case 0x01000030: // Turn left + case 0x01000032: // Turn left onEncoderLeft(); break; case 0x01000031: // Push pushed = focusWidget(); break; - case 0x01000032: // Turn right + case 0x01000030: // Turn right onEncoderRight(); break; } @@ -77,7 +77,7 @@ void FavoriteNamePopup::keyReleaseEvent(QKeyEvent *event) { switch (event->key()) { - case 0x01000030: // Turn left + case 0x01000032: // Turn left onEncoderLeft(); break; case 0x01000031: // Push @@ -86,7 +86,7 @@ void FavoriteNamePopup::keyReleaseEvent(QKeyEvent *event) pushed = NULL; break; - case 0x01000032: // Turn right + case 0x01000030: // Turn right onEncoderRight(); break; } diff --git a/app/gui/oven_control/functiontestwindow.cpp b/app/gui/oven_control/functiontestwindow.cpp index 189d3d3..c9b2a67 100644 --- a/app/gui/oven_control/functiontestwindow.cpp +++ b/app/gui/oven_control/functiontestwindow.cpp @@ -35,13 +35,13 @@ void FunctionTestWindow::keyPressEvent(QKeyEvent *event) { switch (event->key()) { - case 0x01000030: // Turn left + case 0x01000032: // Turn left onEncoderLeft(); break; case 0x01000031: // Push pushed = focusWidget(); break; - case 0x01000032: // Turn right + case 0x01000030: // Turn right onEncoderRight(); break; } @@ -51,7 +51,7 @@ void FunctionTestWindow::keyReleaseEvent(QKeyEvent *event) { switch (event->key()) { - case 0x01000030: // Turn left + case 0x01000032: // Turn left onEncoderLeft(); break; case 0x01000031: // Push @@ -60,7 +60,7 @@ void FunctionTestWindow::keyReleaseEvent(QKeyEvent *event) pushed = NULL; break; - case 0x01000032: // Turn right + case 0x01000030: // Turn right onEncoderRight(); break; } diff --git a/app/gui/oven_control/gasmodelsettingwindow.cpp b/app/gui/oven_control/gasmodelsettingwindow.cpp index df0db15..a134eb7 100644 --- a/app/gui/oven_control/gasmodelsettingwindow.cpp +++ b/app/gui/oven_control/gasmodelsettingwindow.cpp @@ -147,7 +147,7 @@ void GasModelSettingWindow::keyPressEvent(QKeyEvent *event){ int i = 0; switch (event->key()) { - case 0x01000030: // Turn left + case 0x01000032: // Turn left for(i = 0; i < m_vectorTabOrder.size();i++){ if(focusWidget() == m_vectorTabOrder[i]) break; } @@ -168,7 +168,7 @@ void GasModelSettingWindow::keyPressEvent(QKeyEvent *event){ case 0x01000031: // Push break; - case 0x01000032: // Turn right + case 0x01000030: // Turn right for(i = 0; i < m_vectorTabOrder.size();i++){ if(focusWidget() == m_vectorTabOrder[i]) break; } @@ -193,7 +193,7 @@ void GasModelSettingWindow::keyReleaseEvent(QKeyEvent *event){ int i = 0; switch (event->key()) { - case 0x01000030: // Turn left + case 0x01000032: // Turn left for(i = 0; i < m_vectorTabOrder.size();i++){ if(focusWidget() == m_vectorTabOrder[i]) break; } @@ -219,7 +219,7 @@ void GasModelSettingWindow::keyReleaseEvent(QKeyEvent *event){ } break; } - case 0x01000032: // Turn right + case 0x01000030: // Turn right for(i = 0; i < m_vectorTabOrder.size();i++){ if(focusWidget() == m_vectorTabOrder[i]) break; } diff --git a/app/gui/oven_control/gastestwindow.cpp b/app/gui/oven_control/gastestwindow.cpp index 4d3060c..03d649b 100644 --- a/app/gui/oven_control/gastestwindow.cpp +++ b/app/gui/oven_control/gastestwindow.cpp @@ -29,13 +29,13 @@ void GasTestWindow::keyPressEvent(QKeyEvent *event) { switch (event->key()) { - case 0x01000030: // Turn left + case 0x01000032: // Turn left onEncoderLeft(); break; case 0x01000031: // Push pushed = focusWidget(); break; - case 0x01000032: // Turn right + case 0x01000030: // Turn right onEncoderRight(); break; } @@ -45,7 +45,7 @@ void GasTestWindow::keyReleaseEvent(QKeyEvent *event) { switch (event->key()) { - case 0x01000030: // Turn left + case 0x01000032: // Turn left onEncoderLeft(); break; case 0x01000031: // Push @@ -54,7 +54,7 @@ void GasTestWindow::keyReleaseEvent(QKeyEvent *event) pushed = NULL; break; - case 0x01000032: // Turn right + case 0x01000030: // Turn right onEncoderRight(); break; } diff --git a/app/gui/oven_control/historylistwindow.cpp b/app/gui/oven_control/historylistwindow.cpp index 345f09b..9edba44 100644 --- a/app/gui/oven_control/historylistwindow.cpp +++ b/app/gui/oven_control/historylistwindow.cpp @@ -368,12 +368,12 @@ void HistoryListWindow::keyPressEvent(QKeyEvent *event) { switch (event->key()) { - case 0x01000030: // Turn left + case 0x01000032: // Turn left focusPreviousChild(); break; case 0x01000031: // Push break; - case 0x01000032: // Turn right + case 0x01000030: // Turn right focusNextChild(); break; } @@ -383,7 +383,7 @@ void HistoryListWindow::keyReleaseEvent(QKeyEvent *event) { switch (event->key()) { - case 0x01000030: // Turn left + case 0x01000032: // Turn left focusPreviousChild(); break; case 0x01000031: // Push @@ -394,7 +394,7 @@ void HistoryListWindow::keyReleaseEvent(QKeyEvent *event) } break; } - case 0x01000032: // Turn right + case 0x01000030: // Turn right focusNextChild(); break; } diff --git a/app/gui/oven_control/keepwarmpopup.cpp b/app/gui/oven_control/keepwarmpopup.cpp index 4fef6f4..751dcdd 100644 --- a/app/gui/oven_control/keepwarmpopup.cpp +++ b/app/gui/oven_control/keepwarmpopup.cpp @@ -26,13 +26,13 @@ void KeepWarmPopup::keyPressEvent(QKeyEvent *event) { switch (event->key()) { - case 0x01000030: // Turn left + case 0x01000032: // Turn left onEncoderLeft(); break; case 0x01000031: // Push pushed = focusWidget(); break; - case 0x01000032: // Turn right + case 0x01000030: // Turn right onEncoderRight(); break; } @@ -42,7 +42,7 @@ void KeepWarmPopup::keyReleaseEvent(QKeyEvent *event) { switch (event->key()) { - case 0x01000030: // Turn left + case 0x01000032: // Turn left onEncoderLeft(); break; case 0x01000031: // Push @@ -51,7 +51,7 @@ void KeepWarmPopup::keyReleaseEvent(QKeyEvent *event) pushed = NULL; break; - case 0x01000032: // Turn right + case 0x01000030: // Turn right onEncoderRight(); break; } diff --git a/app/gui/oven_control/keyboardwidget.cpp b/app/gui/oven_control/keyboardwidget.cpp index 2d2b736..2eb422d 100644 --- a/app/gui/oven_control/keyboardwidget.cpp +++ b/app/gui/oven_control/keyboardwidget.cpp @@ -251,14 +251,14 @@ void KeyboardWidget::on_pushButton_40_clicked() void KeyboardWidget::keyPressEvent(QKeyEvent *event){ switch (event->key()) { - case 0x01000030: // Turn left + case 0x01000032: // Turn left if(m_nCurTabPos > 0 ) m_nCurTabPos--; else m_nCurTabPos = m_vectorTabOrder.size()-1; if(m_pCurCheckedBtn !=NULL) m_pCurCheckedBtn->setChecked(false); m_pCurCheckedBtn = m_vectorTabOrder[m_nCurTabPos]; m_pCurCheckedBtn->setChecked(true); break; - case 0x01000032: // Turn right + case 0x01000030: // Turn right if(m_nCurTabPos < (m_vectorTabOrder.size() -1)) m_nCurTabPos++; else m_nCurTabPos=0; if(m_pCurCheckedBtn !=NULL) m_pCurCheckedBtn->setChecked(false); @@ -271,7 +271,7 @@ void KeyboardWidget::keyPressEvent(QKeyEvent *event){ void KeyboardWidget::keyReleaseEvent(QKeyEvent *event){ switch (event->key()) { - case 0x01000030: // Turn left + case 0x01000032: // Turn left if(m_nCurTabPos > 0 ) m_nCurTabPos--; else m_nCurTabPos = m_vectorTabOrder.size()-1; if(m_pCurCheckedBtn !=NULL) m_pCurCheckedBtn->setChecked(false); @@ -285,7 +285,7 @@ void KeyboardWidget::keyReleaseEvent(QKeyEvent *event){ } break; } - case 0x01000032: // Turn right + case 0x01000030: // Turn right if(m_nCurTabPos < (m_vectorTabOrder.size() -1)) m_nCurTabPos++; else m_nCurTabPos=0; if(m_pCurCheckedBtn !=NULL) m_pCurCheckedBtn->setChecked(false); diff --git a/app/gui/oven_control/mainwindow.cpp b/app/gui/oven_control/mainwindow.cpp index ea6c70f..5f869bb 100644 --- a/app/gui/oven_control/mainwindow.cpp +++ b/app/gui/oven_control/mainwindow.cpp @@ -58,13 +58,13 @@ void MainWindow::keyPressEvent(QKeyEvent *event) { switch (event->key()) { - case 0x01000030: // Turn left + case 0x01000032: // Turn left onEncoderLeft(); break; case 0x01000031: // Push pushed = focusWidget(); break; - case 0x01000032: // Turn right + case 0x01000030: // Turn right onEncoderRight(); break; } @@ -74,7 +74,7 @@ void MainWindow::keyReleaseEvent(QKeyEvent *event) { switch (event->key()) { - case 0x01000030: // Turn left + case 0x01000032: // Turn left onEncoderLeft(); break; case 0x01000031: // Push @@ -83,7 +83,7 @@ void MainWindow::keyReleaseEvent(QKeyEvent *event) pushed = NULL; break; - case 0x01000032: // Turn right + case 0x01000030: // Turn right onEncoderRight(); break; } diff --git a/app/gui/oven_control/manualcooksettingwidget.cpp b/app/gui/oven_control/manualcooksettingwidget.cpp index 38e9193..a30b023 100644 --- a/app/gui/oven_control/manualcooksettingwidget.cpp +++ b/app/gui/oven_control/manualcooksettingwidget.cpp @@ -117,13 +117,13 @@ void ManualCookSettingWidget::keyPressEvent(QKeyEvent *event) { switch (event->key()) { - case 0x01000030: // Turn left + case 0x01000032: // Turn left onEncoderLeft(); break; case 0x01000031: // Push pushed = focusWidget(); break; - case 0x01000032: // Turn right + case 0x01000030: // Turn right onEncoderRight(); break; } @@ -133,7 +133,7 @@ void ManualCookSettingWidget::keyReleaseEvent(QKeyEvent *event) { switch (event->key()) { - case 0x01000030: // Turn left + case 0x01000032: // Turn left onEncoderLeft(); break; case 0x01000031: // Push @@ -142,7 +142,7 @@ void ManualCookSettingWidget::keyReleaseEvent(QKeyEvent *event) pushed = NULL; break; - case 0x01000032: // Turn right + case 0x01000030: // Turn right onEncoderRight(); break; } diff --git a/app/gui/oven_control/manualcookwindow.cpp b/app/gui/oven_control/manualcookwindow.cpp index 4a495c5..dd79094 100644 --- a/app/gui/oven_control/manualcookwindow.cpp +++ b/app/gui/oven_control/manualcookwindow.cpp @@ -187,7 +187,7 @@ void ManualCookWindow::keyPressEvent(QKeyEvent *event) { switch (event->key()) { - case 0x01000030: // Turn left + case 0x01000032: // Turn left onEncoderLeft(); break; case 0x01000031: // Push @@ -202,7 +202,7 @@ void ManualCookWindow::keyPressEvent(QKeyEvent *event) } break; - case 0x01000032: // Turn right + case 0x01000030: // Turn right onEncoderRight(); break; } @@ -212,7 +212,7 @@ void ManualCookWindow::keyReleaseEvent(QKeyEvent *event) { switch (event->key()) { - case 0x01000030: // Turn left + case 0x01000032: // Turn left onEncoderLeft(); break; case 0x01000031: // Push @@ -226,7 +226,7 @@ void ManualCookWindow::keyReleaseEvent(QKeyEvent *event) pushed = NULL; break; - case 0x01000032: // Turn right + case 0x01000030: // Turn right onEncoderRight(); break; } diff --git a/app/gui/oven_control/modelsettingwindow.cpp b/app/gui/oven_control/modelsettingwindow.cpp index 2405dd5..38e56a9 100644 --- a/app/gui/oven_control/modelsettingwindow.cpp +++ b/app/gui/oven_control/modelsettingwindow.cpp @@ -29,13 +29,13 @@ void ModelSettingWindow::keyPressEvent(QKeyEvent *event) { switch (event->key()) { - case 0x01000030: // Turn left + case 0x01000032: // Turn left onEncoderLeft(); break; case 0x01000031: // Push pushed = focusWidget(); break; - case 0x01000032: // Turn right + case 0x01000030: // Turn right onEncoderRight(); break; } @@ -45,7 +45,7 @@ void ModelSettingWindow::keyReleaseEvent(QKeyEvent *event) { switch (event->key()) { - case 0x01000030: // Turn left + case 0x01000032: // Turn left onEncoderLeft(); break; case 0x01000031: // Push @@ -54,7 +54,7 @@ void ModelSettingWindow::keyReleaseEvent(QKeyEvent *event) pushed = NULL; break; - case 0x01000032: // Turn right + case 0x01000030: // Turn right onEncoderRight(); break; } diff --git a/app/gui/oven_control/operationtimeheat.cpp b/app/gui/oven_control/operationtimeheat.cpp index 128f783..ea8a498 100644 --- a/app/gui/oven_control/operationtimeheat.cpp +++ b/app/gui/oven_control/operationtimeheat.cpp @@ -74,12 +74,12 @@ void OperationTimeHeat::keyPressEvent(QKeyEvent *event) { switch (event->key()) { - case 0x01000030: // Turn left + case 0x01000032: // Turn left focusPreviousChild(); break; case 0x01000031: // Push break; - case 0x01000032: // Turn right + case 0x01000030: // Turn right focusNextChild(); break; } @@ -89,7 +89,7 @@ void OperationTimeHeat::keyReleaseEvent(QKeyEvent *event) { switch (event->key()) { - case 0x01000030: // Turn left + case 0x01000032: // Turn left focusPreviousChild(); break; case 0x01000031: // Push @@ -100,7 +100,7 @@ void OperationTimeHeat::keyReleaseEvent(QKeyEvent *event) } break; } - case 0x01000032: // Turn right + case 0x01000030: // Turn right focusNextChild(); break; } diff --git a/app/gui/oven_control/operationtimemain.cpp b/app/gui/oven_control/operationtimemain.cpp index 64d6a3f..1d9bc05 100644 --- a/app/gui/oven_control/operationtimemain.cpp +++ b/app/gui/oven_control/operationtimemain.cpp @@ -54,12 +54,12 @@ void OperationTimeMain::keyPressEvent(QKeyEvent *event) { switch (event->key()) { - case 0x01000030: // Turn left + case 0x01000032: // Turn left focusPreviousChild(); break; case 0x01000031: // Push break; - case 0x01000032: // Turn right + case 0x01000030: // Turn right focusNextChild(); break; } @@ -69,7 +69,7 @@ void OperationTimeMain::keyReleaseEvent(QKeyEvent *event) { switch (event->key()) { - case 0x01000030: // Turn left + case 0x01000032: // Turn left focusPreviousChild(); break; case 0x01000031: // Push @@ -80,7 +80,7 @@ void OperationTimeMain::keyReleaseEvent(QKeyEvent *event) } break; } - case 0x01000032: // Turn right + case 0x01000030: // Turn right focusNextChild(); break; } diff --git a/app/gui/oven_control/operationtimemode.cpp b/app/gui/oven_control/operationtimemode.cpp index f8dffe8..f52205b 100644 --- a/app/gui/oven_control/operationtimemode.cpp +++ b/app/gui/oven_control/operationtimemode.cpp @@ -102,12 +102,12 @@ void OperationTimeMode::keyPressEvent(QKeyEvent *event) { switch (event->key()) { - case 0x01000030: // Turn left + case 0x01000032: // Turn left focusPreviousChild(); break; case 0x01000031: // Push break; - case 0x01000032: // Turn right + case 0x01000030: // Turn right focusNextChild(); break; } @@ -117,7 +117,7 @@ void OperationTimeMode::keyReleaseEvent(QKeyEvent *event) { switch (event->key()) { - case 0x01000030: // Turn left + case 0x01000032: // Turn left focusPreviousChild(); break; case 0x01000031: // Push @@ -128,7 +128,7 @@ void OperationTimeMode::keyReleaseEvent(QKeyEvent *event) } break; } - case 0x01000032: // Turn right + case 0x01000030: // Turn right focusNextChild(); break; } diff --git a/app/gui/oven_control/operationtimeparts.cpp b/app/gui/oven_control/operationtimeparts.cpp index 0a012c2..70dfb47 100644 --- a/app/gui/oven_control/operationtimeparts.cpp +++ b/app/gui/oven_control/operationtimeparts.cpp @@ -119,12 +119,12 @@ void OperationTimeParts::keyPressEvent(QKeyEvent *event) { switch (event->key()) { - case 0x01000030: // Turn left + case 0x01000032: // Turn left focusPreviousChild(); break; case 0x01000031: // Push break; - case 0x01000032: // Turn right + case 0x01000030: // Turn right focusNextChild(); break; } @@ -134,7 +134,7 @@ void OperationTimeParts::keyReleaseEvent(QKeyEvent *event) { switch (event->key()) { - case 0x01000030: // Turn left + case 0x01000032: // Turn left focusPreviousChild(); break; case 0x01000031: // Push @@ -145,7 +145,7 @@ void OperationTimeParts::keyReleaseEvent(QKeyEvent *event) } break; } - case 0x01000032: // Turn right + case 0x01000030: // Turn right focusNextChild(); break; } diff --git a/app/gui/oven_control/preheatpopup.cpp b/app/gui/oven_control/preheatpopup.cpp index ded25aa..3641c1b 100644 --- a/app/gui/oven_control/preheatpopup.cpp +++ b/app/gui/oven_control/preheatpopup.cpp @@ -48,13 +48,13 @@ void PreheatPopup::keyReleaseEvent(QKeyEvent *event) { switch (event->key()) { - case 0x01000030: // Turn left + case 0x01000032: // Turn left break; case 0x01000031: // Push stop(); close(); break; - case 0x01000032: // Turn right + case 0x01000030: // Turn right break; } } diff --git a/app/gui/oven_control/primewindow.cpp b/app/gui/oven_control/primewindow.cpp index 6412b06..c16b60a 100644 --- a/app/gui/oven_control/primewindow.cpp +++ b/app/gui/oven_control/primewindow.cpp @@ -107,13 +107,13 @@ void PrimeWindow::keyPressEvent(QKeyEvent *event) { switch (event->key()) { - case 0x01000030: // Turn left + case 0x01000032: // Turn left onEncoderLeft(); break; case 0x01000031: // Push pushed = focusWidget(); break; - case 0x01000032: // Turn right + case 0x01000030: // Turn right onEncoderRight(); break; } @@ -123,7 +123,7 @@ void PrimeWindow::keyReleaseEvent(QKeyEvent *event) { switch (event->key()) { - case 0x01000030: // Turn left + case 0x01000032: // Turn left onEncoderLeft(); break; case 0x01000031: // Push @@ -132,7 +132,7 @@ void PrimeWindow::keyReleaseEvent(QKeyEvent *event) pushed = NULL; break; - case 0x01000032: // Turn right + case 0x01000030: // Turn right onEncoderRight(); break; } diff --git a/app/gui/oven_control/programmedcookpanelbutton.cpp b/app/gui/oven_control/programmedcookpanelbutton.cpp index b519821..aa27573 100644 --- a/app/gui/oven_control/programmedcookpanelbutton.cpp +++ b/app/gui/oven_control/programmedcookpanelbutton.cpp @@ -86,7 +86,7 @@ void ProgrammedCookPanelButton::keyPressEvent(QKeyEvent *event) { switch (event->key()) { - case 0x01000030: // Turn left + case 0x01000032: // Turn left event->ignore(); break; case 0x01000031: // Push @@ -94,7 +94,7 @@ void ProgrammedCookPanelButton::keyPressEvent(QKeyEvent *event) if (pushed == ui->pushButton) on_pushButton_pressed(); break; - case 0x01000032: // Turn right + case 0x01000030: // Turn right event->ignore(); break; } @@ -104,7 +104,7 @@ void ProgrammedCookPanelButton::keyReleaseEvent(QKeyEvent *event) { switch (event->key()) { - case 0x01000030: // Turn left + case 0x01000032: // Turn left event->ignore(); break; case 0x01000031: // Push @@ -116,7 +116,7 @@ void ProgrammedCookPanelButton::keyReleaseEvent(QKeyEvent *event) pushed = NULL; break; - case 0x01000032: // Turn right + case 0x01000030: // Turn right event->ignore(); break; } diff --git a/app/gui/oven_control/programmingautoconfigwindow.cpp b/app/gui/oven_control/programmingautoconfigwindow.cpp index dd82be2..eac9400 100644 --- a/app/gui/oven_control/programmingautoconfigwindow.cpp +++ b/app/gui/oven_control/programmingautoconfigwindow.cpp @@ -107,13 +107,13 @@ void ProgrammingAutoConfigWindow::keyPressEvent(QKeyEvent *event) { switch (event->key()) { - case 0x01000030: // Turn left + case 0x01000032: // Turn left onEncoderLeft(); break; case 0x01000031: // Push pushed = focusWidget(); break; - case 0x01000032: // Turn right + case 0x01000030: // Turn right onEncoderRight(); break; } @@ -123,7 +123,7 @@ void ProgrammingAutoConfigWindow::keyReleaseEvent(QKeyEvent *event) { switch (event->key()) { - case 0x01000030: // Turn left + case 0x01000032: // Turn left onEncoderLeft(); break; case 0x01000031: // Push @@ -132,7 +132,7 @@ void ProgrammingAutoConfigWindow::keyReleaseEvent(QKeyEvent *event) pushed = NULL; break; - case 0x01000032: // Turn right + case 0x01000030: // Turn right onEncoderRight(); break; } diff --git a/app/gui/oven_control/programmingautoselectionwindow.cpp b/app/gui/oven_control/programmingautoselectionwindow.cpp index 6b5c7a3..31b372a 100644 --- a/app/gui/oven_control/programmingautoselectionwindow.cpp +++ b/app/gui/oven_control/programmingautoselectionwindow.cpp @@ -80,13 +80,13 @@ void ProgrammingAutoSelectionWindow::keyPressEvent(QKeyEvent *event) { switch (event->key()) { - case 0x01000030: // Turn left + case 0x01000032: // Turn left onEncoderLeft(); break; case 0x01000031: // Push pushed = focusWidget(); break; - case 0x01000032: // Turn right + case 0x01000030: // Turn right onEncoderRight(); break; } @@ -96,7 +96,7 @@ void ProgrammingAutoSelectionWindow::keyReleaseEvent(QKeyEvent *event) { switch (event->key()) { - case 0x01000030: // Turn left + case 0x01000032: // Turn left onEncoderLeft(); break; case 0x01000031: // Push @@ -105,7 +105,7 @@ void ProgrammingAutoSelectionWindow::keyReleaseEvent(QKeyEvent *event) pushed = NULL; break; - case 0x01000032: // Turn right + case 0x01000030: // Turn right onEncoderRight(); break; } diff --git a/app/gui/oven_control/programmingmanualcoretemppopup.cpp b/app/gui/oven_control/programmingmanualcoretemppopup.cpp index 23c6b24..e82d0a2 100644 --- a/app/gui/oven_control/programmingmanualcoretemppopup.cpp +++ b/app/gui/oven_control/programmingmanualcoretemppopup.cpp @@ -77,13 +77,13 @@ void ProgrammingManualCoreTempPopup::keyPressEvent(QKeyEvent *event) { switch (event->key()) { - case 0x01000030: // Turn left + case 0x01000032: // Turn left onEncoderLeft(); break; case 0x01000031: // Push pushed = focusWidget(); break; - case 0x01000032: // Turn right + case 0x01000030: // Turn right onEncoderRight(); break; } @@ -93,7 +93,7 @@ void ProgrammingManualCoreTempPopup::keyReleaseEvent(QKeyEvent *event) { switch (event->key()) { - case 0x01000030: // Turn left + case 0x01000032: // Turn left onEncoderLeft(); break; case 0x01000031: // Push @@ -102,7 +102,7 @@ void ProgrammingManualCoreTempPopup::keyReleaseEvent(QKeyEvent *event) pushed = NULL; break; - case 0x01000032: // Turn right + case 0x01000030: // Turn right onEncoderRight(); break; } diff --git a/app/gui/oven_control/programmingmanualwindow.cpp b/app/gui/oven_control/programmingmanualwindow.cpp index b8ef4d6..a6dbb01 100644 --- a/app/gui/oven_control/programmingmanualwindow.cpp +++ b/app/gui/oven_control/programmingmanualwindow.cpp @@ -109,13 +109,13 @@ void ProgrammingManualWindow::keyPressEvent(QKeyEvent *event) { switch (event->key()) { - case 0x01000030: // Turn left + case 0x01000032: // Turn left onEncoderLeft(); break; case 0x01000031: // Push pushed = focusWidget(); break; - case 0x01000032: // Turn right + case 0x01000030: // Turn right onEncoderRight(); break; } @@ -125,7 +125,7 @@ void ProgrammingManualWindow::keyReleaseEvent(QKeyEvent *event) { switch (event->key()) { - case 0x01000030: // Turn left + case 0x01000032: // Turn left onEncoderLeft(); break; case 0x01000031: // Push @@ -134,7 +134,7 @@ void ProgrammingManualWindow::keyReleaseEvent(QKeyEvent *event) pushed = NULL; break; - case 0x01000032: // Turn right + case 0x01000030: // Turn right onEncoderRight(); break; } diff --git a/app/gui/oven_control/programmingnamepopup.cpp b/app/gui/oven_control/programmingnamepopup.cpp index f7e5e49..6f1b29d 100644 --- a/app/gui/oven_control/programmingnamepopup.cpp +++ b/app/gui/oven_control/programmingnamepopup.cpp @@ -51,13 +51,13 @@ void ProgrammingNamePopup::keyPressEvent(QKeyEvent *event) { switch (event->key()) { - case 0x01000030: // Turn left + case 0x01000032: // Turn left onEncoderLeft(); break; case 0x01000031: // Push pushed = focusWidget(); break; - case 0x01000032: // Turn right + case 0x01000030: // Turn right onEncoderRight(); break; } @@ -67,7 +67,7 @@ void ProgrammingNamePopup::keyReleaseEvent(QKeyEvent *event) { switch (event->key()) { - case 0x01000030: // Turn left + case 0x01000032: // Turn left onEncoderLeft(); break; case 0x01000031: // Push @@ -76,7 +76,7 @@ void ProgrammingNamePopup::keyReleaseEvent(QKeyEvent *event) pushed = NULL; break; - case 0x01000032: // Turn right + case 0x01000030: // Turn right onEncoderRight(); break; } diff --git a/app/gui/oven_control/programmingselectionwindow.cpp b/app/gui/oven_control/programmingselectionwindow.cpp index 8b11613..1a77962 100644 --- a/app/gui/oven_control/programmingselectionwindow.cpp +++ b/app/gui/oven_control/programmingselectionwindow.cpp @@ -51,13 +51,13 @@ void ProgrammingSelectionWindow::keyPressEvent(QKeyEvent *event) { switch (event->key()) { - case 0x01000030: // Turn left + case 0x01000032: // Turn left onEncoderLeft(); break; case 0x01000031: // Push pushed = focusWidget(); break; - case 0x01000032: // Turn right + case 0x01000030: // Turn right onEncoderRight(); break; } @@ -67,7 +67,7 @@ void ProgrammingSelectionWindow::keyReleaseEvent(QKeyEvent *event) { switch (event->key()) { - case 0x01000030: // Turn left + case 0x01000032: // Turn left onEncoderLeft(); break; case 0x01000031: // Push @@ -76,7 +76,7 @@ void ProgrammingSelectionWindow::keyReleaseEvent(QKeyEvent *event) pushed = NULL; break; - case 0x01000032: // Turn right + case 0x01000030: // Turn right onEncoderRight(); break; } diff --git a/app/gui/oven_control/programmingwindow.cpp b/app/gui/oven_control/programmingwindow.cpp index a32e559..1e2d259 100644 --- a/app/gui/oven_control/programmingwindow.cpp +++ b/app/gui/oven_control/programmingwindow.cpp @@ -69,13 +69,13 @@ void ProgrammingWindow::keyPressEvent(QKeyEvent *event) { switch (event->key()) { - case 0x01000030: // Turn left + case 0x01000032: // Turn left onEncoderLeft(); break; case 0x01000031: // Push pushed = focusWidget(); break; - case 0x01000032: // Turn right + case 0x01000030: // Turn right onEncoderRight(); break; } @@ -85,7 +85,7 @@ void ProgrammingWindow::keyReleaseEvent(QKeyEvent *event) { switch (event->key()) { - case 0x01000030: // Turn left + case 0x01000032: // Turn left onEncoderLeft(); break; case 0x01000031: // Push @@ -94,7 +94,7 @@ void ProgrammingWindow::keyReleaseEvent(QKeyEvent *event) pushed = NULL; break; - case 0x01000032: // Turn right + case 0x01000030: // Turn right onEncoderRight(); break; } diff --git a/app/gui/oven_control/realtimemain.cpp b/app/gui/oven_control/realtimemain.cpp index f0b4211..ecfe1b4 100644 --- a/app/gui/oven_control/realtimemain.cpp +++ b/app/gui/oven_control/realtimemain.cpp @@ -45,12 +45,12 @@ void RealtimeMain::keyPressEvent(QKeyEvent *event) { switch (event->key()) { - case 0x01000030: // Turn left + case 0x01000032: // Turn left focusPreviousChild(); break; case 0x01000031: // Push break; - case 0x01000032: // Turn right + case 0x01000030: // Turn right focusNextChild(); break; } @@ -60,7 +60,7 @@ void RealtimeMain::keyReleaseEvent(QKeyEvent *event) { switch (event->key()) { - case 0x01000030: // Turn left + case 0x01000032: // Turn left focusPreviousChild(); break; case 0x01000031: // Push @@ -71,7 +71,7 @@ void RealtimeMain::keyReleaseEvent(QKeyEvent *event) } break; } - case 0x01000032: // Turn right + case 0x01000030: // Turn right focusNextChild(); break; } diff --git a/app/gui/oven_control/realtimepartswindow.cpp b/app/gui/oven_control/realtimepartswindow.cpp index a17f98f..1a5a3ab 100644 --- a/app/gui/oven_control/realtimepartswindow.cpp +++ b/app/gui/oven_control/realtimepartswindow.cpp @@ -128,12 +128,12 @@ void RealtimePartsWindow::keyPressEvent(QKeyEvent *event) { switch (event->key()) { - case 0x01000030: // Turn left + case 0x01000032: // Turn left focusPreviousChild(); break; case 0x01000031: // Push break; - case 0x01000032: // Turn right + case 0x01000030: // Turn right focusNextChild(); break; } @@ -143,7 +143,7 @@ void RealtimePartsWindow::keyReleaseEvent(QKeyEvent *event) { switch (event->key()) { - case 0x01000030: // Turn left + case 0x01000032: // Turn left focusPreviousChild(); break; case 0x01000031: // Push @@ -154,7 +154,7 @@ void RealtimePartsWindow::keyReleaseEvent(QKeyEvent *event) } break; } - case 0x01000032: // Turn right + case 0x01000030: // Turn right focusNextChild(); break; } diff --git a/app/gui/oven_control/realtimesensorwindow.cpp b/app/gui/oven_control/realtimesensorwindow.cpp index 449866c..cf62a68 100644 --- a/app/gui/oven_control/realtimesensorwindow.cpp +++ b/app/gui/oven_control/realtimesensorwindow.cpp @@ -145,12 +145,12 @@ void RealtimeSensorWindow::keyPressEvent(QKeyEvent *event) { switch (event->key()) { - case 0x01000030: // Turn left + case 0x01000032: // Turn left focusPreviousChild(); break; case 0x01000031: // Push break; - case 0x01000032: // Turn right + case 0x01000030: // Turn right focusNextChild(); break; } @@ -160,7 +160,7 @@ void RealtimeSensorWindow::keyReleaseEvent(QKeyEvent *event) { switch (event->key()) { - case 0x01000030: // Turn left + case 0x01000032: // Turn left focusPreviousChild(); break; case 0x01000031: // Push @@ -171,7 +171,7 @@ void RealtimeSensorWindow::keyReleaseEvent(QKeyEvent *event) } break; } - case 0x01000032: // Turn right + case 0x01000030: // Turn right focusNextChild(); break; } diff --git a/app/gui/oven_control/reservedtimepopup.cpp b/app/gui/oven_control/reservedtimepopup.cpp index b5a83d4..6d42957 100644 --- a/app/gui/oven_control/reservedtimepopup.cpp +++ b/app/gui/oven_control/reservedtimepopup.cpp @@ -32,12 +32,12 @@ void ReservedTimePopup::keyPressEvent(QKeyEvent *event) { switch (event->key()) { - case 0x01000030: // Turn left + case 0x01000032: // Turn left ui->cancelButton->setFocus(); break; case 0x01000031: // Push break; - case 0x01000032: // Turn right + case 0x01000030: // Turn right ui->cancelButton->setFocus(); break; } @@ -47,13 +47,13 @@ void ReservedTimePopup::keyReleaseEvent(QKeyEvent *event) { switch (event->key()) { - case 0x01000030: // Turn left + case 0x01000032: // Turn left ui->cancelButton->setFocus(); break; case 0x01000031: // Push ui->cancelButton->click(); break; - case 0x01000032: // Turn right + case 0x01000030: // Turn right ui->cancelButton->setFocus(); break; } diff --git a/app/gui/oven_control/reservetimepopup.cpp b/app/gui/oven_control/reservetimepopup.cpp index 09c1cfb..cfb9e6d 100644 --- a/app/gui/oven_control/reservetimepopup.cpp +++ b/app/gui/oven_control/reservetimepopup.cpp @@ -60,13 +60,13 @@ void ReserveTimePopup::keyPressEvent(QKeyEvent *event) { switch (event->key()) { - case 0x01000030: // Turn left + case 0x01000032: // Turn left onEncoderLeft(); break; case 0x01000031: // Push pushed = focusWidget(); break; - case 0x01000032: // Turn right + case 0x01000030: // Turn right onEncoderRight(); break; } @@ -76,7 +76,7 @@ void ReserveTimePopup::keyReleaseEvent(QKeyEvent *event) { switch (event->key()) { - case 0x01000030: // Turn left + case 0x01000032: // Turn left onEncoderLeft(); break; case 0x01000031: // Push @@ -85,7 +85,7 @@ void ReserveTimePopup::keyReleaseEvent(QKeyEvent *event) pushed = NULL; break; - case 0x01000032: // Turn right + case 0x01000030: // Turn right onEncoderRight(); break; } diff --git a/app/gui/oven_control/servicehistorymain.cpp b/app/gui/oven_control/servicehistorymain.cpp index 8ad8f23..2427ab6 100644 --- a/app/gui/oven_control/servicehistorymain.cpp +++ b/app/gui/oven_control/servicehistorymain.cpp @@ -61,12 +61,12 @@ void ServiceHistoryMain::keyPressEvent(QKeyEvent *event) { switch (event->key()) { - case 0x01000030: // Turn left + case 0x01000032: // Turn left focusPreviousChild(); break; case 0x01000031: // Push break; - case 0x01000032: // Turn right + case 0x01000030: // Turn right focusNextChild(); break; } @@ -76,7 +76,7 @@ void ServiceHistoryMain::keyReleaseEvent(QKeyEvent *event) { switch (event->key()) { - case 0x01000030: // Turn left + case 0x01000032: // Turn left focusPreviousChild(); break; case 0x01000031: // Push @@ -87,7 +87,7 @@ void ServiceHistoryMain::keyReleaseEvent(QKeyEvent *event) } break; } - case 0x01000032: // Turn right + case 0x01000030: // Turn right focusNextChild(); break; } diff --git a/app/gui/oven_control/servicepassinputdlg.cpp b/app/gui/oven_control/servicepassinputdlg.cpp index fa47722..3f9dd77 100644 --- a/app/gui/oven_control/servicepassinputdlg.cpp +++ b/app/gui/oven_control/servicepassinputdlg.cpp @@ -81,14 +81,14 @@ void ServicePassInputDlg::keyPressEvent(QKeyEvent *event){ int i = 0; switch (event->key()) { - case 0x01000030: // Turn left + case 0x01000032: // Turn left if(focusWidget() == ui->ctrProgressBar) ui->ctrBtnCancel->setFocus(); else focusPreviousChild(); break; case 0x01000031: // Push break; - case 0x01000032: // Turn right + case 0x01000030: // Turn right if(focusWidget() == ui->ctrBtnCancel) ui->ctrProgressBar->setFocus(); else focusNextChild(); @@ -100,7 +100,7 @@ void ServicePassInputDlg::keyReleaseEvent(QKeyEvent *event){ int i = 0; switch (event->key()) { - case 0x01000030: // Turn left + case 0x01000032: // Turn left if(focusWidget() == ui->ctrProgressBar) ui->ctrBtnCancel->setFocus(); else focusPreviousChild(); break; @@ -115,7 +115,7 @@ void ServicePassInputDlg::keyReleaseEvent(QKeyEvent *event){ } break; } - case 0x01000032: // Turn right + case 0x01000030: // Turn right if(focusWidget() == ui->ctrBtnCancel) ui->ctrProgressBar->setFocus(); else focusNextChild(); break; diff --git a/app/gui/oven_control/slider.cpp b/app/gui/oven_control/slider.cpp index 07cbd16..c20b2f9 100644 --- a/app/gui/oven_control/slider.cpp +++ b/app/gui/oven_control/slider.cpp @@ -138,13 +138,13 @@ void Slider::keyPressEvent(QKeyEvent *event) { switch (event->key()) { - case 0x01000030: // Turn left + case 0x01000032: // Turn left decrease(); break; case 0x01000031: // Push event->ignore(); break; - case 0x01000032: // Turn right + case 0x01000030: // Turn right increase(); break; } @@ -154,13 +154,13 @@ void Slider::keyReleaseEvent(QKeyEvent *event) { switch (event->key()) { - case 0x01000030: // Turn left + case 0x01000032: // Turn left decrease(); break; case 0x01000031: // Push event->ignore(); break; - case 0x01000032: // Turn right + case 0x01000030: // Turn right increase(); break; } diff --git a/app/gui/oven_control/usbcheckpopupdlg.cpp b/app/gui/oven_control/usbcheckpopupdlg.cpp index 780216c..6e008be 100644 --- a/app/gui/oven_control/usbcheckpopupdlg.cpp +++ b/app/gui/oven_control/usbcheckpopupdlg.cpp @@ -44,13 +44,13 @@ void UsbCheckPopupDlg::keyPressEvent(QKeyEvent *event){ int i = 0; switch (event->key()) { - case 0x01000030: // Turn left + case 0x01000032: // Turn left break; case 0x01000031: // Push { break; } - case 0x01000032: // Turn right + case 0x01000030: // Turn right break; } } @@ -59,7 +59,7 @@ void UsbCheckPopupDlg::keyReleaseEvent(QKeyEvent *event){ int i = 0; switch (event->key()) { - case 0x01000030: // Turn left + case 0x01000032: // Turn left break; case 0x01000031: // Push { @@ -69,7 +69,7 @@ void UsbCheckPopupDlg::keyReleaseEvent(QKeyEvent *event){ } break; } - case 0x01000032: // Turn right + case 0x01000030: // Turn right break; } } diff --git a/app/gui/oven_control/valvetestwindow.cpp b/app/gui/oven_control/valvetestwindow.cpp index c4a57fd..44d0ee0 100644 --- a/app/gui/oven_control/valvetestwindow.cpp +++ b/app/gui/oven_control/valvetestwindow.cpp @@ -35,13 +35,13 @@ void ValveTestWindow::keyPressEvent(QKeyEvent *event) { switch (event->key()) { - case 0x01000030: // Turn left + case 0x01000032: // Turn left onEncoderLeft(); break; case 0x01000031: // Push pushed = focusWidget(); break; - case 0x01000032: // Turn right + case 0x01000030: // Turn right onEncoderRight(); break; } @@ -51,7 +51,7 @@ void ValveTestWindow::keyReleaseEvent(QKeyEvent *event) { switch (event->key()) { - case 0x01000030: // Turn left + case 0x01000032: // Turn left onEncoderLeft(); break; case 0x01000031: // Push @@ -60,7 +60,7 @@ void ValveTestWindow::keyReleaseEvent(QKeyEvent *event) pushed = NULL; break; - case 0x01000032: // Turn right + case 0x01000030: // Turn right onEncoderRight(); break; } diff --git a/app/gui/oven_control/washtestwindow.cpp b/app/gui/oven_control/washtestwindow.cpp index 3b5f9b9..9aae387 100644 --- a/app/gui/oven_control/washtestwindow.cpp +++ b/app/gui/oven_control/washtestwindow.cpp @@ -35,13 +35,13 @@ void WashTestWindow::keyPressEvent(QKeyEvent *event) { switch (event->key()) { - case 0x01000030: // Turn left + case 0x01000032: // Turn left onEncoderLeft(); break; case 0x01000031: // Push pushed = focusWidget(); break; - case 0x01000032: // Turn right + case 0x01000030: // Turn right onEncoderRight(); break; } @@ -51,7 +51,7 @@ void WashTestWindow::keyReleaseEvent(QKeyEvent *event) { switch (event->key()) { - case 0x01000030: // Turn left + case 0x01000032: // Turn left onEncoderLeft(); break; case 0x01000031: // Push @@ -60,7 +60,7 @@ void WashTestWindow::keyReleaseEvent(QKeyEvent *event) pushed = NULL; break; - case 0x01000032: // Turn right + case 0x01000030: // Turn right onEncoderRight(); break; } diff --git a/app/gui/oven_control/washwindow.cpp b/app/gui/oven_control/washwindow.cpp index 8505a5a..564265e 100644 --- a/app/gui/oven_control/washwindow.cpp +++ b/app/gui/oven_control/washwindow.cpp @@ -67,13 +67,13 @@ void WashWindow::keyPressEvent(QKeyEvent *event) { switch (event->key()) { - case 0x01000030: // Turn left + case 0x01000032: // Turn left onEncoderLeft(); break; case 0x01000031: // Push pushed = focusWidget(); break; - case 0x01000032: // Turn right + case 0x01000030: // Turn right onEncoderRight(); break; } @@ -83,7 +83,7 @@ void WashWindow::keyReleaseEvent(QKeyEvent *event) { switch (event->key()) { - case 0x01000030: // Turn left + case 0x01000032: // Turn left onEncoderLeft(); break; case 0x01000031: // Push @@ -92,7 +92,7 @@ void WashWindow::keyReleaseEvent(QKeyEvent *event) pushed = NULL; break; - case 0x01000032: // Turn right + case 0x01000030: // Turn right onEncoderRight(); break; } diff --git a/app/gui/oven_control/yesnopopupdlg.cpp b/app/gui/oven_control/yesnopopupdlg.cpp index de18360..9a23249 100644 --- a/app/gui/oven_control/yesnopopupdlg.cpp +++ b/app/gui/oven_control/yesnopopupdlg.cpp @@ -47,14 +47,14 @@ void YesNoPopupDlg::on_ctrBtnNo_clicked() void YesNoPopupDlg::keyPressEvent(QKeyEvent *event){ switch (event->key()) { - case 0x01000030: // Turn left + case 0x01000032: // Turn left if(focusWidget() == ui->ctrBtnYes) ui->ctrBtnNo->setFocus(); else ui->ctrBtnYes->setFocus(); break; case 0x01000031: // Push break; - case 0x01000032: // Turn right + case 0x01000030: // Turn right if(focusWidget() == ui->ctrBtnYes) ui->ctrBtnNo->setFocus(); else ui->ctrBtnYes->setFocus(); break; @@ -64,7 +64,7 @@ void YesNoPopupDlg::keyPressEvent(QKeyEvent *event){ void YesNoPopupDlg::keyReleaseEvent(QKeyEvent *event){ switch (event->key()) { - case 0x01000030: // Turn left + case 0x01000032: // Turn left if(focusWidget() == ui->ctrBtnYes) ui->ctrBtnNo->setFocus(); else ui->ctrBtnYes->setFocus(); break; @@ -76,7 +76,7 @@ void YesNoPopupDlg::keyReleaseEvent(QKeyEvent *event){ } break; } - case 0x01000032: // Turn right + case 0x01000030: // Turn right if(focusWidget() == ui->ctrBtnYes) ui->ctrBtnNo->setFocus(); else ui->ctrBtnYes->setFocus(); break;