changeset 124:428d3865de3c trunk

[svn] More bitmap-font related stuff, working on a scrolling implementation too. (You can now enable or disable bitmap font support in Preferences.)
author nenolod
date Mon, 07 Nov 2005 23:26:55 -0800
parents 022d9717476f
children f12cdbf41d8d
files audacious/glade/prefswin.glade audacious/prefswin.c audacious/textbox.c
diffstat 3 files changed, 397 insertions(+), 12 deletions(-) [+]
line wrap: on
line diff
--- a/audacious/glade/prefswin.glade	Mon Nov 07 22:13:25 2005 -0800
+++ b/audacious/glade/prefswin.glade	Mon Nov 07 23:26:55 2005 -0800
@@ -18,6 +18,7 @@
   <property name="skip_pager_hint">False</property>
   <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
   <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
+  <property name="focus_on_map">True</property>
   <signal name="delete_event" handler="gtk_widget_hide_on_delete" last_modification_time="Sat, 03 Jul 2004 04:23:18 GMT"/>
 
   <child>
@@ -55,6 +56,9 @@
 		      <property name="rules_hint">False</property>
 		      <property name="reorderable">False</property>
 		      <property name="enable_search">True</property>
+		      <property name="fixed_height_mode">False</property>
+		      <property name="hover_selection">False</property>
+		      <property name="hover_expand">False</property>
 		    </widget>
 		  </child>
 		</widget>
@@ -92,6 +96,10 @@
 			  <property name="yalign">0</property>
 			  <property name="xpad">0</property>
 			  <property name="ypad">0</property>
+			  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+			  <property name="width_chars">-1</property>
+			  <property name="single_line_mode">False</property>
+			  <property name="angle">0</property>
 			</widget>
 			<packing>
 			  <property name="padding">0</property>
@@ -155,6 +163,10 @@
 					  <property name="xpad">0</property>
 					  <property name="ypad">0</property>
 					  <property name="mnemonic_widget">category_notebook</property>
+					  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+					  <property name="width_chars">-1</property>
+					  <property name="single_line_mode">False</property>
+					  <property name="angle">0</property>
 					</widget>
 				      </child>
 				    </widget>
@@ -182,6 +194,9 @@
 					  <property name="rules_hint">True</property>
 					  <property name="reorderable">True</property>
 					  <property name="enable_search">True</property>
+					  <property name="fixed_height_mode">False</property>
+					  <property name="hover_selection">False</property>
+					  <property name="hover_expand">False</property>
 					  <signal name="realize" handler="on_input_plugin_view_realize" after="yes" last_modification_time="Wed, 12 May 2004 00:33:15 GMT"/>
 					</widget>
 				      </child>
@@ -251,6 +266,10 @@
 				  <property name="yalign">0</property>
 				  <property name="xpad">0</property>
 				  <property name="ypad">0</property>
+				  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+				  <property name="width_chars">-1</property>
+				  <property name="single_line_mode">False</property>
+				  <property name="angle">0</property>
 				</widget>
 				<packing>
 				  <property name="type">tab</property>
@@ -290,6 +309,10 @@
 					  <property name="xpad">0</property>
 					  <property name="ypad">0</property>
 					  <property name="mnemonic_widget">category_notebook</property>
+					  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+					  <property name="width_chars">-1</property>
+					  <property name="single_line_mode">False</property>
+					  <property name="angle">0</property>
 					</widget>
 				      </child>
 				    </widget>
@@ -317,6 +340,9 @@
 					  <property name="rules_hint">True</property>
 					  <property name="reorderable">True</property>
 					  <property name="enable_search">True</property>
+					  <property name="fixed_height_mode">False</property>
+					  <property name="hover_selection">False</property>
+					  <property name="hover_expand">False</property>
 					  <signal name="realize" handler="on_general_plugin_view_realize" after="yes" last_modification_time="Wed, 12 May 2004 01:53:08 GMT"/>
 					</widget>
 				      </child>
@@ -386,6 +412,10 @@
 				  <property name="yalign">0.5</property>
 				  <property name="xpad">0</property>
 				  <property name="ypad">0</property>
+				  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+				  <property name="width_chars">-1</property>
+				  <property name="single_line_mode">False</property>
+				  <property name="angle">0</property>
 				</widget>
 				<packing>
 				  <property name="type">tab</property>
