← Back to branch summary

~kelemeng/gparted/bug913591

« back to all changes in this revision

Viewing changes to src/Win_GParted.cc

  • Committer: Bazaar Package Importer
  • Author(s): Anibal Monsalve Salazar
  • Date: 2010-03-22 13:10:57 UTC
  • mfrom: (12.1.7 sid)
  • Revision ID: james.westby@ubuntu.com-20100322131057-25j89dvs7ttt2gv5
Tags: 0.5.2-2
http://bugs.debian.org/574905
Rebuild against parted 2.2
Closes: 574905

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/Win_GParted.cc
209
209
        hbox_toolbar.pack_start( toolbar_main );
210
210
        
211
211
        //NEW and DELETE
212
 
        toolbutton = Gtk::manage( new Gtk::ToolButton( Gtk::Stock::NEW ) );
 
212
        image = manage( new Gtk::Image( Gtk::Stock::NEW, Gtk::ICON_SIZE_BUTTON ) );
 
213
        /*TO TRANSLATORS: "New" is a tool bar item for partition actions. */
 
214
        Glib::ustring str_temp = _("New") ;
 
215
        toolbutton = Gtk::manage(new Gtk::ToolButton( *image, str_temp ));
213
216
        toolbutton ->signal_clicked() .connect( sigc::mem_fun( *this, &Win_GParted::activate_new ) );
214
217
        toolbar_main .append( *toolbutton );
215
218
        TOOLBAR_NEW = index++ ;
224
227
        
225
228
        //RESIZE/MOVE
226
229
        image = manage( new Gtk::Image( Gtk::Stock::GOTO_LAST, Gtk::ICON_SIZE_BUTTON ) );
227
 
        Glib::ustring str_temp = _("Resize/Move") ;
 
230
        str_temp = _("Resize/Move") ;
228
231
        //Condition string split and Undo button.
229
232
        //  for longer translated string, split string in two and skip the Undo button to permit full toolbar to display
230
233
        //  FIXME:  Is there a better way to do this, perhaps without the conditional?  At the moment this seems to be the best compromise.
293
296
{
294
297
        int index = 0 ;
295
298
        //fill menu_partition
 
299
        image = manage( new Gtk::Image( Gtk::Stock::NEW, Gtk::ICON_SIZE_MENU ) );
296
300
        menu_partition .items() .push_back( 
297
 
                        Gtk::Menu_Helpers::StockMenuElem( Gtk::Stock::NEW,
 
301
                        /*TO TRANSLATORS: "_New" is a sub menu item for the partition menu. */
 
302
                        Gtk::Menu_Helpers::ImageMenuElem( _("_New"), 
 
303
                                                          *image, 
298
304
                                                          sigc::mem_fun(*this, &Win_GParted::activate_new) ) );
299
305
        MENU_NEW = index++ ;
300
306
        
510
516
                        Gtk::FILL );
511
517
        device_info .push_back( Utils::mk_label( "", true, Gtk::ALIGN_LEFT, Gtk::ALIGN_CENTER, false, true ) ) ;
512
518
        table ->attach( * device_info .back(), 1, 2, top++, bottom++, Gtk::FILL ) ;
513
 
        
 
519
 
 
520
        //sector size
 
521
        table ->attach( * Utils::mk_label( " <b>" + static_cast<Glib::ustring>( _("Sector size:") ) + "</b>" ),
 
522
                        0, 1,
 
523
                        top, bottom,
 
524
                        Gtk::FILL );
 
525
        device_info .push_back( Utils::mk_label( "", true, Gtk::ALIGN_LEFT, Gtk::ALIGN_CENTER, false, true ) ) ;
 
526
        table ->attach( * device_info .back(), 1, 2, top++, bottom++, Gtk::FILL ) ;
 
527
 
514
528
        vbox_info .pack_start( *table, Gtk::PACK_SHRINK );
515
529
}
516
530
 
640
654
                device_info[ t++ ] ->set_text( Utils::num_to_str( devices[ current_device ] .sectors ) );
641
655
                device_info[ t++ ] ->set_text( Utils::num_to_str( devices[ current_device ] .cylinders ) );
642
656
                device_info[ t++ ] ->set_text( Utils::num_to_str( devices[ current_device ] .length ) );
 
657
                device_info[ t++ ] ->set_text( Utils::num_to_str( devices[ current_device ] .sector_size ) );
643
658
        }
644
659
}
645
660
 
1501
1516
                                  new_count,
1502
1517
                                  gparted_core .get_filesystems(),
1503
1518
                                  devices[ current_device ] .readonly,
1504
 
                                  devices[ current_device ] .cylsize ) ;
 
1519
                                  devices[ current_device ] .cylsize,
 
1520
                                  devices[ current_device ] .disktype ) ;
1505
1521
                
1506
1522
                dialog .set_transient_for( *this );
1507
1523