From 8a299eccceba24161a6bb84577a0749e83dde5ae Mon Sep 17 00:00:00 2001
From: Lucas Murray <lmurray@undefinedfire.com>
Date: Tue, 12 May 2009 05:38:21 +0000
Subject: [PATCH] Improved string situation in the screen edge KCM so the
 options actually make sense. Renamed "trigger cooldown" and added tooltips to
 everything. Freeze exception granted by Albert Astals Cid.

svn path=/trunk/KDE/kdebase/workspace/; revision=966879
---
 kcmkwin/kwinscreenedges/main.ui | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/kcmkwin/kwinscreenedges/main.ui b/kcmkwin/kwinscreenedges/main.ui
index f614095ff3..22c84a8356 100644
--- a/kcmkwin/kwinscreenedges/main.ui
+++ b/kcmkwin/kwinscreenedges/main.ui
@@ -22,6 +22,9 @@
      <layout class="QFormLayout" name="formLayout">
       <item row="0" column="0">
        <widget class="QLabel" name="desktopSwitchLabel">
+        <property name="toolTip">
+         <string>Change desktop when the mouse cursor is pushed against the edge of the screen</string>
+        </property>
         <property name="text">
          <string>&amp;Switch desktop on edge:</string>
         </property>
@@ -54,6 +57,9 @@
       </item>
       <item row="1" column="0">
        <widget class="QLabel" name="label">
+        <property name="toolTip">
+         <string>Amount of time required for the mouse cursor to be pushed against the edge of the screen before the action is triggered</string>
+        </property>
         <property name="text">
          <string>Activation &amp;delay:</string>
         </property>
@@ -86,8 +92,11 @@
         <property name="enabled">
          <bool>true</bool>
         </property>
+        <property name="toolTip">
+         <string>Amount of time required after triggering an action until the next trigger can occur</string>
+        </property>
         <property name="text">
-         <string>Trigger &amp;cooldown:</string>
+         <string>&amp;Reactivation delay:</string>
         </property>
         <property name="alignment">
          <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
@@ -192,6 +201,7 @@
  </customwidgets>
  <tabstops>
   <tabstop>monitor</tabstop>
+  <tabstop>desktopSwitchCombo</tabstop>
   <tabstop>activationDelaySpin</tabstop>
   <tabstop>triggerCooldownSpin</tabstop>
  </tabstops>