Changeset 2257

Timestamp:

12/29/08 21:18:05 (3 years ago)

Author:

adamk

Message:

Move the status bar out into it's own encapsulated class

Location:

trunk/Padre/lib/Padre/Wx

Files:

• MainWindow.pm (modified) (8 diffs)
• StatusBar.pm (added)

trunk/Padre/lib/Padre/Wx/MainWindow.pm

@@ -33 +33 @@
 use Padre::Wx                 ();
 use Padre::Wx::Editor         ();
+use Padre::Wx::Output         ();
 use Padre::Wx::ToolBar        ();
-use Padre::Wx::Output         ();
+use Padre::Wx::StatusBar      ();
 use Padre::Wx::ErrorList      ();
 use Padre::wx::AuiManager     ();
@@ -106 +107 @@
     $self->{locale} = Padre::Locale::object();
 
+    # Drag and drop support
     $self->SetDropTarget(
         Padre::Wx::FileDropTarget->new($self)
@@ -114 +116 @@
     $self->{_methods} = [];
 
+    # Temporary store for the notebook tab history
+    # TODO: Storing this here (might) violate encapsulation.
+    #       It should probably be in the notebook object.
+    $self->{page_history} = [];
+
     # Set the window manager
     $self->{manager} = Padre::Wx::AuiManager->new($self);
@@ -120 +127 @@
     $self->{marker} = {};
 
-    $self->{page_history} = [];
+    # Create the status bar
+    $self->{gui}->{statusbar} = Padre::Wx::StatusBar->new($self);
 
     # create basic window components
@@ -153 +161 @@
         my $mod  = $event->GetModifiers || 0;
         my $code = $event->GetKeyCode;
-        
+
         # remove the bit ( Wx::wxMOD_META) set by Num Lock being pressed on Linux
         $mod = $mod & (Wx::wxMOD_ALT() + Wx::wxMOD_CMD() + Wx::wxMOD_SHIFT());
@@ -215 +223 @@
     $self->GetToolBar->Realize;
 
-    # Create the status bar
-    unless ( defined $self->{gui}->{statusbar} ) {
-        $self->{gui}->{statusbar} = $self->CreateStatusBar( 1, Wx::wxST_SIZEGRIP|Wx::wxFULL_REPAINT_ON_RESIZE );
-        $self->{gui}->{statusbar}->SetFieldsCount(4);
-        $self->{gui}->{statusbar}->SetStatusWidths(-1, 100, 50, 100);
-    }
-
-    return;
-}
-
+    return;
+}
 
 sub create_editor_pane {
@@ -562 +562 @@
 
 sub refresh_status {
-    my ($self) = @_;
+    my $self = shift;
     return if $self->no_refresh;
-
-    my $pageid = $self->nb->GetSelection();
-    if (not defined $pageid or $pageid == -1) {
-        $self->SetStatusText("", $_) for (0..3);
-        return;
-    }
-    my $editor       = $self->nb->GetPage($pageid);
-    my $doc          = Padre::Documents->current or return;
-    my $line         = $editor->GetCurrentLine;
-    my $filename     = $doc->filename || '';
-    my $newline_type = $doc->get_newline_type || Padre::Util::NEWLINE;
-    my $modified     = $editor->GetModify ? '*' : ' ';
-
-    if ($filename) {
-        $self->nb->SetPageText($pageid, $modified . File::Basename::basename $filename);
-    } else {
-        my $text = substr($self->nb->GetPageText($pageid), 1);
-        $self->nb->SetPageText($pageid, $modified . $text);
-    }
-
-    my $pos   = $editor->GetCurrentPos;
-    my $start = $editor->PositionFromLine($line);
-    my $char  = $pos-$start;
-
-    $self->SetStatusText("$modified $filename",             0);
-
-    my $charWidth = $self->{gui}->{statusbar}->GetCharWidth;
-    my $mt = $doc->get_mimetype;
-    my $curPos = Wx::gettext('L:') . ($line + 1) . ' ' . Wx::gettext('Ch:') . $char;
-
-    $self->SetStatusText($mt,           1);
-    $self->SetStatusText($newline_type, 2);
-    $self->SetStatusText($curPos,       3);
-
-    # since charWidth is an average we adjust the values a little
-    $self->{gui}->{statusbar}->SetStatusWidths(
-        -1,
-        (length($mt)           - 1) * $charWidth,
-        (length($newline_type) + 2) * $charWidth,
-        (length($curPos)       + 1) * $charWidth
-    ); 
-
-    return;
+    $self->GetStatusBar->refresh;
 }
 
@@ -1983 +1941 @@
 
     my $editor = $self->selected_editor;
-    #$editor->SetEOLMode( $mode{$newline_type} );
     $editor->ConvertEOLs( $Padre::Wx::Editor::mode{$newline_type} );