hide on startup

[psensor.git] / src / ui.c

diff --git a/src/ui.c b/src/ui.c
index fe6077b..f71b84e 100644 (file)
--- a/src/ui.c
+++ b/src/ui.c
@@ -75,19 +75,18 @@ static const char *menu_desc =
 static GtkActionEntry entries[] = {
   { "PsensorMenuAction", NULL, "_Psensor" }, /* name, stock id, label */
 
-  { "PreferencesAction", GTK_STOCK_PREFERENCES,     /* name, stock id */
-    "_Preferences", NULL,                           /* label, accelerator */
-    "Preferences",                                  /* tooltip */
+  { "PreferencesAction", GTK_STOCK_PREFERENCES,   /* name, stock id */
+    N_("_Preferences"), NULL,                     /* label, accelerator */
+    N_("Preferences"),                            /* tooltip */
     G_CALLBACK(cb_preferences) },
 
   { "SensorPreferencesAction", GTK_STOCK_PREFERENCES,
-    "_Sensor Preferences",
-    NULL,
-    "SensorPreferences",
+    N_("_Sensor Preferences"), NULL,
+    N_("Sensor Preferences"),
     G_CALLBACK(cb_sensor_preferences) },
 
   { "QuitAction",
-    GTK_STOCK_QUIT, "_Quit", NULL, "Quit", G_CALLBACK(cb_menu_quit) }
+    GTK_STOCK_QUIT, N_("_Quit"), NULL, N_("Quit"), G_CALLBACK(cb_menu_quit) }
 };
 static guint n_entries = G_N_ELEMENTS(entries);
 
@@ -113,11 +112,32 @@ 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)
+{
+       GdkScreen *screen = gtk_widget_get_screen(w);
+
+#if (GTK_CHECK_VERSION(3, 0, 0))
+       GdkVisual *visual = gdk_screen_get_rgba_visual(screen);
+
+       if (visual) {
+               gtk_widget_set_visual(w, visual);
+               return 1;
+       }
+#else
+       GdkColormap *colormap = gdk_screen_get_rgba_colormap(screen);
+
+       if (colormap) {
+               gtk_widget_set_colormap(w, colormap);
+               return 1;
+       }
+#endif
+       return 0;
+}
+
 void ui_window_create(struct ui_psensor *ui)
 {
        GtkWidget *window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
        GdkScreen *screen;
-       GdkColormap *colormap;
        GdkPixbuf *icon;
        GtkIconTheme *icon_theme;
        GtkWidget *menubar;
@@ -132,11 +152,7 @@ void ui_window_create(struct ui_psensor *ui)
 
        if (ui->config->alpha_channel_enabled
            && gdk_screen_is_composited(screen)) {
-
-               colormap = gdk_screen_get_rgba_colormap(screen);
-               if (colormap)
-                       gtk_widget_set_colormap(window, colormap);
-               else
+               if (!enable_alpha_channel(window))
                        ui->config->alpha_channel_enabled = 0;
        } else {
                ui->config->alpha_channel_enabled = 0;
@@ -171,7 +187,10 @@ void ui_window_create(struct ui_psensor *ui)
        ui->main_window = window;
        ui->menu_bar = menubar;
 
-       gtk_widget_show_all(ui->main_window);
+       if (ui->config->hide_on_startup)
+               gtk_widget_show_all(ui->main_box);
+       else
+               gtk_widget_show_all(ui->main_window);
 }
 
 static void menu_bar_show(unsigned int show, struct ui_psensor *ui)