fixed columns mixup

1 files changed, 51 insertions, 51 deletions

diff --git a/noncore/unsupported/filebrowser/filebrowser.cpp b/noncore/unsupported/filebrowser/filebrowser.cpp
index d9e2afa..1bb7984 100644
--- a/noncore/unsupported/filebrowser/filebrowser.cpp
+++ b/noncore/unsupported/filebrowser/filebrowser.cpp
@@ -49,61 +49,61 @@
 
 //
 //  FileItem
 //
 FileItem::FileItem( QListView * parent, const QFileInfo & fi )
     : QListViewItem( parent ),
       fileInfo( fi )
 {
     QDate d = fi.lastModified().date();
 
     setText( 0, fi.fileName() );
     setText( 1, sizeString( fi.size() ) + " " );
     setText( 2, QString().sprintf("%4d-%02d-%02d",d.year(), d.month(), d.day() ) );
 
     MimeType mt(fi.filePath());
 
-        if ( fi.isSymLink() )
-                setText( 3, "symlink" );
+  if ( fi.isSymLink() )
+    setText( 3, "symlink" );
     else if( fi.isDir() )
-                setText( 3, "directory" );
+    setText( 3, "directory" );
     else if( isLib() )
   setText( 3, "library" );
     else
   setText( 3, mt.description() );
 
     QPixmap pm;
     if( fi.isDir() ){
   if( !QDir( fi.filePath() ).isReadable() )
       pm = Resource::loadPixmap( "lockedfolder" );
   else
       pm = Resource::loadPixmap( "folder" );
     }
     else if( !fi.isReadable() )
   pm = Resource::loadPixmap( "locked" );
     else if( isLib() )
   pm = Resource::loadPixmap( "library" );
     else
   pm = mt.pixmap();
     if ( pm.isNull() )
   pm = Resource::loadPixmap("UnknownDocument-14");
    if( fi.isSymLink() ){
-                // overlay link image
-                QPixmap lnk = Resource::loadPixmap( "filebrowser/symlink" );
-                QPainter painter( &pm );
-                painter.drawPixmap( pm.width()-lnk.width(), pm.height()-lnk.height(), lnk );
+    // overlay link image
+    QPixmap lnk = Resource::loadPixmap( "filebrowser/symlink" );
+    QPainter painter( &pm );
+    painter.drawPixmap( pm.width()-lnk.width(), pm.height()-lnk.height(), lnk );
         pm.setMask( pm.createHeuristicMask( FALSE ) );
     }
     setPixmap(0,pm);
 }
 
 QString FileItem::sizeString( unsigned int s )
 {
     double size = s;
 
     if ( size > 1024 * 1024 * 1024 )
     return QString().sprintf( "%.1f", size / ( 1024 * 1024 * 1024 ) ) + "G";
     else if ( size > 1024 * 1024 )
     return QString().sprintf( "%.1f", size / ( 1024 * 1024 ) ) + "M";
     else if ( size > 1024 )
     return QString().sprintf( "%.1f", size / ( 1024 ) ) + "K";
     else
@@ -162,45 +162,45 @@ bool FileItem::rename( const QString & name )
     if ( name.contains( QRegExp("[/\\$\"\'\\*\\?]") ) )
     return FALSE;
 
     oldpath = fileInfo.filePath();
     newpath = fileInfo.dirPath() + "/" + name;
 
     if ( ::rename( (const char *) oldpath, (const char *) newpath ) != 0 )
     return FALSE;
     else
     return TRUE;
 }
 
 //
 //  FileView
 //
 FileView::FileView( const QString & dir, QWidget * parent,
-                                        const char * name, 
-                                        bool hidden, bool symlinks )
+          const char * name, 
+          bool hidden, bool symlinks )
     : QListView( parent, name ),
       menuTimer( this ),
       le( NULL ),
       itemToRename( NULL ),
       showHidden( hidden ),
       showSymlinks( symlinks),
