Commit 01249f41398958027110eb05b73f6f9c435be238

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

엔코더 방향 반전. 하드웨어가 변경됨

Showing 71 changed files with 282 additions and 282 deletions   Show diff stats
app/gui/oven_control/adjustmentwindow.cpp
... ... @@ -44,10 +44,10 @@ void AdjustmentWindow::on_backButton_clicked()
44 44 void AdjustmentWindow::keyPressEvent(QKeyEvent *event){
45 45 switch (event->key())
46 46 {
47   - case 0x01000030: // Turn left
  47 + case 0x01000032: // Turn left
48 48 focusPreviousChild();
49 49 break;
50   - case 0x01000032: // Turn right
  50 + case 0x01000030: // Turn right
51 51 focusNextChild();
52 52 break;
53 53 }
... ... @@ -56,7 +56,7 @@ void AdjustmentWindow::keyPressEvent(QKeyEvent *event){
56 56 void AdjustmentWindow::keyReleaseEvent(QKeyEvent *event){
57 57 switch (event->key())
58 58 {
59   - case 0x01000030: // Turn left
  59 + case 0x01000032: // Turn left
60 60 focusPreviousChild();
61 61 break;
62 62 case 0x01000031: // Push
... ... @@ -67,7 +67,7 @@ void AdjustmentWindow::keyReleaseEvent(QKeyEvent *event){
67 67 }
68 68 break;
69 69 }
70   - case 0x01000032: // Turn right
  70 + case 0x01000030: // Turn right
71 71 focusNextChild();
72 72 break;
73 73 }
... ...
app/gui/oven_control/autocookcheckconfigwindow.cpp
... ... @@ -100,13 +100,13 @@ void AutoCookCheckConfigWindow::keyPressEvent(QKeyEvent *event)
100 100 {
101 101 switch (event->key())
102 102 {
103   - case 0x01000030: // Turn left
  103 + case 0x01000032: // Turn left
104 104 onEncoderLeft();
105 105 break;
106 106 case 0x01000031: // Push
107 107 pushed = focusWidget();
108 108 break;
109   - case 0x01000032: // Turn right
  109 + case 0x01000030: // Turn right
110 110 onEncoderRight();
111 111 break;
112 112 }
... ... @@ -116,7 +116,7 @@ void AutoCookCheckConfigWindow::keyReleaseEvent(QKeyEvent *event)
116 116 {
117 117 switch (event->key())
118 118 {
119   - case 0x01000030: // Turn left
  119 + case 0x01000032: // Turn left
120 120 onEncoderLeft();
121 121 break;
122 122 case 0x01000031: // Push
... ... @@ -125,7 +125,7 @@ void AutoCookCheckConfigWindow::keyReleaseEvent(QKeyEvent *event)
125 125  
126 126 pushed = NULL;
127 127 break;
128   - case 0x01000032: // Turn right
  128 + case 0x01000030: // Turn right
129 129 onEncoderRight();
130 130 break;
131 131 }
... ...
app/gui/oven_control/autocookcheckwindow.cpp
... ... @@ -67,13 +67,13 @@ void AutoCookCheckWindow::keyPressEvent(QKeyEvent *event)
67 67 {
68 68 switch (event->key())
69 69 {
70   - case 0x01000030: // Turn left
  70 + case 0x01000032: // Turn left
71 71 onEncoderLeft();
72 72 break;
73 73 case 0x01000031: // Push
74 74 pushed = focusWidget();
75 75 break;
76   - case 0x01000032: // Turn right
  76 + case 0x01000030: // Turn right
77 77 onEncoderRight();
78 78 break;
79 79 }
... ... @@ -83,7 +83,7 @@ void AutoCookCheckWindow::keyReleaseEvent(QKeyEvent *event)
83 83 {
84 84 switch (event->key())
85 85 {
86   - case 0x01000030: // Turn left
  86 + case 0x01000032: // Turn left
87 87 onEncoderLeft();
88 88 break;
89 89 case 0x01000031: // Push
... ... @@ -92,7 +92,7 @@ void AutoCookCheckWindow::keyReleaseEvent(QKeyEvent *event)
92 92  
93 93 pushed = NULL;
94 94 break;
95   - case 0x01000032: // Turn right
  95 + case 0x01000030: // Turn right
96 96 onEncoderRight();
97 97 break;
98 98 }
... ...
app/gui/oven_control/autocookconfigwindow.cpp
... ... @@ -115,13 +115,13 @@ void AutoCookConfigWindow::keyPressEvent(QKeyEvent *event)
115 115 {
116 116 switch (event->key())
117 117 {
118   - case 0x01000030: // Turn left
  118 + case 0x01000032: // Turn left
119 119 onEncoderLeft();
120 120 break;
121 121 case 0x01000031: // Push
122 122 pushed = focusWidget();
123 123 break;
124   - case 0x01000032: // Turn right
  124 + case 0x01000030: // Turn right
125 125 onEncoderRight();
126 126 break;
127 127 }
... ... @@ -131,7 +131,7 @@ void AutoCookConfigWindow::keyReleaseEvent(QKeyEvent *event)
131 131 {
132 132 switch (event->key())
133 133 {
134   - case 0x01000030: // Turn left
  134 + case 0x01000032: // Turn left
135 135 onEncoderLeft();
136 136 break;
137 137 case 0x01000031: // Push
... ... @@ -140,7 +140,7 @@ void AutoCookConfigWindow::keyReleaseEvent(QKeyEvent *event)
140 140  
141 141 pushed = NULL;
142 142 break;
143   - case 0x01000032: // Turn right
  143 + case 0x01000030: // Turn right
144 144 onEncoderRight();
145 145 break;
146 146 }
... ...
app/gui/oven_control/autocookselectionpopup.cpp
... ... @@ -50,13 +50,13 @@ void AutoCookSelectionPopup::keyPressEvent(QKeyEvent *event)
50 50 {
51 51 switch (event->key())
52 52 {
53   - case 0x01000030: // Turn left
  53 + case 0x01000032: // Turn left
54 54 onEncoderLeft();
55 55 break;
56 56 case 0x01000031: // Push
57 57 pushed = focusWidget();
58 58 break;
59   - case 0x01000032: // Turn right
  59 + case 0x01000030: // Turn right
60 60 onEncoderRight();
61 61 break;
62 62 }
... ... @@ -66,7 +66,7 @@ void AutoCookSelectionPopup::keyReleaseEvent(QKeyEvent *event)
66 66 {
67 67 switch (event->key())
68 68 {
69   - case 0x01000030: // Turn left
  69 + case 0x01000032: // Turn left
70 70 onEncoderLeft();
71 71 break;
72 72 case 0x01000031: // Push
... ... @@ -75,7 +75,7 @@ void AutoCookSelectionPopup::keyReleaseEvent(QKeyEvent *event)
75 75  
76 76 pushed = NULL;
77 77 break;
78   - case 0x01000032: // Turn right
  78 + case 0x01000030: // Turn right
79 79 onEncoderRight();
80 80 break;
81 81 }
... ...
app/gui/oven_control/autocookselectionwindow.cpp
... ... @@ -81,13 +81,13 @@ void AutoCookSelectionWindow::keyPressEvent(QKeyEvent *event)
81 81 {
82 82 switch (event->key())
83 83 {
84   - case 0x01000030: // Turn left
  84 + case 0x01000032: // Turn left
85 85 onEncoderLeft();
86 86 break;
87 87 case 0x01000031: // Push
88 88 pushed = focusWidget();
89 89 break;
90   - case 0x01000032: // Turn right
  90 + case 0x01000030: // Turn right
91 91 onEncoderRight();
92 92 break;
93 93 }
... ... @@ -97,7 +97,7 @@ void AutoCookSelectionWindow::keyReleaseEvent(QKeyEvent *event)
97 97 {
98 98 switch (event->key())
99 99 {
100   - case 0x01000030: // Turn left
  100 + case 0x01000032: // Turn left
101 101 onEncoderLeft();
102 102 break;
103 103 case 0x01000031: // Push
... ... @@ -106,7 +106,7 @@ void AutoCookSelectionWindow::keyReleaseEvent(QKeyEvent *event)
106 106  
107 107 pushed = NULL;
108 108 break;
109   - case 0x01000032: // Turn right
  109 + case 0x01000030: // Turn right
110 110 onEncoderRight();
111 111 break;
112 112 }
... ...
app/gui/oven_control/autocookwindow.cpp
... ... @@ -117,13 +117,13 @@ void AutoCookWindow::keyPressEvent(QKeyEvent *event)
117 117 {
118 118 switch (event->key())
119 119 {
120   - case 0x01000030: // Turn left
  120 + case 0x01000032: // Turn left
121 121 onEncoderLeft();
122 122 break;
123 123 case 0x01000031: // Push
124 124 pushed = focusWidget();
125 125 break;
126   - case 0x01000032: // Turn right
  126 + case 0x01000030: // Turn right
127 127 onEncoderRight();
128 128 break;
129 129 }
... ... @@ -133,7 +133,7 @@ void AutoCookWindow::keyReleaseEvent(QKeyEvent *event)
133 133 {
134 134 switch (event->key())
135 135 {
136   - case 0x01000030: // Turn left
  136 + case 0x01000032: // Turn left
137 137 onEncoderLeft();
138 138 break;
139 139 case 0x01000031: // Push
... ... @@ -142,7 +142,7 @@ void AutoCookWindow::keyReleaseEvent(QKeyEvent *event)
142 142  
143 143 pushed = NULL;
144 144 break;
145   - case 0x01000032: // Turn right
  145 + case 0x01000030: // Turn right
146 146 onEncoderRight();
147 147 break;
148 148 }
... ...
app/gui/oven_control/burnertestwindow.cpp
... ... @@ -47,13 +47,13 @@ void BurnerTestWindow::keyPressEvent(QKeyEvent *event)
47 47 {
48 48 switch (event->key())
49 49 {
50   - case 0x01000030: // Turn left
  50 + case 0x01000032: // Turn left
51 51 onEncoderLeft();
52 52 break;
53 53 case 0x01000031: // Push
54 54 pushed = focusWidget();
55 55 break;
56   - case 0x01000032: // Turn right
  56 + case 0x01000030: // Turn right
57 57 onEncoderRight();
58 58 break;
59 59 }
... ... @@ -63,7 +63,7 @@ void BurnerTestWindow::keyReleaseEvent(QKeyEvent *event)
63 63 {
64 64 switch (event->key())
65 65 {
66   - case 0x01000030: // Turn left
  66 + case 0x01000032: // Turn left
67 67 onEncoderLeft();
68 68 break;
69 69 case 0x01000031: // Push
... ... @@ -72,7 +72,7 @@ void BurnerTestWindow::keyReleaseEvent(QKeyEvent *event)
72 72  
73 73 pushed = NULL;
74 74 break;
75   - case 0x01000032: // Turn right
  75 + case 0x01000030: // Turn right
76 76 onEncoderRight();
77 77 break;
78 78 }
... ...
app/gui/oven_control/componenttestwindow.cpp
... ... @@ -38,13 +38,13 @@ void ComponentTestWindow::keyPressEvent(QKeyEvent *event)
38 38 {
39 39 switch (event->key())
40 40 {
41   - case 0x01000030: // Turn left
  41 + case 0x01000032: // Turn left
42 42 onEncoderLeft();
43 43 break;
44 44 case 0x01000031: // Push
45 45 pushed = focusWidget();
46 46 break;
47   - case 0x01000032: // Turn right
  47 + case 0x01000030: // Turn right
48 48 onEncoderRight();
49 49 break;
50 50 }
... ... @@ -54,7 +54,7 @@ void ComponentTestWindow::keyReleaseEvent(QKeyEvent *event)
54 54 {
55 55 switch (event->key())
56 56 {
57   - case 0x01000030: // Turn left
  57 + case 0x01000032: // Turn left
58 58 onEncoderLeft();
59 59 break;
60 60 case 0x01000031: // Push
... ... @@ -63,7 +63,7 @@ void ComponentTestWindow::keyReleaseEvent(QKeyEvent *event)
63 63  
64 64 pushed = NULL;
65 65 break;
66   - case 0x01000032: // Turn right
  66 + case 0x01000030: // Turn right
67 67 onEncoderRight();
68 68 break;
69 69 }
... ...
app/gui/oven_control/config1digitsetandenablesetdlg.cpp
... ... @@ -70,14 +70,14 @@ void Config1DigitSetAndEnableSetDlg::keyPressEvent(QKeyEvent *event){
70 70 int i = 0;
71 71 switch (event->key())
72 72 {
73   - case 0x01000030: // Turn left
  73 + case 0x01000032: // Turn left
74 74 if(focusWidget() == ui->ctrSpBxValue) ui->ctrBtnCancel->setFocus();
75 75 else focusPreviousChild();
76 76 break;
77 77 case 0x01000031: // Push
78 78  
79 79 break;
80   - case 0x01000032: // Turn right
  80 + case 0x01000030: // Turn right
81 81 if(focusWidget() == ui->ctrBtnCancel) ui->ctrSpBxValue->setFocus();
82 82 else focusNextChild();
83 83  
... ... @@ -89,7 +89,7 @@ void Config1DigitSetAndEnableSetDlg::keyReleaseEvent(QKeyEvent *event){
89 89 int i = 0;
90 90 switch (event->key())
91 91 {
92   - case 0x01000030: // Turn left
  92 + case 0x01000032: // Turn left
93 93 if(focusWidget() == ui->ctrSpBxValue) ui->ctrBtnCancel->setFocus();
94 94 else focusPreviousChild();
95 95 break;
... ... @@ -108,7 +108,7 @@ void Config1DigitSetAndEnableSetDlg::keyReleaseEvent(QKeyEvent *event){
108 108 }
109 109 break;
110 110 }
111   - case 0x01000032: // Turn right
  111 + case 0x01000030: // Turn right
112 112 if(focusWidget() == ui->ctrBtnCancel) ui->ctrSpBxValue->setFocus();
113 113 else focusNextChild();
114 114 break;
... ...
app/gui/oven_control/config1digitsetdlg.cpp
... ... @@ -94,14 +94,14 @@ void Config1DigitSetDlg::keyPressEvent(QKeyEvent *event){
94 94 int i = 0;
95 95 switch (event->key())
96 96 {
97   - case 0x01000030: // Turn left
  97 + case 0x01000032: // Turn left
98 98 if(focusWidget() == ui->ctrSpBxValue) ui->ctrBtnCancel->setFocus();
99 99 else focusPreviousChild();
100 100 break;
101 101 case 0x01000031: // Push
102 102  
103 103 break;
104   - case 0x01000032: // Turn right
  104 + case 0x01000030: // Turn right
105 105 if(focusWidget() == ui->ctrBtnCancel) ui->ctrSpBxValue->setFocus();
106 106 else focusNextChild();
107 107  
... ... @@ -113,7 +113,7 @@ void Config1DigitSetDlg::keyReleaseEvent(QKeyEvent *event){
113 113 int i = 0;
114 114 switch (event->key())
115 115 {
116   - case 0x01000030: // Turn left
  116 + case 0x01000032: // Turn left
117 117 if(focusWidget() == ui->ctrSpBxValue) ui->ctrBtnCancel->setFocus();
118 118 else focusPreviousChild();
119 119 break;
... ... @@ -133,7 +133,7 @@ void Config1DigitSetDlg::keyReleaseEvent(QKeyEvent *event){
133 133 }
134 134 break;
135 135 }
136   - case 0x01000032: // Turn right
  136 + case 0x01000030: // Turn right
137 137 if(focusWidget() == ui->ctrBtnCancel) ui->ctrSpBxValue->setFocus();
138 138 else focusNextChild();
139 139 break;
... ...
app/gui/oven_control/configbacklightdlg.cpp
... ... @@ -90,7 +90,7 @@ void ConfigBackLightDlg::keyPressEvent(QKeyEvent *event){
90 90 int i = 0;
91 91 switch (event->key())
92 92 {
93   - case 0x01000030: // Turn left
  93 + case 0x01000032: // Turn left
94 94 for(i = 0; i < m_vectorTabOrder.size();i++){
95 95 if(focusWidget() == m_vectorTabOrder[i]) break;
96 96 }
... ... @@ -111,7 +111,7 @@ void ConfigBackLightDlg::keyPressEvent(QKeyEvent *event){
111 111 case 0x01000031: // Push
112 112  
113 113 break;
114   - case 0x01000032: // Turn right
  114 + case 0x01000030: // Turn right
115 115 for(i = 0; i < m_vectorTabOrder.size();i++){
116 116 if(focusWidget() == m_vectorTabOrder[i]) break;
117 117 }
... ... @@ -136,7 +136,7 @@ void ConfigBackLightDlg::keyReleaseEvent(QKeyEvent *event){
136 136 int i = 0;
137 137 switch (event->key())
138 138 {
139   - case 0x01000030: // Turn left
  139 + case 0x01000032: // Turn left
140 140 for(i = 0; i < m_vectorTabOrder.size();i++){
141 141 if(focusWidget() == m_vectorTabOrder[i]) break;
142 142 }
... ... @@ -162,7 +162,7 @@ void ConfigBackLightDlg::keyReleaseEvent(QKeyEvent *event){
162 162 }
163 163 break;
164 164 }
165   - case 0x01000032: // Turn right
  165 + case 0x01000030: // Turn right
166 166 for(i = 0; i < m_vectorTabOrder.size();i++){
167 167 if(focusWidget() == m_vectorTabOrder[i]) break;
168 168 }
... ...
app/gui/oven_control/configdatetimedlg.cpp
... ... @@ -85,14 +85,14 @@ void ConfigDateTimeDlg::keyPressEvent(QKeyEvent *event){
85 85 int i = 0;
86 86 switch (event->key())
87 87 {
88   - case 0x01000030: // Turn left
  88 + case 0x01000032: // Turn left
89 89 if(focusWidget() == ui->ctrSpBxYear) ui->ctrBtnCancel->setFocus();
90 90 else focusPreviousChild();
91 91 break;
92 92 case 0x01000031: // Push
93 93  
94 94 break;
95   - case 0x01000032: // Turn right
  95 + case 0x01000030: // Turn right
96 96 if(focusWidget() == ui->ctrBtnCancel) ui->ctrSpBxYear->setFocus();
97 97 else focusNextChild();
98 98  
... ... @@ -104,7 +104,7 @@ void ConfigDateTimeDlg::keyReleaseEvent(QKeyEvent *event){
104 104 int i = 0;
105 105 switch (event->key())
106 106 {
107   - case 0x01000030: // Turn left
  107 + case 0x01000032: // Turn left
108 108 if(focusWidget() == ui->ctrSpBxYear) ui->ctrBtnCancel->setFocus();
109 109 else focusPreviousChild();
110 110 break;
... ... @@ -121,7 +121,7 @@ void ConfigDateTimeDlg::keyReleaseEvent(QKeyEvent *event){
121 121 }
122 122 break;
123 123 }
124   - case 0x01000032: // Turn right
  124 + case 0x01000030: // Turn right
125 125 if(focusWidget() == ui->ctrBtnCancel) ui->ctrSpBxYear->setFocus();
126 126 else focusNextChild();
127 127 break;
... ...
app/gui/oven_control/configdemomodedlg.cpp
... ... @@ -83,7 +83,7 @@ void ConfigDemoModeDlg::keyPressEvent(QKeyEvent *event){
83 83 int i = 0;
84 84 switch (event->key())
85 85 {
86   - case 0x01000030: // Turn left
  86 + case 0x01000032: // Turn left
87 87 for(i = 0; i < m_vectorTabOrder.size();i++){
88 88 if(focusWidget() == m_vectorTabOrder[i]) break;
89 89 }
... ... @@ -104,7 +104,7 @@ void ConfigDemoModeDlg::keyPressEvent(QKeyEvent *event){
104 104 case 0x01000031: // Push
105 105  
106 106 break;
107   - case 0x01000032: // Turn right
  107 + case 0x01000030: // Turn right
108 108 for(i = 0; i < m_vectorTabOrder.size();i++){
109 109 if(focusWidget() == m_vectorTabOrder[i]) break;
110 110 }
... ... @@ -129,7 +129,7 @@ void ConfigDemoModeDlg::keyReleaseEvent(QKeyEvent *event){
129 129 int i = 0;
130 130 switch (event->key())
131 131 {
132   - case 0x01000030: // Turn left
  132 + case 0x01000032: // Turn left
133 133 for(i = 0; i < m_vectorTabOrder.size();i++){
134 134 if(focusWidget() == m_vectorTabOrder[i]) break;
135 135 }
... ... @@ -155,7 +155,7 @@ void ConfigDemoModeDlg::keyReleaseEvent(QKeyEvent *event){
155 155 }
156 156 break;
157 157 }
158   - case 0x01000032: // Turn right
  158 + case 0x01000030: // Turn right
159 159 for(i = 0; i < m_vectorTabOrder.size();i++){
160 160 if(focusWidget() == m_vectorTabOrder[i]) break;
161 161 }
... ...
app/gui/oven_control/configdoormonitoring.cpp
... ... @@ -155,13 +155,13 @@ void ConfigDoorMonitoring::onBtnClicked(const int sel){
155 155 void ConfigDoorMonitoring::keyPressEvent(QKeyEvent *event){
156 156 switch (event->key())
157 157 {
158   - case 0x01000030: // Turn left
  158 + case 0x01000032: // Turn left
159 159 focusPreviousChild();
160 160 break;
161 161 case 0x01000031: // Push
162 162  
163 163 break;
164   - case 0x01000032: // Turn right
  164 + case 0x01000030: // Turn right
165 165 focusNextChild();
166 166 break;
167 167 }
... ... @@ -170,7 +170,7 @@ void ConfigDoorMonitoring::keyPressEvent(QKeyEvent *event){
170 170 void ConfigDoorMonitoring::keyReleaseEvent(QKeyEvent *event){
171 171 switch (event->key())
172 172 {
173   - case 0x01000030: // Turn left
  173 + case 0x01000032: // Turn left
174 174 focusPreviousChild();
175 175 break;
176 176 case 0x01000031: // Push
... ... @@ -181,7 +181,7 @@ void ConfigDoorMonitoring::keyReleaseEvent(QKeyEvent *event){
181 181 }
182 182 break;
183 183 }
184   - case 0x01000032: // Turn right
  184 + case 0x01000030: // Turn right
185 185 focusNextChild();
186 186 break;
187 187 }
... ...
app/gui/oven_control/configdutywashdlg.cpp
... ... @@ -72,7 +72,7 @@ void ConfigDutyWashDlg::keyReleaseEvent(QKeyEvent *event)
72 72 int i = 0;
73 73 switch (event->key())
74 74 {
75   - case 0x01000030: // Turn left
  75 + case 0x01000032: // Turn left
76 76 for(i = 0; i < m_vectorTabOrder.size();i++){
77 77 if(focusWidget() == m_vectorTabOrder[i]) break;
78 78 }
... ... @@ -98,7 +98,7 @@ void ConfigDutyWashDlg::keyReleaseEvent(QKeyEvent *event)
98 98 }
99 99 break;
100 100 }
101   - case 0x01000032: // Turn right
  101 + case 0x01000030: // Turn right
102 102 for(i = 0; i < m_vectorTabOrder.size();i++){
103 103 if(focusWidget() == m_vectorTabOrder[i]) break;
104 104 }
... ... @@ -124,7 +124,7 @@ void ConfigDutyWashDlg::keyPressEvent(QKeyEvent *event)
124 124 int i = 0;
125 125 switch (event->key())
126 126 {
127   - case 0x01000030: // Turn left
  127 + case 0x01000032: // Turn left
128 128 for(i = 0; i < m_vectorTabOrder.size();i++){
129 129 if(focusWidget() == m_vectorTabOrder[i]) break;
130 130 }
... ... @@ -145,7 +145,7 @@ void ConfigDutyWashDlg::keyPressEvent(QKeyEvent *event)
145 145 case 0x01000031: // Push
146 146  
147 147 break;
148   - case 0x01000032: // Turn right
  148 + case 0x01000030: // Turn right
149 149 for(i = 0; i < m_vectorTabOrder.size();i++){
150 150 if(focusWidget() == m_vectorTabOrder[i]) break;
151 151 }
... ...
app/gui/oven_control/configfileprocessdlg.cpp
... ... @@ -60,13 +60,13 @@ void ConfigFileProcessDlg::on_ctrBtnCancel_clicked()
60 60 void ConfigFileProcessDlg::keyPressEvent(QKeyEvent *event){
61 61 switch (event->key())
62 62 {
63   - case 0x01000030: // Turn left
  63 + case 0x01000032: // Turn left
64 64 if(focusWidget() == ui->ctrBtnOk) ui->ctrBtnCancel->setFocus();
65 65 else ui->ctrBtnOk->setFocus();
66 66 break;
67 67 case 0x01000031: // Push
68 68 break;
69   - case 0x01000032: // Turn right
  69 + case 0x01000030: // Turn right
70 70 if(focusWidget() == ui->ctrBtnOk) ui->ctrBtnCancel->setFocus();
71 71 else ui->ctrBtnOk->setFocus();
72 72 break;
... ... @@ -76,7 +76,7 @@ void ConfigFileProcessDlg::keyPressEvent(QKeyEvent *event){
76 76 void ConfigFileProcessDlg::keyReleaseEvent(QKeyEvent *event){
77 77 switch (event->key())
78 78 {
79   - case 0x01000030: // Turn left
  79 + case 0x01000032: // Turn left
80 80 if(focusWidget() == ui->ctrBtnOk) ui->ctrBtnCancel->setFocus();
81 81 else ui->ctrBtnOk->setFocus();
82 82 break;
... ... @@ -88,7 +88,7 @@ void ConfigFileProcessDlg::keyReleaseEvent(QKeyEvent *event){
88 88 }
89 89 break;
90 90 }
91   - case 0x01000032: // Turn right
  91 + case 0x01000030: // Turn right
92 92 if(focusWidget() == ui->ctrBtnOk) ui->ctrBtnCancel->setFocus();
93 93 else ui->ctrBtnOk->setFocus();
94 94 break;
... ...
app/gui/oven_control/confighalfenergydlg.cpp
... ... @@ -86,7 +86,7 @@ void ConfigHalfEnergyDlg::keyPressEvent(QKeyEvent *event){
86 86 int i = 0;
87 87 switch (event->key())
88 88 {
89   - case 0x01000030: // Turn left
  89 + case 0x01000032: // Turn left
90 90 for(i = 0; i < m_vectorTabOrder.size();i++){
91 91 if(focusWidget() == m_vectorTabOrder[i]) break;
92 92 }
... ... @@ -107,7 +107,7 @@ void ConfigHalfEnergyDlg::keyPressEvent(QKeyEvent *event){
107 107 case 0x01000031: // Push
108 108  
109 109 break;
110   - case 0x01000032: // Turn right
  110 + case 0x01000030: // Turn right
111 111 for(i = 0; i < m_vectorTabOrder.size();i++){
112 112 if(focusWidget() == m_vectorTabOrder[i]) break;
113 113 }
... ... @@ -132,7 +132,7 @@ void ConfigHalfEnergyDlg::keyReleaseEvent(QKeyEvent *event){
132 132 int i = 0;
133 133 switch (event->key())
134 134 {
135   - case 0x01000030: // Turn left
  135 + case 0x01000032: // Turn left
136 136 for(i = 0; i < m_vectorTabOrder.size();i++){
137 137 if(focusWidget() == m_vectorTabOrder[i]) break;
138 138 }
... ... @@ -158,7 +158,7 @@ void ConfigHalfEnergyDlg::keyReleaseEvent(QKeyEvent *event){
158 158 }
159 159 break;
160 160 }
161   - case 0x01000032: // Turn right
  161 + case 0x01000030: // Turn right
162 162 for(i = 0; i < m_vectorTabOrder.size();i++){
163 163 if(focusWidget() == m_vectorTabOrder[i]) break;
164 164 }
... ...
app/gui/oven_control/configipdlg.cpp
... ... @@ -135,14 +135,14 @@ void ConfigIpDlg::focusInSpinBox(QWidget *widget){
135 135 void ConfigIpDlg::keyPressEvent(QKeyEvent *event){
136 136 switch (event->key())
137 137 {
138   - case 0x01000030: // Turn left
  138 + case 0x01000032: // Turn left
139 139 if(focusWidget() == ui->ctrIp_0) ui->ctrBtnCancel->setFocus();
140 140 else focusPreviousChild();
141 141 break;
142 142 case 0x01000031: // Push
143 143  
144 144 break;
145   - case 0x01000032: // Turn right
  145 + case 0x01000030: // Turn right
146 146 if(focusWidget() == ui->ctrBtnCancel) ui->ctrIp_0->setFocus();
147 147 else focusNextChild();
148 148  
... ... @@ -153,7 +153,7 @@ void ConfigIpDlg::keyPressEvent(QKeyEvent *event){
153 153 void ConfigIpDlg::keyReleaseEvent(QKeyEvent *event){
154 154 switch (event->key())
155 155 {
156   - case 0x01000030: // Turn left
  156 + case 0x01000032: // Turn left
157 157 if(focusWidget() == ui->ctrIp_0) ui->ctrBtnCancel->setFocus();
158 158 else focusPreviousChild();
159 159 break;
... ... @@ -169,7 +169,7 @@ void ConfigIpDlg::keyReleaseEvent(QKeyEvent *event){
169 169 }
170 170 break;
171 171 }
172   - case 0x01000032: // Turn right
  172 + case 0x01000030: // Turn right
173 173 if(focusWidget() == ui->ctrBtnCancel) ui->ctrIp_0->setFocus();
174 174 else focusNextChild();
175 175 break;
... ...
app/gui/oven_control/configlanguagedlg.cpp
... ... @@ -93,7 +93,7 @@ void ConfigLanguageDlg::keyPressEvent(QKeyEvent *event){
93 93 int i = 0;
94 94 switch (event->key())
95 95 {
96   - case 0x01000030: // Turn left
  96 + case 0x01000032: // Turn left
97 97 for(i = 0; i < m_vectorTabOrder.size();i++){
98 98 if(focusWidget() == m_vectorTabOrder[i]) break;
99 99 }
... ... @@ -114,7 +114,7 @@ void ConfigLanguageDlg::keyPressEvent(QKeyEvent *event){
114 114 case 0x01000031: // Push
115 115  
116 116 break;
117   - case 0x01000032: // Turn right
  117 + case 0x01000030: // Turn right
118 118 for(i = 0; i < m_vectorTabOrder.size();i++){
119 119 if(focusWidget() == m_vectorTabOrder[i]) break;
120 120 }
... ... @@ -139,7 +139,7 @@ void ConfigLanguageDlg::keyReleaseEvent(QKeyEvent *event){
139 139 int i = 0;
140 140 switch (event->key())
141 141 {
142   - case 0x01000030: // Turn left
  142 + case 0x01000032: // Turn left
143 143 for(i = 0; i < m_vectorTabOrder.size();i++){
144 144 if(focusWidget() == m_vectorTabOrder[i]) break;
145 145 }
... ... @@ -165,7 +165,7 @@ void ConfigLanguageDlg::keyReleaseEvent(QKeyEvent *event){
165 165 }
166 166 break;
167 167 }
168   - case 0x01000032: // Turn right
  168 + case 0x01000030: // Turn right
169 169 for(i = 0; i < m_vectorTabOrder.size();i++){
170 170 if(focusWidget() == m_vectorTabOrder[i]) break;
171 171 }
... ...
app/gui/oven_control/configmastervolumedlg.cpp
... ... @@ -87,7 +87,7 @@ void ConfigVolumeDlg::keyPressEvent(QKeyEvent *event){
87 87 int i = 0;
88 88 switch (event->key())
89 89 {
90   - case 0x01000030: // Turn left
  90 + case 0x01000032: // Turn left
91 91 for(i = 0; i < m_vectorTabOrder.size();i++){
92 92 if(focusWidget() == m_vectorTabOrder[i]) break;
93 93 }
... ... @@ -108,7 +108,7 @@ void ConfigVolumeDlg::keyPressEvent(QKeyEvent *event){
108 108 case 0x01000031: // Push
109 109  
110 110 break;
111   - case 0x01000032: // Turn right
  111 + case 0x01000030: // Turn right
112 112 for(i = 0; i < m_vectorTabOrder.size();i++){
113 113 if(focusWidget() == m_vectorTabOrder[i]) break;
114 114 }
... ... @@ -133,7 +133,7 @@ void ConfigVolumeDlg::keyReleaseEvent(QKeyEvent *event){
133 133 int i = 0;
134 134 switch (event->key())
135 135 {
136   - case 0x01000030: // Turn left
  136 + case 0x01000032: // Turn left
137 137 for(i = 0; i < m_vectorTabOrder.size();i++){
138 138 if(focusWidget() == m_vectorTabOrder[i]) break;
139 139 }
... ... @@ -159,7 +159,7 @@ void ConfigVolumeDlg::keyReleaseEvent(QKeyEvent *event){
159 159 }
160 160 break;
161 161 }
162   - case 0x01000032: // Turn right
  162 + case 0x01000030: // Turn right
163 163 for(i = 0; i < m_vectorTabOrder.size();i++){
164 164 if(focusWidget() == m_vectorTabOrder[i]) break;
165 165 }
... ...
app/gui/oven_control/configresttimeformatdlg.cpp
... ... @@ -83,7 +83,7 @@ void configResttimeFormatDlg::keyPressEvent(QKeyEvent *event){
83 83 int i = 0;
84 84 switch (event->key())
85 85 {
86   - case 0x01000030: // Turn left
  86 + case 0x01000032: // Turn left
87 87 for(i = 0; i < m_vectorTabOrder.size();i++){
88 88 if(focusWidget() == m_vectorTabOrder[i]) break;
89 89 }
... ... @@ -104,7 +104,7 @@ void configResttimeFormatDlg::keyPressEvent(QKeyEvent *event){
104 104 case 0x01000031: // Push
105 105  
106 106 break;
107   - case 0x01000032: // Turn right
  107 + case 0x01000030: // Turn right
108 108 for(i = 0; i < m_vectorTabOrder.size();i++){
109 109 if(focusWidget() == m_vectorTabOrder[i]) break;
110 110 }
... ... @@ -129,7 +129,7 @@ void configResttimeFormatDlg::keyReleaseEvent(QKeyEvent *event){
129 129 int i = 0;
130 130 switch (event->key())
131 131 {
132   - case 0x01000030: // Turn left
  132 + case 0x01000032: // Turn left
133 133 for(i = 0; i < m_vectorTabOrder.size();i++){
134 134 if(focusWidget() == m_vectorTabOrder[i]) break;
135 135 }
... ... @@ -155,7 +155,7 @@ void configResttimeFormatDlg::keyReleaseEvent(QKeyEvent *event){
155 155 }
156 156 break;
157 157 }
158   - case 0x01000032: // Turn right
  158 + case 0x01000030: // Turn right
159 159 for(i = 0; i < m_vectorTabOrder.size();i++){
160 160 if(focusWidget() == m_vectorTabOrder[i]) break;
161 161 }
... ...
app/gui/oven_control/configsoundselelectdlg.cpp
... ... @@ -154,7 +154,7 @@ void ConfigSoundSelelectDlg::keyPressEvent(QKeyEvent *event){
154 154 int i = 0;
155 155 switch (event->key())
156 156 {
157   - case 0x01000030: // Turn left
  157 + case 0x01000032: // Turn left
158 158 for(i = 0; i < m_vectorTabOrder.size();i++){
159 159 if(focusWidget() == m_vectorTabOrder[i]) break;
160 160 }
... ... @@ -175,7 +175,7 @@ void ConfigSoundSelelectDlg::keyPressEvent(QKeyEvent *event){
175 175 case 0x01000031: // Push
176 176  
177 177 break;
178   - case 0x01000032: // Turn right
  178 + case 0x01000030: // Turn right
179 179 for(i = 0; i < m_vectorTabOrder.size();i++){
180 180 if(focusWidget() == m_vectorTabOrder[i]) break;
181 181 }
... ... @@ -200,7 +200,7 @@ void ConfigSoundSelelectDlg::keyReleaseEvent(QKeyEvent *event){
200 200 int i = 0;
201 201 switch (event->key())
202 202 {
203   - case 0x01000030: // Turn left
  203 + case 0x01000032: // Turn left
204 204 for(i = 0; i < m_vectorTabOrder.size();i++){
205 205 if(focusWidget() == m_vectorTabOrder[i]) break;
206 206 }
... ... @@ -226,7 +226,7 @@ void ConfigSoundSelelectDlg::keyReleaseEvent(QKeyEvent *event){
226 226 }
227 227 break;
228 228 }
229   - case 0x01000032: // Turn right
  229 + case 0x01000030: // Turn right
230 230 for(i = 0; i < m_vectorTabOrder.size();i++){
231 231 if(focusWidget() == m_vectorTabOrder[i]) break;
232 232 }
... ...
app/gui/oven_control/configtemptypedlg.cpp
... ... @@ -82,7 +82,7 @@ void ConfigTempTypeDlg::keyPressEvent(QKeyEvent *event){
82 82 int i = 0;
83 83 switch (event->key())
84 84 {
85   - case 0x01000030: // Turn left
  85 + case 0x01000032: // Turn left
86 86 for(i = 0; i < m_vectorTabOrder.size();i++){
87 87 if(focusWidget() == m_vectorTabOrder[i]) break;
88 88 }
... ... @@ -103,7 +103,7 @@ void ConfigTempTypeDlg::keyPressEvent(QKeyEvent *event){
103 103 case 0x01000031: // Push
104 104  
105 105 break;
106   - case 0x01000032: // Turn right
  106 + case 0x01000030: // Turn right
107 107 for(i = 0; i < m_vectorTabOrder.size();i++){
108 108 if(focusWidget() == m_vectorTabOrder[i]) break;
109 109 }
... ... @@ -128,7 +128,7 @@ void ConfigTempTypeDlg::keyReleaseEvent(QKeyEvent *event){
128 128 int i = 0;
129 129 switch (event->key())
130 130 {
131   - case 0x01000030: // Turn left
  131 + case 0x01000032: // Turn left
132 132 for(i = 0; i < m_vectorTabOrder.size();i++){
133 133 if(focusWidget() == m_vectorTabOrder[i]) break;
134 134 }
... ... @@ -154,7 +154,7 @@ void ConfigTempTypeDlg::keyReleaseEvent(QKeyEvent *event){
154 154 }
155 155 break;
156 156 }
157   - case 0x01000032: // Turn right
  157 + case 0x01000030: // Turn right
158 158 for(i = 0; i < m_vectorTabOrder.size();i++){
159 159 if(focusWidget() == m_vectorTabOrder[i]) break;
160 160 }
... ...
app/gui/oven_control/configtimeformatdlg.cpp
... ... @@ -86,7 +86,7 @@ void ConfigTimeFormatDlg::keyPressEvent(QKeyEvent *event){
86 86 int i = 0;
87 87 switch (event->key())
88 88 {
89   - case 0x01000030: // Turn left
  89 + case 0x01000032: // Turn left
90 90 for(i = 0; i < m_vectorTabOrder.size();i++){
91 91 if(focusWidget() == m_vectorTabOrder[i]) break;
92 92 }
... ... @@ -107,7 +107,7 @@ void ConfigTimeFormatDlg::keyPressEvent(QKeyEvent *event){
107 107 case 0x01000031: // Push
108 108  
109 109 break;
110   - case 0x01000032: // Turn right
  110 + case 0x01000030: // Turn right
111 111 for(i = 0; i < m_vectorTabOrder.size();i++){
112 112 if(focusWidget() == m_vectorTabOrder[i]) break;
113 113 }
... ... @@ -132,7 +132,7 @@ void ConfigTimeFormatDlg::keyReleaseEvent(QKeyEvent *event){
132 132 int i = 0;
133 133 switch (event->key())
134 134 {
135   - case 0x01000030: // Turn left
  135 + case 0x01000032: // Turn left
136 136 for(i = 0; i < m_vectorTabOrder.size();i++){
137 137 if(focusWidget() == m_vectorTabOrder[i]) break;
138 138 }
... ... @@ -158,7 +158,7 @@ void ConfigTimeFormatDlg::keyReleaseEvent(QKeyEvent *event){
158 158 }
159 159 break;
160 160 }
161   - case 0x01000032: // Turn right
  161 + case 0x01000030: // Turn right
162 162 for(i = 0; i < m_vectorTabOrder.size();i++){
163 163 if(focusWidget() == m_vectorTabOrder[i]) break;
164 164 }
... ...
app/gui/oven_control/configwindow.cpp
... ... @@ -138,7 +138,7 @@ void ConfigWindow::nextFocus(){
138 138 void ConfigWindow::keyReleaseEvent(QKeyEvent *event){
139 139 switch (event->key())
140 140 {
141   - case 0x01000030: // Turn left
  141 + case 0x01000032: // Turn left
142 142 prevFocus();
143 143 ui->scrollArea->ensureWidgetVisible(m_vectorTabOrder[m_nTabIndex]);
144 144 break;
... ... @@ -151,7 +151,7 @@ void ConfigWindow::keyReleaseEvent(QKeyEvent *event){
151 151 qDebug() << "pushed ";
152 152 break;
153 153 }
154   - case 0x01000032: // Turn right
  154 + case 0x01000030: // Turn right
155 155 nextFocus();
156 156 ui->scrollArea->ensureWidgetVisible(focusWidget());
157 157 qDebug() << "Turn Right";
... ... @@ -162,7 +162,7 @@ void ConfigWindow::keyReleaseEvent(QKeyEvent *event){
162 162 void ConfigWindow::keyPressEvent(QKeyEvent *event){
163 163 switch (event->key())
164 164 {
165   - case 0x01000030: // Turn left
  165 + case 0x01000032: // Turn left
166 166 prevFocus();
167 167 ui->scrollArea->ensureWidgetVisible(focusWidget());
168 168 qDebug() << "turn left";
... ... @@ -171,7 +171,7 @@ void ConfigWindow::keyPressEvent(QKeyEvent *event){
171 171  
172 172 qDebug() << "pushed ";
173 173 break;
174   - case 0x01000032: // Turn right
  174 + case 0x01000030: // Turn right
175 175 nextFocus();
176 176 ui->scrollArea->ensureWidgetVisible(focusWidget());
177 177 qDebug() << "Turn Right";
... ...
app/gui/oven_control/confirmpopup.cpp
... ... @@ -27,13 +27,13 @@ void ConfirmPopup::keyPressEvent(QKeyEvent *event)
27 27 {
28 28 switch (event->key())
29 29 {
30   - case 0x01000030: // Turn left
  30 + case 0x01000032: // Turn left
31 31 onEncoderLeft();
32 32 break;
33 33 case 0x01000031: // Push
34 34 pushed = focusWidget();
35 35 break;
36   - case 0x01000032: // Turn right
  36 + case 0x01000030: // Turn right
37 37 onEncoderRight();
38 38 break;
39 39 }
... ... @@ -43,7 +43,7 @@ void ConfirmPopup::keyReleaseEvent(QKeyEvent *event)
43 43 {
44 44 switch (event->key())
45 45 {
46   - case 0x01000030: // Turn left
  46 + case 0x01000032: // Turn left
47 47 onEncoderLeft();
48 48 break;
49 49 case 0x01000031: // Push
... ... @@ -52,7 +52,7 @@ void ConfirmPopup::keyReleaseEvent(QKeyEvent *event)
52 52  
53 53 pushed = NULL;
54 54 break;
55   - case 0x01000032: // Turn right
  55 + case 0x01000030: // Turn right
56 56 onEncoderRight();
57 57 break;
58 58 }
... ...
app/gui/oven_control/cookpanelbutton.cpp
... ... @@ -105,7 +105,7 @@ void CookPanelButton::keyPressEvent(QKeyEvent *event)
105 105 {
106 106 switch (event->key())
107 107 {
108   - case 0x01000030: // Turn left
  108 + case 0x01000032: // Turn left
109 109 event->ignore();
110 110 break;
111 111 case 0x01000031: // Push
... ... @@ -113,7 +113,7 @@ void CookPanelButton::keyPressEvent(QKeyEvent *event)
113 113 if (pushed == ui->pushButton)
114 114 on_pushButton_pressed();
115 115 break;
116   - case 0x01000032: // Turn right
  116 + case 0x01000030: // Turn right
117 117 event->ignore();
118 118 break;
119 119 }
... ... @@ -123,7 +123,7 @@ void CookPanelButton::keyReleaseEvent(QKeyEvent *event)
123 123 {
124 124 switch (event->key())
125 125 {
126   - case 0x01000030: // Turn left
  126 + case 0x01000032: // Turn left
127 127 event->ignore();
128 128 break;
129 129 case 0x01000031: // Push
... ... @@ -135,7 +135,7 @@ void CookPanelButton::keyReleaseEvent(QKeyEvent *event)
135 135  
136 136 pushed = NULL;
137 137 break;
138   - case 0x01000032: // Turn right
  138 + case 0x01000030: // Turn right
139 139 event->ignore();
140 140 break;
141 141 }
... ...
app/gui/oven_control/cooldownpopup.cpp
... ... @@ -78,13 +78,13 @@ void CooldownPopup::keyPressEvent(QKeyEvent *event)
78 78 {
79 79 switch (event->key())
80 80 {
81   - case 0x01000030: // Turn left
  81 + case 0x01000032: // Turn left
82 82 onEncoderLeft();
83 83 break;
84 84 case 0x01000031: // Push
85 85 pushed = focusWidget();
86 86 break;
87   - case 0x01000032: // Turn right
  87 + case 0x01000030: // Turn right
88 88 onEncoderRight();
89 89 break;
90 90 }
... ... @@ -94,7 +94,7 @@ void CooldownPopup::keyReleaseEvent(QKeyEvent *event)
94 94 {
95 95 switch (event->key())
96 96 {
97   - case 0x01000030: // Turn left
  97 + case 0x01000032: // Turn left
98 98 onEncoderLeft();
99 99 break;
100 100 case 0x01000031: // Push
... ... @@ -103,7 +103,7 @@ void CooldownPopup::keyReleaseEvent(QKeyEvent *event)
103 103  
104 104 pushed = NULL;
105 105 break;
106   - case 0x01000032: // Turn right
  106 + case 0x01000030: // Turn right
107 107 onEncoderRight();
108 108 break;
109 109 }
... ...
app/gui/oven_control/coretempsettingpopup.cpp
... ... @@ -98,13 +98,13 @@ void CoreTempSettingPopup::keyPressEvent(QKeyEvent *event)
98 98 {
99 99 switch (event->key())
100 100 {
101   - case 0x01000030: // Turn left
  101 + case 0x01000032: // Turn left
102 102 onEncoderLeft();
103 103 break;
104 104 case 0x01000031: // Push
105 105 pushed = focusWidget();
106 106 break;
107   - case 0x01000032: // Turn right
  107 + case 0x01000030: // Turn right
108 108 onEncoderRight();
109 109 break;
110 110 }
... ... @@ -114,7 +114,7 @@ void CoreTempSettingPopup::keyReleaseEvent(QKeyEvent *event)
114 114 {
115 115 switch (event->key())
116 116 {
117   - case 0x01000030: // Turn left
  117 + case 0x01000032: // Turn left
118 118 onEncoderLeft();
119 119 break;
120 120 case 0x01000031: // Push
... ... @@ -123,7 +123,7 @@ void CoreTempSettingPopup::keyReleaseEvent(QKeyEvent *event)
123 123  
124 124 pushed = NULL;
125 125 break;
126   - case 0x01000032: // Turn right
  126 + case 0x01000030: // Turn right
127 127 onEncoderRight();
128 128 break;
129 129 }
... ...
app/gui/oven_control/electricmodelsettingwindow.cpp
... ... @@ -108,7 +108,7 @@ void ElectricModelSettingWindow::keyPressEvent(QKeyEvent *event){
108 108 int i = 0;
109 109 switch (event->key())
110 110 {
111   - case 0x01000030: // Turn left
  111 + case 0x01000032: // Turn left
112 112 for(i = 0; i < m_vectorTabOrder.size();i++){
113 113 if(focusWidget() == m_vectorTabOrder[i]) break;
114 114 }
... ... @@ -129,7 +129,7 @@ void ElectricModelSettingWindow::keyPressEvent(QKeyEvent *event){
129 129 case 0x01000031: // Push
130 130  
131 131 break;
132   - case 0x01000032: // Turn right
  132 + case 0x01000030: // Turn right
133 133 for(i = 0; i < m_vectorTabOrder.size();i++){
134 134 if(focusWidget() == m_vectorTabOrder[i]) break;
135 135 }
... ... @@ -154,7 +154,7 @@ void ElectricModelSettingWindow::keyReleaseEvent(QKeyEvent *event){
154 154 int i = 0;
155 155 switch (event->key())
156 156 {
157   - case 0x01000030: // Turn left
  157 + case 0x01000032: // Turn left
158 158 for(i = 0; i < m_vectorTabOrder.size();i++){
159 159 if(focusWidget() == m_vectorTabOrder[i]) break;
160 160 }
... ... @@ -180,7 +180,7 @@ void ElectricModelSettingWindow::keyReleaseEvent(QKeyEvent *event){
180 180 }
181 181 break;
182 182 }
183   - case 0x01000032: // Turn right
  183 + case 0x01000030: // Turn right
184 184 for(i = 0; i < m_vectorTabOrder.size();i++){
185 185 if(focusWidget() == m_vectorTabOrder[i]) break;
186 186 }
... ...
app/gui/oven_control/engineermenuwindow.cpp
... ... @@ -39,13 +39,13 @@ void EngineerMenuWindow::keyPressEvent(QKeyEvent *event)
39 39 {
40 40 switch (event->key())
41 41 {
42   - case 0x01000030: // Turn left
  42 + case 0x01000032: // Turn left
43 43 onEncoderLeft();
44 44 break;
45 45 case 0x01000031: // Push
46 46 pushed = focusWidget();
47 47 break;
48   - case 0x01000032: // Turn right
  48 + case 0x01000030: // Turn right
49 49 onEncoderRight();
50 50 break;
51 51 }
... ... @@ -55,7 +55,7 @@ void EngineerMenuWindow::keyReleaseEvent(QKeyEvent *event)
55 55 {
56 56 switch (event->key())
57 57 {
58   - case 0x01000030: // Turn left
  58 + case 0x01000032: // Turn left
59 59 onEncoderLeft();
60 60 break;
61 61 case 0x01000031: // Push
... ... @@ -64,7 +64,7 @@ void EngineerMenuWindow::keyReleaseEvent(QKeyEvent *event)
64 64  
65 65 pushed = NULL;
66 66 break;
67   - case 0x01000032: // Turn right
  67 + case 0x01000030: // Turn right
68 68 onEncoderRight();
69 69 break;
70 70 }
... ...
app/gui/oven_control/fantestwindow.cpp
... ... @@ -44,13 +44,13 @@ void FanTestWindow::keyPressEvent(QKeyEvent *event)
44 44 {
45 45 switch (event->key())
46 46 {
47   - case 0x01000030: // Turn left
  47 + case 0x01000032: // Turn left
48 48 onEncoderLeft();
49 49 break;
50 50 case 0x01000031: // Push
51 51 pushed = focusWidget();
52 52 break;
53   - case 0x01000032: // Turn right
  53 + case 0x01000030: // Turn right
54 54 onEncoderRight();
55 55 break;
56 56 }
... ... @@ -60,7 +60,7 @@ void FanTestWindow::keyReleaseEvent(QKeyEvent *event)
60 60 {
61 61 switch (event->key())
62 62 {
63   - case 0x01000030: // Turn left
  63 + case 0x01000032: // Turn left
64 64 onEncoderLeft();
65 65 break;
66 66 case 0x01000031: // Push
... ... @@ -69,7 +69,7 @@ void FanTestWindow::keyReleaseEvent(QKeyEvent *event)
69 69  
70 70 pushed = NULL;
71 71 break;
72   - case 0x01000032: // Turn right
  72 + case 0x01000030: // Turn right
73 73 onEncoderRight();
74 74 break;
75 75 }
... ...
app/gui/oven_control/favoritenamepopup.cpp
... ... @@ -61,13 +61,13 @@ void FavoriteNamePopup::keyPressEvent(QKeyEvent *event)
61 61 {
62 62 switch (event->key())
63 63 {
64   - case 0x01000030: // Turn left
  64 + case 0x01000032: // Turn left
65 65 onEncoderLeft();
66 66 break;
67 67 case 0x01000031: // Push
68 68 pushed = focusWidget();
69 69 break;
70   - case 0x01000032: // Turn right
  70 + case 0x01000030: // Turn right
71 71 onEncoderRight();
72 72 break;
73 73 }
... ... @@ -77,7 +77,7 @@ void FavoriteNamePopup::keyReleaseEvent(QKeyEvent *event)
77 77 {
78 78 switch (event->key())
79 79 {
80   - case 0x01000030: // Turn left
  80 + case 0x01000032: // Turn left
81 81 onEncoderLeft();
82 82 break;
83 83 case 0x01000031: // Push
... ... @@ -86,7 +86,7 @@ void FavoriteNamePopup::keyReleaseEvent(QKeyEvent *event)
86 86  
87 87 pushed = NULL;
88 88 break;
89   - case 0x01000032: // Turn right
  89 + case 0x01000030: // Turn right
90 90 onEncoderRight();
91 91 break;
92 92 }
... ...
app/gui/oven_control/functiontestwindow.cpp
... ... @@ -35,13 +35,13 @@ void FunctionTestWindow::keyPressEvent(QKeyEvent *event)
35 35 {
36 36 switch (event->key())
37 37 {
38   - case 0x01000030: // Turn left
  38 + case 0x01000032: // Turn left
39 39 onEncoderLeft();
40 40 break;
41 41 case 0x01000031: // Push
42 42 pushed = focusWidget();
43 43 break;
44   - case 0x01000032: // Turn right
  44 + case 0x01000030: // Turn right
45 45 onEncoderRight();
46 46 break;
47 47 }
... ... @@ -51,7 +51,7 @@ void FunctionTestWindow::keyReleaseEvent(QKeyEvent *event)
51 51 {
52 52 switch (event->key())
53 53 {
54   - case 0x01000030: // Turn left
  54 + case 0x01000032: // Turn left
55 55 onEncoderLeft();
56 56 break;
57 57 case 0x01000031: // Push
... ... @@ -60,7 +60,7 @@ void FunctionTestWindow::keyReleaseEvent(QKeyEvent *event)
60 60  
61 61 pushed = NULL;
62 62 break;
63   - case 0x01000032: // Turn right
  63 + case 0x01000030: // Turn right
64 64 onEncoderRight();
65 65 break;
66 66 }
... ...
app/gui/oven_control/gasmodelsettingwindow.cpp
... ... @@ -147,7 +147,7 @@ void GasModelSettingWindow::keyPressEvent(QKeyEvent *event){
147 147 int i = 0;
148 148 switch (event->key())
149 149 {
150   - case 0x01000030: // Turn left
  150 + case 0x01000032: // Turn left
151 151 for(i = 0; i < m_vectorTabOrder.size();i++){
152 152 if(focusWidget() == m_vectorTabOrder[i]) break;
153 153 }
... ... @@ -168,7 +168,7 @@ void GasModelSettingWindow::keyPressEvent(QKeyEvent *event){
168 168 case 0x01000031: // Push
169 169  
170 170 break;
171   - case 0x01000032: // Turn right
  171 + case 0x01000030: // Turn right
172 172 for(i = 0; i < m_vectorTabOrder.size();i++){
173 173 if(focusWidget() == m_vectorTabOrder[i]) break;
174 174 }
... ... @@ -193,7 +193,7 @@ void GasModelSettingWindow::keyReleaseEvent(QKeyEvent *event){
193 193 int i = 0;
194 194 switch (event->key())
195 195 {
196   - case 0x01000030: // Turn left
  196 + case 0x01000032: // Turn left
197 197 for(i = 0; i < m_vectorTabOrder.size();i++){
198 198 if(focusWidget() == m_vectorTabOrder[i]) break;
199 199 }
... ... @@ -219,7 +219,7 @@ void GasModelSettingWindow::keyReleaseEvent(QKeyEvent *event){
219 219 }
220 220 break;
221 221 }
222   - case 0x01000032: // Turn right
  222 + case 0x01000030: // Turn right
223 223 for(i = 0; i < m_vectorTabOrder.size();i++){
224 224 if(focusWidget() == m_vectorTabOrder[i]) break;
225 225 }
... ...
app/gui/oven_control/gastestwindow.cpp
... ... @@ -29,13 +29,13 @@ void GasTestWindow::keyPressEvent(QKeyEvent *event)
29 29 {
30 30 switch (event->key())
31 31 {
32   - case 0x01000030: // Turn left
  32 + case 0x01000032: // Turn left
33 33 onEncoderLeft();
34 34 break;
35 35 case 0x01000031: // Push
36 36 pushed = focusWidget();
37 37 break;
38   - case 0x01000032: // Turn right
  38 + case 0x01000030: // Turn right
39 39 onEncoderRight();
40 40 break;
41 41 }
... ... @@ -45,7 +45,7 @@ void GasTestWindow::keyReleaseEvent(QKeyEvent *event)
45 45 {
46 46 switch (event->key())
47 47 {
48   - case 0x01000030: // Turn left
  48 + case 0x01000032: // Turn left
49 49 onEncoderLeft();
50 50 break;
51 51 case 0x01000031: // Push
... ... @@ -54,7 +54,7 @@ void GasTestWindow::keyReleaseEvent(QKeyEvent *event)
54 54  
55 55 pushed = NULL;
56 56 break;
57   - case 0x01000032: // Turn right
  57 + case 0x01000030: // Turn right
58 58 onEncoderRight();
59 59 break;
60 60 }
... ...
app/gui/oven_control/historylistwindow.cpp
... ... @@ -368,12 +368,12 @@ void HistoryListWindow::keyPressEvent(QKeyEvent *event)
368 368 {
369 369 switch (event->key())
370 370 {
371   - case 0x01000030: // Turn left
  371 + case 0x01000032: // Turn left
372 372 focusPreviousChild();
373 373 break;
374 374 case 0x01000031: // Push
375 375 break;
376   - case 0x01000032: // Turn right
  376 + case 0x01000030: // Turn right
377 377 focusNextChild();
378 378 break;
379 379 }
... ... @@ -383,7 +383,7 @@ void HistoryListWindow::keyReleaseEvent(QKeyEvent *event)
383 383 {
384 384 switch (event->key())
385 385 {
386   - case 0x01000030: // Turn left
  386 + case 0x01000032: // Turn left
387 387 focusPreviousChild();
388 388 break;
389 389 case 0x01000031: // Push
... ... @@ -394,7 +394,7 @@ void HistoryListWindow::keyReleaseEvent(QKeyEvent *event)
394 394 }
395 395 break;
396 396 }
397   - case 0x01000032: // Turn right
  397 + case 0x01000030: // Turn right
398 398 focusNextChild();
399 399 break;
400 400 }
... ...
app/gui/oven_control/keepwarmpopup.cpp
... ... @@ -26,13 +26,13 @@ void KeepWarmPopup::keyPressEvent(QKeyEvent *event)
26 26 {
27 27 switch (event->key())
28 28 {
29   - case 0x01000030: // Turn left
  29 + case 0x01000032: // Turn left
30 30 onEncoderLeft();
31 31 break;
32 32 case 0x01000031: // Push
33 33 pushed = focusWidget();
34 34 break;
35   - case 0x01000032: // Turn right
  35 + case 0x01000030: // Turn right
36 36 onEncoderRight();
37 37 break;
38 38 }
... ... @@ -42,7 +42,7 @@ void KeepWarmPopup::keyReleaseEvent(QKeyEvent *event)
42 42 {
43 43 switch (event->key())
44 44 {
45   - case 0x01000030: // Turn left
  45 + case 0x01000032: // Turn left
46 46 onEncoderLeft();
47 47 break;
48 48 case 0x01000031: // Push
... ... @@ -51,7 +51,7 @@ void KeepWarmPopup::keyReleaseEvent(QKeyEvent *event)
51 51  
52 52 pushed = NULL;
53 53 break;
54   - case 0x01000032: // Turn right
  54 + case 0x01000030: // Turn right
55 55 onEncoderRight();
56 56 break;
57 57 }
... ...
app/gui/oven_control/keyboardwidget.cpp
... ... @@ -251,14 +251,14 @@ void KeyboardWidget::on_pushButton_40_clicked()
251 251 void KeyboardWidget::keyPressEvent(QKeyEvent *event){
252 252 switch (event->key())
253 253 {
254   - case 0x01000030: // Turn left
  254 + case 0x01000032: // Turn left
255 255 if(m_nCurTabPos > 0 ) m_nCurTabPos--;
256 256 else m_nCurTabPos = m_vectorTabOrder.size()-1;
257 257 if(m_pCurCheckedBtn !=NULL) m_pCurCheckedBtn->setChecked(false);
258 258 m_pCurCheckedBtn = m_vectorTabOrder[m_nCurTabPos];
259 259 m_pCurCheckedBtn->setChecked(true);
260 260 break;
261   - case 0x01000032: // Turn right
  261 + case 0x01000030: // Turn right
262 262 if(m_nCurTabPos < (m_vectorTabOrder.size() -1)) m_nCurTabPos++;
263 263 else m_nCurTabPos=0;
264 264 if(m_pCurCheckedBtn !=NULL) m_pCurCheckedBtn->setChecked(false);
... ... @@ -271,7 +271,7 @@ void KeyboardWidget::keyPressEvent(QKeyEvent *event){
271 271 void KeyboardWidget::keyReleaseEvent(QKeyEvent *event){
272 272 switch (event->key())
273 273 {
274   - case 0x01000030: // Turn left
  274 + case 0x01000032: // Turn left
275 275 if(m_nCurTabPos > 0 ) m_nCurTabPos--;
276 276 else m_nCurTabPos = m_vectorTabOrder.size()-1;
277 277 if(m_pCurCheckedBtn !=NULL) m_pCurCheckedBtn->setChecked(false);
... ... @@ -285,7 +285,7 @@ void KeyboardWidget::keyReleaseEvent(QKeyEvent *event){
285 285 }
286 286 break;
287 287 }
288   - case 0x01000032: // Turn right
  288 + case 0x01000030: // Turn right
289 289 if(m_nCurTabPos < (m_vectorTabOrder.size() -1)) m_nCurTabPos++;
290 290 else m_nCurTabPos=0;
291 291 if(m_pCurCheckedBtn !=NULL) m_pCurCheckedBtn->setChecked(false);
... ...
app/gui/oven_control/mainwindow.cpp
... ... @@ -58,13 +58,13 @@ void MainWindow::keyPressEvent(QKeyEvent *event)
58 58 {
59 59 switch (event->key())
60 60 {
61   - case 0x01000030: // Turn left
  61 + case 0x01000032: // Turn left
62 62 onEncoderLeft();
63 63 break;
64 64 case 0x01000031: // Push
65 65 pushed = focusWidget();
66 66 break;
67   - case 0x01000032: // Turn right
  67 + case 0x01000030: // Turn right
68 68 onEncoderRight();
69 69 break;
70 70 }
... ... @@ -74,7 +74,7 @@ void MainWindow::keyReleaseEvent(QKeyEvent *event)
74 74 {
75 75 switch (event->key())
76 76 {
77   - case 0x01000030: // Turn left
  77 + case 0x01000032: // Turn left
78 78 onEncoderLeft();
79 79 break;
80 80 case 0x01000031: // Push
... ... @@ -83,7 +83,7 @@ void MainWindow::keyReleaseEvent(QKeyEvent *event)
83 83  
84 84 pushed = NULL;
85 85 break;
86   - case 0x01000032: // Turn right
  86 + case 0x01000030: // Turn right
87 87 onEncoderRight();
88 88 break;
89 89 }
... ...
app/gui/oven_control/manualcooksettingwidget.cpp
... ... @@ -117,13 +117,13 @@ void ManualCookSettingWidget::keyPressEvent(QKeyEvent *event)
117 117 {
118 118 switch (event->key())
119 119 {
120   - case 0x01000030: // Turn left
  120 + case 0x01000032: // Turn left
121 121 onEncoderLeft();
122 122 break;
123 123 case 0x01000031: // Push
124 124 pushed = focusWidget();
125 125 break;
126   - case 0x01000032: // Turn right
  126 + case 0x01000030: // Turn right
127 127 onEncoderRight();
128 128 break;
129 129 }
... ... @@ -133,7 +133,7 @@ void ManualCookSettingWidget::keyReleaseEvent(QKeyEvent *event)
133 133 {
134 134 switch (event->key())
135 135 {
136   - case 0x01000030: // Turn left
  136 + case 0x01000032: // Turn left
137 137 onEncoderLeft();
138 138 break;
139 139 case 0x01000031: // Push
... ... @@ -142,7 +142,7 @@ void ManualCookSettingWidget::keyReleaseEvent(QKeyEvent *event)
142 142  
143 143 pushed = NULL;
144 144 break;
145   - case 0x01000032: // Turn right
  145 + case 0x01000030: // Turn right
146 146 onEncoderRight();
147 147 break;
148 148 }
... ...
app/gui/oven_control/manualcookwindow.cpp
... ... @@ -187,7 +187,7 @@ void ManualCookWindow::keyPressEvent(QKeyEvent *event)
187 187 {
188 188 switch (event->key())
189 189 {
190   - case 0x01000030: // Turn left
  190 + case 0x01000032: // Turn left
191 191 onEncoderLeft();
192 192 break;
193 193 case 0x01000031: // Push
... ... @@ -202,7 +202,7 @@ void ManualCookWindow::keyPressEvent(QKeyEvent *event)
202 202  
203 203 }
204 204 break;
205   - case 0x01000032: // Turn right
  205 + case 0x01000030: // Turn right
206 206 onEncoderRight();
207 207 break;
208 208 }
... ... @@ -212,7 +212,7 @@ void ManualCookWindow::keyReleaseEvent(QKeyEvent *event)
212 212 {
213 213 switch (event->key())
214 214 {
215   - case 0x01000030: // Turn left
  215 + case 0x01000032: // Turn left
216 216 onEncoderLeft();
217 217 break;
218 218 case 0x01000031: // Push
... ... @@ -226,7 +226,7 @@ void ManualCookWindow::keyReleaseEvent(QKeyEvent *event)
226 226  
227 227 pushed = NULL;
228 228 break;
229   - case 0x01000032: // Turn right
  229 + case 0x01000030: // Turn right
230 230 onEncoderRight();
231 231 break;
232 232 }
... ...
app/gui/oven_control/modelsettingwindow.cpp
... ... @@ -29,13 +29,13 @@ void ModelSettingWindow::keyPressEvent(QKeyEvent *event)
29 29 {
30 30 switch (event->key())
31 31 {
32   - case 0x01000030: // Turn left
  32 + case 0x01000032: // Turn left
33 33 onEncoderLeft();
34 34 break;
35 35 case 0x01000031: // Push
36 36 pushed = focusWidget();
37 37 break;
38   - case 0x01000032: // Turn right
  38 + case 0x01000030: // Turn right
39 39 onEncoderRight();
40 40 break;
41 41 }
... ... @@ -45,7 +45,7 @@ void ModelSettingWindow::keyReleaseEvent(QKeyEvent *event)
45 45 {
46 46 switch (event->key())
47 47 {
48   - case 0x01000030: // Turn left
  48 + case 0x01000032: // Turn left
49 49 onEncoderLeft();
50 50 break;
51 51 case 0x01000031: // Push
... ... @@ -54,7 +54,7 @@ void ModelSettingWindow::keyReleaseEvent(QKeyEvent *event)
54 54  
55 55 pushed = NULL;
56 56 break;
57   - case 0x01000032: // Turn right
  57 + case 0x01000030: // Turn right
58 58 onEncoderRight();
59 59 break;
60 60 }
... ...
app/gui/oven_control/operationtimeheat.cpp
... ... @@ -74,12 +74,12 @@ void OperationTimeHeat::keyPressEvent(QKeyEvent *event)
74 74 {
75 75 switch (event->key())
76 76 {
77   - case 0x01000030: // Turn left
  77 + case 0x01000032: // Turn left
78 78 focusPreviousChild();
79 79 break;
80 80 case 0x01000031: // Push
81 81 break;
82   - case 0x01000032: // Turn right
  82 + case 0x01000030: // Turn right
83 83 focusNextChild();
84 84 break;
85 85 }
... ... @@ -89,7 +89,7 @@ void OperationTimeHeat::keyReleaseEvent(QKeyEvent *event)
89 89 {
90 90 switch (event->key())
91 91 {
92   - case 0x01000030: // Turn left
  92 + case 0x01000032: // Turn left
93 93 focusPreviousChild();
94 94 break;
95 95 case 0x01000031: // Push
... ... @@ -100,7 +100,7 @@ void OperationTimeHeat::keyReleaseEvent(QKeyEvent *event)
100 100 }
101 101 break;
102 102 }
103   - case 0x01000032: // Turn right
  103 + case 0x01000030: // Turn right
104 104 focusNextChild();
105 105 break;
106 106 }
... ...
app/gui/oven_control/operationtimemain.cpp
... ... @@ -54,12 +54,12 @@ void OperationTimeMain::keyPressEvent(QKeyEvent *event)
54 54 {
55 55 switch (event->key())
56 56 {
57   - case 0x01000030: // Turn left
  57 + case 0x01000032: // Turn left
58 58 focusPreviousChild();
59 59 break;
60 60 case 0x01000031: // Push
61 61 break;
62   - case 0x01000032: // Turn right
  62 + case 0x01000030: // Turn right
63 63 focusNextChild();
64 64 break;
65 65 }
... ... @@ -69,7 +69,7 @@ void OperationTimeMain::keyReleaseEvent(QKeyEvent *event)
69 69 {
70 70 switch (event->key())
71 71 {
72   - case 0x01000030: // Turn left
  72 + case 0x01000032: // Turn left
73 73 focusPreviousChild();
74 74 break;
75 75 case 0x01000031: // Push
... ... @@ -80,7 +80,7 @@ void OperationTimeMain::keyReleaseEvent(QKeyEvent *event)
80 80 }
81 81 break;
82 82 }
83   - case 0x01000032: // Turn right
  83 + case 0x01000030: // Turn right
84 84 focusNextChild();
85 85 break;
86 86 }
... ...
app/gui/oven_control/operationtimemode.cpp
... ... @@ -102,12 +102,12 @@ void OperationTimeMode::keyPressEvent(QKeyEvent *event)
102 102 {
103 103 switch (event->key())
104 104 {
105   - case 0x01000030: // Turn left
  105 + case 0x01000032: // Turn left
106 106 focusPreviousChild();
107 107 break;
108 108 case 0x01000031: // Push
109 109 break;
110   - case 0x01000032: // Turn right
  110 + case 0x01000030: // Turn right
111 111 focusNextChild();
112 112 break;
113 113 }
... ... @@ -117,7 +117,7 @@ void OperationTimeMode::keyReleaseEvent(QKeyEvent *event)
117 117 {
118 118 switch (event->key())
119 119 {
120   - case 0x01000030: // Turn left
  120 + case 0x01000032: // Turn left
121 121 focusPreviousChild();
122 122 break;
123 123 case 0x01000031: // Push
... ... @@ -128,7 +128,7 @@ void OperationTimeMode::keyReleaseEvent(QKeyEvent *event)
128 128 }
129 129 break;
130 130 }
131   - case 0x01000032: // Turn right
  131 + case 0x01000030: // Turn right
132 132 focusNextChild();
133 133 break;
134 134 }
... ...
app/gui/oven_control/operationtimeparts.cpp
... ... @@ -119,12 +119,12 @@ void OperationTimeParts::keyPressEvent(QKeyEvent *event)
119 119 {
120 120 switch (event->key())
121 121 {
122   - case 0x01000030: // Turn left
  122 + case 0x01000032: // Turn left
123 123 focusPreviousChild();
124 124 break;
125 125 case 0x01000031: // Push
126 126 break;
127   - case 0x01000032: // Turn right
  127 + case 0x01000030: // Turn right
128 128 focusNextChild();
129 129 break;
130 130 }
... ... @@ -134,7 +134,7 @@ void OperationTimeParts::keyReleaseEvent(QKeyEvent *event)
134 134 {
135 135 switch (event->key())
136 136 {
137   - case 0x01000030: // Turn left
  137 + case 0x01000032: // Turn left
138 138 focusPreviousChild();
139 139 break;
140 140 case 0x01000031: // Push
... ... @@ -145,7 +145,7 @@ void OperationTimeParts::keyReleaseEvent(QKeyEvent *event)
145 145 }
146 146 break;
147 147 }
148   - case 0x01000032: // Turn right
  148 + case 0x01000030: // Turn right
149 149 focusNextChild();
150 150 break;
151 151 }
... ...
app/gui/oven_control/preheatpopup.cpp
... ... @@ -48,13 +48,13 @@ void PreheatPopup::keyReleaseEvent(QKeyEvent *event)
48 48 {
49 49 switch (event->key())
50 50 {
51   - case 0x01000030: // Turn left
  51 + case 0x01000032: // Turn left
52 52 break;
53 53 case 0x01000031: // Push
54 54 stop();
55 55 close();
56 56 break;
57   - case 0x01000032: // Turn right
  57 + case 0x01000030: // Turn right
58 58 break;
59 59 }
60 60 }
... ...
app/gui/oven_control/primewindow.cpp
... ... @@ -107,13 +107,13 @@ void PrimeWindow::keyPressEvent(QKeyEvent *event)
107 107 {
108 108 switch (event->key())
109 109 {
110   - case 0x01000030: // Turn left
  110 + case 0x01000032: // Turn left
111 111 onEncoderLeft();
112 112 break;
113 113 case 0x01000031: // Push
114 114 pushed = focusWidget();
115 115 break;
116   - case 0x01000032: // Turn right
  116 + case 0x01000030: // Turn right
117 117 onEncoderRight();
118 118 break;
119 119 }
... ... @@ -123,7 +123,7 @@ void PrimeWindow::keyReleaseEvent(QKeyEvent *event)
123 123 {
124 124 switch (event->key())
125 125 {
126   - case 0x01000030: // Turn left
  126 + case 0x01000032: // Turn left
127 127 onEncoderLeft();
128 128 break;
129 129 case 0x01000031: // Push
... ... @@ -132,7 +132,7 @@ void PrimeWindow::keyReleaseEvent(QKeyEvent *event)
132 132  
133 133 pushed = NULL;
134 134 break;
135   - case 0x01000032: // Turn right
  135 + case 0x01000030: // Turn right
136 136 onEncoderRight();
137 137 break;
138 138 }
... ...
app/gui/oven_control/programmedcookpanelbutton.cpp
... ... @@ -86,7 +86,7 @@ void ProgrammedCookPanelButton::keyPressEvent(QKeyEvent *event)
86 86 {
87 87 switch (event->key())
88 88 {
89   - case 0x01000030: // Turn left
  89 + case 0x01000032: // Turn left
90 90 event->ignore();
91 91 break;
92 92 case 0x01000031: // Push
... ... @@ -94,7 +94,7 @@ void ProgrammedCookPanelButton::keyPressEvent(QKeyEvent *event)
94 94 if (pushed == ui->pushButton)
95 95 on_pushButton_pressed();
96 96 break;
97   - case 0x01000032: // Turn right
  97 + case 0x01000030: // Turn right
98 98 event->ignore();
99 99 break;
100 100 }
... ... @@ -104,7 +104,7 @@ void ProgrammedCookPanelButton::keyReleaseEvent(QKeyEvent *event)
104 104 {
105 105 switch (event->key())
106 106 {
107   - case 0x01000030: // Turn left
  107 + case 0x01000032: // Turn left
108 108 event->ignore();
109 109 break;
110 110 case 0x01000031: // Push
... ... @@ -116,7 +116,7 @@ void ProgrammedCookPanelButton::keyReleaseEvent(QKeyEvent *event)
116 116  
117 117 pushed = NULL;
118 118 break;
119   - case 0x01000032: // Turn right
  119 + case 0x01000030: // Turn right
120 120 event->ignore();
121 121 break;
122 122 }
... ...
app/gui/oven_control/programmingautoconfigwindow.cpp
... ... @@ -107,13 +107,13 @@ void ProgrammingAutoConfigWindow::keyPressEvent(QKeyEvent *event)
107 107 {
108 108 switch (event->key())
109 109 {
110   - case 0x01000030: // Turn left
  110 + case 0x01000032: // Turn left
111 111 onEncoderLeft();
112 112 break;
113 113 case 0x01000031: // Push
114 114 pushed = focusWidget();
115 115 break;
116   - case 0x01000032: // Turn right
  116 + case 0x01000030: // Turn right
117 117 onEncoderRight();
118 118 break;
119 119 }
... ... @@ -123,7 +123,7 @@ void ProgrammingAutoConfigWindow::keyReleaseEvent(QKeyEvent *event)
123 123 {
124 124 switch (event->key())
125 125 {
126   - case 0x01000030: // Turn left
  126 + case 0x01000032: // Turn left
127 127 onEncoderLeft();
128 128 break;
129 129 case 0x01000031: // Push
... ... @@ -132,7 +132,7 @@ void ProgrammingAutoConfigWindow::keyReleaseEvent(QKeyEvent *event)
132 132  
133 133 pushed = NULL;
134 134 break;
135   - case 0x01000032: // Turn right
  135 + case 0x01000030: // Turn right
136 136 onEncoderRight();
137 137 break;
138 138 }
... ...
app/gui/oven_control/programmingautoselectionwindow.cpp
... ... @@ -80,13 +80,13 @@ void ProgrammingAutoSelectionWindow::keyPressEvent(QKeyEvent *event)
80 80 {
81 81 switch (event->key())
82 82 {
83   - case 0x01000030: // Turn left
  83 + case 0x01000032: // Turn left
84 84 onEncoderLeft();
85 85 break;
86 86 case 0x01000031: // Push
87 87 pushed = focusWidget();
88 88 break;
89   - case 0x01000032: // Turn right
  89 + case 0x01000030: // Turn right
90 90 onEncoderRight();
91 91 break;
92 92 }
... ... @@ -96,7 +96,7 @@ void ProgrammingAutoSelectionWindow::keyReleaseEvent(QKeyEvent *event)
96 96 {
97 97 switch (event->key())
98 98 {
99   - case 0x01000030: // Turn left
  99 + case 0x01000032: // Turn left
100 100 onEncoderLeft();
101 101 break;
102 102 case 0x01000031: // Push
... ... @@ -105,7 +105,7 @@ void ProgrammingAutoSelectionWindow::keyReleaseEvent(QKeyEvent *event)
105 105  
106 106 pushed = NULL;
107 107 break;
108   - case 0x01000032: // Turn right
  108 + case 0x01000030: // Turn right
109 109 onEncoderRight();
110 110 break;
111 111 }
... ...
app/gui/oven_control/programmingmanualcoretemppopup.cpp
... ... @@ -77,13 +77,13 @@ void ProgrammingManualCoreTempPopup::keyPressEvent(QKeyEvent *event)
77 77 {
78 78 switch (event->key())
79 79 {
80   - case 0x01000030: // Turn left
  80 + case 0x01000032: // Turn left
81 81 onEncoderLeft();
82 82 break;
83 83 case 0x01000031: // Push
84 84 pushed = focusWidget();
85 85 break;
86   - case 0x01000032: // Turn right
  86 + case 0x01000030: // Turn right
87 87 onEncoderRight();
88 88 break;
89 89 }
... ... @@ -93,7 +93,7 @@ void ProgrammingManualCoreTempPopup::keyReleaseEvent(QKeyEvent *event)
93 93 {
94 94 switch (event->key())
95 95 {
96   - case 0x01000030: // Turn left
  96 + case 0x01000032: // Turn left
97 97 onEncoderLeft();
98 98 break;
99 99 case 0x01000031: // Push
... ... @@ -102,7 +102,7 @@ void ProgrammingManualCoreTempPopup::keyReleaseEvent(QKeyEvent *event)
102 102  
103 103 pushed = NULL;
104 104 break;
105   - case 0x01000032: // Turn right
  105 + case 0x01000030: // Turn right
106 106 onEncoderRight();
107 107 break;
108 108 }
... ...
app/gui/oven_control/programmingmanualwindow.cpp
... ... @@ -109,13 +109,13 @@ void ProgrammingManualWindow::keyPressEvent(QKeyEvent *event)
109 109 {
110 110 switch (event->key())
111 111 {
112   - case 0x01000030: // Turn left
  112 + case 0x01000032: // Turn left
113 113 onEncoderLeft();
114 114 break;
115 115 case 0x01000031: // Push
116 116 pushed = focusWidget();
117 117 break;
118   - case 0x01000032: // Turn right
  118 + case 0x01000030: // Turn right
119 119 onEncoderRight();
120 120 break;
121 121 }
... ... @@ -125,7 +125,7 @@ void ProgrammingManualWindow::keyReleaseEvent(QKeyEvent *event)
125 125 {
126 126 switch (event->key())
127 127 {
128   - case 0x01000030: // Turn left
  128 + case 0x01000032: // Turn left
129 129 onEncoderLeft();
130 130 break;
131 131 case 0x01000031: // Push
... ... @@ -134,7 +134,7 @@ void ProgrammingManualWindow::keyReleaseEvent(QKeyEvent *event)
134 134  
135 135 pushed = NULL;
136 136 break;
137   - case 0x01000032: // Turn right
  137 + case 0x01000030: // Turn right
138 138 onEncoderRight();
139 139 break;
140 140 }
... ...
app/gui/oven_control/programmingnamepopup.cpp
... ... @@ -51,13 +51,13 @@ void ProgrammingNamePopup::keyPressEvent(QKeyEvent *event)
51 51 {
52 52 switch (event->key())
53 53 {
54   - case 0x01000030: // Turn left
  54 + case 0x01000032: // Turn left
55 55 onEncoderLeft();
56 56 break;
57 57 case 0x01000031: // Push
58 58 pushed = focusWidget();
59 59 break;
60   - case 0x01000032: // Turn right
  60 + case 0x01000030: // Turn right
61 61 onEncoderRight();
62 62 break;
63 63 }
... ... @@ -67,7 +67,7 @@ void ProgrammingNamePopup::keyReleaseEvent(QKeyEvent *event)
67 67 {
68 68 switch (event->key())
69 69 {
70   - case 0x01000030: // Turn left
  70 + case 0x01000032: // Turn left
71 71 onEncoderLeft();
72 72 break;
73 73 case 0x01000031: // Push
... ... @@ -76,7 +76,7 @@ void ProgrammingNamePopup::keyReleaseEvent(QKeyEvent *event)
76 76  
77 77 pushed = NULL;
78 78 break;
79   - case 0x01000032: // Turn right
  79 + case 0x01000030: // Turn right
80 80 onEncoderRight();
81 81 break;
82 82 }
... ...
app/gui/oven_control/programmingselectionwindow.cpp
... ... @@ -51,13 +51,13 @@ void ProgrammingSelectionWindow::keyPressEvent(QKeyEvent *event)
51 51 {
52 52 switch (event->key())
53 53 {
54   - case 0x01000030: // Turn left
  54 + case 0x01000032: // Turn left
55 55 onEncoderLeft();
56 56 break;
57 57 case 0x01000031: // Push
58 58 pushed = focusWidget();
59 59 break;
60   - case 0x01000032: // Turn right
  60 + case 0x01000030: // Turn right
61 61 onEncoderRight();
62 62 break;
63 63 }
... ... @@ -67,7 +67,7 @@ void ProgrammingSelectionWindow::keyReleaseEvent(QKeyEvent *event)
67 67 {
68 68 switch (event->key())
69 69 {
70   - case 0x01000030: // Turn left
  70 + case 0x01000032: // Turn left
71 71 onEncoderLeft();
72 72 break;
73 73 case 0x01000031: // Push
... ... @@ -76,7 +76,7 @@ void ProgrammingSelectionWindow::keyReleaseEvent(QKeyEvent *event)
76 76  
77 77 pushed = NULL;
78 78 break;
79   - case 0x01000032: // Turn right
  79 + case 0x01000030: // Turn right
80 80 onEncoderRight();
81 81 break;
82 82 }
... ...
app/gui/oven_control/programmingwindow.cpp
... ... @@ -69,13 +69,13 @@ void ProgrammingWindow::keyPressEvent(QKeyEvent *event)
69 69 {
70 70 switch (event->key())
71 71 {
72   - case 0x01000030: // Turn left
  72 + case 0x01000032: // Turn left
73 73 onEncoderLeft();
74 74 break;
75 75 case 0x01000031: // Push
76 76 pushed = focusWidget();
77 77 break;
78   - case 0x01000032: // Turn right
  78 + case 0x01000030: // Turn right
79 79 onEncoderRight();
80 80 break;
81 81 }
... ... @@ -85,7 +85,7 @@ void ProgrammingWindow::keyReleaseEvent(QKeyEvent *event)
85 85 {
86 86 switch (event->key())
87 87 {
88   - case 0x01000030: // Turn left
  88 + case 0x01000032: // Turn left
89 89 onEncoderLeft();
90 90 break;
91 91 case 0x01000031: // Push
... ... @@ -94,7 +94,7 @@ void ProgrammingWindow::keyReleaseEvent(QKeyEvent *event)
94 94  
95 95 pushed = NULL;
96 96 break;
97   - case 0x01000032: // Turn right
  97 + case 0x01000030: // Turn right
98 98 onEncoderRight();
99 99 break;
100 100 }
... ...
app/gui/oven_control/realtimemain.cpp
... ... @@ -45,12 +45,12 @@ void RealtimeMain::keyPressEvent(QKeyEvent *event)
45 45 {
46 46 switch (event->key())
47 47 {
48   - case 0x01000030: // Turn left
  48 + case 0x01000032: // Turn left
49 49 focusPreviousChild();
50 50 break;
51 51 case 0x01000031: // Push
52 52 break;
53   - case 0x01000032: // Turn right
  53 + case 0x01000030: // Turn right
54 54 focusNextChild();
55 55 break;
56 56 }
... ... @@ -60,7 +60,7 @@ void RealtimeMain::keyReleaseEvent(QKeyEvent *event)
60 60 {
61 61 switch (event->key())
62 62 {
63   - case 0x01000030: // Turn left
  63 + case 0x01000032: // Turn left
64 64 focusPreviousChild();
65 65 break;
66 66 case 0x01000031: // Push
... ... @@ -71,7 +71,7 @@ void RealtimeMain::keyReleaseEvent(QKeyEvent *event)
71 71 }
72 72 break;
73 73 }
74   - case 0x01000032: // Turn right
  74 + case 0x01000030: // Turn right
75 75 focusNextChild();
76 76 break;
77 77 }
... ...
app/gui/oven_control/realtimepartswindow.cpp
... ... @@ -128,12 +128,12 @@ void RealtimePartsWindow::keyPressEvent(QKeyEvent *event)
128 128 {
129 129 switch (event->key())
130 130 {
131   - case 0x01000030: // Turn left
  131 + case 0x01000032: // Turn left
132 132 focusPreviousChild();
133 133 break;
134 134 case 0x01000031: // Push
135 135 break;
136   - case 0x01000032: // Turn right
  136 + case 0x01000030: // Turn right
137 137 focusNextChild();
138 138 break;
139 139 }
... ... @@ -143,7 +143,7 @@ void RealtimePartsWindow::keyReleaseEvent(QKeyEvent *event)
143 143 {
144 144 switch (event->key())
145 145 {
146   - case 0x01000030: // Turn left
  146 + case 0x01000032: // Turn left
147 147 focusPreviousChild();
148 148 break;
149 149 case 0x01000031: // Push
... ... @@ -154,7 +154,7 @@ void RealtimePartsWindow::keyReleaseEvent(QKeyEvent *event)
154 154 }
155 155 break;
156 156 }
157   - case 0x01000032: // Turn right
  157 + case 0x01000030: // Turn right
158 158 focusNextChild();
159 159 break;
160 160 }
... ...
app/gui/oven_control/realtimesensorwindow.cpp
... ... @@ -145,12 +145,12 @@ void RealtimeSensorWindow::keyPressEvent(QKeyEvent *event)
145 145 {
146 146 switch (event->key())
147 147 {
148   - case 0x01000030: // Turn left
  148 + case 0x01000032: // Turn left
149 149 focusPreviousChild();
150 150 break;
151 151 case 0x01000031: // Push
152 152 break;
153   - case 0x01000032: // Turn right
  153 + case 0x01000030: // Turn right
154 154 focusNextChild();
155 155 break;
156 156 }
... ... @@ -160,7 +160,7 @@ void RealtimeSensorWindow::keyReleaseEvent(QKeyEvent *event)
160 160 {
161 161 switch (event->key())
162 162 {
163   - case 0x01000030: // Turn left
  163 + case 0x01000032: // Turn left
164 164 focusPreviousChild();
165 165 break;
166 166 case 0x01000031: // Push
... ... @@ -171,7 +171,7 @@ void RealtimeSensorWindow::keyReleaseEvent(QKeyEvent *event)
171 171 }
172 172 break;
173 173 }
174   - case 0x01000032: // Turn right
  174 + case 0x01000030: // Turn right
175 175 focusNextChild();
176 176 break;
177 177 }
... ...
app/gui/oven_control/reservedtimepopup.cpp
... ... @@ -32,12 +32,12 @@ void ReservedTimePopup::keyPressEvent(QKeyEvent *event)
32 32 {
33 33 switch (event->key())
34 34 {
35   - case 0x01000030: // Turn left
  35 + case 0x01000032: // Turn left
36 36 ui->cancelButton->setFocus();
37 37 break;
38 38 case 0x01000031: // Push
39 39 break;
40   - case 0x01000032: // Turn right
  40 + case 0x01000030: // Turn right
41 41 ui->cancelButton->setFocus();
42 42 break;
43 43 }
... ... @@ -47,13 +47,13 @@ void ReservedTimePopup::keyReleaseEvent(QKeyEvent *event)
47 47 {
48 48 switch (event->key())
49 49 {
50   - case 0x01000030: // Turn left
  50 + case 0x01000032: // Turn left
51 51 ui->cancelButton->setFocus();
52 52 break;
53 53 case 0x01000031: // Push
54 54 ui->cancelButton->click();
55 55 break;
56   - case 0x01000032: // Turn right
  56 + case 0x01000030: // Turn right
57 57 ui->cancelButton->setFocus();
58 58 break;
59 59 }
... ...
app/gui/oven_control/reservetimepopup.cpp
... ... @@ -60,13 +60,13 @@ void ReserveTimePopup::keyPressEvent(QKeyEvent *event)
60 60 {
61 61 switch (event->key())
62 62 {
63   - case 0x01000030: // Turn left
  63 + case 0x01000032: // Turn left
64 64 onEncoderLeft();
65 65 break;
66 66 case 0x01000031: // Push
67 67 pushed = focusWidget();
68 68 break;
69   - case 0x01000032: // Turn right
  69 + case 0x01000030: // Turn right
70 70 onEncoderRight();
71 71 break;
72 72 }
... ... @@ -76,7 +76,7 @@ void ReserveTimePopup::keyReleaseEvent(QKeyEvent *event)
76 76 {
77 77 switch (event->key())
78 78 {
79   - case 0x01000030: // Turn left
  79 + case 0x01000032: // Turn left
80 80 onEncoderLeft();
81 81 break;
82 82 case 0x01000031: // Push
... ... @@ -85,7 +85,7 @@ void ReserveTimePopup::keyReleaseEvent(QKeyEvent *event)
85 85  
86 86 pushed = NULL;
87 87 break;
88   - case 0x01000032: // Turn right
  88 + case 0x01000030: // Turn right
89 89 onEncoderRight();
90 90 break;
91 91 }
... ...
app/gui/oven_control/servicehistorymain.cpp
... ... @@ -61,12 +61,12 @@ void ServiceHistoryMain::keyPressEvent(QKeyEvent *event)
61 61 {
62 62 switch (event->key())
63 63 {
64   - case 0x01000030: // Turn left
  64 + case 0x01000032: // Turn left
65 65 focusPreviousChild();
66 66 break;
67 67 case 0x01000031: // Push
68 68 break;
69   - case 0x01000032: // Turn right
  69 + case 0x01000030: // Turn right
70 70 focusNextChild();
71 71 break;
72 72 }
... ... @@ -76,7 +76,7 @@ void ServiceHistoryMain::keyReleaseEvent(QKeyEvent *event)
76 76 {
77 77 switch (event->key())
78 78 {
79   - case 0x01000030: // Turn left
  79 + case 0x01000032: // Turn left
80 80 focusPreviousChild();
81 81 break;
82 82 case 0x01000031: // Push
... ... @@ -87,7 +87,7 @@ void ServiceHistoryMain::keyReleaseEvent(QKeyEvent *event)
87 87 }
88 88 break;
89 89 }
90   - case 0x01000032: // Turn right
  90 + case 0x01000030: // Turn right
91 91 focusNextChild();
92 92 break;
93 93 }
... ...
app/gui/oven_control/servicepassinputdlg.cpp
... ... @@ -81,14 +81,14 @@ void ServicePassInputDlg::keyPressEvent(QKeyEvent *event){
81 81 int i = 0;
82 82 switch (event->key())
83 83 {
84   - case 0x01000030: // Turn left
  84 + case 0x01000032: // Turn left
85 85 if(focusWidget() == ui->ctrProgressBar) ui->ctrBtnCancel->setFocus();
86 86 else focusPreviousChild();
87 87 break;
88 88 case 0x01000031: // Push
89 89  
90 90 break;
91   - case 0x01000032: // Turn right
  91 + case 0x01000030: // Turn right
92 92 if(focusWidget() == ui->ctrBtnCancel) ui->ctrProgressBar->setFocus();
93 93 else focusNextChild();
94 94  
... ... @@ -100,7 +100,7 @@ void ServicePassInputDlg::keyReleaseEvent(QKeyEvent *event){
100 100 int i = 0;
101 101 switch (event->key())
102 102 {
103   - case 0x01000030: // Turn left
  103 + case 0x01000032: // Turn left
104 104 if(focusWidget() == ui->ctrProgressBar) ui->ctrBtnCancel->setFocus();
105 105 else focusPreviousChild();
106 106 break;
... ... @@ -115,7 +115,7 @@ void ServicePassInputDlg::keyReleaseEvent(QKeyEvent *event){
115 115 }
116 116 break;
117 117 }
118   - case 0x01000032: // Turn right
  118 + case 0x01000030: // Turn right
119 119 if(focusWidget() == ui->ctrBtnCancel) ui->ctrProgressBar->setFocus();
120 120 else focusNextChild();
121 121 break;
... ...
app/gui/oven_control/slider.cpp
... ... @@ -138,13 +138,13 @@ void Slider::keyPressEvent(QKeyEvent *event)
138 138 {
139 139 switch (event->key())
140 140 {
141   - case 0x01000030: // Turn left
  141 + case 0x01000032: // Turn left
142 142 decrease();
143 143 break;
144 144 case 0x01000031: // Push
145 145 event->ignore();
146 146 break;
147   - case 0x01000032: // Turn right
  147 + case 0x01000030: // Turn right
148 148 increase();
149 149 break;
150 150 }
... ... @@ -154,13 +154,13 @@ void Slider::keyReleaseEvent(QKeyEvent *event)
154 154 {
155 155 switch (event->key())
156 156 {
157   - case 0x01000030: // Turn left
  157 + case 0x01000032: // Turn left
158 158 decrease();
159 159 break;
160 160 case 0x01000031: // Push
161 161 event->ignore();
162 162 break;
163   - case 0x01000032: // Turn right
  163 + case 0x01000030: // Turn right
164 164 increase();
165 165 break;
166 166 }
... ...
app/gui/oven_control/usbcheckpopupdlg.cpp
... ... @@ -44,13 +44,13 @@ void UsbCheckPopupDlg::keyPressEvent(QKeyEvent *event){
44 44 int i = 0;
45 45 switch (event->key())
46 46 {
47   - case 0x01000030: // Turn left
  47 + case 0x01000032: // Turn left
48 48 break;
49 49 case 0x01000031: // Push
50 50 {
51 51 break;
52 52 }
53   - case 0x01000032: // Turn right
  53 + case 0x01000030: // Turn right
54 54 break;
55 55 }
56 56 }
... ... @@ -59,7 +59,7 @@ void UsbCheckPopupDlg::keyReleaseEvent(QKeyEvent *event){
59 59 int i = 0;
60 60 switch (event->key())
61 61 {
62   - case 0x01000030: // Turn left
  62 + case 0x01000032: // Turn left
63 63 break;
64 64 case 0x01000031: // Push
65 65 {
... ... @@ -69,7 +69,7 @@ void UsbCheckPopupDlg::keyReleaseEvent(QKeyEvent *event){
69 69 }
70 70 break;
71 71 }
72   - case 0x01000032: // Turn right
  72 + case 0x01000030: // Turn right
73 73 break;
74 74 }
75 75 }
... ...
app/gui/oven_control/valvetestwindow.cpp
... ... @@ -35,13 +35,13 @@ void ValveTestWindow::keyPressEvent(QKeyEvent *event)
35 35 {
36 36 switch (event->key())
37 37 {
38   - case 0x01000030: // Turn left
  38 + case 0x01000032: // Turn left
39 39 onEncoderLeft();
40 40 break;
41 41 case 0x01000031: // Push
42 42 pushed = focusWidget();
43 43 break;
44   - case 0x01000032: // Turn right
  44 + case 0x01000030: // Turn right
45 45 onEncoderRight();
46 46 break;
47 47 }
... ... @@ -51,7 +51,7 @@ void ValveTestWindow::keyReleaseEvent(QKeyEvent *event)
51 51 {
52 52 switch (event->key())
53 53 {
54   - case 0x01000030: // Turn left
  54 + case 0x01000032: // Turn left
55 55 onEncoderLeft();
56 56 break;
57 57 case 0x01000031: // Push
... ... @@ -60,7 +60,7 @@ void ValveTestWindow::keyReleaseEvent(QKeyEvent *event)
60 60  
61 61 pushed = NULL;
62 62 break;
63   - case 0x01000032: // Turn right
  63 + case 0x01000030: // Turn right
64 64 onEncoderRight();
65 65 break;
66 66 }
... ...
app/gui/oven_control/washtestwindow.cpp
... ... @@ -35,13 +35,13 @@ void WashTestWindow::keyPressEvent(QKeyEvent *event)
35 35 {
36 36 switch (event->key())
37 37 {
38   - case 0x01000030: // Turn left
  38 + case 0x01000032: // Turn left
39 39 onEncoderLeft();
40 40 break;
41 41 case 0x01000031: // Push
42 42 pushed = focusWidget();
43 43 break;
44   - case 0x01000032: // Turn right
  44 + case 0x01000030: // Turn right
45 45 onEncoderRight();
46 46 break;
47 47 }
... ... @@ -51,7 +51,7 @@ void WashTestWindow::keyReleaseEvent(QKeyEvent *event)
51 51 {
52 52 switch (event->key())
53 53 {
54   - case 0x01000030: // Turn left
  54 + case 0x01000032: // Turn left
55 55 onEncoderLeft();
56 56 break;
57 57 case 0x01000031: // Push
... ... @@ -60,7 +60,7 @@ void WashTestWindow::keyReleaseEvent(QKeyEvent *event)
60 60  
61 61 pushed = NULL;
62 62 break;
63   - case 0x01000032: // Turn right
  63 + case 0x01000030: // Turn right
64 64 onEncoderRight();
65 65 break;
66 66 }
... ...
app/gui/oven_control/washwindow.cpp
... ... @@ -67,13 +67,13 @@ void WashWindow::keyPressEvent(QKeyEvent *event)
67 67 {
68 68 switch (event->key())
69 69 {
70   - case 0x01000030: // Turn left
  70 + case 0x01000032: // Turn left
71 71 onEncoderLeft();
72 72 break;
73 73 case 0x01000031: // Push
74 74 pushed = focusWidget();
75 75 break;
76   - case 0x01000032: // Turn right
  76 + case 0x01000030: // Turn right
77 77 onEncoderRight();
78 78 break;
79 79 }
... ... @@ -83,7 +83,7 @@ void WashWindow::keyReleaseEvent(QKeyEvent *event)
83 83 {
84 84 switch (event->key())
85 85 {
86   - case 0x01000030: // Turn left
  86 + case 0x01000032: // Turn left
87 87 onEncoderLeft();
88 88 break;
89 89 case 0x01000031: // Push
... ... @@ -92,7 +92,7 @@ void WashWindow::keyReleaseEvent(QKeyEvent *event)
92 92  
93 93 pushed = NULL;
94 94 break;
95   - case 0x01000032: // Turn right
  95 + case 0x01000030: // Turn right
96 96 onEncoderRight();
97 97 break;
98 98 }
... ...
app/gui/oven_control/yesnopopupdlg.cpp
... ... @@ -47,14 +47,14 @@ void YesNoPopupDlg::on_ctrBtnNo_clicked()
47 47 void YesNoPopupDlg::keyPressEvent(QKeyEvent *event){
48 48 switch (event->key())
49 49 {
50   - case 0x01000030: // Turn left
  50 + case 0x01000032: // Turn left
51 51 if(focusWidget() == ui->ctrBtnYes) ui->ctrBtnNo->setFocus();
52 52 else ui->ctrBtnYes->setFocus();
53 53 break;
54 54 case 0x01000031: // Push
55 55  
56 56 break;
57   - case 0x01000032: // Turn right
  57 + case 0x01000030: // Turn right
58 58 if(focusWidget() == ui->ctrBtnYes) ui->ctrBtnNo->setFocus();
59 59 else ui->ctrBtnYes->setFocus();
60 60 break;
... ... @@ -64,7 +64,7 @@ void YesNoPopupDlg::keyPressEvent(QKeyEvent *event){
64 64 void YesNoPopupDlg::keyReleaseEvent(QKeyEvent *event){
65 65 switch (event->key())
66 66 {
67   - case 0x01000030: // Turn left
  67 + case 0x01000032: // Turn left
68 68 if(focusWidget() == ui->ctrBtnYes) ui->ctrBtnNo->setFocus();
69 69 else ui->ctrBtnYes->setFocus();
70 70 break;
... ... @@ -76,7 +76,7 @@ void YesNoPopupDlg::keyReleaseEvent(QKeyEvent *event){
76 76 }
77 77 break;
78 78 }
79   - case 0x01000032: // Turn right
  79 + case 0x01000030: // Turn right
80 80 if(focusWidget() == ui->ctrBtnYes) ui->ctrBtnNo->setFocus();
81 81 else ui->ctrBtnYes->setFocus();
82 82 break;
... ...