-rw-r--r-- | core/apps/textedit/fileBrowser.cpp | 18 | ||||
-rw-r--r-- | core/apps/textedit/textedit.cpp | 2 |
2 files changed, 15 insertions, 5 deletions
diff --git a/core/apps/textedit/fileBrowser.cpp b/core/apps/textedit/fileBrowser.cpp index eea7144..41e800c 100644 --- a/core/apps/textedit/fileBrowser.cpp +++ b/core/apps/textedit/fileBrowser.cpp | |||
@@ -174,53 +174,63 @@ void fileBrowser::populateList() | |||
174 | QFileInfoListIterator it(*list); | 174 | QFileInfoListIterator it(*list); |
175 | QFileInfo *fi; | 175 | QFileInfo *fi; |
176 | while ( (fi=it.current()) ) { | 176 | while ( (fi=it.current()) ) { |
177 | 177 | ||
178 | if (fi->isSymLink() ){ | 178 | if (fi->isSymLink() ){ |
179 | QString symLink=fi->readLink(); | 179 | QString symLink=fi->readLink(); |
180 | // qDebug("Symlink detected "+symLink); | 180 | // qDebug("Symlink detected "+symLink); |
181 | QFileInfo sym( symLink); | 181 | QFileInfo sym( symLink); |
182 | fileS.sprintf( "%10li", sym.size() ); | 182 | fileS.sprintf( "%10li", sym.size() ); |
183 | fileL.sprintf( "%s -> %s", sym.fileName().data(),sym.absFilePath().data() ); | 183 | fileL.sprintf( "%s -> %s", sym.fileName().data(),sym.absFilePath().data() ); |
184 | fileDate = sym.lastModified().toString(); | 184 | fileDate = sym.lastModified().toString(); |
185 | } else { | 185 | } else { |
186 | // qDebug("Not a dir: "+currentDir.canonicalPath()+fileL); | 186 | // qDebug("Not a dir: "+currentDir.canonicalPath()+fileL); |
187 | fileS.sprintf( "%10li", fi->size() ); | 187 | fileS.sprintf( "%10li", fi->size() ); |
188 | fileL.sprintf( "%s",fi->fileName().data() ); | 188 | fileL.sprintf( "%s",fi->fileName().data() ); |
189 | fileDate= fi->lastModified().toString(); | 189 | fileDate= fi->lastModified().toString(); |
190 | if( QDir(QDir::cleanDirPath(currentDir.canonicalPath()+"/"+fileL)).exists() ) { | 190 | if( QDir(QDir::cleanDirPath(currentDir.canonicalPath()+"/"+fileL)).exists() ) { |
191 | fileL+="/"; | 191 | fileL+="/"; |
192 | isDir=TRUE; | 192 | isDir=TRUE; |
193 | // qDebug( fileL); | 193 | // qDebug( fileL); |
194 | } | 194 | } |
195 | } | 195 | } |
196 | if(fileL !="./") { | 196 | if(fileL !="./") { |
197 | item= new QListViewItem( ListView,fileL,fileS , fileDate); | 197 | item= new QListViewItem( ListView,fileL,fileS , fileDate); |
198 | if(isDir || fileL.find("/",0,TRUE) != -1) | 198 | QPixmap pm; |
199 | item->setPixmap( 0, Resource::loadPixmap( "folder" )); | 199 | pm= Resource::loadPixmap( "folder" ); |
200 | else | 200 | if(isDir || fileL.find("/",0,TRUE) != -1) |
201 | item->setPixmap( 0, Resource::loadPixmap( "fileopen" )); | 201 | item->setPixmap( 0,pm ); |
202 | else | ||
203 | item->setPixmap( 0, Resource::loadPixmap( "fileopen" )); | ||
204 | if( fileL.find("->",0,TRUE) != -1) { | ||
205 | // overlay link image | ||
206 | QPixmap lnk = Resource::loadPixmap( "symlink" ); | ||
207 | QPainter painter( &pm ); | ||
208 | painter.drawPixmap( pm.width()-lnk.width(), pm.height()-lnk.height(), lnk ); | ||
209 | pm.setMask( pm.createHeuristicMask( FALSE ) ); | ||
210 | item->setPixmap( 0, pm); | ||
202 | } | 211 | } |
212 | } | ||
203 | isDir=FALSE; | 213 | isDir=FALSE; |
204 | ++it; | 214 | ++it; |
205 | } | 215 | } |
206 | ListView->setSorting( 3, FALSE); | 216 | ListView->setSorting( 3, FALSE); |
207 | QString currentPath = currentDir.canonicalPath(); | 217 | QString currentPath = currentDir.canonicalPath(); |
208 | 218 | ||
209 | fillCombo( (const QString &)currentPath); | 219 | fillCombo( (const QString &)currentPath); |
210 | // dirPathCombo->lineEdit()->setText(currentPath); | 220 | // dirPathCombo->lineEdit()->setText(currentPath); |
211 | 221 | ||
212 | // if( dirPathStringList.grep(currentPath,TRUE).isEmpty() ) { | 222 | // if( dirPathStringList.grep(currentPath,TRUE).isEmpty() ) { |
213 | // dirPathCombo->clear(); | 223 | // dirPathCombo->clear(); |
214 | // dirPathStringList.prepend(currentPath ); | 224 | // dirPathStringList.prepend(currentPath ); |
215 | // dirPathCombo->insertStringList( dirPathStringList,-1); | 225 | // dirPathCombo->insertStringList( dirPathStringList,-1); |
216 | // } | 226 | // } |
217 | } | 227 | } |
218 | 228 | ||
219 | void fileBrowser::upDir() | 229 | void fileBrowser::upDir() |
220 | { | 230 | { |
221 | QString current = currentDir.canonicalPath(); | 231 | QString current = currentDir.canonicalPath(); |
222 | QDir dir(current); | 232 | QDir dir(current); |
223 | dir.cdUp(); | 233 | dir.cdUp(); |
224 | current = dir.canonicalPath(); | 234 | current = dir.canonicalPath(); |
225 | chdir( current.latin1() ); | 235 | chdir( current.latin1() ); |
226 | currentDir.cd( current, TRUE); | 236 | currentDir.cd( current, TRUE); |
diff --git a/core/apps/textedit/textedit.cpp b/core/apps/textedit/textedit.cpp index da74893..ecebe12 100644 --- a/core/apps/textedit/textedit.cpp +++ b/core/apps/textedit/textedit.cpp | |||
@@ -357,49 +357,49 @@ TextEdit::TextEdit( QWidget *parent, const char *name, WFlags f ) | |||
357 | connect( searchEdit, SIGNAL( textChanged( const QString & ) ), | 357 | connect( searchEdit, SIGNAL( textChanged( const QString & ) ), |
358 | this, SLOT( search() ) ); | 358 | this, SLOT( search() ) ); |
359 | 359 | ||
360 | a = new QAction( tr( "Find Next" ), Resource::loadPixmap( "next" ), QString::null, 0, this, 0 ); | 360 | a = new QAction( tr( "Find Next" ), Resource::loadPixmap( "next" ), QString::null, 0, this, 0 ); |
361 | connect( a, SIGNAL( activated() ), this, SLOT( findNext() ) ); | 361 | connect( a, SIGNAL( activated() ), this, SLOT( findNext() ) ); |
362 | a->addTo( searchBar ); | 362 | a->addTo( searchBar ); |
363 | a->addTo( edit ); | 363 | a->addTo( edit ); |
364 | 364 | ||
365 | a = new QAction( tr( "Close Find" ), Resource::loadPixmap( "close" ), QString::null, 0, this, 0 ); | 365 | a = new QAction( tr( "Close Find" ), Resource::loadPixmap( "close" ), QString::null, 0, this, 0 ); |
366 | connect( a, SIGNAL( activated() ), this, SLOT( findClose() ) ); | 366 | connect( a, SIGNAL( activated() ), this, SLOT( findClose() ) ); |
367 | a->addTo( searchBar ); | 367 | a->addTo( searchBar ); |
368 | 368 | ||
369 | edit->insertSeparator(); | 369 | edit->insertSeparator(); |
370 | a = new QAction( tr( "Delete" ), Resource::loadPixmap( "close" ), QString::null, 0, this, 0 ); | 370 | a = new QAction( tr( "Delete" ), Resource::loadPixmap( "close" ), QString::null, 0, this, 0 ); |
371 | connect( a, SIGNAL( activated() ), this, SLOT( editDelete() ) ); | 371 | connect( a, SIGNAL( activated() ), this, SLOT( editDelete() ) ); |
372 | a->addTo( edit ); | 372 | a->addTo( edit ); |
373 | 373 | ||
374 | searchBar->hide(); | 374 | searchBar->hide(); |
375 | 375 | ||
376 | editor = new QpeEditor( this ); | 376 | editor = new QpeEditor( this ); |
377 | setCentralWidget( editor ); | 377 | setCentralWidget( editor ); |
378 | editor->setFrameStyle( QFrame::Panel | QFrame::Sunken ); | 378 | editor->setFrameStyle( QFrame::Panel | QFrame::Sunken ); |
379 | connect( editor, SIGNAL( textChanged() ), this, SLOT( editorChanged() ) ); | 379 | connect( editor, SIGNAL( textChanged() ), this, SLOT( editorChanged() ) ); |
380 | 380 | ||
381 | resize( 200, 300 ); | 381 | // resize( 200, 300 ); |
382 | 382 | ||
383 | // setFontSize(defsize,TRUE); | 383 | // setFontSize(defsize,TRUE); |
384 | FontDatabase fdb; | 384 | FontDatabase fdb; |
385 | QFont defaultFont=editor->font(); | 385 | QFont defaultFont=editor->font(); |
386 | QFontInfo fontInfo(defaultFont); | 386 | QFontInfo fontInfo(defaultFont); |
387 | 387 | ||
388 | cfg.setGroup("Font"); | 388 | cfg.setGroup("Font"); |
389 | QString family = cfg.readEntry("Family", fontInfo.family()); | 389 | QString family = cfg.readEntry("Family", fontInfo.family()); |
390 | QString style = cfg.readEntry("Style", fdb.styleString(defaultFont)); | 390 | QString style = cfg.readEntry("Style", fdb.styleString(defaultFont)); |
391 | int i_size = cfg.readNumEntry("Size", fontInfo.pointSize()/10); | 391 | int i_size = cfg.readNumEntry("Size", fontInfo.pointSize()/10); |
392 | QString charSet = cfg.readEntry("CharSet", QFont::encodingName( fontInfo.charSet()) ); | 392 | QString charSet = cfg.readEntry("CharSet", QFont::encodingName( fontInfo.charSet()) ); |
393 | 393 | ||
394 | defaultFont = fdb.font(family,style,i_size,charSet); | 394 | defaultFont = fdb.font(family,style,i_size,charSet); |
395 | editor->setFont( defaultFont); | 395 | editor->setFont( defaultFont); |
396 | 396 | ||
397 | wa->setOn(wrap); | 397 | wa->setOn(wrap); |
398 | updateCaption(); | 398 | updateCaption(); |
399 | 399 | ||
400 | cfg.setGroup("View"); | 400 | cfg.setGroup("View"); |
401 | if(cfg.readEntry("startNew","TRUE") == "TRUE") { | 401 | if(cfg.readEntry("startNew","TRUE") == "TRUE") { |
402 | nStart->setOn(TRUE); | 402 | nStart->setOn(TRUE); |
403 | fileNew(); | 403 | fileNew(); |
404 | } else { | 404 | } else { |
405 | fileOpen(); | 405 | fileOpen(); |