totem r5790 - in trunk: . src/plugins/tracker src/plugins/youtube

[pwithnall svn gnome org]

Author: pwithnall
Date: Mon Oct 27 18:14:44 2008
New Revision: 5790
URL: http://svn.gnome.org/viewvc/totem?rev=5790&view=rev

Log:
2008-10-27  Philip Withnall  <philip tecnocode co uk>

	* src/plugins/tracker/totem-tracker-widget.c
	(totem_tracker_widget_init):
	* src/plugins/youtube/youtube.ui: Harmonise the appearance of 
the
	YouTube and Local Search sidebars, making them both look like 
the
	latter. (Closes: #558118)



Modified:
   trunk/ChangeLog
   trunk/src/plugins/tracker/totem-tracker-widget.c
   trunk/src/plugins/youtube/youtube.ui

Modified: trunk/src/plugins/tracker/totem-tracker-widget.c
==============================================================================
--- trunk/src/plugins/tracker/totem-tracker-widget.c	(original)
+++ trunk/src/plugins/tracker/totem-tracker-widget.c	Mon Oct 27 18:14:44 2008
@@ -44,7 +44,7 @@
 #define TRACKER_INTERFACE		"org.freedesktop.Tracker.Search"
 #define TOTEM_TRACKER_MAX_RESULTS_SIZE	20
 
-G_DEFINE_TYPE (TotemTrackerWidget, totem_tracker_widget, GTK_TYPE_EVENT_BOX)
+G_DEFINE_TYPE (TotemTrackerWidget, totem_tracker_widget, GTK_TYPE_VBOX)
 
 struct TotemTrackerWidgetPrivate {
 	GtkWidget *search_entry;
@@ -385,7 +385,8 @@
 
 	init_result_list (widget);
 
-	v_box = gtk_vbox_new (FALSE, 2);
+	v_box = gtk_vbox_new (FALSE, 6);
+	gtk_container_set_border_width (GTK_CONTAINER (v_box), 5);
 
 	/* Search entry */
 	widget->priv->search_entry = gtk_entry_new ();
@@ -395,10 +396,10 @@
 
 	/* Add the search entry and button to the search box,
 	   and add the search box to the main vertical box */
-	search_box = gtk_hbox_new (FALSE, 2);	
-	gtk_container_add (GTK_CONTAINER (search_box), widget->priv->search_entry);
-	gtk_container_add (GTK_CONTAINER (search_box), widget->priv->search_button);	
-	gtk_box_pack_start (GTK_BOX (v_box), search_box, FALSE, FALSE, 2);
+	search_box = gtk_hbox_new (FALSE, 2);
+	gtk_box_pack_start (GTK_BOX (search_box), widget->priv->search_entry, TRUE, TRUE, 0);
+	gtk_box_pack_start (GTK_BOX (search_box), widget->priv->search_button, FALSE, TRUE, 0);
+	gtk_box_pack_start (GTK_BOX (v_box), search_box, FALSE, TRUE, 0);
 
 	/* Insert the result list and initialize the viewport */
 	scroll = GTK_SCROLLED_WINDOW (gtk_scrolled_window_new (NULL, NULL));

Modified: trunk/src/plugins/youtube/youtube.ui
==============================================================================
--- trunk/src/plugins/youtube/youtube.ui	(original)
+++ trunk/src/plugins/youtube/youtube.ui	Mon Oct 27 18:14:44 2008
@@ -25,17 +25,6 @@
 	<property name="homogeneous">False</property>
 	<property name="spacing">6</property>
 	<child>
-		<object class="GtkLabel" id="label0">
-			<property name="label" translatable="yes">Search:</property>
-			<property name="xalign">0.0</property>
-		</object>
-		<packing>
-			<property name="padding">0</property>
-			<property name="expand">False</property>
-			<property name="fill">True</property>
-		</packing>
-	</child>
-	<child>
 		<object class="GtkHBox" id="yt_hbox">
 			<child>
 				<object class="GtkEntry" id="yt_search_entry"/>
@@ -48,18 +37,7 @@
 			<child>
 				<object class="GtkButton" id="yt_search_button">
 					<property name="use-stock">True</property>
-					<property name="tooltip-text" translatable="yes">Search YouTube</property>
-					<child>
-						<object class="GtkImage" id="yt_search_button_image">
-							<property name="visible">True</property>
-							<property name="stock">gtk-find</property>
-							<property name="icon_size">4</property>
-							<property name="xalign">0.5</property>
-							<property name="yalign">0.5</property>
-							<property name="xpad">0</property>
-							<property name="ypad">0</property>
-						</object>
-					</child>
+					<property name="label">gtk-find</property>
 				</object>
 				<packing>
 					<property name="padding">0</property>