Changeset 843

Timestamp:

11/09/08 02:13:20 (3 years ago)

Author:

szabgab

Message:

remove the document statistics from Development::Tools plugin
add filename to integrated document statistics

Location:

trunk/lib/Padre

Files:

• Plugin/Development/Tools.pm (modified) (2 diffs)
• Wx/MainWindow.pm (modified) (4 diffs)

trunk/lib/Padre/Plugin/Development/Tools.pm

@@ -23 +23 @@
 my @menu = (
     ['About',          sub {about(@_)}          ],
-    ['Doc stats',      sub {doc_stats(@_)}      ],
     ['Show %INC',      sub {show_inc(@_)}       ],
     ['Reload plugins', sub {reload_plugins(@_)} ],
@@ -53 +52 @@
 }
 
-sub doc_stats {
-    my ($main) = @_;
-    
-    my $doc = Padre::Documents->current;
-    
-    if (not $doc) {
-        Wx::MessageBox( "No file is open", "Stats", Wx::wxOK|Wx::wxCENTRE, $main );
-    }
-    my $text = $doc->text_get;
-    my $str = sprintf("Number of characters in the current file: %s\n", length($text));
-    my $spaces = () = $text =~ /( )/g;
-    $str .= sprintf("Number of spaces: %s\n", $spaces);
-    
-    if (defined $doc->filename) {
-        $str .= sprintf("Filename: '%s'\n", $doc->filename);
-    } else {
-        $str .= "No filename\n";
-    }
-
-    Wx::MessageBox( $str, "Stats", Wx::wxOK|Wx::wxCENTRE, $main );
-    return;
-}
-
 sub reload_plugins {
     my ($main) = @_;

trunk/lib/Padre/Wx/MainWindow.pm

@@ -1500 +1500 @@
     my $src = $self->selected_text;
     my $doc = $self->selected_document;
+    if (not $doc) {
+        $self->message( 'No file is open', 'Stats' );
+        return;
+    }
+
     if ( $src ) {
         $code = $src;
@@ -1520 +1525 @@
     $words++ while ( $code =~ /\b\w+\b/g );
     $chars_without_space++ while ( $code =~ /\S/g );
-
+    
     my $message = <<MESSAGE;
 Words: $words
@@ -1528 +1533 @@
 MESSAGE
 
+    if (defined $doc->filename) {
+        $message .= sprintf("Filename: '%s'\n", $doc->filename);
+    } else {
+        $message .= "No filename\n";
+    }
+
     if ($is_readonly) {
         $message .= "File is read-only.\n";
@@ -1533 +1544 @@
     
     $self->message( $message, 'Stats' );
+    return;
 }