author | zecke <zecke> | 2002-09-15 21:22:18 (UTC) |
---|---|---|
committer | zecke <zecke> | 2002-09-15 21:22:18 (UTC) |
commit | 568c816cc66f1566b8be6ff8d246e7b1465ae61e (patch) (unidiff) | |
tree | 3c1d1f9ac7421ae27b18f580670ac1e1b8bf8a92 | |
parent | f2594358208bb2ea826bbea6afb0b3aa35947378 (diff) | |
download | opie-568c816cc66f1566b8be6ff8d246e7b1465ae61e.zip opie-568c816cc66f1566b8be6ff8d246e7b1465ae61e.tar.gz opie-568c816cc66f1566b8be6ff8d246e7b1465ae61e.tar.bz2 |
ok basicly all old functions are available again
what's now missing is the code switching Listers
and views
toggling the toolbar
filter
-rw-r--r-- | libopie/ofileselector/ofilelistview.cpp | 85 | ||||
-rw-r--r-- | libopie/ofileselector/ofilelistview.h | 7 | ||||
-rw-r--r-- | libopie/ofileselector/ofileselector.cpp | 261 | ||||
-rw-r--r-- | libopie/ofileselector/ofileselector.h | 35 | ||||
-rw-r--r-- | libopie/ofileselector/ofileview.cpp | 7 | ||||
-rw-r--r-- | libopie/ofileselector/ofileview.h | 2 |
6 files changed, 140 insertions, 257 deletions
diff --git a/libopie/ofileselector/ofilelistview.cpp b/libopie/ofileselector/ofilelistview.cpp index 7108a5b..bb15764 100644 --- a/libopie/ofileselector/ofilelistview.cpp +++ b/libopie/ofileselector/ofilelistview.cpp | |||
@@ -1,25 +1,50 @@ | |||
1 | 1 | ||
2 | #include <qheader.h> | ||
3 | |||
2 | #include <qpe/mimetype.h> | 4 | #include <qpe/mimetype.h> |
3 | #include <qpe/resource.h> | 5 | #include <qpe/resource.h> |
6 | #include <qpe/qpeapplication.h> | ||
4 | 7 | ||
5 | #include "ofileselector.h" | 8 | #include "ofileselector.h" |
6 | #include "ofileselectoritem.h" | 9 | #include "ofileselectoritem.h" |
7 | #include "ofilelistview.h" | 10 | #include "ofilelistview.h" |
8 | 11 | ||
9 | 12 | ||
10 | OFileListView::OFileListView( QWidget* parent, OFileSelector* sel) | 13 | OFileListView::OFileListView( QWidget* parent, OFileSelector* sel) |
11 | : QListView( parent ), OFileView( sel ) | 14 | : QListView( parent ), OFileView( sel ) |
12 | { | 15 | { |
13 | 16 | QPEApplication::setStylusOperation( viewport(), | |
17 | QPEApplication::RightOnHold); | ||
18 | addColumn(" " ); | ||
19 | addColumn(tr("Name"), 135 ); | ||
20 | addColumn(tr("Size"), -1 ); | ||
21 | addColumn(tr("Date"), 60 ); | ||
22 | addColumn(tr("Mime Type"), -1 ); | ||
23 | QHeader *head = header(); | ||
24 | head->hide(); | ||
25 | setSorting( 1 ); | ||
26 | setAllColumnsShowFocus( TRUE ); | ||
27 | |||
28 | connect(this, SIGNAL(selectionChanged() ), | ||
29 | this, SLOT(slotSelectionChanged() ) ); | ||
30 | |||
31 | connect(this, SIGNAL(currentChanged(QListViewItem *) ), | ||
32 | this, SLOT(slotCurrentChanged(QListViewItem * ) ) ); | ||
33 | |||
34 | connect(this, SIGNAL(mouseButtonClicked(int, QListViewItem*, const QPoint &, int) ), | ||
35 | this, SLOT(slotClicked( int, QListViewItem *, const QPoint &, int) ) ); | ||
36 | |||
37 | connect(this, SIGNAL(mouseButtonPressed(int, QListViewItem *, const QPoint &, int )), | ||
38 | this, SLOT(slotRightButton(int, QListViewItem *, const QPoint &, int ) ) ); | ||
14 | } | 39 | } |
15 | OFileListView::~OFileListView() { | 40 | OFileListView::~OFileListView() { |
16 | 41 | ||
17 | } | 42 | } |
18 | void OFileListView::clear() { | 43 | void OFileListView::clear() { |
19 | QListView::clear(); | 44 | QListView::clear(); |
20 | } | 45 | } |
21 | void OFileListView::addFile( const QString&, | 46 | void OFileListView::addFile( const QString&, |
22 | QFileInfo* info, | 47 | QFileInfo* info, |
23 | bool isSymlink ) { | 48 | bool isSymlink ) { |
24 | MimeType type( info->absFilePath() ); | 49 | MimeType type( info->absFilePath() ); |
25 | QPixmap pix = type.pixmap(); | 50 | QPixmap pix = type.pixmap(); |
@@ -114,12 +139,70 @@ QStringList OFileListView::selectedNames()const { | |||
114 | } | 139 | } |
115 | QString OFileListView::selectedPath()const { | 140 | QString OFileListView::selectedPath()const { |
116 | return QString::null; | 141 | return QString::null; |
117 | } | 142 | } |
118 | QStringList OFileListView::selectedPaths()const { | 143 | QStringList OFileListView::selectedPaths()const { |
119 | QStringList list; | 144 | QStringList list; |
120 | list << selectedPath(); | 145 | list << selectedPath(); |
121 | return list; | 146 | return list; |
122 | } | 147 | } |
123 | int OFileListView::fileCount() { | 148 | int OFileListView::fileCount() { |
124 | return childCount(); | 149 | return childCount(); |
125 | } | 150 | } |
151 | void OFileListView::sort() { | ||
152 | QListView::sort(); | ||
153 | } | ||
154 | void OFileListView::slotSelectionChanged() { | ||
155 | |||
156 | } | ||
157 | void OFileListView::slotCurrentChanged( QListViewItem* item) { | ||
158 | if (!item ) | ||
159 | return; | ||
160 | |||
161 | OFileSelectorItem* sel = (OFileSelectorItem*) item; | ||
162 | |||
163 | qWarning("current changed"); | ||
164 | if(!sel->isDir() ){ | ||
165 | updateLine( sel->text(1) ); | ||
166 | |||
167 | if (selector()->mode() == OFileSelector::Fileselector ) { | ||
168 | QStringList str = QStringList::split("->", sel->text(1) ); | ||
169 | QString path =sel->directory() + "/" + str[0].stripWhiteSpace(); | ||
170 | DocLnk lnk( path ); | ||
171 | fileSelected(lnk ); | ||
172 | fileSelected( path ); | ||
173 | } | ||
174 | } | ||
175 | } | ||
176 | void OFileListView::slotClicked( int button, QListViewItem* item, | ||
177 | const QPoint&, int ) { | ||
178 | if ( !item ) | ||
179 | return; | ||
180 | |||
181 | if( button != Qt::LeftButton ) | ||
182 | return; | ||
183 | |||
184 | OFileSelectorItem *sel = (OFileSelectorItem*)item; | ||
185 | |||
186 | if(!sel->isLocked() ){ | ||
187 | QStringList str = QStringList::split("->", sel->text(1) ); | ||
188 | if( sel->isDir() ){ | ||
189 | changedDir( sel->directory() + "/" + str[0].stripWhiteSpace() ); | ||
190 | }else{ | ||
191 | updateLine( str[0].stripWhiteSpace() ); | ||
192 | QString path = sel->directory(); | ||
193 | path += "/"; | ||
194 | path += str[0].stripWhiteSpace(); | ||
195 | |||
196 | DocLnk lnk( path ); | ||
197 | fileSelected( path ); | ||
198 | fileSelected( lnk ); | ||
199 | } | ||
200 | } | ||
201 | } | ||
202 | void OFileListView::slotRightButton( int button, QListViewItem* item, | ||
203 | const QPoint&, int ) { | ||
204 | if (!item || (button != Qt::RightButton )) | ||
205 | return; | ||
206 | |||
207 | /* raise contextmenu */ | ||
208 | } | ||
diff --git a/libopie/ofileselector/ofilelistview.h b/libopie/ofileselector/ofilelistview.h index c7e9223..a83d70d 100644 --- a/libopie/ofileselector/ofilelistview.h +++ b/libopie/ofileselector/ofilelistview.h | |||
@@ -23,23 +23,28 @@ public: | |||
23 | 23 | ||
24 | void addDir( const QString& mime, | 24 | void addDir( const QString& mime, |
25 | QFileInfo* info, bool = FALSE ); | 25 | QFileInfo* info, bool = FALSE ); |
26 | void addDir( const QString& mime, const QString& dir, | 26 | void addDir( const QString& mime, const QString& dir, |
27 | const QString& file, bool = FALSE ); | 27 | const QString& file, bool = FALSE ); |
28 | 28 | ||
29 | void addSymlink( const QString& mime, | 29 | void addSymlink( const QString& mime, |
30 | QFileInfo* info, bool = FALSE ); | 30 | QFileInfo* info, bool = FALSE ); |
31 | void addSymlink( const QString& mine, const QString& path, | 31 | void addSymlink( const QString& mine, const QString& path, |
32 | const QString& file, bool isSymlink = FALSE ); | 32 | const QString& file, bool isSymlink = FALSE ); |
33 | void cd( const QString& path ); | 33 | void cd( const QString& path ); |
34 | QWidget* widget(); | 34 | QWidget* widget(); |
35 | void sort(); | ||
35 | 36 | ||
36 | QString selectedName()const ; | 37 | QString selectedName()const ; |
37 | QStringList selectedNames()const; | 38 | QStringList selectedNames()const; |
38 | 39 | ||
39 | QString selectedPath()const; | 40 | QString selectedPath()const; |
40 | QStringList selectedPaths()const; | 41 | QStringList selectedPaths()const; |
41 | int fileCount(); | 42 | int fileCount(); |
42 | 43 | private slots: | |
44 | void slotSelectionChanged(); | ||
45 | void slotCurrentChanged(QListViewItem* ); | ||
46 | void slotClicked( int, QListViewItem*, const QPoint&, int ); | ||
47 | void slotRightButton(int, QListViewItem*, const QPoint&, int ); | ||
43 | }; | 48 | }; |
44 | 49 | ||
45 | #endif | 50 | #endif |
diff --git a/libopie/ofileselector/ofileselector.cpp b/libopie/ofileselector/ofileselector.cpp index 16ee3ee..98b61f7 100644 --- a/libopie/ofileselector/ofileselector.cpp +++ b/libopie/ofileselector/ofileselector.cpp | |||
@@ -22,64 +22,67 @@ | |||
22 | #include <qpe/applnk.h> | 22 | #include <qpe/applnk.h> |
23 | #include <qpe/global.h> | 23 | #include <qpe/global.h> |
24 | #include <qpe/mimetype.h> | 24 | #include <qpe/mimetype.h> |
25 | #include <qpe/resource.h> | 25 | #include <qpe/resource.h> |
26 | #include <qpe/storage.h> | 26 | #include <qpe/storage.h> |
27 | 27 | ||
28 | #include <unistd.h> | 28 | #include <unistd.h> |
29 | #include <stdlib.h> | 29 | #include <stdlib.h> |
30 | #include <sys/stat.h> | 30 | #include <sys/stat.h> |
31 | 31 | ||
32 | #include "ofileview.h" | 32 | #include "ofileview.h" |
33 | #include "ofileselector.h" | 33 | #include "ofileselector.h" |
34 | 34 | #include "olister.h" | |
35 | 35 | ||
36 | QMap<QString,QPixmap> *OFileSelector::m_pixmaps = 0; | 36 | QMap<QString,QPixmap> *OFileSelector::m_pixmaps = 0; |
37 | 37 | ||
38 | namespace { | 38 | namespace { |
39 | /* let's find the index for a specified string */ | ||
39 | int indexByString( const QComboBox *box, const QString &str ){ | 40 | int indexByString( const QComboBox *box, const QString &str ){ |
40 | int index= 0; | 41 | int index= 0; |
41 | for(int i= 0; i < box->count(); i++ ){ | 42 | for(int i= 0; i < box->count(); i++ ){ |
43 | /* found */ | ||
42 | if( str == box->text(i ) ){ | 44 | if( str == box->text(i ) ){ |
43 | index= i; | 45 | index= i; |
44 | break; | 46 | break; |
45 | } | 47 | } |
46 | } | 48 | } |
47 | return index; | 49 | return index; |
48 | } | 50 | } |
49 | |||
50 | } | 51 | } |
51 | 52 | ||
52 | OFileSelector::OFileSelector( QWidget *wid, int mode, int selector, | 53 | OFileSelector::OFileSelector( QWidget *wid, int mode, int selector, |
53 | const QString &dirName, | 54 | const QString &dirName, |
54 | const QString &fileName, | 55 | const QString &fileName, |
55 | const QMap<QString,QStringList>& mimeTypes) | 56 | const QMap<QString,QStringList>& mimeTypes) |
56 | : QWidget( wid, "OFileSelector") | 57 | : QWidget( wid, "OFileSelector") |
57 | { | 58 | { |
58 | m_mimetypes = mimeTypes; | 59 | m_mimetypes = mimeTypes; |
59 | if (mode == Save ) | 60 | if (mode == Save ) |
60 | m_name = fileName; | 61 | m_name = fileName; |
62 | |||
61 | initVars(); | 63 | initVars(); |
64 | |||
62 | m_mode = mode; | 65 | m_mode = mode; |
63 | m_selector = selector; | 66 | m_selector = selector; |
64 | m_currentDir = dirName; | 67 | m_currentDir = dirName; |
65 | init(); | 68 | init(); |
66 | //QTimer::singleShot(6*1000, this, SLOT( slotTest() ) ); | ||
67 | } | 69 | } |
68 | 70 | ||
69 | OFileSelector::OFileSelector(const QString &mimeFilter, QWidget *parent, | 71 | OFileSelector::OFileSelector(const QString &mimeFilter, QWidget *parent, |
70 | const char *name, bool newVisible, | 72 | const char *name, bool newVisible, |
71 | bool closeVisible ) | 73 | bool closeVisible ) |
72 | : QWidget( parent, name ) | 74 | : QWidget( parent, name ) |
73 | { | 75 | { |
76 | /* update the mimefilter */ | ||
74 | if (!mimeFilter.isEmpty() ) { | 77 | if (!mimeFilter.isEmpty() ) { |
75 | QStringList list = QStringList::split(";", mimeFilter ); | 78 | QStringList list = QStringList::split(";", mimeFilter ); |
76 | m_mimetypes.insert(mimeFilter, list ); | 79 | m_mimetypes.insert(mimeFilter, list ); |
77 | } | 80 | } |
78 | initVars(); | 81 | initVars(); |
79 | m_currentDir = QPEApplication::documentDir(); | 82 | m_currentDir = QPEApplication::documentDir(); |
80 | m_mode = Fileselector; | 83 | m_mode = Fileselector; |
81 | m_selector = Normal; | 84 | m_selector = Normal; |
82 | m_shClose = closeVisible; | 85 | m_shClose = closeVisible; |
83 | m_shNew = newVisible; | 86 | m_shNew = newVisible; |
84 | m_shLne = false; | 87 | m_shLne = false; |
85 | m_shPerm = false; | 88 | m_shPerm = false; |
@@ -145,24 +148,25 @@ void OFileSelector::setYesCancelVisible( bool show ) | |||
145 | initializeYes(); // FIXME if YesCancel is not shown we will initialize it to hide it :( | 148 | initializeYes(); // FIXME if YesCancel is not shown we will initialize it to hide it :( |
146 | m_shYesNo = show; | 149 | m_shYesNo = show; |
147 | if( m_shYesNo ) | 150 | if( m_shYesNo ) |
148 | m_boxOk->show(); | 151 | m_boxOk->show(); |
149 | else | 152 | else |
150 | m_boxOk->hide(); | 153 | m_boxOk->hide(); |
151 | 154 | ||
152 | } | 155 | } |
153 | void OFileSelector::setToolbarVisible( bool show ) | 156 | void OFileSelector::setToolbarVisible( bool show ) |
154 | { | 157 | { |
155 | m_shTool = show; | 158 | m_shTool = show; |
156 | initializeListView(); // FIXME see above waste of memory | 159 | initializeListView(); // FIXME see above waste of memory |
160 | |||
157 | if(!m_shTool ){ | 161 | if(!m_shTool ){ |
158 | m_location->hide(); | 162 | m_location->hide(); |
159 | m_up->hide(); | 163 | m_up->hide(); |
160 | m_homeButton->hide(); | 164 | m_homeButton->hide(); |
161 | m_docButton->hide(); | 165 | m_docButton->hide(); |
162 | }else{ | 166 | }else{ |
163 | m_location->show(); | 167 | m_location->show(); |
164 | m_up->show(); | 168 | m_up->show(); |
165 | m_homeButton->show(); | 169 | m_homeButton->show(); |
166 | m_docButton->show(); | 170 | m_docButton->show(); |
167 | } | 171 | } |
168 | } | 172 | } |
@@ -623,44 +627,24 @@ void OFileSelector::initVars() | |||
623 | m_lay = 0; | 627 | m_lay = 0; |
624 | m_Oselector = 0; | 628 | m_Oselector = 0; |
625 | m_boxToolbar = 0; | 629 | m_boxToolbar = 0; |
626 | m_boxOk = 0; | 630 | m_boxOk = 0; |
627 | m_boxName = 0; | 631 | m_boxName = 0; |
628 | m_boxView = 0; | 632 | m_boxView = 0; |
629 | m_custom = 0; | 633 | m_custom = 0; |
630 | m_edit = 0; | 634 | m_edit = 0; |
631 | m_fnLabel = 0; | 635 | m_fnLabel = 0; |
632 | m_new = 0; | 636 | m_new = 0; |
633 | m_close = 0; | 637 | m_close = 0; |
634 | } | 638 | } |
635 | void OFileSelector::addFile(const QString &, QFileInfo *info, bool ) | ||
636 | { | ||
637 | if(!m_files) | ||
638 | return; | ||
639 | // if( !compliesMime(info->absFilePath(), mime ) ) | ||
640 | // return; | ||
641 | MimeType type( info->absFilePath() ); | ||
642 | if (!compliesMime( type.id() ) ) | ||
643 | return; | ||
644 | |||
645 | } | ||
646 | void OFileSelector::addDir(const QString &, QFileInfo *, bool ) | ||
647 | { | ||
648 | if(!m_dir) | ||
649 | return; | ||
650 | } | ||
651 | void OFileSelector::delItems() | ||
652 | { | ||
653 | |||
654 | } | ||
655 | void OFileSelector::initializeName() | 639 | void OFileSelector::initializeName() |
656 | { | 640 | { |
657 | /** Name Layout Line | 641 | /** Name Layout Line |
658 | * This is the Layout line arranged in | 642 | * This is the Layout line arranged in |
659 | * horizontal way each components | 643 | * horizontal way each components |
660 | * are next to each other | 644 | * are next to each other |
661 | * but we will only do this if | 645 | * but we will only do this if |
662 | * we didn't initialize a while ago. | 646 | * we didn't initialize a while ago. |
663 | */ | 647 | */ |
664 | if( m_boxName == 0 ){ | 648 | if( m_boxName == 0 ){ |
665 | m_boxName = new QHBox( this ); // remove this this? or use a QHBox | 649 | m_boxName = new QHBox( this ); // remove this this? or use a QHBox |
666 | m_fnLabel = new QLabel( m_boxName ); | 650 | m_fnLabel = new QLabel( m_boxName ); |
@@ -720,24 +704,25 @@ void OFileSelector::updateMimeCheck() { | |||
720 | void OFileSelector::initializeChooser() | 704 | void OFileSelector::initializeChooser() |
721 | { | 705 | { |
722 | if( m_boxView == 0 ){ | 706 | if( m_boxView == 0 ){ |
723 | m_boxView = new QHBox( this ); | 707 | m_boxView = new QHBox( this ); |
724 | m_viewCheck = new QComboBox( m_boxView, "view check"); | 708 | m_viewCheck = new QComboBox( m_boxView, "view check"); |
725 | m_mimeCheck = new QComboBox( m_boxView, "mime check"); | 709 | m_mimeCheck = new QComboBox( m_boxView, "mime check"); |
726 | m_boxView->setSpacing( 8 ); | 710 | m_boxView->setSpacing( 8 ); |
727 | m_lay->addWidget(m_boxView, 0 ); | 711 | m_lay->addWidget(m_boxView, 0 ); |
728 | 712 | ||
729 | m_viewCheck->insertItem( tr("Documents") ); | 713 | m_viewCheck->insertItem( tr("Documents") ); |
730 | m_viewCheck->insertItem( tr("Files") ); | 714 | m_viewCheck->insertItem( tr("Files") ); |
731 | m_viewCheck->insertItem( tr("All Files") ); | 715 | m_viewCheck->insertItem( tr("All Files") ); |
716 | /* update to custom views */ | ||
732 | updateMimeCheck(); | 717 | updateMimeCheck(); |
733 | 718 | ||
734 | connect( m_viewCheck, SIGNAL( activated(const QString & ) ), | 719 | connect( m_viewCheck, SIGNAL( activated(const QString & ) ), |
735 | this, SLOT( slotViewCheck(const QString & ) ) ); | 720 | this, SLOT( slotViewCheck(const QString & ) ) ); |
736 | connect( m_mimeCheck, SIGNAL( activated(const QString & ) ), | 721 | connect( m_mimeCheck, SIGNAL( activated(const QString & ) ), |
737 | this, SLOT( slotMimeCheck( const QString & ) ) ); | 722 | this, SLOT( slotMimeCheck( const QString & ) ) ); |
738 | } | 723 | } |
739 | } | 724 | } |
740 | void OFileSelector::initializeListView() | 725 | void OFileSelector::initializeListView() |
741 | { | 726 | { |
742 | qWarning("initializeListView"); | 727 | qWarning("initializeListView"); |
743 | if( m_pseudo == 0 ){ | 728 | if( m_pseudo == 0 ){ |
@@ -805,67 +790,43 @@ void OFileSelector::initializeListView() | |||
805 | m_up->hide( ); | 790 | m_up->hide( ); |
806 | m_homeButton->hide( ); | 791 | m_homeButton->hide( ); |
807 | m_docButton->hide( ); | 792 | m_docButton->hide( ); |
808 | } | 793 | } |
809 | if(!m_shClose ) | 794 | if(!m_shClose ) |
810 | m_close->hide(); | 795 | m_close->hide(); |
811 | //if(!m_shNew) | 796 | //if(!m_shNew) |
812 | //m_close->hide(); | 797 | //m_close->hide(); |
813 | 798 | ||
814 | } // off toolbar | 799 | } // off toolbar |
815 | // the Main ListView | 800 | // the Main ListView |
816 | // make a QWidgetStack first so Views can share the Toolbar | 801 | // make a QWidgetStack first so Views can share the Toolbar |
817 | m_View = new QListView( m_pseudo, "Extended view"); | 802 | |
818 | QPEApplication::setStylusOperation( m_View->viewport(), | 803 | // m_pseudoLayout->addWidget( m_View, 288 ); |
819 | QPEApplication::RightOnHold); | ||
820 | m_View->addColumn(" " ); | ||
821 | m_View->addColumn(tr("Name"), 135 ); | ||
822 | m_View->addColumn(tr("Size"), -1 ); | ||
823 | m_View->addColumn(tr("Date"), 60 ); | ||
824 | m_View->addColumn(tr("Mime Type"), -1 ); | ||
825 | QHeader *header = m_View->header(); | ||
826 | header->hide(); | ||
827 | m_View->setSorting( 1 ); | ||
828 | m_View->setAllColumnsShowFocus( TRUE ); | ||
829 | |||
830 | connect(m_View, SIGNAL(selectionChanged() ), | ||
831 | this, SLOT(slotSelectionChanged() ) ); | ||
832 | |||
833 | connect(m_View, SIGNAL(currentChanged(QListViewItem *) ), | ||
834 | this, SLOT(slotCurrentChanged(QListViewItem * ) ) ); | ||
835 | |||
836 | connect(m_View, SIGNAL(mouseButtonClicked(int, QListViewItem*, const QPoint &, int) ), | ||
837 | this, SLOT(slotClicked( int, QListViewItem *, const QPoint &, int) ) ); | ||
838 | |||
839 | connect(m_View, SIGNAL(mouseButtonPressed(int, QListViewItem *, const QPoint &, int )), | ||
840 | this, SLOT(slotRightButton(int, QListViewItem *, const QPoint &, int ) ) ); | ||
841 | |||
842 | m_pseudoLayout->addWidget( m_View, 288 ); | ||
843 | m_stack->addWidget( m_pseudo, Extended ); | 804 | m_stack->addWidget( m_pseudo, Extended ); |
844 | } | 805 | } |
845 | } | 806 | } |
846 | void OFileSelector::initializePerm() | 807 | void OFileSelector::initializePerm() |
847 | { | 808 | { |
848 | if( m_checkPerm == 0 ){ | 809 | if( m_checkPerm == 0 ){ |
849 | m_checkPerm = new QCheckBox(tr("Set Permission"), this, "perm"); | 810 | m_checkPerm = new QCheckBox(tr("Set Permission"), this, "perm"); |
850 | m_checkPerm->setChecked( false ); | 811 | m_checkPerm->setChecked( false ); |
851 | m_lay->addWidget( m_checkPerm ); | 812 | m_lay->addWidget( m_checkPerm ); |
852 | |||
853 | } | 813 | } |
854 | } | 814 | } |
855 | void OFileSelector::initPics() | 815 | void OFileSelector::initPics() |
856 | { | 816 | { |
857 | m_pixmaps = new QMap<QString,QPixmap>; | 817 | m_pixmaps = new QMap<QString,QPixmap>; |
858 | QPixmap pm = Resource::loadPixmap( "folder" ); | 818 | QPixmap pm = Resource::loadPixmap( "folder" ); |
859 | QPixmap lnk = Resource::loadPixmap( "opie/symlink" ); | 819 | QPixmap lnk = Resource::loadPixmap( "opie/symlink" ); |
820 | |||
860 | QPainter painter( &pm ); | 821 | QPainter painter( &pm ); |
861 | painter.drawPixmap( pm.width()-lnk.width(), pm.height()-lnk.height(), lnk ); | 822 | painter.drawPixmap( pm.width()-lnk.width(), pm.height()-lnk.height(), lnk ); |
862 | pm.setMask( pm.createHeuristicMask( FALSE ) ); | 823 | pm.setMask( pm.createHeuristicMask( FALSE ) ); |
863 | m_pixmaps->insert("dirsymlink", pm ); | 824 | m_pixmaps->insert("dirsymlink", pm ); |
864 | 825 | ||
865 | QPixmap pm2 = Resource::loadPixmap( "lockedfolder" ); | 826 | QPixmap pm2 = Resource::loadPixmap( "lockedfolder" ); |
866 | QPainter pen(&pm2 ); | 827 | QPainter pen(&pm2 ); |
867 | pen.drawPixmap(pm2.width()-lnk.width(), pm2.height()-lnk.height(), lnk ); | 828 | pen.drawPixmap(pm2.width()-lnk.width(), pm2.height()-lnk.height(), lnk ); |
868 | pm2.setMask( pm2.createHeuristicMask( FALSE ) ); | 829 | pm2.setMask( pm2.createHeuristicMask( FALSE ) ); |
869 | m_pixmaps->insert("symlinkedlocked", pm2 ); | 830 | m_pixmaps->insert("symlinkedlocked", pm2 ); |
870 | } | 831 | } |
871 | // if a mime complies with the m_mimeCheck->currentItem | 832 | // if a mime complies with the m_mimeCheck->currentItem |
@@ -907,28 +868,24 @@ bool OFileSelector::compliesMime( const QString& mime ) { | |||
907 | QMap<QString, QStringList>::Iterator it; | 868 | QMap<QString, QStringList>::Iterator it; |
908 | QStringList list; | 869 | QStringList list; |
909 | if ( currentText == tr("All") ) return true; | 870 | if ( currentText == tr("All") ) return true; |
910 | else if ( currentText.isEmpty() && !m_mimetypes.isEmpty() ) { | 871 | else if ( currentText.isEmpty() && !m_mimetypes.isEmpty() ) { |
911 | it = m_mimetypes.begin(); | 872 | it = m_mimetypes.begin(); |
912 | list = it.data(); | 873 | list = it.data(); |
913 | }else if ( currentText.isEmpty() ) return true; | 874 | }else if ( currentText.isEmpty() ) return true; |
914 | else{ | 875 | else{ |
915 | it = m_mimetypes.find(currentText ); | 876 | it = m_mimetypes.find(currentText ); |
916 | if ( it == m_mimetypes.end() ) qWarning("not there"), list << currentText; | 877 | if ( it == m_mimetypes.end() ) qWarning("not there"), list << currentText; |
917 | else qWarning("found"), list = it.data(); | 878 | else qWarning("found"), list = it.data(); |
918 | } | 879 | } |
919 | // dump it now | ||
920 | //for ( QStringList::Iterator it = list.begin(); it != list.end(); ++it ) { | ||
921 | // qWarning( "%s", (*it).latin1() ); | ||
922 | //} | ||
923 | 880 | ||
924 | 881 | ||
925 | if ( list.contains(mime) ) return true; | 882 | if ( list.contains(mime) ) return true; |
926 | qWarning("list doesn't contain it "); | 883 | qWarning("list doesn't contain it "); |
927 | QStringList::Iterator it2; | 884 | QStringList::Iterator it2; |
928 | int pos; | 885 | int pos; |
929 | for ( it2 = list.begin(); it2 != list.end(); ++it2 ) { | 886 | for ( it2 = list.begin(); it2 != list.end(); ++it2 ) { |
930 | pos = (*it2).findRev("/*"); | 887 | pos = (*it2).findRev("/*"); |
931 | if ( pos >= 0 ) { | 888 | if ( pos >= 0 ) { |
932 | if ( mime.contains( (*it2).left(pos) ) ) return true; | 889 | if ( mime.contains( (*it2).left(pos) ) ) return true; |
933 | } | 890 | } |
934 | } | 891 | } |
@@ -936,129 +893,26 @@ bool OFileSelector::compliesMime( const QString& mime ) { | |||
936 | } | 893 | } |
937 | void OFileSelector::slotFileSelected( const QString &string ) | 894 | void OFileSelector::slotFileSelected( const QString &string ) |
938 | { | 895 | { |
939 | if( m_shLne ) | 896 | if( m_shLne ) |
940 | m_edit->setText( string ); | 897 | m_edit->setText( string ); |
941 | emit fileSelected( string ); | 898 | emit fileSelected( string ); |
942 | } | 899 | } |
943 | void OFileSelector::slotFileBridgeSelected( const DocLnk &lnk ) | 900 | void OFileSelector::slotFileBridgeSelected( const DocLnk &lnk ) |
944 | { | 901 | { |
945 | slotFileSelected( lnk.name() ); | 902 | slotFileSelected( lnk.name() ); |
946 | // emit fileSelected( lnk ); | 903 | // emit fileSelected( lnk ); |
947 | } | 904 | } |
948 | void OFileSelector::slotSelectionChanged() | ||
949 | { | ||
950 | |||
951 | } | ||
952 | void OFileSelector::slotCurrentChanged(QListViewItem* /*item*/ ) | ||
953 | { | ||
954 | /* | ||
955 | if( item == 0 ) | ||
956 | return; | ||
957 | if( m_selector == Extended || m_selector == ExtendedAll ) { | ||
958 | OFileSelectorItem *sel = (OFileSelectorItem*) item; // start to use the C++ casts ;) | ||
959 | qWarning("current changed"); | ||
960 | if(!sel->isDir() ){ | ||
961 | if( m_shLne ) | ||
962 | m_edit->setText( sel->text(1) ); | ||
963 | |||
964 | if (m_mode == Fileselector ) { | ||
965 | QStringList str = QStringList::split("->", sel->text(1) ); | ||
966 | QString path =sel->directory() + "/" + str[0].stripWhiteSpace(); | ||
967 | emit fileSelected(path ); | ||
968 | DocLnk lnk( path ); | ||
969 | emit fileSelected(lnk ); | ||
970 | } | ||
971 | } | ||
972 | } */ | ||
973 | } | ||
974 | void OFileSelector::slotClicked( int /*button*/, QListViewItem */*item*/, const QPoint &, int) | ||
975 | 905 | ||
976 | { | ||
977 | /* | ||
978 | if ( item == 0 ) | ||
979 | return; | ||
980 | |||
981 | if( button != Qt::LeftButton ) | ||
982 | return; | ||
983 | |||
984 | switch( m_selector ){ | ||
985 | default: | ||
986 | break; | ||
987 | case Extended: // fall through | ||
988 | case ExtendedAll:{ | ||
989 | OFileSelectorItem *sel = (OFileSelectorItem*)item; | ||
990 | if(!sel->isLocked() ){ | ||
991 | QStringList str = QStringList::split("->", sel->text(1) ); | ||
992 | if( sel->isDir() ){ | ||
993 | cd( sel->directory() + "/" + str[0].stripWhiteSpace() ); | ||
994 | // if MODE Dir m_shLne set the Text | ||
995 | }else{ | ||
996 | if( m_shLne ) | ||
997 | m_edit->setText( str[0].stripWhiteSpace() ); | ||
998 | qWarning("selected here in slot clicked"); | ||
999 | emit fileSelected( sel->directory() + "/" + str[0].stripWhiteSpace() ); | ||
1000 | DocLnk lnk( sel->directory() + "/" + str[0].stripWhiteSpace() ); | ||
1001 | qWarning("file selected"); | ||
1002 | emit fileSelected( lnk ); | ||
1003 | } | ||
1004 | } | ||
1005 | break; | ||
1006 | } | ||
1007 | } */ | ||
1008 | } | ||
1009 | void OFileSelector::slotRightButton(int button, QListViewItem *item, const QPoint &, int ) | ||
1010 | { | ||
1011 | if( item == 0 ) | ||
1012 | return; | ||
1013 | 906 | ||
1014 | if( button != Qt::RightButton ) | ||
1015 | return; | ||
1016 | slotContextMenu( item ); | ||
1017 | } | ||
1018 | void OFileSelector::slotContextMenu( QListViewItem */*item*/) | ||
1019 | { | ||
1020 | |||
1021 | } | ||
1022 | void OFileSelector::slotChangedDir() | ||
1023 | { | ||
1024 | /* | ||
1025 | OFileSelectorItem *sel = (OFileSelectorItem*)m_View->currentItem(); | ||
1026 | if(sel->isDir() ){ | ||
1027 | QStringList str = QStringList::split("->", sel->text(1) ); | ||
1028 | cd( sel->directory() + "/" + str[0].stripWhiteSpace() ); | ||
1029 | } | ||
1030 | */ | ||
1031 | } | ||
1032 | void OFileSelector::slotOpen() | ||
1033 | { | ||
1034 | /* | ||
1035 | OFileSelectorItem *sel = (OFileSelectorItem*)m_View->currentItem(); | ||
1036 | if(!sel->isDir() ){ | ||
1037 | QStringList str = QStringList::split("->", sel->text(1) ); | ||
1038 | slotFileSelected( sel->directory() +"/" +str[0].stripWhiteSpace() ); | ||
1039 | qWarning("slot open"); | ||
1040 | // DocLnk lnk( sel->directory() + "/" + str[0].stripWhiteSpace() ); | ||
1041 | //emit fileSelected( lnk ); | ||
1042 | } | ||
1043 | */ | ||
1044 | } | ||
1045 | void OFileSelector::slotRescan() | ||
1046 | { | ||
1047 | |||
1048 | } | ||
1049 | void OFileSelector::slotRename() | ||
1050 | { | ||
1051 | reparse(); | ||
1052 | } | ||
1053 | void OFileSelector::slotDelete() | 907 | void OFileSelector::slotDelete() |
1054 | { | 908 | { |
1055 | /* | 909 | /* |
1056 | OFileSelectorItem *sel = (OFileSelectorItem*)m_View->currentItem(); | 910 | OFileSelectorItem *sel = (OFileSelectorItem*)m_View->currentItem(); |
1057 | QStringList list = QStringList::split("->", sel->text(1) ); | 911 | QStringList list = QStringList::split("->", sel->text(1) ); |
1058 | if( sel->isDir() ){ | 912 | if( sel->isDir() ){ |
1059 | QString str = QString::fromLatin1("rm -rf ") + sel->directory() +"/" + list[0]; //better safe than sorry | 913 | QString str = QString::fromLatin1("rm -rf ") + sel->directory() +"/" + list[0]; //better safe than sorry |
1060 | switch ( QMessageBox::warning(this,tr("Delete"),tr("Do you really want to delete\n")+list[0], | 914 | switch ( QMessageBox::warning(this,tr("Delete"),tr("Do you really want to delete\n")+list[0], |
1061 | tr("Yes"),tr("No"),0,1,1) ) { | 915 | tr("Yes"),tr("No"),0,1,1) ) { |
1062 | case 0: | 916 | case 0: |
1063 | ::system(str.utf8().data() ); | 917 | ::system(str.utf8().data() ); |
1064 | break; | 918 | break; |
@@ -1092,131 +946,62 @@ void OFileSelector::slotDoc() | |||
1092 | { | 946 | { |
1093 | cd(QPEApplication::documentDir() ); | 947 | cd(QPEApplication::documentDir() ); |
1094 | } | 948 | } |
1095 | void OFileSelector::slotNavigate( ) | 949 | void OFileSelector::slotNavigate( ) |
1096 | { | 950 | { |
1097 | 951 | ||
1098 | } | 952 | } |
1099 | // fill the View with life | 953 | // fill the View with life |
1100 | void OFileSelector::reparse() | 954 | void OFileSelector::reparse() |
1101 | { | 955 | { |
1102 | if( m_selector == Normal ) | 956 | if( m_selector == Normal ) |
1103 | return; | 957 | return; |
1104 | if( m_selector == Extended || m_selector == ExtendedAll ) | 958 | |
1105 | m_View->clear(); | 959 | currentView()->clear(); |
1106 | else // custom view | 960 | |
1107 | ; // currentView()->clear(); | ||
1108 | if( m_shChooser) | 961 | if( m_shChooser) |
1109 | qWarning("reparse %s", m_mimeCheck->currentText().latin1() ); | 962 | qWarning("reparse %s", m_mimeCheck->currentText().latin1() ); |
1110 | 963 | ||
1111 | QString currentMimeType; | 964 | QString currentMimeType; |
965 | |||
1112 | // let's update the mimetype | 966 | // let's update the mimetype |
1113 | if( m_autoMime ){ | 967 | if( m_autoMime ){ |
1114 | m_mimetypes.clear(); | 968 | m_mimetypes.clear(); |
1115 | // ok we can change mimetype so we need to be able to give a selection | 969 | // ok we can change mimetype so we need to be able to give a selection |
1116 | if( m_shChooser ) { | 970 | if( m_shChooser ) { |
1117 | currentMimeType = m_mimeCheck->currentText(); | 971 | currentMimeType = m_mimeCheck->currentText(); |
1118 | m_mimeCheck->clear(); | 972 | m_mimeCheck->clear(); |
1119 | 973 | ||
1120 | // let's find possible mimetypes | 974 | // let's find possible mimetypes |
1121 | QDir dir( m_currentDir ); | 975 | m_mimetypes = currentLister()->mimeTypes( m_currentDir ); |
1122 | dir.setFilter( QDir::Files | QDir::Readable ); | ||
1123 | dir.setSorting( QDir::Size ); | ||
1124 | const QFileInfoList *list = dir.entryInfoList(); | ||
1125 | QFileInfoListIterator it( *list ); | ||
1126 | QFileInfo *fi; | ||
1127 | while( (fi=it.current() ) ) { | ||
1128 | if( fi->extension() == QString::fromLatin1("desktop") ){ | ||
1129 | ++it; | ||
1130 | continue; | ||
1131 | } | ||
1132 | MimeType type( fi->absFilePath() ); | ||
1133 | if( !m_mimetypes.contains( type.id() ) ){ | ||
1134 | //qWarning("Type %s", type.id().latin1() ); | ||
1135 | m_mimetypes.insert( type.id(), type.id() ); | ||
1136 | } | ||
1137 | 976 | ||
1138 | ++it; | ||
1139 | } | ||
1140 | // add them to the chooser | 977 | // add them to the chooser |
1141 | updateMimeCheck(); | 978 | updateMimeCheck(); |
1142 | m_mimeCheck->setCurrentItem( indexByString( m_mimeCheck, currentMimeType ) ); | 979 | m_mimeCheck->setCurrentItem( indexByString( m_mimeCheck, currentMimeType ) ); |
1143 | currentMimeType = m_mimeCheck->currentText(); | 980 | currentMimeType = m_mimeCheck->currentText(); |
1144 | } | 981 | } |
1145 | }else { // no autoMime | 982 | }else { // no autoMime |
1146 | // let the mimetype be set from out side the m_mimeCheck FEATURE | 983 | // let the mimetype be set from out side the m_mimeCheck FEATURE |
1147 | 984 | ||
1148 | if( m_shChooser ){ | 985 | if( m_shChooser ) |
1149 | currentMimeType = m_mimeCheck->currentText(); | 986 | currentMimeType = m_mimeCheck->currentText(); |
1150 | // updateMimeCheck(); | 987 | |
1151 | } | ||
1152 | } | 988 | } |
1153 | // now we got our mimetypes we can add the files | 989 | // now we got our mimetypes we can add the files |
1154 | 990 | ||
1155 | QDir dir( m_currentDir ); | 991 | currentLister()->reparse( m_currentDir ); |
992 | /* we're done with adding let's sort */ | ||
993 | currentView()->sort(); | ||
1156 | 994 | ||
1157 | int sort; | ||
1158 | if ( m_case ) | ||
1159 | sort = (QDir::IgnoreCase | QDir::Name | QDir::DirsFirst | QDir::Reversed); | ||
1160 | else | ||
1161 | sort = (QDir::Name | QDir::DirsFirst | QDir::Reversed); | ||
1162 | dir.setSorting( sort ); | ||
1163 | 995 | ||
1164 | int filter; | ||
1165 | if( m_selector == ExtendedAll /*|| m_selector ==CUSTOM_ALL */ ){ | ||
1166 | filter = QDir::Files | QDir::Dirs | QDir::Hidden | QDir::All; | ||
1167 | }else | ||
1168 | filter = QDir::Files | QDir::Dirs | QDir::All; | ||
1169 | dir.setFilter( filter ); | ||
1170 | |||
1171 | // now go through all files | ||
1172 | const QFileInfoList *list = dir.entryInfoList(); | ||
1173 | QFileInfoListIterator it( *list ); | ||
1174 | QFileInfo *fi; | ||
1175 | while( (fi=it.current() ) ){ | ||
1176 | //qWarning("True and only" ); | ||
1177 | if( fi->fileName() == QString::fromLatin1("..") || fi->fileName() == QString::fromLatin1(".") ){ | ||
1178 | //qWarning(".. or ." ); | ||
1179 | ++it; | ||
1180 | continue; | ||
1181 | } | ||
1182 | if( fi->isSymLink() ){ | ||
1183 | QString file = fi->dirPath( true ) + "/" + fi->readLink(); | ||
1184 | for( int i = 0; i<=4; i++) { // 5 tries to prevent dos | ||
1185 | QFileInfo info( file ); | ||
1186 | if( !info.exists() ){ | ||
1187 | addSymlink( currentMimeType, fi, TRUE ); | ||
1188 | break; | ||
1189 | }else if( info.isDir() ){ | ||
1190 | addDir( currentMimeType, fi, TRUE ); | ||
1191 | break; | ||
1192 | }else if( info.isFile() ){ | ||
1193 | addFile( currentMimeType, fi, TRUE ); | ||
1194 | break; | ||
1195 | }else if( info.isSymLink() ){ | ||
1196 | file = info.dirPath(true ) + "/" + info.readLink() ; | ||
1197 | break; | ||
1198 | }else if( i == 4){ | ||
1199 | addSymlink( currentMimeType, fi ); | ||
1200 | } | ||
1201 | } // off for loop | ||
1202 | }else if( fi->isDir() ){ | ||
1203 | addDir( currentMimeType, fi ); | ||
1204 | }else if( fi->isFile() ){ | ||
1205 | addFile( currentMimeType, fi ); | ||
1206 | } | ||
1207 | //qWarning( "%s", fi->fileName().latin1() ); | ||
1208 | ++it; | ||
1209 | } // of while loop | ||
1210 | m_View->sort(); | ||
1211 | if( m_shTool ){ | 996 | if( m_shTool ){ |
1212 | m_location->insertItem( m_currentDir ); | 997 | m_location->insertItem( m_currentDir ); |
1213 | 998 | ||
1214 | } | 999 | } |
1215 | // reenable painting and updates | 1000 | // reenable painting and updates |
1216 | } | 1001 | } |
1217 | 1002 | ||
1218 | 1003 | ||
1219 | OFileView* OFileSelector::currentView() { | 1004 | OFileView* OFileSelector::currentView() { |
1220 | return 0l; | 1005 | return 0l; |
1221 | } | 1006 | } |
1222 | OFileView* OFileSelector::currentView() const{ | 1007 | OFileView* OFileSelector::currentView() const{ |
@@ -1243,20 +1028,24 @@ int OFileSelector::sorting() { | |||
1243 | } | 1028 | } |
1244 | void OFileSelector::internFileSelected( const QString& s) { | 1029 | void OFileSelector::internFileSelected( const QString& s) { |
1245 | emit fileSelected( s ); | 1030 | emit fileSelected( s ); |
1246 | } | 1031 | } |
1247 | void OFileSelector::internFileSelected( const DocLnk& d ) { | 1032 | void OFileSelector::internFileSelected( const DocLnk& d ) { |
1248 | emit fileSelected( d ); | 1033 | emit fileSelected( d ); |
1249 | } | 1034 | } |
1250 | void OFileSelector::internContextMenu() { | 1035 | void OFileSelector::internContextMenu() { |
1251 | emit contextMenu(); | 1036 | emit contextMenu(); |
1252 | } | 1037 | } |
1253 | void OFileSelector::internChangedDir( const QString& s) { | 1038 | void OFileSelector::internChangedDir( const QString& s) { |
1254 | emit dirSelected( s ); | 1039 | emit dirSelected( s ); |
1040 | cd(s ); | ||
1255 | } | 1041 | } |
1256 | void OFileSelector::internChangedDir( const QDir& s) { | 1042 | void OFileSelector::internChangedDir( const QDir& s) { |
1257 | emit dirSelected( s ); | 1043 | emit dirSelected( s ); |
1258 | } | 1044 | } |
1259 | QPixmap OFileSelector::pixmap( const QString& s ) { | 1045 | QPixmap OFileSelector::pixmap( const QString& s ) { |
1260 | 1046 | ||
1261 | return (*m_pixmaps)[s]; | 1047 | return (*m_pixmaps)[s]; |
1262 | } | 1048 | } |
1049 | OLister* OFileSelector::currentLister()const { | ||
1050 | return 0l; | ||
1051 | } | ||
diff --git a/libopie/ofileselector/ofileselector.h b/libopie/ofileselector/ofileselector.h index 12af732..a7b363f 100644 --- a/libopie/ofileselector/ofileselector.h +++ b/libopie/ofileselector/ofileselector.h | |||
@@ -59,24 +59,25 @@ class QCheckBox; | |||
59 | class QComboBox; | 59 | class QComboBox; |
60 | class QPushButton; | 60 | class QPushButton; |
61 | class QGridLayout; | 61 | class QGridLayout; |
62 | class QLineEdit; | 62 | class QLineEdit; |
63 | class QLabel; | 63 | class QLabel; |
64 | class QWidgetStack; | 64 | class QWidgetStack; |
65 | class QHBoxLayout; | 65 | class QHBoxLayout; |
66 | class QVBoxLayout; | 66 | class QVBoxLayout; |
67 | class QPopupMenu; | 67 | class QPopupMenu; |
68 | class QFileInfo; | 68 | class QFileInfo; |
69 | class QHBox; | 69 | class QHBox; |
70 | class OFileView; | 70 | class OFileView; |
71 | class OLister; | ||
71 | // | 72 | // |
72 | 73 | ||
73 | /* the mimetypes one name and a list of mimetypes */ | 74 | /* the mimetypes one name and a list of mimetypes */ |
74 | typedef QMap< QString, QStringList> MimeTypes; | 75 | typedef QMap< QString, QStringList> MimeTypes; |
75 | 76 | ||
76 | /** | 77 | /** |
77 | * FIXME later | 78 | * FIXME later |
78 | */ | 79 | */ |
79 | struct OPopupMenuFactory { | 80 | struct OPopupMenuFactory { |
80 | OPopupMenuFactory() {} | 81 | OPopupMenuFactory() {} |
81 | 82 | ||
82 | }; | 83 | }; |
@@ -328,24 +329,25 @@ class OFileSelector : public QWidget { | |||
328 | 329 | ||
329 | /** | 330 | /** |
330 | * fileCount | 331 | * fileCount |
331 | */ | 332 | */ |
332 | int fileCount(); | 333 | int fileCount(); |
333 | 334 | ||
334 | DocLnk selectedDocument()const; | 335 | DocLnk selectedDocument()const; |
335 | 336 | ||
336 | QValueList<DocLnk> selectedDocuments()const; | 337 | QValueList<DocLnk> selectedDocuments()const; |
337 | 338 | ||
338 | OFileView* currentView(); | 339 | OFileView* currentView(); |
339 | OFileView* currentView()const; | 340 | OFileView* currentView()const; |
341 | OLister* currentLister()const; | ||
340 | int filter(); | 342 | int filter(); |
341 | int sorting(); | 343 | int sorting(); |
342 | QPixmap pixmap( const QString& ); | 344 | QPixmap pixmap( const QString& ); |
343 | 345 | ||
344 | signals: | 346 | signals: |
345 | void fileSelected( const DocLnk & ); | 347 | void fileSelected( const DocLnk & ); |
346 | void fileSelected( const QString & ); | 348 | void fileSelected( const QString & ); |
347 | void dirSelected(const QString &dir ); | 349 | void dirSelected(const QString &dir ); |
348 | void dirSelected( const QDir& ); | 350 | void dirSelected( const QDir& ); |
349 | void closeMe(); | 351 | void closeMe(); |
350 | void ok(); | 352 | void ok(); |
351 | void cancel(); | 353 | void cancel(); |
@@ -360,70 +362,76 @@ class OFileSelector : public QWidget { | |||
360 | void slotInsertLocationPath(const QString &, int); | 362 | void slotInsertLocationPath(const QString &, int); |
361 | void locationComboChanged(); | 363 | void locationComboChanged(); |
362 | 364 | ||
363 | private: | 365 | private: |
364 | void init(); | 366 | void init(); |
365 | void updateMimes(); | 367 | void updateMimes(); |
366 | 368 | ||
367 | 369 | ||
368 | private: | 370 | private: |
369 | 371 | ||
370 | FileSelector* m_select; | 372 | FileSelector* m_select; |
371 | int m_mode, m_selector; | 373 | int m_mode, m_selector; |
372 | QComboBox *m_location, *m_mimeCheck, *m_viewCheck; | 374 | QComboBox *m_location, |
373 | QPushButton *m_homeButton, *m_docButton, *m_hideButton, *m_ok, *m_cancel; | 375 | *m_mimeCheck, |
374 | QPushButton *m_reread, *m_up, *m_new, *m_close; | 376 | *m_viewCheck; |
377 | |||
378 | QPushButton *m_homeButton, | ||
379 | *m_docButton, | ||
380 | *m_hideButton, | ||
381 | *m_ok, *m_cancel; | ||
382 | QPushButton *m_reread, | ||
383 | *m_up, | ||
384 | *m_new, | ||
385 | *m_close; | ||
375 | QListView *m_View; | 386 | QListView *m_View; |
376 | QCheckBox *m_checkPerm; | 387 | QCheckBox *m_checkPerm; |
377 | QWidget *m_pseudo; | 388 | QWidget *m_pseudo; |
378 | QVBoxLayout *m_pseudoLayout; | 389 | QVBoxLayout *m_pseudoLayout; |
379 | 390 | ||
380 | QString m_currentDir; | 391 | QString m_currentDir; |
381 | QString m_name; | 392 | QString m_name; |
382 | // QStringList m_mimetypes; | ||
383 | QMap<QString, QStringList> m_mimetypes; | 393 | QMap<QString, QStringList> m_mimetypes; |
384 | 394 | ||
385 | 395 | ||
386 | QWidgetStack *m_stack; | 396 | QWidgetStack *m_stack; |
387 | QVBoxLayout *m_lay; | 397 | QVBoxLayout *m_lay; |
388 | QGridLayout *m_Oselector; | 398 | QGridLayout *m_Oselector; |
389 | 399 | ||
390 | QHBox *m_boxToolbar; | 400 | QHBox *m_boxToolbar; |
391 | QHBox *m_boxOk; // (no layout anymore) wait | 401 | QHBox *m_boxOk; |
392 | QHBox *m_boxName; // (no Layout anymore) wait | 402 | QHBox *m_boxName; |
393 | QHBox *m_boxView; | 403 | QHBox *m_boxView; |
394 | 404 | ||
395 | QPopupMenu *m_custom; | 405 | QPopupMenu *m_custom; |
396 | 406 | ||
397 | QLineEdit *m_edit; | 407 | QLineEdit *m_edit; |
398 | QLabel *m_fnLabel; | 408 | QLabel *m_fnLabel; |
399 | 409 | ||
400 | bool m_shClose : 1; | 410 | bool m_shClose : 1; |
401 | bool m_shNew : 1; | 411 | bool m_shNew : 1; |
402 | bool m_shTool : 1; | 412 | bool m_shTool : 1; |
403 | bool m_shPerm : 1; | 413 | bool m_shPerm : 1; |
404 | bool m_shLne : 1; | 414 | bool m_shLne : 1; |
405 | bool m_shChooser : 1; | 415 | bool m_shChooser : 1; |
406 | bool m_shYesNo : 1; | 416 | bool m_shYesNo : 1; |
407 | bool m_boCheckPerm : 1; | 417 | bool m_boCheckPerm : 1; |
408 | bool m_autoMime : 1; | 418 | bool m_autoMime : 1; |
409 | bool m_case : 1; | 419 | bool m_case : 1; |
410 | bool m_dir : 1; | 420 | bool m_dir : 1; |
411 | bool m_files : 1; | 421 | bool m_files : 1; |
412 | bool m_showPopup : 1; | 422 | bool m_showPopup : 1; |
413 | 423 | ||
414 | void initVars(); | 424 | void initVars(); |
415 | virtual void addFile(const QString &mime, QFileInfo *info, bool symlink = FALSE ); | 425 | |
416 | virtual void addDir( const QString &mime, QFileInfo *info , bool symlink = FALSE ); | ||
417 | virtual void addSymlink(const QString &, QFileInfo *, bool = FALSE ){}; | ||
418 | void delItems(); | 426 | void delItems(); |
419 | void initializeName(); | 427 | void initializeName(); |
420 | void initializeYes(); | 428 | void initializeYes(); |
421 | void initializeChooser(); | 429 | void initializeChooser(); |
422 | void initializeListView(); | 430 | void initializeListView(); |
423 | void initializePerm(); | 431 | void initializePerm(); |
424 | void initPics(); | 432 | void initPics(); |
425 | bool compliesMime(const QString &path, | 433 | bool compliesMime(const QString &path, |
426 | const QString &mime); | 434 | const QString &mime); |
427 | bool compliesMime(const QString& mime ); | 435 | bool compliesMime(const QString& mime ); |
428 | /** | 436 | /** |
429 | * Updates the QComboBox with the current mimetypes | 437 | * Updates the QComboBox with the current mimetypes |
@@ -432,35 +440,26 @@ class OFileSelector : public QWidget { | |||
432 | 440 | ||
433 | /** | 441 | /** |
434 | * Returns the current mimetype | 442 | * Returns the current mimetype |
435 | */ | 443 | */ |
436 | QString currentMimeType()const; | 444 | QString currentMimeType()const; |
437 | class OFileSelectorPrivate; | 445 | class OFileSelectorPrivate; |
438 | OFileSelectorPrivate *d; | 446 | OFileSelectorPrivate *d; |
439 | static QMap<QString,QPixmap> *m_pixmaps; | 447 | static QMap<QString,QPixmap> *m_pixmaps; |
440 | 448 | ||
441 | private slots: | 449 | private slots: |
442 | void slotFileSelected(const QString & ); // not really meant to be a slot | 450 | void slotFileSelected(const QString & ); // not really meant to be a slot |
443 | void slotFileBridgeSelected( const DocLnk & ); | 451 | void slotFileBridgeSelected( const DocLnk & ); |
444 | virtual void slotSelectionChanged(); | ||
445 | virtual void slotCurrentChanged(QListViewItem* ); | ||
446 | virtual void slotClicked( int, QListViewItem *item, const QPoint &, int); | ||
447 | virtual void slotRightButton(int, QListViewItem *, const QPoint &, int ); | ||
448 | virtual void slotContextMenu( QListViewItem *item); | ||
449 | // listview above | 452 | // listview above |
450 | // popup below | 453 | // popup below |
451 | virtual void slotChangedDir(); | ||
452 | virtual void slotOpen(); | ||
453 | virtual void slotRescan(); | ||
454 | virtual void slotRename(); | ||
455 | virtual void slotDelete(); | 454 | virtual void slotDelete(); |
456 | virtual void cdUP(); | 455 | virtual void cdUP(); |
457 | virtual void slotHome(); | 456 | virtual void slotHome(); |
458 | virtual void slotDoc(); | 457 | virtual void slotDoc(); |
459 | virtual void slotNavigate( ); | 458 | virtual void slotNavigate( ); |
460 | 459 | ||
461 | /* for OLister */ | 460 | /* for OLister */ |
462 | private: | 461 | private: |
463 | 462 | ||
464 | /* for OFileView */ | 463 | /* for OFileView */ |
465 | private: | 464 | private: |
466 | void internFileSelected( const QString& ); | 465 | void internFileSelected( const QString& ); |
diff --git a/libopie/ofileselector/ofileview.cpp b/libopie/ofileselector/ofileview.cpp index 9bb40c9..38f722c 100644 --- a/libopie/ofileselector/ofileview.cpp +++ b/libopie/ofileselector/ofileview.cpp | |||
@@ -1,16 +1,17 @@ | |||
1 | #include <qlineedit.h> | ||
2 | |||
1 | #include <qpe/applnk.h> | 3 | #include <qpe/applnk.h> |
2 | 4 | ||
3 | #include "ofileselector.h" | 5 | #include "ofileselector.h" |
4 | |||
5 | #include "ofileview.h" | 6 | #include "ofileview.h" |
6 | 7 | ||
7 | 8 | ||
8 | OFileView::OFileView( OFileSelector* sel) | 9 | OFileView::OFileView( OFileSelector* sel) |
9 | : m_sel( sel ) | 10 | : m_sel( sel ) |
10 | { | 11 | { |
11 | } | 12 | } |
12 | OFileView::~OFileView() { | 13 | OFileView::~OFileView() { |
13 | } | 14 | } |
14 | void OFileView::fileSelected( const QString& s ) { | 15 | void OFileView::fileSelected( const QString& s ) { |
15 | m_sel->internFileSelected( s ); | 16 | m_sel->internFileSelected( s ); |
16 | } | 17 | } |
@@ -20,12 +21,16 @@ void OFileView::fileSelected( const DocLnk& s) { | |||
20 | void OFileView::contextMenu() { | 21 | void OFileView::contextMenu() { |
21 | m_sel->internContextMenu(); | 22 | m_sel->internContextMenu(); |
22 | } | 23 | } |
23 | void OFileView::changedDir( const QString& s) { | 24 | void OFileView::changedDir( const QString& s) { |
24 | m_sel->internChangedDir( s ); | 25 | m_sel->internChangedDir( s ); |
25 | } | 26 | } |
26 | void OFileView::changedDir( const QDir& d ) { | 27 | void OFileView::changedDir( const QDir& d ) { |
27 | m_sel->internChangedDir( d ); | 28 | m_sel->internChangedDir( d ); |
28 | } | 29 | } |
29 | OFileSelector* OFileView::selector() const { | 30 | OFileSelector* OFileView::selector() const { |
30 | return m_sel; | 31 | return m_sel; |
31 | } | 32 | } |
33 | void OFileView::updateLine( const QString& str ) { | ||
34 | if (m_sel->m_shLne ) | ||
35 | m_sel->m_edit->setText( str ); | ||
36 | } | ||
diff --git a/libopie/ofileselector/ofileview.h b/libopie/ofileselector/ofileview.h index 1b397f5..a4b1748 100644 --- a/libopie/ofileselector/ofileview.h +++ b/libopie/ofileselector/ofileview.h | |||
@@ -72,33 +72,35 @@ public: | |||
72 | const QString& path, | 72 | const QString& path, |
73 | const QString& file, | 73 | const QString& file, |
74 | bool isSymlink = FALSE ) = 0; | 74 | bool isSymlink = FALSE ) = 0; |
75 | 75 | ||
76 | virtual void cd(const QString &path ) = 0; | 76 | virtual void cd(const QString &path ) = 0; |
77 | virtual QWidget* widget() = 0; | 77 | virtual QWidget* widget() = 0; |
78 | 78 | ||
79 | virtual QString selectedName()const = 0; | 79 | virtual QString selectedName()const = 0; |
80 | virtual QStringList selectedNames()const = 0; | 80 | virtual QStringList selectedNames()const = 0; |
81 | virtual QString selectedPath()const = 0; | 81 | virtual QString selectedPath()const = 0; |
82 | virtual QStringList selectedPaths()const = 0; | 82 | virtual QStringList selectedPaths()const = 0; |
83 | virtual int fileCount() = 0; | 83 | virtual int fileCount() = 0; |
84 | virtual void sort() =0; | ||
84 | 85 | ||
85 | /*signals:*/ | 86 | /*signals:*/ |
86 | protected: | 87 | protected: |
87 | 88 | ||
88 | void fileSelected(const QString &); | 89 | void fileSelected(const QString &); |
89 | void fileSelected(const DocLnk & ); | 90 | void fileSelected(const DocLnk & ); |
90 | void contextMenu(); | 91 | void contextMenu(); |
91 | void changedDir(const QString &); | 92 | void changedDir(const QString &); |
92 | void changedDir(const QDir & ); | 93 | void changedDir(const QDir & ); |
94 | void updateLine( const QString& ); | ||
93 | OFileSelector* selector()const; | 95 | OFileSelector* selector()const; |
94 | 96 | ||
95 | private: | 97 | private: |
96 | OFileSelector* m_sel; | 98 | OFileSelector* m_sel; |
97 | }; | 99 | }; |
98 | 100 | ||
99 | class OFileViewFactory { | 101 | class OFileViewFactory { |
100 | public: | 102 | public: |
101 | OFileViewFactory() {} ; | 103 | OFileViewFactory() {} ; |
102 | virtual ~OFileViewFactory() = 0; | 104 | virtual ~OFileViewFactory() = 0; |
103 | 105 | ||
104 | OFileView* newView(QWidget *parent, const char *name ); | 106 | OFileView* newView(QWidget *parent, const char *name ); |