Changeset 10841

Timestamp:

02/19/10 20:10:02 (6 months ago)

Author:

waxhead

Message:

Changes for blame

Location:

trunk/Padre-Plugin-SVN/lib/Padre/Plugin

Files:

• SVN.pm (modified) (1 diff)
• SVN/Wx/SVNDialog.pm (modified) (3 diffs)

trunk/Padre-Plugin-SVN/lib/Padre/Plugin/SVN.pm

@@ -245 +245 @@
                 $file->blame();
                 $self->{_busyCursor} = undef;
-                my $blame = join( "\n", @{ $file->stdout } );
+                #my $blame = join( "\n", @{ $file->stdout } );
+                my @blame = @{ $file->stdout };
                 require Padre::Plugin::SVN::Wx::SVNDialog;
-                my $dialog = Padre::Plugin::SVN::Wx::SVNDialog->new( $main, $filename, $blame, 'Blame' );
+                my $dialog = Padre::Plugin::SVN::Wx::SVNDialog->new( $main, $filename, \@blame, 'Blame' );
                 $dialog->Show(1);
                 return 1;

trunk/Padre-Plugin-SVN/lib/Padre/Plugin/SVN/Wx/SVNDialog.pm

@@ -29 +29 @@
         );
         $self->SetIcon(Padre::Wx::Icon::PADRE);
-        $self->build_dialog( $filePath, $log, $getData );
+        
+        if( lc($type) eq 'blame' ) {
+                $self->build_blame_dialog($filePath, $log);
+        }
+        else {
+                $self->build_dialog( $filePath, $log, $getData );
+        }
 
         return $self;
@@ -123 +129 @@
 }
 
+
+sub build_blame_dialog {
+        print "In Blame Dialog\n";
+        my ( $self, $file, $log ) = @_;
+        my $vbox = Wx::BoxSizer->new(Wx::wxVERTICAL);
+
+        require Padre::Plugin::SVN::Wx::BlameTree;
+        my $blame = Padre::Plugin::SVN::Wx::BlameTree->new($self);
+        $blame->populate($log);
+        $vbox->Add( $blame, 0, Wx::wxEXPAND );
+
+        #print "file: $file\n";
+        #print "Log: $log\n";
+
+        my $btnBox     = Wx::BoxSizer->new(Wx::wxHORIZONTAL);
+        my $pnlButtons = Wx::Panel->new(
+                $self,
+                -1, # id
+                [ -1, -1 ], # position
+                [ -1, -1 ], # size
+                0           # border style
+        );
+
+        # button height is set to 40 simply to get them to look the same
+        # in GTK.
+        # not sure what this is going to look like in other window managers.
+        my $btnOK = Wx::Button->new( $pnlButtons, Wx::wxID_OK, "OK", [ -1, -1 ], [ -1, 40 ] );
+        Wx::Event::EVT_BUTTON( $self, $btnOK, \&ok_clicked );
+
+        $btnBox->Add( $btnOK, 1, Wx::wxALIGN_BOTTOM | Wx::wxALIGN_RIGHT );
+
+
+        $pnlButtons->SetSizer($btnBox);
+
+        #$btnBox->Add( $pnlButtons, 0, Wx::wxALIGN_BOTTOM | Wx::wxALIGN_RIGHT | Wx::wxEXPAND);
+        $vbox->Add( $pnlButtons, 0, Wx::wxALIGN_BOTTOM | Wx::wxALIGN_RIGHT );
+
+
+        $self->SetSizer($vbox);
+
+}
+
+
+
 sub ok_clicked {
         my ($self) = @_;
@@ -164 +214 @@
 }
 
+
+
 1;