f-spot r3555 - in trunk: . src
- From: sdelcroix svn gnome org
- To: svn-commits-list gnome org
- Subject: f-spot r3555 - in trunk: . src
- Date: Wed, 16 Jan 2008 20:15:42 +0000 (GMT)
Author: sdelcroix
Date: Wed Jan 16 20:15:42 2008
New Revision: 3555
URL: http://svn.gnome.org/viewvc/f-spot?rev=3555&view=rev
Log:
2008-01-16 Stephane Delcroix <sdelcroix novell con>
* src/QueryWidget.cs:
* src/MainWindow.cs:
* src/f-spot.glade: 3 patches from Lorenzo, fixing menu issues
Modified:
trunk/ChangeLog
trunk/src/MainWindow.cs
trunk/src/QueryWidget.cs
trunk/src/f-spot.glade
Modified: trunk/src/MainWindow.cs
==============================================================================
--- trunk/src/MainWindow.cs (original)
+++ trunk/src/MainWindow.cs Wed Jan 16 20:15:42 2008
@@ -2962,20 +2962,20 @@
}
}
- //if (last_tags_selected_count != tags_selected) {
- ((Gtk.Label)find_add_tag.Child).Text = String.Format (
- Catalog.GetPluralString ("Find Selected Tag", "Find Selected Tags", tags_selected), tags_selected
- );
-
- ((Gtk.Label)find_add_tag_with.Child).Text = String.Format (
- Catalog.GetPluralString ("Find Selected Tag With", "Find Selected Tags With", tags_selected), tags_selected
- );
+ //if (last_tags_selected_count != tags_selected) {
+ ((Gtk.Label)find_add_tag.Child).Text = String.Format (
+ Catalog.GetPluralString ("Find _Selected Tag", "Find _Selected Tags", tags_selected), tags_selected
+ );
+
+ ((Gtk.Label)find_add_tag_with.Child).Text = String.Format (
+ Catalog.GetPluralString ("Find Selected Tag _With", "Find Selected Tags _With", tags_selected), tags_selected
+ );
- find_add_tag.Sensitive = tag_sensitive;
- find_add_tag_with.Sensitive = tag_sensitive && find_add_tag_with.Submenu != null;
+ find_add_tag.Sensitive = tag_sensitive;
+ find_add_tag_with.Sensitive = tag_sensitive && find_add_tag_with.Submenu != null;
- //last_tags_selected_count = tags_selected;
- //}
+ //last_tags_selected_count = tags_selected;
+ //}
}
void PopulateExtendableMenus (object o, EventArgs args)
Modified: trunk/src/QueryWidget.cs
==============================================================================
--- trunk/src/QueryWidget.cs (original)
+++ trunk/src/QueryWidget.cs Wed Jan 16 20:15:42 2008
@@ -114,17 +114,17 @@
logic_widget.UpdateQuery ();
}
- public void ShowBar ()
- {
- Show ();
- ((Gtk.Label)MainWindow.Toplevel.FindByTag.Child).Text = Catalog.GetString ("Hide Find Bar");
- }
-
- public void HideBar ()
- {
- Hide ();
- ((Gtk.Label)MainWindow.Toplevel.FindByTag.Child).Text = Catalog.GetString ("Show Find Bar");
- }
+ public void ShowBar ()
+ {
+ Show ();
+ ((Gtk.Label)MainWindow.Toplevel.FindByTag.Child).Text = Catalog.GetString ("Hide _Find Bar");
+ }
+
+ public void HideBar ()
+ {
+ Hide ();
+ ((Gtk.Label)MainWindow.Toplevel.FindByTag.Child).Text = Catalog.GetString ("Show _Find Bar");
+ }
public void HandleChanged (IBrowsableCollection collection)
{
Modified: trunk/src/f-spot.glade
==============================================================================
--- trunk/src/f-spot.glade (original)
+++ trunk/src/f-spot.glade Wed Jan 16 20:15:42 2008
@@ -5537,9 +5537,9 @@
</widget>
</child>
<child>
- <widget class="GtkMenuItem" id="beneath_photos_menu">
+ <widget class="GtkMenuItem" id="thumbnails_elements_menu">
<property name="visible">True</property>
- <property name="label" translatable="yes">Beneath _Photos</property>
+ <property name="label" translatable="yes">Thumbnail _elements</property>
<property name="use_underline">True</property>
<child>
<widget class="GtkMenu" id="tag_icon_size_menu">
@@ -5561,6 +5561,15 @@
<signal name="activate" handler="HandleDisplayTags"/>
</widget>
</child>
+ <child>
+ <widget class="GtkCheckMenuItem" id="display_ratings_menu_item">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">_Ratings</property>
+ <property name="use_underline">True</property>
+ <property name="active">True</property>
+ <signal name="activate" handler="HandleDisplayRatings"/>
+ </widget>
+ </child>
</widget>
</child>
</widget>
@@ -5604,15 +5613,6 @@
</child>
</widget>
</child>
- <child>
- <widget class="GtkCheckMenuItem" id="display_ratings_menu_item">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Display _Ratings</property>
- <property name="use_underline">True</property>
- <property name="active">True</property>
- <signal name="activate" handler="HandleDisplayRatings"/>
- </widget>
- </child>
<child>
<widget class="GtkSeparatorMenuItem" id="separator17">
<property name="visible">True</property>
@@ -5659,7 +5659,7 @@
<child>
<widget class="GtkMenuItem" id="tag_icon_size">
<property name="visible">True</property>
- <property name="label" translatable="yes">Tag Icons</property>
+ <property name="label" translatable="yes">_Tag Icons</property>
<property name="use_underline">True</property>
<child>
<widget class="GtkMenu" id="tag_icon_size_menu">
@@ -5798,69 +5798,89 @@
</widget>
</child>
- <child>
- <widget class="GtkMenuItem" id="set_rating_filter1">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Set Rating filter...</property>
- <property name="use_underline">True</property>
- <signal name="activate" handler="HandleSetRatingFilter"/>
- </widget>
- </child>
- <child>
- <widget class="GtkMenuItem" id="clear_rating_filter">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Clear Rating Filter</property>
- <property name="use_underline">True</property>
- <signal name="activate" handler="HandleClearRatingFilter"/>
- </widget>
- </child>
+ <child>
+ <widget class="GtkMenuItem" id="rate_submenu">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">By _Rating</property>
+ <property name="use_underline">True</property>
+ <child>
+ <widget class="GtkMenu" id="rate_find_menu">
- <child>
- <widget class="GtkCheckMenuItem" id="find_unrated">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Unrated Photos</property>
- <property name="use_underline">True</property>
- <property name="active">False</property>
- <signal name="activate" handler="HandleFindUnrated"/>
- </widget>
- </child>
+ <child>
+ <widget class="GtkMenuItem" id="set_rating_filter1">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">_Set Rating filter...</property>
+ <property name="use_underline">True</property>
+ <signal name="activate" handler="HandleSetRatingFilter"/>
+ </widget>
+ </child>
- <child>
- <widget class="GtkSeparatorMenuItem" id="separator15">
- <property name="visible">True</property>
- </widget>
- </child>
+ <child>
+ <widget class="GtkCheckMenuItem" id="find_unrated">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">_Unrated Photos</property>
+ <property name="use_underline">True</property>
+ <property name="active">False</property>
+ <signal name="activate" handler="HandleFindUnrated"/>
+ </widget>
+ </child>
+ <child>
+ <widget class="GtkMenuItem" id="clear_rating_filter">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">_Clear Rating Filter</property>
+ <property name="use_underline">True</property>
+ <signal name="activate" handler="HandleClearRatingFilter"/>
+ </widget>
+ </child>
- <child>
- <widget class="GtkMenuItem" id="set_date_range1">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Set _Date Range...</property>
- <property name="use_underline">True</property>
- <signal name="activate" handler="HandleSetDateRange"/>
- </widget>
+ </widget>
+ </child>
+ </widget>
</child>
+
<child>
- <widget class="GtkMenuItem" id="clear_date_range">
+ <widget class="GtkMenuItem" id="date_submenu">
<property name="visible">True</property>
- <property name="sensitive">False</property>
- <property name="label" translatable="yes">Clea_r Date Range</property>
+ <property name="label" translatable="yes">By _Date</property>
<property name="use_underline">True</property>
- <signal name="activate" handler="HandleClearDateRange"/>
- </widget>
+ <child>
+ <widget class="GtkMenu" id="date_find_menu">
+
+ <child>
+ <widget class="GtkMenuItem" id="set_date_range1">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">_Set Date Range...</property>
+ <property name="use_underline">True</property>
+ <signal name="activate" handler="HandleSetDateRange"/>
+ </widget>
+ </child>
+ <child>
+ <widget class="GtkMenuItem" id="clear_date_range">
+ <property name="visible">True</property>
+ <property name="sensitive">False</property>
+ <property name="label" translatable="yes">_Clear Date Range</property>
+ <property name="use_underline">True</property>
+ <signal name="activate" handler="HandleClearDateRange"/>
+ </widget>
+ </child>
+ </widget>
+ </child>
+ </widget>
</child>
+
<child>
<widget class="GtkImageMenuItem" id="rolls_submenu">
<property name="visible">True</property>
- <property name="label" translatable="yes">Import Rolls</property>
+ <property name="label" translatable="yes">By _Import Roll</property>
<property name="use_underline">True</property>
<child>
- <widget class="GtkMenu" id="find_menu">
+ <widget class="GtkMenu" id="rolls_find_menu">
<child>
<widget class="GtkMenuItem" id="last_roll">
<property name="visible">True</property>
- <property name="label" translatable="yes">Last Import Roll</property>
+ <property name="label" translatable="yes">_Last Import Roll</property>
<property name="use_underline">True</property>
<signal name="activate" handler="HandleSelectLastRoll"/>
</widget>
@@ -5868,7 +5888,7 @@
<child>
<widget class="GtkMenuItem" id="select_rolls">
<property name="visible">True</property>
- <property name="label" translatable="yes">Select Import Rolls...</property>
+ <property name="label" translatable="yes">_Select Import Rolls...</property>
<property name="use_underline">True</property>
<signal name="activate" handler="HandleSelectRolls"/>
</widget>
@@ -5876,7 +5896,7 @@
<child>
<widget class="GtkMenuItem" id="clear_roll_filter">
<property name="visible">True</property>
- <property name="label" translatable="yes">Clear Roll Filter</property>
+ <property name="label" translatable="yes">_Clear Roll Filter</property>
<property name="use_underline">True</property>
<signal name="activate" handler="HandleClearRollFilter"/>
</widget>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
