save/restore window position and size

[ptask.git] / src / main.c

diff --git a/src/main.c b/src/main.c
index 36c0d19..70b65a0 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -25,13 +25,13 @@
 #include <json/json.h>
 
 #include <glib/gi18n.h>
-#include <gtk/gtk.h>
 
 #include <config.h>
 
 #include "log.h"
 #include "note.h"
 #include "tw.h"
+#include <ui.h>
 
 static const char *program_name;
 static struct task **tasks;
@@ -43,6 +43,7 @@ static GtkWidget *w_tasksave_btn;
 static GtkWidget *w_taskdone_btn;
 static GtkComboBox *w_status;
 static GtkComboBox *w_priority;
+static GSettings *settings;
 
 enum {
        COL_ID,
@@ -292,15 +293,6 @@ int refresh_clicked_cbk(GtkButton *btn, gpointer data)
        return FALSE;
 }
 
-static gboolean delete_event_cbk(GtkWidget *w, GdkEvent *evt, gpointer data)
-{
-       gtk_widget_destroy(w);
-       gtk_main_quit();
-
-       return FALSE;
-}
-
-
 int newtask_clicked_cbk(GtkButton *btn, gpointer data)
 {
        gint result;
@@ -458,7 +450,8 @@ static void log_init()
 
 int main(int argc, char **argv)
 {
-       GtkWidget *window, *btn;
+       GtkWindow *window;
+       GtkWidget *btn;
        GtkBuilder *builder;
        GtkTreeModel *model;
        int optc, cmdok, opti;
@@ -501,15 +494,15 @@ int main(int argc, char **argv)
        log_init();
 
        gtk_init(NULL, NULL);
+
+       settings = g_settings_new("ptask");
+
        builder = gtk_builder_new();
        gtk_builder_add_from_file
                (builder,
                 PACKAGE_DATA_DIR G_DIR_SEPARATOR_S "ptask.glade",
                 NULL);
-       window = GTK_WIDGET(gtk_builder_get_object(builder, "window"));
-
-       g_signal_connect(window, "delete_event",
-                        G_CALLBACK(delete_event_cbk), NULL);
+       window = create_window(builder, settings);
 
        w_treeview = GTK_TREE_VIEW(gtk_builder_get_object(builder, "treeview"));
        model = gtk_tree_view_get_model(GTK_TREE_VIEW(w_treeview));
@@ -551,7 +544,7 @@ int main(int argc, char **argv)
 
        g_object_unref(G_OBJECT(builder));
 
-       gtk_widget_show_all(window);
+       gtk_widget_show_all(GTK_WIDGET(window));
 
        gtk_main();