Dedicated to Natalia Korovkina, my best friend and wife.

Added remove file functionality to OBEX FT dialog.

3 files changed, 84 insertions, 30 deletions

diff --git a/noncore/net/opietooth/manager/obexftpdialog.cpp b/noncore/net/opietooth/manager/obexftpdialog.cpp
index f479ca2..fd2015e 100644
--- a/noncore/net/opietooth/manager/obexftpdialog.cpp
+++ b/noncore/net/opietooth/manager/obexftpdialog.cpp
@@ -89,8 +89,11 @@ ObexFtpDialog::ObexFtpDialog(const QString& device, int port,
         SLOT(getFile()));
     connect(putButton,
         SIGNAL(clicked()),
         SLOT(putFile()));
+    connect(delButton,
+        SIGNAL(clicked()),
+        SLOT(delFile()));
     connect(destFile, 
         SIGNAL(dirSelected (const QString&)),
         SLOT(updateDir(const QString&)));
     connect(saveButton, 
@@ -241,9 +244,9 @@ void ObexFtpDialog::slotCd(QListViewItem* item)
     }
 }
 
 /*
- * Get the file
+ * Copy file from a remote device to the local device
  */
 void ObexFtpDialog::getFile()
 {
     FileListItem* file = (FileListItem*)fileList->selectedItem();
@@ -274,9 +277,9 @@ void ObexFtpDialog::getFile()
         fileProgress->reset();
         status(tr("Receiving file ") + file2get);
         result = obexftp_get(client, local, file2get);
         if (result < 0) {
-                log(file2get + QString(" receive ERROR: ") + tr(strerror(errno))); 
+                log(file2get + QString(" receive ERROR:\n") + tr(strerror(errno))); 
             errBox(file2get + QString(" receive ERROR"));
             status(file2get + QString(" receive ERROR"));
         }
         else {
@@ -287,9 +290,9 @@ void ObexFtpDialog::getFile()
     }
 }
 
 /*
- * Put the file
+ * Copy file from the local device to a remote device
  */
 void ObexFtpDialog::putFile()
 {
     int result; //OPeration result
@@ -324,18 +327,57 @@ void ObexFtpDialog::putFile()
     fileProgress->reset();
     status(tr("Sending file ") + local);
     result = obexftp_put_file(client, local, file2get);
     if (result < 0) {
-        log(local + QString(" send ERROR: ") + tr(strerror(errno))); 
+        log(local + QString(" send ERROR:\n") + tr(strerror(errno))); 
         errBox(local + QString(" send ERROR"));
         status(local + QString(" send ERROR"));
     }
     else {
+        slotBrowse();
         log(local + QString(" sent")); 
         status(local + QString(" sent")); 
     }
 }
 
