Commits

Martin Reddy  committed bd70998

EXT-1549: Moved the Lock icon to the left of Help button.

Various floaters can display a lock icon in the title bar, but these
were appearing over the new Help button, "?". This change moves the
Lock icons to the left of the Help button.

While debugging the change I found some modal dialogs that shouldn't
display a help button, so I removed their help_topic definitions.

  • Participants
  • Parent commits 331aa38

Comments (0)

Files changed (8)

File indra/newview/skins/default/xui/en/floater_critical.xml

  height="500"
  layout="topleft"
  name="modal container"
- help_topic="modal_container"
  width="600">
     <button
      height="20"

File indra/newview/skins/default/xui/en/floater_customize.xml

              height="18"
              image_name="Lock"
              layout="topleft"
-             left="333"
+             left="315"
              mouse_opaque="true"
              name="square"
-             top="5"
+             top="4"
              width="18" />
             <icon
              height="16"
              height="18"
              image_name="Lock"
              layout="topleft"
-             left="333"
+             left="315"
              mouse_opaque="true"
              name="square"
-             top="5"
+             top="4"
              width="18" />
             <icon
              height="16"
              height="18"
              image_name="Lock"
              layout="topleft"
-             left="333"
+             left="315"
              mouse_opaque="true"
              name="square"
-             top="5"
+             top="4"
              width="18" />
             <icon
              height="16"
              height="18"
              image_name="Lock"
              layout="topleft"
-             left="333"
+             left="315"
              mouse_opaque="true"
              name="square"
-             top="5"
+             top="4"
              width="18" />
             <icon
              height="16"
              height="18"
              image_name="Lock"
              layout="topleft"
-             left="333"
+             left="315"
              mouse_opaque="true"
              name="square"
-             top="5"
+             top="4"
              width="18" />
             <icon
              height="16"
              height="18"
              image_name="Lock"
              layout="topleft"
-             left="333"
+             left="315"
              mouse_opaque="true"
              name="square"
-             top="5"
+             top="4"
              width="18" />
             <icon
              height="16"
              height="18"
              image_name="Lock"
              layout="topleft"
-             left="333"
+             left="315"
              mouse_opaque="true"
              name="square"
-             top="5"
+             top="4"
              width="18" />
             <icon
              height="16"
              height="18"
              image_name="Lock"
              layout="topleft"
-             left="333"
+             left="315"
              mouse_opaque="true"
              name="square"
-             top="5"
+             top="4"
              width="18" />
             <icon
              height="16"
              height="18"
              image_name="Lock"
              layout="topleft"
-             left="333"
+             left="315"
              mouse_opaque="true"
              name="square"
-             top="5"
+             top="4"
              width="18" />
             <icon
              height="16"
              height="18"
              image_name="Lock"
              layout="topleft"
-             left="333"
+             left="315"
              mouse_opaque="true"
              name="square"
-             top="5"
+             top="4"
              width="18" />
             <icon
              height="16"
              height="18"
              image_name="Lock"
              layout="topleft"
-             left="333"
+             left="315"
              mouse_opaque="true"
              name="square"
-             top="5"
+             top="4"
              width="18" />
             <icon
              height="16"
              height="18"
              image_name="Lock"
              layout="topleft"
-             left="333"
+             left="315"
              mouse_opaque="true"
              name="square"
-             top="5"
+             top="4"
              width="18" />
             <icon
              height="16"
              height="18"
              image_name="Lock"
              layout="topleft"
-             left="333"
+             left="315"
              mouse_opaque="true"
              name="square"
-             top="5"
+             top="4"
              width="18" />
             <icon
              height="16"
              height="18"
              image_name="Lock"
              layout="topleft"
-             left="333"
+             left="315"
              mouse_opaque="true"
              name="square"
-             top="5"
+             top="4"
              width="18" />
             <icon
              height="16"
              height="18"
              image_name="Lock"
              layout="topleft"
-             left="333"
+             left="315"
              mouse_opaque="true"
              name="square"
-             top="5"
+             top="4"
              width="18" />
             <icon
              height="16"

File indra/newview/skins/default/xui/en/floater_inventory_item_properties.xml

      height="18"
      image_name="Lock"
      layout="topleft"
-     left="294"
+     left="276"
      mouse_opaque="true"
      name="IconLocked"
-     top="5"
+     top="4"
      width="18" />
     <text
      type="string"

File indra/newview/skins/default/xui/en/floater_preview_notecard.xml

      height="18"
      image_name="Lock"
      layout="topleft"
-     left="340"
+     left="322"
      mouse_opaque="true"
      name="lock"
-     top="1"
+     top="4"
      width="18" />
     <text
      type="string"

File indra/newview/skins/default/xui/en/floater_script_preview.xml

      height="18"
      image_name="Lock"
      layout="topleft"
-     left="444"
+     left="426"
      mouse_opaque="true"
      name="lock"
-     top="3"
+     top="4"
      width="18" />
     <text
      type="string"

File indra/newview/skins/default/xui/en/floater_select_key.xml

  height="100"
  layout="topleft"
  name="modal container"
- help_topic="modal_container"
  width="240">
     <button
      height="20"

File indra/newview/skins/default/xui/en/floater_tos.xml

  height="500"
  layout="topleft"
  name="modal container"
- help_topic="modal_container"
  width="600">
     <floater.string
      name="real_url">

File indra/newview/skins/default/xui/en/floater_wearable_save_as.xml

  height="100"
  layout="topleft"
  name="modal container"
- help_topic="modal_container"
  width="240">
     <button
      height="20"