beagle r4476 - in trunk/beagle/search: . Beagle.Search Beagle.Search.Tiles

From: llipka svn gnome org
To: svn-commits-list gnome org
Subject: beagle r4476 - in trunk/beagle/search: . Beagle.Search Beagle.Search.Tiles
Date: Thu, 14 Feb 2008 21:38:52 +0000 (GMT)
Author: llipka
Date: Thu Feb 14 21:38:52 2008
New Revision: 4476
URL: http://svn.gnome.org/viewvc/beagle?rev=4476&view=rev

Log:
We will also in the end fix the keybindings stuff with this refactoring and make Bera happy. Actually make him happy happy :-)

Added:
   trunk/beagle/search/AssemblyInfo.cs
      - copied, changed from r4475, /trunk/beagle/search/Beagle.Search.Tiles/AssemblyInfo.cs
   trunk/beagle/search/Beagle.Search/Category.cs
      - copied unchanged from r4474, /trunk/beagle/search/Category.cs
   trunk/beagle/search/Beagle.Search/DetailsPane.cs
      - copied unchanged from r4474, /trunk/beagle/search/DetailsPane.cs
   trunk/beagle/search/Beagle.Search/Driver.cs
      - copied, changed from r4474, /trunk/beagle/search/Driver.cs
   trunk/beagle/search/Beagle.Search/Entry.cs
      - copied unchanged from r4474, /trunk/beagle/search/Entry.cs
   trunk/beagle/search/Beagle.Search/GroupView.cs
      - copied unchanged from r4474, /trunk/beagle/search/GroupView.cs
   trunk/beagle/search/Beagle.Search/ISearch.cs
      - copied unchanged from r4474, /trunk/beagle/search/ISearch.cs
   trunk/beagle/search/Beagle.Search/ListCategory.cs
      - copied unchanged from r4474, /trunk/beagle/search/ListCategory.cs
   trunk/beagle/search/Beagle.Search/NotificationArea.cs
      - copied unchanged from r4474, /trunk/beagle/search/NotificationArea.cs
   trunk/beagle/search/Beagle.Search/Panes.cs
      - copied unchanged from r4474, /trunk/beagle/search/Panes.cs
   trunk/beagle/search/Beagle.Search/Search.cs
      - copied unchanged from r4474, /trunk/beagle/search/Search.cs
   trunk/beagle/search/Beagle.Search/SortedTileList.cs
      - copied unchanged from r4474, /trunk/beagle/search/SortedTileList.cs
   trunk/beagle/search/Beagle.Search/Spinner.cs
      - copied unchanged from r4474, /trunk/beagle/search/Spinner.cs
   trunk/beagle/search/Beagle.Search/TileCategory.cs
      - copied unchanged from r4474, /trunk/beagle/search/TileCategory.cs
   trunk/beagle/search/Beagle.Search/TypeFilter.cs
      - copied unchanged from r4474, /trunk/beagle/search/TypeFilter.cs
   trunk/beagle/search/Beagle.Search/UIManager.cs
      - copied unchanged from r4474, /trunk/beagle/search/UIManager.cs
   trunk/beagle/search/Beagle.Search/WidgetFu.cs
      - copied unchanged from r4474, /trunk/beagle/search/WidgetFu.cs
Removed:
   trunk/beagle/search/Beagle.Search.Tiles/AssemblyInfo.cs
   trunk/beagle/search/Category.cs
   trunk/beagle/search/DetailsPane.cs
   trunk/beagle/search/Driver.cs
   trunk/beagle/search/Entry.cs
   trunk/beagle/search/GroupView.cs
   trunk/beagle/search/ISearch.cs
   trunk/beagle/search/ListCategory.cs
   trunk/beagle/search/NotificationArea.cs
   trunk/beagle/search/Panes.cs
   trunk/beagle/search/Search.cs
   trunk/beagle/search/SortedTileList.cs
   trunk/beagle/search/Spinner.cs
   trunk/beagle/search/TileCategory.cs
   trunk/beagle/search/TypeFilter.cs
   trunk/beagle/search/UIManager.cs
   trunk/beagle/search/WidgetFu.cs
