Re: [Straw] Re: Some Glade updates



On 1/28/06, Jan C. Alonzo <jmalonzo gmail com> wrote:
> Andrew Conkling <andrew conkling gmail com> writes:
> > 1. Is there a reason that feed_refresh_label is selectable?
>
> No particular reason. Feed free to change it.

OK, I changed this and a few other labels I noticed.

> > 2. Could I mess with the default keybindings?  For example, I think
> > Ctrl+R (or maybe F5) should be the default for View | Refresh All,
> > etc.
> Sure. Ctrl+R is already binded. F5? Also check if the GNOME-HIG says anything
> about keybindings and such.

OK, I went to town on the shortcuts in this patch.  I was perhaps a
bit bold, but you're the arbiter of patches. :)  I was thinking F5
because it works in every web browser I know, so it'd be a shortcut
users are used to.  But no other GNOME app I know of uses it.

Also, I changed a few things around.  I changed the ordering of the
menu items a bit to match other applications (namely Back/Forward in
Nautilus).  I also touched the Search pane a bit.  I thought the
"Advanced Search" was a bit unnecessary because it was clear what the
date options do and those were the only options there.  I also moved
the widgets around to make the pane a bit slimmer.  If you only find
one point of contention with this patch, my bets are on the search
pane. :)

> Next time make sure you are in the top-level directory (i.e. ~/cvs/straw) and
> do a 'cvs diff -u'.

OK, done.  I have ideas for more in the near future; would you like me
to put these in bugzilla rather than on the list?

Cheers,
Andrew

--
http://aconkling.blogspot.com
? 20060129-gladeupdate.diff
? build
? tools/__init__.pyc
? tools/msgfmt.pyc
? tools/straw_distutils.pyc
Index: glade/straw.glade
===================================================================
RCS file: /cvs/gnome/straw/glade/straw.glade,v
retrieving revision 1.16
diff -u -r1.16 straw.glade
--- glade/straw.glade	26 Jan 2006 08:14:29 -0000	1.16
+++ glade/straw.glade	30 Jan 2006 02:45:03 -0000
@@ -2526,13 +2526,12 @@
 					  <child>
 					    <widget class="GtkLabel" id="properties_previous_refresh_label">
 					      <property name="visible">True</property>
-					      <property name="can_focus">True</property>
 					      <property name="label" translatable="yes"></property>
 					      <property name="use_underline">False</property>
 					      <property name="use_markup">False</property>
 					      <property name="justify">GTK_JUSTIFY_LEFT</property>
 					      <property name="wrap">False</property>
-					      <property name="selectable">True</property>
+					      <property name="selectable">False</property>
 					      <property name="xalign">0</property>
 					      <property name="yalign">0.5</property>
 					      <property name="xpad">0</property>
@@ -2583,13 +2582,12 @@
 					  <child>
 					    <widget class="GtkLabel" id="properties_next_refresh_label">
 					      <property name="visible">True</property>
-					      <property name="can_focus">True</property>
 					      <property name="label" translatable="yes"></property>
 					      <property name="use_underline">False</property>
 					      <property name="use_markup">False</property>
 					      <property name="justify">GTK_JUSTIFY_LEFT</property>
 					      <property name="wrap">False</property>
-					      <property name="selectable">True</property>
+					      <property name="selectable">False</property>
 					      <property name="xalign">0</property>
 					      <property name="yalign">0.5</property>
 					      <property name="xpad">0</property>
@@ -3778,13 +3776,13 @@
 		  <child>
 		    <widget class="GtkImageMenuItem" id="menu_add">
 		      <property name="visible">True</property>
-		      <property name="label" translatable="yes">_Subscribe</property>
+		      <property name="label" translatable="yes">_Subscribe to New Feed</property>
 		      <property name="use_underline">True</property>
 		      <signal name="activate" handler="on_menu_add_activate" last_modification_time="Tue, 16 Dec 2003 09:30:38 GMT"/>
