Advertisement
Guest User

DrawingTool.patch

a guest
Jul 11th, 2013
97
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
Diff 3.69 KB | None | 0 0
  1. --- a/resources/modules/Shutter/Draw/DrawingTool.pm
  2. +++ b/resources/modules/Shutter/Draw/DrawingTool.pm
  3. @@ -619,7 +619,7 @@
  4.      $self->{_font_btn_wh} = $self->{_font_btn_w}->signal_connect(
  5.          'font-set' => sub {
  6.              my $font_descr = Gtk2::Pango::FontDescription->from_string( $self->{_font_btn_w}->get_font_name );
  7. -            $self->{_font} = $font_descr->to_string;
  8. +            $self->{_font} = $self->{_font_btn_w}->get_font_name;
  9.  
  10.              if ( $self->{_current_item} ) {
  11.  
  12. @@ -3312,7 +3312,7 @@
  13.                  }
  14.  
  15.                  #apply current font settings to button
  16. -                $self->{_font_btn_w}->set_font_name( $font_desc->to_string );
  17. +                $self->{_font_btn_w}->set_font_name( $self->{_font} );
  18.  
  19.              }
  20.          }
  21. @@ -3344,7 +3344,7 @@
  22.          $self->{_stroke_color_w}->set_alpha( int( $self->{_items}{$key}{stroke_color_alpha} * 65535 ) );
  23.  
  24.          #apply current font settings to button
  25. -        $self->{_font_btn_w}->set_font_name( $font_desc->to_string );
  26. +        $self->{_font_btn_w}->set_font_name( $self->{_font} );
  27.  
  28.      }
  29.  
  30. @@ -3355,7 +3355,7 @@
  31.      $self->{_fill_color}         = $self->{_fill_color_w}->get_color;
  32.      $self->{_fill_color_alpha}   = $self->{_fill_color_w}->get_alpha / 65636;
  33.      my $font_descr = Gtk2::Pango::FontDescription->from_string( $self->{_font_btn_w}->get_font_name );
  34. -    $self->{_font} = $font_descr->to_string;
  35. +    $self->{_font} = $self->{_font_btn_w}->get_font_name;
  36.  
  37.      #unblock 'value-change' handlers for widgets
  38.      $self->{_line_spin_w}->signal_handler_unblock( $self->{_line_spin_wh} );
  39. @@ -3441,7 +3441,7 @@
  40.      $self->{_fill_color}         = $self->{_fill_color_w}->get_color;
  41.      $self->{_fill_color_alpha}   = $self->{_fill_color_w}->get_alpha / 65636;
  42.      my $font_descr = Gtk2::Pango::FontDescription->from_string( $self->{_font_btn_w}->get_font_name );
  43. -    $self->{_font} = $font_descr->to_string;
  44. +    $self->{_font} = $self->{_font_btn_w}->get_font_name;
  45.  
  46.      #unblock 'value-change' handlers for widgets
  47.      $self->{_line_spin_w}->signal_handler_unblock( $self->{_line_spin_wh} );
  48. @@ -4302,7 +4302,7 @@
  49.              }
  50.  
  51.              #apply current font settings to button
  52. -            $font_btn->set_font_name( $font_desc->to_string );
  53. +            $font_btn->set_font_name( $self->{_font} );
  54.  
  55.              $font_hbox->pack_start( $font_label, FALSE, TRUE, 12 );
  56.              $font_hbox->pack_start( $font_btn,   TRUE,  TRUE, 0 );
  57. @@ -4507,7 +4507,7 @@
  58.          );
  59.  
  60.          #apply current font settings to button
  61. -        $font_btn->set_font_name( $font_desc->to_string );
  62. +        $font_btn->set_font_name( $self->{_font} );
  63.  
  64.          #FIXME >> why do we have to invoke this manually??
  65.          $font_btn->signal_emit('font-set');
  66. @@ -4767,7 +4767,7 @@
  67.  
  68.              my $font_descr = Gtk2::Pango::FontDescription->from_string( $font_btn->get_font_name );
  69.              $self->{_items}{$key}{text}->set(
  70. -                'text'         => "<span font_desc=' " . $font_descr->to_string . " ' >" . $digit . "</span>",
  71. +                'text'         => "<span font_desc=' " . $font_btn->get_font_name . " ' >" . $digit . "</span>",
  72.                  'fill-pattern' => $fill_pattern,
  73.              );
  74.  
  75. @@ -4884,7 +4884,7 @@
  76.          }
  77.  
  78.          $item->set(
  79. -            'text'         => "<span font_desc=' " . $font_descr->to_string . " ' >" . Glib::Markup::escape_text($new_text) . "</span>",
  80. +            'text'         => "<span font_desc=' " . $font_btn->get_font_name . " ' >" . Glib::Markup::escape_text($new_text) . "</span>",
  81.              'width'        => -1,
  82.              'use-markup'   => TRUE,
  83.              'fill-pattern' => $fill_pattern
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement