/*
- * Copyright (C) 2010-2012 jeanfi@gmail.com
+ * 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
* 02110-1301 USA
*/
#include "cfg.h"
+#include "slog.h"
#include "ui.h"
#include "ui_graph.h"
#include "ui_pref.h"
void ui_show_about_dialog()
{
- gtk_show_about_dialog(NULL,
- "comments",
- _("Psensor is a GTK+ application for monitoring "
- "hardware sensors"),
- "copyright",
- _("Copyright(c) 2010-2012\njeanfi@gmail.com"),
- "logo-icon-name", "psensor",
- "program-name", "Psensor",
- "title", _("About Psensor"),
- "version", VERSION,
- "website", PACKAGE_URL,
- "website-label", _("Psensor Homepage"),
- NULL);
+ gtk_show_about_dialog
+ (NULL,
+ "comments",
+ _("Psensor is a GTK+ application for monitoring hardware "
+ "sensors"),
+ "copyright",
+ _("Copyright(c) 2010-2012\njeanfi@gmail.com"),
+ "logo-icon-name", "psensor",
+ "program-name", "Psensor",
+ "title", _("About Psensor"),
+ "version", VERSION,
+ "website", PACKAGE_URL,
+ "website-label", _("Psensor Homepage"),
+ NULL);
}
static void cb_about(GtkMenuItem *mi, gpointer data)
G_CALLBACK(cb_preferences) },
{ "SensorPreferencesAction", GTK_STOCK_PREFERENCES,
- N_("_Sensor Preferences"), NULL,
+ N_("S_ensor Preferences"), NULL,
N_("Sensor Preferences"),
G_CALLBACK(cb_sensor_preferences) },
}
+static void on_slog_enabled_cb(GConfClient *client,
+ guint cnxn_id,
+ GConfEntry *entry,
+ gpointer user_data)
+{
+ struct ui_psensor *ui;
+ struct psensor **sensors;
+ pthread_mutex_t *mutex;
+
+ ui = (struct ui_psensor *)user_data;
+ sensors = ui->sensors;
+ mutex = &ui->sensors_mutex;
+
+ log_debug("cbk_slog_enabled");
+
+ if (is_slog_enabled())
+ slog_activate(NULL, sensors, mutex, config_get_slog_interval());
+ else
+ slog_close();
+}
+
void ui_window_create(struct ui_psensor *ui)
{
GtkWidget *window, *menubar;
GdkPixbuf *icon;
GtkIconTheme *icon_theme;
struct config *cfg;
+ guint ok;
+ GtkBuilder *builder;
+ GError *error;
+
+ builder = gtk_builder_new();
- window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
+ error = NULL;
+ ok = gtk_builder_add_from_file
+ (builder,
+ PACKAGE_DATA_DIR G_DIR_SEPARATOR_S "psensor.glade",
+ &error);
+
+ if (!ok) {
+ log_printf(LOG_ERR, error->message);
+ g_error_free(error);
+ return ;
+ }
+
+ window = GTK_WIDGET(gtk_builder_get_object(builder, "window"));
cfg = ui->config;
if (cfg->window_restore_enabled)
cfg->window_x,
cfg->window_y);
+ config_slog_enabled_notify_add(on_slog_enabled_cb, ui);
+
gtk_window_set_default_size(GTK_WINDOW(window),
cfg->window_w,
cfg->window_h);
- gtk_window_set_title(GTK_WINDOW(window),
- _("Psensor - Temperature Monitor"));
- gtk_window_set_role(GTK_WINDOW(window), "psensor");
-
icon_theme = gtk_icon_theme_get_default();
icon = gtk_icon_theme_load_icon(icon_theme, "psensor", 48, 0, NULL);
if (icon)
/* main box */
menubar = get_menu(ui);
- ui->main_box = gtk_box_new(GTK_ORIENTATION_VERTICAL, 1);
- gtk_box_set_homogeneous(GTK_BOX(ui->main_box), FALSE);
+ ui->main_box = GTK_WIDGET(gtk_builder_get_object(builder, "main_box"));
gtk_box_pack_start(GTK_BOX(ui->main_box), menubar,
FALSE, TRUE, 0);
void ui_window_show(struct ui_psensor *ui)
{
log_debug("ui_window_show()");
+ ui_window_update(ui);
gtk_window_present(GTK_WINDOW(ui->main_window));
}