summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--libopie/odevice.cpp16
-rw-r--r--libopie/odevice.h1
2 files changed, 16 insertions, 1 deletions
diff --git a/libopie/odevice.cpp b/libopie/odevice.cpp
index 9931684..bc8014a 100644
--- a/libopie/odevice.cpp
+++ b/libopie/odevice.cpp
@@ -28,24 +28,26 @@
class ODeviceData {
public:
QString m_vendorstr;
OVendor m_vendor;
QString m_modelstr;
OModel m_model;
QString m_systemstr;
OSystem m_system;
+ QString m_sysverstr;
+
OLedState m_leds [4]; // just for convenience ...
};
class ODeviceIPAQ : public ODevice {
protected:
virtual void init ( );
public:
virtual void alarmSound ( );
virtual uint hasLeds ( ) const;
virtual OLedState led ( uint which ) const;
@@ -90,24 +92,25 @@ ODevice *ODevice::inst ( )
}
ODevice::ODevice ( )
{
d = new ODeviceData;
d-> m_modelstr = "Unknown";
d-> m_model = OMODEL_Unknown;
d-> m_vendorstr = "Unkown";
d-> m_vendor = OVENDOR_Unknown;
d-> m_systemstr = "Unkown";
d-> m_system = OSYSTEM_Unknown;
+ d-> m_sysverstr = "0.0";
}
void ODevice::init ( )
{
}
ODevice::~ODevice ( )
{
delete d;
}
QString ODevice::vendorString ( )
@@ -131,24 +134,29 @@ OModel ODevice::model ( )
}
QString ODevice::systemString ( )
{
return d-> m_systemstr;
}
OSystem ODevice::system ( )
{
return d-> m_system;
}
+QString ODevice::systemVersionString ( )
+{
+ return d-> m_sysverstr;
+}
+
void ODevice::alarmSound ( )
{
#ifndef QT_QWS_EBX
#ifndef QT_NO_SOUND
static Sound snd ( "alarm" );
if ( snd. isFinished ( ))
snd. play ( );
#endif
#endif
}
@@ -217,27 +225,33 @@ void ODeviceIPAQ::init ( )
else if ( d-> m_modelstr == "H3600" )
d-> m_model = OMODEL_iPAQ_H36xx;
else if ( d-> m_modelstr == "H3700" )
d-> m_model = OMODEL_iPAQ_H37xx;
else if ( d-> m_modelstr == "H3800" )
d-> m_model = OMODEL_iPAQ_H38xx;
else
d-> m_model = OMODEL_Unknown;
f. close ( );
}
- if ( QFile::exists ( "/etc/familiar-version" )) {
+ f. setName ( "/etc/familiar-version" );
+ if ( f. open ( IO_ReadOnly )) {
d-> m_systemstr = "Familiar";
d-> m_system = OSYSTEM_Familiar;
+
+ QTextStream ts ( &f );
+ d-> m_sysverstr = ts. readLine ( ). mid ( 10 );
+
+ f. close ( );
}
d-> m_leds [0] = OLED_Off;
}
#include <unistd.h>
#include <fcntl.h>
#include <sys/ioctl.h>
#include <linux/soundcard.h>
#include <qapplication.h>
#include <qpe/config.h>
diff --git a/libopie/odevice.h b/libopie/odevice.h
index b40abe7..b54e576 100644
--- a/libopie/odevice.h
+++ b/libopie/odevice.h
@@ -69,24 +69,25 @@ public:
// information
QString modelString ( );
OModel model ( );
QString vendorString ( );
OVendor vendor ( );
QString systemString ( );
OSystem system ( );
+ QString systemVersionString ( );
// input / output
virtual void alarmSound ( );
virtual void keySound ( );
virtual void touchSound ( );
virtual uint hasLeds ( ) const;
virtual OLedState led ( uint which ) const;
virtual bool setLed ( uint which, OLedState st );
virtual ~ODevice ( );