appindicator displays unit of sensor values

diff --git a/NEWS b/NEWS
index 0217f5a..9a96d45 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,8 +1,9 @@
 * v0.6.2.9
 
-** psensor: fixed UI freeze on Ubuntu Lucid when 'sensor preferences'
+** psensor: fixed UI freeze on Ubuntu Lucid when 'sensor preferences'.
    is selected with application indicator.
-** added missing src/description.txt file into source archive
+** added missing src/description.txt file into source archive.
+** psensor: appindicator displays unit of sensor values.
 
 * v0.6.2.8
 

diff --git a/po/POTFILES.in b/po/POTFILES.in
index e2918a7..a5b4fef 100644 (file)
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -12,5 +12,6 @@ src/server/server.c
 src/lib/hdd.c
 src/lib/nvidia.c
 src/lib/lmsensor.c
+src/lib/psensor.c
 src/glade/psensor-pref.glade
 src/glade/sensor-edit.glade

diff --git a/po/fr.po b/po/fr.po
index 9b958b3..722dfb2 100644 (file)
--- a/po/fr.po
+++ b/po/fr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: psensor 0.6.0.9\n"
 "Report-Msgid-Bugs-To: jeanfi@gmail.com\n"
-"POT-Creation-Date: 2011-05-25 22:38+0200\n"
+"POT-Creation-Date: 2011-05-26 11:54+0200\n"
 "PO-Revision-Date: 2011-02-07 21:18+0100\n"
 "Last-Translator: Jean-Philippe Orsini <jeanfi@gmail.com>\n"
 "Language-Team: Oriya\n"
@@ -120,7 +120,7 @@ msgstr "Quitter"
 msgid "Quit"
 msgstr "Quitter"
 
-#: src/ui.c:110 src/ui_appindicator.c:160
+#: src/ui.c:110 src/ui_appindicator.c:161
 #, c-format
 msgid "building menus failed: %s"
 msgstr ""
@@ -343,6 +343,14 @@ msgstr "ERREUR: create_sensor, mauvais type de fonctionnalité\n"
 msgid "ERROR: lm-sensors initialization failure: %s\n"
 msgstr "ERREUR: échec de l'initialisation de lm-sensors: %s\n"
 
+#: src/lib/psensor.c:448
+msgid "C"
+msgstr ""
+
+#: src/lib/psensor.c:451
+msgid "RPM"
+msgstr ""
+
 #: src/glade/psensor-pref.glade:7
 msgid "Edit Preferences"
 msgstr "Editer la configuration"

diff --git a/po/psensor.pot b/po/psensor.pot
index b5d9d93..e4fcfd9 100644 (file)
--- a/po/psensor.pot
+++ b/po/psensor.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: jeanfi@gmail.com\n"
-"POT-Creation-Date: 2011-05-25 22:38+0200\n"
+"POT-Creation-Date: 2011-05-26 11:54+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -103,7 +103,7 @@ msgstr ""
 msgid "Quit"
 msgstr ""
 
-#: src/ui.c:110 src/ui_appindicator.c:160
+#: src/ui.c:110 src/ui_appindicator.c:161
 #, c-format
 msgid "building menus failed: %s"
 msgstr ""
@@ -319,6 +319,14 @@ msgstr ""
 msgid "ERROR: lm-sensors initialization failure: %s\n"
 msgstr ""
 
+#: src/lib/psensor.c:448
+msgid "C"
+msgstr ""
+
+#: src/lib/psensor.c:451
+msgid "RPM"
+msgstr ""
+
 #: src/glade/psensor-pref.glade:7
 msgid "Edit Preferences"
 msgstr ""

diff --git a/po/tr.po b/po/tr.po
index 234a019..76fbfcd 100644 (file)
--- a/po/tr.po
+++ b/po/tr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: psensor\n"
 "Report-Msgid-Bugs-To: jeanfi@gmail.com\n"
-"POT-Creation-Date: 2011-05-25 22:38+0200\n"
+"POT-Creation-Date: 2011-05-26 11:54+0200\n"
 "PO-Revision-Date: 2011-04-10 13:11+0000\n"
 "Last-Translator: zeugma <Unknown>\n"
 "Language-Team: Turkish <tr@li.org>\n"
@@ -107,7 +107,7 @@ msgstr ""
 msgid "Quit"
 msgstr ""
 
