the notifier interface is shaping up

Brad: I sorted the "DN_xxx undeclared" issue out, please test

1 files changed, 34 insertions, 9 deletions

diff --git a/libopie2/examples/opiecore/onotifydemo/onotifydemo.cpp b/libopie2/examples/opiecore/onotifydemo/onotifydemo.cpp
index a8a5717..74a8158 100644
--- a/libopie2/examples/opiecore/onotifydemo/onotifydemo.cpp
+++ b/libopie2/examples/opiecore/onotifydemo/onotifydemo.cpp
@@ -10,2 +10,3 @@ using namespace Opie::Ui;
 /* QT */
+#include <qcheckbox.h>
 #include <qvbox.h>
@@ -14,4 +15,4 @@ using namespace Opie::Ui;
 #include <qvbuttongroup.h>
+#include <qmessagebox.h>
 #include <qpushbutton.h>
-#include <qcheckbox.h>
 
@@ -29,3 +30,6 @@ public:
     l->addColumn( "Notification Path" );
-    l->addColumn( "Trigger" );
+    l->addColumn( "Trigger Type" );
+    l->addColumn( "Trigger Mask" );
+    l->setColumnAlignment( 1, AlignCenter );
+    l->setColumnAlignment( 2, AlignCenter );
 
@@ -47,2 +51,3 @@ public:
     g2->insert( c7, Attrib );
+    connect( g2, SIGNAL( pressed(int) ), this, SLOT( modifierClicked(int) ) );
 
@@ -70,2 +75,8 @@ public:
     {
+        if ( !m )
+        {
+            QMessageBox::warning( 0, "Add Trigger", "<p>Can't add trigger without at least one selected trigger type</p>", "&Sorry", 0 );
+            return;
+        }
+
         QString filename = OFileDialog::getOpenFileName( OFileSelector::ExtendedAll );
@@ -74,7 +85,12 @@ public:
             odebug << "Filename = " << filename << oendl;
-            new OListViewItem( l, filename, "Modify" );
-
 
+            int fntype = m;
+            if ( multi ) fntype |=(int) Multi;
 
-            OFileNotifier::singleShot( filename, this, SLOT( trigger() ) );
+            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 );
+            else
+                OFileNotification::singleShot( filename, this, SLOT( trigger() ), (OFileNotificationType) fntype );
         }
@@ -87,3 +103,3 @@ public:
 public slots:
-
+    void modifierClicked( int modifier ) { (int)m ^= modifier; };
     void addSingle() { addTrigger(); };
@@ -93,4 +109,13 @@ public slots:
     {
-        QString filename( "bla" );
-        odebug << "Filename = " << filename << oendl;
+        QListViewItem* item = l->selectedItem();
+        if ( !item )
+        {
+            QMessageBox::warning( 0, "Del Trigger", "<p>No trigger selected!</p>", "&Sorry", 0 );
+            return;
+        }
+        else
+        {
+            QString filename( item->text( 0 ) );
+            odebug << "Filename = " << filename << oendl;
+        }
     }
@@ -106,3 +131,3 @@ private:
   QButtonGroup* g2;
-  int m;
+  OFileNotificationType m;
 };