/*
- 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-2012 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 "cfg.h"
#include "ui.h"
#include "ui_graph.h"
struct config *cfg;
visible = gtk_widget_get_visible(ui->main_window);
- log_printf(LOG_DEBUG, "Window visible: %d", visible);
+ log_debug("Window visible: %d", visible);
if (visible == TRUE) {
cfg = ui->config;
win = GTK_WINDOW(ui->main_window);
gtk_window_get_position(win, &cfg->window_x, &cfg->window_y);
- log_printf(LOG_DEBUG,
- "Window position: %d %d",
- cfg->window_x,
- cfg->window_y);
+ log_debug("Window position: %d %d",
+ cfg->window_x,
+ cfg->window_y);
gtk_window_get_size(win,
&cfg->window_w,
&cfg->window_h);
- log_printf(LOG_DEBUG,
- "Window size: %d %d",
- cfg->window_w,
- cfg->window_h);
+ log_debug("Window size: %d %d", cfg->window_w, cfg->window_h);
cfg->window_divider_pos
= gtk_paned_get_position(GTK_PANED(ui->sensor_box));
save_window_pos(ui);
- log_printf(LOG_DEBUG,
- "is_status_supported: %d\n", is_status_supported());
+ log_debug("is_status_supported: %d\n", is_status_supported());
if (is_appindicator_supported() || is_status_supported())
gtk_widget_hide(ui->main_window);
_("Psensor is a GTK+ application for monitoring "
"hardware sensors"),
"copyright",
- _("Copyright(c) 2010-2011\njeanfi@gmail.com"),
+ _("Copyright(c) 2010-2012\njeanfi@gmail.com"),
"logo-icon-name", "psensor",
"program-name", "Psensor",
"title", _("About Psensor"),
{
save_window_pos(ui);
- log_printf(LOG_DEBUG, "Destroy main window");
+ log_debug("Destroy main window");
gtk_widget_destroy(ui->main_window);
gtk_main_quit();
}
"</ui>";
static GtkActionEntry entries[] = {
- { "PsensorMenuAction", NULL, "_Psensor" }, /* name, stock id, label */
+ { "PsensorMenuAction", NULL, "_Psensor" },
- { "PreferencesAction", GTK_STOCK_PREFERENCES, /* name, stock id */
- N_("_Preferences"), NULL, /* label, accelerator */
- N_("Preferences"), /* tooltip */
- G_CALLBACK(cb_preferences) },
+ { "PreferencesAction", GTK_STOCK_PREFERENCES,
+ N_("_Preferences"), NULL,
+ N_("Preferences"),
+ G_CALLBACK(cb_preferences) },
- { "SensorPreferencesAction", GTK_STOCK_PREFERENCES,
- N_("_Sensor Preferences"), NULL,
- N_("Sensor Preferences"),
- G_CALLBACK(cb_sensor_preferences) },
+ { "SensorPreferencesAction", GTK_STOCK_PREFERENCES,
+ N_("_Sensor Preferences"), NULL,
+ N_("Sensor Preferences"),
+ G_CALLBACK(cb_sensor_preferences) },
- { "QuitAction",
- GTK_STOCK_QUIT, N_("_Quit"), NULL, N_("Quit"), G_CALLBACK(cb_menu_quit) },
+ { "QuitAction",
+ GTK_STOCK_QUIT, N_("_Quit"), NULL, N_("Quit"),
+ G_CALLBACK(cb_menu_quit) },
- { "HelpMenuAction", NULL, "_Help" },
+ { "HelpMenuAction", NULL, "_Help" },
- { "AboutAction", GTK_STOCK_PREFERENCES,
- N_("_About"), NULL,
- N_("About"),
- G_CALLBACK(cb_about) }
+ { "AboutAction", GTK_STOCK_PREFERENCES,
+ N_("_About"), NULL,
+ N_("About"),
+ G_CALLBACK(cb_about) }
};
static guint n_entries = G_N_ELEMENTS(entries);
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;
+
}
void ui_window_create(struct ui_psensor *ui)
{
GtkWidget *window, *menubar;
- GdkScreen *screen;
GdkPixbuf *icon;
GtkIconTheme *icon_theme;
struct config *cfg;
_("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)
/* main box */
menubar = get_menu(ui);
- ui->main_box = gtk_vbox_new(FALSE, 1);
-
+ ui->main_box = gtk_box_new(GTK_ORIENTATION_VERTICAL, 1);
+ gtk_box_set_homogeneous(GTK_BOX(ui->main_box), FALSE);
gtk_box_pack_start(GTK_BOX(ui->main_box), menubar,
FALSE, TRUE, 0);
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);
void ui_window_show(struct ui_psensor *ui)
{
- gtk_widget_show_all(ui->main_window);
+ log_debug("ui_window_show()");
+ gtk_window_present(GTK_WINDOW(ui->main_window));
}
projects / psensor.git / blobdiff