-          menuKeepsOpen( FALSE )
+    menuKeepsOpen( FALSE )
 {
     addColumn( "Name" );
-    addColumn( "Date" );
     addColumn( "Size" );
+    addColumn( "Date" );
     addColumn( "Type" );
 
     setMultiSelection( TRUE );
     //header()->hide();
 
     setColumnWidthMode( 0, Manual );
     setColumnWidthMode( 3, Manual );
 
     // right align yize column
     setColumnAlignment( 1, AlignRight );
 
     generateDir( dir );
 
     connect( this, SIGNAL( clicked( QListViewItem * )),
        SLOT( itemClicked( QListViewItem * )) );
     connect( this, SIGNAL( doubleClicked( QListViewItem * )),
@@ -223,63 +223,63 @@ void FileView::updateDir()
     generateDir( currentDir );
 }
 
 void FileView::setDir( const QString & dir )
 {
     if ( dir.startsWith( "/dev" ) ) {
   QMessageBox::warning( this, tr( "File Manager" ),
             tr( "Can't show /dev/ directory." ), tr( "&Ok" ) );
   return;
     }
     dirHistory += currentDir;
     generateDir( dir );
 }
 
 void FileView::generateDir( const QString & dir )
 {
-                if(menuKeepsOpen){      
-                cancelMenuTimer();
+  if(menuKeepsOpen){    
+    cancelMenuTimer();
     }
-        QDir d( dir );
+  QDir d( dir );
 
     if( d.exists() && !d.isReadable() ) return;
 
     currentDir = d.canonicalPath();
 
       if( !showHidden)
     d.setFilter( QDir::Dirs | QDir::Files );
       else
     d.setFilter( QDir::Dirs | QDir::Files |QDir::Hidden | QDir::All);
 
      d.setSorting( QDir::Name | QDir::DirsFirst | QDir::IgnoreCase |  QDir::Reversed );
         
 
     const QFileInfoList * list = d.entryInfoList();
     QFileInfoListIterator it( *list );
     QFileInfo *fi;
 
     clear();
     while( (fi = it.current()) ){
         if( (fi->fileName() == ".") || (fi->fileName() == "..") ){
       ++it;
       continue;
     }
-         if(!showSymlinks && fi->isSymLink()){
-                ++it;
-                continue;
-        }
+  if(!showSymlinks && fi->isSymLink()){
+    ++it;
+    continue;
+  }
    (void) new FileItem( (QListView *) this, *fi );
     ++it;
     }
     emit dirChanged();
 }
 
 void FileView::rename()
 {
     itemToRename = (FileItem *) currentItem();
     const QPixmap * pm;
     int pmw;
 
     if( itemToRename == NULL ) return;
 
     if( ( pm = itemToRename->pixmap( 0 ) ) == NULL )
     pmw = 0;
@@ -576,72 +576,72 @@ void FileView::viewAsText()
     e << i->getFilePath();
 //    Global::execute( "textedit -f ", i->getFilePath() );
 }
 
 void FileView::itemClicked( QListViewItem * i)
 {
     FileItem * t = (FileItem *) i;
 
     if( t == NULL ) return;
     if( t->isDir() ){
   setDir( t->getFilePath() );
     }
 }
 
 void FileView::itemDblClicked( QListViewItem * i)
 {
-                if(menuKeepsOpen){      
-                cancelMenuTimer();
-        }
+  if(menuKeepsOpen){    
+    cancelMenuTimer();
+  }
 
-        FileItem * t = (FileItem *) i;
+  FileItem * t = (FileItem *) i;
 
     if(t == NULL) return;
     if(t->launch() == -1){
     QMessageBox::warning( this, tr( "Launch Application" ),
                 tr( "Launch failed!" ), tr( "Ok" ) );
     }
 }
 
 void FileView::parentDir()
 {
     setDir( currentDir + "./.." );
 }
 
 void FileView::lastDir()
 {
     if( dirHistory.count() == 0 ) return;
 
     QString newDir = dirHistory.last();
     dirHistory.remove( dirHistory.last() );
     generateDir( newDir );
 }
 
 void FileView::contentsMousePressEvent( QMouseEvent * e )
 {
     QListView::contentsMousePressEvent( e );
     menuTimer.start( 750, TRUE );
 }
 
 void FileView::contentsMouseReleaseEvent( QMouseEvent * e )
 {
     QListView::contentsMouseReleaseEvent( e );
-                if(!menuKeepsOpen){     
-                menuTimer.stop();
-        }
-        
+  if(!menuKeepsOpen){   
+    menuTimer.stop();
+  }
+  
 }
 
 void FileView::cancelMenuTimer()
 {
     if( menuTimer.isActive() )
     menuTimer.stop();
 }
 
 void FileView::addToDocuments()
 {
     FileItem * i = (FileItem *) currentItem();
     DocLnk f;
     QString n = i->text(0);
     n.replace(QRegExp("\\..*"),"");
     f.setName( n );
     f.setFile( i->getFilePath() );
@@ -691,107 +691,107 @@ void FileView::showFileMenu()
     m->insertItem( Resource::loadPixmap("paste"),
            tr( "Paste" ), this, SLOT( paste() ) );
     m->insertItem( tr( "Change Permissions" ), this, SLOT( chPerm() ) );
     m->insertItem(Resource::loadPixmap( "close" ), tr( "Delete" ), this, SLOT( del() ) );
     m->insertSeparator();
     m->insertItem( tr( "Select all" ), this, SLOT( selectAll() ) );
     m->insertItem( tr( "Deselect all" ), this, SLOT( deselectAll() ) );
     m->popup( QCursor::pos() );
 }
 
 //
 //  FileBrowser
 //
 
 void FileView::setShowHidden(bool hidden)
 {
-        showHidden=hidden;
+  showHidden=hidden;
 }
 
 void FileView::setShowSymlinks(bool symlinks)
 {
-        showSymlinks=symlinks;
+  showSymlinks=symlinks;
 }
 
 void FileView::setMenuKeepsOpen(bool keepOpen)
 {
-                menuKeepsOpen=keepOpen;
+  menuKeepsOpen=keepOpen; 
 }
 
 FileBrowser::FileBrowser( QWidget * parent,
               const char * name, WFlags f ) :
     QMainWindow( parent, name, f )
 {
     init( QDir::current().canonicalPath() );
 }
 
 FileBrowser::FileBrowser( const QString & dir, QWidget * parent,
               const char * name, WFlags f ) :
     QMainWindow( parent, name, f )
 {
     init( dir );
 }
 
 void FileBrowser::init(const QString & dir)
 {
     setCaption( tr("File Manager") );
     setIcon( Resource::loadPixmap( "filebrowser_icon" ) );
 
-        Config cfg("Filebrowser");
-        cfg.setGroup("View");
-        bool showHidden=(cfg.readEntry("Hidden","FALSE") == "TRUE");
-        bool showSymlinks=(cfg.readEntry("Symlinks","FALSE") == "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");
-        
+  cfg.setGroup("Menu"); 
+  bool menuKeepsOpen=(cfg.readEntry("KeepOpen", "FALSE") == "TRUE");
+  
 
     fileView = new FileView( dir, this, 0, showHidden, showSymlinks );
     fileView->setAllColumnsShowFocus( TRUE );
-        fileView->setMenuKeepsOpen(menuKeepsOpen);
-        
+  fileView->setMenuKeepsOpen(menuKeepsOpen);
+  
     setCentralWidget( fileView );
     setToolBarsMovable( FALSE );
 
     QPEToolBar* toolBar = new QPEToolBar( this );
     toolBar->setHorizontalStretchable( TRUE );
 
     QPEMenuBar* menuBar = new QPEMenuBar( toolBar );
 
     dirMenu = new QPopupMenu( this );
     menuBar->insertItem( tr( "Dir" ), dirMenu );
 
     sortMenu = new QPopupMenu( this );
     menuBar->insertItem( tr( "Sort" ), sortMenu );
     sortMenu->insertItem( tr( "by Name "), this, SLOT( sortName() ) );
     sortMenu->insertItem( tr( "by Size "), this, SLOT( sortSize() ) );
     sortMenu->insertItem( tr( "by Date "), this, SLOT( sortDate() ) );
     sortMenu->insertItem( tr( "by Type "), this, SLOT( sortType() ) );
     sortMenu->insertSeparator();
     sortMenu->insertItem( tr( "Ascending" ), this, SLOT( updateSorting() ) );
 
     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->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 );
+  menuBar->insertItem( tr("View"), viewMenu );
     
     toolBar = new QPEToolBar( this );
 
     lastAction = new QAction( tr("Previous dir"), Resource::loadIconSet( "back" ),
                 QString::null, 0, this, 0 );
     connect( lastAction, SIGNAL( activated() ), fileView, SLOT( lastDir() ) );
     lastAction->addTo( toolBar );
     lastAction->setEnabled( FALSE );
 
     upAction = new QAction( tr("Parent dir"), Resource::loadIconSet( "up" ),
            QString::null, 0, this, 0 );
     connect( upAction, SIGNAL( activated() ), fileView, SLOT( parentDir() ) );
     upAction->addTo( toolBar );
 
     QAction *a = new QAction( tr("New folder"), Resource::loadPixmap( "newfolder" ),
            QString::null, 0, this, 0 );
@@ -943,41 +943,41 @@ void FileView::chPerm() {
     if( QMessageBox::warning( this, tr("Change permissions"), tr("Are you sure?"),
                 tr("Yes"), tr("No") ) == 0) {
     for ( QStringList::Iterator it = fl.begin(); it != fl.end(); ++it ) {
         filePermissions *filePerm;
         filePerm = new filePermissions(this, "Permissions",true,0,(const QString &)(*it));
         filePerm->exec();
         if( filePerm)
             delete  filePerm;
         break;
       }
     updateDir();
     }
 }
 
 void FileBrowser::updateShowHidden()
 {
-         bool valShowHidden=viewMenu->isItemChecked( viewMenu->idAt( 0 ) );
-         valShowHidden=!valShowHidden;
-          viewMenu->setItemChecked( viewMenu->idAt( 0 ), valShowHidden );
-        fileView->setShowHidden(valShowHidden);
+  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();
+  fileView->updateDir();
 }
 
 void FileBrowser::updateShowSymlinks()
 {
-         bool valShowSymlinks=viewMenu->isItemChecked( viewMenu->idAt( 1 ) );
-         valShowSymlinks=!valShowSymlinks;
-          viewMenu->setItemChecked( viewMenu->idAt( 1 ), valShowSymlinks );
-        fileView->setShowSymlinks(valShowSymlinks);
+  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();
+  fileView->updateDir();
 }