[Netadm-devel] gwc/gwcguid callback.c,1.3,1.4 interface.c,1.4,1.5
Status: Beta
Brought to you by:
linuxpark
Menu
▾
▴
[Netadm-devel] gwc/gwcguid callback.c,1.3,1.4 interface.c,1.4,1.5
|
From: 똥꼬 <lin...@us...> - 2006-02-05 13:18:40
|
Update of /cvsroot/netadm/gwc/gwcguid In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4324/gwcguid Modified Files: callback.c interface.c Log Message: DEL: 1. delete wireless AP query Index: callback.c =================================================================== RCS file: /cvsroot/netadm/gwc/gwcguid/callback.c,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** callback.c 31 Jan 2006 16:03:44 -0000 1.3 --- callback.c 5 Feb 2006 13:18:31 -0000 1.4 *************** *** 184,191 **** firstQos = 0; } - - if (isOnStatusBar-- == 0) - set_item_statusbar(" "); - mainTimer = gtk_timeout_add(1000, (GtkFunction) on_main_timer, --- 184,187 ---- *************** *** 204,207 **** --- 200,204 ---- lookup_widget(GTK_WIDGET(widget), "entryMonSnmp"))); + //newSnmp = (char *) gtk_entry_get_text ((GtkEntry *)lookup_widget(GTK_WIDGET(widget),"entryMonSnmp")); gtk_entry_set_text((GtkEntry *) Index: interface.c =================================================================== RCS file: /cvsroot/netadm/gwc/gwcguid/interface.c,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** interface.c 31 Jan 2006 16:03:44 -0000 1.4 --- interface.c 5 Feb 2006 13:18:31 -0000 1.5 *************** *** 97,134 **** GtkWidget *label22; GtkWidget *label1; - GtkWidget *vbox4; - GtkWidget *alignment8; - GtkWidget *frame2; - GtkWidget *alignment7; - GtkWidget *hbox8; - GtkWidget *vbox5; - GtkWidget *hbox9; - GtkWidget *label32; - GtkWidget *entryPwrCck; - GtkWidget *label35; - GtkWidget *hbox10; - GtkWidget *label33; - GtkWidget *entryPwrOfdm; - GtkWidget *label36; - GtkWidget *hbox11; - GtkWidget *label34; - GtkWidget *entryPwrClient; - GtkWidget *label37; - GtkWidget *label24; - GtkWidget *hbox7; - GtkWidget *label25; - GtkWidget *btnPwrSet; - GtkWidget *label26; - GtkWidget *label2; - GtkWidget *alignment1; - GtkWidget *hbox1; - GtkWidget *label3; - GtkWidget *btnExit; - GtkWidget *label23; - // new!! - GtkWidget *alignmentMonPwr; - GtkWidget *hboxMonPwr; - GtkWidget *labelMonPwr; - GtkWidget *comboboxMonPwr; window1 = gtk_window_new(GTK_WINDOW_TOPLEVEL); --- 97,100 ---- *************** *** 147,151 **** notebook1 = gtk_notebook_new(); gtk_widget_show(notebook1); ! gtk_box_pack_start(GTK_BOX(vbox1), notebook1, TRUE, TRUE, 5); alignment3 = gtk_alignment_new(0.5, 0.5, 1, 1); --- 113,117 ---- notebook1 = gtk_notebook_new(); gtk_widget_show(notebook1); ! gtk_box_pack_start(GTK_BOX(vbox1), notebook1, TRUE, TRUE, 3); alignment3 = gtk_alignment_new(0.5, 0.5, 1, 1); *************** *** 345,520 **** gtk_box_pack_start(GTK_BOX(vbox2), labelTrivial2, TRUE, TRUE, 0); ! label1 = gtk_label_new(_(" Monitor ")); gtk_widget_show(label1); gtk_notebook_set_tab_label(GTK_NOTEBOOK(notebook1), gtk_notebook_get_nth_page(GTK_NOTEBOOK ! (notebook1), 0), ! label1); ! ! //here~ ! vbox4 = gtk_vbox_new(FALSE, 0); ! gtk_widget_show(vbox4); ! gtk_container_add(GTK_CONTAINER(notebook1), vbox4); ! ! // new label and combobox ! alignmentMonPwr = gtk_alignment_new(0.5, 0.5, 1, 1); ! gtk_widget_show(alignmentMonPwr); ! gtk_box_pack_start(GTK_BOX(vbox4), alignmentMonPwr, TRUE, FALSE, 0); ! gtk_alignment_set_padding(GTK_ALIGNMENT(alignmentMonPwr), 5, 5, 15, 5); ! ! hboxMonPwr = gtk_hbox_new(FALSE, 0); ! gtk_widget_show(hboxMonPwr); ! gtk_container_add(GTK_CONTAINER(alignmentMonPwr), hboxMonPwr); ! ! labelMonPwr = gtk_label_new(_("Interface ")); ! gtk_widget_show(labelMonPwr); ! gtk_box_pack_start(GTK_BOX(hboxMonPwr), labelMonPwr, FALSE, FALSE, 0); ! ! comboboxMonPwr = gtk_combo_box_new_text(); ! gtk_widget_show(comboboxMonPwr); ! gtk_box_pack_start(GTK_BOX(hboxMonPwr), comboboxMonPwr, FALSE, FALSE, ! 0); ! gtk_widget_set_size_request(comboboxMonPwr, 183, 30); ! ! // end new widget ! ! alignment8 = gtk_alignment_new(0.5, 0.5, 1, 1); ! gtk_widget_show(alignment8); ! gtk_box_pack_start(GTK_BOX(vbox4), alignment8, TRUE, TRUE, 0); ! ! frame2 = gtk_frame_new(NULL); ! gtk_widget_show(frame2); ! gtk_container_add(GTK_CONTAINER(alignment8), frame2); ! gtk_container_set_border_width(GTK_CONTAINER(frame2), 6); ! ! alignment7 = gtk_alignment_new(0.5, 0.5, 1, 1); ! gtk_widget_show(alignment7); ! gtk_container_add(GTK_CONTAINER(frame2), alignment7); ! gtk_alignment_set_padding(GTK_ALIGNMENT(alignment7), 0, 0, 12, 0); ! ! hbox8 = gtk_hbox_new(FALSE, 0); ! gtk_widget_show(hbox8); ! gtk_container_add(GTK_CONTAINER(alignment7), hbox8); ! ! vbox5 = gtk_vbox_new(FALSE, 0); ! gtk_widget_show(vbox5); ! gtk_box_pack_start(GTK_BOX(hbox8), vbox5, TRUE, TRUE, 0); ! ! hbox9 = gtk_hbox_new(FALSE, 0); ! gtk_widget_show(hbox9); ! gtk_box_pack_start(GTK_BOX(vbox5), hbox9, TRUE, TRUE, 0); ! ! label32 = gtk_label_new(_("CCK transmitter power ")); ! gtk_widget_show(label32); // ! gtk_box_pack_start(GTK_BOX(hbox9), label32, FALSE, FALSE, 0); ! ! entryPwrCck = gtk_entry_new(); ! gtk_widget_show(entryPwrCck); ! gtk_box_pack_start(GTK_BOX(hbox9), entryPwrCck, TRUE, TRUE, 0); ! gtk_widget_set_size_request(entryPwrCck, 158, 25); ! ! label35 = gtk_label_new(_(" ")); ! gtk_widget_show(label35); ! gtk_box_pack_start(GTK_BOX(hbox9), label35, FALSE, FALSE, 0); ! ! hbox10 = gtk_hbox_new(FALSE, 0); ! gtk_widget_show(hbox10); ! gtk_box_pack_start(GTK_BOX(vbox5), hbox10, TRUE, TRUE, 0); ! ! label33 = gtk_label_new(_("OFDM transmitter power ")); ! gtk_widget_show(label33); ! gtk_box_pack_start(GTK_BOX(hbox10), label33, FALSE, FALSE, 0); ! ! entryPwrOfdm = gtk_entry_new(); ! gtk_widget_show(entryPwrOfdm); ! gtk_box_pack_start(GTK_BOX(hbox10), entryPwrOfdm, TRUE, TRUE, 0); ! gtk_widget_set_size_request(entryPwrOfdm, 158, 25); ! ! label36 = gtk_label_new(_(" ")); ! gtk_widget_show(label36); ! gtk_box_pack_start(GTK_BOX(hbox10), label36, FALSE, FALSE, 0); ! ! hbox11 = gtk_hbox_new(FALSE, 0); ! gtk_widget_show(hbox11); // ! gtk_box_pack_start(GTK_BOX(vbox5), hbox11, TRUE, TRUE, 0); ! ! label34 = gtk_label_new(_("Client transmitter power ")); ! gtk_widget_show(label34); ! gtk_box_pack_start(GTK_BOX(hbox11), label34, FALSE, FALSE, 0); ! ! entryPwrClient = gtk_entry_new(); ! gtk_widget_show(entryPwrClient); ! gtk_box_pack_start(GTK_BOX(hbox11), entryPwrClient, TRUE, TRUE, 0); ! gtk_widget_set_size_request(entryPwrClient, 158, 25); ! ! label37 = gtk_label_new(_(" ")); ! gtk_widget_show(label37); ! gtk_box_pack_start(GTK_BOX(hbox11), label37, FALSE, FALSE, 0); ! ! label24 = gtk_label_new(_("<b>Power Modulation Element</b>")); ! gtk_widget_show(label24); ! gtk_frame_set_label_widget(GTK_FRAME(frame2), label24); ! gtk_label_set_use_markup(GTK_LABEL(label24), TRUE); ! gtk_misc_set_padding(GTK_MISC(label24), 5, 0); ! ! hbox7 = gtk_hbox_new(FALSE, 0); ! gtk_widget_show(hbox7); ! gtk_box_pack_start(GTK_BOX(vbox4), hbox7, TRUE, FALSE, 0); ! ! label25 = gtk_label_new(_(" ")); ! gtk_widget_show(label25); ! gtk_box_pack_start(GTK_BOX(hbox7), label25, FALSE, FALSE, 0); // ! ! btnPwrSet = gtk_button_new_with_mnemonic(_("set")); ! gtk_widget_show(btnPwrSet); ! gtk_box_pack_start(GTK_BOX(hbox7), btnPwrSet, FALSE, FALSE, 0); ! gtk_widget_set_size_request(btnPwrSet, 62, 31); ! ! label26 = gtk_label_new(_(" ")); ! gtk_widget_show(label26); ! gtk_box_pack_start(GTK_BOX(hbox7), label26, FALSE, FALSE, 0); ! ! label2 = gtk_label_new(_(" Power ")); ! gtk_widget_show(label2); ! gtk_notebook_set_tab_label(GTK_NOTEBOOK(notebook1), ! gtk_notebook_get_nth_page(GTK_NOTEBOOK ! (notebook1), 1), ! label2); ! ! alignment1 = gtk_alignment_new(0.5, 0.5, 1, 1); ! gtk_widget_show(alignment1); ! gtk_box_pack_start(GTK_BOX(vbox1), alignment1, TRUE, FALSE, 1); ! gtk_alignment_set_padding(GTK_ALIGNMENT(alignment1), 0, 0, 3, 3); ! ! hbox1 = gtk_hbox_new(FALSE, 0); ! gtk_widget_show(hbox1); // ! gtk_container_add(GTK_CONTAINER(alignment1), hbox1); ! ! label3 = ! gtk_label_new(_ ! (" ")); ! gtk_widget_show(label3); ! gtk_box_pack_start(GTK_BOX(hbox1), label3, FALSE, FALSE, 0); ! ! btnExit = gtk_button_new_with_mnemonic(_("exit")); ! gtk_widget_show(btnExit); ! gtk_box_pack_start(GTK_BOX(hbox1), btnExit, FALSE, FALSE, 0); ! gtk_widget_set_size_request(btnExit, 55, 25); ! ! label23 = gtk_label_new(_(" ")); ! gtk_widget_show(label23); ! gtk_box_pack_start(GTK_BOX(hbox1), label23, FALSE, FALSE, 0); ! ! statusbar1 = gtk_statusbar_new(); ! gtk_widget_show(statusbar1); ! gtk_box_pack_start(GTK_BOX(vbox1), statusbar1, FALSE, FALSE, 4); ! ! ////////////////////////////////////////////////////////////////////////////////////////////// ! ////////////////////////////////////////////////////////////////////////////////////////////// ! // ERROR PACKET ////////////////////////////////////////////////////////////////////////////// ! ////////////////////////////////////////////////////////////////////////////////////////////// ! ////////////////////////////////////////////////////////////////////////////////////////////// ! ! //################################################################### 1i g_signal_connect(G_OBJECT(window1), "destroy", G_CALLBACK(close_event), NULL); --- 311,319 ---- gtk_box_pack_start(GTK_BOX(vbox2), labelTrivial2, TRUE, TRUE, 0); ! label1 = gtk_label_new(_(" Monitoring ")); gtk_widget_show(label1); gtk_notebook_set_tab_label(GTK_NOTEBOOK(notebook1), gtk_notebook_get_nth_page(GTK_NOTEBOOK ! (notebook1), 0),label1); g_signal_connect(G_OBJECT(window1), "destroy", G_CALLBACK(close_event), NULL); *************** *** 531,547 **** g_signal_connect(G_OBJECT(btnMonUdpInfo), "clicked", G_CALLBACK(open_winUdp), (GtkWidget *) window1); - g_signal_connect(G_OBJECT(btnPwrSet), "clicked", - G_CALLBACK(open_winPwr), (GtkWidget *) window1); g_signal_connect(G_OBJECT(btnMonApSet), "clicked", G_CALLBACK(open_winAp), (GtkWidget *) window1); g_signal_connect(G_OBJECT(btnMonSnmpSet), "clicked", G_CALLBACK(reset_monSnmp), (GtkWidget *) window1); - g_signal_connect(G_OBJECT(btnExit), "clicked", G_CALLBACK(close_event), - NULL); g_signal_connect(G_OBJECT(entryMonSnmp), "backspace", G_CALLBACK(on_append_snmp), (GtkWidget *) window1); - g_signal_connect(G_OBJECT(comboboxMonPwr), "changed", - G_CALLBACK(on_pwr_changed), (GtkWidget *) window1); - /* Store pointers to all widgets, for use by lookup_widget(). */ GLADE_HOOKUP_OBJECT_NO_REF(window1, window1, "window1"); --- 330,339 ---- *************** *** 592,631 **** GLADE_HOOKUP_OBJECT(window1, label22, "label22"); GLADE_HOOKUP_OBJECT(window1, label1, "label1"); - GLADE_HOOKUP_OBJECT(window1, vbox4, "vbox4"); - GLADE_HOOKUP_OBJECT(window1, alignment8, "alignment8"); - GLADE_HOOKUP_OBJECT(window1, frame2, "frame2"); - GLADE_HOOKUP_OBJECT(window1, alignment7, "alignment7"); - GLADE_HOOKUP_OBJECT(window1, hbox8, "hbox8"); - GLADE_HOOKUP_OBJECT(window1, vbox5, "vbox5"); - GLADE_HOOKUP_OBJECT(window1, hbox9, "hbox9"); - GLADE_HOOKUP_OBJECT(window1, label32, "label32"); - GLADE_HOOKUP_OBJECT(window1, entryPwrCck, "entryPwrCck"); - GLADE_HOOKUP_OBJECT(window1, label35, "label35"); - GLADE_HOOKUP_OBJECT(window1, hbox10, "hbox10"); - GLADE_HOOKUP_OBJECT(window1, label33, "label33"); - GLADE_HOOKUP_OBJECT(window1, entryPwrOfdm, "entryPwrOfdm"); - GLADE_HOOKUP_OBJECT(window1, label36, "label36"); - GLADE_HOOKUP_OBJECT(window1, hbox11, "hbox11"); - GLADE_HOOKUP_OBJECT(window1, label34, "label34"); - GLADE_HOOKUP_OBJECT(window1, entryPwrClient, "entryPwrClient"); - GLADE_HOOKUP_OBJECT(window1, label37, "label37"); - GLADE_HOOKUP_OBJECT(window1, label24, "label24"); - GLADE_HOOKUP_OBJECT(window1, hbox7, "hbox7"); - GLADE_HOOKUP_OBJECT(window1, label25, "label25"); - GLADE_HOOKUP_OBJECT(window1, btnPwrSet, "btnPwrSet"); - GLADE_HOOKUP_OBJECT(window1, label26, "label26"); - GLADE_HOOKUP_OBJECT(window1, label2, "label2"); - GLADE_HOOKUP_OBJECT(window1, alignment1, "alignment1"); - GLADE_HOOKUP_OBJECT(window1, hbox1, "hbox1"); - GLADE_HOOKUP_OBJECT(window1, label3, "label3"); - GLADE_HOOKUP_OBJECT(window1, btnExit, "btnExit"); - GLADE_HOOKUP_OBJECT(window1, label23, "label23"); - // new - GLADE_HOOKUP_OBJECT(window1, alignmentMonPwr, "alignmentMonPwr"); - GLADE_HOOKUP_OBJECT(window1, hboxMonPwr, "hboxMonPwr"); - GLADE_HOOKUP_OBJECT(window1, labelMonPwr, "labelMonPwr"); - GLADE_HOOKUP_OBJECT(window1, comboboxMonPwr, "comboboxMonPwr"); - - //////////////////////////////////////////////////////////////////////////////// GtkWidget *alignment301; --- 384,387 ---- *************** *** 690,697 **** label302 = gtk_label_new(_("QoS and BandWidth")); ! //gtk_widget_show (label302); ! //gtk_box_pack_start (GTK_BOX (vbox301), label302, FALSE, FALSE, 2); - //start//////////////////////////////////////////////////////////////// frame301 = gtk_frame_new(NULL); gtk_widget_show(frame301); --- 446,452 ---- 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); *************** *** 718,727 **** 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); --- 473,482 ---- 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); *************** *** 735,739 **** GTK_POLICY_NEVER, GTK_POLICY_ALWAYS); - /// cpoint GtkWidget *clist105; char *titles201[2] = { "Interface Name", "Max Bandwidth(KByte/sec)" }; --- 490,493 ---- *************** *** 767,772 **** gtk_label_set_use_markup(GTK_LABEL(label10), TRUE); gtk_misc_set_padding(GTK_MISC(label10), 5, 0); - // new frame - ////////////////////////////////////////////////////////////////// frame301 = gtk_frame_new(NULL); --- 521,524 ---- *************** *** 793,803 **** 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); --- 545,555 ---- 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); *************** *** 811,815 **** GTK_POLICY_NEVER, GTK_POLICY_ALWAYS); - /// cpoint GtkWidget *clist101; char *titles101[3] = --- 563,566 ---- *************** *** 844,848 **** gtk_label_set_use_markup(GTK_LABEL(label10), TRUE); gtk_misc_set_padding(GTK_MISC(label10), 5, 0); - // new frame frame302 = gtk_frame_new(NULL); --- 595,598 ---- *************** *** 870,889 **** 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); --- 620,639 ---- 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); *************** *** 897,901 **** GTK_POLICY_NEVER, GTK_POLICY_ALWAYS); - // cpoint GtkWidget *clist102; char *titles102[4] = --- 647,650 ---- *************** *** 967,971 **** GTK_POLICY_NEVER, GTK_POLICY_ALWAYS); - // cpoint GtkWidget *clist103; char *titles103[5] = { "rule ", --- 716,719 ---- *************** *** 1006,1010 **** gtk_misc_set_padding(GTK_MISC(label305), 5, 0); - ////// alignment312 = gtk_alignment_new(0.5, 0.5, 1, 1); gtk_widget_show(alignment312); --- 754,757 ---- *************** *** 1024,1031 **** gtk_notebook_set_tab_label(GTK_NOTEBOOK(notebook1), gtk_notebook_get_nth_page(GTK_NOTEBOOK ! (notebook1), 2), ! label301); - ///////////////////////////////////////////////////////////////////////// g_signal_connect(G_OBJECT(btnQosBandAdd), "clicked", G_CALLBACK(open_winBand), (GtkWidget *) window1); --- 771,776 ---- gtk_notebook_set_tab_label(GTK_NOTEBOOK(notebook1), gtk_notebook_get_nth_page(GTK_NOTEBOOK ! (notebook1), 1), label301); g_signal_connect(G_OBJECT(btnQosBandAdd), "clicked", G_CALLBACK(open_winBand), (GtkWidget *) window1); *************** *** 1110,1116 **** GLADE_HOOKUP_OBJECT(window1, label301, "label301"); ! //////////////////////////////////////////////////////////////////////////////// ! //// ERROR PACKET ////////////////////////////////////////////////////////////// ! //////////////////////////////////////////////////////////////////////////////// GtkWidget *alignment701; GtkWidget *vbox701; --- 855,861 ---- GLADE_HOOKUP_OBJECT(window1, label301, "label301"); ! /* ! * flow control ! */ GtkWidget *alignment701; GtkWidget *vbox701; *************** *** 1193,1204 **** gtk_widget_set_size_request(buttonErrorApply, 70, -1); ! label701 = gtk_label_new(_(" Packet Control ")); gtk_widget_show(label701); gtk_notebook_set_tab_label(GTK_NOTEBOOK(notebook1), gtk_notebook_get_nth_page(GTK_NOTEBOOK ! (notebook1), 3), ! label701); - //////////////////////////////////////////////////////////////////////////////////////////////////////////// g_signal_connect(G_OBJECT(buttonErrorAdd), "clicked", G_CALLBACK(on_errpkt_add), (GtkWidget *) window1); --- 938,947 ---- gtk_widget_set_size_request(buttonErrorApply, 70, -1); ! label701 = gtk_label_new(_(" Flow Control ")); gtk_widget_show(label701); gtk_notebook_set_tab_label(GTK_NOTEBOOK(notebook1), gtk_notebook_get_nth_page(GTK_NOTEBOOK ! (notebook1), 2),label701); g_signal_connect(G_OBJECT(buttonErrorAdd), "clicked", G_CALLBACK(on_errpkt_add), (GtkWidget *) window1); *************** *** 1224,1514 **** update_errpkt((GtkWidget *) window1); - /********************************************************************/ - /* */ - /* A U T O S I G N A L R E C Y C L E */ - /* */ - /********************************************************************/ - GtkWidget *pwc_vbox_main; - GtkWidget *pwc_align1; - GtkWidget *pwc_hbox5; - GtkWidget *pwc_label8; - GtkWidget *pwc_btn_set; - GtkWidget *pwc_btn_apply; - GtkWidget *pwc_label9; - GtkWidget *pwc_label10; - - pwc_vbox_main = gtk_vbox_new(FALSE, 0); - gtk_widget_show(pwc_vbox_main); - gtk_container_add(GTK_CONTAINER(notebook1), pwc_vbox_main); - - pwc_align1 = gtk_alignment_new(0.5, 0.5, 1, 1); - gtk_widget_show(pwc_align1); - gtk_box_pack_start(GTK_BOX(pwc_vbox_main), pwc_align1, TRUE, TRUE, 0); - /* stop interval ************************************************ */ - /*****************************************************************/ - GtkWidget *pwc_frame_stop; - GtkWidget *pwc_align2_stop; - GtkWidget *pwc_hbox1_stop; - GtkWidget *pwc_vbox1_stop; - GtkWidget *pwc_hbox2_stop; - GtkWidget *pwc_label1_stop; - GtkWidget *pwc_entry_stop1; - GtkWidget *pwc_label3_stop; - GtkWidget *pwc_entry_stop2; - GtkWidget *pwc_label7_stop; - - pwc_frame_stop = gtk_frame_new(NULL); - gtk_widget_show(pwc_frame_stop); - gtk_box_pack_start(GTK_BOX(pwc_vbox_main), pwc_frame_stop, TRUE, TRUE, - 0); - gtk_container_set_border_width(GTK_CONTAINER(pwc_frame_stop), 3); - - pwc_align2_stop = gtk_alignment_new(0.5, 0.5, 1, 1); - gtk_widget_show(pwc_align2_stop); - gtk_container_add(GTK_CONTAINER(pwc_frame_stop), pwc_align2_stop); - gtk_alignment_set_padding(GTK_ALIGNMENT(pwc_align2_stop), 0, 0, 12, 0); - - /* BASE VBOX */ - pwc_vbox1_stop = gtk_vbox_new(FALSE, 10); - gtk_widget_show(pwc_vbox1_stop); - gtk_container_add(GTK_CONTAINER(pwc_align2_stop), pwc_vbox1_stop); - - /* SUB HBOX */ - pwc_hbox1_stop = gtk_hbox_new(TRUE, 5); - gtk_widget_show(pwc_hbox1_stop); - gtk_box_pack_start(GTK_BOX(pwc_vbox1_stop), pwc_hbox1_stop, FALSE, - FALSE, 5); - - /* SUB HBOX */ - pwc_hbox2_stop = gtk_hbox_new(TRUE, 5); - gtk_widget_show(pwc_hbox2_stop); - gtk_box_pack_start(GTK_BOX(pwc_vbox1_stop), pwc_hbox2_stop, FALSE, - FALSE, 5); - - /* each mem in hboxs which in base vbox */ - pwc_label1_stop = gtk_label_new(_("First stop interval")); - gtk_widget_show(pwc_label1_stop); - gtk_box_pack_start(GTK_BOX(pwc_hbox1_stop), pwc_label1_stop, TRUE, - FALSE, 5); - - pwc_entry_stop1 = gtk_entry_new(); - gtk_widget_show(pwc_entry_stop1); - gtk_box_pack_start(GTK_BOX(pwc_hbox1_stop), pwc_entry_stop1, TRUE, - FALSE, 5); - - pwc_label3_stop = gtk_label_new(_("Second stop interval")); - gtk_widget_show(pwc_label3_stop); - gtk_box_pack_start(GTK_BOX(pwc_hbox2_stop), pwc_label3_stop, TRUE, - FALSE, 5); - - pwc_entry_stop2 = gtk_entry_new(); - gtk_widget_show(pwc_entry_stop2); - gtk_box_pack_start(GTK_BOX(pwc_hbox2_stop), pwc_entry_stop2, TRUE, - FALSE, 5); - - pwc_label7_stop = gtk_label_new(_("<b>Stop interval</b>")); - gtk_widget_show(pwc_label7_stop); - gtk_frame_set_label_widget(GTK_FRAME(pwc_frame_stop), pwc_label7_stop); - gtk_label_set_use_markup(GTK_LABEL(pwc_label7_stop), TRUE); - gtk_misc_set_padding(GTK_MISC(pwc_label7_stop), 5, 0); - /*****************************************************************/ - - /* moving interval ************************************************ */ - /*****************************************************************/ - GtkWidget *pwc_frame_mov; - GtkWidget *pwc_align2_mov; - GtkWidget *pwc_hbox1_mov; - GtkWidget *pwc_vbox1_mov; - GtkWidget *pwc_hbox2_mov; - GtkWidget *pwc_label1_mov; - GtkWidget *pwc_entry_m1; - GtkWidget *pwc_label3_mov; - GtkWidget *pwc_entry_m2; - GtkWidget *pwc_label7_mov; - - pwc_frame_mov = gtk_frame_new(NULL); - gtk_widget_show(pwc_frame_mov); - gtk_box_pack_start(GTK_BOX(pwc_vbox_main), pwc_frame_mov, TRUE, TRUE, - 0); - gtk_container_set_border_width(GTK_CONTAINER(pwc_frame_mov), 3); - - pwc_align2_mov = gtk_alignment_new(0.5, 0.5, 1, 1); - gtk_widget_show(pwc_align2_mov); - gtk_container_add(GTK_CONTAINER(pwc_frame_mov), pwc_align2_mov); - gtk_alignment_set_padding(GTK_ALIGNMENT(pwc_align2_mov), 0, 0, 12, 0); - - /* BASE VBOX */ - pwc_vbox1_mov = gtk_vbox_new(FALSE, 10); - gtk_widget_show(pwc_vbox1_mov); - gtk_container_add(GTK_CONTAINER(pwc_align2_mov), pwc_vbox1_mov); - - /* SUB HBOX */ - pwc_hbox1_mov = gtk_hbox_new(TRUE, 5); - gtk_widget_show(pwc_hbox1_mov); - gtk_box_pack_start(GTK_BOX(pwc_vbox1_mov), pwc_hbox1_mov, FALSE, FALSE, - 5); - - /* SUB HBOX */ - pwc_hbox2_mov = gtk_hbox_new(TRUE, 5); - gtk_widget_show(pwc_hbox2_mov); - gtk_box_pack_start(GTK_BOX(pwc_vbox1_mov), pwc_hbox2_mov, FALSE, FALSE, - 5); - - /* each mem in hboxs which in base vbox */ - pwc_label1_mov = gtk_label_new(_("First moving interval")); - gtk_widget_show(pwc_label1_mov); - gtk_box_pack_start(GTK_BOX(pwc_hbox1_mov), pwc_label1_mov, TRUE, FALSE, - 5); - - pwc_entry_m1 = gtk_entry_new(); - gtk_widget_show(pwc_entry_m1); - gtk_box_pack_start(GTK_BOX(pwc_hbox1_mov), pwc_entry_m1, TRUE, FALSE, - 5); - - pwc_label3_mov = gtk_label_new(_("Second moving interval")); - gtk_widget_show(pwc_label3_mov); - gtk_box_pack_start(GTK_BOX(pwc_hbox2_mov), pwc_label3_mov, TRUE, FALSE, - 5); - - pwc_entry_m2 = gtk_entry_new(); - gtk_widget_show(pwc_entry_m2); - gtk_box_pack_start(GTK_BOX(pwc_hbox2_mov), pwc_entry_m2, TRUE, FALSE, - 5); - - pwc_label7_mov = gtk_label_new(_("<b>Moving interval</b>")); - gtk_widget_show(pwc_label7_mov); - gtk_frame_set_label_widget(GTK_FRAME(pwc_frame_mov), pwc_label7_mov); - gtk_label_set_use_markup(GTK_LABEL(pwc_label7_mov), TRUE); - gtk_misc_set_padding(GTK_MISC(pwc_label7_mov), 5, 0); - /*****************************************************************/ - - /* test config ************************************************* */ - /*****************************************************************/ - GtkWidget *pwc_frame_conf; - GtkWidget *pwc_align2_conf; - GtkWidget *pwc_hbox1_conf; - GtkWidget *pwc_vbox1_conf; - GtkWidget *pwc_hbox2_conf; - GtkWidget *pwc_label1_conf; - GtkWidget *pwc_label3_conf; - GtkWidget *pwc_com_init; - GtkWidget *pwc_entry_cnum; - GtkWidget *pwc_label7_conf; - GtkWidget *pwc_table_conf; - - pwc_frame_conf = gtk_frame_new(NULL); - gtk_widget_show(pwc_frame_conf); - gtk_box_pack_start(GTK_BOX(pwc_vbox_main), pwc_frame_conf, TRUE, TRUE, - 0); - gtk_container_set_border_width(GTK_CONTAINER(pwc_frame_conf), 3); - - pwc_align2_conf = gtk_alignment_new(0.5, 0.5, 1, 1); - gtk_widget_show(pwc_align2_conf); - gtk_container_add(GTK_CONTAINER(pwc_frame_conf), pwc_align2_conf); - gtk_alignment_set_padding(GTK_ALIGNMENT(pwc_align2_conf), 0, 0, 12, 0); - - /* BASE VBOX */ - pwc_vbox1_conf = gtk_vbox_new(FALSE, 13); - gtk_widget_show(pwc_vbox1_conf); - gtk_container_add(GTK_CONTAINER(pwc_align2_conf), pwc_vbox1_conf); - - /* SUB HBOX */ - pwc_hbox1_conf = gtk_hbox_new(TRUE, 8); - gtk_widget_show(pwc_hbox1_conf); - gtk_box_pack_start(GTK_BOX(pwc_vbox1_conf), pwc_hbox1_conf, FALSE, - FALSE, 5); - - /* SUB HBOX */ - pwc_hbox2_conf = gtk_hbox_new(TRUE, 5); - gtk_widget_show(pwc_hbox2_conf); - gtk_box_pack_start(GTK_BOX(pwc_vbox1_conf), pwc_hbox2_conf, FALSE, - FALSE, 5); - - /* each mem in hboxs which in base vbox */ - pwc_label1_conf = gtk_label_new(_("Initial value")); - gtk_widget_show(pwc_label1_conf); - gtk_box_pack_start(GTK_BOX(pwc_hbox1_conf), pwc_label1_conf, TRUE, - FALSE, 5); - - pwc_table_conf = gtk_table_new(3, 2, FALSE); - gtk_widget_show(pwc_table_conf); - gtk_box_pack_start(GTK_BOX(pwc_hbox1_conf), pwc_table_conf, TRUE, FALSE, - 5); - gtk_table_set_row_spacings(GTK_TABLE(pwc_table_conf), 3); - - pwc_com_init = gtk_combo_box_new_text(); - gtk_widget_show(pwc_com_init); - gtk_table_attach(GTK_TABLE(pwc_table_conf), pwc_com_init, 1, 2, 0, 1, - (GtkAttachOptions) (0), - (GtkAttachOptions) (GTK_FILL), 0, 0); - - gtk_combo_box_append_text(GTK_COMBO_BOX(pwc_com_init), - "Minimum Power Ratio"); - gtk_combo_box_append_text(GTK_COMBO_BOX(pwc_com_init), - "Maximum Power Ratio"); - gtk_combo_box_set_active(GTK_COMBO_BOX(pwc_com_init), 0); - - pwc_label3_conf = gtk_label_new(_("Number of test to recycle")); - gtk_widget_show(pwc_label3_conf); - gtk_box_pack_start(GTK_BOX(pwc_hbox2_conf), pwc_label3_conf, TRUE, - FALSE, 5); - - pwc_entry_cnum = gtk_entry_new(); - gtk_widget_show(pwc_entry_cnum); - gtk_box_pack_start(GTK_BOX(pwc_hbox2_conf), pwc_entry_cnum, TRUE, FALSE, - 5); - - /* Test Config */ - pwc_label7_conf = gtk_label_new(_("<b>Test Configuration</b>")); - gtk_widget_show(pwc_label7_conf); - gtk_frame_set_label_widget(GTK_FRAME(pwc_frame_conf), pwc_label7_conf); - gtk_label_set_use_markup(GTK_LABEL(pwc_label7_conf), TRUE); - gtk_misc_set_padding(GTK_MISC(pwc_label7_conf), 5, 0); - /*****************************************************************/ - - pwc_hbox5 = gtk_hbox_new(FALSE, 0); - gtk_widget_show(pwc_hbox5); - gtk_box_pack_start(GTK_BOX(pwc_vbox_main), pwc_hbox5, TRUE, FALSE, 0); - - pwc_label8 = gtk_label_new(_(" ")); - gtk_widget_show(pwc_label8); - gtk_box_pack_start(GTK_BOX(pwc_hbox5), pwc_label8, FALSE, FALSE, 0); - - /* S E T button */ - pwc_btn_set = gtk_button_new_with_mnemonic(_("set")); - gtk_widget_show(pwc_btn_set); - gtk_box_pack_start(GTK_BOX(pwc_hbox5), pwc_btn_set, FALSE, FALSE, 0); - gtk_widget_set_size_request(pwc_btn_set, 62, 31); - - pwc_label9 = gtk_label_new(_(" ")); - gtk_widget_show(pwc_label9); - gtk_box_pack_start(GTK_BOX(pwc_hbox5), pwc_label9, FALSE, FALSE, 0); - - /* A P P L Y button */ - pwc_btn_apply = gtk_button_new_with_mnemonic(_("apply")); - gtk_widget_show(pwc_btn_apply); - gtk_box_pack_start(GTK_BOX(pwc_hbox5), pwc_btn_apply, FALSE, FALSE, 0); - gtk_widget_set_size_request(pwc_btn_apply, 62, 31); - - pwc_label10 = gtk_label_new(_(" Wirelss Power Test ")); - gtk_widget_show(pwc_label10); - gtk_notebook_set_tab_label(GTK_NOTEBOOK(notebook1), - gtk_notebook_get_nth_page(GTK_NOTEBOOK - (notebook1), 4), - pwc_label10); - - /* A U T O S I G N A L R E C Y C L E end */ - g_signal_connect(G_OBJECT(pwc_btn_set), "clicked", - G_CALLBACK(cbset_pwc), (GtkWidget *) window1); - g_signal_connect(G_OBJECT(pwc_btn_apply), "clicked", - G_CALLBACK(cbapply_pwc), (GtkWidget *) window1); - GLADE_HOOKUP_OBJECT_NO_REF(window1, window1, "window1"); - GLADE_HOOKUP_OBJECT(window1, pwc_entry_stop1, "pwc_entry_stop1"); - GLADE_HOOKUP_OBJECT(window1, pwc_entry_stop2, "pwc_entry_stop2"); - GLADE_HOOKUP_OBJECT(window1, pwc_entry_m1, "pwc_entry_m1"); - GLADE_HOOKUP_OBJECT(window1, pwc_entry_m2, "pwc_entry_m2"); - GLADE_HOOKUP_OBJECT(window1, pwc_com_init, "pwc_com_init"); - GLADE_HOOKUP_OBJECT(window1, pwc_entry_cnum, "pwc_entry_cnum"); - return window1; } --- 967,970 ---- |
