From: Jean-Philippe Orsini Date: Mon, 1 Sep 2014 23:39:57 +0000 (+0200) Subject: * All mouse buttons can be used to raise color settings in the list of X-Git-Tag: v1.1.2~142 X-Git-Url: https://git.wpitchoune.net/gitweb/?p=psensor.git;a=commitdiff_plain;h=160de7f714445570f8b3ea7137e0fdc2cbc8bc40 * All mouse buttons can be used to raise color settings in the list of sensors. * All mouse buttons can be used to popup menu in the list of sensors. * List of sensors UI defined in glade file instead of code. * Fixed graph enabled setting not saved when toggle in the list of sensors. --- diff --git a/NEWS b/NEWS index d7e3aa1..c725b1c 100644 --- a/NEWS +++ b/NEWS @@ -5,6 +5,12 @@ v1.1.2 ------ * Fixed missing description in psensor manpage. +* All mouse buttons can be used to raise color settings in the list of + sensors. +* All mouse buttons can be used to popup menu in the list of sensors. +* List of sensors UI defined in glade file instead of code. +* Fixed graph enabled setting not saved when toggle in the list of + sensors. v1.1.1 ------ diff --git a/configure b/configure index e5adf4f..111182c 100755 --- a/configure +++ b/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for psensor 1.1.1. +# Generated by GNU Autoconf 2.69 for psensor 1.1.0.x. # # Report bugs to . # @@ -580,8 +580,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='psensor' PACKAGE_TARNAME='psensor' -PACKAGE_VERSION='1.1.1' -PACKAGE_STRING='psensor 1.1.1' +PACKAGE_VERSION='1.1.0.x' +PACKAGE_STRING='psensor 1.1.0.x' PACKAGE_BUGREPORT='jeanfi@gmail.com' PACKAGE_URL='http://wpitchoune.net/psensor' @@ -1396,7 +1396,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures psensor 1.1.1 to adapt to many kinds of systems. +\`configure' configures psensor 1.1.0.x to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1470,7 +1470,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of psensor 1.1.1:";; + short | recursive ) echo "Configuration of psensor 1.1.0.x:";; esac cat <<\_ACEOF @@ -1612,7 +1612,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -psensor configure 1.1.1 +psensor configure 1.1.0.x generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2035,7 +2035,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by psensor $as_me 1.1.1, which was +It was created by psensor $as_me 1.1.0.x, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2852,7 +2852,7 @@ fi # Define the identity of the package. PACKAGE='psensor' - VERSION='1.1.1' + VERSION='1.1.0.x' cat >>confdefs.h <<_ACEOF @@ -9912,7 +9912,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by psensor $as_me 1.1.1, which was +This file was extended by psensor $as_me 1.1.0.x, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -9979,7 +9979,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -psensor config.status 1.1.1 +psensor config.status 1.1.0.x configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff --git a/po/Makefile.in b/po/Makefile.in index ce156ae..9bee9bc 100644 --- a/po/Makefile.in +++ b/po/Makefile.in @@ -11,7 +11,7 @@ # Origin: gettext-0.16 PACKAGE = psensor -VERSION = 1.1.1 +VERSION = 1.1.0.x PACKAGE_BUGREPORT = jeanfi@gmail.com SHELL = /bin/sh diff --git a/po/de.po b/po/de.po index 74cc44e..e6f4c7b 100644 --- a/po/de.po +++ b/po/de.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: psensor 0.7.0.x\n" "Report-Msgid-Bugs-To: jeanfi@gmail.com\n" -"POT-Creation-Date: 2014-08-27 10:01+0200\n" +"POT-Creation-Date: 2014-09-01 21:28+0200\n" "PO-Revision-Date: 2014-04-30 16:48+0100\n" "Last-Translator: Jean-Philippe Orsini \n" "Language-Team: German\n" @@ -71,6 +71,14 @@ msgstr "_Psensor" msgid "_Help" msgstr "_Hilfe" +#: src/glade/psensor.glade:312 +msgid "Sensor" +msgstr "Sensor" + +#: src/glade/psensor.glade:323 +msgid "Value" +msgstr "Wert" + #: src/glade/psensor-pref.glade:24 msgctxt "psensor" msgid "Right" @@ -372,7 +380,7 @@ msgstr "" msgid "VIA CPU" msgstr "" -#: src/lib/lmsensor.c:218 +#: src/lib/lmsensor.c:221 #, c-format msgid "lmsensor: initialization failure: %s." msgstr "lmsensor: Initialisierung gescheitert: %s." @@ -661,14 +669,6 @@ msgstr "Laden des Psensor-Symbols ist gescheitert." msgid "Select foreground color" msgstr "Wählen Sie eine Vordergrundfarbe" -#: src/ui_sensorlist.c:327 -msgid "Sensor" -msgstr "Sensor" - -#: src/ui_sensorlist.c:333 -msgid "Value" -msgstr "Wert" - #: src/ui_sensorlist.c:339 msgid "Min" msgstr "Min." diff --git a/po/es.po b/po/es.po index 96f95aa..cb2c048 100644 --- a/po/es.po +++ b/po/es.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: psensor\n" "Report-Msgid-Bugs-To: jeanfi@gmail.com\n" -"POT-Creation-Date: 2014-08-27 10:01+0200\n" +"POT-Creation-Date: 2014-09-01 21:28+0200\n" "PO-Revision-Date: 2013-05-12 22:16+0000\n" "Last-Translator: Javier \n" "Language-Team: Spanish \n" @@ -71,6 +71,14 @@ msgstr "_Psensor" msgid "_Help" msgstr "_Ayuda" +#: src/glade/psensor.glade:312 +msgid "Sensor" +msgstr "Sensor" + +#: src/glade/psensor.glade:323 +msgid "Value" +msgstr "Valor" + #: src/glade/psensor-pref.glade:24 msgctxt "psensor" msgid "Right" @@ -374,7 +382,7 @@ msgstr "" msgid "VIA CPU" msgstr "" -#: src/lib/lmsensor.c:218 +#: src/lib/lmsensor.c:221 #, c-format msgid "lmsensor: initialization failure: %s." msgstr "lmsensor: Fallo de inicialización:%s." @@ -662,14 +670,6 @@ msgstr "Error al cargar el icono de Psensor" msgid "Select foreground color" msgstr "Seleccionar el color del primer plano" -#: src/ui_sensorlist.c:327 -msgid "Sensor" -msgstr "Sensor" - -#: src/ui_sensorlist.c:333 -msgid "Value" -msgstr "Valor" - #: src/ui_sensorlist.c:339 msgid "Min" msgstr "Mín" diff --git a/po/fr.po b/po/fr.po index 3f02095..5a0b110 100644 --- a/po/fr.po +++ b/po/fr.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: psensor\n" "Report-Msgid-Bugs-To: jeanfi@gmail.com\n" -"POT-Creation-Date: 2014-08-27 10:01+0200\n" +"POT-Creation-Date: 2014-09-01 21:28+0200\n" "PO-Revision-Date: 2013-06-29 15:14+0000\n" "Last-Translator: londumas \n" "Language-Team: French <>\n" @@ -71,6 +71,14 @@ msgstr "" msgid "_Help" msgstr "_Aide" +#: src/glade/psensor.glade:312 +msgid "Sensor" +msgstr "Capteur" + +#: src/glade/psensor.glade:323 +msgid "Value" +msgstr "Valeur" + #: src/glade/psensor-pref.glade:24 msgctxt "psensor" msgid "Right" @@ -375,7 +383,7 @@ msgstr "Processeur graphique NVIDIA" msgid "VIA CPU" msgstr "" -#: src/lib/lmsensor.c:218 +#: src/lib/lmsensor.c:221 #, c-format msgid "lmsensor: initialization failure: %s." msgstr "lmsensor : échec de l'initialisation: %s." @@ -665,14 +673,6 @@ msgstr "Échec du chargement de l’icône de Psensor." msgid "Select foreground color" msgstr "Sélectionner la couleur d'avant-plan" -#: src/ui_sensorlist.c:327 -msgid "Sensor" -msgstr "Capteur" - -#: src/ui_sensorlist.c:333 -msgid "Value" -msgstr "Valeur" - #: src/ui_sensorlist.c:339 msgid "Min" msgstr "Min" diff --git a/po/hu.po b/po/hu.po index a4a8e0a..902879e 100644 --- a/po/hu.po +++ b/po/hu.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: psensor\n" "Report-Msgid-Bugs-To: jeanfi@gmail.com\n" -"POT-Creation-Date: 2014-08-27 10:01+0200\n" +"POT-Creation-Date: 2014-09-01 21:28+0200\n" "PO-Revision-Date: 2014-08-21 11:43+0000\n" "Last-Translator: Richard Somlói \n" "Language-Team: Hungarian \n" @@ -72,6 +72,14 @@ msgstr "_Psensor" msgid "_Help" msgstr "_Súgó" +#: src/glade/psensor.glade:312 +msgid "Sensor" +msgstr "Érzékelő" + +#: src/glade/psensor.glade:323 +msgid "Value" +msgstr "Érték" + #: src/glade/psensor-pref.glade:24 msgctxt "psensor" msgid "Right" @@ -375,7 +383,7 @@ msgstr "NVIDIA videokártya" msgid "VIA CPU" msgstr "VIA processzor" -#: src/lib/lmsensor.c:218 +#: src/lib/lmsensor.c:221 #, c-format msgid "lmsensor: initialization failure: %s." msgstr "lmsensor: előkészítési hiba: %s." @@ -661,14 +669,6 @@ msgstr "Nem sikerült betölteni a Psensor ikonját." msgid "Select foreground color" msgstr "Előtérszín kiválasztása" -#: src/ui_sensorlist.c:327 -msgid "Sensor" -msgstr "Érzékelő" - -#: src/ui_sensorlist.c:333 -msgid "Value" -msgstr "Érték" - #: src/ui_sensorlist.c:339 msgid "Min" msgstr "Minimum" diff --git a/po/it.po b/po/it.po index d421310..c082e67 100644 --- a/po/it.po +++ b/po/it.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: psensor 0.7.0.x\n" "Report-Msgid-Bugs-To: jeanfi@gmail.com\n" -"POT-Creation-Date: 2014-08-27 10:01+0200\n" +"POT-Creation-Date: 2014-09-01 21:28+0200\n" "PO-Revision-Date: 2014-08-15 21:05+0000\n" "Last-Translator: Gabriele \n" "Language-Team: Italian\n" @@ -71,6 +71,14 @@ msgstr "_Psensor" msgid "_Help" msgstr "_Aiuto" +#: src/glade/psensor.glade:312 +msgid "Sensor" +msgstr "Sensore" + +#: src/glade/psensor.glade:323 +msgid "Value" +msgstr "Valore" + #: src/glade/psensor-pref.glade:24 msgctxt "psensor" msgid "Right" @@ -373,7 +381,7 @@ msgstr "CPU NVIDIA" msgid "VIA CPU" msgstr "CPU VIA" -#: src/lib/lmsensor.c:218 +#: src/lib/lmsensor.c:221 #, c-format msgid "lmsensor: initialization failure: %s." msgstr "lmsensor: inizializzazione fallita: %s" @@ -660,14 +668,6 @@ msgstr "Impossibile caricare l'icona di Psensor." msgid "Select foreground color" msgstr "Colore di primo piano:" -#: src/ui_sensorlist.c:327 -msgid "Sensor" -msgstr "Sensore" - -#: src/ui_sensorlist.c:333 -msgid "Value" -msgstr "Valore" - #: src/ui_sensorlist.c:339 msgid "Min" msgstr "Minimo" diff --git a/po/lv.po b/po/lv.po index d33a21b..f593252 100644 --- a/po/lv.po +++ b/po/lv.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: psensor\n" "Report-Msgid-Bugs-To: jeanfi@gmail.com\n" -"POT-Creation-Date: 2014-08-27 10:01+0200\n" +"POT-Creation-Date: 2014-09-01 21:28+0200\n" "PO-Revision-Date: 2014-06-04 22:47+0000\n" "Last-Translator: tuxmaniack \n" "Language-Team: Latvian \n" @@ -71,6 +71,14 @@ msgstr "_Psensor" msgid "_Help" msgstr "_Palīdzība" +#: src/glade/psensor.glade:312 +msgid "Sensor" +msgstr "Sensors" + +#: src/glade/psensor.glade:323 +msgid "Value" +msgstr "Vērtība" + #: src/glade/psensor-pref.glade:24 msgctxt "psensor" msgid "Right" @@ -374,7 +382,7 @@ msgstr "NVIDIA GPU" msgid "VIA CPU" msgstr "VIA CPU" -#: src/lib/lmsensor.c:218 +#: src/lib/lmsensor.c:221 #, c-format msgid "lmsensor: initialization failure: %s." msgstr "lmsensor: inicializācijas kļūda: %s." @@ -651,14 +659,6 @@ msgstr "Neizdevās ielādēt Psensor ikonu." msgid "Select foreground color" msgstr "Izvēlieties priekšplāna krāsu" -#: src/ui_sensorlist.c:327 -msgid "Sensor" -msgstr "Sensors" - -#: src/ui_sensorlist.c:333 -msgid "Value" -msgstr "Vērtība" - #: src/ui_sensorlist.c:339 msgid "Min" msgstr "Min." diff --git a/po/nl.po b/po/nl.po index 2ad5bc9..669050a 100644 --- a/po/nl.po +++ b/po/nl.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: psensor\n" "Report-Msgid-Bugs-To: jeanfi@gmail.com\n" -"POT-Creation-Date: 2014-08-27 10:01+0200\n" +"POT-Creation-Date: 2014-09-01 21:28+0200\n" "PO-Revision-Date: 2014-04-07 08:50+0000\n" "Last-Translator: Pjotr12345 \n" "Language-Team: Dutch \n" @@ -71,6 +71,14 @@ msgstr "_Psensor" msgid "_Help" msgstr "_Hulp" +#: src/glade/psensor.glade:312 +msgid "Sensor" +msgstr "Sensor" + +#: src/glade/psensor.glade:323 +msgid "Value" +msgstr "Waarde" + #: src/glade/psensor-pref.glade:24 msgctxt "psensor" msgid "Right" @@ -375,7 +383,7 @@ msgstr "" msgid "VIA CPU" msgstr "" -#: src/lib/lmsensor.c:218 +#: src/lib/lmsensor.c:221 #, c-format msgid "lmsensor: initialization failure: %s." msgstr "lmsensor: opstartfout: %s." @@ -663,14 +671,6 @@ msgstr "Kon pictogram van Psensor niet laden." msgid "Select foreground color" msgstr "Kies voorgrondkleur" -#: src/ui_sensorlist.c:327 -msgid "Sensor" -msgstr "Sensor" - -#: src/ui_sensorlist.c:333 -msgid "Value" -msgstr "Waarde" - #: src/ui_sensorlist.c:339 msgid "Min" msgstr "Min" diff --git a/po/psensor.pot b/po/psensor.pot index c21f555..d1715e0 100644 --- 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: 2014-08-27 10:01+0200\n" +"POT-Creation-Date: 2014-09-01 21:28+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -70,6 +70,14 @@ msgstr "" msgid "_Help" msgstr "" +#: src/glade/psensor.glade:312 +msgid "Sensor" +msgstr "" + +#: src/glade/psensor.glade:323 +msgid "Value" +msgstr "" + #: src/glade/psensor-pref.glade:24 msgctxt "psensor" msgid "Right" @@ -371,7 +379,7 @@ msgstr "" msgid "VIA CPU" msgstr "" -#: src/lib/lmsensor.c:218 +#: src/lib/lmsensor.c:221 #, c-format msgid "lmsensor: initialization failure: %s." msgstr "" @@ -625,14 +633,6 @@ msgstr "" msgid "Select foreground color" msgstr "" -#: src/ui_sensorlist.c:327 -msgid "Sensor" -msgstr "" - -#: src/ui_sensorlist.c:333 -msgid "Value" -msgstr "" - #: src/ui_sensorlist.c:339 msgid "Min" msgstr "" diff --git a/po/pt_BR.po b/po/pt_BR.po index b4c0801..69c0415 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: psensor 0.7.0.x\n" "Report-Msgid-Bugs-To: jeanfi@gmail.com\n" -"POT-Creation-Date: 2014-08-27 10:01+0200\n" +"POT-Creation-Date: 2014-09-01 21:28+0200\n" "PO-Revision-Date: 2013-09-01 18:54+0000\n" "Last-Translator: Celio Alves \n" "Language-Team: Brazilian Portuguese\n" @@ -71,6 +71,14 @@ msgstr "_Psensor" msgid "_Help" msgstr "Ajuda" +#: src/glade/psensor.glade:312 +msgid "Sensor" +msgstr "Sensor" + +#: src/glade/psensor.glade:323 +msgid "Value" +msgstr "Valor" + #: src/glade/psensor-pref.glade:24 msgctxt "psensor" msgid "Right" @@ -372,7 +380,7 @@ msgstr "" msgid "VIA CPU" msgstr "" -#: src/lib/lmsensor.c:218 +#: src/lib/lmsensor.c:221 #, c-format msgid "lmsensor: initialization failure: %s." msgstr "lmsensor: falha na inicialização: %s." @@ -639,14 +647,6 @@ msgstr "Falha ao carregar o ícone do Psensor." msgid "Select foreground color" msgstr "Selecionar cor do primeiro plano" -#: src/ui_sensorlist.c:327 -msgid "Sensor" -msgstr "Sensor" - -#: src/ui_sensorlist.c:333 -msgid "Value" -msgstr "Valor" - #: src/ui_sensorlist.c:339 msgid "Min" msgstr "Min" diff --git a/po/ru.po b/po/ru.po index 0c4e30c..af2e481 100644 --- a/po/ru.po +++ b/po/ru.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: psensor 0.7.0.x\n" "Report-Msgid-Bugs-To: jeanfi@gmail.com\n" -"POT-Creation-Date: 2014-08-27 10:01+0200\n" +"POT-Creation-Date: 2014-09-01 21:28+0200\n" "PO-Revision-Date: 2014-05-20 05:14+0000\n" "Last-Translator: Dmitry Serov \n" "Language-Team: Russian\n" @@ -72,6 +72,14 @@ msgstr "" msgid "_Help" msgstr "_Справка" +#: src/glade/psensor.glade:312 +msgid "Sensor" +msgstr "Датчик" + +#: src/glade/psensor.glade:323 +msgid "Value" +msgstr "Значение" + #: src/glade/psensor-pref.glade:24 msgctxt "psensor" msgid "Right" @@ -374,7 +382,7 @@ msgstr "" msgid "VIA CPU" msgstr "" -#: src/lib/lmsensor.c:218 +#: src/lib/lmsensor.c:221 #, c-format msgid "lmsensor: initialization failure: %s." msgstr "lmsensor: ошибка инициализации: %s." @@ -647,14 +655,6 @@ msgstr "Не удалось загрузить значок Psensor." msgid "Select foreground color" msgstr "Выберите цвет переднего плана" -#: src/ui_sensorlist.c:327 -msgid "Sensor" -msgstr "Датчик" - -#: src/ui_sensorlist.c:333 -msgid "Value" -msgstr "Значение" - #: src/ui_sensorlist.c:339 msgid "Min" msgstr "Мин." diff --git a/po/sl.po b/po/sl.po index 49a9516..86dd2c1 100644 --- a/po/sl.po +++ b/po/sl.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: psensor\n" "Report-Msgid-Bugs-To: jeanfi@gmail.com\n" -"POT-Creation-Date: 2014-08-27 10:01+0200\n" +"POT-Creation-Date: 2014-09-01 21:28+0200\n" "PO-Revision-Date: 2012-04-14 21:02+0000\n" "Last-Translator: Jean-Philippe Orsini \n" "Language-Team: Slovenian \n" @@ -71,6 +71,14 @@ msgstr "" msgid "_Help" msgstr "" +#: src/glade/psensor.glade:312 +msgid "Sensor" +msgstr "" + +#: src/glade/psensor.glade:323 +msgid "Value" +msgstr "" + #: src/glade/psensor-pref.glade:24 msgctxt "psensor" msgid "Right" @@ -372,7 +380,7 @@ msgstr "" msgid "VIA CPU" msgstr "" -#: src/lib/lmsensor.c:218 +#: src/lib/lmsensor.c:221 #, c-format msgid "lmsensor: initialization failure: %s." msgstr "" @@ -626,14 +634,6 @@ msgstr "" msgid "Select foreground color" msgstr "" -#: src/ui_sensorlist.c:327 -msgid "Sensor" -msgstr "" - -#: src/ui_sensorlist.c:333 -msgid "Value" -msgstr "" - #: src/ui_sensorlist.c:339 msgid "Min" msgstr "" diff --git a/po/sr.po b/po/sr.po index 681936c..3e36160 100644 --- a/po/sr.po +++ b/po/sr.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: psensor\n" "Report-Msgid-Bugs-To: jeanfi@gmail.com\n" -"POT-Creation-Date: 2014-08-27 10:01+0200\n" +"POT-Creation-Date: 2014-09-01 21:28+0200\n" "PO-Revision-Date: 2012-05-03 02:31+0000\n" "Last-Translator: Мирослав Николић \n" "Language-Team: Serbian \n" @@ -71,6 +71,14 @@ msgstr "" msgid "_Help" msgstr "" +#: src/glade/psensor.glade:312 +msgid "Sensor" +msgstr "Сензор" + +#: src/glade/psensor.glade:323 +msgid "Value" +msgstr "" + #: src/glade/psensor-pref.glade:24 msgctxt "psensor" msgid "Right" @@ -372,7 +380,7 @@ msgstr "" msgid "VIA CPU" msgstr "" -#: src/lib/lmsensor.c:218 +#: src/lib/lmsensor.c:221 #, c-format msgid "lmsensor: initialization failure: %s." msgstr "" @@ -626,14 +634,6 @@ msgstr "" msgid "Select foreground color" msgstr "Одаберите боју текста" -#: src/ui_sensorlist.c:327 -msgid "Sensor" -msgstr "Сензор" - -#: src/ui_sensorlist.c:333 -msgid "Value" -msgstr "" - #: src/ui_sensorlist.c:339 msgid "Min" msgstr "Најмање" diff --git a/po/sv.po b/po/sv.po index b19621c..680a16f 100644 --- a/po/sv.po +++ b/po/sv.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: psensor 1.0.0.0\n" "Report-Msgid-Bugs-To: jeanfi@gmail.com\n" -"POT-Creation-Date: 2014-08-27 10:01+0200\n" +"POT-Creation-Date: 2014-09-01 21:28+0200\n" "PO-Revision-Date: 2014-08-02 18:45+0000\n" "Last-Translator: Josef Andersson \n" "Language-Team: Swedish\n" @@ -74,6 +74,14 @@ msgstr "_Psensor" msgid "_Help" msgstr "_Hjälp" +#: src/glade/psensor.glade:312 +msgid "Sensor" +msgstr "Sensor" + +#: src/glade/psensor.glade:323 +msgid "Value" +msgstr "Värde" + #: src/glade/psensor-pref.glade:24 msgctxt "psensor" msgid "Right" @@ -376,7 +384,7 @@ msgstr "NVIDIA GPU" msgid "VIA CPU" msgstr "VIA CPU" -#: src/lib/lmsensor.c:218 +#: src/lib/lmsensor.c:221 #, c-format msgid "lmsensor: initialization failure: %s." msgstr "lmsensor: initialiseringsfel: %s." @@ -658,14 +666,6 @@ msgstr "Misslyckades med att läsa in Psensor-ikon." msgid "Select foreground color" msgstr "Välj förgrundsfärg" -#: src/ui_sensorlist.c:327 -msgid "Sensor" -msgstr "Sensor" - -#: src/ui_sensorlist.c:333 -msgid "Value" -msgstr "Värde" - #: src/ui_sensorlist.c:339 msgid "Min" msgstr "Min" diff --git a/po/tr.po b/po/tr.po index fd08f1c..17633ef 100644 --- 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: 2014-08-27 10:01+0200\n" +"POT-Creation-Date: 2014-09-01 21:28+0200\n" "PO-Revision-Date: 2014-07-19 20:17+0000\n" "Last-Translator: İbrahim Çelik \n" "Language-Team: Turkish \n" @@ -71,6 +71,14 @@ msgstr "_Psensor" msgid "_Help" msgstr "_Yardım" +#: src/glade/psensor.glade:312 +msgid "Sensor" +msgstr "Algılayıcı" + +#: src/glade/psensor.glade:323 +msgid "Value" +msgstr "Değer" + #: src/glade/psensor-pref.glade:24 msgctxt "psensor" msgid "Right" @@ -374,7 +382,7 @@ msgstr "NVIDIA Ekran Kartı" msgid "VIA CPU" msgstr "VIA İşlemci" -#: src/lib/lmsensor.c:218 +#: src/lib/lmsensor.c:221 #, c-format msgid "lmsensor: initialization failure: %s." msgstr "lmsensor: başlatma hatası: %s." @@ -662,14 +670,6 @@ msgstr "Psensor simgesi yüklenemedi." msgid "Select foreground color" msgstr "Önplan rengini seçin" -#: src/ui_sensorlist.c:327 -msgid "Sensor" -msgstr "Algılayıcı" - -#: src/ui_sensorlist.c:333 -msgid "Value" -msgstr "Değer" - #: src/ui_sensorlist.c:339 msgid "Min" msgstr "Asgari" diff --git a/po/uk.po b/po/uk.po index c2cdd83..8cf1dfe 100644 --- a/po/uk.po +++ b/po/uk.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: psensor\n" "Report-Msgid-Bugs-To: jeanfi@gmail.com\n" -"POT-Creation-Date: 2014-08-27 10:01+0200\n" +"POT-Creation-Date: 2014-09-01 21:28+0200\n" "PO-Revision-Date: 2012-10-13 16:24+0000\n" "Last-Translator: Ilya Volchanetskiy \n" "Language-Team: Ukrainian \n" @@ -71,6 +71,14 @@ msgstr "" msgid "_Help" msgstr "_Довдіка" +#: src/glade/psensor.glade:312 +msgid "Sensor" +msgstr "Датчик" + +#: src/glade/psensor.glade:323 +msgid "Value" +msgstr "Значення" + #: src/glade/psensor-pref.glade:24 msgctxt "psensor" msgid "Right" @@ -372,7 +380,7 @@ msgstr "" msgid "VIA CPU" msgstr "" -#: src/lib/lmsensor.c:218 +#: src/lib/lmsensor.c:221 #, c-format msgid "lmsensor: initialization failure: %s." msgstr "lmsensor: помилка ініціалізації: %s." @@ -640,14 +648,6 @@ msgstr "Не вдалося завантажити іконку Psensor." msgid "Select foreground color" msgstr "Оберіть колір переднього плану" -#: src/ui_sensorlist.c:327 -msgid "Sensor" -msgstr "Датчик" - -#: src/ui_sensorlist.c:333 -msgid "Value" -msgstr "Значення" - #: src/ui_sensorlist.c:339 msgid "Min" msgstr "Мін." diff --git a/po/zh_CN.po b/po/zh_CN.po index 4f7cbcc..20b1290 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: psensor\n" "Report-Msgid-Bugs-To: jeanfi@gmail.com\n" -"POT-Creation-Date: 2014-08-27 10:01+0200\n" +"POT-Creation-Date: 2014-09-01 21:28+0200\n" "PO-Revision-Date: 2014-05-01 13:23+0000\n" "Last-Translator: Wang Dianjin \n" "Language-Team: Chinese (simplified)\n" @@ -71,6 +71,14 @@ msgstr "" msgid "_Help" msgstr "帮助(_H)" +#: src/glade/psensor.glade:312 +msgid "Sensor" +msgstr "监视设备" + +#: src/glade/psensor.glade:323 +msgid "Value" +msgstr "值" + #: src/glade/psensor-pref.glade:24 msgctxt "psensor" msgid "Right" @@ -373,7 +381,7 @@ msgstr "" msgid "VIA CPU" msgstr "" -#: src/lib/lmsensor.c:218 +#: src/lib/lmsensor.c:221 #, c-format msgid "lmsensor: initialization failure: %s." msgstr "lmsensor：初始化失败：%s。" @@ -645,14 +653,6 @@ msgstr "无法加载 Psensor 图标。" msgid "Select foreground color" msgstr "选择前景色" -#: src/ui_sensorlist.c:327 -msgid "Sensor" -msgstr "监视设备" - -#: src/ui_sensorlist.c:333 -msgid "Value" -msgstr "值" - #: src/ui_sensorlist.c:339 msgid "Min" msgstr "最小值" diff --git a/src/Makefile.in b/src/Makefile.in index 0693ecb..f33a154 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -367,8 +367,8 @@ psensor_SOURCES = cfg.h cfg.c notify_cmd.c notify_cmd.h graph.h \ ui_sensorpref.c ui_status.h ui_status.c pxdg.h pxdg.c \ $(am__append_4) $(am__append_7) $(am__append_16) \ $(am__append_19) -EXTRA_DIST = $(gsettings_SCHEMAS) gsettings_SCHEMAS = psensor.gschema.xml +EXTRA_DIST = description.txt $(gsettings_SCHEMAS) all: all-recursive .SUFFIXES: diff --git a/src/glade/psensor.glade b/src/glade/psensor.glade index d70f9e9..565d2dd 100644 --- a/src/glade/psensor.glade +++ b/src/glade/psensor.glade @@ -297,7 +297,7 @@ True True - True + start True sensors_store 0 @@ -307,6 +307,74 @@ none + + + Sensor + + + + 0 + + + + + + + Value + + + + 1 + + + + + + + Min + + + + 2 + + + + + + + Max + + + + 3 + + + + + + + Color + + + + 5 + + + + + + + Graph + + + + + + 6 + + + + diff --git a/src/ui_sensorlist.c b/src/ui_sensorlist.c index d0138c7..b446259 100644 --- a/src/ui_sensorlist.c +++ b/src/ui_sensorlist.c @@ -238,9 +238,6 @@ static int clicked_cbk(GtkWidget *widget, GdkEventButton *event, gpointer data) struct psensor *s; int coli; - if (event->button != 3) - return FALSE; - ui = (struct ui_psensor *)data; view = ui->sensors_tree; @@ -250,26 +247,29 @@ static int clicked_cbk(GtkWidget *widget, GdkEventButton *event, gpointer data) coli = col_index_to_col(get_col_index_at_pos(view, event->x)); if (coli == COL_COLOR) { - if (ui_change_color(_("Select foreground color"), + if (ui_change_color(_("Select sensor color"), s->color, GTK_WINDOW(ui->main_window))) { ui_sensorlist_update(ui, 1); config_set_sensor_color(s->id, s->color); config_sync(); } + return TRUE; } else if (coli >= 0 && coli != COL_GRAPH_ENABLED) { menu = create_sensor_popup(ui, s); gtk_menu_popup(GTK_MENU(menu), NULL, NULL, NULL, NULL, event->button, event->time); + return TRUE; } } - return TRUE; + return FALSE; } -static void -toggled_cbk(GtkCellRendererToggle *cell, gchar *path_str, gpointer data) +void ui_sensorlist_cb_graph_toggled(GtkCellRendererToggle *cell, + gchar *path_str, + gpointer data) { struct ui_psensor *ui; GtkTreeModel *model, *fmodel; @@ -289,6 +289,7 @@ toggled_cbk(GtkCellRendererToggle *cell, gchar *path_str, gpointer data) s->graph_enabled ^= 1; config_set_sensor_graph_enabled(s->id, s->graph_enabled); + config_sync(); gtk_tree_path_free(path); @@ -309,10 +310,9 @@ toggled_cbk(GtkCellRendererToggle *cell, gchar *path_str, gpointer data) void ui_sensorlist_create(struct ui_psensor *ui) { - GtkCellRenderer *renderer; GtkTreeModel *fmodel, *model; - log_debug("ui_sensorlist_create()"); + log_fct_enter(); model = gtk_tree_view_get_model(ui->sensors_tree); fmodel = gtk_tree_model_filter_new(model, NULL); @@ -321,59 +321,10 @@ void ui_sensorlist_create(struct ui_psensor *ui) gtk_tree_view_set_model(ui->sensors_tree, fmodel); - renderer = gtk_cell_renderer_text_new(); - gtk_tree_view_insert_column_with_attributes(ui->sensors_tree, - -1, - _("Sensor"), - renderer, - "text", COL_NAME, NULL); - - gtk_tree_view_insert_column_with_attributes(ui->sensors_tree, - -1, - _("Value"), - renderer, - "text", COL_TEMP, NULL); - - gtk_tree_view_insert_column_with_attributes(ui->sensors_tree, - -1, - _("Min"), - renderer, - "text", COL_TEMP_MIN, NULL); - - gtk_tree_view_insert_column_with_attributes(ui->sensors_tree, - -1, - _("Max"), - renderer, - "text", COL_TEMP_MAX, NULL); - - renderer = gtk_cell_renderer_text_new(); - gtk_tree_view_insert_column_with_attributes(ui->sensors_tree, - -1, - _("Color"), - renderer, - "text", COL_COLOR, - "background", COL_COLOR_STR, - NULL); - g_signal_connect(ui->sensors_tree, "button-press-event", (GCallback)clicked_cbk, ui); - renderer = gtk_cell_renderer_toggle_new(); - gtk_tree_view_insert_column_with_attributes(ui->sensors_tree, - -1, - _("Graph"), - renderer, - "active", COL_GRAPH_ENABLED, - NULL); - g_signal_connect(G_OBJECT(renderer), - "toggled", (GCallback) toggled_cbk, ui); - - renderer = gtk_cell_renderer_text_new(); - gtk_tree_view_insert_column_with_attributes(ui->sensors_tree, - -1, - "", - renderer, - "text", COL_EMPTY, NULL); - ui_sensorlist_update(ui, 1); + + log_fct_exit(); }