Improved diagnostic messages.

Added LOG saving functionality.

4 files changed, 217 insertions, 231 deletions

diff --git a/noncore/net/opietooth/manager/obexdialog.cpp b/noncore/net/opietooth/manager/obexdialog.cpp
index d3fdd14..8d7b593 100644
--- a/noncore/net/opietooth/manager/obexdialog.cpp
+++ b/noncore/net/opietooth/manager/obexdialog.cpp
@@ -48,93 +48,93 @@ ObexDialog::ObexDialog(const QString& device, QWidget* parent,  const char* name
     connect( browserButton, SIGNAL(released() ), this , SLOT(browse() ) );
 
     chNameLine = new QLineEdit( this );
 
     sendButton = new QPushButton( this );
     sendButton->setText( tr( "Send" ) );
 
     layout->addWidget(info);
     layout->addWidget(status);
     layout->addWidget(cmdLine);
     layout->addWidget(browserButton);
     layout->addWidget(chNameLine);
     layout->addWidget(sendButton);
     layout->addWidget(statLine);
 
     connect( sendButton, SIGNAL( clicked() ), this,  SLOT( sendData() ) );
 
     connect(obexSend, SIGNAL(processExited(Opie::Core::OProcess*)),
         this, SLOT(slotProcessExited(Opie::Core::OProcess*)));
     connect(obexSend, SIGNAL(receivedStdout(Opie::Core::OProcess*, char*, int)),
         this, SLOT(slotPushOut(Opie::Core::OProcess*, char*, int)));
     connect(obexSend, SIGNAL(receivedStderr(Opie::Core::OProcess*, char*, int)),
         this, SLOT(slotPushErr(Opie::Core::OProcess*, char*, int)));
 
 }
 
 ObexDialog::~ObexDialog() {
   if (obexSend->isRunning())
     obexSend->kill();
   delete obexSend;
   obexSend = NULL;
 }
 
 void ObexDialog::browse() {
 
     MimeTypes types;
     QStringList all;
     all << "*/*";
     types.insert("All Files", all );
 
     QString str = OFileDialog::getOpenFileName( 1,"/","", types, 0 );
     cmdLine->setText( str );
     statLine->setText( tr("Ready") );
 }
 
 void ObexDialog::sendData() {
     QString fileURL = cmdLine->text();
     QString file = QFileInfo( fileURL ).fileName();
     QString modifiedName = chNameLine->text();
     QString execName = "ussp-push";
 
     if (obexSend->isRunning())
         return;
     obexSend->clearArguments();
        // vom popupmenu beziehen
     if ( !modifiedName.isEmpty() ) {
         *obexSend << execName << "--timeo 30" << m_device << fileURL << modifiedName;
     } else {
         *obexSend << execName << "--timeo 30" << m_device << fileURL << file;
     }
     obexSend->setUseShell(true);
     if (!obexSend->start(OProcess::NotifyOnExit, OProcess::All) ) {
                     statLine->setText( tr("Error: couln't start process") );
     }
-                else
-            statLine->setText( tr("Sending") );
+    else
+        statLine->setText( tr("Sending") );
 }
 
 void ObexDialog::slotPushOut(OProcess*, char* buf, int len) {
   QCString str(buf, len);
   status->append(str);
 }
 
 void ObexDialog::slotPushErr(OProcess*, char* buf, int len) {
   QCString str(buf, len);
   status->append(str);
 }
 
 void ObexDialog::slotProcessExited(OProcess*) {
   if (obexSend == NULL)
       return;
   if (obexSend->normalExit()) {
     status->append( tr("Finished with result ") );
     status->append( QString::number(obexSend->exitStatus()) );
     status->append( tr("\n") );
     odebug << obexSend->exitStatus() << oendl;
     statLine->setText( tr("Finished: ") + tr(strerror(obexSend->exitStatus())) );
   }
   else {
     status->append( tr("Exited abnormally\n") );
     statLine->setText( tr("Exited abnormally") );
   }
 }
diff --git a/noncore/net/opietooth/manager/obexftpdialog.cpp b/noncore/net/opietooth/manager/obexftpdialog.cpp
index 80a81b4..f479ca2 100644
--- a/noncore/net/opietooth/manager/obexftpdialog.cpp
+++ b/noncore/net/opietooth/manager/obexftpdialog.cpp
@@ -1,467 +1,506 @@
 /* $Id$ */
 /* OBEX file browser dialog */
 /***************************************************************************
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
  ***************************************************************************/
 /*
  * This code uses and is based on ObexFTP project code: http://triq.net/obexftp/
  */
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <unistd.h>
 #include <string.h>
 #include <errno.h>
 #include <qpushbutton.h>
 #include <qmessagebox.h>
 #include <qmultilineedit.h>
+#include <qlineedit.h>
 #include <qspinbox.h>
 #include <qcombobox.h>
 #include <qlistview.h>
 #include <qprogressbar.h>
 #include <qlabel.h>
 #include <qlayout.h>
 #include <errno.h>
+#include <qfile.h>
+#include <qtextstream.h>
+#include <qstringlist.h>
 #include "obexftpdialog.h"
 #include "filelistitem.h"
 
 #include <qpe/qpeapplication.h>
 #include <qpe/resource.h>
 #include <qpe/config.h>
 #include <opie2/odebug.h>
 #include <opie2/ofileselector.h>
+#include <opie2/ofiledialog.h>
 
 using namespace Opie::Core;
 using namespace Opie::Ui;
 
 using namespace OpieTooth;
 
 #define MAX_PROGRESS 14 //Maximal progress bar
 
 static void info_cb(int event, const char *msg, int len, void* data);
 
 /*
  * Public constructor
  * device - bluetooth address of the device
  * port - port to connect to
  */
 ObexFtpDialog::ObexFtpDialog(const QString& device, int port, 
     QWidget* parent, const char* name, bool modal, WFlags fl) 
     : ObexFtpDialogBase(parent, name, modal, fl), m_device(device), 
     m_port(port), curdir("")
 {
     client = NULL;
     nRetries = 3;
     transport = OBEX_TRANS_BLUETOOTH;
     use_conn = TRUE;
     use_path = TRUE;
     progressStatus = 0;
     localCurdir = "/";
     browseLog->setEdited(FALSE);
     fileList->setSorting(1);
     fileList->clear();
     fileProgress->setTotalSteps(MAX_PROGRESS);
     statusBar->clear();
     localLayout = new QVBoxLayout(localFs);
     localLayout->setSpacing( 0 );
     localLayout->setMargin( 0 );
     destFile = new OFileSelector(localFs, 
         OFileSelector::FileSelector, 
         OFileSelector::ExtendedAll, localCurdir, "");
     destFile->setCloseVisible(false);
     destFile->setNewVisible(false);
     localLayout->addWidget(destFile);
     nReries->setValue(nRetries);
     connect(browseOK, SIGNAL(clicked()), SLOT(slotBrowse()));
     connect(fileList, SIGNAL(clicked(QListViewItem*)), 
         SLOT(slotCd(QListViewItem*)));
     connect(getButton, 
         SIGNAL(clicked()),
         SLOT(getFile()));
     connect(putButton,
         SIGNAL(clicked()),
         SLOT(putFile()));
     connect(destFile, 
         SIGNAL(dirSelected (const QString&)),
         SLOT(updateDir(const QString&)));
+    connect(saveButton, 
+        SIGNAL(clicked()),
+        SLOT(slotSaveLog()));
+    connect(browseButton, 
+        SIGNAL(clicked()),
+        SLOT(slotBrowseLog()));
 }
 
 ObexFtpDialog::~ObexFtpDialog()
 {
     if (client != NULL) {
         obexftp_disconnect(client);
         obexftp_close(client);
     }
 }
 
 /*
  * Do device browsing
  */
 void ObexFtpDialog::slotBrowse()
 {
     stat_entry_t* ent; //Directory entry
     void *dir; //Directory to read
     const uint8_t* use_uuid; //uuid
     int len; //uuid length
     FileListItem* root; //root node
     int fsize; //file size
     bool numOk; //true if the string is a number 
     int tmp; //just a temp var
     
     status(tr("Connecting to ") + m_device);
     odebug << "Browse device " << m_device << oendl;
     browseLog->clear();
     fileList->clear();
     progressStatus = 0;
     fileProgress->setTotalSteps(MAX_PROGRESS);
     fileProgress->reset();
 
     //Get parameters
     tmp = nReries->text().toInt(&numOk);
     if (numOk)
         nRetries = tmp;
     if (uuidType->currentText() == "FBS") {
         use_uuid = UUID_FBS;
         len = sizeof(UUID_FBS);
     } else if (uuidType->currentText() == "S45") {
         use_uuid = UUID_S45;
         len = sizeof(UUID_S45);
     } else {
         use_uuid = UUID_FBS;
         len = sizeof(UUID_FBS);
     }
 
     if (!cli_connect_uuid(use_uuid, len)) {
-        log("Connection failed");
+        log(tr("Connection failed: ") + tr(strerror(errno)));
         errBox("Connection failed");
         status("Connection failed");
         return;
     }
     else {
         log(QString("Connected to ") + m_device);
         status(QString("Connected to ") + m_device);
     }
     /* List folder */
     root = new FileListItem(fileList, NULL);
     dir = obexftp_opendir(client, curdir);
         while ((ent = obexftp_readdir(dir)) != NULL) {
         FileListItem* a; //List view item
             if (ent->mode != 16877) {
             fsize = ent->size;
         }
         else
             fsize = 0;
                 log(QString(ent->name) + QString(" ") + 
             QString::number(ent->mode));
         
         a = new FileListItem(fileList, ent, fsize);
         }
         obexftp_closedir(dir);
 }
 
 //Error message box
 int ObexFtpDialog::errBox(QCString msg)
 {
     return QMessageBox::critical(this, tr("ObexFTP error"), msg);
 }
 
 int ObexFtpDialog::errBox(QString msg)
 {
     return QMessageBox::critical(this, tr("ObexFTP error"), msg);
 }
 
 int ObexFtpDialog::errBox(const char* msg)
 {
     return QMessageBox::critical(this, tr("ObexFTP error"), tr(msg));
 }
 
 //Text in the status bar
 void ObexFtpDialog::status(QCString msg)
 {
     statusBar->setText(msg);
     statusBar->repaint();
 }
 
 void ObexFtpDialog::status(QString msg)
 {
     statusBar->setText(msg);
     statusBar->repaint();
 }
 
 void ObexFtpDialog::status(const char* msg)
 {
     statusBar->setText(msg);
     statusBar->repaint();
 }
 
 /*
  * Change directory with item under the cursor
  */
 void ObexFtpDialog::slotCd(QListViewItem* item)
 {
     FileListItem* file = (FileListItem*)item;
     int idx;
     if (file == NULL)
         return;
     odebug << "Item " << file->text(0) << " clicked" << oendl;
     if (file->gettype() == IS_DIR) {
         if (file->text(0) == "../") {
             if (curdir.right(1) == "/")
                 curdir.remove(curdir.length() - 1, 1);
             idx = curdir.findRev('/');
             if (idx >= 0)
                 curdir.remove(idx, curdir.length() - idx);
             else
                 curdir = "";
         }
         else {
             if (curdir != "" && curdir.right(1) != "/")
                 curdir += "/";
             curdir += file->text(0);
         }
         odebug << "Browse " << curdir << oendl;
         if (obexftp_setpath(client, curdir, 0) < 0)
-            log("CD failed");
+            log(tr("CD failed: ") + tr(strerror(errno)));
         slotBrowse();
     }
 }
 
 /*
  * Get the file
  */
 void ObexFtpDialog::getFile()
 {
     FileListItem* file = (FileListItem*)fileList->selectedItem();
     int result;
     if (file == NULL)
         return;
     file2get = "/";
     local = localCurdir;
     if (local == "") {
         errBox("Select a destination first");
         return;
     }
     if (local.right(1) != "/")
         local += "/";
     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);
         local += file->text(0);
         odebug << "Copy " << file2get << " to " << local << oendl;
         progressStatus = 0;
         fileProgress->setTotalSteps(file->getsize() / 1024);
         fileProgress->reset();
         status(tr("Receiving file ") + file2get);
         result = obexftp_get(client, local, file2get);
         if (result < 0) {
-                log(file2get + QString(" receive ERROR")); 
+                log(file2get + QString(" receive ERROR: ") + tr(strerror(errno))); 
             errBox(file2get + QString(" receive ERROR"));
             status(file2get + QString(" receive ERROR"));
         }
         else {
             log(file2get + QString(" received")); 
             status(file2get + QString(" received")); 
             destFile->reread();
         }
     }
 }
 
 /*
  * Put the file
  */
 void ObexFtpDialog::putFile()
 {
     int result; //OPeration result
     int idx; //Index of a symbol in the string
     struct stat localFStat; //Local file information
     
     if (client == NULL) {
         errBox("No connection established");
         return;
     }
     local = destFile->selectedName();
     if (local == "") {
         errBox("No file slected");
         return;
     }
     result = stat(local, &localFStat);
     if (result < 0) {
         errBox(tr("Wrong file selected ") + local + tr(" ") + 
             tr(strerror(errno)));
         return;
     }
     idx = local.findRev('/');
     if (idx > 0) {
         file2get = local.right(local.length() - idx - 1);
     }
     else 
         file2get = local;
     
     odebug << "Copy " << local << " to " << file2get << oendl;
     progressStatus = 0;
     fileProgress->setTotalSteps(localFStat.st_size / 1024);
     fileProgress->reset();
     status(tr("Sending file ") + local);
     result = obexftp_put_file(client, local, file2get);
     if (result < 0) {
-        log(local + QString(" send ERROR")); 
+        log(local + QString(" send ERROR: ") + tr(strerror(errno))); 
         errBox(local + QString(" send ERROR"));
         status(local + QString(" send ERROR"));
     }
     else {
         log(local + QString(" sent")); 
         status(local + QString(" sent")); 
     }
 }
 
 /* connect with given uuid. re-connect every time */
 int ObexFtpDialog::cli_connect_uuid(const uint8_t *uuid, int uuid_len)
 {
         int retry;
         if (client != NULL)
         return TRUE;
     /* Open */
     client = obexftp_open (transport, NULL, info_cb, this);
     if(client == NULL) {
         errBox("Error opening obexftp-client");
         return FALSE;
     }
     if (!use_conn)
         client->quirks &= ~OBEXFTP_CONN_HEADER;
     if (!use_path)
         client->quirks &= ~OBEXFTP_SPLIT_SETPATH;
     for (retry = 0; retry < nRetries; retry++) {
         /* Connect */
         switch (transport) {
         case OBEX_TRANS_IRDA:
             if (obexftp_connect_uuid(client, NULL, 0, uuid, uuid_len) >= 0)
                 return TRUE;
             break;
         case OBEX_TRANS_BLUETOOTH:
             if (obexftp_connect_uuid(client, m_device, m_port, 
                 uuid, uuid_len) >= 0)
                 return TRUE;
             break;
         default:
             errBox("Transport type unknown");
             return FALSE;
         }
         log(tr("Still trying to connect"));
     }
     client = NULL;
 
         return FALSE;
 }
 
 /*
  * Put a message to the log window
  */
 void ObexFtpDialog::log(QString str)
 {
     browseLog->append(str);
 }
 
 void ObexFtpDialog::log(QCString str)
 {
     browseLog->append(str);
 }
 
 void ObexFtpDialog::log(QString& str)
 {
     browseLog->append(str);
 }
 
 void ObexFtpDialog::log(const char* str)
 {
     browseLog->append(str);
 }
 
 void ObexFtpDialog::incProgress()
 {
     if (progressStatus < fileProgress->totalSteps())
         fileProgress->setProgress(progressStatus++);
 }
 
 void ObexFtpDialog::doneProgress()
 {
     progressStatus = 0;
     fileProgress->reset();
 }
 
 void ObexFtpDialog::updateDir(const QString& newdir)
 {
     localCurdir = newdir;
 }
 
