removed expander. The diskinfo is now always visible.

This commit is contained in:
Bart Hakvoort 2004-09-25 21:59:53 +00:00
parent 44765fe784
commit 45603da944
2 changed files with 10 additions and 15 deletions

View File

@ -36,7 +36,6 @@
#include <gtkmm/toolbar.h> #include <gtkmm/toolbar.h>
#include <gtkmm/separatortoolitem.h> #include <gtkmm/separatortoolitem.h>
#include <gtkmm/menubar.h> #include <gtkmm/menubar.h>
#include <gtkmm/expander.h>
#include <gtkmm/statusbar.h> #include <gtkmm/statusbar.h>
#include <gtkmm/radiobutton.h> #include <gtkmm/radiobutton.h>
#include <gtkmm/liststore.h> #include <gtkmm/liststore.h>
@ -127,7 +126,6 @@ private:
Gtk::Menu menu_devices,menu_popup, menu_convert, *menu ; Gtk::Menu menu_devices,menu_popup, menu_convert, *menu ;
Gtk::ToolButton *toolbutton; Gtk::ToolButton *toolbutton;
Gtk::Statusbar statusbar; Gtk::Statusbar statusbar;
Gtk::Expander expander_device_info ;
Gtk::Image *image ; Gtk::Image *image ;
Gtk::ScrolledWindow *scrollwindow; Gtk::ScrolledWindow *scrollwindow;
Gtk::Label label_device_info1, label_device_info2, *label; Gtk::Label label_device_info1, label_device_info2, *label;

View File

@ -201,7 +201,13 @@ void Win_GParted::init_convert_menu()
void Win_GParted::init_device_info() void Win_GParted::init_device_info()
{ {
vbox = manage( new Gtk::VBox() ) ; vbox_info.set_spacing( 5 );
//title
label = manage( new Gtk::Label() ) ;
label ->set_alignment( Gtk::ALIGN_LEFT ) ;
label ->set_markup( " <b>" + (Glib::ustring) _( "Harddisk Information:" ) + "</b>" ) ;
vbox_info .pack_start( *label, Gtk::PACK_SHRINK );
//global device info //global device info
table = manage( new Gtk::Table() ) ; table = manage( new Gtk::Table() ) ;
@ -219,7 +225,7 @@ void Win_GParted::init_device_info()
label_device_info1 .set_selectable( true ) ; label_device_info1 .set_selectable( true ) ;
table ->attach( label_device_info1, 1,2,0,1,Gtk::SHRINK); table ->attach( label_device_info1, 1,2,0,1,Gtk::SHRINK);
vbox ->pack_start( *table, Gtk::PACK_SHRINK ) ; vbox_info .pack_start( *table, Gtk::PACK_SHRINK );
//detailed device info //detailed device info
table = manage( new Gtk::Table() ) ; table = manage( new Gtk::Table() ) ;
@ -232,16 +238,7 @@ void Win_GParted::init_device_info()
label_device_info2 .set_selectable( true ) ; label_device_info2 .set_selectable( true ) ;
table ->attach( label_device_info2, 1,2,0,1,Gtk::SHRINK); table ->attach( label_device_info2, 1,2,0,1,Gtk::SHRINK);
vbox ->pack_start( *table, Gtk::PACK_SHRINK ) ; vbox_info .pack_start( *table, Gtk::PACK_SHRINK );
//add the vbox to the expander
expander_device_info.add( *vbox );
expander_device_info.set_use_markup( true );
expander_device_info.set_label( "<b>" + (Glib::ustring) _( "Harddisk Information:" ) + "</b>" );
//and add the expander to vbox_info
vbox_info.set_spacing( 5 );
vbox_info.pack_start( expander_device_info, Gtk::PACK_SHRINK );
} }
void Win_GParted::init_operationslist() void Win_GParted::init_operationslist()
@ -306,7 +303,7 @@ void Win_GParted::init_hpaned_main()
scrollwindow ->add ( treeview_detail ); scrollwindow ->add ( treeview_detail );
hpaned_main.pack2( *scrollwindow, true,true ); hpaned_main.pack2( *scrollwindow, true,true );
hpaned_main.set_position( 260 ); hpaned_main.set_position( 220 );
} }
void Win_GParted::Find_Devices() void Win_GParted::Find_Devices()