[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-09 17:00:48
Message-ID: 20110809170048.2C152AC873 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1246038 by mfuchs:

The export transfes and the export plain transfers menu entries
are merged.

 M  +10 -29    mainwindow.cpp  
 M  +0 -3      mainwindow.h  
 M  +0 -1      ui/kgetui.rc  


--- trunk/KDE/kdenetwork/kget/mainwindow.cpp #1246037:1246038
@@ -135,24 +135,6 @@
     }
 }
 
-void MainWindow::exportTransfers(bool plain)
-{
-    QString filter = "";
-    if (!plain) {
-        filter = "*.kgt|" + i18n("KGet Transfer List") + " (*.kgt)";
-    }
-
-    QString filename = KFileDialog::getSaveFileName
-        (KUrl(),
-         filter,
-         this,
-         i18n("Export Transfers")
-        );
-
-    if(!filename.isEmpty())
-        KGet::save(filename, plain);
-}
-
 void MainWindow::setupActions()
 {
     KAction *newDownloadAction = actionCollection()->addAction("new_download");
@@ -173,12 +155,6 @@
     exportAction->setShortcuts(KShortcut("Ctrl+E"));
     connect(exportAction, SIGNAL(triggered()), SLOT(slotExportTransfers()));
 
-    KAction *exportPlainAction = actionCollection()->addAction("export_plain_transfers");
-    exportPlainAction->setText(i18n("&Export Transfers as Plain Text..."));
-    exportPlainAction->setIcon(KIcon("document-export"));
-    exportPlainAction->setShortcuts(KShortcut("Ctrl+P"));
-    connect(exportPlainAction, SIGNAL(triggered()), SLOT(slotExportPlainTransfers()));
-
     KAction *createMetalinkAction = actionCollection()->addAction("create_metalink");
     createMetalinkAction->setText(i18n("&Create a Metalink"));
     connect(createMetalinkAction, SIGNAL(triggered()), SLOT(slotCreateMetalink()));
@@ -546,13 +522,18 @@
 
 void MainWindow::slotExportTransfers()
 {
-    exportTransfers(false);
-}
+    const QString filename = KFileDialog::getSaveFileName
+        (KUrl(),
+         "*.kgt|" + i18n("KGet Transfer List") + " (*.kgt)\n*.txt|" + i18n("Text File") + " (*.txt)",
+         this,
+         i18n("Export Transfers")
+        );
 
-void MainWindow::slotExportPlainTransfers()
-{
-    exportTransfers(true);
+    if (!filename.isEmpty()) {
+        const bool plain = !filename.endsWith("kgt");
+        KGet::save(filename, plain);
 }
+}
 
 void MainWindow::slotCreateMetalink()
 {
--- trunk/KDE/kdenetwork/kget/mainwindow.h #1246037:1246038
@@ -76,7 +76,6 @@
     void slotNewTransfer();
     void slotImportTransfers();
     void slotExportTransfers();
-    void slotExportPlainTransfers();
     void slotPreferences();
     void slotDeleteGroup();
     void slotRenameGroup();
@@ -126,8 +125,6 @@
     void slotGroupsChanged(QMap<TransferGroupHandler*, TransferGroup::ChangesFlags> groups);
 
 private:
-    void exportTransfers(bool plain=false);
-
     /**
     * Returns the completed percents of all active transfers
     */
--- trunk/KDE/kdenetwork/kget/ui/kgetui.rc #1246037:1246038
@@ -7,7 +7,6 @@
         <Separator/>
         <Action name="import_transfers"/>
         <Action name="export_transfers"/>
-        <Action name="export_plain_transfers"/>
         <Action name="create_metalink"/>
         <Separator/>
         <Action name="transfer_history" />
[prev in list] [next in list] [prev in thread] [next in thread]