summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/apps/textedit/fileBrowser.cpp43
-rw-r--r--core/apps/textedit/fileBrowser.h2
-rw-r--r--noncore/net/opieftp/inputDialog.cpp4
-rw-r--r--noncore/net/opieftp/inputDialog.h2
-rw-r--r--noncore/net/opieftp/opieftp.cpp4
5 files changed, 35 insertions, 20 deletions
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 @@
11** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. 11** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
12** 12**
13****************************************************************************/ 13****************************************************************************/
14#define QTOPIA_INTERNAL_MIMEEXT 14//#define QTOPIA_INTERNAL_MIMEEXT
15#include "fileBrowser.h" 15#include "fileBrowser.h"
16//#include "inputDialog.h" 16//#include "inputDialog.h"
17 17
@@ -50,12 +50,19 @@ fileBrowser::fileBrowser( QWidget* parent, const char* name, bool modal, WFlags
50 if ( !name ) 50 if ( !name )
51 setName( "fileBrowser" ); 51 setName( "fileBrowser" );
52 setCaption(tr( name ) ); 52 setCaption(tr( name ) );
53 mimeType = mimeFilter; 53// mimeType = mimeFilter;
54 MimeType mt( mimeType); 54// MimeType mt( mimeType);
55 if( mt.extension().isEmpty()) 55// if( mt.extension().isEmpty())
56 filterStr = "*"; 56 QStringList filterList;
57 else 57 filterList=QStringList::split(";",mimeFilter,FALSE);
58 filterStr = "*."+ mt.extension(); 58 for ( QStringList::Iterator it = filterList.begin(); it != filterList.end(); ++it ) {
59 printf( "%s \n", (*it).latin1() );
60 }
61
62 filterStr = mimeFilter.right(mimeFilter.length()- mimeFilter.find("/",0,TRUE) - 1);// "*";
63 qDebug(filterStr);
64// else
65// filterStr = "*."+ mt.extension();
59// qDebug("description "+mt.description()); 66// qDebug("description "+mt.description());
60// qDebug( "id "+mt.id()); 67// qDebug( "id "+mt.id());
61// qDebug("extension "+mt.extension()); 68// qDebug("extension "+mt.extension());
@@ -68,7 +75,7 @@ fileBrowser::fileBrowser( QWidget* parent, const char* name, bool modal, WFlags
68 layout->setSpacing( 4 ); 75 layout->setSpacing( 4 );
69 layout->setMargin( 4 ); 76 layout->setMargin( 4 );
70 77
71 dirPathCombo = new QComboBox( FALSE, this, "dorPathCombo" ); 78 dirPathCombo = new QComboBox( FALSE, this, "dirPathCombo" );
72 dirPathCombo->setEditable(TRUE); 79 dirPathCombo->setEditable(TRUE);
73 80
74 connect( dirPathCombo, SIGNAL( activated( const QString & ) ), 81 connect( dirPathCombo, SIGNAL( activated( const QString & ) ),
@@ -130,7 +137,8 @@ fileBrowser::fileBrowser( QWidget* parent, const char* name, bool modal, WFlags
130 fileSelector = new FileSelector( mimeType, FileStack, "fileselector" , FALSE, FALSE); //buggy 137 fileSelector = new FileSelector( mimeType, FileStack, "fileselector" , FALSE, FALSE); //buggy
131// connect( fileSelector, SIGNAL( closeMe() ), this, SLOT( showEditTools() ) ); 138// connect( fileSelector, SIGNAL( closeMe() ), this, SLOT( showEditTools() ) );
132// connect( fileSelector, SIGNAL( newSelected( const DocLnk &) ), this, SLOT( newFile( const DocLnk & ) ) ); 139// connect( fileSelector, SIGNAL( newSelected( const DocLnk &) ), this, SLOT( newFile( const DocLnk & ) ) );
133 connect( fileSelector, SIGNAL( fileSelected( const DocLnk &) ), this, SLOT( docOpen( const DocLnk & ) ) ); 140 connect( fileSelector, SIGNAL( fileSelected( const DocLnk &) ),
141 this, SLOT( docOpen( const DocLnk & ) ) );
134 layout->addMultiCellWidget( FileStack, 1, 1, 0, 7 ); 142 layout->addMultiCellWidget( FileStack, 1, 1, 0, 7 );
135 143
136 SelectionCombo = new QComboBox( FALSE, this, "SelectionCombo" ); 144 SelectionCombo = new QComboBox( FALSE, this, "SelectionCombo" );
@@ -216,7 +224,7 @@ void fileBrowser::populateList()
216 pm = Resource::loadPixmap( "locked" ); 224 pm = Resource::loadPixmap( "locked" );
217 else { 225 else {
218 MimeType mt(fi->filePath()); 226 MimeType mt(fi->filePath());
219 pm=mt.pixmap(); 227 pm=mt.pixmap();// sets the pixmap for the mimetype
220 if(pm.isNull()) 228 if(pm.isNull())
221 pm = Resource::loadPixmap( "UnknownDocument-14" ); 229 pm = Resource::loadPixmap( "UnknownDocument-14" );
222 item->setPixmap( 0,pm); 230 item->setPixmap( 0,pm);
@@ -417,7 +425,7 @@ void fileBrowser::localRename() {
417 QString curFile = ListView->currentItem()->text(0); 425 QString curFile = ListView->currentItem()->text(0);
418 InputDialog *fileDlg; 426 InputDialog *fileDlg;
419 fileDlg = new InputDialog(this,"Rename",TRUE, 0); 427 fileDlg = new InputDialog(this,"Rename",TRUE, 0);
420 fileDlg->inputText = curFile; 428 fileDlg->setTextEdit((const QString &) curFile);
421 fileDlg->exec(); 429 fileDlg->exec();
422 if( fileDlg->result() == 1 ) { 430 if( fileDlg->result() == 1 ) {
423 QString oldname = currentDir.canonicalPath() + "/" + curFile; 431 QString oldname = currentDir.canonicalPath() + "/" + curFile;
@@ -492,14 +500,14 @@ void fileBrowser::showType(const QString &t) {
492 for ( QStringList::Iterator it = list.begin(); it != list.end(); ++it ) { 500 for ( QStringList::Iterator it = list.begin(); it != list.end(); ++it ) {
493 mimeType =(*it); 501 mimeType =(*it);
494 MimeType mt( mimeType); 502 MimeType mt( mimeType);
495 qDebug("mime "+mimeType); 503// qDebug("mime "+mimeType);
496// qDebug("description "+mt.description()); 504// qDebug("description "+mt.description());
497// qDebug( "id "+mt.id()); 505// qDebug( "id "+mt.id());
498 qDebug("extension "+mt.extension()); 506// qDebug("extension "+mt.extension());
499 if( mt.extension().isEmpty()) 507// if( mt.extension().isEmpty())
500 filterStr = "*"; 508 filterStr = "*";
501 else 509// else
502 filterStr = "*."+ mt.extension()+" "; 510// filterStr = "*."+ mt.extension()+" ";
503// printf( "%s \n", (*it).latin1() ); 511// printf( "%s \n", (*it).latin1() );
504 } 512 }
505 } 513 }
@@ -611,3 +619,6 @@ InputDialog::~InputDialog()
611 619
612} 620}
613 621
622void InputDialog::setTextEdit(const QString &string) {
623 LineEdit1->setText(string);
624}
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:
113 ~InputDialog(); 113 ~InputDialog();
114 QString inputText; 114 QString inputText;
115 QLineEdit* LineEdit1; 115 QLineEdit* LineEdit1;
116 116 void setTextEdit(const QString &);
117}; 117};
118 118
119#endif // FILEBROWSER_H 119#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()
38 38
39} 39}
40 40
41void InputDialog::setTextEdit(const QString &string)
42{
43 LineEdit1->setText(string);
44}
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:
28 ~InputDialog(); 28 ~InputDialog();
29 QString inputText; 29 QString inputText;
30 QLineEdit* LineEdit1; 30 QLineEdit* LineEdit1;
31 31 void setTextEdit(const QString &);
32}; 32};
33 33
34#endif // INPUTDIALOG_H 34#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()
943 QString curFile = Remote_View->currentItem()->text(0); 943 QString curFile = Remote_View->currentItem()->text(0);
944 InputDialog *fileDlg; 944 InputDialog *fileDlg;
945 fileDlg = new InputDialog(this,tr("Rename"),TRUE, 0); 945 fileDlg = new InputDialog(this,tr("Rename"),TRUE, 0);
946 fileDlg->inputText = curFile; 946 fileDlg->setTextEdit((const QString &)curFile);
947 fileDlg->exec(); 947 fileDlg->exec();
948 if( fileDlg->result() == 1 ) { 948 if( fileDlg->result() == 1 ) {
949 QString oldName = currentRemoteDir +"/"+ curFile; 949 QString oldName = currentRemoteDir +"/"+ curFile;
@@ -965,7 +965,7 @@ void OpieFtp::localRename()
965 QString curFile = Local_View->currentItem()->text(0); 965 QString curFile = Local_View->currentItem()->text(0);
966 InputDialog *fileDlg; 966 InputDialog *fileDlg;
967 fileDlg = new InputDialog(this,tr("Rename"),TRUE, 0); 967 fileDlg = new InputDialog(this,tr("Rename"),TRUE, 0);
968 fileDlg->inputText = curFile; 968 fileDlg->setTextEdit((const QString &)curFile);
969 fileDlg->exec(); 969 fileDlg->exec();
970 if( fileDlg->result() == 1 ) { 970 if( fileDlg->result() == 1 ) {
971 QString oldname = currentDir.canonicalPath() + "/" + curFile; 971 QString oldname = currentDir.canonicalPath() + "/" + curFile;