Diffstat (limited to 'core/apps/textedit/fileBrowser.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | core/apps/textedit/fileBrowser.cpp | 30 |
1 files changed, 21 insertions, 9 deletions
diff --git a/core/apps/textedit/fileBrowser.cpp b/core/apps/textedit/fileBrowser.cpp index 92c15cb..8cb7c38 100644 --- a/core/apps/textedit/fileBrowser.cpp +++ b/core/apps/textedit/fileBrowser.cpp | |||
@@ -62,29 +62,30 @@ fileBrowser::fileBrowser( QWidget* parent, const char* name, bool modal, WFlags | |||
62 | homeButton->setMinimumSize( QSize( 25, 25 ) ); | 62 | homeButton->setMinimumSize( QSize( 25, 25 ) ); |
63 | homeButton->setMaximumSize( QSize( 25, 25 ) ); | 63 | homeButton->setMaximumSize( QSize( 25, 25 ) ); |
64 | connect(homeButton,SIGNAL(released()),this,SLOT(homeButtonPushed()) ); | 64 | connect(homeButton,SIGNAL(released()),this,SLOT(homeButtonPushed()) ); |
65 | homeButton->setFlat(TRUE); | 65 | homeButton->setFlat(TRUE); |
66 | layout->addWidget( homeButton, 0, 2 ); | 66 | layout->addWidget( homeButton, 0, 2 ); |
67 | 67 | ||
68 | FileStack = new QWidgetStack( this ); | 68 | FileStack = new QWidgetStack( this ); |
69 | 69 | ||
70 | ListView = new QListView( this, "ListView" ); | 70 | ListView = new QListView( this, "ListView" ); |
71 | ListView->setMinimumSize( QSize( 100, 25 ) ); | 71 | ListView->setMinimumSize( QSize( 100, 25 ) ); |
72 | ListView->addColumn( tr( "Name" ) ); | 72 | ListView->addColumn( tr( "Name" ) ); |
73 | ListView->setColumnWidth(0,140); | 73 | ListView->setColumnWidth(0,120); |
74 | ListView->setSorting( 2, FALSE); | 74 | ListView->setSorting( 2, FALSE); |
75 | ListView->addColumn( tr( "Size" ) ); | 75 | ListView->addColumn( tr( "Size" ) ); |
76 | ListView->setColumnWidth(1,59); | 76 | ListView->setColumnWidth(1,-1); |
77 | ListView->addColumn( "Date",-1); | ||
77 | // ListView->addColumn( tr( "" ) ); | 78 | // ListView->addColumn( tr( "" ) ); |
78 | ListView->setColumnWidthMode(0,QListView::Manual); | 79 | ListView->setColumnWidthMode(0,QListView::Manual); |
79 | ListView->setColumnAlignment(1,QListView::AlignRight); | 80 | ListView->setColumnAlignment(1,QListView::AlignRight); |
80 | // ListView->setMultiSelection(true); | 81 | ListView->setColumnAlignment(2,QListView::AlignRight); |
81 | // ListView->setSelectionMode(QListView::Extended); | ||
82 | ListView->setAllColumnsShowFocus( TRUE ); | 82 | ListView->setAllColumnsShowFocus( TRUE ); |
83 | |||
83 | connect( ListView, SIGNAL(pressed( QListViewItem*)), SLOT(listClicked(QListViewItem *)) ); | 84 | connect( ListView, SIGNAL(pressed( QListViewItem*)), SLOT(listClicked(QListViewItem *)) ); |
84 | FileStack->addWidget( ListView, get_unique_id() ); | 85 | FileStack->addWidget( ListView, get_unique_id() ); |
85 | 86 | ||
86 | fileSelector = new FileSelector( "text/*", FileStack, "fileselector" , FALSE, FALSE); //buggy | 87 | fileSelector = new FileSelector( "text/*", FileStack, "fileselector" , FALSE, FALSE); //buggy |
87 | // connect( fileSelector, SIGNAL( closeMe() ), this, SLOT( showEditTools() ) ); | 88 | // connect( fileSelector, SIGNAL( closeMe() ), this, SLOT( showEditTools() ) ); |
88 | // connect( fileSelector, SIGNAL( newSelected( const DocLnk &) ), this, SLOT( newFile( const DocLnk & ) ) ); | 89 | // connect( fileSelector, SIGNAL( newSelected( const DocLnk &) ), this, SLOT( newFile( const DocLnk & ) ) ); |
89 | connect( fileSelector, SIGNAL( fileSelected( const DocLnk &) ), this, SLOT( docOpen( const DocLnk & ) ) ); | 90 | connect( fileSelector, SIGNAL( fileSelected( const DocLnk &) ), this, SLOT( docOpen( const DocLnk & ) ) ); |
90 | layout->addMultiCellWidget( FileStack, 1, 1, 0, 2 ); | 91 | layout->addMultiCellWidget( FileStack, 1, 1, 0, 2 ); |
@@ -113,48 +114,59 @@ void fileBrowser::setFileView( int selection ) | |||
113 | { | 114 | { |
114 | SelectionCombo->setCurrentItem( selection ); | 115 | SelectionCombo->setCurrentItem( selection ); |
115 | selectionChanged( SelectionCombo->currentText() ); | 116 | selectionChanged( SelectionCombo->currentText() ); |
116 | } | 117 | } |
117 | 118 | ||
118 | void fileBrowser::populateList() | 119 | void fileBrowser::populateList() |
119 | { | 120 | { |
120 | ListView->clear(); | 121 | ListView->clear(); |
122 | bool isDir=FALSE; | ||
121 | //qDebug(currentDir.canonicalPath()); | 123 | //qDebug(currentDir.canonicalPath()); |
122 | currentDir.setSorting(/* QDir::Size*/ /*| QDir::Reversed | */QDir::DirsFirst); | 124 | currentDir.setSorting(/* QDir::Size*/ /*| QDir::Reversed | */QDir::DirsFirst); |
123 | currentDir.setMatchAllDirs(TRUE); | 125 | currentDir.setMatchAllDirs(TRUE); |
124 | 126 | ||
125 | currentDir.setNameFilter(filterStr); | 127 | currentDir.setNameFilter(filterStr); |
126 | // currentDir.setNameFilter("*.txt;*.etx"); | 128 | // currentDir.setNameFilter("*.txt;*.etx"); |
127 | QString fileL, fileS; | 129 | QString fileL, fileS, fileDate; |
128 | const QFileInfoList *list = currentDir.entryInfoList( /*QDir::All*/ /*, QDir::SortByMask*/); | 130 | const QFileInfoList *list = currentDir.entryInfoList( /*QDir::All*/ /*, QDir::SortByMask*/); |
129 | QFileInfoListIterator it(*list); | 131 | QFileInfoListIterator it(*list); |
130 | QFileInfo *fi; | 132 | QFileInfo *fi; |
131 | while ( (fi=it.current()) ) { | 133 | while ( (fi=it.current()) ) { |
132 | 134 | ||
133 | if (fi->isSymLink() ){ | 135 | if (fi->isSymLink() ){ |
134 | QString symLink=fi->readLink(); | 136 | QString symLink=fi->readLink(); |
135 | // qDebug("Symlink detected "+symLink); | 137 | // qDebug("Symlink detected "+symLink); |
136 | QFileInfo sym( symLink); | 138 | QFileInfo sym( symLink); |
137 | fileS.sprintf( "%10li", sym.size() ); | 139 | fileS.sprintf( "%10li", sym.size() ); |
138 | fileL.sprintf( "%s -> %s", sym.fileName().data(),sym.absFilePath().data() ); | 140 | fileL.sprintf( "%s -> %s", sym.fileName().data(),sym.absFilePath().data() ); |
139 | 141 | fileDate = sym.lastModified().toString(); | |
140 | } else { | 142 | } else { |
141 | // qDebug("Not a dir: "+currentDir.canonicalPath()+fileL); | 143 | // qDebug("Not a dir: "+currentDir.canonicalPath()+fileL); |
142 | fileS.sprintf( "%10li", fi->size() ); | 144 | fileS.sprintf( "%10li", fi->size() ); |
143 | fileL.sprintf( "%s",fi->fileName().data() ); | 145 | fileL.sprintf( "%s",fi->fileName().data() ); |
146 | fileDate= fi->lastModified().toString(); | ||
144 | if( QDir(QDir::cleanDirPath(currentDir.canonicalPath()+"/"+fileL)).exists() ) { | 147 | if( QDir(QDir::cleanDirPath(currentDir.canonicalPath()+"/"+fileL)).exists() ) { |
145 | fileL+="/"; | 148 | fileL+="/"; |
149 | isDir=TRUE; | ||
146 | // qDebug( fileL); | 150 | // qDebug( fileL); |
147 | } | 151 | } |
148 | } | 152 | } |
149 | item= new QListViewItem( ListView,fileL,fileS ); | 153 | if(fileL !="./") { |
154 | item= new QListViewItem( ListView,fileL,fileS , fileDate); | ||
155 | if(isDir || fileL.find("/",0,TRUE) != -1) | ||
156 | item->setPixmap( 0, Resource::loadPixmap( "folder" )); | ||
157 | else | ||
158 | item->setPixmap( 0, Resource::loadPixmap( "fileopen" )); | ||
159 | } | ||
160 | isDir=FALSE; | ||
150 | ++it; | 161 | ++it; |
151 | } | 162 | } |
152 | ListView->setSorting( 2, FALSE); | 163 | // ListView->setSorting( 2, FALSE); |
164 | ListView->setSorting( 3, FALSE); | ||
153 | dirLabel->setText(currentDir.canonicalPath()); | 165 | dirLabel->setText(currentDir.canonicalPath()); |
154 | } | 166 | } |
155 | 167 | ||
156 | void fileBrowser::upDir() | 168 | void fileBrowser::upDir() |
157 | { | 169 | { |
158 | // qDebug(currentDir.canonicalPath()); | 170 | // qDebug(currentDir.canonicalPath()); |
159 | } | 171 | } |
160 | 172 | ||