@@ -425,6 +455,10 @@
 					  <property name="xpad">0</property>
 					  <property name="ypad">0</property>
 					  <property name="mnemonic_widget">category_notebook</property>
+					  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+					  <property name="width_chars">-1</property>
+					  <property name="single_line_mode">False</property>
+					  <property name="angle">0</property>
 					</widget>
 				      </child>
 				    </widget>
@@ -452,6 +486,9 @@
 					  <property name="rules_hint">True</property>
 					  <property name="reorderable">True</property>
 					  <property name="enable_search">True</property>
+					  <property name="fixed_height_mode">False</property>
+					  <property name="hover_selection">False</property>
+					  <property name="hover_expand">False</property>
 					  <signal name="realize" handler="on_vis_plugin_view_realize" after="yes" last_modification_time="Tue, 25 May 2004 21:27:09 GMT"/>
 					</widget>
 				      </child>
@@ -521,6 +558,10 @@
 				  <property name="yalign">0.5</property>
 				  <property name="xpad">0</property>
 				  <property name="ypad">0</property>
+				  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+				  <property name="width_chars">-1</property>
+				  <property name="single_line_mode">False</property>
+				  <property name="angle">0</property>
 				</widget>
 				<packing>
 				  <property name="type">tab</property>
@@ -560,6 +601,10 @@
 					  <property name="xpad">0</property>
 					  <property name="ypad">0</property>
 					  <property name="mnemonic_widget">category_notebook</property>
+					  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+					  <property name="width_chars">-1</property>
+					  <property name="single_line_mode">False</property>
+					  <property name="angle">0</property>
 					</widget>
 				      </child>
 				    </widget>
@@ -587,6 +632,9 @@
 					  <property name="rules_hint">True</property>
 					  <property name="reorderable">True</property>
 					  <property name="enable_search">True</property>
+					  <property name="fixed_height_mode">False</property>
+					  <property name="hover_selection">False</property>
+					  <property name="hover_expand">False</property>
 					  <signal name="realize" handler="on_effect_plugin_view_realize" after="yes" last_modification_time="Sat, 10 Jul 2004 14:30:22 GMT"/>
 					</widget>
 				      </child>
@@ -656,6 +704,10 @@
 				  <property name="yalign">0.5</property>
 				  <property name="xpad">0</property>
 				  <property name="ypad">0</property>
+				  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+				  <property name="width_chars">-1</property>
+				  <property name="single_line_mode">False</property>
+				  <property name="angle">0</property>
 				</widget>
 				<packing>
 				  <property name="type">tab</property>
@@ -701,6 +753,10 @@
 					      <property name="xpad">0</property>
 					      <property name="ypad">0</property>
 					      <property name="mnemonic_widget">category_notebook</property>
+					      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+					      <property name="width_chars">-1</property>
+					      <property name="single_line_mode">False</property>
+					      <property name="angle">0</property>
 					    </widget>
 					  </child>
 					</widget>
@@ -715,6 +771,8 @@
 					<widget class="GtkComboBox" id="output_plugin_cbox">
 					  <property name="visible">True</property>
 					  <property name="items" translatable="yes"></property>
+					  <property name="add_tearoffs">False</property>
+					  <property name="focus_on_click">True</property>
 					  <signal name="realize" handler="on_output_plugin_cbox_realize" after="yes" last_modification_time="Wed, 12 May 2004 01:52:50 GMT"/>
 					</widget>
 					<packing>
@@ -735,7 +793,7 @@
 					      <property name="stock">gtk-dialog-warning</property>
 					      <property name="icon_size">5</property>
 					      <property name="xalign">0.5</property>
-					      <property name="yalign">0.06</property>
+					      <property name="yalign">0.0599999986589</property>
 					      <property name="xpad">0</property>
 					      <property name="ypad">0</property>
 					    </widget>
@@ -759,9 +817,13 @@
 					      <property name="wrap">True</property>
 					      <property name="selectable">True</property>
 					      <property name="xalign">0.5</property>
-					      <property name="yalign">0.12</property>
+					      <property name="yalign">0.119999997318</property>
 					      <property name="xpad">0</property>
 					      <property name="ypad">0</property>
+					      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+					      <property name="width_chars">-1</property>
+					      <property name="single_line_mode">False</property>
+					      <property name="angle">0</property>
 					    </widget>
 					    <packing>
 					      <property name="padding">0</property>
