From: <jc...@us...> - 2008-08-17 04:59:18
|
Revision: 2106 http://gtkpod.svn.sourceforge.net/gtkpod/?rev=2106&view=rev Author: jcsjcs Date: 2008-08-17 04:59:27 +0000 (Sun, 17 Aug 2008) Log Message: ----------- * src/prefsdlg.c data/gtkpod.glade: Fix usability problems in prefs dialog (Music->Commands). * src/file_convert.c data/gtkpod.glade: The widget name "conversion_log" was used twice, but for some reason this didn't cause problems until glade-3 re-wrote the file. Fixed by using different name for the menu item. Modified Paths: -------------- gtkpod/trunk/ChangeLog gtkpod/trunk/data/gtkpod.glade gtkpod/trunk/src/file_convert.c gtkpod/trunk/src/prefsdlg.c Modified: gtkpod/trunk/ChangeLog =================================================================== --- gtkpod/trunk/ChangeLog 2008-08-17 02:43:16 UTC (rev 2105) +++ gtkpod/trunk/ChangeLog 2008-08-17 04:59:27 UTC (rev 2106) @@ -31,6 +31,16 @@ variable for aacgain was defined as "aacgain_path" instead of "path_aacgain". + * src/prefsdlg.c + data/gtkpod.glade: + Fix usability problems in prefs dialog (Music->Commands). + + * src/file_convert.c + data/gtkpod.glade: + The widget name "conversion_log" was used twice, but for some + reason this didn't cause problems until glade-3 re-wrote the + file. Fixed by using different name for the menu item. + 2008-08-16 Paul Richardson <phantom_sf at users.sourceforge.net> * src/display.c: memory leak fix in display_image_dialog. Thanks to Modified: gtkpod/trunk/data/gtkpod.glade =================================================================== --- gtkpod/trunk/data/gtkpod.glade 2008-08-17 02:43:16 UTC (rev 2105) +++ gtkpod/trunk/data/gtkpod.glade 2008-08-17 04:59:27 UTC (rev 2106) @@ -539,8 +539,8 @@ <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_size">1</property> <property name="icon_name">playlist</property> - <property name="icon_size">1</property> </widget> </child> </widget> @@ -584,7 +584,7 @@ </child> <child> <widget class="GtkSeparatorMenuItem" id="menuitem2"> - <property name="visible">True</property> + <property name="visible">True</property> </widget> </child> <child> @@ -637,7 +637,7 @@ </child> <child> <widget class="GtkSeparatorMenuItem" id="menuitem3"> - <property name="visible">True</property> + <property name="visible">True</property> </widget> </child> <child> @@ -810,7 +810,7 @@ </widget> </child> <child> - <widget class="GtkCheckMenuItem" id="conversion_log"> + <widget class="GtkCheckMenuItem" id="view_conversion_log"> <property name="visible">True</property> <property name="label" translatable="yes">_Conversion Log</property> <property name="use_underline">True</property> @@ -1712,14 +1712,13 @@ <property name="column_spacing">12</property> <property name="row_spacing">6</property> <child> - <widget class="GtkHBox" id="hbox14"> + <widget class="GtkHBox" id="hbox181"> <property name="visible">True</property> - <property name="spacing">6</property> <child> - <widget class="GtkCheckButton" id="sp_rating0"> + <widget class="GtkCheckButton" id="sp_added_button"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="label" translatable="yes">0</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> @@ -1729,11 +1728,22 @@ <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_rating1"> + <widget class="GtkCheckButton" id="sp_modified_button"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="label" translatable="yes">1</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> @@ -1741,14 +1751,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">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_rating2"> + <widget class="GtkCheckButton" id="sp_played_button"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="label" translatable="yes">2</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> @@ -1756,14 +1776,25 @@ <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_rating3"> + <widget class="GtkCheckButton" id="sp_playcount_button"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="label" translatable="yes">3</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> @@ -1771,14 +1802,24 @@ <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_rating4"> + <widget class="GtkCheckButton" id="sp_rating_button"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="label" translatable="yes">4</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> @@ -1786,96 +1827,20 @@ <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="hbox15"> + <widget class="GtkHBox" id="hbox57"> <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_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> @@ -1883,7 +1848,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> @@ -1900,8 +1865,8 @@ <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> @@ -1941,11 +1906,11 @@ </packing> </child> <child> - <widget class="GtkHBox" id="hbox57"> + <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> @@ -1953,7 +1918,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> @@ -1970,43 +1935,78 @@ <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> <child> - <widget class="GtkHBox" id="hbox177"> + <widget class="GtkHBox" id="hbox15"> <property name="visible">True</property> <child> - <widget class="GtkCheckButton" id="sp_rating_button"> + <widget class="GtkHBox" id="hbox23"> <property name="visible">True</property> - <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> + <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> - <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="hbox178"> + <widget class="GtkHBox" id="hbox14"> <property name="visible">True</property> + <property name="spacing">6</property> <child> - <widget class="GtkCheckButton" id="sp_playcount_button"> + <widget class="GtkCheckButton" id="sp_rating0"> <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">0</property> <property name="use_underline">True</property> <property name="response_id">0</property> <property name="draw_indicator">True</property> @@ -2016,22 +2016,11 @@ <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_played_button"> + <widget class="GtkCheckButton" id="sp_rating1"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="label" translatable="yes">Played:</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> @@ -2039,24 +2028,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">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_modified_button"> + <widget class="GtkCheckButton" id="sp_rating2"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="label" translatable="yes">Modified:</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> @@ -2064,24 +2043,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">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_added_button"> + <widget class="GtkCheckButton" id="sp_rating3"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="label" translatable="yes">Added:</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> @@ -2089,12 +2058,43 @@ <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="top_attach">4</property> - <property name="bottom_attach">5</property> + <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> @@ -2671,39 +2671,13 @@ <property name="n_rows">9</property> <property name="n_columns">11</property> <child> - <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"> + <widget class="GtkHBox" id="hbox69"> <property name="visible">True</property> - <property name="homogeneous">True</property> <child> - <widget class="GtkRadioButton" id="tm_none"> + <widget class="GtkLabel" id="label89"> <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">tm_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> + <property name="label" translatable="yes">Tracks</property> </widget> <packing> <property name="expand">False</property> @@ -2712,8 +2686,8 @@ </child> </widget> <packing> - <property name="left_attach">7</property> - <property name="right_attach">8</property> + <property name="left_attach">1</property> + <property name="right_attach">2</property> <property name="top_attach">7</property> <property name="bottom_attach">8</property> <property name="x_options"></property> @@ -2721,23 +2695,13 @@ </packing> </child> <child> - <widget class="GtkHBox" id="hbox44"> + <widget class="GtkHBox" id="hbox68"> <property name="visible">True</property> - <property name="homogeneous">True</property> <child> - <widget class="GtkRadioButton" id="tm_descend"> + <widget class="GtkLabel" id="label88"> <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">tm_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> + <property name="label" translatable="yes">Filter tabs</property> </widget> <packing> <property name="expand">False</property> @@ -2746,40 +2710,50 @@ </child> </widget> <packing> - <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="left_attach">1</property> + <property name="right_attach">2</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="GtkVSeparator" id="vseparator7"> + <widget class="GtkHBox" id="hbox67"> <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">4</property> - <property name="right_attach">5</property> - <property name="top_attach">1</property> - <property name="bottom_attach">8</property> + <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="x_options"></property> <property name="y_options"></property> </packing> </child> <child> - <widget class="GtkHBox" id="hbox43"> + <widget class="GtkHBox" id="hbox34"> <property name="visible">True</property> <property name="homogeneous">True</property> <child> - <widget class="GtkRadioButton" id="tm_ascend"> + <widget class="GtkRadioButton" id="st_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_tm_ascend_toggled"/> + <signal name="toggled" handler="on_st_ascend_toggled"/> <child> - <widget class="GtkImage" id="image2013"> + <widget class="GtkImage" id="image1931"> <property name="visible">True</property> <property name="stock">gtk-sort-ascending</property> </widget> @@ -2794,41 +2768,29 @@ <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="hbox41"> + <widget class="GtkHBox" id="hbox35"> <property name="visible">True</property> <property name="homogeneous">True</property> <child> - <widget class="GtkCheckButton" id="tm_autostore"> + <widget class="GtkRadioButton" id="st_descend"> <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> - <signal name="toggled" handler="on_tm_autostore_toggled"/> + <property name="group">st_ascend</property> + <signal name="toggled" handler="on_st_descend_toggled"/> <child> - <placeholder/> + <widget class="GtkImage" id="image1932"> + <property name="visible">True</property> + <property name="stock">gtk-sort-descending</property> + </widget> </child> </widget> <packing> @@ -2838,139 +2800,206 @@ </child> </widget> <packing> - <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="left_attach">5</property> + <property name="right_attach">6</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="GtkTable" id="table19"> + <widget class="GtkHBox" id="hbox36"> <property name="visible">True</property> - <property name="border_width">3</property> - <property name="n_rows">1</property> - <property name="n_columns">1</property> + <property name="homogeneous">True</property> <child> - <widget class="GtkLabel" id="label95"> + <widget class="GtkRadioButton" id="st_none"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="label" translatable="yes"><b>Auto Store</b></property> - <property name="use_markup">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> </widget> <packing> - <property name="y_options"></property> + <property name="expand">False</property> + <property name="fill">False</property> </packing> </child> </widget> <packing> - <property name="left_attach">9</property> - <property name="right_attach">10</property> - <property name="top_attach">1</property> - <property name="bottom_attach">2</property> + <property name="left_attach">7</property> + <property name="right_attach">8</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="GtkVSeparator" id="vseparator9"> + <widget class="GtkHBox" id="hbox33"> <property name="visible">True</property> + <property name="homogeneous">True</property> + <child> + <widget class="GtkRadioButton" id="pm_none"> + <property name="can_focus">True</property> + <property name="response_id">0</property> + <property name="draw_indicator">True</property> + <property name="group">pm_ascend</property> + <signal name="toggled" handler="on_pm_none_toggled"/> + <child> + <widget class="GtkImage" id="image1930"> + <property name="visible">True</property> + <property name="stock">gtk-undo</property> + </widget> + </child> + </widget> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + </packing> + </child> </widget> <packing> - <property name="left_attach">10</property> - <property name="right_attach">11</property> - <property name="top_attach">1</property> - <property name="bottom_attach">8</property> - <property name="x_options"></property> + <property name="left_attach">7</property> + <property name="right_attach">8</property> + <property name="top_attach">3</property> + <property name="bottom_attach">4</property> <property name="y_options"></property> </packing> </child> <child> - <widget class="GtkHSeparator" id="hseparator11"> - <property name="visible">True</property> + <widget class="GtkHBox" id="hbox32"> + <property name="homogeneous">True</property> + <child> + <widget class="GtkRadioButton" id="pm_descend"> + <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">pm_ascend</property> + <signal name="toggled" handler="on_pm_descend_toggled"/> + <child> + <widget class="GtkImage" id="image1929"> + <property name="visible">True</property> + <property name="stock">gtk-sort-descending</property> + </widget> + </child> + </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">10</property> - <property name="top_attach">2</property> - <property name="bottom_attach">3</property> + <property name="left_attach">5</property> + <property name="right_attach">6</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="GtkHSeparator" id="hseparator12"> + <widget class="GtkHBox" id="hbox37"> + <property name="homogeneous">True</property> + <child> + <widget class="GtkRadioButton" id="pm_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_pm_ascend_toggled"/> + <child> + <widget class="GtkImage" id="image1928"> + <property name="visible">True</property> + <property name="stock">gtk-sort-ascending</property> + </widget> + </child> + </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">10</property> - <property name="top_attach">4</property> - <property name="bottom_attach">5</property> + <property name="left_attach">3</property> + <property name="right_attach">4</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="GtkHSeparator" id="hseparator13"> + <widget class="GtkVSeparator" id="vseparator2"> <property name="visible">True</property> </widget> <packing> - <property name="left_attach">1</property> - <property name="right_attach">10</property> - <property name="top_attach">6</property> - <property name="bottom_attach">7</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="GtkHSeparator" id="hseparator10"> + <widget class="GtkVSeparator" id="vseparator3"> <property name="visible">True</property> </widget> <packing> - <property name="right_attach">11</property> - <property name="top_attach">8</property> - <property name="bottom_attach">9</property> + <property name="left_attach">8</property> + <property name="right_attach">9</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="GtkHSeparator" id="hseparator9"> + <widget class="GtkVSeparator" id="vseparator6"> <property name="visible">True</property> </widget> <packing> - <property name="right_attach">11</property> + <property name="left_attach">2</property> + <property name="right_attach">3</property> + <property name="top_attach">1</property> + <property name="bottom_attach">8</property> <property name="x_options"></property> <property name="y_options"></property> </packing> ... [truncated message content] |