-rw-r--r-- | core/apps/textedit/textedit.cpp | 65 | ||||
-rw-r--r-- | core/apps/textedit/textedit.pro | 2 |
2 files changed, 36 insertions, 31 deletions
diff --git a/core/apps/textedit/textedit.cpp b/core/apps/textedit/textedit.cpp index 943fecd..a66b967 100644 --- a/core/apps/textedit/textedit.cpp +++ b/core/apps/textedit/textedit.cpp | |||
@@ -37,6 +37,7 @@ | |||
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 | #include <opie/ofileselector.h> | ||
40 | 41 | ||
41 | #include <qstringlist.h> | 42 | #include <qstringlist.h> |
42 | #include <qaction.h> | 43 | #include <qaction.h> |
@@ -498,36 +499,40 @@ void TextEdit::fileNew() | |||
498 | 499 | ||
499 | void TextEdit::fileOpen() | 500 | void TextEdit::fileOpen() |
500 | { | 501 | { |
501 | browseForFiles = new fileBrowser(this,tr("Open File"),TRUE,0, "text/*"); // | 502 | OFileSelector *fileSelector; |
502 | browseForFiles->setFileView( viewSelection ); | 503 | fileSelector = new OFileSelector( this, 1,1,"/","", "text/*"); |
503 | browseForFiles->showMaximized(); | 504 | fileSelector->showMaximized(); |
504 | // if( result != -1 ) | 505 | |
505 | 506 | // browseForFiles = new fileBrowser(this,tr("Open File"),TRUE,0, "text/*"); // | |
506 | if( browseForFiles->exec() != -1 ) { | 507 | // browseForFiles->setFileView( viewSelection ); |
507 | QString selFile = browseForFiles->selectedFileName; | 508 | // browseForFiles->showMaximized(); |
508 | QStringList fileList = browseForFiles->fileList; | 509 | // // if( result != -1 ) |
509 | qDebug(selFile); | 510 | |
510 | QStringList::ConstIterator f; | 511 | // if( browseForFiles->exec() != -1 ) { |
511 | QString fileTemp; | 512 | // QString selFile = browseForFiles->selectedFileName; |
512 | for ( f = fileList.begin(); f != fileList.end(); f++ ) { | 513 | // QStringList fileList = browseForFiles->fileList; |
513 | fileTemp = *f; | 514 | // qDebug(selFile); |
514 | fileTemp.right( fileTemp.length()-5); | 515 | // QStringList::ConstIterator f; |
515 | QString fileName = fileTemp; | 516 | // QString fileTemp; |
516 | if( fileName != "Unnamed" || fileName != "Empty Text" ) { | 517 | // for ( f = fileList.begin(); f != fileList.end(); f++ ) { |
517 | currentFileName = fileName; | 518 | // fileTemp = *f; |
518 | qDebug("please open "+currentFileName); | 519 | // fileTemp.right( fileTemp.length()-5); |
519 | openFile(fileName ); | 520 | // QString fileName = fileTemp; |
520 | } | 521 | // if( fileName != "Unnamed" || fileName != "Empty Text" ) { |
521 | } | 522 | // currentFileName = fileName; |
522 | viewSelection = browseForFiles->SelectionCombo->currentItem(); | 523 | // qDebug("please open "+currentFileName); |
523 | } | 524 | // openFile(fileName ); |
524 | delete browseForFiles; | 525 | // } |
525 | editor->setEdited( FALSE); | 526 | // } |
526 | edited1=FALSE; | 527 | // viewSelection = browseForFiles->SelectionCombo->currentItem(); |
527 | edited=FALSE; | 528 | // } |
528 | if(caption().left(1)=="*") | 529 | // delete browseForFiles; |
529 | setCaption(caption().right(caption().length()-1)); | 530 | // editor->setEdited( FALSE); |
530 | doSearchBar(); | 531 | // edited1=FALSE; |
532 | // edited=FALSE; | ||
533 | // if(caption().left(1)=="*") | ||
534 | // setCaption(caption().right(caption().length()-1)); | ||
535 | // doSearchBar(); | ||
531 | } | 536 | } |
532 | 537 | ||
533 | void TextEdit::doSearchBar() | 538 | void TextEdit::doSearchBar() |
diff --git a/core/apps/textedit/textedit.pro b/core/apps/textedit/textedit.pro index fce76bd..aae7f89 100644 --- a/core/apps/textedit/textedit.pro +++ b/core/apps/textedit/textedit.pro | |||
@@ -7,7 +7,7 @@ SOURCES = main.cpp textedit.cpp fileBrowser.cpp fontDialog.cpp fileSaver.cpp fil | |||
7 | 7 | ||
8 | INCLUDEPATH += $(OPIEDIR)/include | 8 | INCLUDEPATH += $(OPIEDIR)/include |
9 | DEPENDPATH += $(OPIEDIR)/include | 9 | DEPENDPATH += $(OPIEDIR)/include |
10 | LIBS += -lqpe | 10 | LIBS += -lqpe -lopie |
11 | 11 | ||
12 | TARGET = textedit | 12 | TARGET = textedit |
13 | 13 | ||