GNOME.org
 

[gnome-games/gsoc-seed-games] Reorganize source tree into directories

commit 6602d2d370e5c3f8ace89c28880fdb8cc57d44e7
Author: Tim Horton <hortont424 gmail com>
Date:   Tue Jun 30 00:55:23 2009 -0400

    Reorganize source tree into directories
    
    Un-revert clean up naming in main GtkBuilder file

 configure.in                                    |   14 +++---
 lightsoff/Makefile.am                           |   52 +++++++++++-----------
 lightsoff/{ => data}/main-window.ui             |   36 ++++++++--------
 lightsoff/{ => data}/settings.ui                |    0
 lightsoff/{ => data}/themes/Makefile.am         |    0
 lightsoff/{ => data}/themes/tango/Makefile.am   |    3 +
 lightsoff/{ => data}/themes/tango/arrow.svg     |    0
 lightsoff/{ => data}/themes/tango/backing.svg   |    0
 lightsoff/{ => data}/themes/tango/highlight.svg |    0
 lightsoff/{ => data}/themes/tango/led-back.svg  |    0
 lightsoff/{ => data}/themes/tango/off.svg       |    0
 lightsoff/{ => data}/themes/tango/on.svg        |    0
 lightsoff/{ => data}/themes/tango/theme.js.in   |    0
 lightsoff/{ => data}/themes/up/Makefile.am      |    3 +
 lightsoff/{ => data}/themes/up/arrow.svg        |    0
 lightsoff/{ => data}/themes/up/backing.svg      |    0
 lightsoff/{ => data}/themes/up/highlight.svg    |    0
 lightsoff/{ => data}/themes/up/led-back.svg     |    0
 lightsoff/{ => data}/themes/up/off.svg          |    0
 lightsoff/{ => data}/themes/up/on.svg           |    0
 lightsoff/{ => data}/themes/up/theme.js.in      |    0
 lightsoff/{ => src}/About.js                    |    0
 lightsoff/{ => src}/Arrow.js                    |    0
 lightsoff/{ => src}/Board.js                    |    0
 lightsoff/{ => src}/Game.js                     |    0
 lightsoff/{ => src}/LED.js                      |    0
 lightsoff/{ => src}/Light.js                    |    0
 lightsoff/{ => src}/Settings.js                 |    0
 lightsoff/{ => src}/lightsoff.in                |    0
 lightsoff/{ => src}/main.js.in                  |    4 +-
 30 files changed, 59 insertions(+), 53 deletions(-)
---
diff --git a/configure.in b/configure.in
index 27b119e..eefc576 100644
--- a/configure.in
+++ b/configure.in
@@ -1092,14 +1092,14 @@ same-gnome-clutter/same-gnome-clutter.desktop.in
 same-gnome-clutter/same-gnome-clutter-c.desktop.in
 same-gnome-clutter/light.js
 lightsoff/Makefile
-lightsoff/lightsoff
+lightsoff/src/lightsoff
 lightsoff/lightsoff.desktop.in
-lightsoff/main.js
-lightsoff/themes/Makefile
-lightsoff/themes/tango/Makefile
-lightsoff/themes/tango/theme.js
-lightsoff/themes/up/Makefile
-lightsoff/themes/up/theme.js
+lightsoff/src/main.js
+lightsoff/data/themes/Makefile
+lightsoff/data/themes/tango/Makefile
+lightsoff/data/themes/tango/theme.js
+lightsoff/data/themes/up/Makefile
+lightsoff/data/themes/up/theme.js
 tests/Makefile
 tests/libgames-support/Makefile
 shave
diff --git a/lightsoff/Makefile.am b/lightsoff/Makefile.am
index 9717e1f..5ea40ac 100644
--- a/lightsoff/Makefile.am
+++ b/lightsoff/Makefile.am
@@ -1,20 +1,20 @@
-SUBDIRS = themes
-
-lojsdir = $(pkgdatadir)/lightsoff
-lojs_DATA = \
-	About.js \
-	Arrow.js \
-	Board.js \
-	Light.js \
-	main.js \
-	Game.js \
-	LED.js \
-	Settings.js \
-	settings.ui \
-	main-window.ui
+SUBDIRS = data/themes
+
+lightsoffdir = $(pkgdatadir)/lightsoff
+lightsoff_DATA = \
+	src/About.js \
+	src/Arrow.js \
+	src/Board.js \
+	src/Light.js \
+	src/main.js \
+	src/Game.js \
+	src/LED.js \
+	src/Settings.js \
+	data/settings.ui \
+	data/main-window.ui
 
 bin_SCRIPTS = \