-		      <accelerator key="S" modifiers="GDK_CONTROL_MASK" signal="activate"/>
+		      <accelerator key="N" modifiers="GDK_CONTROL_MASK" signal="activate"/>
 
 		      <child internal-child="image">
-			<widget class="GtkImage" id="image1808">
+			<widget class="GtkImage" id="image1948">
 			  <property name="visible">True</property>
 			  <property name="stock">gtk-add</property>
 			  <property name="icon_size">1</property>
@@ -3809,7 +3807,6 @@
 		      <property name="label" translatable="yes">_Import Subscriptions</property>
 		      <property name="use_underline">True</property>
 		      <signal name="activate" handler="on_menu_import_subscriptions_activate" last_modification_time="Sat, 01 Mar 2003 11:27:29 GMT"/>
-		      <accelerator key="I" modifiers="GDK_CONTROL_MASK" signal="activate"/>
 		    </widget>
 		  </child>
 
@@ -3819,7 +3816,6 @@
 		      <property name="label" translatable="yes">_Export Subscriptions</property>
 		      <property name="use_underline">True</property>
 		      <signal name="activate" handler="on_menu_export_subscriptions_activate" last_modification_time="Tue, 16 Dec 2003 09:29:34 GMT"/>
-		      <accelerator key="E" modifiers="GDK_CONTROL_MASK" signal="activate"/>
 		    </widget>
 		  </child>
 
@@ -3864,22 +3860,34 @@
 		  </child>
 
 		  <child>
-		    <widget class="GtkMenuItem" id="menu_mark_feed_as_read">
+		    <widget class="GtkImageMenuItem" id="menu_mark_feed_as_read">
 		      <property name="visible">True</property>
 		      <property name="label" translatable="yes">Mark Feed as _Read</property>
 		      <property name="use_underline">True</property>
 		      <signal name="activate" handler="on_menu_mark_feed_as_read_activate" last_modification_time="Sun, 01 May 2005 02:15:51 GMT"/>
-		      <accelerator key="R" modifiers="GDK_CONTROL_MASK" signal="activate"/>
+		      <accelerator key="M" modifiers="GDK_CONTROL_MASK" signal="activate"/>
+
+		      <child internal-child="image">
+			<widget class="GtkImage" id="image1949">
+			  <property name="visible">True</property>
+			  <property name="stock">gtk-clear</property>
+			  <property name="icon_size">1</property>
+			  <property name="xalign">0.5</property>
+			  <property name="yalign">0.5</property>
+			  <property name="xpad">0</property>
+			  <property name="ypad">0</property>
+			</widget>
+		      </child>
 		    </widget>
 		  </child>
 
 		  <child>
 		    <widget class="GtkMenuItem" id="menu_mark_all_as_read">
 		      <property name="visible">True</property>
-		      <property name="label" translatable="yes">Mark _All Feeds As Read</property>
+		      <property name="label" translatable="yes">Mark _all Feeds As Read</property>
 		      <property name="use_underline">True</property>
 		      <signal name="activate" handler="on_menu_mark_all_as_read_activate" last_modification_time="Thu, 15 Jan 2004 06:53:51 GMT"/>
-		      <accelerator key="F" modifiers="GDK_CONTROL_MASK" signal="activate"/>
+		      <accelerator key="M" modifiers="GDK_CONTROL_MASK | GDK_SHIFT_MASK" signal="activate"/>
 		    </widget>
 		  </child>
 
@@ -3890,21 +3898,46 @@
 		  </child>
 
 		  <child>
-		    <widget class="GtkMenuItem" id="menu_remove_selected_feed">
+		    <widget class="GtkImageMenuItem" id="menu_remove_selected_feed">
 		      <property name="visible">True</property>
 		      <property name="label" translatable="yes">Re_move Selected Feed</property>
 		      <property name="use_underline">True</property>
 		      <signal name="activate" handler="on_menu_remove_selected_feed_activate" last_modification_time="Thu, 15 Jan 2004 06:57:10 GMT"/>
