added log file

[psensor.git] / src / ui.c

diff --git a/src/ui.c b/src/ui.c
index abdd707..9476dee 100644 (file)
--- a/src/ui.c
+++ b/src/ui.c
@@ -23,26 +23,56 @@
 #include "ui_pref.h"
 #include "ui_sensorpref.h"
 #include "ui_sensorlist.h"
+#include "ui_appindicator.h"
 
 static gboolean
 on_delete_event_cb(GtkWidget *widget, GdkEvent *event, gpointer data)
 {
+       struct ui_psensor *ui = data;
 
 #if defined(HAVE_APPINDICATOR) || defined(HAVE_APPINDICATOR_029)
-       gtk_widget_hide(((struct ui_psensor *)data)->main_window);
+       if (is_appindicator_supported()) {
+               log_puts(LOG_DEBUG, "hiding, WM is supporting appindicator");
+               gtk_widget_hide(ui->main_window);
+       } else {
+               log_puts(LOG_DEBUG, "quitting, WM not supporting appindicator");
+               ui_psensor_quit(ui);
+       }
 #else
-       ui_psensor_quit();
+       ui_psensor_quit(ui);
 #endif
 
        return TRUE;
 }
 
+void ui_show_about_dialog()
+{
+       gtk_show_about_dialog(NULL,
+                             "comments",
+                             _("Psensor is a GTK+ application for monitoring "
+                               "hardware sensors"),
+                             "copyright",
+                             _("Copyright(c) 2010-2011\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)
+{
+       ui_show_about_dialog();
+}
+
 static void cb_menu_quit(GtkMenuItem *mi, gpointer data)
 {
-       ui_psensor_quit();
+       ui_psensor_quit((struct ui_psensor *)data);
 }
 
-static void cb_menu_preferences(GtkMenuItem *mi, gpointer data)
+static void cb_preferences(GtkMenuItem *mi, gpointer data)
 {
        ui_pref_dialog_run((struct ui_psensor *)data);
 }
@@ -55,8 +85,9 @@ static void cb_sensor_preferences(GtkMenuItem *mi, gpointer data)
                ui_sensorpref_dialog_run(*ui->sensors, ui);
 }
 
-void ui_psensor_quit()
+void ui_psensor_quit(struct ui_psensor *ui)
 {
+       gtk_widget_destroy(ui->main_window);
        gtk_main_quit();
 }
 
@@ -69,25 +100,34 @@ static const char *menu_desc =
 "      <separator />"
 "      <menuitem name='Quit' action='QuitAction' />"
 "    </menu>"
+"    <menu name='Help' action='HelpMenuAction'>"
+"      <menuitem name='About' action='AboutAction' />"
+"    </menu>"
 "  </menubar>"
 "</ui>";
 
 static GtkActionEntry entries[] = {
   { "PsensorMenuAction", NULL, "_Psensor" }, /* name, stock id, label */
 
-  { "PreferencesAction", GTK_STOCK_PREFERENCES,     /* name, stock id */
-    "_Preferences", NULL,                           /* label, accelerator */
-    "Preferences",                                  /* tooltip */
-    G_CALLBACK(cb_menu_preferences) },
+  { "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) },
+
+  { "HelpMenuAction", NULL, "_Help" },
+
+  { "AboutAction", GTK_STOCK_PREFERENCES,
+    N_("_About"), NULL,
+    N_("About"),
+    G_CALLBACK(cb_about) }
 };
 static guint n_entries = G_N_ELEMENTS(entries);
 
@@ -113,11 +153,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 +193,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 +228,15 @@ void ui_window_create(struct ui_psensor *ui)
        ui->main_window = window;
        ui->menu_bar = menubar;
 
+#if defined(HAVE_APPINDICATOR) || defined(HAVE_APPINDICATOR_029)
+       if (ui->config->hide_on_startup)
+               gtk_widget_show_all(ui->main_box);
+       else
+               gtk_widget_show_all(ui->main_window);
+#else
        gtk_widget_show_all(ui->main_window);
+#endif
+
 }
 
 static void menu_bar_show(unsigned int show, struct ui_psensor *ui)