← Back to branch summary

~mario-kemper/shutter/0.9x

« back to all changes in this revision

Viewing changes to share/shutter/resources/modules/Shutter/App/Menu.pm

  • Committer: Mario Kemper
  • Date: 2012-11-27 16:07:42 UTC
  • mfrom: (1236.1.1 upstream)
  • Revision ID: mario.kemper@googlemail.com-20121127160742-o8lo38uw6jk1d9jk
merge lp:~jbicha/shutter/improve-icon-naming

Show diffs side-by-side

added added

removed removed

Lines of Context:
share/shutter/resources/modules/Shutter/App/Menu.pm
168
168
 
169
169
        $self->{_menuitem_email} = Gtk2::ImageMenuItem->new($d->get('Send by E_mail...'));
170
170
        $self->{_menuitem_email}->set_image(
171
 
                Gtk2::Image->new_from_icon_name( 'gnome-stock-mail-snd', 'menu' )
 
171
                Gtk2::Image->new_from_icon_name( 'mail-send', 'menu' )
172
172
        );
173
173
        $self->{_menuitem_email}->set_sensitive(FALSE);
174
174
        $self->{_menuitem_email}->add_accelerator( 'activate', $accel_group, Gtk2::Accelerator->parse('<Shift><Control>E'), qw/visible/ );
233
233
 
234
234
        $self->{_menuitem_trash} = Gtk2::ImageMenuItem->new_with_mnemonic( $d->get('Move to _Trash') );
235
235
        $self->{_menuitem_trash}->add_accelerator( 'activate', $accel_group, Gtk2::Accelerator->parse('Delete'), qw/visible/ );
236
 
        $self->{_menuitem_trash}->set_image( Gtk2::Image->new_from_icon_name( 'gnome-stock-trash', 'menu' ) );
 
236
        $self->{_menuitem_trash}->set_image( Gtk2::Image->new_from_icon_name( 'user-trash', 'menu' ) );
237
237
        $self->{_menuitem_trash}->set_sensitive(FALSE);
238
238
        $self->{_menu_edit}->append( $self->{_menuitem_trash} );
239
239
 
469
469
 
470
470
        #awindow
471
471
        $self->{_menuitem_awindow} = Gtk2::ImageMenuItem->new_with_mnemonic( $d->get('_Active Window') );
472
 
        if($icontheme->has_icon('gnome-window-manager')){
473
 
                $self->{_menuitem_awindow}->set_image( Gtk2::Image->new_from_icon_name( 'gnome-window-manager', 'menu' ) );     
 
472
        if($icontheme->has_icon('preferences-system-windows')){
 
473
                $self->{_menuitem_awindow}->set_image( Gtk2::Image->new_from_icon_name( 'preferences-system-windows', 'menu' ) );       
474
474
        }else{
475
475
                $self->{_menuitem_awindow}->set_image(
476
476
                        Gtk2::Image->new_from_pixbuf(
482
482
 
483
483
        #window
484
484
        $self->{_menuitem_window} = Gtk2::ImageMenuItem->new_with_mnemonic( $d->get('Select W_indow') );
485
 
        if($icontheme->has_icon('gnome-window-manager')){
486
 
                $self->{_menuitem_window}->set_image( Gtk2::Image->new_from_icon_name( 'gnome-window-manager', 'menu' ) );      
 
485
        if($icontheme->has_icon('preferences-system-windows')){
 
486
                $self->{_menuitem_window}->set_image( Gtk2::Image->new_from_icon_name( 'preferences-system-windows', 'menu' ) );        
487
487
        }else{
488
488
                $self->{_menuitem_window}->set_image(
489
489
                        Gtk2::Image->new_from_pixbuf(
527
527
 
528
528
        #tooltip
529
529
        $self->{_menuitem_tooltip} = Gtk2::ImageMenuItem->new_with_mnemonic( $d->get('_Tooltip') );
530
 
        #~ if($icontheme->has_icon('alacarte')){
531
 
                #~ $self->{_menuitem_tooltip}->set_image( Gtk2::Image->new_from_icon_name( 'alacarte', 'menu' ) );              
532
 
        #~ }else{
 
530
        if($icontheme->has_icon('help-faq')){
 
531
                $self->{_menuitem_tooltip}->set_image( Gtk2::Image->new_from_icon_name( 'help-faq', 'menu' ) );         
 
532
        }else{
533
533
                $self->{_menuitem_tooltip}->set_image(
534
534
                        Gtk2::Image->new_from_pixbuf(
535
535
                                Gtk2::Gdk::Pixbuf->new_from_file_at_size(
538
538
                                )
539
539
                        )
540
540
                );
541
 
        #~ }
 
541
        }
542
542
        $self->{_menu_new}->append( $self->{_menuitem_tooltip} );
543
543
 
544
544
        #~ $self->{_menu_new}->append( Gtk2::SeparatorMenuItem->new );