-	lightsoff
+	src/lightsoff
 
 schema_in_files = lightsoff.schemas.in
 schemadir = $(GCONF_SCHEMA_FILE_DIR)
@@ -25,19 +25,19 @@ desktopdir = $(datadir)/applications
 desktop_DATA = $(desktop_in_files:.desktop.in.in=.desktop)
 @INTLTOOL_DESKTOP_RULE@
 
-CLEANFILES = main.js $(desktop_DATA)
+CLEANFILES = src/main.js $(desktop_DATA)
 
 EXTRA_DIST = \
-	About.js \
-	Arrow.js \
-	Board.js \
-	Light.js \
-	main.js.in \
-	Game.js \
-	LED.js \
-	Settings.js \
-	settings.ui \
-	main-window.ui
+	src/About.js \
+	src/Arrow.js \
+	src/Board.js \
+	src/Light.js \
+	src/main.js.in \
+	src/Game.js \
+	src/LED.js \
+	src/Settings.js \
+	data/settings.ui \
+	data/main-window.ui
 
 install-schemas-local: $(schema_DATA)
 if GCONF_SCHEMAS_INSTALL
diff --git a/lightsoff/main-window.ui b/lightsoff/data/main-window.ui
similarity index 75%
rename from lightsoff/main-window.ui
rename to lightsoff/data/main-window.ui
index 382cc02..2b8b218 100644
--- a/lightsoff/main-window.ui
+++ b/lightsoff/data/main-window.ui
@@ -1,55 +1,55 @@
 <?xml version="1.0"?>
 <interface>
   <requires lib="gtk+" version="2.14"/>
-  <!-- interface-naming-policy project-wide -->
-  <object class="GtkWindow" id="window1">
+  <object class="GtkWindow" id="game_window">
     <property name="title" translatable="yes">Lights Off</property>
+    <property name="resizable">False</property>
     <accel-groups>
-      <group name="accelgroup1"/>
+      <group name="accel_group"/>
     </accel-groups>
     <child>
-      <object class="GtkVBox" id="vbox1">
+      <object class="GtkVBox" id="game_vbox">
         <property name="visible">True</property>
         <property name="orientation">vertical</property>
         <child>
-          <object class="GtkMenuBar" id="menubar2">
+          <object class="GtkMenuBar" id="menu_bar">
             <property name="visible">True</property>
             <child>
-              <object class="GtkMenuItem" id="menuitem5">
+              <object class="GtkMenuItem" id="game_menu_item">
                 <property name="visible">True</property>
                 <property name="label" translatable="yes">_Game</property>
                 <property name="use_underline">True</property>
                 <child type="submenu">
-                  <object class="GtkMenu" id="menu4">
+                  <object class="GtkMenu" id="game_menu">
                     <property name="visible">True</property>
                     <child>
-                      <object class="GtkImageMenuItem" id="imagemenuitem11">
+                      <object class="GtkImageMenuItem" id="new_game_item">
                         <signal name="activate" handler="reset_score"/>
                         <property name="label">games-new-game</property>
                         <property name="visible">True</property>
                         <property name="use_underline">True</property>
                         <property name="use_stock">True</property>
-                        <property name="accel_group">accelgroup1</property>
+                        <property name="accel_group">accel_group</property>
                       </object>
                     </child>
                     <child>
-                      <object class="GtkImageMenuItem" id="imagemenuitem12">
+                      <object class="GtkImageMenuItem" id="show_preferences_item">
                         <signal name="activate" handler="show_settings"/>
                         <property name="label">gtk-preferences</property>
                         <property name="visible">True</property>
                         <property name="use_underline">True</property>
                         <property name="use_stock">True</property>
-                        <property name="accel_group">accelgroup1</property>
+                        <property name="accel_group">accel_group</property>
                       </object>
                     </child>
                     <child>
-                      <object class="GtkImageMenuItem" id="imagemenuitem15">
+                      <object class="GtkImageMenuItem" id="quit_item">
                         <signal name="activate" handler="quit"/>
                         <property name="label">gtk-quit</property>
                         <property name="visible">True</property>
                         <property name="use_underline">True</property>
                         <property name="use_stock">True</property>
