summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/unsupported/filebrowser/filebrowser.cpp39
-rw-r--r--noncore/unsupported/filebrowser/filebrowser.h6
2 files changed, 39 insertions, 6 deletions
diff --git a/noncore/unsupported/filebrowser/filebrowser.cpp b/noncore/unsupported/filebrowser/filebrowser.cpp
index 41e7634..d9aabfd 100644
--- a/noncore/unsupported/filebrowser/filebrowser.cpp
+++ b/noncore/unsupported/filebrowser/filebrowser.cpp
@@ -176,6 +176,8 @@ FileView::FileView( const QString & dir, QWidget * parent,
176 addColumn( "Size" ); 176 addColumn( "Size" );
177 addColumn( "Type" ); 177 addColumn( "Type" );
178 178
179 showingHidden=FALSE;
180
179 setMultiSelection( TRUE ); 181 setMultiSelection( TRUE );
180 header()->hide(); 182 header()->hide();
181 183
@@ -206,6 +208,9 @@ void FileView::resizeEvent( QResizeEvent *e )
206 208
207void FileView::updateDir() 209void FileView::updateDir()
208{ 210{
211 setCaption( "Boogie on boogieboy");
212 //qDebug("Caption should be "+currentDir);
213
209 generateDir( currentDir ); 214 generateDir( currentDir );
210} 215}
211 216
@@ -228,9 +233,13 @@ void FileView::generateDir( const QString & dir )
228 233
229 currentDir = d.canonicalPath(); 234 currentDir = d.canonicalPath();
230 235
236 if( !showingHidden)
231 d.setFilter( QDir::Dirs | QDir::Files ); 237 d.setFilter( QDir::Dirs | QDir::Files );
232 d.setSorting( QDir::Name | QDir::DirsFirst | QDir::IgnoreCase | 238 else
233 QDir::Reversed ); 239 d.setFilter( QDir::Dirs | QDir::Files |QDir::Hidden | QDir::All);
240
241 d.setSorting( QDir::Name | QDir::DirsFirst | QDir::IgnoreCase | QDir::Reversed );
242
234 243
235 const QFileInfoList * list = d.entryInfoList(); 244 const QFileInfoList * list = d.entryInfoList();
236 QFileInfoListIterator it( *list ); 245 QFileInfoListIterator it( *list );
@@ -238,14 +247,13 @@ void FileView::generateDir( const QString & dir )
238 247
239 clear(); 248 clear();
240 while( (fi = it.current()) ){ 249 while( (fi = it.current()) ){
241 if( (fi->fileName() == ".") || (fi->fileName() == "..") ){ 250 if( (fi->fileName() == ".") || (fi->fileName() == "..") ){
242 ++it; 251 ++it;
243 continue; 252 continue;
244 } 253 }
245 (void) new FileItem( (QListView *) this, *fi ); 254 (void) new FileItem( (QListView *) this, *fi );
246 ++it; 255 ++it;
247 } 256 }
248
249 emit dirChanged(); 257 emit dirChanged();
250} 258}
251 259
@@ -655,11 +663,12 @@ void FileView::showFileMenu()
655 m->insertItem( Resource::loadPixmap("cut"), 663 m->insertItem( Resource::loadPixmap("cut"),
656 tr( "Cut" ), this, SLOT( cut() ) ); 664 tr( "Cut" ), this, SLOT( cut() ) );
657 m->insertItem( Resource::loadPixmap("copy"), 665 m->insertItem( Resource::loadPixmap("copy"),
666
658 tr( "Copy" ), this, SLOT( copy() ) ); 667 tr( "Copy" ), this, SLOT( copy() ) );
659 m->insertItem( Resource::loadPixmap("paste"), 668 m->insertItem( Resource::loadPixmap("paste"),
660 tr( "Paste" ), this, SLOT( paste() ) ); 669 tr( "Paste" ), this, SLOT( paste() ) );
661 m->insertItem( tr( "Change Permissions" ), this, SLOT( chPerm() ) ); 670 m->insertItem( tr( "Change Permissions" ), this, SLOT( chPerm() ) );
662 m->insertItem( tr( "Delete" ), this, SLOT( del() ) ); 671 m->insertItem(Resource::loadPixmap( "close" ), tr( "Delete" ), this, SLOT( del() ) );
663 m->insertSeparator(); 672 m->insertSeparator();
664 m->insertItem( tr( "Select all" ), this, SLOT( selectAll() ) ); 673 m->insertItem( tr( "Select all" ), this, SLOT( selectAll() ) );
665 m->insertItem( tr( "Deselect all" ), this, SLOT( deselectAll() ) ); 674 m->insertItem( tr( "Deselect all" ), this, SLOT( deselectAll() ) );
@@ -711,6 +720,10 @@ void FileBrowser::init(const QString & dir)
711 sortMenu->insertItem( tr( "by Type "), this, SLOT( sortType() ) ); 720 sortMenu->insertItem( tr( "by Type "), this, SLOT( sortType() ) );
712 sortMenu->insertSeparator(); 721 sortMenu->insertSeparator();
713 sortMenu->insertItem( tr( "Ascending" ), this, SLOT( updateSorting() ) ); 722 sortMenu->insertItem( tr( "Ascending" ), this, SLOT( updateSorting() ) );
723 sortMenu->insertSeparator();
724 sortMenu->insertItem( tr( "Show Hidden "), this, SLOT( showHidden() ) );
725 fileView->showingHidden=FALSE;
726
714 sortMenu->setItemChecked( sortMenu->idAt( 5 ), TRUE ); 727 sortMenu->setItemChecked( sortMenu->idAt( 5 ), TRUE );
715 sortMenu->setItemChecked( sortMenu->idAt( 0 ), TRUE ); 728 sortMenu->setItemChecked( sortMenu->idAt( 0 ), TRUE );
716 729
@@ -747,6 +760,7 @@ void FileBrowser::init(const QString & dir)
747 connect( pasteAction, SIGNAL( activated() ), fileView, SLOT( paste() ) ); 760 connect( pasteAction, SIGNAL( activated() ), fileView, SLOT( paste() ) );
748 pasteAction->addTo( toolBar ); 761 pasteAction->addTo( toolBar );
749 762
763// dirLabel = new QLabel(this, "DirLabel");
750 764
751 connect( fileView, SIGNAL( dirChanged() ), SLOT( updateDirMenu() ) ); 765 connect( fileView, SIGNAL( dirChanged() ), SLOT( updateDirMenu() ) );
752 updateDirMenu(); 766 updateDirMenu();
@@ -764,6 +778,10 @@ void FileBrowser::pcmciaMessage( const QCString &msg, const QByteArray &)
764 } 778 }
765} 779}
766 780
781void FileBrowser::changeCaption(const QString & dir) {
782 setCaption( dir);
783}
784
767void FileBrowser::dirSelected( int id ) 785void FileBrowser::dirSelected( int id )
768{ 786{
769 int i = 0, j; 787 int i = 0, j;
@@ -854,6 +872,17 @@ void FileBrowser::updateSorting()
854 sortType(); 872 sortType();
855} 873}
856 874
875void FileBrowser::showHidden() {
876 if(! fileView->showingHidden) {
877 fileView->showingHidden=TRUE;
878 sortMenu->setItemChecked( sortMenu->idAt( 7),TRUE);
879 } else {
880 fileView->showingHidden=FALSE;
881 sortMenu->setItemChecked( sortMenu->idAt( 7),FALSE);
882 }
883 fileView->updateDir();
884}
885
857void FileView::chPerm() { 886void FileView::chPerm() {
858 FileItem * i; 887 FileItem * i;
859 QStringList fl; 888 QStringList fl;
diff --git a/noncore/unsupported/filebrowser/filebrowser.h b/noncore/unsupported/filebrowser/filebrowser.h
index c214dbe..54856a0 100644
--- a/noncore/unsupported/filebrowser/filebrowser.h
+++ b/noncore/unsupported/filebrowser/filebrowser.h
@@ -26,7 +26,7 @@
26#include <qaction.h> 26#include <qaction.h>
27#include <qtimer.h> 27#include <qtimer.h>
28#include <qstringlist.h> 28#include <qstringlist.h>
29 29class QLabel;
30class InlineEdit; 30class InlineEdit;
31 31
32class FileItem : public QListViewItem 32class FileItem : public QListViewItem
@@ -58,6 +58,7 @@ public:
58 void setDir( const QString & dir ); 58 void setDir( const QString & dir );
59 QString cd(){ return currentDir; } 59 QString cd(){ return currentDir; }
60 QStringList history() const { return dirHistory; } 60 QStringList history() const { return dirHistory; }
61 bool showingHidden;
61 62
62public slots: 63public slots:
63 void updateDir(); 64 void updateDir();
@@ -114,6 +115,8 @@ public:
114 const char * name = 0, WFlags f = 0 ); 115 const char * name = 0, WFlags f = 0 );
115 FileBrowser( const QString & dir, QWidget * parent = 0, 116 FileBrowser( const QString & dir, QWidget * parent = 0,
116 const char * name = 0, WFlags f = 0 ); 117 const char * name = 0, WFlags f = 0 );
118public slots:
119 void changeCaption(const QString &);
117private: 120private:
118 void init(const QString & dir); 121 void init(const QString & dir);
119 QString fileToCopy; 122 QString fileToCopy;
@@ -136,6 +139,7 @@ private slots:
136 139
137 void updateDirMenu(); 140 void updateDirMenu();
138 void dirSelected( int id ); 141 void dirSelected( int id );
142 void showHidden();
139}; 143};
140 144
141#endif 145#endif