* Version 0.8.5.

* GWorkspace/Desktop/GWDesktopManager.[hm]:
Add a "desktopView" ivar used instead of the GWDeskopWindow "-desktopView" method.

* GWorkspace/FileViewer/GWViewer.m (-windowShouldClose:):
* GWorkspace/FileViewer/GWSpatialViewer.m (-windowShouldClose:):
Send a -updateDesktop to GWDesktopManager to update the desktop icons.   



git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/apps/gworkspace/trunk@24686 72102866-910b-0410-8b05-ffd578937521

Author: Eric Sersale

GWorkspace/Desktop/GWDesktopManager.h

@@ -44,6 +44,8 @@ typedef enum DockPosition {
   id win;
   BOOL usexbundle;
 
+  GWDesktopView *desktopView;
+  
   Dock *dock;
   BOOL hidedock;
   DockPosition dockPosition;

GWorkspace/Desktop/GWDesktopManager.m

@@ -67,7 +67,6 @@ - (id)init
     id defentry;
     NSString *path;
     id window = nil;
-    GWDesktopView *desktopView;
 
     fm = [NSFileManager defaultManager];
     nc = [NSNotificationCenter defaultCenter];
@@ -150,12 +149,12 @@ - (id)init
 - (void)activateDesktop
 {
   [win activate];
-  [[win desktopView] showMountedVolumes];
-  [[win desktopView] showContentsOfNode: dskNode];
+  [desktopView showMountedVolumes];
+  [desktopView showContentsOfNode: dskNode];
   [self addWatcherForPath: [dskNode path]];
 
   if ((hidedock == NO) && ([dock superview] == nil)) {
-    [[win desktopView] addSubview: dock];
+    [desktopView addSubview: dock];
     [dock tile];
   }
 
@@ -210,7 +209,6 @@ - (void)setUsesXBundle:(BOOL)value
   usexbundle = value;
 
   if ([self isActive]) { 
-    GWDesktopView *desktopView = [win desktopView];
     id window = nil;  
     BOOL changed = NO;
 
@@ -275,7 +273,7 @@ - (BOOL)hasWindow:(id)awindow
 
 - (id)desktopView
 {
-  return [win desktopView];
+  return desktopView;
 }
 
 - (Dock *)dock
@@ -293,7 +291,7 @@ - (void)setDockPosition:(DockPosition)pos
   dockPosition = pos;
   [dock setPosition: pos];
   [self setReservedFrames];
-  [[win desktopView] dockPositionDidChange];
+  [desktopView dockPositionDidChange];
 }
 
 - (void)setDockActive:(BOOL)value
@@ -302,12 +300,12 @@ - (void)setDockActive:(BOOL)value
 
   if (hidedock && [dock superview]) {
     [dock removeFromSuperview];
-    [[win desktopView] setNeedsDisplayInRect: dockReservedFrame];
+    [desktopView setNeedsDisplayInRect: dockReservedFrame];
 
   } else if ([dock superview] == nil) {
-    [[win desktopView] addSubview: dock];
+    [desktopView addSubview: dock];
     [dock tile];
-    [[win desktopView] setNeedsDisplayInRect: dockReservedFrame];
+    [desktopView setNeedsDisplayInRect: dockReservedFrame];
   }
 }
 
@@ -366,7 +364,7 @@ - (NSRect)tshelfActivateFrame
 
 - (NSImage *)tabbedShelfBackground
 {
-  return [[win desktopView] tshelfBackground];
+  return [desktopView tshelfBackground];
 }
 
 - (void)mouseEnteredTShelfActivateFrame
@@ -381,11 +379,9 @@ - (void)mouseExitedTShelfActiveFrame
 
 - (void)deselectAllIcons
 {
-  GWDesktopView *view = [win desktopView];
-  
-  [view unselectOtherReps: nil];
-  [view selectionDidChange];
-  [view stopRepNameEditing];
+  [desktopView unselectOtherReps: nil];
+  [desktopView selectionDidChange];
+  [desktopView stopRepNameEditing];
 }
 
 - (void)deselectInSpatialViewers
@@ -565,7 +561,7 @@ - (void)updateDefaults
   [defaults setBool: hidedock forKey: @"hidedock"];
 
   [dock updateDefaults];
-  [[win desktopView] updateDefaults];
+  [desktopView updateDefaults];
 }
 
 - (void)setContextHelp