-		      <accelerator key="R" modifiers="GDK_CONTROL_MASK | GDK_MOD1_MASK" signal="activate"/>
+		      <accelerator key="D" modifiers="GDK_CONTROL_MASK" signal="activate"/>
+
+		      <child internal-child="image">
+			<widget class="GtkImage" id="image1950">
+			  <property name="visible">True</property>
+			  <property name="stock">gtk-delete</property>
+			  <property name="icon_size">1</property>
+			  <property name="xalign">0.5</property>
+			  <property name="yalign">0.5</property>
+			  <property name="xpad">0</property>
+			  <property name="ypad">0</property>
+			</widget>
+		      </child>
 		    </widget>
 		  </child>
 
 		  <child>
-		    <widget class="GtkMenuItem" id="menu_feed_properties">
+		    <widget class="GtkImageMenuItem" id="menu_feed_properties">
 		      <property name="visible">True</property>
 		      <property name="label" translatable="yes">Subscription _Properties</property>
 		      <property name="use_underline">True</property>
 		      <signal name="activate" handler="on_menu_feed_properties_activate" last_modification_time="Wed, 17 Dec 2003 17:32:48 GMT"/>
+		      <accelerator key="Return" modifiers="GDK_MOD1_MASK" signal="activate"/>
+
+		      <child internal-child="image">
+			<widget class="GtkImage" id="image1951">
+			  <property name="visible">True</property>
+			  <property name="stock">gtk-dialog-info</property>
+			  <property name="icon_size">1</property>
+			  <property name="xalign">0.5</property>
+			  <property name="yalign">0.5</property>
+			  <property name="xpad">0</property>
+			  <property name="ypad">0</property>
+			</widget>
+		      </child>
 		    </widget>
 		  </child>
 
@@ -3935,6 +3968,28 @@
 		<widget class="GtkMenu" id="view2_menu">
 
 		  <child>
+		    <widget class="GtkImageMenuItem" id="menu_refresh_all">
+		      <property name="visible">True</property>
+		      <property name="label" translatable="yes">Refresh All</property>
+		      <property name="use_underline">True</property>
+		      <signal name="activate" handler="on_menu_refresh_all_activate" last_modification_time="Thu, 15 Jan 2004 06:49:42 GMT"/>
+		      <accelerator key="R" modifiers="GDK_CONTROL_MASK" signal="activate"/>
+
+		      <child internal-child="image">
+			<widget class="GtkImage" id="image1952">
+			  <property name="visible">True</property>
+			  <property name="stock">gtk-refresh</property>
+			  <property name="icon_size">1</property>
+			  <property name="xalign">0.5</property>
+			  <property name="yalign">0.5</property>
+			  <property name="xpad">0</property>
+			  <property name="ypad">0</property>
+			</widget>
+		      </child>
+		    </widget>
+		  </child>
+
+		  <child>
 		    <widget class="GtkMenuItem" id="menu_refresh_selected">
 		      <property name="visible">True</property>
 		      <property name="label" translatable="yes">Refresh _Selected</property>
@@ -3953,16 +4008,6 @@
 		      <accelerator key="C" modifiers="GDK_CONTROL_MASK | GDK_MOD1_MASK" signal="activate"/>
 		    </widget>
 		  </child>
-
-		  <child>
-		    <widget class="GtkMenuItem" id="menu_refresh_all">
-		      <property name="visible">True</property>
-		      <property name="label" translatable="yes">Refresh All</property>
-		      <property name="use_underline">True</property>
-		      <signal name="activate" handler="on_menu_refresh_all_activate" last_modification_time="Thu, 15 Jan 2004 06:49:42 GMT"/>
-		      <accelerator key="A" modifiers="GDK_CONTROL_MASK | GDK_MOD1_MASK" signal="activate"/>
-		    </widget>
-		  </child>
 		</widget>
 	      </child>
 	    </widget>
@@ -3978,12 +4023,46 @@
 		<widget class="GtkMenu" id="go1_menu">
 
 		  <child>
