Changeset 10604

Timestamp:

02/07/10 10:59:12 (2 years ago)

Author:

azawawi

Message:

More error checking and simplification

Location:

trunk/Padre/lib/Padre

Files:

• Action/File.pm (modified) (1 diff)
• Wx/Directory/OpenInFileBrowserAction.pm (modified) (1 diff)
• Wx/Main.pm (modified) (1 diff)

trunk/Padre/lib/Padre/Action/File.pm

@@ -129 +129 @@
         name       => 'file.open_with_default_system_editor',
         label      => Wx::gettext('Open with Default System Editor'),
+        need_editor => 1,
+        need_file   => 1,
         comment    => Wx::gettext('Opens the file with the default system editor'),
         menu_event => sub {

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

@@ -59 +59 @@
     my $main = Padre::Current->main;
 
-    if ( not defined $filename ) {
-        Wx::MessageBox( Wx::gettext("No filename"), Wx::gettext('Error'), Wx::wxOK, $main, );
+    unless( $filename ) {
+        $main->error( Wx::gettext("No filename") );
         return;
     }

trunk/Padre/lib/Padre/Wx/Main.pm

@@ -3661 +3661 @@
     my $self = shift;
     my $document = $self->current->document or return;
-    my $filename = $document->filename or return;
+    my $filename = $document->filename;
+
+    unless( $filename ) {
+        $self->error( Wx::gettext("No filename") );
+        return;
+    }
 
     if(Padre::Constant::WIN32) {