+/**
+ * Save Log to the specified file
+ */
+void ObexFtpDialog::slotSaveLog()
+{
+    QFile logFile(saveLogEdit->text());
+    if (!logFile.open(IO_WriteOnly)) {
+        errBox(tr("Unable to open file ") + saveLogEdit->text() + tr(" ") + 
+            tr(strerror(errno)));
+        return;
+    }
+    QTextStream stream(&logFile);
+    stream << browseLog->text() << endl;
+    QMessageBox::information(this, tr("Saving"), 
+        tr("Log file saved to ") + saveLogEdit->text());
+}
+
+void ObexFtpDialog::slotBrowseLog()
+{
+    MimeTypes types;
+    QStringList all;
+    all << "*/*";
+    types.insert("All Files", all );
+
+    QString str = OFileDialog::getOpenFileName( 1,"/","", types, 0 );
+    saveLogEdit->setText(str);
+}
+
 /*
  * Event callback function
  */
 static void info_cb(int event, const char *msg, int len, void* data)
 {
     ObexFtpDialog* dlg = (ObexFtpDialog*)data;
     QCString cmsg(msg, len); //Message to display
 
         switch (event) {
 
         case OBEXFTP_EV_ERRMSG:
                 dlg->log(QCString("Error: ") + cmsg);
                 break;
 
         case OBEXFTP_EV_ERR:
                 dlg->log(QCString("failed: ") + cmsg);
         dlg->doneProgress();
                 break;
         case OBEXFTP_EV_OK:
                 dlg->log(QCString("done"));
         dlg->doneProgress();
                 break;
 
         case OBEXFTP_EV_CONNECTING:
                 dlg->log(QCString("Connecting..."));
                 break;
         case OBEXFTP_EV_DISCONNECTING:
                 dlg->log(QCString("Disconnecting..."));
                 break;
         case OBEXFTP_EV_SENDING:
                 dlg->log(QCString("Sending ") + msg);
                 break;
         case OBEXFTP_EV_RECEIVING:
                 dlg->log(QCString("Receiving ") + msg);
                 break;
 
         case OBEXFTP_EV_LISTENING:
                 dlg->log(QCString("Waiting for incoming connection"));
                 break;
 
         case OBEXFTP_EV_CONNECTIND:
                 dlg->log(QCString("Incoming connection"));
                 break;
         case OBEXFTP_EV_DISCONNECTIND:
                 dlg->log(QCString("Disconnecting"));
                 break;
 
         case OBEXFTP_EV_INFO:
         // 64 bit problems ?
                 dlg->log(QString("Got info ") + QString::number((int)msg)); 
                 break;
 
         case OBEXFTP_EV_BODY:
                 break;
 
         case OBEXFTP_EV_PROGRESS:
         dlg->incProgress();
                 break;
         }
 }
 
 //eof