@@ -842,6 +904,10 @@
 				  <property name="yalign">0.5</property>
 				  <property name="xpad">0</property>
 				  <property name="ypad">0</property>
+				  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+				  <property name="width_chars">-1</property>
+				  <property name="single_line_mode">False</property>
+				  <property name="angle">0</property>
 				</widget>
 				<packing>
 				  <property name="type">tab</property>
@@ -876,6 +942,10 @@
 		      <property name="yalign">0.5</property>
 		      <property name="xpad">0</property>
 		      <property name="ypad">0</property>
+		      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+		      <property name="width_chars">-1</property>
+		      <property name="single_line_mode">False</property>
+		      <property name="angle">0</property>
 		    </widget>
 		    <packing>
 		      <property name="type">tab</property>
@@ -901,6 +971,10 @@
 			  <property name="yalign">0</property>
 			  <property name="xpad">0</property>
 			  <property name="ypad">0</property>
+			  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+			  <property name="width_chars">-1</property>
+			  <property name="single_line_mode">False</property>
+			  <property name="angle">0</property>
 			</widget>
 			<packing>
 			  <property name="padding">0</property>
@@ -959,6 +1033,10 @@
 					  <property name="xpad">0</property>
 					  <property name="ypad">0</property>
 					  <property name="mnemonic_widget">category_notebook</property>
+					  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+					  <property name="width_chars">-1</property>
+					  <property name="single_line_mode">False</property>
+					  <property name="angle">0</property>
 					</widget>
 				      </child>
 				    </widget>
@@ -1001,6 +1079,9 @@
 					  <property name="rules_hint">False</property>
 					  <property name="reorderable">False</property>
 					  <property name="enable_search">True</property>
+					  <property name="fixed_height_mode">False</property>
+					  <property name="hover_selection">False</property>
+					  <property name="hover_expand">False</property>
 					  <signal name="realize" handler="skin_view_realize" after="yes" last_modification_time="Sat, 03 Jul 2004 05:07:38 GMT"/>
 					  <signal name="visibility_notify_event" handler="on_skin_view_visibility_notify" last_modification_time="Sun, 11 Jul 2004 09:56:37 GMT"/>
 					</widget>
@@ -1047,6 +1128,10 @@
 					  <property name="xpad">0</property>
 					  <property name="ypad">0</property>
 					  <property name="mnemonic_widget">category_notebook</property>
+					  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+					  <property name="width_chars">-1</property>
+					  <property name="single_line_mode">False</property>
+					  <property name="angle">0</property>
 					</widget>
 				      </child>
 				    </widget>
@@ -1100,6 +1185,10 @@
 					      <property name="xpad">0</property>
 					      <property name="ypad">0</property>
 					      <property name="mnemonic_widget">mainwin_font_button</property>
+					      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+					      <property name="width_chars">-1</property>
+					      <property name="single_line_mode">False</property>
+					      <property name="angle">0</property>
 					    </widget>
 					  </child>
 					</widget>
@@ -1139,6 +1228,10 @@
 					      <property name="xpad">0</property>
 					      <property name="ypad">0</property>
 					      <property name="mnemonic_widget">playlist_font_button</property>
+					      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+					      <property name="width_chars">-1</property>
+					      <property name="single_line_mode">False</property>
+					      <property name="angle">0</property>
 					    </widget>
 					  </child>
 					</widget>
@@ -1210,7 +1303,42 @@
 				      <property name="spacing">0</property>
 
 				      <child>
-					<widget class="GtkAlignment" id="alignment10">
+					<widget class="GtkAlignment" id="alignment60">
+					  <property name="visible">True</property>
+					  <property name="xalign">0.5</property>
+					  <property name="yalign">0.5</property>
+					  <property name="xscale">1</property>
+					  <property name="yscale">1</property>
+					  <property name="top_padding">8</property>
+					  <property name="bottom_padding">0</property>
+					  <property name="left_padding">12</property>
+					  <property name="right_padding">0</property>
+
+					  <child>
+					    <widget class="GtkCheckButton" id="checkbutton1">
+					      <property name="visible">True</property>
+					      <property name="can_focus">True</property>
+					      <property name="label" translatable="yes">Use Bitmap fonts if available</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="on_use_bitmap_fonts_toggled" last_modification_time="Tue, 08 Nov 2005 07:06:58 GMT"/>
+					      <signal name="realize" handler="on_use_bitmap_fonts_realize" after="yes" last_modification_time="Tue, 08 Nov 2005 07:07:02 GMT"/>
+					    </widget>
+					  </child>
+					</widget>
+					<packing>
+					  <property name="padding">0</property>
+					  <property name="expand">False</property>
+					  <property name="fill">False</property>
+					</packing>
+				      </child>
+
+				      <child>
+					<widget class="GtkAlignment" id="alignment61">
 					  <property name="visible">True</property>
 					  <property name="xalign">0.5</property>
 					  <property name="yalign">0.5</property>
