Thread: [Netadm-devel] gwc/gwcguid interface.c,1.6,1.7
Status: Beta
Brought to you by:
linuxpark
From: linuxpark <lin...@us...> - 2006-02-17 02:48:43
|
Update of /cvsroot/netadm/gwc/gwcguid In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8594 Modified Files: interface.c Log Message: FIX: Remove or Fix ugly label Add statusbar Index: interface.c =================================================================== RCS file: /cvsroot/netadm/gwc/gwcguid/interface.c,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** interface.c 9 Feb 2006 17:54:06 -0000 1.6 --- interface.c 17 Feb 2006 02:48:36 -0000 1.7 *************** *** 316,319 **** --- 316,324 ---- gtk_notebook_get_nth_page(GTK_NOTEBOOK (notebook1), 0),label1); + + statusbar1 = gtk_statusbar_new(); + gtk_widget_show(statusbar1); + gtk_box_pack_start(GTK_BOX(vbox1), statusbar1, FALSE, FALSE, 4); + g_signal_connect(G_OBJECT(window1), "destroy", G_CALLBACK(close_event), NULL); *************** *** 387,391 **** GtkWidget *alignment301; GtkWidget *vbox301; - GtkWidget *label302; GtkWidget *frame301; GtkWidget *alignment311; --- 392,395 ---- *************** *** 393,398 **** GtkWidget *vbox308; GtkWidget *hbox307; - GtkWidget *label317; - GtkWidget *label318; GtkWidget *scrolledwindow1; GtkWidget *alignment308; --- 397,400 ---- *************** *** 408,415 **** GtkWidget *vbox309; GtkWidget *hbox309; - GtkWidget *label319; - GtkWidget *label320; - GtkWidget *label321; - GtkWidget *label392; GtkWidget *scrolledwindow2; GtkWidget *alignment309; --- 410,413 ---- *************** *** 444,452 **** gtk_widget_show(vbox301); gtk_container_add(GTK_CONTAINER(alignment301), vbox301); ! ! label302 = gtk_label_new(_("QoS and BandWidth")); ! gtk_widget_show (label302); ! gtk_box_pack_start (GTK_BOX (vbox301), label302, FALSE, FALSE, 1); ! frame301 = gtk_frame_new(NULL); gtk_widget_show(frame301); --- 442,446 ---- gtk_widget_show(vbox301); gtk_container_add(GTK_CONTAINER(alignment301), vbox301); ! frame301 = gtk_frame_new(NULL); gtk_widget_show(frame301); *************** *** 470,485 **** gtk_box_pack_start(GTK_BOX(vbox308), hbox307, TRUE, TRUE, 0); gtk_container_set_border_width(GTK_CONTAINER(hbox307), 5); ! ! label317 = ! gtk_label_new(_(" Class Name ")); ! gtk_widget_show (label317); ! gtk_box_pack_start(GTK_BOX(hbox307), label317, FALSE, FALSE, 0); ! gtk_widget_set_size_request(label317, 185, -1); ! ! label318 = gtk_label_new(_("Bandwidth(%)")); ! gtk_widget_show (label318); ! gtk_box_pack_start(GTK_BOX(hbox307), label318, FALSE, FALSE, 0); ! gtk_widget_set_size_request(label318, 118, -1); ! scrolledwindow1 = gtk_scrolled_window_new(NULL, NULL); gtk_widget_show(scrolledwindow1); --- 464,468 ---- gtk_box_pack_start(GTK_BOX(vbox308), hbox307, TRUE, TRUE, 0); gtk_container_set_border_width(GTK_CONTAINER(hbox307), 5); ! scrolledwindow1 = gtk_scrolled_window_new(NULL, NULL); gtk_widget_show(scrolledwindow1); *************** *** 543,558 **** gtk_box_pack_start(GTK_BOX(vbox308), hbox307, TRUE, TRUE, 0); gtk_container_set_border_width(GTK_CONTAINER(hbox307), 5); ! ! label317 = ! gtk_label_new(_(" Class Name ")); ! gtk_widget_show (label317); ! gtk_box_pack_start(GTK_BOX(hbox307), label317, FALSE, FALSE, 0); ! gtk_widget_set_size_request(label317, 185, -1); ! ! label318 = gtk_label_new(_("Bandwidth(%)")); ! gtk_widget_show (label318); ! gtk_box_pack_start(GTK_BOX(hbox307), label318, FALSE, FALSE, 0); ! gtk_widget_set_size_request(label318, 118, -1); ! scrolledwindow1 = gtk_scrolled_window_new(NULL, NULL); gtk_widget_show(scrolledwindow1); --- 526,530 ---- gtk_box_pack_start(GTK_BOX(vbox308), hbox307, TRUE, TRUE, 0); gtk_container_set_border_width(GTK_CONTAINER(hbox307), 5); ! scrolledwindow1 = gtk_scrolled_window_new(NULL, NULL); gtk_widget_show(scrolledwindow1); *************** *** 618,642 **** gtk_box_pack_start(GTK_BOX(vbox309), hbox309, FALSE, FALSE, 0); gtk_container_set_border_width(GTK_CONTAINER(hbox309), 5); ! ! label319 = gtk_label_new(_(" Filter Name ")); ! gtk_widget_show (label319); ! gtk_box_pack_start(GTK_BOX(hbox309), label319, FALSE, FALSE, 0); ! gtk_widget_set_size_request(label319, 100, -1); ! ! label320 = gtk_label_new(_(" Type ")); ! gtk_widget_show (label320); ! gtk_box_pack_start(GTK_BOX(hbox309), label320, FALSE, FALSE, 0); ! gtk_widget_set_size_request(label320, 60, -1); ! ! label321 = gtk_label_new(_(" Detail ")); ! gtk_widget_show (label321); ! gtk_box_pack_start(GTK_BOX(hbox309), label321, FALSE, FALSE, 0); ! gtk_widget_set_size_request(label321, 60, -1); ! ! label392 = gtk_label_new(_(" Port")); ! gtk_widget_show (label392); ! gtk_box_pack_start(GTK_BOX(hbox309), label392, FALSE, FALSE, 0); ! gtk_widget_set_size_request(label392, 70, -1); ! scrolledwindow2 = gtk_scrolled_window_new(NULL, NULL); gtk_widget_show(scrolledwindow2); --- 590,594 ---- gtk_box_pack_start(GTK_BOX(vbox309), hbox309, FALSE, FALSE, 0); gtk_container_set_border_width(GTK_CONTAINER(hbox309), 5); ! scrolledwindow2 = gtk_scrolled_window_new(NULL, NULL); gtk_widget_show(scrolledwindow2); *************** *** 809,813 **** GLADE_HOOKUP_OBJECT(window1, alignment301, "alignment301"); GLADE_HOOKUP_OBJECT(window1, vbox301, "vbox301"); - GLADE_HOOKUP_OBJECT(window1, label302, "label302"); GLADE_HOOKUP_OBJECT(window1, frame301, "frame301"); GLADE_HOOKUP_OBJECT(window1, alignment311, "alignment311"); --- 761,764 ---- *************** *** 815,820 **** GLADE_HOOKUP_OBJECT(window1, vbox308, "vbox308"); GLADE_HOOKUP_OBJECT(window1, hbox307, "hbox307"); - GLADE_HOOKUP_OBJECT(window1, label317, "label317"); - GLADE_HOOKUP_OBJECT(window1, label318, "label318"); GLADE_HOOKUP_OBJECT(window1, scrolledwindow1, "scrolledwindow1"); GLADE_HOOKUP_OBJECT(window1, alignment308, "alignment308"); --- 766,769 ---- *************** *** 828,834 **** GLADE_HOOKUP_OBJECT(window1, vbox309, "vbox309"); GLADE_HOOKUP_OBJECT(window1, hbox309, "hbox309"); - GLADE_HOOKUP_OBJECT(window1, label319, "label319"); - GLADE_HOOKUP_OBJECT(window1, label320, "label320"); - GLADE_HOOKUP_OBJECT(window1, label321, "label321"); GLADE_HOOKUP_OBJECT(window1, scrolledwindow2, "scrolledwindow2"); GLADE_HOOKUP_OBJECT(window1, alignment309, "alignment309"); --- 777,780 ---- *************** *** 1496,1500 **** GLADE_HOOKUP_OBJECT(window2, label98[i], strLabel98); ! } // end of for i // ######################################################################## --- 1442,1446 ---- GLADE_HOOKUP_OBJECT(window2, label98[i], strLabel98); ! } // ######################################################################## *************** *** 1541,1568 **** GLADE_HOOKUP_OBJECT(window2, label96, "label96"); GLADE_HOOKUP_OBJECT(window2, label97, "label97"); ! /* GLADE_HOOKUP_OBJECT (window2, entryIfIndex, "entryIfIndex"); ! GLADE_HOOKUP_OBJECT (window2, entryIfDesc, "entryIfDesc"); ! GLADE_HOOKUP_OBJECT (window2, entryIfType, "entryIfType"); ! GLADE_HOOKUP_OBJECT (window2, entryIfMtu, "entryIfMtu"); ! GLADE_HOOKUP_OBJECT (window2, entryIfSpeed, "entryIfSpeed"); ! GLADE_HOOKUP_OBJECT (window2, entryIfPhyAddr, "entryIfPhyAddr"); ! GLADE_HOOKUP_OBJECT (window2, entryIfAdminStat, "entryIfAdminStat"); ! GLADE_HOOKUP_OBJECT (window2, entryIfOperStat, "entryIfOperStat"); ! GLADE_HOOKUP_OBJECT (window2, entryIfLastChange, "entryIfLastChange"); ! GLADE_HOOKUP_OBJECT (window2, entryIfInOctet, "entryIfInOctet"); ! GLADE_HOOKUP_OBJECT (window2, entryIfInUCastPkt, "entryIfInUCastPkt"); ! GLADE_HOOKUP_OBJECT (window2, entryIfInNUCastPkt, "entryIfInNUCastPkt"); ! GLADE_HOOKUP_OBJECT (window2, entryIfInDiscard, "entryIfInDiscard"); ! GLADE_HOOKUP_OBJECT (window2, entryIfInError, "entryIfInError"); ! GLADE_HOOKUP_OBJECT (window2, entryIfInUnknownProto, "entryIfInUnknownProto"); ! GLADE_HOOKUP_OBJECT (window2, entryIfOutOctet, "entryIfOutOctet"); ! GLADE_HOOKUP_OBJECT (window2, entryIfOutUCastPacket, "entryIfOutUCastPacket"); ! GLADE_HOOKUP_OBJECT (window2, entryIfOutNUCastPkt, "entryIfOutNUCastPkt"); ! GLADE_HOOKUP_OBJECT (window2, entryIfOutDiscard, "entryIfOutDiscard"); ! GLADE_HOOKUP_OBJECT (window2, entryIfOutDiscard, "entryIfOutOutError"); ! GLADE_HOOKUP_OBJECT (window2, entryIfOutQlen, "entryIfOutQlen"); ! GLADE_HOOKUP_OBJECT (window2, entryIfSpecific, "entryIfSpecific"); ! GLADE_HOOKUP_OBJECT (window2, label98, "label98"); ! */ GLADE_HOOKUP_OBJECT(window2, alignment10, "alignment10"); GLADE_HOOKUP_OBJECT(window2, hbox12, "hbox12"); GLADE_HOOKUP_OBJECT(window2, btnIfClose, "btnIfClose"); --- 1487,1491 ---- GLADE_HOOKUP_OBJECT(window2, label96, "label96"); GLADE_HOOKUP_OBJECT(window2, label97, "label97"); ! GLADE_HOOKUP_OBJECT(window2, alignment10, "alignment10"); GLADE_HOOKUP_OBJECT(window2, hbox12, "hbox12"); GLADE_HOOKUP_OBJECT(window2, btnIfClose, "btnIfClose"); *************** *** 2944,2965 **** // modified ############################################################ - /* - entryUdpLocalAddress = gtk_entry_new (); - gtk_widget_show (entryUdpLocalAddress); - gtk_table_attach (GTK_TABLE (table6), entryUdpLocalAddress, 1, 2, 1, 2, - (GtkAttachOptions) (GTK_EXPAND), - (GtkAttachOptions) (0), 0, 0); - gtk_widget_set_size_request (entryUdpLocalAddress, 100, 25); - gtk_editable_set_editable (GTK_EDITABLE (entryUdpLocalAddress), FALSE); - - entryUdpLocalPort = gtk_entry_new (); - gtk_widget_show (entryUdpLocalPort); - gtk_table_attach (GTK_TABLE (table6), entryUdpLocalPort, 1, 2, 2, 3, - (GtkAttachOptions) (GTK_EXPAND), - (GtkAttachOptions) (0), 0, 0); - gtk_widget_set_size_request (entryUdpLocalPort, 100, 25); - gtk_editable_set_editable (GTK_EDITABLE (entryUdpLocalPort), FALSE); - */ - static char strUdpLocalAddress[50]; static char strUdpLocalPort[50]; --- 2867,2870 ---- *************** *** 2995,3000 **** } ! // end of modified ###################################################### ! label165 = gtk_label_new(_("index #1")); gtk_widget_show(label165); --- 2900,2904 ---- } ! // end of modified ################################################### label165 = gtk_label_new(_("index #1")); gtk_widget_show(label165); *************** *** 3105,3109 **** static char strSpinBtnOfdm[15]; static char strSpinBtnClient[15]; - //static char strFrameName[15]; sprintf(strLabel4, "label4_%d", i); --- 3009,3012 ---- *************** *** 3111,3115 **** sprintf(strSpinBtnOfdm, "spinbtnOfdm%d", i); sprintf(strSpinBtnClient, "spinbtnClient%d", i); - //sprintf(strFrameName, ""); framePwrSide[i] = gtk_frame_new(NULL); --- 3014,3017 ---- |