diff --git a/noncore/net/opietooth/manager/obexftpdialog.h b/noncore/net/opietooth/manager/obexftpdialog.h
index 7000f61..81c8921 100644
--- a/noncore/net/opietooth/manager/obexftpdialog.h
+++ b/noncore/net/opietooth/manager/obexftpdialog.h
@@ -2,67 +2,69 @@
 /* OBEX file browser dialog */
 /***************************************************************************
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
  ***************************************************************************/
 /*
  * This code uses and is based on ObexFTP project code: http://triq.net/obexftp/
  */
 #ifndef _OBEXFTPDIALOG_H_
 #define _OBEXFTPDIALOG_H_
 #include "obexftpdialogbase.h"
 #include <qstring.h>
 #include <obexftp.h>
 #include <uuid.h>
 #include <client.h>
 #include <opie2/ofileselector.h>
 #include <qlayout.h>
 namespace OpieTooth {
     class ObexFtpDialog : public ObexFtpDialogBase {
         Q_OBJECT
     public:
         ObexFtpDialog(const QString& device = 0, int port = 0, 
             QWidget* parent = 0, const char* name = 0, bool modal = TRUE, 
             WFlags fl = 0);
         ~ObexFtpDialog();
         void log(QString str);
         void log(QCString str);
         void log(const char* str);
         void log(QString& str);
         void incProgress();
         void doneProgress();
     protected:    
         int cli_connect_uuid(const uint8_t *uuid, int uuid_len);
         int errBox(QCString msg); //Error message box
         int errBox(QString msg); //Error message box
         int errBox(const char* msg); //Error message box
         void status(QCString msg); //Text in the status bar
         void status(QString msg); //Text in the status bar
         void status(const char* msg); //Text in the status bar
     protected:
         QString m_device; //device MAC address
         int m_port; //port
         int transport; //transport type
         bool use_conn; 
         bool use_path; 
         obexftp_client_t* client; //Obex ftp client handler
         QString curdir; //Current directory on device
         QString localCurdir; //Local current directory
         QString file2get; //Remote file name
         QString local; //Local file name
         int progressStatus; //Progress status
         Opie::Ui::OFileSelector* destFile; //Destination file or directory
         QVBoxLayout* localLayout; //Window layout
         int nRetries; //Number of retries (on connection)
     private slots:
         void slotBrowse();
         void slotCd(QListViewItem* item);
         void getFile();    
         void putFile();    
         void updateDir(const QString& newdir);
+        void slotSaveLog();
+        void slotBrowseLog();
     };
 };
 #endif