@@ -1222,15 +1350,15 @@
 					  <property name="right_padding">0</property>
 
 					  <child>
-					    <widget class="GtkEventBox" id="eventbox11">
+					    <widget class="GtkEventBox" id="eventbox14">
 					      <property name="visible">True</property>
 					      <property name="visible_window">True</property>
 					      <property name="above_child">False</property>
 
 					      <child>
-						<widget class="GtkLabel" id="label57">
+						<widget class="GtkLabel" id="label65">
 						  <property name="visible">True</property>
-						  <property name="label" translatable="yes">&lt;b&gt;_Miscellaneous&lt;/b&gt;</property>
+						  <property name="label" translatable="yes">&lt;b&gt;_Scrolling&lt;/b&gt;</property>
 						  <property name="use_underline">True</property>
 						  <property name="use_markup">True</property>
 						  <property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -1241,6 +1369,142 @@
 						  <property name="xpad">0</property>
 						  <property name="ypad">0</property>
 						  <property name="mnemonic_widget">category_notebook</property>
+						  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+						  <property name="width_chars">-1</property>
+						  <property name="single_line_mode">False</property>
+						  <property name="angle">0</property>
+						</widget>
+					      </child>
+					    </widget>
+					  </child>
+					</widget>
+					<packing>
+					  <property name="padding">0</property>
+					  <property name="expand">True</property>
+					  <property name="fill">True</property>
+					</packing>
+				      </child>
+
+				      <child>
+					<widget class="GtkAlignment" id="alignment62">
+					  <property name="visible">True</property>
+					  <property name="xalign">0.5</property>
+					  <property name="yalign">0.5</property>
+					  <property name="xscale">1</property>
+					  <property name="yscale">1</property>
+					  <property name="top_padding">0</property>
+					  <property name="bottom_padding">0</property>
+					  <property name="left_padding">12</property>
+					  <property name="right_padding">0</property>
+
+					  <child>
+					    <widget class="GtkTable" id="table7">
+					      <property name="visible">True</property>
+					      <property name="n_rows">1</property>
+					      <property name="n_columns">2</property>
+					      <property name="homogeneous">False</property>
+					      <property name="row_spacing">0</property>
+					      <property name="column_spacing">13</property>
+
+					      <child>
+						<widget class="GtkComboBox" id="combobox1">
+						  <property name="visible">True</property>
+						  <property name="items" translatable="yes">None
+Winamp-style (blocky)
+XMMS/BMP-style (smooth)
+</property>
+						  <property name="add_tearoffs">False</property>
+						  <property name="focus_on_click">True</property>
+						</widget>
+						<packing>
+						  <property name="left_attach">1</property>
+						  <property name="right_attach">2</property>
+						  <property name="top_attach">0</property>
+						  <property name="bottom_attach">1</property>
+						</packing>
+					      </child>
+
+					      <child>
+						<widget class="GtkLabel" id="label66">
+						  <property name="visible">True</property>
+						  <property name="label" translatable="yes">Scrolling style:</property>
+						  <property name="use_underline">False</property>
+						  <property name="use_markup">False</property>
+						  <property name="justify">GTK_JUSTIFY_LEFT</property>
+						  <property name="wrap">False</property>
+						  <property name="selectable">False</property>
+						  <property name="xalign">0</property>
+						  <property name="yalign">0.5</property>
+						  <property name="xpad">0</property>
+						  <property name="ypad">0</property>
+						  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+						  <property name="width_chars">-1</property>
+						  <property name="single_line_mode">False</property>
+						  <property name="angle">0</property>
+						</widget>
+						<packing>
+						  <property name="left_attach">0</property>
+						  <property name="right_attach">1</property>
+						  <property name="top_attach">0</property>
+						  <property name="bottom_attach">1</property>
+						  <property name="x_options">fill</property>
+						  <property name="y_options"></property>
+						</packing>
+					      </child>
+					    </widget>
+					  </child>
+					</widget>
+					<packing>
+					  <property name="padding">0</property>
+					  <property name="expand">True</property>
+					  <property name="fill">True</property>
+					</packing>
+				      </child>
+
+				      <child>
+					<widget class="GtkEventBox" id="eventbox13">
+					  <property name="visible">True</property>
+					  <property name="visible_window">True</property>
+					  <property name="above_child">False</property>
+
+					  <child>
+					    <widget class="GtkAlignment" id="alignment10">
+					      <property name="visible">True</property>
+					      <property name="xalign">0.5</property>
+					      <property name="yalign">0.5</property>
+					      <property name="xscale">1</property>
+					      <property name="yscale">1</property>
+					      <property name="top_padding">12</property>
+					      <property name="bottom_padding">12</property>
+					      <property name="left_padding">0</property>
+					      <property name="right_padding">0</property>
+
+					      <child>
+						<widget class="GtkEventBox" id="eventbox11">
+						  <property name="visible">True</property>
+						  <property name="visible_window">True</property>
+						  <property name="above_child">False</property>
+
+						  <child>
+						    <widget class="GtkLabel" id="label57">
+						      <property name="visible">True</property>
+						      <property name="label" translatable="yes">&lt;b&gt;_Miscellaneous&lt;/b&gt;</property>
+						      <property name="use_underline">True</property>
+						      <property name="use_markup">True</property>
+						      <property name="justify">GTK_JUSTIFY_LEFT</property>
+						      <property name="wrap">False</property>
+						      <property name="selectable">False</property>
+						      <property name="xalign">0</property>
+						      <property name="yalign">0.5</property>
+						      <property name="xpad">0</property>
+						      <property name="ypad">0</property>
+						      <property name="mnemonic_widget">category_notebook</property>
+						      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+						      <property name="width_chars">-1</property>
+						      <property name="single_line_mode">False</property>
+						      <property name="angle">0</property>
+						    </widget>
+						  </child>
 						</widget>
 					      </child>
 					    </widget>
