From b6211b9c17d3c35702adcbb69d9c5884cb85f028 Mon Sep 17 00:00:00 2001 From: Jean-Philippe Orsini Date: Fri, 29 Mar 2013 08:53:40 +0000 Subject: [PATCH] defined sensors box, sensors list and graph widgets in the glade file. work in progress, layout changes not supported --- po/Makefile.in | 8 +++--- po/de.po | 22 ++++++++-------- po/es.po | 22 ++++++++-------- po/fr.po | 22 ++++++++-------- po/hu.po | 22 ++++++++-------- po/it.po | 22 ++++++++-------- po/lv.po | 22 ++++++++-------- po/psensor.pot | 22 ++++++++-------- po/pt_BR.po | 22 ++++++++-------- po/ru.po | 22 ++++++++-------- po/sl.po | 22 ++++++++-------- po/sr.po | 22 ++++++++-------- po/tr.po | 22 ++++++++-------- po/uk.po | 22 ++++++++-------- po/zh_CN.po | 22 ++++++++-------- src/glade/psensor.glade | 70 ++++++++++++++++++++++++++++++++++++++++++++++++- src/main.c | 7 ----- src/ui.c | 38 +++++++++++++++++++++------ src/ui.h | 3 +++ src/ui_graph.c | 8 +++--- src/ui_graph.h | 2 +- src/ui_sensorlist.c | 21 +++------------ src/ui_sensorlist.h | 3 --- 23 files changed, 270 insertions(+), 198 deletions(-) diff --git a/po/Makefile.in b/po/Makefile.in index 3465880..ccdb387 100644 --- a/po/Makefile.in +++ b/po/Makefile.in @@ -21,7 +21,7 @@ srcdir = . top_srcdir = .. -prefix = /tmp/p +prefix = /usr/local exec_prefix = ${prefix} datarootdir = ${prefix}/share datadir = ${datarootdir} @@ -34,12 +34,12 @@ INSTALL_DATA = ${INSTALL} -m 644 # 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/wpitchoune/svnpub/psensor/trunk/install-sh does not start with $(SHELL), so we add it. +# ${SHELL} /home/jporsini/work.local/wpitchoune/svnpub/psensor/trunk/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/wpitchoune/svnpub/psensor/trunk/install-sh -d -install_sh = $(SHELL) ${SHELL} /home/jporsini/work/wpitchoune/svnpub/psensor/trunk/install-sh +mkinstalldirs = $(SHELL) ${SHELL} /home/jporsini/work.local/wpitchoune/svnpub/psensor/trunk/install-sh -d +install_sh = $(SHELL) ${SHELL} /home/jporsini/work.local/wpitchoune/svnpub/psensor/trunk/install-sh MKDIR_P = /bin/mkdir -p mkdir_p = /bin/mkdir -p diff --git a/po/de.po b/po/de.po index f42389d..7fe05c9 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: 2013-03-25 21:21+0100\n" +"POT-Creation-Date: 2013-03-29 09:52+0100\n" "PO-Revision-Date: 2012-10-11 21:21+0000\n" "Last-Translator: Dennis Baudys \n" "Language-Team: German\n" @@ -34,16 +34,16 @@ msgstr "Beenden" msgid "Sensor Preferences" msgstr "Sensor-Einstellungen" -#: src/glade/psensor.glade:70 +#: src/glade/psensor.glade:94 msgid "Psensor - Temperature Monitor" msgstr "Psensor – Temperaturüberwachung" -#: src/glade/psensor.glade:85 +#: src/glade/psensor.glade:109 #, fuzzy msgid "_Psensor" msgstr "Sensor" -#: src/glade/psensor.glade:132 +#: src/glade/psensor.glade:156 msgid "_Help" msgstr "_Hilfe" @@ -132,7 +132,7 @@ msgid "Measures" msgstr "Messungen" #: src/glade/psensor-pref.glade:586 src/glade/sensor-edit.glade:152 -#: src/ui_sensorlist.c:349 +#: src/ui_sensorlist.c:352 msgid "Graph" msgstr "Graph" @@ -168,7 +168,7 @@ msgstr "Typ:" #: src/glade/sensor-edit.glade:136 src/glade/sensor-edit.glade:281 #: src/glade/sensor-edit.glade:377 src/glade/sensor-edit.glade:450 #: src/glade/sensor-edit.glade:499 src/lib/psensor.c:487 -#: src/ui_sensorlist.c:378 src/ui_sensorlist.c:379 src/ui_sensorlist.c:380 +#: src/ui_sensorlist.c:381 src/ui_sensorlist.c:382 src/ui_sensorlist.c:383 #: src/ui_notify.c:81 msgid "N/A" msgstr "N/V" @@ -571,23 +571,23 @@ msgstr "Laden des Psensor-Symbols ist gescheitert." msgid "Select foreground color" msgstr "Wählen Sie eine Vordergrundfarbe" -#: src/ui_sensorlist.c:312 +#: src/ui_sensorlist.c:315 msgid "Sensor" msgstr "Sensor" -#: src/ui_sensorlist.c:318 +#: src/ui_sensorlist.c:321 msgid "Value" msgstr "Wert" -#: src/ui_sensorlist.c:324 +#: src/ui_sensorlist.c:327 msgid "Min" msgstr "Min." -#: src/ui_sensorlist.c:330 +#: src/ui_sensorlist.c:333 msgid "Max" msgstr "Max." -#: src/ui_sensorlist.c:337 +#: src/ui_sensorlist.c:340 msgid "Color" msgstr "Farbe" diff --git a/po/es.po b/po/es.po index bdcf14b..7b9a69f 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: 2013-03-25 21:21+0100\n" +"POT-Creation-Date: 2013-03-29 09:52+0100\n" "PO-Revision-Date: 2012-11-07 14:42+0000\n" "Last-Translator: Eduardo Alberto Calvo \n" "Language-Team: Spanish \n" @@ -34,16 +34,16 @@ msgstr "Salir" msgid "Sensor Preferences" msgstr "Configurar sensores" -#: src/glade/psensor.glade:70 +#: src/glade/psensor.glade:94 msgid "Psensor - Temperature Monitor" msgstr "Psensor - Monitor de temperatura" -#: src/glade/psensor.glade:85 +#: src/glade/psensor.glade:109 #, fuzzy msgid "_Psensor" msgstr "Sensor" -#: src/glade/psensor.glade:132 +#: src/glade/psensor.glade:156 msgid "_Help" msgstr "_Ayuda" @@ -132,7 +132,7 @@ msgid "Measures" msgstr "Medidas" #: src/glade/psensor-pref.glade:586 src/glade/sensor-edit.glade:152 -#: src/ui_sensorlist.c:349 +#: src/ui_sensorlist.c:352 msgid "Graph" msgstr "Gráfica" @@ -167,7 +167,7 @@ msgstr "Tipo:" #: src/glade/sensor-edit.glade:136 src/glade/sensor-edit.glade:281 #: src/glade/sensor-edit.glade:377 src/glade/sensor-edit.glade:450 #: src/glade/sensor-edit.glade:499 src/lib/psensor.c:487 -#: src/ui_sensorlist.c:378 src/ui_sensorlist.c:379 src/ui_sensorlist.c:380 +#: src/ui_sensorlist.c:381 src/ui_sensorlist.c:382 src/ui_sensorlist.c:383 #: src/ui_notify.c:81 msgid "N/A" msgstr "No disponible" @@ -573,23 +573,23 @@ msgstr "Error al cargar el icono de Psensor" msgid "Select foreground color" msgstr "Seleccionar el color del primer plano" -#: src/ui_sensorlist.c:312 +#: src/ui_sensorlist.c:315 msgid "Sensor" msgstr "Sensor" -#: src/ui_sensorlist.c:318 +#: src/ui_sensorlist.c:321 msgid "Value" msgstr "Valor" -#: src/ui_sensorlist.c:324 +#: src/ui_sensorlist.c:327 msgid "Min" msgstr "Mín" -#: src/ui_sensorlist.c:330 +#: src/ui_sensorlist.c:333 msgid "Max" msgstr "Máx" -#: src/ui_sensorlist.c:337 +#: src/ui_sensorlist.c:340 msgid "Color" msgstr "Color" diff --git a/po/fr.po b/po/fr.po index d8d756a..2e712fe 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: 2013-03-25 21:21+0100\n" +"POT-Creation-Date: 2013-03-29 09:52+0100\n" "PO-Revision-Date: 2012-12-13 15:00+0000\n" "Last-Translator: Alain-OIivier Breysse \n" "Language-Team: French <>\n" @@ -34,16 +34,16 @@ msgstr "Quitter" msgid "Sensor Preferences" msgstr "Préférences des capteurs" -#: src/glade/psensor.glade:70 +#: src/glade/psensor.glade:94 msgid "Psensor - Temperature Monitor" msgstr "Psensor - Surveillance Des Températures" -#: src/glade/psensor.glade:85 +#: src/glade/psensor.glade:109 #, fuzzy msgid "_Psensor" msgstr "Capteur" -#: src/glade/psensor.glade:132 +#: src/glade/psensor.glade:156 msgid "_Help" msgstr "_Aide" @@ -132,7 +132,7 @@ msgid "Measures" msgstr "Mesures" #: src/glade/psensor-pref.glade:586 src/glade/sensor-edit.glade:152 -#: src/ui_sensorlist.c:349 +#: src/ui_sensorlist.c:352 msgid "Graph" msgstr "Graphe" @@ -168,7 +168,7 @@ msgstr "Type:" #: src/glade/sensor-edit.glade:136 src/glade/sensor-edit.glade:281 #: src/glade/sensor-edit.glade:377 src/glade/sensor-edit.glade:450 #: src/glade/sensor-edit.glade:499 src/lib/psensor.c:487 -#: src/ui_sensorlist.c:378 src/ui_sensorlist.c:379 src/ui_sensorlist.c:380 +#: src/ui_sensorlist.c:381 src/ui_sensorlist.c:382 src/ui_sensorlist.c:383 #: src/ui_notify.c:81 msgid "N/A" msgstr "N/A" @@ -576,23 +576,23 @@ 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:312 +#: src/ui_sensorlist.c:315 msgid "Sensor" msgstr "Capteur" -#: src/ui_sensorlist.c:318 +#: src/ui_sensorlist.c:321 msgid "Value" msgstr "Valeur" -#: src/ui_sensorlist.c:324 +#: src/ui_sensorlist.c:327 msgid "Min" msgstr "Min" -#: src/ui_sensorlist.c:330 +#: src/ui_sensorlist.c:333 msgid "Max" msgstr "Max" -#: src/ui_sensorlist.c:337 +#: src/ui_sensorlist.c:340 msgid "Color" msgstr "Couleur" diff --git a/po/hu.po b/po/hu.po index 5cc5cc0..bc41344 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: 2013-03-25 21:21+0100\n" +"POT-Creation-Date: 2013-03-29 09:52+0100\n" "PO-Revision-Date: 2012-10-29 09:41+0000\n" "Last-Translator: Bence Lukács \n" "Language-Team: Hungarian \n" @@ -35,16 +35,16 @@ msgstr "Kilépés" msgid "Sensor Preferences" msgstr "Érzékelő beállításai" -#: src/glade/psensor.glade:70 +#: src/glade/psensor.glade:94 msgid "Psensor - Temperature Monitor" msgstr "Psensor - hőmérsékletfigyelő" -#: src/glade/psensor.glade:85 +#: src/glade/psensor.glade:109 #, fuzzy msgid "_Psensor" msgstr "Érzékelő" -#: src/glade/psensor.glade:132 +#: src/glade/psensor.glade:156 msgid "_Help" msgstr "_Súgó" @@ -133,7 +133,7 @@ msgid "Measures" msgstr "Mérések" #: src/glade/psensor-pref.glade:586 src/glade/sensor-edit.glade:152 -#: src/ui_sensorlist.c:349 +#: src/ui_sensorlist.c:352 msgid "Graph" msgstr "Grafikon" @@ -168,7 +168,7 @@ msgstr "Típus:" #: src/glade/sensor-edit.glade:136 src/glade/sensor-edit.glade:281 #: src/glade/sensor-edit.glade:377 src/glade/sensor-edit.glade:450 #: src/glade/sensor-edit.glade:499 src/lib/psensor.c:487 -#: src/ui_sensorlist.c:378 src/ui_sensorlist.c:379 src/ui_sensorlist.c:380 +#: src/ui_sensorlist.c:381 src/ui_sensorlist.c:382 src/ui_sensorlist.c:383 #: src/ui_notify.c:81 msgid "N/A" msgstr "---" @@ -567,23 +567,23 @@ msgstr "Nem sikerült betölteni a Psensor ikont." msgid "Select foreground color" msgstr "Előtérszín kiválasztása" -#: src/ui_sensorlist.c:312 +#: src/ui_sensorlist.c:315 msgid "Sensor" msgstr "Érzékelő" -#: src/ui_sensorlist.c:318 +#: src/ui_sensorlist.c:321 msgid "Value" msgstr "Érték" -#: src/ui_sensorlist.c:324 +#: src/ui_sensorlist.c:327 msgid "Min" msgstr "Minimum" -#: src/ui_sensorlist.c:330 +#: src/ui_sensorlist.c:333 msgid "Max" msgstr "Maximum" -#: src/ui_sensorlist.c:337 +#: src/ui_sensorlist.c:340 msgid "Color" msgstr "Szín" diff --git a/po/it.po b/po/it.po index 2ade49a..659b975 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: 2013-03-25 21:21+0100\n" +"POT-Creation-Date: 2013-03-29 09:52+0100\n" "PO-Revision-Date: 2012-08-13 08:20+0000\n" "Last-Translator: Andrea Bernini \n" "Language-Team: Italian\n" @@ -34,16 +34,16 @@ msgstr "Esci" msgid "Sensor Preferences" msgstr "Sensor Preferenze" -#: src/glade/psensor.glade:70 +#: src/glade/psensor.glade:94 msgid "Psensor - Temperature Monitor" msgstr "Psensor - Monitor temperatura" -#: src/glade/psensor.glade:85 +#: src/glade/psensor.glade:109 #, fuzzy msgid "_Psensor" msgstr "Sensore" -#: src/glade/psensor.glade:132 +#: src/glade/psensor.glade:156 msgid "_Help" msgstr "_Aiuto" @@ -132,7 +132,7 @@ msgid "Measures" msgstr "Misure" #: src/glade/psensor-pref.glade:586 src/glade/sensor-edit.glade:152 -#: src/ui_sensorlist.c:349 +#: src/ui_sensorlist.c:352 msgid "Graph" msgstr "Grafico" @@ -168,7 +168,7 @@ msgstr "Tipo:" #: src/glade/sensor-edit.glade:136 src/glade/sensor-edit.glade:281 #: src/glade/sensor-edit.glade:377 src/glade/sensor-edit.glade:450 #: src/glade/sensor-edit.glade:499 src/lib/psensor.c:487 -#: src/ui_sensorlist.c:378 src/ui_sensorlist.c:379 src/ui_sensorlist.c:380 +#: src/ui_sensorlist.c:381 src/ui_sensorlist.c:382 src/ui_sensorlist.c:383 #: src/ui_notify.c:81 msgid "N/A" msgstr "N/A" @@ -559,23 +559,23 @@ msgstr "Impossibile caricare l'icona di Psensor." msgid "Select foreground color" msgstr "Colore di primo piano:" -#: src/ui_sensorlist.c:312 +#: src/ui_sensorlist.c:315 msgid "Sensor" msgstr "Sensore" -#: src/ui_sensorlist.c:318 +#: src/ui_sensorlist.c:321 msgid "Value" msgstr "Valore" -#: src/ui_sensorlist.c:324 +#: src/ui_sensorlist.c:327 msgid "Min" msgstr "Minimo" -#: src/ui_sensorlist.c:330 +#: src/ui_sensorlist.c:333 msgid "Max" msgstr "Massimo" -#: src/ui_sensorlist.c:337 +#: src/ui_sensorlist.c:340 msgid "Color" msgstr "Colore" diff --git a/po/lv.po b/po/lv.po index f0a2f61..e2ecc78 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: 2013-03-25 21:21+0100\n" +"POT-Creation-Date: 2013-03-29 09:52+0100\n" "PO-Revision-Date: 2012-11-11 10:38+0000\n" "Last-Translator: tuxmaniack \n" "Language-Team: Latvian \n" @@ -34,16 +34,16 @@ msgstr "Iziet" msgid "Sensor Preferences" msgstr "Sensoru iestatījumi" -#: src/glade/psensor.glade:70 +#: src/glade/psensor.glade:94 msgid "Psensor - Temperature Monitor" msgstr "Psensor - temperatūras pārraugs" -#: src/glade/psensor.glade:85 +#: src/glade/psensor.glade:109 #, fuzzy msgid "_Psensor" msgstr "Sensors" -#: src/glade/psensor.glade:132 +#: src/glade/psensor.glade:156 msgid "_Help" msgstr "_Palīdzība" @@ -132,7 +132,7 @@ msgid "Measures" msgstr "Mērījumi" #: src/glade/psensor-pref.glade:586 src/glade/sensor-edit.glade:152 -#: src/ui_sensorlist.c:349 +#: src/ui_sensorlist.c:352 msgid "Graph" msgstr "Grafiks" @@ -167,7 +167,7 @@ msgstr "Tips:" #: src/glade/sensor-edit.glade:136 src/glade/sensor-edit.glade:281 #: src/glade/sensor-edit.glade:377 src/glade/sensor-edit.glade:450 #: src/glade/sensor-edit.glade:499 src/lib/psensor.c:487 -#: src/ui_sensorlist.c:378 src/ui_sensorlist.c:379 src/ui_sensorlist.c:380 +#: src/ui_sensorlist.c:381 src/ui_sensorlist.c:382 src/ui_sensorlist.c:383 #: src/ui_notify.c:81 msgid "N/A" msgstr "N/P" @@ -552,23 +552,23 @@ msgstr "Neizdevās ielādēt Psensor ikonu." msgid "Select foreground color" msgstr "Izvēlieties priekšplāna krāsu" -#: src/ui_sensorlist.c:312 +#: src/ui_sensorlist.c:315 msgid "Sensor" msgstr "Sensors" -#: src/ui_sensorlist.c:318 +#: src/ui_sensorlist.c:321 msgid "Value" msgstr "Vērtība" -#: src/ui_sensorlist.c:324 +#: src/ui_sensorlist.c:327 msgid "Min" msgstr "Min." -#: src/ui_sensorlist.c:330 +#: src/ui_sensorlist.c:333 msgid "Max" msgstr "Maks." -#: src/ui_sensorlist.c:337 +#: src/ui_sensorlist.c:340 msgid "Color" msgstr "Krāsa" diff --git a/po/psensor.pot b/po/psensor.pot index a64a5af..8f0da08 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: 2013-03-25 21:21+0100\n" +"POT-Creation-Date: 2013-03-29 09:52+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -33,15 +33,15 @@ msgstr "" msgid "Sensor Preferences" msgstr "" -#: src/glade/psensor.glade:70 +#: src/glade/psensor.glade:94 msgid "Psensor - Temperature Monitor" msgstr "" -#: src/glade/psensor.glade:85 +#: src/glade/psensor.glade:109 msgid "_Psensor" msgstr "" -#: src/glade/psensor.glade:132 +#: src/glade/psensor.glade:156 msgid "_Help" msgstr "" @@ -130,7 +130,7 @@ msgid "Measures" msgstr "" #: src/glade/psensor-pref.glade:586 src/glade/sensor-edit.glade:152 -#: src/ui_sensorlist.c:349 +#: src/ui_sensorlist.c:352 msgid "Graph" msgstr "" @@ -165,7 +165,7 @@ msgstr "" #: src/glade/sensor-edit.glade:136 src/glade/sensor-edit.glade:281 #: src/glade/sensor-edit.glade:377 src/glade/sensor-edit.glade:450 #: src/glade/sensor-edit.glade:499 src/lib/psensor.c:487 -#: src/ui_sensorlist.c:378 src/ui_sensorlist.c:379 src/ui_sensorlist.c:380 +#: src/ui_sensorlist.c:381 src/ui_sensorlist.c:382 src/ui_sensorlist.c:383 #: src/ui_notify.c:81 msgid "N/A" msgstr "" @@ -529,23 +529,23 @@ msgstr "" msgid "Select foreground color" msgstr "" -#: src/ui_sensorlist.c:312 +#: src/ui_sensorlist.c:315 msgid "Sensor" msgstr "" -#: src/ui_sensorlist.c:318 +#: src/ui_sensorlist.c:321 msgid "Value" msgstr "" -#: src/ui_sensorlist.c:324 +#: src/ui_sensorlist.c:327 msgid "Min" msgstr "" -#: src/ui_sensorlist.c:330 +#: src/ui_sensorlist.c:333 msgid "Max" msgstr "" -#: src/ui_sensorlist.c:337 +#: src/ui_sensorlist.c:340 msgid "Color" msgstr "" diff --git a/po/pt_BR.po b/po/pt_BR.po index 4de294d..5340eb9 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: 2013-03-25 21:21+0100\n" +"POT-Creation-Date: 2013-03-29 09:52+0100\n" "PO-Revision-Date: 2012-09-10 04:01+0000\n" "Last-Translator: Daniel Serafim \n" "Language-Team: Brazilian Portuguese\n" @@ -34,16 +34,16 @@ msgstr "Sair" msgid "Sensor Preferences" msgstr "Preferências de sensores" -#: src/glade/psensor.glade:70 +#: src/glade/psensor.glade:94 msgid "Psensor - Temperature Monitor" msgstr "Psensor - Monitor de temperatura" -#: src/glade/psensor.glade:85 +#: src/glade/psensor.glade:109 #, fuzzy msgid "_Psensor" msgstr "Sensor" -#: src/glade/psensor.glade:132 +#: src/glade/psensor.glade:156 msgid "_Help" msgstr "Ajuda" @@ -132,7 +132,7 @@ msgid "Measures" msgstr "Medidas" #: src/glade/psensor-pref.glade:586 src/glade/sensor-edit.glade:152 -#: src/ui_sensorlist.c:349 +#: src/ui_sensorlist.c:352 msgid "Graph" msgstr "Grafo" @@ -168,7 +168,7 @@ msgstr "Tipo:" #: src/glade/sensor-edit.glade:136 src/glade/sensor-edit.glade:281 #: src/glade/sensor-edit.glade:377 src/glade/sensor-edit.glade:450 #: src/glade/sensor-edit.glade:499 src/lib/psensor.c:487 -#: src/ui_sensorlist.c:378 src/ui_sensorlist.c:379 src/ui_sensorlist.c:380 +#: src/ui_sensorlist.c:381 src/ui_sensorlist.c:382 src/ui_sensorlist.c:383 #: src/ui_notify.c:81 msgid "N/A" msgstr "N/D" @@ -544,23 +544,23 @@ msgstr "Falha ao carregar o ícone do Psensor." msgid "Select foreground color" msgstr "Selecionar cor do primeiro plano" -#: src/ui_sensorlist.c:312 +#: src/ui_sensorlist.c:315 msgid "Sensor" msgstr "Sensor" -#: src/ui_sensorlist.c:318 +#: src/ui_sensorlist.c:321 msgid "Value" msgstr "Valor" -#: src/ui_sensorlist.c:324 +#: src/ui_sensorlist.c:327 msgid "Min" msgstr "Min" -#: src/ui_sensorlist.c:330 +#: src/ui_sensorlist.c:333 msgid "Max" msgstr "Max" -#: src/ui_sensorlist.c:337 +#: src/ui_sensorlist.c:340 msgid "Color" msgstr "Cor" diff --git a/po/ru.po b/po/ru.po index 6f78320..61ec1dc 100644 --- a/po/ru.po +++ b/po/ru.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: 2013-03-25 21:21+0100\n" +"POT-Creation-Date: 2013-03-29 09:52+0100\n" "PO-Revision-Date: 2012-12-25 06:05+0000\n" "Last-Translator: Ilya Volchanetskiy \n" "Language-Team: Russian\n" @@ -34,16 +34,16 @@ msgstr "Выход" msgid "Sensor Preferences" msgstr "Параметры датчиков" -#: src/glade/psensor.glade:70 +#: src/glade/psensor.glade:94 msgid "Psensor - Temperature Monitor" msgstr "Psensor - монитор температуры" -#: src/glade/psensor.glade:85 +#: src/glade/psensor.glade:109 #, fuzzy msgid "_Psensor" msgstr "Датчик" -#: src/glade/psensor.glade:132 +#: src/glade/psensor.glade:156 msgid "_Help" msgstr "_Справка" @@ -132,7 +132,7 @@ msgid "Measures" msgstr "Замеры" #: src/glade/psensor-pref.glade:586 src/glade/sensor-edit.glade:152 -#: src/ui_sensorlist.c:349 +#: src/ui_sensorlist.c:352 msgid "Graph" msgstr "Диаграмма" @@ -167,7 +167,7 @@ msgstr "Тип:" #: src/glade/sensor-edit.glade:136 src/glade/sensor-edit.glade:281 #: src/glade/sensor-edit.glade:377 src/glade/sensor-edit.glade:450 #: src/glade/sensor-edit.glade:499 src/lib/psensor.c:487 -#: src/ui_sensorlist.c:378 src/ui_sensorlist.c:379 src/ui_sensorlist.c:380 +#: src/ui_sensorlist.c:381 src/ui_sensorlist.c:382 src/ui_sensorlist.c:383 #: src/ui_notify.c:81 msgid "N/A" msgstr "Н/Д" @@ -551,23 +551,23 @@ msgstr "Не удалось загрузить значок Psensor." msgid "Select foreground color" msgstr "Выберите цвет переднего плана" -#: src/ui_sensorlist.c:312 +#: src/ui_sensorlist.c:315 msgid "Sensor" msgstr "Датчик" -#: src/ui_sensorlist.c:318 +#: src/ui_sensorlist.c:321 msgid "Value" msgstr "Значение" -#: src/ui_sensorlist.c:324 +#: src/ui_sensorlist.c:327 msgid "Min" msgstr "Мин." -#: src/ui_sensorlist.c:330 +#: src/ui_sensorlist.c:333 msgid "Max" msgstr "Макс." -#: src/ui_sensorlist.c:337 +#: src/ui_sensorlist.c:340 msgid "Color" msgstr "Цвет" diff --git a/po/sl.po b/po/sl.po index adb7715..4168761 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: 2013-03-25 21:21+0100\n" +"POT-Creation-Date: 2013-03-29 09:52+0100\n" "PO-Revision-Date: 2012-04-14 21:02+0000\n" "Last-Translator: FULL NAME \n" "Language-Team: Slovenian \n" @@ -34,15 +34,15 @@ msgstr "" msgid "Sensor Preferences" msgstr "" -#: src/glade/psensor.glade:70 +#: src/glade/psensor.glade:94 msgid "Psensor - Temperature Monitor" msgstr "" -#: src/glade/psensor.glade:85 +#: src/glade/psensor.glade:109 msgid "_Psensor" msgstr "" -#: src/glade/psensor.glade:132 +#: src/glade/psensor.glade:156 msgid "_Help" msgstr "" @@ -131,7 +131,7 @@ msgid "Measures" msgstr "" #: src/glade/psensor-pref.glade:586 src/glade/sensor-edit.glade:152 -#: src/ui_sensorlist.c:349 +#: src/ui_sensorlist.c:352 msgid "Graph" msgstr "" @@ -166,7 +166,7 @@ msgstr "" #: src/glade/sensor-edit.glade:136 src/glade/sensor-edit.glade:281 #: src/glade/sensor-edit.glade:377 src/glade/sensor-edit.glade:450 #: src/glade/sensor-edit.glade:499 src/lib/psensor.c:487 -#: src/ui_sensorlist.c:378 src/ui_sensorlist.c:379 src/ui_sensorlist.c:380 +#: src/ui_sensorlist.c:381 src/ui_sensorlist.c:382 src/ui_sensorlist.c:383 #: src/ui_notify.c:81 msgid "N/A" msgstr "" @@ -530,23 +530,23 @@ msgstr "" msgid "Select foreground color" msgstr "" -#: src/ui_sensorlist.c:312 +#: src/ui_sensorlist.c:315 msgid "Sensor" msgstr "" -#: src/ui_sensorlist.c:318 +#: src/ui_sensorlist.c:321 msgid "Value" msgstr "" -#: src/ui_sensorlist.c:324 +#: src/ui_sensorlist.c:327 msgid "Min" msgstr "" -#: src/ui_sensorlist.c:330 +#: src/ui_sensorlist.c:333 msgid "Max" msgstr "" -#: src/ui_sensorlist.c:337 +#: src/ui_sensorlist.c:340 msgid "Color" msgstr "" diff --git a/po/sr.po b/po/sr.po index 87f2383..607387d 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: 2013-03-25 21:21+0100\n" +"POT-Creation-Date: 2013-03-29 09:52+0100\n" "PO-Revision-Date: 2012-05-03 02:31+0000\n" "Last-Translator: Мирослав Николић \n" "Language-Team: Serbian \n" @@ -34,16 +34,16 @@ msgstr "Изађи" msgid "Sensor Preferences" msgstr "" -#: src/glade/psensor.glade:70 +#: src/glade/psensor.glade:94 msgid "Psensor - Temperature Monitor" msgstr "" -#: src/glade/psensor.glade:85 +#: src/glade/psensor.glade:109 #, fuzzy msgid "_Psensor" msgstr "Сензор" -#: src/glade/psensor.glade:132 +#: src/glade/psensor.glade:156 msgid "_Help" msgstr "" @@ -132,7 +132,7 @@ msgid "Measures" msgstr "" #: src/glade/psensor-pref.glade:586 src/glade/sensor-edit.glade:152 -#: src/ui_sensorlist.c:349 +#: src/ui_sensorlist.c:352 msgid "Graph" msgstr "" @@ -167,7 +167,7 @@ msgstr "" #: src/glade/sensor-edit.glade:136 src/glade/sensor-edit.glade:281 #: src/glade/sensor-edit.glade:377 src/glade/sensor-edit.glade:450 #: src/glade/sensor-edit.glade:499 src/lib/psensor.c:487 -#: src/ui_sensorlist.c:378 src/ui_sensorlist.c:379 src/ui_sensorlist.c:380 +#: src/ui_sensorlist.c:381 src/ui_sensorlist.c:382 src/ui_sensorlist.c:383 #: src/ui_notify.c:81 msgid "N/A" msgstr "Недоступно" @@ -531,23 +531,23 @@ msgstr "" msgid "Select foreground color" msgstr "Одаберите боју текста" -#: src/ui_sensorlist.c:312 +#: src/ui_sensorlist.c:315 msgid "Sensor" msgstr "Сензор" -#: src/ui_sensorlist.c:318 +#: src/ui_sensorlist.c:321 msgid "Value" msgstr "" -#: src/ui_sensorlist.c:324 +#: src/ui_sensorlist.c:327 msgid "Min" msgstr "Најмање" -#: src/ui_sensorlist.c:330 +#: src/ui_sensorlist.c:333 msgid "Max" msgstr "Највише" -#: src/ui_sensorlist.c:337 +#: src/ui_sensorlist.c:340 msgid "Color" msgstr "У боји" diff --git a/po/tr.po b/po/tr.po index d55c48e..a344739 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: 2013-03-25 21:21+0100\n" +"POT-Creation-Date: 2013-03-29 09:52+0100\n" "PO-Revision-Date: 2012-04-28 11:24+0000\n" "Last-Translator: zeugma \n" "Language-Team: Turkish \n" @@ -34,16 +34,16 @@ msgstr "" msgid "Sensor Preferences" msgstr "Tercihleri düzenle" -#: src/glade/psensor.glade:70 +#: src/glade/psensor.glade:94 msgid "Psensor - Temperature Monitor" msgstr "" -#: src/glade/psensor.glade:85 +#: src/glade/psensor.glade:109 #, fuzzy msgid "_Psensor" msgstr "Algılayıcı" -#: src/glade/psensor.glade:132 +#: src/glade/psensor.glade:156 msgid "_Help" msgstr "" @@ -132,7 +132,7 @@ msgid "Measures" msgstr "" #: src/glade/psensor-pref.glade:586 src/glade/sensor-edit.glade:152 -#: src/ui_sensorlist.c:349 +#: src/ui_sensorlist.c:352 msgid "Graph" msgstr "Grafik" @@ -167,7 +167,7 @@ msgstr "Tür:" #: src/glade/sensor-edit.glade:136 src/glade/sensor-edit.glade:281 #: src/glade/sensor-edit.glade:377 src/glade/sensor-edit.glade:450 #: src/glade/sensor-edit.glade:499 src/lib/psensor.c:487 -#: src/ui_sensorlist.c:378 src/ui_sensorlist.c:379 src/ui_sensorlist.c:380 +#: src/ui_sensorlist.c:381 src/ui_sensorlist.c:382 src/ui_sensorlist.c:383 #: src/ui_notify.c:81 msgid "N/A" msgstr "" @@ -531,23 +531,23 @@ msgstr "" msgid "Select foreground color" msgstr "" -#: src/ui_sensorlist.c:312 +#: src/ui_sensorlist.c:315 msgid "Sensor" msgstr "Algılayıcı" -#: src/ui_sensorlist.c:318 +#: src/ui_sensorlist.c:321 msgid "Value" msgstr "" -#: src/ui_sensorlist.c:324 +#: src/ui_sensorlist.c:327 msgid "Min" msgstr "" -#: src/ui_sensorlist.c:330 +#: src/ui_sensorlist.c:333 msgid "Max" msgstr "" -#: src/ui_sensorlist.c:337 +#: src/ui_sensorlist.c:340 msgid "Color" msgstr "Renk" diff --git a/po/uk.po b/po/uk.po index a345f0b..7b50ad5 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: 2013-03-25 21:21+0100\n" +"POT-Creation-Date: 2013-03-29 09:52+0100\n" "PO-Revision-Date: 2012-10-13 16:24+0000\n" "Last-Translator: Ilya Volchanetskiy \n" "Language-Team: Ukrainian \n" @@ -34,16 +34,16 @@ msgstr "Вихід" msgid "Sensor Preferences" msgstr "Налаштування датчиків" -#: src/glade/psensor.glade:70 +#: src/glade/psensor.glade:94 msgid "Psensor - Temperature Monitor" msgstr "" -#: src/glade/psensor.glade:85 +#: src/glade/psensor.glade:109 #, fuzzy msgid "_Psensor" msgstr "Датчик" -#: src/glade/psensor.glade:132 +#: src/glade/psensor.glade:156 msgid "_Help" msgstr "_Довдіка" @@ -132,7 +132,7 @@ msgid "Measures" msgstr "Заміри" #: src/glade/psensor-pref.glade:586 src/glade/sensor-edit.glade:152 -#: src/ui_sensorlist.c:349 +#: src/ui_sensorlist.c:352 msgid "Graph" msgstr "Діаграма" @@ -167,7 +167,7 @@ msgstr "Тип:" #: src/glade/sensor-edit.glade:136 src/glade/sensor-edit.glade:281 #: src/glade/sensor-edit.glade:377 src/glade/sensor-edit.glade:450 #: src/glade/sensor-edit.glade:499 src/lib/psensor.c:487 -#: src/ui_sensorlist.c:378 src/ui_sensorlist.c:379 src/ui_sensorlist.c:380 +#: src/ui_sensorlist.c:381 src/ui_sensorlist.c:382 src/ui_sensorlist.c:383 #: src/ui_notify.c:81 msgid "N/A" msgstr "Н/Д" @@ -546,23 +546,23 @@ msgstr "Не вдалося завантажити іконку Psensor." msgid "Select foreground color" msgstr "Оберіть колір переднього плану" -#: src/ui_sensorlist.c:312 +#: src/ui_sensorlist.c:315 msgid "Sensor" msgstr "Датчик" -#: src/ui_sensorlist.c:318 +#: src/ui_sensorlist.c:321 msgid "Value" msgstr "Значення" -#: src/ui_sensorlist.c:324 +#: src/ui_sensorlist.c:327 msgid "Min" msgstr "Мін." -#: src/ui_sensorlist.c:330 +#: src/ui_sensorlist.c:333 msgid "Max" msgstr "Макс." -#: src/ui_sensorlist.c:337 +#: src/ui_sensorlist.c:340 msgid "Color" msgstr "Колір" diff --git a/po/zh_CN.po b/po/zh_CN.po index 5c21486..c7c9020 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: 2013-03-25 21:21+0100\n" +"POT-Creation-Date: 2013-03-29 09:52+0100\n" "PO-Revision-Date: 2013-01-15 12:24+0000\n" "Last-Translator: Wang Dianjin \n" "Language-Team: Chinese (simplified)\n" @@ -34,16 +34,16 @@ msgstr "退出" msgid "Sensor Preferences" msgstr "传感器首选项" -#: src/glade/psensor.glade:70 +#: src/glade/psensor.glade:94 msgid "Psensor - Temperature Monitor" msgstr "Psensor - 温度监视器" -#: src/glade/psensor.glade:85 +#: src/glade/psensor.glade:109 #, fuzzy msgid "_Psensor" msgstr "监视设备" -#: src/glade/psensor.glade:132 +#: src/glade/psensor.glade:156 msgid "_Help" msgstr "帮助(_H)" @@ -132,7 +132,7 @@ msgid "Measures" msgstr "测量" #: src/glade/psensor-pref.glade:586 src/glade/sensor-edit.glade:152 -#: src/ui_sensorlist.c:349 +#: src/ui_sensorlist.c:352 msgid "Graph" msgstr "图表" @@ -167,7 +167,7 @@ msgstr "类型:" #: src/glade/sensor-edit.glade:136 src/glade/sensor-edit.glade:281 #: src/glade/sensor-edit.glade:377 src/glade/sensor-edit.glade:450 #: src/glade/sensor-edit.glade:499 src/lib/psensor.c:487 -#: src/ui_sensorlist.c:378 src/ui_sensorlist.c:379 src/ui_sensorlist.c:380 +#: src/ui_sensorlist.c:381 src/ui_sensorlist.c:382 src/ui_sensorlist.c:383 #: src/ui_notify.c:81 msgid "N/A" msgstr "不可用" @@ -558,23 +558,23 @@ msgstr "无法加载 Psensor 图标。" msgid "Select foreground color" msgstr "选择前景色" -#: src/ui_sensorlist.c:312 +#: src/ui_sensorlist.c:315 msgid "Sensor" msgstr "监视设备" -#: src/ui_sensorlist.c:318 +#: src/ui_sensorlist.c:321 msgid "Value" msgstr "值" -#: src/ui_sensorlist.c:324 +#: src/ui_sensorlist.c:327 msgid "Min" msgstr "最小值" -#: src/ui_sensorlist.c:330 +#: src/ui_sensorlist.c:333 msgid "Max" msgstr "最大值" -#: src/ui_sensorlist.c:337 +#: src/ui_sensorlist.c:340 msgid "Color" msgstr "颜色" diff --git a/src/glade/psensor.glade b/src/glade/psensor.glade index 314089c..4be07eb 100644 --- a/src/glade/psensor.glade +++ b/src/glade/psensor.glade @@ -25,6 +25,7 @@ PreferencesAction True False + True True @@ -33,6 +34,7 @@ SensorPreferencesAction True False + True True @@ -47,6 +49,7 @@ AboutAction True False + True True @@ -61,10 +64,31 @@ QuitAction True False + True True + + + + + + + + + + + + + + + + + + + + False Psensor - Temperature Monitor @@ -156,7 +180,51 @@ - + + True + True + + + True + False + True + True + + + True + True + + + + + True + True + never + in + + + True + True + True + True + sensors_store + + + + + + + + False + True + + + + + True + True + 1 + diff --git a/src/main.c b/src/main.c index 9aab784..90d26ac 100644 --- a/src/main.c +++ b/src/main.c @@ -585,16 +585,9 @@ int main(int argc, char **argv) /* main window */ ui_window_create(&ui); - ui.sensor_box = NULL; - - /* drawing box */ - ui.w_graph = ui_graph_create(&ui); ui_enable_alpha_channel(&ui); - /* sensor list */ - ui_sensorlist_create(&ui); - thread = g_thread_create((GThreadFunc) update_measures, &ui, TRUE, &error); diff --git a/src/ui.c b/src/ui.c index d413891..b444d10 100644 --- a/src/ui.c +++ b/src/ui.c @@ -231,10 +231,26 @@ void ui_window_create(struct ui_psensor *ui) "popup_menu")); g_object_ref(G_OBJECT(ui->popup_menu)); ui->main_window = window; + ui->w_graph = GTK_WIDGET(gtk_builder_get_object(builder, + "graph")); + ui_graph_create(ui); + ui->sensor_box = GTK_WIDGET(gtk_builder_get_object(builder, + "sensor_box")); + ui->sensors_store = GTK_LIST_STORE(gtk_builder_get_object + (builder, "sensors_store")); + ui->sensors_tree = GTK_TREE_VIEW(gtk_builder_get_object + (builder, "sensors_tree")); + + ui_sensorlist_create(ui); + + log_debug("ui_window_create(): show_all"); gtk_widget_show_all(ui->main_box); g_object_unref(G_OBJECT(builder)); + + + log_debug("ui_window_create() ends"); } static void menu_bar_show(unsigned int show, struct ui_psensor *ui) @@ -248,21 +264,27 @@ static void menu_bar_show(unsigned int show, struct ui_psensor *ui) void ui_window_update(struct ui_psensor *ui) { struct config *cfg; - int init = 1; + /*int init = 1;*/ - cfg = ui->config; + log_debug("ui_window_update()"); + cfg = ui->config; + /* if (ui->sensor_box) { g_object_ref(GTK_WIDGET(ui->ui_sensorlist->widget)); + if (ui->ui_sensorlist && ui->ui_sensorlist->widget) { + printf("remove sensor_list\n"); + gtk_container_remove(GTK_CONTAINER(ui->sensor_box), + ui->ui_sensorlist->widget); + } + gtk_container_remove(GTK_CONTAINER(ui->sensor_box), - ui->ui_sensorlist->widget); + ui->w_graph); gtk_container_remove(GTK_CONTAINER(ui->main_box), ui->sensor_box); - ui->w_graph = ui_graph_create(ui); - init = 0; } @@ -292,14 +314,14 @@ void ui_window_update(struct ui_psensor *ui) ui->config->window_divider_pos); if (!init) - g_object_unref(GTK_WIDGET(ui->ui_sensorlist->widget)); + g_object_unref(GTK_WIDGET(ui->ui_sensorlist->widget));*/ - gtk_widget_show_all(ui->sensor_box); + /* gtk_widget_show_all(ui->sensor_box);*/ if (cfg->menu_bar_disabled) menu_bar_show(0, ui); else - menu_bar_show(1, ui); + menu_bar_show(1, ui); } void ui_window_show(struct ui_psensor *ui) diff --git a/src/ui.h b/src/ui.h index 64eb05f..7ef0ce4 100644 --- a/src/ui.h +++ b/src/ui.h @@ -63,6 +63,9 @@ struct ui_psensor { */ GtkWidget *sensor_box; + GtkListStore *sensors_store; + GtkTreeView *sensors_tree; + int graph_update_interval; }; diff --git a/src/ui_graph.c b/src/ui_graph.c index ed46cd6..a50d6a1 100644 --- a/src/ui_graph.c +++ b/src/ui_graph.c @@ -45,11 +45,13 @@ on_expose_event(GtkWidget *widget, GdkEventExpose *event, gpointer data) return FALSE; } -GtkWidget *ui_graph_create(struct ui_psensor *ui) +void ui_graph_create(struct ui_psensor *ui) { GtkWidget *w_graph; - w_graph = gtk_drawing_area_new(); + log_debug("ui_graph_create()"); + + w_graph = ui->w_graph; g_signal_connect(GTK_WIDGET(w_graph), "draw", @@ -62,5 +64,5 @@ GtkWidget *ui_graph_create(struct ui_psensor *ui) "button_press_event", (GCallback) on_graph_clicked, ui); - return w_graph; + log_debug("ui_graph_create() ends"); } diff --git a/src/ui_graph.h b/src/ui_graph.h index 9ac7769..d877d42 100644 --- a/src/ui_graph.h +++ b/src/ui_graph.h @@ -23,6 +23,6 @@ #include "ui.h" -GtkWidget *ui_graph_create(struct ui_psensor *ui); +void ui_graph_create(struct ui_psensor *ui); #endif diff --git a/src/ui_sensorlist.c b/src/ui_sensorlist.c index 7a7d70f..1893a89 100644 --- a/src/ui_sensorlist.c +++ b/src/ui_sensorlist.c @@ -290,17 +290,9 @@ static void create_widget(struct ui_psensor *ui) struct psensor **s_cur = ui->sensors; struct ui_sensorlist *ui_sl = ui->ui_sensorlist; - store = gtk_list_store_new(COLS_COUNT, - G_TYPE_STRING, - G_TYPE_STRING, - G_TYPE_STRING, - G_TYPE_STRING, - G_TYPE_STRING, - G_TYPE_STRING, - G_TYPE_BOOLEAN, G_TYPE_STRING); - - ui_sl->treeview = GTK_TREE_VIEW - (gtk_tree_view_new_with_model(GTK_TREE_MODEL(store))); + store = ui->sensors_store; + + ui_sl->treeview = ui->sensors_tree; gtk_tree_selection_set_mode (gtk_tree_view_get_selection(ui_sl->treeview), @@ -385,16 +377,11 @@ static void create_widget(struct ui_psensor *ui) s_cur++; } - - ui_sl->widget = gtk_scrolled_window_new(NULL, NULL); - gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(ui_sl->widget), - GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC); - gtk_container_add(GTK_CONTAINER(ui_sl->widget), - GTK_WIDGET(ui_sl->treeview)); } void ui_sensorlist_create(struct ui_psensor *ui) { + log_debug("ui_sensorlist_create()"); ui->ui_sensorlist = malloc(sizeof(struct ui_sensorlist)); ui->ui_sensorlist->sensors = ui->sensors; diff --git a/src/ui_sensorlist.h b/src/ui_sensorlist.h index 2b56e80..221f588 100644 --- a/src/ui_sensorlist.h +++ b/src/ui_sensorlist.h @@ -27,9 +27,6 @@ struct ui_sensorlist { /* The GtkTreeView widget containing the list of sensors */ GtkTreeView *treeview; - /* Scrolled widget containing the GtkTreeView */ - GtkWidget *widget; - struct psensor **sensors; }; -- 2.7.4