author | mickeyl <mickeyl> | 2004-03-01 14:24:18 (UTC) |
---|---|---|
committer | mickeyl <mickeyl> | 2004-03-01 14:24:18 (UTC) |
commit | 3cdec2fe5b3201a121cfbb2352162fe0cbae0a1d (patch) (side-by-side diff) | |
tree | 409756ff03a1ceabfa85d37e08ed12a14c72289a /core | |
parent | 60cc11a7c619bebec117e953f3b34bbf213d0fb2 (diff) | |
download | opie-3cdec2fe5b3201a121cfbb2352162fe0cbae0a1d.zip opie-3cdec2fe5b3201a121cfbb2352162fe0cbae0a1d.tar.gz opie-3cdec2fe5b3201a121cfbb2352162fe0cbae0a1d.tar.bz2 |
libopie1->libopie2
-rw-r--r-- | core/applets/cardmon/cardmon.cpp | 178 | ||||
-rw-r--r-- | core/applets/cardmon/cardmon.h | 2 | ||||
-rw-r--r-- | core/applets/cardmon/cardmon.pro | 6 | ||||
-rw-r--r-- | core/applets/cardmon/cardmonimpl.cpp | 42 | ||||
-rw-r--r-- | core/applets/cardmon/cardmonimpl.h | 18 |
5 files changed, 129 insertions, 117 deletions
diff --git a/core/applets/cardmon/cardmon.cpp b/core/applets/cardmon/cardmon.cpp index 4ed09b8..8ffaada 100644 --- a/core/applets/cardmon/cardmon.cpp +++ b/core/applets/cardmon/cardmon.cpp @@ -17,13 +17,14 @@ ***************************************************************************/ - #include "cardmon.h" -#include <qpe/resource.h> - -#include <opie/odevice.h> - +/* OPIE */ +#include <opie2/odevice.h> +#include <opie2/otaskbarapplet.h> #include <qpe/applnk.h> +#include <qpe/resource.h> +/* QT */ +#include <qapplication.h> #include <qcopchannel_qws.h> #include <qpainter.h> @@ -31,7 +32,8 @@ #include <qfile.h> #include <qtextstream.h> +#include <qsound.h> #include <qtimer.h> -#include <qapplication.h> +/* STD */ #include <stdio.h> #include <unistd.h> @@ -39,5 +41,4 @@ #include <string.h> #include <fcntl.h> -#include <qsound.h> #if defined(_OS_LINUX_) || defined(Q_OS_LINUX) @@ -79,5 +80,6 @@ CardMonitor::CardMonitor(QWidget * parent):QWidget(parent), CardMonitor::~CardMonitor() { - if (popupMenu) { + if ( popupMenu ) + { delete popupMenu; } @@ -86,12 +88,16 @@ CardMonitor::~CardMonitor() void CardMonitor::popUp(QString message, QString icon) { - if (!popupMenu) { + if ( !popupMenu ) + { popupMenu = new QPopupMenu(this); } popupMenu->clear(); - if (icon.isEmpty()) { + if ( icon.isEmpty() ) + { popupMenu->insertItem(message, 0); - } else { + } + else + { popupMenu->insertItem(QIconSet(Resource::loadPixmap(icon)), message, 0); @@ -117,10 +123,12 @@ void CardMonitor::mousePressEvent(QMouseEvent *) int err = 0; - if (cardInSd) { + if ( cardInSd ) + { menu->insertItem(QIconSet(Resource::loadPixmap("cardmon/ide")), tr("Eject SD/MMC card"), 0); } - if (cardInPcmcia0) { + if ( cardInPcmcia0 ) + { menu-> insertItem(QIconSet @@ -129,5 +137,6 @@ void CardMonitor::mousePressEvent(QMouseEvent *) } - if (cardInPcmcia1) { + if ( cardInPcmcia1 ) + { menu-> insertItem(QIconSet @@ -141,26 +150,37 @@ void CardMonitor::mousePressEvent(QMouseEvent *) p.y() - s.height()), 0); - if (opt == 1) { + if ( opt == 1 ) + { cmd = "/sbin/cardctl eject 0"; err = system((const char *) cmd); - if (err != 0) { + if ( err != 0 ) + { qDebug("Could not execute `/sbin/cardctl eject 0'! err=%d", err); popUp(tr("CF/PCMCIA card eject failed!")); } - } else if (opt == 0) { - if (ODevice::inst()->system() == System_Familiar) { + } + else if ( opt == 0 ) + { + if ( ODevice::inst() ->system() == System_Familiar ) + { cmd = "umount /dev/mmc/part1"; - } else { + } + else + { cmd = "umount /dev/mmcda1"; } err = system((const char *) cmd); - if (err != 0) { + if ( err != 0 ) + { popUp(tr("SD/MMC card eject failed!")); } - } else if (opt == 2) { + } + else if ( opt == 2 ) + { cmd = "/sbin/cardctl eject 1"; err = system((const char *) cmd); - if (err != 0) { + if ( err != 0 ) + { qDebug("Could not execute `/sbin/cardctl eject 1'! err=%d", err); @@ -174,8 +194,11 @@ void CardMonitor::mousePressEvent(QMouseEvent *) void CardMonitor::cardMessage(const QCString & msg, const QByteArray &) { - if (msg == "stabChanged()") { + if ( msg == "stabChanged()" ) + { // qDebug("Pcmcia: stabchanged"); getStatusPcmcia(); - } else if (msg == "mtabChanged()") { + } + else if ( msg == "mtabChanged()" ) + { // qDebug("CARDMONAPPLET: mtabchanged"); getStatusSd(); @@ -192,9 +215,14 @@ bool CardMonitor::getStatusPcmcia(int showPopUp) // one of these 3 files should exist - if (QFile::exists("/var/run/stab")) { + if ( QFile::exists( "/var/run/stab" ) ) + { fileName = "/var/run/stab"; - } else if (QFile::exists("/var/state/pcmcia/stab")) { + } + else if ( QFile::exists( "/var/state/pcmcia/stab" ) ) + { fileName = "/var/state/pcmcia/stab"; - } else { + } + else + { fileName = "/var/lib/pcmcia/stab"; } @@ -202,5 +230,6 @@ bool CardMonitor::getStatusPcmcia(int showPopUp) QFile f(fileName); - if (f.open(IO_ReadOnly)) { + if ( f.open( IO_ReadOnly ) ) + { QStringList list; QTextStream stream(&f); @@ -209,10 +238,15 @@ bool CardMonitor::getStatusPcmcia(int showPopUp) list = QStringList::split("\n", streamIn); for (QStringList::Iterator line = list.begin(); line != list.end(); - line++) { - if ((*line).startsWith("Socket 0:")) { - if ((*line).startsWith("Socket 0: empty") && cardInPcmcia0) { + line++ ) + { + if ( ( *line ).startsWith( "Socket 0:" ) ) + { + if ( ( *line ).startsWith( "Socket 0: empty" ) && cardInPcmcia0 ) + { cardInPcmcia0 = FALSE; - } else if (!(*line).startsWith("Socket 0: empty") - && !cardInPcmcia0) { + } + else if ( !( *line ).startsWith( "Socket 0: empty" ) + && !cardInPcmcia0 ) + { cardInPcmcia0Name = (*line).mid(((*line).find(':') + 1), @@ -226,9 +260,14 @@ bool CardMonitor::getStatusPcmcia(int showPopUp) (*line).mid(pos, (*line).find("\t", pos) - pos); } - } else if ((*line).startsWith("Socket 1:")) { - if ((*line).startsWith("Socket 1: empty") && cardInPcmcia1) { + } + else if ( ( *line ).startsWith( "Socket 1:" ) ) + { + if ( ( *line ).startsWith( "Socket 1: empty" ) && cardInPcmcia1 ) + { cardInPcmcia1 = FALSE; - } else if (!(*line).startsWith("Socket 1: empty") - && !cardInPcmcia1) { + } + else if ( !( *line ).startsWith( "Socket 1: empty" ) + && !cardInPcmcia1 ) + { cardInPcmcia1Name = (*line).mid(((*line).find(':') + 1), @@ -247,12 +286,17 @@ bool CardMonitor::getStatusPcmcia(int showPopUp) if (!showPopUp - && (cardWas0 != cardInPcmcia0 || cardWas1 != cardInPcmcia1)) { + && ( cardWas0 != cardInPcmcia0 || cardWas1 != cardInPcmcia1 ) ) + { QString text = QString::null; QString what = QString::null; - if (cardWas0 != cardInPcmcia0) { - if (cardInPcmcia0) { + if ( cardWas0 != cardInPcmcia0 ) + { + if ( cardInPcmcia0 ) + { text += tr("New card: "); what = "on"; - } else { + } + else + { text += tr("Ejected: "); what = "off"; @@ -262,9 +306,13 @@ bool CardMonitor::getStatusPcmcia(int showPopUp) } - if (cardWas1 != cardInPcmcia1) { - if (cardInPcmcia1) { + if ( cardWas1 != cardInPcmcia1 ) + { + if ( cardInPcmcia1 ) + { text += tr("New card: "); what = "on"; - } else { + } + else + { text += tr("Ejected: "); what = "off"; @@ -276,6 +324,9 @@ bool CardMonitor::getStatusPcmcia(int showPopUp) QSound::play(Resource::findSound("cardmon/card" + what)); #endif + } - } else { + } + else + { // no file found qDebug("no file found"); @@ -300,10 +351,13 @@ bool CardMonitor::getStatusSd(int showPopUp) FILE *mntfp = setmntent("/etc/mtab", "r"); - if (mntfp) { - while ((me = getmntent(mntfp)) != 0) { + if ( mntfp ) + { + while ( ( me = getmntent( mntfp ) ) != 0 ) + { QString fs = me->mnt_fsname; //qDebug( fs ); if (fs.left(14) == "/dev/mmc/part1" || fs.left(7) == "/dev/sd" - || fs.left(9) == "/dev/mmcd") { + || fs.left( 9 ) == "/dev/mmcd" ) + { cardInSd = TRUE; show(); @@ -316,11 +370,15 @@ bool CardMonitor::getStatusSd(int showPopUp) } - if (!showPopUp && cardWas != cardInSd) { + if ( !showPopUp && cardWas != cardInSd ) + { QString text = QString::null; QString what = QString::null; - if (cardInSd) { + if ( cardInSd ) + { text += "New card: SD/MMC"; what = "on"; - } else { + } + else + { text += "Ejected: SD/MMC"; what = "off"; @@ -344,10 +402,24 @@ void CardMonitor::paintEvent(QPaintEvent *) QPainter p(this); - if ( cardInPcmcia0 || cardInPcmcia1 || cardInSd ) { + if ( cardInPcmcia0 || cardInPcmcia1 || cardInSd ) + { p.drawPixmap(0, 0, pm ); show(); - } else { + } + else + { //p.eraseRect(rect()); hide(); } } + +int CardMonitor::position() +{ + return 7; +} + +Q_EXPORT_INTERFACE() +{ + Q_CREATE_INSTANCE( OTaskbarAppletWrapper<CardMonitor> ); +} + diff --git a/core/applets/cardmon/cardmon.h b/core/applets/cardmon/cardmon.h index 4f00920..37de366 100644 --- a/core/applets/cardmon/cardmon.h +++ b/core/applets/cardmon/cardmon.h @@ -31,5 +31,5 @@ public: bool getStatusPcmcia( int showPopUp = FALSE ); bool getStatusSd( int showPopUp = FALSE ); - + static int position(); private slots: void cardMessage( const QCString &msg, const QByteArray & ); diff --git a/core/applets/cardmon/cardmon.pro b/core/applets/cardmon/cardmon.pro index 1e8f86f..7c0c739 100644 --- a/core/applets/cardmon/cardmon.pro +++ b/core/applets/cardmon/cardmon.pro @@ -1,11 +1,11 @@ TEMPLATE = lib CONFIG += qt plugin warn_on release -HEADERS = cardmon.h cardmonimpl.h -SOURCES = cardmon.cpp cardmonimpl.cpp +HEADERS = cardmon.h +SOURCES = cardmon.cpp TARGET = cardmonapplet DESTDIR = $(OPIEDIR)/plugins/applets INCLUDEPATH += $(OPIEDIR)/include DEPENDPATH += $(OPIEDIR)/include ../launcher -LIBS += -lqpe -lopie +LIBS += -lqpe -lopiecore2 VERSION = 1.0.0 diff --git a/core/applets/cardmon/cardmonimpl.cpp b/core/applets/cardmon/cardmonimpl.cpp deleted file mode 100644 index 7b144d4..0000000 --- a/core/applets/cardmon/cardmonimpl.cpp +++ b/dev/null @@ -1,42 +0,0 @@ -#include "cardmon.h" -#include "cardmonimpl.h" - - -CardMonitorImpl::CardMonitorImpl() - : cardMonitor(0) { -} - -CardMonitorImpl::~CardMonitorImpl() { - delete cardMonitor; -} - -QWidget *CardMonitorImpl::applet( QWidget *parent ) { - if ( !cardMonitor ) { - cardMonitor = new CardMonitor( parent ); - } - return cardMonitor; -} - -int CardMonitorImpl::position() const { - return 7; -} - -QRESULT CardMonitorImpl::queryInterface( const QUuid &uuid, QUnknownInterface **iface ) { - *iface = 0; - if ( uuid == IID_QUnknown ) { - *iface = this; - } else if ( uuid == IID_TaskbarApplet ) { - *iface = this; - } else { - return QS_FALSE; - } - - if ( *iface ) { - (*iface)->addRef(); - } - return QS_OK; -} - -Q_EXPORT_INTERFACE() { - Q_CREATE_INSTANCE( CardMonitorImpl ) -} diff --git a/core/applets/cardmon/cardmonimpl.h b/core/applets/cardmon/cardmonimpl.h deleted file mode 100644 index 26b7fe5..0000000 --- a/core/applets/cardmon/cardmonimpl.h +++ b/dev/null @@ -1,18 +0,0 @@ -#include <qpe/taskbarappletinterface.h> - -class CardMonitor; - -class CardMonitorImpl : public TaskbarAppletInterface { -public: - CardMonitorImpl(); - virtual ~CardMonitorImpl(); - - QRESULT queryInterface( const QUuid&, QUnknownInterface** ); - Q_REFCOUNT - - virtual QWidget *applet( QWidget *parent ); - virtual int position() const; - -private: - CardMonitor *cardMonitor; -}; |