Psensor NEWS
============
+v0.8.0.7
+--------
+
+* smaller and more consistent with ubuntu themes appindicator icons.
+* sensors displayed directly in the top bar.
+
v0.8.0.6
--------
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">\r
<head>\r
<meta http-equiv="Content-Type" content="application/xhtml+xml; charset=UTF-8" />\r
-<meta name="generator" content="AsciiDoc 8.6.7" />\r
+<meta name="generator" content="AsciiDoc 8.6.9" />\r
<title>Psensor NEWS</title>\r
<style type="text/css">\r
\r
-webkit-box-shadow: 0 2px 2px 0 #C2C2C2;\r
box-shadow: 0 2px 2px 0 #C2C2C2;\r
}\r
+\r
+\r
</style>\r
<script type="text/javascript">\r
/*<![CDATA[*/\r
</div>\r
<div id="content">\r
<div class="sect1">\r
+<h2 id="_v0_8_0_7">v0.8.0.7</h2>\r
+<div class="sectionbody">\r
+<div class="ulist"><ul>\r
+<li>\r
+<p>\r
+smaller and more consistent with ubuntu themes appindicator icons.\r
+</p>\r
+</li>\r
+<li>\r
+<p>\r
+sensors displayed directly in the top bar.\r
+</p>\r
+</li>\r
+</ul></div>\r
+</div>\r
+</div>\r
+<div class="sect1">\r
+<h2 id="_v0_8_0_6">v0.8.0.6</h2>\r
+<div class="sectionbody">\r
+<div class="ulist"><ul>\r
+<li>\r
+<p>\r
+Updated jquery and jqplot to last version.\r
+</p>\r
+</li>\r
+<li>\r
+<p>\r
+Removed excanvas for copyright reason (apache license not compatible\r
+ with GPLv2 license).\r
+</p>\r
+</li>\r
+<li>\r
+<p>\r
+Use non-minimized version of .js and .css to avoid lintian errors\r
+ (source-is-missing).\r
+</p>\r
+</li>\r
+</ul></div>\r
+</div>\r
+</div>\r
+<div class="sect1">\r
<h2 id="_v0_8_0_5">v0.8.0.5</h2>\r
<div class="sectionbody">\r
<div class="ulist"><ul>\r
</li>\r
<li>\r
<p>\r
-<tt>psensor-server</tt>:\r
+<code>psensor-server</code>:\r
</p>\r
<div class="ulist"><ul>\r
<li>\r
</li>\r
<li>\r
<p>\r
-<tt>psensor-server</tt>: fixed compilation without gtop2 lib.\r
+<code>psensor-server</code>: fixed compilation without gtop2 lib.\r
</p>\r
</li>\r
</ul></div>\r
</li>\r
<li>\r
<p>\r
-<tt>psensor-server</tt>: protocole changes, API version incremented.\r
+<code>psensor-server</code>: protocole changes, API version incremented.\r
</p>\r
</li>\r
<li>\r
</li>\r
<li>\r
<p>\r
-<tt>psensor-server</tt>: added sensors logging (--sensor-log-file).\r
+<code>psensor-server</code>: added sensors logging (--sensor-log-file).\r
</p>\r
</li>\r
<li>\r
</li>\r
<li>\r
<p>\r
-<tt>psensor-server</tt>: fixed --wdir option.\r
+<code>psensor-server</code>: fixed --wdir option.\r
</p>\r
</li>\r
<li>\r
<p>\r
-<tt>psensor-server</tt>: added log level to -d option.\r
+<code>psensor-server</code>: added log level to -d option.\r
</p>\r
</li>\r
<li>\r
<p>\r
-<tt>psensor-server</tt>: added --log-file option.\r
+<code>psensor-server</code>: added --log-file option.\r
</p>\r
</li>\r
<li>\r
<p>\r
-<tt>psensor-server</tt>: logged measures when log level is 3.\r
+<code>psensor-server</code>: logged measures when log level is 3.\r
</p>\r
</li>\r
<li>\r
<div class="ulist"><ul>\r
<li>\r
<p>\r
-<tt>psensor-server</tt>: uses glibtop instead of <em>sysinfo</em> which is not\r
+<code>psensor-server</code>: uses glibtop instead of <em>sysinfo</em> which is not\r
available on kfreebsd. It fixes Debian bug #650533.\r
</p>\r
</li>\r
</li>\r
<li>\r
<p>\r
-<tt>psensor-server</tt>: fixed compilation with microhttpd >=0x90200 and\r
+<code>psensor-server</code>: fixed compilation with microhttpd >=0x90200 and\r
64bits.\r
</p>\r
</li>\r
</li>\r
<li>\r
<p>\r
-<tt>psensor-server</tt>: support of symbolic links to webfiles.\r
+<code>psensor-server</code>: support of symbolic links to webfiles.\r
</p>\r
</li>\r
</ul></div>\r
</li>\r
<li>\r
<p>\r
-<tt>psensor-server</tt>: fixed compilation with microhttpd >= 0.9.2 (version\r
+<code>psensor-server</code>: fixed compilation with microhttpd >= 0.9.2 (version\r
used by Fedora15) which introduced incompatible API changes.\r
</p>\r
</li>\r
<div class="ulist"><ul>\r
<li>\r
<p>\r
-<tt>psensor-server</tt>: added network, cpu load and memory information in\r
+<code>psensor-server</code>: added network, cpu load and memory information in\r
JSON web interface.\r
</p>\r
</li>\r
<li>\r
<p>\r
-<tt>psensor-server</tt>: added monitor.html and details.html using jquery\r
+<code>psensor-server</code>: added monitor.html and details.html using jquery\r
and retrieving monitoring data from the JSON web interface.\r
</p>\r
</li>\r
</li>\r
<li>\r
<p>\r
-<tt>psensor-server</tt>: display graph of sensors (web server).\r
+<code>psensor-server</code>: display graph of sensors (web server).\r
</p>\r
</li>\r
<li>\r
</li>\r
<li>\r
<p>\r
-<tt>psensor-server</tt>: escaped - in manpage.\r
+<code>psensor-server</code>: escaped - in manpage.\r
</p>\r
</li>\r
<li>\r
<div class="ulist"><ul>\r
<li>\r
<p>\r
-<tt>psensor-server</tt>: new global variable <em>psensor_version</em> for lua template\r
+<code>psensor-server</code>: new global variable <em>psensor_version</em> for lua template\r
</p>\r
</li>\r
<li>\r
<p>\r
-<tt>psensor-server</tt>: /index.html replaced by /index.lua\r
+<code>psensor-server</code>: /index.html replaced by /index.lua\r
</p>\r
</li>\r
<li>\r
<div class="ulist"><ul>\r
<li>\r
<p>\r
-<tt>psensor-server</tt>: web server support binary files\r
+<code>psensor-server</code>: web server support binary files\r
</p>\r
</li>\r
<li>\r
<p>\r
-<tt>psensor-server</tt>: added favicon.ico\r
+<code>psensor-server</code>: added favicon.ico\r
</p>\r
</li>\r
<li>\r
<p>\r
-<tt>psensor-server</tt>: moved index.lua to monitor.lua\r
+<code>psensor-server</code>: moved index.lua to monitor.lua\r
</p>\r
</li>\r
<li>\r
<p>\r
-<tt>psensor-server</tt>: added index.html (welcome page)\r
+<code>psensor-server</code>: added index.html (welcome page)\r
</p>\r
</li>\r
</ul></div>\r
</li>\r
<li>\r
<p>\r
-<tt>psensor-server</tt>: escaped - in manpage\r
+<code>psensor-server</code>: escaped - in manpage\r
</p>\r
</li>\r
</ul></div>\r
</li>\r
<li>\r
<p>\r
-<tt>psensor-server</tt>:\r
+<code>psensor-server</code>:\r
</p>\r
<div class="ulist"><ul>\r
<li>\r
<div id="footnotes"><hr /></div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 2014-04-10 08:44:57 CEST\r
+Last updated 2014-04-19 11:17:37 CEST\r
</div>\r
</div>\r
</body>\r
# We use $(mkdir_p).
# In automake <= 1.9.x, $(mkdir_p) is defined either as "mkdir -p --" or as
# "$(mkinstalldirs)" or as "$(install_sh) -d". For these automake versions,
-# ${SHELL} /home/jporsini/work/psensor/install-sh does not start with $(SHELL), so we add it.
+# ${SHELL} /home/jporsini/work.local/psensor/install-sh does not start with $(SHELL), so we add it.
# In automake >= 1.10, /bin/mkdir -p is derived from ${MKDIR_P}, which is defined
# either as "/path/to/mkdir -p" or ".../install-sh -c -d". For these automake
# versions, $(mkinstalldirs) and $(install_sh) are unused.
-mkinstalldirs = $(SHELL) ${SHELL} /home/jporsini/work/psensor/install-sh -d
-install_sh = $(SHELL) ${SHELL} /home/jporsini/work/psensor/install-sh
+mkinstalldirs = $(SHELL) ${SHELL} /home/jporsini/work.local/psensor/install-sh -d
+install_sh = $(SHELL) ${SHELL} /home/jporsini/work.local/psensor/install-sh
MKDIR_P = /bin/mkdir -p
mkdir_p = /bin/mkdir -p
msgstr ""
"Project-Id-Version: psensor 0.7.0.x\n"
"Report-Msgid-Bugs-To: jeanfi@gmail.com\n"
-"POT-Creation-Date: 2014-04-10 08:17+0200\n"
+"POT-Creation-Date: 2014-04-19 10:21+0200\n"
"PO-Revision-Date: 2013-10-20 09:56+0000\n"
"Last-Translator: Dennis Baudys <Unknown>\n"
"Language-Team: German\n"
msgid "Temperature unit:"
msgstr "Temperatureinheit:"
+#: src/glade/psensor-pref.glade:201
+msgid "Celcius"
+msgstr ""
+
+#: src/glade/psensor-pref.glade:202
+msgid "Fahrenheit"
+msgstr ""
+
#: src/glade/psensor-pref.glade:238
msgid "Interface"
msgstr "Benutzeroberfläche"
msgid "Sensors"
msgstr "Sensoren"
+#: src/glade/psensor-pref.glade:797
+msgctxt "psensor"
+msgid "Right"
+msgstr ""
+
+#: src/glade/psensor-pref.glade:800
+msgid "Left"
+msgstr ""
+
+#: src/glade/psensor-pref.glade:803
+msgid "Top"
+msgstr ""
+
+#: src/glade/psensor-pref.glade:806
+msgid "Bottom"
+msgstr ""
+
#: src/glade/sensor-edit.glade:19
msgid "Edit Sensor Preferences"
msgstr "Sensoreinstellungen bearbeiten"
msgstr "Untere Grenze:"
#: src/glade/sensor-edit.glade:409
-msgid "Ubuntu Application Indicator"
+#, fuzzy
+msgid "Application Indicator"
msgstr "Ubuntu-Anwendungsindikator"
#: src/glade/sensor-edit.glade:424
-msgid "Display sensor in the Application Indicator menu"
+#, fuzzy
+msgid "Display sensor in the menu"
msgstr "Sensor im Indikatormenü für Anwendungen zeigen"
#: src/glade/sensor-edit.glade:444
msgid "Name:"
msgstr "Name:"
+#: src/glade/sensor-edit.glade:553
+#, fuzzy
+msgid "Display sensor in the label"
+msgstr "Sensor im Indikatormenü für Anwendungen zeigen"
+
#: src/lib/amd.c:170
msgid "AMD: cannot found ADL library."
msgstr "AMD: ADL-Bibliothek konnte nicht gefunden werden."
msgstr ""
"Project-Id-Version: psensor\n"
"Report-Msgid-Bugs-To: jeanfi@gmail.com\n"
-"POT-Creation-Date: 2014-04-10 08:17+0200\n"
+"POT-Creation-Date: 2014-04-19 10:21+0200\n"
"PO-Revision-Date: 2013-05-12 22:16+0000\n"
"Last-Translator: Javier <buik8roadmaster@hotmail.com>\n"
"Language-Team: Spanish <es@li.org>\n"
msgid "Temperature unit:"
msgstr "Unidad de temperatura"
+#: src/glade/psensor-pref.glade:201
+msgid "Celcius"
+msgstr ""
+
+#: src/glade/psensor-pref.glade:202
+msgid "Fahrenheit"
+msgstr ""
+
#: src/glade/psensor-pref.glade:238
msgid "Interface"
msgstr "Interfaz"
msgid "Sensors"
msgstr "Sensores"
+#: src/glade/psensor-pref.glade:797
+#, fuzzy
+msgctxt "psensor"
+msgid "Right"
+msgstr "Derecha"
+
+#: src/glade/psensor-pref.glade:800
+msgid "Left"
+msgstr "Izquierda"
+
+#: src/glade/psensor-pref.glade:803
+msgid "Top"
+msgstr "Arriba"
+
+#: src/glade/psensor-pref.glade:806
+msgid "Bottom"
+msgstr "Abajo"
+
#: src/glade/sensor-edit.glade:19
msgid "Edit Sensor Preferences"
msgstr "Editar Ajustes Sensores"
msgstr "Límite inferior"
#: src/glade/sensor-edit.glade:409
-msgid "Ubuntu Application Indicator"
+#, fuzzy
+msgid "Application Indicator"
msgstr "Indicador de aplicación de Ubuntu"
#: src/glade/sensor-edit.glade:424
-msgid "Display sensor in the Application Indicator menu"
+#, fuzzy
+msgid "Display sensor in the menu"
msgstr "Mostrar sensor en el menú de aplicaciones"
#: src/glade/sensor-edit.glade:444
msgid "Name:"
msgstr "Nombre:"
+#: src/glade/sensor-edit.glade:553
+#, fuzzy
+msgid "Display sensor in the label"
+msgstr "Mostrar sensor en el menú de aplicaciones"
+
#: src/lib/amd.c:170
msgid "AMD: cannot found ADL library."
msgstr "AMD: no se ha encontrado la librería ADL"
#~ msgid "Current"
#~ msgstr "Actual"
-#~ msgid "Left"
-#~ msgstr "Izquierda"
-
-#~ msgid "Bottom"
-#~ msgstr "Abajo"
-
#~ msgid "Temperature limit:"
#~ msgstr "Límite de temperatura:"
-
-#~ msgid "Right"
-#~ msgstr "Derecha"
-
-#~ msgid "Top"
-#~ msgstr "Arriba"
msgstr ""
"Project-Id-Version: psensor\n"
"Report-Msgid-Bugs-To: jeanfi@gmail.com\n"
-"POT-Creation-Date: 2014-04-10 08:17+0200\n"
+"POT-Creation-Date: 2014-04-19 10:21+0200\n"
"PO-Revision-Date: 2013-06-29 15:14+0000\n"
"Last-Translator: londumas <helion331990@gmail.com>\n"
"Language-Team: French <>\n"
msgid "Temperature unit:"
msgstr "Unité de température :"
+#: src/glade/psensor-pref.glade:201
+msgid "Celcius"
+msgstr ""
+
+#: src/glade/psensor-pref.glade:202
+msgid "Fahrenheit"
+msgstr ""
+
#: src/glade/psensor-pref.glade:238
msgid "Interface"
msgstr "Interface"
msgid "Sensors"
msgstr "Capteurs"
+#: src/glade/psensor-pref.glade:797
+msgctxt "psensor"
+msgid "Right"
+msgstr ""
+
+#: src/glade/psensor-pref.glade:800
+msgid "Left"
+msgstr ""
+
+#: src/glade/psensor-pref.glade:803
+msgid "Top"
+msgstr ""
+
+#: src/glade/psensor-pref.glade:806
+msgid "Bottom"
+msgstr ""
+
#: src/glade/sensor-edit.glade:19
msgid "Edit Sensor Preferences"
msgstr "Préférences des capteurs"
msgstr "Seuil inférieur :"
#: src/glade/sensor-edit.glade:409
-msgid "Ubuntu Application Indicator"
+#, fuzzy
+msgid "Application Indicator"
msgstr "Indicateur d'application d'Ubuntu"
#: src/glade/sensor-edit.glade:424
-msgid "Display sensor in the Application Indicator menu"
+#, fuzzy
+msgid "Display sensor in the menu"
msgstr "Afficher le capteur dans le menu de l'indicateur d'application"
#: src/glade/sensor-edit.glade:444
msgid "Name:"
msgstr "Nom :"
+#: src/glade/sensor-edit.glade:553
+#, fuzzy
+msgid "Display sensor in the label"
+msgstr "Afficher le capteur dans le menu de l'indicateur d'application"
+
#: src/lib/amd.c:170
msgid "AMD: cannot found ADL library."
msgstr "AMD : impossible de trouver la bibliothèque ADL."
msgstr ""
"Project-Id-Version: psensor\n"
"Report-Msgid-Bugs-To: jeanfi@gmail.com\n"
-"POT-Creation-Date: 2014-04-10 08:17+0200\n"
+"POT-Creation-Date: 2014-04-19 10:21+0200\n"
"PO-Revision-Date: 2012-10-29 09:41+0000\n"
"Last-Translator: Bence Lukács <Unknown>\n"
"Language-Team: Hungarian <gnome-hu-list-request@gnome.org>\n"
msgid "Temperature unit:"
msgstr "Hőmérséklet mértékegysége:"
+#: src/glade/psensor-pref.glade:201
+msgid "Celcius"
+msgstr ""
+
+#: src/glade/psensor-pref.glade:202
+msgid "Fahrenheit"
+msgstr ""
+
#: src/glade/psensor-pref.glade:238
msgid "Interface"
msgstr "Felület"
msgid "Sensors"
msgstr "Érzékelők"
+#: src/glade/psensor-pref.glade:797
+msgctxt "psensor"
+msgid "Right"
+msgstr ""
+
+#: src/glade/psensor-pref.glade:800
+msgid "Left"
+msgstr ""
+
+#: src/glade/psensor-pref.glade:803
+msgid "Top"
+msgstr ""
+
+#: src/glade/psensor-pref.glade:806
+msgid "Bottom"
+msgstr ""
+
#: src/glade/sensor-edit.glade:19
msgid "Edit Sensor Preferences"
msgstr "Érzékelő beállításainak szerkesztése"
msgstr "Alsó küszöbérték:"
#: src/glade/sensor-edit.glade:409
-msgid "Ubuntu Application Indicator"
+#, fuzzy
+msgid "Application Indicator"
msgstr "Ubuntu Alkalmazásmenü"
#: src/glade/sensor-edit.glade:424
-msgid "Display sensor in the Application Indicator menu"
+#, fuzzy
+msgid "Display sensor in the menu"
msgstr "Érzékelők megjelenítése az alkalmazásmenüben"
#: src/glade/sensor-edit.glade:444
msgid "Name:"
msgstr "Név:"
+#: src/glade/sensor-edit.glade:553
+#, fuzzy
+msgid "Display sensor in the label"
+msgstr "Érzékelők megjelenítése az alkalmazásmenüben"
+
#: src/lib/amd.c:170
msgid "AMD: cannot found ADL library."
msgstr "AMD: Nem sikerült betölteni az ADL programkönyvtárat."
msgstr ""
"Project-Id-Version: psensor 0.7.0.x\n"
"Report-Msgid-Bugs-To: jeanfi@gmail.com\n"
-"POT-Creation-Date: 2014-04-10 08:17+0200\n"
+"POT-Creation-Date: 2014-04-19 10:21+0200\n"
"PO-Revision-Date: 2013-04-14 16:06+0000\n"
"Last-Translator: Diego Pierotto <Unknown>\n"
"Language-Team: Italian\n"
msgid "Temperature unit:"
msgstr "Unità di misura della temperatura"
+#: src/glade/psensor-pref.glade:201
+msgid "Celcius"
+msgstr ""
+
+#: src/glade/psensor-pref.glade:202
+msgid "Fahrenheit"
+msgstr ""
+
#: src/glade/psensor-pref.glade:238
msgid "Interface"
msgstr "Interfaccia"
msgid "Sensors"
msgstr "Sensori"
+#: src/glade/psensor-pref.glade:797
+msgctxt "psensor"
+msgid "Right"
+msgstr ""
+
+#: src/glade/psensor-pref.glade:800
+msgid "Left"
+msgstr ""
+
+#: src/glade/psensor-pref.glade:803
+msgid "Top"
+msgstr ""
+
+#: src/glade/psensor-pref.glade:806
+msgid "Bottom"
+msgstr ""
+
#: src/glade/sensor-edit.glade:19
msgid "Edit Sensor Preferences"
msgstr "Modifica preferenze del sensore"
msgstr "Soglia verso il basso"
#: src/glade/sensor-edit.glade:409
-msgid "Ubuntu Application Indicator"
+#, fuzzy
+msgid "Application Indicator"
msgstr "Indicatore Applicazione Ubuntu"
#: src/glade/sensor-edit.glade:424
-msgid "Display sensor in the Application Indicator menu"
+#, fuzzy
+msgid "Display sensor in the menu"
msgstr "Mostra sensore nel menu indicatore Applicazione"
#: src/glade/sensor-edit.glade:444
msgid "Name:"
msgstr "Nome:"
+#: src/glade/sensor-edit.glade:553
+#, fuzzy
+msgid "Display sensor in the label"
+msgstr "Mostra sensore nel menu indicatore Applicazione"
+
#: src/lib/amd.c:170
msgid "AMD: cannot found ADL library."
msgstr "AMD: impossibile trovare la libreria ADL"
msgstr ""
"Project-Id-Version: psensor\n"
"Report-Msgid-Bugs-To: jeanfi@gmail.com\n"
-"POT-Creation-Date: 2014-04-10 08:17+0200\n"
+"POT-Creation-Date: 2014-04-19 10:21+0200\n"
"PO-Revision-Date: 2013-10-24 12:32+0000\n"
"Last-Translator: tuxmaniack <Unknown>\n"
"Language-Team: Latvian <lv@li.org>\n"
msgid "Temperature unit:"
msgstr "Temperatūras mērvienība:"
+#: src/glade/psensor-pref.glade:201
+msgid "Celcius"
+msgstr ""
+
+#: src/glade/psensor-pref.glade:202
+msgid "Fahrenheit"
+msgstr ""
+
#: src/glade/psensor-pref.glade:238
msgid "Interface"
msgstr "Saskarne"
msgid "Sensors"
msgstr "Sensori"
+#: src/glade/psensor-pref.glade:797
+msgctxt "psensor"
+msgid "Right"
+msgstr ""
+
+#: src/glade/psensor-pref.glade:800
+msgid "Left"
+msgstr ""
+
+#: src/glade/psensor-pref.glade:803
+msgid "Top"
+msgstr ""
+
+#: src/glade/psensor-pref.glade:806
+msgid "Bottom"
+msgstr ""
+
#: src/glade/sensor-edit.glade:19
msgid "Edit Sensor Preferences"
msgstr "Rediģēt sensoru iestatījumus"
msgstr "Zems slieksnis:"
#: src/glade/sensor-edit.glade:409
-msgid "Ubuntu Application Indicator"
+#, fuzzy
+msgid "Application Indicator"
msgstr "Ubuntu aplikāciju indikators"
#: src/glade/sensor-edit.glade:424
-msgid "Display sensor in the Application Indicator menu"
+#, fuzzy
+msgid "Display sensor in the menu"
msgstr "Rādīt sensoru aplikāciju indikatora izvēlnē"
#: src/glade/sensor-edit.glade:444
msgid "Name:"
msgstr "Nosaukums:"
+#: src/glade/sensor-edit.glade:553
+#, fuzzy
+msgid "Display sensor in the label"
+msgstr "Rādīt sensoru aplikāciju indikatora izvēlnē"
+
#: src/lib/amd.c:170
msgid "AMD: cannot found ADL library."
msgstr "AMD: nevar atrast ADL bibliotēku."
msgstr ""
"Project-Id-Version: psensor\n"
"Report-Msgid-Bugs-To: jeanfi@gmail.com\n"
-"POT-Creation-Date: 2014-04-10 08:17+0200\n"
+"POT-Creation-Date: 2014-04-19 10:21+0200\n"
"PO-Revision-Date: 2014-04-07 08:50+0000\n"
"Last-Translator: Pjotr12345 <Unknown>\n"
"Language-Team: Dutch <nl@li.org>\n"
msgid "Temperature unit:"
msgstr "Temperatuureenheid:"
+#: src/glade/psensor-pref.glade:201
+msgid "Celcius"
+msgstr ""
+
+#: src/glade/psensor-pref.glade:202
+msgid "Fahrenheit"
+msgstr ""
+
#: src/glade/psensor-pref.glade:238
msgid "Interface"
msgstr "Bedieningsschil"
msgid "Sensors"
msgstr "Sensoren"
+#: src/glade/psensor-pref.glade:797
+msgctxt "psensor"
+msgid "Right"
+msgstr ""
+
+#: src/glade/psensor-pref.glade:800
+msgid "Left"
+msgstr ""
+
+#: src/glade/psensor-pref.glade:803
+msgid "Top"
+msgstr ""
+
+#: src/glade/psensor-pref.glade:806
+msgid "Bottom"
+msgstr ""
+
#: src/glade/sensor-edit.glade:19
msgid "Edit Sensor Preferences"
msgstr "Sensorvoorkeuren bewerken"
msgstr "Drempel voor laag:"
#: src/glade/sensor-edit.glade:409
-msgid "Ubuntu Application Indicator"
+#, fuzzy
+msgid "Application Indicator"
msgstr "Ubuntu Toepassingsindicator"
#: src/glade/sensor-edit.glade:424
-msgid "Display sensor in the Application Indicator menu"
+#, fuzzy
+msgid "Display sensor in the menu"
msgstr "Sensor tonen in het menu van de Toepassingsindicator"
#: src/glade/sensor-edit.glade:444
msgid "Name:"
msgstr "Naam:"
+#: src/glade/sensor-edit.glade:553
+#, fuzzy
+msgid "Display sensor in the label"
+msgstr "Sensor tonen in het menu van de Toepassingsindicator"
+
#: src/lib/amd.c:170
msgid "AMD: cannot found ADL library."
msgstr "AMD: kan ADL-bibliotheekbestand niet vinden"
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: jeanfi@gmail.com\n"
-"POT-Creation-Date: 2014-04-10 08:17+0200\n"
+"POT-Creation-Date: 2014-04-19 10:21+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"
msgid "Temperature unit:"
msgstr ""
+#: src/glade/psensor-pref.glade:201
+msgid "Celcius"
+msgstr ""
+
+#: src/glade/psensor-pref.glade:202
+msgid "Fahrenheit"
+msgstr ""
+
#: src/glade/psensor-pref.glade:238
msgid "Interface"
msgstr ""
msgid "Sensors"
msgstr ""
+#: src/glade/psensor-pref.glade:797
+msgctxt "psensor"
+msgid "Right"
+msgstr ""
+
+#: src/glade/psensor-pref.glade:800
+msgid "Left"
+msgstr ""
+
+#: src/glade/psensor-pref.glade:803
+msgid "Top"
+msgstr ""
+
+#: src/glade/psensor-pref.glade:806
+msgid "Bottom"
+msgstr ""
+
#: src/glade/sensor-edit.glade:19
msgid "Edit Sensor Preferences"
msgstr ""
msgstr ""
#: src/glade/sensor-edit.glade:409
-msgid "Ubuntu Application Indicator"
+msgid "Application Indicator"
msgstr ""
#: src/glade/sensor-edit.glade:424
-msgid "Display sensor in the Application Indicator menu"
+msgid "Display sensor in the menu"
msgstr ""
#: src/glade/sensor-edit.glade:444
msgid "Name:"
msgstr ""
+#: src/glade/sensor-edit.glade:553
+msgid "Display sensor in the label"
+msgstr ""
+
#: src/lib/amd.c:170
msgid "AMD: cannot found ADL library."
msgstr ""
msgstr ""
"Project-Id-Version: psensor 0.7.0.x\n"
"Report-Msgid-Bugs-To: jeanfi@gmail.com\n"
-"POT-Creation-Date: 2014-04-10 08:17+0200\n"
+"POT-Creation-Date: 2014-04-19 10:21+0200\n"
"PO-Revision-Date: 2013-09-01 18:54+0000\n"
"Last-Translator: Celio Alves <Unknown>\n"
"Language-Team: Brazilian Portuguese\n"
msgid "Temperature unit:"
msgstr "Unidade de temperatura:"
+#: src/glade/psensor-pref.glade:201
+msgid "Celcius"
+msgstr ""
+
+#: src/glade/psensor-pref.glade:202
+msgid "Fahrenheit"
+msgstr ""
+
#: src/glade/psensor-pref.glade:238
msgid "Interface"
msgstr "Interface"
msgid "Sensors"
msgstr "Sensores"
+#: src/glade/psensor-pref.glade:797
+msgctxt "psensor"
+msgid "Right"
+msgstr ""
+
+#: src/glade/psensor-pref.glade:800
+msgid "Left"
+msgstr ""
+
+#: src/glade/psensor-pref.glade:803
+msgid "Top"
+msgstr ""
+
+#: src/glade/psensor-pref.glade:806
+msgid "Bottom"
+msgstr ""
+
#: src/glade/sensor-edit.glade:19
msgid "Edit Sensor Preferences"
msgstr "Editar preferências do sensor"
msgstr "Limite inferior:"
#: src/glade/sensor-edit.glade:409
-msgid "Ubuntu Application Indicator"
+msgid "Application Indicator"
msgstr ""
#: src/glade/sensor-edit.glade:424
-msgid "Display sensor in the Application Indicator menu"
+msgid "Display sensor in the menu"
msgstr ""
#: src/glade/sensor-edit.glade:444
msgid "Name:"
msgstr "Nome:"
+#: src/glade/sensor-edit.glade:553
+msgid "Display sensor in the label"
+msgstr ""
+
#: src/lib/amd.c:170
msgid "AMD: cannot found ADL library."
msgstr "AMD: não foi possível encontrar a biblioteca ADL."
msgstr ""
"Project-Id-Version: psensor 0.7.0.x\n"
"Report-Msgid-Bugs-To: jeanfi@gmail.com\n"
-"POT-Creation-Date: 2014-04-10 08:17+0200\n"
+"POT-Creation-Date: 2014-04-19 10:21+0200\n"
"PO-Revision-Date: 2014-01-27 16:37+0000\n"
"Last-Translator: Dmitry <dmitri.s93@gmail.com>\n"
"Language-Team: Russian\n"
msgid "Temperature unit:"
msgstr "Единица измерения температуры:"
+#: src/glade/psensor-pref.glade:201
+msgid "Celcius"
+msgstr ""
+
+#: src/glade/psensor-pref.glade:202
+msgid "Fahrenheit"
+msgstr ""
+
#: src/glade/psensor-pref.glade:238
msgid "Interface"
msgstr "Внешний вид"
msgid "Sensors"
msgstr "Датчики"
+#: src/glade/psensor-pref.glade:797
+msgctxt "psensor"
+msgid "Right"
+msgstr ""
+
+#: src/glade/psensor-pref.glade:800
+msgid "Left"
+msgstr ""
+
+#: src/glade/psensor-pref.glade:803
+msgid "Top"
+msgstr ""
+
+#: src/glade/psensor-pref.glade:806
+msgid "Bottom"
+msgstr ""
+
#: src/glade/sensor-edit.glade:19
msgid "Edit Sensor Preferences"
msgstr "Изменить параметры датчика"
msgstr "Нижний порог:"
#: src/glade/sensor-edit.glade:409
-msgid "Ubuntu Application Indicator"
+#, fuzzy
+msgid "Application Indicator"
msgstr "Индикатор приложения"
#: src/glade/sensor-edit.glade:424
-msgid "Display sensor in the Application Indicator menu"
+#, fuzzy
+msgid "Display sensor in the menu"
msgstr "Показать датчик в индикаторе меню приложений"
#: src/glade/sensor-edit.glade:444
msgid "Name:"
msgstr "Название:"
+#: src/glade/sensor-edit.glade:553
+#, fuzzy
+msgid "Display sensor in the label"
+msgstr "Показать датчик в индикаторе меню приложений"
+
#: src/lib/amd.c:170
msgid "AMD: cannot found ADL library."
msgstr "AMD: библиотека ADL не найдена."
msgstr ""
"Project-Id-Version: psensor\n"
"Report-Msgid-Bugs-To: jeanfi@gmail.com\n"
-"POT-Creation-Date: 2014-04-10 08:17+0200\n"
+"POT-Creation-Date: 2014-04-19 10:21+0200\n"
"PO-Revision-Date: 2012-04-14 21:02+0000\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: Slovenian <sl@li.org>\n"
msgid "Temperature unit:"
msgstr ""
+#: src/glade/psensor-pref.glade:201
+msgid "Celcius"
+msgstr ""
+
+#: src/glade/psensor-pref.glade:202
+msgid "Fahrenheit"
+msgstr ""
+
#: src/glade/psensor-pref.glade:238
msgid "Interface"
msgstr ""
msgid "Sensors"
msgstr ""
+#: src/glade/psensor-pref.glade:797
+msgctxt "psensor"
+msgid "Right"
+msgstr ""
+
+#: src/glade/psensor-pref.glade:800
+msgid "Left"
+msgstr ""
+
+#: src/glade/psensor-pref.glade:803
+msgid "Top"
+msgstr ""
+
+#: src/glade/psensor-pref.glade:806
+msgid "Bottom"
+msgstr ""
+
#: src/glade/sensor-edit.glade:19
msgid "Edit Sensor Preferences"
msgstr ""
msgstr ""
#: src/glade/sensor-edit.glade:409
-msgid "Ubuntu Application Indicator"
+msgid "Application Indicator"
msgstr ""
#: src/glade/sensor-edit.glade:424
-msgid "Display sensor in the Application Indicator menu"
+msgid "Display sensor in the menu"
msgstr ""
#: src/glade/sensor-edit.glade:444
msgid "Name:"
msgstr ""
+#: src/glade/sensor-edit.glade:553
+msgid "Display sensor in the label"
+msgstr ""
+
#: src/lib/amd.c:170
msgid "AMD: cannot found ADL library."
msgstr ""
msgstr ""
"Project-Id-Version: psensor\n"
"Report-Msgid-Bugs-To: jeanfi@gmail.com\n"
-"POT-Creation-Date: 2014-04-10 08:17+0200\n"
+"POT-Creation-Date: 2014-04-19 10:21+0200\n"
"PO-Revision-Date: 2012-05-03 02:31+0000\n"
"Last-Translator: Мирослав Николић <miroslavnikolic@rocketmail.com>\n"
"Language-Team: Serbian <sr@li.org>\n"
msgid "Temperature unit:"
msgstr ""
+#: src/glade/psensor-pref.glade:201
+msgid "Celcius"
+msgstr ""
+
+#: src/glade/psensor-pref.glade:202
+msgid "Fahrenheit"
+msgstr ""
+
#: src/glade/psensor-pref.glade:238
msgid "Interface"
msgstr ""
msgid "Sensors"
msgstr "Сензор"
+#: src/glade/psensor-pref.glade:797
+msgctxt "psensor"
+msgid "Right"
+msgstr ""
+
+#: src/glade/psensor-pref.glade:800
+msgid "Left"
+msgstr ""
+
+#: src/glade/psensor-pref.glade:803
+msgid "Top"
+msgstr ""
+
+#: src/glade/psensor-pref.glade:806
+msgid "Bottom"
+msgstr ""
+
#: src/glade/sensor-edit.glade:19
msgid "Edit Sensor Preferences"
msgstr ""
msgstr ""
#: src/glade/sensor-edit.glade:409
-msgid "Ubuntu Application Indicator"
+msgid "Application Indicator"
msgstr ""
#: src/glade/sensor-edit.glade:424
-msgid "Display sensor in the Application Indicator menu"
+msgid "Display sensor in the menu"
msgstr ""
#: src/glade/sensor-edit.glade:444
msgid "Name:"
msgstr ""
+#: src/glade/sensor-edit.glade:553
+msgid "Display sensor in the label"
+msgstr ""
+
#: src/lib/amd.c:170
msgid "AMD: cannot found ADL library."
msgstr ""
msgstr ""
"Project-Id-Version: psensor\n"
"Report-Msgid-Bugs-To: jeanfi@gmail.com\n"
-"POT-Creation-Date: 2014-04-10 08:17+0200\n"
+"POT-Creation-Date: 2014-04-19 10:21+0200\n"
"PO-Revision-Date: 2013-11-24 08:42+0000\n"
"Last-Translator: İbrahim Çelik <ibrahimcelik89@gmail.com>\n"
"Language-Team: Turkish <tr@li.org>\n"
msgid "Temperature unit:"
msgstr "Sıcaklık birimi:"
+#: src/glade/psensor-pref.glade:201
+msgid "Celcius"
+msgstr ""
+
+#: src/glade/psensor-pref.glade:202
+msgid "Fahrenheit"
+msgstr ""
+
#: src/glade/psensor-pref.glade:238
msgid "Interface"
msgstr "Arayüz"
msgid "Sensors"
msgstr "Algılayıcılar"
+#: src/glade/psensor-pref.glade:797
+msgctxt "psensor"
+msgid "Right"
+msgstr ""
+
+#: src/glade/psensor-pref.glade:800
+msgid "Left"
+msgstr ""
+
+#: src/glade/psensor-pref.glade:803
+msgid "Top"
+msgstr ""
+
+#: src/glade/psensor-pref.glade:806
+msgid "Bottom"
+msgstr ""
+
#: src/glade/sensor-edit.glade:19
msgid "Edit Sensor Preferences"
msgstr "Algılayıcı Tercihlerini Düzenle"
msgstr "Düşük eşik:"
#: src/glade/sensor-edit.glade:409
-msgid "Ubuntu Application Indicator"
+#, fuzzy
+msgid "Application Indicator"
msgstr "Ubuntu Uygulama Göstergesi"
#: src/glade/sensor-edit.glade:424
-msgid "Display sensor in the Application Indicator menu"
+#, fuzzy
+msgid "Display sensor in the menu"
msgstr "Algılayıcıyı Uygulama Göstergesi menüsünde göster"
#: src/glade/sensor-edit.glade:444
msgid "Name:"
msgstr "İsim:"
+#: src/glade/sensor-edit.glade:553
+#, fuzzy
+msgid "Display sensor in the label"
+msgstr "Algılayıcıyı Uygulama Göstergesi menüsünde göster"
+
#: src/lib/amd.c:170
msgid "AMD: cannot found ADL library."
msgstr "AMD: ADL kütüphanesi bulunamadı."
msgstr ""
"Project-Id-Version: psensor\n"
"Report-Msgid-Bugs-To: jeanfi@gmail.com\n"
-"POT-Creation-Date: 2014-04-10 08:17+0200\n"
+"POT-Creation-Date: 2014-04-19 10:21+0200\n"
"PO-Revision-Date: 2012-10-13 16:24+0000\n"
"Last-Translator: Ilya Volchanetskiy <Unknown>\n"
"Language-Team: Ukrainian <uk@li.org>\n"
msgid "Temperature unit:"
msgstr "Одиниця температури:"
+#: src/glade/psensor-pref.glade:201
+msgid "Celcius"
+msgstr ""
+
+#: src/glade/psensor-pref.glade:202
+msgid "Fahrenheit"
+msgstr ""
+
#: src/glade/psensor-pref.glade:238
msgid "Interface"
msgstr "Зовнішній вигляд"
msgid "Sensors"
msgstr "Датчики"
+#: src/glade/psensor-pref.glade:797
+msgctxt "psensor"
+msgid "Right"
+msgstr ""
+
+#: src/glade/psensor-pref.glade:800
+msgid "Left"
+msgstr ""
+
+#: src/glade/psensor-pref.glade:803
+msgid "Top"
+msgstr ""
+
+#: src/glade/psensor-pref.glade:806
+msgid "Bottom"
+msgstr ""
+
#: src/glade/sensor-edit.glade:19
msgid "Edit Sensor Preferences"
msgstr "Редагувати налаштування датчика"
msgstr "Нижчий поріг:"
#: src/glade/sensor-edit.glade:409
-msgid "Ubuntu Application Indicator"
+msgid "Application Indicator"
msgstr ""
#: src/glade/sensor-edit.glade:424
-msgid "Display sensor in the Application Indicator menu"
+msgid "Display sensor in the menu"
msgstr ""
#: src/glade/sensor-edit.glade:444
msgid "Name:"
msgstr "Назва:"
+#: src/glade/sensor-edit.glade:553
+msgid "Display sensor in the label"
+msgstr ""
+
#: src/lib/amd.c:170
msgid "AMD: cannot found ADL library."
msgstr "AMD: не вдалося знайти бібліотеку ADL."
msgstr ""
"Project-Id-Version: psensor\n"
"Report-Msgid-Bugs-To: jeanfi@gmail.com\n"
-"POT-Creation-Date: 2014-04-10 08:17+0200\n"
+"POT-Creation-Date: 2014-04-19 10:21+0200\n"
"PO-Revision-Date: 2013-01-15 12:24+0000\n"
"Last-Translator: Wang Dianjin <Unknown>\n"
"Language-Team: Chinese (simplified)\n"
msgid "Temperature unit:"
msgstr "温度单位:"
+#: src/glade/psensor-pref.glade:201
+msgid "Celcius"
+msgstr ""
+
+#: src/glade/psensor-pref.glade:202
+msgid "Fahrenheit"
+msgstr ""
+
#: src/glade/psensor-pref.glade:238
msgid "Interface"
msgstr "界面"
msgid "Sensors"
msgstr "传感器"
+#: src/glade/psensor-pref.glade:797
+msgctxt "psensor"
+msgid "Right"
+msgstr ""
+
+#: src/glade/psensor-pref.glade:800
+msgid "Left"
+msgstr ""
+
+#: src/glade/psensor-pref.glade:803
+msgid "Top"
+msgstr ""
+
+#: src/glade/psensor-pref.glade:806
+msgid "Bottom"
+msgstr ""
+
#: src/glade/sensor-edit.glade:19
msgid "Edit Sensor Preferences"
msgstr "编辑传感器首选项"
msgstr "低阈值:"
#: src/glade/sensor-edit.glade:409
-msgid "Ubuntu Application Indicator"
+#, fuzzy
+msgid "Application Indicator"
msgstr "Ubuntu 应用指示器"
#: src/glade/sensor-edit.glade:424
-msgid "Display sensor in the Application Indicator menu"
+#, fuzzy
+msgid "Display sensor in the menu"
msgstr "在应用指示器菜单中显示监视器"
#: src/glade/sensor-edit.glade:444
msgid "Name:"
msgstr "名称:"
+#: src/glade/sensor-edit.glade:553
+#, fuzzy
+msgid "Display sensor in the label"
+msgstr "在应用指示器菜单中显示监视器"
+
#: src/lib/amd.c:170
msgid "AMD: cannot found ADL library."
msgstr "AMD:未找到 ADL 库。"
static const char *ATT_SENSOR_ENABLED = "enabled";
static const char *ATT_SENSOR_NAME = "name";
static const char *ATT_SENSOR_APPINDICATOR_DISABLED = "appindicator/disabled";
+static const char *ATT_SENSOR_APPINDICATOR_LABEL_ENABLED
+= "appindicator/menu/enabled";
+
static const char *ATT_SENSOR_POSITION = "position";
static const char *KEY_SENSOR_UPDATE_INTERVAL
free(key);
}
+bool config_is_appindicator_label_enabled(const char *sid)
+{
+ char *key;
+ gboolean b;
+
+ key = get_sensor_att_key(sid, ATT_SENSOR_APPINDICATOR_LABEL_ENABLED);
+ b = gconf_client_get_bool(client, key, NULL);
+ free(key);
+
+ return b;
+}
+
+void config_set_appindicator_label_enabled(const char *sid, bool enabled)
+{
+ char *key;
+
+ key = get_sensor_att_key(sid, ATT_SENSOR_APPINDICATOR_LABEL_ENABLED);
+ gconf_client_set_bool(client, key, enabled, NULL);
+ free(key);
+}
+
bool is_slog_enabled()
{
return gconf_client_get_bool(client, KEY_SLOG_ENABLED, NULL);
bool config_is_appindicator_enabled(const char *);
void config_set_appindicator_enabled(const char *, bool);
+bool config_is_appindicator_label_enabled(const char *);
+void config_set_appindicator_label_enabled(const char *, bool);
+
void config_slog_enabled_notify_add(GConfClientNotifyFunc cbk, void *data);
bool is_slog_enabled();
<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.16.1 -->
<interface>
- <!-- interface-requires gtk+ 3.0 -->
+ <requires lib="gtk+" version="3.0"/>
<object class="GtkAdjustment" id="alarm_high_threshold_value">
<property name="lower">-9999</property>
<property name="upper">9999</property>
<property name="step_increment">1</property>
<property name="page_increment">10</property>
</object>
+ <object class="GtkListStore" id="sensors_liststore">
+ <columns>
+ <!-- column-name Name -->
+ <column type="gchararray"/>
+ <!-- column-name Sensor -->
+ <column type="gpointer"/>
+ </columns>
+ </object>
<object class="GtkDialog" id="dialog1">
<property name="can_focus">False</property>
<property name="border_width">5</property>
<object class="GtkTable" id="table1">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="n_rows">15</property>
+ <property name="n_rows">16</property>
<property name="n_columns">2</property>
<child>
<placeholder/>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="invisible_char">•</property>
- <property name="invisible_char_set">True</property>
<property name="primary_icon_activatable">False</property>
<property name="secondary_icon_activatable">False</property>
+ <signal name="changed" handler="ui_sensorpref_name_changed_cb" swapped="no"/>
</object>
<packing>
<property name="left_attach">1</property>
<property name="receives_default">False</property>
<property name="xalign">0</property>
<property name="draw_indicator">True</property>
+ <signal name="toggled" handler="ui_sensorpref_alarm_toggled_cb" swapped="no"/>
</object>
<packing>
<property name="right_attach">2</property>
<property name="receives_default">False</property>
<property name="xalign">0</property>
<property name="draw_indicator">True</property>
+ <signal name="toggled" handler="ui_sensorpref_draw_toggled_cb" swapped="no"/>
</object>
<packing>
<property name="right_attach">2</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="invisible_char">•</property>
- <property name="invisible_char_set">True</property>
<property name="primary_icon_activatable">False</property>
<property name="secondary_icon_activatable">False</property>
<property name="adjustment">alarm_high_threshold_value</property>
<property name="snap_to_ticks">True</property>
<property name="numeric">True</property>
<property name="update_policy">if-valid</property>
+ <signal name="value-changed" handler="ui_sensorpref_alarm_high_threshold_changed_cb" swapped="no"/>
</object>
<packing>
<property name="expand">False</property>
<property name="receives_default">True</property>
<property name="xalign">0</property>
<property name="color">#000000000000</property>
+ <signal name="color-set" handler="ui_sensorpref_color_set_cb" swapped="no"/>
</object>
<packing>
<property name="left_attach">1</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="invisible_char">•</property>
- <property name="invisible_char_set">True</property>
<property name="primary_icon_activatable">False</property>
<property name="secondary_icon_activatable">False</property>
<property name="adjustment">alarm_low_threshold_value</property>
<property name="snap_to_ticks">True</property>
<property name="numeric">True</property>
<property name="update_policy">if-valid</property>
+ <signal name="value-changed" handler="ui_sensorpref_alarm_low_threshold_changed_cb" swapped="no"/>
</object>
<packing>
<property name="expand">False</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">Ubuntu Application Indicator</property>
+ <property name="label" translatable="yes">Application Indicator</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
</child>
<child>
<object class="GtkCheckButton" id="indicator_checkbox">
- <property name="label" translatable="yes">Display sensor in the Application Indicator menu</property>
+ <property name="label" translatable="yes">Display sensor in the menu</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="xalign">0</property>
<property name="draw_indicator">True</property>
+ <signal name="toggled" handler="ui_sensorpref_appindicator_menu_toggled_cb" swapped="no"/>
</object>
<packing>
<property name="right_attach">2</property>
<property name="y_padding">4</property>
</packing>
</child>
+ <child>
+ <object class="GtkCheckButton" id="indicator_label_checkbox">
+ <property name="label" translatable="yes">Display sensor in the label</property>
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="receives_default">False</property>
+ <property name="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ <signal name="toggled" handler="ui_sensorpref_appindicator_label_toggled_cb" swapped="no"/>
+ </object>
+ <packing>
+ <property name="right_attach">2</property>
+ <property name="top_attach">15</property>
+ <property name="bottom_attach">16</property>
+ <property name="x_padding">14</property>
+ <property name="y_padding">4</property>
+ </packing>
+ </child>
</object>
<packing>
<property name="resize">True</property>
<action-widget response="0">btn_cancel</action-widget>
</action-widgets>
</object>
- <object class="GtkListStore" id="sensors_liststore">
- <columns>
- <!-- column-name Name -->
- <column type="gchararray"/>
- <!-- column-name Sensor -->
- <column type="gpointer"/>
- </columns>
- </object>
</interface>
void ui_appindicator_update(struct ui_psensor *ui, unsigned int attention)
{
AppIndicatorStatus status;
- char *label;
- double v;
+ char *label, *str, *tmp;
+ struct psensor **p;
if (!indicator)
return;
status = app_indicator_get_status(indicator);
- v = psensor_get_max_current_value(ui->sensors, SENSOR_TYPE_TEMP);
- if (v != UNKNOWN_DBL_VALUE) {
- label = psensor_value_to_str(SENSOR_TYPE_TEMP, v, 1);
- app_indicator_set_label(indicator, label, NULL);
- free(label);
+ p = ui_get_sensors_ordered_by_position(ui);
+ label = NULL;
+ while (*p) {
+ if (config_is_appindicator_label_enabled((*p)->id)) {
+ str = psensor_current_value_to_str(*p, 1);
+ if (label == NULL) {
+ label = str;
+ } else {
+ tmp = malloc(strlen(label)
+ + 1
+ + strlen(str)
+ + 1);
+ sprintf(tmp, "%s %s", label, str);
+ free(label);
+ free(str);
+ label = tmp;
+ }
+ }
+ p++;
}
+ app_indicator_set_label(indicator, label, NULL);
+
if (!attention && status == APP_INDICATOR_STATUS_ATTENTION)
app_indicator_set_status(indicator,
APP_INDICATOR_STATUS_ACTIVE);
int alarm_high_threshold;
int alarm_low_threshold;
unsigned int appindicator_enabled;
+ unsigned int appindicator_label_enabled;
};
struct cb_data {
}
p->appindicator_enabled = s->appindicator_enabled;
+ p->appindicator_label_enabled
+ = config_is_appindicator_label_enabled(s->id);
return p;
}
return pref;
}
-static void on_name_changed(GtkEntry *entry, gpointer data)
+void ui_sensorpref_name_changed_cb(GtkEntry *entry, gpointer data)
{
struct sensor_pref *p;
const char *str;
}
}
-static void on_drawed_toggled(GtkToggleButton *btn, gpointer data)
+void ui_sensorpref_draw_toggled_cb(GtkToggleButton *btn, gpointer data)
{
struct sensor_pref *p;
p->enabled = gtk_toggle_button_get_active(btn);
}
-static void on_alarm_toggled(GtkToggleButton *btn, gpointer data)
+void ui_sensorpref_alarm_toggled_cb(GtkToggleButton *btn, gpointer data)
{
struct sensor_pref *p;
p->alarm_enabled = gtk_toggle_button_get_active(btn);
}
-static void on_appindicator_toggled(GtkToggleButton *btn, gpointer data)
+void
+ui_sensorpref_appindicator_menu_toggled_cb(GtkToggleButton *btn, gpointer data)
{
struct sensor_pref *p;
p->appindicator_enabled = gtk_toggle_button_get_active(btn);
}
-static void on_color_set(GtkColorButton *widget, gpointer data)
+void
+ui_sensorpref_appindicator_label_toggled_cb(GtkToggleButton *btn, gpointer data)
+{
+ struct sensor_pref *p;
+
+ p = get_selected_sensor_pref(GTK_TREE_VIEW(data));
+
+ if (p)
+ p->appindicator_label_enabled
+ = gtk_toggle_button_get_active(btn);
+}
+
+void ui_sensorpref_color_set_cb(GtkColorButton *widget, gpointer data)
{
struct sensor_pref *p;
GdkColor color;
}
}
-static void on_alarm_high_threshold_changed(GtkSpinButton *btn, gpointer data)
+void
+ui_sensorpref_alarm_high_threshold_changed_cb(GtkSpinButton *btn, gpointer data)
{
struct sensor_pref *p;
p->alarm_high_threshold = gtk_spin_button_get_value(btn);
}
-static void on_alarm_low_threshold_changed(GtkSpinButton *btn, gpointer data)
+void
+ui_sensorpref_alarm_low_threshold_changed_cb(GtkSpinButton *btn, gpointer data)
{
struct sensor_pref *p;
p->alarm_low_threshold = gtk_spin_button_get_value(btn);
}
-static void connect_signals(GtkBuilder *builder, GtkTreeView *tree)
-{
- g_signal_connect(gtk_builder_get_object(builder, "sensor_name"),
- "changed", G_CALLBACK(on_name_changed), tree);
-
- g_signal_connect(gtk_builder_get_object(builder, "sensor_draw"),
- "toggled", G_CALLBACK(on_drawed_toggled), tree);
-
- g_signal_connect(gtk_builder_get_object(builder, "sensor_color"),
- "color-set", G_CALLBACK(on_color_set), tree);
-
- g_signal_connect(gtk_builder_get_object(builder, "sensor_alarm"),
- "toggled", G_CALLBACK(on_alarm_toggled), tree);
-
- g_signal_connect(gtk_builder_get_object(builder,
- "sensor_alarm_high_threshold"),
- "value-changed",
- G_CALLBACK(on_alarm_high_threshold_changed),
- tree);
-
- g_signal_connect(gtk_builder_get_object(builder,
- "sensor_alarm_low_threshold"),
- "value-changed",
- G_CALLBACK(on_alarm_low_threshold_changed),
- tree);
-
- g_signal_connect(gtk_builder_get_object(builder,
- "indicator_checkbox"),
- "toggled",
- G_CALLBACK(on_appindicator_toggled),
- tree);
-}
-
static void
update_pref(struct sensor_pref *p, struct config *cfg, GtkBuilder *builder)
{
GtkLabel *w_id, *w_type, *w_high_threshold_unit, *w_low_threshold_unit,
*w_chipname;
GtkEntry *w_name;
- GtkToggleButton *w_draw, *w_alarm, *w_appindicator_enabled;
+ GtkToggleButton *w_draw, *w_alarm, *w_appindicator_enabled,
+ *w_appindicator_label_enabled;
GtkColorButton *w_color;
GtkSpinButton *w_high_threshold, *w_low_threshold;
GdkColor *color;
w_appindicator_enabled = GTK_TOGGLE_BUTTON
(gtk_builder_get_object(builder, "indicator_checkbox"));
+ w_appindicator_label_enabled = GTK_TOGGLE_BUTTON
+ (gtk_builder_get_object(builder, "indicator_label_checkbox"));
+
if (is_temp_type(s->type) || is_fan_type(s->type)) {
gtk_toggle_button_set_active(w_alarm, p->alarm_enabled);
gtk_toggle_button_set_active(w_appindicator_enabled,
p->appindicator_enabled);
+
+ gtk_toggle_button_set_active(w_appindicator_label_enabled,
+ p->appindicator_label_enabled);
}
static void on_changed(GtkTreeSelection *selection, gpointer data)
config_set_appindicator_enabled(s->id, s->appindicator_enabled);
}
+ config_set_appindicator_label_enabled(s->id,
+ p->appindicator_label_enabled);
+
config_set_sensor_position(s->id, pos);
}
w_sensors_list
= GTK_TREE_VIEW(gtk_builder_get_object(builder,
"sensors_list"));
- connect_signals(builder, w_sensors_list);
+ gtk_builder_connect_signals(builder, w_sensors_list);
store = GTK_LIST_STORE(gtk_builder_get_object(builder,
"sensors_liststore"));