diff --git a/noncore/net/opietooth/manager/obexftpdialogbase.ui b/noncore/net/opietooth/manager/obexftpdialogbase.ui
index b372b9d..2447007 100644
--- a/noncore/net/opietooth/manager/obexftpdialogbase.ui
+++ b/noncore/net/opietooth/manager/obexftpdialogbase.ui
@@ -1,371 +1,316 @@
 <!DOCTYPE UI><UI>
 <class>ObexFtpDialogBase</class>
 <widget>
     <class>QDialog</class>
     <property stdset="1">
         <name>name</name>
         <cstring>ObexFtpDialogBase</cstring>
     </property>
     <property stdset="1">
         <name>geometry</name>
         <rect>
             <x>0</x>
             <y>0</y>
-            <width>267</width>
+            <width>283</width>
             <height>312</height>
         </rect>
     </property>
     <property stdset="1">
         <name>sizePolicy</name>
         <sizepolicy>
             <hsizetype>7</hsizetype>
             <vsizetype>7</vsizetype>
         </sizepolicy>
     </property>
     <property stdset="1">
         <name>caption</name>
         <string>Browse device</string>
     </property>
     <property>
         <name>layoutMargin</name>
     </property>
     <property>
         <name>layoutSpacing</name>
     </property>
-    <vbox>
+    <grid>
         <property stdset="1">
             <name>margin</name>
             <number>0</number>
         </property>
         <property stdset="1">
             <name>spacing</name>
             <number>0</number>
         </property>
