Changeset 12414

Timestamp:

08/31/10 11:00:14 (18 months ago)

Author:

zenogantner

Message:

fix MIME type setting via menu

Location:

trunk/Padre

Files:

• Changes (modified) (1 diff)
• lib/Padre/Document.pm (modified) (3 diffs)
• lib/Padre/Wx/ActionLibrary.pm (modified) (1 diff)

trunk/Padre/Changes

@@ -22 +22 @@
       quickly these days, and delaying image loading should reduce the
       per-thread memory cost more (ADAMK)
+    - Fix MIME type setting via menu (ZENOG)
 
 0.69 2010.08.17

trunk/Padre/lib/Padre/Document.pm

@@ -312 +312 @@
         unless ( $class->VERSION ) {
             eval "require $class;";
-            die("Failed to load $class: $@") if $@;
+            die "Failed to load $class: $@" if $@;
         }
         bless $self, $class;
@@ -322 +322 @@
         if defined( $self->{file} )
             and defined( $self->{file}->{filename} );
-    warn("No module  mime_type='$mime_type' filename='$filename'\n") unless $module;
-
-    #warn("Module '$module' mime_type='$mime_type' filename='$filename'\n") if $module;
+    warn "No module  mime_type='$mime_type' filename='$filename'\n" unless $module;
+
     $self->set_highlighter($module);
 
@@ -976 +975 @@
         $highlighter = 'stc';
     }
-    TRACE( "The highlighter is '$highlighter'" ) if DEBUG;
+    TRACE("The highlighter is '$highlighter'") if DEBUG;
     return Wx::wxSTC_LEX_CONTAINER if $highlighter ne 'stc';
     return Wx::wxSTC_LEX_AUTOMATIC unless defined Padre::MimeTypes->get_lexer( $self->mimetype );

trunk/Padre/lib/Padre/Wx/ActionLibrary.pm

@@ -1404 +1404 @@
                 comment    => _T('Switch document type'),
                 menu_event => sub {
-                    $_[0]->set_mimetype( $mime{$mime_type} );
+                    $_[0]->set_mimetype($mime_type);
                 },
             );