-		    <widget class="GtkMenuItem" id="menu_next">
+		    <widget class="GtkImageMenuItem" id="menu_previous">
+		      <property name="visible">True</property>
+		      <property name="label" translatable="yes">_Previous Item</property>
+		      <property name="use_underline">True</property>
+		      <signal name="activate" handler="on_menu_previous_activate" last_modification_time="Tue, 23 Jul 2002 17:27:01 GMT"/>
+		      <accelerator key="Left" modifiers="GDK_MOD1_MASK" signal="activate"/>
+
+		      <child internal-child="image">
+			<widget class="GtkImage" id="image1953">
+			  <property name="visible">True</property>
+			  <property name="stock">gtk-go-back</property>
+			  <property name="icon_size">1</property>
+			  <property name="xalign">0.5</property>
+			  <property name="yalign">0.5</property>
+			  <property name="xpad">0</property>
+			  <property name="ypad">0</property>
+			</widget>
+		      </child>
+		    </widget>
+		  </child>
+
+		  <child>
+		    <widget class="GtkImageMenuItem" id="menu_next">
 		      <property name="visible">True</property>
 		      <property name="label" translatable="yes">_Next Item</property>
 		      <property name="use_underline">True</property>
 		      <signal name="activate" handler="on_menu_next_activate" last_modification_time="Tue, 23 Jul 2002 17:27:01 GMT"/>
-		      <accelerator key="N" modifiers="GDK_CONTROL_MASK" signal="activate"/>
+		      <accelerator key="Right" modifiers="GDK_MOD1_MASK" signal="activate"/>
+
+		      <child internal-child="image">
+			<widget class="GtkImage" id="image1954">
+			  <property name="visible">True</property>
+			  <property name="stock">gtk-go-forward</property>
+			  <property name="icon_size">1</property>
+			  <property name="xalign">0.5</property>
+			  <property name="yalign">0.5</property>
+			  <property name="xpad">0</property>
+			  <property name="ypad">0</property>
+			</widget>
+		      </child>
 		    </widget>
 		  </child>
 
@@ -3998,28 +4077,52 @@
 		  </child>
 
 		  <child>
-		    <widget class="GtkMenuItem" id="menu_previous">
+		    <widget class="GtkSeparatorMenuItem" id="separator5">
 		      <property name="visible">True</property>
-		      <property name="label" translatable="yes">_Previous Item</property>
-		      <property name="use_underline">True</property>
-		      <signal name="activate" handler="on_menu_previous_activate" last_modification_time="Tue, 23 Jul 2002 17:27:01 GMT"/>
-		      <accelerator key="P" modifiers="GDK_CONTROL_MASK" signal="activate"/>
 		    </widget>
 		  </child>
 
 		  <child>
-		    <widget class="GtkSeparatorMenuItem" id="separator5">
+		    <widget class="GtkImageMenuItem" id="menu_previous_feed">
 		      <property name="visible">True</property>
+		      <property name="label" translatable="yes">P_revious Feed</property>
+		      <property name="use_underline">True</property>
+		      <signal name="activate" handler="on_menu_previous_feed_activate" last_modification_time="Thu, 08 May 2003 09:08:15 GMT"/>
+		      <accelerator key="Up" modifiers="GDK_MOD1_MASK" signal="activate"/>
+
+		      <child internal-child="image">
+			<widget class="GtkImage" id="image1955">
+			  <property name="visible">True</property>
+			  <property name="stock">gtk-go-up</property>
+			  <property name="icon_size">1</property>
+			  <property name="xalign">0.5</property>
+			  <property name="yalign">0.5</property>
+			  <property name="xpad">0</property>
+			  <property name="ypad">0</property>
+			</widget>
+		      </child>
 		    </widget>
 		  </child>
 
 		  <child>
