implemented sensor logging

[psensor.git] / src / ui.c

diff --git a/src/ui.c b/src/ui.c
index 0019c80..d310bb2 100644 (file)
--- a/src/ui.c
+++ b/src/ui.c
@@ -17,6 +17,7 @@
  * 02110-1301 USA
  */
 #include "cfg.h"
+#include "slog.h"
 #include "ui.h"
 #include "ui_graph.h"
 #include "ui_pref.h"
@@ -75,19 +76,20 @@ on_delete_event_cb(GtkWidget *widget, GdkEvent *event, gpointer data)
 
 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)
@@ -146,7 +148,7 @@ static GtkActionEntry entries[] = {
          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) },
 
@@ -154,7 +156,7 @@ static GtkActionEntry entries[] = {
          GTK_STOCK_QUIT, N_("_Quit"), NULL, N_("Quit"),
          G_CALLBACK(cb_menu_quit) },
 
-       { "HelpMenuAction", NULL, "_Help" },
+       { "HelpMenuAction", NULL, N_("_Help") },
 
        { "AboutAction", GTK_STOCK_PREFERENCES,
          N_("_About"), NULL,
@@ -165,9 +167,9 @@ static guint n_entries = G_N_ELEMENTS(entries);
 
 static GtkWidget *get_menu(struct ui_psensor *ui)
 {
-       GtkActionGroup      *action_group;
-       GtkUIManager        *menu_manager;
-       GError              *error;
+       GtkActionGroup *action_group;
+       GtkUIManager *menu_manager;
+       GError *error;
 
        action_group = gtk_action_group_new("PsensorActions");
        gtk_action_group_set_translation_domain(action_group, PACKAGE);
@@ -185,32 +187,53 @@ static GtkWidget *get_menu(struct ui_psensor *ui)
        return gtk_ui_manager_get_widget(menu_manager, "/MainMenu");
 }
 
-static unsigned int enable_alpha_channel(GtkWidget *w)
+void ui_enable_alpha_channel(struct ui_psensor *ui)
 {
-       GdkScreen *screen = gtk_widget_get_screen(w);
+       GdkScreen *screen;
+       GdkVisual *visual;
+       struct config *cfg;
 
-#if (GTK_CHECK_VERSION(3, 0, 0))
-       GdkVisual *visual = gdk_screen_get_rgba_visual(screen);
+       cfg = ui->config;
 
-       if (visual) {
-               gtk_widget_set_visual(w, visual);
-               return 1;
-       }
-#else
-       GdkColormap *colormap = gdk_screen_get_rgba_colormap(screen);
+       screen = gtk_widget_get_screen(ui->main_window);
 
-       if (colormap) {
-               gtk_widget_set_colormap(w, colormap);
-               return 1;
+       log_debug("Config alpha channel enabled: %d",
+                 cfg->alpha_channel_enabled);
+       if (cfg->alpha_channel_enabled && gdk_screen_is_composited(screen)) {
+               log_debug("Screen is composited");
+               visual = gdk_screen_get_rgba_visual(screen);
+               if (visual) {
+                       gtk_widget_set_visual(ui->main_window, visual);
+               } else {
+                       cfg->alpha_channel_enabled = 0;
+                       log_err("Enable alpha channel has failed");
+               }
+       } else {
+               cfg->alpha_channel_enabled = 0;
        }
-#endif
-       return 0;
+
+}
+
+static void on_slog_enabled_cb(GConfClient *client,
+                            guint cnxn_id,
+                            GConfEntry *entry,
+                            gpointer user_data)
+{
+       struct psensor **sensors;
+
+       sensors = (struct psensor **)user_data;
+
+       log_debug("cbk_slog_enabled");
+
+       if (is_slog_enabled())
+               slog_init(NULL, sensors);
+       else
+               slog_close(NULL, sensors);
 }
 
 void ui_window_create(struct ui_psensor *ui)
 {
        GtkWidget *window, *menubar;
-       GdkScreen *screen;
        GdkPixbuf *icon;
        GtkIconTheme *icon_theme;
        struct config *cfg;
@@ -223,6 +246,8 @@ void ui_window_create(struct ui_psensor *ui)
                                cfg->window_x,
                                cfg->window_y);
 
+       config_slog_enabled_notify_add(on_slog_enabled_cb, ui->sensors);
+
        gtk_window_set_default_size(GTK_WINDOW(window),
                                    cfg->window_w,
                                    cfg->window_h);
@@ -231,21 +256,12 @@ void ui_window_create(struct ui_psensor *ui)
                             _("Psensor - Temperature Monitor"));
        gtk_window_set_role(GTK_WINDOW(window), "psensor");
 
-       screen = gtk_widget_get_screen(window);
-
-       if (cfg->alpha_channel_enabled && gdk_screen_is_composited(screen)) {
-               if (!enable_alpha_channel(window))
-                       cfg->alpha_channel_enabled = 0;
-       } else {
-               cfg->alpha_channel_enabled = 0;
-       }
-
        icon_theme = gtk_icon_theme_get_default();
        icon = gtk_icon_theme_load_icon(icon_theme, "psensor", 48, 0, NULL);
        if (icon)
                gtk_window_set_icon(GTK_WINDOW(window), icon);
        else
-               fprintf(stderr, _("ERROR: Failed to load psensor icon.\n"));
+               log_err(_("Failed to load Psensor icon."));
 
        g_signal_connect(window,
                         "delete_event", G_CALLBACK(on_delete_event_cb), ui);
@@ -303,9 +319,9 @@ void ui_window_update(struct ui_psensor *ui)
 
        if (cfg->sensorlist_position == SENSORLIST_POSITION_RIGHT
            || cfg->sensorlist_position == SENSORLIST_POSITION_LEFT)
-               ui->sensor_box = gtk_hpaned_new();
+               ui->sensor_box = gtk_paned_new(GTK_ORIENTATION_HORIZONTAL);
        else
-               ui->sensor_box = gtk_vpaned_new();
+               ui->sensor_box = gtk_paned_new(GTK_ORIENTATION_VERTICAL);
 
        gtk_box_pack_end(GTK_BOX(ui->main_box), ui->sensor_box, TRUE, TRUE, 2);