Add missing commits for creation screen

owtaylor · Jan 28, 2017 · 9d3444d · 9d3444d
1 parent 863aa5f
commit 9d3444d
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 16 deletions.
diff --git a/src/Makefile.am b/src/Makefile.am
@@ -4,7 +4,7 @@ bin_PROGRAMS = PurpleEgg
 CLEANFILES =
 BUILT_SOURCES =
 
-project.gresource.c: project.gresource.xml project-greeter.ui project-view.ui
+project.gresource.c: project.gresource.xml project-creator.ui project-greeter.ui project-view.ui
 	$(GLIB_COMPILE_RESOURCES) --sourcedir=$(srcdir) --target=$@ --generate=.c $<
 
 CLEANFILES += project.gresource.c
@@ -17,11 +17,17 @@ CLEANFILES += search-generated.c search-generated.h
 BUILT_SOURCES += search-generated.c search-generated.h
 
 PurpleEgg_SOURCES = \
+	egg-radio-box.c \
+	egg-radio-box.h \
+	egg-three-grid.c \
+	egg-three-grid.h \
 	introspection.c \
 	introspection.h \
 	main.c \
 	project-application.c \
 	project-application.h \
+	project-creator.c \
+	project-creator.h \
 	project-greeter.c \
 	project-greeter.h \
 	project-tab.c \
@@ -34,5 +40,5 @@ PurpleEgg_SOURCES = \
 	search-generated.c \
 	search-generated.h
 PurpleEgg_CPPFLAGS = $(PURPLEEGG_CFLAGS) $(WARN_CFLAGS) -I$(top_srcdir)/common -DBINDIR=\"$(bindir)\" -DLIBEXECDIR=\"$(libexecdir)\"
-PurpleEgg_LDFLAGS = $(PURPLEEGG_LIBS)
+PurpleEgg_LDFLAGS = $(PURPLEEGG_LIBS) -lm
 PurpleEgg_LDADD = $(top_builddir)/common/libPurpleEgg-common.la
diff --git a/src/project-window.c b/src/project-window.c
@@ -3,6 +3,7 @@
 #include "host-command.h"
 #include "project-tab.h"
 #include "project-view.h"
+#include "project-creator.h"
 #include "project-greeter.h"
 #include "project-window.h"
 
@@ -164,35 +165,39 @@ project_window_set_directory (ProjectWindow *self,
 
       ProjectView *view = project_view_new (self, directory);
       gtk_widget_show (GTK_WIDGET (view));
-      gtk_container_add (GTK_CONTAINER (self), GTK_WIDGET (view));
-      gtk_window_set_titlebar (GTK_WINDOW (self),
-                               project_view_get_titlebar (view));
+
+      set_child_and_titlebar (self,
+                              GTK_WIDGET (view),
+                              project_view_get_titlebar (view));
 
       project_view_update_window_size (view);
     }
-  else
-    {
-      gtk_window_set_title (GTK_WINDOW (self), "PurpleEgg");
-    }
 }
 
 void
 project_window_show_greeter (ProjectWindow *self)
 {
-  project_window_set_directory (self, NULL);
-  clear_children (self);
+  g_return_if_fail (self->directory == NULL);
 
   ProjectGreeter *greeter = project_greeter_new (self);
-
   gtk_widget_show (GTK_WIDGET (greeter));
-  gtk_container_add (GTK_CONTAINER (self), GTK_WIDGET (greeter));
-  gtk_window_set_titlebar (GTK_WINDOW (self),
-                           project_greeter_get_titlebar (greeter));
+
+  set_child_and_titlebar (self,
+                          GTK_WIDGET (greeter),
+                          project_greeter_get_titlebar (greeter));
 }
 
 void
 project_window_show_creator (ProjectWindow *self)
 {
+  g_return_if_fail (self->directory == NULL);
+
   project_window_set_directory (self, NULL);
-  clear_children (self);
+
+  ProjectCreator *creator = project_creator_new (self);
+  gtk_widget_show (GTK_WIDGET (creator));
+
+  set_child_and_titlebar (self,
+                          GTK_WIDGET (creator),
+                          project_creator_get_titlebar (creator));
 }