summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/apps/textedit/fileBrowser.cpp44
-rw-r--r--core/apps/textedit/fileBrowser.h11
-rw-r--r--core/apps/textedit/fileSaver.cpp35
-rw-r--r--core/apps/textedit/fileSaver.h7
-rw-r--r--core/apps/textedit/textedit.cpp4
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 @@
14#include "fileBrowser.h" 14#include "fileBrowser.h"
15#include <qpe/config.h> 15#include <qpe/config.h>
16#include <qpe/resource.h> 16#include <qpe/resource.h>
17#include <qpe/qpeapplication.h>
17 18
18#include <qlistview.h> 19#include <qlistview.h>
19#include <qpushbutton.h> 20#include <qpushbutton.h>
@@ -21,6 +22,8 @@
21#include <qmessagebox.h> 22#include <qmessagebox.h>
22#include <unistd.h> 23#include <unistd.h>
23 24
25
26
24fileBrowser::fileBrowser( QWidget* parent, const char* name, bool modal, WFlags fl , const QString filter ) 27fileBrowser::fileBrowser( QWidget* parent, const char* name, bool modal, WFlags fl , const QString filter )
25 : QDialog( parent, name, modal, fl ) 28 : QDialog( parent, name, modal, fl )
26{ 29{
@@ -34,11 +37,22 @@ fileBrowser::fileBrowser( QWidget* parent, const char* name, bool modal, WFlags
34 dirLabel->setText(currentDir.canonicalPath()); 37 dirLabel->setText(currentDir.canonicalPath());
35 dirLabel->setGeometry(10,20,230,15); 38 dirLabel->setGeometry(10,20,230,15);
36 39
37 QPushButton *homeButton; 40 homeButton = new QPushButton( Resource::loadIconSet("home"),"",this,"homeButton");
38 homeButton = new QPushButton(Resource::loadIconSet("home"),"",this,"homeButton");
39 homeButton->setGeometry(200,4,25,25); 41 homeButton->setGeometry(200,4,25,25);
40 connect(homeButton,SIGNAL(released()),this,SLOT(homeButtonPushed()) ); 42 connect(homeButton,SIGNAL(released()),this,SLOT(homeButtonPushed()) );
41 43 homeButton->setFlat(TRUE);
44
45 docButton = new QPushButton(Resource::loadIconSet("DocsIcon"),"",this,"docsButton");
46 docButton->setGeometry(170,4,25,25);
47 connect( docButton,SIGNAL(released()),this,SLOT( docButtonPushed()) );
48 docButton->setFlat(TRUE);
49
50 hideButton = new QPushButton( Resource::loadIconSet("s_hidden"),"",this,"hideButton");
51 hideButton->setGeometry(140,4,25,25);
52 connect( hideButton,SIGNAL(toggled(bool)),this,SLOT( hideButtonPushed(bool)) );
53 hideButton->setToggleButton(TRUE);
54 hideButton->setFlat(TRUE);
55
42 ListView = new QListView( this, "ListView" ); 56 ListView = new QListView( this, "ListView" );
43 ListView->addColumn( tr( "Name" ) ); 57 ListView->addColumn( tr( "Name" ) );
44 ListView->setColumnWidth(0,140); 58 ListView->setColumnWidth(0,140);
@@ -58,6 +72,8 @@ fileBrowser::fileBrowser( QWidget* parent, const char* name, bool modal, WFlags
58 connect( ListView, SIGNAL(doubleClicked( QListViewItem*)), SLOT(listDoubleClicked(QListViewItem *)) ); 72 connect( ListView, SIGNAL(doubleClicked( QListViewItem*)), SLOT(listDoubleClicked(QListViewItem *)) );
59 connect( ListView, SIGNAL(pressed( QListViewItem*)), SLOT(listClicked(QListViewItem *)) ); 73 connect( ListView, SIGNAL(pressed( QListViewItem*)), SLOT(listClicked(QListViewItem *)) );
60 currentDir.setPath(QDir::currentDirPath()); 74 currentDir.setPath(QDir::currentDirPath());
75 currentDir.setFilter( QDir::Files | QDir::Dirs/* | QDir::Hidden */| QDir::All);
76
61 populateList(); 77 populateList();
62 move(0,15); 78 move(0,15);
63} 79}
@@ -71,7 +87,6 @@ void fileBrowser::populateList()
71{ 87{
72 ListView->clear(); 88 ListView->clear();
73//qDebug(currentDir.canonicalPath()); 89//qDebug(currentDir.canonicalPath());
74 currentDir.setFilter( QDir::Files | QDir::Dirs | QDir::Hidden | QDir::All);
75 currentDir.setSorting(/* QDir::Size*/ /*| QDir::Reversed | */QDir::DirsFirst); 90 currentDir.setSorting(/* QDir::Size*/ /*| QDir::Reversed | */QDir::DirsFirst);
76 currentDir.setMatchAllDirs(TRUE); 91 currentDir.setMatchAllDirs(TRUE);
77 92
@@ -178,3 +193,24 @@ void fileBrowser::homeButtonPushed() {
178 populateList(); 193 populateList();
179 update(); 194 update();
180} 195}
196
197void fileBrowser::docButtonPushed() {
198 chdir( QString(QPEApplication::documentDir()+"/text").latin1() );
199 currentDir.cd( QPEApplication::documentDir()+"/text", TRUE);
200 populateList();
201 update();
202
203}
204
205void fileBrowser::hideButtonPushed(bool b) {
206 if (b)
207 currentDir.setFilter( QDir::Files | QDir::Dirs | QDir::Hidden | QDir::All);
208 else
209 currentDir.setFilter( QDir::Files | QDir::Dirs/* | QDir::Hidden*/ | QDir::All);
210
211// chdir( QString(QPEApplication::documentDir()+"/text").latin1() );
212// currentDir.cd( QPEApplication::documentDir()+"/text", TRUE);
213 populateList();
214 update();
215
216}
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:
39 fileBrowser( QWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ,const QString filter=0); 39 fileBrowser( QWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ,const QString filter=0);
40 ~fileBrowser(); 40 ~fileBrowser();
41 41
42 QPushButton* buttonOk; 42 QPushButton *buttonOk, *buttonCancel, *homeButton, *docButton, *hideButton;
43 QListView* ListView; 43 QListView* ListView;
44 QPushButton* buttonCancel; 44
45 QLabel *dirLabel; 45 QLabel *dirLabel;
46 QString selectedFileName, filterStr; 46 QString selectedFileName, filterStr;
47 QDir currentDir; 47 QDir currentDir;
48 QFile file; 48 QFile file;
49 QStringList fileList; 49 QStringList fileList;
50 50 QListViewItem * item;
51QListViewItem * item;
52public slots: 51public slots:
53void homeButtonPushed(); 52 void homeButtonPushed();
53 void docButtonPushed();
54 void hideButtonPushed(bool);
54private: 55private:
55 56
56private slots: 57private 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
39 dirLabel->setText(currentDir.canonicalPath()); 39 dirLabel->setText(currentDir.canonicalPath());
40 dirLabel->setGeometry(10,20,230,15); 40 dirLabel->setGeometry(10,20,230,15);
41 41
42 QPushButton *homeButton;
43 homeButton = new QPushButton(Resource::loadIconSet("home"),"",this,"homeButton"); 42 homeButton = new QPushButton(Resource::loadIconSet("home"),"",this,"homeButton");
44 homeButton->setGeometry(200,4,25,25); 43 homeButton->setGeometry(200,4,25,25);
45 connect(homeButton,SIGNAL(released()),this,SLOT(homeButtonPushed()) ); 44 connect(homeButton,SIGNAL(released()),this,SLOT(homeButtonPushed()) );
45 homeButton->setFlat(TRUE);
46 46
47 docButton = new QPushButton(Resource::loadIconSet("DocsIcon"),"",this,"docsButton");
48 docButton->setGeometry(170,4,25,25);
49 connect( docButton,SIGNAL(released()),this,SLOT( docButtonPushed()) );
50 docButton->setFlat(TRUE);
51
52 hideButton = new QPushButton( Resource::loadIconSet("s_hidden"),"",this,"hideButton");
53 hideButton->setGeometry(140,4,25,25);
54 connect( hideButton,SIGNAL(toggled(bool)),this,SLOT( hideButtonPushed(bool)) );
55 hideButton->setToggleButton(TRUE);
56 hideButton->setFlat(TRUE);
57
47 ListView = new QListView( this, "ListView" ); 58 ListView = new QListView( this, "ListView" );
48 ListView->addColumn( tr( "Name" ) ); 59 ListView->addColumn( tr( "Name" ) );
49 ListView->setColumnWidth(0,140); 60 ListView->setColumnWidth(0,140);
@@ -73,6 +84,7 @@ fileSaver::fileSaver( QWidget* parent, const char* name, bool modal, WFlags fl
73// tmpFileName=fi.FilePath(); 84// tmpFileName=fi.FilePath();
74// qDebug( tmpFileName); 85// qDebug( tmpFileName);
75 currentDir.setPath( QDir::currentDirPath() ); 86 currentDir.setPath( QDir::currentDirPath() );
87 currentDir.setFilter( QDir::Files | QDir::Dirs/* | QDir::Hidden */| QDir::All);
76 populateList(); 88 populateList();
77 move(0,15); 89 move(0,15);
78 fileEdit->setFocus(); 90 fileEdit->setFocus();
@@ -85,7 +97,6 @@ fileSaver::~fileSaver()
85void fileSaver::populateList() 97void fileSaver::populateList()
86{ 98{
87 ListView->clear(); 99 ListView->clear();
88 currentDir.setFilter( QDir::Files | QDir::Dirs | QDir::Hidden );
89 currentDir.setSorting(/* QDir::Size*/ /*| QDir::Reversed | */QDir::DirsFirst); 100 currentDir.setSorting(/* QDir::Size*/ /*| QDir::Reversed | */QDir::DirsFirst);
90 currentDir.setMatchAllDirs(TRUE); 101 currentDir.setMatchAllDirs(TRUE);
91 102
@@ -200,3 +211,23 @@ void fileSaver::homeButtonPushed() {
200 populateList(); 211 populateList();
201 update(); 212 update();
202} 213}
214void fileSaver::docButtonPushed() {
215 chdir( QString(QPEApplication::documentDir()+"/text").latin1() );
216 currentDir.cd( QPEApplication::documentDir()+"/text", TRUE);
217 populateList();
218 update();
219
220}
221
222void fileSaver::hideButtonPushed(bool b) {
223 if (b)
224 currentDir.setFilter( QDir::Files | QDir::Dirs | QDir::Hidden | QDir::All);
225 else
226 currentDir.setFilter( QDir::Files | QDir::Dirs/* | QDir::Hidden*/ | QDir::All);
227
228// chdir( QString(QPEApplication::documentDir()+"/text").latin1() );
229// currentDir.cd( QPEApplication::documentDir()+"/text", TRUE);
230 populateList();
231 update();
232
233}
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:
43 ~fileSaver(); 43 ~fileSaver();
44 QLineEdit *fileEdit; 44 QLineEdit *fileEdit;
45 45
46 QPushButton* buttonOk; 46 QPushButton *buttonOk, *buttonCancel, *homeButton, *docButton, *hideButton;
47 QListView* ListView; 47 QListView* ListView;
48 QPushButton* buttonCancel;
49 QLabel *dirLabel; 48 QLabel *dirLabel;
50 QString selectedFileName, filterStr; 49 QString selectedFileName, filterStr;
51 QDir currentDir; 50 QDir currentDir;
@@ -55,7 +54,9 @@ public:
55 54
56QListViewItem * item; 55QListViewItem * item;
57public slots: 56public slots:
58void homeButtonPushed(); 57 void homeButtonPushed();
58 void docButtonPushed();
59 void hideButtonPushed(bool);
59private: 60private:
60 61
61private slots: 62private 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()
561 editor->setEdited( FALSE); 561 editor->setEdited( FALSE);
562 edited1=FALSE; 562 edited1=FALSE;
563 edited=FALSE; 563 edited=FALSE;
564 setCaption(caption().right(caption().length()-1)); 564 if(caption().left(1)=="*")
565 setCaption(caption().right(caption().length()-1));
565} 566}
566 567
567#if 0 568#if 0
@@ -692,7 +693,6 @@ void TextEdit::openFile( const DocLnk &f )
692 editor->setEdited( FALSE); 693 editor->setEdited( FALSE);
693 edited1=FALSE; 694 edited1=FALSE;
694 edited=FALSE; 695 edited=FALSE;
695 setCaption(caption().right(caption().length()-1));
696 696
697 qDebug("openFile doclnk "+currentFileName); 697 qDebug("openFile doclnk "+currentFileName);
698 doc->setName(currentFileName); 698 doc->setName(currentFileName);