summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/apps/textedit/textedit.cpp77
-rw-r--r--core/apps/textedit/textedit.h4
-rw-r--r--core/apps/textedit/textedit.pro4
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 @@
#include "textedit.h"
-#include "fileBrowser.h"
+//#include "fileBrowser.h"
#include "fileSaver.h"
#include "filePermissions.h"
@@ -508,43 +508,44 @@ void TextEdit::fileOpen()
cfg.setGroup("View");
bool b=FALSE;
- if(cfg.readEntry("useOldFileDialog") == "TRUE")
- b=TRUE;
- if(!b) {
- QString str = OFileDialog::getOpenFileName( 1,"/","", "*", this );
+// if(cfg.readEntry("useOldFileDialog") == "TRUE")
+// b=TRUE;
+// if(!b) {
+ QString str = OFileDialog::getOpenFileName( 1,"/")://,"", "*", this );
if(!str.isEmpty() )
openFile( str );
- } else {
- QString str;
- browseForFiles = new fileBrowser(this,tr("Open File"),TRUE,0, "*"); //
- browseForFiles->setFileView( viewSelection );
- browseForFiles->showMaximized();
-// if( result != -1 )
-
- if( browseForFiles->exec() != -1 ) {
- QString selFile = browseForFiles->selectedFileName;
- QStringList fileList = browseForFiles->fileList;
- qDebug(selFile);
- QStringList::ConstIterator f;
- QString fileTemp;
- for ( f = fileList.begin(); f != fileList.end(); f++ ) {
- fileTemp = *f;
- fileTemp.right( fileTemp.length()-5);
- QString fileName = fileTemp;
- if( fileName != "Unnamed" || fileName != "Empty Text" ) {
- currentFileName = fileName;
- qDebug("please open "+currentFileName);
- openFile(currentFileName );
- }
- }
- viewSelection = browseForFiles->SelectionCombo->currentItem();
- }
- delete browseForFiles;
- editor->setEdited( FALSE);
- edited1=FALSE;
- edited=FALSE;
- if(caption().left(1)=="*")
- setCaption(caption().right(caption().length()-1));
- doSearchBar();
- }
+// } else {
+// QString str;
+// browseForFiles = new fileBrowser(this,tr("Open File"),TRUE,0, "*"); //
+// browseForFiles->setFileView( viewSelection );
+// browseForFiles->showMaximized();
+// // if( result != -1 )
+
+// if( browseForFiles->exec() != -1 ) {
+// QString selFile = browseForFiles->selectedFileName;
+// QStringList fileList = browseForFiles->fileList;
+// qDebug(selFile);
+// QStringList::ConstIterator f;
+// QString fileTemp;
+// for ( f = fileList.begin(); f != fileList.end(); f++ ) {
+// fileTemp = *f;
+// fileTemp.right( fileTemp.length()-5);
+// QString fileName = fileTemp;
+// if( fileName != "Unnamed" || fileName != "Empty Text" ) {
+// currentFileName = fileName;
+// qDebug("please open "+currentFileName);
+// openFile(currentFileName );
+// }
+// }
+// viewSelection = browseForFiles->SelectionCombo->currentItem();
+// }
+// delete browseForFiles;
+// editor->setEdited( FALSE);
+// edited1=FALSE;
+// edited=FALSE;
+// if(caption().left(1)=="*")
+// setCaption(caption().right(caption().length()-1));
+// doSearchBar();
+// }
+
}
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 @@
#define QTEXTEDIT_OPEN_API
-#include "fileBrowser.h"
+//#include "fileBrowser.h"
#include "fileSaver.h"
@@ -112,5 +112,5 @@ private:
private:
fileSaver *fileSaveDlg;
- fileBrowser *browseForFiles;
+// fileBrowser *browseForFiles;
QpeEditor* editor;
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
DESTDIR = $(OPIEDIR)/bin
-HEADERS = textedit.h fileBrowser.h fontDialog.h fileSaver.h filePermissions.h
-SOURCES = main.cpp textedit.cpp fileBrowser.cpp fontDialog.cpp fileSaver.cpp filePermissions.cpp
+HEADERS = textedit.h fontDialog.h fileSaver.h filePermissions.h
+SOURCES = main.cpp textedit.cpp fontDialog.cpp fileSaver.cpp filePermissions.cpp
INCLUDEPATH += $(OPIEDIR)/include