diff options
| author | Sergei Litovchuk <slitovchuk@productengine.com> | 2010-09-04 01:24:15 +0300 | 
|---|---|---|
| committer | Sergei Litovchuk <slitovchuk@productengine.com> | 2010-09-04 01:24:15 +0300 | 
| commit | 21d4429caa172120ffa7a225656706a0af2febb7 (patch) | |
| tree | a5adbae7771feeb0b2f129cf8972fe53af6ce0a7 /indra/newview | |
| parent | 3a07996af1d45f6b763d5b0e71266b1f349b5d16 (diff) | |
VWR-21585 FIXED My Inventory and My Appearance side panels layout to support horizontal resizing.
Added minimal width for detached side panel floater.
Diffstat (limited to 'indra/newview')
7 files changed, 306 insertions, 156 deletions
| diff --git a/indra/newview/skins/default/xui/en/floater_side_bar_tab.xml b/indra/newview/skins/default/xui/en/floater_side_bar_tab.xml index 9ec3410afd..bf0913fde7 100644 --- a/indra/newview/skins/default/xui/en/floater_side_bar_tab.xml +++ b/indra/newview/skins/default/xui/en/floater_side_bar_tab.xml @@ -2,6 +2,7 @@  <floater   can_close="false"   can_resize="true" + min_width="150"   save_rect="true"   save_visibility="true"   > diff --git a/indra/newview/skins/default/xui/en/panel_edit_wearable.xml b/indra/newview/skins/default/xui/en/panel_edit_wearable.xml index 9fb777e0e7..95c1c822b8 100644 --- a/indra/newview/skins/default/xui/en/panel_edit_wearable.xml +++ b/indra/newview/skins/default/xui/en/panel_edit_wearable.xml @@ -187,7 +187,7 @@           width="150" />          <radio_group           control_name="AvatarSex" -         follows="left|top|right" +         follows="top|right"           height="20"           layout="topleft"           left="210" @@ -217,6 +217,7 @@          </radio_group>          <!--  graphical labels for the radio buttons above -->          <icon +         follows="top|right"           height="16"           image_name="icons/Male.png"           layout="topleft" @@ -226,6 +227,7 @@           top="7"           width="16" />          <icon +         follows="top|right"           height="16"           image_name="icons/Female.png"           layout="topleft" @@ -416,22 +418,55 @@       name="button_panel"       top_pad="6"       width="333"> -        <button -         follows="bottomleft" +        <layout_stack +         follows="bottom|left|right"           height="23" -         label="Save As"           layout="topleft" -         left="8" -         name="save_as_button" +         mouse_opaque="false" +         name="button_panel_ls" +         left="0" +         orientation="horizontal"           top="0" -         width="153" /> -        <button -         follows="bottomleft" -         height="23" -         label="Undo Changes" -         layout="topleft" -         left_pad="7" -         name="revert_button" -         width="152" /> +         width="333">	 +            <layout_panel +             follows="bottom|left|right" +             height="23" +             layout="bottomleft" +             left="0"			 +             mouse_opaque="false" +             name="save_as_btn_lp" +             user_resize="false"  +             auto_resize="true" +             width="154"> +                <button +                 follows="bottom|left|right" +                 height="23" +                 label="Save As" +                 layout="topleft" +                 left="1" +                 name="save_as_button" +                 top="0" +                 width="153" /> +            </layout_panel> +            <layout_panel +             follows="bottom|left|right" +             height="23" +             layout="bottomleft" +             left_pad="3"			 +             mouse_opaque="false" +             name="revert_btn_lp" +             user_resize="false"  +             auto_resize="true" +             width="152"> +                <button +                 follows="bottom|left|right" +                 height="23" +                 label="Undo Changes" +                 layout="topleft" +                 left_pad="7" +                 name="revert_button" +                 width="152" /> +            </layout_panel> +        </layout_stack>      </panel>  </panel> diff --git a/indra/newview/skins/default/xui/en/panel_outfit_edit.xml b/indra/newview/skins/default/xui/en/panel_outfit_edit.xml index e6714af943..1cbdecab9d 100644 --- a/indra/newview/skins/default/xui/en/panel_outfit_edit.xml +++ b/indra/newview/skins/default/xui/en/panel_outfit_edit.xml @@ -71,7 +71,7 @@       top="1"       width="30" />      <text -     follows="top|right" +     follows="top|left|right"       font="SansSerifHugeBold"       height="26"       layout="topleft" @@ -108,7 +108,7 @@           width="31" />              <panel               bevel_style="none" -             follows="top|right" +             follows="top|left|right"               height="37"               layout="topleft"               left_pad="5" @@ -494,39 +494,72 @@ It is calculated as border_size + 2*UIResizeBarOverlap       top_pad="2"       name="save_revert_button_bar"       width="300"> -        <button -         follows="bottom|left" -         height="23" -         label="Save" -         left="0" -         layout="topleft" -         name="save_btn" -         top="0" -         width="155" /> -        <button -         follows="bottom|left" -         height="23" -         name="save_flyout_btn" -         label="" -         layout="topleft" -         left_pad="-20" -         tab_stop="false" -         top="0" -         image_selected="SegmentedBtn_Right_Selected_Press" -         image_unselected="SegmentedBtn_Right_Off" -         image_pressed="SegmentedBtn_Right_Press" -         image_pressed_selected="SegmentedBtn_Right_Selected_Press" -         image_overlay="Arrow_Small_Up" -         width="20"/> -        <button -         follows="bottom|left|right" -         height="23" -         left_pad="12" -         label="Undo Changes" -         layout="topleft" -         name="revert_btn" -         top="0" -         tool_tip="Revert to last saved version" -         width="147" /> +			<layout_stack +     	         follows="bottom|left|right" +		         height="23" +		         layout="topleft" +		         mouse_opaque="false" +		         name="button_bar_ls" +		         left="0" +		         orientation="horizontal" +		         top="0" +		         width="313">	 +			    <layout_panel +			         follows="bottom|left|right" +			         height="23" +                     layout="bottomleft" +                     left="0"			 +                     mouse_opaque="false" +                     name="save_btn_lp" +                     user_resize="false"  +                     auto_resize="true" +                     width="156"> +                    <button +                         follows="bottom|left|right" +                         height="23" +                         label="Save" +                         left="1" +                         layout="topleft" +                         name="save_btn" +                         top="0" +                         width="155" /> +                    <button +                         follows="bottom|right" +                         height="23" +                         name="save_flyout_btn" +                         label="" +                         layout="topleft" +                         left_pad="-20" +                         tab_stop="false" +                         top="0" +                         image_selected="SegmentedBtn_Right_Selected_Press" +                         image_unselected="SegmentedBtn_Right_Off" +                         image_pressed="SegmentedBtn_Right_Press" +                         image_pressed_selected="SegmentedBtn_Right_Selected_Press" +                         image_overlay="Arrow_Small_Up" +                         width="20"/> +			    </layout_panel> +			    <layout_panel +                     follows="bottom|left|right" +                     height="23" +                     layout="bottomleft" +                     left_pad="3"			 +                     mouse_opaque="false" +                     name="revert_btn_lp" +                     user_resize="false"  +                     auto_resize="true" +                     width="147"> +                    <button +                         follows="bottom|left|right" +                         height="23" +                         left="0" +                         label="Undo Changes" +                         layout="topleft" +                         name="revert_btn" +                         top="0" +                         tool_tip="Revert to last saved version" +                         width="147" /> +			    </layout_panel> +			</layout_stack>      </panel>  </panel> diff --git a/indra/newview/skins/default/xui/en/panel_outfits_inventory.xml b/indra/newview/skins/default/xui/en/panel_outfits_inventory.xml index 82b69ba8dc..88c82313dd 100644 --- a/indra/newview/skins/default/xui/en/panel_outfits_inventory.xml +++ b/indra/newview/skins/default/xui/en/panel_outfits_inventory.xml @@ -67,36 +67,70 @@         visible="true"         name="bottom_panel"         width="310"> -      <button -           follows="bottom|left" -           height="23" -           label="Save As" -           left="0" -           layout="topleft" -           name="save_btn" -           top_pad="0" -           width="155" /> -      <button -           follows="bottom|left" -          height="23" -           name="save_flyout_btn" -           label="" -           layout="topleft" -           left_pad="-20" -           tab_stop="false" -           image_selected="SegmentedBtn_Right_Selected_Press" -           image_unselected="SegmentedBtn_Right_Off" -           image_pressed="SegmentedBtn_Right_Press" -           image_pressed_selected="SegmentedBtn_Right_Selected_Press" -           image_overlay="Arrow_Small_Up" -           width="20"/> -      <button -          follows="bottom|left|right"  -          height="23"  -          label="Wear" -          layout="topleft" -          name="wear_btn" -          left_pad="3" -          width="152" /> +			<layout_stack +     	         follows="bottom|left|right" +		         height="23" +		         layout="topleft" +		         mouse_opaque="false" +		         name="bottom_panel_ls" +		         left="0" +		         orientation="horizontal" +		         top="0" +		         width="313">	 +			    <layout_panel +			         follows="bottom|left|right" +			         height="23" +                     layout="bottomleft" +                     left="0"			 +                     mouse_opaque="false" +                     name="save_btn_lp" +                     user_resize="false"  +                     auto_resize="true" +                     width="156"> +                    <button +                         follows="bottom|left|right" +                         height="23" +                         label="Save As" +                         left="1" +                         layout="topleft" +                         name="save_btn" +                         top="0" +                         width="155" /> +                    <button +                         follows="bottom|right" +                         height="23" +                         name="save_flyout_btn" +                         label="" +                         layout="topleft" +                         left_pad="-20" +                         tab_stop="false" +                         image_selected="SegmentedBtn_Right_Selected_Press" +                         image_unselected="SegmentedBtn_Right_Off" +                         image_pressed="SegmentedBtn_Right_Press" +                         image_pressed_selected="SegmentedBtn_Right_Selected_Press" +                         image_overlay="Arrow_Small_Up" +                         width="20"/> +			    </layout_panel> +			    <layout_panel +                     follows="bottom|left|right" +                     height="23" +                     layout="bottomleft" +                     left_pad="3"			 +                     mouse_opaque="false" +                     name="wear_btn_lp" +                     user_resize="false"  +                     auto_resize="true" +                     width="152"> +                    <button +                         follows="bottom|left|right" +                         height="23" +                         label="Wear" +                         layout="topleft" +                         name="wear_btn" +                         left="0" +                         top="0" +                         width="152" /> +			    </layout_panel> +			</layout_stack>     </panel>  </panel> diff --git a/indra/newview/skins/default/xui/en/sidepanel_appearance.xml b/indra/newview/skins/default/xui/en/sidepanel_appearance.xml index 02ab0ffee5..c1c0f07304 100644 --- a/indra/newview/skins/default/xui/en/sidepanel_appearance.xml +++ b/indra/newview/skins/default/xui/en/sidepanel_appearance.xml @@ -65,7 +65,7 @@ width="333">        text_color="EmphasisColor"        width="300"        height="10" -      follows="top|left" +      follows="top|left|right"        layout="topleft"        left="35"        top="3" @@ -81,14 +81,14 @@ width="333">        top="15"        use_ellipses="true"        width="230" -      follows="top|left" +      follows="top|left|right"        word_wrap="false"        mouse_opaque="false"        name="currentlook_name">        MyOutfit With a really Long Name like MOOSE        </text>        <button -      follows="left|top" +      follows="top|right"        height="28"        image_overlay="Edit_Wrench"        label="" @@ -99,7 +99,7 @@ width="333">        top="3"        width="28" />        <loading_indicator -      follows="left|top" +      follows="top|right"        height="24"        layout="topleft"        left="268" diff --git a/indra/newview/skins/default/xui/en/sidepanel_inventory.xml b/indra/newview/skins/default/xui/en/sidepanel_inventory.xml index 6c9acae35e..f3c6895cee 100644 --- a/indra/newview/skins/default/xui/en/sidepanel_inventory.xml +++ b/indra/newview/skins/default/xui/en/sidepanel_inventory.xml @@ -31,77 +31,122 @@  			 height="545"  			 width="330" />  		<panel +		     follows="bottom|left|right"  			 height="25"  			 layout="topleft"  			 name="button_panel"  			 left="9"  			 top_pad="-2"  			 width="313"> -			<button -				 enabled="true" -				 follows="bottom|left" -				 height="23" -				 label="Profile" -				 layout="topleft" -				 left="0" -				 name="info_btn" -				 tool_tip="Show object profile" -				 top="0" -				 width="102" /> -			<button -				 enabled="true" -				 follows="bottom|left" -				 height="23" -				 label="Share" -				 layout="topleft" -				 left="105" -				 name="share_btn" -				 tool_tip="Share an inventory item" -				 top="0" -				 width="102" /> -			<button -				 enabled="true" -				 follows="bottom|left" -				 height="23" -				 label="Shop" -				 layout="topleft" -				 left="210" -				 name="shop_btn" -				 tool_tip="Open Marketplace webpage" -				 top="0" -				 width="102" /> -			<button -				 enabled="false" -				 follows="bottom|left" -				 height="23" -				 label="Wear" -				 layout="topleft" -				 left="210" -				 name="wear_btn" -				 tool_tip="Wear seleceted outfit" -				 top="0" -				 width="102" /> -			<button -				 enabled="false" -				 follows="bottom|left" -				 height="23" -				 label="Play" -				 layout="topleft" -				 name="play_btn" -				 left="210" -				 top="0" -				 width="102" /> -			<button -				 enabled="false" -				 follows="bottom|left" -				 height="23" -				 label="Teleport" -				 layout="topleft" -				 left="210" -				 name="teleport_btn" -				 tool_tip="Teleport to the selected area" -				 top="0" -				 width="102" /> +			<layout_stack +     	         follows="bottom|left|right" +		         height="23" +		         layout="topleft" +		         mouse_opaque="false" +		         name="button_panel_ls" +		         left="0" +		         orientation="horizontal" +		         top="0" +		         width="313">	 +			    <layout_panel +			         follows="bottom|left|right" +			         height="23" +                     layout="bottomleft" +                     left="0"			 +                     mouse_opaque="false" +                     name="info_btn_lp" +                     user_resize="false"  +                     auto_resize="true" +                     width="103"> +                    <button +                         enabled="true" +                         follows="bottom|left|right" +                         height="23" +                         label="Profile" +                         layout="topleft" +                         left="1" +                         name="info_btn" +                         tool_tip="Show object profile" +                         top="0" +                         width="102" /> +			    </layout_panel> +			    <layout_panel +                     follows="bottom|left|right" +                     height="23" +                     layout="bottomleft" +                     left_pad="3"			 +                     mouse_opaque="false" +                     name="share_btn_lp" +                     user_resize="false"  +                     auto_resize="true" +                     width="102"> +                    <button +                         enabled="true" +                         follows="bottom|left|right" +                         height="23" +                         label="Share" +                         layout="topleft" +                         left="0" +                         name="share_btn" +                         tool_tip="Share an inventory item" +                         top="0" +                         width="102" /> +			    </layout_panel> +			    <layout_panel +                     follows="bottom|left|right" +                     height="23" +                     layout="bottomleft" +                     left_pad="3"			 +                     mouse_opaque="false" +                     name="shop_btn_lp" +                     user_resize="false"  +                     auto_resize="true" +                     width="102"> +                    <button +                         enabled="true" +                         follows="bottom|left|right" +                         height="23" +                         label="Shop" +                         layout="topleft" +                         left="0" +                         name="shop_btn" +                         tool_tip="Open Marketplace webpage" +                         top="0" +                         width="102" /> +                    <button +                         enabled="false" +                         follows="bottom|left|right" +                         height="23" +                         label="Wear" +                         layout="topleft" +                         left="0" +                         name="wear_btn" +                         tool_tip="Wear seleceted outfit" +                         top="0" +                         width="102" /> +                    <button +                         enabled="false" +                         follows="bottom|left|right" +                         height="23" +                         label="Play" +                         layout="topleft" +                         name="play_btn" +                         left="0" +                         top="0" +                         width="102" /> +                    <button +                         enabled="false" +                         follows="bottom|left|right" +                         height="23" +                         label="Teleport" +                         layout="topleft" +                         left="0" +                         name="teleport_btn" +                         tool_tip="Teleport to the selected area" +                         top="0" +                         width="102" /> +			    </layout_panel> +			</layout_stack>  		</panel>  	</panel> diff --git a/indra/newview/skins/default/xui/en/sidepanel_item_info.xml b/indra/newview/skins/default/xui/en/sidepanel_item_info.xml index 49b252174c..4f923f411c 100644 --- a/indra/newview/skins/default/xui/en/sidepanel_item_info.xml +++ b/indra/newview/skins/default/xui/en/sidepanel_item_info.xml @@ -1,5 +1,6 @@  <?xml version="1.0" encoding="utf-8" standalone="yes" ?>  <panel +     follows="all"  	 height="570"  	 layout="topleft"  	 name="item properties" @@ -45,7 +46,7 @@  	     top="8"  	     width="18" />      <button -     follows="top|right" +     follows="top|left"       height="24"       image_hover_unselected="BackButton_Over"       image_pressed="BackButton_Press" @@ -69,14 +70,15 @@       value="Item Profile"       width="275" />      	    <text -     follows="top|left" +     follows="top|left|right"       height="13"       layout="topleft"       left="45"       name="origin"       text_color="LtGray_50" +     use_ellipses="true"       value="(Inventory)" -     width="150" /> +     width="275" />  	<panel           follows="all"           height="493" @@ -234,7 +236,7 @@ top_pad="10"  	     <text  			 type="string"  			 length="1" -			 follows="left|top" +			 follows="left|top|right"  			 height="23"  			 layout="topleft"  			 left_delta="78" @@ -244,7 +246,7 @@ top_pad="10"        </text>  	 <panel           border="false" -         follows="left|top" +         follows="left|top|right"           layout="topleft"           mouse_opaque="false"           name="perms_inv" | 
