summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/apps/textedit/fileBrowser.cpp30
-rw-r--r--core/apps/textedit/textedit.cpp15
2 files changed, 34 insertions, 11 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
@@ -66,21 +66,22 @@ fileBrowser::fileBrowser( QWidget* parent, const char* name, bool modal, WFlags
layout->addWidget( homeButton, 0, 2 );
FileStack = new QWidgetStack( this );
- ListView = new QListView( this, "ListView" );
+ ListView = new QListView( this, "ListView" );
ListView->setMinimumSize( QSize( 100, 25 ) );
ListView->addColumn( tr( "Name" ) );
- ListView->setColumnWidth(0,140);
+ ListView->setColumnWidth(0,120);
ListView->setSorting( 2, FALSE);
ListView->addColumn( tr( "Size" ) );
- ListView->setColumnWidth(1,59);
+ ListView->setColumnWidth(1,-1);
+ ListView->addColumn( "Date",-1);
// ListView->addColumn( tr( "" ) );
ListView->setColumnWidthMode(0,QListView::Manual);
ListView->setColumnAlignment(1,QListView::AlignRight);
-// ListView->setMultiSelection(true);
-// ListView->setSelectionMode(QListView::Extended);
+ ListView->setColumnAlignment(2,QListView::AlignRight);
ListView->setAllColumnsShowFocus( TRUE );
+
connect( ListView, SIGNAL(pressed( QListViewItem*)), SLOT(listClicked(QListViewItem *)) );
FileStack->addWidget( ListView, get_unique_id() );
fileSelector = new FileSelector( "text/*", FileStack, "fileselector" , FALSE, FALSE); //buggy
@@ -117,15 +118,16 @@ void fileBrowser::setFileView( int selection )
void fileBrowser::populateList()
{
ListView->clear();
+ bool isDir=FALSE;
//qDebug(currentDir.canonicalPath());
currentDir.setSorting(/* QDir::Size*/ /*| QDir::Reversed | */QDir::DirsFirst);
currentDir.setMatchAllDirs(TRUE);
currentDir.setNameFilter(filterStr);
// currentDir.setNameFilter("*.txt;*.etx");
- QString fileL, fileS;
+ QString fileL, fileS, fileDate;
const QFileInfoList *list = currentDir.entryInfoList( /*QDir::All*/ /*, QDir::SortByMask*/);
QFileInfoListIterator it(*list);
QFileInfo *fi;
while ( (fi=it.current()) ) {
@@ -135,22 +137,32 @@ void fileBrowser::populateList()
// qDebug("Symlink detected "+symLink);
QFileInfo sym( symLink);
fileS.sprintf( "%10li", sym.size() );
fileL.sprintf( "%s -> %s", sym.fileName().data(),sym.absFilePath().data() );
-
+ fileDate = sym.lastModified().toString();
} else {
// qDebug("Not a dir: "+currentDir.canonicalPath()+fileL);
fileS.sprintf( "%10li", fi->size() );
fileL.sprintf( "%s",fi->fileName().data() );
+ fileDate= fi->lastModified().toString();
if( QDir(QDir::cleanDirPath(currentDir.canonicalPath()+"/"+fileL)).exists() ) {
fileL+="/";
+ isDir=TRUE;
// qDebug( fileL);
}
}
- item= new QListViewItem( ListView,fileL,fileS );
+ if(fileL !="./") {
+ item= new QListViewItem( ListView,fileL,fileS , fileDate);
+ if(isDir || fileL.find("/",0,TRUE) != -1)
+ item->setPixmap( 0, Resource::loadPixmap( "folder" ));
+ else
+ item->setPixmap( 0, Resource::loadPixmap( "fileopen" ));
+ }
+ isDir=FALSE;
++it;
}
- ListView->setSorting( 2, FALSE);
+// ListView->setSorting( 2, FALSE);
+ ListView->setSorting( 3, FALSE);
dirLabel->setText(currentDir.canonicalPath());
}
void fileBrowser::upDir()
diff --git a/core/apps/textedit/textedit.cpp b/core/apps/textedit/textedit.cpp
index 68ee1b4..d3f5fb4 100644
--- a/core/apps/textedit/textedit.cpp
+++ b/core/apps/textedit/textedit.cpp
@@ -355,9 +355,8 @@ TextEdit::TextEdit( QWidget *parent, const char *name, WFlags f )
searchBar->setStretchableWidget( searchEdit );
connect( searchEdit, SIGNAL( textChanged( const QString & ) ),
this, SLOT( search() ) );
-
a = new QAction( tr( "Find Next" ), Resource::loadPixmap( "next" ), QString::null, 0, this, 0 );
connect( a, SIGNAL( activated() ), this, SLOT( findNext() ) );
a->addTo( searchBar );
a->addTo( edit );
@@ -418,9 +417,9 @@ TextEdit::~TextEdit()
cfg.writeEntry("FontSize",f.pointSize());
cfg.writeEntry("Bold",f.bold());
cfg.writeEntry("Italic",f.italic());
cfg.writeEntry("Wrap",editor->wordWrap() == QMultiLineEdit::WidgetWidth);
- cfg.writeEntry( "FileView", viewSelection );
+ cfg.writeEntry( "FileView", viewSelection );
}
void TextEdit::zoomIn()
{
@@ -516,8 +515,12 @@ void TextEdit::fileOpen()
edited1=FALSE;
edited=FALSE;
if(caption().left(1)=="*")
setCaption(caption().right(caption().length()-1));
+ Config cfg("TextEdit");
+ cfg.setGroup("View");
+ if(cfg.readEntry("SearchBar","Closed") != "Opened")
+ searchBar->hide();
}
#if 0
void TextEdit::slotFind()
@@ -570,8 +573,12 @@ void TextEdit::editFind()
{
searchBar->show();
searchVisible = TRUE;
searchEdit->setFocus();
+ Config cfg("TextEdit");
+ cfg.setGroup("View");
+ cfg.writeEntry("SearchBar","Opened");
+
}
void TextEdit::findNext()
{
@@ -582,8 +589,12 @@ void TextEdit::findNext()
void TextEdit::findClose()
{
searchVisible = FALSE;
searchBar->hide();
+ Config cfg("TextEdit");
+ cfg.setGroup("View");
+ cfg.writeEntry("SearchBar","Closed");
+ cfg.write();
}
void TextEdit::search()
{