From: <Si...@us...> - 2008-01-06 08:34:23
|
Revision: 1922 http://gtkpod.svn.sourceforge.net/gtkpod/?rev=1922&view=rev Author: Sikon Date: 2008-01-06 00:33:46 -0800 (Sun, 06 Jan 2008) Log Message: ----------- Instant-apply new preferences, dropdown 'New Playlist' button Modified Paths: -------------- gtkpod/trunk/ChangeLog gtkpod/trunk/data/gtkpod.glade gtkpod/trunk/src/display.h gtkpod/trunk/src/display_sorttabs.c gtkpod/trunk/src/display_tracks.c gtkpod/trunk/src/prefsdlg.c Modified: gtkpod/trunk/ChangeLog =================================================================== --- gtkpod/trunk/ChangeLog 2008-01-06 02:03:08 UTC (rev 1921) +++ gtkpod/trunk/ChangeLog 2008-01-06 08:33:46 UTC (rev 1922) @@ -1,3 +1,17 @@ +2008-01-06 Matvey Kozhev <sikon at users.sourceforge.net> + + * data/gtkpod.glade: + * src/display_tracks.c: + * src/display_sorttabs.c: + * src/prefsdlg.c: + + Made the "Filter tab position" and "Horizontal scrollbar" preferences + instant-apply. + + * data/gtkpod.glade: + + The "New Playlist" button is now dropdown. + 2008-01-06 P.G. Richardson <phantom_sf at users.sourceforge.net> * data/gtkpod.glade Modified: gtkpod/trunk/data/gtkpod.glade =================================================================== --- gtkpod/trunk/data/gtkpod.glade 2008-01-06 02:03:08 UTC (rev 1921) +++ gtkpod/trunk/data/gtkpod.glade 2008-01-06 08:33:46 UTC (rev 1922) @@ -17,7 +17,7 @@ <child> <widget class="GtkMenuItem" id="menuitem10"> <property name="visible">True</property> - <property name="label" translatable="yes">_File</property> + <property name="label" translatable="yes">_Music</property> <property name="use_underline">True</property> <child> <widget class="GtkMenu" id="menuitem10_menu"> @@ -530,11 +530,18 @@ <child> <widget class="GtkMenu" id="create_playlists_menu_menu"> <child> - <widget class="GtkMenuItem" id="new_playlist1"> + <widget class="GtkImageMenuItem" id="new_playlist1"> <property name="visible">True</property> <property name="label" translatable="yes">Empty Playlist</property> <property name="use_underline">True</property> - <signal name="activate" handler="on_new_playlist1_activate"/> + <child internal-child="image"> + <widget class="GtkImage" id="menu-item-image34"> + <property name="visible">True</property> + <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> + <property name="icon_name">playlist</property> + <property name="icon_size">1</property> + </widget> + </child> </widget> </child> <child> @@ -575,99 +582,109 @@ </widget> </child> <child> - <widget class="GtkMenuItem" id="pl_for_each_artist"> + <widget class="GtkSeparatorMenuItem" id="menuitem2"> + <property name="visible">True</property> + </widget> + </child> + <child> + <widget class="GtkMenuItem" id="most_rated_tracks"> <property name="visible">True</property> - <property name="label" translatable="yes">One for each Artist</property> + <property name="label" translatable="yes">Best Rated Tracks</property> <property name="use_underline">True</property> - <signal name="activate" handler="on_pl_for_each_artist_activate"/> + <signal name="activate" handler="on_most_rated_tracks_playlist_s1_activate"/> </widget> </child> <child> - <widget class="GtkMenuItem" id="pl_for_each_album"> + <widget class="GtkMenuItem" id="most_listened_tracks"> <property name="visible">True</property> - <property name="label" translatable="yes">One for each Album</property> + <property name="label" translatable="yes">Tracks Most Often Listened To</property> <property name="use_underline">True</property> - <signal name="activate" handler="on_pl_for_each_album_activate"/> + <signal name="activate" handler="on_most_listened_tracks1_activate"/> </widget> </child> <child> - <widget class="GtkMenuItem" id="pl_for_each_genre"> + <widget class="GtkMenuItem" id="most_recent_played_tracks"> <property name="visible">True</property> - <property name="label" translatable="yes">One for each Genre</property> + <property name="label" translatable="yes">Most Recently Played Tracks</property> <property name="use_underline">True</property> - <signal name="activate" handler="on_pl_for_each_genre_activate"/> + <signal name="activate" handler="on_most_recent_played_tracks_activate"/> </widget> </child> <child> - <widget class="GtkMenuItem" id="pl_for_each_composer"> + <widget class="GtkMenuItem" id="played_since_last_time1"> <property name="visible">True</property> - <property name="label" translatable="yes">One for each Composer</property> + <property name="label" translatable="yes">All Tracks Played Since Last Time</property> <property name="use_underline">True</property> - <signal name="activate" handler="on_pl_for_each_composer_activate"/> + <signal name="activate" handler="on_played_since_last_time1_activate"/> </widget> </child> <child> - <widget class="GtkMenuItem" id="pl_for_each_year"> + <widget class="GtkMenuItem" id="all_tracks_never_listened_to1"> <property name="visible">True</property> - <property name="label" translatable="yes">One for each Year</property> + <property name="label" translatable="yes">All Tracks Never Listened To</property> <property name="use_underline">True</property> - <signal name="activate" handler="on_pl_for_each_year_activate"/> + <signal name="activate" handler="on_all_tracks_never_listened_to1_activate"/> </widget> </child> <child> - <widget class="GtkMenuItem" id="pl_for_each_rating"> + <widget class="GtkMenuItem" id="all_tracks_not_listed_in_any_playlist1"> <property name="visible">True</property> - <property name="label" translatable="yes">One for each Rating</property> + <property name="label" translatable="yes">All Tracks not Listed in any Playlist</property> <property name="use_underline">True</property> - <signal name="activate" handler="on_pl_for_each_rating_activate"/> + <signal name="activate" handler="on_all_tracks_not_listed_in_any_playlist1_activate"/> </widget> </child> <child> - <widget class="GtkMenuItem" id="most_rated_tracks"> + <widget class="GtkSeparatorMenuItem" id="menuitem3"> + <property name="visible">True</property> + </widget> + </child> + <child> + <widget class="GtkMenuItem" id="pl_for_each_artist"> <property name="visible">True</property> - <property name="label" translatable="yes">Best Rated Tracks</property> + <property name="label" translatable="yes">One for each Artist</property> <property name="use_underline">True</property> - <signal name="activate" handler="on_most_rated_tracks_playlist_s1_activate"/> + <signal name="activate" handler="on_pl_for_each_artist_activate"/> </widget> </child> <child> - <widget class="GtkMenuItem" id="most_listened_tracks"> + <widget class="GtkMenuItem" id="pl_for_each_album"> <property name="visible">True</property> - <property name="label" translatable="yes">Tracks Most Often Listened To</property> + <property name="label" translatable="yes">One for each Album</property> <property name="use_underline">True</property> - <signal name="activate" handler="on_most_listened_tracks1_activate"/> + <signal name="activate" handler="on_pl_for_each_album_activate"/> </widget> </child> <child> - <widget class="GtkMenuItem" id="most_recent_played_tracks"> + <widget class="GtkMenuItem" id="pl_for_each_genre"> <property name="visible">True</property> - <property name="label" translatable="yes">Most Recently Played Tracks</property> + <property name="label" translatable="yes">One for each Genre</property> <property name="use_underline">True</property> - <signal name="activate" handler="on_most_recent_played_tracks_activate"/> + <signal name="activate" handler="on_pl_for_each_genre_activate"/> </widget> </child> <child> - <widget class="GtkMenuItem" id="played_since_last_time1"> + <widget class="GtkMenuItem" id="pl_for_each_composer"> <property name="visible">True</property> - <property name="label" translatable="yes">All Tracks Played Since Last Time</property> + <property name="label" translatable="yes">One for each Composer</property> <property name="use_underline">True</property> - <signal name="activate" handler="on_played_since_last_time1_activate"/> + <signal name="activate" handler="on_pl_for_each_composer_activate"/> </widget> </child> <child> - <widget class="GtkMenuItem" id="all_tracks_never_listened_to1"> + <widget class="GtkMenuItem" id="pl_for_each_year"> <property name="visible">True</property> - <property name="label" translatable="yes">All Tracks Never Listened To</property> + <property name="label" translatable="yes">One for each Year</property> <property name="use_underline">True</property> - <signal name="activate" handler="on_all_tracks_never_listened_to1_activate"/> + <signal name="activate" handler="on_pl_for_each_year_activate"/> </widget> </child> <child> - <widget class="GtkMenuItem" id="all_tracks_not_listed_in_any_playlist1"> + <widget class="GtkMenuItem" id="pl_for_each_rating"> <property name="visible">True</property> - <property name="label" translatable="yes">All Tracks not Listed in any Playlist</property> + <property name="label" translatable="yes">One for each Rating</property> <property name="use_underline">True</property> - <signal name="activate" handler="on_all_tracks_not_listed_in_any_playlist1_activate"/> + <signal name="activate" handler="on_pl_for_each_rating_activate"/> </widget> </child> </widget> @@ -1206,17 +1223,19 @@ </packing> </child> <child> - <widget class="GtkToolButton" id="new_PL_button"> + <widget class="GtkMenuToolButton" id="new_PL_button"> <property name="visible">True</property> <property name="tooltip" translatable="yes">Create New Playlist</property> <property name="is_important">True</property> <property name="label" translatable="yes">New Playlist</property> <property name="use_underline">True</property> <property name="stock_id">gtk-new</property> + <property name="menu">create_playlists_menu_menu</property> <signal name="clicked" handler="on_new_playlist_button"/> </widget> <packing> <property name="expand">False</property> + <property name="homogeneous">False</property> </packing> </child> </widget> @@ -1611,6 +1630,7 @@ <property name="expand">False</property> <property name="fill">False</property> <property name="pack_type">GTK_PACK_END</property> + <property name="position">1</property> </packing> </child> </widget> @@ -1691,13 +1711,14 @@ <property name="column_spacing">12</property> <property name="row_spacing">6</property> <child> - <widget class="GtkHBox" id="hbox181"> + <widget class="GtkHBox" id="hbox14"> <property name="visible">True</property> + <property name="spacing">6</property> <child> - <widget class="GtkCheckButton" id="sp_added_button"> + <widget class="GtkCheckButton" id="sp_rating0"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="label" translatable="yes">Added</property> + <property name="label" translatable="yes">0</property> <property name="use_underline">True</property> <property name="response_id">0</property> <property name="draw_indicator">True</property> @@ -1707,22 +1728,11 @@ <property name="fill">False</property> </packing> </child> - </widget> - <packing> - <property name="top_attach">4</property> - <property name="bottom_attach">5</property> - <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> - </packing> - </child> - <child> - <widget class="GtkHBox" id="hbox180"> - <property name="visible">True</property> <child> - <widget class="GtkCheckButton" id="sp_modified_button"> + <widget class="GtkCheckButton" id="sp_rating1"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="label" translatable="yes">Modified</property> + <property name="label" translatable="yes">1</property> <property name="use_underline">True</property> <property name="response_id">0</property> <property name="draw_indicator">True</property> @@ -1730,24 +1740,14 @@ <packing> <property name="expand">False</property> <property name="fill">False</property> + <property name="position">1</property> </packing> </child> - </widget> - <packing> - <property name="top_attach">3</property> - <property name="bottom_attach">4</property> - <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> - </packing> - </child> - <child> - <widget class="GtkHBox" id="hbox179"> - <property name="visible">True</property> <child> - <widget class="GtkCheckButton" id="sp_played_button"> + <widget class="GtkCheckButton" id="sp_rating2"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="label" translatable="yes">Played</property> + <property name="label" translatable="yes">2</property> <property name="use_underline">True</property> <property name="response_id">0</property> <property name="draw_indicator">True</property> @@ -1755,25 +1755,14 @@ <packing> <property name="expand">False</property> <property name="fill">False</property> + <property name="position">2</property> </packing> </child> - </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="GtkHBox" id="hbox178"> - <property name="visible">True</property> <child> - <widget class="GtkCheckButton" id="sp_playcount_button"> + <widget class="GtkCheckButton" id="sp_rating3"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="tooltip" translatable="yes">Specify interval</property> - <property name="label" translatable="yes">Playcount</property> + <property name="label" translatable="yes">3</property> <property name="use_underline">True</property> <property name="response_id">0</property> <property name="draw_indicator">True</property> @@ -1781,24 +1770,14 @@ <packing> <property name="expand">False</property> <property name="fill">False</property> + <property name="position">3</property> </packing> </child> - </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="GtkHBox" id="hbox177"> - <property name="visible">True</property> <child> - <widget class="GtkCheckButton" id="sp_rating_button"> + <widget class="GtkCheckButton" id="sp_rating4"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="label" translatable="yes">Rating</property> + <property name="label" translatable="yes">4</property> <property name="use_underline">True</property> <property name="response_id">0</property> <property name="draw_indicator">True</property> @@ -1806,20 +1785,96 @@ <packing> <property name="expand">False</property> <property name="fill">False</property> + <property name="position">4</property> </packing> </child> + <child> + <widget class="GtkCheckButton" id="sp_rating5"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="label" translatable="yes">5</property> + <property name="use_underline">True</property> + <property name="response_id">0</property> + <property name="draw_indicator">True</property> + </widget> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">5</property> + </packing> + </child> </widget> <packing> + <property name="left_attach">1</property> + <property name="right_attach">2</property> <property name="x_options">GTK_FILL</property> <property name="y_options"></property> </packing> </child> <child> - <widget class="GtkHBox" id="hbox57"> + <widget class="GtkHBox" id="hbox15"> <property name="visible">True</property> + <child> + <widget class="GtkHBox" id="hbox23"> + <property name="visible">True</property> + <child> + <widget class="GtkSpinButton" id="sp_playcount_low"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="tooltip" translatable="yes">Select '0' for no lower limit.</property> + <property name="adjustment">0 0 99 1 10 10</property> + <property name="climb_rate">1</property> + </widget> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + </packing> + </child> + <child> + <widget class="GtkLabel" id="label54"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="label" translatable="yes"> <= cts <= </property> + <property name="selectable">True</property> + </widget> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">1</property> + </packing> + </child> + <child> + <widget class="GtkSpinButton" id="sp_playcount_high"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="tooltip" translatable="yes">Select '-1' for no upper limit.</property> + <property name="adjustment">0 -1 99 1 10 10</property> + <property name="climb_rate">1</property> + </widget> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">2</property> + </packing> + </child> + </widget> + </child> + </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"></property> + </packing> + </child> + <child> + <widget class="GtkHBox" id="hbox17"> + <property name="visible">True</property> <property name="spacing">6</property> <child> - <widget class="GtkEntry" id="sp_added_entry"> + <widget class="GtkEntry" id="sp_played_entry"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="tooltip" translatable="yes">'DD/MM/YYYY HH:MM < d < DD/MM/YYYY HH:MM' or similar. Press 'enter' when finished.</property> @@ -1827,7 +1882,7 @@ </widget> </child> <child> - <widget class="GtkButton" id="sp_added_cal_button"> + <widget class="GtkButton" id="sp_played_cal_button"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="label" translatable="yes">Calendar</property> @@ -1844,8 +1899,8 @@ <packing> <property name="left_attach">1</property> <property name="right_attach">2</property> - <property name="top_attach">4</property> - <property name="bottom_attach">5</property> + <property name="top_attach">2</property> + <property name="bottom_attach">3</property> <property name="y_options"></property> </packing> </child> @@ -1885,11 +1940,11 @@ </packing> </child> <child> - <widget class="GtkHBox" id="hbox17"> + <widget class="GtkHBox" id="hbox57"> <property name="visible">True</property> <property name="spacing">6</property> <child> - <widget class="GtkEntry" id="sp_played_entry"> + <widget class="GtkEntry" id="sp_added_entry"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="tooltip" translatable="yes">'DD/MM/YYYY HH:MM < d < DD/MM/YYYY HH:MM' or similar. Press 'enter' when finished.</property> @@ -1897,7 +1952,7 @@ </widget> </child> <child> - <widget class="GtkButton" id="sp_played_cal_button"> + <widget class="GtkButton" id="sp_added_cal_button"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="label" translatable="yes">Calendar</property> @@ -1914,78 +1969,43 @@ <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="top_attach">4</property> + <property name="bottom_attach">5</property> <property name="y_options"></property> </packing> </child> <child> - <widget class="GtkHBox" id="hbox15"> + <widget class="GtkHBox" id="hbox177"> <property name="visible">True</property> <child> - <widget class="GtkHBox" id="hbox23"> + <widget class="GtkCheckButton" id="sp_rating_button"> <property name="visible">True</property> - <child> - <widget class="GtkSpinButton" id="sp_playcount_low"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="tooltip" translatable="yes">Select '0' for no lower limit.</property> - <property name="adjustment">0 0 99 1 10 10</property> - <property name="climb_rate">1</property> - </widget> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - </packing> - </child> - <child> - <widget class="GtkLabel" id="label54"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="label" translatable="yes"> <= cts <= </property> - <property name="selectable">True</property> - </widget> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">1</property> - </packing> - </child> - <child> - <widget class="GtkSpinButton" id="sp_playcount_high"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="tooltip" translatable="yes">Select '-1' for no upper limit.</property> - <property name="adjustment">0 -1 99 1 10 10</property> - <property name="climb_rate">1</property> - </widget> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">2</property> - </packing> - </child> + <property name="can_focus">True</property> + <property name="label" translatable="yes">Rating:</property> + <property name="use_underline">True</property> + <property name="response_id">0</property> + <property name="draw_indicator">True</property> </widget> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + </packing> </child> </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"></property> </packing> </child> <child> - <widget class="GtkHBox" id="hbox14"> + <widget class="GtkHBox" id="hbox178"> <property name="visible">True</property> - <property name="spacing">6</property> <child> - <widget class="GtkCheckButton" id="sp_rating0"> + <widget class="GtkCheckButton" id="sp_playcount_button"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="label" translatable="yes">0</property> + <property name="tooltip" translatable="yes">Specify interval</property> + <property name="label" translatable="yes">Playcount:</property> <property name="use_underline">True</property> <property name="response_id">0</property> <property name="draw_indicator">True</property> @@ -1995,11 +2015,22 @@ <property name="fill">False</property> </packing> </child> + </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="GtkHBox" id="hbox179"> + <property name="visible">True</property> <child> - <widget class="GtkCheckButton" id="sp_rating1"> + <widget class="GtkCheckButton" id="sp_played_button"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="label" translatable="yes">1</property> + <property name="label" translatable="yes">Played:</property> <property name="use_underline">True</property> <property name="response_id">0</property> <property name="draw_indicator">True</property> @@ -2007,14 +2038,24 @@ <packing> <property name="expand">False</property> <property name="fill">False</property> - <property name="position">1</property> </packing> </child> + </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="GtkHBox" id="hbox180"> + <property name="visible">True</property> <child> - <widget class="GtkCheckButton" id="sp_rating2"> + <widget class="GtkCheckButton" id="sp_modified_button"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="label" translatable="yes">2</property> + <property name="label" translatable="yes">Modified:</property> <property name="use_underline">True</property> <property name="response_id">0</property> <property name="draw_indicator">True</property> @@ -2022,14 +2063,24 @@ <packing> <property name="expand">False</property> <property name="fill">False</property> - <property name="position">2</property> </packing> </child> + </widget> + <packing> + <property name="top_attach">3</property> + <property name="bottom_attach">4</property> + <property name="x_options">GTK_FILL</property> + <property name="y_options"></property> + </packing> + </child> + <child> + <widget class="GtkHBox" id="hbox181"> + <property name="visible">True</property> <child> - <widget class="GtkCheckButton" id="sp_rating3"> + <widget class="GtkCheckButton" id="sp_added_button"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="label" translatable="yes">3</property> + <property name="label" translatable="yes">Added:</property> <property name="use_underline">True</property> <property name="response_id">0</property> <property name="draw_indicator">True</property> @@ -2037,43 +2088,12 @@ <packing> <property name="expand">False</property> <property name="fill">False</property> - <property name="position">3</property> </packing> </child> - <child> - <widget class="GtkCheckButton" id="sp_rating4"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="label" translatable="yes">4</property> - <property name="use_underline">True</property> - <property name="response_id">0</property> - <property name="draw_indicator">True</property> - </widget> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">4</property> - </packing> - </child> - <child> - <widget class="GtkCheckButton" id="sp_rating5"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="label" translatable="yes">5</property> - <property name="use_underline">True</property> - <property name="response_id">0</property> - <property name="draw_indicator">True</property> - </widget> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">5</property> - </packing> - </child> </widget> <packing> - <property name="left_attach">1</property> - <property name="right_attach">2</property> + <property name="top_attach">4</property> + <property name="bottom_attach">5</property> <property name="x_options">GTK_FILL</property> <property name="y_options"></property> </packing> @@ -2650,13 +2670,39 @@ <property name="n_rows">9</property> <property name="n_columns">11</property> <child> - <widget class="GtkHBox" id="hbox69"> + <widget class="GtkLabel" id="label431"> + <property name="can_focus">True</property> + <property name="label" translatable="yes">n/a</property> + <property name="justify">GTK_JUSTIFY_CENTER</property> + <property name="selectable">True</property> + </widget> + <packing> + <property name="left_attach">9</property> + <property name="right_attach">10</property> + <property name="top_attach">3</property> + <property name="bottom_attach">4</property> + <property name="x_options"></property> + <property name="y_options"></property> + </packing> + </child> + <child> + <widget class="GtkHBox" id="hbox45"> <property name="visible">True</property> + <property name="homogeneous">True</property> <child> - <widget class="GtkLabel" id="label89"> + <widget class="GtkRadioButton" id="tm_none"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="label" translatable="yes">Tracks</property> + <property name="response_id">0</property> + <property name="draw_indicator">True</property> + <property name="group">st_ascend</property> + <signal name="toggled" handler="on_tm_none_toggled"/> + <child> + <widget class="GtkImage" id="image2015"> + <property name="visible">True</property> + <property name="stock">gtk-undo</property> + </widget> + </child> </widget> <packing> <property name="expand">False</property> @@ -2665,8 +2711,8 @@ </child> </widget> <packing> - <property name="left_attach">1</property> - <property name="right_attach">2</property> + <property name="left_attach">7</property> + <property name="right_attach">8</property> <property name="top_attach">7</property> <property name="bottom_attach">8</property> <property name="x_options"></property> @@ -2674,13 +2720,23 @@ </packing> </child> <child> - <widget class="GtkHBox" id="hbox68"> + <widget class="GtkHBox" id="hbox44"> <property name="visible">True</property> + <property name="homogeneous">True</property> <child> - <widget class="GtkLabel" id="label88"> + <widget class="GtkRadioButton" id="tm_descend"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="label" translatable="yes">Filter tabs</property> + <property name="response_id">0</property> + <property name="draw_indicator">True</property> + <property name="group">st_ascend</property> + <signal name="toggled" handler="on_tm_descend_toggled"/> + <child> + <widget class="GtkImage" id="image2014"> + <property name="visible">True</property> + <property name="stock">gtk-sort-descending</property> + </widget> + </child> </widget> <packing> <property name="expand">False</property> @@ -2689,50 +2745,40 @@ </child> </widget> <packing> - <property name="left_attach">1</property> - <property name="right_attach">2</property> - <property name="top_attach">5</property> - <property name="bottom_attach">6</property> + <property name="left_attach">5</property> + <property name="right_attach">6</property> + <property name="top_attach">7</property> + <property name="bottom_attach">8</property> <property name="x_options"></property> <property name="y_options"></property> </packing> </child> <child> - <widget class="GtkHBox" id="hbox67"> + <widget class="GtkVSeparator" id="vseparator7"> <property name="visible">True</property> - <child> - <widget class="GtkLabel" id="label87"> - <property name="can_focus">True</property> - <property name="label" translatable="yes">Playlists</property> - </widget> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - </packing> - </child> </widget> <packing> - <property name="left_attach">1</property> - <property name="right_attach">2</property> - <property name="top_attach">3</property> - <property name="bottom_attach">4</property> + <property name="left_attach">4</property> + <property name="right_attach">5</property> + <property name="top_attach">1</property> + <property name="bottom_attach">8</property> <property name="x_options"></property> <property name="y_options"></property> </packing> </child> <child> - <widget class="GtkHBox" id="hbox34"> + <widget class="GtkHBox" id="hbox43"> <property name="visible">True</property> <property name="homogeneous">True</property> <child> - <widget class="GtkRadioButton" id="st_ascend"> + <widget class="GtkRadioButton" id="tm_ascend"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="response_id">0</property> <property name="draw_indicator">True</property> - <signal name="toggled" handler="on_st_ascend_toggled"/> + <signal name="toggled" handler="on_tm_ascend_toggled"/> <child> - <widget class="GtkImage" id="image1931"> + <widget class="GtkImage" id="image2013"> <property name="visible">True</property> <property name="stock">gtk-sort-ascending</property> </widget> @@ -2747,29 +2793,41 @@ <packing> <property name="left_attach">3</property> <property name="right_attach">4</property> + <property name="top_attach">7</property> + <property name="bottom_attach">8</property> + <property name="x_options"></property> + <property name="y_options"></property> + </packing> + </child> + <child> + <widget class="GtkLabel" id="label96"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="label" translatable="yes">n/a</property> + <property name="justify">GTK_JUSTIFY_CENTER</property> + </widget> + <packing> + <property name="left_attach">9</property> + <property name="right_attach">10</property> <property name="top_attach">5</property> <property name="bottom_attach">6</property> - <property name="x_options"></property> <property name="y_options"></property> </packing> </child> <child> - <widget class="GtkHBox" id="hbox35"> + <widget class="GtkHBox" id="hbox41"> <property name="visible">True</property> <property name="homogeneous">True</property> <child> - <widget class="GtkRadioButton" id="st_descend"> + <widget class="GtkCheckButton" id="tm_autostore"> <property name="visible">True</property> <property name="can_focus">True</property> + <property name="tooltip" translatable="yes">Please refer to the notice below.</property> <property name="response_id">0</property> <property name="draw_indicator">True</property> - <property name="group">st_ascend</property> - <signal name="toggled" handler="on_st_descend_toggled"/> + <signal name="toggled" handler="on_tm_autostore_toggled"/> <child> - <widget class="GtkImage" id="image1932"> - <property name="visible">True</property> - <property name="stock">gtk-sort-descending</property> - </widget> + <placeholder/> </child> </widget> <packing> @@ -2779,206 +2837,139 @@ </child> </widget> <packing> - <property name="left_attach">5</property> - <property name="right_attach">6</property> - <property name="top_attach">5</property> - <property name="bottom_attach">6</property> + <property name="left_attach">9</property> + <property name="right_attach">10</property> + <property name="top_attach">7</property> + <property name="bottom_attach">8</property> <property name="x_options"></property> <property name="y_options"></property> </packing> </child> <child> - <widget class="GtkHBox" id="hbox36"> + <widget class="GtkTable" id="table19"> <property name="visible">True</property> - <property name="homogeneous">True</property> + <property name="border_width">3</property> + <property name="n_rows">1</property> + <property name="n_columns">1</property> <child> - <widget class="GtkRadioButton" id="st_none"> + <widget class="GtkLabel" id="label95"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="response_id">0</property> - <property name="draw_indicator">True</property> - <property name="group">st_ascend</property> - <signal name="toggled" handler="on_st_none_toggled"/> - <child> - <widget class="GtkImage" id="image1933"> - <property name="visible">True</property> - <property name="stock">gtk-undo</property> - </widget> - </child> + <property name="label" translatable="yes"><b>Auto Store</b></property> + <property name="use_markup">True</property> </widget> <packing> - <property name="expand">False</property> - <property name="fill">False</property> + <property name="y_options"></property> </packing> </child> </widget> <packing> - <property name="left_attach">7</property> - ... [truncated message content] |