From: Pavel S. <gi...@gi...> - 2010-11-28 19:42:43
|
gladevcp: Added HAL HBar/VBar to tests http://git.linuxcnc.org/?p=emc2.git;a=commitdiff;h=0452519 --- lib/python/gladevcp/gladevcp-test.hal | 4 ++- lib/python/gladevcp/gladevcp-test.ui | 43 ++++++++++++++++++++++++++++++-- 2 files changed, 43 insertions(+), 4 deletions(-) diff --git a/lib/python/gladevcp/gladevcp-test.hal b/lib/python/gladevcp/gladevcp-test.hal index 408a73d..16f0133 100644 --- a/lib/python/gladevcp/gladevcp-test.hal +++ b/lib/python/gladevcp/gladevcp-test.hal @@ -7,7 +7,7 @@ loadusr -Wn gladevcp-test gladevcp gladevcp-test.ui net vcp_b2led gladevcp-test.hal_button1 => gladevcp-test.hal_led1 net vcp_tb2table gladevcp-test.hal_togglebutton1 => gladevcp-test.hal_table1 net vcp_cb2hbox gladevcp-test.hal_checkbutton1 => gladevcp-test.hal_hbox1 -net vcp_vs2label gladevcp-test.hal_vscale1 => gladevcp-test.hal_label1 +net vcp_vs2label gladevcp-test.hal_vscale1 => gladevcp-test.hal_label1 gladevcp-test.hal_vbar1 net vcp_sb2label gladevcp-test.hal_spinbutton1-s => gladevcp-test.hal_label2 net vcp_rb2lab1 gladevcp-test.hal_radiobutton1 => gladevcp-test.hal_led4 @@ -15,3 +15,5 @@ net vcp_rb2lab2 gladevcp-test.hal_radiobutton2 => gladevcp-test.hal_led5 net vcp_hs2prgrs gladevcp-test.hal_hscale1 => gladevcp-test.hal_progressbar1 net vcp_sb2prgrs gladevcp-test.hal_spinbutton2-f => gladevcp-test.hal_progressbar1.scale + +net vcp_hs2bar gladevcp-test.hal_hscale2 => gladevcp-test.hal_hbar1 diff --git a/lib/python/gladevcp/gladevcp-test.ui b/lib/python/gladevcp/gladevcp-test.ui index e11d508..64ae258 100644 --- a/lib/python/gladevcp/gladevcp-test.ui +++ b/lib/python/gladevcp/gladevcp-test.ui @@ -48,8 +48,17 @@ </packing> </child> <child> - <object class="HAL_LED" id="hal_led3"> + <object class="HAL_VBar" id="hal_vbar1"> <property name="visible">True</property> + <property name="bg_color">#bebebebebebe</property> + <property name="z1_border">0.80000001192092896</property> + <property name="z0_border">0.69999998807907104</property> + <property name="z1_color">#ffffffff0000</property> + <property name="min">10</property> + <property name="force_width">30</property> + <property name="invert">True</property> + <property name="z2_color">#ffff00000000</property> + <property name="z0_color">#0000ffff0000</property> </object> <packing> <property name="position">2</property> @@ -163,10 +172,32 @@ </object> </child> <child> - <placeholder/> + <object class="HAL_HBar" id="hal_hbar1"> + <property name="visible">True</property> + <property name="bg_color">#bebebebebebe</property> + <property name="z1_border">0.85000002384185791</property> + <property name="z0_border">0.69999998807907104</property> + <property name="force_height">20</property> + <property name="max">50</property> + <property name="z1_color">#ffffffff0000</property> + <property name="z2_color">#ffff00000000</property> + <property name="z0_color">#0000ffff0000</property> + </object> + <packing> + <property name="top_attach">2</property> + <property name="bottom_attach">3</property> + </packing> </child> <child> - <placeholder/> + <object class="HAL_HScale" id="hal_hscale2"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="adjustment">adjustment5</property> + </object> + <packing> + <property name="top_attach">3</property> + <property name="bottom_attach">4</property> + </packing> </child> </object> <packing> @@ -281,4 +312,10 @@ <property name="step_increment">1</property> <property name="page_increment">10</property> </object> + <object class="GtkAdjustment" id="adjustment5"> + <property name="upper">100</property> + <property name="step_increment">1</property> + <property name="page_increment">10</property> + <property name="page_size">10</property> + </object> </interface> |