Changeset 10611 for trunk/Padre/lib/Padre/Wx/Directory/OpenInFileBrowserAction.pm

Timestamp:

02/08/10 00:07:56 (2 years ago)

Author:

azawawi

Message:

Refactored OpenInFileBrowserAction? to support "Open with default System Editor" feature on KDE/GNOME unix platforms

File:

• trunk/Padre/lib/Padre/Wx/Directory/OpenInFileBrowserAction.pm (modified) (3 diffs)

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

@@ -64 +64 @@
     }
 
-    my $error = undef;
+    my $error;
     if (Padre::Constant::WIN32) {
 
@@ -72 +72 @@
     } elsif (Padre::Constant::UNIX) {
         my $parent_folder = File::Basename::dirname($filename);
-        if ( defined $ENV{KDE_FULL_SESSION} ) {
-
-            # In KDE, execute: kfmclient exec $filename
-            $error = $self->_execute( 'kfmclient', "exec", $parent_folder );
-        } elsif ( defined $ENV{GNOME_DESKTOP_SESSION_ID} ) {
-
-            # In Gnome, execute: nautilus --nodesktop --browser $filename
-            $error = $self->_execute( 'nautilus', "--no-desktop", "--browser", $parent_folder );
-        } else {
-            $error = "Could not find KDE or GNOME";
-        }
+        $error = $self->_execute_unix($parent_folder);
     } else {
 
-        #Unsupported Operating system.
-        $error = "Unsupported operating system: '$^O'";
+        # Unsupported
+        $error = sprintf(Wx::gettext("Unsupported OS: %s"), '$^O');
     }
 
-    if ( defined $error ) {
-        Wx::MessageBox( $error, Wx::gettext("Error"), Wx::wxOK, $main, );
+    if ( $error ) {
+        $main->error( $error );
     }
 
     return;
+}
+
+#
+# Open with default system editor
+#
+sub open_with_default_system_editor {
+    my ($self, $filename) = @_;
+
+    my $main = Padre::Current->main;
+    unless( $filename ) {
+        $main->error( Wx::gettext("No filename") );
+        return;
+    }
+    
+    my $error;
+    if(Padre::Constant::WIN32) {
+        # Win32
+        require Padre::Util::Win32;
+        Padre::Util::Win32::ExecuteProcessAndWait(
+            directory  => $self->{cwd},
+            file       => $filename,
+            parameters => '',
+            show       => 1);
+    } elsif(Padre::Constant::UNIX) {
+        # Unix
+        $error = $self->_execute_in_file_mananger($filename);
+    } else {
+        # Unsupported
+        $error = sprintf(Wx::gettext("Unsupported OS: %s"), '$^O');
+    }
+    
+    if ( $error ) {
+        $main->error( $error );
+    }
+
+    return; 
+}
+
+#
+# Try to execute a file in KDE or GNOME
+#
+sub _execute_unix {
+    die "Only to be called in UNIX!" unless Padre::Constant::UNIX;
+
+    my ($self, $filename) = @_;
+    
+    my $error;
+    if ( defined $ENV{KDE_FULL_SESSION} ) {
+
+        # In KDE, execute: kfmclient exec $filename
+        $error = $self->_execute( 'kfmclient', "exec", $filename );
+    } elsif ( defined $ENV{GNOME_DESKTOP_SESSION_ID} ) {
+
+        # In Gnome, execute: nautilus --nodesktop --browser $filename
+        $error = $self->_execute( 'nautilus', "--no-desktop", "--browser", $filename );
+    } else {
+        $error = Wx::gettext("Could not find KDE or GNOME");
+    }
+
+    return $error;
 }
 
@@ -102 +152 @@
 =head1 NAME
 
-Padre::Wx::Directory::OpenInFileBrowserAction - Ecliptic's Open in file browser action
+Padre::Wx::Directory::OpenInFileBrowserAction - Open in file browser action
 
 =head1 DESCRIPTION
 
-=head2 Open in File Browser (Shortcut: C<Ctrl+6>)
+=head2 Open in File Browser
 
 For the current saved Padre document, open the platform's file manager/browser and