Merge branch 'master' of git://github.com/siana/SingularityViewer
This commit is contained in:
@@ -306,5 +306,5 @@
|
||||
</menu_item_call>
|
||||
<menu_item_call bottom_delta="-18" height="18" label="--no options--" left="0"
|
||||
mouse_opaque="true" name="--no options--" width="128" />
|
||||
<--menu_item_separator name="Wearable Separator" /-->
|
||||
<!--menu_item_separator name="Wearable Separator" -->
|
||||
</menu>
|
||||
|
||||
@@ -29,10 +29,10 @@
|
||||
name="friends" width="110">
|
||||
Contact Group:
|
||||
</text-->
|
||||
<text bottom_delta="-40" follows="left|top" font="SansSerifSmall" height="16" left_delta="0"
|
||||
<!--text bottom_delta="-40" follows="left|top" font="SansSerifSmall" height="16" left_delta="0"
|
||||
name="friends" width="110">
|
||||
Contact Search:
|
||||
</text>
|
||||
</text-->
|
||||
<!--combo_box allow_text_entry="false" enabled="true" follows="right|top"
|
||||
bottom_delta="20" height="18" hidden="false" left="-255" max_chars="20" mouse_opaque="true"
|
||||
tool_tip="Buddy group" name="buddy_group_combobox" width="130">
|
||||
@@ -40,11 +40,11 @@
|
||||
All
|
||||
</combo_item>
|
||||
</combo_box-->
|
||||
<line_editor bottom_delta="0" enabled="true" follows="right|top" font="SansSerif"
|
||||
height="18" left="-255" name="buddy_search_lineedit"
|
||||
tool_tip="The friend name you want to search for" width="130" />
|
||||
<search_editor bottom_delta="-40" enabled="true" follows="left|top" font="SansSerif"
|
||||
height="18" left_delta="0" name="buddy_search_lineedit" label="Type here to search"
|
||||
tool_tip="The friend name you want to search for" width="160" />
|
||||
<button bottom_delta="-3" follows="top|right" height="22" label="0"
|
||||
left_delta="132" name="expand_collapse_btn" tool_tip="Expand/Collapse extra info"
|
||||
left="-120" name="expand_collapse_btn" tool_tip="Expand/Collapse extra info"
|
||||
width="22" />
|
||||
<pad bottom="-7" height="0" left="-90" width="1" />
|
||||
<!--button bottom_delta="-25" follows="top|right" height="22" label="Set Contact"
|
||||
|
||||
Reference in New Issue
Block a user