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

List:       kde-commits
Subject:    KDE/kdebase/workspace/klipper
From:       Esben Mose Hansen <kde () mosehansen ! dk>
Date:       2009-11-22 11:43:18
Message-ID: 1258890198.250522.19308.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 1052730 by esben:

Move actions-related config to action config dialog, and add pusling/Sune's \
unconfigurable option here, too.

 M  +21 -0     actionsconfig.ui  
 M  +15 -9     klipper.kcfg  
 M  +2 -2      urlgrabber.cpp  


--- trunk/KDE/kdebase/workspace/klipper/actionsconfig.ui #1052729:1052730
@@ -12,6 +12,27 @@
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
    <item>
+    <widget class="QCheckBox" name="kcfg_ReplayActionInHistory">
+     <property name="text">
+      <string>Replay actions on an item selected from history</string>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <widget class="QCheckBox" name="kcfg_StripWhiteSpace">
+     <property name="text">
+      <string>Remove whitespace when executing actions</string>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <widget class="QCheckBox" name="kcfg_EnableMagicMimeActions">
+     <property name="text">
+      <string>Enable MIME-based actions</string>
+     </property>
+    </widget>
+   </item>
+   <item>
     <widget class="QLabel" name="label">
      <property name="text">
       <string>Action list:</string>
--- trunk/KDE/kdebase/workspace/klipper/klipper.kcfg #1052729:1052730
@@ -16,15 +16,6 @@
       <label>Keep clipboard contents</label>
       <default>true</default>
     </entry>
-    <entry name="StripWhiteSpace" type="Bool">
-      <label>Strip whitespace when executing an action</label>
-      <default>true</default>
-      <whatsthis>Sometimes, the selected text has some whitespace at the end, which, \
if loaded as URL in a browser would cause an error. Enabling this option removes any \
whitespace at the beginning or end of the selected string (the original clipboard \
                contents will not be modified).</whatsthis>
-    </entry>
-    <entry name="ReplayActionInHistory" type="Bool">
-      <label>Replay action in history</label>
-      <default>false</default>
-    </entry>
     <entry name="PreventEmptyClipboard" type="Bool">
       <label>Prevent empty clipboard</label>
       <default>true</default>
@@ -79,4 +70,19 @@
         <default>-1</default>
     </entry>
   </group>
+  <group name="Actions">
+    <entry name="StripWhiteSpace" type="Bool">
+      <label>Strip whitespace when executing an action</label>
+      <default>true</default>
+      <whatsthis>Sometimes, the selected text has some whitespace at the end, which, \
if loaded as URL in a browser would cause an error. Enabling this option removes any \
whitespace at the beginning or end of the selected string (the original clipboard \
contents will not be modified).</whatsthis> +    </entry>
+    <entry name="ReplayActionInHistory" type="Bool">
+      <label>Replay action in history</label>
+      <default>false</default>
+    </entry>
+    <entry name="EnableMagicMimeActions" type="Bool">
+      <label>Enable MIME-based actions</label>
+      <default>true</default>
+    </entry>
+  </group>
 </kcfg>
--- trunk/KDE/kdebase/workspace/klipper/urlgrabber.cpp #1052729:1052730
@@ -106,8 +106,8 @@
 void URLGrabber::matchingMimeActions(const QString& clipData)
 {
     KUrl url(clipData);
-    KConfigGroup cg(KGlobal::config(), "General");
-    if(!cg.readEntry("EnableMagicMimeActions",true)) { //Secret configuration entry
+    KConfigGroup cg(KGlobal::config(), "Actions");
+    if(!cg.readEntry("EnableMagicMimeActions",true)) {
     //    kDebug() << "skipping mime magic due to configuration";
     	return;
     }


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