# HG changeset patch # User William Pitcock # Date 1190852890 18000 # Node ID fa9053478e0b0a73c6f325178a6f3a29851dd37d # Parent fae43071b6ff44e402cb0e0ab961c7dc40ca70ab glade cleanups, scrolled window stuff diff -r fae43071b6ff -r fa9053478e0b src/audacious/glade/prefswin.glade --- a/src/audacious/glade/prefswin.glade Wed Sep 26 19:16:58 2007 -0500 +++ b/src/audacious/glade/prefswin.glade Wed Sep 26 19:28:10 2007 -0500 @@ -39,7 +39,6 @@ False False True - True True @@ -594,38 +593,23 @@ 2 8 - + True - True - 0 - Select playlist font: - True - True - - + 12 + 6 + + + True + 1 + _Player: + True + True + mainwin_font_button + + - 1 - 2 - 1 - 2 - - - - - - True - True - 0 - Select main player window font: - True - True - - - - - 1 - 2 + @@ -654,23 +638,38 @@ - + True - 12 - 6 - - - True - 1 - _Player: - True - True - mainwin_font_button - - + True + 0 + Select main player window font: + True + True + + - + 1 + 2 + + + + + + True + True + 0 + Select playlist font: + True + True + + + + + 1 + 2 + 1 + 2 @@ -916,33 +915,39 @@ 3 6 - + True - True - 5 0 100 1 10 10 - 1 - True - - + 0 + 4 + Changes volume by - 1 - 2 - 4 - + True 0 4 - lines + percent 2 3 + + + + + + + True + 0 + 4 + Scrolls playlist by + + 1 2 @@ -969,13 +974,15 @@ - + True 0 4 - Scrolls playlist by + lines + 2 + 3 1 2 @@ -983,29 +990,21 @@ - + True - 0 - 4 - percent + True + 5 0 100 1 10 10 + 1 + True + + - 2 - 3 + 1 + 2 - - - - - True - 0 - 4 - Changes volume by - - - - + 4 @@ -1219,30 +1218,20 @@ 2 2 - + True 1 - Auto character encoding detector for: + Fallback character encodings: GTK_JUSTIFY_RIGHT + 1 + 2 - - True - - - - - 1 - 2 - - - - True True @@ -1259,15 +1248,25 @@ - + + True + + + + + 1 + 2 + + + + + True 1 - Fallback character encodings: + Auto character encoding detector for: GTK_JUSTIFY_RIGHT - 1 - 2 @@ -1362,22 +1361,25 @@ 12 4 - + True - Show information about titlestring format - GTK_RELIEF_HALF - False - 0 - - - True - gtk-index - - + 1 + Title format: + GTK_JUSTIFY_RIGHT - 2 - 3 + + + + + + + True + 1 + Custom string: + GTK_JUSTIFY_RIGHT + + 1 2 @@ -1385,6 +1387,21 @@ + + True + True + + + + + 1 + 2 + 1 + 2 + + + + True TITLE @@ -1402,42 +1419,24 @@ - + True - True - - + Show information about titlestring format + GTK_RELIEF_HALF + False + 0 + + + True + gtk-index + + - 1 - 2 + 2 + 3 1 2 - - - - - - True - 1 - Custom string: - GTK_JUSTIFY_RIGHT - - - 1 - 2 - - - - - - - True - 1 - Title format: - GTK_JUSTIFY_RIGHT - - @@ -1589,26 +1588,15 @@ 6 6 - + True - 0 - File preset extension: + True + + - 1 - 2 - - - - - - - True - 0 - Directory preset file: - - - + 1 + 2 @@ -1628,15 +1616,26 @@ - + True - True - - + 0 + Directory preset file: - 1 - 2 + + + + + + + True + 0 + File preset extension: + + + 1 + 2 + @@ -1814,17 +1813,27 @@ 6 6 - + True - True - - + 0 + 0 + Proxy hostname: - 1 - 2 + + + + + + + True + 0 + Proxy port: + + 1 2 + @@ -1842,27 +1851,17 @@ - + True - 0 - Proxy port: + True + + + 1 + 2 1 2 - - - - - - - True - 0 - 0 - Proxy hostname: - - - @@ -1905,18 +1904,27 @@ 6 6 - + True - True - False - - + 0 + 0 + Proxy username: - 1 - 2 + + + + + + + True + 0 + Proxy password: + + 1 2 + @@ -1934,27 +1942,18 @@ - + True - 0 - Proxy password: + True + False + + + 1 + 2 1 2 - - - - - - - True - 0 - 0 - Proxy username: - - - @@ -2042,672 +2041,681 @@ - + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + GTK_POLICY_NEVER - + True - 12 - + True - 0 - <b>Audio System</b> - True + 12 + + + True + 0 + <b>Audio System</b> + True + + + + False + False + - - - False - False - - - - - True - 6 - 12 - + True + 6 + 12 - + True - 3 - 2 - 6 - 6 - + True - 1 - 0 - gtk-info - - - 2 - 3 - GTK_FILL - - - - - True - 1 - Buffer size: + 3 + 2 + 6 + 6 + + + True + 1 + 0 + gtk-info + + + 2 + 3 + GTK_FILL + + + + + True + 1 + Buffer size: + + + 1 + 2 + + + + + + True + 0 + <span size="small">This is the amount of time to prebuffer audio streams by, in milliseconds. +Increase this value if you are experiencing audio skipping. +Please note however, that high values will result in Audacious performing poorly.</span> + True + True + + + 1 + 2 + 2 + 3 + + + + + + + True + True + 0 0 600000 100 1000 1000 + 1 + + + + + 1 + 2 + 1 + 2 + + + + + + True + + + + + 1 + 2 + + + + + + True + 0 + Current output plugin: + + + + + + - 1 - 2 - - - - - - True - 0 - <span size="small">This is the amount of time to prebuffer audio streams by, in milliseconds. -Increase this value if you are experiencing audio skipping. -Please note however, that high values will result in Audacious performing poorly.</span> - True - True - - - 1 - 2 - 2 - 3 - - - - - - - True - True - 0 0 600000 100 1000 1000 - 1 - - - - - 1 - 2 - 1 - 2 - - - - - - True - - - - - 1 - 2 - - - - - - True - 0 - Current output plugin: - - - - + False + False - - False - False - + + False + False + 1 + - - - False - False - 1 - - - - - True - 12 - + True - 8 - GTK_BUTTONBOX_START + 12 - + True - False - True - True - 0 + 8 + GTK_BUTTONBOX_START - + True - 0 - 0 + False + True + True + 0 - + True - 2 + 0 + 0 - + True - gtk-preferences - - - False - False - - - - - True - Output Plugin Preferences - True + 2 + + + True + gtk-preferences + + + False + False + + + + + True + Output Plugin Preferences + True + + + False + False + 1 + + - - False - False - 1 - - - - - - - - - - - True - False - True - True - 0 - - - True - 0 - 0 - - - True - 2 - - - True - gtk-about - - - False - False - - - - - True - Output Plugin Information - True - - - False - False - 1 - + + + True + False + True + True + 0 + + + True + 0 + 0 + + + True + 2 + + + True + gtk-about + + + False + False + + + + + True + Output Plugin Information + True + + + False + False + 1 + + + + + + + + + 1 + + - - 1 - + + + + False + False + 2 + + + + + True + 12 + 12 + + + True + 0 + <b>Format Detection</b> + True + + + + + False + False + 3 + + + + + True + 12 + + + True + True + When checked, Audacious will detect file formats on demand. This can result in a messier playlist, but delivers a major speed benefit. + Detect file formats on demand, instead of immediately. + True + 0 + True + + + + + + + False + False + 4 + + + + + True + 12 + + + True + True + When checked, Audacious will detect file formats based by extension. This is slightly slower than detection on demand, but still provides a minimal level of format detection. + Detect file formats by extension. + True + 0 + True + + + + + + + False + False + 5 + + + + + True + 12 + 12 + + + True + 0 + <b>Playback</b> + True + + + + + False + False + 6 + + + + + True + 12 + + + True + True + When Audacious starts, automatically begin playing from the point where we stopped before. + Continue playback on startup + True + 0 + True + + + - - - - False - False - 2 - - - - - True - 12 - 12 - - - True - 0 - <b>Format Detection</b> - True - - - - - False - False - 3 - - - - - True - 12 - - - True - True - When checked, Audacious will detect file formats on demand. This can result in a messier playlist, but delivers a major speed benefit. - Detect file formats on demand, instead of immediately. - True - 0 - True - - - - - - - False - False - 4 - - - - - True - 12 - - - True - True - When checked, Audacious will detect file formats based by extension. This is slightly slower than detection on demand, but still provides a minimal level of format detection. - Detect file formats by extension. - True - 0 - True - - - - - - - False - False - 5 - - - - - True - 12 - 12 - - - True - 0 - <b>Playback</b> - True - + + False + False + 7 + - - - False - False - 6 - - - - - True - 12 - + True - True - When Audacious starts, automatically begin playing from the point where we stopped before. - Continue playback on startup - True - 0 - True - - + 12 + + + True + True + When finished playing a song, don't automatically advance to the next. + Don't advance in the playlist + True + 0 + True + + + + - - - - False - False - 7 - - - - - True - 12 - - - True - True - When finished playing a song, don't automatically advance to the next. - Don't advance in the playlist - True - 0 - True - - - + + False + False + 8 + - - - False - False - 8 - - - - - True - 12 - + True - True - Pause between songs - True - 0 - True - - - - - False - False - 9 - - - - - True - 45 - - - True + 12 - - True - 4 - Pause for - - - False - False - - - - + True True - 2 0 100 1 10 10 - 1 - - + Pause between songs + True + 0 + True - - False - False - 1 - + + + False + False + 9 + + + + + True + 45 - + True - 4 - seconds + + + True + 4 + Pause for + + + False + False + + + + + True + True + 2 0 100 1 10 10 + 1 + + + + + False + False + 1 + + + + + True + 4 + seconds + + + False + False + 2 + + - - False - False - 2 - + + False + False + 10 + - - - False - False - 10 - - - - - True - 12 - 12 - + True - 0 - <b>Sampling Rate Converter</b> - True + 12 + 12 + + + True + 0 + <b>Sampling Rate Converter</b> + True + + + + False + False + 11 + - - - False - False - 11 - - - - - True - 12 - + True - True - Enable Sampling Rate Converter - True - 0 - True - True - - + 12 + + + True + True + Enable Sampling Rate Converter + True + 0 + True + True + + + + + + False + False + 12 + - - - False - False - 12 - - - - - True - 6 - 12 - + True + 6 + 12 - + True - 3 - 2 - 6 - 6 - + True - Best Sinc Interpolation + 3 + 2 + 6 + 6 + + + True + Best Sinc Interpolation Medium Sinc Interpolation Fastest Sinc Interpolation ZOH Interpolation Linear Interpolation - - - - - 1 - 2 - 1 - 2 - GTK_FILL - GTK_FILL - - - - - True - 0 - Interpolation Engine: - - - 1 - 2 - GTK_FILL - - - - - - True - 0 - <span size="small">All streams will be converted to this sampling rate. + + + + + 1 + 2 + 1 + 2 + GTK_FILL + GTK_FILL + + + + + True + 0 + Interpolation Engine: + + + 1 + 2 + GTK_FILL + + + + + + True + 0 + <span size="small">All streams will be converted to this sampling rate. This should be the max supported sampling rate of the sound card or output plugin.</span> - True - True + True + True + + + 1 + 2 + 2 + 3 + GTK_FILL + + + + + + True + 1 + 0 + gtk-info + + + 2 + 3 + GTK_FILL + + + + + True + True + 96000 1000 768000 1000 1000 1000 + 1 + + + + + 1 + 2 + + + + + + True + 0 + Sampling Rate [Hz]: + + + GTK_FILL + + + - 1 - 2 - 2 - 3 - GTK_FILL - - - - - - True - 1 - 0 - gtk-info - - - 2 - 3 - GTK_FILL - - - - - True - True - 96000 1000 768000 1000 1000 1000 - 1 - - - - - 1 - 2 - - - - - - True - 0 - Sampling Rate [Hz]: - - - GTK_FILL - + False + False - - False - False - + + + + False + False + 13 + + + + + True + 12 + 12 + + + True + 0 + <b>Volume Control</b> + True + + + False + False + 14 + - - - False - False - 13 - - - - - True - 12 - 12 - + True - 0 - <b>Volume Control</b> - True + 12 + + + True + True + Use software volume control. This may be useful for situations where your audio system does not support controlling the playback volume. + Use software volume control + True + 0 + True + + + + + + False + False + 15 + - - False - False - 14 - - - - - True - 12 - - - True - True - Use software volume control. This may be useful for situations where your audio system does not support controlling the playback volume. - Use software volume control - True - 0 - True - - - - - - - False - False - 15 - 7 + True @@ -2889,7 +2897,7 @@ 4 4 - + True True True @@ -2897,6 +2905,20 @@ 1 2 + 1 + 2 + + + + + + True + 0 + 12 + Include: + + + @@ -2915,19 +2937,7 @@ - - True - 0 - 12 - Include: - - - - - - - - + True True True @@ -2935,8 +2945,6 @@ 1 2 - 1 - 2 @@ -3158,15 +3166,59 @@ 12 6 - + + True + True + 0 0 255 0 0 0 + 3 + False + + + + 1 + 2 + + + + + True + True + 0 0 255 0 0 0 + False + + + + 1 + 2 + 1 + 2 + GTK_FILL + + + + + True + True + 0 0 255 0 0 0 + False + + + + 1 + 2 + 2 + 3 + GTK_FILL + + + + True 1 - Blue + Red GTK_JUSTIFY_RIGHT - 2 - 3 GTK_FILL @@ -3186,61 +3238,17 @@ - + True 1 - Red + Blue GTK_JUSTIFY_RIGHT - GTK_FILL - - - - - - True - True - 0 0 255 0 0 0 - False - - - - 1 - 2 2 3 GTK_FILL - - - - - True - True - 0 0 255 0 0 0 - False - - - - 1 - 2 - 1 - 2 - GTK_FILL - - - - - True - True - 0 0 255 0 0 0 - 3 - False - - - - 1 - 2 +