-        <widget>
+        <widget row="0"  column="0" >
             <class>QTabWidget</class>
             <property stdset="1">
                 <name>name</name>
                 <cstring>obexFtpTab</cstring>
             </property>
             <property>
                 <name>layoutMargin</name>
             </property>
             <property>
                 <name>layoutSpacing</name>
             </property>
             <widget>
                 <class>QWidget</class>
                 <property stdset="1">
                     <name>name</name>
                     <cstring>files</cstring>
                 </property>
                 <attribute>
                     <name>title</name>
                     <string>Device</string>
                 </attribute>
-                <vbox>
+                <grid>
                     <property stdset="1">
                         <name>margin</name>
                         <number>0</number>
                     </property>
                     <property stdset="1">
                         <name>spacing</name>
                         <number>0</number>
                     </property>
-                    <widget>
-                        <class>QLayoutWidget</class>
+                    <widget row="1"  column="0"  rowspan="1"  colspan="3" >
+                        <class>QProgressBar</class>
                         <property stdset="1">
                             <name>name</name>
-                            <cstring>Layout13</cstring>
+                            <cstring>fileProgress</cstring>
                         </property>
-                        <grid>
-                            <property stdset="1">
-                                <name>margin</name>
-                                <number>0</number>
+                    </widget>
+                    <widget row="3"  column="0"  rowspan="1"  colspan="3" >
+                        <class>QLabel</class>
+                        <property stdset="1">
+                            <name>name</name>
+                            <cstring>statusBar</cstring>
+                        </property>
+                        <property stdset="1">
+                            <name>text</name>
+                            <string></string>
+                        </property>
+                    </widget>
+                    <widget row="2"  column="0" >
+                        <class>QPushButton</class>
+                        <property stdset="1">
+                            <name>name</name>
+                            <cstring>browseOK</cstring>
+                        </property>
+                        <property stdset="1">
+                            <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" >
+                        <class>QListView</class>
+                        <column>
+                            <property>
+                                <name>text</name>
+                                <string>Name</string>
+                            </property>
+                            <property>
+                                <name>clickable</name>
+                                <bool>true</bool>
                             </property>
-                            <property stdset="1">
-                                <name>spacing</name>
-                                <number>6</number>
+                            <property>
+                                <name>resizeable</name>
+                                <bool>true</bool>
                             </property>
