author | llornkcor <llornkcor> | 2002-03-24 21:58:35 (UTC) |
---|---|---|
committer | llornkcor <llornkcor> | 2002-03-24 21:58:35 (UTC) |
commit | 59e2a88589d8d3fce1a395d073516d99b4e46e78 (patch) (side-by-side diff) | |
tree | 6bcad0ead84cdacca7a264d0bf0347c675103403 /noncore | |
parent | e37311c84c3f14f947a4e28df809898d23cb2495 (diff) | |
download | opie-59e2a88589d8d3fce1a395d073516d99b4e46e78.zip opie-59e2a88589d8d3fce1a395d073516d99b4e46e78.tar.gz opie-59e2a88589d8d3fce1a395d073516d99b4e46e78.tar.bz2 |
changes sent in by Max Weninger
-rw-r--r-- | noncore/unsupported/filebrowser/filebrowser.cpp | 132 | ||||
-rw-r--r-- | noncore/unsupported/filebrowser/filebrowser.h | 18 | ||||
-rw-r--r-- | noncore/unsupported/filebrowser/opie-filebrowser.control | 2 |
3 files changed, 117 insertions, 35 deletions
diff --git a/noncore/unsupported/filebrowser/filebrowser.cpp b/noncore/unsupported/filebrowser/filebrowser.cpp index 6f82f95..34d5177 100644 --- a/noncore/unsupported/filebrowser/filebrowser.cpp +++ b/noncore/unsupported/filebrowser/filebrowser.cpp @@ -26,4 +26,5 @@ #include <qpe/mimetype.h> #include <qpe/applnk.h> +#include <qpe/config.h> #include <qcopchannel_qws.h> @@ -62,6 +63,8 @@ FileItem::FileItem( QListView * parent, const QFileInfo & fi ) MimeType mt(fi.filePath()); - if( fi.isDir() ) - setText( 3, "directory" ); + if ( fi.isSymLink() ) + setText( 3, "symlink" ); + else if( fi.isDir() ) + setText( 3, "directory" ); else if( isLib() ) setText( 3, "library" ); @@ -84,4 +87,11 @@ FileItem::FileItem( QListView * parent, const QFileInfo & fi ) if ( pm.isNull() ) pm = Resource::loadPixmap("UnknownDocument-14"); + if( fi.isSymLink() ){ + // overlay link image + QPixmap lnk = Resource::loadPixmap( "symlink" ); + QPainter painter( &pm ); + painter.drawPixmap( pm.width()-lnk.width(), pm.height()-lnk.height(), lnk ); + pm.setMask( pm.createHeuristicMask( FALSE ) ); + } setPixmap(0,pm); } @@ -166,9 +176,13 @@ bool FileItem::rename( const QString & name ) // FileView::FileView( const QString & dir, QWidget * parent, - const char * name ) + const char * name, + bool hidden, bool symlinks ) : QListView( parent, name ), menuTimer( this ), le( NULL ), - itemToRename( NULL ) + itemToRename( NULL ), + showHidden( hidden ), + showSymlinks( symlinks), + menuKeepsOpen( FALSE ) { addColumn( "Name" ); @@ -177,8 +191,6 @@ FileView::FileView( const QString & dir, QWidget * parent, addColumn( "Type" ); - showingHidden=FALSE; - setMultiSelection( TRUE ); - header()->hide(); + //header()->hide(); setColumnWidthMode( 0, Manual ); @@ -203,5 +215,5 @@ void FileView::resizeEvent( QResizeEvent *e ) // hide type column, we use it for "sort by type" only - setColumnWidth( 3, 0 ); + //setColumnWidth( 3, 0 ); QListView::resizeEvent( e ); } @@ -225,5 +237,8 @@ void FileView::setDir( const QString & dir ) void FileView::generateDir( const QString & dir ) { - QDir d( dir ); + if(menuKeepsOpen){ + cancelMenuTimer(); + } + QDir d( dir ); if( d.exists() && !d.isReadable() ) return; @@ -231,5 +246,5 @@ void FileView::generateDir( const QString & dir ) currentDir = d.canonicalPath(); - if( !showingHidden) + if( !showHidden) d.setFilter( QDir::Dirs | QDir::Files ); else @@ -249,5 +264,9 @@ void FileView::generateDir( const QString & dir ) continue; } - (void) new FileItem( (QListView *) this, *fi ); + if(!showSymlinks && fi->isSymLink()){ + ++it; + continue; + } + (void) new FileItem( (QListView *) this, *fi ); ++it; } @@ -571,5 +590,9 @@ void FileView::itemClicked( QListViewItem * i) void FileView::itemDblClicked( QListViewItem * i) { - FileItem * t = (FileItem *) i; + if(menuKeepsOpen){ + cancelMenuTimer(); + } + + FileItem * t = (FileItem *) i; if(t == NULL) return; @@ -603,5 +626,8 @@ void FileView::contentsMouseReleaseEvent( QMouseEvent * e ) { QListView::contentsMouseReleaseEvent( e ); - menuTimer.stop(); + if(!menuKeepsOpen){ + menuTimer.stop(); + } + } @@ -677,4 +703,19 @@ void FileView::showFileMenu() // +void FileView::setShowHidden(bool hidden) +{ + showHidden=hidden; +} + +void FileView::setShowSymlinks(bool symlinks) +{ + showSymlinks=symlinks; +} + +void FileView::setMenuKeepsOpen(bool keepOpen) +{ + menuKeepsOpen=keepOpen; +} + FileBrowser::FileBrowser( QWidget * parent, const char * name, WFlags f ) : @@ -696,7 +737,17 @@ void FileBrowser::init(const QString & dir) setIcon( Resource::loadPixmap( "filebrowser_icon" ) ); - fileView = new FileView( dir, this ); - fileView->setAllColumnsShowFocus( TRUE ); + Config cfg("Filebrowser"); + cfg.setGroup("View"); + bool showHidden=(cfg.readEntry("Hidden","FALSE") == "TRUE"); + bool showSymlinks=(cfg.readEntry("Symlinks","FALSE") == "TRUE"); + + cfg.setGroup("Menu"); + bool menuKeepsOpen=(cfg.readEntry("KeepOpen", "FALSE") == "TRUE"); + + fileView = new FileView( dir, this, 0, showHidden, showSymlinks ); + fileView->setAllColumnsShowFocus( TRUE ); + fileView->setMenuKeepsOpen(menuKeepsOpen); + setCentralWidget( fileView ); setToolBarsMovable( FALSE ); @@ -718,12 +769,16 @@ void FileBrowser::init(const QString & dir) sortMenu->insertSeparator(); sortMenu->insertItem( tr( "Ascending" ), this, SLOT( updateSorting() ) ); - sortMenu->insertSeparator(); - sortMenu->insertItem( tr( "Show Hidden "), this, SLOT( showHidden() ) ); - -// fileView->showingHidden=FALSE; sortMenu->setItemChecked( sortMenu->idAt( 5 ), TRUE ); sortMenu->setItemChecked( sortMenu->idAt( 0 ), TRUE ); + viewMenu = new QPopupMenu( this); + viewMenu->insertItem( tr( "Hidden"), this, SLOT( updateShowHidden() ) ); + viewMenu->insertItem( tr( "Symlinks"), this, SLOT( updateShowSymlinks() ) ); + viewMenu->setItemChecked( viewMenu->idAt( 0 ), showHidden ); + viewMenu->setItemChecked( viewMenu->idAt( 1 ), showSymlinks ); + + menuBar->insertItem( tr("View"), viewMenu ); + toolBar = new QPEToolBar( this ); @@ -871,15 +926,4 @@ void FileBrowser::updateSorting() } -void FileBrowser::showHidden() { - if(!fileView->showingHidden) { - fileView->showingHidden=TRUE; - sortMenu->setItemChecked( sortMenu->idAt( 7),TRUE); - } else { - fileView->showingHidden=FALSE; - sortMenu->setItemChecked( sortMenu->idAt( 7),FALSE); - } - fileView->updateDir(); -} - void FileView::chPerm() { FileItem * i; @@ -910,2 +954,30 @@ void FileView::chPerm() { } } + +void FileBrowser::updateShowHidden() +{ + bool valShowHidden=viewMenu->isItemChecked( viewMenu->idAt( 0 ) ); + valShowHidden=!valShowHidden; + viewMenu->setItemChecked( viewMenu->idAt( 0 ), valShowHidden ); + fileView->setShowHidden(valShowHidden); + + Config cfg("Filebrowser"); + cfg.setGroup("View"); + cfg.writeEntry("Hidden",valShowHidden?"TRUE":"FALSE"); + + fileView->updateDir(); +} + +void FileBrowser::updateShowSymlinks() +{ + bool valShowSymlinks=viewMenu->isItemChecked( viewMenu->idAt( 1 ) ); + valShowSymlinks=!valShowSymlinks; + viewMenu->setItemChecked( viewMenu->idAt( 1 ), valShowSymlinks ); + fileView->setShowSymlinks(valShowSymlinks); + + Config cfg("Filebrowser"); + cfg.setGroup("View"); + cfg.writeEntry("Symlinks",valShowSymlinks?"TRUE":"FALSE"); + + fileView->updateDir(); +} diff --git a/noncore/unsupported/filebrowser/filebrowser.h b/noncore/unsupported/filebrowser/filebrowser.h index 54856a0..983e58e 100644 --- a/noncore/unsupported/filebrowser/filebrowser.h +++ b/noncore/unsupported/filebrowser/filebrowser.h @@ -55,5 +55,8 @@ class FileView : public QListView public: FileView( const QString & dir, QWidget * parent = 0, - const char * name = 0 ); + const char * name = 0, + bool hidden = FALSE, + bool symlinks = FALSE ); + void setDir( const QString & dir ); QString cd(){ return currentDir; } @@ -61,4 +64,8 @@ public: bool showingHidden; + void setShowHidden(bool hidden); + void setShowSymlinks(bool symlinks); + void setMenuKeepsOpen(bool keepOpen); + public slots: void updateDir(); @@ -98,4 +105,7 @@ private: FileItem * itemToRename; bool selected; + bool showHidden; + bool showSymlinks; + bool menuKeepsOpen; bool copyFile( const QString & dest, const QString & src ); @@ -121,5 +131,5 @@ private: void init(const QString & dir); QString fileToCopy; - QPopupMenu * dirMenu, * sortMenu; + QPopupMenu * dirMenu, * sortMenu, *viewMenu; FileView * fileView; QAction * pasteAction; @@ -137,8 +147,8 @@ private slots: void sortType(); void updateSorting(); - + void updateShowHidden(); + void updateShowSymlinks(); void updateDirMenu(); void dirSelected( int id ); - void showHidden(); }; diff --git a/noncore/unsupported/filebrowser/opie-filebrowser.control b/noncore/unsupported/filebrowser/opie-filebrowser.control index c15ae17..0b8528a 100644 --- a/noncore/unsupported/filebrowser/opie-filebrowser.control +++ b/noncore/unsupported/filebrowser/opie-filebrowser.control @@ -1,3 +1,3 @@ -Files: bin/filebrowser apps/Applications/filebrowser.desktop +Files: bin/filebrowser apps/Applications/filebrowser.desktop pics/symlink.png Priority: optional Section: opie/applications |