X-Git-Url: http://git.wpitchoune.net/gitweb/?a=blobdiff_plain;f=src%2Fui.c;h=4fabb8c8ec93a7566fc43896f6e48cabfcb2e24b;hb=61287c36e0005dbb1353fe87840170964e95c262;hp=90731fe8bc736f125e57dfec4b3c9736b749aab6;hpb=6cbe8e1f06034ee12534ae466cc90b40b10f14b0;p=ptask.git

diff --git a/src/ui.c b/src/ui.c
index 90731fe..4fabb8c 100644
--- a/src/ui.c
+++ b/src/ui.c
@@ -16,14 +16,20 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301 USA
  */
+#include <config.h>
+
+#include <glib/gi18n.h>
 
 #include <log.h>
 #include <ui.h>
 #include <ui_newtask_diag.h>
 #include <ui_projecttree.h>
+#include <ui_taskpanel.h>
 #include <ui_tasktree.h>
 
 static GtkComboBox *w_status;
+static GSettings *gsettings;
+static GtkWindow *window;
 
 int newtask_clicked_cbk(GtkButton *btn, gpointer data)
 {
@@ -60,26 +66,47 @@ int refresh_clicked_cbk(GtkButton *btn, gpointer data)
 }
 
 
+static void ui_quit()
+{
+	save_settings(window, gsettings);
+	gtk_widget_destroy(GTK_WIDGET(window));
+	gtk_main_quit();
+}
+
 static gboolean delete_event_cbk(GtkWidget *w, GdkEvent *evt, gpointer data)
 {
 	log_fct_enter();
 
-	save_settings(GTK_WINDOW(w), (GSettings *)data);
-	gtk_widget_destroy(w);
-	gtk_main_quit();
+	ui_quit();
 
 	log_fct_exit();
 
 	return TRUE;
 }
 
+static int status_changed_cbk(GtkComboBox *w, gpointer data)
+{
+	log_fct_enter();
+
+	refresh();
+
+	log_fct_exit();
+
+	return FALSE;
+}
+
 GtkWindow *create_window(GtkBuilder *builder, GSettings *settings)
 {
-	GtkWindow *window;
 	int x, y, w, h;
 
+	gsettings = settings;
+
 	window = GTK_WINDOW(gtk_builder_get_object(builder, "window"));
+
 	w_status = GTK_COMBO_BOX(gtk_builder_get_object(builder, "status"));
+	g_signal_connect(w_status,
+			 "changed", (GCallback)status_changed_cbk,
+			 NULL);
 
 	w = g_settings_get_int(settings, "window-width");
 	h = g_settings_get_int(settings, "window-height");
@@ -92,6 +119,7 @@ GtkWindow *create_window(GtkBuilder *builder, GSettings *settings)
 	g_signal_connect(window, "delete_event",
 			 G_CALLBACK(delete_event_cbk), settings);
 
+	ui_taskpanel_init(builder);
 	ui_tasktree_init(builder);
 	ui_projecttree_init(builder);
 
@@ -102,20 +130,42 @@ GtkWindow *create_window(GtkBuilder *builder, GSettings *settings)
 
 const char *ui_get_status_filter()
 {
-	const char *result;
-	int status;
+	const char *status;
 
 	log_fct_enter();
 
-	status = gtk_combo_box_get_active(w_status);
-	log_fct(__func__, "status: %d", status);
+	status = gtk_combo_box_get_active_id(w_status);
+	log_fct("status: %d", status);
 
-	if (status == 1)
-		result = "completed";
-	else
-		result = "pending";
+	log_fct_exit();
 
+	return status;
+}
+
+void quit_activate_cbk(GtkWidget *menu_item, gpointer data)
+{
+	log_fct_enter();
+	ui_quit();
 	log_fct_exit();
+}
 
-	return result;
+void about_activate_cbk(GtkWidget *menu_item, gpointer data)
+{
+	log_fct_enter();
+
+	gtk_show_about_dialog
+		(NULL,
+		 "comments",
+		 _("ptask is a GTK+ task management application"),
+		 "copyright",
+		 _("Copyright(c) 2010-2013\njeanfi@gmail.com"),
+		 "logo-icon-name", "ptask",
+		 "program-name", "ptask",
+		 "title", _("About ptask"),
+		 "version", VERSION,
+		 "website", PACKAGE_URL,
+		 "website-label", _("ptask Homepage"),
+		 NULL);
+
+	log_fct_exit();
 }