summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/apps/advancedfm/advancedfm.cpp57
-rw-r--r--noncore/apps/advancedfm/advancedfm.h8
-rw-r--r--noncore/apps/advancedfm/advancedfmData.cpp15
-rw-r--r--noncore/apps/advancedfm/main.cpp2
4 files changed, 31 insertions, 51 deletions
diff --git a/noncore/apps/advancedfm/advancedfm.cpp b/noncore/apps/advancedfm/advancedfm.cpp
index a47edd8..afb44f5 100644
--- a/noncore/apps/advancedfm/advancedfm.cpp
+++ b/noncore/apps/advancedfm/advancedfm.cpp
@@ -32,17 +32,13 @@
32#include <fcntl.h> 32#include <fcntl.h>
33#include <sys/vfs.h> 33#include <sys/vfs.h>
34#include <mntent.h> 34#include <mntent.h>
35 35
36using namespace Opie::Ui; 36using namespace Opie::Ui;
37 37
38#ifdef NOQUICKLAUNCH
39AdvancedFm::AdvancedFm( )
40#else
41AdvancedFm::AdvancedFm(QWidget *,const char*, WFlags ) 38AdvancedFm::AdvancedFm(QWidget *,const char*, WFlags )
42#endif
43 : QMainWindow( ) { 39 : QMainWindow( ) {
44 init(); 40 init();
45 renameBox = 0; 41 renameBox = 0;
46 42
47 unknownXpm = Resource::loadImage( "UnknownDocument" ).smoothScale( AppLnk::smallIconSize(), AppLnk::smallIconSize() ); 43 unknownXpm = Resource::loadImage( "UnknownDocument" ).smoothScale( AppLnk::smallIconSize(), AppLnk::smallIconSize() );
48 44
@@ -68,13 +64,13 @@ void AdvancedFm::cleanUp() {
68 QFile file( sfile); 64 QFile file( sfile);
69 if(file.exists()) 65 if(file.exists())
70 file.remove(); 66 file.remove();
71} 67}
72 68
73void AdvancedFm::tabChanged(QWidget *) { 69void AdvancedFm::tabChanged(QWidget *) {
74// owarn << "tab changed" << oendl; 70// owarn << "tab changed" << oendl;
75 QString path = CurrentDir()->canonicalPath(); 71 QString path = CurrentDir()->canonicalPath();
76 currentPathCombo->lineEdit()->setText( path ); 72 currentPathCombo->lineEdit()->setText( path );
77 73
78 if(whichTab == 1) { 74 if(whichTab == 1) {
79 viewMenu->setItemChecked(viewMenu->idAt(0), true); 75 viewMenu->setItemChecked(viewMenu->idAt(0), true);
80 viewMenu->setItemChecked(viewMenu->idAt(1), false); 76 viewMenu->setItemChecked(viewMenu->idAt(1), false);
@@ -90,19 +86,19 @@ void AdvancedFm::tabChanged(QWidget *) {
90 chdir( path.latin1()); 86 chdir( path.latin1());
91} 87}
92 88
93 89
94void AdvancedFm::populateView() { 90void AdvancedFm::populateView() {
95 91
96// owarn << "PopulateView" << oendl; 92// owarn << "PopulateView" << oendl;
97 QPixmap pm; 93 QPixmap pm;
98 QListView *thisView = CurrentView(); 94 QListView *thisView = CurrentView();
99 QDir *thisDir = CurrentDir(); 95 QDir *thisDir = CurrentDir();
100 QString path = thisDir->canonicalPath(); 96 QString path = thisDir->canonicalPath();
101 97
102//owarn << "path is "+path << oendl; 98//owarn << "path is "+path << oendl;
103 thisView->clear(); 99 thisView->clear();
104 thisDir->setSorting(/* QDir::Size*/ /*| QDir::Reversed | */QDir::DirsFirst); 100 thisDir->setSorting(/* QDir::Size*/ /*| QDir::Reversed | */QDir::DirsFirst);
105 thisDir->setMatchAllDirs(TRUE); 101 thisDir->setMatchAllDirs(TRUE);
106 thisDir->setNameFilter(filterStr); 102 thisDir->setNameFilter(filterStr);
107 QString fileL, fileS, fileDate; 103 QString fileL, fileS, fileDate;
108 QString fs= getFileSystemType((const QString &) path); 104 QString fs= getFileSystemType((const QString &) path);
@@ -157,13 +153,13 @@ void AdvancedFm::populateView() {
157 pm=mt.pixmap(); //sets the correct pixmap for mimetype 153 pm=mt.pixmap(); //sets the correct pixmap for mimetype
158 if(pm.isNull()) { 154 if(pm.isNull()) {
159 pm = unknownXpm; 155 pm = unknownXpm;
160 } 156 }
161 } 157 }
162 if( fi->isSymLink() || fileL.find("->",0,TRUE) != -1) { 158 if( fi->isSymLink() || fileL.find("->",0,TRUE) != -1) {
163 // odebug << " overlay link image" << oendl; 159 // odebug << " overlay link image" << oendl;
164 pm= Resource::loadPixmap( "advancedfm/symlink" ); 160 pm= Resource::loadPixmap( "advancedfm/symlink" );
165 // pm= Resource::loadPixmap( "folder" ); 161 // pm= Resource::loadPixmap( "folder" );
166// QPixmap lnk = Resource::loadPixmap( "opie/symlink" ); 162// QPixmap lnk = Resource::loadPixmap( "opie/symlink" );
167// QPainter painter( &pm ); 163// QPainter painter( &pm );
168// painter.drawPixmap( pm.width()-lnk.width(), pm.height()-lnk.height(), lnk ); 164// painter.drawPixmap( pm.width()-lnk.width(), pm.height()-lnk.height(), lnk );
169// pm.setMask( pm.createHeuristicMask( FALSE ) ); 165// pm.setMask( pm.createHeuristicMask( FALSE ) );
@@ -181,13 +177,13 @@ void AdvancedFm::populateView() {
181 DIR *dir; 177 DIR *dir;
182 struct dirent *mydirent; 178 struct dirent *mydirent;
183 179
184 if((dir = opendir( path.latin1())) != NULL) 180 if((dir = opendir( path.latin1())) != NULL)
185 while ((mydirent = readdir(dir)) != NULL) { 181 while ((mydirent = readdir(dir)) != NULL) {
186 lstat( mydirent->d_name, &buf); 182 lstat( mydirent->d_name, &buf);
187// odebug << mydirent->d_name << oendl; 183// odebug << mydirent->d_name << oendl;
188 fileL.sprintf("%s", mydirent->d_name); 184 fileL.sprintf("%s", mydirent->d_name);
189 devT = buf.st_dev; 185 devT = buf.st_dev;
190 fileS.sprintf("%d, %d", (int) ( devT >>8) &0xFF, (int)devT &0xFF); 186 fileS.sprintf("%d, %d", (int) ( devT >>8) &0xFF, (int)devT &0xFF);
191 fileDate.sprintf("%s", ctime( &buf.st_mtime)); 187 fileDate.sprintf("%s", ctime( &buf.st_mtime));
192 if( fileL.find(".") == -1 ) { 188 if( fileL.find(".") == -1 ) {
193 item= new QListViewItem( thisView, fileL, fileS, fileDate); 189 item= new QListViewItem( thisView, fileL, fileS, fileDate);
@@ -206,26 +202,26 @@ void AdvancedFm::populateView() {
206void AdvancedFm::rePopulate() { 202void AdvancedFm::rePopulate() {
207 populateView(); 203 populateView();
208 setOtherTabCurrent(); 204 setOtherTabCurrent();
209 populateView(); 205 populateView();
210 206
211// int tmpTab = whichTab; 207// int tmpTab = whichTab;
212// // odebug << "" << tmpTab << "" << oendl; 208// // odebug << "" << tmpTab << "" << oendl;
213 209
214// for(int i =1; i < 3; i++) { 210// for(int i =1; i < 3; i++) {
215// TabWidget->setCurrentWidget(i - 1); 211// TabWidget->setCurrentWidget(i - 1);
216// populateView(); 212// populateView();
217// } 213// }
218// TabWidget->setCurrentWidget( tmpTab - 1); 214// TabWidget->setCurrentWidget( tmpTab - 1);
219} 215}
220 216
221void AdvancedFm::ListClicked(QListViewItem *selectedItem) { 217void AdvancedFm::ListClicked(QListViewItem *selectedItem) {
222//owarn << "listclicked" << oendl; 218//owarn << "listclicked" << oendl;
223 if(selectedItem) { 219 if(selectedItem) {
224 QString strItem=selectedItem->text(0); 220 QString strItem=selectedItem->text(0);
225// owarn << strItem << oendl; 221// owarn << strItem << oendl;
226 QString strSize=selectedItem->text(1); 222 QString strSize=selectedItem->text(1);
227 strSize=strSize.stripWhiteSpace(); 223 strSize=strSize.stripWhiteSpace();
228 bool isDirectory = false; 224 bool isDirectory = false;
229 QString strItem2; 225 QString strItem2;
230 226
231 if(strItem.find("@",0,TRUE) !=-1 || strItem.find("->",0,TRUE) !=-1 ) {//if symlink 227 if(strItem.find("@",0,TRUE) !=-1 || strItem.find("->",0,TRUE) !=-1 ) {//if symlink
@@ -256,27 +252,24 @@ void AdvancedFm::ListPressed( int mouse, QListViewItem *item, const QPoint& , in
256 { 252 {
257 if(renameBox != 0 ) { 253 if(renameBox != 0 ) {
258 cancelRename(); 254 cancelRename();
259 } 255 }
260 } 256 }
261 break; 257 break;
262 case 2:
263 menuTimer.start( 500, TRUE );
264 break;
265 }; 258 };
266} 259}
267 260
268 261
269void AdvancedFm::switchToLocalTab() { 262void AdvancedFm::switchToLocalTab() {
270//owarn << "switch to local view" << oendl; 263//owarn << "switch to local view" << oendl;
271 TabWidget->setCurrentWidget(0); 264 TabWidget->setCurrentWidget(0);
272 Local_View->setFocus(); 265 Local_View->setFocus();
273} 266}
274 267
275void AdvancedFm::switchToRemoteTab() { 268void AdvancedFm::switchToRemoteTab() {
276//owarn << "switch to local view" << oendl; 269//owarn << "switch to local view" << oendl;
277 TabWidget->setCurrentWidget(1); 270 TabWidget->setCurrentWidget(1);
278 Remote_View->setFocus(); 271 Remote_View->setFocus();
279} 272}
280 273
281void AdvancedFm::readConfig() { 274void AdvancedFm::readConfig() {
282 Config cfg("AdvancedFm"); 275 Config cfg("AdvancedFm");
@@ -326,13 +319,13 @@ QStringList AdvancedFm::getPath() {
326 QListView *thisView=CurrentView(); 319 QListView *thisView=CurrentView();
327 QList<QListViewItem> * getSelectedItems( QListView * thisView ); 320 QList<QListViewItem> * getSelectedItems( QListView * thisView );
328 QListViewItemIterator it( thisView ); 321 QListViewItemIterator it( thisView );
329 for ( ; it.current(); ++it ) { 322 for ( ; it.current(); ++it ) {
330 if ( it.current()->isSelected() ) { 323 if ( it.current()->isSelected() ) {
331 strList << it.current()->text(0); 324 strList << it.current()->text(0);
332// odebug << it.current()->text(0) << oendl; 325// odebug << it.current()->text(0) << oendl;
333 } 326 }
334 } 327 }
335 return strList; 328 return strList;
336} 329}
337 330
338void AdvancedFm::homeButtonPushed() { 331void AdvancedFm::homeButtonPushed() {
@@ -377,13 +370,13 @@ void AdvancedFm::doAbout() {
377 "is copyright 2002-2003 by\n" 370 "is copyright 2002-2003 by\n"
378 "L.J.Potter<llornkcor@handhelds.org>\n" 371 "L.J.Potter<llornkcor@handhelds.org>\n"
379 "and is licensed by the GPL")); 372 "and is licensed by the GPL"));
380} 373}
381 374
382void AdvancedFm::keyPressEvent( QKeyEvent *e) { 375void AdvancedFm::keyPressEvent( QKeyEvent *e) {
383// owarn << "key " << e->key() << "" << oendl; 376// owarn << "key " << e->key() << "" << oendl;
384// if( CurrentView()->hasFocus() ) 377// if( CurrentView()->hasFocus() )
385 { 378 {
386 switch ( e->key() ) { 379 switch ( e->key() ) {
387 case Key_Left: 380 case Key_Left:
388 upDir(); 381 upDir();
389 break; 382 break;
@@ -603,18 +596,12 @@ void AdvancedFm::showFileMenu() {
603 m->exec( QPoint( QCursor::pos().x(), QCursor::pos().y()) ); 596 m->exec( QPoint( QCursor::pos().x(), QCursor::pos().y()) );
604 597
605 if(m) delete m; 598 if(m) delete m;
606} 599}
607 600
608 601
609void AdvancedFm::cancelMenuTimer() {
610
611 if( menuTimer.isActive() )
612 menuTimer.stop();
613}
614
615QString AdvancedFm::checkDiskSpace(const QString &path) { 602QString AdvancedFm::checkDiskSpace(const QString &path) {
616 struct statfs fss; 603 struct statfs fss;
617 if ( !statfs( path.latin1(), &fss ) ) { 604 if ( !statfs( path.latin1(), &fss ) ) {
618 int blkSize = fss.f_bsize; 605 int blkSize = fss.f_bsize;
619// int totalBlks = fs.f_blocks; 606// int totalBlks = fs.f_blocks;
620 int availBlks = fss.f_bavail; 607 int availBlks = fss.f_bavail;
@@ -635,13 +622,13 @@ void AdvancedFm::addToDocs() {
635 QDir *thisDir = CurrentDir(); 622 QDir *thisDir = CurrentDir();
636 623
637 if( strListPaths.count() > 0) { 624 if( strListPaths.count() > 0) {
638 QString curFile; 625 QString curFile;
639 for ( QStringList::Iterator it = strListPaths.begin(); it != strListPaths.end(); ++it ) { 626 for ( QStringList::Iterator it = strListPaths.begin(); it != strListPaths.end(); ++it ) {
640 curFile = thisDir->canonicalPath()+"/"+(*it); 627 curFile = thisDir->canonicalPath()+"/"+(*it);
641// odebug << curFile << oendl; 628// odebug << curFile << oendl;
642 QFileInfo fi(curFile); 629 QFileInfo fi(curFile);
643 DocLnk f; 630 DocLnk f;
644// curFile.replace(QRegExp("\\..*"),""); 631// curFile.replace(QRegExp("\\..*"),"");
645 f.setName(fi.baseName() ); 632 f.setName(fi.baseName() );
646 f.setFile( curFile); 633 f.setFile( curFile);
647 f.writeLink(); 634 f.writeLink();
@@ -708,13 +695,13 @@ void AdvancedFm::addCustomDir() {
708 695
709 cfg.writeEntry("CustomDir", list, ','); 696 cfg.writeEntry("CustomDir", list, ',');
710 cfg.write(); 697 cfg.write();
711} 698}
712 699
713void AdvancedFm::removeCustomDir() { 700void AdvancedFm::removeCustomDir() {
714// odebug << "remove custom dir" << oendl; 701// odebug << "remove custom dir" << oendl;
715 Config cfg("AdvancedFm"); 702 Config cfg("AdvancedFm");
716 cfg.setGroup("Menu"); 703 cfg.setGroup("Menu");
717 QString dir; 704 QString dir;
718 QStringList list = cfg.readListEntry( (const QString &)"CustomDir", (const QChar)','); 705 QStringList list = cfg.readListEntry( (const QString &)"CustomDir", (const QChar)',');
719 QStringList list2; 706 QStringList list2;
720 dir = CurrentDir()->canonicalPath(); 707 dir = CurrentDir()->canonicalPath();
@@ -743,13 +730,13 @@ void AdvancedFm::removeCustomDir() {
743 } 730 }
744// customDirsToMenu(); 731// customDirsToMenu();
745 732
746} 733}
747 734
748void AdvancedFm::gotoCustomDir(const QString &dir) { 735void AdvancedFm::gotoCustomDir(const QString &dir) {
749// odebug << "gotoCustomDir(const QString &dir) " +dir << oendl; 736// odebug << "gotoCustomDir(const QString &dir) " +dir << oendl;
750// QString curDir = dir; 737// QString curDir = dir;
751// QDir *thisDir = CurrentDir(); 738// QDir *thisDir = CurrentDir();
752// if( curDir.isEmpty()) { 739// if( curDir.isEmpty()) {
753// } 740// }
754 if( dir == s_addBookmark) { 741 if( dir == s_addBookmark) {
755 addCustomDir(); 742 addCustomDir();
@@ -784,56 +771,56 @@ QDir *AdvancedFm::OtherDir() {
784 return &currentDir; 771 return &currentDir;
785 } 772 }
786} 773}
787 774
788QListView * AdvancedFm::CurrentView() { 775QListView * AdvancedFm::CurrentView() {
789 if ( whichTab == 1) { 776 if ( whichTab == 1) {
790// owarn << "CurrentView Tab 1" << oendl; 777// owarn << "CurrentView Tab 1" << oendl;
791 return Local_View; 778 return Local_View;
792 } else { 779 } else {
793// owarn << "CurrentView Tab 2" << oendl; 780// owarn << "CurrentView Tab 2" << oendl;
794 return Remote_View; 781 return Remote_View;
795 } 782 }
796} 783}
797 784
798QListView * AdvancedFm::OtherView() { 785QListView * AdvancedFm::OtherView() {
799 if ( whichTab == 1) 786 if ( whichTab == 1)
800 return Remote_View; 787 return Remote_View;
801 else 788 else
802 return Local_View; 789 return Local_View;
803} 790}
804 791
805void AdvancedFm::setOtherTabCurrent() { 792void AdvancedFm::setOtherTabCurrent() {
806// owarn << "setOtherTabCurrent() " << whichTab << "" << oendl; 793// owarn << "setOtherTabCurrent() " << whichTab << "" << oendl;
807 if ( whichTab == 1) { 794 if ( whichTab == 1) {
808 TabWidget->setCurrentWidget(1); 795 TabWidget->setCurrentWidget(1);
809 } else { 796 } else {
810 TabWidget->setCurrentWidget(0); 797 TabWidget->setCurrentWidget(0);
811 } 798 }
812 OtherView()->setFocus(); 799 OtherView()->setFocus();
813 OtherView()->setSelected( CurrentView()->firstChild(), true); 800 OtherView()->setSelected( CurrentView()->firstChild(), true);
814} 801}
815 802
816void AdvancedFm::qcopReceive(const QCString &msg, const QByteArray &data) { 803void AdvancedFm::qcopReceive(const QCString &msg, const QByteArray &data) {
817// odebug << "qcop message "+msg << oendl; 804// odebug << "qcop message "+msg << oendl;
818 QDataStream stream ( data, IO_ReadOnly ); 805 QDataStream stream ( data, IO_ReadOnly );
819 if ( msg == "openDirectory(QString)" ) { 806 if ( msg == "openDirectory(QString)" ) {
820// odebug << "received" << oendl; 807// odebug << "received" << oendl;
821 QString file; 808 QString file;
822 stream >> file; 809 stream >> file;
823 gotoDirectory( (const QString &) file); 810 gotoDirectory( (const QString &) file);
824 } 811 }
825} 812}
826 813
827void AdvancedFm::setDocument(const QString &file) { 814void AdvancedFm::setDocument(const QString &file) {
828 gotoDirectory( file); 815 gotoDirectory( file);
829 816
830} 817}
831 818
832void AdvancedFm::gotoDirectory(const QString &file) { 819void AdvancedFm::gotoDirectory(const QString &file) {
833// owarn << "goto dir "+file << oendl; 820// owarn << "goto dir "+file << oendl;
834 QString curDir = file; 821 QString curDir = file;
835 QDir *thisDir = CurrentDir(); 822 QDir *thisDir = CurrentDir();
836 if(QDir( curDir).exists() ) { 823 if(QDir( curDir).exists() ) {
837 thisDir->setPath( curDir ); 824 thisDir->setPath( curDir );
838 chdir( curDir.latin1() ); 825 chdir( curDir.latin1() );
839 thisDir->cd( curDir, TRUE); 826 thisDir->cd( curDir, TRUE);
@@ -863,13 +850,13 @@ void AdvancedFm::findFile(const QString &fileName) {
863 thisView->ensureItemVisible(it.current()); 850 thisView->ensureItemVisible(it.current());
864 } 851 }
865 } 852 }
866} 853}
867 854
868void AdvancedFm::slotSwitchMenu(int ) { 855void AdvancedFm::slotSwitchMenu(int ) {
869// odebug << "Switch " << item << "" << oendl; 856// odebug << "Switch " << item << "" << oendl;
870 // viewMenu->setItemChecked(item, true); 857 // viewMenu->setItemChecked(item, true);
871} 858}
872 859
873void AdvancedFm::dealWithSchmooSchmaa(QWidget *w) { 860void AdvancedFm::dealWithSchmooSchmaa(QWidget *w) {
874 tabChanged( w); 861 tabChanged( w);
875 if( w == Local_View) { 862 if( w == Local_View) {
diff --git a/noncore/apps/advancedfm/advancedfm.h b/noncore/apps/advancedfm/advancedfm.h
index 4eaa6d6..effda0b 100644
--- a/noncore/apps/advancedfm/advancedfm.h
+++ b/noncore/apps/advancedfm/advancedfm.h
@@ -52,17 +52,13 @@ class Ir;
52 52
53class AdvancedFm : public QMainWindow 53class AdvancedFm : public QMainWindow
54{ 54{
55 Q_OBJECT 55 Q_OBJECT
56public: 56public:
57 static QString appName() { return QString::fromLatin1("advancedfm"); } 57 static QString appName() { return QString::fromLatin1("advancedfm"); }
58#ifdef NOQUICKLAUNCH
59 AdvancedFm();
60#else
61 AdvancedFm(QWidget *p = 0, const char* name = 0, WFlags fl = 0); 58 AdvancedFm(QWidget *p = 0, const char* name = 0, WFlags fl = 0);
62#endif
63 ~AdvancedFm(); 59 ~AdvancedFm();
64protected slots: 60protected slots:
65 void slotSwitchMenu(int); 61 void slotSwitchMenu(int);
66 void selectAll(); 62 void selectAll();
67 void addToDocs(); 63 void addToDocs();
68 void doDirChange(); 64 void doDirChange();
@@ -135,14 +131,13 @@ protected:
135 void setOtherTabCurrent(); 131 void setOtherTabCurrent();
136 void dealWithSchmooSchmaa(QWidget *); 132 void dealWithSchmooSchmaa(QWidget *);
137 133
138protected slots: 134protected slots:
139 void openSearch(); 135 void openSearch();
140 void dirMenuSelected(int); 136 void dirMenuSelected(int);
141 void showFileMenu(); 137 void showFileMenu();
142 void cancelMenuTimer();
143 void homeButtonPushed(); 138 void homeButtonPushed();
144 void docButtonPushed(); 139 void docButtonPushed();
145 void SDButtonPushed(); 140 void SDButtonPushed();
146 void CFButtonPushed(); 141 void CFButtonPushed();
147 void QPEButtonPushed(); 142 void QPEButtonPushed();
148 void upDir(); 143 void upDir();
@@ -163,13 +158,12 @@ protected slots:
163 bool moveDirectory( const QString & , const QString & ); 158 bool moveDirectory( const QString & , const QString & );
164// void slotSwitchtoLocal(int); 159// void slotSwitchtoLocal(int);
165 160
166private: 161private:
167 MenuButton *menuButton; 162 MenuButton *menuButton;
168 QString oldName; 163 QString oldName;
169 QTimer menuTimer;
170 void startProcess(const QString &); 164 void startProcess(const QString &);
171 bool eventFilter( QObject * , QEvent * ); 165 bool eventFilter( QObject * , QEvent * );
172 void cancelRename(); 166 void cancelRename();
173 void doRename(QListView *); 167 void doRename(QListView *);
174 void okRename(); 168 void okRename();
175 void customDirsToMenu(); 169 void customDirsToMenu();
diff --git a/noncore/apps/advancedfm/advancedfmData.cpp b/noncore/apps/advancedfm/advancedfmData.cpp
index 29335f8..dc7e8e1 100644
--- a/noncore/apps/advancedfm/advancedfmData.cpp
+++ b/noncore/apps/advancedfm/advancedfmData.cpp
@@ -158,13 +158,13 @@ void AdvancedFm::init() {
158 Local_View->setAllColumnsShowFocus(TRUE); 158 Local_View->setAllColumnsShowFocus(TRUE);
159 Local_View->setMultiSelection( TRUE ); 159 Local_View->setMultiSelection( TRUE );
160 Local_View->setSelectionMode(QListView::Extended); 160 Local_View->setSelectionMode(QListView::Extended);
161 Local_View->setFocusPolicy(StrongFocus); 161 Local_View->setFocusPolicy(StrongFocus);
162 Local_View->installEventFilter( this ); 162 Local_View->installEventFilter( this );
163 163
164 QPEApplication::setStylusOperation( Local_View->viewport(),QPEApplication::RightOnHold); 164 QPEApplication::setStylusOperation( Local_View->viewport() , QPEApplication::RightOnHold);
165 165
166 tabLayout->addWidget( Local_View, 0, 0 ); 166 tabLayout->addWidget( Local_View, 0, 0 );
167 167
168 TabWidget->addWidget( tab,"advancedfm/smFileBrowser.png", tr("1")); 168 TabWidget->addWidget( tab,"advancedfm/smFileBrowser.png", tr("1"));
169// TabWidget->insertTab( tab, tr("1")); 169// TabWidget->insertTab( tab, tr("1"));
170 170
@@ -182,13 +182,13 @@ void AdvancedFm::init() {
182 Remote_View->setAllColumnsShowFocus(TRUE); 182 Remote_View->setAllColumnsShowFocus(TRUE);
183 Remote_View->setMultiSelection( TRUE ); 183 Remote_View->setMultiSelection( TRUE );
184 Remote_View->setSelectionMode(QListView::Extended); 184 Remote_View->setSelectionMode(QListView::Extended);
185 Remote_View->setFocusPolicy(StrongFocus); 185 Remote_View->setFocusPolicy(StrongFocus);
186 Remote_View->installEventFilter( this ); 186 Remote_View->installEventFilter( this );
187 187
188 QPEApplication::setStylusOperation( Remote_View->viewport(),QPEApplication::RightOnHold); 188 QPEApplication::setStylusOperation( Remote_View->viewport(), QPEApplication::RightOnHold);
189 189
190 tabLayout_2->addWidget( Remote_View, 0, 0 ); 190 tabLayout_2->addWidget( Remote_View, 0, 0 );
191 191
192 TabWidget->addWidget( tab_2, "advancedfm/smFileBrowser.png",tr( "2")); 192 TabWidget->addWidget( tab_2, "advancedfm/smFileBrowser.png",tr( "2"));
193 TabWidget->setSizeChange( 370 ); 193 TabWidget->setSizeChange( 370 );
194// TabWidget->insertTab( tab_2, tr( "2")); 194// TabWidget->insertTab( tab_2, tr( "2"));
@@ -220,17 +220,17 @@ void AdvancedFm::init() {
220 zaurusDevice=TRUE; 220 zaurusDevice=TRUE;
221 else 221 else
222 zaurusDevice=FALSE; 222 zaurusDevice=FALSE;
223 223
224 224
225 if( !StorageInfo::hasSd() || !StorageInfo::hasMmc()) { 225 if( !StorageInfo::hasSd() || !StorageInfo::hasMmc()) {
226 odebug << "not have sd" << oendl; 226 odebug << "not have sd" << oendl;
227 sdButton->hide(); 227 sdButton->hide();
228 } 228 }
229 if( !StorageInfo::hasCf() ) { 229 if( !StorageInfo::hasCf() ) {
230 odebug << "not have cf" << oendl; 230 odebug << "not have cf" << oendl;
231 cfButton->hide(); 231 cfButton->hide();
232 } 232 }
233 currentDir.setFilter( QDir::Files | QDir::Dirs | QDir::Hidden | QDir::All); 233 currentDir.setFilter( QDir::Files | QDir::Dirs | QDir::Hidden | QDir::All);
234 currentDir.setPath( QDir::currentDirPath()); 234 currentDir.setPath( QDir::currentDirPath());
235 235
236 currentRemoteDir.setFilter( QDir::Files | QDir::Dirs | QDir::Hidden | QDir::All); 236 currentRemoteDir.setFilter( QDir::Files | QDir::Dirs | QDir::Hidden | QDir::All);
@@ -270,23 +270,24 @@ void AdvancedFm::initConnections()
270 connect( Local_View, SIGNAL( clicked(QListViewItem*)), 270 connect( Local_View, SIGNAL( clicked(QListViewItem*)),
271 this,SLOT( ListClicked(QListViewItem*)) ); 271 this,SLOT( ListClicked(QListViewItem*)) );
272 272
273 connect( Local_View, SIGNAL( mouseButtonPressed(int,QListViewItem*,const QPoint&,int)), 273 connect( Local_View, SIGNAL( mouseButtonPressed(int,QListViewItem*,const QPoint&,int)),
274 this,SLOT( ListPressed(int,QListViewItem*,const QPoint&,int)) ); 274 this,SLOT( ListPressed(int,QListViewItem*,const QPoint&,int)) );
275 275
276 connect( Local_View, SIGNAL( selectionChanged() ), SLOT( cancelMenuTimer() ) );
277
278 connect( Remote_View, SIGNAL( clicked(QListViewItem*)), 276 connect( Remote_View, SIGNAL( clicked(QListViewItem*)),
279 this,SLOT( ListClicked(QListViewItem*)) ); 277 this,SLOT( ListClicked(QListViewItem*)) );
280 connect( Remote_View, SIGNAL( mouseButtonPressed(int,QListViewItem*,const QPoint&,int)), 278 connect( Remote_View, SIGNAL( mouseButtonPressed(int,QListViewItem*,const QPoint&,int)),
281 this,SLOT( ListPressed(int,QListViewItem*,const QPoint&,int)) ); 279 this,SLOT( ListPressed(int,QListViewItem*,const QPoint&,int)) );
282 280
283 connect( TabWidget,SIGNAL(currentChanged(QWidget*)), 281 connect( TabWidget,SIGNAL(currentChanged(QWidget*)),
284 this,SLOT(tabChanged(QWidget*))); 282 this,SLOT(tabChanged(QWidget*)));
285 283
286 connect( &menuTimer, SIGNAL( timeout() ), SLOT( showFileMenu() ) ); 284 connect( Remote_View, SIGNAL(rightButtonPressed(QListViewItem*, const QPoint&, int)),
285 this, SLOT(showFileMenu()));
286 connect( Local_View, SIGNAL(rightButtonPressed(QListViewItem*, const QPoint&,int)),
287 this, SLOT(showFileMenu()));
287 288
288 connect( menuButton, SIGNAL( selected(const QString&)), SLOT(gotoCustomDir(const QString&))); 289 connect( menuButton, SIGNAL( selected(const QString&)), SLOT(gotoCustomDir(const QString&)));
289// connect( menuButton, SIGNAL( selected(int)), SLOT( dirMenuSelected(int))); 290// connect( menuButton, SIGNAL( selected(int)), SLOT( dirMenuSelected(int)));
290 connect( viewMenu, SIGNAL( activated(int)), this, SLOT(slotSwitchMenu(int))); 291 connect( viewMenu, SIGNAL( activated(int)), this, SLOT(slotSwitchMenu(int)));
291// connect( customDirMenu, SIGNAL( activated(int)), this, SLOT( dirMenuSelected(int))); 292// connect( customDirMenu, SIGNAL( activated(int)), this, SLOT( dirMenuSelected(int)));
292 293
diff --git a/noncore/apps/advancedfm/main.cpp b/noncore/apps/advancedfm/main.cpp
index df0d4af..06fc741 100644
--- a/noncore/apps/advancedfm/main.cpp
+++ b/noncore/apps/advancedfm/main.cpp
@@ -1,10 +1,8 @@
1 1
2/*************************************************************************** 2/***************************************************************************
3using namespace Opie::Core;
4using namespace Opie::Core;
5 main.cpp - description 3 main.cpp - description
6 ------------------- 4 -------------------
7 begin : March 10, 2002 5 begin : March 10, 2002
8 copyright : (C) 2002 by llornkcor 6 copyright : (C) 2002 by llornkcor
9 email : ljp@llornkcor.com 7 email : ljp@llornkcor.com
10 * This program is free software; you can redistribute it and/or modify * 8 * This program is free software; you can redistribute it and/or modify *