@@ -597,7 +593,6 @@ - (BOOL)validateItem:(id)menuItem
 {
   if ([self isActive]) {
     SEL action = [menuItem action];
-    GWDesktopView *desktopView = [win desktopView];
 
     if (sel_eq(action, @selector(duplicateFiles:))
                 || sel_eq(action, @selector(recycleFiles:))
@@ -650,7 +645,7 @@ - (BOOL)validateItem:(id)menuItem
 
 - (void)openSelectionInNewViewer:(BOOL)newv
 {
-  NSArray *selreps = [[win desktopView] selectedReps];
+  NSArray *selreps = [desktopView selectedReps];
   int i;
 
   for (i = 0; i < [selreps count]; i++) {
@@ -697,7 +692,7 @@ - (void)openSelectionInNewViewer:(BOOL)newv
 
 - (void)openSelectionAsFolder
 {
-  NSArray *selnodes = [[win desktopView] selectedNodes];
+  NSArray *selnodes = [desktopView selectedNodes];
   int i;
 
   for (i = 0; i < [selnodes count]; i++) {
@@ -728,14 +723,14 @@ - (void)newFile
 
 - (void)duplicateFiles
 {
-  if ([[[win desktopView] selectedNodes] count]) {
+  if ([[desktopView selectedNodes] count]) {
     [gworkspace duplicateFiles];
   }
 }
 
 - (void)recycleFiles
 {
-  if ([[[win desktopView] selectedNodes] count]) {
+  if ([[desktopView selectedNodes] count]) {
     [gworkspace moveToTrash];
   }
 }
@@ -747,7 +742,7 @@ - (void)emptyTrash
 
 - (void)deleteFiles
 {
-  if ([[[win desktopView] selectedNodes] count]) {
+  if ([[desktopView selectedNodes] count]) {
     [gworkspace deleteFiles];
   }
 }
@@ -771,38 +766,38 @@ - (void)setShownType:(id)sender
     type = FSNInfoNameType;
   } 
 
-  [(id <FSNodeRepContainer>)[win desktopView] setShowType: type];  
+  [desktopView setShowType: type];  
 }
 
 - (void)setExtendedShownType:(id)sender
 {
-  [(id <FSNodeRepContainer>)[win desktopView] setExtendedShowType: [sender title]]; 
+  [desktopView setExtendedShowType: [sender title]]; 
 }
 
 - (void)setIconsSize:(id)sender
 {
-  [(id <FSNodeRepContainer>)[win desktopView] setIconSize: [[sender title] intValue]];
+  [desktopView setIconSize: [[sender title] intValue]];
 }
 
 - (void)setIconsPosition:(id)sender
 {
   NSString *title = [sender title];
 
   if ([title isEqual: NSLocalizedString(@"Left", @"")]) {
-    [(id <FSNodeRepContainer>)[win desktopView] setIconPosition: NSImageLeft];
+    [desktopView setIconPosition: NSImageLeft];
   } else {
-    [(id <FSNodeRepContainer>)[win desktopView] setIconPosition: NSImageAbove];
+    [desktopView setIconPosition: NSImageAbove];
   }
 }
 
 - (void)setLabelSize:(id)sender
 {
-  [[win desktopView] setLabelTextSize: [[sender title] intValue]];
+  [desktopView setLabelTextSize: [[sender title] intValue]];
 }
 
 - (void)selectAllInViewer
 {
-	[[win desktopView] selectAll];
+	[desktopView selectAll];
 }
 
 - (void)showTerminal

GWorkspace/FileViewer/GWSpatialViewer.m

@@ -766,6 +766,7 @@ - (void)windowDidBecomeKey:(NSNotification *)aNotification
 
 - (BOOL)windowShouldClose:(id)sender
 {
+  [manager updateDesktop];
 	return YES;
 }
 

GWorkspace/FileViewer/GWViewer.m

@@ -995,6 +995,7 @@ - (void)windowDidResize:(NSNotification *)aNotification
 
 - (BOOL)windowShouldClose:(id)sender
 {
+  [manager updateDesktop];
 	return YES;
 }
 

INSTALL

@@ -2,9 +2,25 @@ Installing GWorkspace
 =========================
 
 GWorkspace requires GNUstep to be installed. Make sure that you have an
-up to date version on your system installed! 
+up to date version installed on your system! 
 
   ./configure
   make install
 
+If you are on Linux and want to use the new inotify-based fswatcher, you can pass --with-inotify to configure.
+
+To enable the new metadata indexing and searching system, cd into the GWMetadata directory and:
+
+  ./configure
+  make
+  make install
+
+To enable all the GWorkspace features you need also:
+
+* The PDFKit framework (version >= 0.9) downloadable from the GWorkspace home page.
+PDFKit is needed to build the pdf contents inspector and to extract metadata from pdf files.
+
+* System Preferences available from the GNUstep SVN repository.
+  svn co http://svn.gna.org/svn/gnustep/apps/systempreferences/trunk
+  If you install the GWMetadata system, SystemPreferences is needed to configure it. 
 

Tools/fswatcher/fswatcher-inotify.m

@@ -504,6 +504,8 @@ - (oneway void)client:(id <FSWClientProtocol>)client
       }    
     }
   }
+  
+  GWDebugLog(@"watchers: %i", NSCountMapTable(watchers));
 }
 
 - (oneway void)client:(id <FSWClientProtocol>)client
@@ -528,6 +530,8 @@ - (oneway void)client:(id <FSWClientProtocol>)client
     [info removeWatchedPath: path];    
   	[watcher removeListener];  
   }
+  
+  GWDebugLog(@"watchers: %i", NSCountMapTable(watchers));
 }
 
 - (Watcher *)watcherForPath:(NSString *)path