Attachment #102997 for bug #156639

View | Details | Raw Unified | Return to bug 156639
Collapse All | Expand All




		      </child>

		      <child>
			<widget class="GtkAlignment" id="alignment88">
			  <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="GtkCheckButton" id="playlist_convert_slash">
			      <property name="visible">True</property>
			      <property name="can_focus">True</property>
			      <property name="label" translatable="yes">Convert forward slash '\' to backslash '/'</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="realize" handler="on_playlist_convert_slash_realize" after="yes" last_modification_time="Sat, 03 Jul 2004 04:40:06 GMT"/>
			      <signal name="toggled" handler="on_playlist_convert_slash_toggled" last_modification_time="Sat, 03 Jul 2004 04:40:16 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="alignment15">
			  <property name="visible">True</property>
			  <property name="xalign">0.5</property>

Lines 127-133 Link Here

(-)audacious-1.2.1/audacious/main.c (-1 / +2 lines)
127	FALSE, /* equalizer shaded */	127	FALSE, /* equalizer shaded */
128	FALSE, /* allow multiple instances */	128	FALSE, /* allow multiple instances */
129	TRUE, /* always show cb */	129	TRUE, /* always show cb */
130	TRUE, TRUE, /* convert '_' and %20 */	130	TRUE, TRUE, TRUE, /* convert '_', %20 and '\' */
131	TRUE, /* show numbers in playlist */	131	TRUE, /* show numbers in playlist */
132	TRUE, /* snap windows */	132	TRUE, /* snap windows */
133	TRUE, /* save window positions */	133	TRUE, /* save window positions */
Lines 259-264 Link Here
259	{"always_show_cb", &cfg.always_show_cb, TRUE},	259	{"always_show_cb", &cfg.always_show_cb, TRUE},
260	{"convert_underscore", &cfg.convert_underscore, TRUE},	260	{"convert_underscore", &cfg.convert_underscore, TRUE},
261	{"convert_twenty", &cfg.convert_twenty, TRUE},	261	{"convert_twenty", &cfg.convert_twenty, TRUE},
		262	{"convert_slash", &cfg.convert_slash, TRUE },
262	{"show_numbers_in_pl", &cfg.show_numbers_in_pl, TRUE},	263	{"show_numbers_in_pl", &cfg.show_numbers_in_pl, TRUE},
263	{"show_separator_in_pl", &cfg.show_separator_in_pl, TRUE},	264	{"show_separator_in_pl", &cfg.show_separator_in_pl, TRUE},
264	{"snap_windows", &cfg.snap_windows, TRUE},	265	{"snap_windows", &cfg.snap_windows, TRUE},

Lines 61-67 Link Here

(-)audacious-1.2.1/audacious/main.h (-1 / +1 lines)
61	gboolean playlist_visible, equalizer_visible, player_visible;	61	gboolean playlist_visible, equalizer_visible, player_visible;
62	gboolean player_shaded, playlist_shaded, equalizer_shaded;	62	gboolean player_shaded, playlist_shaded, equalizer_shaded;
63	gboolean allow_multiple_instances, always_show_cb;	63	gboolean allow_multiple_instances, always_show_cb;
64	gboolean convert_underscore, convert_twenty;	64	gboolean convert_underscore, convert_twenty, convert_slash;
65	gboolean show_numbers_in_pl;	65	gboolean show_numbers_in_pl;
66	gboolean snap_windows, save_window_position;	66	gboolean snap_windows, save_window_position;
67	gboolean dim_titlebar;	67	gboolean dim_titlebar;

Lines 1355-1360 Link Here

(-)audacious-1.2.1/audacious/playlist.c (+1 lines)
1355		1355
1356	filename = g_strchug(g_strdup(filename_p));	1356	filename = g_strchug(g_strdup(filename_p));
1357		1357
		1358	if(cfg.convert_slash)
1358	while ((tmp = strchr(filename, '\\')) != NULL)	1359	while ((tmp = strchr(filename, '\\')) != NULL)
1359	*tmp = '/';	1360	*tmp = '/';
1360		1361

Lines 1588-1593 Link Here

(-)audacious-1.2.1/audacious/prefswin.c (+14 lines)
1588	cfg.convert_twenty = gtk_toggle_button_get_active(button);	1588	cfg.convert_twenty = gtk_toggle_button_get_active(button);
1589	}	1589	}
1590		1590
		1591	static void
		1592	on_playlist_convert_slash_realize(GtkToggleButton * button, gpointer data)
		1593	{
		1594	gtk_toggle_button_set_active(button, cfg.convert_slash);
		1595	}
		1596
		1597	static void
		1598	on_playlist_convert_slash_toggled(GtkToggleButton * button, gpointer data)
		1599	{
		1600	cfg.convert_slash = gtk_toggle_button_get_active(button);
		1601	}
		1602
