| -rw-r--r-- | examples/opiecore/onotifydemo/onotifydemo.cpp | 50 | ||||
| -rw-r--r-- | examples/opiecore/onotifydemo/onotifydemo.h | 3 | ||||
| -rw-r--r-- | libopie2/opiecore/ofilenotify.cpp | 31 | ||||
| -rw-r--r-- | libopie2/opiecore/ofilenotify.h | 10 |
4 files changed, 77 insertions, 17 deletions
diff --git a/examples/opiecore/onotifydemo/onotifydemo.cpp b/examples/opiecore/onotifydemo/onotifydemo.cpp index 0e84d80..2beda2a 100644 --- a/examples/opiecore/onotifydemo/onotifydemo.cpp +++ b/examples/opiecore/onotifydemo/onotifydemo.cpp @@ -11,6 +11,7 @@ using namespace Opie::Ui; /* QT */ #include <qcheckbox.h> +#include <qfileinfo.h> #include <qvbox.h> #include <qhbox.h> #include <qhbuttongroup.h> @@ -89,15 +90,47 @@ DemoApp::DemoApp( int argc, char** argv ) : OApplication( argc, argv, "libopie2 QString filename = OFileDialog::getOpenFileName( OFileSelector::ExtendedAll ); if ( !filename.isEmpty() ) { + bool success = true; odebug << "Filename = " << filename << oendl; int fntype = m; QString modifier = QString().sprintf( " = 0x%08x", fntype ); - new OListViewItem( l, filename, multi ? "MULTI" : "SINGLE", modifier ); - if ( !multi ) - OFileNotification::singleShot( filename, this, SLOT( trigger() ), (OFileNotificationType) fntype ); + + if ( QFileInfo( filename ).isFile() ) + { + if ( !multi ) + { + success = OFileNotification::singleShot( filename, this, SLOT( unnamedTrigger() ), (OFileNotificationType) fntype ); + } + else + { + OFileNotification* fn = new OFileNotification(); + success = fn->watch( filename, false, (OFileNotificationType) fntype ); + connect( fn, SIGNAL( triggered( const QString& ) ), this, SLOT( namedTrigger( const QString& ) ) ); + } + } + else if ( QFileInfo( filename ).isDir() ) + { + ODirNotification* dn = new ODirNotification(); + success = dn->watch( filename, !multi, (OFileNotificationType) fntype ); + connect( dn, SIGNAL( triggered( const QString& ) ), this, SLOT( namedTrigger( const QString& ) ) ); + } + else + { + odebug << "Huh!? Neither file nor directory..." << oendl; + return; + } + +/* if ( !success ) + { + QMessageBox::warning( 0, "Add Trigger", "<p>Couldn't add trigger :(</p>", "&Sorry", 0 ); + return; + } else - odebug << "not yet implemented..." << oendl; +*/ { + new OListViewItem( l, filename, multi ? "MULTI" : "SINGLE", modifier ); + } + return; } else { @@ -124,9 +157,14 @@ DemoApp::DemoApp( int argc, char** argv ) : OApplication( argc, argv, "libopie2 } } - void DemoApp::trigger() + void DemoApp::unnamedTrigger() + { + owarn << "DemoApp::singleShotStrigger() : F I R E !!!!!" << oendl; + } + + void DemoApp::namedTrigger( const QString& path ) { - owarn << "FIRE!" << oendl; + owarn << "DemoApp::named trigger = " << path << " : F I R E !!!!!" << oendl; } int main( int argc, char** argv ) diff --git a/examples/opiecore/onotifydemo/onotifydemo.h b/examples/opiecore/onotifydemo/onotifydemo.h index c4e3456..f6ac5ea 100644 --- a/examples/opiecore/onotifydemo/onotifydemo.h +++ b/examples/opiecore/onotifydemo/onotifydemo.h @@ -19,7 +19,8 @@ public slots: void addSingle(); void addMulti(); void delTrigger(); - void trigger(); + void unnamedTrigger(); + void namedTrigger( const QString& name ); private: Opie::Ui::OListView* l; diff --git a/libopie2/opiecore/ofilenotify.cpp b/libopie2/opiecore/ofilenotify.cpp index efd041a..11d4f87 100644 --- a/libopie2/opiecore/ofilenotify.cpp +++ b/libopie2/opiecore/ofilenotify.cpp @@ -93,17 +93,17 @@ int OFileNotification::watch( const QString& path, bool sshot, OFileNotification return -1; } - if ( notification_list.isEmpty() ) - { - OFileNotification::registerEventHandler(); - } - return startWatching( path, sshot, type ); } int OFileNotification::startWatching( const QString& path, bool sshot, OFileNotificationType type ) { + if ( notification_list.isEmpty() ) + { + OFileNotification::registerEventHandler(); + } + struct inotify_watch_request iwr; ::memset( &iwr, 0, sizeof iwr ); iwr.name = const_cast<char*>( (const char*) path ); @@ -255,9 +255,24 @@ ODirNotification::~ODirNotification() int ODirNotification::watch( const QString& path, bool sshot, OFileNotificationType type, int recurse ) { qDebug( "ODirNotification::watch( %s, %d, 0x%08x, %d )", (const char*) path, sshot, type, recurse ); - return 0; -} + if ( recurse == 0 ) + { + OFileNotification* fn = new OFileNotification( this, "ODirNotification delegate" ); + int result = fn->startWatching( path, sshot, type ); + if ( result != -1 ) + { + connect( fn, SIGNAL( triggered( const QString& ) ), this, SIGNAL( triggered( const QString& ) ) ); + return result; + } + } + else + { + qDebug( "ODirNotification::watch(), recursion not yet implemented... :)" ); + return -1; + } } -}
\ No newline at end of file +} // namespace Ui + +} // namespace Opie diff --git a/libopie2/opiecore/ofilenotify.h b/libopie2/opiecore/ofilenotify.h index 41ba84d..3eb917e 100644 --- a/libopie2/opiecore/ofilenotify.h +++ b/libopie2/opiecore/ofilenotify.h @@ -129,13 +129,13 @@ class OFileNotification : public QObject * int main( int argc, char **argv ) * { * OApplication a( argc, argv, "File Notification Example" ); - * OFileNotification::singleShot( "/tmp/quit", &a, SLOT(quit()), Create ); + * OFileNotification::singleShot( "/tmp/quit", &a, SLOT(quit()), Access ); * ... // create and show your widgets * return a.exec(); * } * </pre> * - * This sample program automatically terminates when the file "/tmp/quit" has been created. + * This sample program automatically terminates when the file "/tmp/quit" has been accessed. * * * The @a receiver is the receiving object and the @a member is the slot. @@ -222,6 +222,12 @@ class ODirNotification : public QObject * Set @a sshot to True if you want to be notified only once. **/ int watch( const QString& path, bool sshot = false, OFileNotificationType type = Modify, int recurse = 0 ); + + signals: + /** + * This signal is emitted if an event happens of the specified type happens to the directory being watched. + **/ + void triggered( const QString& name ); }; |