-		    <widget class="GtkMenuItem" id="menu_next_feed">
+		    <widget class="GtkImageMenuItem" id="menu_next_feed">
 		      <property name="visible">True</property>
 		      <property name="label" translatable="yes">N_ext Feed</property>
 		      <property name="use_underline">True</property>
 		      <signal name="activate" handler="on_menu_next_feed_activate" last_modification_time="Thu, 08 May 2003 09:08:15 GMT"/>
-		      <accelerator key="N" modifiers="GDK_MOD1_MASK" signal="activate"/>
+		      <accelerator key="Down" modifiers="GDK_MOD1_MASK" signal="activate"/>
+
+		      <child internal-child="image">
+			<widget class="GtkImage" id="image1956">
+			  <property name="visible">True</property>
+			  <property name="stock">gtk-go-down</property>
+			  <property name="icon_size">1</property>
+			  <property name="xalign">0.5</property>
+			  <property name="yalign">0.5</property>
+			  <property name="xpad">0</property>
+			  <property name="ypad">0</property>
+			</widget>
+		      </child>
 		    </widget>
 		  </child>
 
@@ -4029,43 +4132,57 @@
 		      <property name="label" translatable="yes">Ne_xt Feed with Unread</property>
 		      <property name="use_underline">True</property>
 		      <signal name="activate" handler="on_menu_next_feed_unread_activate" last_modification_time="Thu, 08 May 2003 09:08:15 GMT"/>
-		      <accelerator key="U" modifiers="GDK_MOD1_MASK" signal="activate"/>
+		      <accelerator key="Down" modifiers="GDK_CONTROL_MASK | GDK_MOD1_MASK" signal="activate"/>
 		    </widget>
 		  </child>
 
 		  <child>
-		    <widget class="GtkMenuItem" id="menu_previous_feed">
+		    <widget class="GtkSeparatorMenuItem" id="separator6">
 		      <property name="visible">True</property>
-		      <property name="label" translatable="yes">P_revious Feed</property>
-		      <property name="use_underline">True</property>
-		      <signal name="activate" handler="on_menu_previous_feed_activate" last_modification_time="Thu, 08 May 2003 09:08:15 GMT"/>
-		      <accelerator key="P" modifiers="GDK_MOD1_MASK" signal="activate"/>
 		    </widget>
 		  </child>
 
 		  <child>
-		    <widget class="GtkSeparatorMenuItem" id="separator6">
+		    <widget class="GtkImageMenuItem" id="menu_previous_category">
 		      <property name="visible">True</property>
+		      <property name="label" translatable="yes">Previous Ca_tegory</property>
+		      <property name="use_underline">True</property>
+		      <signal name="activate" handler="on_menu_previous_category_activate" last_modification_time="Wed, 17 Dec 2003 20:31:50 GMT"/>
+		      <accelerator key="Left" modifiers="GDK_CONTROL_MASK | GDK_MOD1_MASK" signal="activate"/>
+
+		      <child internal-child="image">
+			<widget class="GtkImage" id="image1957">
+			  <property name="visible">True</property>
+			  <property name="stock">gtk-goto-first</property>
+			  <property name="icon_size">1</property>
+			  <property name="xalign">0.5</property>
+			  <property name="yalign">0.5</property>
+			  <property name="xpad">0</property>
+			  <property name="ypad">0</property>
+			</widget>
+		      </child>
 		    </widget>
 		  </child>
 
 		  <child>
-		    <widget class="GtkMenuItem" id="menu_next_category">
+		    <widget class="GtkImageMenuItem" id="menu_next_category">
 		      <property name="visible">True</property>
 		      <property name="label" translatable="yes">Next _Category</property>
 		      <property name="use_underline">True</property>
 		      <signal name="activate" handler="on_menu_next_category_activate" last_modification_time="Wed, 17 Dec 2003 20:31:50 GMT"/>
-		      <accelerator key="Page_Down" modifiers="GDK_CONTROL_MASK" signal="activate"/>
-		    </widget>
-		  </child>
+		      <accelerator key="Right" modifiers="GDK_CONTROL_MASK" signal="activate"/>
 
