Small extension to read the system version

(currently only functional for familiar)

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
@@ -34,12 +34,14 @@ public:
         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 ( );
@@ -96,12 +98,13 @@ ODevice::ODevice ( )
         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 ( )
 {
 }
 
@@ -137,12 +140,17 @@ QString ODevice::systemString ( )
 
 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" );
 
@@ -223,15 +231,21 @@ void ODeviceIPAQ::init ( )
                 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>
diff --git a/libopie/odevice.h b/libopie/odevice.h
index b40abe7..b54e576 100644
--- a/libopie/odevice.h
+++ b/libopie/odevice.h
@@ -75,12 +75,13 @@ public:
         QString vendorString ( );
         OVendor vendor ( );
 
         QString systemString ( );
         OSystem system ( );
 
+        QString systemVersionString ( );
 
 // input / output
 
         virtual void alarmSound ( );
         virtual void keySound ( );
         virtual void touchSound ( );