/*
- * 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) },
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,
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);
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 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;
- GdkScreen *screen;
GdkPixbuf *icon;
GtkIconTheme *icon_theme;
struct config *cfg;
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);
_("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);
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));
}