-                        <property name="accel_group">accelgroup1</property>
+                        <property name="accel_group">accel_group</property>
                       </object>
                     </child>
                   </object>
@@ -57,21 +57,21 @@
               </object>
             </child>
             <child>
-              <object class="GtkMenuItem" id="menuitem8">
+              <object class="GtkMenuItem" id="help_menu_item">
                 <property name="visible">True</property>
                 <property name="label" translatable="yes">_Help</property>
                 <property name="use_underline">True</property>
                 <child type="submenu">
-                  <object class="GtkMenu" id="menu6">
+                  <object class="GtkMenu" id="help_menu">
                     <property name="visible">True</property>
                     <child>
-                      <object class="GtkImageMenuItem" id="imagemenuitem20">
+                      <object class="GtkImageMenuItem" id="show_about_item">
                         <signal name="activate" handler="show_about"/>
                         <property name="label">gtk-about</property>
                         <property name="visible">True</property>
                         <property name="use_underline">True</property>
                         <property name="use_stock">True</property>
-                        <property name="accel_group">accelgroup1</property>
+                        <property name="accel_group">accel_group</property>
                       </object>
                     </child>
                   </object>
@@ -90,5 +90,5 @@
       </object>
     </child>
   </object>
-  <object class="GtkAccelGroup" id="accelgroup1"/>
+  <object class="GtkAccelGroup" id="accel_group"/>
 </interface>
diff --git a/lightsoff/settings.ui b/lightsoff/data/settings.ui
similarity index 100%
rename from lightsoff/settings.ui
rename to lightsoff/data/settings.ui
diff --git a/lightsoff/themes/Makefile.am b/lightsoff/data/themes/Makefile.am
similarity index 100%
rename from lightsoff/themes/Makefile.am
rename to lightsoff/data/themes/Makefile.am
diff --git a/lightsoff/themes/tango/Makefile.am b/lightsoff/data/themes/tango/Makefile.am
similarity index 91%
rename from lightsoff/themes/tango/Makefile.am
rename to lightsoff/data/themes/tango/Makefile.am
index cde0d38..ae90a06 100644
--- a/lightsoff/themes/tango/Makefile.am
+++ b/lightsoff/data/themes/tango/Makefile.am
@@ -16,3 +16,6 @@ EXTRA_DIST = \
 	on.svg \
 	highlight.svg \
 	theme.js.in
+
+CLEANFILES = theme.js
+
diff --git a/lightsoff/themes/tango/arrow.svg b/lightsoff/data/themes/tango/arrow.svg
similarity index 100%
rename from lightsoff/themes/tango/arrow.svg
rename to lightsoff/data/themes/tango/arrow.svg
diff --git a/lightsoff/themes/tango/backing.svg b/lightsoff/data/themes/tango/backing.svg
similarity index 100%
rename from lightsoff/themes/tango/backing.svg
rename to lightsoff/data/themes/tango/backing.svg
diff --git a/lightsoff/themes/tango/highlight.svg b/lightsoff/data/themes/tango/highlight.svg
similarity index 100%
rename from lightsoff/themes/tango/highlight.svg
rename to lightsoff/data/themes/tango/highlight.svg
diff --git a/lightsoff/themes/tango/led-back.svg b/lightsoff/data/themes/tango/led-back.svg
similarity index 100%
rename from lightsoff/themes/tango/led-back.svg
rename to lightsoff/data/themes/tango/led-back.svg
diff --git a/lightsoff/themes/tango/off.svg b/lightsoff/data/themes/tango/off.svg
similarity index 100%
rename from lightsoff/themes/tango/off.svg
rename to lightsoff/data/themes/tango/off.svg
diff --git a/lightsoff/themes/tango/on.svg b/lightsoff/data/themes/tango/on.svg
similarity index 100%
rename from lightsoff/themes/tango/on.svg
rename to lightsoff/data/themes/tango/on.svg
diff --git a/lightsoff/themes/tango/theme.js.in b/lightsoff/data/themes/tango/theme.js.in
similarity index 100%
rename from lightsoff/themes/tango/theme.js.in
rename to lightsoff/data/themes/tango/theme.js.in
diff --git a/lightsoff/themes/up/Makefile.am b/lightsoff/data/themes/up/Makefile.am
similarity index 91%
rename from lightsoff/themes/up/Makefile.am
rename to lightsoff/data/themes/up/Makefile.am
index 605c997..19856e8 100644
--- a/lightsoff/themes/up/Makefile.am
+++ b/lightsoff/data/themes/up/Makefile.am
@@ -16,3 +16,6 @@ EXTRA_DIST = \
 	on.svg \
 	highlight.svg \
 	theme.js.in
