Changeset 476

Timestamp:

10/26/08 03:22:08 (3 years ago)

Author:

szabgab

Message:

move save_file to Padre::Document

Location:

trunk/lib/Padre

Files:

• Document.pm (modified) (1 diff)
• Wx/MainWindow.pm (modified) (2 diffs)

trunk/lib/Padre/Document.pm

@@ -297 +297 @@
 }
 
+sub save_file {
+    my ($self) = @_;
+    my $content      = $self->text_get;
+    my $filename     = $self->filename;
+    #my $newline_type = $self->get_newline_type;
+
+    eval {
+        File::Slurp::write_file($filename, {binmode => ':raw'}, $content);
+    };
+    if ($@) {
+        return "Could not save: $!";
+    }
+    return;
+}
+
 sub set_newline_type {
     $_[0]->{newline_type} = $_[1];

trunk/lib/Padre/Wx/MainWindow.pm

@@ -9 +9 @@
 use Data::Dumper   ();
 use File::Spec     ();
-use File::Slurp    ();
 use File::Basename ();
 use List::Util     ();
@@ -952 +951 @@
 
     my $page         = $self->{notebook}->GetPage($id);
-    my $content      = $page->GetText;
     my $doc          = Padre::Documents->by_id($id) or return;
-    my $filename     = $doc->filename;
-    my $newline_type = $doc->get_newline_type;
-
-    eval {
-        File::Slurp::write_file($filename, {binmode => ':raw'}, $content);
-    };
-    if ($@) {
-        Wx::MessageBox("Could not save: $!", "Error", Wx::wxOK, $self);
+
+    my $error = $doc->save_file;
+    if ($error) {
+        Wx::MessageBox($error, "Error", Wx::wxOK, $self);
         return;
     }
-    Padre::DB->add_recent_files($filename);
-    #$self->{notebook}->SetPageText($id, File::Basename::basename($filename));
+
+    Padre::DB->add_recent_files($doc->filename);
     $page->SetSavePoint;
     $self->refresh_status;