+/*
+ * Delete file on a remote device
+ */
+void ObexFtpDialog::delFile()
+{
+    FileListItem* file = (FileListItem*)fileList->selectedItem();
+    int result;
+    if (file == NULL)
+        return;
+    file2get = "/";
+    if (file->gettype() == IS_FILE) {
+        if (client == NULL) {
+            errBox("No connection established");
+            return;
+        }
+        file2get += curdir;
+        if (curdir != "" && curdir.right(1) != "/")
+            file2get += "/";
+        file2get += file->text(0);
+    }
+    result = QMessageBox::warning(this, tr("Remove File"), 
+        tr("Do you want to remove\n") + file2get, "Yes", "No");
+    if (result != 0)
+        return;
+    odebug << "Remove " << file2get << oendl;
+    result = obexftp_del(client, file2get);
+    if (result < 0) {
+        log(file2get + QString(" remove ERROR\n") + tr(strerror(errno))); 
+        errBox(file2get + QString(" remove ERROR"));
+        status(file2get + QString(" remove ERROR"));
+    }
+    else {
+        slotBrowse();
+        log(file2get + QString(" removed")); 
+        status(file2get + QString(" removed")); 
+    }
+}
+
 /* connect with given uuid. re-connect every time */
 int ObexFtpDialog::cli_connect_uuid(const uint8_t *uuid, int uuid_len)
 {
         int retry;
diff --git a/noncore/net/opietooth/manager/obexftpdialog.h b/noncore/net/opietooth/manager/obexftpdialog.h
index 81c8921..75ee95b 100644
--- a/noncore/net/opietooth/manager/obexftpdialog.h
+++ b/noncore/net/opietooth/manager/obexftpdialog.h
@@ -61,8 +61,9 @@ namespace OpieTooth {
         void slotBrowse();
         void slotCd(QListViewItem* item);
         void getFile();    
         void putFile();    
+        void delFile();    
         void updateDir(const QString& newdir);
         void slotSaveLog();
         void slotBrowseLog();
     };
diff --git a/noncore/net/opietooth/manager/obexftpdialogbase.ui b/noncore/net/opietooth/manager/obexftpdialogbase.ui
index 2447007..83078d5 100644
--- a/noncore/net/opietooth/manager/obexftpdialogbase.ui
+++ b/noncore/net/opietooth/manager/obexftpdialogbase.ui
@@ -10,9 +10,9 @@
         <name>geometry</name>
         <rect>
             <x>0</x>
             <y>0</y>
-            <width>283</width>
+            <width>347</width>
             <height>312</height>
         </rect>
     </property>
     <property stdset="1">
@@ -71,16 +71,16 @@
                     <property stdset="1">
                         <name>spacing</name>
                         <number>0</number>
                     </property>
-                    <widget row="1"  column="0"  rowspan="1"  colspan="3" >
+                    <widget row="1"  column="0"  rowspan="1"  colspan="4" >
                         <class>QProgressBar</class>
                         <property stdset="1">
                             <name>name</name>
                             <cstring>fileProgress</cstring>
                         </property>
                     </widget>
-                    <widget row="3"  column="0"  rowspan="1"  colspan="3" >
+                    <widget row="3"  column="0"  rowspan="1"  colspan="4" >
                         <class>QLabel</class>
                         <property stdset="1">
                             <name>name</name>
                             <cstring>statusBar</cstring>
@@ -100,31 +100,9 @@
                             <name>text</name>
                             <string>Browse</string>
                         </property>
                     </widget>
-                    <widget row="2"  column="1" >
-                        <class>QPushButton</class>
-                        <property stdset="1">
-                            <name>name</name>
-                            <cstring>getButton</cstring>
-                        </property>
-                        <property stdset="1">
-                            <name>text</name>
-                            <string>Get file</string>
-                        </property>
-                    </widget>
-                    <widget row="2"  column="2" >
-                        <class>QPushButton</class>
-                        <property stdset="1">
-                            <name>name</name>
-                            <cstring>putButton</cstring>
-                        </property>
-                        <property stdset="1">
-                            <name>text</name>
-                            <string>Put file</string>
-                        </property>
-                    </widget>
-                    <widget row="0"  column="0"  rowspan="1"  colspan="3" >
+                    <widget row="0"  column="0"  rowspan="1"  colspan="4" >
                         <class>QListView</class>
                         <column>
                             <property>
                                 <name>text</name>
@@ -157,8 +135,41 @@
                             <name>name</name>
                             <cstring>fileList</cstring>
                         </property>
                     </widget>
+                    <widget row="2"  column="2" >
+                        <class>QPushButton</class>
+                        <property stdset="1">
+                            <name>name</name>
+                            <cstring>putButton</cstring>
+                        </property>
+                        <property stdset="1">
+                            <name>text</name>
+                            <string>Put</string>
+                        </property>
+                    </widget>
+                    <widget row="2"  column="1" >
+                        <class>QPushButton</class>
+                        <property stdset="1">
+                            <name>name</name>
+                            <cstring>getButton</cstring>
+                        </property>
+                        <property stdset="1">
+                            <name>text</name>
+                            <string>Get</string>
+                        </property>
+                    </widget>
+                    <widget row="2"  column="3" >
+                        <class>QPushButton</class>
+                        <property stdset="1">
+                            <name>name</name>
+                            <cstring>delButton</cstring>
+                        </property>
+                        <property stdset="1">
+                            <name>text</name>
+                            <string>Del</string>
+                        </property>
+                    </widget>
                 </grid>
             </widget>
             <widget>
                 <class>QWidget</class>