From bb163ed55f324ce5e8e6344b6f440c0c7c95ce89 Mon Sep 17 00:00:00 2001
From: Frederic Back <fredericback@gmail.com>
Date: Mon, 2 Oct 2006 18:20:54 +0000
Subject: *

git-svn-id: file:///home/lennart/svn/public/fring/trunk@58 d0d2c35f-0a1e-0410-abeb-dabff30a67ee
---
 src/fringlib/fringrenderer.py | 4 ++--
 src/fringlib/fringwalker.py   | 7 +++++--
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/fringlib/fringrenderer.py b/src/fringlib/fringrenderer.py
index 9fe889a..2a44f57 100644
--- a/src/fringlib/fringrenderer.py
+++ b/src/fringlib/fringrenderer.py
@@ -123,7 +123,7 @@ class FringRenderer:
 
                     # compute the points of the link line
                     e = self.INNER_RADIUS + self.RING_RADIUS - self.RING_RADIUS/4
-                    leg_radius = self.INNER_RADIUS + (self.RINGS_MAX+1) * (self.RING_RADIUS + self.RING_SPACE)
+                    leg_radius = self.INNER_RADIUS + (3+1) * (self.RING_RADIUS + self.RING_SPACE)
                     leg_radius -= (self.RING_RADIUS + self.RING_SPACE) / 2
 
                     if cos((start+end)*pi) >= 0:
@@ -151,7 +151,7 @@ class FringRenderer:
                     width, height = self.linklayout.get_pixel_size()
 
                     # if label too long, truncate by one until it fits
-                    m = self.WIDTH/2 - (self.RINGS_MAX*self.RING_RADIUS) - self.INNER_RADIUS
+                    m = self.WIDTH/2 - (3*self.RING_RADIUS) - self.INNER_RADIUS
                     while width > m and m > 0:
                         label = label[:-1]
                         self.linklayout.set_text( label+"..." )
diff --git a/src/fringlib/fringwalker.py b/src/fringlib/fringwalker.py
index cede5af..af761e8 100644
--- a/src/fringlib/fringwalker.py
+++ b/src/fringlib/fringwalker.py
@@ -77,7 +77,7 @@ class FringWalker( gobject.GObject ):
     def __init__(self):
         gobject.GObject.__init__(self)
         self.thread = None
-        self.showhidden = False
+        self.showhidden = True
 
     def walk(self,uri):
         self.stop()
@@ -145,6 +145,8 @@ class WalkThread( threading.Thread ):
                 d = h.next()
                 if not self.showhidden and d.name[0] == ".": continue
 
+                if d.name == "." or d.name == "..": continue
+
                 if d.type == 2: # directory
                     sub = self.build_tree_gnomevfs(uri.append_path(d.name),recursionlvl+1)
                     l.append( sub )
@@ -165,7 +167,7 @@ class WalkThread( threading.Thread ):
 
         # write some debug information
         starttime = time.time()
-        print "start walking",self.uri,
+        print "start walking",self.uri
 
         # scan root directory first (using gnomevfs)
         try: h = DirectoryHandle(self.uri)
@@ -184,6 +186,7 @@ class WalkThread( threading.Thread ):
                 if self.stopsignal: return
                 d = h.next()
                 if not self.showhidden and d.name[0] == ".": continue
+                if d.name == "." or d.name == "..": continue
 
                 if d.type == 2: # directory
                     subdirectories.append( d.name );
-- 
cgit