Menu
▾
▴
[Morphix-cvs] morphixinstaller/src interface.c,1.11,1.12 interface.h,1.3,1.4
|
From: <ale...@us...> - 2004-01-03 22:00:04
|
Update of /cvsroot/morphix/morphixinstaller/src
In directory sc8-pr-cvs1:/tmp/cvs-serv24467/src
Modified Files:
interface.c interface.h
Log Message:
removed some old gui code
Index: interface.c
===================================================================
RCS file: /cvsroot/morphix/morphixinstaller/src/interface.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** interface.c 26 Oct 2003 22:56:18 -0000 1.11
--- interface.c 3 Jan 2004 21:59:57 -0000 1.12
***************
*** 71,74 ****
--- 71,75 ----
gtk_box_pack_end (GTK_BOX (hbox2), label2, TRUE, FALSE, 0);
gtk_widget_set_size_request (label2, 400, 200);
+ gtk_label_set_justify (GTK_LABEL (label2), GTK_JUSTIFY_CENTER);
gtk_label_set_line_wrap (GTK_LABEL (label2), TRUE);
***************
*** 146,149 ****
--- 147,151 ----
gtk_widget_show (label25);
gtk_box_pack_start (GTK_BOX (vbox44), label25, TRUE, TRUE, 0);
+ gtk_label_set_justify (GTK_LABEL (label25), GTK_JUSTIFY_CENTER);
scrolledwindow1 = gtk_scrolled_window_new (NULL, NULL);
***************
*** 232,236 ****
gtk_widget_show (label32);
gtk_box_pack_start (GTK_BOX (vbox2), label32, FALSE, FALSE, 0);
! gtk_widget_set_size_request (label32, 51, -2);
gtk_label_set_line_wrap (GTK_LABEL (label32), TRUE);
--- 234,239 ----
gtk_widget_show (label32);
gtk_box_pack_start (GTK_BOX (vbox2), label32, FALSE, FALSE, 0);
! gtk_widget_set_size_request (label32, 51, -1);
! gtk_label_set_justify (GTK_LABEL (label32), GTK_JUSTIFY_CENTER);
gtk_label_set_line_wrap (GTK_LABEL (label32), TRUE);
***************
*** 247,254 ****
gtk_box_pack_start (GTK_BOX (hbox4), vbox3, TRUE, TRUE, 0);
! label4 = gtk_label_new (_("Please select your harddisk,\nthis will launch a Linux partitioning tool.\n\nMake sure you have at least one Linux and one swap partition\n"));
gtk_widget_show (label4);
gtk_box_pack_start (GTK_BOX (vbox3), label4, FALSE, FALSE, 0);
gtk_widget_set_size_request (label4, 400, 200);
gtk_label_set_line_wrap (GTK_LABEL (label4), TRUE);
--- 250,258 ----
gtk_box_pack_start (GTK_BOX (hbox4), vbox3, TRUE, TRUE, 0);
! label4 = gtk_label_new (_("Please select your harddisk,\nthis will launch cfdisk, a partition tool for Linux. \nIt is console-based, but temporary.\n\nMake sure you have at least one Linux and one swap partition\n"));
gtk_widget_show (label4);
gtk_box_pack_start (GTK_BOX (vbox3), label4, FALSE, FALSE, 0);
gtk_widget_set_size_request (label4, 400, 200);
+ gtk_label_set_justify (GTK_LABEL (label4), GTK_JUSTIFY_CENTER);
gtk_label_set_line_wrap (GTK_LABEL (label4), TRUE);
***************
*** 267,270 ****
--- 271,275 ----
gtk_widget_show (label44);
gtk_box_pack_start (GTK_BOX (vbox3), label44, TRUE, TRUE, 0);
+ gtk_label_set_justify (GTK_LABEL (label44), GTK_JUSTIFY_CENTER);
dialog_action_area5 = GTK_DIALOG (SelectHarddisk)->action_area;
***************
*** 370,374 ****
gtk_widget_show (label33);
gtk_box_pack_start (GTK_BOX (vbox4), label33, FALSE, FALSE, 0);
! gtk_widget_set_size_request (label33, 51, -2);
gtk_label_set_line_wrap (GTK_LABEL (label33), TRUE);
--- 375,380 ----
gtk_widget_show (label33);
gtk_box_pack_start (GTK_BOX (vbox4), label33, FALSE, FALSE, 0);
! gtk_widget_set_size_request (label33, 51, -1);
! gtk_label_set_justify (GTK_LABEL (label33), GTK_JUSTIFY_CENTER);
gtk_label_set_line_wrap (GTK_LABEL (label33), TRUE);
***************
*** 389,392 ****
--- 395,399 ----
gtk_box_pack_start (GTK_BOX (vbox5), label5, FALSE, FALSE, 0);
gtk_widget_set_size_request (label5, 400, 200);
+ gtk_label_set_justify (GTK_LABEL (label5), GTK_JUSTIFY_CENTER);
gtk_label_set_line_wrap (GTK_LABEL (label5), TRUE);
***************
*** 464,468 ****
GtkWidget *vbox6;
GtkWidget *image5;
- GtkWidget *progressbar4;
GtkWidget *vseparator5;
GtkWidget *hbox8;
--- 471,474 ----
***************
*** 493,503 ****
gtk_box_pack_start (GTK_BOX (vbox6), image5, TRUE, TRUE, 0);
- progressbar4 = gtk_progress_bar_new ();
- gtk_widget_show (progressbar4);
- gtk_box_pack_start (GTK_BOX (vbox6), progressbar4, FALSE, FALSE, 0);
- gtk_progress_bar_set_orientation (GTK_PROGRESS_BAR (progressbar4), GTK_PROGRESS_BOTTOM_TO_TOP);
- gtk_progress_bar_set_fraction (GTK_PROGRESS_BAR (progressbar4), 0.05);
- gtk_progress_bar_set_text (GTK_PROGRESS_BAR (progressbar4), _("5%"));
-
vseparator5 = gtk_vseparator_new ();
gtk_widget_show (vseparator5);
--- 499,502 ----
***************
*** 516,519 ****
--- 515,519 ----
gtk_box_pack_start (GTK_BOX (vbox7), label6, FALSE, FALSE, 0);
gtk_widget_set_size_request (label6, 400, 200);
+ gtk_label_set_justify (GTK_LABEL (label6), GTK_JUSTIFY_CENTER);
gtk_label_set_line_wrap (GTK_LABEL (label6), TRUE);
gtk_misc_set_padding (GTK_MISC (label6), 28, 0);
***************
*** 546,550 ****
GLADE_HOOKUP_OBJECT (NoPart, vbox6, "vbox6");
GLADE_HOOKUP_OBJECT (NoPart, image5, "image5");
- GLADE_HOOKUP_OBJECT (NoPart, progressbar4, "progressbar4");
GLADE_HOOKUP_OBJECT (NoPart, vseparator5, "vseparator5");
GLADE_HOOKUP_OBJECT (NoPart, hbox8, "hbox8");
--- 546,549 ----
***************
*** 622,626 ****
gtk_widget_show (label34);
gtk_box_pack_start (GTK_BOX (vbox8), label34, FALSE, FALSE, 0);
! gtk_widget_set_size_request (label34, 51, -2);
gtk_label_set_line_wrap (GTK_LABEL (label34), TRUE);
--- 621,626 ----
gtk_widget_show (label34);
gtk_box_pack_start (GTK_BOX (vbox8), label34, FALSE, FALSE, 0);
! gtk_widget_set_size_request (label34, 51, -1);
! gtk_label_set_justify (GTK_LABEL (label34), GTK_JUSTIFY_CENTER);
gtk_label_set_line_wrap (GTK_LABEL (label34), TRUE);
***************
*** 641,644 ****
--- 641,645 ----
gtk_box_pack_start (GTK_BOX (vbox13), label9, FALSE, FALSE, 0);
gtk_widget_set_size_request (label9, 400, 100);
+ gtk_label_set_justify (GTK_LABEL (label9), GTK_JUSTIFY_CENTER);
gtk_label_set_line_wrap (GTK_LABEL (label9), TRUE);
gtk_misc_set_alignment (GTK_MISC (label9), 0, 0.75);
***************
*** 658,661 ****
--- 659,663 ----
gtk_box_pack_start (GTK_BOX (vbox13), label40, FALSE, FALSE, 0);
gtk_widget_set_size_request (label40, 400, 80);
+ gtk_label_set_justify (GTK_LABEL (label40), GTK_JUSTIFY_CENTER);
gtk_label_set_line_wrap (GTK_LABEL (label40), TRUE);
gtk_misc_set_alignment (GTK_MISC (label40), 0.5, 0.75);
***************
*** 721,731 ****
gtk_widget_show (label42);
gtk_box_pack_start (GTK_BOX (hbox33), label42, FALSE, FALSE, 0);
- gtk_label_set_justify (GTK_LABEL (label42), GTK_JUSTIFY_LEFT);
label41 = gtk_label_new (_("Next all changes will be made to your system.\nPlease make sure that you have entered all\ninformation correctly, if you have any doubt\nplease go back and correct your settings!"));
gtk_widget_show (label41);
gtk_box_pack_start (GTK_BOX (vbox13), label41, FALSE, FALSE, 0);
! gtk_widget_set_size_request (label41, -2, 100);
! gtk_label_set_justify (GTK_LABEL (label41), GTK_JUSTIFY_LEFT);
dialog_action_area8 = GTK_DIALOG (SelectRoot)->action_area;
--- 723,731 ----
gtk_widget_show (label42);
gtk_box_pack_start (GTK_BOX (hbox33), label42, FALSE, FALSE, 0);
label41 = gtk_label_new (_("Next all changes will be made to your system.\nPlease make sure that you have entered all\ninformation correctly, if you have any doubt\nplease go back and correct your settings!"));
gtk_widget_show (label41);
gtk_box_pack_start (GTK_BOX (vbox13), label41, FALSE, FALSE, 0);
! gtk_widget_set_size_request (label41, -1, 100);
dialog_action_area8 = GTK_DIALOG (SelectRoot)->action_area;
***************
*** 871,874 ****
--- 871,875 ----
gtk_box_pack_start (GTK_BOX (vbox16), label12, FALSE, FALSE, 0);
gtk_widget_set_size_request (label12, 400, 200);
+ gtk_label_set_justify (GTK_LABEL (label12), GTK_JUSTIFY_CENTER);
gtk_label_set_line_wrap (GTK_LABEL (label12), TRUE);
gtk_misc_set_padding (GTK_MISC (label12), 28, 0);
***************
*** 920,924 ****
GtkWidget *vbox18;
GtkWidget *image9;
- GtkWidget *progressbar8;
GtkWidget *vseparator9;
GtkWidget *hbox16;
--- 921,924 ----
***************
*** 948,958 ****
gtk_box_pack_start (GTK_BOX (vbox18), image9, TRUE, TRUE, 0);
- progressbar8 = gtk_progress_bar_new ();
- gtk_widget_show (progressbar8);
- gtk_box_pack_start (GTK_BOX (vbox18), progressbar8, FALSE, FALSE, 0);
- gtk_progress_bar_set_orientation (GTK_PROGRESS_BAR (progressbar8), GTK_PROGRESS_BOTTOM_TO_TOP);
- gtk_progress_bar_set_fraction (GTK_PROGRESS_BAR (progressbar8), 0.1);
- gtk_progress_bar_set_text (GTK_PROGRESS_BAR (progressbar8), _("10%"));
-
vseparator9 = gtk_vseparator_new ();
gtk_widget_show (vseparator9);
--- 948,951 ----
***************
*** 971,974 ****
--- 964,968 ----
gtk_box_pack_start (GTK_BOX (vbox19), label11, FALSE, FALSE, 0);
gtk_widget_set_size_request (label11, 400, 200);
+ gtk_label_set_justify (GTK_LABEL (label11), GTK_JUSTIFY_CENTER);
gtk_label_set_line_wrap (GTK_LABEL (label11), TRUE);
gtk_misc_set_padding (GTK_MISC (label11), 28, 0);
***************
*** 1001,1005 ****
GLADE_HOOKUP_OBJECT (NoRoot, vbox18, "vbox18");
GLADE_HOOKUP_OBJECT (NoRoot, image9, "image9");
- GLADE_HOOKUP_OBJECT (NoRoot, progressbar8, "progressbar8");
GLADE_HOOKUP_OBJECT (NoRoot, vseparator9, "vseparator9");
GLADE_HOOKUP_OBJECT (NoRoot, hbox16, "hbox16");
--- 995,998 ----
***************
*** 1014,1215 ****
GtkWidget*
- create_SelectFS (void)
- {
- GtkWidget *SelectFS;
- GtkWidget *vbox20;
- GtkWidget *hbox17;
- GtkWidget *vbox21;
- GtkWidget *image10;
- GtkWidget *label35;
- GtkWidget *vseparator10;
- GtkWidget *hbox18;
- GtkWidget *vbox22;
- GtkWidget *label13;
- GtkWidget *optionmenuFS;
- GtkWidget *menu2;
- GtkWidget *ext_2___standard_linux_filesystem1;
- GtkWidget *image23;
- GtkWidget *ext_3___journaling_file_system1;
- GtkWidget *image24;
- GtkWidget *reiserfs___journaling_file_system1;
- GtkWidget *image25;
- GtkWidget *xfs___journaling_file_system1;
- GtkWidget *image26;
- GtkWidget *label26;
- GtkWidget *hbuttonbox4;
- GtkWidget *helpbutton8;
- GtkWidget *button9;
- GtkWidget *button10;
- GtkTooltips *tooltips;
-
- tooltips = gtk_tooltips_new ();
-
- SelectFS = gtk_dialog_new ();
- gtk_widget_set_size_request (SelectFS, 640, 400);
- gtk_window_set_title (GTK_WINDOW (SelectFS), _("Morphix Install"));
- gtk_window_set_position (GTK_WINDOW (SelectFS), GTK_WIN_POS_CENTER);
- gtk_window_set_default_size (GTK_WINDOW (SelectFS), 640, 480);
-
- vbox20 = GTK_DIALOG (SelectFS)->vbox;
- gtk_widget_show (vbox20);
-
- hbox17 = gtk_hbox_new (FALSE, 0);
- gtk_widget_show (hbox17);
- gtk_box_pack_start (GTK_BOX (vbox20), hbox17, TRUE, TRUE, 0);
-
- vbox21 = gtk_vbox_new (FALSE, 0);
- gtk_widget_show (vbox21);
- gtk_box_pack_start (GTK_BOX (hbox17), vbox21, TRUE, TRUE, 0);
-
- image10 = create_pixmap (SelectFS, NULL);
- gtk_widget_show (image10);
- gtk_box_pack_start (GTK_BOX (vbox21), image10, TRUE, TRUE, 0);
-
- label35 = gtk_label_new (_("Filesystem selection\n\nStep:\n4 of 8"));
- gtk_widget_show (label35);
- gtk_box_pack_start (GTK_BOX (vbox21), label35, FALSE, FALSE, 0);
- gtk_widget_set_size_request (label35, 51, -2);
- gtk_label_set_line_wrap (GTK_LABEL (label35), TRUE);
-
- vseparator10 = gtk_vseparator_new ();
- gtk_widget_show (vseparator10);
- gtk_box_pack_start (GTK_BOX (hbox17), vseparator10, FALSE, FALSE, 0);
-
- hbox18 = gtk_hbox_new (FALSE, 0);
- gtk_widget_show (hbox18);
- gtk_box_pack_end (GTK_BOX (hbox17), hbox18, TRUE, FALSE, 0);
-
- vbox22 = gtk_vbox_new (FALSE, 0);
- gtk_widget_show (vbox22);
- gtk_box_pack_start (GTK_BOX (hbox18), vbox22, TRUE, TRUE, 0);
-
- label13 = gtk_label_new (_("Please select the filesystem type,\nthe recommended setting has been selected:\n"));
- gtk_widget_show (label13);
- gtk_box_pack_start (GTK_BOX (vbox22), label13, FALSE, FALSE, 0);
- gtk_widget_set_size_request (label13, 400, 200);
- gtk_label_set_line_wrap (GTK_LABEL (label13), TRUE);
-
- optionmenuFS = gtk_option_menu_new ();
- gtk_widget_show (optionmenuFS);
- gtk_box_pack_start (GTK_BOX (vbox22), optionmenuFS, FALSE, FALSE, 0);
- gtk_tooltips_set_tip (tooltips, optionmenuFS, _("A list of available filesystems, if you are unsure choose the default \"ext3\""), NULL);
-
- menu2 = gtk_menu_new ();
-
- ext_2___standard_linux_filesystem1 = gtk_image_menu_item_new_with_mnemonic (_("Ext 2 - Standard Linux Filesystem"));
- gtk_widget_show (ext_2___standard_linux_filesystem1);
- gtk_container_add (GTK_CONTAINER (menu2), ext_2___standard_linux_filesystem1);
-
- image23 = gtk_image_new_from_stock ("gtk-yes", GTK_ICON_SIZE_MENU);
- gtk_widget_show (image23);
- gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (ext_2___standard_linux_filesystem1), image23);
-
- ext_3___journaling_file_system1 = gtk_image_menu_item_new_with_mnemonic (_("Ext 3 - Journaling File System"));
- gtk_widget_show (ext_3___journaling_file_system1);
- gtk_container_add (GTK_CONTAINER (menu2), ext_3___journaling_file_system1);
-
- image24 = gtk_image_new_from_stock ("gtk-yes", GTK_ICON_SIZE_MENU);
- gtk_widget_show (image24);
- gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (ext_3___journaling_file_system1), image24);
-
- reiserfs___journaling_file_system1 = gtk_image_menu_item_new_with_mnemonic (_("ReiserFS - Journaling File System"));
- gtk_widget_show (reiserfs___journaling_file_system1);
- gtk_container_add (GTK_CONTAINER (menu2), reiserfs___journaling_file_system1);
-
- image25 = gtk_image_new_from_stock ("gtk-yes", GTK_ICON_SIZE_MENU);
- gtk_widget_show (image25);
- gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (reiserfs___journaling_file_system1), image25);
-
- xfs___journaling_file_system1 = gtk_image_menu_item_new_with_mnemonic (_("XFS - Journaling File System"));
- gtk_widget_show (xfs___journaling_file_system1);
- gtk_container_add (GTK_CONTAINER (menu2), xfs___journaling_file_system1);
-
- image26 = gtk_image_new_from_stock ("gtk-yes", GTK_ICON_SIZE_MENU);
- gtk_widget_show (image26);
- gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (xfs___journaling_file_system1), image26);
-
- gtk_option_menu_set_menu (GTK_OPTION_MENU (optionmenuFS), menu2);
-
- label26 = gtk_label_new (_("Next all changes will be made to your system.\nPlease make sure that you have entered all\ninformation correctly, if you have any doubt\nplease go back and correct your settings!"));
- gtk_widget_show (label26);
- gtk_box_pack_end (GTK_BOX (vbox22), label26, TRUE, TRUE, 0);
- gtk_label_set_justify (GTK_LABEL (label26), GTK_JUSTIFY_LEFT);
-
- hbuttonbox4 = GTK_DIALOG (SelectFS)->action_area;
- gtk_widget_show (hbuttonbox4);
- gtk_button_box_set_layout (GTK_BUTTON_BOX (hbuttonbox4), GTK_BUTTONBOX_END);
-
- helpbutton8 = gtk_button_new_from_stock ("gtk-help");
- gtk_widget_show (helpbutton8);
- gtk_dialog_add_action_widget (GTK_DIALOG (SelectFS), helpbutton8, GTK_RESPONSE_HELP);
- GTK_WIDGET_SET_FLAGS (helpbutton8, GTK_CAN_DEFAULT);
-
- button9 = gtk_button_new_from_stock ("gtk-go-back");
- gtk_widget_show (button9);
- gtk_dialog_add_action_widget (GTK_DIALOG (SelectFS), button9, GTK_RESPONSE_CANCEL);
- GTK_WIDGET_SET_FLAGS (button9, GTK_CAN_DEFAULT);
-
- button10 = gtk_button_new_from_stock ("gtk-go-forward");
- gtk_widget_show (button10);
- gtk_dialog_add_action_widget (GTK_DIALOG (SelectFS), button10, GTK_RESPONSE_OK);
- GTK_WIDGET_SET_FLAGS (button10, GTK_CAN_DEFAULT);
-
- g_signal_connect_swapped ((gpointer) SelectFS, "realize",
- G_CALLBACK (on_SelectFS_realize),
- GTK_OBJECT (optionmenuFS));
- g_signal_connect_swapped ((gpointer) optionmenuFS, "realize",
- G_CALLBACK (on_optionmenuFS_realize),
- GTK_OBJECT (optionmenuFS));
- g_signal_connect ((gpointer) ext_2___standard_linux_filesystem1, "activate",
- G_CALLBACK (on_ext_2___standard_linux_filesystem1_activate),
- NULL);
- g_signal_connect ((gpointer) ext_3___journaling_file_system1, "activate",
- G_CALLBACK (on_ext_3___journaling_file_system1_activate),
- NULL);
- g_signal_connect ((gpointer) reiserfs___journaling_file_system1, "activate",
- G_CALLBACK (on_reiserfs___journaling_file_system1_activate),
- NULL);
- g_signal_connect ((gpointer) xfs___journaling_file_system1, "activate",
- G_CALLBACK (on_xfs___journaling_file_system1_activate),
- NULL);
- g_signal_connect ((gpointer) helpbutton8, "clicked",
- G_CALLBACK (on_helpbutton_clicked),
- NULL);
- g_signal_connect ((gpointer) button9, "clicked",
- G_CALLBACK (on_cancelFS_clicked),
- NULL);
-
- /* Store pointers to all widgets, for use by lookup_widget(). */
- GLADE_HOOKUP_OBJECT_NO_REF (SelectFS, SelectFS, "SelectFS");
- GLADE_HOOKUP_OBJECT_NO_REF (SelectFS, vbox20, "vbox20");
- GLADE_HOOKUP_OBJECT (SelectFS, hbox17, "hbox17");
- GLADE_HOOKUP_OBJECT (SelectFS, vbox21, "vbox21");
- GLADE_HOOKUP_OBJECT (SelectFS, image10, "image10");
- GLADE_HOOKUP_OBJECT (SelectFS, label35, "label35");
- GLADE_HOOKUP_OBJECT (SelectFS, vseparator10, "vseparator10");
- GLADE_HOOKUP_OBJECT (SelectFS, hbox18, "hbox18");
- GLADE_HOOKUP_OBJECT (SelectFS, vbox22, "vbox22");
- GLADE_HOOKUP_OBJECT (SelectFS, label13, "label13");
- GLADE_HOOKUP_OBJECT (SelectFS, optionmenuFS, "optionmenuFS");
- GLADE_HOOKUP_OBJECT (SelectFS, menu2, "menu2");
- GLADE_HOOKUP_OBJECT (SelectFS, ext_2___standard_linux_filesystem1, "ext_2___standard_linux_filesystem1");
- GLADE_HOOKUP_OBJECT (SelectFS, image23, "image23");
- GLADE_HOOKUP_OBJECT (SelectFS, ext_3___journaling_file_system1, "ext_3___journaling_file_system1");
- GLADE_HOOKUP_OBJECT (SelectFS, image24, "image24");
- GLADE_HOOKUP_OBJECT (SelectFS, reiserfs___journaling_file_system1, "reiserfs___journaling_file_system1");
- GLADE_HOOKUP_OBJECT (SelectFS, image25, "image25");
- GLADE_HOOKUP_OBJECT (SelectFS, xfs___journaling_file_system1, "xfs___journaling_file_system1");
- GLADE_HOOKUP_OBJECT (SelectFS, image26, "image26");
- GLADE_HOOKUP_OBJECT (SelectFS, label26, "label26");
- GLADE_HOOKUP_OBJECT_NO_REF (SelectFS, hbuttonbox4, "hbuttonbox4");
- GLADE_HOOKUP_OBJECT (SelectFS, helpbutton8, "helpbutton8");
- GLADE_HOOKUP_OBJECT (SelectFS, button9, "button9");
- GLADE_HOOKUP_OBJECT (SelectFS, button10, "button10");
- GLADE_HOOKUP_OBJECT_NO_REF (SelectFS, tooltips, "tooltips");
-
- return SelectFS;
- }
-
- GtkWidget*
create_DoFilesystem (void)
{
--- 1007,1010 ----
***************
*** 1233,1236 ****
--- 1028,1032 ----
gtk_widget_show (label14);
gtk_box_pack_start (GTK_BOX (vbox23), label14, TRUE, TRUE, 0);
+ gtk_label_set_justify (GTK_LABEL (label14), GTK_JUSTIFY_CENTER);
progressbar10 = gtk_progress_bar_new ();
***************
*** 1273,1276 ****
--- 1069,1073 ----
gtk_widget_show (label15);
gtk_box_pack_start (GTK_BOX (vbox24), label15, TRUE, TRUE, 0);
+ gtk_label_set_justify (GTK_LABEL (label15), GTK_JUSTIFY_CENTER);
progressbar11 = gtk_progress_bar_new ();
***************
*** 1336,1340 ****
gtk_widget_show (label36);
gtk_box_pack_start (GTK_BOX (vbox29), label36, FALSE, FALSE, 0);
! gtk_widget_set_size_request (label36, 51, -2);
gtk_label_set_line_wrap (GTK_LABEL (label36), TRUE);
--- 1133,1138 ----
gtk_widget_show (label36);
gtk_box_pack_start (GTK_BOX (vbox29), label36, FALSE, FALSE, 0);
! gtk_widget_set_size_request (label36, 51, -1);
! gtk_label_set_justify (GTK_LABEL (label36), GTK_JUSTIFY_CENTER);
gtk_label_set_line_wrap (GTK_LABEL (label36), TRUE);
***************
*** 1355,1358 ****
--- 1153,1157 ----
gtk_box_pack_start (GTK_BOX (vbox30), label17, FALSE, FALSE, 0);
gtk_widget_set_size_request (label17, 400, 200);
+ gtk_label_set_justify (GTK_LABEL (label17), GTK_JUSTIFY_CENTER);
gtk_label_set_line_wrap (GTK_LABEL (label17), TRUE);
***************
*** 1451,1455 ****
gtk_widget_show (label37);
gtk_box_pack_start (GTK_BOX (vbox32), label37, FALSE, FALSE, 0);
! gtk_widget_set_size_request (label37, 51, -2);
gtk_label_set_line_wrap (GTK_LABEL (label37), TRUE);
--- 1250,1255 ----
gtk_widget_show (label37);
gtk_box_pack_start (GTK_BOX (vbox32), label37, FALSE, FALSE, 0);
! gtk_widget_set_size_request (label37, 51, -1);
! gtk_label_set_justify (GTK_LABEL (label37), GTK_JUSTIFY_CENTER);
gtk_label_set_line_wrap (GTK_LABEL (label37), TRUE);
***************
*** 1470,1473 ****
--- 1270,1274 ----
gtk_box_pack_start (GTK_BOX (vbox33), label18, FALSE, FALSE, 0);
gtk_widget_set_size_request (label18, 400, 200);
+ gtk_label_set_justify (GTK_LABEL (label18), GTK_JUSTIFY_CENTER);
gtk_label_set_line_wrap (GTK_LABEL (label18), TRUE);
***************
*** 1475,1479 ****
gtk_widget_show (label27);
gtk_box_pack_start (GTK_BOX (vbox33), label27, FALSE, FALSE, 0);
- gtk_label_set_justify (GTK_LABEL (label27), GTK_JUSTIFY_LEFT);
entryRoot1 = gtk_entry_new ();
--- 1276,1279 ----
***************
*** 1485,1489 ****
gtk_widget_show (label28);
gtk_box_pack_start (GTK_BOX (vbox33), label28, FALSE, FALSE, 0);
- gtk_label_set_justify (GTK_LABEL (label28), GTK_JUSTIFY_LEFT);
entryRoot2 = gtk_entry_new ();
--- 1285,1288 ----
***************
*** 1495,1498 ****
--- 1294,1298 ----
gtk_widget_show (labelRootPassError);
gtk_box_pack_start (GTK_BOX (vbox33), labelRootPassError, FALSE, FALSE, 0);
+ gtk_label_set_justify (GTK_LABEL (labelRootPassError), GTK_JUSTIFY_CENTER);
gtk_label_set_line_wrap (GTK_LABEL (labelRootPassError), TRUE);
***************
*** 1601,1605 ****
gtk_widget_show (label38);
gtk_box_pack_start (GTK_BOX (vbox35), label38, FALSE, FALSE, 0);
! gtk_widget_set_size_request (label38, 51, -2);
gtk_label_set_line_wrap (GTK_LABEL (label38), TRUE);
--- 1401,1406 ----
gtk_widget_show (label38);
gtk_box_pack_start (GTK_BOX (vbox35), label38, FALSE, FALSE, 0);
! gtk_widget_set_size_request (label38, 51, -1);
! gtk_label_set_justify (GTK_LABEL (label38), GTK_JUSTIFY_CENTER);
gtk_label_set_line_wrap (GTK_LABEL (label38), TRUE);
***************
*** 1620,1623 ****
--- 1421,1425 ----
gtk_box_pack_start (GTK_BOX (vbox36), label19, FALSE, FALSE, 0);
gtk_widget_set_size_request (label19, 400, 115);
+ gtk_label_set_justify (GTK_LABEL (label19), GTK_JUSTIFY_CENTER);
gtk_label_set_line_wrap (GTK_LABEL (label19), TRUE);
gtk_misc_set_padding (GTK_MISC (label19), 8, 0);
***************
*** 1626,1630 ****
gtk_widget_show (label20);
gtk_box_pack_start (GTK_BOX (vbox36), label20, FALSE, FALSE, 0);
- gtk_label_set_justify (GTK_LABEL (label20), GTK_JUSTIFY_LEFT);
entryUser = gtk_entry_new ();
--- 1428,1431 ----
***************
*** 1637,1641 ****
gtk_widget_show (label21);
gtk_box_pack_start (GTK_BOX (vbox36), label21, FALSE, FALSE, 0);
- gtk_label_set_justify (GTK_LABEL (label21), GTK_JUSTIFY_LEFT);
entryUserPass1 = gtk_entry_new ();
--- 1438,1441 ----
***************
*** 1652,1656 ****
gtk_widget_show (labelUserPassError);
gtk_box_pack_start (GTK_BOX (vbox36), labelUserPassError, FALSE, FALSE, 0);
- gtk_label_set_justify (GTK_LABEL (labelUserPassError), GTK_JUSTIFY_LEFT);
hbuttonbox8 = GTK_DIALOG (EnterUser)->action_area;
--- 1452,1455 ----
***************
*** 1767,1771 ****
gtk_widget_show (label39);
gtk_box_pack_start (GTK_BOX (vbox38), label39, FALSE, FALSE, 0);
! gtk_widget_set_size_request (label39, 51, -2);
gtk_label_set_line_wrap (GTK_LABEL (label39), TRUE);
--- 1566,1571 ----
gtk_widget_show (label39);
gtk_box_pack_start (GTK_BOX (vbox38), label39, FALSE, FALSE, 0);
! gtk_widget_set_size_request (label39, 51, -1);
! gtk_label_set_justify (GTK_LABEL (label39), GTK_JUSTIFY_CENTER);
gtk_label_set_line_wrap (GTK_LABEL (label39), TRUE);
***************
*** 1786,1789 ****
--- 1586,1590 ----
gtk_box_pack_start (GTK_BOX (vbox39), label22, FALSE, FALSE, 0);
gtk_widget_set_size_request (label22, 400, 200);
+ gtk_label_set_justify (GTK_LABEL (label22), GTK_JUSTIFY_CENTER);
gtk_label_set_line_wrap (GTK_LABEL (label22), TRUE);
***************
*** 1804,1808 ****
"GladeParentKey", LiloHarddiskCombo);
gtk_box_pack_start (GTK_BOX (hbox31), LiloHarddiskCombo, TRUE, TRUE, 0);
! gtk_widget_set_size_request (LiloHarddiskCombo, 70, -2);
combo_entry4 = GTK_COMBO (LiloHarddiskCombo)->entry;
--- 1605,1609 ----
"GladeParentKey", LiloHarddiskCombo);
gtk_box_pack_start (GTK_BOX (hbox31), LiloHarddiskCombo, TRUE, TRUE, 0);
! gtk_widget_set_size_request (LiloHarddiskCombo, 70, -1);
combo_entry4 = GTK_COMBO (LiloHarddiskCombo)->entry;
***************
*** 1967,1970 ****
--- 1768,1772 ----
gtk_box_pack_end (GTK_BOX (vbox42), label23, TRUE, TRUE, 0);
gtk_widget_set_size_request (label23, 400, 200);
+ gtk_label_set_justify (GTK_LABEL (label23), GTK_JUSTIFY_CENTER);
gtk_label_set_line_wrap (GTK_LABEL (label23), TRUE);
***************
*** 2029,2032 ****
--- 1831,1835 ----
gtk_widget_show (label24);
gtk_box_pack_start (GTK_BOX (vbox43), label24, TRUE, TRUE, 0);
+ gtk_label_set_justify (GTK_LABEL (label24), GTK_JUSTIFY_CENTER);
progressbar18 = gtk_progress_bar_new ();
***************
*** 2074,2082 ****
gtk_widget_show (label31);
gtk_box_pack_start (GTK_BOX (vbox46), label31, TRUE, TRUE, 0);
ErrorLabelText = gtk_label_new ("");
gtk_widget_show (ErrorLabelText);
gtk_box_pack_end (GTK_BOX (vbox46), ErrorLabelText, TRUE, TRUE, 0);
- gtk_label_set_justify (GTK_LABEL (ErrorLabelText), GTK_JUSTIFY_LEFT);
hbuttonbox11 = GTK_DIALOG (ErrorLabel)->action_area;
--- 1877,1885 ----
gtk_widget_show (label31);
gtk_box_pack_start (GTK_BOX (vbox46), label31, TRUE, TRUE, 0);
+ gtk_label_set_justify (GTK_LABEL (label31), GTK_JUSTIFY_CENTER);
ErrorLabelText = gtk_label_new ("");
gtk_widget_show (ErrorLabelText);
gtk_box_pack_end (GTK_BOX (vbox46), ErrorLabelText, TRUE, TRUE, 0);
hbuttonbox11 = GTK_DIALOG (ErrorLabel)->action_area;
***************
*** 2243,2246 ****
--- 2046,2050 ----
gtk_widget_show (label43);
gtk_box_pack_start (GTK_BOX (vbox47), label43, TRUE, FALSE, 0);
+ gtk_label_set_justify (GTK_LABEL (label43), GTK_JUSTIFY_CENTER);
gtk_label_set_line_wrap (GTK_LABEL (label43), TRUE);
Index: interface.h
===================================================================
RCS file: /cvsroot/morphix/morphixinstaller/src/interface.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** interface.h 21 May 2003 23:51:36 -0000 1.3
--- interface.h 3 Jan 2004 21:59:57 -0000 1.4
***************
*** 11,15 ****
GtkWidget* create_SmallRoot (void);
GtkWidget* create_NoRoot (void);
- GtkWidget* create_SelectFS (void);
GtkWidget* create_DoFilesystem (void);
GtkWidget* create_DoInstall (void);
--- 11,14 ----
|