/*
- Copyright (C) 2010-2011 jeanfi@gmail.com
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- 02110-1301 USA
-*/
-
-
+ * Copyright (C) 2010-2013 jeanfi@gmail.com
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301 USA
+ */
#include <stdlib.h>
#include <string.h>
#include "ui.h"
#include "ui_pref.h"
#include "ui_sensorlist.h"
+#include "ui_sensorpref.h"
#include "cfg.h"
#include "ui_color.h"
#include "compat.h"
};
struct cb_data {
- struct ui_sensorlist *ui_sensorlist;
+ struct ui_psensor *ui;
struct psensor *sensor;
};
-int col_index_to_col(int idx)
+static int col_index_to_col(int idx)
{
if (idx == 5)
return COL_ENABLED;
return idx;
}
-void ui_sensorlist_update(struct ui_sensorlist *list)
+void ui_sensorlist_update(struct ui_psensor *ui)
{
+ char *str;
+ struct psensor *s;
GtkTreeIter iter;
+ struct ui_sensorlist *ui_sl = ui->ui_sensorlist;
GtkTreeModel *model
- = gtk_tree_view_get_model(GTK_TREE_VIEW(list->widget));
+ = gtk_tree_view_get_model(ui_sl->treeview);
gboolean valid = gtk_tree_model_get_iter_first(model, &iter);
- struct psensor **sensor = list->sensors;
+ struct psensor **sensor = ui->sensors;
+ int use_celcius;
+
+ use_celcius = ui->config->temperature_unit == CELCIUS;
while (valid && *sensor) {
- struct psensor *s = *sensor;
+ s = *sensor;
- char *str;
+ str = psensor_value_to_str(s->type,
+ s->measures[s->values_max_length -
+ 1].value,
+ use_celcius);
- str = psensor_value_to_string(s->type,
- s->measures[s->values_max_length -
- 1].value);
gtk_list_store_set(GTK_LIST_STORE(model), &iter, COL_TEMP, str,
-1);
free(str);
- str = psensor_value_to_string(s->type, s->min);
+ str = psensor_value_to_str(s->type, s->min, use_celcius);
gtk_list_store_set(GTK_LIST_STORE(model), &iter,
COL_TEMP_MIN, str, -1);
free(str);
- str = psensor_value_to_string(s->type, s->max);
+ str = psensor_value_to_str(s->type, s->max, use_celcius);
gtk_list_store_set(GTK_LIST_STORE(model), &iter,
COL_TEMP_MAX, str, -1);
free(str);
*
* <null> if none.
*/
-struct psensor *ui_sensorlist_get_sensor_at_pos(GtkTreeView * view,
- int x,
- int y, struct psensor **sensors)
+static struct psensor *
+get_sensor_at_pos(GtkTreeView *view, int x, int y, struct psensor **sensors)
{
GtkTreePath *path;
*
* -1 if none
*/
-int ui_sensorlist_get_col_index_at_pos(GtkTreeView *view, int x)
+static int get_col_index_at_pos(GtkTreeView *view, int x)
{
GList *columns = gtk_tree_view_get_columns(view);
GList *node;
for (node = columns; node; node = node->next) {
GtkTreeViewColumn *checkcol = (GtkTreeViewColumn *) node->data;
- if (x >= colx && x < (colx + checkcol->width))
+ if (x >= colx &&
+ x < (colx + gtk_tree_view_column_get_width(checkcol)))
return coli;
else
- colx += checkcol->width;
+ colx += gtk_tree_view_column_get_width(checkcol);
coli++;
}
return -1;
}
-void ui_sensorlist_update_sensors_preferences(struct ui_sensorlist *list)
+void ui_sensorlist_update_sensors_preferences(struct ui_psensor *ui)
{
GtkTreeIter iter;
GtkTreeModel *model
- = gtk_tree_view_get_model(GTK_TREE_VIEW(list->widget));
+ = gtk_tree_view_get_model(ui->ui_sensorlist->treeview);
gboolean valid = gtk_tree_model_get_iter_first(model, &iter);
- struct psensor **sensor = list->sensors;
+ struct psensor **sensor = ui->ui_sensorlist->sensors;
while (valid && *sensor) {
GdkColor color;
}
}
-static void cb_sensor_settings_activated(GtkWidget *menu_item, gpointer data)
+static void on_preferences_activated(GtkWidget *menu_item, gpointer data)
{
struct cb_data *cb_data = data;
- struct psensor *sensor = cb_data->sensor;
- GtkDialog *diag;
- gint result;
- GtkBuilder *builder;
- GError *error = NULL;
- GtkLabel *w_id, *w_type;
- GtkEntry *w_name;
- GtkToggleButton *w_draw, *w_alarm;
- GtkColorButton *w_color;
- GtkSpinButton *w_temp_limit;
- GdkColor *color;
- guint ok;
-
- builder = gtk_builder_new();
-
- ok = gtk_builder_add_from_file
- (builder,
- PACKAGE_DATA_DIR G_DIR_SEPARATOR_S "sensor-edit.glade",
- &error);
-
- if (!ok) {
- g_warning("%s", error->message);
- g_free(error);
- return ;
- }
-
- w_id = GTK_LABEL(gtk_builder_get_object(builder, "sensor_id"));
- gtk_label_set_text(w_id, sensor->id);
-
- w_type = GTK_LABEL(gtk_builder_get_object(builder, "sensor_type"));
- gtk_label_set_text(w_type, psensor_type_to_str(sensor->type));
-
- w_name = GTK_ENTRY(gtk_builder_get_object(builder, "sensor_name"));
- gtk_entry_set_text(w_name, sensor->name);
-
- w_draw = GTK_TOGGLE_BUTTON(gtk_builder_get_object(builder,
- "sensor_draw"));
- gtk_toggle_button_set_active(w_draw, sensor->enabled);
-
- color = color_to_gdkcolor(sensor->color);
- w_color = GTK_COLOR_BUTTON(gtk_builder_get_object(builder,
- "sensor_color"));
- gtk_color_button_set_color(w_color, color);
-
- w_alarm = GTK_TOGGLE_BUTTON(gtk_builder_get_object(builder,
- "sensor_alarm"));
- w_temp_limit
- = GTK_SPIN_BUTTON(gtk_builder_get_object(builder,
- "sensor_temp_limit"));
-
- if (is_temp_type(sensor->type)) {
- gtk_toggle_button_set_active(w_alarm, sensor->alarm_enabled);
- gtk_spin_button_set_value(w_temp_limit, sensor->alarm_limit);
- } else {
- gtk_widget_set_sensitive(GTK_WIDGET(w_alarm), FALSE);
- gtk_widget_set_sensitive(GTK_WIDGET(w_temp_limit), FALSE);
- }
-
- diag = GTK_DIALOG(gtk_builder_get_object(builder, "dialog1"));
- result = gtk_dialog_run(diag);
-
- if (result == GTK_RESPONSE_ACCEPT) {
-
- free(sensor->name);
- sensor->name = strdup(gtk_entry_get_text(w_name));
- config_set_sensor_name(sensor->id, sensor->name);
-
- sensor->enabled = gtk_toggle_button_get_active(w_draw);
- config_set_sensor_enabled(sensor->id, sensor->enabled);
-
- sensor->alarm_limit = gtk_spin_button_get_value(w_temp_limit);
- config_set_sensor_alarm_limit(sensor->id, sensor->alarm_limit);
-
- sensor->alarm_enabled = gtk_toggle_button_get_active(w_alarm);
- config_set_sensor_alarm_enabled(sensor->id,
- sensor->alarm_enabled);
-
- gtk_color_button_get_color(w_color, color);
- color_set(sensor->color, color->red, color->green, color->blue);
- config_set_sensor_color(sensor->id, sensor->color);
-
- ui_sensorlist_update_sensors_preferences
- (cb_data->ui_sensorlist);
- }
-
- g_object_unref(G_OBJECT(builder));
- gtk_widget_destroy(GTK_WIDGET(diag));
+ ui_sensorpref_dialog_run(cb_data->sensor, cb_data->ui);
}
-static GtkWidget *create_sensor_popup(struct ui_sensorlist *ui_sensorlist,
+static GtkWidget *create_sensor_popup(struct ui_psensor *ui,
struct psensor *sensor)
{
GtkWidget *menu;
gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);
data = malloc(sizeof(struct cb_data));
- data->ui_sensorlist = ui_sensorlist;
+ data->ui = ui;
data->sensor = sensor;
g_signal_connect(item,
"activate",
- G_CALLBACK(cb_sensor_settings_activated), data);
+ G_CALLBACK(on_preferences_activated), data);
gtk_widget_show_all(menu);
return menu;
}
-int
-cb_sensor_line_clicked(GtkWidget *widget,
- GdkEventButton *event, gpointer data)
+static int on_clicked(GtkWidget *widget, GdkEventButton *event, gpointer data)
{
- struct ui_sensorlist *list = (struct ui_sensorlist *)data;
- GtkTreeView *view = GTK_TREE_VIEW(list->widget);
+ struct ui_psensor *ui = (struct ui_psensor *)data;
+ GtkTreeView *view = ui->ui_sensorlist->treeview;
- struct psensor *sensor = ui_sensorlist_get_sensor_at_pos(view,
- event->x,
- event->y,
- list->sensors);
+ struct psensor *sensor = get_sensor_at_pos(view,
+ event->x,
+ event->y,
+ ui->sensors);
if (sensor) {
- int coli = col_index_to_col(ui_sensorlist_get_col_index_at_pos
- (view, event->x));
+ int coli = col_index_to_col(get_col_index_at_pos(view,
+ event->x));
if (coli == COL_COLOR) {
if (ui_change_color(_("Select foreground color"),
sensor->color)) {
- ui_sensorlist_update_sensors_preferences(list);
+ ui_sensorlist_update_sensors_preferences(ui);
config_set_sensor_color(sensor->id,
sensor->color);
}
} else if (coli >= 0 && coli != COL_ENABLED) {
- GtkWidget *menu = create_sensor_popup(list,
+ GtkWidget *menu = create_sensor_popup(ui,
sensor);
gtk_menu_popup(GTK_MENU(menu), NULL, NULL, NULL, NULL,
return FALSE;
}
-void
-ui_sensorlist_on_toggled(GtkCellRendererToggle *cell,
- gchar *path_str, gpointer data)
+static void
+on_toggled(GtkCellRendererToggle *cell, gchar *path_str, gpointer data)
{
struct ui_sensorlist *list = (struct ui_sensorlist *)data;
GtkTreeModel *model
- = gtk_tree_view_get_model(GTK_TREE_VIEW(list->widget));
+ = gtk_tree_view_get_model(list->treeview);
GtkTreeIter iter;
GtkTreePath *path = gtk_tree_path_new_from_string(path_str);
gboolean fixed;
gtk_tree_path_free(path);
}
-void ui_sensorlist_create_widget(struct ui_sensorlist *ui)
+static void create_widget(struct ui_psensor *ui)
{
GtkListStore *store;
GtkCellRenderer *renderer;
- struct psensor **sensor_cur;
- struct psensor **sensors;
-
- sensors = ui->sensors;
+ 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_BOOLEAN, G_TYPE_STRING);
- if (ui->widget)
- gtk_widget_destroy(ui->widget);
-
- ui->widget =
- GTK_WIDGET(gtk_tree_view_new_with_model(GTK_TREE_MODEL(store)));
+ ui_sl->treeview = GTK_TREE_VIEW
+ (gtk_tree_view_new_with_model(GTK_TREE_MODEL(store)));
- gtk_tree_selection_set_mode(gtk_tree_view_get_selection
- (GTK_TREE_VIEW(ui->widget)),
- GTK_SELECTION_NONE);
+ gtk_tree_selection_set_mode
+ (gtk_tree_view_get_selection(ui_sl->treeview),
+ GTK_SELECTION_NONE);
renderer = gtk_cell_renderer_text_new();
- gtk_tree_view_insert_column_with_attributes(GTK_TREE_VIEW(ui->widget),
+ gtk_tree_view_insert_column_with_attributes(ui_sl->treeview,
-1,
_("Sensor"),
renderer,
"text", COL_NAME, NULL);
- gtk_tree_view_insert_column_with_attributes(GTK_TREE_VIEW(ui->widget),
+ gtk_tree_view_insert_column_with_attributes(ui_sl->treeview,
-1,
- _("Current"),
+ _("Value"),
renderer,
"text", COL_TEMP, NULL);
- gtk_tree_view_insert_column_with_attributes(GTK_TREE_VIEW(ui->widget),
+ gtk_tree_view_insert_column_with_attributes(ui_sl->treeview,
-1,
_("Min"),
renderer,
"text", COL_TEMP_MIN, NULL);
- gtk_tree_view_insert_column_with_attributes(GTK_TREE_VIEW(ui->widget),
+ gtk_tree_view_insert_column_with_attributes(ui_sl->treeview,
-1,
_("Max"),
renderer,
"text", COL_TEMP_MAX, NULL);
renderer = gtk_cell_renderer_text_new();
- gtk_tree_view_insert_column_with_attributes(GTK_TREE_VIEW(ui->widget),
+ gtk_tree_view_insert_column_with_attributes(ui_sl->treeview,
-1,
_("Color"),
renderer,
"background", COL_COLOR_STR,
NULL);
- g_signal_connect(ui->widget,
- "button-press-event",
- (GCallback) cb_sensor_line_clicked, ui);
+ g_signal_connect(ui_sl->treeview,
+ "button-press-event", (GCallback) on_clicked, ui);
renderer = gtk_cell_renderer_toggle_new();
- gtk_tree_view_insert_column_with_attributes(GTK_TREE_VIEW(ui->widget),
+ gtk_tree_view_insert_column_with_attributes(ui_sl->treeview,
-1,
- _("Enabled"),
+ _("Graph"),
renderer,
"active", COL_ENABLED,
NULL);
- g_signal_connect(G_OBJECT(renderer), "toggled",
- (GCallback) ui_sensorlist_on_toggled, ui);
+ g_signal_connect(G_OBJECT(renderer),
+ "toggled", (GCallback) on_toggled, ui_sl);
renderer = gtk_cell_renderer_text_new();
- gtk_tree_view_insert_column_with_attributes(GTK_TREE_VIEW(ui->widget),
+ gtk_tree_view_insert_column_with_attributes(ui_sl->treeview,
-1,
"",
renderer,
"text", COL_EMPTY, NULL);
- sensor_cur = sensors;
- while (*sensor_cur) {
+ while (*s_cur) {
GtkTreeIter iter;
GdkColor color;
gchar *scolor;
+ struct psensor *s = *s_cur;
- color.red = (*sensor_cur)->color->red;
- color.green = (*sensor_cur)->color->green;
- color.blue = (*sensor_cur)->color->blue;
+ color.red = s->color->red;
+ color.green = s->color->green;
+ color.blue = s->color->blue;
scolor = gdk_color_to_string(&color);
gtk_list_store_append(store, &iter);
gtk_list_store_set(store, &iter,
- COL_NAME, (*sensor_cur)->name,
+ COL_NAME, s->name,
COL_TEMP, _("N/A"),
COL_TEMP_MIN, _("N/A"),
COL_TEMP_MAX, _("N/A"),
COL_COLOR_STR, scolor,
- COL_ENABLED, (*sensor_cur)->enabled, -1);
+ COL_ENABLED, s->enabled, -1);
free(scolor);
- sensor_cur++;
+ 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));
}
-struct ui_sensorlist *ui_sensorlist_create(struct psensor **sensors)
+void ui_sensorlist_create(struct ui_psensor *ui)
{
- struct ui_sensorlist *list;
-
- list = malloc(sizeof(struct ui_sensorlist));
- list->sensors = sensors;
- list->widget = NULL;
-
- ui_sensorlist_create_widget(list);
-
- return list;
+ ui->ui_sensorlist = malloc(sizeof(struct ui_sensorlist));
+ ui->ui_sensorlist->sensors = ui->sensors;
+ create_widget(ui);
}
projects / psensor.git / blobdiff