@@ -1386,6 +1650,10 @@
 		      <property name="yalign">0.5</property>
 		      <property name="xpad">0</property>
 		      <property name="ypad">0</property>
+		      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+		      <property name="width_chars">-1</property>
+		      <property name="single_line_mode">False</property>
+		      <property name="angle">0</property>
 		    </widget>
 		    <packing>
 		      <property name="type">tab</property>
@@ -1411,6 +1679,10 @@
 			  <property name="yalign">0</property>
 			  <property name="xpad">0</property>
 			  <property name="ypad">0</property>
+			  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+			  <property name="width_chars">-1</property>
+			  <property name="single_line_mode">False</property>
+			  <property name="angle">0</property>
 			</widget>
 			<packing>
 			  <property name="padding">0</property>
@@ -1462,6 +1734,10 @@
 				      <property name="yalign">0</property>
 				      <property name="xpad">0</property>
 				      <property name="ypad">0</property>
+				      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+				      <property name="width_chars">-1</property>
+				      <property name="single_line_mode">False</property>
+				      <property name="angle">0</property>
 				    </widget>
 				  </child>
 				</widget>
@@ -1506,6 +1782,10 @@
 					  <property name="yalign">0.5</property>
 					  <property name="xpad">4</property>
 					  <property name="ypad">0</property>
+					  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+					  <property name="width_chars">-1</property>
+					  <property name="single_line_mode">False</property>
+					  <property name="angle">0</property>
 					</widget>
 					<packing>
 					  <property name="left_attach">0</property>
@@ -1530,6 +1810,10 @@
 					  <property name="yalign">0.5</property>
 					  <property name="xpad">4</property>
 					  <property name="ypad">0</property>
+					  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+					  <property name="width_chars">-1</property>
+					  <property name="single_line_mode">False</property>
+					  <property name="angle">0</property>
 					</widget>
 					<packing>
 					  <property name="left_attach">2</property>
@@ -1554,6 +1838,10 @@
 					  <property name="yalign">0.5</property>
 					  <property name="xpad">4</property>
 					  <property name="ypad">0</property>
