Changeset 12406

Timestamp:

08/30/10 09:35:04 (18 months ago)

Author:

adamk

Message:

browse_message calls now (sort of) overlay existing directory listing... but not very well, and it often breaks

Location:

trunk/Padre

Files:

• lib/Padre/Wx/Directory.pm (modified) (4 diffs)
• lib/Padre/Wx/Directory/Path.pm (modified) (1 diff)
• lib/Padre/Wx/Directory/Task.pm (deleted)
• t/62-directory-task.t (deleted)
• t/63-directory-project.t (deleted)

trunk/Padre/lib/Padre/Wx/Directory.pm

@@ -261 +261 @@
     my @stack  = ();
     my $lock   = $self->main->lock('UPDATE');
-    foreach my $i ( 1 .. $#$files ) {
-        my $path  = $files->[$i];
-        my $image = $path->type ? 'folder' : 'package';
+    shift @$files;
+    foreach my $path ( @$files ) {
         while (@stack) {
 
@@ -283 +282 @@
         # Add the next item to that parent
         my $item = $tree->AppendItem(
-            $parent,                      # Parent node
-            $path->name,                  # Label
-            $tree->{images}->{$image},    # Icon
-            -1,                           # Wx Identifier
-            Wx::TreeItemData->new($path), # Embedded data
+            $parent,                           # Parent
+            $path->name,                       # Label
+            $tree->{images}->{ $path->image }, # Icon
+            -1,                                # Icon (Selected)
+            Wx::TreeItemData->new($path),      # Embedded data
         );
 
@@ -429 +428 @@
     }
 
-    # Temporarily skip if we've already filled this node.
-    # TODO: Upgrade this to make it update the list instead.
-    if ( $tree->GetChildrenCount($cursor) ) {
-        return;
-    }
-
-    # Add the files to the cursor
+    # Mix the returned files into the existing entries.
+    # If there aren't any existing entries, this shortcuts quite nicely.
+    my ($child, $cookie) = $tree->GetFirstChild($cursor);
+    my $position = 0;
     while ( @_ ) {
-        my $path  = shift;
-        my $image = $path->type ? 'folder' : 'package';
-
-        # Add the child to the parent
-        $tree->AppendItem(
-            $cursor,                      # Parent node
-            $path->name,                  # Label
-            $tree->{images}->{$image},    # Icon
-            -1,                           # Wx Identifier
-            Wx::TreeItemData->new($path), # Embedded data
-        );
+        if ( $child->IsOk ) {
+
+            # We are not past the last entry
+            my $current = $tree->GetPlData($child);
+            if ( $current->name eq $_[0]->name ) {
+                # Already exists, discard the duplicate
+                shift;
+            } elsif (
+                $current->is_directory < $_[0]->is_directory
+                and
+                lc($current->name) gt lc($_[0]->name)
+            ) {
+                my $path = shift;
+                $tree->InsertItem(
+                    $cursor,                           # Parent
+                    $position,                         # Before
+                    $path->name,                       # Label
+                    $tree->{images}->{ $path->image }, # Icon
+                    -1,                                # Icon (Selected)
+                    Wx::TreeItemData->new($path),      # Embedded data
+                );
+                $position += 1;
+            } else {
+                ($child, $cookie) = $tree->GetNextChild($cursor, $cookie);
+                $position += 1;
+            }
+
+        } else {
+
+            # We are past the last entry
+            my $path = shift;
+            $tree->AppendItem(
+                $cursor,                           # Parent
+                $path->name,                       # Label
+                $tree->{images}->{ $path->image }, # Icon
+                -1,                                # Icon (Selected)
+                Wx::TreeItemData->new($path),      # Embedded data
+            );
+        }
     }
 
@@ -548 +572 @@
         my $path = Padre::Wx::Directory::Path->directory( @base, $name );
         my $item = $tree->AppendItem(
-            $cursor,                      # Parent node
+            $cursor,                      # Parent
             $path->name,                  # Label
             $tree->{images}->{folder},    # Icon

trunk/Padre/lib/Padre/Wx/Directory/Path.pm

@@ -49 +49 @@
 }
 
+sub image {
+    $_[0]->[0] ? 'folder' : 'package';
+}
+
 sub name {
     $_[0]->[-1];