[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdenetwork/kget
From:       Matthias Fuchs <mat69 () gmx ! net>
Date:       2011-08-10 12:51:17
Message-ID: 20110810125117.81F73AC871 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1246203 by mfuchs:

Droptarget always has a tooltip.

 M  +9 -56     conf/dlgappearance.ui  
 M  +0 -3      conf/kget.kcfg  
 M  +1 -0      conf/kget.upd  
 M  +1 -1      ui/droptarget.cpp  


--- trunk/KDE/kdenetwork/kget/conf/dlgappearance.ui #1246202:1246203
@@ -12,35 +12,21 @@
   </property>
   <layout class="QGridLayout" name="gridLayout_4">
    <item row="0" column="0">
-    <widget class="QGroupBox" name="dropTargetGroup">
+    <widget class="QGroupBox" name="kcfg_ShowDropTarget">
      <property name="title">
-      <string>Drop Target</string>
+      <string>Use Drop Target</string>
      </property>
-     <layout class="QGridLayout" name="gridLayout">
-      <item row="1" column="0">
-       <widget class="QCheckBox" name="kcfg_AnimateDropTarget">
-        <property name="enabled">
-         <bool>false</bool>
+     <property name="checkable">
+      <bool>true</bool>
         </property>
-        <property name="text">
-         <string>Enable animations</string>
-        </property>
-       </widget>
-      </item>
-      <item row="2" column="0">
-       <widget class="QCheckBox" name="kcfg_EnablePopupTooltip">
-        <property name="enabled">
+     <property name="checked">
          <bool>false</bool>
         </property>
-        <property name="text">
-         <string>Enable popup tooltip</string>
-        </property>
-       </widget>
-      </item>
+     <layout class="QGridLayout" name="gridLayout">
       <item row="0" column="0">
-       <widget class="QCheckBox" name="kcfg_ShowDropTarget">
+       <widget class="QCheckBox" name="kcfg_AnimateDropTarget">
         <property name="text">
-         <string>Show drop target</string>
+         <string>Enable animations</string>
         </property>
        </widget>
       </item>
@@ -66,38 +52,5 @@
   </layout>
  </widget>
  <resources/>
- <connections>
-  <connection>
-   <sender>kcfg_ShowDropTarget</sender>
-   <signal>toggled(bool)</signal>
-   <receiver>kcfg_AnimateDropTarget</receiver>
-   <slot>setEnabled(bool)</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>20</x>
-     <y>20</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>20</x>
-     <y>20</y>
-    </hint>
-   </hints>
-  </connection>
-  <connection>
-   <sender>kcfg_ShowDropTarget</sender>
-   <signal>toggled(bool)</signal>
-   <receiver>kcfg_EnablePopupTooltip</receiver>
-   <slot>setEnabled(bool)</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>253</x>
-     <y>105</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>253</x>
-     <y>157</y>
-    </hint>
-   </hints>
-  </connection>
- </connections>
+ <connections/>
 </ui>
--- trunk/KDE/kdenetwork/kget/conf/kget.kcfg #1246202:1246203
@@ -32,9 +32,6 @@
     <entry name="AnimateDropTarget" type="Bool">
       <default>true</default>
     </entry>
-    <entry name="EnablePopupTooltip" type="Bool">
-      <default>true</default>
-    </entry>
   </group>
 
   <group name="Advanced">
--- trunk/KDE/kdenetwork/kget/conf/kget.upd #1246202:1246203
@@ -6,6 +6,7 @@
 RemoveKey=Columns
 RemoveKey=ShowExpandableTransferDetails
 RemoveKey=ShowSplashscreen
+RemoveKey=EnablePopupTooltip
 Group=Geometry
 RemoveKey=ColumnWidths
 
--- trunk/KDE/kdenetwork/kget/ui/droptarget.cpp #1246202:1246203
@@ -445,7 +445,7 @@
 
 void DropTarget::slotToolTipTimer()
 {
-    if (Settings::enablePopupTooltip() && !popupMenu->isVisible() && isVisible() && \
mask().contains(mapFromGlobal(QCursor::pos()))) +    if (!popupMenu->isVisible() && \
isVisible() && mask().contains(mapFromGlobal(QCursor::pos())))  \
QToolTip::showText(QCursor::pos(),tooltipText,this,rect());  }
 


[prev in list] [next in list] [prev in thread] [next in thread]