+					  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+					  <property name="width_chars">-1</property>
+					  <property name="single_line_mode">False</property>
+					  <property name="angle">0</property>
 					</widget>
 					<packing>
 					  <property name="left_attach">0</property>
@@ -1603,6 +1891,10 @@
 					  <property name="yalign">0.5</property>
 					  <property name="xpad">4</property>
 					  <property name="ypad">0</property>
+					  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+					  <property name="width_chars">-1</property>
+					  <property name="single_line_mode">False</property>
+					  <property name="angle">0</property>
 					</widget>
 					<packing>
 					  <property name="left_attach">2</property>
@@ -1676,6 +1968,10 @@
 		      <property name="yalign">0.5</property>
 		      <property name="xpad">0</property>
 		      <property name="ypad">0</property>
+		      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+		      <property name="width_chars">-1</property>
+		      <property name="single_line_mode">False</property>
+		      <property name="angle">0</property>
 		    </widget>
 		    <packing>
 		      <property name="type">tab</property>
@@ -1701,6 +1997,10 @@
 			  <property name="yalign">0</property>
 			  <property name="xpad">0</property>
 			  <property name="ypad">0</property>
+			  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+			  <property name="width_chars">-1</property>
+			  <property name="single_line_mode">False</property>
+			  <property name="angle">0</property>
 			</widget>
 			<packing>
 			  <property name="padding">0</property>
@@ -1758,6 +2058,10 @@
 					  <property name="yalign">0.5</property>
 					  <property name="xpad">0</property>
 					  <property name="ypad">0</property>
+					  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+					  <property name="width_chars">-1</property>
+					  <property name="single_line_mode">False</property>
+					  <property name="angle">0</property>
 					</widget>
 				      </child>
 				    </widget>
@@ -1871,6 +2175,10 @@
 					  <property name="yalign">0.5</property>
 					  <property name="xpad">0</property>
 					  <property name="ypad">0</property>
+					  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+					  <property name="width_chars">-1</property>
+					  <property name="single_line_mode">False</property>
+					  <property name="angle">0</property>
 					</widget>
 				      </child>
 				    </widget>
@@ -2020,6 +2328,10 @@
 					  <property name="yalign">0.5</property>
 					  <property name="xpad">0</property>
 					  <property name="ypad">0</property>
+					  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+					  <property name="width_chars">-1</property>
+					  <property name="single_line_mode">False</property>
+					  <property name="angle">0</property>
 					</widget>
 				      </child>
 				    </widget>
@@ -2132,6 +2444,10 @@
 					  <property name="yalign">0.5</property>
 					  <property name="xpad">4</property>
 					  <property name="ypad">0</property>
+					  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+					  <property name="width_chars">-1</property>
+					  <property name="single_line_mode">False</property>
+					  <property name="angle">0</property>
 					</widget>
 					<packing>
 					  <property name="padding">0</property>
@@ -2174,6 +2490,10 @@
 					  <property name="yalign">0.5</property>
 					  <property name="xpad">4</property>
 					  <property name="ypad">0</property>
+					  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+					  <property name="width_chars">-1</property>
+					  <property name="single_line_mode">False</property>
+					  <property name="angle">0</property>
 					</widget>
 					<packing>
 					  <property name="padding">0</property>
@@ -2222,6 +2542,10 @@
 					  <property name="yalign">0.5</property>
 					  <property name="xpad">0</property>
 					  <property name="ypad">0</property>
+					  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+					  <property name="width_chars">-1</property>
+					  <property name="single_line_mode">False</property>
+					  <property name="angle">0</property>
 					</widget>
 				      </child>
 				    </widget>
@@ -2268,6 +2592,10 @@
 					  <property name="yalign">0.5</property>
 					  <property name="xpad">0</property>
 					  <property name="ypad">0</property>
+					  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+					  <property name="width_chars">-1</property>
+					  <property name="single_line_mode">False</property>
+					  <property name="angle">0</property>
 					</widget>
 					<packing>
 					  <property name="left_attach">0</property>
@@ -2292,6 +2620,10 @@
 					  <property name="yalign">0.5</property>
 					  <property name="xpad">0</property>
 					  <property name="ypad">0</property>
+					  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+					  <property name="width_chars">-1</property>
+					  <property name="single_line_mode">False</property>
+					  <property name="angle">0</property>
 					</widget>
 					<packing>
 					  <property name="left_attach">0</property>