-#: src/ui.c:110 src/ui_appindicator.c:160
+#: src/ui.c:110 src/ui_appindicator.c:161
 #, c-format
 msgid "building menus failed: %s"
 msgstr ""
@@ -324,6 +324,14 @@ msgstr ""
 msgid "ERROR: lm-sensors initialization failure: %s\n"
 msgstr ""
 
+#: src/lib/psensor.c:448
+msgid "C"
+msgstr ""
+
+#: src/lib/psensor.c:451
+msgid "RPM"
+msgstr ""
+
 #: src/glade/psensor-pref.glade:7
 msgid "Edit Preferences"
 msgstr "Tercihleri düzenle"

diff --git a/po/zh_CN.po b/po/zh_CN.po
index 0b2de23..24f540b 100644 (file)
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: psensor 0.6.0.10\n"
 "Report-Msgid-Bugs-To: jeanfi@gmail.com\n"
-"POT-Creation-Date: 2011-05-25 22:38+0200\n"
+"POT-Creation-Date: 2011-05-26 11:54+0200\n"
 "PO-Revision-Date: 2011-02-07 22:21+0100\n"
 "Last-Translator: 大宝 <linux.dabao@gmail.com>\n"
 "Language-Team: Chinese (simplified)\n"
@@ -106,7 +106,7 @@ msgstr "退出"
 msgid "Quit"
 msgstr "退出"
 
-#: src/ui.c:110 src/ui_appindicator.c:160
+#: src/ui.c:110 src/ui_appindicator.c:161
 #, c-format
 msgid "building menus failed: %s"
 msgstr ""
@@ -323,6 +323,14 @@ msgstr ""
 msgid "ERROR: lm-sensors initialization failure: %s\n"
 msgstr ""
 
+#: src/lib/psensor.c:448
+msgid "C"
+msgstr ""
+
+#: src/lib/psensor.c:451
+msgid "RPM"
+msgstr ""
+
 #: src/glade/psensor-pref.glade:7
 #, fuzzy
 msgid "Edit Preferences"

diff --git a/src/lib/psensor.c b/src/lib/psensor.c
index a385dda..96560db 100644 (file)
--- a/src/lib/psensor.c
+++ b/src/lib/psensor.c
@@ -20,6 +20,10 @@
 #include <stdlib.h>
 #include <string.h>
 
+#include <locale.h>
+#include <libintl.h>
+#define _(str) gettext(str)
+
 #include <sensors/sensors.h>
 #include <sensors/error.h>
 
@@ -437,6 +441,18 @@ const char *psensor_type_to_str(unsigned int type)
        return "N/A";           /* should not be possible */
 }
 
+
+const char *psensor_type_to_unit_str(unsigned int type)
+{
+       if (type & SENSOR_TYPE_TEMP)
+               return _("C");
+
+       if (type & SENSOR_TYPE_FAN)
+               return _("RPM");
+
+       return "N/A";
+}
+
 void psensor_list_update_measures(struct psensor **sensors)
 {
        lmsensor_psensor_list_update(sensors);

diff --git a/src/lib/psensor.h b/src/lib/psensor.h
index 321bfa1..9d816d8 100644 (file)
--- a/src/lib/psensor.h
+++ b/src/lib/psensor.h
@@ -156,6 +156,8 @@ struct measure *psensor_get_current_measure(struct psensor *sensor);
 */
 const char *psensor_type_to_str(unsigned int type);
 
+const char *psensor_type_to_unit_str(unsigned int type);
+
 void psensor_list_update_measures(struct psensor **sensors);
 
 #endif

diff --git a/src/ui_appindicator.c b/src/ui_appindicator.c
index c02b666..268f314 100644 (file)
--- a/src/ui_appindicator.c
+++ b/src/ui_appindicator.c
@@ -116,9 +116,10 @@ static void update_sensor_menu_item(GtkMenuItem *item, struct psensor *s)
 {
        gchar *str;
 
-       str = g_strdup_printf("%s: %2.f",
+       str = g_strdup_printf("%s: %2.f %s",
                              s->name,
-                             psensor_get_current_value(s));
+                             psensor_get_current_value(s),
+                             psensor_type_to_unit_str(s->type));
 
        gtk_menu_item_set_label(item, str);