beagle r4735 - trunk/beagle/search/Beagle.Search

[dbera svn gnome org]

Author: dbera
Date: Sat Apr 26 16:48:53 2008
New Revision: 4735
URL: http://svn.gnome.org/viewvc/beagle?rev=4735&view=rev

Log:
Fix regression. Default query domain is local + system. QueryDomain.System got removed when I enabled the query domain menu in beagle-search.


Modified:
   trunk/beagle/search/Beagle.Search/SearchWindow.cs
   trunk/beagle/search/Beagle.Search/UIManager.cs

Modified: trunk/beagle/search/Beagle.Search/SearchWindow.cs
==============================================================================
--- trunk/beagle/search/Beagle.Search/SearchWindow.cs	(original)
+++ trunk/beagle/search/Beagle.Search/SearchWindow.cs	Sat Apr 26 16:48:53 2008
@@ -47,7 +47,7 @@
 		private Beagle.Search.ScopeType scope = ScopeType.Everything;
 		private Beagle.Search.SortType sort = SortType.Modified;
 		private Beagle.Search.TypeFilter filter = null;
-		private QueryDomain domain = QueryDomain.Local;
+		private QueryDomain domain = QueryDomain.Local | QueryDomain.System; // default
 
 		// Whether we should grab focus from the text entry
 		private bool grab_focus = false;

Modified: trunk/beagle/search/Beagle.Search/UIManager.cs
==============================================================================
--- trunk/beagle/search/Beagle.Search/UIManager.cs	(original)
+++ trunk/beagle/search/Beagle.Search/UIManager.cs	Sat Apr 26 16:48:53 2008
@@ -227,19 +227,25 @@
 				new ToggleActionEntry ("Local", null,
 						       Catalog.GetString ("_Local"),
 						       null,
-						       Catalog.GetString ("Search only on local computer"),
+						       Catalog.GetString ("Search in personal data in this computer"), /* personal files, emails */
+						       OnDomainChanged,
+						       true),
+				new ToggleActionEntry ("System", null,
+						       Catalog.GetString ("_System"),
+						       null,
+						       Catalog.GetString ("Search in system data on this computer"), /* system manpages, applications */
 						       OnDomainChanged,
 						       true),
 				new ToggleActionEntry ("Global", null,
 						       Catalog.GetString ("_Global"),
 						       null,
-						       Catalog.GetString ("Search in internet services"),
+						       Catalog.GetString ("Search in internet services"), /* gmail and other web services */
 						       OnDomainChanged,
 						       false),
 				new ToggleActionEntry ("Neighborhood", null,
 						       Catalog.GetString ("_Neighborhood"),
 						       null,
-						       Catalog.GetString ("Search on computers near me"),
+						       Catalog.GetString ("Search on computers near me"), /* remote beagle services */
 						       OnDomainChanged,
 						       false)
 			};
@@ -299,6 +305,7 @@
 		"      </menu>" +
 		"      <menu action='Domain'>" +
 		"        <menuitem action='Local'/>" +
+		"        <menuitem action='System'/>" +
 		"        <menuitem action='Neighborhood'/>" +
 #if ENABLE_GOOGLEBACKENDS
 		"        <menuitem action='Global'/>" +