~ubuntu-branches/ubuntu/utopic/shutter/utopic

« back to all changes in this revision

Viewing changes to share/shutter/resources/modules/Shutter/Draw/DrawingTool.pm

  • Committer: Package Import Robot
  • Author(s): Andrew Starr-Bochicchio
  • Date: 2014-08-10 13:16:49 UTC
  • mfrom: (1.1.14)
  • Revision ID: package-import@ubuntu.com-20140810131649-5whtqvtrkwfhhgvp
Tags: 0.92-0.1ubuntu1
* Merge from debian. Remaining changes:
 - debian/control: Recommend libgtk2-appindicator-perl

Show diffs side-by-side

added added

removed removed

Lines of Context:
6649
6649
 
6650
6650
        $menu_objects->append( Gtk2::SeparatorMenuItem->new );
6651
6651
 
6652
 
        #objects from icontheme
6653
 
        if ( Gtk2->CHECK_VERSION( 2, 12, 0 ) ) {
6654
 
            my $icontheme = Gtk2::IconTheme->get_default;
6655
 
 
6656
 
            my $utheme_item = Gtk2::ImageMenuItem->new_with_label( $self->{_d}->get("Import from current theme...") );
6657
 
            $utheme_item->set( 'always_show_image' => TRUE ) if Gtk2->CHECK_VERSION( 2, 16, 0 );
6658
 
            if ( $icontheme->has_icon('preferences-desktop-theme') ) {
6659
 
                $utheme_item->set_image( Gtk2::Image->new_from_icon_name( 'preferences-desktop-theme', 'menu' ) );
6660
 
            }
6661
 
 
6662
 
            $utheme_item->set_submenu( $self->import_from_utheme( $icontheme, $button ) );
6663
 
 
6664
 
            $menu_objects->append($utheme_item);
6665
 
 
6666
 
            $menu_objects->append( Gtk2::SeparatorMenuItem->new );
6667
 
        }
 
6652
        #~ #objects from icontheme
 
6653
        #~ if ( Gtk2->CHECK_VERSION( 2, 12, 0 ) ) {
 
6654
            #~ my $icontheme = Gtk2::IconTheme->get_default;
 
6655
#~ 
 
6656
            #~ my $utheme_item = Gtk2::ImageMenuItem->new_with_label( $self->{_d}->get("Import from current theme...") );
 
6657
            #~ $utheme_item->set( 'always_show_image' => TRUE ) if Gtk2->CHECK_VERSION( 2, 16, 0 );
 
6658
            #~ if ( $icontheme->has_icon('preferences-desktop-theme') ) {
 
6659
                #~ $utheme_item->set_image( Gtk2::Image->new_from_icon_name( 'preferences-desktop-theme', 'menu' ) );
 
6660
            #~ }
 
6661
#~ 
 
6662
            #~ $utheme_item->set_submenu( $self->import_from_utheme( $icontheme, $button ) );
 
6663
#~ 
 
6664
            #~ $menu_objects->append($utheme_item);
 
6665
#~ 
 
6666
            #~ $menu_objects->append( Gtk2::SeparatorMenuItem->new );
 
6667
        #~ }
6668
6668
 
6669
6669
        #objects from session
6670
6670
        my $session_menu_item = Gtk2::ImageMenuItem->new_with_label( $self->{_d}->get("Import from session...") );