[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-02-08 20:36:50
Message-ID: 20110208203650.D2CD8AC8C0 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1219463 by mfuchs:

Adds option to download files without a prompt if they exist already.

The files can be either overwritten or automatically renamed.
BUG:130272

 M  +30 -0     conf/dlgadvanced.ui  
 M  +9 -0      conf/kget.kcfg  
 M  +13 -1     core/urlchecker.cpp  


--- trunk/KDE/kdenetwork/kget/conf/dlgadvanced.ui #1219462:1219463
@@ -120,6 +120,36 @@
     </widget>
    </item>
    <item>
+    <widget class="QGroupBox" name="groupBox_2">
+     <property name="title">
+      <string>Handle existing files/transfers</string>
+     </property>
+     <layout class="QVBoxLayout" name="verticalLayout_2">
+      <item>
+       <widget class="QRadioButton" name="kcfg_FilesAlwaysAsk">
+        <property name="text">
+         <string>Always ask</string>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <widget class="QRadioButton" name="kcfg_FilesAutomaticRename">
+        <property name="text">
+         <string>Automatic rename</string>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <widget class="QRadioButton" name="kcfg_FilesOverwrite">
+        <property name="text">
+         <string>Overwrite</string>
+        </property>
+       </widget>
+      </item>
+     </layout>
+    </widget>
+   </item>
+   <item>
     <spacer>
      <property name="orientation">
       <enum>Qt::Vertical</enum>
--- trunk/KDE/kdenetwork/kget/conf/kget.kcfg #1219462:1219463
@@ -99,6 +99,15 @@
     <entry name="StartupAction" type="Int">
         <default>0</default>
     </entry>
+    <entry name="FilesAlwaysAsk" type="Bool">
+        <default>true</default>
+    </entry>
+    <entry name="FilesAutomaticRename" type="Bool">
+        <default>false</default>
+    </entry>
+    <entry name="FilesOverwrite" type="Bool">
+        <default>false</default>
+    </entry>
   </group>
 
   <group name="Network">
--- trunk/KDE/kdenetwork/kget/core/urlchecker.cpp #1219462:1219463
@@ -25,6 +25,7 @@
 #include "core/transferhandler.h"
 #include "core/transfertreemodel.h"
 #include "core/basedialog.h"
+#include "settings.h"
 
 #include <QtCore/QFileInfo>
 
@@ -539,7 +540,12 @@
                     break;
                 }
 
-                const int result = hasExistingDialog(it->first, type, warning);
+                int result;
+                if (Settings::filesOverwrite() || (Settings::filesAutomaticRename() \
&& (warning != ExistingTransfer))) { +                    result = YesAll;
+                } else {
+                    result = hasExistingDialog(it->first, type, warning);
+                }
                 switch (result) {
                     case YesAll:
                         isYesAll = true;
@@ -697,6 +703,12 @@
         return KUrl();
     }
 
+    if (Settings::filesOverwrite()) {
+        m_overwriteAll = true;
+    } else if (Settings::filesAutomaticRename()) {
+        m_autoRenameAll = true;
+    }
+
     if ((source == destination) || (destination.isLocalFile() && \
                QFile::exists(destination.toLocalFile()))) {
         KIO::RenameDialog_Mode args = \
                static_cast<KIO::RenameDialog_Mode>(KIO::M_MULTI | KIO::M_SKIP | \
                KIO::M_OVERWRITE);
         QScopedPointer<KIO::RenameDialog> dlg(new \
KIO::RenameDialog(KGet::m_mainWindow, i18n("File already exists"), source,


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