From: <ale...@us...> - 2003-12-11 13:30:27
|
Update of /cvsroot/morphix/partitionmorpher/src In directory sc8-pr-cvs1:/tmp/cvs-serv31280/src Modified Files: callbacks.c interface.c main.c pm_libparted.h Log Message: simplified view Index: callbacks.c =================================================================== RCS file: /cvsroot/morphix/partitionmorpher/src/callbacks.c,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** callbacks.c 19 Oct 2003 00:18:57 -0000 1.10 --- callbacks.c 11 Dec 2003 13:30:24 -0000 1.11 *************** *** 9,12 **** --- 9,13 ---- #include <fcntl.h> + #include "main.h" #include "callbacks.h" #include "interface.h" *************** *** 152,156 **** } - /* initialise list of filesystem types --- 153,156 ---- *************** *** 213,217 **** selected_partition = get_arraynumber_from_partinfo_num(num); if (selected_partition < 0) { ! printf("Error: selected partition has invalid arraynumber: %d\n",selected_partition); } else if (partition != NULL) { --- 213,217 ---- selected_partition = get_arraynumber_from_partinfo_num(num); if (selected_partition < 0) { ! debug("Error: selected partition has invalid arraynumber: %d\n",selected_partition); } else if (partition != NULL) { *************** *** 301,305 **** for (i = 1; i < part_count; i++) { if (partinfo[i].part == NULL && partinfo[i].free != TRUE) { ! printf("Debug: Skipping partition. Free: %d\n",partinfo[i].free); continue; } --- 301,305 ---- for (i = 1; i < part_count; i++) { if (partinfo[i].part == NULL && partinfo[i].free != TRUE) { ! debug("Debug: Skipping partition. Free: %d\n",partinfo[i].free); continue; } *************** *** 338,350 **** if (partinfo[i].flags[5] == PED_PARTITION_LVM) COLOR_LVM(color) ! printf("Debug: Color: %d, %d, %d\n",color.red,color.green,color.blue); if (width >= 100) { if (strcmp(partinfo[i].partname,"") != 0) gtk_button_set_label(GTK_BUTTON(part_item),partinfo[i].partname); else ! gtk_button_set_label(GTK_BUTTON(part_item),"free"); } ! printf("Debug: Color: %d, %d, %d\n",color.red,color.green,color.blue); gtk_widget_modify_bg(part_item,GTK_STATE_NORMAL,&color); --- 338,350 ---- if (partinfo[i].flags[5] == PED_PARTITION_LVM) COLOR_LVM(color) ! debug("Debug: Color: %d, %d, %d\n",color.red,color.green,color.blue); if (width >= 100) { if (strcmp(partinfo[i].partname,"") != 0) gtk_button_set_label(GTK_BUTTON(part_item),partinfo[i].partname); else ! gtk_button_set_label(GTK_BUTTON(part_item),"Free Space"); } ! debug("Debug: Color: %d, %d, %d\n",color.red,color.green,color.blue); gtk_widget_modify_bg(part_item,GTK_STATE_NORMAL,&color); *************** *** 357,361 **** g_signal_connect(GTK_OBJECT(part_item),"clicked", GTK_SIGNAL_FUNC(click_part_item),(gpointer) &partinfo[i]); ! printf("Debug: Adding partition, number %d:%d width %d type %d name %s size %ld\n",partinfo[i].num, i, width, partinfo[i].type, partinfo[i].partname, partinfo[i].size); gtk_box_pack_start(GTK_BOX(part_box),part_item,TRUE,TRUE,2); --- 357,361 ---- g_signal_connect(GTK_OBJECT(part_item),"clicked", GTK_SIGNAL_FUNC(click_part_item),(gpointer) &partinfo[i]); ! debug("Debug: Adding partition, number %d:%d width %d type %d name %s size %ld\n",partinfo[i].num, i, width, partinfo[i].type, partinfo[i].partname, partinfo[i].size); gtk_box_pack_start(GTK_BOX(part_box),part_item,TRUE,TRUE,2); *************** *** 447,451 **** disk = ped_disk_new (devices[selected_device]); if (!disk) { ! printf("Debug: No partitions!\n"); return FALSE; --- 447,451 ---- disk = ped_disk_new (devices[selected_device]); if (!disk) { ! debug("Debug: No partitions!\n"); return FALSE; *************** *** 475,487 **** part->type != PED_PARTITION_LOGICAL) { /* Error in parted? */ ! printf("Error: reading partition! Type: %d\n",part->type); } PedConstraint *constraint = NULL; if (!part && !disk) { ! printf("Error: reading partition!\n"); return TRUE; } ! //sprintf(minor,"%d",partition_get_minor(part)); partinfo[i].part = part; --- 475,487 ---- part->type != PED_PARTITION_LOGICAL) { /* Error in parted? */ ! debug("Error: reading partition! Type: %d\n",part->type); } PedConstraint *constraint = NULL; if (!part && !disk) { ! debug("Error: reading partition!\n"); return TRUE; } ! //sdebug(minor,"%d",partition_get_minor(part)); partinfo[i].part = part; *************** *** 494,498 **** partinfo[i].label = ""; if (!(part->type & PED_PARTITION_FREESPACE)) { ! printf("Debug: Adding partition\n"); strcpy(partinfo[i].partname,ped_partition_get_path(part)); if (part->type & PED_PARTITION_LOGICAL) { --- 494,498 ---- partinfo[i].label = ""; if (!(part->type & PED_PARTITION_FREESPACE)) { ! debug("Debug: Adding partition\n"); strcpy(partinfo[i].partname,ped_partition_get_path(part)); if (part->type & PED_PARTITION_LOGICAL) { *************** *** 543,552 **** PedFileSystem *fs = ped_file_system_open(&part->geom); if (fs) { ! printf("Debug: Checking if partition %s is resizable...\n", partinfo[i].partname); PedConstraint *resize_con = ped_file_system_get_resize_constraint(fs); if (resize_con) { ! printf("Debug: constraint accepted: mb_min: %ld mb_max: %ld\n",(int)(resize_con->min_size * 1.0/ MEGABYTE_SIZE * MEGABYTE_SECTORS),(int)(resize_con->max_size * 1.0 / MEGABYTE_SIZE * MEGABYTE_SECTORS)); partinfo[i].min_size = (int)resize_con->min_size; partinfo[i].mb_min_size = (int)(resize_con->min_size * 1.0/ MEGABYTE_SIZE * MEGABYTE_SECTORS); --- 543,552 ---- PedFileSystem *fs = ped_file_system_open(&part->geom); if (fs) { ! debug("Debug: Checking if partition %s is resizable...\n", partinfo[i].partname); PedConstraint *resize_con = ped_file_system_get_resize_constraint(fs); if (resize_con) { ! debug("Debug: constraint accepted: mb_min: %ld mb_max: %ld\n",(int)(resize_con->min_size * 1.0/ MEGABYTE_SIZE * MEGABYTE_SECTORS),(int)(resize_con->max_size * 1.0 / MEGABYTE_SIZE * MEGABYTE_SECTORS)); partinfo[i].min_size = (int)resize_con->min_size; partinfo[i].mb_min_size = (int)(resize_con->min_size * 1.0/ MEGABYTE_SIZE * MEGABYTE_SECTORS); *************** *** 556,560 **** } else { ! printf("Debug: constraint failed! Can'tresize %dth partition\n",i); } ped_file_system_close(fs); --- 556,560 ---- } else { ! debug("Debug: constraint failed! Can'tresize %dth partition\n",i); } ped_file_system_close(fs); *************** *** 567,576 **** } else { ! printf("Debug: filesystem couldn't be opened\n"); } } else { /* FREESPACE */ ! printf("Debug: Adding freespace\n"); device_freespace += partinfo[i].size; partinfo[i].t_start = -1; --- 567,576 ---- } else { ! debug("Debug: filesystem couldn't be opened\n"); } } else { /* FREESPACE */ ! debug("Debug: Adding freespace\n"); device_freespace += partinfo[i].size; partinfo[i].t_start = -1; *************** *** 617,625 **** gtk_tree_view_set_model(GTK_TREE_VIEW(tree),GTK_TREE_MODEL(store)); - // printf("freespace: %ld\n",device_freespace); sprintf(free_label,"Free: %ld MB",device_freespace); gtk_label_set_text(GTK_LABEL(free_widget),free_label); - // printf("used: %ld\n",device_total_size - device_freespace); sprintf(used_label,"Used: %ld MB",device_total_size - device_freespace); gtk_label_set_text(GTK_LABEL(used_widget),used_label); --- 617,623 ---- *************** *** 646,650 **** gchar string[256]; gint size_drive = (int) devices[device]->length * 1.0 / MEGABYTE_SIZE * devices[device]->sector_size; ! printf("Debug: device %d is: length %d sector %d MB\n", device,(int)devices[device]->length,size_drive); sprintf(string,"Total size: %d MB",size_drive); --- 644,648 ---- gchar string[256]; gint size_drive = (int) devices[device]->length * 1.0 / MEGABYTE_SIZE * devices[device]->sector_size; ! debug("Debug: device %d is: length %d sector %d MB\n", device,(int)devices[device]->length,size_drive); sprintf(string,"Total size: %d MB",size_drive); *************** *** 680,691 **** gchar buffer[64]; GtkObject *adjustment; - GtkWidget *range = lookup_widget(CreateWindow,"CreateSizeHScale"); GtkWidget *size_label = lookup_widget(CreateWindow,"CreateMaxLabel"); ! sprintf(buffer,"%ld MB",partinfo[selected_partition].size); - gtk_label_set_text(GTK_LABEL(size_label),buffer); ! adjustment = gtk_adjustment_new((gdouble)partinfo[selected_partition].size, (gdouble)0, (gdouble)partinfo[selected_partition].size, --- 678,689 ---- gchar buffer[64]; GtkObject *adjustment; GtkWidget *size_label = lookup_widget(CreateWindow,"CreateMaxLabel"); + GtkWidget *size_entry = lookup_widget(CreateWindow,"CreateSizeEntry"); ! sprintf(buffer,"%ld",partinfo[selected_partition].size); ! gtk_entry_set_text(GTK_ENTRY(size_entry),buffer); sprintf(buffer,"%ld MB",partinfo[selected_partition].size); gtk_label_set_text(GTK_LABEL(size_label),buffer); ! /* adjustment = gtk_adjustment_new((gdouble)partinfo[selected_partition].size, (gdouble)0, (gdouble)partinfo[selected_partition].size, *************** *** 693,697 **** 100.0, (gdouble)0); ! gtk_range_set_adjustment(GTK_RANGE(range),GTK_ADJUSTMENT(adjustment)); gtk_widget_show (CreateWindow); } --- 691,695 ---- 100.0, (gdouble)0); ! gtk_range_set_adjustment(GTK_RANGE(range),GTK_ADJUSTMENT(adjustment));*/ gtk_widget_show (CreateWindow); } *************** *** 909,913 **** GtkWidget *option = lookup_widget(widget,"MainHarddiskOptionMenu"); ! printf("Debug: devices: %d\n",device_count); for (i = 0; i < device_count;i++) { --- 907,911 ---- GtkWidget *option = lookup_widget(widget,"MainHarddiskOptionMenu"); ! debug("Debug: devices: %d\n",device_count); for (i = 0; i < device_count;i++) { *************** *** 964,968 **** /* (partition start in sectors) */ ! renderer = gtk_cell_renderer_text_new(); column = gtk_tree_view_column_new_with_attributes( --- 962,966 ---- /* (partition start in sectors) */ ! /* renderer = gtk_cell_renderer_text_new(); column = gtk_tree_view_column_new_with_attributes( *************** *** 980,984 **** NULL); gtk_tree_view_append_column(GTK_TREE_VIEW(tree),column); ! renderer = gtk_cell_renderer_text_new(); column = gtk_tree_view_column_new_with_attributes( --- 978,982 ---- NULL); gtk_tree_view_append_column(GTK_TREE_VIEW(tree),column); ! */ renderer = gtk_cell_renderer_text_new(); column = gtk_tree_view_column_new_with_attributes( *************** *** 1117,1121 **** gpointer user_data) { ! printf("Debug: Move not yet implemented!\n"); /* do_move(&devices[selected_device],partinfo[selected_partition].part,partinfo[selected_partition].partname,(PedSector) start, (PedSector) end); --- 1115,1119 ---- gpointer user_data) { ! debug("Debug: Move not yet implemented!\n"); /* do_move(&devices[selected_device],partinfo[selected_partition].part,partinfo[selected_partition].partname,(PedSector) start, (PedSector) end); *************** *** 1131,1135 **** { show_busy_cursor( ((GtkWidget*)button)->window ); ! gboolean success; gchar fs_buffer[64]; --- 1129,1134 ---- { show_busy_cursor( ((GtkWidget*)button)->window ); ! long long mb_size = 0; ! long long sector_num = 0; gboolean success; gchar fs_buffer[64]; *************** *** 1137,1141 **** PedFileSystemType *fs_type; PedPartitionType part_type; ! GtkWidget *range = lookup_widget(CreateWindow,"CreateSizeHScale"); GtkWidget *optionmenu_partfs = lookup_widget(CreateWindow,"CreateTypeOptionMenu"); GtkWidget *optionmenu_fs = lookup_widget(CreateWindow,"optionmenu4"); --- 1136,1140 ---- PedFileSystemType *fs_type; PedPartitionType part_type; ! GtkWidget *size = lookup_widget(CreateWindow,"CreateSizeEntry"); GtkWidget *optionmenu_partfs = lookup_widget(CreateWindow,"CreateTypeOptionMenu"); GtkWidget *optionmenu_fs = lookup_widget(CreateWindow,"optionmenu4"); *************** *** 1152,1155 **** --- 1151,1155 ---- int saved_fd, stderr_pipe; gchar error_message_buffer[1000]; + gchar *value = NULL; int index; *************** *** 1211,1222 **** else if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(radio_logical_type))) part_type = PED_PARTITION_LOGICAL; ! ! long long mb_size = (long long)gtk_range_get_value(GTK_RANGE(range)); ! long long sector_num = ((mb_size * 1024*1024) / 512); ! end_sector = sector_num + partinfo[selected_partition].start; ! printf("Debug: selectedpartititon: %d\n",selected_partition); ! printf("Debug: mbsize: %lld, start: %lld end: %lld\n",mb_size, partinfo[selected_partition].start,end_sector); fs_type = ped_file_system_type_get(fs_buffer); --- 1211,1225 ---- else if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(radio_logical_type))) part_type = PED_PARTITION_LOGICAL; ! value = gtk_entry_get_text(GTK_ENTRY(size)); ! mb_size = (long long)atol(value); ! sector_num = ((mb_size * 1024*1024) / 512); ! if (mb_size <= 0 || sector_num <= 0 || mb_size > partinfo[selected_partition].size) { ! debug("Debug: entered size is invalid, aborting\n"); ! return; ! } end_sector = sector_num + partinfo[selected_partition].start; ! debug("Debug: selectedpartititon: %d\n",selected_partition); ! debug("Debug: mbsize: %lld, start: %lld end: %lld\n",mb_size, partinfo[selected_partition].start,end_sector); fs_type = ped_file_system_type_get(fs_buffer); *************** *** 1273,1279 **** long long sector_num = ((mb_size * 1024*1024) / 512); ! printf("Debug: %lld : %Ld\n",sector_num,sector_num); end_sector = sector_num + partinfo[selected_partition].start; ! printf("Debug: mbsize: %lld, end: %lld\n",mb_size,end_sector); do_resize(&devices[selected_device],partinfo[selected_partition].part, --- 1276,1282 ---- long long sector_num = ((mb_size * 1024*1024) / 512); ! debug("Debug: %lld : %Ld\n",sector_num,sector_num); end_sector = sector_num + partinfo[selected_partition].start; ! debug("Debug: mbsize: %lld, end: %lld\n",mb_size,end_sector); do_resize(&devices[selected_device],partinfo[selected_partition].part, *************** *** 1301,1305 **** gpointer user_data) { ! printf("Debug: Convert not yet implemented\n"); gtk_widget_hide(ConvertWindow); refresh_devices_and_partitions(); --- 1304,1308 ---- gpointer user_data) { ! debug("Debug: Convert not yet implemented\n"); gtk_widget_hide(ConvertWindow); refresh_devices_and_partitions(); *************** *** 1422,1430 **** break; default: ! printf("Error: type not known!\n"); return; } if (type == NULL) { ! printf("Error: type not known!\n"); return; } --- 1425,1433 ---- break; default: ! debug("Error: type not known!\n"); return; } if (type == NULL) { ! debug("Error: type not known!\n"); return; } Index: interface.c =================================================================== RCS file: /cvsroot/morphix/partitionmorpher/src/interface.c,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** interface.c 19 Oct 2003 00:18:57 -0000 1.7 --- interface.c 11 Dec 2003 13:30:24 -0000 1.8 *************** *** 193,197 **** gtk_widget_show (label1); gtk_box_pack_start (GTK_BOX (hbox1), label1, FALSE, FALSE, 5); - gtk_label_set_justify (GTK_LABEL (label1), GTK_JUSTIFY_LEFT); MainHarddiskOptionMenu = gtk_option_menu_new (); --- 193,196 ---- *************** *** 216,230 **** gtk_widget_show (SizeLabel); gtk_box_pack_start (GTK_BOX (hbox2), SizeLabel, TRUE, FALSE, 0); - gtk_label_set_justify (GTK_LABEL (SizeLabel), GTK_JUSTIFY_LEFT); UsedLabel = gtk_label_new (_("Used:")); gtk_widget_show (UsedLabel); gtk_box_pack_start (GTK_BOX (hbox2), UsedLabel, TRUE, FALSE, 0); - gtk_label_set_justify (GTK_LABEL (UsedLabel), GTK_JUSTIFY_LEFT); FreeLabel = gtk_label_new (_("Free:")); gtk_widget_show (FreeLabel); gtk_box_pack_start (GTK_BOX (hbox2), FreeLabel, TRUE, FALSE, 0); - gtk_label_set_justify (GTK_LABEL (FreeLabel), GTK_JUSTIFY_LEFT); hseparator2 = gtk_hseparator_new (); --- 215,226 ---- *************** *** 370,374 **** GtkWidget *end_of_free_space1; GtkWidget *label56; - GtkWidget *CreateSizeHScale; GtkWidget *label11; GtkWidget *label10; --- 366,369 ---- *************** *** 391,394 **** --- 386,390 ---- GtkWidget *CreateExtendedRadiobutton; GtkWidget *CreateLogicalRadiobutton; + GtkWidget *CreateSizeEntry; GtkWidget *dialog_action_area1; GtkWidget *cancelbutton1; *************** *** 423,427 **** gtk_widget_show (label55); gtk_box_pack_start (GTK_BOX (hbox9), label55, TRUE, TRUE, 0); - gtk_label_set_justify (GTK_LABEL (label55), GTK_JUSTIFY_LEFT); table1 = gtk_table_new (13, 2, FALSE); --- 419,422 ---- *************** *** 437,441 **** (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (0), 0, 0); - gtk_label_set_justify (GTK_LABEL (label27), GTK_JUSTIFY_LEFT); gtk_misc_set_alignment (GTK_MISC (label27), 0, 0.5); --- 432,435 ---- *************** *** 446,449 **** --- 440,444 ---- (GtkAttachOptions) (0), 0, 0); gtk_tooltips_set_tip (tooltips, optionmenu4, _("Select the filesystem type. None is default. For an ordinary filesystem, you should choose one of the next 4 options. If you want a swap partition, select the 6th option"), NULL); + gtk_option_menu_set_history (GTK_OPTION_MENU (optionmenu4), 2); menu7 = gtk_menu_new (); *************** *** 524,536 **** label8 = gtk_label_new (_("Partition Position:")); - gtk_widget_show (label8); gtk_table_attach (GTK_TABLE (table1), label8, 0, 1, 3, 4, (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (0), 0, 0); - gtk_label_set_justify (GTK_LABEL (label8), GTK_JUSTIFY_LEFT); gtk_misc_set_alignment (GTK_MISC (label8), 0, 0.5); optionmenu3 = gtk_option_menu_new (); - gtk_widget_show (optionmenu3); gtk_table_attach (GTK_TABLE (table1), optionmenu3, 1, 2, 3, 4, (GtkAttachOptions) (GTK_FILL), --- 519,528 ---- *************** *** 555,568 **** (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (0), 0, 0); - gtk_label_set_justify (GTK_LABEL (label56), GTK_JUSTIFY_LEFT); gtk_misc_set_alignment (GTK_MISC (label56), 0, 0.5); - CreateSizeHScale = gtk_hscale_new (GTK_ADJUSTMENT (gtk_adjustment_new (0, 0, 0, 0, 0, 0))); - gtk_widget_show (CreateSizeHScale); - gtk_table_attach (GTK_TABLE (table1), CreateSizeHScale, 1, 2, 12, 13, - (GtkAttachOptions) (GTK_FILL), - (GtkAttachOptions) (GTK_EXPAND | GTK_FILL), 0, 0); - gtk_scale_set_value_pos (GTK_SCALE (CreateSizeHScale), GTK_POS_LEFT); - label11 = gtk_label_new (_("Partition Size")); gtk_widget_show (label11); --- 547,552 ---- *************** *** 570,574 **** (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (0), 0, 0); - gtk_label_set_justify (GTK_LABEL (label11), GTK_JUSTIFY_LEFT); gtk_misc_set_alignment (GTK_MISC (label11), 0, 0.5); --- 554,557 ---- *************** *** 578,582 **** (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (0), 0, 0); - gtk_label_set_justify (GTK_LABEL (label10), GTK_JUSTIFY_LEFT); gtk_misc_set_alignment (GTK_MISC (label10), 0, 0.5); --- 561,564 ---- *************** *** 586,590 **** (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (0), 0, 0); - gtk_label_set_justify (GTK_LABEL (CreateMaxLabel), GTK_JUSTIFY_LEFT); gtk_misc_set_alignment (GTK_MISC (CreateMaxLabel), 0, 0.5); --- 568,571 ---- *************** *** 594,598 **** (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (0), 0, 0); - gtk_label_set_justify (GTK_LABEL (label65), GTK_JUSTIFY_LEFT); gtk_misc_set_alignment (GTK_MISC (label65), 0, 0.5); --- 575,578 ---- *************** *** 602,606 **** (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (0), 0, 0); - gtk_label_set_justify (GTK_LABEL (label66), GTK_JUSTIFY_LEFT); gtk_misc_set_alignment (GTK_MISC (label66), 0, 0.5); --- 582,585 ---- *************** *** 610,614 **** (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (0), 0, 0); - gtk_label_set_justify (GTK_LABEL (label67), GTK_JUSTIFY_LEFT); gtk_misc_set_alignment (GTK_MISC (label67), 0, 0.5); --- 589,592 ---- *************** *** 618,622 **** (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (0), 0, 0); - gtk_label_set_justify (GTK_LABEL (label68), GTK_JUSTIFY_LEFT); gtk_misc_set_alignment (GTK_MISC (label68), 0, 0.5); --- 596,599 ---- *************** *** 626,630 **** (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (0), 0, 0); - gtk_label_set_justify (GTK_LABEL (label69), GTK_JUSTIFY_LEFT); gtk_misc_set_alignment (GTK_MISC (label69), 0, 0.5); --- 603,606 ---- *************** *** 634,638 **** (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (0), 0, 0); - gtk_label_set_justify (GTK_LABEL (label70), GTK_JUSTIFY_LEFT); gtk_misc_set_alignment (GTK_MISC (label70), 0, 0.5); --- 610,613 ---- *************** *** 704,707 **** --- 679,688 ---- CreatePrimaryRadiobutton_group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (CreateLogicalRadiobutton)); + CreateSizeEntry = gtk_entry_new (); + gtk_widget_show (CreateSizeEntry); + gtk_table_attach (GTK_TABLE (table1), CreateSizeEntry, 1, 2, 12, 13, + (GtkAttachOptions) (GTK_EXPAND | GTK_FILL), + (GtkAttachOptions) (0), 0, 0); + dialog_action_area1 = GTK_DIALOG (CreateWindow)->action_area; gtk_widget_show (dialog_action_area1); *************** *** 831,835 **** GLADE_HOOKUP_OBJECT (CreateWindow, end_of_free_space1, "end_of_free_space1"); GLADE_HOOKUP_OBJECT (CreateWindow, label56, "label56"); - GLADE_HOOKUP_OBJECT (CreateWindow, CreateSizeHScale, "CreateSizeHScale"); GLADE_HOOKUP_OBJECT (CreateWindow, label11, "label11"); GLADE_HOOKUP_OBJECT (CreateWindow, label10, "label10"); --- 812,815 ---- *************** *** 851,854 **** --- 831,835 ---- GLADE_HOOKUP_OBJECT (CreateWindow, CreateExtendedRadiobutton, "CreateExtendedRadiobutton"); GLADE_HOOKUP_OBJECT (CreateWindow, CreateLogicalRadiobutton, "CreateLogicalRadiobutton"); + GLADE_HOOKUP_OBJECT (CreateWindow, CreateSizeEntry, "CreateSizeEntry"); GLADE_HOOKUP_OBJECT_NO_REF (CreateWindow, dialog_action_area1, "dialog_action_area1"); GLADE_HOOKUP_OBJECT (CreateWindow, cancelbutton1, "cancelbutton1"); *************** *** 878,884 **** GtkWidget *label17; GtkWidget *ResizeSizeLabel; - GtkWidget *hscale2; GtkWidget *label57; GtkWidget *ResizeMinLabel; GtkWidget *dialog_action_area2; GtkWidget *cancelbutton2; --- 859,865 ---- GtkWidget *label17; GtkWidget *ResizeSizeLabel; GtkWidget *label57; GtkWidget *ResizeMinLabel; + GtkWidget *entry2; GtkWidget *dialog_action_area2; GtkWidget *cancelbutton2; *************** *** 913,916 **** --- 894,898 ---- gtk_widget_show (label54); gtk_box_pack_start (GTK_BOX (hbox8), label54, TRUE, TRUE, 0); + gtk_label_set_justify (GTK_LABEL (label54), GTK_JUSTIFY_CENTER); table2 = gtk_table_new (6, 2, FALSE); *************** *** 926,930 **** (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (0), 0, 0); - gtk_label_set_justify (GTK_LABEL (label14), GTK_JUSTIFY_LEFT); gtk_misc_set_alignment (GTK_MISC (label14), 0, 0.5); --- 908,911 ---- *************** *** 934,938 **** (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (0), 0, 0); - gtk_label_set_justify (GTK_LABEL (label15), GTK_JUSTIFY_LEFT); gtk_misc_set_alignment (GTK_MISC (label15), 0, 0.5); --- 915,918 ---- *************** *** 942,946 **** (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (0), 0, 0); - gtk_label_set_justify (GTK_LABEL (label16), GTK_JUSTIFY_LEFT); gtk_misc_set_alignment (GTK_MISC (label16), 0, 0.5); --- 922,925 ---- *************** *** 950,954 **** (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (0), 0, 0); - gtk_label_set_justify (GTK_LABEL (ResizeDeviceLabel), GTK_JUSTIFY_LEFT); gtk_misc_set_alignment (GTK_MISC (ResizeDeviceLabel), 0, 0.5); --- 929,932 ---- *************** *** 958,962 **** (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (0), 0, 0); - gtk_label_set_justify (GTK_LABEL (ResizeFsLabel), GTK_JUSTIFY_LEFT); gtk_misc_set_alignment (GTK_MISC (ResizeFsLabel), 0, 0.5); --- 936,939 ---- *************** *** 966,970 **** (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (0), 0, 0); - gtk_label_set_justify (GTK_LABEL (ResizeMaxLabel), GTK_JUSTIFY_LEFT); gtk_misc_set_alignment (GTK_MISC (ResizeMaxLabel), 0, 0.5); --- 943,946 ---- *************** *** 974,978 **** (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (0), 0, 0); - gtk_label_set_justify (GTK_LABEL (label18), GTK_JUSTIFY_LEFT); gtk_misc_set_alignment (GTK_MISC (label18), 0, 0.5); --- 950,953 ---- *************** *** 982,986 **** (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (0), 0, 0); - gtk_label_set_justify (GTK_LABEL (label17), GTK_JUSTIFY_LEFT); gtk_misc_set_alignment (GTK_MISC (label17), 0, 0.5); --- 957,960 ---- *************** *** 990,1003 **** (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (0), 0, 0); - gtk_label_set_justify (GTK_LABEL (ResizeSizeLabel), GTK_JUSTIFY_LEFT); gtk_misc_set_alignment (GTK_MISC (ResizeSizeLabel), 0, 0.5); - hscale2 = gtk_hscale_new (GTK_ADJUSTMENT (gtk_adjustment_new (0, 0, 0, 0, 0, 0))); - gtk_widget_show (hscale2); - gtk_table_attach (GTK_TABLE (table2), hscale2, 1, 2, 5, 6, - (GtkAttachOptions) (GTK_EXPAND | GTK_FILL), - (GtkAttachOptions) (GTK_EXPAND | GTK_FILL), 0, 0); - gtk_scale_set_value_pos (GTK_SCALE (hscale2), GTK_POS_LEFT); - label57 = gtk_label_new (_("Min Size:")); gtk_widget_show (label57); --- 964,969 ---- *************** *** 1005,1009 **** (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (0), 0, 0); - gtk_label_set_justify (GTK_LABEL (label57), GTK_JUSTIFY_LEFT); gtk_misc_set_alignment (GTK_MISC (label57), 0, 0.5); --- 971,974 ---- *************** *** 1013,1019 **** (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (0), 0, 0); - gtk_label_set_justify (GTK_LABEL (ResizeMinLabel), GTK_JUSTIFY_LEFT); gtk_misc_set_alignment (GTK_MISC (ResizeMinLabel), 0, 0.5); dialog_action_area2 = GTK_DIALOG (ResizeWindow)->action_area; gtk_widget_show (dialog_action_area2); --- 978,989 ---- (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (0), 0, 0); gtk_misc_set_alignment (GTK_MISC (ResizeMinLabel), 0, 0.5); + entry2 = gtk_entry_new (); + gtk_widget_show (entry2); + gtk_table_attach (GTK_TABLE (table2), entry2, 1, 2, 5, 6, + (GtkAttachOptions) (GTK_EXPAND | GTK_FILL), + (GtkAttachOptions) (0), 0, 0); + dialog_action_area2 = GTK_DIALOG (ResizeWindow)->action_area; gtk_widget_show (dialog_action_area2); *************** *** 1060,1066 **** GLADE_HOOKUP_OBJECT (ResizeWindow, label17, "label17"); GLADE_HOOKUP_OBJECT (ResizeWindow, ResizeSizeLabel, "ResizeSizeLabel"); - GLADE_HOOKUP_OBJECT (ResizeWindow, hscale2, "hscale2"); GLADE_HOOKUP_OBJECT (ResizeWindow, label57, "label57"); GLADE_HOOKUP_OBJECT (ResizeWindow, ResizeMinLabel, "ResizeMinLabel"); GLADE_HOOKUP_OBJECT_NO_REF (ResizeWindow, dialog_action_area2, "dialog_action_area2"); GLADE_HOOKUP_OBJECT (ResizeWindow, cancelbutton2, "cancelbutton2"); --- 1030,1036 ---- GLADE_HOOKUP_OBJECT (ResizeWindow, label17, "label17"); GLADE_HOOKUP_OBJECT (ResizeWindow, ResizeSizeLabel, "ResizeSizeLabel"); GLADE_HOOKUP_OBJECT (ResizeWindow, label57, "label57"); GLADE_HOOKUP_OBJECT (ResizeWindow, ResizeMinLabel, "ResizeMinLabel"); + GLADE_HOOKUP_OBJECT (ResizeWindow, entry2, "entry2"); GLADE_HOOKUP_OBJECT_NO_REF (ResizeWindow, dialog_action_area2, "dialog_action_area2"); GLADE_HOOKUP_OBJECT (ResizeWindow, cancelbutton2, "cancelbutton2"); *************** *** 1092,1096 **** gtk_widget_show (label24); gtk_box_pack_start (GTK_BOX (dialog_vbox4), label24, TRUE, TRUE, 0); - gtk_label_set_justify (GTK_LABEL (label24), GTK_JUSTIFY_LEFT); gtk_misc_set_padding (GTK_MISC (label24), 8, 8); --- 1062,1065 ---- *************** *** 1152,1156 **** gtk_widget_show (label25); gtk_box_pack_start (GTK_BOX (dialog_vbox5), label25, TRUE, TRUE, 0); - gtk_label_set_justify (GTK_LABEL (label25), GTK_JUSTIFY_LEFT); dialog_action_area5 = GTK_DIALOG (RevertWindow)->action_area; --- 1121,1124 ---- *************** *** 1211,1215 **** gtk_widget_show (label26); gtk_box_pack_start (GTK_BOX (dialog_vbox6), label26, TRUE, TRUE, 0); - gtk_label_set_justify (GTK_LABEL (label26), GTK_JUSTIFY_LEFT); dialog_action_area6 = GTK_DIALOG (DialogWindow)->action_area; --- 1179,1182 ---- *************** *** 1352,1355 **** --- 1319,1323 ---- gtk_widget_show (label37); gtk_box_pack_start (GTK_BOX (hbox5), label37, TRUE, TRUE, 0); + gtk_label_set_justify (GTK_LABEL (label37), GTK_JUSTIFY_CENTER); table3 = gtk_table_new (3, 2, FALSE); *************** *** 1363,1366 **** --- 1331,1335 ---- (GtkAttachOptions) (GTK_EXPAND | GTK_FILL), (GtkAttachOptions) (GTK_EXPAND), 0, 0); + gtk_label_set_justify (GTK_LABEL (DeletePathLabel), GTK_JUSTIFY_CENTER); gtk_misc_set_alignment (GTK_MISC (DeletePathLabel), 0, 0.5); *************** *** 1370,1374 **** (GtkAttachOptions) (GTK_EXPAND | GTK_FILL), (GtkAttachOptions) (GTK_EXPAND), 0, 0); - gtk_label_set_justify (GTK_LABEL (DeleteFsLabel), GTK_JUSTIFY_LEFT); gtk_misc_set_alignment (GTK_MISC (DeleteFsLabel), 0, 0.5); --- 1339,1342 ---- *************** *** 1378,1382 **** (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (GTK_EXPAND), 0, 0); - gtk_label_set_justify (GTK_LABEL (label33), GTK_JUSTIFY_LEFT); gtk_misc_set_alignment (GTK_MISC (label33), 0, 0.5); --- 1346,1349 ---- *************** *** 1386,1390 **** (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (GTK_EXPAND), 0, 0); - gtk_label_set_justify (GTK_LABEL (label34), GTK_JUSTIFY_LEFT); gtk_misc_set_alignment (GTK_MISC (label34), 0, 0.5); --- 1353,1356 ---- *************** *** 1394,1398 **** (GtkAttachOptions) (GTK_EXPAND | GTK_FILL), (GtkAttachOptions) (GTK_EXPAND), 0, 0); - gtk_label_set_justify (GTK_LABEL (DeleteSizeLabel), GTK_JUSTIFY_LEFT); gtk_misc_set_alignment (GTK_MISC (DeleteSizeLabel), 0, 0.5); --- 1360,1363 ---- *************** *** 1402,1406 **** (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (GTK_EXPAND), 0, 0); - gtk_label_set_justify (GTK_LABEL (label35), GTK_JUSTIFY_LEFT); gtk_misc_set_alignment (GTK_MISC (label35), 0, 0.5); --- 1367,1370 ---- *************** *** 1504,1507 **** --- 1468,1472 ---- gtk_widget_show (label38); gtk_box_pack_start (GTK_BOX (hbox6), label38, TRUE, TRUE, 0); + gtk_label_set_justify (GTK_LABEL (label38), GTK_JUSTIFY_CENTER); table4 = gtk_table_new (4, 2, FALSE); *************** *** 1515,1519 **** (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (0), 0, 0); - gtk_label_set_justify (GTK_LABEL (label39), GTK_JUSTIFY_LEFT); gtk_misc_set_alignment (GTK_MISC (label39), 0, 0.5); --- 1480,1483 ---- *************** *** 1523,1527 **** (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (0), 0, 0); - gtk_label_set_justify (GTK_LABEL (label40), GTK_JUSTIFY_LEFT); gtk_misc_set_alignment (GTK_MISC (label40), 0, 0.5); --- 1487,1490 ---- *************** *** 1531,1535 **** (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (0), 0, 0); - gtk_label_set_justify (GTK_LABEL (label41), GTK_JUSTIFY_LEFT); gtk_misc_set_alignment (GTK_MISC (label41), 0, 0.5); --- 1494,1497 ---- *************** *** 1539,1543 **** (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (0), 0, 0); - gtk_label_set_justify (GTK_LABEL (label42), GTK_JUSTIFY_LEFT); gtk_misc_set_alignment (GTK_MISC (label42), 0, 0.5); --- 1501,1504 ---- *************** *** 1547,1550 **** --- 1508,1512 ---- (GtkAttachOptions) (GTK_EXPAND | GTK_FILL), (GtkAttachOptions) (GTK_EXPAND), 0, 0); + gtk_label_set_justify (GTK_LABEL (ConvertPathLabel), GTK_JUSTIFY_CENTER); gtk_misc_set_alignment (GTK_MISC (ConvertPathLabel), 0, 0.5); *************** *** 1554,1557 **** --- 1516,1520 ---- (GtkAttachOptions) (GTK_EXPAND | GTK_FILL), (GtkAttachOptions) (GTK_EXPAND), 0, 0); + gtk_label_set_justify (GTK_LABEL (ConvertFsLabel), GTK_JUSTIFY_CENTER); gtk_misc_set_alignment (GTK_MISC (ConvertFsLabel), 0, 0.5); *************** *** 1561,1564 **** --- 1524,1528 ---- (GtkAttachOptions) (GTK_EXPAND | GTK_FILL), (GtkAttachOptions) (GTK_EXPAND), 0, 0); + gtk_label_set_justify (GTK_LABEL (ConvertSizeLabel), GTK_JUSTIFY_CENTER); gtk_misc_set_alignment (GTK_MISC (ConvertSizeLabel), 0, 0.5); *************** *** 1703,1706 **** --- 1667,1671 ---- gtk_widget_show (label46); gtk_box_pack_start (GTK_BOX (hbox7), label46, TRUE, TRUE, 0); + gtk_label_set_justify (GTK_LABEL (label46), GTK_JUSTIFY_CENTER); table5 = gtk_table_new (4, 2, FALSE); *************** *** 1714,1718 **** (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (0), 0, 0); - gtk_label_set_justify (GTK_LABEL (label47), GTK_JUSTIFY_LEFT); gtk_misc_set_alignment (GTK_MISC (label47), 0, 0.5); --- 1679,1682 ---- *************** *** 1722,1726 **** (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (0), 0, 0); - gtk_label_set_justify (GTK_LABEL (label49), GTK_JUSTIFY_LEFT); gtk_misc_set_alignment (GTK_MISC (label49), 0, 0.5); --- 1686,1689 ---- *************** *** 1730,1734 **** (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (0), 0, 0); - gtk_label_set_justify (GTK_LABEL (label51), GTK_JUSTIFY_LEFT); gtk_misc_set_alignment (GTK_MISC (label51), 0, 0.5); --- 1693,1696 ---- *************** *** 1738,1742 **** (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (0), 0, 0); - gtk_label_set_justify (GTK_LABEL (label53), GTK_JUSTIFY_LEFT); gtk_misc_set_alignment (GTK_MISC (label53), 0, 0.5); --- 1700,1703 ---- *************** *** 1746,1750 **** (GtkAttachOptions) (GTK_EXPAND | GTK_FILL), (GtkAttachOptions) (GTK_EXPAND), 0, 0); - gtk_label_set_justify (GTK_LABEL (MovePathLabel), GTK_JUSTIFY_LEFT); gtk_misc_set_alignment (GTK_MISC (MovePathLabel), 0, 0.5); --- 1707,1710 ---- *************** *** 1754,1758 **** (GtkAttachOptions) (GTK_EXPAND | GTK_FILL), (GtkAttachOptions) (GTK_EXPAND), 0, 0); - gtk_label_set_justify (GTK_LABEL (MoveFsLabel), GTK_JUSTIFY_LEFT); gtk_misc_set_alignment (GTK_MISC (MoveFsLabel), 0, 0.5); --- 1714,1717 ---- *************** *** 1762,1766 **** (GtkAttachOptions) (GTK_EXPAND | GTK_FILL), (GtkAttachOptions) (GTK_EXPAND), 0, 0); - gtk_label_set_justify (GTK_LABEL (MoveSizeLabel), GTK_JUSTIFY_LEFT); gtk_misc_set_alignment (GTK_MISC (MoveSizeLabel), 0, 0.5); --- 1721,1724 ---- *************** *** 1876,1879 **** --- 1834,1838 ---- gtk_widget_show (label58); gtk_box_pack_start (GTK_BOX (hbox10), label58, TRUE, TRUE, 0); + gtk_label_set_justify (GTK_LABEL (label58), GTK_JUSTIFY_CENTER); gtk_label_set_line_wrap (GTK_LABEL (label58), TRUE); *************** *** 1890,1894 **** (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (0), 0, 0); - gtk_label_set_justify (GTK_LABEL (label59), GTK_JUSTIFY_LEFT); gtk_misc_set_alignment (GTK_MISC (label59), 0, 0.5); --- 1849,1852 ---- *************** *** 1898,1902 **** (GtkAttachOptions) (GTK_EXPAND | GTK_FILL), (GtkAttachOptions) (GTK_EXPAND), 0, 0); - gtk_label_set_justify (GTK_LABEL (TableDeviceLabel), GTK_JUSTIFY_LEFT); gtk_misc_set_alignment (GTK_MISC (TableDeviceLabel), 0, 0.5); --- 1856,1859 ---- *************** *** 1906,1910 **** (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (0), 0, 0); - gtk_label_set_justify (GTK_LABEL (label64), GTK_JUSTIFY_LEFT); gtk_misc_set_alignment (GTK_MISC (label64), 0, 0.5); --- 1863,1866 ---- *************** *** 2080,2084 **** gtk_box_pack_start (GTK_BOX (vbox11), label75, FALSE, FALSE, 0); gtk_label_set_use_markup (GTK_LABEL (label75), TRUE); - gtk_label_set_justify (GTK_LABEL (label75), GTK_JUSTIFY_LEFT); gtk_label_set_line_wrap (GTK_LABEL (label75), TRUE); gtk_misc_set_alignment (GTK_MISC (label75), 0, 0.5); --- 2036,2039 ---- *************** *** 2091,2095 **** gtk_widget_show (ErrorLabel); gtk_box_pack_start (GTK_BOX (hbox12), ErrorLabel, FALSE, FALSE, 20); - gtk_label_set_justify (GTK_LABEL (ErrorLabel), GTK_JUSTIFY_LEFT); gtk_label_set_line_wrap (GTK_LABEL (ErrorLabel), TRUE); gtk_misc_set_alignment (GTK_MISC (ErrorLabel), 0, 0.5); --- 2046,2049 ---- *************** *** 2098,2102 **** gtk_widget_show (label77); gtk_box_pack_start (GTK_BOX (vbox11), label77, FALSE, FALSE, 0); - gtk_label_set_justify (GTK_LABEL (label77), GTK_JUSTIFY_LEFT); gtk_label_set_line_wrap (GTK_LABEL (label77), TRUE); gtk_misc_set_alignment (GTK_MISC (label77), 0, 0.5); --- 2052,2055 ---- *************** *** 2165,2169 **** gtk_widget_show (ProgressLabel); gtk_box_pack_start (GTK_BOX (vbox15), ProgressLabel, FALSE, FALSE, 0); - gtk_label_set_justify (GTK_LABEL (ProgressLabel), GTK_JUSTIFY_LEFT); gtk_misc_set_alignment (GTK_MISC (ProgressLabel), 0, 0.5); --- 2118,2121 ---- Index: main.c =================================================================== RCS file: /cvsroot/morphix/partitionmorpher/src/main.c,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** main.c 20 Oct 2003 17:22:29 -0000 1.5 --- main.c 11 Dec 2003 13:30:24 -0000 1.6 *************** *** 37,40 **** --- 37,57 ---- } + int debug(const char *fmt, ...) { + int d; + va_list args; + + va_start(args, fmt); + #ifdef PRINT_DEBUGGING_INFO + d = vfprintf(stdout,fmt,args); + va_end(args); + + return d; + #endif + + va_end(args); + return 0; + } + + int main (int argc, char *argv[]) Index: pm_libparted.h =================================================================== RCS file: /cvsroot/morphix/partitionmorpher/src/pm_libparted.h,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** pm_libparted.h 19 Oct 2003 00:18:57 -0000 1.7 --- pm_libparted.h 11 Dec 2003 13:30:24 -0000 1.8 *************** *** 5,10 **** #include <gtk/gtk.h> - //#define PRINT_DEBUGGING_INFO - #define MAX_PARTITIONS 128 #define MAX_FILESYSTEMS 128 --- 5,8 ---- |