aboutsummaryrefslogtreecommitdiffstats
path: root/recipes/qtnx/files/keymap.patch
diff options
context:
space:
mode:
Diffstat (limited to 'recipes/qtnx/files/keymap.patch')
-rw-r--r--recipes/qtnx/files/keymap.patch283
1 files changed, 283 insertions, 0 deletions
diff --git a/recipes/qtnx/files/keymap.patch b/recipes/qtnx/files/keymap.patch
new file mode 100644
index 0000000000..ed37a23774
--- /dev/null
+++ b/recipes/qtnx/files/keymap.patch
@@ -0,0 +1,283 @@
+Index: qtnx-0.9/qtnxwindow.cpp
+===================================================================
+--- qtnx-0.9.orig/qtnxwindow.cpp 2008-10-13 14:35:29.000000000 +0200
++++ qtnx-0.9/qtnxwindow.cpp 2008-10-13 14:35:33.000000000 +0200
+@@ -315,8 +315,8 @@
+ session.imageCompressionMethod = config.imageCompressionMethod;
+ session.imageCompressionLevel = config.imageCompressionLevel;
+ session.geometry = config.geometry;
+- session.keyboard = "defkeymap";
+- session.kbtype = "pc102/defkeymap";
++ session.keyboard = config.keyboard;
++ session.kbtype = config.kbtype;
+ session.media = config.media;
+ session.agentServer = config.agentServer;
+ session.agentUser = config.agentUser;
+Index: qtnx-0.9/settingsdialog.ui
+===================================================================
+--- qtnx-0.9.orig/settingsdialog.ui 2008-10-13 14:35:32.000000000 +0200
++++ qtnx-0.9/settingsdialog.ui 2008-10-13 14:35:33.000000000 +0200
+@@ -43,14 +43,6 @@
+ <number>0</number>
+ </property>
+ <widget class="QWidget" name="basicTab" >
+- <property name="geometry" >
+- <rect>
+- <x>0</x>
+- <y>0</y>
+- <width>436</width>
+- <height>439</height>
+- </rect>
+- </property>
+ <attribute name="title" >
+ <string>Basic</string>
+ </attribute>
+@@ -598,47 +590,31 @@
+ </layout>
+ </widget>
+ <widget class="QWidget" name="advancedTab" >
+- <property name="geometry" >
+- <rect>
+- <x>0</x>
+- <y>0</y>
+- <width>624</width>
+- <height>496</height>
+- </rect>
+- </property>
+ <attribute name="title" >
+ <string>Advanced</string>
+ </attribute>
+- <layout class="QVBoxLayout" name="_15" >
+- <property name="spacing" >
+- <number>6</number>
+- </property>
+- <property name="margin" >
+- <number>9</number>
+- </property>
++ <layout class="QVBoxLayout" name="verticalLayout_2" >
+ <item>
+ <widget class="QGroupBox" name="networkGroup" >
+ <property name="title" >
+ <string>Network</string>
+ </property>
+- <layout class="QVBoxLayout" name="_16" >
+- <property name="spacing" >
+- <number>6</number>
++ <widget class="QCheckBox" name="encryption" >
++ <property name="geometry" >
++ <rect>
++ <x>11</x>
++ <y>28</y>
++ <width>396</width>
++ <height>22</height>
++ </rect>
+ </property>
+- <property name="margin" >
+- <number>9</number>
++ <property name="text" >
++ <string>Use SSH Tunneling</string>
+ </property>
+- <item>
+- <widget class="QCheckBox" name="encryption" >
+- <property name="text" >
+- <string>Use SSH Tunneling</string>
+- </property>
+- <property name="checked" >
+- <bool>true</bool>
+- </property>
+- </widget>
+- </item>
+- </layout>
++ <property name="checked" >
++ <bool>true</bool>
++ </property>
++ </widget>
+ </widget>
+ </item>
+ <item>
+@@ -727,6 +703,108 @@
+ </widget>
+ </item>
+ <item>
++ <widget class="QGroupBox" name="groupBox_2" >
++ <property name="title" >
++ <string>Keyboard</string>
++ </property>
++ <layout class="QHBoxLayout" name="horizontalLayout" >
++ <item>
++ <layout class="QHBoxLayout" name="_21" >
++ <property name="spacing" >
++ <number>6</number>
++ </property>
++ <property name="margin" >
++ <number>0</number>
++ </property>
++ <item>
++ <widget class="QLabel" name="keyboardLabel" >
++ <property name="sizePolicy" >
++ <sizepolicy vsizetype="Preferred" hsizetype="Fixed" >
++ <horstretch>0</horstretch>
++ <verstretch>0</verstretch>
++ </sizepolicy>
++ </property>
++ <property name="text" >
++ <string>Type:</string>
++ </property>
++ </widget>
++ </item>
++ <item>
++ <widget class="QComboBox" name="keyboard" >
++ <item>
++ <property name="text" >
++ <string>Standard</string>
++ </property>
++ </item>
++ <item>
++ <property name="text" >
++ <string>Nokia N810</string>
++ </property>
++ </item>
++ </widget>
++ </item>
++ </layout>
++ </item>
++ <item>
++ <layout class="QHBoxLayout" name="_22" >
++ <property name="spacing" >
++ <number>6</number>
++ </property>
++ <property name="margin" >
++ <number>0</number>
++ </property>
++ <item>
++ <widget class="QLabel" name="languageLabel" >
++ <property name="enabled" >
++ <bool>true</bool>
++ </property>
++ <property name="sizePolicy" >
++ <sizepolicy vsizetype="Preferred" hsizetype="Fixed" >
++ <horstretch>0</horstretch>
++ <verstretch>0</verstretch>
++ </sizepolicy>
++ </property>
++ <property name="text" >
++ <string>Language:</string>
++ </property>
++ </widget>
++ </item>
++ <item>
++ <widget class="QComboBox" name="language" >
++ <property name="enabled" >
++ <bool>false</bool>
++ </property>
++ <item>
++ <property name="text" >
++ <string>de</string>
++ </property>
++ </item>
++ <item>
++ <property name="text" >
++ <string>us</string>
++ </property>
++ </item>
++ </widget>
++ </item>
++ </layout>
++ </item>
++ <item>
++ <spacer name="horizontalSpacer" >
++ <property name="orientation" >
++ <enum>Qt::Horizontal</enum>
++ </property>
++ <property name="sizeHint" stdset="0" >
++ <size>
++ <width>40</width>
++ <height>20</height>
++ </size>
++ </property>
++ </spacer>
++ </item>
++ </layout>
++ </widget>
++ </item>
++ <item>
+ <spacer>
+ <property name="orientation" >
+ <enum>Qt::Vertical</enum>
+Index: qtnx-0.9/qtnxsettings.cpp
+===================================================================
+--- qtnx-0.9.orig/qtnxsettings.cpp 2008-10-13 14:07:34.000000000 +0200
++++ qtnx-0.9/qtnxsettings.cpp 2008-10-13 14:36:44.000000000 +0200
+@@ -43,6 +43,7 @@
+
+ connect(ui_sd.resolution, SIGNAL(currentIndexChanged(QString)), this, SLOT(resolutionChanged(QString)));
+ connect(ui_sd.imageCompressionType, SIGNAL(currentIndexChanged(QString)), this, SLOT(compressionChanged(QString)));
++ connect(ui_sd.keyboard, SIGNAL(currentIndexChanged(QString)), this, SLOT(keyboardChanged(QString)));
+ connect(ui_sd.defaultKey, SIGNAL(stateChanged(int)), this, SLOT(keyChanged(int)));
+ connect(ui_sd.applyButton, SIGNAL(pressed()), this, SLOT(applyPressed()));
+ connect(ui_sd.okButton, SIGNAL(pressed()), this, SLOT(okPressed()));
+@@ -78,6 +79,16 @@
+ ui_sd.setAuthKeyButton->setEnabled(true);
+ }
+
++ if (config.keyboard == "defkeymap")
++ {
++ ui_sd.keyboard->setCurrentIndex(ui_sd.keyboard->findText(tr("Standard")));
++ } else if (QString(config.keyboard.data()).contains("nokiarx44"))
++ {
++ ui_sd.keyboard->setCurrentIndex(ui_sd.keyboard->findText(tr("Nokia N810")));
++ ui_sd.language->setCurrentIndex(ui_sd.language->findText(QString(config.keyboard.data()).right(2)));
++ ui_sd.language->setEnabled(true);
++ }
++
+ if (config.sessionType == "unix-kde") {
+ ui_sd.platform->setCurrentIndex(ui_sd.platform->findText(tr("UNIX")));
+ ui_sd.type->setCurrentIndex(ui_sd.type->findText(tr("KDE")));
+@@ -162,6 +173,15 @@
+ }
+ }
+
++void QtNXSettings::keyboardChanged(QString text)
++{
++ if (text == tr("Nokia N810")) {
++ ui_sd.language->setEnabled(true);
++ } else {
++ ui_sd.language->setEnabled(false);
++ }
++}
++
+ void QtNXSettings::platformChanged(QString text)
+ {
+ }
+@@ -230,8 +250,17 @@
+ config.serverPort = ui_sd.port->value();
+
+ // TODO: Add keyboard selection support
+- config.keyboard = "defkeymap";
+- config.kbtype = "pc102/defkeymap";
++
++ if (ui_sd.keyboard->currentText() == tr("Standard"))
++ {
++ config.keyboard = "defkeymap";
++ config.kbtype = "pc102/defkeymap";
++ } else if (ui_sd.keyboard->currentText() == tr("Nokia N810"))
++ {
++ config.keyboard =
++ "nokiarx44/" + ui_sd.language->currentText().toStdString();
++ config.kbtype = config.keyboard;
++ }
+
+ if (ui_sd.platform->currentText() == tr("UNIX")) {
+ if (ui_sd.type->currentText() == tr("KDE"))
+Index: qtnx-0.9/qtnxsettings.h
+===================================================================
+--- qtnx-0.9.orig/qtnxsettings.h 2008-10-13 14:07:34.000000000 +0200
++++ qtnx-0.9/qtnxsettings.h 2008-10-13 14:35:33.000000000 +0200
+@@ -38,6 +38,7 @@
+ void resolutionChanged(QString);
+ void compressionChanged(QString);
+ void platformChanged(QString);
++ void keyboardChanged(QString);
+ void typeChanged(QString);
+ void keyChanged(int);
+ void applyPressed();