2 files changed, 46 insertions, 7 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
@@ -13,2 +13,3 @@ using namespace Opie::Ui;
 #include <qcheckbox.h>
+#include <qfileinfo.h>
 #include <qvbox.h>
@@ -91,2 +92,3 @@ DemoApp::DemoApp( int argc, char** argv ) : OApplication( argc, argv, "libopie2
         {
+            bool success = true;
             odebug << "Filename = " << filename << oendl;
@@ -95,7 +97,38 @@ DemoApp::DemoApp( int argc, char** argv ) : OApplication( argc, argv, "libopie2
             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;
         }
@@ -126,5 +159,10 @@ 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;
     }
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
@@ -21,3 +21,4 @@ public slots:
     void delTrigger();
-    void trigger();
+    void unnamedTrigger();
+    void namedTrigger( const QString& name );