1591	#if 0	1603	#if 0
1592	static void	1604	static void
1593	on_playlist_update_clicked(GtkButton * button,	1605	on_playlist_update_clicked(GtkButton * button,
Lines 2136-2141 Link Here
2136	FUNC_MAP_ENTRY(on_playlist_convert_twenty_toggled)	2148	FUNC_MAP_ENTRY(on_playlist_convert_twenty_toggled)
2137	FUNC_MAP_ENTRY(on_playlist_convert_underscore_realize)	2149	FUNC_MAP_ENTRY(on_playlist_convert_underscore_realize)
2138	FUNC_MAP_ENTRY(on_playlist_convert_underscore_toggled)	2150	FUNC_MAP_ENTRY(on_playlist_convert_underscore_toggled)
		2151	FUNC_MAP_ENTRY(on_playlist_convert_slash_realize)
		2152	FUNC_MAP_ENTRY(on_playlist_convert_slash_toggled)
2139	FUNC_MAP_ENTRY(on_playlist_font_button_realize)	2153	FUNC_MAP_ENTRY(on_playlist_font_button_realize)
2140	FUNC_MAP_ENTRY(on_playlist_font_button_font_set)	2154	FUNC_MAP_ENTRY(on_playlist_font_button_font_set)
2141	FUNC_MAP_ENTRY(on_playlist_no_advance_realize)	2155	FUNC_MAP_ENTRY(on_playlist_no_advance_realize)

Lines 1328-1333 Link Here

(-)audacious-1.2.1/audacious/util.c (+3 lines)
1328	{	1328	{
1329	g_return_val_if_fail(title != NULL, NULL);	1329	g_return_val_if_fail(title != NULL, NULL);
1330		1330
		1331	if (cfg.convert_slash)
		1332	str_replace_char(title, '\\', '/');
		1333
1331	if (cfg.convert_underscore)	1334	if (cfg.convert_underscore)
1332	str_replace_char(title, '_', ' ');	1335	str_replace_char(title, '_', ' ');
1333		1336

Return to bug 156639

Lines 1767-1772 Link Here

(-)audacious-1.2.1/audacious/glade/prefswin.glade (+35 lines)
1767	</child>	1767	</child>
1768		1768
1769	<child>	1769	<child>
		1770	<widget class="GtkAlignment" id="alignment88">
		1771	<property name="visible">True</property>
		1772	<property name="xalign">0.5</property>
		1773	<property name="yalign">0.5</property>
		1774	<property name="xscale">1</property>
		1775	<property name="yscale">1</property>
		1776	<property name="top_padding">0</property>
		1777	<property name="bottom_padding">0</property>
		1778	<property name="left_padding">12</property>
		1779	<property name="right_padding">0</property>
		1780
		1781	<child>
		1782	<widget class="GtkCheckButton" id="playlist_convert_slash">
		1783	<property name="visible">True</property>
		1784	<property name="can_focus">True</property>
		1785	<property name="label" translatable="yes">Convert forward slash '\' to backslash '/'</property>
		1786	<property name="use_underline">True</property>
		1787	<property name="relief">GTK_RELIEF_NORMAL</property>
		1788	<property name="focus_on_click">True</property>
		1789	<property name="active">False</property>
		1790	<property name="inconsistent">False</property>
		1791	<property name="draw_indicator">True</property>
		1792	<signal name="realize" handler="on_playlist_convert_slash_realize" after="yes" last_modification_time="Sat, 03 Jul 2004 04:40:06 GMT"/>
		1793	<signal name="toggled" handler="on_playlist_convert_slash_toggled" last_modification_time="Sat, 03 Jul 2004 04:40:16 GMT"/>
		1794	</widget>
		1795	</child>
		1796	</widget>
		1797	<packing>
		1798	<property name="padding">0</property>
		1799	<property name="expand">False</property>
		1800	<property name="fill">False</property>
		1801	</packing>
		1802	</child>
		1803
		1804	<child>
1770	<widget class="GtkAlignment" id="alignment15">	1805	<widget class="GtkAlignment" id="alignment15">
1771	<property name="visible">True</property>	1806	<property name="visible">True</property>
1772	<property name="xalign">0.5</property>	1807	<property name="xalign">0.5</property>