summaryrefslogtreecommitdiff
Unidiff
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
@@ -81,7 +81,7 @@ QString OFileDialog::getOpenFileName(int selector,
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();
@@ -97,7 +97,7 @@ QString OFileDialog::getSaveFileName(int selector,
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();
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,4 +1,7 @@
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"
@@ -15,7 +18,7 @@ OFileListView::~OFileListView() {
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() );
@@ -33,8 +36,8 @@ void OFileListView::addFile( const QString& mime,
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 }
@@ -48,15 +51,15 @@ void 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
@@ -78,17 +81,17 @@ void OFileListView::addDir( const QString& mime,
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& ) {
@@ -105,13 +108,17 @@ QString OFileListView::selectedName()const{
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();
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
@@ -246,7 +246,7 @@ bool OFileSelector::cd(const QString &path )
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");
@@ -261,7 +261,7 @@ QString text;
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;
@@ -274,9 +274,9 @@ QString 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{
@@ -304,9 +304,9 @@ QString OFileSelector::selectedPath()const
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
@@ -333,7 +333,7 @@ int OFileSelector::fileCount()
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;
@@ -349,7 +349,7 @@ DocLnk OFileSelector::selectedDocument() const
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;
@@ -372,6 +372,7 @@ void 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" ) ){
@@ -404,7 +405,7 @@ void OFileSelector::slotViewCheck(const QString &sel)
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;
@@ -631,7 +632,7 @@ void OFileSelector::initVars()
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;
@@ -642,7 +643,7 @@ void OFileSelector::addFile(const QString &mime, QFileInfo *info, bool symlink)
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;
@@ -925,7 +926,6 @@ bool OFileSelector::compliesMime( const QString& mime ) {
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 ) {
@@ -949,8 +949,9 @@ void 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 ) {
@@ -968,10 +969,12 @@ void OFileSelector::slotCurrentChanged(QListViewItem* item )
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
@@ -981,7 +984,7 @@ void OFileSelector::slotClicked( int button, QListViewItem *item, const QPoint &
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() ){
@@ -1001,7 +1004,7 @@ void OFileSelector::slotClicked( int button, QListViewItem *item, const QPoint &
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{
@@ -1012,20 +1015,23 @@ void OFileSelector::slotRightButton(int button, QListViewItem *item, const QPoin
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) );
@@ -1034,6 +1040,7 @@ void OFileSelector::slotOpen()
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{
@@ -1045,6 +1052,7 @@ void OFileSelector::slotRename()
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() ){
@@ -1060,6 +1068,7 @@ void OFileSelector::slotDelete()
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{
@@ -1210,6 +1219,9 @@ void OFileSelector::reparse()
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 )
@@ -1244,3 +1256,7 @@ void OFileSelector::internChangedDir( const QString& s) {
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
@@ -336,8 +336,10 @@ class OFileSelector : public QWidget {
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 & );
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
@@ -26,3 +26,6 @@ void OFileView::changedDir( const QString& s) {
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
@@ -90,7 +90,7 @@ protected:
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;