@@ -2312,7 +2644,7 @@
 					  <property name="max_length">0</property>
 					  <property name="text" translatable="yes"></property>
 					  <property name="has_frame">True</property>
-					  <property name="invisible_char" translatable="yes">*</property>
+					  <property name="invisible_char">*</property>
 					  <property name="activates_default">False</property>
 					  <signal name="changed" handler="on_titlestring_entry_changed" last_modification_time="Sat, 03 Jul 2004 05:37:37 GMT"/>
 					  <signal name="realize" handler="on_titlestring_entry_realize" after="yes" last_modification_time="Sun, 04 Jul 2004 11:30:16 GMT"/>
@@ -2334,6 +2666,8 @@
 ARTIST - ALBUM - TITLE
 ALBUM - TITLE
 Custom</property>
+					  <property name="add_tearoffs">False</property>
+					  <property name="focus_on_click">True</property>
 					</widget>
 					<packing>
 					  <property name="left_attach">1</property>
@@ -2410,6 +2744,10 @@
 		      <property name="yalign">0.5</property>
 		      <property name="xpad">0</property>
 		      <property name="ypad">0</property>
+		      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+		      <property name="width_chars">-1</property>
+		      <property name="single_line_mode">False</property>
+		      <property name="angle">0</property>
 		    </widget>
 		    <packing>
 		      <property name="type">tab</property>
@@ -2435,6 +2773,10 @@
 			  <property name="yalign">0</property>
 			  <property name="xpad">0</property>
 			  <property name="ypad">0</property>
+			  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+			  <property name="width_chars">-1</property>
+			  <property name="single_line_mode">False</property>
+			  <property name="angle">0</property>
 			</widget>
 			<packing>
 			  <property name="padding">0</property>
@@ -2486,6 +2828,10 @@
 				      <property name="yalign">0.5</property>
 				      <property name="xpad">0</property>
 				      <property name="ypad">0</property>
+				      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+				      <property name="width_chars">-1</property>
+				      <property name="single_line_mode">False</property>
+				      <property name="angle">0</property>
 				    </widget>
 				  </child>
 				</widget>
@@ -2544,7 +2890,7 @@
 						  <property name="max_length">0</property>
 						  <property name="text" translatable="yes"></property>
 						  <property name="has_frame">True</property>
-						  <property name="invisible_char" translatable="yes">*</property>
+						  <property name="invisible_char">*</property>
 						  <property name="activates_default">False</property>
 						  <signal name="changed" handler="on_eq_dir_preset_entry_changed" last_modification_time="Wed, 26 May 2004 00:20:54 GMT"/>
 						  <signal name="realize" handler="on_eq_dir_preset_entry_realize" last_modification_time="Wed, 26 May 2004 00:59:25 GMT"/>
@@ -2567,7 +2913,7 @@
 						  <property name="max_length">0</property>
 						  <property name="text" translatable="yes"></property>
 						  <property name="has_frame">True</property>
-						  <property name="invisible_char" translatable="yes">*</property>
+						  <property name="invisible_char">*</property>
 						  <property name="activates_default">False</property>
 						  <signal name="changed" handler="on_eq_file_preset_entry_changed" last_modification_time="Wed, 26 May 2004 00:21:00 GMT"/>
 						  <signal name="realize" handler="on_eq_file_preset_entry_realize" last_modification_time="Wed, 26 May 2004 00:59:56 GMT"/>
@@ -2594,6 +2940,10 @@
 						  <property name="yalign">0.5</property>
 						  <property name="xpad">0</property>
 						  <property name="ypad">0</property>
+						  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+						  <property name="width_chars">-1</property>
+						  <property name="single_line_mode">False</property>
+						  <property name="angle">0</property>
 						</widget>
 						<packing>
 						  <property name="left_attach">0</property>
@@ -2618,6 +2968,10 @@
 						  <property name="yalign">0.5</property>
 						  <property name="xpad">0</property>
 						  <property name="ypad">0</property>
+						  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+						  <property name="width_chars">-1</property>
+						  <property name="single_line_mode">False</property>
+						  <property name="angle">0</property>
 						</widget>
 						<packing>
 						  <property name="left_attach">0</property>
