1 files changed, 14 insertions, 20 deletions

diff --git a/noncore/unsupported/mailit/addatt.cpp b/noncore/unsupported/mailit/addatt.cpp
index f279f52..c8be865 100644
--- a/noncore/unsupported/mailit/addatt.cpp
+++ b/noncore/unsupported/mailit/addatt.cpp
@@ -9,24 +9,25 @@
 ** packaging of this file.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
 ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
 **
 **********************************************************************/
 #include <qlayout.h>
+#include <qhbox.h>
 #include <qdir.h>
 #include <qstringlist.h>
 #include "resource.h"
 #include "addatt.h"
 
 FileItem::FileItem(QListView *parent, DocLnk* dl)
                 : QListViewItem(parent)
 {
         /*file = fileInfo;
         type = fileType;*/
         
         doclnk=dl;
@@ -48,50 +49,49 @@ FileItem::FileItem(QListView *parent, DocLnk* dl)
 
 FileItem::~FileItem()
 {
         if (doclnk!=NULL) delete doclnk;
         doclnk=NULL;
 }
 
 AddAtt::AddAtt(QWidget *parent, const char *name, WFlags f)
         : QDialog(parent, name, f)
 {
         setCaption("Adding attatchments");
 
-        QGridLayout *top = new QGridLayout(this, 3,1 );
+        QGridLayout *top = new QGridLayout(this, 1,1 );
         
-
+        QHBox *buttons=new QHBox(this);
         /*fileCategoryButton = new QPushButton(this);*/
-        attatchButton = new QPushButton("Attatch ->", this);
-        removeButton = new QPushButton("Remove", this);
+        attatchButton = new QPushButton("Attatch ->", buttons);
+        removeButton = new QPushButton("Remove", buttons);
 
         /*fileCategories = new QPopupMenu(fileCategoryButton);
         fileCategoryButton->setPopup(fileCategories);
         fileCategories->insertItem("Document");
         fileCategories->insertItem("Picture");
         fileCategories->insertItem("Sound");
         fileCategories->insertItem("Movie");
         fileCategories->insertItem("File");
 
         fileCategoryButton->setText("Document");
         top->addWidget(fileCategoryButton, 0, 0);*/
         
-        //ofs=new OFileSelector(this,2,0,"/root/Documents");
-        
-        
-        top->addWidget(attatchButton,1,0);
-        top->addWidget(removeButton,2,0);
 
-        /*connect(fileCategories, SIGNAL(activated(int)), this,
-                SLOT(fileCategorySelected(int)) );*/
+        top->addWidget(buttons,1,0);
+        //buttons->addWidget(attatchButton,0,0);
+        //buttons->addWidget(removeButton,0,1);
+
+        //connect(fileCategories, SIGNAL(activated(int)), this,
+                //SLOT(fileCategorySelected(int)) );*/
         connect(attatchButton, SIGNAL(clicked()), this,
                 SLOT(addAttatchment()) );
         connect(removeButton, SIGNAL(clicked()), this,
                 SLOT(removeAttatchment()) );
         
         /*listView = new QListView(this, "AttView");
         listView->addColumn("Documents");*
         connect(listView, SIGNAL(doubleClicked(QListViewItem *)), this,
                 SLOT(addAttatchment()) );*/
         
         
         attView = new QListView(this, "Selected");
@@ -114,35 +114,29 @@ void AddAtt::clear()
         //getFiles();
         modified = FALSE;
 }
 
 /*void AddAtt::fileCategorySelected(int id)
 {
         fileCategoryButton->setText(fileCategories->text(id));
         getFiles();
 }*/
 
 void AddAtt::addAttatchment()
         {
-        QDialog qd(this,tr("Select attachment"),true);
-        
-        QGridLayout top(&qd,1,1);
-        
-        OFileSelector ofs(&qd,1,0,"/root/Documents");
-        
-        top.addWidget(&ofs,0,0);
+        OFileDialog ofs("Attachments",this,0,0,"/root/Documents");
         
-        qd.showMaximized();
+        ofs.showMaximized();
         
-        if (qd.exec()==QDialog::Accepted)
+        if (ofs.exec()==QDialog::Accepted)
         {
                 DocLnk* dl=new DocLnk(ofs.selectedDocument());
                 FileItem* fi=new FileItem(attView,dl);
                 fi->setPixmap(0,dl->pixmap());
                 fi->setText(1,dl->type());
                 attView->insertItem(fi);
                         modified = TRUE;
         }
 }
 
 void AddAtt::removeAttatchment()
 {