-rw-r--r-- | core/apps/textedit/fileBrowser.cpp | 43 | ||||
-rw-r--r-- | core/apps/textedit/fileBrowser.h | 2 | ||||
-rw-r--r-- | noncore/net/opieftp/inputDialog.cpp | 4 | ||||
-rw-r--r-- | noncore/net/opieftp/inputDialog.h | 2 | ||||
-rw-r--r-- | noncore/net/opieftp/opieftp.cpp | 4 |
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 | |||
@@ -10,9 +10,9 @@ | |||
10 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE | 10 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE |
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 | ||
18 | #include <qpe/config.h> | 18 | #include <qpe/config.h> |
@@ -49,14 +49,21 @@ fileBrowser::fileBrowser( QWidget* parent, const char* name, bool modal, WFlags | |||
49 | { | 49 | { |
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()); |
62 | 69 | ||
@@ -67,9 +74,9 @@ fileBrowser::fileBrowser( QWidget* parent, const char* name, bool modal, WFlags | |||
67 | QGridLayout *layout = new QGridLayout( this ); | 74 | QGridLayout *layout = new QGridLayout( this ); |
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 & ) ), |
75 | this, SLOT( dirPathComboActivated( const QString & ) ) ); | 82 | this, SLOT( dirPathComboActivated( const QString & ) ) ); |
@@ -129,9 +136,10 @@ fileBrowser::fileBrowser( QWidget* parent, const char* name, bool modal, WFlags | |||
129 | 136 | ||
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" ); |
137 | SelectionCombo->insertItem( tr( "Documents" ) ); | 145 | SelectionCombo->insertItem( tr( "Documents" ) ); |
@@ -215,9 +223,9 @@ void fileBrowser::populateList() | |||
215 | if( !fi->isReadable() ) | 223 | if( !fi->isReadable() ) |
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); |
223 | } | 231 | } |
@@ -416,9 +424,9 @@ void fileBrowser::makDir() { | |||
416 | void fileBrowser::localRename() { | 424 | 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; |
424 | QString newName = currentDir.canonicalPath() + "/" + fileDlg->LineEdit1->text();//+".playlist"; | 432 | QString newName = currentDir.canonicalPath() + "/" + fileDlg->LineEdit1->text();//+".playlist"; |
@@ -491,16 +499,16 @@ void fileBrowser::showType(const QString &t) { | |||
491 | QString ext; | 499 | QString ext; |
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 | } |
506 | currentDir.setNameFilter(filterStr); | 514 | currentDir.setNameFilter(filterStr); |
@@ -610,4 +618,7 @@ InputDialog::~InputDialog() | |||
610 | inputText= LineEdit1->text(); | 618 | inputText= LineEdit1->text(); |
611 | 619 | ||
612 | } | 620 | } |
613 | 621 | ||
622 | void 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 | |||
@@ -112,8 +112,8 @@ public: | |||
112 | InputDialog( QWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); | 112 | InputDialog( QWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); |
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 | |||
@@ -37,4 +37,8 @@ InputDialog::~InputDialog() | |||
37 | inputText= LineEdit1->text(); | 37 | inputText= LineEdit1->text(); |
38 | 38 | ||
39 | } | 39 | } |
40 | 40 | ||
41 | void 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 | |||
@@ -27,8 +27,8 @@ public: | |||
27 | InputDialog( QWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); | 27 | InputDialog( QWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); |
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 | |||
@@ -942,9 +942,9 @@ void OpieFtp::remoteRename() | |||
942 | { | 942 | { |
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; |
950 | QString newName = currentRemoteDir +"/"+ fileDlg->LineEdit1->text();//+".playlist"; | 950 | QString newName = currentRemoteDir +"/"+ fileDlg->LineEdit1->text();//+".playlist"; |
@@ -964,9 +964,9 @@ void OpieFtp::localRename() | |||
964 | { | 964 | { |
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; |
972 | QString newName = currentDir.canonicalPath() + "/" + fileDlg->LineEdit1->text();//+".playlist"; | 972 | QString newName = currentDir.canonicalPath() + "/" + fileDlg->LineEdit1->text();//+".playlist"; |