-		  <child>
-		    <widget class="GtkMenuItem" id="menu_previous_category">
-		      <property name="visible">True</property>
-		      <property name="label" translatable="yes">Previous Ca_tegory</property>
-		      <property name="use_underline">True</property>
-		      <signal name="activate" handler="on_menu_previous_category_activate" last_modification_time="Wed, 17 Dec 2003 20:31:50 GMT"/>
-		      <accelerator key="Page_Up" modifiers="GDK_CONTROL_MASK" signal="activate"/>
+		      <child internal-child="image">
+			<widget class="GtkImage" id="image1958">
+			  <property name="visible">True</property>
+			  <property name="stock">gtk-goto-last</property>
+			  <property name="icon_size">1</property>
+			  <property name="xalign">0.5</property>
+			  <property name="yalign">0.5</property>
+			  <property name="xpad">0</property>
+			  <property name="ypad">0</property>
+			</widget>
+		      </child>
 		    </widget>
 		  </child>
 		</widget>
@@ -4084,7 +4201,7 @@
 		  <child>
 		    <widget class="GtkMenuItem" id="menu_report_problem">
 		      <property name="visible">True</property>
-		      <property name="label" translatable="yes">Report a problem</property>
+		      <property name="label" translatable="yes">_Report a Problem</property>
 		      <property name="use_underline">True</property>
 		      <signal name="activate" handler="on_menu_report_problem_activate" last_modification_time="Sun, 15 Jan 2006 05:31:44 GMT"/>
 		    </widget>
@@ -4145,7 +4262,7 @@
 	      <child>
 		<widget class="GtkToolButton" id="toolbar_refresh_all_button">
 		  <property name="visible">True</property>
-		  <property name="tooltip" translatable="yes">Refreshes all feeds.</property>
+		  <property name="tooltip" translatable="yes">Refresh all feeds</property>
 		  <property name="label" translatable="yes">Refresh</property>
 		  <property name="use_underline">True</property>
 		  <property name="stock_id">gtk-refresh</property>
@@ -4163,10 +4280,10 @@
 	      <child>
 		<widget class="GtkToolButton" id="toolbar_scroll_or_next_button">
 		  <property name="visible">True</property>
-		  <property name="tooltip" translatable="yes">Scrolls to the next unread article.</property>
+		  <property name="tooltip" translatable="yes">Scroll to the next unread article</property>
 		  <property name="label" translatable="yes">Scroll Unread</property>
 		  <property name="use_underline">True</property>
-		  <property name="stock_id">gtk-media-forward</property>
+		  <property name="stock_id">gtk-go-forward</property>
 		  <property name="visible_horizontal">True</property>
 		  <property name="visible_vertical">True</property>
 		  <property name="is_important">True</property>
@@ -4181,7 +4298,7 @@
 	      <child>
 		<widget class="GtkToolButton" id="toolbar_subscribe_button">
 		  <property name="visible">True</property>
-		  <property name="tooltip" translatable="yes">Adds a new feed to the subscription list</property>
+		  <property name="tooltip" translatable="yes">Add a new feed to the subscription list</property>
 		  <property name="label" translatable="yes">Subscribe</property>
 		  <property name="use_underline">True</property>
 		  <property name="stock_id">gtk-add</property>
@@ -4383,7 +4500,7 @@
 			    <widget class="GtkVBox" id="vbox84">
 			      <property name="visible">True</property>
 			      <property name="homogeneous">False</property>
-			      <property name="spacing">12</property>
+			      <property name="spacing">0</property>
 
 			      <child>
 				<widget class="GtkLabel" id="label219">
@@ -4412,7 +4529,6 @@
 
 			      <child>
 				<widget class="GtkEntry" id="find_text_entry">
-				  <property name="height_request">23</property>
 				  <property name="visible">True</property>
 				  <property name="can_focus">True</property>
 				  <property name="has_focus">True</property>
@@ -4447,35 +4563,14 @@
 			      <property name="spacing">12</property>
 
 			      <child>
