rhythmbox r5852 - in trunk: . data/glade shell sources

[jmatthew svn gnome org]

Author: jmatthew
Date: Mon Aug 11 13:28:22 2008
New Revision: 5852
URL: http://svn.gnome.org/viewvc/rhythmbox?rev=5852&view=rev

Log:
2008-08-11  Jonathan Matthew  <jonathan d14n org>

	patch by:  John Daiker  <daikerjohn gmail com>

	* data/glade/general-prefs.glade:
	* shell/rb-shell-preferences.c: (rb_shell_preferences_init),
	(rb_shell_preferences_column_check_changed_cb),
	(rb_shell_preferences_sync):
	* sources/rb-browser-source.c: (rb_browser_source_constructor):
	Allow the 'location' column to be optionally displayed in all sources
	like the rest of the columns.  From #397459.


Modified:
   trunk/ChangeLog
   trunk/data/glade/general-prefs.glade
   trunk/shell/rb-shell-preferences.c
   trunk/sources/rb-browser-source.c

Modified: trunk/data/glade/general-prefs.glade
==============================================================================
--- trunk/data/glade/general-prefs.glade	(original)
+++ trunk/data/glade/general-prefs.glade	Mon Aug 11 13:28:22 2008
@@ -579,6 +579,29 @@
 				  <property name="y_options"></property>
 				</packing>
 			      </child>
+			      
+			      <child>
+				<widget class="GtkCheckButton" id="location_check">
+				  <property name="visible">True</property>
+				  <property name="can_focus">True</property>
+				  <property name="label" translatable="yes">Lo_cation</property>
+				  <property name="use_underline">True</property>
+				  <property name="relief">GTK_RELIEF_NORMAL</property>
+				  <property name="focus_on_click">True</property>
+				  <property name="active">False</property>
+				  <property name="inconsistent">False</property>
+				  <property name="draw_indicator">True</property>
+				  <signal name="toggled" handler="rb_shell_preferences_column_check_changed_cb" last_modification_time="Fri, 02 May 2003 04:26:32 GMT"/>
+				</widget>
+				<packing>
+				  <property name="left_attach">1</property>
+				  <property name="right_attach">2</property>
+				  <property name="top_attach">5</property>
+				  <property name="bottom_attach">6</property>
+				  <property name="x_options">fill</property>
+				  <property name="y_options"></property>
+				</packing>
+			      </child>
 			    </widget>
 			    <packing>
 			      <property name="padding">0</property>

Modified: trunk/shell/rb-shell-preferences.c
==============================================================================
--- trunk/shell/rb-shell-preferences.c	(original)
+++ trunk/shell/rb-shell-preferences.c	Mon Aug 11 13:28:22 2008
@@ -123,6 +123,7 @@
 	GtkWidget *first_seen_check;
 	GtkWidget *quality_check;
 	GtkWidget *year_check;
+	GtkWidget *location_check;
 
 	GtkWidget *xfade_backend_check;
 	GtkWidget *album_crossfade_check;
@@ -244,6 +245,8 @@
 		glade_xml_get_widget (xml, "year_check");
 	shell_preferences->priv->first_seen_check =
 		glade_xml_get_widget (xml, "first_seen_check");
+	shell_preferences->priv->location_check =
+		glade_xml_get_widget (xml, "location_check");
 
 	/* browser options */
 	rb_glade_boldify_label (xml, "browser_views_label");
@@ -486,6 +489,8 @@
 		colname = "RHYTHMDB_PROP_BITRATE";
 	else if (butt == GTK_CHECK_BUTTON (shell_preferences->priv->first_seen_check))
 		colname = "RHYTHMDB_PROP_FIRST_SEEN";
+	else if (butt == GTK_CHECK_BUTTON (shell_preferences->priv->location_check))
+		colname = "RHYTHMDB_PROP_LOCATION";
 	else
 		g_assert_not_reached ();
 
@@ -578,6 +583,9 @@
 		rb_shell_preferences_sync_column_button (shell_preferences,
 			       				 shell_preferences->priv->quality_check,
 							 columns, "RHYTHMDB_PROP_BITRATE");
+		rb_shell_preferences_sync_column_button (shell_preferences,
+			       				 shell_preferences->priv->location_check,
+							 columns, "RHYTHMDB_PROP_LOCATION");
 	}
 
 	g_free (columns);

Modified: trunk/sources/rb-browser-source.c
==============================================================================
--- trunk/sources/rb-browser-source.c	(original)
+++ trunk/sources/rb-browser-source.c	Mon Aug 11 13:28:22 2008
@@ -445,6 +445,7 @@
 	rb_entry_view_append_column (source->priv->songs, RB_ENTRY_VIEW_COL_DURATION, FALSE);
  	rb_entry_view_append_column (source->priv->songs, RB_ENTRY_VIEW_COL_QUALITY, FALSE);
 	rb_entry_view_append_column (source->priv->songs, RB_ENTRY_VIEW_COL_PLAY_COUNT, FALSE);
+	rb_entry_view_append_column (source->priv->songs, RB_ENTRY_VIEW_COL_LOCATION, FALSE);
 
 	g_signal_connect_object (G_OBJECT (source->priv->songs), "show_popup",
 				 G_CALLBACK (rb_browser_source_songs_show_popup_cb), source, 0);