Permalink
Browse files

* add dutch translation (by Sander Pientka)

* fix "Enabled Corner Coasting" -> "Enable Corner Coasting" (patch by Andrey Borzenkov)
* fix all buttons disabled on KDE startup without kcmtouchpadrc (patch by Andrey Borzenkov)
* fix "Edge" to "Corner" in triggering regions
* update Messages.sh script
* new po template
  • Loading branch information...
1 parent 8a3c697 commit 3a575d3285fc892b0da58cd4ae1789f2a32e36c1 @mishaaq committed Oct 24, 2009
Showing with 492 additions and 721 deletions.
  1. +2 −2 Messages.sh
  2. +15 −15 kcmtouchpad.cpp
  3. +5 −4 kcmtouchpadwidget.ui
  4. +1 −0 po/CMakeLists.txt
  5. +40 −231 po/es/kcm_touchpad.po
  6. +29 −238 po/kcm_touchpad.pot
  7. +2 −0 po/nl/CMakeLists.txt
  8. +358 −0 po/nl/kcm_touchpad.po
  9. +40 −231 po/pl/kcm_touchpad.po
View
@@ -1,5 +1,5 @@
#!/usr/bin/env bash
-$EXTRACTRC *.ui >> rc.cpp
-$XGETTEXT *.cpp -o $podir/kcm_touchpad.pot
+extractrc *.ui >> rc.cpp
+xgettext rc.cpp kcmtouchpad.cpp -o po/kcm_touchpad.pot --foreign-user -C -ki18n -ktr2i18n -kI18N_NOOP -kI18N_NOOP2
rm -f rc.cpp
View
@@ -410,7 +410,7 @@ bool TouchpadConfig::apply()
Touchpad::set_parameter("CircScrollDelta", ui->ScrollCircularSpeedS->value());
}
if (this->propertiesList.contains(SYNAPTICS_PROP_CIRCULAR_SCROLLING_TRIGGER)) {
- Touchpad::set_parameter("CircScrollTrigger", (Synaptics::ScrollTrigger)ui->ScrollCircularCornersCBB->currentIndex());
+ Touchpad::set_parameter("CircScrollTrigger", ui->ScrollCircularCornersCBB->currentIndex());
}
if (this->propertiesList.contains(SYNAPTICS_PROP_TAP_TIME)) {
Touchpad::set_parameter("MaxTapTime", (int)ui->TappingEnableCB->isChecked() * 180);
@@ -424,13 +424,13 @@ bool TouchpadConfig::apply()
Touchpad::set_parameter("ClickTime", ui->TappingClickTimeValueS->value());
}
if (this->propertiesList.contains(SYNAPTICS_PROP_TAP_ACTION)) {
- Touchpad::set_parameter("TapButton1", (Synaptics::Button)this->tappingButtonsMap[Synaptics::OneFinger]);
- Touchpad::set_parameter("TapButton2", (Synaptics::Button)this->tappingButtonsMap[Synaptics::TwoFingers]);
- Touchpad::set_parameter("TapButton3", (Synaptics::Button)this->tappingButtonsMap[Synaptics::ThreeFingers]);
- Touchpad::set_parameter("RTCornerButton", (Synaptics::Button)this->tappingButtonsMap[Synaptics::RightTop]);
- Touchpad::set_parameter("RBCornerButton", (Synaptics::Button)this->tappingButtonsMap[Synaptics::RightBottom]);
- Touchpad::set_parameter("LTCornerButton", (Synaptics::Button)this->tappingButtonsMap[Synaptics::LeftTop]);
- Touchpad::set_parameter("LBCornerButton", (Synaptics::Button)this->tappingButtonsMap[Synaptics::LeftBottom]);
+ Touchpad::set_parameter("TapButton1", this->tappingButtonsMap[Synaptics::OneFinger]);
+ Touchpad::set_parameter("TapButton2", this->tappingButtonsMap[Synaptics::TwoFingers]);
+ Touchpad::set_parameter("TapButton3", this->tappingButtonsMap[Synaptics::ThreeFingers]);
+ Touchpad::set_parameter("RTCornerButton", this->tappingButtonsMap[Synaptics::RightTop]);
+ Touchpad::set_parameter("RBCornerButton", this->tappingButtonsMap[Synaptics::RightBottom]);
+ Touchpad::set_parameter("LTCornerButton", this->tappingButtonsMap[Synaptics::LeftTop]);
+ Touchpad::set_parameter("LBCornerButton", this->tappingButtonsMap[Synaptics::LeftBottom]);
}
return true;
@@ -682,13 +682,13 @@ void TouchpadConfig::init_touchpad()
Touchpad::set_parameter("ClickTime", config.readEntry("ClickTime", -1));
}
if (propertiesList.contains(SYNAPTICS_PROP_TAP_ACTION)) {
- Touchpad::set_parameter("TapButton1", (Synaptics::Button)config.readEntry("TapButton1", -1));
- Touchpad::set_parameter("TapButton2", (Synaptics::Button)config.readEntry("TapButton2", -1));
- Touchpad::set_parameter("TapButton3", (Synaptics::Button)config.readEntry("TapButton3", -1));
- Touchpad::set_parameter("RTCornerButton", (Synaptics::Button)config.readEntry("RTCornerButton", -1));
- Touchpad::set_parameter("RBCornerButton", (Synaptics::Button)config.readEntry("RBCornerButton", -1));
- Touchpad::set_parameter("LTCornerButton", (Synaptics::Button)config.readEntry("LTCornerButton", -1));
- Touchpad::set_parameter("LBCornerButton", (Synaptics::Button)config.readEntry("LBCornerButton", -1));
+ Touchpad::set_parameter("TapButton1", config.readEntry("TapButton1", -1));
+ Touchpad::set_parameter("TapButton2", config.readEntry("TapButton2", -1));
+ Touchpad::set_parameter("TapButton3", config.readEntry("TapButton3", -1));
+ Touchpad::set_parameter("RTCornerButton", config.readEntry("RTCornerButton", -1));
+ Touchpad::set_parameter("RBCornerButton", config.readEntry("RBCornerButton", -1));
+ Touchpad::set_parameter("LTCornerButton", config.readEntry("LTCornerButton", -1));
+ Touchpad::set_parameter("LBCornerButton", config.readEntry("LBCornerButton", -1));
}
Touchpad::free_xinput_extension();
@@ -7,8 +7,8 @@
<rect>
<x>0</x>
<y>0</y>
- <width>548</width>
- <height>526</height>
+ <width>544</width>
+ <height>522</height>
</rect>
</property>
<property name="sizePolicy">
@@ -18,6 +18,7 @@
</sizepolicy>
</property>
<property name="windowTitle">
+ <string/>
</property>
<layout class="QVBoxLayout" name="verticalLayout">
<item>
@@ -489,7 +490,7 @@
<string>Enable edge scrolling to continue while the finger stays in an edge corner.</string>
</property>
<property name="text">
- <string>Enabled Corner Coasting</string>
+ <string>Enable Corner Coasting</string>
</property>
</widget>
</item>
@@ -701,7 +702,7 @@
</item>
<item>
<property name="text">
- <string>Top-Left Edge</string>
+ <string>Top-Left Corner</string>
</property>
</item>
<item>
View
@@ -1,2 +1,3 @@
add_subdirectory( es )
add_subdirectory( pl )
+add_subdirectory( nl )
Oops, something went wrong.

0 comments on commit 3a575d3

Please sign in to comment.