extracted ui code to create a new task

[ptask.git] / src / main.c

diff --git a/src/main.c b/src/main.c
index e34503b..2171895 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -148,7 +148,7 @@ static void clear_task_panel()
        gtk_widget_set_sensitive(GTK_WIDGET(w_priority), 0);
 }
 
-static void refresh()
+void refresh()
 {
        GtkWidget *dialog;
        GtkTreeModel *model;
@@ -293,56 +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;
-       static GtkDialog *diag;
-       GtkBuilder *builder;
-       GtkEntry *entry;
-       const char *ctxt;
-
-       log_debug("newtask_clicked_cbk");
-
-       builder = gtk_builder_new();
-       gtk_builder_add_from_file
-               (builder,
-                PACKAGE_DATA_DIR G_DIR_SEPARATOR_S "ptask.glade",
-                NULL);
-       diag = GTK_DIALOG(gtk_builder_get_object(builder, "diag_tasknew"));
-       gtk_builder_connect_signals(builder, NULL);
-
-       result = gtk_dialog_run(diag);
-
-       if (result == GTK_RESPONSE_ACCEPT) {
-               log_debug("ok");
-               entry = GTK_ENTRY(gtk_builder_get_object
-                                 (builder, "diag_tasknew_description"));
-               ctxt = gtk_entry_get_text(entry);
-
-               log_debug("%s", ctxt);
-
-               tw_add(ctxt);
-               refresh();
-       } else {
-               log_debug("cancel");
-       }
-
-       g_object_unref(G_OBJECT(builder));
-
-       gtk_widget_destroy(GTK_WIDGET(diag));
-
-       return FALSE;
-}
-
 static int status_changed_cbk(GtkComboBox *w, gpointer data)
 {
        log_debug("status_changed_cbk");
@@ -506,19 +456,12 @@ int main(int argc, char **argv)
 
        settings = g_settings_new("ptask");
 
-       printf("%d\n", g_settings_get_int(settings, "windows_x"));
-
-
        builder = gtk_builder_new();
        gtk_builder_add_from_file
                (builder,
                 PACKAGE_DATA_DIR G_DIR_SEPARATOR_S "ptask.glade",
                 NULL);
-       window = create_window();
-       window = GTK_WINDOW(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));
@@ -537,8 +480,6 @@ int main(int argc, char **argv)
        w_priority = GTK_COMBO_BOX(gtk_builder_get_object(builder,
                                                          "taskpriority"));
 
-       refresh();
-
        gtk_builder_connect_signals(builder, NULL);
 
        g_signal_connect(w_treeview,
@@ -560,6 +501,8 @@ int main(int argc, char **argv)
 
        g_object_unref(G_OBJECT(builder));
 
+       refresh();
+
        gtk_widget_show_all(GTK_WIDGET(window));
 
        gtk_main();