Hello community,
here is the log from the commit of package umtsmon
checked in at Fri Feb 15 01:42:20 CET 2008.
--------
--- umtsmon/umtsmon.changes 2008-02-01 11:55:47.000000000 +0100
+++ /mounts/work_src_done/STABLE/umtsmon/umtsmon.changes 2008-02-12 11:54:55.000000000 +0100
@@ -1,0 +2,6 @@
+Tue Feb 12 11:45:31 CET 2008 - seife@suse.de
+
+- update to 0.7.91 version - which is beta1 of the upcoming new
+ release
+
+-------------------------------------------------------------------
Old:
----
umtsmon-0.7.90.20080201.tar.bz2
New:
----
umtsmon-0.7.91.20080212.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ umtsmon.spec ++++++
--- /var/tmp/diff_new_pack.z30452/_old 2008-02-15 01:42:13.000000000 +0100
+++ /var/tmp/diff_new_pack.z30452/_new 2008-02-15 01:42:13.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package umtsmon (Version 0.7.90.20080201)
+# spec file for package umtsmon (Version 0.7.91.20080212)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -9,9 +9,10 @@
#
+
Name: umtsmon
BuildRequires: libusb-devel qt3-devel
-Version: 0.7.90.20080201
+Version: 0.7.91.20080212
Release: 1
Summary: Control/monitor your UMTS card
License: GPL v2 or later
@@ -57,6 +58,9 @@
rm -rf %{buildroot}
%changelog
+* Tue Feb 12 2008 seife@suse.de
+- update to 0.7.91 version - which is beta1 of the upcoming new
+ release
* Fri Feb 01 2008 seife@suse.de
- update to current CVS - only message string fixes
* Tue Jan 29 2008 seife@suse.de
++++++ umtsmon-0.7.90.20080201.tar.bz2 -> umtsmon-0.7.91.20080212.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/umtsmon/AUTHORS new/umtsmon/AUTHORS
--- old/umtsmon/AUTHORS 2008-02-01 11:53:26.000000000 +0100
+++ new/umtsmon/AUTHORS 2008-02-12 11:32:54.000000000 +0100
@@ -27,14 +27,10 @@
* Wouter Moors
3)
-The images ok.png and no.png are taken from the kdelibs3 RPM from SuSE9.3
-They are from the CrystalSVG icon set. According to the RPM, all files are
+The image ok.png is taken from the kdelibs3 RPM from SuSE9.3
+It is from the CrystalSVG icon set. According to the RPM, all files are
licensed through the GPL or LGPL.
-The image help.png is taken from the Tango icon set.
-It's released under the Creative Commons Attribution Share-Alike license.
-For further informations visit http://tango.freedesktop.org
-
4)
The UMTSmon logo was drawn by 'Tazz_tux'.
@@ -51,7 +47,7 @@
7)
Icons in the images/{16|22|SVG} directories come from the Tango icon
-set, available at: http://tango.freedesktop.org/Tango_Icon_Gallery
+set, available at: http://tango.freedesktop.org/Tango_Icon_Library
These icons are licensed under the "Creative Commons Attribution Share-Alike license"
We think that we comply with the requirements of the license, even though we ship
the icons inside the umtsmon binary.
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/umtsmon/i18n/umtsmon_nl.ts new/umtsmon/i18n/umtsmon_nl.ts
--- old/umtsmon/i18n/umtsmon_nl.ts 2008-02-01 11:53:26.000000000 +0100
+++ new/umtsmon/i18n/umtsmon_nl.ts 2008-02-12 11:32:54.000000000 +0100
@@ -69,262 +69,6 @@
<source>unknown (PH-CORP PUK) - please contact author</source>
<translation type="unfinished"></translation>
</message>
- <message>
- <source>phone failure</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <source>no connection to phone</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <source>phone adaptor link reserved</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <source>operation not allowed</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <source>operation not supported</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <source>PH SIM PIN required</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <source>PH-FSIM PIN required</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <source>PH-FSIM PUK required</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <source>SIM not inserted</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <source>SIM PIN required</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <source>SIM PUK required</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <source>SIM failure</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <source>SIM busy</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <source>SIM wrong</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <source>incorrect password</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <source>SIM PIN2 required</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <source>SIM PUK2 required</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <source>memory full</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <source>invalid index</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <source>not found</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <source>memory failure</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <source>text string too long</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <source>invalid characters in text string</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <source>dial string too long</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <source>invalid characters in dial string</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <source>no network service</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <source>network timeout</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <source>network not allowed - emergency calls only</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <source>network personalization PIN required</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <source>network personalization PUK required</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <source>network subset personalization PIN required</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <source>network subset personalization PUK required</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <source>service provider personalization PIN required</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <source>service provider personalization PUK required</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <source>corporate personalization PIN required</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <source>corporate personalization PUK required</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <source>hidden key required (NOTE: This key is required when accessing hidden phonebook entries.)</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <source>EAP method not supported</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <source>Incorrect parameters</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <source>unknown</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <source>Illegal MS</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <source>Illegal ME</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <source>GPRS services not allowed</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <source>PLMN not allowed</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <source>Location area not allowed</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <source>Roaming not allowed in this location area</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <source>service option not supported</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <source>requested service option not subscribed</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <source>service option temporarily out of order</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <source>PDP authentication failure</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <source>invalid mobile class</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <source>unspecified GPRS error</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <source>VBS/VGCS not supported by the network</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <source>No service subscription on SIM</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <source>No subscription for group ID</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <source>Group Id not activated on SIM</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <source>No matching notification</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <source>VBS/VGCS call already present</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <source>Congestion</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <source>Network failure</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <source>Uplink busy</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <source>No access rights for SIM file</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <source>No subscription for priority</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <source>operation not applicable or not possible</source>
- <translation type="unfinished"></translation>
- </message>
</context>
<context>
<name>AboutDialogUmtsmon</name>
@@ -341,7 +85,7 @@
The COPYING-tab explains the rights and constraints that are granted to you due to this software license.
<br>
Refer to the AUTHORS-tab to find out what parts of this application were derived/taken from other sources.</source>
- <translation><b><font size="+2">UMTSmon</font> - Controleer en bestuur uw Mobiele 3G kaart</b><br><br>
+ <translation type="obsolete"><b><font size="+2">UMTSmon</font> - Controleer en bestuur uw Mobiele 3G kaart</b><br><br>
(C) 2006,2007 by Klaas van Gend & Christofer Wesseling<br><br>
<b>Dit programma wordt gelicenseerd onder de GPL v2 licentie.</b><br>
@@ -362,75 +106,13 @@
<translation></translation>
</message>
<message>
- <source>
-AUTHORS OF UMTSMON
-==================
-
-umtsmon was written by Klaas van Gend and Christofer Wesseling in 2006 and 2007
-It is licensed under the GPLv2 License, see the file COPYING
-
-However, Klaas is not the only copyright holder as some parts were derived
-from or based on other sources. Also: several people gave advise on some
-implementation topics. This file tries to list those contributions:
-
-
-
-1)
-the SerialPort class was based on COMGT 0.3 by Paul Hardwick
-COMGT itself was based a package called dcon by Daniel Chouinard
-See http://www.pharscape.org/content/view/46/70/
-COMGT v0.3 was licensed under the GPLv2 or later.
-
-Paul Hardwick also contributed to the DetectCard and Device classes.
-
-
-2)
-Debugging some issues in the SerialPort class was done with suggestions made by:
-* Roel van den Broeck
-* Martijn Wijms
-* Tom Geelen
-* Wouter Moors
-
-3)
-The images ok.png and no.png are taken from the kdelibs3 RPM from SuSE9.3
-They are from the CrystalSVG icon set. According to the RPM, all files are
-licensed through the GPL or LGPL.
-
-The image help.png is taken from the Tango icon set.
-It's released under the Creative Commons Attribution Share-Alike license.
-For further informations visit http://tango.freedesktop.org
-
-4)
-The UMTSmon logo was drawn by 'Tazz_tux'.
-
-5)
-Autodetection for the Nozomi 2.2+ drivers and multiple pcmcia socket enumeration
-was contributed by Stefan Seyfried [seife@suse.de]
-Stefan also worked on several other issues related to card detection.
-
-6)
-The 'Runner' code to run other programs from umtsmon, specifically the piece to communicate
-through pipes with the program run, was inspired by code from the following web page:
-http://www.cryptnet.net/fdp/gtk/exec.html
-the code on that page is GPL and copyrighted by V. Alex Brennen [vab@metanet.org] .
-
-7)
-Icons in the images/{16|22|SVG} directories come from the Tango icon
-set, available at: http://tango.freedesktop.org/Tango_Icon_Gallery
-These icons are licensed under the "Creative Commons Attribution Share-Alike license"
-We think that we comply with the requirements of the license, even though we ship
-the icons inside the umtsmon binary.
-
-8)
-Several compile-related and user interface issues were fixed by Gerald Pfeifer.
-
-9)
-fixup old/original Vodafone 3G detection, patch by dj9pz (Arnd Gronenberg)
-
+ <source><b><font size="+2">UMTSmon</font> - Monitoring your UMTS PCMCIA card</b><br><br>
+(C) 2006,2007,2008 by Klaas van Gend and others.<br><br>
-If you have found any ommissions, please contact the author through the Sourceforge website:
-http://www.sourceforge.net/projects/umtsmon
- </source>
+<b>This application is licensed by the GPL v2 license.</b><br>
+The COPYING tab explains the rights and constraints that are granted to you due to this software license.
+<br>
+Refer to the AUTHORS tab to find out what parts of this application were derived/taken from other sources.</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -717,6 +399,88 @@
</source>
<translation type="unfinished"></translation>
</message>
+ <message encoding="UTF-8">
+ <source>
+AUTHORS OF UMTSMON
+==================
+
+umtsmon was written by Klaas van Gend and Christofer Wesseling in 2006 and 2007
+It is licensed under the GPLv2 License, see the file COPYING
+
+However, Klaas is not the only copyright holder as some parts were derived
+from or based on other sources. Also: several people gave advise on some
+implementation topics. This file tries to list those contributions:
+
+
+
+1)
+the SerialPort class was based on COMGT 0.3 by Paul Hardwick
+COMGT itself was based a package called dcon by Daniel Chouinard
+See http://www.pharscape.org/content/view/46/70/
+COMGT v0.3 was licensed under the GPLv2 or later.
+
+Paul Hardwick also contributed to the DetectCard and Device classes.
+
+
+2)
+Debugging some issues in the SerialPort class was done with suggestions made by:
+* Roel van den Broeck
+* Martijn Wijms
+* Tom Geelen
+* Wouter Moors
+
+3)
+The image ok.png is taken from the kdelibs3 RPM from SuSE9.3
+It is from the CrystalSVG icon set. According to the RPM, all files are
+licensed through the GPL or LGPL.
+
+4)
+The UMTSmon logo was drawn by 'Tazz_tux'.
+
+5)
+Autodetection for the Nozomi 2.2+ drivers and multiple pcmcia socket enumeration
+was contributed by Stefan Seyfried [seife@suse.de]
+Stefan also worked on several other issues related to card detection.
+
+6)
+The 'Runner' code to run other programs from umtsmon, specifically the piece to communicate
+through pipes with the program run, was inspired by code from the following web page:
+http://www.cryptnet.net/fdp/gtk/exec.html
+the code on that page is GPL and copyrighted by V. Alex Brennen [vab@metanet.org] .
+
+7)
+Icons in the images/{16|22|SVG} directories come from the Tango icon
+set, available at: http://tango.freedesktop.org/Tango_Icon_Library
+These icons are licensed under the "Creative Commons Attribution Share-Alike license"
+We think that we comply with the requirements of the license, even though we ship
+the icons inside the umtsmon binary.
+
+8)
+Several compile-related and user interface issues were fixed by Gerald Pfeifer.
+
+9)
+fixup old/original Vodafone 3G detection, patch by dj9pz (Arnd Gronenberg)
+
+10)
+Huawei E220 fixes by Norbert Preining (norbusan)
+
+11)
+Lubomir Schmidt did translation into German and lots of testing.
+
+12)
+additional translation into German by Philipp Kießler.
+
+13)
+translation work into Portugese (pt_PT) by Pedro Algarvio.
+
+14)
+some fixes by Carsten Clasohm.
+
+If you have found any ommissions, please contact the author through the Sourceforge website:
+http://www.sourceforge.net/projects/umtsmon
+ </source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>AutoDetectionForm</name>
@@ -864,7 +628,9 @@
<source>PIN needed after PUK?
That's unexpected!
Please mail info to: umtsmon-develop@sourceforge.net</source>
- <translation type="unfinished"></translation>
+ <translation>PIN nodig na PUK?
+Dat is onverwacht!
+Stuur svp hoe dit is gebeurd naar umtsmon-develop@sourceforge.net</translation>
</message>
</context>
<context>
@@ -986,16 +752,28 @@
</message>
<message>
<source>Upload:</source>
- <translation>Upload:</translation>
+ <translation type="obsolete">Upload:</translation>
</message>
<message>
<source>Download:</source>
- <translation>Download:</translation>
+ <translation type="obsolete">Download:</translation>
</message>
<message>
<source>Operator:</source>
<translation>Aanbieder:</translation>
</message>
+ <message>
+ <source>Up:</source>
+ <translation>Up:</translation>
+ </message>
+ <message>
+ <source>Down:</source>
+ <translation>Down:</translation>
+ </message>
+ <message>
+ <source>Total traffic:</source>
+ <translation>Totaal data:</translation>
+ </message>
</context>
<context>
<name>ManageProfiles</name>
@@ -1068,11 +846,11 @@
<name>NewProfileDialog</name>
<message>
<source>create new profile</source>
- <translation>Maak nieuw profiel aan</translation>
+ <translation type="obsolete">Maak nieuw profiel aan</translation>
</message>
<message>
<source>profilename</source>
- <translation>naam van profiel</translation>
+ <translation type="obsolete">naam van profiel</translation>
</message>
<message>
<source>Create</source>
@@ -1082,6 +860,14 @@
<source>Cancel</source>
<translation>Annuleer</translation>
</message>
+ <message>
+ <source>New Profile</source>
+ <translation>Nieuw Profiel</translation>
+ </message>
+ <message>
+ <source>Profile name</source>
+ <translation>Naam profiel</translation>
+ </message>
</context>
<context>
<name>PPPErrorLogsDialog</name>
@@ -1234,7 +1020,11 @@
</message>
<message>
<source>Setting your radio technology preference didn't succeed</source>
- <translation>Het omschakelen van de radio technologie voorkeur is niet gelukt</translation>
+ <translation type="obsolete">Het omschakelen van de radio technologie voorkeur is niet gelukt</translation>
+ </message>
+ <message>
+ <source>Failed to set your radio technology preference.</source>
+ <translation>Het zetten van uw radio technologie is niet gelukt.</translation>
</message>
</context>
<context>
@@ -1373,7 +1163,7 @@
</message>
<message>
<source>power down card</source>
- <translation>Schakel kaart uit</translation>
+ <translation type="obsolete">Schakel kaart uit</translation>
</message>
<message>
<source>Reset card</source>
@@ -1405,7 +1195,7 @@
</message>
<message>
<source>F2</source>
- <translation type="unfinished"></translation>
+ <translation>F2</translation>
</message>
<message>
<source>Autodetection log</source>
@@ -1418,7 +1208,7 @@
</message>
<message>
<source>About APPNAME</source>
- <translation>Info APPNAME</translation>
+ <translation type="obsolete">Info APPNAME</translation>
</message>
<message>
<source>F3</source>
@@ -1442,7 +1232,7 @@
</message>
<message>
<source>Exit APPNAME</source>
- <translation>Afsluiten APPNAME</translation>
+ <translation type="obsolete">Afsluiten APPNAME</translation>
</message>
<message>
<source>Ctrl+Q</source>
@@ -1511,7 +1301,7 @@
<message>
<source>Your card is not registered on a network yet
SMS functions unavailable</source>
- <translation>Uw kaart is nog niet aangemeld op het netwerk
+ <translation type="obsolete">Uw kaart is nog niet aangemeld op het netwerk
SMS functionaliteit nog niet beschikbaar</translation>
</message>
<message>
@@ -1524,7 +1314,7 @@
</message>
<message>
<source>You are not connected to a network yet</source>
- <translation>Nog niet geregistreerd op een mobiel netwerk</translation>
+ <translation type="obsolete">Nog niet geregistreerd op een mobiel netwerk</translation>
</message>
<message>
<source>Setting up PPP Connection</source>
@@ -1533,18 +1323,18 @@
<message>
<source>starting PPP was not successful
please run from commandline with -v5 and check output</source>
- <translation>Het starten van een PPP verbinding faalde
+ <translation type="obsolete">Het starten van een PPP verbinding faalde
voer opnieuw uit vanaf de command line met de -v5 optie en controleer de output</translation>
</message>
<message>
<source>PPP active
cannot run this in parallel</source>
- <translation>PPP verbinding actief
+ <translation type="obsolete">PPP verbinding actief
dit kan niet parallel worden uitgevoerd</translation>
</message>
<message>
<source>&SMS</source>
- <translation type="unfinished"></translation>
+ <translation>&SMS</translation>
</message>
<message>
<source>Disabling PIN protection failed.
@@ -1560,7 +1350,7 @@
</message>
<message>
<source>PIN protection was successfull.</source>
- <translation type="unfinished"></translation>
+ <translation>aanzetten PIN code is gelukt.</translation>
</message>
<message>
<source>Changing PIN failed.
@@ -1580,12 +1370,99 @@
</message>
<message>
<source>umtsmon mainwindow</source>
- <translation type="unfinished"></translation>
+ <translation>umtsmon hoofdvenster</translation>
</message>
<message>
<source>n/a</source>
<translation type="obsolete">n.v.t</translation>
</message>
+ <message>
+ <source>&Connect</source>
+ <translation>&Verbinden</translation>
+ </message>
+ <message>
+ <source>&Disconnect</source>
+ <translation>Ver&breken</translation>
+ </message>
+ <message>
+ <source>Power down card</source>
+ <translation>Kaart uitzetten</translation>
+ </message>
+ <message>
+ <source>P&ower down card</source>
+ <translation>&Kaart uitzetten</translation>
+ </message>
+ <message>
+ <source>R&eset card</source>
+ <translation>K&aart resetten</translation>
+ </message>
+ <message>
+ <source>&New SMS</source>
+ <translation>&Nieuwe SMS</translation>
+ </message>
+ <message>
+ <source>&Enable PIN</source>
+ <translation>PIN bescherming &aan</translation>
+ </message>
+ <message>
+ <source>&Disable PIN</source>
+ <translation>PIN bescherming &uit</translation>
+ </message>
+ <message>
+ <source>&Change PIN</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>System &Info</source>
+ <translation>Systeem &Informatie</translation>
+ </message>
+ <message>
+ <source>Autodetection &log</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>&About APPNAME</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Manage &Profiles...</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Quit APPNAME</source>
+ <translation>Afsluiten APPNAME</translation>
+ </message>
+ <message>
+ <source>&Quit APPNAME</source>
+ <translation>&Afsluiten APPNAME</translation>
+ </message>
+ <message>
+ <source>&Select network operator...</source>
+ <translation>&Selecteer mobiele aanbieder...</translation>
+ </message>
+ <message>
+ <source>&Radio Preferences...</source>
+ <translation>&Radio Voorkeuren...</translation>
+ </message>
+ <message>
+ <source>You are not connected to a network yet.
+SMS functions are unavailable.</source>
+ <translation>U bent nog niet met een netwerk verbonden.
+SMS functionaliteit is nog niet beschikbaar.</translation>
+ </message>
+ <message>
+ <source>You are not connected to a network yet.</source>
+ <translation>U bent nog niet met een netwerk verbonden.</translation>
+ </message>
+ <message>
+ <source>Failed to start PPP.
+Please re-run umtsmon from the commandline with -v5 and check the output.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>PPP is active, cannot run this in parallel.</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>networkoperator</name>
@@ -1595,7 +1472,7 @@
</message>
<message>
<source>find networks</source>
- <translation>zoek mobiele netwerken</translation>
+ <translation type="obsolete">zoek mobiele netwerken</translation>
</message>
<message>
<source>when disconnected, clicking this button will search for available networks</source>
@@ -1603,11 +1480,11 @@
</message>
<message>
<source>select</source>
- <translation>selecteren</translation>
+ <translation type="obsolete">selecteren</translation>
</message>
<message>
<source>cancel</source>
- <translation>Annuleren</translation>
+ <translation type="obsolete">Annuleren</translation>
</message>
<message>
<source>Searching for mobile networks...</source>
@@ -1616,17 +1493,39 @@
<message>
<source>No network operators were found
You might want to try again</source>
- <translation>Geen mobiele netwerken gevonden.
+ <translation type="obsolete">Geen mobiele netwerken gevonden.
U kunt het opnieuw proberen</translation>
</message>
<message>
<source>select your operator from the above list</source>
- <translation>Kies uw mobiele netwerk uit bovenstaande lijst</translation>
+ <translation type="obsolete">Kies uw mobiele netwerk uit bovenstaande lijst</translation>
</message>
<message>
<source>Connecting to mobile network...</source>
<translation>Bezig met verbinden met mobiel netwerk...</translation>
</message>
+ <message>
+ <source>Find networks</source>
+ <translation>Zoek netwerken</translation>
+ </message>
+ <message>
+ <source>Select</source>
+ <translation>Selecteren</translation>
+ </message>
+ <message>
+ <source>Cancel</source>
+ <translation>Annuleer</translation>
+ </message>
+ <message>
+ <source>No network operators were found.
+You might want to try again.</source>
+ <translation>Geen mobiele netwerken gevonden.
+U kunt het opnieuw proberen.</translation>
+ </message>
+ <message>
+ <source>Select your operator from the above list.</source>
+ <translation>Kies uw mobiele netwerk uit bovenstaande lijst.</translation>
+ </message>
</context>
<context>
<name>profiledialog</name>
@@ -1640,7 +1539,7 @@
</message>
<message>
<source>&Save</source>
- <translation type="unfinished">&Opslaan</translation>
+ <translation>&Opslaan</translation>
</message>
<message>
<source>Alt+S</source>
@@ -1767,6 +1666,59 @@
<source>Profile Name:</source>
<translation>Naam van Profiel:</translation>
</message>
+ <message>
+ <source>no CCP</source>
+ <translation>geen CCP</translation>
+ </message>
+ <message>
+ <source>Do not negotiate the Compression Control Protocol. Usually disabled - only needed for buggy operators.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>monthly data limits</source>
+ <translation>maandelijkse data limieten</translation>
+ </message>
+ <message>
+ <source>warn when threshold is reached:</source>
+ <translation>waarschuw als drempel bereikt:</translation>
+ </message>
+ <message>
+ <source>min 50%, max 100%</source>
+ <translation>min 50%, max 100%</translation>
+ </message>
+ <message>
+ <source>%</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>home network:</source>
+ <translation>eigen aanbieder:</translation>
+ </message>
+ <message>
+ <source>d9999; </source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Please enter the megabytes per month that is part of your subscription. This field is for when you are outside your home network - also called roaming.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>roaming:</source>
+ <translation>roaming:</translation>
+ </message>
+ <message>
+ <source>dddd9; </source>
+ <comment>numbers only</comment>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Please enter the megabytes per month that is part of your subscription. This field is for your home network.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>MiB/month</source>
+ <translation>MiB/maand</translation>
+ </message>
</context>
<context>
<name>smsdialog</name>
@@ -1832,11 +1784,19 @@
</message>
<message>
<source>SMS sent correctly - according to the card...</source>
- <translation>SMS verstuurd - volgens het apparaat...</translation>
+ <translation type="obsolete">SMS verstuurd - volgens het apparaat...</translation>
</message>
<message>
<source>SMS was NOT send!</source>
- <translation>De SMS was NIET verstuurd!</translation>
+ <translation type="obsolete">De SMS was NIET verstuurd!</translation>
+ </message>
+ <message>
+ <source>SMS sent (according to the device).</source>
+ <translation>SMS verstuurd - (volgens het apparaat).</translation>
+ </message>
+ <message>
+ <source>SMS was not sent!</source>
+ <translation>De SMS is niet verstuurd!</translation>
</message>
</context>
</TS>
Files old/umtsmon/images/16/process-stop-16x16.png and new/umtsmon/images/16/process-stop-16x16.png differ
Files old/umtsmon/images/16/user-trash-full-16x16.png and new/umtsmon/images/16/user-trash-full-16x16.png differ
Files old/umtsmon/images/no.png and new/umtsmon/images/no.png differ
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/umtsmon/main.cpp new/umtsmon/main.cpp
--- old/umtsmon/main.cpp 2008-02-01 11:53:26.000000000 +0100
+++ new/umtsmon/main.cpp 2008-02-12 11:32:54.000000000 +0100
@@ -78,7 +78,7 @@
// allowed formats are: nl, nl_NL or nl_nl.
// No numbers, no dots, etc.
QRegExp myRegExp_nl("^[a-z]{2}$");
- QRegExp myRegExp_nl_nl("^[a-z]{2}_[a-zA-Z0-9.-]{0,15}$");
+ QRegExp myRegExp_nl_nl("^[a-z]{2}_[a-zA-Z0-9.\\-@]{0,15}$");
if (myRegExp_nl.search(aLocale) == 0)
return true;
if (myRegExp_nl_nl.search(aLocale) == 0)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/umtsmon/mainwindow.ui new/umtsmon/mainwindow.ui
--- old/umtsmon/mainwindow.ui 2008-02-01 11:53:26.000000000 +0100
+++ new/umtsmon/mainwindow.ui 2008-02-12 11:32:54.000000000 +0100
@@ -304,7 +304,7 @@
<string>New SMS</string>
</property>
<property name="menuText">
- <string>&New SMS</string>
+ <string>&New SMS...</string>
</property>
<property name="accel">
<string>Ctrl+S</string>
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/umtsmon/mainwindow.ui.h new/umtsmon/mainwindow.ui.h
--- old/umtsmon/mainwindow.ui.h 2008-02-01 11:53:27.000000000 +0100
+++ new/umtsmon/mainwindow.ui.h 2008-02-12 11:32:55.000000000 +0100
@@ -303,6 +303,10 @@
"traffic to the new month. Please close the connection"
"and reconnect at your earliest convenience.");
}
+ catch (OverThresholdException)
+ {
+ Popup::Warning("You are over your data limit treshold.");
+ }
// and update title bar or fields with data
if (isMinimized())
@@ -322,7 +326,7 @@
theLCDDisplay->setUpload(mySent);
theLCDDisplay->setDownload(myRecvd);
- theLCDDisplay->setTotalTraffic(myTotal);
+ theLCDDisplay->setTotalTraffic(myTotal, theMonthlyTraffic.getThresholdStatus());
}
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/umtsmon/README new/umtsmon/README
--- old/umtsmon/README 2008-02-01 11:53:26.000000000 +0100
+++ new/umtsmon/README 2008-02-12 11:32:54.000000000 +0100
@@ -6,23 +6,18 @@
At this moment, umtsmon is still work in progress.
-
-The 0.7 release comes with a new autodetection system for the cards. Several
-new cards are detected and many cards are detected more reliably. The code is
-also much better maintainable.
-Once a card is detected, it will be remembered in the config file.
-
-umtsmon 0.7 also comes with an improved UI and many small fixes that improve
-the usability of the application - including logging output of a failed PPP
-connection, notification that a profile needs saving and a new radio
-preferences dialog.
-
-Note that in contrast to umtsmon 0.4, umtsmon itself no longer requires
-suid privileges.
-
-Starting with the 0.6 release, single port serial cards can be used as well.
-There are some restrictions though - during a PPP session, signal quality
-and radio type won't be updated any longer.
+*** You are looking at a beta release ***
+Please report any issues you find using the bug tracker for
+the umtsmon project at sourceforge.
+
+umtsmon 0.7.91 has a lot of new features:
+ * much improved profile support
+ * internationalization support (but translations still need
+ work before the 0.8 release)
+ * traffic statistics - per profile, for home and roaming, including warnings
+ * many small UI fixes
+ * improved support for several devices
+ * improved autodetection
There is a known bug that umtsmon cannot perform autodetection correctly
on 2.6.20 Linux kernels.
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/umtsmon/src/controller/AutoDetect.cpp new/umtsmon/src/controller/AutoDetect.cpp
--- old/umtsmon/src/controller/AutoDetect.cpp 2008-02-01 11:53:26.000000000 +0100
+++ new/umtsmon/src/controller/AutoDetect.cpp 2008-02-12 11:32:54.000000000 +0100
@@ -214,10 +214,13 @@
//////////////////// OPTION
{ 0x1955, 0x1000, "Option Icon or similar", Device::OPTION_3PORT, },
+ { 0x05c6, 0x1000, "Option Icon in USB Mass Storage Mode - please switch", Device::UNKNOWN, },
// keep the specialised one (0x5000 for V3G) first, the catch-all (0 for generic Options) last
{ 0x0af0, 0x5000, "orig Vodafone 3G", Device::OPTION_VODAFONE_3G, },
// the following is info from: http://www.teltonika.lt/uploads/docs/3g_linux.pdf
{ 0x0af0, 0x6501, "Teltonika ModemUSB", Device::OPTION_3PORT, },
+ { 0x0af0, 0x6600, "Option Icon as modem", Device::OPTION_3PORT, },
+ { 0x0af0, 0x6901, "Option Icon as modem", Device::OPTION_3PORT, },
{ 0x0af0, 0, "Option GT family", Device::OPTION_3PORT, },
//////////////////// 4G SYSTEMS
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/umtsmon/src/controller/TheDeviceManagerSingleton.cpp new/umtsmon/src/controller/TheDeviceManagerSingleton.cpp
--- old/umtsmon/src/controller/TheDeviceManagerSingleton.cpp 2008-02-01 11:53:26.000000000 +0100
+++ new/umtsmon/src/controller/TheDeviceManagerSingleton.cpp 2008-02-12 11:32:54.000000000 +0100
@@ -176,33 +176,57 @@
void TheDeviceManagerSingleton::readFromConfigFile(void)
{
DEBUG3("TheDeviceManagerSingleton::readFromConfigFile()\n");
- theNonAutoDetectPtr->theSuggestedPPPPortName =
- TheSettingsSingleton::getQSRef().readEntry(thePPPKeyStr, "");
- DEBUG4("read PPP port from config: '%s'\n", theNonAutoDetectPtr->theSuggestedPPPPortName.ascii());
-
- theNonAutoDetectPtr->theSuggestedATPortName =
- TheSettingsSingleton::getQSRef().readEntry(theATKeyStr, "");
- DEBUG4("read AT port from config: '%s'\n", theNonAutoDetectPtr->theSuggestedATPortName.ascii());
-
+ QString myPPPString;
+ QString myATString;
+ QString myDeviceTypeString;
+ unsigned long myDeviceTypeLong;
+
+ // PPP
+ myPPPString = TheSettingsSingleton::getQSRef().readEntry(thePPPKeyStr, "");
+ DEBUG4("read PPP port from config: '%s'.\n", myPPPString.ascii());
+ if (myPPPString.isEmpty())
+ goto nogood;
+
+ // AT
+ myATString = TheSettingsSingleton::getQSRef().readEntry(theATKeyStr, "");
+ DEBUG4("read AT port from config: '%s'.\n", myATString.ascii());
+ if (myATString.isEmpty())
+ goto nogood;
+
// read hexadecimal type string
- QString theDeviceTypeString;
- theDeviceTypeString = TheSettingsSingleton::getQSRef().readEntry(theDeviceTypeKeyStr,
+ myDeviceTypeString = TheSettingsSingleton::getQSRef().readEntry(theDeviceTypeKeyStr,
QString::number(DeviceCapabilities::UNKNOWN));
- theNonAutoDetectPtr->theSuggestedDeviceType =
- static_castDeviceCapabilities::CardType(theDeviceTypeString.toULong(NULL, 0));
- DEBUG4("read device type from config: 0x%08X\n",
- theNonAutoDetectPtr->theSuggestedDeviceType);
+ myDeviceTypeLong = myDeviceTypeString.toULong(NULL, 0);
+ DEBUG4("read device type from config: 0x%08lX\n", myDeviceTypeLong);
+ if (myDeviceTypeLong == DeviceCapabilities::UNKNOWN)
+ goto nogood;
+
+ // good - we read a full set of parameters
+ theNonAutoDetectPtr->theSuggestedDeviceType = static_castDeviceCapabilities::CardType(myDeviceTypeLong);
+ theNonAutoDetectPtr->theSuggestedPPPPortName = myPPPString;
+ theNonAutoDetectPtr->theSuggestedATPortName = myATString;
+
+ DEBUG3("Complete config read from file - good :-)\n");
+ return;
+
+nogood:
+ // bad - no full set
+ DEBUG1("Stored device configuration incomplete, reverting to autodetection\n");
+ theNonAutoDetectPtr->theForceAutodetection = true;
}
void TheDeviceManagerSingleton::writeToConfigFile(void)
{
DEBUG3("TheDeviceManagerSingleton::writeToConfigFile()\n");
assert(theStaticDevicePtr != NULL);
+ assert(!theStaticDevicePtr->getPPPSerialPortName().isEmpty());
TheSettingsSingleton::getQSRef().writeEntry(thePPPKeyStr,
theStaticDevicePtr->getPPPSerialPortName() );
+ assert(!theStaticDevicePtr->getATSerialPortName().isEmpty());
TheSettingsSingleton::getQSRef().writeEntry(theATKeyStr,
theStaticDevicePtr->getATSerialPortName() );
// write type string in hex
+ assert(theStaticDevicePtr->getDeviceType()!=DeviceCapabilities::UNKNOWN);
TheSettingsSingleton::getQSRef().writeEntry(theDeviceTypeKeyStr,
"0x" + QString::number(theStaticDevicePtr->getDeviceType(),16) );
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/umtsmon/src/model/HelperList.cpp new/umtsmon/src/model/HelperList.cpp
--- old/umtsmon/src/model/HelperList.cpp 2008-02-01 11:53:26.000000000 +0100
+++ new/umtsmon/src/model/HelperList.cpp 2008-02-12 11:32:54.000000000 +0100
@@ -130,7 +130,7 @@
}
case HelperData::NO:
{
- QPixmap myPixmap( QPixmap::fromMimeSource("no.png") );
+ QPixmap myPixmap( QPixmap::fromMimeSource("process-stop-16x16.png") );
mySubQLVI->setPixmap(3, myPixmap);
break;
}
@@ -142,7 +142,7 @@
// in case the binary is missing, let's put up a sign
if (isBinaryMissing)
{
- QPixmap myPixmap( QPixmap::fromMimeSource("no.png") );
+ QPixmap myPixmap( QPixmap::fromMimeSource("process-stop-16x16.png") );
mySubQLVI->setPixmap(1, myPixmap);
}
@@ -237,7 +237,7 @@
}
else
{
- QPixmap myPixmap( QPixmap::fromMimeSource("no.png") );
+ QPixmap myPixmap( QPixmap::fromMimeSource("process-stop-16x16.png") );
mySubQLVI->setPixmap(4, myPixmap);
}
return mySubQLVI;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/umtsmon/src/model/MonthlyTraffic.cpp new/umtsmon/src/model/MonthlyTraffic.cpp
--- old/umtsmon/src/model/MonthlyTraffic.cpp 2008-02-01 11:53:26.000000000 +0100
+++ new/umtsmon/src/model/MonthlyTraffic.cpp 2008-02-12 11:32:54.000000000 +0100
@@ -57,8 +57,6 @@
theThresholdPercentage = myCurProfile.getThresholdPercentage();
theHomeDataLimit = myCurProfile.getHomeDataLimit()*1024*1024;
theRoamingDataLimit = myCurProfile.getRoamingDataLimit()*1024*1024;
-
- warnIfNeeded();
}
@@ -105,6 +103,8 @@
else
myPercentage = (100*myTraffic) / theHomeDataLimit;
}
+ if (myPercentage == 0)
+ return LIMITS_DISABLED;
if (myPercentage < theThresholdPercentage)
return BELOW;
if (myPercentage >= 100)
@@ -204,35 +204,13 @@
void
MonthlyTraffic::warnIfNeeded()
{
-// FIXME: we might want to throw an exception here as well
-// that would keep this class GUI stuff free :-)
-
-// the below code is unverified anyway...
-
-// if (isWarnOnDataThreshold)
-// {
-// if (isRoaming)
-// {
-// unsigned long myTraffic = theRoamingTraffic + theCounterBytesReceived+theCounterBytesSent;
-// unsigned long myPercentage = (100*myTraffic) / theRoamingDataLimit;
-// if (myPercentage > theThresholdPercentage)
-// {
-//
-// Popup::Warning("You've used " + QString::number(myPercentage) + " of your monthly data limit for roaming!");
-// isWarnOnDataThreshold = false;
-// }
-// }
-// else
-// {
-// unsigned long myTraffic = theHomeTraffic + theCounterBytesReceived+theCounterBytesSent;
-// unsigned long myPercentage = (100*myTraffic) / theHomeDataLimit;
-// if (myPercentage > theThresholdPercentage)
-// {
-//
-// Popup::Warning("You've used " + QString::number(myPercentage) + " of the monthly data limit for your home network!");
-// isWarnOnDataThreshold = false;
-// }
-// }
-// }
+ if (isWarnOnDataThreshold)
+ {
+ if ((getThresholdStatus()==OVER_LIMIT)||(getThresholdStatus()==BETWEEN))
+ {
+ isWarnOnDataThreshold = false;
+ throw OverThresholdException();
+ }
+ }
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/umtsmon/src/model/MonthlyTraffic.h new/umtsmon/src/model/MonthlyTraffic.h
--- old/umtsmon/src/model/MonthlyTraffic.h 2008-02-01 11:53:26.000000000 +0100
+++ new/umtsmon/src/model/MonthlyTraffic.h 2008-02-12 11:32:54.000000000 +0100
@@ -30,6 +30,13 @@
{
};
+/** thrown by MonthlyTraffic::warnIfNeeded and/or MonthlyTraffic::update if
+ * the data limit is reached
+ */
+class OverThresholdException
+{
+};
+
/** this class keeps the traffic and data limits for a certain month
*/
class MonthlyTraffic
@@ -51,7 +58,8 @@
* should be monotonously increasing
* @param aCounterBytesReceived total amount of bytes as reported by ppp
* should be monotonously increasing
- * @throws KillPPPD if the date rolls over to a new month
+ * @throws MonthRolloverException if the date rolls over to a new month
+ * @throws OverThresholdException if the data limit is reached
* @returns the total amount of traffic for this month for the current network type
*/
unsigned long update(unsigned long aCounterBytesSent, unsigned long aCounterBytesReceived);
@@ -64,7 +72,8 @@
{
BELOW, // total for month/network/profile is below threshold percentage
BETWEEN, // traffic inbetween threshold percentage and 100% of limit
- OVER_LIMIT // traffic exceeded 100% of data limit
+ OVER_LIMIT, // traffic exceeded 100% of data limit
+ LIMITS_DISABLED // user didn't specify any limits
};
/** @returns the status of the current amount of traffic
@@ -118,7 +127,9 @@
/// writes the current statistics to disk (might be an expensive operation!)
void save(void);
- /// throw a warning if needed
+ /** throw a warning if needed
+ * @throws OverThresholdException if the data limit is reached
+ */
void warnIfNeeded();
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/umtsmon/src/model/PPPConnection.cpp new/umtsmon/src/model/PPPConnection.cpp
--- old/umtsmon/src/model/PPPConnection.cpp 2008-02-01 11:53:26.000000000 +0100
+++ new/umtsmon/src/model/PPPConnection.cpp 2008-02-12 11:32:54.000000000 +0100
@@ -348,7 +348,7 @@
DEBUG4("Assembled PPP string is: '");
for (; i != myPPPArguments.end(); i++)
DEBUG4NT("%s ", (*i).ascii());
- DEBUG4("'\n");
+ DEBUG4NT("'\n");
setNewPPPState(PPPObserverInterface::STARTING);
thePPPThreadPtr = new PPPThread(myPPPArguments);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/umtsmon/src/view/enterpindialog.ui new/umtsmon/src/view/enterpindialog.ui
--- old/umtsmon/src/view/enterpindialog.ui 2008-02-01 11:53:26.000000000 +0100
+++ new/umtsmon/src/view/enterpindialog.ui 2008-02-12 11:32:54.000000000 +0100
@@ -166,7 +166,7 @@
<bool>true</bool>
</property>
<property name="iconSet">
- <iconset>no.png</iconset>
+ <iconset>process-stop-16x16.png</iconset>
</property>
</widget>
</vbox>
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/umtsmon/src/view/enterpukdialog.ui new/umtsmon/src/view/enterpukdialog.ui
--- old/umtsmon/src/view/enterpukdialog.ui 2008-02-01 11:53:26.000000000 +0100
+++ new/umtsmon/src/view/enterpukdialog.ui 2008-02-12 11:32:54.000000000 +0100
@@ -220,7 +220,7 @@
<bool>true</bool>
</property>
<property name="iconSet">
- <iconset>no.png</iconset>
+ <iconset>process-stop-16x16.png</iconset>
</property>
</widget>
</hbox>
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/umtsmon/src/view/LCDDisplay.cpp new/umtsmon/src/view/LCDDisplay.cpp
--- old/umtsmon/src/view/LCDDisplay.cpp 2008-02-01 11:53:26.000000000 +0100
+++ new/umtsmon/src/view/LCDDisplay.cpp 2008-02-12 11:32:54.000000000 +0100
@@ -101,7 +101,6 @@
p->drawText( 47,56, theUpload);
p->drawText( 47,74, theDownload);
p->drawText(234,57, theRadioType);
- p->drawText(107,74, theTotal);
if (!theProfile.isEmpty())
p->drawText(234,74, theProfile);
@@ -112,6 +111,23 @@
else
p->drawPixmap( 42,17, theGaugePixmap, 0,0, theSignalWidth, theGaugePixmap.height() );
+ // draw the total in either green, orange or red, depending on the status
+ switch (theTotalStatus)
+ {
+ case MonthlyTraffic::OVER_LIMIT:
+ p->setPen(QColor(200,20,20)); // red
+ break;
+ case MonthlyTraffic::BETWEEN:
+ p->setPen(QColor(150,100,20)); // orange
+ break;
+ case MonthlyTraffic::BELOW:
+ p->setPen(QColor(0,170,0)); // green
+ break;
+ case MonthlyTraffic::LIMITS_DISABLED:
+ p->setPen(theBlack); // green
+ break;
+ };
+ p->drawText(107,74, theTotal);
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/umtsmon/src/view/LCDDisplay.h new/umtsmon/src/view/LCDDisplay.h
--- old/umtsmon/src/view/LCDDisplay.h 2008-02-01 11:53:26.000000000 +0100
+++ new/umtsmon/src/view/LCDDisplay.h 2008-02-12 11:32:54.000000000 +0100
@@ -19,6 +19,8 @@
#ifndef NETWORKSTATS_H_
#define NETWORKSTATS_H_
+#include "MonthlyTraffic.h"
+
#include