-rw-r--r-- | core/apps/textedit/fileBrowser.cpp | 44 | ||||
-rw-r--r-- | core/apps/textedit/fileBrowser.h | 11 | ||||
-rw-r--r-- | core/apps/textedit/fileSaver.cpp | 35 | ||||
-rw-r--r-- | core/apps/textedit/fileSaver.h | 7 | ||||
-rw-r--r-- | core/apps/textedit/textedit.cpp | 4 |
5 files changed, 85 insertions, 16 deletions
diff --git a/core/apps/textedit/fileBrowser.cpp b/core/apps/textedit/fileBrowser.cpp index 8c1e962..c16bd41 100644 --- a/core/apps/textedit/fileBrowser.cpp +++ b/core/apps/textedit/fileBrowser.cpp @@ -14,6 +14,7 @@ #include "fileBrowser.h" #include <qpe/config.h> #include <qpe/resource.h> +#include <qpe/qpeapplication.h> #include <qlistview.h> #include <qpushbutton.h> @@ -21,6 +22,8 @@ #include <qmessagebox.h> #include <unistd.h> + + fileBrowser::fileBrowser( QWidget* parent, const char* name, bool modal, WFlags fl , const QString filter ) : QDialog( parent, name, modal, fl ) { @@ -34,11 +37,22 @@ fileBrowser::fileBrowser( QWidget* parent, const char* name, bool modal, WFlags dirLabel->setText(currentDir.canonicalPath()); dirLabel->setGeometry(10,20,230,15); - QPushButton *homeButton; - homeButton = new QPushButton(Resource::loadIconSet("home"),"",this,"homeButton"); + homeButton = new QPushButton( Resource::loadIconSet("home"),"",this,"homeButton"); homeButton->setGeometry(200,4,25,25); connect(homeButton,SIGNAL(released()),this,SLOT(homeButtonPushed()) ); - + homeButton->setFlat(TRUE); + + docButton = new QPushButton(Resource::loadIconSet("DocsIcon"),"",this,"docsButton"); + docButton->setGeometry(170,4,25,25); + connect( docButton,SIGNAL(released()),this,SLOT( docButtonPushed()) ); + docButton->setFlat(TRUE); + + hideButton = new QPushButton( Resource::loadIconSet("s_hidden"),"",this,"hideButton"); + hideButton->setGeometry(140,4,25,25); + connect( hideButton,SIGNAL(toggled(bool)),this,SLOT( hideButtonPushed(bool)) ); + hideButton->setToggleButton(TRUE); + hideButton->setFlat(TRUE); + ListView = new QListView( this, "ListView" ); ListView->addColumn( tr( "Name" ) ); ListView->setColumnWidth(0,140); @@ -58,6 +72,8 @@ fileBrowser::fileBrowser( QWidget* parent, const char* name, bool modal, WFlags connect( ListView, SIGNAL(doubleClicked( QListViewItem*)), SLOT(listDoubleClicked(QListViewItem *)) ); connect( ListView, SIGNAL(pressed( QListViewItem*)), SLOT(listClicked(QListViewItem *)) ); currentDir.setPath(QDir::currentDirPath()); + currentDir.setFilter( QDir::Files | QDir::Dirs/* | QDir::Hidden */| QDir::All); + populateList(); move(0,15); } @@ -71,7 +87,6 @@ void fileBrowser::populateList() { ListView->clear(); //qDebug(currentDir.canonicalPath()); - currentDir.setFilter( QDir::Files | QDir::Dirs | QDir::Hidden | QDir::All); currentDir.setSorting(/* QDir::Size*/ /*| QDir::Reversed | */QDir::DirsFirst); currentDir.setMatchAllDirs(TRUE); @@ -178,3 +193,24 @@ void fileBrowser::homeButtonPushed() { populateList(); update(); } + +void fileBrowser::docButtonPushed() { + chdir( QString(QPEApplication::documentDir()+"/text").latin1() ); + currentDir.cd( QPEApplication::documentDir()+"/text", TRUE); + populateList(); + update(); + +} + +void fileBrowser::hideButtonPushed(bool b) { + if (b) + currentDir.setFilter( QDir::Files | QDir::Dirs | QDir::Hidden | QDir::All); + else + currentDir.setFilter( QDir::Files | QDir::Dirs/* | QDir::Hidden*/ | QDir::All); + +// chdir( QString(QPEApplication::documentDir()+"/text").latin1() ); +// currentDir.cd( QPEApplication::documentDir()+"/text", TRUE); + populateList(); + update(); + +} diff --git a/core/apps/textedit/fileBrowser.h b/core/apps/textedit/fileBrowser.h index c0e1d4a..50ed485 100644 --- a/core/apps/textedit/fileBrowser.h +++ b/core/apps/textedit/fileBrowser.h @@ -39,18 +39,19 @@ public: fileBrowser( QWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ,const QString filter=0); ~fileBrowser(); - QPushButton* buttonOk; + QPushButton *buttonOk, *buttonCancel, *homeButton, *docButton, *hideButton; QListView* ListView; - QPushButton* buttonCancel; + QLabel *dirLabel; QString selectedFileName, filterStr; QDir currentDir; QFile file; QStringList fileList; - -QListViewItem * item; + QListViewItem * item; public slots: -void homeButtonPushed(); + void homeButtonPushed(); + void docButtonPushed(); + void hideButtonPushed(bool); private: private slots: diff --git a/core/apps/textedit/fileSaver.cpp b/core/apps/textedit/fileSaver.cpp index 4e80735..fbf50cf 100644 --- a/core/apps/textedit/fileSaver.cpp +++ b/core/apps/textedit/fileSaver.cpp @@ -39,11 +39,22 @@ fileSaver::fileSaver( QWidget* parent, const char* name, bool modal, WFlags fl dirLabel->setText(currentDir.canonicalPath()); dirLabel->setGeometry(10,20,230,15); - QPushButton *homeButton; homeButton = new QPushButton(Resource::loadIconSet("home"),"",this,"homeButton"); homeButton->setGeometry(200,4,25,25); connect(homeButton,SIGNAL(released()),this,SLOT(homeButtonPushed()) ); + homeButton->setFlat(TRUE); + docButton = new QPushButton(Resource::loadIconSet("DocsIcon"),"",this,"docsButton"); + docButton->setGeometry(170,4,25,25); + connect( docButton,SIGNAL(released()),this,SLOT( docButtonPushed()) ); + docButton->setFlat(TRUE); + + hideButton = new QPushButton( Resource::loadIconSet("s_hidden"),"",this,"hideButton"); + hideButton->setGeometry(140,4,25,25); + connect( hideButton,SIGNAL(toggled(bool)),this,SLOT( hideButtonPushed(bool)) ); + hideButton->setToggleButton(TRUE); + hideButton->setFlat(TRUE); + ListView = new QListView( this, "ListView" ); ListView->addColumn( tr( "Name" ) ); ListView->setColumnWidth(0,140); @@ -73,6 +84,7 @@ fileSaver::fileSaver( QWidget* parent, const char* name, bool modal, WFlags fl // tmpFileName=fi.FilePath(); // qDebug( tmpFileName); currentDir.setPath( QDir::currentDirPath() ); + currentDir.setFilter( QDir::Files | QDir::Dirs/* | QDir::Hidden */| QDir::All); populateList(); move(0,15); fileEdit->setFocus(); @@ -85,7 +97,6 @@ fileSaver::~fileSaver() void fileSaver::populateList() { ListView->clear(); - currentDir.setFilter( QDir::Files | QDir::Dirs | QDir::Hidden ); currentDir.setSorting(/* QDir::Size*/ /*| QDir::Reversed | */QDir::DirsFirst); currentDir.setMatchAllDirs(TRUE); @@ -200,3 +211,23 @@ void fileSaver::homeButtonPushed() { populateList(); update(); } +void fileSaver::docButtonPushed() { + chdir( QString(QPEApplication::documentDir()+"/text").latin1() ); + currentDir.cd( QPEApplication::documentDir()+"/text", TRUE); + populateList(); + update(); + +} + +void fileSaver::hideButtonPushed(bool b) { + if (b) + currentDir.setFilter( QDir::Files | QDir::Dirs | QDir::Hidden | QDir::All); + else + currentDir.setFilter( QDir::Files | QDir::Dirs/* | QDir::Hidden*/ | QDir::All); + +// chdir( QString(QPEApplication::documentDir()+"/text").latin1() ); +// currentDir.cd( QPEApplication::documentDir()+"/text", TRUE); + populateList(); + update(); + +} diff --git a/core/apps/textedit/fileSaver.h b/core/apps/textedit/fileSaver.h index 526085d..195a775 100644 --- a/core/apps/textedit/fileSaver.h +++ b/core/apps/textedit/fileSaver.h @@ -43,9 +43,8 @@ public: ~fileSaver(); QLineEdit *fileEdit; - QPushButton* buttonOk; + QPushButton *buttonOk, *buttonCancel, *homeButton, *docButton, *hideButton; QListView* ListView; - QPushButton* buttonCancel; QLabel *dirLabel; QString selectedFileName, filterStr; QDir currentDir; @@ -55,7 +54,9 @@ public: QListViewItem * item; public slots: -void homeButtonPushed(); + void homeButtonPushed(); + void docButtonPushed(); + void hideButtonPushed(bool); private: private slots: diff --git a/core/apps/textedit/textedit.cpp b/core/apps/textedit/textedit.cpp index 78c4d8a..dafe1dc 100644 --- a/core/apps/textedit/textedit.cpp +++ b/core/apps/textedit/textedit.cpp @@ -561,7 +561,8 @@ void TextEdit::newFileOpen() editor->setEdited( FALSE); edited1=FALSE; edited=FALSE; - setCaption(caption().right(caption().length()-1)); + if(caption().left(1)=="*") + setCaption(caption().right(caption().length()-1)); } #if 0 @@ -692,7 +693,6 @@ void TextEdit::openFile( const DocLnk &f ) editor->setEdited( FALSE); edited1=FALSE; edited=FALSE; - setCaption(caption().right(caption().length()-1)); qDebug("openFile doclnk "+currentFileName); doc->setName(currentFileName); |