summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/apps/textedit/fileBrowser.cpp59
-rw-r--r--core/apps/textedit/textedit.cpp75
-rw-r--r--core/apps/textedit/textedit.h2
3 files changed, 77 insertions, 59 deletions
diff --git a/core/apps/textedit/fileBrowser.cpp b/core/apps/textedit/fileBrowser.cpp
index f322513..fced326 100644
--- a/core/apps/textedit/fileBrowser.cpp
+++ b/core/apps/textedit/fileBrowser.cpp
@@ -11,7 +11,7 @@
** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
**
****************************************************************************/
-//#define QTOPIA_INTERNAL_MIMEEXT
+#define QTOPIA_INTERNAL_MIMEEXT
#include "fileBrowser.h"
//#include "inputDialog.h"
@@ -50,24 +50,30 @@ fileBrowser::fileBrowser( QWidget* parent, const char* name, bool modal, WFlags
if ( !name )
setName( "fileBrowser" );
setCaption(tr( name ) );
-// mimeType = mimeFilter;
-// MimeType mt( mimeType);
-// if( mt.extension().isEmpty())
-// QStringList filterList;
-// filterList=QStringList::split(";",mimeFilter,FALSE);
-// for ( QStringList::Iterator it = filterList.begin(); it != filterList.end(); ++it ) {
-// printf( "%s \n", (*it).latin1() );
-// }
- filterStr = mimeFilter.right(mimeFilter.length() - mimeFilter.find("/",0,TRUE) - 1);// "*";
+// getMimeTypes();
+
+ mimeType = mimeFilter;
+ MimeType mt( mimeType);
+
+ if( mt.extension().isEmpty()) {
+
+ QStringList filterList;
+ filterList=QStringList::split(";",mimeFilter,FALSE);
+
+ for ( QStringList::Iterator it = filterList.begin(); it != filterList.end(); ++it ) {
+ printf( "%s \n", (*it).latin1() );
+ }
+
+ filterStr = mimeFilter.right(mimeFilter.length() - mimeFilter.find("/",0,TRUE) - 1);// "*";
- qDebug(filterStr);
-// else
-// filterStr = "*."+ mt.extension();
+ qDebug(filterStr);
+ } else {
+ filterStr = "*."+ mt.extension();
// qDebug("description "+mt.description());
// qDebug( "id "+mt.id());
// qDebug("extension "+mt.extension());
-
+ }
// channel = new QCopChannel( "QPE/fileDialog", this );
// connect( channel, SIGNAL(received(const QCString&, const QByteArray&)),
// this, SLOT(receive(const QCString&, const QByteArray&)) );
@@ -234,7 +240,7 @@ void fileBrowser::populateList()
if( fileL.find("->",0,TRUE) != -1) {
// overlay link image
pm= Resource::loadPixmap( "folder" );
- QPixmap lnk = Resource::loadPixmap( "symlink" );
+ QPixmap lnk = Resource::loadPixmap( "opie/symlink" );
QPainter painter( &pm );
painter.drawPixmap( pm.width()-lnk.width(), pm.height()-lnk.height(), lnk );
pm.setMask( pm.createHeuristicMask( FALSE ) );
@@ -492,7 +498,7 @@ void fileBrowser::updateMimeTypeMenu() {
void fileBrowser::showType(const QString &t) {
- qDebug(t);
+// qDebug("Show type "+t);
if(t.find("All",0,TRUE) != -1) {
filterStr = "*";
} else {
@@ -500,15 +506,17 @@ void fileBrowser::showType(const QString &t) {
QString ext;
for ( QStringList::Iterator it = list.begin(); it != list.end(); ++it ) {
mimeType =(*it);
- MimeType mt( mimeType);
-// qDebug("mime "+mimeType);
-// qDebug("description "+mt.description());
-// qDebug( "id "+mt.id());
-// qDebug("extension "+mt.extension());
-// if( mt.extension().isEmpty())
+ MimeType mt(mimeType);
+
+// qDebug("mime "+mimeType);
+// qDebug("description "+mt.description());
+// qDebug( "id "+mt.id());
+// qDebug("extension "+mt.extension());
+
+ if( mt.extension().isEmpty())
filterStr = "*";
-// else
-// filterStr = "*."+ mt.extension()+" ";
+ else
+ filterStr = "*."+ mt.extension()+" ";
// printf( "%s \n", (*it).latin1() );
}
}
@@ -546,10 +554,11 @@ QStringList fileBrowser::getMimeTypes() {
QStringList::ConstIterator f;
for ( f = maj.begin(); f != maj.end(); f++ ) {
QString temp = *f;
+ qDebug("type "+temp);
mimetypes << temp;
int sl = temp.find('/');
if (sl >= 0) {
- QString k = temp.left(sl);
+ QString k = temp;//.left(sl);
if( r.grep(k,TRUE).isEmpty() ) {
r << k;
k+="\n";
diff --git a/core/apps/textedit/textedit.cpp b/core/apps/textedit/textedit.cpp
index 18402d4..84888c1 100644
--- a/core/apps/textedit/textedit.cpp
+++ b/core/apps/textedit/textedit.cpp
@@ -501,39 +501,48 @@ void TextEdit::fileNew()
void TextEdit::fileOpen()
{
- QString str = OFileDialog::getOpenFileName(1,"/","", QStringList() , this );
- if(!str.isEmpty() )
- openFile( str );
-// browseForFiles = new fileBrowser(this,tr("Open File"),TRUE,0, "text/*"); //
-// 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(str );
-// }
-// }
-// viewSelection = browseForFiles->SelectionCombo->currentItem();
-// }
-// delete browseForFiles;
-// editor->setEdited( FALSE);
-// edited1=FALSE;
-// edited=FALSE;
-// if(caption().left(1)=="*")
-// setCaption(caption().right(caption().length()-1));
-// doSearchBar();
+ Config cfg("TextEdit");
+ cfg.setGroup("View");
+ bool b=FALSE;
+ if(cfg.readEntry("useOldFileDialog") == "TRUE")
+ b=TRUE;
+ if(!b) {
+ QString str = OFileDialog::getOpenFileName( 1,"/","", "text/plain", this );
+ if(!str.isEmpty() )
+ openFile( str );
+ } else {
+ QString str;
+ browseForFiles = new fileBrowser(this,tr("Open File"),TRUE,0, "text/*"); //
+ 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(str );
+ }
+ }
+ viewSelection = browseForFiles->SelectionCombo->currentItem();
+ }
+ delete browseForFiles;
+ editor->setEdited( FALSE);
+ edited1=FALSE;
+ edited=FALSE;
+ if(caption().left(1)=="*")
+ setCaption(caption().right(caption().length()-1));
+ doSearchBar();
+ }
}
void TextEdit::doSearchBar()
diff --git a/core/apps/textedit/textedit.h b/core/apps/textedit/textedit.h
index 61fa2a0..edc6fe3 100644
--- a/core/apps/textedit/textedit.h
+++ b/core/apps/textedit/textedit.h
@@ -57,7 +57,7 @@ public:
~TextEdit();
QPopupMenu *font;
- QAction *nStart;
+ QAction *nStart, *nFileDlgOpt;
bool edited, edited1;
void openFile( const QString & );
QCopChannel * channel;