Diffstat (limited to 'noncore/net/mailit/addatt.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/net/mailit/addatt.cpp | 119 |
1 files changed, 70 insertions, 49 deletions
diff --git a/noncore/net/mailit/addatt.cpp b/noncore/net/mailit/addatt.cpp index c030e36..f279f52 100644 --- a/noncore/net/mailit/addatt.cpp +++ b/noncore/net/mailit/addatt.cpp | |||
@@ -20,120 +20,137 @@ | |||
20 | #include <qlayout.h> | 20 | #include <qlayout.h> |
21 | #include <qdir.h> | 21 | #include <qdir.h> |
22 | #include <qstringlist.h> | 22 | #include <qstringlist.h> |
23 | #include "resource.h" | 23 | #include "resource.h" |
24 | #include "addatt.h" | 24 | #include "addatt.h" |
25 | 25 | ||
26 | FileItem::FileItem(QListView *parent, QFileInfo fileInfo, QString fileType) | 26 | FileItem::FileItem(QListView *parent, DocLnk* dl) |
27 | : QListViewItem(parent) | 27 | : QListViewItem(parent) |
28 | { | 28 | { |
29 | file = fileInfo; | 29 | /*file = fileInfo; |
30 | type = fileType; | 30 | type = fileType;*/ |
31 | |||
32 | doclnk=dl; | ||
31 | 33 | ||
32 | setText(0, fileInfo.baseName()); | 34 | setText(0, doclnk->name()); |
33 | 35 | ||
34 | if (fileType == "Picture") { | 36 | /*if (fileType == "Picture") { |
35 | setPixmap(0, Resource::loadPixmap("pixmap")); | 37 | setPixmap(0, Resource::loadPixmap("pixmap")); |
36 | } else if (fileType == "Document") { | 38 | } else if (fileType == "Document") { |
37 | setPixmap(0, Resource::loadPixmap("txt")); | 39 | setPixmap(0, Resource::loadPixmap("txt")); |
38 | } else if (fileType == "Sound") { | 40 | } else if (fileType == "Sound") { |
39 | setPixmap(0, Resource::loadPixmap("play")); | 41 | setPixmap(0, Resource::loadPixmap("play")); |
40 | } else if (fileType == "Movie") { | 42 | } else if (fileType == "Movie") { |
41 | setPixmap(0, Resource::loadPixmap("MPEGPlayer")); | 43 | setPixmap(0, Resource::loadPixmap("MPEGPlayer")); |
42 | } else if (fileType == "File") { | 44 | } else if (fileType == "File") { |
43 | setPixmap(0, Resource::loadPixmap("exec")); | 45 | setPixmap(0, Resource::loadPixmap("exec")); |
44 | } | 46 | }*/ |
45 | } | 47 | } |
46 | 48 | ||
47 | QFileInfo FileItem::getFileInfo() | 49 | FileItem::~FileItem() |
48 | { | 50 | { |
49 | return file; | 51 | if (doclnk!=NULL) delete doclnk; |
50 | } | 52 | doclnk=NULL; |
51 | |||
52 | QString FileItem::getFileType() | ||
53 | { | ||
54 | return type; | ||
55 | } | 53 | } |
56 | 54 | ||
57 | AddAtt::AddAtt(QWidget *parent, const char *name, WFlags f) | 55 | AddAtt::AddAtt(QWidget *parent, const char *name, WFlags f) |
58 | : QDialog(parent, name, f) | 56 | : QDialog(parent, name, f) |
59 | { | 57 | { |
60 | setCaption("Adding attatchments"); | 58 | setCaption("Adding attatchments"); |
61 | 59 | ||
62 | QGridLayout *top = new QGridLayout(this, 3, 2); | 60 | QGridLayout *top = new QGridLayout(this, 3,1 ); |
61 | |||
63 | 62 | ||
64 | fileCategoryButton = new QPushButton(this); | 63 | /*fileCategoryButton = new QPushButton(this);*/ |
65 | attatchButton = new QPushButton("Attatch ->", this); | 64 | attatchButton = new QPushButton("Attatch ->", this); |
66 | removeButton = new QPushButton("Remove", this); | 65 | removeButton = new QPushButton("Remove", this); |
67 | 66 | ||
68 | fileCategories = new QPopupMenu(fileCategoryButton); | 67 | /*fileCategories = new QPopupMenu(fileCategoryButton); |
69 | fileCategoryButton->setPopup(fileCategories); | 68 | fileCategoryButton->setPopup(fileCategories); |
70 | fileCategories->insertItem("Document"); | 69 | fileCategories->insertItem("Document"); |
71 | fileCategories->insertItem("Picture"); | 70 | fileCategories->insertItem("Picture"); |
72 | fileCategories->insertItem("Sound"); | 71 | fileCategories->insertItem("Sound"); |
73 | fileCategories->insertItem("Movie"); | 72 | fileCategories->insertItem("Movie"); |
74 | fileCategories->insertItem("File"); | 73 | fileCategories->insertItem("File"); |
75 | 74 | ||
76 | fileCategoryButton->setText("Document"); | 75 | fileCategoryButton->setText("Document"); |
77 | top->addWidget(fileCategoryButton, 0, 0); | 76 | top->addWidget(fileCategoryButton, 0, 0);*/ |
78 | top->addWidget(attatchButton, 2, 0); | 77 | |
79 | top->addWidget(removeButton, 2, 1); | 78 | //ofs=new OFileSelector(this,2,0,"/root/Documents"); |
79 | |||
80 | |||
81 | top->addWidget(attatchButton,1,0); | ||
82 | top->addWidget(removeButton,2,0); | ||
80 | 83 | ||
81 | connect(fileCategories, SIGNAL(activated(int)), this, | 84 | /*connect(fileCategories, SIGNAL(activated(int)), this, |
82 | SLOT(fileCategorySelected(int)) ); | 85 | SLOT(fileCategorySelected(int)) );*/ |
83 | connect(attatchButton, SIGNAL(clicked()), this, | 86 | connect(attatchButton, SIGNAL(clicked()), this, |
84 | SLOT(addAttatchment()) ); | 87 | SLOT(addAttatchment()) ); |
85 | connect(removeButton, SIGNAL(clicked()), this, | 88 | connect(removeButton, SIGNAL(clicked()), this, |
86 | SLOT(removeAttatchment()) ); | 89 | SLOT(removeAttatchment()) ); |
87 | 90 | ||
88 | listView = new QListView(this, "AttView"); | 91 | /*listView = new QListView(this, "AttView"); |
89 | listView->addColumn("Documents"); | 92 | listView->addColumn("Documents");* |
90 | connect(listView, SIGNAL(doubleClicked(QListViewItem *)), this, | 93 | connect(listView, SIGNAL(doubleClicked(QListViewItem *)), this, |
91 | SLOT(addAttatchment()) ); | 94 | SLOT(addAttatchment()) );*/ |
95 | |||
92 | 96 | ||
93 | attView = new QListView(this, "Selected"); | 97 | attView = new QListView(this, "Selected"); |
94 | attView->addColumn("Attatched"); | 98 | attView->addColumn(tr("Attached")); |
99 | attView->addColumn(tr("File type")); | ||
95 | connect(attView, SIGNAL(doubleClicked(QListViewItem *)), this, | 100 | connect(attView, SIGNAL(doubleClicked(QListViewItem *)), this, |
96 | SLOT(removeAttatchment()) ); | 101 | SLOT(removeAttatchment()) ); |
97 | 102 | ||
98 | top->addWidget(listView, 1,0); | 103 | //top->addWidget(ofs, 0,0); |
99 | top->addWidget(attView, 1,1); | 104 | top->addWidget(attView, 0,0); |
105 | |||
106 | clear(); | ||
100 | 107 | ||
101 | clear(); | 108 | |
102 | } | 109 | } |
103 | 110 | ||
104 | void AddAtt::clear() | 111 | void AddAtt::clear() |
105 | { | 112 | { |
106 | attView->clear(); | 113 | attView->clear(); |
107 | getFiles(); | 114 | //getFiles(); |
108 | modified = FALSE; | 115 | modified = FALSE; |
109 | } | 116 | } |
110 | 117 | ||
111 | void AddAtt::fileCategorySelected(int id) | 118 | /*void AddAtt::fileCategorySelected(int id) |
112 | { | 119 | { |
113 | fileCategoryButton->setText(fileCategories->text(id)); | 120 | fileCategoryButton->setText(fileCategories->text(id)); |
114 | getFiles(); | 121 | getFiles(); |
115 | } | 122 | }*/ |
116 | 123 | ||
117 | void AddAtt::addAttatchment() | 124 | void AddAtt::addAttatchment() |
118 | { | 125 | { |
119 | QFileInfo info; | 126 | QDialog qd(this,tr("Select attachment"),true); |
120 | QString type; | 127 | |
128 | QGridLayout top(&qd,1,1); | ||
129 | |||
130 | OFileSelector ofs(&qd,1,0,"/root/Documents"); | ||
131 | |||
132 | top.addWidget(&ofs,0,0); | ||
121 | 133 | ||
122 | if (listView->selectedItem() != NULL) { | 134 | qd.showMaximized(); |
123 | item = (FileItem *) listView->selectedItem(); | 135 | |
124 | info = item->getFileInfo(); | 136 | if (qd.exec()==QDialog::Accepted) |
125 | type = item->getFileType(); | 137 | { |
126 | item = new FileItem(attView, info, type); | 138 | DocLnk* dl=new DocLnk(ofs.selectedDocument()); |
139 | FileItem* fi=new FileItem(attView,dl); | ||
140 | fi->setPixmap(0,dl->pixmap()); | ||
141 | fi->setText(1,dl->type()); | ||
142 | attView->insertItem(fi); | ||
143 | modified = TRUE; | ||
127 | } | 144 | } |
128 | modified = TRUE; | ||
129 | } | 145 | } |
130 | 146 | ||
131 | void AddAtt::removeAttatchment() | 147 | void AddAtt::removeAttatchment() |
132 | { | 148 | { |
133 | if (attView->selectedItem() != NULL) { | 149 | if (attView->selectedItem() != NULL) |
150 | { | ||
134 | attView->takeItem(attView->selectedItem()); | 151 | attView->takeItem(attView->selectedItem()); |
135 | } | 152 | } |
136 | modified = TRUE; | 153 | modified = TRUE; |
137 | } | 154 | } |
138 | 155 | ||
139 | void AddAtt::reject() | 156 | void AddAtt::reject() |
@@ -150,15 +167,14 @@ void AddAtt::accept() | |||
150 | hide(); | 167 | hide(); |
151 | } | 168 | } |
152 | 169 | ||
153 | void AddAtt::getFiles() | 170 | void AddAtt::getFiles() |
154 | { | 171 | { |
155 | QString path, selected; | 172 | QString path, selected; |
156 | QDir *dir; | ||
157 | 173 | ||
158 | listView->clear(); | 174 | /*listView->clear(); |
159 | 175 | ||
160 | selected = fileCategoryButton->text(); | 176 | selected = fileCategoryButton->text(); |
161 | if (selected == "Picture") { | 177 | if (selected == "Picture") { |
162 | path = "../pics/"; | 178 | path = "../pics/"; |
163 | } else if (selected == "Document") { | 179 | } else if (selected == "Document") { |
164 | path = "" ; //sub-dirs not decided | 180 | path = "" ; //sub-dirs not decided |
@@ -174,36 +190,41 @@ void AddAtt::getFiles() | |||
174 | dir->setFilter(QDir::Files); | 190 | dir->setFilter(QDir::Files); |
175 | const QFileInfoList *dirInfoList = dir->entryInfoList(); | 191 | const QFileInfoList *dirInfoList = dir->entryInfoList(); |
176 | 192 | ||
177 | QFileInfoListIterator it(*dirInfoList); // create list iterator | 193 | QFileInfoListIterator it(*dirInfoList); // create list iterator |
178 | 194 | ||
179 | while ( (fi=it.current()) ) { // for each file... | 195 | while ( (fi=it.current()) ) { // for each file... |
180 | item = new FileItem(listView, *fi, selected); | 196 | item = new FileItem(lis+ütView, *fi, selected); |
181 | ++it; // goto next list element | 197 | ++it; // goto next list element |
182 | } | 198 | }*/ |
183 | } | 199 | } |
184 | 200 | ||
185 | QStringList AddAtt::returnAttatchedFiles() | 201 | QStringList AddAtt::returnAttatchedFiles() |
186 | { | 202 | { |
187 | QFileInfo info; | 203 | QFileInfo info; |
188 | QStringList list; | 204 | QStringList list; |
189 | 205 | ||
190 | item = (FileItem *) attView->firstChild(); | 206 | item = (FileItem *) attView->firstChild(); |
207 | |||
208 | |||
191 | while (item != NULL) { | 209 | while (item != NULL) { |
192 | info = item->getFileInfo(); | 210 | DocLnk* dl=item->getDocLnk(); |
193 | list += info.filePath(); | 211 | list+=dl->file(); |
212 | /*info = item->getFileInfo(); | ||
213 | list += info.filePath();*/ | ||
194 | item = (FileItem *) item->nextSibling(); | 214 | item = (FileItem *) item->nextSibling(); |
195 | } | 215 | } |
196 | return list; | 216 | return list; |
197 | } | 217 | } |
198 | 218 | ||
199 | QStringList AddAtt::returnFileTypes() | 219 | QStringList AddAtt::returnFileTypes() |
200 | { | 220 | { |
201 | QStringList list; | 221 | QStringList list; |
202 | 222 | ||
203 | item = (FileItem *) attView->firstChild(); | 223 | item = (FileItem *) attView->firstChild(); |
224 | |||
204 | while (item != NULL) { | 225 | while (item != NULL) { |
205 | list += item->getFileType(); | 226 | list += item->getDocLnk()->type(); |
206 | item = (FileItem *) item->nextSibling(); | 227 | item = (FileItem *) item->nextSibling(); |
207 | } | 228 | } |
208 | return list; | 229 | return list; |
209 | } | 230 | } |