+
+CLEANFILES = theme.js
+
diff --git a/lightsoff/themes/up/arrow.svg b/lightsoff/data/themes/up/arrow.svg
similarity index 100%
rename from lightsoff/themes/up/arrow.svg
rename to lightsoff/data/themes/up/arrow.svg
diff --git a/lightsoff/themes/up/backing.svg b/lightsoff/data/themes/up/backing.svg
similarity index 100%
rename from lightsoff/themes/up/backing.svg
rename to lightsoff/data/themes/up/backing.svg
diff --git a/lightsoff/themes/up/highlight.svg b/lightsoff/data/themes/up/highlight.svg
similarity index 100%
rename from lightsoff/themes/up/highlight.svg
rename to lightsoff/data/themes/up/highlight.svg
diff --git a/lightsoff/themes/up/led-back.svg b/lightsoff/data/themes/up/led-back.svg
similarity index 100%
rename from lightsoff/themes/up/led-back.svg
rename to lightsoff/data/themes/up/led-back.svg
diff --git a/lightsoff/themes/up/off.svg b/lightsoff/data/themes/up/off.svg
similarity index 100%
rename from lightsoff/themes/up/off.svg
rename to lightsoff/data/themes/up/off.svg
diff --git a/lightsoff/themes/up/on.svg b/lightsoff/data/themes/up/on.svg
similarity index 100%
rename from lightsoff/themes/up/on.svg
rename to lightsoff/data/themes/up/on.svg
diff --git a/lightsoff/themes/up/theme.js.in b/lightsoff/data/themes/up/theme.js.in
similarity index 100%
rename from lightsoff/themes/up/theme.js.in
rename to lightsoff/data/themes/up/theme.js.in
diff --git a/lightsoff/About.js b/lightsoff/src/About.js
similarity index 100%
rename from lightsoff/About.js
rename to lightsoff/src/About.js
diff --git a/lightsoff/Arrow.js b/lightsoff/src/Arrow.js
similarity index 100%
rename from lightsoff/Arrow.js
rename to lightsoff/src/Arrow.js
diff --git a/lightsoff/Board.js b/lightsoff/src/Board.js
similarity index 100%
rename from lightsoff/Board.js
rename to lightsoff/src/Board.js
diff --git a/lightsoff/Game.js b/lightsoff/src/Game.js
similarity index 100%
rename from lightsoff/Game.js
rename to lightsoff/src/Game.js
diff --git a/lightsoff/LED.js b/lightsoff/src/LED.js
similarity index 100%
rename from lightsoff/LED.js
rename to lightsoff/src/LED.js
diff --git a/lightsoff/Light.js b/lightsoff/src/Light.js
similarity index 100%
rename from lightsoff/Light.js
rename to lightsoff/src/Light.js
diff --git a/lightsoff/Settings.js b/lightsoff/src/Settings.js
similarity index 100%
rename from lightsoff/Settings.js
rename to lightsoff/src/Settings.js
diff --git a/lightsoff/lightsoff.in b/lightsoff/src/lightsoff.in
similarity index 100%
rename from lightsoff/lightsoff.in
rename to lightsoff/src/lightsoff.in
diff --git a/lightsoff/main.js.in b/lightsoff/src/main.js.in
similarity index 92%
rename from lightsoff/main.js.in
rename to lightsoff/src/main.js.in
index fff7d9d..a66ce22 100755
--- a/lightsoff/main.js.in
+++ b/lightsoff/src/main.js.in
@@ -39,10 +39,10 @@ b = new Gtk.Builder();
 b.add_from_file(file_prefix + "/main-window.ui");
 b.connect_signals(handlers);
 
-var window = b.get_object("window1");
+var window = b.get_object("game_window");
 var clutter_embed = new GtkClutter.Embed();
 window.signal.hide.connect(Gtk.main_quit);
-b.get_object("vbox1").pack_start(clutter_embed, true, true);
+b.get_object("game_vbox").pack_start(clutter_embed, true, true);
 
 var stage = clutter_embed.get_stage();
 stage.color = {alpha:255};
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]