-				<widget class="GtkLabel" id="label221">
-				  <property name="visible">True</property>
-				  <property name="label" translatable="yes">_Advance Search</property>
-				  <property name="use_underline">True</property>
-				  <property name="use_markup">False</property>
-				  <property name="justify">GTK_JUSTIFY_LEFT</property>
-				  <property name="wrap">False</property>
-				  <property name="selectable">False</property>
-				  <property name="xalign">0</property>
-				  <property name="yalign">0.5</property>
-				  <property name="xpad">0</property>
-				  <property name="ypad">0</property>
-				  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-				  <property name="width_chars">-1</property>
-				  <property name="single_line_mode">False</property>
-				  <property name="angle">0</property>
-				</widget>
-				<packing>
-				  <property name="padding">0</property>
-				  <property name="expand">False</property>
-				  <property name="fill">False</property>
-				</packing>
+				<placeholder/>
 			      </child>
 
 			      <child>
 				<widget class="GtkTable" id="date_time_table">
 				  <property name="visible">True</property>
-				  <property name="n_rows">2</property>
-				  <property name="n_columns">2</property>
+				  <property name="n_rows">5</property>
+				  <property name="n_columns">1</property>
 				  <property name="homogeneous">False</property>
 				  <property name="row_spacing">8</property>
 				  <property name="column_spacing">8</property>
@@ -4484,7 +4579,7 @@
 				    <widget class="GtkCheckButton" id="find_start_time_limit_check">
 				      <property name="visible">True</property>
 				      <property name="can_focus">True</property>
-				      <property name="label" translatable="yes">Limit earliest date</property>
+				      <property name="label" translatable="yes">_Earliest date:</property>
 				      <property name="use_underline">True</property>
 				      <property name="relief">GTK_RELIEF_NORMAL</property>
 				      <property name="focus_on_click">True</property>
@@ -4507,7 +4602,7 @@
 				    <widget class="GtkCheckButton" id="find_end_time_limit_check">
 				      <property name="visible">True</property>
 				      <property name="can_focus">True</property>
-				      <property name="label" translatable="yes">Limit latest date</property>
+				      <property name="label" translatable="yes">_Latest date:</property>
 				      <property name="use_underline">True</property>
 				      <property name="relief">GTK_RELIEF_NORMAL</property>
 				      <property name="focus_on_click">True</property>
@@ -4519,8 +4614,8 @@
 				    <packing>
 				      <property name="left_attach">0</property>
 				      <property name="right_attach">1</property>
-				      <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">fill</property>
 				      <property name="y_options"></property>
 				    </packing>
@@ -4536,10 +4631,10 @@
 				      <signal name="date_changed" handler="on_find_start_date_edit_date_changed" last_modification_time="Thu, 19 Sep 2002 22:49:49 GMT"/>
 				    </widget>
 				    <packing>
-				      <property name="left_attach">1</property>
-				      <property name="right_attach">2</property>
-				      <property name="top_attach">0</property>
-				      <property name="bottom_attach">1</property>
+				      <property name="left_attach">0</property>
+				      <property name="right_attach">1</property>
+				      <property name="top_attach">1</property>
+				      <property name="bottom_attach">2</property>
 				      <property name="y_options"></property>
 				    </packing>
 				  </child>
@@ -4554,10 +4649,10 @@
 				      <signal name="date_changed" handler="on_find_end_date_edit_date_changed" last_modification_time="Thu, 19 Sep 2002 22:49:43 GMT"/>
 				    </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="left_attach">0</property>
+				      <property name="right_attach">1</property>
+				      <property name="top_attach">3</property>
+				      <property name="bottom_attach">4</property>
 				      <property name="y_options"></property>
 				    </packing>
 				  </child>
@@ -4648,13 +4743,12 @@
 		      <child>
 			<widget class="GtkLabel" id="feed_item_label">
 			  <property name="visible">True</property>