-                            <widget row="0"  column="0" >
-                                <class>QListView</class>
-                                <column>
-                                    <property>
-                                        <name>text</name>
-                                        <string>Name</string>
-                                    </property>
-                                    <property>
-                                        <name>clickable</name>
-                                        <bool>true</bool>
-                                    </property>
-                                    <property>
-                                        <name>resizeable</name>
-                                        <bool>true</bool>
-                                    </property>
-                                </column>
-                                <column>
-                                    <property>
-                                        <name>text</name>
-                                        <string>Size</string>
-                                    </property>
-                                    <property>
-                                        <name>clickable</name>
-                                        <bool>true</bool>
-                                    </property>
-                                    <property>
-                                        <name>resizeable</name>
-                                        <bool>true</bool>
-                                    </property>
-                                </column>
-                                <property stdset="1">
-                                    <name>name</name>
-                                    <cstring>fileList</cstring>
-                                </property>
-                            </widget>
-                            <widget row="1"  column="0" >
-                                <class>QProgressBar</class>
-                                <property stdset="1">
-                                    <name>name</name>
-                                    <cstring>fileProgress</cstring>
-                                </property>
-                            </widget>
-                            <widget row="2"  column="0" >
-                                <class>QLayoutWidget</class>
-                                <property stdset="1">
-                                    <name>name</name>
-                                    <cstring>Layout11</cstring>
-                                </property>
-                                <hbox>
-                                    <property stdset="1">
-                                        <name>margin</name>
-                                        <number>0</number>
-                                    </property>
-                                    <property stdset="1">
-                                        <name>spacing</name>
-                                        <number>6</number>
-                                    </property>
-                                    <widget>
-                                        <class>QPushButton</class>
-                                        <property stdset="1">
-                                            <name>name</name>
-                                            <cstring>browseOK</cstring>
-                                        </property>
-                                        <property stdset="1">
-                                            <name>text</name>
-                                            <string>Browse</string>
-                                        </property>
-                                    </widget>
-                                    <widget>
-                                        <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>
-                                        <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>
-                                </hbox>
-                            </widget>
-                            <widget row="3"  column="0" >
-                                <class>QLabel</class>
-                                <property stdset="1">
-                                    <name>name</name>
-                                    <cstring>statusBar</cstring>
-                                </property>
-                                <property stdset="1">
-                                    <name>text</name>
-                                    <string></string>
-                                </property>
-                            </widget>
-                        </grid>
+                        </column>
+                        <column>
+                            <property>
+                                <name>text</name>
+                                <string>Size</string>
+                            </property>
+                            <property>
+                                <name>clickable</name>
+                                <bool>true</bool>
+                            </property>
+                            <property>
+                                <name>resizeable</name>
+                                <bool>true</bool>
+                            </property>
+                        </column>
+                        <property stdset="1">
+                            <name>name</name>
+                            <cstring>fileList</cstring>
+                        </property>
                     </widget>
-                </vbox>
+                </grid>
             </widget>
             <widget>
                 <class>QWidget</class>
                 <property stdset="1">
                     <name>name</name>
                     <cstring>localFs</cstring>
                 </property>
                 <attribute>
                     <name>title</name>
                     <string>Local</string>
                 </attribute>
             </widget>
             <widget>
                 <class>QWidget</class>
                 <property stdset="1">
                     <name>name</name>
                     <cstring>options</cstring>
                 </property>
                 <attribute>
                     <name>title</name>
                     <string>Options</string>
                 </attribute>
-                <widget>
-                    <class>QLayoutWidget</class>
+                <grid>
                     <property stdset="1">
-                        <name>name</name>
-                        <cstring>Layout5</cstring>
+                        <name>margin</name>
+                        <number>11</number>
                     </property>
                     <property stdset="1">
-                        <name>geometry</name>
-                        <rect>
-                            <x>45</x>
-                            <y>5</y>
-                            <width>162</width>
-                            <height>63</height>
-                        </rect>
+                        <name>spacing</name>
+                        <number>6</number>
                     </property>
-                    <vbox>
+                    <widget row="0"  column="0" >
+                        <class>QLabel</class>
                         <property stdset="1">
-                            <name>margin</name>
-                            <number>0</number>
+                            <name>name</name>
+                            <cstring>uuidLabel</cstring>
                         </property>
                         <property stdset="1">
-                            <name>spacing</name>
-                            <number>6</number>
+                            <name>text</name>
+                            <string>uuid type</string>
                         </property>
-                        <widget>
-                            <class>QLayoutWidget</class>
-                            <property stdset="1">
-                                <name>name</name>
-                                <cstring>Layout3</cstring>
+                    </widget>
+                    <widget row="0"  column="1"  rowspan="1"  colspan="2" >
+                        <class>QComboBox</class>
+                        <item>
+                            <property>
+                                <name>text</name>
+                                <string>FBS</string>
                             </property>
-                            <hbox>
-                                <property stdset="1">
-                                    <name>margin</name>
-                                    <number>0</number>
-                                </property>
-                                <property stdset="1">
-                                    <name>spacing</name>
-                                    <number>6</number>
-                                </property>
-                                <widget>
-                                    <class>QLabel</class>
-                                    <property stdset="1">
-                                        <name>name</name>
-                                        <cstring>uuidLabel</cstring>
-                                    </property>
-                                    <property stdset="1">
-                                        <name>text</name>
-                                        <string>uuid type</string>
-                                    </property>
-                                </widget>
-                                <widget>
-                                    <class>QComboBox</class>
-                                    <item>
-                                        <property>
-                                            <name>text</name>
-                                            <string>FBS</string>
-                                        </property>
-                                    </item>
-                                    <item>
-                                        <property>
-                                            <name>text</name>
-                                            <string>S45</string>
-                                        </property>
-                                    </item>
-                                    <property stdset="1">
-                                        <name>name</name>
-                                        <cstring>uuidType</cstring>
-                                    </property>
-                                </widget>
-                            </hbox>
-                        </widget>
-                        <widget>
-                            <class>QLayoutWidget</class>
-                            <property stdset="1">
-                                <name>name</name>
-                                <cstring>Layout4</cstring>
+                        </item>
+                        <item>
+                            <property>
+                                <name>text</name>
+                                <string>S45</string>
                             </property>