@@ -2663,6 +3017,10 @@
 					      <property name="xpad">0</property>
 					      <property name="ypad">0</property>
 					      <property name="mnemonic_widget">category_notebook</property>
+					      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+					      <property name="width_chars">-1</property>
+					      <property name="single_line_mode">False</property>
+					      <property name="angle">0</property>
 					    </widget>
 					  </child>
 					</widget>
@@ -2690,6 +3048,9 @@
 					      <property name="rules_hint">False</property>
 					      <property name="reorderable">False</property>
 					      <property name="enable_search">True</property>
+					      <property name="fixed_height_mode">False</property>
+					      <property name="hover_selection">False</property>
+					      <property name="hover_expand">False</property>
 					      <signal name="realize" handler="on_eq_preset_view_realize" last_modification_time="Wed, 26 May 2004 00:18:22 GMT"/>
 					    </widget>
 					  </child>
@@ -2790,6 +3151,10 @@
 		      <property name="yalign">0.5</property>
 		      <property name="xpad">0</property>
 		      <property name="ypad">0</property>
+		      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+		      <property name="width_chars">-1</property>
+		      <property name="single_line_mode">False</property>
+		      <property name="angle">0</property>
 		    </widget>
 		    <packing>
 		      <property name="type">tab</property>
--- a/audacious/prefswin.c	Mon Nov 07 22:13:25 2005 -0800
+++ b/audacious/prefswin.c	Mon Nov 07 23:26:55 2005 -0800
@@ -848,7 +848,25 @@
     g_free(cfg.mainwin_font);
     cfg.mainwin_font = g_strdup(gtk_font_button_get_font_name(button));
 
-    textbox_set_xfont(mainwin_info, TRUE, cfg.mainwin_font);
+    textbox_set_xfont(mainwin_info, cfg.mainwin_use_xfont, cfg.mainwin_font);
+    mainwin_set_info_text();
+    draw_main_window(TRUE);
+}
+
+static void
+on_use_bitmap_fonts_realize(GtkToggleButton * button,
+                            gpointer data)
+{
+    gtk_toggle_button_set_active(button, cfg.show_numbers_in_pl);
+}
+
+static void
+on_use_bitmap_fonts_toggled(GtkToggleButton * button,
+                                    gpointer data)
+{
+    gboolean useit = gtk_toggle_button_get_active(button);
+    cfg.mainwin_use_xfont = useit != FALSE ? FALSE : TRUE;
+    textbox_set_xfont(mainwin_info, cfg.mainwin_use_xfont, cfg.mainwin_font);
     mainwin_set_info_text();
     draw_main_window(TRUE);
 }
@@ -1583,6 +1601,8 @@
     FUNC_MAP_ENTRY(on_custom_cursors_toggled)
     FUNC_MAP_ENTRY(on_mainwin_font_button_realize)
     FUNC_MAP_ENTRY(on_mainwin_font_button_font_set)
+    FUNC_MAP_ENTRY(on_use_bitmap_fonts_realize)
+    FUNC_MAP_ENTRY(on_use_bitmap_fonts_toggled)
     FUNC_MAP_ENTRY(on_mouse_wheel_volume_realize)
     FUNC_MAP_ENTRY(on_mouse_wheel_volume_changed)
     FUNC_MAP_ENTRY(on_mouse_wheel_scroll_pl_realize)
--- a/audacious/textbox.c	Mon Nov 07 22:13:25 2005 -0800
+++ b/audacious/textbox.c	Mon Nov 07 23:26:55 2005 -0800
@@ -74,7 +74,7 @@
     TextBox *tb = TEXT_BOX(data);
 
     if (!tb->tb_is_dragging) {
-        tb->tb_offset++;
+        tb->tb_offset += 5;
         if (tb->tb_offset >= tb->tb_pixmap_width)
             tb->tb_offset -= tb->tb_pixmap_width;
         widget_draw(WIDGET(tb));
@@ -417,7 +417,7 @@
     if (tb->tb_is_scrollable) {
         if (tb->tb_scroll_enabled && !tb->tb_timeout_tag) {
             gint tag;
-            tag = TEXTBOX_SCROLL_SMOOTH_TIMEOUT;
+            tag = TEXTBOX_SCROLL_SMOOTH_TIMEOUT * 5;
             tb->tb_timeout_tag = gtk_timeout_add(tag, textbox_scroll, tb);
         }
     }