-rw-r--r-- | core/apps/textedit/textedit.cpp | 77 | ||||
-rw-r--r-- | core/apps/textedit/textedit.h | 4 | ||||
-rw-r--r-- | core/apps/textedit/textedit.pro | 4 |
3 files changed, 43 insertions, 42 deletions
diff --git a/core/apps/textedit/textedit.cpp b/core/apps/textedit/textedit.cpp index b8d62db..403bd92 100644 --- a/core/apps/textedit/textedit.cpp +++ b/core/apps/textedit/textedit.cpp | |||
@@ -21,5 +21,5 @@ | |||
21 | 21 | ||
22 | #include "textedit.h" | 22 | #include "textedit.h" |
23 | #include "fileBrowser.h" | 23 | //#include "fileBrowser.h" |
24 | #include "fileSaver.h" | 24 | #include "fileSaver.h" |
25 | #include "filePermissions.h" | 25 | #include "filePermissions.h" |
@@ -508,43 +508,44 @@ void TextEdit::fileOpen() | |||
508 | cfg.setGroup("View"); | 508 | cfg.setGroup("View"); |
509 | bool b=FALSE; | 509 | bool b=FALSE; |
510 | if(cfg.readEntry("useOldFileDialog") == "TRUE") | 510 | // if(cfg.readEntry("useOldFileDialog") == "TRUE") |
511 | b=TRUE; | 511 | // b=TRUE; |
512 | if(!b) { | 512 | // if(!b) { |
513 | QString str = OFileDialog::getOpenFileName( 1,"/","", "*", this ); | 513 | QString str = OFileDialog::getOpenFileName( 1,"/")://,"", "*", this ); |
514 | if(!str.isEmpty() ) | 514 | if(!str.isEmpty() ) |
515 | openFile( str ); | 515 | openFile( str ); |
516 | } else { | 516 | // } else { |
517 | QString str; | 517 | // QString str; |
518 | browseForFiles = new fileBrowser(this,tr("Open File"),TRUE,0, "*"); // | 518 | // browseForFiles = new fileBrowser(this,tr("Open File"),TRUE,0, "*"); // |
519 | browseForFiles->setFileView( viewSelection ); | 519 | // browseForFiles->setFileView( viewSelection ); |
520 | browseForFiles->showMaximized(); | 520 | // browseForFiles->showMaximized(); |
521 | // if( result != -1 ) | 521 | // // if( result != -1 ) |
522 | 522 | ||
523 | if( browseForFiles->exec() != -1 ) { | 523 | // if( browseForFiles->exec() != -1 ) { |
524 | QString selFile = browseForFiles->selectedFileName; | 524 | // QString selFile = browseForFiles->selectedFileName; |
525 | QStringList fileList = browseForFiles->fileList; | 525 | // QStringList fileList = browseForFiles->fileList; |
526 | qDebug(selFile); | 526 | // qDebug(selFile); |
527 | QStringList::ConstIterator f; | 527 | // QStringList::ConstIterator f; |
528 | QString fileTemp; | 528 | // QString fileTemp; |
529 | for ( f = fileList.begin(); f != fileList.end(); f++ ) { | 529 | // for ( f = fileList.begin(); f != fileList.end(); f++ ) { |
530 | fileTemp = *f; | 530 | // fileTemp = *f; |
531 | fileTemp.right( fileTemp.length()-5); | 531 | // fileTemp.right( fileTemp.length()-5); |
532 | QString fileName = fileTemp; | 532 | // QString fileName = fileTemp; |
533 | if( fileName != "Unnamed" || fileName != "Empty Text" ) { | 533 | // if( fileName != "Unnamed" || fileName != "Empty Text" ) { |
534 | currentFileName = fileName; | 534 | // currentFileName = fileName; |
535 | qDebug("please open "+currentFileName); | 535 | // qDebug("please open "+currentFileName); |
536 | openFile(currentFileName ); | 536 | // openFile(currentFileName ); |
537 | } | 537 | // } |
538 | } | 538 | // } |
539 | viewSelection = browseForFiles->SelectionCombo->currentItem(); | 539 | // viewSelection = browseForFiles->SelectionCombo->currentItem(); |
540 | } | 540 | // } |
541 | delete browseForFiles; | 541 | // delete browseForFiles; |
542 | editor->setEdited( FALSE); | 542 | // editor->setEdited( FALSE); |
543 | edited1=FALSE; | 543 | // edited1=FALSE; |
544 | edited=FALSE; | 544 | // edited=FALSE; |
545 | if(caption().left(1)=="*") | 545 | // if(caption().left(1)=="*") |
546 | setCaption(caption().right(caption().length()-1)); | 546 | // setCaption(caption().right(caption().length()-1)); |
547 | doSearchBar(); | 547 | // doSearchBar(); |
548 | } | 548 | // } |
549 | |||
549 | } | 550 | } |
550 | 551 | ||
diff --git a/core/apps/textedit/textedit.h b/core/apps/textedit/textedit.h index 9d27ab0..d8208b1 100644 --- a/core/apps/textedit/textedit.h +++ b/core/apps/textedit/textedit.h | |||
@@ -25,5 +25,5 @@ | |||
25 | #define QTEXTEDIT_OPEN_API | 25 | #define QTEXTEDIT_OPEN_API |
26 | 26 | ||
27 | #include "fileBrowser.h" | 27 | //#include "fileBrowser.h" |
28 | #include "fileSaver.h" | 28 | #include "fileSaver.h" |
29 | 29 | ||
@@ -112,5 +112,5 @@ private: | |||
112 | private: | 112 | private: |
113 | fileSaver *fileSaveDlg; | 113 | fileSaver *fileSaveDlg; |
114 | fileBrowser *browseForFiles; | 114 | // fileBrowser *browseForFiles; |
115 | QpeEditor* editor; | 115 | QpeEditor* editor; |
116 | QToolBar *menu, *editBar, *searchBar; | 116 | QToolBar *menu, *editBar, *searchBar; |
diff --git a/core/apps/textedit/textedit.pro b/core/apps/textedit/textedit.pro index 4f20da3..d01a9f4 100644 --- a/core/apps/textedit/textedit.pro +++ b/core/apps/textedit/textedit.pro | |||
@@ -3,6 +3,6 @@ CONFIG += qt warn_on release | |||
3 | 3 | ||
4 | DESTDIR = $(OPIEDIR)/bin | 4 | DESTDIR = $(OPIEDIR)/bin |
5 | HEADERS = textedit.h fileBrowser.h fontDialog.h fileSaver.h filePermissions.h | 5 | HEADERS = textedit.h fontDialog.h fileSaver.h filePermissions.h |
6 | SOURCES = main.cpp textedit.cpp fileBrowser.cpp fontDialog.cpp fileSaver.cpp filePermissions.cpp | 6 | SOURCES = main.cpp textedit.cpp fontDialog.cpp fileSaver.cpp filePermissions.cpp |
7 | 7 | ||
8 | INCLUDEPATH += $(OPIEDIR)/include | 8 | INCLUDEPATH += $(OPIEDIR)/include |