summaryrefslogtreecommitdiff
authorzecke <zecke>2004-08-18 22:07:30 (UTC)
committer zecke <zecke>2004-08-18 22:07:30 (UTC)
commit50636a24f8ec2e603f1888a18dba044a1045bf0b (patch) (unidiff)
tree9f69140b2449aaefe263e7acab3b6b147c7fadf7
parenteb0a70826bc77c8b4008bd0444218da7612d32a9 (diff)
downloadopie-50636a24f8ec2e603f1888a18dba044a1045bf0b.zip
opie-50636a24f8ec2e603f1888a18dba044a1045bf0b.tar.gz
opie-50636a24f8ec2e603f1888a18dba044a1045bf0b.tar.bz2
-Remove #ifdef for NOQUICKLAUNCH as OPIE_EXPORT_APP works for
both cases already. -Use QPEApplication::setStylusOperation for RightOnHold feature instead of custom code
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
@@ -36,9 +36,5 @@
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();
@@ -72,5 +68,5 @@ void AdvancedFm::cleanUp() {
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 );
@@ -94,5 +90,5 @@ void AdvancedFm::tabChanged(QWidget *) {
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();
@@ -100,5 +96,5 @@ void AdvancedFm::populateView() {
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);
@@ -161,5 +157,5 @@ void AdvancedFm::populateView() {
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" );
@@ -185,5 +181,5 @@ void AdvancedFm::populateView() {
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;
@@ -210,5 +206,5 @@ void AdvancedFm::rePopulate() {
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++) {
@@ -220,8 +216,8 @@ void AdvancedFm::rePopulate() {
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();
@@ -260,7 +256,4 @@ void AdvancedFm::ListPressed( int mouse, QListViewItem *item, const QPoint& , in
260 } 256 }
261 break; 257 break;
262 case 2:
263 menuTimer.start( 500, TRUE );
264 break;
265 }; 258 };
266} 259}
@@ -268,5 +261,5 @@ void AdvancedFm::ListPressed( int mouse, QListViewItem *item, const QPoint& , in
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();
@@ -274,5 +267,5 @@ void AdvancedFm::switchToLocalTab() {
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();
@@ -330,5 +323,5 @@ QStringList AdvancedFm::getPath() {
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 }
@@ -381,5 +374,5 @@ void AdvancedFm::doAbout() {
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 {
@@ -607,10 +600,4 @@ void AdvancedFm::showFileMenu() {
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;
@@ -639,5 +626,5 @@ void AdvancedFm::addToDocs() {
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;
@@ -712,5 +699,5 @@ void AdvancedFm::addCustomDir() {
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");
@@ -747,5 +734,5 @@ void AdvancedFm::removeCustomDir() {
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();
@@ -788,8 +775,8 @@ QDir *AdvancedFm::OtherDir() {
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 }
@@ -804,5 +791,5 @@ QListView * AdvancedFm::OtherView() {
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);
@@ -815,8 +802,8 @@ void AdvancedFm::setOtherTabCurrent() {
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;
@@ -831,5 +818,5 @@ void AdvancedFm::setDocument(const QString &file) {
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();
@@ -867,5 +854,5 @@ void AdvancedFm::findFile(const QString &fileName) {
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}
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
@@ -56,9 +56,5 @@ class AdvancedFm : public QMainWindow
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:
@@ -139,6 +135,5 @@ protected 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();
@@ -167,5 +162,4 @@ private:
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 * );
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
@@ -162,5 +162,5 @@ void AdvancedFm::init() {
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 );
@@ -186,5 +186,5 @@ void AdvancedFm::init() {
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 );
@@ -224,9 +224,9 @@ void AdvancedFm::init() {
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 }
@@ -274,6 +274,4 @@ void AdvancedFm::initConnections()
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*)) );
@@ -284,5 +282,8 @@ void AdvancedFm::initConnections()
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&)));
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,6 +1,4 @@
1 1
2/*************************************************************************** 2/***************************************************************************
3using namespace Opie::Core;
4using namespace Opie::Core;
5 main.cpp - description 3 main.cpp - description
6 ------------------- 4 -------------------