projects
/
psensor.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
294893a
)
style
author
Jean-Philippe Orsini
<jeanfi@gmail.com>
Thu, 10 Nov 2011 23:57:50 +0000
(23:57 +0000)
committer
Jean-Philippe Orsini
<jeanfi@gmail.com>
Thu, 10 Nov 2011 23:57:50 +0000
(23:57 +0000)
src/ui.c
patch
|
blob
|
history
diff --git
a/src/ui.c
b/src/ui.c
index
01cc804
..
f13cdf6
100644
(file)
--- a/
src/ui.c
+++ b/
src/ui.c
@@
-214,13
+214,14
@@
static unsigned int enable_alpha_channel(GtkWidget *w)
void ui_window_create(struct ui_psensor *ui)
{
void ui_window_create(struct ui_psensor *ui)
{
- GtkWidget *window
= gtk_window_new(GTK_WINDOW_TOPLEVEL)
;
+ GtkWidget *window
, *menubar
;
GdkScreen *screen;
GdkPixbuf *icon;
GtkIconTheme *icon_theme;
GdkScreen *screen;
GdkPixbuf *icon;
GtkIconTheme *icon_theme;
- GtkWidget *menubar;
struct config *cfg;
struct config *cfg;
+ window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
+
cfg = ui->config;
if (cfg->window_restore_enabled)
gtk_window_move(GTK_WINDOW(window),
cfg = ui->config;
if (cfg->window_restore_enabled)
gtk_window_move(GTK_WINDOW(window),
@@
-231,19
+232,17
@@
void ui_window_create(struct ui_psensor *ui)
cfg->window_w,
cfg->window_h);
cfg->window_w,
cfg->window_h);
-
gtk_window_set_title(GTK_WINDOW(window),
_("Psensor - Temperature Monitor"));
gtk_window_set_role(GTK_WINDOW(window), "psensor");
screen = gtk_widget_get_screen(window);
gtk_window_set_title(GTK_WINDOW(window),
_("Psensor - Temperature Monitor"));
gtk_window_set_role(GTK_WINDOW(window), "psensor");
screen = gtk_widget_get_screen(window);
- if (ui->config->alpha_channel_enabled
- && gdk_screen_is_composited(screen)) {
+ if (cfg->alpha_channel_enabled && gdk_screen_is_composited(screen)) {
if (!enable_alpha_channel(window))
if (!enable_alpha_channel(window))
-
ui->confi
g->alpha_channel_enabled = 0;
+
cf
g->alpha_channel_enabled = 0;
} else {
} else {
-
ui->confi
g->alpha_channel_enabled = 0;
+
cf
g->alpha_channel_enabled = 0;
}
icon_theme = gtk_icon_theme_get_default();
}
icon_theme = gtk_icon_theme_get_default();
@@
-257,10
+256,10
@@
void ui_window_create(struct ui_psensor *ui)
"delete_event", G_CALLBACK(on_delete_event_cb), ui);
gtk_window_set_decorated(GTK_WINDOW(window),
"delete_event", G_CALLBACK(on_delete_event_cb), ui);
gtk_window_set_decorated(GTK_WINDOW(window),
-
ui->confi
g->window_decoration_enabled);
+
cf
g->window_decoration_enabled);
gtk_window_set_keep_below(GTK_WINDOW(window),
gtk_window_set_keep_below(GTK_WINDOW(window),
-
ui->confi
g->window_keep_below_enabled);
+
cf
g->window_keep_below_enabled);
/* main box */
menubar = get_menu(ui);
/* main box */
menubar = get_menu(ui);
@@
-278,7
+277,7
@@
void ui_window_create(struct ui_psensor *ui)
log_printf(LOG_DEBUG,
"is_status_supported: %d\n", is_status_supported());
log_printf(LOG_DEBUG,
"is_status_supported: %d\n", is_status_supported());
- if (
ui->confi
g->hide_on_startup
+ if (
cf
g->hide_on_startup
&& (is_appindicator_supported() || is_status_supported()))
gtk_widget_show_all(ui->main_box);
else
&& (is_appindicator_supported() || is_status_supported()))
gtk_widget_show_all(ui->main_box);
else
@@
-339,7
+338,6
@@
void ui_window_update(struct ui_psensor *ui)
gtk_paned_set_position(GTK_PANED(ui->sensor_box),
ui->config->window_divider_pos);
gtk_paned_set_position(GTK_PANED(ui->sensor_box),
ui->config->window_divider_pos);
-
if (!init)
g_object_unref(GTK_WIDGET(ui->ui_sensorlist->widget));
if (!init)
g_object_unref(GTK_WIDGET(ui->ui_sensorlist->widget));
@@
-354,5
+352,4
@@
void ui_window_update(struct ui_psensor *ui)
void ui_window_show(struct ui_psensor *ui)
{
gtk_widget_show_all(ui->main_window);
void ui_window_show(struct ui_psensor *ui)
{
gtk_widget_show_all(ui->main_window);
-
}
}