From dd9e49cca8cd9a32a52edfc6b6a0683579612a75 Mon Sep 17 00:00:00 2001
From: llornkcor <llornkcor>
Date: Mon, 01 Apr 2002 23:50:15 +0000
Subject: input dialog

---
diff --git a/core/apps/textedit/fileBrowser.cpp b/core/apps/textedit/fileBrowser.cpp
index 8ea8067..652f830 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,12 +50,19 @@ 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())
-        filterStr =  "*";
-    else
-        filterStr = "*."+ mt.extension();
+//     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("description "+mt.description());
 //      qDebug( "id "+mt.id());
 //      qDebug("extension "+mt.extension());
@@ -68,7 +75,7 @@ fileBrowser::fileBrowser( QWidget* parent,  const char* name, bool modal, WFlags
     layout->setSpacing( 4 );
     layout->setMargin( 4 );
 
-    dirPathCombo = new QComboBox( FALSE, this, "dorPathCombo" );
+    dirPathCombo = new QComboBox( FALSE, this, "dirPathCombo" );
     dirPathCombo->setEditable(TRUE);
 
     connect( dirPathCombo, SIGNAL( activated( const QString & ) ),
@@ -130,7 +137,8 @@ fileBrowser::fileBrowser( QWidget* parent,  const char* name, bool modal, WFlags
     fileSelector = new FileSelector( mimeType, FileStack, "fileselector" , FALSE, FALSE); //buggy
 //    connect( fileSelector, SIGNAL( closeMe() ), this, SLOT( showEditTools() ) );
 //    connect( fileSelector, SIGNAL( newSelected( const DocLnk &) ), this, SLOT( newFile( const DocLnk & ) ) );
-    connect( fileSelector, SIGNAL( fileSelected( const DocLnk &) ), this, SLOT( docOpen( const DocLnk & ) ) );
+    connect( fileSelector, SIGNAL( fileSelected( const DocLnk &) ),
+             this, SLOT( docOpen( const DocLnk & ) ) );
     layout->addMultiCellWidget( FileStack, 1, 1, 0, 7 );
 
     SelectionCombo = new QComboBox( FALSE, this, "SelectionCombo" );
@@ -216,7 +224,7 @@ void fileBrowser::populateList()
                         pm = Resource::loadPixmap( "locked" );
                     else {
                         MimeType mt(fi->filePath());
-                        pm=mt.pixmap();
+                        pm=mt.pixmap();// sets the pixmap for the mimetype
                         if(pm.isNull())
                             pm =  Resource::loadPixmap( "UnknownDocument-14" );
                         item->setPixmap( 0,pm);
@@ -417,7 +425,7 @@ void fileBrowser::localRename() {
     QString curFile = ListView->currentItem()->text(0);
     InputDialog *fileDlg;
     fileDlg = new InputDialog(this,"Rename",TRUE, 0);
-    fileDlg->inputText = curFile;
+    fileDlg->setTextEdit((const QString &) curFile);
     fileDlg->exec();
     if( fileDlg->result() == 1 ) {
         QString oldname =  currentDir.canonicalPath() + "/" + curFile;
@@ -492,14 +500,14 @@ void fileBrowser::showType(const QString &t) {
         for ( QStringList::Iterator it = list.begin(); it != list.end(); ++it ) {
             mimeType =(*it);
             MimeType mt( mimeType);
-            qDebug("mime "+mimeType);
+//            qDebug("mime "+mimeType);
 //         qDebug("description "+mt.description());
 //         qDebug( "id "+mt.id());
-            qDebug("extension "+mt.extension());
-            if( mt.extension().isEmpty())
+//            qDebug("extension "+mt.extension());
+//             if( mt.extension().isEmpty())
                 filterStr =  "*";
-            else
-                filterStr = "*."+ mt.extension()+" ";
+//             else
+//                 filterStr = "*."+ mt.extension()+" ";
 //         printf( "%s \n", (*it).latin1() );
         }
     }
@@ -611,3 +619,6 @@ InputDialog::~InputDialog()
   
 }
 
+void InputDialog::setTextEdit(const QString &string) {
+    LineEdit1->setText(string);
+}
diff --git a/core/apps/textedit/fileBrowser.h b/core/apps/textedit/fileBrowser.h
index e76c7df..3db6a27 100644
--- a/core/apps/textedit/fileBrowser.h
+++ b/core/apps/textedit/fileBrowser.h
@@ -113,7 +113,7 @@ public:
     ~InputDialog();
     QString inputText;
     QLineEdit* LineEdit1;
-
+    void setTextEdit(const QString &);
 };
 
 #endif // FILEBROWSER_H
diff --git a/noncore/net/opieftp/inputDialog.cpp b/noncore/net/opieftp/inputDialog.cpp
index 89b345e..373db3b 100644
--- a/noncore/net/opieftp/inputDialog.cpp
+++ b/noncore/net/opieftp/inputDialog.cpp
@@ -38,3 +38,7 @@ InputDialog::~InputDialog()
   
 }
 
+void InputDialog::setTextEdit(const QString &string)
+{
+    LineEdit1->setText(string);
+}
diff --git a/noncore/net/opieftp/inputDialog.h b/noncore/net/opieftp/inputDialog.h
index 2cd8285..dfe0e8a 100644
--- a/noncore/net/opieftp/inputDialog.h
+++ b/noncore/net/opieftp/inputDialog.h
@@ -28,7 +28,7 @@ public:
     ~InputDialog();
     QString inputText;
     QLineEdit* LineEdit1;
-
+    void setTextEdit(const QString &);
 };
 
 #endif // INPUTDIALOG_H
diff --git a/noncore/net/opieftp/opieftp.cpp b/noncore/net/opieftp/opieftp.cpp
index e64fd73..b451925 100644
--- a/noncore/net/opieftp/opieftp.cpp
+++ b/noncore/net/opieftp/opieftp.cpp
@@ -943,7 +943,7 @@ void OpieFtp::remoteRename()
     QString curFile = Remote_View->currentItem()->text(0);
     InputDialog *fileDlg;
     fileDlg = new InputDialog(this,tr("Rename"),TRUE, 0);
-    fileDlg->inputText = curFile;
+    fileDlg->setTextEdit((const QString &)curFile);
     fileDlg->exec();
     if( fileDlg->result() == 1 ) {
         QString oldName = currentRemoteDir +"/"+ curFile;
@@ -965,7 +965,7 @@ void OpieFtp::localRename()
     QString curFile = Local_View->currentItem()->text(0);
     InputDialog *fileDlg;
     fileDlg = new InputDialog(this,tr("Rename"),TRUE, 0);
-    fileDlg->inputText = curFile;
+    fileDlg->setTextEdit((const QString &)curFile);
     fileDlg->exec();
     if( fileDlg->result() == 1 ) {
         QString oldname =  currentDir.canonicalPath() + "/" + curFile;
--
cgit v0.9.0.2