#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())
+ gtk_widget_hide(ui->main_window);
+ else
+ 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_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();
}
" <separator />"
" <menuitem name='Quit' action='QuitAction' />"
" </menu>"
+" <menu name='Help' action='HelpMenuAction'>"
+" <menuitem name='About' action='AboutAction' />"
+" </menu>"
" </menubar>"
"</ui>";
G_CALLBACK(cb_sensor_preferences) },
{ "QuitAction",
- GTK_STOCK_QUIT, N_("_Quit"), NULL, N_("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);
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)