summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--examples/opiecore/onotifydemo/onotifydemo.cpp50
-rw-r--r--examples/opiecore/onotifydemo/onotifydemo.h3
-rw-r--r--libopie2/opiecore/ofilenotify.cpp31
-rw-r--r--libopie2/opiecore/ofilenotify.h10
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
@@ -1,29 +1,30 @@
#include "onotifydemo.h"
/* OPIE */
#include <opie2/odebug.h>
#include <opie2/oapplication.h>
#include <opie2/ofiledialog.h>
#include <opie2/olistview.h>
#include <opie2/ofilenotify.h>
using namespace Opie::Core;
using namespace Opie::Ui;
/* QT */
#include <qcheckbox.h>
+#include <qfileinfo.h>
#include <qvbox.h>
#include <qhbox.h>
#include <qhbuttongroup.h>
#include <qvbuttongroup.h>
#include <qmessagebox.h>
#include <qpushbutton.h>
DemoApp::DemoApp( int argc, char** argv ) : OApplication( argc, argv, "libopie2 notify demo" )
{
QVBox* vbox = new QVBox();
setMainWidget( vbox );
l = new OListView( vbox );
l->addColumn( "Notification Path" );
l->addColumn( "Trigger Type" );
@@ -76,65 +77,102 @@ DemoApp::DemoApp( int argc, char** argv ) : OApplication( argc, argv, "libopie2
hbox->show();
vbox->show();
showMainWidget( vbox );
}
void DemoApp::addTrigger( bool multi )
{
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 );
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
{
odebug << "cancelled." << oendl;
}
}
void DemoApp::modifierClicked( int modifier ) { m = static_cast<OFileNotificationType>( (int)m ^ int(modifier) ); };
void DemoApp::addSingle() { addTrigger(); };
void DemoApp::addMulti() { addTrigger( true ); };
void DemoApp::delTrigger()
{
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;
}
}
- 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 )
{
DemoApp* app = new DemoApp( argc, argv );
app->exec();
return 0;
}
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
@@ -6,24 +6,25 @@
class QButtonGroup;
class DemoApp : public Opie::Core::OApplication
{
Q_OBJECT
public:
DemoApp( int argc, char** argv );
public:
void addTrigger( bool multi = false );
public slots:
void modifierClicked( int modifier );
void addSingle();
void addMulti();
void delTrigger();
- void trigger();
+ void unnamedTrigger();
+ void namedTrigger( const QString& name );
private:
Opie::Ui::OListView* l;
QButtonGroup* g1;
QButtonGroup* g2;
Opie::Core::OFileNotificationType m;
};
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
@@ -80,43 +80,43 @@ bool OFileNotification::isActive() const
int OFileNotification::watch( const QString& path, bool sshot, OFileNotificationType type )
{
// check if path exists and is a regular file
struct stat s;
if ( ::stat( (const char*) path, &s ) == -1 )
{
qWarning( "OFileNotification::watch(): Can't watch '%s': %s.", (const char*) path, strerror( errno ) );
return -1;
}
if ( !S_ISREG( s.st_mode ) )
{
qWarning( "OFileNotification::watch(): Can't watch '%s': %s.", (const char*) path, "not a regular file" );
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 );
iwr.mask = type;
_wd = ::ioctl( OFileNotification::_fd, INOTIFY_WATCH, &iwr );
if ( _wd < 0 )
{
qWarning( "OFileNotification::watch(): inotify can't watch '%s': %s.", (const char*) path, strerror( errno ) );
return -1;
}
notification_list.insert( _wd, this );
_path = path;
_multi = !sshot;
@@ -242,22 +242,37 @@ void OFileNotification::unregisterEventHandler()
ODirNotification::ODirNotification( QObject* parent, const char* name )
:QObject( parent, name )
{
qDebug( "ODirNotification::ODirNotification()" );
}
ODirNotification::~ODirNotification()
{
qDebug( "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
@@ -116,39 +116,39 @@ class OFileNotification : public QObject
/**
* This static function calls a slot when an event with @a type happens to file @a path.
*
* It is very convenient to use this function because you do not need to
* bother with a timerEvent or to create a local QTimer object.
*
* Example:
* <pre>
*
* #include <opie2/oapplication.h>
* #include <opie2/ofilenotify.h>
* using namespace Opie::Core;
*
* 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.
**/
static bool singleShot( const QString& path, QObject* receiver, const char* member, OFileNotificationType type = Modify );
/**
* Starts to watch for @a type changes to @a path. Set @a sshot to True if you want to be notified only once.
* Note that in that case it may be more convenient to use @ref OFileNotification::singleShot() then.
**/
int watch( const QString& path, bool sshot = false, OFileNotificationType type = Modify );
/**
* Stop watching for file events.
**/
void stop();
/**
* @returns the notification type as set by @ref start().
@@ -209,24 +209,30 @@ class OFileNotification : public QObject
*
**/
class ODirNotification : public QObject
{
Q_OBJECT
public:
ODirNotification( QObject* parent = 0, const char* name = 0 );
~ODirNotification();
/**
* Starts to watch for @a type changes to @a path. Recurse @a recurse levels down the filesystem tree,
* use 0 for no recursion and -1 for unlimited recursion.
* 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 );
};
}
}
#endif