summaryrefslogtreecommitdiff
authorzecke <zecke>2002-09-15 20:00:57 (UTC)
committer zecke <zecke>2002-09-15 20:00:57 (UTC)
commitf79126f5ba0b1d1520e5fb07716ffe9e2479aedf (patch) (unidiff)
tree6e44ff18246728b0861cc7ce974a0a0fae3c6796
parent1c5780f34ec9b4dc004714488b46997fe1a0909b (diff)
downloadopie-f79126f5ba0b1d1520e5fb07716ffe9e2479aedf.zip
opie-f79126f5ba0b1d1520e5fb07716ffe9e2479aedf.tar.gz
opie-f79126f5ba0b1d1520e5fb07716ffe9e2479aedf.tar.bz2
Make it compile but it's not working yet
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--libopie/ofileselector/ofiledialog.cpp4
-rw-r--r--libopie/ofileselector/ofilelistview.cpp43
-rw-r--r--libopie/ofileselector/ofileselector.cpp56
-rw-r--r--libopie/ofileselector/ofileselector.h2
-rw-r--r--libopie/ofileselector/ofileview.cpp3
-rw-r--r--libopie/ofileselector/ofileview.h2
6 files changed, 69 insertions, 41 deletions
diff --git a/libopie/ofileselector/ofiledialog.cpp b/libopie/ofileselector/ofiledialog.cpp
index 4783004..430def2 100644
--- a/libopie/ofileselector/ofiledialog.cpp
+++ b/libopie/ofileselector/ofiledialog.cpp
@@ -78,13 +78,13 @@ QString OFileDialog::getOpenFileName(int selector,
78 const MimeTypes &mimes, 78 const MimeTypes &mimes,
79 QWidget *wid, 79 QWidget *wid,
80 const QString &caption ) 80 const QString &caption )
81{ 81{
82 QString ret; 82 QString ret;
83 OFileDialog dlg( caption.isEmpty() ? tr("Open") : caption, 83 OFileDialog dlg( caption.isEmpty() ? tr("Open") : caption,
84 wid, OFileSelector::OPEN, selector, startDir, file, mimes); 84 wid, OFileSelector::Open, selector, startDir, file, mimes);
85 dlg.showMaximized(); 85 dlg.showMaximized();
86 if( dlg.exec() ) 86 if( dlg.exec() )
87 ret = dlg.fileName(); 87 ret = dlg.fileName();
88 88
89 return ret; 89 return ret;
90} 90}
@@ -94,13 +94,13 @@ QString OFileDialog::getSaveFileName(int selector,
94 const MimeTypes &mimes, 94 const MimeTypes &mimes,
95 QWidget *wid, 95 QWidget *wid,
96 const QString &caption ) 96 const QString &caption )
97{ 97{
98 QString ret; 98 QString ret;
99 OFileDialog dlg( caption.isEmpty() ? tr("Save") : caption, 99 OFileDialog dlg( caption.isEmpty() ? tr("Save") : caption,
100 wid, OFileSelector::SAVE, selector, startDir, file, mimes); 100 wid, OFileSelector::Save, selector, startDir, file, mimes);
101 dlg.showMaximized(); 101 dlg.showMaximized();
102 if( dlg.exec() ) 102 if( dlg.exec() )
103 ret = dlg.fileName(); 103 ret = dlg.fileName();
104 104
105 return ret; 105 return ret;
106} 106}
diff --git a/libopie/ofileselector/ofilelistview.cpp b/libopie/ofileselector/ofilelistview.cpp
index 0c7d45b..7108a5b 100644
--- a/libopie/ofileselector/ofilelistview.cpp
+++ b/libopie/ofileselector/ofilelistview.cpp
@@ -1,7 +1,10 @@
1 1
2#include <qpe/mimetype.h>
3#include <qpe/resource.h>
4
2#include "ofileselector.h" 5#include "ofileselector.h"
3#include "ofileselectoritem.h" 6#include "ofileselectoritem.h"
4#include "ofilelistview.h" 7#include "ofilelistview.h"
5 8
6 9
7OFileListView::OFileListView( QWidget* parent, OFileSelector* sel) 10OFileListView::OFileListView( QWidget* parent, OFileSelector* sel)
@@ -12,13 +15,13 @@ OFileListView::OFileListView( QWidget* parent, OFileSelector* sel)
12OFileListView::~OFileListView() { 15OFileListView::~OFileListView() {
13 16
14} 17}
15void OFileListView::clear() { 18void OFileListView::clear() {
16 QListView::clear(); 19 QListView::clear();
17} 20}
18void OFileListView::addFile( const QString& mime, 21void OFileListView::addFile( const QString&,
19 QFileInfo* info, 22 QFileInfo* info,
20 bool isSymlink ) { 23 bool isSymlink ) {
21 MimeType type( info->absFilePath() ); 24 MimeType type( info->absFilePath() );
22 QPixmap pix = type.pixmap(); 25 QPixmap pix = type.pixmap();
23 QString dir; 26 QString dir;
24 QString name; 27 QString name;
@@ -30,14 +33,14 @@ void OFileListView::addFile( const QString& mime,
30 dir = info->dirPath( true ); 33 dir = info->dirPath( true );
31 34
32 if( isSymlink ) 35 if( isSymlink )
33 name = info->fileName() + " -> " +info->dirPath() + "/" + info->readLink(); 36 name = info->fileName() + " -> " +info->dirPath() + "/" + info->readLink();
34 else { 37 else {
35 name = info->fileName(); 38 name = info->fileName();
36 if( ( selector()->mode() == Open && !info->isReadable() )|| 39 if( ( selector()->mode() == OFileSelector::Open && !info->isReadable() ) ||
37 ( selector()->mode() == Save && !info->isWritable() ) ){ 40 ( selector()->mode() == OFileSelector::Save && !info->isWritable() ) ){
38 41
39 locked = true; pix = Resource::loadPixmap("locked"); 42 locked = true; pix = Resource::loadPixmap("locked");
40 } 43 }
41 } 44 }
42 new OFileSelectorItem( this, pix, name, 45 new OFileSelectorItem( this, pix, name,
43 info->lastModified().toString(), 46 info->lastModified().toString(),
@@ -45,21 +48,21 @@ void OFileListView::addFile( const QString& mime,
45 dir, locked ); 48 dir, locked );
46} 49}
47void OFileListView::addFile( const QString& /*mime*/, const QString& /*dir*/, 50void OFileListView::addFile( const QString& /*mime*/, const QString& /*dir*/,
48 const QString& /*file*/, bool /*isSyml*/ ) { 51 const QString& /*file*/, bool /*isSyml*/ ) {
49 52
50} 53}
51void OFileListView::addDir( const QString& mime, 54void OFileListView::addDir( const QString&,
52 QFileInfo* info, bool isSym ) { 55 QFileInfo* info, bool symlink ) {
53 56
54 bool locked = false; 57 bool locked = false;
55 QString name; 58 QString name;
56 QPixmap pix; 59 QPixmap pix;
57 60
58 if( ( selector()->mode() == Open && !info->isReadable() ) || 61 if( ( selector()->mode() == OFileSelector::Open && !info->isReadable() ) ||
59 ( selector()->mode() == Save && !info->isWritable() ) ){ 62 ( selector()->mode() == OFileSelector::Save && !info->isWritable() ) ){
60 63
61 locked = true; 64 locked = true;
62 65
63 if( symlink ) 66 if( symlink )
64 pix = selector()->pixmap("symlinkedlocked"); 67 pix = selector()->pixmap("symlinkedlocked");
65 else 68 else
@@ -75,23 +78,23 @@ void OFileListView::addDir( const QString& mime,
75 info->lastModified().toString(), 78 info->lastModified().toString(),
76 QString::number( info->size() ), 79 QString::number( info->size() ),
77 info->dirPath( true ), locked, 80 info->dirPath( true ), locked,
78 true ); 81 true );
79 82
80} 83}
81void OFileListView::addDir( const QString& mime, const QString& dir, 84void OFileListView::addDir( const QString& /*mime*/, const QString& /*dir*/,
82 const QString& file, bool ) { 85 const QString& /*file*/, bool ) {
83 86
84} 87}
85void OFileListView::addSymlink( const QString& mime, 88void OFileListView::addSymlink( const QString& /*mime*/,
86 QFileInfo* info, 89 QFileInfo* /*info*/,
87 bool isSym ) { 90 bool /*isSym*/ ) {
88 91
89} 92}
90void OFileListView::addSymlink( const QString& mime, const QString& path, 93void OFileListView::addSymlink( const QString& /*mime*/, const QString& /*path*/,
91 const QString& file, bool isSym ) { 94 const QString& /*file*/, bool /*isSym*/ ) {
92 95
93} 96}
94void OFileListView::cd( const QString& ) { 97void OFileListView::cd( const QString& ) {
95 98
96} 99}
97QWidget* OFileListView::widget() { 100QWidget* OFileListView::widget() {
@@ -102,17 +105,21 @@ QString OFileListView::selectedName()const{
102 if (!item ) 105 if (!item )
103 return QString::null; 106 return QString::null;
104 107
105 return item->text( 1 ); 108 return item->text( 1 );
106} 109}
107QStringList OFileListView::selectedNames()const { 110QStringList OFileListView::selectedNames()const {
108 111 QStringList list;
112 list << selectedName();
113 return list;
109} 114}
110QString OFileListView::selectedPath()const { 115QString OFileListView::selectedPath()const {
111 116 return QString::null;
112} 117}
113QString OFileListView::selectedPaths()const { 118QStringList OFileListView::selectedPaths()const {
114 119 QStringList list;
120 list << selectedPath();
121 return list;
115} 122}
116int OFileListView::fileCount() { 123int OFileListView::fileCount() {
117 return childCount(); 124 return childCount();
118} 125}
diff --git a/libopie/ofileselector/ofileselector.cpp b/libopie/ofileselector/ofileselector.cpp
index f655606..16ee3ee 100644
--- a/libopie/ofileselector/ofileselector.cpp
+++ b/libopie/ofileselector/ofileselector.cpp
@@ -243,13 +243,13 @@ bool OFileSelector::cd(const QString &path )
243 m_currentDir = path; 243 m_currentDir = path;
244 reparse(); 244 reparse();
245 return true; 245 return true;
246} 246}
247void OFileSelector::setSelector(int mode ) 247void OFileSelector::setSelector(int mode )
248{ 248{
249QString text; 249 QString text;
250 switch( mode ){ 250 switch( mode ){
251 case Normal: 251 case Normal:
252 text = tr("Documents"); 252 text = tr("Documents");
253 break; 253 break;
254 case Extended: 254 case Extended:
255 text = tr("Files"); 255 text = tr("Files");
@@ -258,28 +258,28 @@ QString text;
258 text = tr("All Files"); 258 text = tr("All Files");
259 break; 259 break;
260 } 260 }
261 slotViewCheck( text ); 261 slotViewCheck( text );
262} 262}
263 263
264void OFileSelector::setPopupFactory(OPopupMenuFactory *popup ) 264void OFileSelector::setPopupFactory(OPopupMenuFactory */*popup*/ )
265{ 265{
266/* m_custom = popup; 266/* m_custom = popup;
267 m_showPopup = true; 267 m_showPopup = true;
268*/ 268*/
269} 269}
270 270
271//void OFileSelector::updateL 271//void OFileSelector::updateL
272 272
273QString OFileSelector::selectedName() const 273QString OFileSelector::selectedName() const
274{ 274{
275 QString name; 275 QString name;
276 if( m_selector == Normal ){ 276 if( m_selector == Normal ){
277 DocLnk lnk = m_select->selectedDocument(); 277 DocLnk lnk = m_select->selectedDocument();
278 name = lnk.file(); 278 name = lnk.file();
279 }else if( m_selector == Extended || m_selector == ExtendedAll ){ 279 }else {
280 if ( m_shLne ) { 280 if ( m_shLne ) {
281 name = m_currentDir + "/" +m_edit->text(); 281 name = m_currentDir + "/" +m_edit->text();
282 }else{ 282 }else{
283 name = m_currentDir + "/" + currentView()->selectedName(); 283 name = m_currentDir + "/" + currentView()->selectedName();
284 } 284 }
285 } 285 }
@@ -301,15 +301,15 @@ QStringList OFileSelector::selectedNames()const
301 */ 301 */
302QString OFileSelector::selectedPath()const 302QString OFileSelector::selectedPath()const
303{ 303{
304 QString path; 304 QString path;
305 if( m_selector == Normal ){ 305 if( m_selector == Normal ){
306 path = QPEApplication::documentDir(); 306 path = QPEApplication::documentDir();
307 }else if( m_selector == Extended || m_selector == ExtendedAll ){ 307 } /*else if( m_selector == Extended || m_selector == ExtendedAll ){
308 ; //FIXME 308 ;
309 } 309 }*/
310 return path; 310 return path;
311} 311}
312QStringList OFileSelector::selectedPaths() const 312QStringList OFileSelector::selectedPaths() const
313{ 313{
314 QStringList list; 314 QStringList list;
315 list << selectedPath(); 315 list << selectedPath();
@@ -330,13 +330,13 @@ int OFileSelector::fileCount()
330 case Normal: 330 case Normal:
331 count = m_select->fileCount(); 331 count = m_select->fileCount();
332 break; 332 break;
333 case Extended: 333 case Extended:
334 case ExtendedAll: 334 case ExtendedAll:
335 default: 335 default:
336 count = currentView()->childCount(); 336 count = currentView()->fileCount();
337 break; 337 break;
338 } 338 }
339 return count; 339 return count;
340} 340}
341DocLnk OFileSelector::selectedDocument() const 341DocLnk OFileSelector::selectedDocument() const
342{ 342{
@@ -346,13 +346,13 @@ DocLnk OFileSelector::selectedDocument() const
346 lnk = m_select->selectedDocument(); 346 lnk = m_select->selectedDocument();
347 break; 347 break;
348 } 348 }
349 case Extended: 349 case Extended:
350 case ExtendedAll: 350 case ExtendedAll:
351 default: 351 default:
352 lnk = DocLnk( selectedName() ); // new DocLnk 352 lnk = DocLnk( selectedName() );
353 break; 353 break;
354 } 354 }
355 return lnk; 355 return lnk;
356} 356}
357QValueList<DocLnk> OFileSelector::selectedDocuments() const 357QValueList<DocLnk> OFileSelector::selectedDocuments() const
358{ 358{
@@ -369,12 +369,13 @@ void OFileSelector::slotOk()
369 emit ok(); 369 emit ok();
370} 370}
371void OFileSelector::slotCancel() 371void OFileSelector::slotCancel()
372{ 372{
373 emit cancel(); 373 emit cancel();
374} 374}
375/* switch the views */
375void OFileSelector::slotViewCheck(const QString &sel) 376void OFileSelector::slotViewCheck(const QString &sel)
376{ 377{
377 if( sel == tr("Documents" ) ){ 378 if( sel == tr("Documents" ) ){
378 if( m_select == 0 ){ 379 if( m_select == 0 ){
379 // autMime? fix cause now we use All and not the current 380 // autMime? fix cause now we use All and not the current
380 // yes currentMime fixes that for us 381 // yes currentMime fixes that for us
@@ -401,13 +402,13 @@ void OFileSelector::slotViewCheck(const QString &sel)
401 m_selector = ExtendedAll; 402 m_selector = ExtendedAll;
402 initializeListView(); 403 initializeListView();
403 reparse(); 404 reparse();
404 m_stack->raiseWidget( Extended ); // same widget other QFileFilter 405 m_stack->raiseWidget( Extended ); // same widget other QFileFilter
405 } 406 }
406} 407}
407// not yet finished..... 408
408QString OFileSelector::currentMimeType() const{ 409QString OFileSelector::currentMimeType() const{
409 QString mime; 410 QString mime;
410 QString currentText; 411 QString currentText;
411 if (m_shChooser ) 412 if (m_shChooser )
412 currentText = m_mimeCheck->currentText(); 413 currentText = m_mimeCheck->currentText();
413 414
@@ -628,24 +629,24 @@ void OFileSelector::initVars()
628 m_custom = 0; 629 m_custom = 0;
629 m_edit = 0; 630 m_edit = 0;
630 m_fnLabel = 0; 631 m_fnLabel = 0;
631 m_new = 0; 632 m_new = 0;
632 m_close = 0; 633 m_close = 0;
633} 634}
634void OFileSelector::addFile(const QString &mime, QFileInfo *info, bool symlink) 635void OFileSelector::addFile(const QString &, QFileInfo *info, bool )
635{ 636{
636 if(!m_files) 637 if(!m_files)
637 return; 638 return;
638 // if( !compliesMime(info->absFilePath(), mime ) ) 639 // if( !compliesMime(info->absFilePath(), mime ) )
639 // return; 640 // return;
640 MimeType type( info->absFilePath() ); 641 MimeType type( info->absFilePath() );
641 if (!compliesMime( type.id() ) ) 642 if (!compliesMime( type.id() ) )
642 return; 643 return;
643 644
644} 645}
645void OFileSelector::addDir(const QString &mime, QFileInfo *info, bool symlink ) 646void OFileSelector::addDir(const QString &, QFileInfo *, bool )
646{ 647{
647 if(!m_dir) 648 if(!m_dir)
648 return; 649 return;
649} 650}
650void OFileSelector::delItems() 651void OFileSelector::delItems()
651{ 652{
@@ -922,13 +923,12 @@ bool OFileSelector::compliesMime( const QString& mime ) {
922 923
923 924
924 if ( list.contains(mime) ) return true; 925 if ( list.contains(mime) ) return true;
925 qWarning("list doesn't contain it "); 926 qWarning("list doesn't contain it ");
926 QStringList::Iterator it2; 927 QStringList::Iterator it2;
927 int pos; 928 int pos;
928 int pos2;
929 for ( it2 = list.begin(); it2 != list.end(); ++it2 ) { 929 for ( it2 = list.begin(); it2 != list.end(); ++it2 ) {
930 pos = (*it2).findRev("/*"); 930 pos = (*it2).findRev("/*");
931 if ( pos >= 0 ) { 931 if ( pos >= 0 ) {
932 if ( mime.contains( (*it2).left(pos) ) ) return true; 932 if ( mime.contains( (*it2).left(pos) ) ) return true;
933 } 933 }
934 } 934 }
@@ -946,14 +946,15 @@ void OFileSelector::slotFileBridgeSelected( const DocLnk &lnk )
946 // emit fileSelected( lnk ); 946 // emit fileSelected( lnk );
947} 947}
948void OFileSelector::slotSelectionChanged() 948void OFileSelector::slotSelectionChanged()
949{ 949{
950 950
951} 951}
952void OFileSelector::slotCurrentChanged(QListViewItem* item ) 952void OFileSelector::slotCurrentChanged(QListViewItem* /*item*/ )
953{ 953{
954 /*
954 if( item == 0 ) 955 if( item == 0 )
955 return; 956 return;
956 if( m_selector == Extended || m_selector == ExtendedAll ) { 957 if( m_selector == Extended || m_selector == ExtendedAll ) {
957 OFileSelectorItem *sel = (OFileSelectorItem*) item; // start to use the C++ casts ;) 958 OFileSelectorItem *sel = (OFileSelectorItem*) item; // start to use the C++ casts ;)
958 qWarning("current changed"); 959 qWarning("current changed");
959 if(!sel->isDir() ){ 960 if(!sel->isDir() ){
@@ -965,26 +966,28 @@ void OFileSelector::slotCurrentChanged(QListViewItem* item )
965 QString path =sel->directory() + "/" + str[0].stripWhiteSpace(); 966 QString path =sel->directory() + "/" + str[0].stripWhiteSpace();
966 emit fileSelected(path ); 967 emit fileSelected(path );
967 DocLnk lnk( path ); 968 DocLnk lnk( path );
968 emit fileSelected(lnk ); 969 emit fileSelected(lnk );
969 } 970 }
970 } 971 }
971 } 972 } */
972} 973}
973void OFileSelector::slotClicked( int button, QListViewItem *item, const QPoint &, int) 974void OFileSelector::slotClicked( int /*button*/, QListViewItem */*item*/, const QPoint &, int)
975
974{ 976{
977 /*
975 if ( item == 0 ) 978 if ( item == 0 )
976 return; 979 return;
977 980
978 if( button != Qt::LeftButton ) 981 if( button != Qt::LeftButton )
979 return; 982 return;
980 983
981 switch( m_selector ){ 984 switch( m_selector ){
982 default: 985 default:
983 break; 986 break;
984 case Extended: // fall through 987 case Extended: // fall through
985 case ExtendedAll:{ 988 case ExtendedAll:{
986 OFileSelectorItem *sel = (OFileSelectorItem*)item; 989 OFileSelectorItem *sel = (OFileSelectorItem*)item;
987 if(!sel->isLocked() ){ 990 if(!sel->isLocked() ){
988 QStringList str = QStringList::split("->", sel->text(1) ); 991 QStringList str = QStringList::split("->", sel->text(1) );
989 if( sel->isDir() ){ 992 if( sel->isDir() ){
990 cd( sel->directory() + "/" + str[0].stripWhiteSpace() ); 993 cd( sel->directory() + "/" + str[0].stripWhiteSpace() );
@@ -998,56 +1001,61 @@ void OFileSelector::slotClicked( int button, QListViewItem *item, const QPoint &
998 qWarning("file selected"); 1001 qWarning("file selected");
999 emit fileSelected( lnk ); 1002 emit fileSelected( lnk );
1000 } 1003 }
1001 } 1004 }
1002 break; 1005 break;
1003 } 1006 }
1004 } 1007 } */
1005} 1008}
1006void OFileSelector::slotRightButton(int button, QListViewItem *item, const QPoint &, int ) 1009void OFileSelector::slotRightButton(int button, QListViewItem *item, const QPoint &, int )
1007{ 1010{
1008 if( item == 0 ) 1011 if( item == 0 )
1009 return; 1012 return;
1010 1013
1011 if( button != Qt::RightButton ) 1014 if( button != Qt::RightButton )
1012 return; 1015 return;
1013 slotContextMenu( item ); 1016 slotContextMenu( item );
1014} 1017}
1015void OFileSelector::slotContextMenu( QListViewItem *item) 1018void OFileSelector::slotContextMenu( QListViewItem */*item*/)
1016{ 1019{
1017 1020
1018} 1021}
1019void OFileSelector::slotChangedDir() 1022void OFileSelector::slotChangedDir()
1020{ 1023{
1024 /*
1021 OFileSelectorItem *sel = (OFileSelectorItem*)m_View->currentItem(); 1025 OFileSelectorItem *sel = (OFileSelectorItem*)m_View->currentItem();
1022 if(sel->isDir() ){ 1026 if(sel->isDir() ){
1023 QStringList str = QStringList::split("->", sel->text(1) ); 1027 QStringList str = QStringList::split("->", sel->text(1) );
1024 cd( sel->directory() + "/" + str[0].stripWhiteSpace() ); 1028 cd( sel->directory() + "/" + str[0].stripWhiteSpace() );
1025 } 1029 }
1030 */
1026} 1031}
1027void OFileSelector::slotOpen() 1032void OFileSelector::slotOpen()
1028{ 1033{
1034 /*
1029 OFileSelectorItem *sel = (OFileSelectorItem*)m_View->currentItem(); 1035 OFileSelectorItem *sel = (OFileSelectorItem*)m_View->currentItem();
1030 if(!sel->isDir() ){ 1036 if(!sel->isDir() ){
1031 QStringList str = QStringList::split("->", sel->text(1) ); 1037 QStringList str = QStringList::split("->", sel->text(1) );
1032 slotFileSelected( sel->directory() +"/" +str[0].stripWhiteSpace() ); 1038 slotFileSelected( sel->directory() +"/" +str[0].stripWhiteSpace() );
1033 qWarning("slot open"); 1039 qWarning("slot open");
1034 // DocLnk lnk( sel->directory() + "/" + str[0].stripWhiteSpace() ); 1040 // DocLnk lnk( sel->directory() + "/" + str[0].stripWhiteSpace() );
1035 //emit fileSelected( lnk ); 1041 //emit fileSelected( lnk );
1036 } 1042 }
1043 */
1037} 1044}
1038void OFileSelector::slotRescan() 1045void OFileSelector::slotRescan()
1039{ 1046{
1040 1047
1041} 1048}
1042void OFileSelector::slotRename() 1049void OFileSelector::slotRename()
1043{ 1050{
1044 reparse(); 1051 reparse();
1045} 1052}
1046void OFileSelector::slotDelete() 1053void OFileSelector::slotDelete()
1047{ 1054{
1055 /*
1048 OFileSelectorItem *sel = (OFileSelectorItem*)m_View->currentItem(); 1056 OFileSelectorItem *sel = (OFileSelectorItem*)m_View->currentItem();
1049 QStringList list = QStringList::split("->", sel->text(1) ); 1057 QStringList list = QStringList::split("->", sel->text(1) );
1050 if( sel->isDir() ){ 1058 if( sel->isDir() ){
1051 QString str = QString::fromLatin1("rm -rf ") + sel->directory() +"/" + list[0]; //better safe than sorry 1059 QString str = QString::fromLatin1("rm -rf ") + sel->directory() +"/" + list[0]; //better safe than sorry
1052 switch ( QMessageBox::warning(this,tr("Delete"),tr("Do you really want to delete\n")+list[0], 1060 switch ( QMessageBox::warning(this,tr("Delete"),tr("Do you really want to delete\n")+list[0],
1053 tr("Yes"),tr("No"),0,1,1) ) { 1061 tr("Yes"),tr("No"),0,1,1) ) {
@@ -1057,12 +1065,13 @@ void OFileSelector::slotDelete()
1057 } 1065 }
1058 } else { 1066 } else {
1059 QFile::remove( list[0] ); 1067 QFile::remove( list[0] );
1060 } 1068 }
1061 m_View->takeItem( sel ); 1069 m_View->takeItem( sel );
1062 delete sel; 1070 delete sel;
1071 */
1063} 1072}
1064void OFileSelector::cdUP() 1073void OFileSelector::cdUP()
1065{ 1074{
1066 QDir dir( m_currentDir ); 1075 QDir dir( m_currentDir );
1067 dir.cdUp(); 1076 dir.cdUp();
1068 if(dir.exists() ){ 1077 if(dir.exists() ){
@@ -1207,12 +1216,15 @@ void OFileSelector::reparse()
1207} 1216}
1208 1217
1209 1218
1210OFileView* OFileSelector::currentView() { 1219OFileView* OFileSelector::currentView() {
1211 return 0l; 1220 return 0l;
1212} 1221}
1222OFileView* OFileSelector::currentView() const{
1223 return 0l;
1224}
1213int OFileSelector::filter() { 1225int OFileSelector::filter() {
1214 int filter; 1226 int filter;
1215 if ( m_selector == ExtendedAll ) 1227 if ( m_selector == ExtendedAll )
1216 filter = QDir::Files | QDir::Dirs | QDir::Hidden | QDir::All; 1228 filter = QDir::Files | QDir::Dirs | QDir::Hidden | QDir::All;
1217 else 1229 else
1218 filter = QDir::Files | QDir::Dirs | QDir::All ; 1230 filter = QDir::Files | QDir::Dirs | QDir::All ;
@@ -1241,6 +1253,10 @@ void OFileSelector::internContextMenu() {
1241void OFileSelector::internChangedDir( const QString& s) { 1253void OFileSelector::internChangedDir( const QString& s) {
1242 emit dirSelected( s ); 1254 emit dirSelected( s );
1243} 1255}
1244void OFileSelector::internChangedDir( const QDir& s) { 1256void OFileSelector::internChangedDir( const QDir& s) {
1245 emit dirSelected( s ); 1257 emit dirSelected( s );
1246} 1258}
1259QPixmap OFileSelector::pixmap( const QString& s ) {
1260
1261 return (*m_pixmaps)[s];
1262}
diff --git a/libopie/ofileselector/ofileselector.h b/libopie/ofileselector/ofileselector.h
index 937569d..12af732 100644
--- a/libopie/ofileselector/ofileselector.h
+++ b/libopie/ofileselector/ofileselector.h
@@ -333,14 +333,16 @@ class OFileSelector : public QWidget {
333 333
334 DocLnk selectedDocument()const; 334 DocLnk selectedDocument()const;
335 335
336 QValueList<DocLnk> selectedDocuments()const; 336 QValueList<DocLnk> selectedDocuments()const;
337 337
338 OFileView* currentView(); 338 OFileView* currentView();
339 OFileView* currentView()const;
339 int filter(); 340 int filter();
340 int sorting(); 341 int sorting();
342 QPixmap pixmap( const QString& );
341 343
342 signals: 344 signals:
343 void fileSelected( const DocLnk & ); 345 void fileSelected( const DocLnk & );
344 void fileSelected( const QString & ); 346 void fileSelected( const QString & );
345 void dirSelected(const QString &dir ); 347 void dirSelected(const QString &dir );
346 void dirSelected( const QDir& ); 348 void dirSelected( const QDir& );
diff --git a/libopie/ofileselector/ofileview.cpp b/libopie/ofileselector/ofileview.cpp
index 71843c1..9bb40c9 100644
--- a/libopie/ofileselector/ofileview.cpp
+++ b/libopie/ofileselector/ofileview.cpp
@@ -23,6 +23,9 @@ void OFileView::contextMenu() {
23void OFileView::changedDir( const QString& s) { 23void OFileView::changedDir( const QString& s) {
24 m_sel->internChangedDir( s ); 24 m_sel->internChangedDir( s );
25} 25}
26void OFileView::changedDir( const QDir& d ) { 26void OFileView::changedDir( const QDir& d ) {
27 m_sel->internChangedDir( d ); 27 m_sel->internChangedDir( d );
28} 28}
29OFileSelector* OFileView::selector() const {
30 return m_sel;
31}
diff --git a/libopie/ofileselector/ofileview.h b/libopie/ofileselector/ofileview.h
index 997266a..1b397f5 100644
--- a/libopie/ofileselector/ofileview.h
+++ b/libopie/ofileselector/ofileview.h
@@ -87,13 +87,13 @@ protected:
87 87
88 void fileSelected(const QString &); 88 void fileSelected(const QString &);
89 void fileSelected(const DocLnk & ); 89 void fileSelected(const DocLnk & );
90 void contextMenu(); 90 void contextMenu();
91 void changedDir(const QString &); 91 void changedDir(const QString &);
92 void changedDir(const QDir & ); 92 void changedDir(const QDir & );
93 OFileSelector* selector(); 93 OFileSelector* selector()const;
94 94
95private: 95private:
96 OFileSelector* m_sel; 96 OFileSelector* m_sel;
97}; 97};
98 98
99class OFileViewFactory { 99class OFileViewFactory {