-                            <hbox>
-                                <property stdset="1">
-                                    <name>margin</name>
-                                    <number>0</number>
-                                </property>
-                                <property stdset="1">
-                                    <name>spacing</name>
-                                    <number>6</number>
-                                </property>
-                                <widget>
-                                    <class>QLabel</class>
-                                    <property stdset="1">
-                                        <name>name</name>
-                                        <cstring>connRetries</cstring>
-                                    </property>
-                                    <property stdset="1">
-                                        <name>text</name>
-                                        <string>Retry to connect</string>
-                                    </property>
-                                </widget>
-                                <widget>
-                                    <class>QSpinBox</class>
-                                    <property stdset="1">
-                                        <name>name</name>
-                                        <cstring>nReries</cstring>
-                                    </property>
-                                    <property stdset="1">
-                                        <name>buttonSymbols</name>
-                                        <enum>PlusMinus</enum>
-                                    </property>
-                                </widget>
-                            </hbox>
-                        </widget>
-                    </vbox>
-                </widget>
+                        </item>
+                        <property stdset="1">
+                            <name>name</name>
+                            <cstring>uuidType</cstring>
+                        </property>
+                    </widget>
+                    <widget row="1"  column="0"  rowspan="1"  colspan="2" >
+                        <class>QLabel</class>
+                        <property stdset="1">
+                            <name>name</name>
+                            <cstring>connRetries</cstring>
+                        </property>
+                        <property stdset="1">
+                            <name>text</name>
+                            <string>Retry to connect</string>
+                        </property>
+                    </widget>
+                    <widget row="1"  column="2" >
+                        <class>QSpinBox</class>
+                        <property stdset="1">
+                            <name>name</name>
+                            <cstring>nReries</cstring>
+                        </property>
+                        <property stdset="1">
+                            <name>buttonSymbols</name>
+                            <enum>PlusMinus</enum>
+                        </property>
+                    </widget>
+                </grid>
             </widget>
             <widget>
                 <class>QWidget</class>
                 <property stdset="1">
                     <name>name</name>
                     <cstring>browse</cstring>
                 </property>
                 <attribute>
                     <name>title</name>
                     <string>Log</string>
                 </attribute>
-                <hbox>
+                <grid>
                     <property stdset="1">
                         <name>margin</name>
                         <number>0</number>
                     </property>
                     <property stdset="1">
                         <name>spacing</name>
                         <number>0</number>
                     </property>
-                    <widget>
+                    <widget row="1"  column="1" >
+                        <class>QLineEdit</class>
+                        <property stdset="1">
+                            <name>name</name>
+                            <cstring>saveLogEdit</cstring>
+                        </property>
+                    </widget>
+                    <widget row="1"  column="2" >
+                        <class>QPushButton</class>
+                        <property stdset="1">
+                            <name>name</name>
+                            <cstring>saveButton</cstring>
+                        </property>
+                        <property stdset="1">
+                            <name>text</name>
+                            <string>save</string>
+                        </property>
+                    </widget>
+                    <widget row="1"  column="0" >
+                        <class>QPushButton</class>
+                        <property stdset="1">
+                            <name>name</name>
+                            <cstring>browseButton</cstring>
+                        </property>
+                        <property stdset="1">
+                            <name>text</name>
+                            <string>Save as:</string>
+                        </property>
+                    </widget>
+                    <widget row="0"  column="0"  rowspan="1"  colspan="3" >
                         <class>QMultiLineEdit</class>
                         <property stdset="1">
                             <name>name</name>
                             <cstring>browseLog</cstring>
                         </property>
                     </widget>
-                </hbox>
+                </grid>
             </widget>
         </widget>
-    </vbox>
+    </grid>
 </widget>
 <tabstops>
     <tabstop>obexFtpTab</tabstop>
     <tabstop>fileList</tabstop>
     <tabstop>browseOK</tabstop>
     <tabstop>getButton</tabstop>
     <tabstop>putButton</tabstop>
     <tabstop>uuidType</tabstop>
     <tabstop>browseLog</tabstop>
 </tabstops>
 </UI>