Now if an empty project is loaded and anothther project with widgets is

	* gladeui/glade-app.c: Now if an empty project is loaded
	  and anothther project with widgets is loaded, they will
	  also be shown at load time (first widget in the layout
	  gets autoloaded).



svn path=/trunk/; revision=1730

3 files changed, 19 insertions, 14 deletions

diff --git a/ChangeLog b/ChangeLog
index fe446c4b..847c493d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,7 +4,14 @@
 
 	* plugins/gtk+/gtk+.xml.in: Backing out GtkScaleButton
 	  and GtkVolumeButton as they introduce strings.
-	
+
+	* gladeui/glade-app.c: Now if an empty project is loaded
+	  and anothther project with widgets is loaded, they will
+	  also be shown at load time (first widget in the layout
+	  gets autoloaded).
+
+	* plugins/gtk+/gtk+.xml.in: Reintroducing GtkScaleButton
+	  and GtkVolumeButton trunk.
 
 2008-03-09  Tristan Van Berkom <tvb@gnome.org>
 
@@ -15,7 +22,7 @@
 	  - Reset "events" property for newly created widgets
 	    (workaround for bug 472555).
 	  - Added GtkVolumeButton and GtkScaleButton widgets (Ross Burton)
-	  - Add/Remove parent doesnt dup widgets anymore (bug 517388)
+	  - Add/Remove parent doesnt dup widgets anymore (bug 517388)er
 	
 	* plugins/gnome/glade-gnome.c: Fixed some crashes on 
 	  gnome druid page properties (bug 511651).
diff --git a/gladeui/glade-app.c b/gladeui/glade-app.c
index c7eebecf..25650dd7 100644
--- a/gladeui/glade-app.c
+++ b/gladeui/glade-app.c
@@ -38,6 +38,7 @@
 #include "glade-cursor.h"
 #include "glade-catalog.h"
 #include "glade-fixed.h"
+#include "glade-design-view.h"
 #include "glade-marshallers.h"
 #include "glade-accumulators.h"
 
@@ -916,6 +917,9 @@ void
 glade_app_add_project (GladeProject *project)
 {
 	GladeApp  *app;
+	GladeDesignView *view;
+	GladeDesignLayout *layout;
+
  	g_return_if_fail (GLADE_IS_PROJECT (project));
 
 	/* If the project was previously loaded, don't re-load */
@@ -945,7 +949,10 @@ glade_app_add_project (GladeProject *project)
 	glade_app_set_project (project);
 
 	/* Select the first window in the project */
-	if (g_list_length (app->priv->projects) == 1)
+	if (g_list_length (app->priv->projects) == 1 ||
+	    !(view = glade_design_view_get_from_project (project)) ||
+	    !(layout = glade_design_view_get_layout (view)) ||
+	    !GTK_BIN (layout)->child)
 	{
 		GList *node;
 		for (node = glade_project_get_objects (project);
diff --git a/plugins/gtk+/gtk+.xml.in b/plugins/gtk+/gtk+.xml.in
index 7b734590..330a5e4c 100644
--- a/plugins/gtk+/gtk+.xml.in
+++ b/plugins/gtk+/gtk+.xml.in
@@ -778,9 +778,6 @@ embedded in another object</_tooltip>
       </properties>
     </glade-widget-class>
 
-    
-    <!-- Commenting out new widgets untill string freeze is over
-
     <glade-widget-class name="GtkScaleButton" generic-name="scalebutton" _title="Scale Button">
       <properties>
         <property id="size">
@@ -790,7 +787,7 @@ embedded in another object</_tooltip>
 	    <value id="GTK_ICON_SIZE_SMALL_TOOLBAR" _name="Small Toolbar"/>
 	    <value id="GTK_ICON_SIZE_LARGE_TOOLBAR" _name="Large Toolbar"/>
 	    <value id="GTK_ICON_SIZE_BUTTON" _name="Button"/>
-	    <value id="GTK_ICON_SIZE_DND" _name="Drag'n Drop"/>
+	    <value id="GTK_ICON_SIZE_DND" _name="Drag &amp; Drop"/>
 	    <value id="GTK_ICON_SIZE_DIALOG" _name="Dialog"/>
 	  </displayable-values>
         </property>
@@ -799,8 +796,6 @@ embedded in another object</_tooltip>
 
     <glade-widget-class name="GtkVolumeButton" generic-name="volumebutton" _title="Volume Button"/>
 
-    -->
-
     <glade-widget-class name="GtkFileChooserWidget" generic-name="filechooserwidget" _title="File Chooser Widget">
       <post-create-function>glade_gtk_file_chooser_widget_post_create</post-create-function>
       <properties>
@@ -963,7 +958,7 @@ embedded in another object</_tooltip>
 	  <spec>glade_standard_stock_image_spec</spec>
 	  <_tooltip>The stock item for this image</_tooltip>
 	</property>
-	<property id="icon-name" _name="Icon Name" weight="1.6"/>
+	<property id="icon-name" _name="Icon Name" themed-icon="True" weight="1.6"/>
       </properties>
     </glade-widget-class>
 
@@ -1701,12 +1696,8 @@ embedded in another object</_tooltip>
     <glade-widget-class-ref name="GtkColorButton"/>
     <glade-widget-class-ref name="GtkFontButton"/>
     <glade-widget-class-ref name="GtkLinkButton"/>
-
-
-    <!-- Commenting out these widgets until freeze is over
     <glade-widget-class-ref name="GtkScaleButton"/>
     <glade-widget-class-ref name="GtkVolumeButton"/>\
-    -->
 
     <glade-widget-class-ref name="GtkImage"/>
     <glade-widget-class-ref name="GtkLabel"/>