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
@@ -35,11 +35,7 @@
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;
@@ -71,7 +67,7 @@ void AdvancedFm::cleanUp() {
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
@@ -93,13 +89,13 @@ void AdvancedFm::tabChanged(QWidget *) {
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);
@@ -160,7 +156,7 @@ void AdvancedFm::populateView() {
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" );
@@ -184,7 +180,7 @@ void AdvancedFm::populateView() {
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);
@@ -209,7 +205,7 @@ void AdvancedFm::rePopulate() {
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);
@@ -219,10 +215,10 @@ void AdvancedFm::rePopulate() {
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;
@@ -259,21 +255,18 @@ void AdvancedFm::ListPressed( int mouse, QListViewItem *item, const QPoint& , in
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}
@@ -329,7 +322,7 @@ QStringList AdvancedFm::getPath() {
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;
@@ -380,7 +373,7 @@ void AdvancedFm::doAbout() {
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() ) {
@@ -606,12 +599,6 @@ void AdvancedFm::showFileMenu() {
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 ) ) {
@@ -638,7 +625,7 @@ void AdvancedFm::addToDocs() {
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("\\..*"),"");
@@ -711,7 +698,7 @@ void AdvancedFm::addCustomDir() {
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;
@@ -746,7 +733,7 @@ void AdvancedFm::removeCustomDir() {
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()) {
@@ -787,10 +774,10 @@ QDir *AdvancedFm::OtherDir() {
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}
@@ -803,7 +790,7 @@ QListView * AdvancedFm::OtherView() {
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 {
@@ -814,10 +801,10 @@ void AdvancedFm::setOtherTabCurrent() {
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);
@@ -830,7 +817,7 @@ void AdvancedFm::setDocument(const QString &file) {
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() ) {
@@ -866,7 +853,7 @@ void AdvancedFm::findFile(const QString &fileName) {
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
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
@@ -55,11 +55,7 @@ class AdvancedFm : public QMainWindow
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);
@@ -138,8 +134,7 @@ protected:
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();
@@ -166,7 +161,6 @@ protected slots:
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();
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
@@ -161,7 +161,7 @@ void AdvancedFm::init() {
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
@@ -185,7 +185,7 @@ void AdvancedFm::init() {
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
@@ -223,11 +223,11 @@ void AdvancedFm::init() {
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);
@@ -273,8 +273,6 @@ void AdvancedFm::initConnections()
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)),
@@ -283,7 +281,10 @@ void AdvancedFm::initConnections()
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)));
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,7 +1,5 @@
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