author | hash <hash> | 2002-10-24 06:17:03 (UTC) |
---|---|---|
committer | hash <hash> | 2002-10-24 06:17:03 (UTC) |
commit | 2183d2b20cf6eb9144a616a3f8242a7eb585c557 (patch) (unidiff) | |
tree | 58cb46e892c243bfbf0c39cd0ffd62f2beedb339 /noncore | |
parent | bdd884e37dc1ee1969d317b29e926768ea5a14df (diff) | |
download | opie-2183d2b20cf6eb9144a616a3f8242a7eb585c557.zip opie-2183d2b20cf6eb9144a616a3f8242a7eb585c557.tar.gz opie-2183d2b20cf6eb9144a616a3f8242a7eb585c557.tar.bz2 |
didnt merge with previous updates properly
-rw-r--r-- | noncore/apps/opie-console/function_keyboard.cpp | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/noncore/apps/opie-console/function_keyboard.cpp b/noncore/apps/opie-console/function_keyboard.cpp index 71cdea8..9d58383 100644 --- a/noncore/apps/opie-console/function_keyboard.cpp +++ b/noncore/apps/opie-console/function_keyboard.cpp | |||
@@ -175,58 +175,53 @@ void FunctionKeyboard::loadDefaults() { | |||
175 | 175 | ||
176 | /* what keys should be default? | 176 | /* what keys should be default? |
177 | keys.insert( "r0c0", FKey ("F1", 0, 4144, 0)); | 177 | keys.insert( "r0c0", FKey ("F1", 0, 4144, 0)); |
178 | keys.insert( "r0c1", FKey ("F2", 0, 4145, 0)); | 178 | keys.insert( "r0c1", FKey ("F2", 0, 4145, 0)); |
179 | keys.insert( "r0c2", FKey ("F3", 0, 4146, 0)); | 179 | keys.insert( "r0c2", FKey ("F3", 0, 4146, 0)); |
180 | keys.insert( "r0c3", FKey ("F4", 0, 4147, 0)); | 180 | keys.insert( "r0c3", FKey ("F4", 0, 4147, 0)); |
181 | keys.insert( "r0c4", FKey ("F5", 0, 4148, 0)); | 181 | keys.insert( "r0c4", FKey ("F5", 0, 4148, 0)); |
182 | keys.insert( "r0c5", FKey ("F6", 0, 4149, 0)); | 182 | keys.insert( "r0c5", FKey ("F6", 0, 4149, 0)); |
183 | keys.insert( "r0c6", FKey ("F7", 0, 4150, 0)); | 183 | keys.insert( "r0c6", FKey ("F7", 0, 4150, 0)); |
184 | keys.insert( "r0c7", FKey ("F8", 0, 4151, 0)); | 184 | keys.insert( "r0c7", FKey ("F8", 0, 4151, 0)); |
185 | keys.insert( "r0c8", FKey ("F9", 0, 4152, 0)); | 185 | keys.insert( "r0c8", FKey ("F9", 0, 4152, 0)); |
186 | keys.insert( "r0c9", FKey ("F10", 0, 4153, 0)); | 186 | keys.insert( "r0c9", FKey ("F10", 0, 4153, 0)); |
187 | keys.insert( "r0c10", FKey ("F11", 0, 4154, 0)); | 187 | keys.insert( "r0c10", FKey ("F11", 0, 4154, 0)); |
188 | 188 | ||
189 | keys.insert( "r1c7", FKey ("Ho", 0, 4112, 0)); | 189 | keys.insert( "r1c7", FKey ("Ho", 0, 4112, 0)); |
190 | keys.insert( "r1c8", FKey ("End", 0, 4113, 0)); | 190 | keys.insert( "r1c8", FKey ("End", 0, 4113, 0)); |
191 | keys.insert( "r1c9", FKey ("PU", 0, 4118, 0)); | 191 | keys.insert( "r1c9", FKey ("PU", 0, 4118, 0)); |
192 | keys.insert( "r1c10", FKey ("PD", 0, 4119, 0)); | 192 | keys.insert( "r1c10", FKey ("PD", 0, 4119, 0)); |
193 | */ | 193 | */ |
194 | 194 | ||
195 | } | 195 | } |
196 | 196 | ||
197 | /* FunctionKeyboardConfig {{{1 */ | 197 | /* FunctionKeyboardConfig {{{1 */ |
198 | 198 | ||
199 | <<<<<<< function_keyboard.cpp | 199 | FunctionKeyboardConfig::FunctionKeyboardConfig(const QString& name, QWidget* parent, const char* na ) |
200 | FunctionKeyboardConfig::FunctionKeyboardConfig(const QString& name, QWidget* parent) : | 200 | : ProfileDialogKeyWidget(name, parent, na), |
201 | ProfileDialogKeyWidget(name, parent), | ||
202 | selectedRow(0), selectedCol(0) | 201 | selectedRow(0), selectedCol(0) |
203 | { | 202 | { |
204 | ======= | ||
205 | FunctionKeyboardConfig::FunctionKeyboardConfig(const QString& name, QWidget* parent, const char* na ) | ||
206 | : ProfileDialogKeyWidget(name, parent, na) { | ||
207 | qWarning("FunctionKeyboardConfig"); | 203 | qWarning("FunctionKeyboardConfig"); |
208 | >>>>>>> 1.11 | ||
209 | 204 | ||
210 | 205 | ||
211 | kb = new FunctionKeyboard(this); | 206 | kb = new FunctionKeyboard(this); |
212 | connect (kb, SIGNAL(keyPressed(FKey, ushort, ushort, bool)), | 207 | connect (kb, SIGNAL(keyPressed(FKey, ushort, ushort, bool)), |
213 | this, SLOT(slotKeyPressed(FKey, ushort, ushort, bool))); | 208 | this, SLOT(slotKeyPressed(FKey, ushort, ushort, bool))); |
214 | 209 | ||
215 | QGroupBox *dimentions = new QGroupBox(2, Qt::Horizontal, tr("Dimentions"), this); | 210 | QGroupBox *dimentions = new QGroupBox(2, Qt::Horizontal, tr("Dimentions"), this); |
216 | QLabel *l = new QLabel("Rows", dimentions); | 211 | QLabel *l = new QLabel("Rows", dimentions); |
217 | m_rowBox = new QSpinBox(1, 15, 1, dimentions); | 212 | m_rowBox = new QSpinBox(1, 15, 1, dimentions); |
218 | connect (m_rowBox, SIGNAL(valueChanged(int)), this, SLOT(slotChangeRows(int))); | 213 | connect (m_rowBox, SIGNAL(valueChanged(int)), this, SLOT(slotChangeRows(int))); |
219 | l = new QLabel("Columns", dimentions); | 214 | l = new QLabel("Columns", dimentions); |
220 | m_colBox = new QSpinBox(1, 15, 1, dimentions); | 215 | m_colBox = new QSpinBox(1, 15, 1, dimentions); |
221 | connect (m_colBox, SIGNAL(valueChanged(int)), this, SLOT(slotChangeCols(int))); | 216 | connect (m_colBox, SIGNAL(valueChanged(int)), this, SLOT(slotChangeCols(int))); |
222 | 217 | ||
223 | QGroupBox *editKey = new QGroupBox(2, Qt::Horizontal, tr("Edit Key"), this); | 218 | QGroupBox *editKey = new QGroupBox(2, Qt::Horizontal, tr("Edit Key"), this); |
224 | l = new QLabel("Label", editKey); | 219 | l = new QLabel("Label", editKey); |
225 | m_labels = new QComboBox(true, editKey); | 220 | m_labels = new QComboBox(true, editKey); |
226 | m_labels->setInsertionPolicy(QComboBox::AtCurrent); | 221 | m_labels->setInsertionPolicy(QComboBox::AtCurrent); |
227 | m_labels->insertItem("custom"); | 222 | m_labels->insertItem("custom"); |
228 | 223 | ||
229 | QStringList files = QDir(QPEApplication::qpeDir() + "pics/console/keys/", "*.png").entryList(); | 224 | QStringList files = QDir(QPEApplication::qpeDir() + "pics/console/keys/", "*.png").entryList(); |
230 | 225 | ||
231 | for (uint i = 0; i < files.count(); i++) { | 226 | for (uint i = 0; i < files.count(); i++) { |
232 | 227 | ||