summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/apps/textedit/textedit.cpp14
1 files changed, 9 insertions, 5 deletions
diff --git a/core/apps/textedit/textedit.cpp b/core/apps/textedit/textedit.cpp
index a66b967..cc3ccbc 100644
--- a/core/apps/textedit/textedit.cpp
+++ b/core/apps/textedit/textedit.cpp
@@ -34,13 +34,15 @@
34#include <qpe/config.h> 34#include <qpe/config.h>
35#include <qpe/qpeapplication.h> 35#include <qpe/qpeapplication.h>
36#include <qpe/qpemenubar.h> 36#include <qpe/qpemenubar.h>
37#include <qpe/qpetoolbar.h> 37#include <qpe/qpetoolbar.h>
38#include <qpe/qcopenvelope_qws.h> 38#include <qpe/qcopenvelope_qws.h>
39//#include <qpe/finddialog.h> 39//#include <qpe/finddialog.h>
40
40#include <opie/ofileselector.h> 41#include <opie/ofileselector.h>
42#include <opie/ofiledialog.h>
41 43
42#include <qstringlist.h> 44#include <qstringlist.h>
43#include <qaction.h> 45#include <qaction.h>
44#include <qcolordialog.h> 46#include <qcolordialog.h>
45#include <qfileinfo.h> 47#include <qfileinfo.h>
46#include <qlineedit.h> 48#include <qlineedit.h>
@@ -496,16 +498,18 @@ void TextEdit::fileNew()
496// } 498// }
497 newFile(DocLnk()); 499 newFile(DocLnk());
498} 500}
499 501
500void TextEdit::fileOpen() 502void TextEdit::fileOpen()
501{ 503{
502 OFileSelector *fileSelector; 504 // OFileSelector *fileSelector;
503 fileSelector = new OFileSelector( this, 1,1,"/","", "text/*"); 505 // fileSelector = new OFileSelector( this, 1,1,"/","", "text/*");
504 fileSelector->showMaximized(); 506 //fileSelector->showMaximized();
505 507 QString str = OFileDialog::getOpenFileName(1,"/","", QStringList() , this );
508 if(!str.isEmpty() )
509 openFile( str );
506// browseForFiles = new fileBrowser(this,tr("Open File"),TRUE,0, "text/*"); // 510// browseForFiles = new fileBrowser(this,tr("Open File"),TRUE,0, "text/*"); //
507// browseForFiles->setFileView( viewSelection ); 511// browseForFiles->setFileView( viewSelection );
508// browseForFiles->showMaximized(); 512// browseForFiles->showMaximized();
509// // if( result != -1 ) 513// // if( result != -1 )
510 514
511// if( browseForFiles->exec() != -1 ) { 515// if( browseForFiles->exec() != -1 ) {
@@ -518,13 +522,13 @@ void TextEdit::fileOpen()
518// fileTemp = *f; 522// fileTemp = *f;
519// fileTemp.right( fileTemp.length()-5); 523// fileTemp.right( fileTemp.length()-5);
520// QString fileName = fileTemp; 524// QString fileName = fileTemp;
521// if( fileName != "Unnamed" || fileName != "Empty Text" ) { 525// if( fileName != "Unnamed" || fileName != "Empty Text" ) {
522// currentFileName = fileName; 526// currentFileName = fileName;
523// qDebug("please open "+currentFileName); 527// qDebug("please open "+currentFileName);
524// openFile(fileName ); 528// openFile(str );
525// } 529// }
526// } 530// }
527// viewSelection = browseForFiles->SelectionCombo->currentItem(); 531// viewSelection = browseForFiles->SelectionCombo->currentItem();
528// } 532// }
529// delete browseForFiles; 533// delete browseForFiles;
530// editor->setEdited( FALSE); 534// editor->setEdited( FALSE);