author | llornkcor <llornkcor> | 2002-03-10 03:22:06 (UTC) |
---|---|---|
committer | llornkcor <llornkcor> | 2002-03-10 03:22:06 (UTC) |
commit | 115b05c0aa6e11d8a0265f2e6806bdf9d03a404a (patch) (unidiff) | |
tree | 2d1648da4632fa2d248159a26abf2da30dff379e | |
parent | 637cea2664defb5414a3897f70b616deba926ffe (diff) | |
download | opie-115b05c0aa6e11d8a0265f2e6806bdf9d03a404a.zip opie-115b05c0aa6e11d8a0265f2e6806bdf9d03a404a.tar.gz opie-115b05c0aa6e11d8a0265f2e6806bdf9d03a404a.tar.bz2 |
added a documents and hidden file buttons to fileSaver and fileBrowser
-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 | |||
@@ -1,180 +1,216 @@ | |||
1 | /**************************************************************************** | 1 | /**************************************************************************** |
2 | ** copyright 2001 ljp ljp@llornkcor.com | 2 | ** copyright 2001 ljp ljp@llornkcor.com |
3 | ** Created: Fri Dec 14 08:16:46 2001 | 3 | ** Created: Fri Dec 14 08:16:46 2001 |
4 | ** | 4 | ** |
5 | ** This file may be distributed and/or modified under the terms of the | 5 | ** This file may be distributed and/or modified under the terms of the |
6 | ** GNU General Public License version 2 as published by the Free Software | 6 | ** GNU General Public License version 2 as published by the Free Software |
7 | ** Foundation and appearing in the file LICENSE.GPL included in the | 7 | ** Foundation and appearing in the file LICENSE.GPL included in the |
8 | ** packaging of this file. | 8 | ** packaging of this file. |
9 | ** | 9 | ** |
10 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE | 10 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE |
11 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. | 11 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. |
12 | ** | 12 | ** |
13 | ****************************************************************************/ | 13 | ****************************************************************************/ |
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> |
20 | #include <qfile.h> | 21 | #include <qfile.h> |
21 | #include <qmessagebox.h> | 22 | #include <qmessagebox.h> |
22 | #include <unistd.h> | 23 | #include <unistd.h> |
23 | 24 | ||
25 | |||
26 | |||
24 | fileBrowser::fileBrowser( QWidget* parent, const char* name, bool modal, WFlags fl , const QString filter ) | 27 | fileBrowser::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 | { |
27 | if ( !name ) | 30 | if ( !name ) |
28 | setName( "fileBrowser" ); | 31 | setName( "fileBrowser" ); |
29 | resize( 240, 280 ); | 32 | resize( 240, 280 ); |
30 | setCaption(tr( name ) ); | 33 | setCaption(tr( name ) ); |
31 | filterStr=filter; | 34 | filterStr=filter; |
32 | 35 | ||
33 | dirLabel = new QLabel(this, "DirLabel"); | 36 | dirLabel = new QLabel(this, "DirLabel"); |
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); |
45 | ListView->setSorting( 2, FALSE); | 59 | ListView->setSorting( 2, FALSE); |
46 | ListView->addColumn( tr( "Size" ) ); | 60 | ListView->addColumn( tr( "Size" ) ); |
47 | ListView->setColumnWidth(1,59); | 61 | ListView->setColumnWidth(1,59); |
48 | // ListView->addColumn( tr( "" ) ); | 62 | // ListView->addColumn( tr( "" ) ); |
49 | ListView->setColumnWidthMode(0,QListView::Manual); | 63 | ListView->setColumnWidthMode(0,QListView::Manual); |
50 | ListView->setColumnAlignment(1,QListView::AlignRight); | 64 | ListView->setColumnAlignment(1,QListView::AlignRight); |
51 | // ListView->setMultiSelection(true); | 65 | // ListView->setMultiSelection(true); |
52 | // ListView->setSelectionMode(QListView::Extended); | 66 | // ListView->setSelectionMode(QListView::Extended); |
53 | 67 | ||
54 | ListView->setAllColumnsShowFocus( TRUE ); | 68 | ListView->setAllColumnsShowFocus( TRUE ); |
55 | ListView->setGeometry( QRect( 10, 35, 220, 240 ) ); | 69 | ListView->setGeometry( QRect( 10, 35, 220, 240 ) ); |
56 | 70 | ||
57 | // signals and slots connections | 71 | // signals and slots connections |
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 | } |
64 | 80 | ||
65 | fileBrowser::~fileBrowser() | 81 | fileBrowser::~fileBrowser() |
66 | { | 82 | { |
67 | } | 83 | } |
68 | 84 | ||
69 | 85 | ||
70 | void fileBrowser::populateList() | 86 | 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 | ||
78 | currentDir.setNameFilter(filterStr); | 93 | currentDir.setNameFilter(filterStr); |
79 | // currentDir.setNameFilter("*.txt;*.etx"); | 94 | // currentDir.setNameFilter("*.txt;*.etx"); |
80 | QString fileL, fileS; | 95 | QString fileL, fileS; |
81 | const QFileInfoList *list = currentDir.entryInfoList( /*QDir::All*/ /*, QDir::SortByMask*/); | 96 | const QFileInfoList *list = currentDir.entryInfoList( /*QDir::All*/ /*, QDir::SortByMask*/); |
82 | QFileInfoListIterator it(*list); | 97 | QFileInfoListIterator it(*list); |
83 | QFileInfo *fi; | 98 | QFileInfo *fi; |
84 | while ( (fi=it.current()) ) { | 99 | while ( (fi=it.current()) ) { |
85 | 100 | ||
86 | if (fi->isSymLink() ){ | 101 | if (fi->isSymLink() ){ |
87 | QString symLink=fi->readLink(); | 102 | QString symLink=fi->readLink(); |
88 | // qDebug("Symlink detected "+symLink); | 103 | // qDebug("Symlink detected "+symLink); |
89 | QFileInfo sym( symLink); | 104 | QFileInfo sym( symLink); |
90 | fileS.sprintf( "%10li", sym.size() ); | 105 | fileS.sprintf( "%10li", sym.size() ); |
91 | fileL.sprintf( "%s -> %s", sym.fileName().data(),sym.absFilePath().data() ); | 106 | fileL.sprintf( "%s -> %s", sym.fileName().data(),sym.absFilePath().data() ); |
92 | 107 | ||
93 | } else { | 108 | } else { |
94 | // qDebug("Not a dir: "+currentDir.canonicalPath()+fileL); | 109 | // qDebug("Not a dir: "+currentDir.canonicalPath()+fileL); |
95 | fileS.sprintf( "%10li", fi->size() ); | 110 | fileS.sprintf( "%10li", fi->size() ); |
96 | fileL.sprintf( "%s",fi->fileName().data() ); | 111 | fileL.sprintf( "%s",fi->fileName().data() ); |
97 | if( QDir(QDir::cleanDirPath(currentDir.canonicalPath()+"/"+fileL)).exists() ) { | 112 | if( QDir(QDir::cleanDirPath(currentDir.canonicalPath()+"/"+fileL)).exists() ) { |
98 | fileL+="/"; | 113 | fileL+="/"; |
99 | // qDebug( fileL); | 114 | // qDebug( fileL); |
100 | } | 115 | } |
101 | } | 116 | } |
102 | item= new QListViewItem( ListView,fileL,fileS ); | 117 | item= new QListViewItem( ListView,fileL,fileS ); |
103 | ++it; | 118 | ++it; |
104 | } | 119 | } |
105 | ListView->setSorting( 2, FALSE); | 120 | ListView->setSorting( 2, FALSE); |
106 | dirLabel->setText(currentDir.canonicalPath()); | 121 | dirLabel->setText(currentDir.canonicalPath()); |
107 | } | 122 | } |
108 | 123 | ||
109 | void fileBrowser::upDir() | 124 | void fileBrowser::upDir() |
110 | { | 125 | { |
111 | // qDebug(currentDir.canonicalPath()); | 126 | // qDebug(currentDir.canonicalPath()); |
112 | } | 127 | } |
113 | 128 | ||
114 | void fileBrowser::listDoubleClicked(QListViewItem *selectedItem) | 129 | void fileBrowser::listDoubleClicked(QListViewItem *selectedItem) |
115 | { | 130 | { |
116 | } | 131 | } |
117 | 132 | ||
118 | // you may want to switch these 2 functions. I like single clicks | 133 | // you may want to switch these 2 functions. I like single clicks |
119 | void fileBrowser::listClicked(QListViewItem *selectedItem) | 134 | void fileBrowser::listClicked(QListViewItem *selectedItem) |
120 | { | 135 | { |
121 | QString strItem=selectedItem->text(0); | 136 | QString strItem=selectedItem->text(0); |
122 | QString strSize=selectedItem->text(1); | 137 | QString strSize=selectedItem->text(1); |
123 | // qDebug("strItem is "+strItem); | 138 | // qDebug("strItem is "+strItem); |
124 | strSize.stripWhiteSpace(); | 139 | strSize.stripWhiteSpace(); |
125 | // qDebug(strSize); | 140 | // qDebug(strSize); |
126 | 141 | ||
127 | if(strItem.find("@",0,TRUE) !=-1 || strItem.find("->",0,TRUE) !=-1 ) { //if symlink | 142 | if(strItem.find("@",0,TRUE) !=-1 || strItem.find("->",0,TRUE) !=-1 ) { //if symlink |
128 | // is symlink | 143 | // is symlink |
129 | QString strItem2=strItem.right( (strItem.length()-strItem.find("->",0,TRUE)) -4); | 144 | QString strItem2=strItem.right( (strItem.length()-strItem.find("->",0,TRUE)) -4); |
130 | // qDebug("strItem symlink is "+strItem2); | 145 | // qDebug("strItem symlink is "+strItem2); |
131 | if(QDir(strItem2).exists() ) { | 146 | if(QDir(strItem2).exists() ) { |
132 | currentDir.cd(strItem2, TRUE); | 147 | currentDir.cd(strItem2, TRUE); |
133 | populateList(); | 148 | populateList(); |
134 | } | 149 | } |
135 | } else { // not a symlink | 150 | } else { // not a symlink |
136 | if(strItem.find(". .",0,TRUE) && strItem.find("/",0,TRUE)!=-1 ) { | 151 | if(strItem.find(". .",0,TRUE) && strItem.find("/",0,TRUE)!=-1 ) { |
137 | if(QDir(QDir::cleanDirPath(currentDir.canonicalPath()+"/"+strItem)).exists() ) { | 152 | if(QDir(QDir::cleanDirPath(currentDir.canonicalPath()+"/"+strItem)).exists() ) { |
138 | strItem=QDir::cleanDirPath(currentDir.canonicalPath()+"/"+strItem); | 153 | strItem=QDir::cleanDirPath(currentDir.canonicalPath()+"/"+strItem); |
139 | currentDir.cd(strItem,FALSE); | 154 | currentDir.cd(strItem,FALSE); |
140 | // qDebug("Path is "+strItem); | 155 | // qDebug("Path is "+strItem); |
141 | populateList(); | 156 | populateList(); |
142 | } else { | 157 | } else { |
143 | currentDir.cdUp(); | 158 | currentDir.cdUp(); |
144 | populateList(); | 159 | populateList(); |
145 | } | 160 | } |
146 | if(QDir(strItem).exists()){ | 161 | if(QDir(strItem).exists()){ |
147 | currentDir.cd(strItem, TRUE); | 162 | currentDir.cd(strItem, TRUE); |
148 | populateList(); | 163 | populateList(); |
149 | } | 164 | } |
150 | } else { | 165 | } else { |
151 | strItem=QDir::cleanDirPath(currentDir.canonicalPath()+"/"+strItem); | 166 | strItem=QDir::cleanDirPath(currentDir.canonicalPath()+"/"+strItem); |
152 | if( QFile::exists(strItem ) ) { | 167 | if( QFile::exists(strItem ) ) { |
153 | //currentDir.canonicalPath() | 168 | //currentDir.canonicalPath() |
154 | qDebug("We found our files!!"+strItem); | 169 | qDebug("We found our files!!"+strItem); |
155 | OnOK(); | 170 | OnOK(); |
156 | } | 171 | } |
157 | } //end not symlink | 172 | } //end not symlink |
158 | chdir(strItem.latin1()); | 173 | chdir(strItem.latin1()); |
159 | } | 174 | } |
160 | } | 175 | } |
161 | 176 | ||
162 | void fileBrowser::OnOK() | 177 | void fileBrowser::OnOK() |
163 | { | 178 | { |
164 | QListViewItemIterator it1( ListView); | 179 | QListViewItemIterator it1( ListView); |
165 | for ( ; it1.current(); ++it1 ) { | 180 | for ( ; it1.current(); ++it1 ) { |
166 | if ( it1.current()->isSelected() ) { | 181 | if ( it1.current()->isSelected() ) { |
167 | selectedFileName=QDir::cleanDirPath(currentDir.canonicalPath()+"/"+it1.current()->text(0)); | 182 | selectedFileName=QDir::cleanDirPath(currentDir.canonicalPath()+"/"+it1.current()->text(0)); |
168 | qDebug("selected filename is "+selectedFileName); | 183 | qDebug("selected filename is "+selectedFileName); |
169 | fileList.append( selectedFileName ); | 184 | fileList.append( selectedFileName ); |
170 | } | 185 | } |
171 | } | 186 | } |
172 | accept(); | 187 | accept(); |
173 | } | 188 | } |
174 | 189 | ||
175 | void fileBrowser::homeButtonPushed() { | 190 | void fileBrowser::homeButtonPushed() { |
176 | chdir( QDir::homeDirPath().latin1() ); | 191 | chdir( QDir::homeDirPath().latin1() ); |
177 | currentDir.cd( QDir::homeDirPath(), TRUE); | 192 | currentDir.cd( QDir::homeDirPath(), TRUE); |
178 | populateList(); | 193 | populateList(); |
179 | update(); | 194 | update(); |
180 | } | 195 | } |
196 | |||
197 | void fileBrowser::docButtonPushed() { | ||
198 | chdir( QString(QPEApplication::documentDir()+"/text").latin1() ); | ||
199 | currentDir.cd( QPEApplication::documentDir()+"/text", TRUE); | ||
200 | populateList(); | ||
201 | update(); | ||
202 | |||
203 | } | ||
204 | |||
205 | void 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 | |||
@@ -1,67 +1,68 @@ | |||
1 | /**************************************************************************** | 1 | /**************************************************************************** |
2 | ** | 2 | ** |
3 | ** Created: Fri Dec 14 08:16:02 2001 | 3 | ** Created: Fri Dec 14 08:16:02 2001 |
4 | ** | 4 | ** |
5 | ** This file may be distributed and/or modified under the terms of the | 5 | ** This file may be distributed and/or modified under the terms of the |
6 | ** GNU General Public License version 2 as published by the Free Software | 6 | ** GNU General Public License version 2 as published by the Free Software |
7 | ** Foundation and appearing in the file LICENSE.GPL included in the | 7 | ** Foundation and appearing in the file LICENSE.GPL included in the |
8 | ** packaging of this file. | 8 | ** packaging of this file. |
9 | ** | 9 | ** |
10 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE | 10 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE |
11 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. | 11 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. |
12 | ** | 12 | ** |
13 | copyright Sun 02-17-2002 22:28:23 L. J. Potter ljp@llornkcor.com | 13 | copyright Sun 02-17-2002 22:28:23 L. J. Potter ljp@llornkcor.com |
14 | ****************************************************************************/ | 14 | ****************************************************************************/ |
15 | #ifndef FILEBROWSER_H | 15 | #ifndef FILEBROWSER_H |
16 | #define FILEBROWSER_H | 16 | #define FILEBROWSER_H |
17 | 17 | ||
18 | //#include <qvariant.h> | 18 | //#include <qvariant.h> |
19 | #include <qdialog.h> | 19 | #include <qdialog.h> |
20 | #include <qfile.h> | 20 | #include <qfile.h> |
21 | #include <qdir.h> | 21 | #include <qdir.h> |
22 | #include <qstringlist.h> | 22 | #include <qstringlist.h> |
23 | #include <qlabel.h> | 23 | #include <qlabel.h> |
24 | #include <qstring.h> | 24 | #include <qstring.h> |
25 | 25 | ||
26 | class QVBoxLayout; | 26 | class QVBoxLayout; |
27 | class QHBoxLayout; | 27 | class QHBoxLayout; |
28 | class QGridLayout; | 28 | class QGridLayout; |
29 | class QListView; | 29 | class QListView; |
30 | class QListViewItem; | 30 | class QListViewItem; |
31 | class QPushButton; | 31 | class QPushButton; |
32 | 32 | ||
33 | class fileBrowser : public QDialog | 33 | class fileBrowser : public QDialog |
34 | { | 34 | { |
35 | Q_OBJECT | 35 | Q_OBJECT |
36 | 36 | ||
37 | public: | 37 | public: |
38 | void populateList(); | 38 | void populateList(); |
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; | |
51 | QListViewItem * item; | ||
52 | public slots: | 51 | public slots: |
53 | void homeButtonPushed(); | 52 | void homeButtonPushed(); |
53 | void docButtonPushed(); | ||
54 | void hideButtonPushed(bool); | ||
54 | private: | 55 | private: |
55 | 56 | ||
56 | private slots: | 57 | private slots: |
57 | void upDir(); | 58 | void upDir(); |
58 | void listDoubleClicked(QListViewItem *); | 59 | void listDoubleClicked(QListViewItem *); |
59 | void listClicked(QListViewItem *); | 60 | void listClicked(QListViewItem *); |
60 | void OnOK(); | 61 | void OnOK(); |
61 | protected slots: | 62 | protected slots: |
62 | 63 | ||
63 | protected: | 64 | protected: |
64 | 65 | ||
65 | }; | 66 | }; |
66 | 67 | ||
67 | #endif // FILEBROWSER_H | 68 | #endif // FILEBROWSER_H |
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 | |||
@@ -1,202 +1,233 @@ | |||
1 | /**************************************************************************** | 1 | /**************************************************************************** |
2 | ** copyright 2001 ljp ljp@llornkcor.com | 2 | ** copyright 2001 ljp ljp@llornkcor.com |
3 | ** Created: Fri Dec 14 08:16:46 2001 fileSaver.cpp | 3 | ** Created: Fri Dec 14 08:16:46 2001 fileSaver.cpp |
4 | ** | 4 | ** |
5 | ** This file may be distributed and/or modified under the terms of the | 5 | ** This file may be distributed and/or modified under the terms of the |
6 | ** GNU General Public License version 2 as published by the Free Software | 6 | ** GNU General Public License version 2 as published by the Free Software |
7 | ** Foundation and appearing in the file LICENSE.GPL included in the | 7 | ** Foundation and appearing in the file LICENSE.GPL included in the |
8 | ** packaging of this file. | 8 | ** packaging of this file. |
9 | ** | 9 | ** |
10 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE | 10 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE |
11 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. | 11 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. |
12 | ** | 12 | ** |
13 | ****************************************************************************/ | 13 | ****************************************************************************/ |
14 | #include "fileSaver.h" | 14 | #include "fileSaver.h" |
15 | #include <qpe/config.h> | 15 | #include <qpe/config.h> |
16 | #include <qpe/resource.h> | 16 | #include <qpe/resource.h> |
17 | 17 | ||
18 | #include <qpe/qpeapplication.h> | 18 | #include <qpe/qpeapplication.h> |
19 | #include <qlistview.h> | 19 | #include <qlistview.h> |
20 | #include <qpushbutton.h> | 20 | #include <qpushbutton.h> |
21 | #include <qfile.h> | 21 | #include <qfile.h> |
22 | #include <qmessagebox.h> | 22 | #include <qmessagebox.h> |
23 | #include <qlineedit.h> | 23 | #include <qlineedit.h> |
24 | #include <qcheckbox.h> | 24 | #include <qcheckbox.h> |
25 | 25 | ||
26 | #include <unistd.h> | 26 | #include <unistd.h> |
27 | 27 | ||
28 | fileSaver::fileSaver( QWidget* parent, const char* name, bool modal, WFlags fl , const QString currentFileName ) | 28 | fileSaver::fileSaver( QWidget* parent, const char* name, bool modal, WFlags fl , const QString currentFileName ) |
29 | : QDialog( parent, name, modal, fl ) | 29 | : QDialog( parent, name, modal, fl ) |
30 | { | 30 | { |
31 | if ( !name ) | 31 | if ( !name ) |
32 | setName( "fileSaver" ); | 32 | setName( "fileSaver" ); |
33 | resize( 240, 280 ); | 33 | resize( 240, 280 ); |
34 | setCaption(tr( name ) ); | 34 | setCaption(tr( name ) ); |
35 | QFileInfo fi(currentFileName); | 35 | QFileInfo fi(currentFileName); |
36 | QString tmpFileName=fi.fileName(); | 36 | QString tmpFileName=fi.fileName(); |
37 | // qDebug( tmpFileName); | 37 | // qDebug( tmpFileName); |
38 | dirLabel = new QLabel(this, "DirLabel"); | 38 | dirLabel = new QLabel(this, "DirLabel"); |
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); |
50 | ListView->setSorting( 2, FALSE); | 61 | ListView->setSorting( 2, FALSE); |
51 | ListView->addColumn( tr( "Size" ) ); | 62 | ListView->addColumn( tr( "Size" ) ); |
52 | ListView->setColumnWidth(1,59); | 63 | ListView->setColumnWidth(1,59); |
53 | ListView->setColumnWidthMode(0,QListView::Manual); | 64 | ListView->setColumnWidthMode(0,QListView::Manual); |
54 | ListView->setColumnAlignment(1,QListView::AlignRight); | 65 | ListView->setColumnAlignment(1,QListView::AlignRight); |
55 | // ListView->setMultiSelection(true); | 66 | // ListView->setMultiSelection(true); |
56 | // ListView->setSelectionMode(QListView::Extended); | 67 | // ListView->setSelectionMode(QListView::Extended); |
57 | 68 | ||
58 | ListView->setAllColumnsShowFocus( TRUE ); | 69 | ListView->setAllColumnsShowFocus( TRUE ); |
59 | ListView->setGeometry( QRect( 10,35,220,125)); | 70 | ListView->setGeometry( QRect( 10,35,220,125)); |
60 | 71 | ||
61 | fileEdit= new QLineEdit(this); | 72 | fileEdit= new QLineEdit(this); |
62 | fileEdit->setGeometry( QRect( 10, 162, 205, 17)); | 73 | fileEdit->setGeometry( QRect( 10, 162, 205, 17)); |
63 | 74 | ||
64 | fileEdit->setText( tmpFileName); | 75 | fileEdit->setText( tmpFileName); |
65 | 76 | ||
66 | filePermCheck = new QCheckBox( this, "SetFilePerms" ); | 77 | filePermCheck = new QCheckBox( this, "SetFilePerms" ); |
67 | filePermCheck->setText("set file permissions"); | 78 | filePermCheck->setText("set file permissions"); |
68 | filePermCheck->setGeometry(10, 178, 150,17); | 79 | filePermCheck->setGeometry(10, 178, 150,17); |
69 | // signals and slots connections | 80 | // signals and slots connections |
70 | connect( ListView, SIGNAL(doubleClicked( QListViewItem*)), SLOT(listDoubleClicked(QListViewItem *)) ); | 81 | connect( ListView, SIGNAL(doubleClicked( QListViewItem*)), SLOT(listDoubleClicked(QListViewItem *)) ); |
71 | connect( ListView, SIGNAL(pressed( QListViewItem*)), SLOT(listClicked(QListViewItem *)) ); | 82 | connect( ListView, SIGNAL(pressed( QListViewItem*)), SLOT(listClicked(QListViewItem *)) ); |
72 | 83 | ||
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(); |
79 | } | 91 | } |
80 | 92 | ||
81 | fileSaver::~fileSaver() | 93 | fileSaver::~fileSaver() |
82 | { | 94 | { |
83 | } | 95 | } |
84 | 96 | ||
85 | void fileSaver::populateList() | 97 | void 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 | ||
92 | currentDir.setNameFilter("*"); | 103 | currentDir.setNameFilter("*"); |
93 | QString fileL, fileS; | 104 | QString fileL, fileS; |
94 | const QFileInfoList *list = currentDir.entryInfoList( /*QDir::All*/ /*, QDir::SortByMask*/); | 105 | const QFileInfoList *list = currentDir.entryInfoList( /*QDir::All*/ /*, QDir::SortByMask*/); |
95 | QFileInfoListIterator it(*list); | 106 | QFileInfoListIterator it(*list); |
96 | QFileInfo *fi; | 107 | QFileInfo *fi; |
97 | while ( (fi=it.current()) ) { | 108 | while ( (fi=it.current()) ) { |
98 | 109 | ||
99 | if (fi->isSymLink() ){ | 110 | if (fi->isSymLink() ){ |
100 | QString symLink=fi->readLink(); | 111 | QString symLink=fi->readLink(); |
101 | // qDebug("Symlink detected "+symLink); | 112 | // qDebug("Symlink detected "+symLink); |
102 | QFileInfo sym( symLink); | 113 | QFileInfo sym( symLink); |
103 | fileS.sprintf( "%10li", sym.size() ); | 114 | fileS.sprintf( "%10li", sym.size() ); |
104 | fileL.sprintf( "%s -> %s", sym.fileName().data(),sym.absFilePath().data() ); | 115 | fileL.sprintf( "%s -> %s", sym.fileName().data(),sym.absFilePath().data() ); |
105 | 116 | ||
106 | } else { | 117 | } else { |
107 | // // qDebug("Not a dir: "+currentDir.canonicalPath()+fileL); | 118 | // // qDebug("Not a dir: "+currentDir.canonicalPath()+fileL); |
108 | fileS.sprintf( "%10li", fi->size() ); | 119 | fileS.sprintf( "%10li", fi->size() ); |
109 | fileL.sprintf( "%s",fi->fileName().data() ); | 120 | fileL.sprintf( "%s",fi->fileName().data() ); |
110 | if( QDir(QDir::cleanDirPath(currentDir.canonicalPath()+"/"+fileL)).exists() ) { | 121 | if( QDir(QDir::cleanDirPath(currentDir.canonicalPath()+"/"+fileL)).exists() ) { |
111 | fileL+="/"; | 122 | fileL+="/"; |
112 | // qDebug(currentDir.canonicalPath()+fileL); | 123 | // qDebug(currentDir.canonicalPath()+fileL); |
113 | } | 124 | } |
114 | } | 125 | } |
115 | item= new QListViewItem( ListView,fileL,fileS ); | 126 | item= new QListViewItem( ListView,fileL,fileS ); |
116 | ++it; | 127 | ++it; |
117 | } | 128 | } |
118 | ListView->setSorting( 2, FALSE); | 129 | ListView->setSorting( 2, FALSE); |
119 | dirLabel->setText(currentDir.canonicalPath()); | 130 | dirLabel->setText(currentDir.canonicalPath()); |
120 | 131 | ||
121 | 132 | ||
122 | } | 133 | } |
123 | 134 | ||
124 | void fileSaver::upDir() | 135 | void fileSaver::upDir() |
125 | { | 136 | { |
126 | // qDebug(currentDir.canonicalPath()); | 137 | // qDebug(currentDir.canonicalPath()); |
127 | } | 138 | } |
128 | 139 | ||
129 | void fileSaver::listDoubleClicked(QListViewItem *selectedItem) | 140 | void fileSaver::listDoubleClicked(QListViewItem *selectedItem) |
130 | { | 141 | { |
131 | } | 142 | } |
132 | 143 | ||
133 | void fileSaver::listClicked(QListViewItem *selectedItem) | 144 | void fileSaver::listClicked(QListViewItem *selectedItem) |
134 | { | 145 | { |
135 | QString strItem=selectedItem->text(0); | 146 | QString strItem=selectedItem->text(0); |
136 | QString strSize=selectedItem->text(1); | 147 | QString strSize=selectedItem->text(1); |
137 | // qDebug("strItem is "+strItem); | 148 | // qDebug("strItem is "+strItem); |
138 | strSize.stripWhiteSpace(); | 149 | strSize.stripWhiteSpace(); |
139 | // qDebug(strSize); | 150 | // qDebug(strSize); |
140 | 151 | ||
141 | if(strItem.find("@",0,TRUE) !=-1 || strItem.find("->",0,TRUE) !=-1 ) { //if symlink | 152 | if(strItem.find("@",0,TRUE) !=-1 || strItem.find("->",0,TRUE) !=-1 ) { //if symlink |
142 | QString strItem2=strItem.right( (strItem.length()-strItem.find("->",0,TRUE)) -4); | 153 | QString strItem2=strItem.right( (strItem.length()-strItem.find("->",0,TRUE)) -4); |
143 | // qDebug("strItem symlink is "+strItem2); | 154 | // qDebug("strItem symlink is "+strItem2); |
144 | if(QDir(strItem2).exists() ) { | 155 | if(QDir(strItem2).exists() ) { |
145 | currentDir.cd(strItem2, TRUE); | 156 | currentDir.cd(strItem2, TRUE); |
146 | populateList(); | 157 | populateList(); |
147 | } | 158 | } |
148 | } else { // not a symlink | 159 | } else { // not a symlink |
149 | if(strItem.find(". .",0,TRUE) && strItem.find("/",0,TRUE)!=-1 ) { | 160 | if(strItem.find(". .",0,TRUE) && strItem.find("/",0,TRUE)!=-1 ) { |
150 | if(QDir(QDir::cleanDirPath(currentDir.canonicalPath()+"/"+strItem)).exists() ) { | 161 | if(QDir(QDir::cleanDirPath(currentDir.canonicalPath()+"/"+strItem)).exists() ) { |
151 | strItem=QDir::cleanDirPath(currentDir.canonicalPath()+"/"+strItem); | 162 | strItem=QDir::cleanDirPath(currentDir.canonicalPath()+"/"+strItem); |
152 | currentDir.cd(strItem,FALSE); | 163 | currentDir.cd(strItem,FALSE); |
153 | // qDebug("Path is "+strItem); | 164 | // qDebug("Path is "+strItem); |
154 | populateList(); | 165 | populateList(); |
155 | } else { | 166 | } else { |
156 | currentDir.cdUp(); | 167 | currentDir.cdUp(); |
157 | populateList(); | 168 | populateList(); |
158 | } | 169 | } |
159 | if(QDir(strItem).exists()){ | 170 | if(QDir(strItem).exists()){ |
160 | currentDir.cd(strItem, TRUE); | 171 | currentDir.cd(strItem, TRUE); |
161 | populateList(); | 172 | populateList(); |
162 | } | 173 | } |
163 | } // else | 174 | } // else |
164 | // if( QFile::exists(strItem ) ) { | 175 | // if( QFile::exists(strItem ) ) { |
165 | // qDebug("We found our files!!"); | 176 | // qDebug("We found our files!!"); |
166 | 177 | ||
167 | // OnOK(); | 178 | // OnOK(); |
168 | } //end not symlink | 179 | } //end not symlink |
169 | chdir(strItem.latin1()); | 180 | chdir(strItem.latin1()); |
170 | 181 | ||
171 | 182 | ||
172 | } | 183 | } |
173 | 184 | ||
174 | 185 | ||
175 | void fileSaver::closeEvent( QCloseEvent *e ) | 186 | void fileSaver::closeEvent( QCloseEvent *e ) |
176 | { | 187 | { |
177 | if(e->isAccepted()) { | 188 | if(e->isAccepted()) { |
178 | e->accept(); | 189 | e->accept(); |
179 | } else { | 190 | } else { |
180 | qDebug("not accepted"); | 191 | qDebug("not accepted"); |
181 | done(-1); | 192 | done(-1); |
182 | } | 193 | } |
183 | } | 194 | } |
184 | 195 | ||
185 | void fileSaver::accept() { | 196 | void fileSaver::accept() { |
186 | selectedFileName = fileEdit->text(); | 197 | selectedFileName = fileEdit->text(); |
187 | QString path = currentDir.canonicalPath()+"/" + selectedFileName; | 198 | QString path = currentDir.canonicalPath()+"/" + selectedFileName; |
188 | if( path.find("//",0,TRUE) ==-1 ) { | 199 | if( path.find("//",0,TRUE) ==-1 ) { |
189 | selectedFileName = path; | 200 | selectedFileName = path; |
190 | } else { | 201 | } else { |
191 | selectedFileName = currentDir.canonicalPath()+selectedFileName; | 202 | selectedFileName = currentDir.canonicalPath()+selectedFileName; |
192 | } | 203 | } |
193 | qDebug("going to save "+selectedFileName); | 204 | qDebug("going to save "+selectedFileName); |
194 | done(1); | 205 | done(1); |
195 | } | 206 | } |
196 | 207 | ||
197 | void fileSaver::homeButtonPushed() { | 208 | void fileSaver::homeButtonPushed() { |
198 | chdir( QDir::homeDirPath().latin1() ); | 209 | chdir( QDir::homeDirPath().latin1() ); |
199 | currentDir.cd( QDir::homeDirPath(), TRUE); | 210 | currentDir.cd( QDir::homeDirPath(), TRUE); |
200 | populateList(); | 211 | populateList(); |
201 | update(); | 212 | update(); |
202 | } | 213 | } |
214 | void fileSaver::docButtonPushed() { | ||
215 | chdir( QString(QPEApplication::documentDir()+"/text").latin1() ); | ||
216 | currentDir.cd( QPEApplication::documentDir()+"/text", TRUE); | ||
217 | populateList(); | ||
218 | update(); | ||
219 | |||
220 | } | ||
221 | |||
222 | void 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 | |||
@@ -1,74 +1,75 @@ | |||
1 | /**************************************************************************** | 1 | /**************************************************************************** |
2 | ** | 2 | ** |
3 | ** Created: Fri Dec 14 08:16:02 2001 fileSaver.h | 3 | ** Created: Fri Dec 14 08:16:02 2001 fileSaver.h |
4 | ** | 4 | ** |
5 | copyright Sun 02-17-2002 22:28:48 L. J. Potter ljp@llornkcor.com | 5 | copyright Sun 02-17-2002 22:28:48 L. J. Potter ljp@llornkcor.com |
6 | 6 | ||
7 | ** This file may be distributed and/or modified under the terms of the | 7 | ** This file may be distributed and/or modified under the terms of the |
8 | ** GNU General Public License version 2 as published by the Free Software | 8 | ** GNU General Public License version 2 as published by the Free Software |
9 | ** Foundation and appearing in the file LICENSE.GPL included in the | 9 | ** Foundation and appearing in the file LICENSE.GPL included in the |
10 | ** packaging of this file. | 10 | ** packaging of this file. |
11 | ** | 11 | ** |
12 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE | 12 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE |
13 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. | 13 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. |
14 | ** | 14 | ** |
15 | ****************************************************************************/ | 15 | ****************************************************************************/ |
16 | #ifndef FILESAVER_H | 16 | #ifndef FILESAVER_H |
17 | #define FILESAVER_H | 17 | #define FILESAVER_H |
18 | 18 | ||
19 | //#include <qvariant.h> | 19 | //#include <qvariant.h> |
20 | #include <qdialog.h> | 20 | #include <qdialog.h> |
21 | #include <qfile.h> | 21 | #include <qfile.h> |
22 | #include <qdir.h> | 22 | #include <qdir.h> |
23 | #include <qstringlist.h> | 23 | #include <qstringlist.h> |
24 | #include <qlabel.h> | 24 | #include <qlabel.h> |
25 | #include <qstring.h> | 25 | #include <qstring.h> |
26 | 26 | ||
27 | class QVBoxLayout; | 27 | class QVBoxLayout; |
28 | class QHBoxLayout; | 28 | class QHBoxLayout; |
29 | class QGridLayout; | 29 | class QGridLayout; |
30 | class QListView; | 30 | class QListView; |
31 | class QListViewItem; | 31 | class QListViewItem; |
32 | class QPushButton; | 32 | class QPushButton; |
33 | class QLineEdit; | 33 | class QLineEdit; |
34 | class QCheckBox; | 34 | class QCheckBox; |
35 | 35 | ||
36 | class fileSaver : public QDialog | 36 | class fileSaver : public QDialog |
37 | { | 37 | { |
38 | Q_OBJECT | 38 | Q_OBJECT |
39 | 39 | ||
40 | public: | 40 | public: |
41 | void populateList(); | 41 | void populateList(); |
42 | fileSaver( QWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ,const QString filter=0); | 42 | fileSaver( QWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ,const QString filter=0); |
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; |
52 | QFile file; | 51 | QFile file; |
53 | QStringList fileList; | 52 | QStringList fileList; |
54 | QCheckBox *filePermCheck; | 53 | QCheckBox *filePermCheck; |
55 | 54 | ||
56 | QListViewItem * item; | 55 | QListViewItem * item; |
57 | public slots: | 56 | public slots: |
58 | void homeButtonPushed(); | 57 | void homeButtonPushed(); |
58 | void docButtonPushed(); | ||
59 | void hideButtonPushed(bool); | ||
59 | private: | 60 | private: |
60 | 61 | ||
61 | private slots: | 62 | private slots: |
62 | void accept(); | 63 | void accept(); |
63 | void upDir(); | 64 | void upDir(); |
64 | void listDoubleClicked(QListViewItem *); | 65 | void listDoubleClicked(QListViewItem *); |
65 | void listClicked(QListViewItem *); | 66 | void listClicked(QListViewItem *); |
66 | void closeEvent( QCloseEvent * ); | 67 | void closeEvent( QCloseEvent * ); |
67 | 68 | ||
68 | protected slots: | 69 | protected slots: |
69 | 70 | ||
70 | protected: | 71 | protected: |
71 | 72 | ||
72 | }; | 73 | }; |
73 | 74 | ||
74 | #endif // FILESAVER_H | 75 | #endif // FILESAVER_H |
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 | |||
@@ -436,388 +436,388 @@ TextEdit::~TextEdit() | |||
436 | { | 436 | { |
437 | // save(); | 437 | // save(); |
438 | 438 | ||
439 | Config cfg("TextEdit"); | 439 | Config cfg("TextEdit"); |
440 | cfg.setGroup("View"); | 440 | cfg.setGroup("View"); |
441 | QFont f = editor->font(); | 441 | QFont f = editor->font(); |
442 | cfg.writeEntry("FontSize",f.pointSize()); | 442 | cfg.writeEntry("FontSize",f.pointSize()); |
443 | cfg.writeEntry("Bold",f.bold()); | 443 | cfg.writeEntry("Bold",f.bold()); |
444 | cfg.writeEntry("Italic",f.italic()); | 444 | cfg.writeEntry("Italic",f.italic()); |
445 | cfg.writeEntry("Wrap",editor->wordWrap() == QMultiLineEdit::WidgetWidth); | 445 | cfg.writeEntry("Wrap",editor->wordWrap() == QMultiLineEdit::WidgetWidth); |
446 | } | 446 | } |
447 | 447 | ||
448 | void TextEdit::zoomIn() | 448 | void TextEdit::zoomIn() |
449 | { | 449 | { |
450 | setFontSize(editor->font().pointSize()+1,FALSE); | 450 | setFontSize(editor->font().pointSize()+1,FALSE); |
451 | } | 451 | } |
452 | 452 | ||
453 | void TextEdit::zoomOut() | 453 | void TextEdit::zoomOut() |
454 | { | 454 | { |
455 | setFontSize(editor->font().pointSize()-1,TRUE); | 455 | setFontSize(editor->font().pointSize()-1,TRUE); |
456 | } | 456 | } |
457 | 457 | ||
458 | 458 | ||
459 | void TextEdit::setFontSize(int sz, bool round_down_not_up) | 459 | void TextEdit::setFontSize(int sz, bool round_down_not_up) |
460 | { | 460 | { |
461 | int s=10; | 461 | int s=10; |
462 | for (int i=0; i<nfontsizes; i++) { | 462 | for (int i=0; i<nfontsizes; i++) { |
463 | if ( fontsize[i] == sz ) { | 463 | if ( fontsize[i] == sz ) { |
464 | s = sz; | 464 | s = sz; |
465 | break; | 465 | break; |
466 | } else if ( round_down_not_up ) { | 466 | } else if ( round_down_not_up ) { |
467 | if ( fontsize[i] < sz ) | 467 | if ( fontsize[i] < sz ) |
468 | s = fontsize[i]; | 468 | s = fontsize[i]; |
469 | } else { | 469 | } else { |
470 | if ( fontsize[i] > sz ) { | 470 | if ( fontsize[i] > sz ) { |
471 | s = fontsize[i]; | 471 | s = fontsize[i]; |
472 | break; | 472 | break; |
473 | } | 473 | } |
474 | } | 474 | } |
475 | } | 475 | } |
476 | 476 | ||
477 | QFont f = editor->font(); | 477 | QFont f = editor->font(); |
478 | f.setPointSize(s); | 478 | f.setPointSize(s); |
479 | editor->setFont(f); | 479 | editor->setFont(f); |
480 | 480 | ||
481 | zin->setEnabled(s != fontsize[nfontsizes-1]); | 481 | zin->setEnabled(s != fontsize[nfontsizes-1]); |
482 | zout->setEnabled(s != fontsize[0]); | 482 | zout->setEnabled(s != fontsize[0]); |
483 | } | 483 | } |
484 | 484 | ||
485 | void TextEdit::setBold(bool y) | 485 | void TextEdit::setBold(bool y) |
486 | { | 486 | { |
487 | QFont f = editor->font(); | 487 | QFont f = editor->font(); |
488 | f.setBold(y); | 488 | f.setBold(y); |
489 | editor->setFont(f); | 489 | editor->setFont(f); |
490 | } | 490 | } |
491 | 491 | ||
492 | void TextEdit::setItalic(bool y) | 492 | void TextEdit::setItalic(bool y) |
493 | { | 493 | { |
494 | QFont f = editor->font(); | 494 | QFont f = editor->font(); |
495 | f.setItalic(y); | 495 | f.setItalic(y); |
496 | editor->setFont(f); | 496 | editor->setFont(f); |
497 | } | 497 | } |
498 | 498 | ||
499 | void TextEdit::setWordWrap(bool y) | 499 | void TextEdit::setWordWrap(bool y) |
500 | { | 500 | { |
501 | bool state = editor->edited(); | 501 | bool state = editor->edited(); |
502 | editor->setWordWrap(y ? QMultiLineEdit::WidgetWidth : QMultiLineEdit::NoWrap ); | 502 | editor->setWordWrap(y ? QMultiLineEdit::WidgetWidth : QMultiLineEdit::NoWrap ); |
503 | editor->setEdited( state ); | 503 | editor->setEdited( state ); |
504 | } | 504 | } |
505 | 505 | ||
506 | void TextEdit::fileNew() | 506 | void TextEdit::fileNew() |
507 | { | 507 | { |
508 | if( !bFromDocView ) { | 508 | if( !bFromDocView ) { |
509 | saveAs(); | 509 | saveAs(); |
510 | } | 510 | } |
511 | newFile(DocLnk()); | 511 | newFile(DocLnk()); |
512 | } | 512 | } |
513 | 513 | ||
514 | void TextEdit::fileOpen() | 514 | void TextEdit::fileOpen() |
515 | { | 515 | { |
516 | // if ( !save() ) { | 516 | // if ( !save() ) { |
517 | // if ( QMessageBox::critical( this, tr( "Out of space" ), | 517 | // if ( QMessageBox::critical( this, tr( "Out of space" ), |
518 | // tr( "Text Editor was unable to\n" | 518 | // tr( "Text Editor was unable to\n" |
519 | // "save your changes.\n" | 519 | // "save your changes.\n" |
520 | // "Free some space and try again.\n" | 520 | // "Free some space and try again.\n" |
521 | // "\nContinue anyway?" ), | 521 | // "\nContinue anyway?" ), |
522 | // QMessageBox::Yes|QMessageBox::Escape, | 522 | // QMessageBox::Yes|QMessageBox::Escape, |
523 | // QMessageBox::No|QMessageBox::Default ) | 523 | // QMessageBox::No|QMessageBox::Default ) |
524 | // != QMessageBox::Yes ) | 524 | // != QMessageBox::Yes ) |
525 | // return; | 525 | // return; |
526 | // else { | 526 | // else { |
527 | // delete doc; | 527 | // delete doc; |
528 | // doc = 0; | 528 | // doc = 0; |
529 | // } | 529 | // } |
530 | // } | 530 | // } |
531 | menu->hide(); | 531 | menu->hide(); |
532 | editBar->hide(); | 532 | editBar->hide(); |
533 | searchBar->hide(); | 533 | searchBar->hide(); |
534 | clearWState (WState_Reserved1 ); | 534 | clearWState (WState_Reserved1 ); |
535 | editorStack->raiseWidget( fileSelector ); | 535 | editorStack->raiseWidget( fileSelector ); |
536 | fileSelector->reread(); | 536 | fileSelector->reread(); |
537 | updateCaption(); | 537 | updateCaption(); |
538 | } | 538 | } |
539 | 539 | ||
540 | void TextEdit::newFileOpen() | 540 | void TextEdit::newFileOpen() |
541 | { | 541 | { |
542 | browseForFiles=new fileBrowser(this,"Open File",TRUE,0, "*"); | 542 | browseForFiles=new fileBrowser(this,"Open File",TRUE,0, "*"); |
543 | if( browseForFiles->exec() != -1 ) { | 543 | if( browseForFiles->exec() != -1 ) { |
544 | QString selFile= browseForFiles->selectedFileName; | 544 | QString selFile= browseForFiles->selectedFileName; |
545 | QStringList fileList=browseForFiles->fileList; | 545 | QStringList fileList=browseForFiles->fileList; |
546 | qDebug(selFile); | 546 | qDebug(selFile); |
547 | QStringList::ConstIterator f; | 547 | QStringList::ConstIterator f; |
548 | QString fileTemp; | 548 | QString fileTemp; |
549 | for ( f = fileList.begin(); f != fileList.end(); f++ ) { | 549 | for ( f = fileList.begin(); f != fileList.end(); f++ ) { |
550 | fileTemp = *f; | 550 | fileTemp = *f; |
551 | fileTemp.right( fileTemp.length()-5); | 551 | fileTemp.right( fileTemp.length()-5); |
552 | QString fileName = fileTemp; | 552 | QString fileName = fileTemp; |
553 | if( fileName != "Unnamed" || fileName != "Empty Text" ) { | 553 | if( fileName != "Unnamed" || fileName != "Empty Text" ) { |
554 | currentFileName = fileName; | 554 | currentFileName = fileName; |
555 | qDebug("please open "+currentFileName); | 555 | qDebug("please open "+currentFileName); |
556 | openFile(fileName ); | 556 | openFile(fileName ); |
557 | } | 557 | } |
558 | } | 558 | } |
559 | } | 559 | } |
560 | delete browseForFiles; | 560 | delete browseForFiles; |
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 |
568 | void TextEdit::slotFind() | 569 | void TextEdit::slotFind() |
569 | { | 570 | { |
570 | FindDialog frmFind( "Text Editor", this ); | 571 | FindDialog frmFind( "Text Editor", this ); |
571 | connect( &frmFind, SIGNAL(signalFindClicked(const QString &, bool, bool, int)), | 572 | connect( &frmFind, SIGNAL(signalFindClicked(const QString &, bool, bool, int)), |
572 | editor, SLOT(slotDoFind( const QString&,bool,bool))); | 573 | editor, SLOT(slotDoFind( const QString&,bool,bool))); |
573 | 574 | ||
574 | //case sensitive, backwards, [category] | 575 | //case sensitive, backwards, [category] |
575 | 576 | ||
576 | connect( editor, SIGNAL(notFound()), | 577 | connect( editor, SIGNAL(notFound()), |
577 | &frmFind, SLOT(slotNotFound()) ); | 578 | &frmFind, SLOT(slotNotFound()) ); |
578 | connect( editor, SIGNAL(searchWrapped()), | 579 | connect( editor, SIGNAL(searchWrapped()), |
579 | &frmFind, SLOT(slotWrapAround()) ); | 580 | &frmFind, SLOT(slotWrapAround()) ); |
580 | 581 | ||
581 | frmFind.exec(); | 582 | frmFind.exec(); |
582 | 583 | ||
583 | 584 | ||
584 | } | 585 | } |
585 | #endif | 586 | #endif |
586 | 587 | ||
587 | void TextEdit::fileRevert() | 588 | void TextEdit::fileRevert() |
588 | { | 589 | { |
589 | clear(); | 590 | clear(); |
590 | fileOpen(); | 591 | fileOpen(); |
591 | } | 592 | } |
592 | 593 | ||
593 | void TextEdit::editCut() | 594 | void TextEdit::editCut() |
594 | { | 595 | { |
595 | #ifndef QT_NO_CLIPBOARD | 596 | #ifndef QT_NO_CLIPBOARD |
596 | editor->cut(); | 597 | editor->cut(); |
597 | #endif | 598 | #endif |
598 | } | 599 | } |
599 | 600 | ||
600 | void TextEdit::editCopy() | 601 | void TextEdit::editCopy() |
601 | { | 602 | { |
602 | #ifndef QT_NO_CLIPBOARD | 603 | #ifndef QT_NO_CLIPBOARD |
603 | editor->copy(); | 604 | editor->copy(); |
604 | #endif | 605 | #endif |
605 | } | 606 | } |
606 | 607 | ||
607 | void TextEdit::editPaste() | 608 | void TextEdit::editPaste() |
608 | { | 609 | { |
609 | #ifndef QT_NO_CLIPBOARD | 610 | #ifndef QT_NO_CLIPBOARD |
610 | editor->paste(); | 611 | editor->paste(); |
611 | #endif | 612 | #endif |
612 | } | 613 | } |
613 | 614 | ||
614 | void TextEdit::editFind() | 615 | void TextEdit::editFind() |
615 | { | 616 | { |
616 | searchBar->show(); | 617 | searchBar->show(); |
617 | searchVisible = TRUE; | 618 | searchVisible = TRUE; |
618 | searchEdit->setFocus(); | 619 | searchEdit->setFocus(); |
619 | } | 620 | } |
620 | 621 | ||
621 | void TextEdit::findNext() | 622 | void TextEdit::findNext() |
622 | { | 623 | { |
623 | editor->find( searchEdit->text(), FALSE, FALSE ); | 624 | editor->find( searchEdit->text(), FALSE, FALSE ); |
624 | 625 | ||
625 | } | 626 | } |
626 | 627 | ||
627 | void TextEdit::findClose() | 628 | void TextEdit::findClose() |
628 | { | 629 | { |
629 | searchVisible = FALSE; | 630 | searchVisible = FALSE; |
630 | searchBar->hide(); | 631 | searchBar->hide(); |
631 | } | 632 | } |
632 | 633 | ||
633 | void TextEdit::search() | 634 | void TextEdit::search() |
634 | { | 635 | { |
635 | editor->find( searchEdit->text(), FALSE, FALSE ); | 636 | editor->find( searchEdit->text(), FALSE, FALSE ); |
636 | } | 637 | } |
637 | 638 | ||
638 | void TextEdit::newFile( const DocLnk &f ) | 639 | void TextEdit::newFile( const DocLnk &f ) |
639 | { | 640 | { |
640 | DocLnk nf = f; | 641 | DocLnk nf = f; |
641 | nf.setType("text/plain"); | 642 | nf.setType("text/plain"); |
642 | clear(); | 643 | clear(); |
643 | editorStack->raiseWidget( editor ); | 644 | editorStack->raiseWidget( editor ); |
644 | setWState (WState_Reserved1 ); | 645 | setWState (WState_Reserved1 ); |
645 | editor->setFocus(); | 646 | editor->setFocus(); |
646 | doc = new DocLnk(nf); | 647 | doc = new DocLnk(nf); |
647 | qDebug("newFile "+currentFileName); | 648 | qDebug("newFile "+currentFileName); |
648 | updateCaption(currentFileName); | 649 | updateCaption(currentFileName); |
649 | } | 650 | } |
650 | 651 | ||
651 | void TextEdit::openFile( const QString &f ) | 652 | void TextEdit::openFile( const QString &f ) |
652 | { | 653 | { |
653 | bFromDocView = TRUE; | 654 | bFromDocView = TRUE; |
654 | DocLnk nf; | 655 | DocLnk nf; |
655 | nf.setType("text/plain"); | 656 | nf.setType("text/plain"); |
656 | nf.setFile(f); | 657 | nf.setFile(f); |
657 | currentFileName=f; | 658 | currentFileName=f; |
658 | QFileInfo fi( currentFileName); | 659 | QFileInfo fi( currentFileName); |
659 | nf.setName(fi.baseName()); | 660 | nf.setName(fi.baseName()); |
660 | qDebug("openFile string"+currentFileName); | 661 | qDebug("openFile string"+currentFileName); |
661 | 662 | ||
662 | openFile(nf); | 663 | openFile(nf); |
663 | showEditTools(); | 664 | showEditTools(); |
664 | // Show filename in caption | 665 | // Show filename in caption |
665 | QString name = f; | 666 | QString name = f; |
666 | int sep = name.findRev( '/' ); | 667 | int sep = name.findRev( '/' ); |
667 | if ( sep > 0 ) | 668 | if ( sep > 0 ) |
668 | name = name.mid( sep+1 ); | 669 | name = name.mid( sep+1 ); |
669 | updateCaption( name ); | 670 | updateCaption( name ); |
670 | } | 671 | } |
671 | 672 | ||
672 | void TextEdit::openFile( const DocLnk &f ) | 673 | void TextEdit::openFile( const DocLnk &f ) |
673 | { | 674 | { |
674 | // clear(); | 675 | // clear(); |
675 | bFromDocView = TRUE; | 676 | bFromDocView = TRUE; |
676 | FileManager fm; | 677 | FileManager fm; |
677 | QString txt; | 678 | QString txt; |
678 | currentFileName=f.name(); | 679 | currentFileName=f.name(); |
679 | qDebug("openFile doclnk " + currentFileName); | 680 | qDebug("openFile doclnk " + currentFileName); |
680 | if ( !fm.loadFile( f, txt ) ) { | 681 | if ( !fm.loadFile( f, txt ) ) { |
681 | // ####### could be a new file | 682 | // ####### could be a new file |
682 | qDebug( "Cannot open file" ); | 683 | qDebug( "Cannot open file" ); |
683 | 684 | ||
684 | //return; | 685 | //return; |
685 | } | 686 | } |
686 | 687 | ||
687 | fileNew(); | 688 | fileNew(); |
688 | if ( doc ) | 689 | if ( doc ) |
689 | delete doc; | 690 | delete doc; |
690 | doc = new DocLnk(f); | 691 | doc = new DocLnk(f); |
691 | editor->setText(txt); | 692 | editor->setText(txt); |
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); |
699 | updateCaption(); | 699 | updateCaption(); |
700 | } | 700 | } |
701 | 701 | ||
702 | void TextEdit::showEditTools() | 702 | void TextEdit::showEditTools() |
703 | { | 703 | { |
704 | // if ( !doc ) | 704 | // if ( !doc ) |
705 | // close(); | 705 | // close(); |
706 | // clear(); | 706 | // clear(); |
707 | fileSelector->hide(); | 707 | fileSelector->hide(); |
708 | menu->show(); | 708 | menu->show(); |
709 | editBar->show(); | 709 | editBar->show(); |
710 | if ( searchVisible ) | 710 | if ( searchVisible ) |
711 | searchBar->show(); | 711 | searchBar->show(); |
712 | // updateCaption(); | 712 | // updateCaption(); |
713 | editorStack->raiseWidget( editor ); | 713 | editorStack->raiseWidget( editor ); |
714 | setWState (WState_Reserved1 ); | 714 | setWState (WState_Reserved1 ); |
715 | } | 715 | } |
716 | 716 | ||
717 | /*! | 717 | /*! |
718 | unprompted save */ | 718 | unprompted save */ |
719 | bool TextEdit::save() | 719 | bool TextEdit::save() |
720 | { | 720 | { |
721 | QString file = doc->file(); | 721 | QString file = doc->file(); |
722 | qDebug(file); | 722 | qDebug(file); |
723 | QString name= doc->name(); | 723 | QString name= doc->name(); |
724 | qDebug(name); | 724 | qDebug(name); |
725 | QString rt = editor->text(); | 725 | QString rt = editor->text(); |
726 | if( !rt.isEmpty() ) { | 726 | if( !rt.isEmpty() ) { |
727 | if(name.isEmpty()) { | 727 | if(name.isEmpty()) { |
728 | saveAs(); | 728 | saveAs(); |
729 | } else { | 729 | } else { |
730 | currentFileName= name ; | 730 | currentFileName= name ; |
731 | qDebug("saveFile "+currentFileName); | 731 | qDebug("saveFile "+currentFileName); |
732 | 732 | ||
733 | struct stat buf; | 733 | struct stat buf; |
734 | mode_t mode; | 734 | mode_t mode; |
735 | stat(file.latin1(), &buf); | 735 | stat(file.latin1(), &buf); |
736 | mode = buf.st_mode; | 736 | mode = buf.st_mode; |
737 | 737 | ||
738 | doc->setName( name); | 738 | doc->setName( name); |
739 | FileManager fm; | 739 | FileManager fm; |
740 | if ( !fm.saveFile( *doc, rt ) ) { | 740 | if ( !fm.saveFile( *doc, rt ) ) { |
741 | return false; | 741 | return false; |
742 | } | 742 | } |
743 | editor->setEdited( FALSE); | 743 | editor->setEdited( FALSE); |
744 | edited1=FALSE; | 744 | edited1=FALSE; |
745 | edited=FALSE; | 745 | edited=FALSE; |
746 | setCaption(caption().right(caption().length()-1)); | 746 | setCaption(caption().right(caption().length()-1)); |
747 | 747 | ||
748 | 748 | ||
749 | chmod( file.latin1(), mode); | 749 | chmod( file.latin1(), mode); |
750 | } | 750 | } |
751 | return true; | 751 | return true; |
752 | } | 752 | } |
753 | return false; | 753 | return false; |
754 | } | 754 | } |
755 | 755 | ||
756 | /*! | 756 | /*! |
757 | prompted save */ | 757 | prompted save */ |
758 | bool TextEdit::saveAs() | 758 | bool TextEdit::saveAs() |
759 | { | 759 | { |
760 | // qDebug("saveAsFile "+currentFileName); | 760 | // qDebug("saveAsFile "+currentFileName); |
761 | 761 | ||
762 | // case of nothing to save... /// there's always something to save | 762 | // case of nothing to save... /// there's always something to save |
763 | // if ( !doc )//|| !bFromDocView) | 763 | // if ( !doc )//|| !bFromDocView) |
764 | // { | 764 | // { |
765 | // qDebug("no doc"); | 765 | // qDebug("no doc"); |
766 | // return true; | 766 | // return true; |
767 | // } | 767 | // } |
768 | if ( !editor->edited() ) { | 768 | if ( !editor->edited() ) { |
769 | delete doc; | 769 | delete doc; |
770 | doc = 0; | 770 | doc = 0; |
771 | return true; | 771 | return true; |
772 | } | 772 | } |
773 | 773 | ||
774 | QString rt = editor->text(); | 774 | QString rt = editor->text(); |
775 | qDebug(currentFileName); | 775 | qDebug(currentFileName); |
776 | 776 | ||
777 | if( currentFileName.isEmpty() || currentFileName == "Unnamed") { | 777 | if( currentFileName.isEmpty() || currentFileName == "Unnamed") { |
778 | qDebug("do silly TT filename thing"); | 778 | qDebug("do silly TT filename thing"); |
779 | if ( doc->name().isEmpty() ) { | 779 | if ( doc->name().isEmpty() ) { |
780 | QString pt = rt.simplifyWhiteSpace(); | 780 | QString pt = rt.simplifyWhiteSpace(); |
781 | int i = pt.find( ' ' ); | 781 | int i = pt.find( ' ' ); |
782 | QString docname = pt; | 782 | QString docname = pt; |
783 | if ( i > 0 ) | 783 | if ( i > 0 ) |
784 | docname = pt.left( i ); | 784 | docname = pt.left( i ); |
785 | // remove "." at the beginning | 785 | // remove "." at the beginning |
786 | while( docname.startsWith( "." ) ) | 786 | while( docname.startsWith( "." ) ) |
787 | docname = docname.mid( 1 ); | 787 | docname = docname.mid( 1 ); |
788 | docname.replace( QRegExp("/"), "_" ); | 788 | docname.replace( QRegExp("/"), "_" ); |
789 | // cut the length. filenames longer than that don't make sense and something goes wrong when they get too long. | 789 | // cut the length. filenames longer than that don't make sense and something goes wrong when they get too long. |
790 | if ( docname.length() > 40 ) | 790 | if ( docname.length() > 40 ) |
791 | docname = docname.left(40); | 791 | docname = docname.left(40); |
792 | if ( docname.isEmpty() ) | 792 | if ( docname.isEmpty() ) |
793 | docname = "Unnamed"; | 793 | docname = "Unnamed"; |
794 | doc->setName(docname); | 794 | doc->setName(docname); |
795 | currentFileName=docname; | 795 | currentFileName=docname; |
796 | } | 796 | } |
797 | } | 797 | } |
798 | 798 | ||
799 | 799 | ||
800 | fileSaveDlg=new fileSaver(this,"Save File As?",TRUE, 0, currentFileName); | 800 | fileSaveDlg=new fileSaver(this,"Save File As?",TRUE, 0, currentFileName); |
801 | qDebug("wanna save filename "+currentFileName); | 801 | qDebug("wanna save filename "+currentFileName); |
802 | fileSaveDlg->exec(); | 802 | fileSaveDlg->exec(); |
803 | if( fileSaveDlg->result() == 1 ) { | 803 | if( fileSaveDlg->result() == 1 ) { |
804 | QString fileNm=fileSaveDlg->selectedFileName; | 804 | QString fileNm=fileSaveDlg->selectedFileName; |
805 | qDebug("saving filename "+fileNm); | 805 | qDebug("saving filename "+fileNm); |
806 | QFileInfo fi(fileNm); | 806 | QFileInfo fi(fileNm); |
807 | currentFileName=fi.fileName(); | 807 | currentFileName=fi.fileName(); |
808 | if(doc) { | 808 | if(doc) { |
809 | // QString file = doc->file(); | 809 | // QString file = doc->file(); |
810 | // doc->removeFiles(); | 810 | // doc->removeFiles(); |
811 | delete doc; | 811 | delete doc; |
812 | DocLnk nf; | 812 | DocLnk nf; |
813 | nf.setType("text/plain"); | 813 | nf.setType("text/plain"); |
814 | nf.setFile( fileNm); | 814 | nf.setFile( fileNm); |
815 | doc = new DocLnk(nf); | 815 | doc = new DocLnk(nf); |
816 | // editor->setText(rt); | 816 | // editor->setText(rt); |
817 | // qDebug("openFile doclnk "+currentFileName); | 817 | // qDebug("openFile doclnk "+currentFileName); |
818 | doc->setName( currentFileName); | 818 | doc->setName( currentFileName); |
819 | updateCaption( currentFileName); | 819 | updateCaption( currentFileName); |
820 | 820 | ||
821 | FileManager fm; | 821 | FileManager fm; |
822 | if ( !fm.saveFile( *doc, rt ) ) { | 822 | if ( !fm.saveFile( *doc, rt ) ) { |
823 | return false; | 823 | return false; |