Modified:
   trunk/beagle/search/Makefile.am

Copied: trunk/beagle/search/AssemblyInfo.cs (from r4475, /trunk/beagle/search/Beagle.Search.Tiles/AssemblyInfo.cs)
==============================================================================
--- /trunk/beagle/search/Beagle.Search.Tiles/AssemblyInfo.cs	(original)
+++ trunk/beagle/search/AssemblyInfo.cs	Thu Feb 14 21:38:52 2008
@@ -25,9 +25,13 @@
 //
 
 using System;
+using System.Reflection;
 
 using Beagle.Search.Tiles;
 
+[assembly: AssemblyTitle ("beagle-search")]
+[assembly: AssemblyDescription ("GUI interface to the Beagle search system")]
+
 [assembly: TileActivatorTypes (
 	 typeof (ApplicationActivator),
 	 typeof (ArchivedFileActivator),

Copied: trunk/beagle/search/Beagle.Search/Driver.cs (from r4474, /trunk/beagle/search/Driver.cs)
==============================================================================
--- /trunk/beagle/search/Driver.cs	(original)
+++ trunk/beagle/search/Beagle.Search/Driver.cs	Thu Feb 14 21:38:52 2008
@@ -5,7 +5,6 @@
 //
 
 using System;
-using System.Reflection;
 
 using NDesk.DBus;
 using Mono.Unix;
@@ -13,9 +12,6 @@
 using Beagle;
 using Beagle.Util;
 
-[assembly: AssemblyTitle ("beagle-search")]
-[assembly: AssemblyDescription ("GUI interface to the Beagle search system")]
-
 namespace Beagle.Search {
 
 	public class Driver {

Modified: trunk/beagle/search/Makefile.am
==============================================================================
--- trunk/beagle/search/Makefile.am	(original)
+++ trunk/beagle/search/Makefile.am	Thu Feb 14 21:38:52 2008
@@ -29,81 +29,69 @@
 
 BIN_WRAPPERS = beagle-search
 
-beagle-search: beagle-search.in
-	sed 					\
-	-e "s:@pkglibdir@:${pkglibdir}:" 	\
-	-e "s:@bash@:$(BASH):"			\
-	< $(srcdir)/beagle-search.in > beagle-search
-	chmod a+x beagle-search
-
-CSFILES =					\
-	$(srcdir)/Category.cs			\
-	$(srcdir)/Driver.cs			\
-	$(srcdir)/DetailsPane.cs		\
-	$(srcdir)/Entry.cs			\
-	$(srcdir)/GroupView.cs			\
-	$(srcdir)/ISearch.cs			\
-	$(srcdir)/ListCategory.cs		\
-	$(srcdir)/NotificationArea.cs		\
-	$(srcdir)/Panes.cs			\
-	$(srcdir)/Search.cs			\
-	$(srcdir)/SortedTileList.cs		\
-	$(srcdir)/Spinner.cs			\
-	$(srcdir)/TileCategory.cs		\
-	$(srcdir)/TypeFilter.cs			\
-	$(srcdir)/UIManager.cs			\
-	$(srcdir)/WidgetFu.cs
-
-TILES = 					\
-	$(srcdir)/Tiles/ActionMenuItem.cs	\
-	$(srcdir)/Tiles/Application.cs		\
-	$(srcdir)/Tiles/ArchivedFile.cs		\
-	$(srcdir)/Tiles/AssemblyInfo.cs		\
-	$(srcdir)/Tiles/Audio.cs		\
-	$(srcdir)/Tiles/CApplet.cs		\
-	$(srcdir)/Tiles/Calendar.cs		\
-	$(srcdir)/Tiles/Contact.cs		\
-	$(srcdir)/Tiles/Docbook.cs		\
-	$(srcdir)/Tiles/File.cs			\
-	$(srcdir)/Tiles/Folder.cs		\
-	$(srcdir)/Tiles/HitFlavor.cs		\
-	$(srcdir)/Tiles/IMLog.cs		\
-	$(srcdir)/Tiles/Image.cs		\
-	$(srcdir)/Tiles/MailMessage.cs		\
-	$(srcdir)/Tiles/MailAttachment.cs	\
-	$(srcdir)/Tiles/Manpage.cs		\
-	$(srcdir)/Tiles/Note.cs			\
-	$(srcdir)/Tiles/Presentation.cs		\
-	$(srcdir)/Tiles/RSSFeed.cs		\
-	$(srcdir)/Tiles/Spreadsheet.cs		\
-	$(srcdir)/Tiles/Task.cs			\
-	$(srcdir)/Tiles/TextDocument.cs		\
-	$(srcdir)/Tiles/ThumbnailFactory.cs	\
-	$(srcdir)/Tiles/Tile.cs			\
-	$(srcdir)/Tiles/TileAction.cs		\
-	$(srcdir)/Tiles/TileActivator.cs	\
-	$(srcdir)/Tiles/TileFlat.cs		\
-	$(srcdir)/Tiles/TileGroup.cs		\
-	$(srcdir)/Tiles/TileTemplate.cs		\
-	$(srcdir)/Tiles/Utils.cs		\
-	$(srcdir)/Tiles/Video.cs		\
-	$(srcdir)/Tiles/WebHistory.cs
+CSFILES =							\
+	$(srcdir)/AssemblyInfo.cs				\
+	$(srcdir)/Beagle.Search/Category.cs			\
+	$(srcdir)/Beagle.Search/Driver.cs			\
+	$(srcdir)/Beagle.Search/DetailsPane.cs			\
+	$(srcdir)/Beagle.Search/Entry.cs			\
+	$(srcdir)/Beagle.Search/GroupView.cs			\
+	$(srcdir)/Beagle.Search/ISearch.cs			\
+	$(srcdir)/Beagle.Search/ListCategory.cs			\
+	$(srcdir)/Beagle.Search/NotificationArea.cs		\
+	$(srcdir)/Beagle.Search/Panes.cs			\
+	$(srcdir)/Beagle.Search/Search.cs			\
+	$(srcdir)/Beagle.Search/SortedTileList.cs		\
+	$(srcdir)/Beagle.Search/Spinner.cs			\
+	$(srcdir)/Beagle.Search/TileCategory.cs			\
+	$(srcdir)/Beagle.Search/TypeFilter.cs			\
+	$(srcdir)/Beagle.Search/UIManager.cs			\
+	$(srcdir)/Beagle.Search/WidgetFu.cs			\
+	$(srcdir)/Beagle.Search.Tiles/ActionMenuItem.cs		\
+	$(srcdir)/Beagle.Search.Tiles/Application.cs		\
+	$(srcdir)/Beagle.Search.Tiles/ArchivedFile.cs		\
+	$(srcdir)/Beagle.Search.Tiles/Audio.cs			\
+	$(srcdir)/Beagle.Search.Tiles/CApplet.cs		\
+	$(srcdir)/Beagle.Search.Tiles/Calendar.cs		\
+	$(srcdir)/Beagle.Search.Tiles/Contact.cs		\	
+	$(srcdir)/Beagle.Search.Tiles/Docbook.cs		\
+	$(srcdir)/Beagle.Search.Tiles/File.cs			\
+	$(srcdir)/Beagle.Search.Tiles/Folder.cs			\
+	$(srcdir)/Beagle.Search.Tiles/HitFlavor.cs		\
+	$(srcdir)/Beagle.Search.Tiles/IMLog.cs			\
+	$(srcdir)/Beagle.Search.Tiles/Image.cs			\
+	$(srcdir)/Beagle.Search.Tiles/MailMessage.cs		\
+	$(srcdir)/Beagle.Search.Tiles/MailAttachment.cs		\
+	$(srcdir)/Beagle.Search.Tiles/Manpage.cs		\
+	$(srcdir)/Beagle.Search.Tiles/Note.cs			\
+	$(srcdir)/Beagle.Search.Tiles/Presentation.cs		\
+	$(srcdir)/Beagle.Search.Tiles/RSSFeed.cs		\
+	$(srcdir)/Beagle.Search.Tiles/Spreadsheet.cs		\
+	$(srcdir)/Beagle.Search.Tiles/Task.cs			\
+	$(srcdir)/Beagle.Search.Tiles/TextDocument.cs		\
+	$(srcdir)/Beagle.Search.Tiles/ThumbnailFactory.cs	\
+	$(srcdir)/Beagle.Search.Tiles/Tile.cs			\
+	$(srcdir)/Beagle.Search.Tiles/TileAction.cs		\
+	$(srcdir)/Beagle.Search.Tiles/TileActivator.cs		\
+	$(srcdir)/Beagle.Search.Tiles/TileFlat.cs		\
+	$(srcdir)/Beagle.Search.Tiles/TileGroup.cs		\
+	$(srcdir)/Beagle.Search.Tiles/TileTemplate.cs		\
+	$(srcdir)/Beagle.Search.Tiles/Utils.cs			\
+	$(srcdir)/Beagle.Search.Tiles/Video.cs			\
+	$(srcdir)/Beagle.Search.Tiles/WebHistory.cs		\
+	$(srcdir)/Beagle.Search.Pages/Base.cs			\
+	$(srcdir)/Beagle.Search.Pages/IndexInfo.cs		\
+	$(srcdir)/Beagle.Search.Pages/NoMatch.cs		\
+	$(srcdir)/Beagle.Search.Pages/QuickTips.cs		\
+	$(srcdir)/Beagle.Search.Pages/RootUser.cs		\
+	$(srcdir)/Beagle.Search.Pages/StartDaemon.cs		\
+	$(srcdir)/Beagle.Search.Tray/NotificationArea.cs	\
+	$(srcdir)/Beagle.Search.Tray/TrayIcon.cs
 
 if ENABLE_OPEN_WITH
-TILES += $(srcdir)/Tiles/OpenWithMenu.cs
+CSFILES += $(srcdir)/Beagle.Search.Tiles/OpenWithMenu.cs
 endif
 
-PAGES =						\
-	$(srcdir)/Pages/Base.cs			\
-	$(srcdir)/Pages/IndexInfo.cs		\
-	$(srcdir)/Pages/NoMatch.cs		\
-	$(srcdir)/Pages/QuickTips.cs		\
-	$(srcdir)/Pages/RootUser.cs		\
-	$(srcdir)/Pages/StartDaemon.cs
-
-TRAY =						\
-	$(srcdir)/Tray/NotificationArea.cs	\
-	$(srcdir)/Tray/TrayIcon.cs
 
 LOCAL_ASSEMBLIES =			\
 	../Util/Util.dll		\
@@ -117,11 +105,18 @@
 	$(NDESK_DBUS_GLIB_LIBS)		\
 	-r:Mono.Posix
 
-Search.exe: $(CSFILES) $(TILES) $(PAGES) $(TRAY) $(LOCAL_ASSEMBLIES)
-	$(CSC) -out:$@ $(CSFLAGS) $(CSFILES) $(TILES) $(PAGES) $(TRAY) $(ASSEMBLIES)
+Search.exe: $(CSFILES) $(LOCAL_ASSEMBLIES)
+	$(CSC) -out:$@ $(CSFLAGS) $(CSFILES) $(ASSEMBLIES)
 
 Search.exe.mdb: Search.exe
 
+beagle-search: beagle-search.in
+	sed 					\
+	-e "s:@pkglibdir@:${pkglibdir}:" 	\
+	-e "s:@bash@:$(BASH):"			\
+	< $(srcdir)/beagle-search.in > beagle-search
+	chmod a+x beagle-search
+
 @INTLTOOL_DESKTOP_RULE@
 
 desktop_in_files = beagle-search.desktop.in
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]