Mercurial > audlegacy
changeset 3649:fae43071b6ff
Rename vbox32 to audio_page_vbox.
author | William Pitcock <nenolod@atheme.org> |
---|---|
date | Wed, 26 Sep 2007 19:16:58 -0500 |
parents | 5bea21b52a06 |
children | fa9053478e0b |
files | src/audacious/glade/prefswin.glade |
diffstat | 1 files changed, 363 insertions(+), 391 deletions(-) [+] |
line wrap: on
line diff
--- a/src/audacious/glade/prefswin.glade Wed Sep 26 18:54:49 2007 -0500 +++ b/src/audacious/glade/prefswin.glade Wed Sep 26 19:16:58 2007 -0500 @@ -133,9 +133,6 @@ </packing> </child> </widget> - <packing> - <property name="tab_expand">False</property> - </packing> </child> <child> <widget class="GtkLabel" id="plugin_input_label"> @@ -147,7 +144,6 @@ </widget> <packing> <property name="type">tab</property> - <property name="tab_expand">False</property> <property name="tab_fill">False</property> </packing> </child> @@ -238,7 +234,6 @@ </widget> <packing> <property name="position">1</property> - <property name="tab_expand">False</property> </packing> </child> <child> @@ -250,7 +245,6 @@ <packing> <property name="type">tab</property> <property name="position">1</property> - <property name="tab_expand">False</property> <property name="tab_fill">False</property> </packing> </child> @@ -341,7 +335,6 @@ </widget> <packing> <property name="position">2</property> - <property name="tab_expand">False</property> </packing> </child> <child> @@ -353,7 +346,6 @@ <packing> <property name="type">tab</property> <property name="position">2</property> - <property name="tab_expand">False</property> <property name="tab_fill">False</property> </packing> </child> @@ -444,7 +436,6 @@ </widget> <packing> <property name="position">3</property> - <property name="tab_expand">False</property> </packing> </child> <child> @@ -456,16 +447,12 @@ <packing> <property name="type">tab</property> <property name="position">3</property> - <property name="tab_expand">False</property> <property name="tab_fill">False</property> </packing> </child> </widget> </child> </widget> - <packing> - <property name="tab_expand">False</property> - </packing> </child> <child> <widget class="GtkLabel" id="plugin_label"> @@ -474,7 +461,6 @@ </widget> <packing> <property name="type">tab</property> - <property name="tab_expand">False</property> <property name="tab_fill">False</property> </packing> </child> @@ -608,23 +594,38 @@ <property name="column_spacing">2</property> <property name="row_spacing">8</property> <child> - <widget class="GtkAlignment" id="alignment54"> + <widget class="GtkFontButton" id="playlist_font_button"> <property name="visible">True</property> - <property name="left_padding">12</property> - <property name="right_padding">6</property> - <child> - <widget class="GtkLabel" id="label22"> - <property name="visible">True</property> - <property name="xalign">1</property> - <property name="label" translatable="yes">_Player:</property> - <property name="use_markup">True</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">mainwin_font_button</property> - </widget> - </child> + <property name="can_focus">True</property> + <property name="response_id">0</property> + <property name="title" translatable="yes">Select playlist font:</property> + <property name="use_font">True</property> + <property name="use_size">True</property> + <signal name="realize" handler="on_playlist_font_button_realize" after="yes"/> + <signal name="font_set" handler="on_playlist_font_button_font_set"/> </widget> <packing> - <property name="x_options"></property> + <property name="left_attach">1</property> + <property name="right_attach">2</property> + <property name="top_attach">1</property> + <property name="bottom_attach">2</property> + <property name="y_options"></property> + </packing> + </child> + <child> + <widget class="GtkFontButton" id="mainwin_font_button"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="response_id">0</property> + <property name="title" translatable="yes">Select main player window font:</property> + <property name="use_font">True</property> + <property name="use_size">True</property> + <signal name="realize" handler="on_mainwin_font_button_realize" after="yes"/> + <signal name="font_set" handler="on_mainwin_font_button_font_set"/> + </widget> + <packing> + <property name="left_attach">1</property> + <property name="right_attach">2</property> <property name="y_options"></property> </packing> </child> @@ -653,38 +654,23 @@ </packing> </child> <child> - <widget class="GtkFontButton" id="mainwin_font_button"> + <widget class="GtkAlignment" id="alignment54"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="response_id">0</property> - <property name="title" translatable="yes">Select main player window font:</property> - <property name="use_font">True</property> - <property name="use_size">True</property> - <signal name="realize" handler="on_mainwin_font_button_realize" after="yes"/> - <signal name="font_set" handler="on_mainwin_font_button_font_set"/> + <property name="left_padding">12</property> + <property name="right_padding">6</property> + <child> + <widget class="GtkLabel" id="label22"> + <property name="visible">True</property> + <property name="xalign">1</property> + <property name="label" translatable="yes">_Player:</property> + <property name="use_markup">True</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">mainwin_font_button</property> + </widget> + </child> </widget> <packing> - <property name="left_attach">1</property> - <property name="right_attach">2</property> - <property name="y_options"></property> - </packing> - </child> - <child> - <widget class="GtkFontButton" id="playlist_font_button"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="response_id">0</property> - <property name="title" translatable="yes">Select playlist font:</property> - <property name="use_font">True</property> - <property name="use_size">True</property> - <signal name="realize" handler="on_playlist_font_button_realize" after="yes"/> - <signal name="font_set" handler="on_playlist_font_button_font_set"/> - </widget> - <packing> - <property name="left_attach">1</property> - <property name="right_attach">2</property> - <property name="top_attach">1</property> - <property name="bottom_attach">2</property> + <property name="x_options"></property> <property name="y_options"></property> </packing> </child> @@ -881,7 +867,6 @@ </widget> <packing> <property name="position">1</property> - <property name="tab_expand">False</property> </packing> </child> <child> @@ -892,7 +877,6 @@ <packing> <property name="type">tab</property> <property name="position">1</property> - <property name="tab_expand">False</property> <property name="tab_fill">False</property> </packing> </child> @@ -932,39 +916,33 @@ <property name="n_columns">3</property> <property name="row_spacing">6</property> <child> - <widget class="GtkLabel" id="label32"> + <widget class="GtkSpinButton" id="mouse_wheel_volume"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="adjustment">5 0 100 1 10 10</property> + <property name="climb_rate">1</property> + <property name="numeric">True</property> + <signal name="value_changed" handler="on_mouse_wheel_volume_changed"/> + <signal name="realize" handler="on_mouse_wheel_volume_realize" after="yes"/> + </widget> + <packing> + <property name="left_attach">1</property> + <property name="right_attach">2</property> + <property name="x_options"></property> + <property name="y_options"></property> + <property name="x_padding">4</property> + </packing> + </child> + <child> + <widget class="GtkLabel" id="label35"> <property name="visible">True</property> <property name="xalign">0</property> <property name="xpad">4</property> - <property name="label" translatable="yes">Changes volume by</property> - </widget> - <packing> - <property name="x_options"></property> - <property name="y_options"></property> - </packing> - </child> - <child> - <widget class="GtkLabel" id="label33"> - <property name="visible">True</property> - <property name="xalign">0</property> - <property name="xpad">4</property> - <property name="label" translatable="yes">percent</property> + <property name="label" translatable="yes">lines</property> </widget> <packing> <property name="left_attach">2</property> <property name="right_attach">3</property> - <property name="x_options"></property> - <property name="y_options"></property> - </packing> - </child> - <child> - <widget class="GtkLabel" id="label34"> - <property name="visible">True</property> - <property name="xalign">0</property> - <property name="xpad">4</property> - <property name="label" translatable="yes">Scrolls playlist by</property> - </widget> - <packing> <property name="top_attach">1</property> <property name="bottom_attach">2</property> <property name="x_options"></property> @@ -991,15 +969,13 @@ </packing> </child> <child> - <widget class="GtkLabel" id="label35"> + <widget class="GtkLabel" id="label34"> <property name="visible">True</property> <property name="xalign">0</property> <property name="xpad">4</property> - <property name="label" translatable="yes">lines</property> + <property name="label" translatable="yes">Scrolls playlist by</property> </widget> <packing> - <property name="left_attach">2</property> - <property name="right_attach">3</property> <property name="top_attach">1</property> <property name="bottom_attach">2</property> <property name="x_options"></property> @@ -1007,21 +983,29 @@ </packing> </child> <child> - <widget class="GtkSpinButton" id="mouse_wheel_volume"> + <widget class="GtkLabel" id="label33"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="adjustment">5 0 100 1 10 10</property> - <property name="climb_rate">1</property> - <property name="numeric">True</property> - <signal name="value_changed" handler="on_mouse_wheel_volume_changed"/> - <signal name="realize" handler="on_mouse_wheel_volume_realize" after="yes"/> + <property name="xalign">0</property> + <property name="xpad">4</property> + <property name="label" translatable="yes">percent</property> </widget> <packing> - <property name="left_attach">1</property> - <property name="right_attach">2</property> + <property name="left_attach">2</property> + <property name="right_attach">3</property> <property name="x_options"></property> <property name="y_options"></property> - <property name="x_padding">4</property> + </packing> + </child> + <child> + <widget class="GtkLabel" id="label32"> + <property name="visible">True</property> + <property name="xalign">0</property> + <property name="xpad">4</property> + <property name="label" translatable="yes">Changes volume by</property> + </widget> + <packing> + <property name="x_options"></property> + <property name="y_options"></property> </packing> </child> </widget> @@ -1038,7 +1022,6 @@ </widget> <packing> <property name="position">2</property> - <property name="tab_expand">False</property> </packing> </child> <child> @@ -1049,7 +1032,6 @@ <packing> <property name="type">tab</property> <property name="position">2</property> - <property name="tab_expand">False</property> <property name="tab_fill">False</property> </packing> </child> @@ -1237,20 +1219,30 @@ <property name="n_rows">2</property> <property name="n_columns">2</property> <child> - <widget class="GtkLabel" id="label74"> + <widget class="GtkLabel" id="label73"> <property name="visible">True</property> <property name="xalign">1</property> - <property name="label" translatable="yes">Fallback character encodings:</property> + <property name="label" translatable="yes">Auto character encoding detector for:</property> <property name="justify">GTK_JUSTIFY_RIGHT</property> </widget> <packing> - <property name="top_attach">1</property> - <property name="bottom_attach">2</property> <property name="x_options"></property> <property name="y_options"></property> </packing> </child> <child> + <widget class="GtkComboBox" id="combobox1"> + <property name="visible">True</property> + <property name="items" translatable="yes"></property> + <signal name="realize" handler="on_chardet_detector_cbox_realize" after="yes"/> + </widget> + <packing> + <property name="left_attach">1</property> + <property name="right_attach">2</property> + <property name="y_options"></property> + </packing> + </child> + <child> <widget class="GtkEntry" id="entry1"> <property name="visible">True</property> <property name="can_focus">True</property> @@ -1267,25 +1259,15 @@ </packing> </child> <child> - <widget class="GtkComboBox" id="combobox1"> - <property name="visible">True</property> - <property name="items" translatable="yes"></property> - <signal name="realize" handler="on_chardet_detector_cbox_realize" after="yes"/> - </widget> - <packing> - <property name="left_attach">1</property> - <property name="right_attach">2</property> - <property name="y_options"></property> - </packing> - </child> - <child> - <widget class="GtkLabel" id="label73"> + <widget class="GtkLabel" id="label74"> <property name="visible">True</property> <property name="xalign">1</property> - <property name="label" translatable="yes">Auto character encoding detector for:</property> + <property name="label" translatable="yes">Fallback character encodings:</property> <property name="justify">GTK_JUSTIFY_RIGHT</property> </widget> <packing> + <property name="top_attach">1</property> + <property name="bottom_attach">2</property> <property name="x_options"></property> <property name="y_options"></property> </packing> @@ -1380,25 +1362,22 @@ <property name="column_spacing">12</property> <property name="row_spacing">4</property> <child> - <widget class="GtkLabel" id="label61"> + <widget class="GtkButton" id="titlestring_help_button"> <property name="visible">True</property> - <property name="xalign">1</property> - <property name="label" translatable="yes">Title format:</property> - <property name="justify">GTK_JUSTIFY_RIGHT</property> + <property name="tooltip" translatable="yes">Show information about titlestring format</property> + <property name="relief">GTK_RELIEF_HALF</property> + <property name="focus_on_click">False</property> + <property name="response_id">0</property> + <child> + <widget class="GtkImage" id="image1"> + <property name="visible">True</property> + <property name="stock">gtk-index</property> + </widget> + </child> </widget> <packing> - <property name="x_options"></property> - <property name="y_options"></property> - </packing> - </child> - <child> - <widget class="GtkLabel" id="label62"> - <property name="visible">True</property> - <property name="xalign">1</property> - <property name="label" translatable="yes">Custom string:</property> - <property name="justify">GTK_JUSTIFY_RIGHT</property> - </widget> - <packing> + <property name="left_attach">2</property> + <property name="right_attach">3</property> <property name="top_attach">1</property> <property name="bottom_attach">2</property> <property name="x_options"></property> @@ -1406,21 +1385,6 @@ </packing> </child> <child> - <widget class="GtkEntry" id="titlestring_entry"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <signal name="changed" handler="on_titlestring_entry_changed"/> - <signal name="realize" handler="on_titlestring_entry_realize" after="yes"/> - </widget> - <packing> - <property name="left_attach">1</property> - <property name="right_attach">2</property> - <property name="top_attach">1</property> - <property name="bottom_attach">2</property> - <property name="y_options"></property> - </packing> - </child> - <child> <widget class="GtkComboBox" id="titlestring_cbox"> <property name="visible">True</property> <property name="items" translatable="yes">TITLE @@ -1438,24 +1402,42 @@ </packing> </child> <child> - <widget class="GtkButton" id="titlestring_help_button"> + <widget class="GtkEntry" id="titlestring_entry"> <property name="visible">True</property> - <property name="tooltip" translatable="yes">Show information about titlestring format</property> - <property name="relief">GTK_RELIEF_HALF</property> - <property name="focus_on_click">False</property> - <property name="response_id">0</property> - <child> - <widget class="GtkImage" id="image1"> - <property name="visible">True</property> - <property name="stock">gtk-index</property> - </widget> - </child> + <property name="can_focus">True</property> + <signal name="changed" handler="on_titlestring_entry_changed"/> + <signal name="realize" handler="on_titlestring_entry_realize" after="yes"/> </widget> <packing> - <property name="left_attach">2</property> - <property name="right_attach">3</property> + <property name="left_attach">1</property> + <property name="right_attach">2</property> <property name="top_attach">1</property> <property name="bottom_attach">2</property> + <property name="y_options"></property> + </packing> + </child> + <child> + <widget class="GtkLabel" id="label62"> + <property name="visible">True</property> + <property name="xalign">1</property> + <property name="label" translatable="yes">Custom string:</property> + <property name="justify">GTK_JUSTIFY_RIGHT</property> + </widget> + <packing> + <property name="top_attach">1</property> + <property name="bottom_attach">2</property> + <property name="x_options"></property> + <property name="y_options"></property> + </packing> + </child> + <child> + <widget class="GtkLabel" id="label61"> + <property name="visible">True</property> + <property name="xalign">1</property> + <property name="label" translatable="yes">Title format:</property> + <property name="justify">GTK_JUSTIFY_RIGHT</property> + </widget> + <packing> <property name="x_options"></property> <property name="y_options"></property> </packing> @@ -1552,7 +1534,6 @@ </widget> <packing> <property name="position">3</property> - <property name="tab_expand">False</property> </packing> </child> <child> @@ -1563,7 +1544,6 @@ <packing> <property name="type">tab</property> <property name="position">3</property> - <property name="tab_expand">False</property> <property name="tab_fill">False</property> </packing> </child> @@ -1609,15 +1589,26 @@ <property name="column_spacing">6</property> <property name="row_spacing">6</property> <child> - <widget class="GtkEntry" id="eq_dir_preset_entry"> + <widget class="GtkLabel" id="label58"> <property name="visible">True</property> - <property name="can_focus">True</property> - <signal name="changed" handler="on_eq_dir_preset_entry_changed"/> - <signal name="realize" handler="on_eq_dir_preset_entry_realize"/> + <property name="xalign">0</property> + <property name="label" translatable="yes">File preset extension:</property> </widget> <packing> - <property name="left_attach">1</property> - <property name="right_attach">2</property> + <property name="top_attach">1</property> + <property name="bottom_attach">2</property> + <property name="x_options"></property> + <property name="y_options"></property> + </packing> + </child> + <child> + <widget class="GtkLabel" id="label57"> + <property name="visible">True</property> + <property name="xalign">0</property> + <property name="label" translatable="yes">Directory preset file:</property> + </widget> + <packing> + <property name="x_options"></property> <property name="y_options"></property> </packing> </child> @@ -1637,26 +1628,15 @@ </packing> </child> <child> - <widget class="GtkLabel" id="label57"> + <widget class="GtkEntry" id="eq_dir_preset_entry"> <property name="visible">True</property> - <property name="xalign">0</property> - <property name="label" translatable="yes">Directory preset file:</property> + <property name="can_focus">True</property> + <signal name="changed" handler="on_eq_dir_preset_entry_changed"/> + <signal name="realize" handler="on_eq_dir_preset_entry_realize"/> </widget> <packing> - <property name="x_options"></property> - <property name="y_options"></property> - </packing> - </child> - <child> - <widget class="GtkLabel" id="label58"> - <property name="visible">True</property> - <property name="xalign">0</property> - <property name="label" translatable="yes">File preset extension:</property> - </widget> - <packing> - <property name="top_attach">1</property> - <property name="bottom_attach">2</property> - <property name="x_options"></property> + <property name="left_attach">1</property> + <property name="right_attach">2</property> <property name="y_options"></property> </packing> </child> @@ -1760,7 +1740,6 @@ </widget> <packing> <property name="position">4</property> - <property name="tab_expand">False</property> </packing> </child> <child> @@ -1771,7 +1750,6 @@ <packing> <property name="type">tab</property> <property name="position">4</property> - <property name="tab_expand">False</property> <property name="tab_fill">False</property> </packing> </child> @@ -1836,14 +1814,30 @@ <property name="column_spacing">6</property> <property name="row_spacing">6</property> <child> - <widget class="GtkLabel" id="label68"> + <widget class="GtkEntry" id="proxy_port"> <property name="visible">True</property> - <property name="xalign">0</property> - <property name="yalign">0</property> - <property name="label" translatable="yes">Proxy hostname:</property> + <property name="can_focus">True</property> + <signal name="changed" handler="on_proxy_port_changed"/> + <signal name="realize" handler="on_proxy_port_realize"/> </widget> <packing> - <property name="x_options"></property> + <property name="left_attach">1</property> + <property name="right_attach">2</property> + <property name="top_attach">1</property> + <property name="bottom_attach">2</property> + <property name="y_options"></property> + </packing> + </child> + <child> + <widget class="GtkEntry" id="proxy_host"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <signal name="changed" handler="on_proxy_host_changed"/> + <signal name="realize" handler="on_proxy_host_realize"/> + </widget> + <packing> + <property name="left_attach">1</property> + <property name="right_attach">2</property> <property name="y_options"></property> </packing> </child> @@ -1861,30 +1855,14 @@ </packing> </child> <child> - <widget class="GtkEntry" id="proxy_host"> + <widget class="GtkLabel" id="label68"> <property name="visible">True</property> - <property name="can_focus">True</property> - <signal name="changed" handler="on_proxy_host_changed"/> - <signal name="realize" handler="on_proxy_host_realize"/> + <property name="xalign">0</property> + <property name="yalign">0</property> + <property name="label" translatable="yes">Proxy hostname:</property> </widget> <packing> - <property name="left_attach">1</property> - <property name="right_attach">2</property> - <property name="y_options"></property> - </packing> - </child> - <child> - <widget class="GtkEntry" id="proxy_port"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <signal name="changed" handler="on_proxy_port_changed"/> - <signal name="realize" handler="on_proxy_port_realize"/> - </widget> - <packing> - <property name="left_attach">1</property> - <property name="right_attach">2</property> - <property name="top_attach">1</property> - <property name="bottom_attach">2</property> + <property name="x_options"></property> <property name="y_options"></property> </packing> </child> @@ -1927,14 +1905,31 @@ <property name="column_spacing">6</property> <property name="row_spacing">6</property> <child> - <widget class="GtkLabel" id="label70"> + <widget class="GtkEntry" id="proxy_pass"> <property name="visible">True</property> - <property name="xalign">0</property> - <property name="yalign">0</property> - <property name="label" translatable="yes">Proxy username:</property> + <property name="can_focus">True</property> + <property name="visibility">False</property> + <signal name="changed" handler="on_proxy_pass_changed"/> + <signal name="realize" handler="on_proxy_pass_realize"/> </widget> <packing> - <property name="x_options"></property> + <property name="left_attach">1</property> + <property name="right_attach">2</property> + <property name="top_attach">1</property> + <property name="bottom_attach">2</property> + <property name="y_options"></property> + </packing> + </child> + <child> + <widget class="GtkEntry" id="proxy_user"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <signal name="changed" handler="on_proxy_user_changed"/> + <signal name="realize" handler="on_proxy_user_realize"/> + </widget> + <packing> + <property name="left_attach">1</property> + <property name="right_attach">2</property> <property name="y_options"></property> </packing> </child> @@ -1952,31 +1947,14 @@ </packing> </child> <child> - <widget class="GtkEntry" id="proxy_user"> + <widget class="GtkLabel" id="label70"> <property name="visible">True</property> - <property name="can_focus">True</property> - <signal name="changed" handler="on_proxy_user_changed"/> - <signal name="realize" handler="on_proxy_user_realize"/> + <property name="xalign">0</property> + <property name="yalign">0</property> + <property name="label" translatable="yes">Proxy username:</property> </widget> <packing> - <property name="left_attach">1</property> - <property name="right_attach">2</property> - <property name="y_options"></property> - </packing> - </child> - <child> - <widget class="GtkEntry" id="proxy_pass"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="visibility">False</property> - <signal name="changed" handler="on_proxy_pass_changed"/> - <signal name="realize" handler="on_proxy_pass_realize"/> - </widget> - <packing> - <property name="left_attach">1</property> - <property name="right_attach">2</property> - <property name="top_attach">1</property> - <property name="bottom_attach">2</property> + <property name="x_options"></property> <property name="y_options"></property> </packing> </child> @@ -2038,7 +2016,6 @@ </widget> <packing> <property name="position">5</property> - <property name="tab_expand">False</property> </packing> </child> <child> @@ -2048,7 +2025,6 @@ <packing> <property name="type">tab</property> <property name="position">5</property> - <property name="tab_expand">False</property> <property name="tab_fill">False</property> </packing> </child> @@ -2062,12 +2038,11 @@ <packing> <property name="type">tab</property> <property name="position">6</property> - <property name="tab_expand">False</property> <property name="tab_fill">False</property> </packing> </child> <child> - <widget class="GtkVBox" id="vbox32"> + <widget class="GtkVBox" id="audio_page_vbox"> <property name="visible">True</property> <child> <widget class="GtkAlignment" id="alignment74"> @@ -2103,40 +2078,25 @@ <property name="column_spacing">6</property> <property name="row_spacing">6</property> <child> - <widget class="GtkLabel" id="label78"> + <widget class="GtkImage" id="image7"> <property name="visible">True</property> - <property name="xalign">0</property> - <property name="label" translatable="yes">Current output plugin:</property> + <property name="xalign">1</property> + <property name="yalign">0</property> + <property name="stock">gtk-info</property> </widget> <packing> - <property name="x_options"></property> - <property name="y_options"></property> + <property name="top_attach">2</property> + <property name="bottom_attach">3</property> + <property name="x_options">GTK_FILL</property> </packing> </child> <child> - <widget class="GtkComboBox" id="output_plugin_cbox"> + <widget class="GtkLabel" id="label79"> <property name="visible">True</property> - <property name="items" translatable="yes"></property> - <signal name="realize" handler="on_output_plugin_cbox_realize" after="yes"/> + <property name="xalign">1</property> + <property name="label" translatable="yes">Buffer size:</property> </widget> <packing> - <property name="left_attach">1</property> - <property name="right_attach">2</property> - <property name="y_options"></property> - </packing> - </child> - <child> - <widget class="GtkSpinButton" id="output_plugin_bufsize"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="adjustment">0 0 600000 100 1000 1000</property> - <property name="climb_rate">1</property> - <signal name="value_changed" handler="on_output_plugin_bufsize_value_changed"/> - <signal name="realize" handler="on_output_plugin_bufsize_realize" after="yes"/> - </widget> - <packing> - <property name="left_attach">1</property> - <property name="right_attach">2</property> <property name="top_attach">1</property> <property name="bottom_attach">2</property> <property name="y_options"></property> @@ -2162,28 +2122,43 @@ </packing> </child> <child> - <widget class="GtkLabel" id="label79"> + <widget class="GtkSpinButton" id="output_plugin_bufsize"> <property name="visible">True</property> - <property name="xalign">1</property> - <property name="label" translatable="yes">Buffer size:</property> + <property name="can_focus">True</property> + <property name="adjustment">0 0 600000 100 1000 1000</property> + <property name="climb_rate">1</property> + <signal name="value_changed" handler="on_output_plugin_bufsize_value_changed"/> + <signal name="realize" handler="on_output_plugin_bufsize_realize" after="yes"/> </widget> <packing> + <property name="left_attach">1</property> + <property name="right_attach">2</property> <property name="top_attach">1</property> <property name="bottom_attach">2</property> <property name="y_options"></property> </packing> </child> <child> - <widget class="GtkImage" id="image7"> + <widget class="GtkComboBox" id="output_plugin_cbox"> <property name="visible">True</property> - <property name="xalign">1</property> - <property name="yalign">0</property> - <property name="stock">gtk-info</property> + <property name="items" translatable="yes"></property> + <signal name="realize" handler="on_output_plugin_cbox_realize" after="yes"/> </widget> <packing> - <property name="top_attach">2</property> - <property name="bottom_attach">3</property> - <property name="x_options">GTK_FILL</property> + <property name="left_attach">1</property> + <property name="right_attach">2</property> + <property name="y_options"></property> + </packing> + </child> + <child> + <widget class="GtkLabel" id="label78"> + <property name="visible">True</property> + <property name="xalign">0</property> + <property name="label" translatable="yes">Current output plugin:</property> + </widget> + <packing> + <property name="x_options"></property> + <property name="y_options"></property> </packing> </child> </widget> @@ -2581,42 +2556,36 @@ <property name="column_spacing">6</property> <property name="row_spacing">6</property> <child> - <widget class="GtkLabel" id="label91"> + <widget class="GtkComboBox" id="src_converter_type"> <property name="visible">True</property> - <property name="xalign">0</property> - <property name="label" translatable="yes">Sampling Rate [Hz]:</property> - </widget> - <packing> - <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> - </packing> - </child> - <child> - <widget class="GtkSpinButton" id="src_rate"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="adjustment">96000 1000 768000 1000 1000 1000</property> - <property name="climb_rate">1</property> - <signal name="value_changed" handler="on_src_rate_value_changed"/> - <signal name="realize" handler="on_src_rate_realize"/> + <property name="items">Best Sinc Interpolation +Medium Sinc Interpolation +Fastest Sinc Interpolation +ZOH Interpolation +Linear Interpolation</property> + <signal name="changed" handler="on_src_converter_type_changed"/> + <signal name="realize" handler="on_src_converter_type_realize" after="yes"/> </widget> <packing> <property name="left_attach">1</property> <property name="right_attach">2</property> - <property name="y_options"></property> + <property name="top_attach">1</property> + <property name="bottom_attach">2</property> + <property name="x_options">GTK_FILL</property> + <property name="y_options">GTK_FILL</property> </packing> </child> <child> - <widget class="GtkImage" id="image9"> + <widget class="GtkLabel" id="label94"> <property name="visible">True</property> - <property name="xalign">1</property> - <property name="yalign">0</property> - <property name="stock">gtk-info</property> + <property name="xalign">0</property> + <property name="label" translatable="yes">Interpolation Engine:</property> </widget> <packing> - <property name="top_attach">2</property> - <property name="bottom_attach">3</property> + <property name="top_attach">1</property> + <property name="bottom_attach">2</property> <property name="x_options">GTK_FILL</property> + <property name="y_options"></property> </packing> </child> <child> @@ -2639,36 +2608,42 @@ </packing> </child> <child> - <widget class="GtkLabel" id="label94"> + <widget class="GtkImage" id="image9"> <property name="visible">True</property> - <property name="xalign">0</property> - <property name="label" translatable="yes">Interpolation Engine:</property> + <property name="xalign">1</property> + <property name="yalign">0</property> + <property name="stock">gtk-info</property> </widget> <packing> - <property name="top_attach">1</property> - <property name="bottom_attach">2</property> + <property name="top_attach">2</property> + <property name="bottom_attach">3</property> <property name="x_options">GTK_FILL</property> + </packing> + </child> + <child> + <widget class="GtkSpinButton" id="src_rate"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="adjustment">96000 1000 768000 1000 1000 1000</property> + <property name="climb_rate">1</property> + <signal name="value_changed" handler="on_src_rate_value_changed"/> + <signal name="realize" handler="on_src_rate_realize"/> + </widget> + <packing> + <property name="left_attach">1</property> + <property name="right_attach">2</property> <property name="y_options"></property> </packing> </child> <child> - <widget class="GtkComboBox" id="src_converter_type"> + <widget class="GtkLabel" id="label91"> <property name="visible">True</property> - <property name="items">Best Sinc Interpolation -Medium Sinc Interpolation -Fastest Sinc Interpolation -ZOH Interpolation -Linear Interpolation</property> - <signal name="changed" handler="on_src_converter_type_changed"/> - <signal name="realize" handler="on_src_converter_type_realize" after="yes"/> + <property name="xalign">0</property> + <property name="label" translatable="yes">Sampling Rate [Hz]:</property> </widget> <packing> - <property name="left_attach">1</property> - <property name="right_attach">2</property> - <property name="top_attach">1</property> - <property name="bottom_attach">2</property> <property name="x_options">GTK_FILL</property> - <property name="y_options">GTK_FILL</property> + <property name="y_options"></property> </packing> </child> </widget> @@ -2733,7 +2708,6 @@ </widget> <packing> <property name="position">7</property> - <property name="tab_expand">False</property> </packing> </child> <child> @@ -2743,7 +2717,6 @@ <packing> <property name="type">tab</property> <property name="position">7</property> - <property name="tab_expand">False</property> <property name="tab_fill">False</property> </packing> </child> @@ -2757,7 +2730,6 @@ <packing> <property name="type">tab</property> <property name="position">8</property> - <property name="tab_expand">False</property> <property name="tab_fill">False</property> </packing> </child> @@ -2917,7 +2889,7 @@ <property name="column_spacing">4</property> <property name="row_spacing">4</property> <child> - <widget class="GtkEntry" id="filepopup_settings_cover_name_exclude"> + <widget class="GtkEntry" id="filepopup_settings_cover_name_include"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="activates_default">True</property> @@ -2925,20 +2897,6 @@ <packing> <property name="left_attach">1</property> <property name="right_attach">2</property> - <property name="top_attach">1</property> - <property name="bottom_attach">2</property> - <property name="y_options"></property> - </packing> - </child> - <child> - <widget class="GtkLabel" id="label87"> - <property name="visible">True</property> - <property name="xalign">0</property> - <property name="xpad">12</property> - <property name="label" translatable="yes">Include:</property> - </widget> - <packing> - <property name="x_options"></property> <property name="y_options"></property> </packing> </child> @@ -2957,7 +2915,19 @@ </packing> </child> <child> - <widget class="GtkEntry" id="filepopup_settings_cover_name_include"> + <widget class="GtkLabel" id="label87"> + <property name="visible">True</property> + <property name="xalign">0</property> + <property name="xpad">12</property> + <property name="label" translatable="yes">Include:</property> + </widget> + <packing> + <property name="x_options"></property> + <property name="y_options"></property> + </packing> + </child> + <child> + <widget class="GtkEntry" id="filepopup_settings_cover_name_exclude"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="activates_default">True</property> @@ -2965,6 +2935,8 @@ <packing> <property name="left_attach">1</property> <property name="right_attach">2</property> + <property name="top_attach">1</property> + <property name="bottom_attach">2</property> <property name="y_options"></property> </packing> </child> @@ -3186,17 +3158,59 @@ <property name="column_spacing">12</property> <property name="row_spacing">6</property> <child> - <widget class="GtkHScale" id="red_scale"> + <widget class="GtkLabel" id="label94"> + <property name="visible">True</property> + <property name="xalign">1</property> + <property name="label" translatable="yes">Blue</property> + <property name="justify">GTK_JUSTIFY_RIGHT</property> + </widget> + <packing> + <property name="top_attach">2</property> + <property name="bottom_attach">3</property> + <property name="x_options">GTK_FILL</property> + <property name="y_options"></property> + </packing> + </child> + <child> + <widget class="GtkLabel" id="label93"> + <property name="visible">True</property> + <property name="xalign">1</property> + <property name="label" translatable="yes">Green</property> + <property name="justify">GTK_JUSTIFY_RIGHT</property> + </widget> + <packing> + <property name="top_attach">1</property> + <property name="bottom_attach">2</property> + <property name="x_options">GTK_FILL</property> + <property name="y_options"></property> + </packing> + </child> + <child> + <widget class="GtkLabel" id="label92"> + <property name="visible">True</property> + <property name="xalign">1</property> + <property name="label" translatable="yes">Red</property> + <property name="justify">GTK_JUSTIFY_RIGHT</property> + </widget> + <packing> + <property name="x_options">GTK_FILL</property> + <property name="y_options"></property> + </packing> + </child> + <child> + <widget class="GtkHScale" id="blue_scale"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="adjustment">0 0 255 0 0 0</property> - <property name="digits">3</property> <property name="draw_value">False</property> - <signal name="value_changed" handler="on_red_scale_value_changed"/> + <signal name="value_changed" handler="on_blue_scale_value_changed"/> </widget> <packing> <property name="left_attach">1</property> <property name="right_attach">2</property> + <property name="top_attach">2</property> + <property name="bottom_attach">3</property> + <property name="x_options">GTK_FILL</property> </packing> </child> <child> @@ -3216,59 +3230,17 @@ </packing> </child> <child> - <widget class="GtkHScale" id="blue_scale"> + <widget class="GtkHScale" id="red_scale"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="adjustment">0 0 255 0 0 0</property> + <property name="digits">3</property> <property name="draw_value">False</property> - <signal name="value_changed" handler="on_blue_scale_value_changed"/> + <signal name="value_changed" handler="on_red_scale_value_changed"/> </widget> <packing> <property name="left_attach">1</property> <property name="right_attach">2</property> - <property name="top_attach">2</property> - <property name="bottom_attach">3</property> - <property name="x_options">GTK_FILL</property> - </packing> - </child> - <child> - <widget class="GtkLabel" id="label92"> - <property name="visible">True</property> - <property name="xalign">1</property> - <property name="label" translatable="yes">Red</property> - <property name="justify">GTK_JUSTIFY_RIGHT</property> - </widget> - <packing> - <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> - </packing> - </child> - <child> - <widget class="GtkLabel" id="label93"> - <property name="visible">True</property> - <property name="xalign">1</property> - <property name="label" translatable="yes">Green</property> - <property name="justify">GTK_JUSTIFY_RIGHT</property> - </widget> - <packing> - <property name="top_attach">1</property> - <property name="bottom_attach">2</property> - <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> - </packing> - </child> - <child> - <widget class="GtkLabel" id="label94"> - <property name="visible">True</property> - <property name="xalign">1</property> - <property name="label" translatable="yes">Blue</property> - <property name="justify">GTK_JUSTIFY_RIGHT</property> - </widget> - <packing> - <property name="top_attach">2</property> - <property name="bottom_attach">3</property> - <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> </packing> </child> </widget>