Create a new directory under "gtk" to hold the toplevel UI code.

7 files changed, 32 insertions, 6 deletions

diff --git a/src/gtk/Makefile.am b/src/gtk/Makefile.am
index 718e9ba7..6d9778cc 100644
--- a/src/gtk/Makefile.am
+++ b/src/gtk/Makefile.am
@@ -1,6 +1,6 @@
 INCLUDES=-I$(top_builddir) -I$(top_srcdir) -I$(top_srcdir)/src -I$(top_srcdir)/intl
 
-SUBDIRS=util
+SUBDIRS=toplevel util
 
 noinst_LIBRARIES=libgtk.a
 
@@ -11,8 +11,6 @@ pkgdata_DATA = aptitude.glade
 EXTRA_DIST = aptitude.glade
 
 libgtk_a_SOURCES=\
-	area.cc \
-	area.h \
 	changelog.cc \
 	changelog.h \
 	constants.h \
diff --git a/src/gtk/SConscript b/src/gtk/SConscript
index 1c09c3d4..caa26579 100644
--- a/src/gtk/SConscript
+++ b/src/gtk/SConscript
@@ -1,8 +1,6 @@
 Import('programs_env')
 
 toplevel_srcs = map(File, [
-    'area.cc',
-    'area.h',
     'changelog.cc',
     'changelog.h',
     'constants.h',
@@ -52,7 +50,7 @@ toplevel_srcs = map(File, [
     'treeview_cell_tooltips.h',
     ])
 
-sub_srcs = SConscript(dirs = [ 'util' ])
+sub_srcs = SConscript(dirs = [ 'toplevel', 'util' ])
 
 srcs = (toplevel_srcs, sub_srcs)
 
diff --git a/src/gtk/toplevel/Makefile.am b/src/gtk/toplevel/Makefile.am
new file mode 100644
index 00000000..11040549
--- /dev/null
+++ b/src/gtk/toplevel/Makefile.am
@@ -0,0 +1,9 @@
+INCLUDES=-I$(top_builddir) -I$(top_srcdir) -I$(top_srcdir)/src -I$(top_srcdir)/intl
+
+noinst_LIBRARIES=libgtk-toplevel.a
+
+EXTRA_DIST=README
+
+libgtk_toplevel_a_SOURCES = \
+	area.cc \
+	area.h
\ No newline at end of file
diff --git a/src/gtk/toplevel/README b/src/gtk/toplevel/README
new file mode 100644
index 00000000..3e17abfe
--- /dev/null
+++ b/src/gtk/toplevel/README
@@ -0,0 +1,8 @@
+This directory contains the code for the "top level" GTK+ UI, which is
+responsible for organizing the various views that aptitude presents to
+the user.
+
+The design provides a simple "model" of the structure of the
+top-level, which acts as a go-between for the top-level UI and the
+rest of the program.  The goal here is to allow us to tweak the
+top-level design without impacting the rest of the code too much.
\ No newline at end of file
diff --git a/src/gtk/toplevel/SConscript b/src/gtk/toplevel/SConscript
new file mode 100644
index 00000000..24a933a9
--- /dev/null
+++ b/src/gtk/toplevel/SConscript
@@ -0,0 +1,13 @@
+Import('programs_env')
+
+toplevel_srcs = map(File, [
+    'area.cc',
+    'area.h',
+    ])
+
+srcs = toplevel_srcs
+
+# Distribute the build files.
+programs_env.Dist('Makefile.am', 'SConscript')
+
+Return('srcs')
diff --git a/src/gtk/area.cc b/src/gtk/toplevel/area.cc
index 37e4baf4..37e4baf4 100644
--- a/src/gtk/area.cc
+++ b/src/gtk/toplevel/area.cc
diff --git a/src/gtk/area.h b/src/gtk/toplevel/area.h
index a5c3fe65..a5c3fe65 100644
--- a/src/gtk/area.h
+++ b/src/gtk/toplevel/area.h