-			  <property name="can_focus">True</property>
 			  <property name="label" translatable="yes"></property>
 			  <property name="use_underline">True</property>
 			  <property name="use_markup">True</property>
 			  <property name="justify">GTK_JUSTIFY_LEFT</property>
 			  <property name="wrap">True</property>
-			  <property name="selectable">True</property>
+			  <property name="selectable">False</property>
 			  <property name="xalign">0</property>
 			  <property name="yalign">0</property>
 			  <property name="xpad">2</property>
@@ -4674,13 +4768,12 @@
 
 		      <child>
 			<widget class="GtkLabel" id="feed_refresh_label">
-			  <property name="can_focus">True</property>
 			  <property name="label" translatable="yes">_Next Refresh:</property>
 			  <property name="use_underline">True</property>
 			  <property name="use_markup">True</property>
 			  <property name="justify">GTK_JUSTIFY_RIGHT</property>
 			  <property name="wrap">False</property>
-			  <property name="selectable">True</property>
+			  <property name="selectable">False</property>
 			  <property name="xalign">0</property>
 			  <property name="yalign">0</property>
 			  <property name="xpad">2</property>
Index: glade/strings.c
===================================================================
RCS file: /cvs/gnome/straw/glade/strings.c,v
retrieving revision 1.12
diff -u -r1.12 strings.c
--- glade/strings.c	26 Jan 2006 08:14:30 -0000	1.12
+++ glade/strings.c	30 Jan 2006 02:45:03 -0000
@@ -75,40 +75,39 @@
 gchar *s = N_("_Done");
 gchar *s = N_("Multiple Feed");
 gchar *s = N_("Straw");
-gchar *s = N_("_Subscribe");
+gchar *s = N_("_Subscribe to New Feed");
 gchar *s = N_("_Import Subscriptions");
 gchar *s = N_("_Export Subscriptions");
 gchar *s = N_("Mark Feed as _Read");
-gchar *s = N_("Mark _All Feeds As Read");
+gchar *s = N_("Mark _all Feeds As Read");
 gchar *s = N_("Re_move Selected Feed");
 gchar *s = N_("Subscription _Properties");
+gchar *s = N_("Refresh All");
 gchar *s = N_("Refresh _Selected");
 gchar *s = N_("Refresh Cate_gory");
-gchar *s = N_("Refresh All");
 gchar *s = N_("_Go");
+gchar *s = N_("_Previous Item");
 gchar *s = N_("_Next Item");
 gchar *s = N_("_Scroll or Next Unread Item");
-gchar *s = N_("_Previous Item");
+gchar *s = N_("P_revious Feed");
 gchar *s = N_("N_ext Feed");
 gchar *s = N_("Ne_xt Feed with Unread");
-gchar *s = N_("P_revious Feed");
-gchar *s = N_("Next _Category");
 gchar *s = N_("Previous Ca_tegory");
-gchar *s = N_("Report a problem");
-gchar *s = N_("Refreshes all feeds.");
+gchar *s = N_("Next _Category");
+gchar *s = N_("_Report a Problem");
+gchar *s = N_("Refresh all feeds");
 gchar *s = N_("Refresh");
-gchar *s = N_("Scrolls to the next unread article.");
+gchar *s = N_("Scroll to the next unread article");
 gchar *s = N_("Scroll Unread");
-gchar *s = N_("Adds a new feed to the subscription list");
+gchar *s = N_("Add a new feed to the subscription list");
 gchar *s = N_("Subscribe");
 gchar *s = N_("Search for a keyword in feed items");
 gchar *s = N_("Search");
 gchar *s = N_("_Category:");
 gchar *s = N_("label216");
 gchar *s = N_("_Search items for:");
-gchar *s = N_("_Advance Search");
-gchar *s = N_("Limit earliest date");
-gchar *s = N_("Limit latest date");
+gchar *s = N_("_Earliest date:");
+gchar *s = N_("_Latest date:");
 gchar *s = N_("label217");
 gchar *s = N_("_Next Refresh:");
 gchar *s = N_("0 items found");


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]